From b2812c418d2fcbdf07baa323087d1a4c62c34cc9 Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 8 Apr 2021 13:43:40 +0000
Subject: [PATCH] Bug 15986: (follow-up) Add all holds per patron

This changes the code to loop through all the holds and group by patron,
we then send the holds to the letter using the 'loops' option

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
---
 misc/cronjobs/holds_reminder.pl | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/misc/cronjobs/holds_reminder.pl b/misc/cronjobs/holds_reminder.pl
index 7b3012550c..f938d0b108 100755
--- a/misc/cronjobs/holds_reminder.pl
+++ b/misc/cronjobs/holds_reminder.pl
@@ -246,8 +246,8 @@ foreach my $branchcode (@branchcodes) { #BEGIN BRANCH LOOP
     my $waiting_since = $dtf->format_date( $waiting_date );
     my $reserves = Koha::Holds->search({
         waitingdate => {'<=' => $waiting_since },
-        branchcode  => $branchcode,
-    });
+        'me.branchcode'  => $branchcode,
+    },{ prefetch => 'patron' });
 
     $verbose and warn "No reserves found for $branchcode\n" unless $reserves->count;
     next unless $reserves->count;
@@ -261,12 +261,16 @@ foreach my $branchcode (@branchcodes) { #BEGIN BRANCH LOOP
     my $sending_params = @mtts ? { message_transports => \@mtts } : { message_name => "Hold_Filled" };
 
 
+    my %patrons;
     while ( my $reserve = $reserves->next ) {
+        $patrons{$reserve->borrowernumber}->{patron} = $reserve->patron unless exists $patrons{$reserve->borrowernumber};
+        push @{$patrons{$reserve->borrowernumber}->{reserves}}, $reserve->reserve_id;
+    }
 
-        my $patron = $reserve->borrower;
-        # Skip if we already dealt with this borrower
-        next if ( $done{$patron->borrowernumber} );
-        $verbose and print "  borrower " . $patron->surname . ", " . $patron->firstname . " has holds triggering notice.\n";
+    foreach my $borrowernumber (keys %patrons){
+
+        my $patron = $patrons{$borrowernumber}->{patron};
+        $verbose and print "  borrower " . $patron->surname . ", " . $patron->firstname . " has " . scalar @{$patrons{$borrowernumber}->{reserves}}  . " holds triggering notice.\n";
 
         # Setup the notice information
         my $letter_params = {
@@ -276,8 +280,10 @@ foreach my $branchcode (@branchcodes) { #BEGIN BRANCH LOOP
             branchcode      => $branchcode,
             tables          => {
                  borrowers  => $patron->borrowernumber,
-                 branches   => $reserve->branchcode,
-                 reserves   => $reserve->unblessed
+                 branches   => $branchcode,
+            },
+            loops           => {
+                reserves    => $patrons{$borrowernumber}->{reserves}
             },
         };
         $sending_params->{letter_params} = $letter_params;
-- 
2.39.5