Tmp release 24.3.9 (#1539)

* CIRC-2198 Implement the code for the feature UXPROD-5001 (#1521) CIRC-2198 Implement the code for the feature UXPROD-5001 * Update NEWS.md * [maven-release-plugin] prepare release v24.3.9 * [maven-release-plugin] prepare for next development iteration --------- Co-authored-by: Antony Hruschev <[email protected]> Co-authored-by: Antony_Hruschev <[email protected]>
folio-org · Jan 17, 2025 · 4858ade · 4858ade
1 parent ea2e5bd
commit 4858ade
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 5 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,6 @@
+## 24.3.9 2025-01-17
+* Support DCB re-request (CIRC-2198)
+
 ## 24.3.8 2025-01-14
 * Fix TLR fetching issue for search slips (CIRC-2197)
 

diff --git a/pom.xml b/pom.xml
@@ -2,7 +2,7 @@
   <modelVersion>4.0.0</modelVersion>
   <artifactId>mod-circulation</artifactId>
   <groupId>org.folio</groupId>
-  <version>24.3.9-SNAPSHOT</version>
+  <version>24.3.10-SNAPSHOT</version>
   <licenses>
     <license>
       <name>Apache License 2.0</name>

diff --git a/ramls/request.json b/ramls/request.json
@@ -437,6 +437,10 @@
     "itemLocationCode": {
       "description": "Allow specifying item location when creating title-level requests",
       "type": "string"
+    },
+    "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
@@ -29,6 +29,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;
@@ -427,6 +428,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
@@ -120,10 +120,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
@@ -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());
+  }
+}