diff --git a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java index 0eb9ba72ef782b73621335b18481c24acba61e16..0b84a7246d2288dd5e04837d79e5e9430189dab1 100644 --- a/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java +++ b/fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java @@ -124,12 +124,12 @@ public class ImageServiceIntegrationTest extends BaseUnitTest { } @Test - public void delete_hasContainer_succeeds() throws ImageNotFoundException, PersistenceException { + public void delete_hasNoContainer_succeeds() throws ImageNotFoundException, PersistenceException { /* test */ imageService.delete(IMAGE_1_ID); assertTrue(imageRepository.findById(IMAGE_1_ID).isEmpty()); - assertTrue(containerRepository.findById(CONTAINER_1_ID).isPresent()); /* container should NEVER be deletable in the metadata db */ + assertFalse(containerRepository.findById(CONTAINER_1_ID).isPresent()); /* container should NEVER be deletable in the metadata db */ } @Test diff --git a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java index 00344f6389eb6a89d61d59558a57376036859b15..7549845e629412779d9cd289b5d4256479402446 100644 --- a/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java +++ b/fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java @@ -48,8 +48,9 @@ public class Database { }) private User creator; + @org.springframework.data.annotation.Transient @ToString.Exclude - @ManyToOne(fetch = FetchType.EAGER, cascade = CascadeType.ALL) + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE) @JoinColumns({ @JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false) }) @@ -73,7 +74,7 @@ public class Database { }) private User contact; - @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE) @JoinColumns({ @JoinColumn(name = "tdbid", referencedColumnName = "id", insertable = false, updatable = false) })