CIRC-2148: added lastPrintRequester in removeRelatedRecordInformation…

… for update request, reverted some permissions, added new printDetails fields in request.json
folio-org · Sep 13, 2024 · f7534b9 · f7534b9
1 parent b2d0ba8
commit f7534b9
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 8 deletions.
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -2065,9 +2065,7 @@
         "users.collection.get",
         "addresstypes.collection.get",
         "usergroups.collection.get",
-        "usergroups.item.get",
-        "print-events-storage.print-events-status.item.post",
-        "circulation-storage.circulation-settings.collection.get"
+        "usergroups.item.get"
       ],
       "visible": false
     },

diff --git a/ramls/examples/request.json b/ramls/examples/request.json
@@ -47,11 +47,13 @@
     "pickupServicePointName": "Circ Desk 1"
   },
   "printDetails": {
-    "count": 4,
-    "lastPrintedDate": "2024-07-29T11:54:07.000Z",
+    "printCount": 32,
+    "requesterId": "21457ab5-4635-4e56-906a-908f05e9233b",
+    "isPrinted": true,
+    "printEventDate": "2024-09-13T06:34:16.035+00:00",
     "lastPrintRequester": {
-      "lastName": "lastName",
       "firstName": "firstName",
+      "lastName": "lastName",
       "middleName": "middleName"
     }
   }

diff --git a/ramls/request.json b/ramls/request.json
@@ -363,12 +363,22 @@
       "type": "object",
       "readonly": true,
       "properties": {
-        "count": {
+        "printCount": {
           "description": "Total no of times the request is printed",
           "type": "integer",
           "readOnly": true
         },
-        "lastPrintedDate": {
+        "requesterId": {
+          "description": "User uuid of last print requester",
+          "type": "string",
+          "readOnly": true
+        },
+        "isPrinted": {
+          "description": "Whether the request is ever printed",
+          "type": "boolean",
+          "readOnly": true
+        },
+        "printEventDate": {
           "description": "Recent printed time of the request",
           "type": "string",
           "format": "date-time",

diff --git a/src/main/java/org/folio/circulation/resources/RequestFromRepresentationService.java b/src/main/java/org/folio/circulation/resources/RequestFromRepresentationService.java
@@ -578,6 +578,12 @@ private Request removeRelatedRecordInformation(Request request) {
     representation.remove("pickupServicePoint");
     representation.remove("deliveryAddress");
 
+    JsonObject printDetails = representation.getJsonObject("printDetails");
+    if (printDetails != null && printDetails.containsKey("lastPrintRequester")) {
+      printDetails.remove("lastPrintRequester");
+    }
+
+
     return request;
   }