Fixed a lot of persistence issues in testing

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/ContainerCreateDto.java

@@ -46,6 +46,10 @@ public class ContainerCreateDto {
     @JsonProperty("ui_port")
     private Integer uiPort;
 
+    @NotNull
+    @Schema(example = "50")
+    private Long quota;
+
     @NotBlank
     @JsonProperty("privileged_username")
     @Schema(description = "Username of privileged user", example = "root")

dbrepo-metadata-service/api/src/main/java/at/tuwien/api/container/image/ImageCreateDto.java

@@ -27,6 +27,11 @@ public class ImageCreateDto {
     @Schema(example = "mariadb")
     private String name;
 
+    @NotNull
+    @JsonProperty("is_default")
+    @Schema(example = "false")
+    private Boolean isDefault;
+
     @NotBlank
     @Parameter(example = "10.5")
     private String version;

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/container/image/ContainerImage.java

@@ -54,7 +54,7 @@ public class ContainerImage {
     @Column(nullable = false)
     private Integer defaultPort;
 
-    @Column(nullable = false, columnDefinition = "BOOLEAN DEFAULT FALSE")
+    @Column(nullable = false, unique = true, columnDefinition = "BOOLEAN DEFAULT FALSE")
     private Boolean isDefault = false;
 
     @OneToMany(fetch = FetchType.LAZY, cascade = {CascadeType.ALL, CascadeType.PERSIST}, mappedBy = "image")

dbrepo-metadata-service/entities/src/main/java/at/tuwien/entities/database/ViewColumn.java

@@ -15,9 +15,7 @@ import jakarta.persistence.*;
 @AllArgsConstructor
 @NoArgsConstructor
 @EntityListeners(AuditingEntityListener.class)
-@jakarta.persistence.Table(name = "mdb_view_columns", uniqueConstraints = {
-        @UniqueConstraint(columnNames = {"view_id", "internalName"})
-})
+@jakarta.persistence.Table(name = "mdb_view_columns")
 public class ViewColumn implements Comparable<ViewColumn> {
 
     @Id

dbrepo-metadata-service/repositories/src/main/java/at/tuwien/mapper/MetadataMapper.java

@@ -416,6 +416,9 @@ public interface MetadataMapper {
         };
     }
 
+    @Mappings({
+            @Mapping(target = "isDefault", source = "isDefault")
+    })
     ContainerImage createImageDtoToContainerImage(ImageCreateDto data);
 
     ImageBriefDto containerImageToImageBriefDto(ContainerImage data);

dbrepo-metadata-service/repositories/src/main/java/at/tuwien/repository/ImageRepository.java

@@ -10,8 +10,8 @@ import java.util.Optional;
 @Repository
 public interface ImageRepository extends JpaRepository<ContainerImage, Long> {
 
-    List<ContainerImage> findAll();
-
     Optional<ContainerImage> findByNameAndVersion(String name, String version);
 
+    Optional<ContainerImage> findByIsDefault(Boolean isDefault);
+
 }

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java

@@ -13,6 +13,7 @@ import at.tuwien.service.ContainerService;
 import at.tuwien.service.BrokerService;
 import at.tuwien.service.impl.DatabaseServiceImpl;
 import lombok.extern.log4j.Log4j2;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -62,6 +63,11 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
     @Autowired
     private DatabaseEndpoint databaseEndpoint;
 
+    @BeforeEach
+    public void beforeEach() {
+        genesis();
+    }
+
     @Test
     @WithAnonymousUser
     public void create_anonymous_fails() {

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/mvc/AuthenticationPrivilegedIntegrationMvcTest.java

@@ -81,8 +81,8 @@ public class AuthenticationPrivilegedIntegrationMvcTest extends AbstractUnitTest
         genesis();
         /* metadata database */
         licenseRepository.save(LICENSE_1);
-        containerRepository.save(CONTAINER_1);
         userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4));
+        containerRepository.save(CONTAINER_1);
         databaseRepository.save(DATABASE_1);
         /* keycloak */
         keycloakUtils.deleteUser(USER_1_USERNAME);

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DataCiteIdentifierServicePersistenceTest.java

@@ -76,8 +76,8 @@ public class DataCiteIdentifierServicePersistenceTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         licenseRepository.save(LICENSE_1);
-        containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
         userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+        containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
         databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
     }
 

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServicePersistenceTest.java

@@ -47,8 +47,8 @@ public class DatabaseServicePersistenceTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         licenseRepository.save(LICENSE_1);
-        containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
         userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+        containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
         databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
     }
 

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceUnitTest.java

 package at.tuwien.service;
 
 import at.tuwien.test.AbstractUnitTest;
-import at.tuwien.api.database.DatabaseCreateDto;
 import at.tuwien.api.database.DatabaseModifyVisibilityDto;
 import at.tuwien.api.database.internal.CreateDatabaseDto;
 import at.tuwien.entities.database.Database;
@@ -43,9 +42,6 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
     @MockBean
     private DatabaseRepository databaseRepository;
 
-    @MockBean
-    private ContainerRepository containerRepository;
-
     @Autowired
     private DatabaseService databaseService;
 
@@ -92,23 +88,6 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
         });
     }
 
-    @Test
-    public void create_notFound_fails() {
-        final DatabaseCreateDto request = DatabaseCreateDto.builder()
-                .cid(CONTAINER_1_ID)
-                .name(DATABASE_1_NAME)
-                .build();
-
-        /* mock */
-        when(containerRepository.findById(CONTAINER_1_ID))
-                .thenReturn(Optional.empty());
-
-        /* test */
-        assertThrows(ContainerNotFoundException.class, () -> {
-            databaseService.create(CONTAINER_1, request, USER_1);
-        });
-    }
-
     @Test
     public void find_succeeds() throws DatabaseNotFoundException {
 
@@ -138,26 +117,11 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
     public void create_succeeds() throws Exception {
 
         /* mock */
-        when(containerRepository.findById(DATABASE_1.getCid()))
-                .thenReturn(Optional.of(CONTAINER_1));
         when(dataServiceGateway.createDatabase(any(CreateDatabaseDto.class)))
                 .thenReturn(DATABASE_1_DTO);
 
         /* test */
-        generic_create(DATABASE_1_CREATE, DATABASE_1);
-    }
-
-    @Test
-    public void create_containerNotFound_fails() {
-
-        /* mock */
-        when(containerRepository.findById(anyLong()))
-                .thenReturn(Optional.empty());
-
-        /* test */
-        assertThrows(ContainerNotFoundException.class, () -> {
-            generic_create(DATABASE_1_CREATE, DATABASE_1);
-        });
+        generic_create();
     }
 
     @Test
@@ -165,15 +129,13 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
             DatabaseNotFoundException {
 
         /* mock */
-        when(containerRepository.findById(DATABASE_1.getCid()))
-                .thenReturn(Optional.of(CONTAINER_1));
         doThrow(DataServiceException.class)
                 .when(dataServiceGateway)
                 .createDatabase(any(CreateDatabaseDto.class));
 
         /* test */
         assertThrows(DataServiceException.class, () -> {
-            generic_create(DATABASE_1_CREATE, DATABASE_1);
+            generic_create();
         });
     }
 
@@ -182,15 +144,13 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
             DatabaseNotFoundException {
 
         /* mock */
-        when(containerRepository.findById(DATABASE_1.getCid()))
-                .thenReturn(Optional.of(CONTAINER_1));
         doThrow(DataServiceConnectionException.class)
                 .when(dataServiceGateway)
                 .createDatabase(any(CreateDatabaseDto.class));
 
         /* test */
         assertThrows(DataServiceConnectionException.class, () -> {
-            generic_create(DATABASE_1_CREATE, DATABASE_1);
+            generic_create();
         });
     }
 
@@ -304,7 +264,7 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
     /* ## GENERIC TEST CASES                                                                            ## */
     /* ################################################################################################### */
 
-    protected Database generic_create(DatabaseCreateDto createDto, Database database) throws DataServiceException,
+    protected Database generic_create() throws DataServiceException,
             DataServiceConnectionException, UserNotFoundException, DatabaseNotFoundException,
             ContainerNotFoundException, SearchServiceException, SearchServiceConnectionException {
 
@@ -312,13 +272,11 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
         when(searchServiceGateway.update(any(Database.class)))
                 .thenReturn(DATABASE_1_DTO);
         when(databaseRepository.save(any(Database.class)))
-                .thenReturn(database);
+                .thenReturn(DATABASE_1);
 
         /* test */
-        final Database response = databaseService.create(CONTAINER_1, createDto, USER_1);
-        assertEquals(database.getName(), response.getName());
-        assertEquals(database.getIsPublic(), response.getIsPublic());
-        assertTrue(response.getInternalName().startsWith(database.getInternalName()));
+        final Database response = databaseService.create(CONTAINER_1, DATABASE_1_CREATE, USER_1);
+        assertTrue(response.getInternalName().startsWith(DATABASE_1_INTERNALNAME));
         assertNotNull(response.getContainer());
         assertNotNull(response.getTables());
         assertNotNull(response.getViews());
@@ -332,7 +290,6 @@ public class DatabaseServiceUnitTest extends AbstractUnitTest {
         assertNotNull(response.getOwner());
         assertNull(response.getImage());
         assertNotNull(response.getExchangeName());
-        assertEquals(database.getIsPublic(), response.getIsPublic());
         return response;
     }
 

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/IdentifierServicePersistenceTest.java

@@ -73,8 +73,8 @@ public class IdentifierServicePersistenceTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         licenseRepository.save(LICENSE_1);
-        containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
         userRepository.saveAll(List.of(USER_1, USER_2, USER_3, USER_4, USER_5));
+        containerRepository.saveAll(List.of(CONTAINER_1, CONTAINER_2, CONTAINER_3, CONTAINER_4));
         databaseRepository.saveAll(List.of(DATABASE_1, DATABASE_2, DATABASE_3, DATABASE_4));
     }
 

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ImageServicePersistenceTest.java

 package at.tuwien.service;
 
+import at.tuwien.exception.ImageInvalidException;
 import at.tuwien.test.AbstractUnitTest;
 import at.tuwien.api.container.image.ImageCreateDto;
 import at.tuwien.exception.ImageAlreadyExistsException;
 import at.tuwien.repository.ContainerRepository;
 import at.tuwien.repository.ImageRepository;
 import lombok.extern.log4j.Log4j2;
-import org.apache.http.auth.BasicUserPrincipal;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,8 +15,6 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-import java.security.Principal;
-
 import static org.junit.jupiter.api.Assertions.*;
 
 @Log4j2
@@ -42,7 +40,7 @@ public class ImageServicePersistenceTest extends AbstractUnitTest {
     }
 
     @Test
-    public void create_succeeds() throws ImageAlreadyExistsException {
+    public void create_succeeds() throws ImageAlreadyExistsException, ImageInvalidException {
         final ImageCreateDto request = ImageCreateDto.builder()
                 .name(IMAGE_1_NAME)
                 .version("11.1.4") // new tag
@@ -51,11 +49,11 @@ public class ImageServicePersistenceTest extends AbstractUnitTest {
                 .dialect(IMAGE_1_DIALECT)
                 .driverClass(IMAGE_1_DRIVER)
                 .defaultPort(IMAGE_1_PORT)
+                .isDefault(false)
                 .build();
-        final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
 
         /* test */
-        imageService.create(request, principal);
+        imageService.create(request, USER_1_PRINCIPAL);
     }
 
     @Test
@@ -67,12 +65,31 @@ public class ImageServicePersistenceTest extends AbstractUnitTest {
                 .driverClass(IMAGE_1_DRIVER)
                 .jdbcMethod(IMAGE_1_JDBC)
                 .dialect(IMAGE_1_DIALECT)
+                .isDefault(IMAGE_1_IS_DEFAULT)
                 .build();
-        final Principal principal = new BasicUserPrincipal(USER_1_USERNAME);
 
         /* test */
         assertThrows(ImageAlreadyExistsException.class, () -> {
-            imageService.create(request, principal);
+            imageService.create(request, USER_1_PRINCIPAL);
+        });
+    }
+
+    @Test
+    public void create_multipleDefaultImages_fails() {
+        final ImageCreateDto request = ImageCreateDto.builder()
+                .name("mariadb")
+                .version("10.5")
+                .registry(IMAGE_1_REGISTRY)
+                .defaultPort(IMAGE_1_PORT)
+                .driverClass(IMAGE_1_DRIVER)
+                .jdbcMethod(IMAGE_1_JDBC)
+                .dialect(IMAGE_1_DIALECT)
+                .isDefault(true) // <<<<
+                .build();
+
+        /* test */
+        assertThrows(ImageInvalidException.class, () -> {
+            imageService.create(request, USER_1_PRINCIPAL);
         });
     }
 

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/TableServicePersistenceTest.java

@@ -71,8 +71,8 @@ public class TableServicePersistenceTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         licenseRepository.save(LICENSE_1);
-        containerRepository.save(CONTAINER_1);
         userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
+        containerRepository.save(CONTAINER_1);
         databaseRepository.saveAll(List.of(DATABASE_1));
     }
 

dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/service/ViewServicePersistenceTest.java

@@ -61,8 +61,8 @@ public class ViewServicePersistenceTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         licenseRepository.save(LICENSE_1);
-        containerRepository.save(CONTAINER_1);
         userRepository.saveAll(List.of(USER_1, USER_2, USER_3));
+        containerRepository.save(CONTAINER_1);
         databaseRepository.save(DATABASE_1);
     }
 

dbrepo-metadata-service/services/src/main/java/at/tuwien/service/ImageService.java

@@ -4,6 +4,7 @@ import at.tuwien.api.container.image.ImageChangeDto;
 import at.tuwien.api.container.image.ImageCreateDto;
 import at.tuwien.entities.container.image.ContainerImage;
 import at.tuwien.exception.ImageAlreadyExistsException;
+import at.tuwien.exception.ImageInvalidException;
 import at.tuwien.exception.ImageNotFoundException;
 
 import java.security.Principal;
@@ -32,8 +33,11 @@ public interface ImageService {
      * @param createDto The new image.
      * @param principal The user principal.
      * @return The container image, if successful.
+     * @throws ImageAlreadyExistsException The image already exists.
+     * @throws ImageInvalidException       The default image cannot be created as a default image already exists.
      */
-    ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException;
+    ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException,
+            ImageInvalidException;
 
     /**
      * Updates a container image with given id in the metadata database.

dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/DatabaseServiceImpl.java

@@ -34,17 +34,14 @@ import java.util.*;
 public class DatabaseServiceImpl implements DatabaseService {
 
     private final MetadataMapper metadataMapper;
-    private final ContainerService containerService;
     private final DatabaseRepository databaseRepository;
     private final DataServiceGateway dataServiceGateway;
     private final SearchServiceGateway searchServiceGateway;
 
     @Autowired
-    public DatabaseServiceImpl(MetadataMapper metadataMapper, ContainerService containerService,
-                               DatabaseRepository databaseRepository, DataServiceGateway dataServiceGateway,
-                               SearchServiceGateway searchServiceGateway) {
+    public DatabaseServiceImpl(MetadataMapper metadataMapper, DatabaseRepository databaseRepository,
+                               DataServiceGateway dataServiceGateway, SearchServiceGateway searchServiceGateway) {
         this.metadataMapper = metadataMapper;
-        this.containerService = containerService;
         this.databaseRepository = databaseRepository;
         this.dataServiceGateway = dataServiceGateway;
         this.searchServiceGateway = searchServiceGateway;

dbrepo-metadata-service/services/src/main/java/at/tuwien/service/impl/ImageServiceImpl.java

@@ -4,6 +4,7 @@ import at.tuwien.api.container.image.ImageChangeDto;
 import at.tuwien.api.container.image.ImageCreateDto;
 import at.tuwien.entities.container.image.ContainerImage;
 import at.tuwien.exception.ImageAlreadyExistsException;
+import at.tuwien.exception.ImageInvalidException;
 import at.tuwien.exception.ImageNotFoundException;
 import at.tuwien.mapper.MetadataMapper;
 import at.tuwien.repository.ImageRepository;
@@ -51,13 +52,17 @@ public class ImageServiceImpl implements ImageService {
 
     @Override
     @Transactional
-    public ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException {
+    public ContainerImage create(ImageCreateDto createDto, Principal principal) throws ImageAlreadyExistsException,
+            ImageInvalidException {
         final ContainerImage image = metadataMapper.createImageDtoToContainerImage(createDto);
         if (imageRepository.findByNameAndVersion(createDto.getName(), createDto.getVersion()).isPresent()) {
-            log.error("Failed to create image {}:{}: exists in the metadata database",
-                    createDto.getName(), createDto.getVersion());
+            log.error("Failed to create image {}:{}: exists in the metadata database", createDto.getName(), createDto.getVersion());
             throw new ImageAlreadyExistsException("Failed to create image " + createDto.getName() + ":" + createDto.getVersion() + ": exists in the metadata database");
         }
+        if (createDto.getIsDefault() && imageRepository.findByIsDefault(true).isPresent()) {
+            log.error("Failed to create image {}:{}: default image exists", createDto.getName(), createDto.getVersion());
+            throw new ImageInvalidException("Failed to create image: default image exists");
+        }
         final ContainerImage dto;
         try {
             dto = imageRepository.save(image);

dbrepo-metadata-service/test/src/main/java/at/tuwien/test/AbstractUnitTest.java

@@ -9,6 +9,8 @@ import java.util.List;
 public abstract class AbstractUnitTest extends BaseTest {
 
     public void genesis() {
+        CONTAINER_1.setDatabases(new LinkedList<>(List.of(DATABASE_1, DATABASE_2, DATABASE_3)));
+        CONTAINER_4.setDatabases(new LinkedList<>(List.of(DATABASE_4)));
         /* USER_1 */
         USER_1.setAccesses(new LinkedList<>());
         /* USER_2 */