Merged in coar-notify-7_CST-12744 (pull request DSpace#1347)

CST-12744 check Announce for Offer!
4Science · Nov 24, 2023 · 062b9ae · 062b9ae
2 parents 38b7be5 + 5bb7551
commit 062b9ae
Showing 1 changed file with 3 additions and 2 deletions.
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
@@ -294,12 +294,13 @@ public NotifyRequestStatus findRequestsByItem(Context context, Item item) throws
                 offer.setServiceName(msg.getTarget().getName());
                 offer.setServiceUrl(msg.getTarget().getLdnUrl());
                 List<LDNMessageEntity> acks = ldnMessageDao.findAllRelatedMessagesByItem(
-                    context, msg, item, "Accept", "TentativeReject", "TentativeAccept");
+                    context, msg, item, "Accept", "TentativeReject", "TentativeAccept", "Announce");
                 if (acks == null || acks.isEmpty()) {
                     offer.setStatus(NotifyRequestStatusEnum.REQUESTED);
                 } else if (acks.stream()
                     .filter(c -> (c.getActivityStreamType().equalsIgnoreCase("TentativeAccept") ||
-                        c.getActivityStreamType().equalsIgnoreCase("Accept")))
+                        c.getActivityStreamType().equalsIgnoreCase("Accept") ||
+                        c.getActivityStreamType().equalsIgnoreCase("Announce")))
                     .findAny().isPresent()) {
                     offer.setStatus(NotifyRequestStatusEnum.ACCEPTED);
                 } else if (acks.stream()