Skip to content

CIRCSTORE-651: Re-enabling tenant overwrites circulation rules #572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
julianladisch merged 3 commits into from
Jun 23, 2026
Merged

CIRCSTORE-651: Re-enabling tenant overwrites circulation rules #572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f688041
CIRCSTORE-651: Re-enabling tenant overwrites circulation rules with d…
julianladisch May 12, 2026
11c6311
Merge branch 'master' into CIRCSTORE-651
roman-barannyk May 29, 2026
c22e0e8
Merge branch 'master' into CIRCSTORE-651
julianladisch Jun 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions reference-data/circulation-rules-storage/single-rule.json
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions src/main/java/org/folio/rest/impl/TenantRefAPI.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,6 @@ private Future<Integer> loadData(TenantAttributes attributes, Map<String, String
.add("request-policy-storage/request-policies")
.add("patron-notice-policy-storage/patron-notice-policies")
.add("staff-slips-storage/staff-slips")
.withIdRaw()
.add("circulation-rules-storage")
.withIdContent()
.add("cancellation-reason-storage/cancellation-reasons");
}
Expand Down
4 changes: 3 additions & 1 deletion ...pts/insertEmptyCirculationRulesRecord.sql → ..._scripts/insertCirculationRulesRecord.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ BEGIN
END IF;
END $$;
INSERT INTO ${myuniversity}_${mymodule}.${table.tableName}
SELECT id, jsonb_build_object('id', id, 'rulesAsText', '')
SELECT id, jsonb_build_object(
'id', id,
'rulesAsText', '"priority: number-of-criteria, criterium (t, s, c, b, a, m, g), last-line\nfallback-policy: l d9cd0bed-1b49-4b5e-a7bd-064b8d177231 r 334e5a9e-94f9-4673-8d1d-ab552863886b n 122b3d2b-4788-4f1e-9117-56daa91cb75c o cd3f6cac-fa17-4079-9fae-2fb28e521412 i ed892c0e-52e0-4cd9-8133-c0ef07b4a709 \nm 1a54b431-2e4f-452d-9cae-9cee66c9a892: l 43198de5-f56a-4a53-a0bd-5a324418967a r 334e5a9e-94f9-4673-8d1d-ab552863886b n 122b3d2b-4788-4f1e-9117-56daa91cb75c o cd3f6cac-fa17-4079-9fae-2fb28e521412 i ed892c0e-52e0-4cd9-8133-c0ef07b4a709"')
FROM (SELECT md5('${myuniversity}_${mymodule}.${table.tableName}.rulesAsText')::uuid AS id) AS alias
ON CONFLICT DO NOTHING;
2 changes: 1 addition & 1 deletion src/main/resources/templates/db_scripts/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@
"tableName": "circulation_rules",
"withMetadata": true,
"withAuditing": false,
"customSnippetPath": "insertEmptyCirculationRulesRecord.sql"
"customSnippetPath": "insertCirculationRulesRecord.sql"
},
{
"tableName": "staff_slips",
Expand Down
Loading