From a68263280e036318b0599556eb3fa264d7eba443 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Fri, 19 Nov 2021 13:27:44 +0100
Subject: [PATCH] Bug 29087: Prevent filter_by_for_hold to crash if default
 holdallowed is not_allowed

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 8c804c17493ecc9cb993c5434644c1b2a860bae3)
Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit 34be9ab95bdf6cb6eccc7ca198dd4e4da6eaf291)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
---
 Koha/Items.pm               | 30 ++++++++++++++++++++++++++----
 t/db_dependent/Koha/Holds.t |  7 +++++++
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/Koha/Items.pm b/Koha/Items.pm
index ac7b226c4e..6bea92278b 100644
--- a/Koha/Items.pm
+++ b/Koha/Items.pm
@@ -61,15 +61,37 @@ placing a hold on one of those items.
 sub filter_by_for_hold {
     my ($self) = @_;
 
-    my @hold_not_allowed_itypes = Koha::CirculationRules->search(
+    my $default_rule = Koha::CirculationRules->get_effective_rule(
         {
             rule_name    => 'holdallowed',
-            branchcode   => undef,
-            categorycode => undef,
             rule_value   => 'not_allowed',
         }
-    )->get_column('itemtype');
+    );
+    my @hold_not_allowed_itypes;
+    if ( $default_rule ) {
+        @hold_not_allowed_itypes = Koha::ItemTypes->search->get_column('itemtype');
+        my @hold_allowed_itypes = Koha::CirculationRules->search(
+            {
+                rule_name    => 'holdallowed',
+                rule_value   => { '!=' => 'not_allowed' },
+                branchcode   => undef,
+                categorycode => undef,
+            }
+        )->get_column('itemtype');
+        @hold_not_allowed_itypes = array_minus( @hold_not_allowed_itypes, @hold_allowed_itypes )
+    } else {
+        @hold_not_allowed_itypes = Koha::CirculationRules->search(
+            {
+                rule_name    => 'holdallowed',
+                branchcode   => undef,
+                categorycode => undef,
+                rule_value   => 'not_allowed',
+            }
+        )->get_column('itemtype');
+    }
+
     push @hold_not_allowed_itypes, Koha::ItemTypes->search({ notforloan => 1 })->get_column('itemtype');
+    @hold_not_allowed_itypes = uniq @hold_not_allowed_itypes;
 
     my $params = {
         itemlost   => 0,
diff --git a/t/db_dependent/Koha/Holds.t b/t/db_dependent/Koha/Holds.t
index 4dad5db128..f1f32ad6a7 100755
--- a/t/db_dependent/Koha/Holds.t
+++ b/t/db_dependent/Koha/Holds.t
@@ -532,6 +532,13 @@ subtest 'Desks' => sub {
 subtest 'get_items_that_can_fill' => sub {
     plan tests => 6;
 
+    Koha::CirculationRules->search(
+        {
+            rule_name    => 'holdallowed',
+            rule_value   => 'not_allowed',
+        }
+    )->delete;
+
     my $biblio = $builder->build_sample_biblio;
     my $itype_1 = $builder->build_object({ class => 'Koha::ItemTypes' }); # For 1, 2, 3, 4
     my $itype_2 = $builder->build_object({ class => 'Koha::ItemTypes' });
-- 
2.39.5