Merge branch 'master' into dev

fda-table-service/gateway/pom.xml → fda-table-service/gateways/pom.xml

@@ -9,16 +9,22 @@
         <version>0.0.1-SNAPSHOT</version>
     </parent>
 
-    <artifactId>gateway</artifactId>
+    <artifactId>gateways</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>fda-table-service-gateway</name>
+    <name>fda-table-service-gateways</name>
 
     <properties>
         <maven.compiler.source>11</maven.compiler.source>
         <maven.compiler.target>11</maven.compiler.target>
     </properties>
 
-    <dependencies />
+    <dependencies>
+        <dependency>
+            <groupId>at.tuwien</groupId>
+            <artifactId>api</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+    </dependencies>
 
 
 </project>
\ No newline at end of file

fda-table-service/gateways/src/main/java/at/tuwien/client/FdaQueryServiceClient.java

+package at.tuwien.client;
+
+import at.tuwien.dto.CreateTableViaCsvDTO;
+import at.tuwien.mapper.ContainerIdAndQueryToExecuteInternalQueryMapper;
+import at.tuwien.mapper.CreateTableViaCsvToExecuteStatementMapper;
+import at.tuwien.model.CreateCSVTableWithDataset;
+import at.tuwien.model.ExecuteInternalQueryDTO;
+import at.tuwien.model.ExecuteStatementDTO;
+import at.tuwien.model.QueryResult;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.stereotype.Component;
+import org.springframework.web.reactive.function.client.ClientResponse;
+import org.springframework.web.reactive.function.client.WebClient;
+import reactor.core.publisher.Mono;
+
+@Component
+public class FdaQueryServiceClient {
+    private static final Logger LOGGER = LoggerFactory.getLogger(FdaQueryServiceClient.class);
+
+
+    private WebClient.Builder webClientBuilder;
+    private CreateTableViaCsvToExecuteStatementMapper mapper;
+
+    @Autowired
+    public FdaQueryServiceClient(WebClient.Builder webClientBuilder, CreateTableViaCsvToExecuteStatementMapper mapper) {
+        this.webClientBuilder = webClientBuilder;
+        this.mapper = mapper;
+    }
+
+    /**
+     * @deprecated use Spring RestTempaltes in future releases
+     */
+    public boolean executeStatement(CreateTableViaCsvDTO dto, String statement) {
+        LOGGER.debug("request fda-query-service for executing statement");
+        ExecuteStatementDTO statementDTO = mapper.map(dto, statement);
+        ClientResponse response = webClientBuilder
+                .build()
+                .post()
+                .uri("http://fda-query-service/query/executeStatement")
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(Mono.just(statementDTO), ExecuteStatementDTO.class)
+                .exchange()
+                .block();
+
+        return true;
+    }
+
+    /**
+     * @deprecated use Spring RestTempaltes in future releases
+     */
+    public QueryResult executeQuery(String containerID, String query) {
+        ContainerIdAndQueryToExecuteInternalQueryMapper mapper = new ContainerIdAndQueryToExecuteInternalQueryMapper();
+        ExecuteInternalQueryDTO execInternalQueryDTO = mapper.map(containerID, query);
+        QueryResult queryResult = webClientBuilder
+                .build()
+                .post()
+                .uri("http://fda-query-service/query/executeQuery")
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(Mono.just(execInternalQueryDTO), ExecuteInternalQueryDTO.class)
+                .retrieve()
+                .bodyToMono(QueryResult.class)
+                .block();
+
+        return queryResult;
+
+    }
+
+    /**
+     * @deprecated use Spring RestTempaltes in future releases
+     */
+    public boolean copyCSVIntoTable(CreateCSVTableWithDataset tableWithDataset) {
+        ClientResponse response = webClientBuilder
+                .build()
+                .post()
+                .uri("http://fda-query-service/query/copyCSVIntoTable")
+                .contentType(MediaType.APPLICATION_JSON)
+                .body(Mono.just(tableWithDataset), CreateCSVTableWithDataset.class)
+                .exchange()
+                .block();
+
+        if(response.statusCode().is2xxSuccessful()){
+            return true;
+        }
+        return false;
+    }
+}

fda-table-service/gateways/src/main/java/at/tuwien/mapper/CreateTableViaCsvToExecuteStatementMapper.java

+package at.tuwien.mapper;
+
+import at.tuwien.dto.CreateTableViaCsvDTO;
+import at.tuwien.model.ExecuteStatementDTO;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CreateTableViaCsvToExecuteStatementMapper {
+
+    public ExecuteStatementDTO map(CreateTableViaCsvDTO dto, String statement){
+        ExecuteStatementDTO statementDTO = new ExecuteStatementDTO();
+        statementDTO.setContainerID(dto.getContainerId());
+        statementDTO.setStatement(statement);
+        return statementDTO;
+    }
+}

fda-table-service/pom.xml

@@ -18,7 +18,6 @@
     <modules>
         <module>rest-service</module>
         <module>services</module>
-        <module>gateway</module>
         <module>report</module>
     </modules>
 
@@ -74,6 +73,17 @@
             <scope>runtime</scope>
         </dependency>
         <!-- Testing -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-data-jpa</artifactId>
+        </dependency>
+        <!-- DataSource -->
+        <dependency>
+            <groupId>org.postgresql</groupId>
+            <artifactId>postgresql</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+        <!-- Testing -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>

fda-table-service/report/pom.xml

@@ -18,11 +18,6 @@
     </properties>
 
     <dependencies>
-        <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>gateway</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>at.tuwien</groupId>
             <artifactId>rest-service</artifactId>

fda-table-service/services/pom.xml

@@ -14,11 +14,6 @@
     <name>fda-table-service-services</name>
 
     <dependencies>
-        <dependency>
-            <groupId>at.tuwien</groupId>
-            <artifactId>gateway</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <dependency>
             <groupId>net.sf.supercsv</groupId>
             <artifactId>super-csv</artifactId>

fda-table-service/services/src/main/java/at/tuwien/exception/FileStorageException.java

 package at.tuwien.exception;
 
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.ResponseStatus;
-
-@ResponseStatus(code = HttpStatus.UNPROCESSABLE_ENTITY)
 public class FileStorageException extends RuntimeException {
 
+
     public FileStorageException(String msg) {
         super(msg);
     }

fda-ui/pages/db/_db_id/tables/index.vue

@@ -5,13 +5,6 @@
     </h3>
     <TableList />
     <TableCreate />
-    <v-card class="mt-1">
-      <v-card-text>
-        <nuxt-link class="table_from_csv" :to="`/db/${$route.params.db_id}/tables/table_from_csv`">
-          Create table from CSV file
-        </nuxt-link>
-      </v-card-text>
-    </v-card>
   </div>
 </template>
 <script>
@@ -34,8 +27,5 @@ export default {
 }
 </script>
 
-<style scoped>
-a.table_from_csv {
-  font-size: 14pt;
-}
+<style>
 </style>