Attachment 170365 Details for Bug 10190 – Bug 10190: Update GetBranchcodesWithOverdueRules to use CirculationRules

[patch] Bug 10190: Update GetBranchcodesWithOverdueRules to use CirculationRules

Bug-10190-Update-GetBranchcodesWithOverdueRules-to.patch (text/plain), 5.72 KB, created by Martin Renvoize (ashimema) on 2024-08-15 11:36:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-08-15 11:36:55 UTC

Size: 5.72 KB

patch

obsolete

>From ca6361e647ce9f9ad32fbcbe2975885501278a22 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 8 Aug 2024 10:34:22 +0100
>Subject: [PATCH] Bug 10190: Update GetBranchcodesWithOverdueRules to use
> CirculationRules
>
>This patch updates the C4::Overdues method
>GetBranchecodesWithOverdueRules to refer to the new location of these
>rules in the circulation rules table. We also update the unit tests to
>move the mocked data into the right location.
>
>We could perhaps migrate this method in Koha::CirculationRules at a
>later date?
>
>Sponsored-by: Glasgow Colleges Library Group
>---
> C4/Overdues.pm            | 23 +++++++++---------
> t/db_dependent/Overdues.t | 50 ++++++++++++++++++++++-----------------
> 2 files changed, 40 insertions(+), 33 deletions(-)
>
>diff --git a/C4/Overdues.pm b/C4/Overdues.pm
>index a2494f7f1e9..8c0d3b149f3 100644
>--- a/C4/Overdues.pm
>+++ b/C4/Overdues.pm
>@@ -676,18 +676,19 @@ returns a list of branch codes for branches with overdue rules defined.
> =cut
> 
> sub GetBranchcodesWithOverdueRules {
>-    my $dbh               = C4::Context->dbh;
>-    my $branchcodes = $dbh->selectcol_arrayref(q|
>-        SELECT DISTINCT(branchcode)
>-        FROM overduerules
>-        WHERE delay1 IS NOT NULL
>-        ORDER BY branchcode
>-    |);
>-    if ( defined $branchcodes->[0] && $branchcodes->[0] eq '' ) {
>-        # If a default rule exists, all branches should be returned
>-        return Koha::Libraries->search({}, { order_by => 'branchname' })->get_column('branchcode');
>+    my @branchcodes = Koha::CirculationRules->search(
>+        { rule_name => 'overdue_1_delay' },
>+        {
>+            order_by => 'branchcode',
>+            columns  => ['branchcode'],
>+            distinct => 1,
>+        }
>+    )->get_column('branchcode');
>+    if ( !$branchcodes[0] ) {
>+        @branchcodes = Koha::Libraries->search( {}, { order_by => 'branchname' } )->get_column('branchcode');
>     }
>-    return @$branchcodes;
>+
>+    return @branchcodes;
> }
> 
> =head2 GetOverduesForBranch
>diff --git a/t/db_dependent/Overdues.t b/t/db_dependent/Overdues.t
>index af719faf76f..78be653025d 100755
>--- a/t/db_dependent/Overdues.t
>+++ b/t/db_dependent/Overdues.t
>@@ -83,53 +83,59 @@ $mtts = C4::Overdues::GetOverdueMessageTransportTypes('', 'PT', 3);
> is_deeply( $mtts, ['print', 'sms', 'email'], 'GetOverdueMessageTransportTypes: third overdue is by print, sms and email for PT (default). With print in first.' );
> 
> # Test GetBranchcodesWithOverdueRules
>-$dbh->do(q|DELETE FROM overduerules|);
>+$dbh->do(q|DELETE FROM circulation_rules WHERE rule_name LIKE 'overdue_%' |);
> 
> my @overdue_branches;
> warnings_are { @overdue_branches = C4::Overdues::GetBranchcodesWithOverdueRules(); } [],
>     "No warnings thrown when no overdue rules exist";
> 
>-$dbh->do(q|
>-    INSERT INTO overduerules
>-        ( branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3 )
>+$dbh->do(
>+    q|
>+    INSERT INTO circulation_rules
>+        ( branchcode, categorycode, itemtype, rule_name, rule_value )
>         VALUES
>-        ( '', '', 1, 'LETTER_CODE1', 1, 5, 'LETTER_CODE2', 1, 10, 'LETTER_CODE3', 1 )
>-|);
>+        ( NULL, NULL, NULL, 'overdue_1_delay', 1 )
>+|
>+);
> 
> my @branchcodes = map { $_->branchcode } Koha::Libraries->search->as_list;
> 
> @overdue_branches = C4::Overdues::GetBranchcodesWithOverdueRules();
> is_deeply( [ sort @overdue_branches ], [ sort @branchcodes ], 'If a default rule exists, all branches should be returned' );
> 
>-$dbh->do(q|
>-    INSERT INTO overduerules
>-        ( branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3 )
>+$dbh->do(
>+    q|
>+    INSERT INTO circulation_rules
>+        ( branchcode, categorycode, itemtype, rule_name, rule_value )
>         VALUES
>-        ( 'CPL', '', 1, 'LETTER_CODE1', 1, 5, 'LETTER_CODE2', 1, 10, 'LETTER_CODE3', 1 )
>-|);
>+        ( 'CPL', NULL, NULL, 'overdue_1_delay', 1 )
>+|
>+);
> 
> @overdue_branches = C4::Overdues::GetBranchcodesWithOverdueRules();
> is_deeply( [ sort @overdue_branches ], [ sort @branchcodes ], 'If a default rule exists and a specific rule exists, all branches should be returned' );
> 
>-$dbh->do(q|DELETE FROM overduerules|);
>+$dbh->do(q|DELETE FROM circulation_rules WHERE rule_name LIKE 'overdue_%' |);
> $dbh->do(q|
>-    INSERT INTO overduerules
>-        ( branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3 )
>+    INSERT INTO circulation_rules
>+        ( branchcode, categorycode, itemtype, rule_name, rule_value )
>         VALUES
>-        ( 'CPL', '', 1, 'LETTER_CODE1', 1, 5, 'LETTER_CODE2', 1, 10, 'LETTER_CODE3', 1 )
>+        ( 'CPL', NULL, NULL, 'overdue_1_delay', 1 )
> |);
> 
> @overdue_branches = C4::Overdues::GetBranchcodesWithOverdueRules();
> is_deeply( \@overdue_branches, ['CPL'] , 'If only a specific rule exist, only 1 branch should be returned' );
> 
>-$dbh->do(q|DELETE FROM overduerules|);
>-$dbh->do(q|
>-    INSERT INTO overduerules
>-        ( branchcode,categorycode, delay1,letter1,debarred1, delay2,letter2,debarred2, delay3,letter3,debarred3 )
>+$dbh->do(q|DELETE FROM circulation_rules WHERE rule_name LIKE 'overdue_%' |);
>+$dbh->do(
>+    q|
>+    INSERT INTO circulation_rules
>+        ( branchcode, categorycode, itemtype, rule_name, rule_value )
>         VALUES
>-        ( 'CPL', '', 1, 'LETTER_CODE1_CPL', 1, 5, 'LETTER_CODE2_CPL', 1, 10, 'LETTER_CODE3_CPL', 1 ),
>-        ( 'MPL', '', 1, 'LETTER_CODE1_MPL', 1, 5, 'LETTER_CODE2_MPL', 1, 10, 'LETTER_CODE3_MPL', 1 )
>-|);
>+        ( 'CPL', NULL, NULL, 'overdue_1_delay', 1 ),
>+        ( 'MPL', NULL, NULL, 'overdue_1_delay', 1 )
>+|
>+);
> 
> @overdue_branches = C4::Overdues::GetBranchcodesWithOverdueRules();
> is_deeply( \@overdue_branches, ['CPL', 'MPL'] , 'If only 2 specific rules exist, 2 branches should be returned' );
>-- 
>2.46.0

Actions: View | Diff | Splinter Review

Attachments on bug 10190: 170357 | 170358 | 170359 | 170360 | 170361 | 170362 | 170363 | 170364 | 170365 | 170366 | 170367 | 170368 | 170369 | 170370 | 170371 | 170372 | 170373 | 170374 | 170375 | 170376 | 170380 | 170449 | 171727 | 171728 | 171729 | 171730 | 171731 | 171732 | 171733 | 171734 | 171735 | 171736 | 171737 | 171738 | 171739 | 171740 | 171741 | 171742 | 171743 | 171744 | 171745 | 171746 | 171747 | 171748 | 171749 | 171750 | 171751 | 171752 | 171753 | 171754 | 171755 | 172588 | 172589 | 172590 | 172591 | 172592 | 172593 | 172594 | 172595 | 172596 | 172597 | 172598 | 172599 | 172600 | 172601 | 172602 | 172603 | 172604 | 172605 | 172606 | 172607 | 172608 | 172609 | 172612 | 172614 | 172617 | 172619 | 172621 | 172622 | 172623 | 172624 | 172625 | 172626 | 172630 | 172631 | 172632 | 172633 | 172634 | 172635 | 172636 | 172637 | 172638 | 172639 | 172640 | 172641 | 172642 | 172643 | 172644 | 172645 | 172646 | 172647 | 172648 | 172649 | 172650 | 172651 | 172652 | 172653 | 172654 | 172655 | 172656 | 172657 | 172658 | 172659 | 172660 | 172661 | 172662 | 172663