Bug 32336: (QA follow-up) Use $metadata->schema

[srvgit] / recalls / recalls_to_pull.pl

diff --git a/recalls/recalls_to_pull.pl b/recalls/recalls_to_pull.pl
index 1665221..e34be38 100755 (executable)
--- a/recalls/recalls_to_pull.pl
+++ b/recalls/recalls_to_pull.pl
@@ -18,17 +18,18 @@
 
 use Modern::Perl;
 use CGI qw ( -utf8 );
+use List::MoreUtils qw( uniq );
+
 use C4::Auth qw( get_template_and_user );
 use C4::Output qw( output_html_with_http_headers );
 use Koha::BiblioFrameworks;
 
-my $query = new CGI;
+my $query = CGI->new;
 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user(
     {
       template_name   => "recalls/recalls_to_pull.tt",
       query           => $query,
       type            => "intranet",
-      authnotrequired => 0,
       flagsrequired   => { recalls => 'manage_recalls' },
       debug           => 1,
     }
@@ -39,28 +40,35 @@ my $recall_id = $query->param('recall_id');
 if ( $op eq 'cancel' ) {
     my $recall = Koha::Recalls->find( $recall_id );
     if ( $recall->in_transit ) {
-        C4::Items::ModItemTransfer( $recall->item->itemnumber, $recall->item->holdingbranch, $recall->item->homebranch, 'CancelRecall' );
+        C4::Items::ModItemTransfer(
+            $recall->item->itemnumber, $recall->item->holdingbranch,
+            $recall->item->homebranch, 'RecallCancellation'
+        );
     }
     $recall->set_cancelled;
     $op = 'list';
 }
 
 if ( $op eq 'list' ) {
-    my @recalls = Koha::Recalls->search({ status => [ 'R','O','T' ] });
+    my @recalls = Koha::Recalls->search({ status => [ 'requested','overdue','in_transit' ] })->as_list;
     my @pull_list;
     my %seen_bib;
     foreach my $recall ( @recalls ) {
-        if ( $seen_bib{$recall->biblionumber} ){
+        if ( $seen_bib{$recall->biblio_id} ){
             # we've already looked at the recalls on this biblio
             next;
         } else {
             # this is an unseen biblio
-            $seen_bib{$recall->biblionumber}++;
+            $seen_bib{$recall->biblio_id}++;
 
             # get recall data about this biblio
-            my @this_bib_recalls = Koha::Recalls->search({ biblionumber => $recall->biblionumber, status => [ 'R','O','T' ] }, { order_by => { -asc => 'recalldate' } });
+            my $biblio = $recall->biblio;
+            my @this_bib_recalls = $biblio->recalls->search(
+                { status   => [ 'requested', 'overdue', 'in_transit' ] },
+                { order_by => { -asc => 'created_date' } }
+            )->as_list;
             my $recalls_count = scalar @this_bib_recalls;
-            my @unique_patrons = do { my %seen; grep { !$seen{$_->borrowernumber}++ } @this_bib_recalls };
+            my @unique_patrons = uniq @this_bib_recalls ;
             my $patrons_count = scalar @unique_patrons;
             my $first_recall = $this_bib_recalls[0];
 
@@ -72,7 +80,7 @@ if ( $op eq 'list' ) {
             my @locations;
             my @libraries;
 
-            my @items = Koha::Items->search({ biblionumber => $recall->biblionumber });
+            my @items = $biblio->items->as_list;
             foreach my $item ( @items ) {
                 if ( $item->can_be_waiting_recall and !$item->checkout ) {
                     # if item can be pulled to fulfill recall, collect item data
@@ -90,26 +98,19 @@ if ( $op eq 'list' ) {
             # don't push data if there are no items available for this recall
 
                 # get unique values
-                my @unique_callnumbers = do { my %seen; grep { !$seen{$_}++ } @callnumbers };
-                my @unique_copynumbers = do { my %seen; grep { !$seen{$_}++ } @copynumbers };
-                my @unique_enumchrons = do { my %seen; grep { !$seen{$_}++ } @enumchrons };
-                my @unique_itemtypes = do { my %seen; grep { !$seen{$_}++ } @itemtypes };
-                my @unique_locations = do { my %seen; grep { !$seen{$_}++ } @locations };
-                my @unique_libraries = do { my %seen; grep { !$seen{$_}++ } @libraries };
-
                 push( @pull_list, {
-                    biblio => $recall->biblio,
+                    biblio => $biblio,
                     items_count => $items_count,
                     recalls_count => $recalls_count,
                     patrons_count => $patrons_count,
                     pull_count => $items_count <= $recalls_count ? $items_count : $recalls_count,
                     first_recall => $first_recall,
-                    callnumbers => \@unique_callnumbers,
-                    copynumbers => \@unique_copynumbers,
-                    enumchrons => \@unique_enumchrons,
-                    itemtypes => \@unique_itemtypes,
-                    locations => \@unique_locations,
-                    libraries => \@unique_libraries,
+                    callnumbers   => [ uniq @callnumbers ],
+                      copynumbers => [ uniq @copynumbers ],
+                      enumchrons  => [ uniq @enumchrons ],
+                      itemtypes   => [ uniq @itemtypes ],
+                      locations   => [ uniq @locations ],
+                      libraries   => [ uniq @libraries ],
                 });
             }
         }