From 637c1cf18360644be0845d5bca0284b31047ae74 Mon Sep 17 00:00:00 2001 From: Jeff Godin Date: Fri, 14 Apr 2017 10:21:40 -0400 Subject: [PATCH] LP#1378829 Fix long overdue override permission Fix override permission used when checking in a copy that is "long overdue". The existing permission was incorrectly created with a code of COPY_STATUS_LONGOVERDUE.override, while the event thrown requires a permission with a code of COPY_STATUS_LONG_OVERDUE.override This commit updates the seed data and a few references to the old/incorrect permission in documentation, and also includes an upgrade script designed to accommodate the various likely ways in which sites may have already locally addressed this issue. A simple pgtap test is also included. Signed-off-by: Jeff Godin Signed-off-by: Jason Stephenson --- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 2 +- .../t/regress/lp1378829_fix_long_overdue_perm.pg | 11 +++ .../Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql | 101 +++++++++++++++++++++ docs/circulation/circulating_items.adoc | 2 +- docs/circulation/circulating_items_web_client.adoc | 2 +- 5 files changed, 115 insertions(+), 3 deletions(-) create mode 100644 Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg create mode 100644 Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 2aa29c30e1..91e2306b4a 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1597,7 +1597,7 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES 'When granted, newly added lineitem identifiers will propagate to linked bib records', 'ppl', 'description')), ( 548, 'ACQ_SET_LINEITEM_IDENTIFIER', oils_i18n_gettext(548, 'Allows staff to change the lineitem identifier', 'ppl', 'description')), - ( 549, 'COPY_STATUS_LONGOVERDUE.override', oils_i18n_gettext(549, + ( 549, 'COPY_STATUS_LONG_OVERDUE.override', oils_i18n_gettext(549, 'Allows the user to check-in long-overdue items, prompting ' || 'long-overdue check-in processing', 'ppl', 'code')), ( 550, 'SET_CIRC_LONG_OVERDUE', oils_i18n_gettext(550, diff --git a/Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg b/Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg new file mode 100644 index 0000000000..0753c7e18f --- /dev/null +++ b/Open-ILS/src/sql/Pg/t/regress/lp1378829_fix_long_overdue_perm.pg @@ -0,0 +1,11 @@ +BEGIN; + +SELECT plan(1); + +SELECT is( code, 'COPY_STATUS_LONG_OVERDUE.override', 'Long overdue override perm is correct' ) +FROM permission.perm_list +WHERE id = 549; + +SELECT * from finish(); + +ROLLBACK; diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql new file mode 100644 index 0000000000..795f328c4f --- /dev/null +++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fix_long_overdue_perm.sql @@ -0,0 +1,101 @@ +-- Evergreen DB patch XXXX.data.fix_long_overdue_perm.sql +-- +-- Update permission 549 to have a "code" value that matches what +-- the Perl code references +-- +BEGIN; + + +-- check whether patch can be applied +SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); -- jeff + +-- For some time now, the database seed data / upgrade scripts have created +-- a permission with id 549 and code COPY_STATUS_LONGOVERDUE.override, while +-- the Perl code references a permission with code +-- COPY_STATUS_LONG_OVERDUE.override +-- +-- Below, we attempt to handle at least three possible database states: +-- +-- 1) no corrective action has been taken, permission exists with id 549 and +-- code COPY_STATUS_LONGOVERDUE.override +-- +-- 2) permission with id 549 has already been updated to have code +-- COPY_STATUS_LONG_OVERDUE.override +-- +-- 3) new permission with unknown id and code COPY_STATUS_LONG_OVERDUE.override +-- has been added, and potentially assigned to users/groups +-- +-- In the case of 3, users and groups may have been assigned both perm id 549 +-- and the local permission of unknown id. +-- +-- The desired end result is that we should have a permission.perm_list +-- entry with id 549 and code COPY_STATUS_LONG_OVERDUE.override, +-- any locally-created permission with that same code but a different id +-- is deleted, and any users or groups that had been granted that locally-created +-- permission (by id) have been granted permission id 549 if not already granted. +-- +-- If for some reason the permission at id 549 has an unexpected value for "code", +-- the end result of this upgrade script should be a no-op. + +-- grant permission 549 to any group that +-- has a potentially locally-added perm +-- with code COPY_STATUS_LONG_OVERDUE.override +WITH new_grp_perms AS ( +SELECT grp, 549 AS perm, depth, grantable +FROM permission.grp_perm_map pgpm +JOIN permission.perm_list ppl ON ppl.id = pgpm.perm +WHERE ppl.code = 'COPY_STATUS_LONG_OVERDUE.override' +-- short circuit if perm id 549 exists and doesn't have the expected code +AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override') +-- don't try to assign perm 549 if already assigned +AND NOT EXISTS (SELECT 1 FROM permission.grp_perm_map pgpm2 WHERE pgpm2.grp = pgpm.grp AND pgpm2.perm = 549) +) +INSERT INTO permission.grp_perm_map +(grp, perm, depth, grantable) +SELECT grp, perm, depth, grantable +FROM new_grp_perms; + +-- grant permission 549 to any user that +-- has a potentially locally-added perm +-- with code COPY_STATUS_LONG_OVERDUE.override +WITH new_usr_perms AS ( +SELECT usr, 549 AS perm, depth, grantable +FROM permission.usr_perm_map pupm +JOIN permission.perm_list ppl ON ppl.id = pupm.perm +WHERE ppl.code = 'COPY_STATUS_LONG_OVERDUE.override' +-- short circuit if perm id 549 exists and doesn't have the expected code +AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override') +-- don't try to assign perm 549 if already assigned +AND NOT EXISTS (SELECT 1 FROM permission.usr_perm_map pupm2 WHERE pupm2.usr = pupm.usr AND pupm2.perm = 549) +) +INSERT INTO permission.usr_perm_map +(usr, perm, depth, grantable) +SELECT usr, perm, depth, grantable +FROM new_usr_perms; + +-- delete any group assignments of the locally-added perm +DELETE FROM permission.grp_perm_map +WHERE perm = (SELECT id FROM permission.perm_list WHERE code = 'COPY_STATUS_LONG_OVERDUE.override' AND id <> 549) +-- short circuit if perm id 549 exists and doesn't have the expected code +AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override'); + +-- delete any user assignments of the locally-added perm +DELETE FROM permission.usr_perm_map +WHERE perm = (SELECT id FROM permission.perm_list WHERE code = 'COPY_STATUS_LONG_OVERDUE.override' AND id <> 549) +-- short circuit if perm id 549 exists and doesn't have the expected code +AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override'); + +-- delete the locally-added perm, if any +DELETE FROM permission.perm_list +WHERE code = 'COPY_STATUS_LONG_OVERDUE.override' +AND id <> 549 +-- short circuit if perm id 549 exists and doesn't have the expected code +AND EXISTS (SELECT 1 FROM permission.perm_list ppl WHERE ppl.id = 549 and ppl.code = 'COPY_STATUS_LONGOVERDUE.override'); + +-- update perm id 549 to the correct code, if not already +UPDATE permission.perm_list +SET code = 'COPY_STATUS_LONG_OVERDUE.override' +WHERE id = 549 +AND code = 'COPY_STATUS_LONGOVERDUE.override'; + +COMMIT; diff --git a/docs/circulation/circulating_items.adoc b/docs/circulation/circulating_items.adoc index 7f3fc0c43c..0cd332e471 100644 --- a/docs/circulation/circulating_items.adoc +++ b/docs/circulation/circulating_items.adoc @@ -427,7 +427,7 @@ lost copy on the patron record when it is paid The following permissions are related to this feature: -* COPY_STATUS_LONGOVERDUE.override +* COPY_STATUS_LONG_OVERDUE.override ** Allows the user to check-in long-overdue items thus removing the long-overdue status on the item diff --git a/docs/circulation/circulating_items_web_client.adoc b/docs/circulation/circulating_items_web_client.adoc index a26f2b2f8d..146b898406 100644 --- a/docs/circulation/circulating_items_web_client.adoc +++ b/docs/circulation/circulating_items_web_client.adoc @@ -401,7 +401,7 @@ The following Library Settings enable you to set preferences related to long ove The following permissions are related to this feature: -* COPY_STATUS_LONGOVERDUE.override +* COPY_STATUS_LONG_OVERDUE.override ** Allows the user to check-in long-overdue items thus removing the long-overdue status on the item -- 2.11.0