Added 1:1 relationship

fda-container-service/services/src/main/java/at/tuwien/auth/PermissionEvaluatorImpl.java

@@ -56,7 +56,7 @@ public class PermissionEvaluatorImpl implements PermissionEvaluator {
                     log.error("Failed to grant permission {}", permission);
                     log.debug("failed to grant permission {}, owner is not the current user", permission);
                     return false;
-                } else if (container.getDatabases().size() > 0) {
+                } else if (container.getDatabase() != null) {
                     log.error("Failed to grant permission {}", permission);
                     log.debug("failed to grant permission {}, databases present in the container", permission);
                     return false;

fda-container-service/services/src/main/java/at/tuwien/mapper/ContainerMapper.java

@@ -38,7 +38,7 @@ public interface ContainerMapper {
             @Mapping(source = "state", target = "state", qualifiedByName = "containerStateDto"),
             @Mapping(source = "id", target = "hash"),
             @Mapping(target = "id", ignore = true),
-            @Mapping(target = "databases", ignore = true),
+            @Mapping(target = "database", ignore = true),
     })
     ContainerDto inspectContainerResponseToContainerDto(InspectContainerResponse data);
 

fda-database-service/services/src/main/java/at/tuwien/mapper/ContainerMapper.java

@@ -11,7 +11,7 @@ public interface ContainerMapper {
 
     @Mappings({
             @Mapping(target = "id", source = "id"),
-            @Mapping(target = "databases", source = "databases", ignore = true),
+            @Mapping(target = "database", source = "database", ignore = true),
     })
     ContainerDto containerToContainerDto(Container data);
 

fda-database-service/services/src/main/java/at/tuwien/service/impl/MariaDbServiceImpl.java

@@ -124,7 +124,7 @@ public class MariaDbServiceImpl extends HibernateConnector implements DatabaseSe
             DatabaseMalformedException, AmqpException, ContainerConnectionException, UserNotFoundException,
             DatabaseNameExistsException, DatabaseConnectionException, QueryMalformedException {
         final Container container = containerService.find(containerId);
-        if (container.getDatabases().size() != 0) {
+        if (container.getDatabase() != null) {
             log.error("Currently we only support one database per container.");
             throw new DatabaseMalformedException("Currently only one database per container is supported");
         }

fda-metadata-db/api/src/main/java/at/tuwien/api/container/ContainerDto.java

@@ -42,9 +42,9 @@ public class ContainerDto {
     @Schema(example = "running")
     private ContainerStateDto state;
 
-    @ToString.Exclude
     @Schema
-    private List<DatabaseDto> databases;
+    @ToString.Exclude
+    private DatabaseDto database;
 
     @JsonProperty("ip_address")
     private String ipAddress;

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/Container.java

@@ -53,15 +53,19 @@ public class Container {
     @Column
     private Integer port;
 
+    @ToString.Exclude
     @org.springframework.data.annotation.Transient
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @OneToOne(fetch = FetchType.LAZY)
     @JoinColumns({
             @JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false)
     })
-    private List<Database> databases;
+    private Database database;
 
     @org.springframework.data.annotation.Transient
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumns({
+            @JoinColumn(name = "image_id", referencedColumnName = "id", insertable = false, updatable = false)
+    })
     private ContainerImage image;
 
     @Column

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java

@@ -64,7 +64,7 @@ public class ContainerImage {
 
     @ToString.Exclude
     @org.springframework.data.annotation.Transient
-    @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.DETACH, CascadeType.MERGE}, mappedBy = "image")
+    @OneToMany(fetch = FetchType.LAZY, mappedBy = "image")
     private List<Container> containers;
 
     @Column(nullable = false, updatable = false)

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageDate.java

@@ -30,7 +30,7 @@ public class ContainerImageDate {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "iid", insertable = false, updatable = false)
     private ContainerImage image;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/container/image/ContainerImageEnvironmentItem.java

@@ -42,7 +42,7 @@ public class ContainerImageEnvironmentItem {
 
     @ToString.Exclude
     @org.springframework.data.annotation.Transient
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumns({
             @JoinColumn(name = "iid", referencedColumnName = "id", insertable = false, updatable = false)
     })

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/Database.java

@@ -42,9 +42,9 @@ public class Database {
     })
     private User creator;
 
-    @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @org.springframework.data.annotation.Transient
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumns({
             @JoinColumn(name = "id", referencedColumnName = "id", insertable = false, updatable = false)
     })
@@ -68,6 +68,7 @@ public class Database {
     })
     private User contact;
 
+    @org.springframework.data.annotation.Transient
     @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
     @JoinColumns({
             @JoinColumn(name = "tdbid", referencedColumnName = "id", insertable = false, updatable = false)

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/View.java

@@ -42,7 +42,7 @@ public class View {
     private User creator;
 
     @org.springframework.data.annotation.Transient
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "vdbid", insertable = false, updatable = false)
     private Database database;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/Table.java

@@ -58,8 +58,7 @@ public class Table {
     private String description;
 
     @org.springframework.data.annotation.Transient
-    @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "tdbid", insertable = false, updatable = false)
     private Database database;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/TableColumn.java

@@ -54,7 +54,7 @@ public class TableColumn implements Comparable<TableColumn> {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumns({
             @JoinColumn(name = "tid", referencedColumnName = "id", insertable = false, updatable = false),
             @JoinColumn(name = "cdbid", referencedColumnName = "tdbid", insertable = false, updatable = false)

fda-metadata-db/entities/src/main/java/at/tuwien/entities/database/table/columns/concepts/Concept.java

@@ -35,7 +35,7 @@ public class Concept {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.MERGE)
+    @OneToMany(fetch = FetchType.LAZY)
     @JoinTable(name = "mdb_columns_concepts",
             joinColumns = @JoinColumn(name = "concept_id", referencedColumnName = "id", insertable = false, updatable = false),
             inverseJoinColumns = {

fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Creator.java

@@ -42,7 +42,7 @@ public class Creator {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "pid", referencedColumnName = "id", insertable = false, updatable = false)
     private Identifier identifier;
 

fda-metadata-db/entities/src/main/java/at/tuwien/entities/user/TimeSecret.java

@@ -39,7 +39,7 @@ public class TimeSecret {
 
     @org.springframework.data.annotation.Transient
     @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumns({
             @JoinColumn(name = "uid", referencedColumnName = "userid", insertable = false, updatable = false)
     })

fda-table-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java

@@ -4,6 +4,8 @@ import at.tuwien.BaseUnitTest;
 import at.tuwien.config.DockerConfig;
 import at.tuwien.config.IndexInitializer;
 import at.tuwien.config.ReadyConfig;
+import at.tuwien.entities.container.Container;
+import at.tuwien.entities.database.Database;
 import at.tuwien.entities.database.table.Table;
 import at.tuwien.exception.*;
 import at.tuwien.repository.jpa.*;
@@ -22,10 +24,12 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
+import javax.transaction.Transactional;
 import java.io.File;
 import java.security.Principal;
 import java.util.Arrays;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import static at.tuwien.config.DockerConfig.dockerClient;
 import static at.tuwien.config.DockerConfig.hostConfig;
@@ -64,6 +68,9 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private UserRepository userRepository;
 
+    @Autowired
+    private ImageEnvironmentRepository imageEnvironmentRepository;
+
     @BeforeAll
     public static void beforeAll() throws InterruptedException {
         afterAll();
@@ -127,15 +134,12 @@ public class TableServiceIntegrationTest extends BaseUnitTest {
 
     @BeforeEach
     public void beforeEach() {
-        userRepository.save(USER_1);
-        userRepository.save(USER_2);
-        imageRepository.save(IMAGE_1);
-        containerRepository.save(CONTAINER_1);
-        containerRepository.save(CONTAINER_2);
-        databaseRepository.save(DATABASE_1) /* public */;
-        databaseRepository.save(DATABASE_2) /* private */;
-        tableRepository.save(TABLE_1);
-        tableRepository.save(TABLE_2);
+        CONTAINER_1.setDatabase(DATABASE_1);
+        CONTAINER_2.setDatabase(DATABASE_2);
+        TABLE_1.setDatabase(DATABASE_1);
+        TABLE_2.setDatabase(DATABASE_2);
+        tableRepository.save(TABLE_1) /* public */;
+        tableRepository.save(TABLE_2) /* private */;
     }
 
     @Test

fda-table-service/services/src/main/java/at/tuwien/repository/jpa/ImageEnvironmentRepository.java

+package at.tuwien.repository.jpa;
+
+import at.tuwien.entities.container.image.ContainerImage;
+import at.tuwien.entities.container.image.ContainerImageEnvironmentItem;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ImageEnvironmentRepository extends JpaRepository<ContainerImageEnvironmentItem, Long> {
+
+}