Merge branch 'master' into tmp-release-17.3.3

ramls/request.json

@@ -282,6 +282,10 @@
     "itemLocationCode": {
       "description": "Allow specifying item location when creating title-level requests",
       "type": "string"
+    },
+    "isDcbReRequestCancellation": {
+      "description": "Indicates if the request was cancelled during a DCB transaction update. This determines whether the Kafka event will be handled and if an email notification will be sent",
+      "type": "boolean"
     }
   },
   "additionalProperties": false,

src/main/resources/templates/db_scripts/createIsbnFunctions.sql

@@ -1,8 +1,8 @@
 -- Usage: SELECT normalize_isbns(jsonb->'identifiers') FROM instance
 -- This takes each ISBN, normalizes it using RMB's normalize_digits(text),
 -- and concatenates the results using a space as separator.
-CREATE OR REPLACE FUNCTION normalize_isbns(jsonb_array jsonb) RETURNS text AS $$
-  SELECT string_agg(normalize_digits(identifiers->>'value'), ' ')
+CREATE OR REPLACE FUNCTION ${myuniversity}_${mymodule}.normalize_isbns(jsonb_array jsonb) RETURNS text AS $$
+SELECT string_agg(${myuniversity}_${mymodule}.normalize_digits(identifiers->>'value'), ' ')
   FROM jsonb_array_elements($1) as identifiers
   WHERE identifiers->>'identifierTypeId' = '8261054f-be78-422d-bd51-4ed9f33c3422';
 $$ LANGUAGE sql IMMUTABLE PARALLEL SAFE STRICT;

src/test/java/org/folio/rest/api/RequestUpdateTriggerTest.java

@@ -22,12 +22,14 @@
 import io.vertx.core.json.JsonObject;
 import io.vertx.sqlclient.Row;
 import io.vertx.sqlclient.RowSet;
+import lombok.SneakyThrows;
 
 import org.joda.time.DateTime;
 import org.joda.time.Seconds;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.CsvSource;
 
@@ -55,6 +57,31 @@ void beforeEach() throws MalformedURLException {
     StorageTestSuite.deleteAll(requestStorageUrl());
   }
 
+  @Test
+  @SneakyThrows
+  void isDcbReRequestCancellationShouldBePresentAfterRequestUpdated() {
+    CompletableFuture<JsonObject> future = new CompletableFuture<>();
+
+    String id = "3a57dc83-e70d-404b-b1f1-442b88760331";
+    Request request = new Request()
+      .withStatus(fromValue(Request.Status.OPEN_NOT_YET_FILLED.toString()));
+
+    assertThat(request.getIsDcbReRequestCancellation(), is(nullValue()));
+
+    saveRequest(id, request)
+      .compose(v -> updateRequest(id, request
+        .withStatus(fromValue(Request.Status.CLOSED_CANCELLED.toString()))
+        .withIsDcbReRequestCancellation(Boolean.TRUE)))
+      .compose(v -> getRequest(id))
+      .onComplete(updatedRequest -> future.complete(updatedRequest.result()));
+
+    JsonObject updatedRequest = future.get(5, TimeUnit.SECONDS);
+
+    assertThat(updatedRequest.getString("isDcbReRequestCancellation"),
+      is(notNullValue()));
+
+  }
+
   @ParameterizedTest
   @CsvSource(value = {
     "Open - Awaiting pickup | Closed - Pickup expired",