hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-16 06:23:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

CST-12744 if Announce received, NotifyRequestsStatus won't give the element

Browse Source
This commit is contained in:
frabacche
2023-11-24 10:53:27 +01:00
parent 5bb75512b0
commit 37227c10c4
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
dspace-api/src/main/java/org/dspace/app/ldn/service/impl/LDNMessageServiceImpl.java
View File

@@ -299,8 +299,7 @@ public class LDNMessageServiceImpl implements LDNMessageService {
offer.setStatus(NotifyRequestStatusEnum.REQUESTED); offer.setStatus(NotifyRequestStatusEnum.REQUESTED);
} else if (acks.stream() } else if (acks.stream()
.filter(c -> (c.getActivityStreamType().equalsIgnoreCase("TentativeAccept") || .filter(c -> (c.getActivityStreamType().equalsIgnoreCase("TentativeAccept") ||
c.getActivityStreamType().equalsIgnoreCase("Accept") || c.getActivityStreamType().equalsIgnoreCase("Accept")))
c.getActivityStreamType().equalsIgnoreCase("Announce")))
.findAny().isPresent()) { .findAny().isPresent()) {
offer.setStatus(NotifyRequestStatusEnum.ACCEPTED); offer.setStatus(NotifyRequestStatusEnum.ACCEPTED);
} else if (acks.stream() } else if (acks.stream()
@@ -308,9 +307,13 @@ public class LDNMessageServiceImpl implements LDNMessageService {
.findAny().isPresent()) { .findAny().isPresent()) {
offer.setStatus(NotifyRequestStatusEnum.REJECTED); offer.setStatus(NotifyRequestStatusEnum.REJECTED);
} }
if (acks.stream().filter(
c -> c.getActivityStreamType().equalsIgnoreCase("Announce"))
.findAny().isEmpty()) {
result.addRequestStatus(offer); result.addRequestStatus(offer);
} }
} }
}
return result; return result;
} }