Merge pull request #8 from indexdata/CIRC-2136-floating-collections

Circ 2136 floating collections
indexdata · Oct 31, 2024 · 7d8665b · 7d8665b
2 parents 117459c + 0796048
commit 7d8665b
Show file tree

Hide file tree

Showing 43 changed files with 619 additions and 734 deletions.
diff --git a/.github/workflows/k8s-deploy-latest.yml b/.github/workflows/k8s-deploy-latest.yml
diff --git a/.github/workflows/mvn-dev-build-deploy.yml b/.github/workflows/mvn-dev-build-deploy.yml
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+## 24.3.0
+
+* [CIRC-2156](https://folio-org.atlassian.net/browse/CIRC-2156) Upgrade "holdings-storage" to 8.0
+
 ## 24.2.0 2024-03-21
 
 * Update `feesfines` interface version to 19.0 (CIRC-1914)

diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -1133,7 +1133,8 @@
             "accounts.item.post",
             "feefineactions.item.post",
             "circulation-storage.loans-history.collection.get",
-            "calendar.endpoint.dates.get"
+            "calendar.endpoint.calendars.surroundingOpenings.get",
+            "calendar.endpoint.calendars.allOpenings.get"
           ],
           "schedule": {
             "cron": "1 0 * * *",
@@ -1214,15 +1215,15 @@
     },
     {
       "id": "instance-storage",
-      "version": "4.0 5.0 6.0 7.0 8.0 9.0 10.0"
+      "version": "4.0 5.0 6.0 7.0 8.0 9.0 10.0 11.0"
     },
     {
       "id": "holdings-storage",
-      "version": "1.3 2.0 3.0 4.0 5.0 6.0 7.0"
+      "version": "1.3 2.0 3.0 4.0 5.0 6.0 7.0 8.0"
     },
     {
       "id": "request-storage",
-      "version": "6.0"
+      "version": "6.1"
     },
     {
       "id": "request-storage-batch",
@@ -1322,7 +1323,7 @@
     },
     {
       "id": "notes",
-      "version": "1.0 2.0 3.0"
+      "version": "4.0"
     },
     {
       "id": "actual-cost-record-storage",
@@ -1773,7 +1774,8 @@
         "proxiesfor.collection.get",
         "patron-notice.post",
         "configuration.entries.collection.get",
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "pubsub.publish.post",
         "circulation-storage.loans-history.collection.get"
       ],
@@ -1784,7 +1786,8 @@
       "displayName" : "module permissions for one op",
       "description" : "to reduce X-Okapi-Token size",
       "subPermissions": [
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "circulation-storage.loans.item.post",
         "circulation-storage.loans.item.get",
         "circulation-storage.loans.collection.get",
@@ -1881,7 +1884,8 @@
         "accounts.refund.post",
         "accounts.cancel.post",
         "configuration.entries.collection.get",
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "actual-cost-record-storage.actual-cost-records.collection.get",
         "actual-cost-record-storage.actual-cost-records.item.get",
         "actual-cost-fee-fine-cancel.post",
@@ -1917,7 +1921,8 @@
         "users.collection.get",
         "addresstypes.collection.get",
         "proxiesfor.collection.get",
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "configuration.entries.collection.get",
         "scheduled-notice-storage.scheduled-notices.collection.delete",
         "scheduled-notice-storage.scheduled-notices.item.post",
@@ -2065,9 +2070,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
     },
@@ -2101,7 +2104,8 @@
         "usergroups.item.get",
         "proxiesfor.collection.get",
         "patron-notice.post",
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "scheduled-notice-storage.scheduled-notices.collection.delete",
         "scheduled-notice-storage.scheduled-notices.item.post",
         "configuration.entries.collection.get",
@@ -2157,7 +2161,8 @@
       "displayName": "module permissions for one op",
       "description": "to reduce X-Okapi-Token size",
       "subPermissions": [
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "circulation-storage.loan-policies.item.get",
         "circulation-storage.loans.item.get",
         "circulation-storage.loans.item.put",
@@ -2261,7 +2266,8 @@
         "usergroups.item.get",
         "proxiesfor.collection.get",
         "patron-notice.post",
-        "calendar.endpoint.dates.get",
+        "calendar.endpoint.calendars.surroundingOpenings.get",
+        "calendar.endpoint.calendars.allOpenings.get",
         "configuration.entries.collection.get",
         "scheduled-notice-storage.scheduled-notices.collection.delete",
         "scheduled-notice-storage.scheduled-notices.item.post",
@@ -2294,7 +2300,6 @@
         "pubsub.publish.post",
         "note.types.collection.get",
         "notes.item.post",
-        "notes.domain.all",
         "actual-cost-record-storage.actual-cost-records.item.post",
         "actual-cost-record-storage.actual-cost-records.collection.get",
         "actual-cost-record-storage.actual-cost-records.item.get",
@@ -2370,7 +2375,6 @@
         "addresstypes.collection.get",
         "notes.item.post",
         "note.types.collection.get",
-        "notes.domain.all",
         "pubsub.publish.post"
       ],
       "visible": false
@@ -2447,6 +2451,10 @@
         "circulation.internal.fetch-items",
         "circulation-storage.requests.item.get",
         "circulation-storage.requests.collection.get",
+        "inventory-storage.holdings.item.get",
+        "inventory-storage.holdings.collection.get",
+        "inventory-storage.instances.item.get",
+        "inventory-storage.instances.collection.get",
         "users.item.get",
         "users.collection.get",
         "addresstypes.item.get",

diff --git a/pom.xml b/pom.xml
@@ -25,7 +25,7 @@
   <properties>
     <antlr4.version>4.11.1</antlr4.version>
     <drools.version>7.74.1.Final</drools.version>
-    <rmb.version>35.2.0</rmb.version>
+    <rmb.version>35.3.0</rmb.version>
     <vertx.version>4.5.5</vertx.version>
     <log4j2.version>2.23.1</log4j2.version>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -106,7 +106,12 @@
     <dependency>
       <groupId>org.apache.commons</groupId>
       <artifactId>commons-lang3</artifactId>
-      <version>3.12.0</version>
+      <version>3.17.0</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>2.17.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>

diff --git a/ramls/circulation-rules.raml b/ramls/circulation-rules.raml
@@ -12,9 +12,6 @@ types:
   error: !include raml-util/schemas/error.schema
   errors: !include raml-util/schemas/errors.schema
 
-traits:
-  language: !include raml-util/traits/language.raml
-
 /circulation:
   /rules:
     displayName: Circulation rules

diff --git a/ramls/circulation-settings.raml b/ramls/circulation-settings.raml
@@ -9,7 +9,6 @@ documentation:
     content: <b>API for circulation settings</b>
 
 traits:
-  language: !include raml-util/traits/language.raml
   pageable: !include raml-util/traits/pageable.raml
   searchable: !include raml-util/traits/searchable.raml
   validate: !include raml-util/traits/validation.raml