dbrepo-data-service/rest-service/src/test/java/at/tuwien/gateway/MetadataServiceGatewayUnitTest.java

@@ -51,23 +51,14 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
     @Test
     public void getTableById_succeeds() throws TableNotFoundException, RemoteUnavailableException,
             MetadataServiceException {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
-        headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
 
         /* mock */
         when(internalRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto.class)))
                 .thenReturn(ResponseEntity.status(HttpStatus.OK)
-                        .headers(headers)
-                        .body(TABLE_1_PRIVILEGED_DTO));
+                        .body(TABLE_1_DTO));
 
         /* test */
         final TableDto response = metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID);
-        assertEquals(IMAGE_1_JDBC, response.getDatabase().getContainer().getImage().getJdbcMethod());
-        assertEquals(CONTAINER_1_HOST, response.getDatabase().getContainer().getHost());
-        assertEquals(CONTAINER_1_PORT, response.getDatabase().getContainer().getPort());
-        assertEquals(CONTAINER_1_PRIVILEGED_USERNAME, response.getDatabase().getContainer().getUsername());
-        assertEquals(CONTAINER_1_PRIVILEGED_PASSWORD, response.getDatabase().getContainer().getPassword());
         assertEquals(TABLE_1_INTERNAL_NAME, response.getInternalName());
     }
 
@@ -105,7 +96,7 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
         /* mock */
         when(internalRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto.class)))
                 .thenReturn(ResponseEntity.status(HttpStatus.NO_CONTENT)
-                        .body(TABLE_1_PRIVILEGED_DTO));
+                        .body(TABLE_1_DTO));
 
         /* test */
         assertThrows(MetadataServiceException.class, () -> {
@@ -113,27 +104,6 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
         });
     }
 
-    @Test
-    public void getTableById_headerMissing_fails() {
-        final List<String> customHeaders = List.of("X-Username", "X-Password");
-
-        for (int i = 0; i < customHeaders.size(); i++) {
-            final HttpHeaders headers = new HttpHeaders();
-            for (int j = 0; j < i; j++) {
-                headers.add(customHeaders.get(j), "");
-            }
-            /* mock */
-            when(internalRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(TableDto.class)))
-                    .thenReturn(ResponseEntity.status(HttpStatus.OK)
-                            .headers(headers)
-                            .body(TABLE_1_PRIVILEGED_DTO));
-            /* test */
-            assertThrows(MetadataServiceException.class, () -> {
-                metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID);
-            });
-        }
-    }
-
     @Test
     public void getTableById_emptyBody_fails() {
         final HttpHeaders headers = new HttpHeaders();
@@ -156,8 +126,12 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
     public void getDatabaseById_succeeds() throws RemoteUnavailableException, MetadataServiceException,
             DatabaseNotFoundException {
         final HttpHeaders headers = new HttpHeaders();
+        headers.set("X-Host", CONTAINER_1_HOST);
+        headers.set("X-Port", "" + CONTAINER_1_PORT);
         headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
         headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
+        headers.set("X-Jdbc-Method", IMAGE_1_JDBC);
+        headers.set("Access-Control-Expose-Headers", "X-Username X-Password X-Jdbc-Method X-Host X-Port");
 
         /* mock */
         when(internalRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(DatabaseDto.class)))
@@ -254,8 +228,12 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
     @Test
     public void getContainerById_succeeds() throws RemoteUnavailableException, ContainerNotFoundException, MetadataServiceException {
         final HttpHeaders headers = new HttpHeaders();
+        headers.set("X-Host", CONTAINER_1_HOST);
+        headers.set("X-Port", "" + CONTAINER_1_PORT);
         headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
         headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
+        headers.set("X-Jdbc-Method", IMAGE_1_JDBC);
+        headers.set("Access-Control-Expose-Headers", "X-Username X-Password X-Jdbc-Method X-Host X-Port");
 
         /* mock */
         when(internalRestTemplate.exchange(anyString(), eq(HttpMethod.GET), eq(HttpEntity.EMPTY), eq(ContainerDto.class)))
@@ -351,15 +329,11 @@ public class MetadataServiceGatewayUnitTest extends AbstractUnitTest {
 
     @Test
     public void getViewById_succeeds() throws RemoteUnavailableException, ViewNotFoundException, MetadataServiceException {
-        final HttpHeaders headers = new HttpHeaders();
-        headers.set("X-Username", CONTAINER_1_PRIVILEGED_USERNAME);
-        headers.set("X-Password", CONTAINER_1_PRIVILEGED_PASSWORD);
 
         /* mock */
         when(internalRestTemplate.exchange(anyString(), eq(HttpMethod.GET), any(HttpEntity.class), eq(ViewDto.class)))
                 .thenReturn(ResponseEntity.ok()
-                        .headers(headers)
-                        .body(VIEW_1_PRIVILEGED_DTO));
+                        .body(VIEW_1_DTO));
 
         /* test */
         final ViewDto response = metadataServiceGateway.getViewById(CONTAINER_1_ID, VIEW_1_ID);

dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerIntegrationTest.java

@@ -2,10 +2,11 @@ package at.tuwien.listener;
 
 import at.tuwien.config.MariaDbConfig;
 import at.tuwien.config.MariaDbContainerConfig;
+import at.tuwien.exception.DatabaseNotFoundException;
 import at.tuwien.exception.MetadataServiceException;
 import at.tuwien.exception.RemoteUnavailableException;
 import at.tuwien.exception.TableNotFoundException;
-import at.tuwien.service.CredentialService;
+import at.tuwien.service.CacheService;
 import at.tuwien.test.AbstractUnitTest;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -42,7 +43,7 @@ import static org.mockito.Mockito.when;
 public class DefaultListenerIntegrationTest extends AbstractUnitTest {
 
     @MockBean
-    private CredentialService credentialService;
+    private CacheService credentialService;
 
     @Autowired
     private DefaultListener defaultListener;
@@ -58,17 +59,19 @@ public class DefaultListenerIntegrationTest extends AbstractUnitTest {
         genesis();
         /* database */
         MariaDbConfig.dropAllDatabases(CONTAINER_1_PRIVILEGED_DTO);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
     }
 
     @Test
     public void onMessage_succeeds(CapturedOutput output) throws TableNotFoundException, RemoteUnavailableException,
-            MetadataServiceException {
+            MetadataServiceException, DatabaseNotFoundException {
         final Message request = buildMessage("dbrepo." + DATABASE_1_ID + "." + TABLE_1_ID, "{\"id\":4,\"date\":\"2023-10-03\",\"mintemp\":15.0,\"rainfall\":0.2}", new HashMap<>());
 
         /* mock */
         when(credentialService.getTable(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_1_PRIVILEGED_DTO);
+                .thenReturn(TABLE_1_DTO);
+        when(credentialService.getDatabase(DATABASE_1_ID))
+                .thenReturn(DATABASE_1_PRIVILEGED_DTO);
 
         /* test */
         defaultListener.onMessage(request);

dbrepo-data-service/rest-service/src/test/java/at/tuwien/listener/DefaultListenerUnitTest.java

@@ -2,10 +2,11 @@ package at.tuwien.listener;
 
 import at.tuwien.config.MariaDbConfig;
 import at.tuwien.config.MariaDbContainerConfig;
+import at.tuwien.exception.DatabaseNotFoundException;
 import at.tuwien.exception.MetadataServiceException;
 import at.tuwien.exception.RemoteUnavailableException;
 import at.tuwien.exception.TableNotFoundException;
-import at.tuwien.service.CredentialService;
+import at.tuwien.service.CacheService;
 import at.tuwien.test.AbstractUnitTest;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -38,7 +39,7 @@ import static org.mockito.Mockito.when;
 public class DefaultListenerUnitTest extends AbstractUnitTest {
 
     @MockBean
-    private CredentialService credentialService;
+    private CacheService credentialService;
 
     @Autowired
     private DefaultListener defaultListener;
@@ -54,7 +55,7 @@ public class DefaultListenerUnitTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         MariaDbConfig.dropAllDatabases(CONTAINER_1_PRIVILEGED_DTO);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
     }
 
     @Test
@@ -77,12 +78,14 @@ public class DefaultListenerUnitTest extends AbstractUnitTest {
 
     @Test
     public void onMessage_messageMalformed_fails(CapturedOutput output) throws TableNotFoundException,
-            RemoteUnavailableException, MetadataServiceException {
-        final Message request = buildMessage("dbrepo.1.1", "{,}", new HashMap<>());
+            RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException {
+        final Message request = buildMessage(TABLE_1_ROUTING_KEY, "{,}", new HashMap<>());
 
         /* mock */
         when(credentialService.getTable(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_1_PRIVILEGED_DTO);
+                .thenReturn(TABLE_1_DTO);
+        when(credentialService.getDatabase(DATABASE_1_ID))
+                .thenReturn(DATABASE_1_PRIVILEGED_DTO);
 
         /* test */
         defaultListener.onMessage(request);
@@ -92,7 +95,7 @@ public class DefaultListenerUnitTest extends AbstractUnitTest {
     @Test
     public void onMessage_tableNotFound_fails(CapturedOutput output) throws TableNotFoundException,
             RemoteUnavailableException, MetadataServiceException {
-        final Message request = buildMessage("dbrepo.1.1", "{\"id\":1}", new HashMap<>());
+        final Message request = buildMessage(TABLE_1_ROUTING_KEY, "{\"id\": 1}", new HashMap<>());
 
         /* mock */
         doThrow(TableNotFoundException.class)

dbrepo-data-service/rest-service/src/test/java/at/tuwien/mvc/PrometheusEndpointMvcTest.java

@@ -2,22 +2,20 @@ package at.tuwien.mvc;
 
 import at.tuwien.api.database.query.ExecuteStatementDto;
 import at.tuwien.api.database.query.ImportDto;
+import at.tuwien.api.database.query.QueryDto;
 import at.tuwien.api.database.query.QueryPersistDto;
 import at.tuwien.api.database.table.TupleDeleteDto;
 import at.tuwien.api.database.table.TupleDto;
 import at.tuwien.api.database.table.TupleUpdateDto;
 import at.tuwien.config.MetricsConfig;
-import at.tuwien.endpoints.*;
+import at.tuwien.endpoints.SubsetEndpoint;
+import at.tuwien.endpoints.TableEndpoint;
+import at.tuwien.endpoints.ViewEndpoint;
 import at.tuwien.listener.DefaultListener;
 import at.tuwien.test.AbstractUnitTest;
-import io.micrometer.observation.annotation.Observed;
 import io.micrometer.observation.tck.TestObservationRegistry;
-import io.swagger.v3.oas.annotations.Operation;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.extern.log4j.Log4j2;
-import org.apache.commons.io.FileUtils;
-import org.junit.jupiter.api.AfterAll;
-import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -31,14 +29,11 @@ import org.springframework.security.test.context.support.WithMockUser;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
 import org.springframework.test.web.servlet.MockMvc;
 
-import java.io.File;
-import java.io.IOException;
-import java.lang.reflect.Method;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
 
 import static at.tuwien.utils.RabbitMqUtils.buildMessage;
 import static io.micrometer.observation.tck.TestObservationRegistryAssert.assertThat;
-import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
 import static org.springframework.test.web.servlet.result.MockMvcResultHandlers.print;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -63,12 +58,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
     @Autowired
     private HttpServletRequest httpServletRequest;
 
-    @Autowired
-    private AccessEndpoint accessEndpoint; /* no metrics */
-
-    @Autowired
-    private DatabaseEndpoint databaseEndpoint; /* no metrics */
-
     @Autowired
     private SubsetEndpoint subsetEndpoint;
 
@@ -78,8 +67,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
     @Autowired
     private ViewEndpoint viewEndpoint;
 
-    private static final Map<String, String> metrics = new TreeMap<>(); /* sorted */
-
     @TestConfiguration
     static class ObservationTestConfiguration {
 
@@ -89,16 +76,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
         }
     }
 
-    @BeforeAll
-    public static void beforeAll() {
-        FileUtils.deleteQuietly(new File("../metrics.txt"));
-    }
-
-    @AfterAll
-    public static void afterAll() throws IOException {
-        saveObservedMetrics(metrics);
-    }
-
     @Test
     public void prometheus_succeeds() throws Exception {
 
@@ -121,7 +98,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
         /* test */
         assertThat(registry)
                 .hasObservationWithNameEqualTo("dbrepo_message_receive");
-        generic_openApiDocs(DefaultListener.class);
     }
 
     @Test
@@ -135,7 +111,7 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
             /* ignore */
         }
         try {
-            subsetEndpoint.create(DATABASE_1_ID, ExecuteStatementDto.builder().statement(QUERY_5_STATEMENT).build(), USER_1_PRINCIPAL, httpServletRequest, null, 0L, 10L);
+            subsetEndpoint.create(DATABASE_1_ID, QUERY_1_SUBSET_DTO, USER_1_PRINCIPAL, httpServletRequest, null, 0L, 10L);
         } catch (Exception e) {
             /* ignore */
         }
@@ -161,7 +137,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
             assertThat(registry)
                     .hasObservationWithNameEqualTo(metric);
         }
-        generic_openApiDocs(SubsetEndpoint.class);
     }
 
     @Test
@@ -212,7 +187,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
             assertThat(registry)
                     .hasObservationWithNameEqualTo(metric);
         }
-        generic_openApiDocs(TableEndpoint.class);
     }
 
     @Test
@@ -229,21 +203,6 @@ public class PrometheusEndpointMvcTest extends AbstractUnitTest {
         /* test */
         assertThat(registry)
                 .hasObservationWithNameEqualTo("dbrepo_view_data");
-        generic_openApiDocs(ViewEndpoint.class);
-    }
-
-    private static void generic_openApiDocs(Class<?> endpoint) {
-        final List<Method> methods = Arrays.stream(endpoint.getMethods())
-                .filter(m -> m.getDeclaringClass().equals(endpoint))
-                .toList();
-        methods.forEach(m -> {
-            final Observed observed = m.getDeclaredAnnotation(Observed.class);
-            final Operation operation = m.getDeclaredAnnotation(Operation.class);
-            if (observed != null) {
-                assertNotNull(operation);
-                metrics.put(observed.name(), operation.summary());
-            }
-        });
     }
 
 }

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

@@ -45,7 +45,7 @@ public class AccessServiceIntegrationTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
     }
 
     @Test

dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ContainerServiceIntegrationTest.java

@@ -79,7 +79,7 @@ public class ContainerServiceIntegrationTest extends AbstractUnitTest {
     }
 
     @Test
-    public void createQueryStore_succeeds() throws SQLException, QueryStoreCreateException, InterruptedException {
+    public void createQueryStore_succeeds() throws SQLException, QueryStoreCreateException {
 
         /* test */
         createQueryStore_generic(DATABASE_1_INTERNALNAME);

dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/CredentialServiceUnitTest.java

@@ -8,7 +8,7 @@ import at.tuwien.api.database.table.TableDto;
 import at.tuwien.api.user.UserDto;
 import at.tuwien.exception.*;
 import at.tuwien.gateway.MetadataServiceGateway;
-import at.tuwien.service.impl.CredentialServiceImpl;
+import at.tuwien.service.impl.CacheServiceImpl;
 import at.tuwien.test.AbstractUnitTest;
 import lombok.extern.log4j.Log4j2;
 import org.junit.jupiter.api.BeforeEach;
@@ -30,7 +30,7 @@ import static org.mockito.Mockito.when;
 public class CredentialServiceUnitTest extends AbstractUnitTest {
 
     @Autowired
-    private CredentialServiceImpl credentialService;
+    private CacheServiceImpl credentialService;
 
     @MockBean
     private MetadataServiceGateway metadataServiceGateway;
@@ -48,7 +48,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
-                .thenReturn(DATABASE_1_PRIVILEGED_DTO);
+                .thenReturn(DATABASE_1_DTO);
 
         /* test */
         final DatabaseDto response = credentialService.getDatabase(DATABASE_1_ID);
@@ -62,7 +62,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
-                .thenReturn(DATABASE_1_PRIVILEGED_DTO)
+                .thenReturn(DATABASE_1_DTO)
                 .thenThrow(RuntimeException.class) /* should never be thrown */;
         credentialService.getDatabase(DATABASE_1_ID);
 
@@ -78,8 +78,8 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
-                .thenReturn(DATABASE_2_PRIVILEGED_DTO) /* needs to be different id for test case */
-                .thenReturn(DATABASE_1_PRIVILEGED_DTO);
+                .thenReturn(DATABASE_2_DTO) /* needs to be different id for test case */
+                .thenReturn(DATABASE_1_DTO);
 
         /* pre-condition */
         final DatabaseDto tmp = credentialService.getDatabase(DATABASE_1_ID);
@@ -98,7 +98,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
-                .thenReturn(CONTAINER_1_PRIVILEGED_DTO);
+                .thenReturn(CONTAINER_1_DTO);
 
         /* test */
         final ContainerDto response = credentialService.getContainer(CONTAINER_1_ID);
@@ -127,9 +127,9 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
             InterruptedException, ContainerNotFoundException {
 
         /* mock */
-        when(metadataServiceGateway.getContainerById(DATABASE_1_ID))
-                .thenReturn(CONTAINER_2_PRIVILEGED_DTO) /* needs to be different id for test case */
-                .thenReturn(CONTAINER_1_PRIVILEGED_DTO);
+        when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
+                .thenReturn(CONTAINER_2_DTO) /* needs to be different id for test case */
+                .thenReturn(CONTAINER_1_DTO);
 
         /* pre-condition */
         final ContainerDto tmp = credentialService.getContainer(CONTAINER_1_ID);
@@ -251,7 +251,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_1_PRIVILEGED_DTO);
+                .thenReturn(TABLE_1_DTO);
 
         /* test */
         final TableDto response = credentialService.getTable(DATABASE_1_ID, TABLE_1_ID);
@@ -265,7 +265,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_1_PRIVILEGED_DTO)
+                .thenReturn(TABLE_1_DTO)
                 .thenThrow(RuntimeException.class) /* should never be thrown */;
         credentialService.getTable(DATABASE_1_ID, TABLE_1_ID);
 
@@ -281,8 +281,8 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_2_PRIVILEGED_DTO) /* needs to be different id for test case */
-                .thenReturn(TABLE_1_PRIVILEGED_DTO);
+                .thenReturn(TABLE_2_DTO) /* needs to be different id for test case */
+                .thenReturn(TABLE_1_DTO);
 
         /* pre-condition */
         final TableDto tmp = credentialService.getTable(DATABASE_1_ID, TABLE_1_ID);
@@ -301,7 +301,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getViewById(DATABASE_1_ID, VIEW_1_ID))
-                .thenReturn(VIEW_1_PRIVILEGED_DTO);
+                .thenReturn(VIEW_1_DTO);
 
         /* test */
         final ViewDto response = credentialService.getView(DATABASE_1_ID, VIEW_1_ID);
@@ -314,7 +314,7 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getViewById(DATABASE_1_ID, VIEW_1_ID))
-                .thenReturn(VIEW_1_PRIVILEGED_DTO)
+                .thenReturn(VIEW_1_DTO)
                 .thenThrow(RuntimeException.class) /* should never be thrown */;
         credentialService.getView(DATABASE_1_ID, VIEW_1_ID);
 
@@ -330,8 +330,8 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
 
         /* mock */
         when(metadataServiceGateway.getViewById(DATABASE_1_ID, VIEW_1_ID))
-                .thenReturn(VIEW_2_PRIVILEGED_DTO) /* needs to be different id for test case */
-                .thenReturn(VIEW_1_PRIVILEGED_DTO);
+                .thenReturn(VIEW_2_DTO) /* needs to be different id for test case */
+                .thenReturn(VIEW_1_DTO);
 
         /* pre-condition */
         final ViewDto tmp = credentialService.getView(DATABASE_1_ID, VIEW_1_ID);
@@ -344,26 +344,4 @@ public class CredentialServiceUnitTest extends AbstractUnitTest {
         assertEquals(VIEW_1_ID, response.getId());
     }
 
-    @Test
-    public void invalidateAccess_succeeds() throws NotAllowedException, RemoteUnavailableException,
-            MetadataServiceException {
-
-        /* mock */
-        when(metadataServiceGateway.getAccess(DATABASE_1_ID, USER_1_ID))
-                .thenReturn(DATABASE_1_USER_1_READ_ACCESS_DTO)
-                .thenThrow(RuntimeException.class);
-
-        /* pre-condition */
-        final DatabaseAccessDto response = credentialService.getAccess(DATABASE_1_ID, USER_1_ID);
-        assertNotNull(response);
-
-        /* test */
-        credentialService.invalidateAccess(DATABASE_1_ID);
-
-        /* post-condition */
-        assertThrows(RuntimeException.class, () -> {
-            credentialService.getAccess(DATABASE_1_ID, USER_1_ID);
-        });
-    }
-
 }

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

@@ -4,9 +4,7 @@ import at.tuwien.api.database.ViewColumnDto;
 import at.tuwien.api.database.ViewDto;
 import at.tuwien.api.database.table.TableBriefDto;
 import at.tuwien.api.database.table.TableDto;
-import at.tuwien.api.database.table.columns.ColumnDto;
-import at.tuwien.api.database.table.columns.ColumnTypeDto;
-import at.tuwien.api.database.table.columns.CreateTableColumnDto;
+import at.tuwien.api.database.table.columns.*;
 import at.tuwien.api.database.table.constraints.ConstraintsDto;
 import at.tuwien.api.database.table.constraints.CreateTableConstraintsDto;
 import at.tuwien.api.database.table.constraints.foreign.CreateForeignKeyDto;
@@ -39,6 +37,7 @@ import java.sql.SQLException;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Set;
+import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
 
@@ -64,9 +63,9 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_2_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_2_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_2_PRIVILEGED_DTO);
         Thread.sleep(1000) /* wait for test container some more */;
     }
 
@@ -74,7 +73,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
     public void createView_succeeds() throws SQLException, ViewMalformedException {
 
         /* test */
-        databaseService.createView(DATABASE_1_PRIVILEGED_DTO, VIEW_1_CREATE_DTO);
+        databaseService.createView(DATABASE_1_PRIVILEGED_DTO, VIEW_1_NAME, VIEW_1_QUERY);
     }
 
     @Test
@@ -85,7 +84,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final ViewDto view0 = response.get(0);
         assertEquals("not_in_metadata_db2", view0.getName());
         assertEquals("not_in_metadata_db2", view0.getInternalName());
-        assertEquals(DATABASE_1_ID, view0.getVdbid());
+        assertEquals(DATABASE_1_ID, view0.getDatabaseId());
         assertEquals(USER_1_BRIEF_DTO, view0.getOwner());
         assertFalse(view0.getIsInitialView());
         assertEquals(DATABASE_1_PUBLIC, view0.getIsPublic());
@@ -150,7 +149,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto response = databaseService.inspectTable(DATABASE_1_PRIVILEGED_DTO, "not_in_metadata_db");
         assertEquals("not_in_metadata_db", response.getInternalName());
         assertEquals("not_in_metadata_db", response.getName());
-        assertEquals(DATABASE_1_ID, response.getTdbid());
+        assertEquals(DATABASE_1_ID, response.getDatabaseId());
         assertTrue(response.getIsVersioned());
         assertEquals(DATABASE_1_PUBLIC, response.getIsPublic());
         final List<ColumnDto> columns = response.getColumns();
@@ -186,7 +185,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto response = databaseService.inspectTable(DATABASE_2_PRIVILEGED_DTO, "experiments");
         assertEquals("experiments", response.getInternalName());
         assertEquals("experiments", response.getName());
-        assertEquals(DATABASE_2_ID, response.getTdbid());
+        assertEquals(DATABASE_2_ID, response.getDatabaseId());
         assertTrue(response.getIsVersioned());
         assertEquals(DATABASE_2_PUBLIC, response.getIsPublic());
         assertNotNull(response.getOwner());
@@ -205,10 +204,10 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         assertColumn(columns.get(0), null, null, DATABASE_2_ID, "id", "id", ColumnTypeDto.BIGINT, 19L, 0L, false, null);
         assertColumn(columns.get(1), null, null, DATABASE_2_ID, "mode", "mode", ColumnTypeDto.ENUM, 3L, null, false, null);
         assertEquals(2, columns.get(1).getEnums().size());
-        assertEquals(List.of("ABC", "DEF"), columns.get(1).getEnums());
+        assertEquals(List.of("ABC", "DEF"), columns.get(1).getEnums().stream().map(EnumDto::getValue).toList());
         assertColumn(columns.get(2), null, null, DATABASE_2_ID, "seq", "seq", ColumnTypeDto.SET, 5L, null, true, null);
         assertEquals(3, columns.get(2).getSets().size());
-        assertEquals(List.of("1", "2", "3"), columns.get(2).getSets());
+        assertEquals(List.of("1", "2", "3"), columns.get(2).getSets().stream().map(SetDto::getValue).toList());
         /* ignore rest (constraints) */
     }
 
@@ -219,7 +218,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto response = databaseService.inspectTable(DATABASE_1_PRIVILEGED_DTO, "weather_aus");
         assertEquals("weather_aus", response.getInternalName());
         assertEquals("weather_aus", response.getName());
-        assertEquals(DATABASE_1_ID, response.getTdbid());
+        assertEquals(DATABASE_1_ID, response.getDatabaseId());
         assertTrue(response.getIsVersioned());
         assertEquals(DATABASE_1_PUBLIC, response.getIsPublic());
         assertNotNull(response.getOwner());
@@ -439,7 +438,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final ViewDto response = databaseService.inspectView(DATABASE_1_PRIVILEGED_DTO, "not_in_metadata_db2");
         assertEquals("not_in_metadata_db2", response.getInternalName());
         assertEquals("not_in_metadata_db2", response.getName());
-        assertEquals(DATABASE_1_ID, response.getVdbid());
+        assertEquals(DATABASE_1_ID, response.getDatabaseId());
         assertEquals(USER_1_BRIEF_DTO, response.getOwner());
         assertFalse(response.getIsInitialView());
         assertEquals(DATABASE_1_PUBLIC, response.getIsPublic());
@@ -473,7 +472,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto table0 = response.get(0);
         Assertions.assertEquals("complex_foreign_keys", table0.getInternalName());
         Assertions.assertEquals("complex_foreign_keys", table0.getName());
-        Assertions.assertEquals(DATABASE_1_ID, table0.getTdbid());
+        Assertions.assertEquals(DATABASE_1_ID, table0.getDatabaseId());
         assertTrue(table0.getIsVersioned());
         Assertions.assertEquals(DATABASE_1_PUBLIC, table0.getIsPublic());
         final List<ColumnDto> columns0 = table0.getColumns();
@@ -520,7 +519,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto table1 = response.get(1);
         Assertions.assertEquals("complex_primary_key", table1.getInternalName());
         Assertions.assertEquals("complex_primary_key", table1.getName());
-        Assertions.assertEquals(DATABASE_1_ID, table1.getTdbid());
+        Assertions.assertEquals(DATABASE_1_ID, table1.getDatabaseId());
         assertTrue(table1.getIsVersioned());
         Assertions.assertEquals(DATABASE_1_PUBLIC, table1.getIsPublic());
         final List<ColumnDto> columns1 = table1.getColumns();
@@ -548,7 +547,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto table2 = response.get(2);
         Assertions.assertEquals("exotic_boolean", table2.getInternalName());
         Assertions.assertEquals("exotic_boolean", table2.getName());
-        Assertions.assertEquals(DATABASE_1_ID, table2.getTdbid());
+        Assertions.assertEquals(DATABASE_1_ID, table2.getDatabaseId());
         assertTrue(table2.getIsVersioned());
         Assertions.assertEquals(DATABASE_1_PUBLIC, table2.getIsPublic());
         final List<ColumnDto> columns2 = table2.getColumns();
@@ -569,7 +568,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         final TableDto table3 = response.get(3);
         Assertions.assertEquals("not_in_metadata_db", table3.getInternalName());
         Assertions.assertEquals("not_in_metadata_db", table3.getName());
-        Assertions.assertEquals(DATABASE_1_ID, table3.getTdbid());
+        Assertions.assertEquals(DATABASE_1_ID, table3.getDatabaseId());
         assertTrue(table3.getIsVersioned());
         Assertions.assertEquals(DATABASE_1_PUBLIC, table3.getIsPublic());
         final List<ColumnDto> columns3 = table3.getColumns();
@@ -709,21 +708,7 @@ public class DatabaseServiceIntegrationTest extends AbstractUnitTest {
         assertEquals(TABLE_1_COLUMNS.size(), response.getColumns().size());
     }
 
-    protected static void assertViewColumn(ViewColumnDto column, ViewColumnDto other) {
-        assertNotNull(column);
-        assertNotNull(other);
-        assertEquals(column.getId(), other.getId());
-        assertEquals(column.getDatabaseId(), other.getDatabaseId());
-        assertEquals(column.getName(), other.getName());
-        assertEquals(column.getInternalName(), other.getInternalName());
-        assertEquals(column.getColumnType(), other.getColumnType());
-        assertEquals(column.getSize(), other.getSize());
-        assertEquals(column.getD(), other.getD());
-        assertEquals(column.getIsNullAllowed(), other.getIsNullAllowed());
-        assertEquals(column.getDescription(), other.getDescription());
-    }
-
-    protected static void assertColumn(ColumnDto column, Long id, Long tableId, Long databaseId, String name,
+    protected static void assertColumn(ColumnDto column, UUID id, UUID tableId, UUID databaseId, String name,
                                        String internalName, ColumnTypeDto type, Long size, Long d, Boolean nullAllowed,
                                        String description) {
         log.trace("assert column: {}", internalName);

dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/QueueServiceIntegrationTest.java

@@ -2,7 +2,7 @@ package at.tuwien.service;
 
 import at.tuwien.config.MariaDbConfig;
 import at.tuwien.config.MariaDbContainerConfig;
-import at.tuwien.exception.ContainerNotFoundException;
+import at.tuwien.exception.DatabaseNotFoundException;
 import at.tuwien.exception.MetadataServiceException;
 import at.tuwien.exception.RemoteUnavailableException;
 import at.tuwien.exception.TableNotFoundException;
@@ -53,12 +53,12 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
     }
 
     @Test
-    public void insert_succeeds() throws SQLException, RemoteUnavailableException, ContainerNotFoundException,
-            TableNotFoundException, MetadataServiceException {
+    public void insert_succeeds() throws SQLException, RemoteUnavailableException, TableNotFoundException,
+            MetadataServiceException, DatabaseNotFoundException {
         final Map<String, Object> request = new HashMap<>() {{
             put("id", 4L);
             put("date", "2023-10-03");
@@ -68,29 +68,31 @@ public class QueueServiceIntegrationTest extends AbstractUnitTest {
         }};
 
         /* mock */
-        when(metadataServiceGateway.getContainerById(CONTAINER_1_ID))
-                .thenReturn(CONTAINER_1_PRIVILEGED_DTO);
+        when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
+                .thenReturn(DATABASE_1_PRIVILEGED_DTO);
         when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_1_PRIVILEGED_DTO);
+                .thenReturn(TABLE_1_DTO);
 
         /* test */
-        queueService.insert(TABLE_1_PRIVILEGED_DTO, request);
+        queueService.insert(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
     }
 
     @Test
     public void insert_onlyMandatoryFields_succeeds() throws SQLException, RemoteUnavailableException,
-            TableNotFoundException, MetadataServiceException {
+            TableNotFoundException, MetadataServiceException, DatabaseNotFoundException {
         final Map<String, Object> request = new HashMap<>() {{
             put("id", 5L);
             put("date", "2023-10-04");
         }};
 
         /* mock */
+        when(metadataServiceGateway.getDatabaseById(DATABASE_1_ID))
+                .thenReturn(DATABASE_1_PRIVILEGED_DTO);
         when(metadataServiceGateway.getTableById(DATABASE_1_ID, TABLE_1_ID))
-                .thenReturn(TABLE_1_PRIVILEGED_DTO);
+                .thenReturn(TABLE_1_DTO);
 
         /* test */
-        queueService.insert(TABLE_1_PRIVILEGED_DTO, request);
+        queueService.insert(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
     }
 
 }

dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/SubsetServiceIntegrationTest.java

 package at.tuwien.service;
 
-import at.tuwien.api.database.query.QueryDto;
+import at.tuwien.api.database.query.*;
 import at.tuwien.api.identifier.IdentifierBriefDto;
 import at.tuwien.config.MariaDbConfig;
 import at.tuwien.config.MariaDbContainerConfig;
@@ -8,9 +8,14 @@ import at.tuwien.exception.*;
 import at.tuwien.gateway.MetadataServiceGateway;
 import at.tuwien.test.AbstractUnitTest;
 import lombok.extern.log4j.Log4j2;
+import org.apache.spark.sql.Dataset;
+import org.apache.spark.sql.Row;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.Arguments;
+import org.junit.jupiter.params.provider.MethodSource;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.boot.test.mock.mockito.MockBean;
@@ -20,7 +25,12 @@ import org.testcontainers.junit.jupiter.Container;
 import org.testcontainers.junit.jupiter.Testcontainers;
 
 import java.sql.SQLException;
+import java.time.Instant;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.stream.Stream;
 
 import static org.junit.jupiter.api.Assertions.*;
 import static org.mockito.Mockito.when;
@@ -32,11 +42,19 @@ import static org.mockito.Mockito.when;
 public class SubsetServiceIntegrationTest extends AbstractUnitTest {
 
     @Autowired
-    private SubsetService queryService;
+    private SubsetService subsetService;
 
     @MockBean
     private MetadataServiceGateway metadataServiceGateway;
 
+    public static Stream<Arguments> create_arguments() {
+        return Stream.of(
+                Arguments.arguments("singleQuote", "' DROP TABLE `weather_location`; --"),
+                Arguments.arguments("singleQuoteEscaped", "\' DROP TABLE `weather_location`; --"),
+                Arguments.arguments("doubleQuote", "\" DROP TABLE `weather_location`; --")
+        );
+    }
+
     @Container
     private static MariaDBContainer<?> mariaDBContainer = MariaDbContainerConfig.getContainer();
 
@@ -45,7 +63,7 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
     }
 
     @Test
@@ -55,8 +73,8 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
         /* test */
         final List<QueryDto> response = findAll_generic(null);
         assertEquals(2, response.size());
-        assertEquals(1L, response.get(0).getId());
-        assertEquals(2L, response.get(1).getId());
+        assertNotNull(response.get(0).getId());
+        assertNotNull(response.get(1).getId());
     }
 
     @Test
@@ -66,7 +84,7 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
         /* test */
         final List<QueryDto> response = findAll_generic(true);
         assertEquals(1, response.size());
-        assertEquals(1L, response.get(0).getId());
+        assertNotNull(response.get(0).getId());
     }
 
     @Test
@@ -76,15 +94,18 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
         /* test */
         final List<QueryDto> response = findAll_generic(false);
         assertEquals(1, response.size());
-        assertEquals(2L, response.get(0).getId());
+        assertNotNull(response.get(0).getId());
     }
 
     @Test
     public void findById_succeeds() throws SQLException, QueryNotFoundException, UserNotFoundException,
             RemoteUnavailableException, MetadataServiceException, DatabaseNotFoundException, InterruptedException {
 
+        /* mock */
+        final UUID queryId = MariaDbConfig.insertQueryStore(DATABASE_1_PRIVILEGED_DTO, QUERY_1_DTO, USER_1_ID);
+
         /* test */
-        findById_generic(QUERY_1_ID);
+        findById_generic(queryId);
     }
 
     @Test
@@ -92,7 +113,7 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
 
         /* test */
         assertThrows(QueryNotFoundException.class, () -> {
-            findById_generic(9999L);
+            findById_generic(UUID.randomUUID());
         });
     }
 
@@ -102,13 +123,14 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
             InterruptedException {
 
         /* mock */
+        final UUID queryId2 = MariaDbConfig.insertQueryStore(DATABASE_1_PRIVILEGED_DTO, QUERY_2_DTO, USER_1_ID);
         when(metadataServiceGateway.getUserById(USER_1_ID))
                 .thenReturn(USER_1_DTO);
 
         /* test */
-        persist_generic(QUERY_2_ID, List.of(IDENTIFIER_5_BRIEF_DTO), true);
-        final QueryDto response = queryService.findById(DATABASE_1_PRIVILEGED_DTO, QUERY_2_ID);
-        assertEquals(2L, response.getId());
+        persist_generic(queryId2, List.of(IDENTIFIER_5_BRIEF_DTO), true);
+        final QueryDto response = subsetService.findById(DATABASE_1_PRIVILEGED_DTO, queryId2);
+        assertEquals(queryId2, response.getId());
         assertTrue(response.getIsPersisted());
     }
 
@@ -118,17 +140,150 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
             InterruptedException {
 
         /* mock */
+        final UUID queryId1 = MariaDbConfig.insertQueryStore(DATABASE_1_PRIVILEGED_DTO, QUERY_1_DTO, USER_1_ID);
         when(metadataServiceGateway.getUserById(USER_1_ID))
                 .thenReturn(USER_1_DTO);
 
         /* test */
-        persist_generic(QUERY_1_ID, List.of(IDENTIFIER_2_BRIEF_DTO), false);
-        final QueryDto response = queryService.findById(DATABASE_1_PRIVILEGED_DTO, QUERY_1_ID);
-        assertEquals(1L, response.getId());
+        persist_generic(queryId1, List.of(IDENTIFIER_2_BRIEF_DTO), false);
+        final QueryDto response = subsetService.findById(DATABASE_1_PRIVILEGED_DTO, queryId1);
+        assertEquals(queryId1, response.getId());
         assertFalse(response.getIsPersisted());
     }
 
-    protected void findById_generic(Long queryId) throws RemoteUnavailableException, SQLException,
+    @Test
+    public void getData_succeeds() throws QueryMalformedException, TableNotFoundException {
+        final List<List<String>> expected = List.of(
+                List.of("1", "2008-12-01", "Albury", "13.4", "0.6"),
+                List.of("2", "2008-12-02", "Albury", "7.4", "0.0"),
+                List.of("3", "2008-12-03", "Albury", "12.9", "0.0"));
+
+
+        /* test */
+        final Dataset<Row> response = subsetService.getData(DATABASE_1_PRIVILEGED_DTO, QUERY_1_STATEMENT);
+        assertNotNull(response);
+        final List<List<String>> mapped = response.collectAsList()
+                .stream()
+                .map(row -> {
+                    final List<String> map = new LinkedList<>();
+                    for (int i = 0; i < response.columns().length; i++) {
+                        map.add(row.get(i) != null ? String.valueOf(row.get(i)) : "");
+                    }
+                    return map;
+                })
+                .toList();
+        assertEquals(expected, mapped);
+    }
+
+    @Test
+    public void getData_notFound_fails() {
+
+        /* test */
+        assertThrows(TableNotFoundException.class, () -> {
+            subsetService.getData(DATABASE_1_PRIVILEGED_DTO, "SELECT 1 FROM i_do_not_exist");
+        });
+    }
+
+    @Test
+    public void reExecuteCount_succeeds() throws SQLException, QueryMalformedException {
+
+        /* test */
+        final Long response = subsetService.reExecuteCount(DATABASE_1_PRIVILEGED_DTO, QUERY_1_DTO);
+        assertNotNull(response);
+    }
+
+    @Test
+    public void reExecuteCount_malformed_fails() {
+        final QueryDto request = QueryDto.builder()
+                .execution(Instant.now())
+                .databaseId(DATABASE_1_ID)
+                .query("SELECT") // <<<
+                .build();
+
+        /* test */
+        assertThrows(QueryMalformedException.class, () -> {
+            subsetService.reExecuteCount(DATABASE_1_PRIVILEGED_DTO, request);
+        });
+    }
+
+    @Test
+    public void executeCountNonPersistent_succeeds() throws SQLException, QueryMalformedException {
+
+        /* test */
+        final Long response = subsetService.executeCountNonPersistent(DATABASE_1_PRIVILEGED_DTO, QUERY_1_STATEMENT, QUERY_1_CREATED);
+        assertNotNull(response);
+    }
+
+    @Test
+    public void executeCountNonPersistent_malformed_fails() {
+
+        /* test */
+        assertThrows(QueryMalformedException.class, () -> {
+            subsetService.executeCountNonPersistent(DATABASE_1_PRIVILEGED_DTO, "SELECT", QUERY_1_CREATED);
+        });
+    }
+
+    @Test
+    public void executeCountNonPersistent_illegalQuery_fails() {
+
+        /* test */
+        assertThrows(QueryMalformedException.class, () -> {
+            subsetService.executeCountNonPersistent(DATABASE_1_PRIVILEGED_DTO, "DROP DATABASE `weather`", QUERY_1_CREATED);
+        });
+    }
+
+    @Test
+    public void storeQuery_succeeds() throws SQLException, QueryStoreInsertException, ViewMalformedException {
+
+        /* test */
+        final UUID response = subsetService.storeQuery(DATABASE_1_PRIVILEGED_DTO, QUERY_1_STATEMENT, QUERY_1_CREATED, USER_1_ID);
+        assertNotNull(response);
+    }
+
+    @Test
+    public void create_succeeds() throws SQLException, QueryStoreInsertException, ViewMalformedException,
+            TableNotFoundException, QueryMalformedException, ImageNotFoundException {
+
+        /* test */
+        final UUID response = subsetService.create(DATABASE_1_PRIVILEGED_DTO, QUERY_1_SUBSET_DTO, QUERY_1_CREATED, USER_1_ID);
+        assertNotNull(response);
+    }
+
+    @ParameterizedTest
+    @MethodSource("create_arguments")
+    public void create_illegalQuery_succeeds(String name, String injection) throws TableNotFoundException,
+            QueryStoreInsertException, ViewMalformedException, SQLException, QueryMalformedException,
+            ImageNotFoundException {
+        final SubsetDto request = SubsetDto.builder()
+                .tableId(TABLE_1_ID)
+                .columns(new LinkedList<>(List.of(COLUMN_1_1_ID, COLUMN_1_2_ID, COLUMN_1_3_ID, COLUMN_1_4_ID, COLUMN_1_5_ID)))
+                .filter(new LinkedList<>(List.of(FilterDto.builder()
+                        .type(FilterTypeDto.WHERE)
+                        .columnId(COLUMN_1_1_ID)
+                        .operatorId(IMAGE_1_OPERATORS_2_ID)
+                        .value(injection)
+                        .build())))
+                .order(new LinkedList<>(List.of(OrderDto.builder()
+                        .columnId(COLUMN_1_1_ID)
+                        .direction(OrderTypeDto.ASC)
+                        .build())))
+                .build();
+
+        /* test */
+        subsetService.create(DATABASE_1_PRIVILEGED_DTO, request, QUERY_1_CREATED, USER_1_ID);
+        assertEquals(1, MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT 1 WHERE EXISTS (SELECT * FROM `weather_location`)", Set.of()).size());
+    }
+
+    @Test
+    public void storeQuery_fails() {
+
+        /* test */
+        assertThrows(QueryStoreInsertException.class, () -> {
+            subsetService.storeQuery(DATABASE_1_PRIVILEGED_DTO, "DROP DATABASE `weather`", QUERY_1_CREATED, USER_1_ID);
+        });
+    }
+
+    protected void findById_generic(UUID queryId) throws RemoteUnavailableException, SQLException,
             UserNotFoundException, QueryNotFoundException, MetadataServiceException, DatabaseNotFoundException,
             InterruptedException {
 
@@ -136,15 +291,14 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
         Thread.sleep(1000) /* wait for test container some more */;
 
         /* mock */
-        when(metadataServiceGateway.getIdentifiers(DATABASE_1_ID, QUERY_1_ID))
+        when(metadataServiceGateway.getIdentifiers(DATABASE_1_ID, queryId))
                 .thenReturn(List.of(IDENTIFIER_2_BRIEF_DTO));
         when(metadataServiceGateway.getUserById(USER_1_ID))
                 .thenReturn(USER_1_DTO);
-        MariaDbConfig.insertQueryStore(DATABASE_1_PRIVILEGED_DTO, QUERY_1_DTO, USER_1_ID);
 
         /* test */
-        final QueryDto response = queryService.findById(DATABASE_1_PRIVILEGED_DTO, queryId);
-        assertEquals(QUERY_1_ID, response.getId());
+        final QueryDto response = subsetService.findById(DATABASE_1_PRIVILEGED_DTO, queryId);
+        assertEquals(queryId, response.getId());
     }
 
     protected List<QueryDto> findAll_generic(Boolean filterPersisted) throws SQLException, QueryNotFoundException,
@@ -161,10 +315,10 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
                 .thenReturn(List.of(IDENTIFIER_2_BRIEF_DTO, IDENTIFIER_5_BRIEF_DTO));
 
         /* test */
-        return queryService.findAll(DATABASE_1_PRIVILEGED_DTO, filterPersisted);
+        return subsetService.findAll(DATABASE_1_PRIVILEGED_DTO, filterPersisted);
     }
 
-    protected void persist_generic(Long queryId, List<IdentifierBriefDto> identifiers, Boolean persist)
+    protected void persist_generic(UUID queryId, List<IdentifierBriefDto> identifiers, Boolean persist)
             throws RemoteUnavailableException, SQLException, QueryStorePersistException, MetadataServiceException,
             DatabaseNotFoundException, InterruptedException {
 
@@ -174,11 +328,9 @@ public class SubsetServiceIntegrationTest extends AbstractUnitTest {
         /* mock */
         when(metadataServiceGateway.getIdentifiers(DATABASE_1_ID, queryId))
                 .thenReturn(identifiers);
-        MariaDbConfig.insertQueryStore(DATABASE_1_PRIVILEGED_DTO, QUERY_1_DTO, USER_1_ID);
-        MariaDbConfig.insertQueryStore(DATABASE_1_PRIVILEGED_DTO, QUERY_2_DTO, USER_1_ID);
 
         /* test */
-        queryService.persist(DATABASE_1_PRIVILEGED_DTO, queryId, persist);
+        subsetService.persist(DATABASE_1_PRIVILEGED_DTO, queryId, persist);
     }
 
 }

dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/TableServiceIntegrationTest.java

@@ -79,8 +79,8 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_2_INTERNALNAME);
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_3_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_PRIVILEGED_DTO);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_3_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_3_PRIVILEGED_DTO);
         /* s3 */
         if (s3Client.listBuckets().buckets().stream().noneMatch(b -> b.name().equals(s3Config.getS3Bucket()))) {
             s3Client.createBucket(CreateBucketRequest.builder()
@@ -110,7 +110,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.updateTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.updateTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id, `date`, location, mintemp, rainfall FROM weather_aus WHERE id = 1", Set.of("id", "date", "location", "mintemp", "rainfall"));
         assertEquals("1", result.get(0).get("id"));
         assertEquals("2023-10-03", result.get(0).get("date")); // <<<
@@ -137,7 +137,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.updateTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.updateTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id, `date`, location, mintemp, rainfall FROM weather_aus WHERE id = 4", Set.of("id", "date", "location", "mintemp", "rainfall"));
         assertEquals("4", result.get(0).get("id"));
         assertEquals("2023-10-03", result.get(0).get("date")); // <<<
@@ -163,7 +163,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.updateTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.updateTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id, `date`, location, mintemp, rainfall FROM weather_aus WHERE id = 1", Set.of("id", "date", "location", "mintemp", "rainfall"));
         assertEquals("1", result.get(0).get("id"));
         assertEquals("2023-10-03", result.get(0).get("date")); // <<<
@@ -189,7 +189,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.updateTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.updateTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id, `date`, location, mintemp, rainfall FROM weather_aus WHERE id = 1", Set.of("id", "date", "location", "mintemp", "rainfall"));
         assertEquals("1", result.get(0).get("id"));
         assertEquals("2023-10-03", result.get(0).get("date")); // <<<
@@ -213,7 +213,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.createTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.createTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id, `date`, location, mintemp, rainfall FROM weather_aus WHERE id = 4", Set.of("id", "date", "location", "mintemp", "rainfall"));
         assertEquals("4", result.get(0).get("id"));
         assertEquals("2023-10-03", result.get(0).get("date"));
@@ -240,7 +240,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build(), RequestBody.fromFile(new File("src/test/resources/csv/keyboard.csv")));
 
         /* test */
-        tableService.createTuple(TABLE_8_PRIVILEGED_DTO, request);
+        tableService.createTuple(DATABASE_3_PRIVILEGED_DTO, TABLE_8_DTO, request);
         final List<Map<String, byte[]>> result = MariaDbConfig.selectQueryByteArr(DATABASE_3_PRIVILEGED_DTO, "SELECT raw FROM mfcc WHERE raw IS NOT NULL", Set.of("raw"));
         assertNotNull(result.get(0).get("raw"));
         assertArrayEquals(Files.toByteArray(new File("src/test/resources/csv/keyboard.csv")), result.get(0).get("raw"));
@@ -261,7 +261,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.createTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.createTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id, `date`, location, mintemp, rainfall FROM weather_aus WHERE id = 4", Set.of("id", "date", "location", "mintemp", "rainfall"));
         assertEquals("4", result.get(0).get("id"));
         assertEquals("2023-10-03", result.get(0).get("date"));
@@ -280,7 +280,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.deleteTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.deleteTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id FROM weather_aus WHERE id = 1", Set.of("id"));
         assertEquals(0, result.size());
     }
@@ -297,7 +297,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build();
 
         /* test */
-        tableService.deleteTuple(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.deleteTuple(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         final List<Map<String, String>> result = MariaDbConfig.selectQuery(DATABASE_1_PRIVILEGED_DTO, "SELECT id FROM weather_aus WHERE id = 1", Set.of("id"));
         assertEquals(0, result.size());
     }
@@ -307,7 +307,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
     public void getStatistics_succeeds() throws TableMalformedException, SQLException, TableNotFoundException {
 
         /* test */
-        final TableStatisticDto response = tableService.getStatistics(TABLE_2_PRIVILEGED_DTO);
+        final TableStatisticDto response = tableService.getStatistics(DATABASE_1_PRIVILEGED_DTO, TABLE_2_DTO);
         assertEquals(TABLE_2_COLUMNS.size(), response.getColumns().size());
         log.trace("response rows: {}", response.getRows());
         assertEquals(3L, response.getRows());
@@ -336,7 +336,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
     public void delete_succeeds() throws SQLException, QueryMalformedException {
 
         /* test */
-        tableService.delete(TABLE_1_PRIVILEGED_DTO);
+        tableService.delete(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO);
     }
 
     @Test
@@ -347,7 +347,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
 
         /* test */
         assertThrows(QueryMalformedException.class, () -> {
-            tableService.delete(TABLE_5_PRIVILEGED_DTO);
+            tableService.delete(DATABASE_2_PRIVILEGED_DTO, TABLE_5_DTO);
         });
     }
 
@@ -355,7 +355,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
     public void getCount_succeeds() throws SQLException, QueryMalformedException {
 
         /* test */
-        final Long response = tableService.getCount(TABLE_1_PRIVILEGED_DTO, null);
+        final Long response = tableService.getCount(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, null);
         assertEquals(3, response);
     }
 
@@ -363,7 +363,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
     public void getCount_timestamp_succeeds() throws SQLException, QueryMalformedException {
 
         /* test */
-        final Long response = tableService.getCount(TABLE_1_PRIVILEGED_DTO, Instant.ofEpochSecond(0));
+        final Long response = tableService.getCount(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, Instant.ofEpochSecond(0));
         assertEquals(0, response);
     }
 
@@ -375,7 +375,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
 
         /* test */
         assertThrows(QueryMalformedException.class, () -> {
-            tableService.getCount(TABLE_5_PRIVILEGED_DTO, null);
+            tableService.getCount(DATABASE_2_PRIVILEGED_DTO, TABLE_5_DTO, null);
         });
     }
 
@@ -383,11 +383,11 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
     public void history_succeeds() throws SQLException, TableNotFoundException {
 
         /* test */
-        final List<TableHistoryDto> response = tableService.history(TABLE_1_PRIVILEGED_DTO, 1000L);
+        final List<TableHistoryDto> response = tableService.history(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, 1000L);
         assertEquals(1, response.size());
         final TableHistoryDto history0 = response.get(0);
         assertNotNull(history0.getTimestamp());
-        assertEquals("INSERT", history0.getEvent());
+        assertEquals(HistoryEventTypeDto.INSERT, history0.getEvent());
         assertEquals(3, history0.getTotal());
     }
 
@@ -399,7 +399,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
 
         /* test */
         assertThrows(TableNotFoundException.class, () -> {
-            tableService.history(TABLE_5_PRIVILEGED_DTO, null);
+            tableService.history(DATABASE_2_PRIVILEGED_DTO, TABLE_5_DTO, null);
         });
     }
 
@@ -421,7 +421,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
                 .build(), RequestBody.fromFile(new File("src/test/resources/csv/weather_aus.csv")));
 
         /* test */
-        tableService.importDataset(TABLE_1_PRIVILEGED_DTO, request);
+        tableService.importDataset(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
     }
 
     @Test
@@ -442,7 +442,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
 
         /* test */
         assertThrows(TableMalformedException.class, () -> {
-            tableService.importDataset(TABLE_1_PRIVILEGED_DTO, request);
+            tableService.importDataset(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         });
     }
 
@@ -464,7 +464,7 @@ public class TableServiceIntegrationTest extends AbstractUnitTest {
 
         /* test */
         assertThrows(MalformedException.class, () -> {
-            tableService.importDataset(TABLE_1_PRIVILEGED_DTO, request);
+            tableService.importDataset(DATABASE_1_PRIVILEGED_DTO, TABLE_1_DTO, request);
         });
     }
 

dbrepo-data-service/rest-service/src/test/java/at/tuwien/service/ViewServiceIntegrationTest.java

@@ -34,14 +34,14 @@ public class ViewServiceIntegrationTest extends AbstractUnitTest {
         genesis();
         /* metadata database */
         MariaDbConfig.dropDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_INTERNALNAME);
-        MariaDbConfig.createInitDatabase(CONTAINER_1_PRIVILEGED_DTO, DATABASE_1_PRIVILEGED_DTO);
+        MariaDbConfig.createInitDatabase(DATABASE_1_PRIVILEGED_DTO);
     }
 
     @Test
     public void delete_succeeds() throws SQLException, ViewMalformedException {
 
         /* test */
-        viewService.delete(VIEW_1_PRIVILEGED_DTO);
+        viewService.delete(DATABASE_1_PRIVILEGED_DTO, VIEW_1_DTO);
     }
 
 }

dbrepo-data-service/rest-service/src/test/resources/init/querystore.sql

 CREATE SEQUENCE `qs_queries_seq` NOCACHE;
-CREATE TABLE `qs_queries` ( `id` bigint not null primary key default nextval(`qs_queries_seq`), `created` datetime not null default now(), `executed` datetime not null default now(), `created_by` varchar(36), `query` text not null, `query_normalized` text not null, `is_persisted` boolean not null, `query_hash` varchar(255) not null, `result_hash` varchar(255), `result_number` bigint ) WITH SYSTEM VERSIONING;
+CREATE TABLE `qs_queries` ( `id` varchar(36) not null primary key default uuid(), `created` datetime not null default now(), `executed` datetime not null default now(), `created_by` varchar(36), `query` text not null, `query_normalized` text not null, `is_persisted` boolean not null, `query_hash` varchar(255) not null, `result_hash` varchar(255), `result_number` bigint ) WITH SYSTEM VERSIONING;
 CREATE PROCEDURE hash_table(IN name VARCHAR(255), OUT hash VARCHAR(255), OUT count BIGINT) BEGIN DECLARE _sql TEXT; SELECT CONCAT('SELECT SHA2(GROUP_CONCAT(CONCAT_WS(\'\',', GROUP_CONCAT(CONCAT('`', column_name, '`') ORDER BY column_name), ') SEPARATOR \',\'), 256) AS hash, COUNT(*) AS count FROM `', name, '` INTO @hash, @count;') FROM `information_schema`.`columns` WHERE `table_schema` = DATABASE() AND `table_name` = name INTO _sql; PREPARE stmt FROM _sql; EXECUTE stmt; DEALLOCATE PREPARE stmt; SET hash = @hash; SET count = @count; END;
-CREATE PROCEDURE store_query(IN query TEXT, IN executed DATETIME, OUT queryId BIGINT) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _username varchar(255) DEFAULT REGEXP_REPLACE(current_user(), '@.*', ''); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
-CREATE DEFINER = 'root' PROCEDURE _store_query(IN _username VARCHAR(255), IN query TEXT, IN executed DATETIME, OUT queryId BIGINT) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
+CREATE PROCEDURE store_query(IN query TEXT, IN executed DATETIME, OUT queryId varchar(36)) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _username varchar(255) DEFAULT REGEXP_REPLACE(current_user(), '@.*', ''); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
+CREATE DEFINER = 'root' PROCEDURE _store_query(IN _username VARCHAR(255), IN query TEXT, IN executed DATETIME, OUT queryId varchar(36)) BEGIN DECLARE _queryhash varchar(255) DEFAULT SHA2(query, 256); DECLARE _query TEXT DEFAULT CONCAT('CREATE OR REPLACE TABLE _tmp AS (', query, ')'); PREPARE stmt FROM _query; EXECUTE stmt; DEALLOCATE PREPARE stmt; CALL hash_table('_tmp', @hash, @count); DROP TABLE IF EXISTS `_tmp`; IF @hash IS NULL THEN INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` IS NULL); ELSE INSERT INTO `qs_queries` (`created_by`, `query`, `query_normalized`, `is_persisted`, `query_hash`, `result_hash`, `result_number`, `executed`) SELECT _username, query, query, false, _queryhash, @hash, @count, executed WHERE NOT EXISTS (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); SET queryId = (SELECT `id` FROM `qs_queries` WHERE `query_hash` = _queryhash AND `result_hash` = @hash); END IF; END;
\ No newline at end of file

dbrepo-data-service/services/pom.xml

@@ -6,18 +6,18 @@
     <parent>
         <groupId>at.tuwien</groupId>
         <artifactId>dbrepo-data-service</artifactId>
-        <version>1.6.5</version>
+        <version>1.7.0</version>
     </parent>
 
     <artifactId>services</artifactId>
     <name>dbrepo-data-service-services</name>
-    <version>1.6.5</version>
+    <version>1.7.0</version>
 
     <dependencies>
         <dependency>
             <groupId>at.tuwien</groupId>
             <artifactId>dbrepo-data-service-querystore</artifactId>
-            <version>1.6.5</version>
+            <version>1.7.0</version>
         </dependency>
     </dependencies>
 

dbrepo-data-service/services/src/main/java/at/tuwien/auth/AuthTokenFilter.java

@@ -13,6 +13,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.context.SecurityContextHolder;
@@ -52,13 +53,13 @@ public class AuthTokenFilter extends OncePerRequestFilter {
         filterChain.doFilter(request, response);
     }
 
-    public UserDetails verifyJwt(String token) throws ServletException {
+    public UserDetails verifyJwt(String token) throws BadCredentialsException {
         final KeyFactory kf;
         try {
             kf = KeyFactory.getInstance("RSA");
         } catch (NoSuchAlgorithmException e) {
             log.error("Failed to find RSA algorithm");
-            throw new ServletException("Failed to find RSA algorithm", e);
+            throw new BadCredentialsException("Failed to find RSA algorithm", e);
         }
         final X509EncodedKeySpec keySpecX509 = new X509EncodedKeySpec(Base64.getDecoder().decode(publicKey));
         final RSAPublicKey pubKey;
@@ -66,7 +67,7 @@ public class AuthTokenFilter extends OncePerRequestFilter {
             pubKey = (RSAPublicKey) kf.generatePublic(keySpecX509);
         } catch (InvalidKeySpecException e) {
             log.error("Provided public key is invalid");
-            throw new ServletException("Provided public key is invalid", e);
+            throw new BadCredentialsException("Provided public key is invalid", e);
         }
         final Algorithm algorithm = Algorithm.RSA256(pubKey, null);
         final Verification verification = JWT.require(algorithm);

dbrepo-data-service/services/src/main/java/at/tuwien/auth/BasicAuthenticationProvider.java

 package at.tuwien.auth;
 
 import at.tuwien.api.keycloak.TokenDto;
-import at.tuwien.exception.*;
 import at.tuwien.gateway.KeycloakGateway;
-import jakarta.servlet.ServletException;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.authentication.AuthenticationManager;
-import org.springframework.security.authentication.BadCredentialsException;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.AuthenticationException;
@@ -29,13 +26,8 @@ public class BasicAuthenticationProvider implements AuthenticationManager {
 
     @Override
     public Authentication authenticate(Authentication auth) throws AuthenticationException {
-        try {
         final TokenDto tokenDto = keycloakGateway.obtainUserToken(auth.getName(), auth.getCredentials().toString());
         final UserDetails userDetails = authTokenFilter.verifyJwt(tokenDto.getAccessToken());
         return new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities());
-        } catch (ServletException | CredentialsInvalidException | AccountNotSetupException |
-                 AuthServiceConnectionException e) {
-            throw new BadCredentialsException("Failed to authenticate with authentication service", e);
-        }
     }
 }

dbrepo-data-service/services/src/main/java/at/tuwien/auth/InternalRequestInterceptor.java

@@ -2,7 +2,6 @@ package at.tuwien.auth;
 
 import at.tuwien.api.keycloak.TokenDto;
 import at.tuwien.config.GatewayConfig;
-import at.tuwien.exception.*;
 import at.tuwien.gateway.KeycloakGateway;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.http.HttpHeaders;
@@ -31,15 +30,10 @@ public class InternalRequestInterceptor implements ClientHttpRequestInterceptor
             throws IOException {
         final HttpHeaders headers = request.getHeaders();
         headers.setAccept(List.of(MediaType.APPLICATION_JSON));
-        try {
         final TokenDto token = keycloakGateway.obtainUserToken(gatewayConfig.getSystemUsername(),
                 gatewayConfig.getSystemPassword());
         headers.setBearerAuth(token.getAccessToken());
         log.trace("set bearer token for internal user: {}", gatewayConfig.getSystemUsername());
-        } catch (AuthServiceConnectionException | CredentialsInvalidException | AccountNotSetupException e) {
-            log.error("Failed to obtain token for internal user: {}", gatewayConfig.getSystemUsername());
-            throw new IOException("Failed to obtain token for internal user", e);
-        }
         return execution.execute(request, body);
     }
 }

dbrepo-data-service/services/src/main/java/at/tuwien/config/CacheConfig.java

@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
 public class CacheConfig {
 
     @Value("${dbrepo.credentialCacheTimeout}")
-    private Long credentialCacheTimeout;
+    private Integer credentialCacheTimeout;
 
     @Bean
     public Cache<UUID, UserDto> userCache() {
@@ -27,28 +27,28 @@ public class CacheConfig {
     }
 
     @Bean
-    public Cache<Long, ViewDto> viewCache() {
-        return new ExpiryCache<Long, ViewDto>().build();
+    public Cache<UUID, ViewDto> viewCache() {
+        return new ExpiryCache<UUID, ViewDto>().build();
     }
 
     @Bean
-    public Cache<Long, DatabaseAccessDto> accessCache() {
-        return new ExpiryCache<Long, DatabaseAccessDto>().build();
+    public Cache<UUID, DatabaseAccessDto> accessCache() {
+        return new ExpiryCache<UUID, DatabaseAccessDto>().build();
     }
 
     @Bean
-    public Cache<Long, TableDto> tableCache() {
-        return new ExpiryCache<Long, TableDto>().build();
+    public Cache<UUID, TableDto> tableCache() {
+        return new ExpiryCache<UUID, TableDto>().build();
     }
 
     @Bean
-    public Cache<Long, DatabaseDto> databaseCache() {
-        return new ExpiryCache<Long, DatabaseDto>().build();
+    public Cache<UUID, DatabaseDto> databaseCache() {
+        return new ExpiryCache<UUID, DatabaseDto>().build();
     }
 
     @Bean
-    public Cache<Long, ContainerDto> containerCache() {
-        return new ExpiryCache<Long, ContainerDto>().build();
+    public Cache<UUID, ContainerDto> containerCache() {
+        return new ExpiryCache<UUID, ContainerDto>().build();
     }
 
     class ExpiryCache<K, T> {

dbrepo-data-service/services/src/main/java/at/tuwien/config/GatewayConfig.java

@@ -5,6 +5,7 @@ import at.tuwien.gateway.KeycloakGateway;
 import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

dbrepo-data-service/services/src/main/java/at/tuwien/config/KeycloakConfig.java

 package at.tuwien.config;
 
 import lombok.Getter;
+import org.keycloak.admin.client.Keycloak;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.web.client.RestTemplate;
 
 @Getter
 @Configuration
@@ -22,4 +25,11 @@ public class KeycloakConfig {
 
     @Value("${dbrepo.keycloak.clientSecret}")
     private String keycloakClientSecret;
+
+    private final String realm = "dbrepo";
+
+    @Bean
+    public Keycloak keycloak() {
+        return Keycloak.getInstance(keycloakEndpoint, "master", keycloakUsername, keycloakPassword, "admin-cli");
+    }
 }