From 69630c3af4560c4326b5e6210fdbee32896ea6db Mon Sep 17 00:00:00 2001 From: Azizbek Khushvakov Date: Thu, 7 Nov 2024 13:29:29 +0500 Subject: [PATCH 1/3] Fix permission related to mod-patron --- .../src/main/resources/vega/edge-patron/patron-junit.feature | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/edge-patron/src/main/resources/vega/edge-patron/patron-junit.feature b/edge-patron/src/main/resources/vega/edge-patron/patron-junit.feature index b9abab139..93cb1e053 100644 --- a/edge-patron/src/main/resources/vega/edge-patron/patron-junit.feature +++ b/edge-patron/src/main/resources/vega/edge-patron/patron-junit.feature @@ -30,12 +30,12 @@ Feature: edge-patron integration tests | 'owners.item.post' | | 'overdue-fines-policies.item.post' | | 'users.collection.get' | - | 'patron.account.item.post' | | 'usergroups.collection.get' | | 'addresstypes.collection.get' | | 'addresstypes.item.post' | + | 'patron.account.collection.get' | | 'patron.account.item.get' | - | 'patron.account.item.put' | + | 'patron.account-by-email.item.put' | * def testTenant = 'ttttpatron' From c693bc3ed2d90cd9ad9a2111b283aaf9295f09ec Mon Sep 17 00:00:00 2001 From: Azizbek Khushvakov Date: Thu, 7 Nov 2024 15:32:10 +0500 Subject: [PATCH 2/3] Fix permission related to mod-patron --- .../vega/mod-circulation/circulation-junit.feature | 8 +++++--- .../features/automatedPatronBlocks.feature | 4 ++-- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature b/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature index d75182f5e..c2640676e 100644 --- a/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature +++ b/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature @@ -50,7 +50,8 @@ Feature: mod-circulation integration tests | 'circulation.requests.hold-shelf-clearance-report.get' | | 'circulation.requests.item.get' | | 'circulation.requests.item.post' | - | 'circulation.requests.queue.reorder.collection.post' | + | 'circulation.requests.queue.item-reorder.collection.post' | + | 'circulation.requests.queue.instance-reorder.collection.post' | | 'circulation.requests.item.delete' | | 'configuration.entries.collection.get' | | 'configuration.entries.item.post' | @@ -110,7 +111,8 @@ Feature: mod-circulation integration tests | 'users.item.post' | | 'users.item.get' | | 'user-summary.item.get' | - | 'circulation.requests.queue.collection.get' | + | 'circulation.requests.queue-item.collection.get' | + | 'circulation.requests.queue-instance.collection.get' | | 'okapi.proxy.self.timers.patch' | | 'circulation.rules.loan-policy.get' | | 'circulation.rules.overdue-fine-policy.get' | @@ -124,7 +126,7 @@ Feature: mod-circulation integration tests | 'calendar.delete' | | 'circulation-storage.fixed-due-date-schedules.item.post' | | 'circulation-storage.loan-policies.item.get' | - | 'mod-settings.global.write.mod-circulation' | + | 'settings.global.write.circulation.execute' | | 'mod-settings.entries.item.post' | | 'circulation.settings.item.post' | | 'circulation.settings.item.delete' | diff --git a/mod-patron-blocks/src/main/resources/vega/mod-patron-blocks/features/automatedPatronBlocks.feature b/mod-patron-blocks/src/main/resources/vega/mod-patron-blocks/features/automatedPatronBlocks.feature index 41775d88e..c1f099a69 100644 --- a/mod-patron-blocks/src/main/resources/vega/mod-patron-blocks/features/automatedPatronBlocks.feature +++ b/mod-patron-blocks/src/main/resources/vega/mod-patron-blocks/features/automatedPatronBlocks.feature @@ -233,7 +233,7 @@ Feature: Automated patron blocks And request checkOutRequest When method POST Then status 422 - And match response.errors contains {"message": "Maximum number of overdue items has been reached!", "parameters": [], "code": "USER_IS_BLOCKED_AUTOMATICALLY", "overridableBlock": {"name": "patronBlock","missingPermissions": ["circulation.override-patron-block"]}} + And match response.errors contains {"message": "Maximum number of overdue items has been reached!", "parameters": [], "code": "USER_IS_BLOCKED_AUTOMATICALLY", "overridableBlock": {"name": "patronBlock","missingPermissions": ["circulation.override-patron-block.post"]}} Scenario: Renewing block exists when 'Max number of overdue items' limit is reached * def itemBarcode = uuid() @@ -261,7 +261,7 @@ Feature: Automated patron blocks And request renewRequest When method POST Then status 422 - And match response.errors contains {"message": "Maximum number of overdue items has been reached!", "parameters": [], "code": "USER_IS_BLOCKED_AUTOMATICALLY", "overridableBlock": {"name": "patronBlock","missingPermissions": ["circulation.override-patron-block"]}} + And match response.errors contains {"message": "Maximum number of overdue items has been reached!", "parameters": [], "code": "USER_IS_BLOCKED_AUTOMATICALLY", "overridableBlock": {"name": "patronBlock","missingPermissions": ["circulation.override-patron-block.post"]}} Scenario: Requesting block exists when 'Max number of overdue items' limit is reached * def maxNumberOfOverdueItems = 3 From 1b3c7a7ad1fd175abdb00a91f183c3ec1272ce74 Mon Sep 17 00:00:00 2001 From: Azizbek Khushvakov Date: Thu, 7 Nov 2024 17:26:00 +0500 Subject: [PATCH 3/3] Fix permission related to mod-feesfines --- .../mod-circulation/circulation-junit.feature | 6 ++++-- .../mod-feesfines/feesfines-junit.feature | 21 ++++++++++++------- 2 files changed, 18 insertions(+), 9 deletions(-) diff --git a/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature b/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature index c2640676e..d22f80679 100644 --- a/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature +++ b/mod-circulation/src/main/resources/vega/mod-circulation/circulation-junit.feature @@ -24,8 +24,10 @@ Feature: mod-circulation integration tests | name | | 'accounts.collection.get' | | 'accounts.item.put' | - | 'accounts.check-pay.post' | - | 'accounts.pay.post' | + | 'feesfines.accounts.check-pay.item.post' | + | 'feesfines.accounts-bulk.check-pay.item.post' | + | 'feesfines.accounts.pay.item.post' | + | 'feesfines.accounts-bulk.pay.item.post' | | 'automated-patron-blocks.collection.get' | | 'automated-patron-blocks.collection.get' | | 'check-in-storage.check-ins.collection.get' | diff --git a/mod-feesfines/src/main/resources/vega/mod-feesfines/feesfines-junit.feature b/mod-feesfines/src/main/resources/vega/mod-feesfines/feesfines-junit.feature index 1778b3f69..845d02a8e 100644 --- a/mod-feesfines/src/main/resources/vega/mod-feesfines/feesfines-junit.feature +++ b/mod-feesfines/src/main/resources/vega/mod-feesfines/feesfines-junit.feature @@ -31,13 +31,20 @@ Feature: mod-feesfines integration tests | 'accounts.item.put' | | 'accounts.item.delete' | | 'accounts.collection.get' | - | 'accounts.pay.post' | - | 'accounts.waive.post' | - | 'accounts.cancel.post' | - | 'accounts.refund.post' | - | 'accounts.transfer.post' | - | 'accounts.check-pay.post' | - | 'accounts.check-waive.post' | + | 'feesfines.accounts.pay.item.post' | + | 'feesfines.accounts-bulk.pay.item.post' | + | 'feesfines.accounts.waive.item.post' | + | 'feesfines.accounts-bulk.waive.item.post' | + | 'feesfines.accounts.cancel.item.post' | + | 'feesfines.accounts-bulk.cancel.item.post' | + | 'feesfines.accounts.refund.item.post' | + | 'feesfines.accounts-bulk.refund.item.post' | + | 'feesfines.accounts.transfer.item.post' | + | 'feesfines.accounts-bulk.transfer.item.post' | + | 'feesfines.accounts.check-pay.item.post' | + | 'feesfines.accounts-bulk.check-pay.item.post' | + | 'feesfines.accounts-bulk.check-waive.item.post' | + | 'feesfines.accounts.check-waive.item.post' | | 'accounts.check-transfer.post' | | 'accounts.check-refund.post' | | 'actual-cost-fee-fine-cancel.post' |