|
Description
Pedro Amorim
2025-07-25 14:23:24 UTC
Created attachment 184640 [details] [review] Bug 40517: Add hold groups relationship to patron Created attachment 184641 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Created attachment 184642 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Created attachment 184643 [details] [review] Bug 40517: Add visual_group_id to hold_groups Created attachment 184644 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Created attachment 184645 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Created attachment 184646 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Comment on attachment 184641 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Review of attachment 184641 [details] [review]: ----------------------------------------------------------------- ::: reserve/placerequest.pl @@ +140,1 @@ > hold_group_id => $hold_group ? $hold_group->id : undef, I haven't tried yet but guessing this line needs to be removed? @@ +165,1 @@ > hold_group_id => $hold_group ? $hold_group->id : undef, I haven't tried yet but guessing this line needs to be removed? Apologies for my delay on this one. I've run out of time today for a meaningful review, but I will take a look at this one and bug 40395. (In reply to David Cook from comment #8) > Comment on attachment 184641 [details] [review] [review] > Bug 40517: Move creation of hold group into Patron class. Add exceptions > > Review of attachment 184641 [details] [review] [review]: > ----------------------------------------------------------------- > > ::: reserve/placerequest.pl > @@ +140,1 @@ > > hold_group_id => $hold_group ? $hold_group->id : undef, > > I haven't tried yet but guessing this line needs to be removed? > > @@ +165,1 @@ > > hold_group_id => $hold_group ? $hold_group->id : undef, > > I haven't tried yet but guessing this line needs to be removed? Good spot, yes most definitely an oversight, these should be removed. I'll correct. Created attachment 184729 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Created attachment 184732 [details] [review] Bug 40517: Add hold groups relationship to patron Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184733 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184734 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184735 [details] [review] Bug 40517: Add visual_group_id to hold_groups Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184736 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184737 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184738 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 184739 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 185217 [details] [review] Bug 40517: (QA follow-up): Fix 'group selected' button active with just 1 hold selected This fixes the following bug: 1) Select 1 hold, notice the 'group selected' button is still disabled 2) Select a 2nd hold, notice the 'group selected' button becomes enabled 3) Unselect one of the holds, notice the 'group select' is kept enabled (this is wrong, it should become disabled) Pedro, can you please give this a rebase? I started QA but hit more merge errors than I was entirely comfortable sorting out on my own. Created attachment 186672 [details] [review] Bug 40517: Add hold groups relationship to patron Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186673 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186674 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186675 [details] [review] Bug 40517: Add visual_group_id to hold_groups Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186676 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186677 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186678 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186679 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Created attachment 186680 [details] [review] Bug 40517: (QA follow-up): Fix 'group selected' button active with just 1 hold selected This fixes the following bug: 1) Select 1 hold, notice the 'group selected' button is still disabled 2) Select a 2nd hold, notice the 'group selected' button becomes enabled 3) Unselect one of the holds, notice the 'group select' is kept enabled (this is wrong, it should become disabled) Created attachment 186745 [details] [review] Bug 40517: Add hold groups relationship to patron Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186746 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186747 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186748 [details] [review] Bug 40517: Add visual_group_id to hold_groups Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186749 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186750 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186751 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186752 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 186753 [details] [review] Bug 40517: (QA follow-up): Fix 'group selected' button active with just 1 hold selected This fixes the following bug: 1) Select 1 hold, notice the 'group selected' button is still disabled 2) Select a 2nd hold, notice the 'group selected' button becomes enabled 3) Unselect one of the holds, notice the 'group select' is kept enabled (this is wrong, it should become disabled) Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Can you separate the schema changes from the other database updates? Created attachment 187789 [details] [review] Bug 40517: Add hold groups relationship to patron Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187790 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187791 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187792 [details] [review] Bug 40517: Add visual_group_id to hold_groups Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187793 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187794 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187795 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187796 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187797 [details] [review] Bug 40517: (QA follow-up): Fix 'group selected' button active with just 1 hold selected This fixes the following bug: 1) Select 1 hold, notice the 'group selected' button is still disabled 2) Select a 2nd hold, notice the 'group selected' button becomes enabled 3) Unselect one of the holds, notice the 'group select' is kept enabled (this is wrong, it should become disabled) Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187801 [details] [review] Bug 40517: dbic Created attachment 187802 [details] [review] Bug 40517: DB changes Created attachment 187803 [details] [review] Bug 40517: atomicupdate Created attachment 187804 [details] [review] Bug 40517: Add hold groups relationship to patron Created attachment 187805 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187806 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187807 [details] [review] Bug 40517: Add visual_group_id to hold_groups Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187808 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187809 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187810 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187811 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187812 [details] [review] Bug 40517: (QA follow-up): Fix 'group selected' button active with just 1 hold selected This fixes the following bug: 1) Select 1 hold, notice the 'group selected' button is still disabled 2) Select a 2nd hold, notice the 'group selected' button becomes enabled 3) Unselect one of the holds, notice the 'group select' is kept enabled (this is wrong, it should become disabled) Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187965 [details] [review] Bug 40517: dbic Created attachment 187966 [details] [review] Bug 40517: DB changes Created attachment 187967 [details] [review] Bug 40517: atomicupdate Created attachment 187968 [details] [review] Bug 40517: Add hold groups relationship to patron Created attachment 187969 [details] [review] Bug 40517: Move creation of hold group into Patron class. Add exceptions Refactor: Update controller logic to make use of patron->create_hold_group This ensures consistency when creating a new hold group for a patron, regardless if on the Staff UI or REST API Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187970 [details] [review] Bug 40517: REST API: Hold groups endpoint list and add actions: /patrons/{patron_id}/hold_groups New test file: prove t/db_dependent/api/v1/patrons_hold_groups.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187971 [details] [review] Bug 40517: Add visual_group_id to hold_groups Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187972 [details] [review] Bug 40517: Patron holds table: Add 'group selected holds' functionality This adds the UI elements required to group selected holds from the patron pages as well as 2 new concepts: Visual group ID: The visual group ID is designed to be easy to understand from a UI/UX perspective and not show the user an indefinitely incremented value. When holds are cancelled, filled or moved to a different group, if the old group is left empty or with a single hold, the hold group is deleted. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187973 [details] [review] Bug 40517: Patron page holds table buttons rearrangement This table now has 4 total buttons, 3 of which relate to a selection of holds. Rearranging the buttons is now necessary to present them nicely. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187974 [details] [review] Bug 40517: Add unit tests Run the updated test file: prove ./t/db_dependent/Koha/Patron.t Relevant tests worth running to ensure no regressions are added to existing covered functionality: prove ./t/db_dependent/Circulation* prove ./t/db_dependent/Hold* prove ./t/db_dependent/Reserves* Test plan, k-t-d: 1) Apply patches, enable DisplayAddHoldGroups system preference 2) Do a search for 'test': <staff_url>/cgi-bin/koha/catalogue/search.pl?q=test 3) Click the 'Select all' link at the top of the search results, click the 'Place hold' button. 4) Enter the 'koha' user 5) Pick a pickup location for each of the holds and click 'Place holds'. 6) Visit the 'koha' patron: <staff_url>/cgi-bin/koha/members/moremember.pl?borrowernumber=51 7) Click the 'holds' tab. Notice a new 'Group selected' button now exists 8) Pick any number of holds (more than 2) and click the 'Group selected' button. Confirm 9) Notice the hold group shows '1'. If you click on it you're presented the hold group modal. 10) Group multiple holds multiple times. 11) Notice you can't group a hold that has already been found. 12) Notice you can't click the 'Group selected' button unless at least 2 holds are selected. 13) Notice a hold group is deleted if left with 0 or 1 hold e.g. make a group of 2 holds, cancel 1, notice the remaining hold is left without a group. prove t/db_dependent/api/v1/patrons_hold_groups.t prove t/db_dependent/Koha/Patron.t Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187975 [details] [review] Bug 40517: (QA follow-up): Cleanup obsolete code The patch 'Move creation of hold group into Patron class' is moving the creation of the hold group logic to the Patron.pm class file but it didn't remove all the obsolete code. This is fixed here. Signed-off-by: Anneli <anneli.osterman@koha-suomi.fi> Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 187976 [details] [review] Bug 40517: (QA follow-up): Fix 'group selected' button active with just 1 hold selected This fixes the following bug: 1) Select 1 hold, notice the 'group selected' button is still disabled 2) Select a 2nd hold, notice the 'group selected' button becomes enabled 3) Unselect one of the holds, notice the 'group select' is kept enabled (this is wrong, it should become disabled) Signed-off-by: Andrew Fuerste Henry <andrew@bywatersolutions.com> Created attachment 188293 [details] [review] Bug 40517: (follow-up) Add a new line to EOF Created attachment 188294 [details] [review] Bug 40517: (follow-up) Fix GNU license links With this patchset applied xt/api.t fails:
kohadev-koha@kohadevbox:koha(main)$ prove -v xt/api.t
xt/api.t ..
1..8
ok 1 - GET /api/v1/
ok 2
# Subtest: The spec passes the swagger-cli validation
1..1
not ok 1 - Validation exit code is 0
# Failed test 'Validation exit code is 0'
# at xt/api.t line 103.
# got: '256'
# expected: '0'
# Validation failed. /paths/patrons/{patron_id}/hold_groups/post is missing path parameter(s) for {patron_id}
# Looks like you failed 1 test of 1.
not ok 3 - The spec passes the swagger-cli validation
# Failed test 'The spec passes the swagger-cli validation'
# at xt/api.t line 108.
# Subtest: tags tests
1..1
not ok 1 - No tag errors in the spec
# Failed test 'No tag errors in the spec'
# at xt/api.t line 130.
# Structures begin differing at:
# $got->[0] = 'get /patrons/{patron_id}/hold_groups -> uses tag 'hold_groups' not present in top level list'
# $expected->[0] = Does not exist
get /patrons/{patron_id}/hold_groups -> uses tag 'hold_groups' not present in top level list
post /patrons/{patron_id}/hold_groups -> uses tag 'hold_groups' not present in top level list
# Looks like you failed 1 test of 1.
not ok 4 - tags tests
# Subtest: 400 response tests
# Failed test 'tags tests'
# at xt/api.t line 135.
1..1
ok 1 - No errors in 400 definitions in the spec
ok 5 - 400 response tests
# Subtest: POST (201) have location header
Created attachment 188343 [details] [review] Bug 40517: (QA follow-up): Fix xt/api.t prove -v xt/api.t If I push this as is we will break Koha_Main_MariaDB_update. kohastructure.sql must match the DB structure:
Schema dump completed.
Running [sudo koha-shell kohadev -p -c 'git diff && git diff --quiet || { echo "ERROR - There is a diff in DBIC schema files" && exit 1; }']...
Running [sudo koha-dump --schema-only kohadev]...
Dumping Koha site kohadev:
* schema to /var/spool/koha/kohadev/kohadev-schema-2025-10-24.sql
Running [sed -n '/-- Table structure/,/-- Dump completed/{//!p;}' /var/spool/koha/kohadev/kohadev-schema-$(date '+%Y-%m-%d').sql > /tmp/upgraded_db.sql]...
Running [sed -n '/-- Table structure/,/-- Dump completed/{//!p;}' installer/data/mysql/kohastructure.sql > /tmp/current_db.sql]...
Running [diff /tmp/current_db.sql /tmp/upgraded_db.sql && diff -q /tmp/current_db.sql /tmp/upgraded_db.sql || { echo "ERROR - DB structures are not identical" && exit 1; }]...
3537a3538
> PRIMARY KEY (`hold_group_id`),
3539,3540c3540
< CONSTRAINT `hold_groups_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE,
< PRIMARY KEY (`hold_group_id`)
---
> CONSTRAINT `hold_groups_ibfk_1` FOREIGN KEY (`borrowernumber`) REFERENCES `borrowers` (`borrowernumber`) ON DELETE CASCADE
ERROR - DB structures are not identical
Can you look Pedro?
Created attachment 188422 [details] [review] Bug 40517: (QA follow-up): Fix kohstructure.sql The order was wrong, PRIMARY KEY must come first. Follow-up pushed. Sorry for the mishap Lucas and thank you for your patience! Pushed to main for 25.11.00 |