tests: add test case for fetching orcid info

tuwien-csd · Jan 22, 2024 · 5c3d324 · 5c3d324
1 parent 9dfaafa
commit 5c3d324
Show file tree

Hide file tree

Showing 15 changed files with 7,940 additions and 160 deletions.
diff --git a/src/main/java/at/ac/tuwien/damap/rest/persons/orcid/ORCIDMapper.java b/src/main/java/at/ac/tuwien/damap/rest/persons/orcid/ORCIDMapper.java
@@ -3,11 +3,13 @@
 import java.util.ArrayList;
 import java.util.Comparator;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import at.ac.tuwien.damap.enums.EIdentifierType;
 import at.ac.tuwien.damap.rest.dmp.domain.ContributorDO;
 import at.ac.tuwien.damap.rest.dmp.domain.IdentifierDO;
 import at.ac.tuwien.damap.rest.persons.orcid.models.ORCIDExpandedSearchPerson;
+import at.ac.tuwien.damap.rest.persons.orcid.models.ORCIDExpandedSearchResult;
 import at.ac.tuwien.damap.rest.persons.orcid.models.ORCIDRecord;
 import at.ac.tuwien.damap.rest.persons.orcid.models.base.ORCIDAffiliation;
 import at.ac.tuwien.damap.rest.persons.orcid.models.base.ORCIDDate;
@@ -78,6 +80,19 @@ public ContributorDO mapRecordEntityToPersonDO(ORCIDRecord orcidRecord,
         return contributorDO;
     }
 
+    public List<ContributorDO> mapExpandedSearchResultEntityToDOList(ORCIDExpandedSearchResult expandedSearchResult) {
+        List<ContributorDO> contributors = List.of();
+
+        if (expandedSearchResult.getNumFound() > 0 && expandedSearchResult.getPersons() != null) {
+            contributors = expandedSearchResult.getPersons().stream().map(o -> {
+                var c = new ContributorDO();
+                ORCIDMapper.mapExpandedSearchPersonEntityToDO(o, c);
+                return c;
+            }).collect(Collectors.toList());
+        }
+        return contributors;
+    }
+
     private final Comparator<? super ORCIDAffiliation> sortByCurrentStartDate = ((ORCIDAffiliation a,
             ORCIDAffiliation b) -> {
         ORCIDDate aEndDate = a.getEndDate();

diff --git a/src/main/java/at/ac/tuwien/damap/rest/persons/orcid/ORCIDPersonServiceImpl.java b/src/main/java/at/ac/tuwien/damap/rest/persons/orcid/ORCIDPersonServiceImpl.java
@@ -1,7 +1,6 @@
 package at.ac.tuwien.damap.rest.persons.orcid;
 
 import java.util.List;
-import java.util.stream.Collectors;
 
 import javax.enterprise.context.ApplicationScoped;
 import javax.inject.Inject;
@@ -35,14 +34,8 @@ public ResultList<ContributorDO> search(MultivaluedMap<String, String> queryPara
         List<ContributorDO> contributors = null;
         try {
             var orcidSearch = orcidRestClient.getAll(search.getQuery(), search.getPagination().getPerPage());
+            contributors = ORCIDMapper.mapExpandedSearchResultEntityToDOList(orcidSearch);
 
-            if (orcidSearch.getNumFound() > 0 && orcidSearch.getPersons() != null) {
-                contributors = orcidSearch.getPersons().stream().map(o -> {
-                    var c = new ContributorDO();
-                    ORCIDMapper.mapExpandedSearchPersonEntityToDO(o, c);
-                    return c;
-                }).collect(Collectors.toList());
-            }
         } catch (Exception e) {
             log.error("Issue searching ORCID persons", e);
         }

diff --git a/src/main/java/at/ac/tuwien/damap/rest/persons/orcid/OrcidPersonService.java b/src/main/java/at/ac/tuwien/damap/rest/persons/orcid/OrcidPersonService.java
@@ -1,5 +1,6 @@
 package at.ac.tuwien.damap.rest.persons.orcid;
 
+import javax.enterprise.context.ApplicationScoped;
 import javax.ws.rs.GET;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
@@ -13,6 +14,7 @@
 import at.ac.tuwien.damap.rest.persons.orcid.models.ORCIDExpandedSearchResult;
 import at.ac.tuwien.damap.rest.persons.orcid.models.ORCIDRecord;
 
+@ApplicationScoped
 @RegisterRestClient(configKey = "rest.orcid.search")
 @Path("/v3.0")
 @Produces(MediaType.APPLICATION_JSON)

diff --git a/src/test/java/at/ac/tuwien/damap/TestSetup.java b/src/test/java/at/ac/tuwien/damap/TestSetup.java
@@ -0,0 +1,48 @@
+package at.ac.tuwien.damap;
+
+import static org.mockito.ArgumentMatchers.any;
+
+import javax.inject.Inject;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.mockito.Mockito;
+
+import at.ac.tuwien.damap.rest.dmp.domain.DmpDO;
+import at.ac.tuwien.damap.rest.persons.MockUniversityPersonServiceImpl;
+import at.ac.tuwien.damap.rest.persons.orcid.ORCIDMapper;
+import at.ac.tuwien.damap.rest.persons.orcid.ORCIDPersonServiceImpl;
+import at.ac.tuwien.damap.security.SecurityService;
+import at.ac.tuwien.damap.util.TestDOFactory;
+import io.quarkus.test.junit.QuarkusTest;
+import io.quarkus.test.junit.mockito.InjectMock;
+
+// Common config for test case setup
+@QuarkusTest
+public class TestSetup {
+    @Inject
+    protected TestDOFactory testDOFactory;
+
+    @InjectMock
+    protected SecurityService securityService;
+
+    @InjectMock
+    MockUniversityPersonServiceImpl personService;
+
+    @InjectMock
+    protected ORCIDPersonServiceImpl orcidPersonServiceImpl;
+
+    protected DmpDO dmpDO;
+
+    @BeforeEach
+    public void setup() {
+        Mockito.when(securityService.getUserId()).thenReturn("012345");
+        Mockito.when(securityService.getUserName()).thenReturn("testUser");
+        Mockito.when(personService.read(any(String.class))).thenReturn(testDOFactory.getTestContributorDO());
+        Mockito.when(orcidPersonServiceImpl.read(any(String.class)))
+                .thenReturn(
+                        ORCIDMapper.mapRecordEntityToPersonDO(testDOFactory.getORCIDTestRecord(),
+                                testDOFactory.getTestContributorDO()));
+
+        dmpDO = testDOFactory.getOrCreateTestDmpDO();
+    }
+}
diff --git a/...java/at/ac/tuwien/damap/conversion/AbstractTemplateExportScienceEuropeComponentsTest.java b/...java/at/ac/tuwien/damap/conversion/AbstractTemplateExportScienceEuropeComponentsTest.java
@@ -1,6 +1,7 @@
 package at.ac.tuwien.damap.conversion;
 
 import at.ac.tuwien.damap.rest.dmp.domain.DmpDO;
+import at.ac.tuwien.damap.rest.persons.orcid.ORCIDPersonServiceImpl;
 import at.ac.tuwien.damap.rest.projects.MockProjectServiceImpl;
 import at.ac.tuwien.damap.util.TestDOFactory;
 import io.quarkus.test.junit.QuarkusTest;
@@ -13,6 +14,7 @@
 
 import javax.inject.Inject;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 
 @QuarkusTest
@@ -25,13 +27,17 @@ class AbstractTemplateExportScienceEuropeComponentsTest extends AbstractTemplate
     @InjectMock
     MockProjectServiceImpl mockProjectService;
 
+    @InjectMock
+    ORCIDPersonServiceImpl orcidPersonServiceImpl;
+
     @BeforeEach
     public void setup() {
         Mockito.when(mockProjectService.read(anyString())).thenReturn(testDOFactory.getTestProjectDO());
+        Mockito.when(orcidPersonServiceImpl.read(any(String.class))).thenReturn(testDOFactory.getTestContributorDO());
     }
 
     @Test
-    void determinteDatasetIDsTest(){
+    void determineDatasetIDsTest() {
         DmpDO dmpDO = testDOFactory.getOrCreateTestDmpDO();
         exportSetup(dmpDO.getId());
         Assertions.assertEquals(datasetTableIDs.size(), datasets.size(), dmpDO.getDatasets().size());

diff --git a/src/test/java/at/ac/tuwien/damap/conversion/ExportFWFTemplateTest.java b/src/test/java/at/ac/tuwien/damap/conversion/ExportFWFTemplateTest.java
@@ -1,21 +1,21 @@
 package at.ac.tuwien.damap.conversion;
 
+import javax.inject.Inject;
+
+import org.apache.poi.xwpf.usermodel.XWPFDocument;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+import at.ac.tuwien.damap.TestSetup;
 import at.ac.tuwien.damap.rest.dmp.domain.DmpDO;
 import at.ac.tuwien.damap.rest.projects.MockProjectServiceImpl;
 import at.ac.tuwien.damap.util.TestDOFactory;
 import io.quarkus.test.junit.QuarkusTest;
 import io.quarkus.test.junit.mockito.InjectMock;
 import io.quarkus.test.security.TestSecurity;
-import org.apache.poi.xwpf.usermodel.XWPFDocument;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import javax.inject.Inject;
 
 @QuarkusTest
-class ExportFWFTemplateTest {
+class ExportFWFTemplateTest extends TestSetup {
 
     @Inject
     ExportFWFTemplate exportFWFTemplate;
@@ -26,13 +26,6 @@ class ExportFWFTemplateTest {
     @InjectMock
     MockProjectServiceImpl mockProjectService;
 
-    String projectId = "-1";
-
-    @BeforeEach
-    public void setup() {
-        Mockito.when(mockProjectService.read(projectId)).thenReturn(testDOFactory.getTestProjectDO());
-    }
-
     @Test
     @TestSecurity(authorizationEnabled = false)
     void testFWFTemplateDmp() {
@@ -52,7 +45,7 @@ void testFWFTemplateDmp() {
     void testEmptyFWFTemplateDmp() {
         final DmpDO emptyDmpDO = testDOFactory.getOrCreateTestDmpDOEmpty();
 
-        //testing the export document return not a null document
+        // testing the export document return not a null document
         XWPFDocument document = null;
         try {
             document = exportFWFTemplate.exportTemplate(emptyDmpDO.getId());

diff --git a/src/test/java/at/ac/tuwien/damap/conversion/ExportHorizonEuropeTemplateTest.java b/src/test/java/at/ac/tuwien/damap/conversion/ExportHorizonEuropeTemplateTest.java
@@ -1,5 +1,6 @@
 package at.ac.tuwien.damap.conversion;
 
+import at.ac.tuwien.damap.TestSetup;
 import at.ac.tuwien.damap.rest.dmp.domain.DmpDO;
 import at.ac.tuwien.damap.rest.projects.MockProjectServiceImpl;
 import at.ac.tuwien.damap.util.TestDOFactory;
@@ -8,14 +9,12 @@
 import io.quarkus.test.security.TestSecurity;
 import org.apache.poi.xwpf.usermodel.XWPFDocument;
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
 
 import javax.inject.Inject;
 
 @QuarkusTest
-class ExportHorizonEuropeTemplateTest {
+class ExportHorizonEuropeTemplateTest extends TestSetup {
 
     @Inject
     ExportHorizonEuropeTemplate exportHorizonEuropeTemplate;
@@ -26,13 +25,6 @@ class ExportHorizonEuropeTemplateTest {
     @InjectMock
     MockProjectServiceImpl mockProjectService;
 
-    String projectId = "-1";
-
-    @BeforeEach
-    public void setup() {
-        Mockito.when(mockProjectService.read(projectId)).thenReturn(testDOFactory.getTestProjectDO());
-    }
-
     @Test
     @TestSecurity(authorizationEnabled = false)
     void testTemplateDmp() {
@@ -52,7 +44,7 @@ void testTemplateDmp() {
     void testEmptyTemplateDmp() {
         final DmpDO emptyDmpDO = testDOFactory.getOrCreateTestDmpDOEmpty();
 
-        //testing the export document return not a null document
+        // testing the export document return not a null document
         XWPFDocument document = null;
         try {
             document = exportHorizonEuropeTemplate.exportTemplate(emptyDmpDO.getId());

diff --git a/src/test/java/at/ac/tuwien/damap/rest/AccessResourceTest.java b/src/test/java/at/ac/tuwien/damap/rest/AccessResourceTest.java
@@ -1,19 +1,13 @@
 package at.ac.tuwien.damap.rest;
 
+import at.ac.tuwien.damap.TestSetup;
 import at.ac.tuwien.damap.enums.EFunctionRole;
 import at.ac.tuwien.damap.rest.access.domain.AccessDO;
 import at.ac.tuwien.damap.rest.access.service.AccessService;
 import at.ac.tuwien.damap.rest.dmp.domain.ContributorDO;
-import at.ac.tuwien.damap.rest.dmp.domain.DmpDO;
-import at.ac.tuwien.damap.rest.persons.MockUniversityPersonServiceImpl;
-import at.ac.tuwien.damap.rest.persons.PersonService;
-import at.ac.tuwien.damap.security.SecurityService;
-import at.ac.tuwien.damap.util.TestDOFactory;
 import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.mockito.InjectMock;
 import io.quarkus.test.security.TestSecurity;
-import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.mockito.Mockito;
 
@@ -22,34 +16,13 @@
 
 import static io.restassured.RestAssured.given;
 import static org.hamcrest.Matchers.greaterThanOrEqualTo;
-import static org.mockito.ArgumentMatchers.any;
 
 @QuarkusTest
 @TestHTTPEndpoint(AccessResource.class)
-class AccessResourceTest {
-
-    @Inject
-    TestDOFactory testDOFactory;
+class AccessResourceTest extends TestSetup {
     @Inject
     AccessService accessService;
 
-    @InjectMock
-    SecurityService securityService;
-
-    @InjectMock
-    MockUniversityPersonServiceImpl personService;
-
-
-    DmpDO dmpDO;
-
-    @BeforeEach
-    public void setup() {
-        Mockito.when(securityService.getUserId()).thenReturn("012345");
-        Mockito.when(securityService.getUserName()).thenReturn("testUser");
-        Mockito.when(personService.read(any(String.class))).thenReturn(testDOFactory.getTestContributorDO());
-        dmpDO = testDOFactory.getOrCreateTestDmpDO();
-    }
-
     @Test
     @TestSecurity(user = "userJwt", roles = "user")
     void testGetAccessList_Valid() {

diff --git a/src/test/java/at/ac/tuwien/damap/rest/DataManagementPlanResourceTest.java b/src/test/java/at/ac/tuwien/damap/rest/DataManagementPlanResourceTest.java
@@ -1,43 +1,32 @@
 package at.ac.tuwien.damap.rest;
 
+import static io.restassured.RestAssured.given;
+import static org.hamcrest.Matchers.is;
+
+import javax.inject.Inject;
+import javax.ws.rs.core.MediaType;
+
+import org.junit.jupiter.api.Test;
+import org.mockito.Mockito;
+
+import at.ac.tuwien.damap.TestSetup;
 import at.ac.tuwien.damap.rest.dmp.domain.DmpDO;
 import at.ac.tuwien.damap.rest.version.VersionService;
-import at.ac.tuwien.damap.security.SecurityService;
 import at.ac.tuwien.damap.util.TestDOFactory;
 import io.quarkus.test.common.http.TestHTTPEndpoint;
 import io.quarkus.test.junit.QuarkusTest;
-import io.quarkus.test.junit.mockito.InjectMock;
 import io.quarkus.test.security.TestSecurity;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
-import org.junit.jupiter.api.Test;
-import org.mockito.Mockito;
-
-import javax.inject.Inject;
-import javax.ws.rs.core.MediaType;
-
-import static io.restassured.RestAssured.given;
-import static org.hamcrest.Matchers.is;
 
 @QuarkusTest
 @TestHTTPEndpoint(DataManagementPlanResource.class)
-class DataManagementPlanResourceTest {
+class DataManagementPlanResourceTest extends TestSetup {
 
     @Inject
     TestDOFactory testDOFactory;
 
     @Inject
     VersionService versionService;
 
-    @InjectMock
-    SecurityService securityService;
-
-    @BeforeEach
-    public void setup() {
-        Mockito.when(securityService.getUserId()).thenReturn("012345");
-        Mockito.when(securityService.getUserName()).thenReturn("testUser");
-    }
-
     @Test
     void testGetAllPlansEndpoint_Invalid() {
         given()
@@ -216,7 +205,9 @@ void testGetDmpByIdAndRevisionlanEndpoint_Valid() {
         testDOFactory.getOrCreateTestVersionDO();
         given()
                 .contentType(MediaType.APPLICATION_JSON)
-                .when().get("/" + dmpDO.getId() + "/" + versionService.getDmpVersions(dmpDO.getId()).get(0).getRevisionNumber())
+                .when()
+                .get("/" + dmpDO.getId() + "/"
+                        + versionService.getDmpVersions(dmpDO.getId()).get(0).getRevisionNumber())
                 .then()
                 .statusCode(200);
     }