add path to mapi works endpoint (#7267)

auumgn · web-flow · commit 1768925ae9ad · 2025-03-31T11:39:31.000-06:00
diff --git a/orcid-api-web/src/main/java/org/orcid/api/memberV2/server/delegator/impl/MemberV2ApiServiceDelegatorImpl.java b/orcid-api-web/src/main/java/org/orcid/api/memberV2/server/delegator/impl/MemberV2ApiServiceDelegatorImpl.java
@@ -1088,6 +1088,7 @@ public Response viewBulkWorks(String orcid, String putCodes) {
         orcidSecurityManager.checkAndFilter(orcid, workBulk, ScopePathType.ORCID_WORKS_READ_LIMITED);
         contributorUtils.filterContributorPrivateData(workBulk);
         ActivityUtils.cleanEmptyFields(workBulk);
+        ActivityUtils.setPathToBulk(workBulk, orcid);
         sourceUtils.setSourceName(workBulk);
         return Response.ok(workBulk).build();
     }
diff --git a/orcid-api-web/src/main/java/org/orcid/api/memberV3/server/delegator/impl/MemberV3ApiServiceDelegatorImpl.java b/orcid-api-web/src/main/java/org/orcid/api/memberV3/server/delegator/impl/MemberV3ApiServiceDelegatorImpl.java
@@ -1202,6 +1202,7 @@ public Response viewBulkWorks(String orcid, String putCodes) {
         orcidSecurityManager.checkAndFilter(orcid, workBulk, ScopePathType.ORCID_WORKS_READ_LIMITED);
         contributorUtils.filterContributorPrivateData(workBulk);
         ActivityUtils.cleanEmptyFields(workBulk);
+        ActivityUtils.setPathToBulk(workBulk, orcid);
         sourceUtils.setSourceName(workBulk);
         return Response.ok(workBulk).build();
     }
diff --git a/orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceDelegator_WorksTest.java b/orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceDelegator_WorksTest.java
@@ -727,6 +727,9 @@ public void testViewBulkWorks() {
         assertTrue(workBulk.getBulk().get(1) instanceof Work);
         assertTrue(workBulk.getBulk().get(2) instanceof Work); // private work but matching source
         assertTrue(workBulk.getBulk().get(3) instanceof OrcidError); // private work not matching source
+        assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());
     }
     
     @Test
diff --git a/orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceVersionedDelegatorTest.java b/orcid-api-web/src/test/java/org/orcid/api/memberV2/server/delegator/MemberV2ApiServiceVersionedDelegatorTest.java
@@ -1558,8 +1558,11 @@ public void testViewBulkWorks() {
         assertTrue(workBulk.getBulk().get(1) instanceof Work);
         assertTrue(workBulk.getBulk().get(2) instanceof Work); // private work but matching source
         assertTrue(workBulk.getBulk().get(3) instanceof OrcidError); // private work not matching source
+        assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());
     }
-    
+
     @Test
     public void testViewBulkWorksWithBadPutCode() {
         SecurityContextTestUtils.setUpSecurityContext("0000-0000-0000-0003", ScopePathType.READ_LIMITED);
diff --git a/orcid-api-web/src/test/java/org/orcid/api/memberV3/server/delegator/MemberV3ApiServiceDelegatorErrorsTest.java b/orcid-api-web/src/test/java/org/orcid/api/memberV3/server/delegator/MemberV3ApiServiceDelegatorErrorsTest.java
@@ -1654,6 +1654,9 @@ public void testViewBulkWorks() {
                                                                      // work not
                                                                      // matching
                                                                      // source
+        assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());
     }
 
     @Test
diff --git a/orcid-api-web/src/test/java/org/orcid/api/memberV3/server/delegator/MemberV3ApiServiceDelegator_WorksTest.java b/orcid-api-web/src/test/java/org/orcid/api/memberV3/server/delegator/MemberV3ApiServiceDelegator_WorksTest.java
@@ -734,6 +734,9 @@ public void testViewBulkWorks() {
         assertTrue(workBulk.getBulk().get(1) instanceof Work);
         assertTrue(workBulk.getBulk().get(2) instanceof Work); // private work but matching source
         assertTrue(workBulk.getBulk().get(3) instanceof OrcidError); // private work not matching source
+        assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());
+        assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());
     }
     
     @Test

Original file line number	Diff line number	Diff line change
`@@ -1088,6 +1088,7 @@ public Response viewBulkWorks(String orcid, String putCodes) {`
`1088`	`1088`	`orcidSecurityManager.checkAndFilter(orcid, workBulk, ScopePathType.ORCID_WORKS_READ_LIMITED);`
`1089`	`1089`	`contributorUtils.filterContributorPrivateData(workBulk);`
`1090`	`1090`	`ActivityUtils.cleanEmptyFields(workBulk);`
	`1091`	`+ ActivityUtils.setPathToBulk(workBulk, orcid);`
`1091`	`1092`	`sourceUtils.setSourceName(workBulk);`
`1092`	`1093`	`return Response.ok(workBulk).build();`
`1093`	`1094`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1202,6 +1202,7 @@ public Response viewBulkWorks(String orcid, String putCodes) {`
`1202`	`1202`	`orcidSecurityManager.checkAndFilter(orcid, workBulk, ScopePathType.ORCID_WORKS_READ_LIMITED);`
`1203`	`1203`	`contributorUtils.filterContributorPrivateData(workBulk);`
`1204`	`1204`	`ActivityUtils.cleanEmptyFields(workBulk);`
	`1205`	`+ ActivityUtils.setPathToBulk(workBulk, orcid);`
`1205`	`1206`	`sourceUtils.setSourceName(workBulk);`
`1206`	`1207`	`return Response.ok(workBulk).build();`
`1207`	`1208`	`}`
Original file line number	Diff line number	Diff line change
`@@ -727,6 +727,9 @@ public void testViewBulkWorks() {`
`727`	`727`	`assertTrue(workBulk.getBulk().get(1) instanceof Work);`
`728`	`728`	`assertTrue(workBulk.getBulk().get(2) instanceof Work); // private work but matching source`
`729`	`729`	`assertTrue(workBulk.getBulk().get(3) instanceof OrcidError); // private work not matching source`
	`730`	`+ assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());`
	`731`	`+ assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());`
	`732`	`+ assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());`
`730`	`733`	`}`
`731`	`734`
`732`	`735`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -1654,6 +1654,9 @@ public void testViewBulkWorks() {`
`1654`	`1654`	`// work not`
`1655`	`1655`	`// matching`
`1656`	`1656`	`// source`
	`1657`	`+ assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());`
	`1658`	`+ assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());`
	`1659`	`+ assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());`
`1657`	`1660`	`}`
`1658`	`1661`
`1659`	`1662`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -734,6 +734,9 @@ public void testViewBulkWorks() {`
`734`	`734`	`assertTrue(workBulk.getBulk().get(1) instanceof Work);`
`735`	`735`	`assertTrue(workBulk.getBulk().get(2) instanceof Work); // private work but matching source`
`736`	`736`	`assertTrue(workBulk.getBulk().get(3) instanceof OrcidError); // private work not matching source`
	`737`	`+ assertEquals("/0000-0000-0000-0003/work/11", ((Work) workBulk.getBulk().get(0)).getPath());`
	`738`	`+ assertEquals("/0000-0000-0000-0003/work/12", ((Work) workBulk.getBulk().get(1)).getPath());`
	`739`	`+ assertEquals("/0000-0000-0000-0003/work/13", ((Work) workBulk.getBulk().get(2)).getPath());`
`737`	`740`	`}`
`738`	`741`
`739`	`742`	`@Test`