Fixed some tests

dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/AccessEndpointUnitTest.java

@@ -14,6 +14,7 @@ import at.tuwien.entities.user.User;
 import at.tuwien.exception.*;
 import at.tuwien.mapper.AccessMapper;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.AccessService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
@@ -47,6 +48,9 @@ public class AccessEndpointUnitTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexInitializer;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private Channel channel;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/ActuatorComponentTest.java

@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
 
 import at.tuwien.BaseUnitTest;
 import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class ActuatorComponentTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Test
     public void actuatorInfo_succeeds() throws Exception {
         this.mockMvc.perform(get("/actuator/info"))

dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/LicenseEndpointUnitTest.java

@@ -6,6 +6,7 @@ import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.endpoints.LicenseEndpoint;
 import at.tuwien.repository.mdb.LicenseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -36,6 +37,9 @@ public class LicenseEndpointUnitTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private LicenseRepository licenseRepository;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/endpoint/SwaggerComponentTest.java

@@ -2,6 +2,7 @@ package at.tuwien.endpoint;
 
 import at.tuwien.BaseUnitTest;
 import at.tuwien.config.IndexConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -32,6 +33,9 @@ public class SwaggerComponentTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Test
     public void swaggerUi_succeeds() throws Exception {
         this.mockMvc.perform(get("/swagger-ui/index.html"))

dbrepo-database-service/rest-service/src/test/java/at/tuwien/gateway/BrokerServiceGatewayTest.java

@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.BrokerVirtualHostCreationException;
 import at.tuwien.exception.BrokerVirtualHostGrantException;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.test.BaseTest;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
@@ -41,6 +42,9 @@ public class BrokerServiceGatewayTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     @Qualifier("brokerRestTemplate")
     private RestTemplate restTemplate;

dbrepo-database-service/rest-service/src/test/java/at/tuwien/mapper/DatabaseMapperTest.java

@@ -5,6 +5,7 @@ import at.tuwien.api.database.DatabaseDto;
 import at.tuwien.api.user.UserBriefDto;
 import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.test.BaseTest;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
@@ -31,6 +32,9 @@ public class DatabaseMapperTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private DatabaseMapper databaseMapper;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceIntegrationTest.java

@@ -11,6 +11,7 @@ import at.tuwien.entities.database.AccessType;
 import at.tuwien.entities.database.DatabaseAccess;
 import at.tuwien.exception.*;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.*;
@@ -47,6 +48,9 @@ public class AccessServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private ImageRepository imageRepository;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/AccessServiceUnitTest.java

@@ -10,6 +10,7 @@ import at.tuwien.entities.database.DatabaseAccess;
 import at.tuwien.exception.AccessDeniedException;
 import at.tuwien.exception.NotAllowedException;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.Test;
@@ -40,6 +41,9 @@ public class AccessServiceUnitTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private DatabaseRepository databaseRepository;
 

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

@@ -10,6 +10,7 @@ import at.tuwien.entities.database.Database;
 import at.tuwien.exception.*;
 import at.tuwien.repository.mdb.ContainerRepository;
 import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.impl.MariaDbServiceImpl;
 import at.tuwien.service.impl.RabbitMqServiceImpl;
 import com.rabbitmq.client.Channel;
@@ -41,6 +42,9 @@ public class DatabaseServiceUnitTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private RabbitMqServiceImpl rabbitMqService;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java

@@ -5,6 +5,7 @@ import at.tuwien.config.IndexConfig;
 import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.identifier.Identifier;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +36,9 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private RealmRepository realmRepository;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/LicenseServiceIntegrationTest.java

@@ -6,6 +6,7 @@ import at.tuwien.config.ReadyConfig;
 import at.tuwien.entities.database.License;
 import at.tuwien.exception.LicenseNotFoundException;
 import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -35,6 +36,9 @@ public class LicenseServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private LicenseRepository licenseRepository;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceIntegrationTest.java

@@ -9,6 +9,7 @@ import at.tuwien.exception.BrokerVirtualHostCreationException;
 import at.tuwien.exception.BrokerVirtualHostGrantException;
 import at.tuwien.gateway.BrokerServiceGateway;
 import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.impl.RabbitMqServiceImpl;
 import at.tuwien.utils.AmqpUtils;
 import com.rabbitmq.client.Channel;
@@ -38,6 +39,9 @@ public class MessageQueueServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private DatabaseRepository databaseRepository;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/MessageQueueServiceUnitTest.java

@@ -6,6 +6,7 @@ import at.tuwien.config.ReadyConfig;
 import at.tuwien.exception.AmqpException;
 import at.tuwien.gateway.BrokerServiceGateway;
 import at.tuwien.repository.mdb.DatabaseRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import at.tuwien.service.impl.RabbitMqServiceImpl;
 import com.rabbitmq.client.BuiltinExchangeType;
 import com.rabbitmq.client.Channel;
@@ -33,6 +34,9 @@ public class MessageQueueServiceUnitTest extends BaseUnitTest {
     @MockBean
     private IndexConfig indexConfig;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @MockBean
     private DatabaseRepository databaseRepository;
 

dbrepo-database-service/rest-service/src/test/java/at/tuwien/service/UserServiceIntegrationTest.java

@@ -7,6 +7,7 @@ import at.tuwien.entities.user.User;
 import at.tuwien.exception.UserNotFoundException;
 import at.tuwien.repository.mdb.RealmRepository;
 import at.tuwien.repository.mdb.UserRepository;
+import at.tuwien.repository.sdb.DatabaseIdxRepository;
 import com.rabbitmq.client.Channel;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -36,6 +37,9 @@ public class UserServiceIntegrationTest extends BaseUnitTest {
     @MockBean
     private Channel channel;
 
+    @MockBean
+    private DatabaseIdxRepository databaseIdxRepository;
+
     @Autowired
     private RealmRepository realmRepository;
 

dbrepo-identifier-service/pom.xml

@@ -227,6 +227,7 @@
                         <exclude>at/tuwien/exception/**/*</exclude>
                         <exclude>at/tuwien/utils/**/*</exclude>
                         <exclude>at/tuwien/handlers/**/*</exclude>
+                        <exclude>at/tuwien/auth/**/*</exclude>
                         <exclude>**/DbrepoIdentifierServiceApplication.class</exclude>
                     </excludes>
                 </configuration>

dbrepo-identifier-service/rest-service/src/test/java/at/tuwien/service/DatabaseServiceIntegrationTest.java

+package at.tuwien.service;
+
+import at.tuwien.BaseUnitTest;
+import at.tuwien.config.IndexConfig;
+import at.tuwien.entities.database.Database;
+import at.tuwien.entities.user.User;
+import at.tuwien.exception.DatabaseNotFoundException;
+import at.tuwien.exception.UserNotFoundException;
+import at.tuwien.repository.mdb.*;
+import at.tuwien.repository.sdb.IdentifierIdxRepository;
+import at.tuwien.service.UserService;
+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;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.when;
+
+@ExtendWith(SpringExtension.class)
+@SpringBootTest
+public class DatabaseServiceIntegrationTest extends BaseUnitTest {
+
+    @MockBean
+    private IndexConfig indexConfig;
+
+    @MockBean
+    private IdentifierIdxRepository identifierIdxRepository;
+
+    @Autowired
+    private DatabaseService databaseService;
+
+    @Autowired
+    private UserRepository userRepository;
+
+    @Autowired
+    private RealmRepository realmRepository;
+
+    @Autowired
+    private ContainerRepository containerRepository;
+
+    @Autowired
+    private DatabaseRepository databaseRepository;
+
+    @Autowired
+    private ImageRepository imageRepository;
+
+    @BeforeEach
+    public void beforeEach() {
+        userRepository.save(USER_1);
+        realmRepository.save(REALM_DBREPO);
+        imageRepository.save(IMAGE_1);
+        containerRepository.save(CONTAINER_1);
+        databaseRepository.save(DATABASE_1);
+    }
+
+    @Test
+    public void find_succeeds() throws DatabaseNotFoundException {
+
+        /* test */
+        final Database response = databaseService.find(DATABASE_1_ID);
+        assertEquals(DATABASE_1_ID, response.getId());
+    }
+
+    @Test
+    public void find_fails() {
+
+        /* test */
+        assertThrows(DatabaseNotFoundException.class, () -> {
+            databaseService.find(9999L);
+        });
+    }
+
+
+}