Bug 18936: (follow-up) Fix tests, replace old get_onshelfholds_policy method

Signed-off-by: Minna Kivinen <minna.kivinen@hamk.fi>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha/CirculationRules.pm b/Koha/CirculationRules.pm
index 7f8d36e..86d1582 100644 (file)
--- a/Koha/CirculationRules.pm
+++ b/Koha/CirculationRules.pm
@@ -342,7 +342,28 @@ sub delete {
     while ( my $rule = $self->next ){
         $rule->delete;
     }
+}
+
+=head3 get_onshelfholds_policy
+
+    my $on_shelf_holds = Koha::CirculationRules->get_onshelfholds_policy({ item => $item, patron => $patron });
+
+=cut
 
+sub get_onshelfholds_policy {
+    my ( $class, $params ) = @_;
+    my $item = $params->{item};
+    my $itemtype = $item->effective_itemtype;
+    my $patron = $params->{patron};
+    my $rule = Koha::CirculationRules->get_effective_rule(
+        {
+            categorycode => ( $patron ? $patron->categorycode : undef ),
+            itemtype     => $itemtype,
+            branchcode   => $item->holdingbranch,
+            rule_name    => 'onshelfholds',
+        }
+    );
+    return $rule ? $rule->rule_value : undef;
 }
 
 =head3 type

diff --git a/installer/onboarding.pl b/installer/onboarding.pl
index 77aa120..8951530 100755 (executable)
--- a/installer/onboarding.pl
+++ b/installer/onboarding.pl
@@ -30,7 +30,6 @@ use Koha::DateUtils;
 use Koha::Patrons;
 use Koha::Patron::Categories;
 use Koha::ItemTypes;
-use Koha::IssuingRules;
 
 #Setting variables
 my $input = new CGI;
@@ -251,15 +250,16 @@ if ( $step == 5 ) {
             branchcode      => $branchcode,
             categorycode    => $categorycode,
             itemtype        => $itemtype,
-            renewalsallowed => $renewalsallowed,
-            renewalperiod   => $renewalperiod,
-            issuelength     => $issuelength,
-            lengthunit      => $lengthunit,
-            onshelfholds    => $onshelfholds,
+            rules => {
+                renewalsallowed => $renewalsallowed,
+                renewalperiod   => $renewalperiod,
+                issuelength     => $issuelength,
+                lengthunit      => $lengthunit,
+                onshelfholds    => $onshelfholds,
+            }
         };
 
-        my $issuingrule = Koha::IssuingRule->new($params);
-        eval { $issuingrule->store; };
+        eval { Koha::CirculationRules->set_rules( $params ) };
 
         if ($@) {
             push @messages, { code => 'error_on_insert_circ_rule' };
@@ -287,7 +287,7 @@ if ( $step == 5 ) {
         }
     }
 
-    $step++ if Koha::IssuingRules->count;
+    $step++ if Koha::CirculationRules->count;
 }
 
 my $libraries = Koha::Libraries->search( {}, { order_by => ['branchcode'] }, );

diff --git a/opac/opac-ISBDdetail.pl b/opac/opac-ISBDdetail.pl
index c79167c..cc4b5b8 100755 (executable)
--- a/opac/opac-ISBDdetail.pl
+++ b/opac/opac-ISBDdetail.pl
@@ -51,7 +51,7 @@ use C4::Reserves;
 use C4::Acquisition;
 use C4::Serials;    # uses getsubscriptionfrom biblionumber
 use C4::Koha;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::ItemTypes;
 use Koha::Patrons;
 use Koha::RecordProcessor;
@@ -178,7 +178,7 @@ while ( my $item = $items->next ) {
         && !Koha::ItemTypes->find($item->effective_itemtype)->notforloan
         && $item->itemnumber;
 
-    $allow_onshelf_holds = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } )
+    $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } )
       unless $allow_onshelf_holds;
 }
 

diff --git a/opac/opac-MARCdetail.pl b/opac/opac-MARCdetail.pl
index 8fb0c4e..4bc9294 100755 (executable)
--- a/opac/opac-MARCdetail.pl
+++ b/opac/opac-MARCdetail.pl
@@ -58,7 +58,7 @@ use C4::Acquisition;
 use C4::Koha;
 use List::MoreUtils qw( any uniq );
 use Koha::Biblios;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Patrons;
@@ -138,7 +138,7 @@ $template->param(
 my $allow_onshelf_holds;
 for my $itm (@all_items) {
     my $item = Koha::Items->find( $itm->{itemnumber} );
-    $allow_onshelf_holds = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
+    $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
     last if $allow_onshelf_holds;
 }
 

diff --git a/opac/opac-detail.pl b/opac/opac-detail.pl
index 07655b2..825a352 100755 (executable)
--- a/opac/opac-detail.pl
+++ b/opac/opac-detail.pl
@@ -52,7 +52,7 @@ use C4::CourseReserves qw(GetItemCourseReservesInfo);
 use Koha::Biblios;
 use Koha::RecordProcessor;
 use Koha::AuthorisedValues;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Acquisition::Orders;
@@ -689,7 +689,7 @@ if ( not $viewallitems and @items > $max_items_to_display ) {
         && !$itemtypes->{$itm->{'itype'}}->{notforloan}
         && $itm->{'itemnumber'};
 
-    $allow_onshelf_holds = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } )
+    $allow_onshelf_holds = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } )
       unless $allow_onshelf_holds;
 
     # get collection code description, too

diff --git a/opac/opac-reserve.pl b/opac/opac-reserve.pl
index 4d7cf13..b781e32 100755 (executable)
--- a/opac/opac-reserve.pl
+++ b/opac/opac-reserve.pl
@@ -36,7 +36,7 @@ use C4::Debug;
 use Koha::AuthorisedValues;
 use Koha::Biblios;
 use Koha::DateUtils;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Checkouts;
@@ -548,7 +548,7 @@ foreach my $biblioNum (@biblionumbers) {
             CanItemBeReserved( $borrowernumber, $itemNum )->{status} eq 'OK';
 
         if ($policy_holdallowed) {
-            my $opac_hold_policy = Koha::IssuingRules->get_opacitemholds_policy( { item => $item, patron => $patron } );
+            my $opac_hold_policy = Koha::CirculationRules->get_opacitemholds_policy( { item => $item, patron => $patron } );
             if ( $opac_hold_policy ne 'N' ) { # If Y or F
                 $itemLoopIter->{available} = 1;
                 $numCopiesOPACAvailable++;

diff --git a/opac/opac-shelves.pl b/opac/opac-shelves.pl
index 06875d2..e9dfa25 100755 (executable)
--- a/opac/opac-shelves.pl
+++ b/opac/opac-shelves.pl
@@ -31,7 +31,7 @@ use C4::XSLT;
 
 use Koha::Biblios;
 use Koha::Biblioitems;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Patrons;
@@ -337,7 +337,7 @@ if ( $op eq 'view' ) {
 
                 my $items = $biblio->items;
                 while ( my $item = $items->next ) {
-                    $this_item->{allow_onshelf_holds} = Koha::IssuingRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
+                    $this_item->{allow_onshelf_holds} = Koha::CirculationRules->get_onshelfholds_policy( { item => $item, patron => $patron } );
                     last if $this_item->{allow_onshelf_holds};
                 }
 

diff --git a/reserve/request.pl b/reserve/request.pl
index c7376c2..e63417b 100755 (executable)
--- a/reserve/request.pl
+++ b/reserve/request.pl
@@ -48,7 +48,7 @@ use Koha::Biblios;
 use Koha::DateUtils;
 use Koha::Checkouts;
 use Koha::Holds;
-use Koha::IssuingRules;
+use Koha::CirculationRules;
 use Koha::Items;
 use Koha::ItemTypes;
 use Koha::Libraries;
@@ -551,7 +551,7 @@ foreach my $biblionumber (@biblionumbers) {
                 my $can_item_be_reserved = CanItemBeReserved( $patron->borrowernumber, $itemnumber )->{status};
                 $item->{not_holdable} = $can_item_be_reserved unless ( $can_item_be_reserved eq 'OK' );
 
-                $item->{item_level_holds} = Koha::IssuingRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
+                $item->{item_level_holds} = Koha::CirculationRules->get_opacitemholds_policy( { item => $item_object, patron => $patron } );
 
                 if (
                        !$item->{cantreserve}

diff --git a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
index fdc8f81..f49aa10 100755 (executable)
--- a/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
+++ b/t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t
@@ -216,17 +216,17 @@ my $hold = $builder->build({
     }
 });
 
-Koha::IssuingRule->new(
+Koha::CirculationRules->set_rules(
     {
-        categorycode => '*',
+        categorycode => undef,
         itemtype     => $itemtype2,
-        branchcode   => '*',
-        issuelength  => 7,
-        lengthunit   => 8,
-        reservesallowed => 99,
-        onshelfholds => 0,
+        branchcode   => undef,
+        rules        => {
+            maxissueqty     => 99,
+            onshelfholds    => 2,
+        }
     }
-)->store();
+);
 
 $is = IsAvailableForItemLevelRequest( $item3, $patron1);
 is( $is, 1, "Item can be held, items in transit are not available" );

diff --git a/t/db_dependent/Reserves.t b/t/db_dependent/Reserves.t
index f7f66fd..d6eb517 100755 (executable)
--- a/t/db_dependent/Reserves.t
+++ b/t/db_dependent/Reserves.t
@@ -563,19 +563,6 @@ Koha::CirculationRules->set_rules(
     }
 );
 
-ok( C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() allowed" );
-Koha::CirculationRules->set_rules(
-    {
-        categorycode => $categorycode,
-        itemtype     => $itype,
-        branchcode   => $holdingbranch,
-        rules => {
-            onshelfholds => 0,
-        }
-    }
-);
-ok( !C4::Reserves::OnShelfHoldsAllowed($item, $borrower), "OnShelfHoldsAllowed() disallowed" );
-
 # tests for MoveReserve in relation to ConfirmFutureHolds (BZ 14526)
 #   hold from A pos 1, today, no fut holds: MoveReserve should fill it
 $dbh->do('DELETE FROM reserves', undef, ($bibnum));