diff --git a/pom.xml b/pom.xml
index de9cb8f84f..46f88a432d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,7 +2,7 @@
4.0.0
mod-circulation
org.folio
- 24.2.6-SNAPSHOT
+ 24.2.7-SNAPSHOT
Apache License 2.0
diff --git a/ramls/request.json b/ramls/request.json
index 9e38fe6c7f..7aca743f34 100644
--- a/ramls/request.json
+++ b/ramls/request.json
@@ -383,6 +383,10 @@
"description": "Request fields used for search",
"type": "object",
"$ref": "request-search-index.json"
+ },
+ "isDcbReRequestCancellation": {
+ "description": "Indicates whether the request was cancelled during a DCB transaction update",
+ "type": "boolean"
}
},
"additionalProperties": false,
diff --git a/src/main/java/org/folio/circulation/domain/Request.java b/src/main/java/org/folio/circulation/domain/Request.java
index 0774075a5b..afae370507 100644
--- a/src/main/java/org/folio/circulation/domain/Request.java
+++ b/src/main/java/org/folio/circulation/domain/Request.java
@@ -27,6 +27,7 @@
import static org.folio.circulation.domain.representations.RequestProperties.REQUEST_LEVEL;
import static org.folio.circulation.domain.representations.RequestProperties.REQUEST_TYPE;
import static org.folio.circulation.domain.representations.RequestProperties.STATUS;
+import static org.folio.circulation.support.json.JsonPropertyFetcher.getBooleanProperty;
import static org.folio.circulation.support.json.JsonPropertyFetcher.getDateTimeProperty;
import static org.folio.circulation.support.json.JsonPropertyFetcher.getIntegerProperty;
import static org.folio.circulation.support.json.JsonPropertyFetcher.getProperty;
@@ -406,6 +407,10 @@ public boolean hasLoan() {
return loan != null;
}
+ public boolean getDcbReRequestCancellationValue() {
+ return getBooleanProperty(requestRepresentation, "isDcbReRequestCancellation");
+ }
+
public enum Operation {
CREATE, REPLACE, MOVE;
}
diff --git a/src/main/java/org/folio/circulation/resources/RequestNoticeSender.java b/src/main/java/org/folio/circulation/resources/RequestNoticeSender.java
index abbf46c61e..a494a0c8b9 100644
--- a/src/main/java/org/folio/circulation/resources/RequestNoticeSender.java
+++ b/src/main/java/org/folio/circulation/resources/RequestNoticeSender.java
@@ -119,10 +119,12 @@ public Result sendNoticeOnRequestCancelled(
log.debug("sendNoticeOnRequestCancelled:: parameters records: {}", () -> records);
Request request = records.getRequest();
- if (request.hasItemId()) {
- sendCancellationNoticeForRequestWithItemId(request);
- } else {
- sendCancellationNoticeForRequestWithoutItemId(request);
+ if (!request.getDcbReRequestCancellationValue()) {
+ if (request.hasItemId()) {
+ sendCancellationNoticeForRequestWithItemId(request);
+ } else {
+ sendCancellationNoticeForRequestWithoutItemId(request);
+ }
}
return succeeded(records);
diff --git a/src/test/java/org/folio/circulation/resources/RequestNoticeSenderTest.java b/src/test/java/org/folio/circulation/resources/RequestNoticeSenderTest.java
new file mode 100644
index 0000000000..a742d50205
--- /dev/null
+++ b/src/test/java/org/folio/circulation/resources/RequestNoticeSenderTest.java
@@ -0,0 +1,36 @@
+package org.folio.circulation.resources;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.times;
+
+import org.folio.circulation.domain.Request;
+import org.folio.circulation.domain.RequestAndRelatedRecords;
+import org.folio.circulation.domain.notice.ImmediatePatronNoticeService;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Mockito;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import api.support.builders.RequestBuilder;
+import io.vertx.core.json.JsonObject;
+
+@ExtendWith(MockitoExtension.class)
+class RequestNoticeSenderTest {
+
+ @Mock
+ private ImmediatePatronNoticeService immediatePatronNoticeService;
+ @InjectMocks
+ private RequestNoticeSender requestNoticeSender;
+
+ @Test
+ void shouldNotSendNotificationWhenIsDcbCancellationTrue() {
+ JsonObject representation = new RequestBuilder().create();
+ representation.put("isDcbReRequestCancellation", true);
+ requestNoticeSender.sendNoticeOnRequestCancelled(
+ new RequestAndRelatedRecords(Request.from(representation)));
+ Mockito.verify(immediatePatronNoticeService, times(0)).acceptNoticeEvent(any());
+ Mockito.verify(immediatePatronNoticeService, times(0)).sendNotice(any(), any());
+ }
+}