Skip to content
Snippets Groups Projects
Unverified Commit b703a689 authored by Martin Weise's avatar Martin Weise
Browse files

added citation report

parent 6f015bc1
No related branches found
No related tags found
3 merge requests!81New stable release,!43Merge dev to master,!27Draft: Resolve "Zenodo Sandbox integration for PID (e.g. DOI)"
...@@ -155,8 +155,7 @@ ...@@ -155,8 +155,7 @@
<exclude>at/tuwien/utils/**/*</exclude> <exclude>at/tuwien/utils/**/*</exclude>
<exclude>at/tuwien/config/**/*</exclude> <exclude>at/tuwien/config/**/*</exclude>
<exclude>at/tuwien/handlers/**/*</exclude> <exclude>at/tuwien/handlers/**/*</exclude>
<exclude>**/FdaTableServiceApplication.class</exclude> <exclude>**/FdaCitationServiceApplication.class</exclude>
<exclude>**/JdbcConnector.class</exclude>
</excludes> </excludes>
</configuration> </configuration>
<executions> <executions>
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
</parent> </parent>
<artifactId>report</artifactId> <artifactId>report</artifactId>
<name>fda-table-service-report</name> <name>fda-citation-service-report</name>
<properties> <properties>
<jacoco.version>0.8.7</jacoco.version> <jacoco.version>0.8.7</jacoco.version>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<artifactId>rest-service</artifactId> <artifactId>rest-service</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>fda-table-service-rest</name> <name>fda-citation-service-rest</name>
<dependencies> <dependencies>
<dependency> <dependency>
......
...@@ -17,10 +17,10 @@ import springfox.documentation.oas.annotations.EnableOpenApi; ...@@ -17,10 +17,10 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"}) @EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaTableServiceApplication { public class FdaCitationServiceApplication {
public static void main(String[] args) { public static void main(String[] args) {
SpringApplication.run(FdaTableServiceApplication.class, args); SpringApplication.run(FdaCitationServiceApplication.class, args);
} }
} }
...@@ -5,7 +5,6 @@ import at.tuwien.api.zenodo.deposit.DepositChangeResponseDto; ...@@ -5,7 +5,6 @@ import at.tuwien.api.zenodo.deposit.DepositChangeResponseDto;
import at.tuwien.api.zenodo.files.FileResponseDto; import at.tuwien.api.zenodo.files.FileResponseDto;
import at.tuwien.api.zenodo.files.FileUploadDto; import at.tuwien.api.zenodo.files.FileUploadDto;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.jpa.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.DatabaseRepository; import at.tuwien.repository.jpa.DatabaseRepository;
......
...@@ -3,11 +3,13 @@ package at.tuwien.service; ...@@ -3,11 +3,13 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest; import at.tuwien.BaseUnitTest;
import at.tuwien.api.zenodo.deposit.*; import at.tuwien.api.zenodo.deposit.*;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.database.Database;
import at.tuwien.entities.database.table.Table; import at.tuwien.entities.database.table.Table;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.jpa.DatabaseRepository;
import at.tuwien.repository.jpa.TableRepository; import at.tuwien.repository.jpa.TableRepository;
import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
...@@ -15,9 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest; ...@@ -15,9 +17,7 @@ import org.springframework.boot.test.context.SpringBootTest;
import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import java.util.Optional; import javax.transaction.Transactional;
import static org.mockito.Mockito.when;
@SpringBootTest @SpringBootTest
@ExtendWith(SpringExtension.class) @ExtendWith(SpringExtension.class)
...@@ -29,21 +29,27 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest { ...@@ -29,21 +29,27 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
@Autowired @Autowired
private ZenodoMetadataService zenodoService; private ZenodoMetadataService zenodoService;
@MockBean @Autowired
private TableRepository tableRepository; private TableRepository tableRepository;
final Database DATABASE_1 = Database.builder() @Autowired
.id(DATABASE_1_ID) private ContainerRepository containerRepository;
.build();
@Autowired
private DatabaseRepository databaseRepository;
@BeforeEach
@Transactional
public void beforeEach() {
containerRepository.save(CONTAINER_1);
databaseRepository.save(DATABASE_1);
tableRepository.save(TABLE_1);
}
@Test @Test
public void listDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException, public void listDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException,
ZenodoUnavailableException { ZenodoUnavailableException {
/* mock */
when(tableRepository.findByDatabaseAndId(DATABASE_1, TABLE_1_ID))
.thenReturn(Optional.of(TABLE_1));
/* test */ /* test */
zenodoService.listCitations(DATABASE_1_ID, TABLE_1_ID); zenodoService.listCitations(DATABASE_1_ID, TABLE_1_ID);
} }
...@@ -52,10 +58,6 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest { ...@@ -52,10 +58,6 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
public void createDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException, public void createDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException,
MetadataDatabaseNotFoundException, ZenodoUnavailableException { MetadataDatabaseNotFoundException, ZenodoUnavailableException {
/* mock */
when(tableRepository.findByDatabaseAndId(DATABASE_1, TABLE_1_ID))
.thenReturn(Optional.of(TABLE_1));
/* test */ /* test */
final DepositChangeResponseDto response = zenodoService.storeCitation(DATABASE_1_ID, TABLE_1_ID); final DepositChangeResponseDto response = zenodoService.storeCitation(DATABASE_1_ID, TABLE_1_ID);
Assertions.assertNotNull(response.getId()); Assertions.assertNotNull(response.getId());
...@@ -64,21 +66,11 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest { ...@@ -64,21 +66,11 @@ public class MetadataServiceIntegrationTest extends BaseUnitTest {
@Test @Test
public void updateDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException, public void updateDeposit_succeeds() throws ZenodoApiException, ZenodoAuthenticationException,
ZenodoNotFoundException, MetadataDatabaseNotFoundException, ZenodoUnavailableException { 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 DepositChangeResponseDto deposit = zenodoService.storeCitation(DATABASE_1_ID, TABLE_1_ID);
final DepositChangeRequestDto request = DepositChangeRequestDto.builder() final DepositChangeRequestDto request = DepositChangeRequestDto.builder()
.metadata(METADATA_1) .metadata(METADATA_1)
.build(); .build();
/* mock */
final Table TABLE_1 = Table.builder()
.id(TABLE_1_ID)
.depositId(deposit.getId())
.build();
/* test */ /* test */
final DepositChangeResponseDto response2 = zenodoService.updateCitation(DATABASE_1_ID, TABLE_1_ID, request); final DepositChangeResponseDto response2 = zenodoService.updateCitation(DATABASE_1_ID, TABLE_1_ID, request);
Assertions.assertNotNull(response2.getId()); Assertions.assertNotNull(response2.getId());
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<artifactId>services</artifactId> <artifactId>services</artifactId>
<version>0.0.1-SNAPSHOT</version> <version>0.0.1-SNAPSHOT</version>
<name>fda-table-service-services</name> <name>fda-citation-service-services</name>
<dependencies> <dependencies>
<dependency> <dependency>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment