From f7921897cbbb5c30bceb19efcd5d2ad04ed4f9be Mon Sep 17 00:00:00 2001
From: Azizbek Khushvakov <113523904+azizbekxm@users.noreply.github.com>
Date: Fri, 22 Nov 2024 20:46:56 +0500
Subject: [PATCH 1/2] [CIRCSTORE-524] - Review and cleanup Module Descriptor
for mod-circulation-storage (#495)
* [CIRCSTORE-524] - Review and cleanup Module Descriptor for mod-circulation-storage
* Update permission name
---
descriptors/ModuleDescriptor-template.json | 9 +++++----
pom.xml | 15 +++++++++++++++
2 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
index 7dc9be02..c745cb6f 100644
--- a/descriptors/ModuleDescriptor-template.json
+++ b/descriptors/ModuleDescriptor-template.json
@@ -78,7 +78,7 @@
}, {
"methods": ["POST"],
"pathPattern": "/loan-storage/loans/anonymize/{userId}",
- "permissionsRequired": ["circulation-storage.loans.collection.anonymize.user.post"]
+ "permissionsRequired": ["circulation-storage.loans.anonymize.execute"]
}
]
},
@@ -757,9 +757,10 @@
"description": "Delete individual loan from storage"
},
{
- "permissionName": "circulation-storage.loans.collection.anonymize.user.post",
+ "permissionName": "circulation-storage.loans.anonymize.execute",
"displayName": "Circulation storage - anonymize loans for a user",
- "description": "Anonymize closed loans for a single user"
+ "description": "Anonymize closed loans for a single user",
+ "replaces": "circulation-storage.loans.collection.anonymize.user.post"
},
{
"permissionName": "anonymize-storage-loans.post",
@@ -1082,7 +1083,7 @@
"circulation-storage.loans.item.put",
"circulation-storage.loans.item.delete",
"circulation-storage.loans.collection.delete",
- "circulation-storage.loans.collection.anonymize.user.post",
+ "circulation-storage.loans.anonymize.execute",
"circulation-storage.loans-history.collection.get",
"circulation-storage.circulation-rules.get",
"circulation-storage.circulation-rules.put",
diff --git a/pom.xml b/pom.xml
index 4e911d1e..40555af2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,6 +31,9 @@
4.5.9
35.3.0
6.1.5
+
+
+ 1.0.0
@@ -513,6 +516,18 @@
+
+ org.folio
+ folio-module-descriptor-validator
+ ${folio-module-descriptor-validator.version}
+
+
+
+ validate
+
+
+
+
From 94078e9d2bc63310d8667c182614c79ad61f1216 Mon Sep 17 00:00:00 2001
From: Roman Barannyk <53909129+roman-barannyk@users.noreply.github.com>
Date: Fri, 22 Nov 2024 18:49:53 +0200
Subject: [PATCH 2/2] CIRCSTORE-524 Remove replaces (#497)
Merge pull request #140 from folio-org/RMB-724-RMB-718-totalRecords-none
RMB-724, RMB-718: totalRecords=exact/estimated/none/auto
---
descriptors/ModuleDescriptor-template.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
index c745cb6f..4e775f55 100644
--- a/descriptors/ModuleDescriptor-template.json
+++ b/descriptors/ModuleDescriptor-template.json
@@ -760,7 +760,7 @@
"permissionName": "circulation-storage.loans.anonymize.execute",
"displayName": "Circulation storage - anonymize loans for a user",
"description": "Anonymize closed loans for a single user",
- "replaces": "circulation-storage.loans.collection.anonymize.user.post"
+ "replaces": ["circulation-storage.loans.collection.anonymize.user.post"]
},
{
"permissionName": "anonymize-storage-loans.post",