Modify the image environment

fda-container-service/rest-service/src/test/java/at/tuwien/BaseUnitTest.java

@@ -144,7 +144,6 @@ public abstract class BaseUnitTest {
             .driverClass(IMAGE_1_DRIVER)
             .compiled(IMAGE_1_BUILT)
             .size(IMAGE_1_SIZE)
-            .environment(IMAGE_1_ENV)
             .defaultPort(IMAGE_1_PORT)
             .build();
 

fda-container-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java

@@ -6,6 +6,7 @@ import at.tuwien.config.DockerUtil;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.container.Container;
 import at.tuwien.exception.*;
+import at.tuwien.repository.jpa.ContainerImageEnvironmentItemRepository;
 import at.tuwien.repository.jpa.ContainerRepository;
 import at.tuwien.repository.jpa.ImageRepository;
 import at.tuwien.repository.jpa.UserRepository;
@@ -48,6 +49,9 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private ImageRepository imageRepository;
 
+    @Autowired
+    private ContainerImageEnvironmentItemRepository containerImageEnvironmentItemRepository;
+
     @Autowired
     private DockerClient dockerClient;
 
@@ -82,6 +86,8 @@ public class ContainerServiceIntegrationTest extends BaseUnitTest {
         /* mock data */
         userRepository.save(USER_1);
         imageRepository.save(IMAGE_1);
+        containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
+        IMAGE_1.setEnvironment(IMAGE_1_ENV);
     }
 
     @AfterEach

fda-container-service/rest-service/src/test/java/at/tuwien/service/ImageServiceIntegrationTest.java

@@ -4,8 +4,10 @@ import at.tuwien.BaseUnitTest;
 import at.tuwien.api.container.image.ImageCreateDto;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.*;
+import at.tuwien.repository.jpa.ContainerImageEnvironmentItemRepository;
 import at.tuwien.repository.jpa.ContainerRepository;
 import at.tuwien.repository.jpa.ImageRepository;
+import at.tuwien.repository.jpa.UserRepository;
 import at.tuwien.service.impl.ImageServiceImpl;
 import lombok.extern.log4j.Log4j2;
 import org.apache.http.auth.BasicUserPrincipal;
@@ -38,15 +40,22 @@ public class ImageServiceIntegrationTest extends BaseUnitTest {
     @Autowired
     private ImageRepository imageRepository;
 
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private ContainerImageEnvironmentItemRepository containerImageEnvironmentItemRepository;
+
     @Autowired
     private ContainerRepository containerRepository;
 
     @Transactional
     @BeforeEach
     public void beforeEach() {
+        userRepository.save(USER_1);
         imageRepository.save(IMAGE_1);
-        log.debug("save container {}", CONTAINER_1);
-        containerRepository.save(CONTAINER_1);
+        containerImageEnvironmentItemRepository.saveAll(IMAGE_1_ENV);
+        IMAGE_1.setEnvironment(IMAGE_1_ENV);
     }
 
     @Test

fda-container-service/services/src/main/java/at/tuwien/repository/jpa/ContainerImageEnvironmentItemRepository.java

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