diff --git a/fda-citation-service/pom.xml b/fda-citation-service/pom.xml index 22e3a0c0ffdae09b46bfdb4efd530655c8fd5b92..b9927da4fb451f70cf92e8dc3f000b5479d99f39 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 c3759ce658c43578c8798b7316722387435102dd..ba36a1858106b458c28252cc899cce6e4a9c6e83 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 f70afaa00a04bcde42d03f91f1e771ae8473cdf9..ad19a971d33391704676b7755bb42bef3319f218 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 90bb253a4c549241394f0696b4b094faa9b46ab4..4b30e78ae701bff27faf236102aedf3a327f23d4 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 59ff998a97e800b8b501a4983bedb8dd8029c996..16675992fdfb5e293ac62d14efffb5ae91eee41f 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 3ad09233a9eabe8f18c239c2cd2dbf45b37e61eb..ef102fd44136a8c84303adf6288535e02a10d392 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 e922677d62abef62314e11bff4d62aa4b9412bb1..8ef68baceb79c4913280a938eada2ac0e7776e12 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>