From 4ad823e6b1e567a3457b424d82308a08b5eaa355 Mon Sep 17 00:00:00 2001
From: Antony Hruschev <antony_hruschev@epam.com>
Date: Mon, 16 Dec 2024 13:49:50 +0400
Subject: [PATCH] Merge the changes for UXPROD-5001

---
 ramls/request.json                            |  4 +++
 .../org/folio/circulation/domain/Request.java |  5 +++
 .../resources/RequestNoticeSender.java        | 10 +++---
 .../resources/RequestNoticeSenderTest.java    | 36 +++++++++++++++++++
 4 files changed, 51 insertions(+), 4 deletions(-)
 create mode 100644 src/test/java/org/folio/circulation/resources/RequestNoticeSenderTest.java

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<RequestAndRelatedRecords> 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());
+  }
+}