[MODFIN-358] - Add tenantId to the locations schema for restrict by F…

…und functionality (#406) [MODFIN-358] - Add tenantId to the locations schema for restrict by Fund functionality
folio-org · Apr 11, 2024 · 33cf0d1 · 33cf0d1
1 parent 37a57c3
commit 33cf0d1
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -164,7 +164,7 @@
     },
     {
       "id": "finance-storage.funds",
-      "version": "4.0",
+      "version": "5.0",
       "handlers": [
         {
           "methods": ["GET"],

diff --git a/ramls/acq-models b/ramls/acq-models
diff --git a/src/main/resources/templates/db_scripts/budget_encumbrances_rollover.sql b/src/main/resources/templates/db_scripts/budget_encumbrances_rollover.sql
@@ -542,7 +542,7 @@ CREATE OR REPLACE FUNCTION ${myuniversity}_${mymodule}.budget_encumbrances_rollo
                         'fundTypeName', fund_type->'name',
                         'acqUnitIds', fund->'acqUnitIds',
                         'donorOrganizationIds', fund->'donorOrganizationIds',
-                        'locationIds', fund->'locationIds',
+                        'locations', fund->'locations',
                         'allocatedFromIds', fund->'allocatedFromIds',
                         'allocatedFromNames', allocatedFromNames,
                         'allocatedToIds', fund->'allocatedToIds',

diff --git a/src/main/resources/templates/db_scripts/migration/transform_location_ids_array.sql b/src/main/resources/templates/db_scripts/migration/transform_location_ids_array.sql
@@ -0,0 +1,8 @@
+-- Transform locationIds arrays to array of objects with locationId field inside them
+UPDATE ${myuniversity}_${mymodule}.fund
+SET jsonb = jsonb - 'locationIds' || jsonb_build_object(
+  'locations',
+  CASE WHEN jsonb->>'locationIds' = '[]' THEN '[]' ELSE
+  (SELECT jsonb_agg(jsonb_build_object('locationId', value)) from jsonb_array_elements(jsonb->'locationIds')) END
+  )
+WHERE jsonb ? 'locationIds';
diff --git a/src/main/resources/templates/db_scripts/schema.json b/src/main/resources/templates/db_scripts/schema.json
@@ -90,6 +90,11 @@
       "run": "after",
       "snippetPath": "migration/update_budget_rollover.sql",
       "fromModuleVersion": "mod-finance-storage-8.4.0"
+    },
+    {
+      "run": "after",
+      "snippetPath": "migration/transform_location_ids_array.sql",
+      "fromModuleVersion": "mod-finance-storage-8.7.0"
     }
   ],
   "tables": [
+7 −3		mod-finance/examples/fund.sample
+7 −3		mod-finance/examples/fund_collection.sample
+7 −3		mod-finance/examples/fund_details.sample
+17 −4		mod-finance/schemas/fund.json
+17 −4		mod-finance/schemas/fund_details.json