Merged in CST-12820-coar-direct-to-the-service-url (pull request DSpa…

…ce#1367) CST-12820 fix service url on NotifyRequestStatus response
4Science · Nov 28, 2023 · 87c512f · 87c512f
2 parents 3b41cca + 5771aeb
commit 87c512f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java b/dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
@@ -291,7 +291,7 @@ public NotifyRequestStatus findRequestsByItem(Context context, Item item) throws
             for (LDNMessageEntity msg : msgs) {
                 RequestStatus offer = new RequestStatus();
                 offer.setServiceName(msg.getTarget() == null ? "Unknown Service" : msg.getTarget().getName());
-                offer.setServiceUrl(msg.getTarget() == null ? "" : msg.getTarget().getLdnUrl());
+                offer.setServiceUrl(msg.getTarget() == null ? "" : msg.getTarget().getUrl());
                 List<LDNMessageEntity> acks = ldnMessageDao.findAllRelatedMessagesByItem(
                     context, msg, item, "Accept", "TentativeReject", "TentativeAccept", "Announce");
                 if (acks == null || acks.isEmpty()) {

diff --git a/...-server-webapp/src/test/java/org/dspace/app/rest/NotifyRequestStatusRestControllerIT.java b/...-server-webapp/src/test/java/org/dspace/app/rest/NotifyRequestStatusRestControllerIT.java
@@ -92,6 +92,7 @@ public void oneStatusReviewedTest() throws Exception {
             .andExpect(jsonPath("$.notifyStatus").isArray())
             .andExpect(jsonPath("$.notifyStatus").isNotEmpty())
             .andExpect(jsonPath("$.notifyStatus[0].status").value("REQUESTED"))
+            .andExpect(jsonPath("$.notifyStatus[0].serviceUrl").value("https://review-service.com/inbox/about/"))
             ;
     }
 
@@ -159,6 +160,7 @@ public void oneStatusRejectedTest() throws Exception {
             .andExpect(jsonPath("$.notifyStatus").isArray())
             .andExpect(jsonPath("$.notifyStatus").isNotEmpty())
             .andExpect(jsonPath("$.notifyStatus[0].status").value("REJECTED"))
+            .andExpect(jsonPath("$.notifyStatus[0].serviceUrl").value("https://review-service.com/inbox/about/"))
             ;
     }
 }