From b703a689874fbe2b2b23cae61da0d553b17050c0 Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Thu, 30 Sep 2021 13:53:23 +0200
Subject: [PATCH] added citation report
---
fda-citation-service/pom.xml | 3 +-
fda-citation-service/report/pom.xml | 2 +-
fda-citation-service/rest-service/pom.xml | 2 +-
...ava => FdaCitationServiceApplication.java} | 4 +-
.../service/FileServiceIntegrationTest.java | 1 -
.../MetadataServiceIntegrationTest.java | 44 ++++++++-----------
fda-citation-service/services/pom.xml | 2 +-
7 files changed, 24 insertions(+), 34 deletions(-)
rename fda-citation-service/rest-service/src/main/java/at/tuwien/{FdaTableServiceApplication.java => FdaCitationServiceApplication.java} (88%)
diff --git a/fda-citation-service/pom.xml b/fda-citation-service/pom.xml
index 22e3a0c0ff..b9927da4fb 100644
--- a/fda-citation-service/pom.xml
+++ b/fda-citation-service/pom.xml
@@ -155,8 +155,7 @@
<exclude>at/tuwien/utils/**/*</exclude>
<exclude>at/tuwien/config/**/*</exclude>
<exclude>at/tuwien/handlers/**/*</exclude>
- <exclude>**/FdaTableServiceApplication.class</exclude>
- <exclude>**/JdbcConnector.class</exclude>
+ <exclude>**/FdaCitationServiceApplication.class</exclude>
</excludes>
</configuration>
<executions>
diff --git a/fda-citation-service/report/pom.xml b/fda-citation-service/report/pom.xml
index c3759ce658..ba36a18581 100644
--- a/fda-citation-service/report/pom.xml
+++ b/fda-citation-service/report/pom.xml
@@ -10,7 +10,7 @@
</parent>
<artifactId>report</artifactId>
- <name>fda-table-service-report</name>
+ <name>fda-citation-service-report</name>
<properties>
<jacoco.version>0.8.7</jacoco.version>
diff --git a/fda-citation-service/rest-service/pom.xml b/fda-citation-service/rest-service/pom.xml
index f70afaa00a..ad19a971d3 100644
--- a/fda-citation-service/rest-service/pom.xml
+++ b/fda-citation-service/rest-service/pom.xml
@@ -11,7 +11,7 @@
<artifactId>rest-service</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>fda-table-service-rest</name>
+ <name>fda-citation-service-rest</name>
<dependencies>
<dependency>
diff --git a/fda-citation-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java b/fda-citation-service/rest-service/src/main/java/at/tuwien/FdaCitationServiceApplication.java
similarity index 88%
rename from fda-citation-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java
rename to fda-citation-service/rest-service/src/main/java/at/tuwien/FdaCitationServiceApplication.java
index 90bb253a4c..4b30e78ae7 100644
--- a/fda-citation-service/rest-service/src/main/java/at/tuwien/FdaTableServiceApplication.java
+++ b/fda-citation-service/rest-service/src/main/java/at/tuwien/FdaCitationServiceApplication.java
@@ -17,10 +17,10 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
@EntityScan(basePackages = {"at.tuwien.entities"})
-public class FdaTableServiceApplication {
+public class FdaCitationServiceApplication {
public static void main(String[] args) {
- SpringApplication.run(FdaTableServiceApplication.class, args);
+ SpringApplication.run(FdaCitationServiceApplication.class, args);
}
}
diff --git a/fda-citation-service/rest-service/src/test/java/at/tuwien/service/FileServiceIntegrationTest.java b/fda-citation-service/rest-service/src/test/java/at/tuwien/service/FileServiceIntegrationTest.java
index 59ff998a97..16675992fd 100644
--- a/fda-citation-service/rest-service/src/test/java/at/tuwien/service/FileServiceIntegrationTest.java
+++ b/fda-citation-service/rest-service/src/test/java/at/tuwien/service/FileServiceIntegrationTest.java
@@ -5,7 +5,6 @@ import at.tuwien.api.zenodo.deposit.DepositChangeResponseDto;
import at.tuwien.api.zenodo.files.FileResponseDto;
import at.tuwien.api.zenodo.files.FileUploadDto;
import at.tuwien.config.ReadyConfig;
-import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.*;
import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.DatabaseRepository;
diff --git a/fda-citation-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java b/fda-citation-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
index 3ad09233a9..ef102fd441 100644
--- a/fda-citation-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
+++ b/fda-citation-service/rest-service/src/test/java/at/tuwien/service/MetadataServiceIntegrationTest.java
@@ -3,11 +3,13 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest;
import at.tuwien.api.zenodo.deposit.*;
import at.tuwien.config.ReadyConfig;
-import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.*;
+import at.tuwien.repository.jpa.ContainerRepository;
+import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.TableRepository;
import org.junit.jupiter.api.Assertions;
+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;
@@ -15,9 +17,7 @@ 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.mockito.Mockito.when;
+import javax.transaction.Transactional;
@SpringBootTest
@ExtendWith(SpringExtension.class)
@@ -29,21 +29,27 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
@Autowired
private ZenodoMetadataService zenodoService;
- @MockBean
+ @Autowired
private TableRepository tableRepository;
- final Database DATABASE_1 = Database.builder()
- .id(DATABASE_1_ID)
- .build();
+ @Autowired
+ private ContainerRepository containerRepository;
+
+ @Autowired
+ private DatabaseRepository databaseRepository;
+
+ @BeforeEach
+ @Transactional
+ public void beforeEach() {
+ containerRepository.save(CONTAINER_1);
+ databaseRepository.save(DATABASE_1);
+ tableRepository.save(TABLE_1);
+ }
@Test
public void listDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException,
ZenodoUnavailableException {
- /* mock */
- when(tableRepository.findByDatabaseAndId(DATABASE_1, TABLE_1_ID))
- .thenReturn(Optional.of(TABLE_1));
-
/* test */
zenodoService.listCitations(DATABASE_1_ID, TABLE_1_ID);
}
@@ -52,10 +58,6 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
public void createDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException,
MetadataDatabaseNotFoundException, ZenodoUnavailableException {
- /* mock */
- when(tableRepository.findByDatabaseAndId(DATABASE_1, TABLE_1_ID))
- .thenReturn(Optional.of(TABLE_1));
-
/* test */
final DepositChangeResponseDto response = zenodoService.storeCitation(DATABASE_1_ID, TABLE_1_ID);
Assertions.assertNotNull(response.getId());
@@ -64,21 +66,11 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
@Test
public void updateDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException,
ZenodoNotFoundException, MetadataDatabaseNotFoundException, ZenodoUnavailableException {
-
- /* mock */
- when(tableRepository.findByDatabaseAndId(DATABASE_1, TABLE_1_ID))
- .thenReturn(Optional.of(TABLE_1));
final DepositChangeResponseDto deposit = zenodoService.storeCitation(DATABASE_1_ID, TABLE_1_ID);
final DepositChangeRequestDto request = DepositChangeRequestDto.builder()
.metadata(METADATA_1)
.build();
- /* mock */
- final Table TABLE_1 = Table.builder()
- .id(TABLE_1_ID)
- .depositId(deposit.getId())
- .build();
-
/* test */
final DepositChangeResponseDto response2 = zenodoService.updateCitation(DATABASE_1_ID, TABLE_1_ID, request);
Assertions.assertNotNull(response2.getId());
diff --git a/fda-citation-service/services/pom.xml b/fda-citation-service/services/pom.xml
index e922677d62..8ef68baceb 100644
--- a/fda-citation-service/services/pom.xml
+++ b/fda-citation-service/services/pom.xml
@@ -11,7 +11,7 @@
<artifactId>services</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>fda-table-service-services</name>
+ <name>fda-citation-service-services</name>
<dependencies>
<dependency>
--
GitLab