diff --git a/src/main/java/com/navi/infra/portal/domain/manifest/Manifest.java b/src/main/java/com/navi/infra/portal/domain/manifest/Manifest.java index 203857bf..f7627c26 100644 --- a/src/main/java/com/navi/infra/portal/domain/manifest/Manifest.java +++ b/src/main/java/com/navi/infra/portal/domain/manifest/Manifest.java @@ -49,7 +49,6 @@ public class Manifest extends JsonEntity { @JsonManagedReference private Deployment deployment; - @Transient private String infraVertical; diff --git a/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java b/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java index a44aad77..56e86c56 100644 --- a/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java +++ b/src/main/java/com/navi/infra/portal/service/manifest/ManifestService.java @@ -335,16 +335,13 @@ public class ManifestService { @PreAuthorize("hasAuthority('manifest.delete')") public List delete(Long id, Boolean deleteManifest) { - Manifest manifest = manifestRepository.findById(id) - .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND)); + Manifest manifest = map(manifestRepository.findById(id)); List result = new ArrayList<>(); if (deleteManifest) { - log.info("Deleting manifest Object - {}/{}", manifest.getEnvironment(), - manifest.getName()); + log.info("Deleting manifest Object - {}", manifest.fullName()); manifestRepository.deleteById(id); } else { - log.info("Deleting manifest Resources for {}/{}", manifest.getEnvironment(), - manifest.getName()); + log.info("Deleting manifest Resources for {}", manifest.fullName()); result = kubernetesManifestService.deleteResources(manifest); } return result;