From 23a4b775c08e070b8beae20eea2032e522cdb054 Mon Sep 17 00:00:00 2001 From: Marcel de Rooy Date: Fri, 6 Jan 2017 10:48:48 +0100 Subject: [PATCH] Bug 17736: [Follow-up] Rename to current_holds Content-Type: text/plain; charset=utf-8 It is not about when the hold was 'placed' but if the hold pertains to the future or not. Test plan: [1] Git grep on holds_placed_before_today. [2] Run t/db_dependent/Koha/Biblios.t [3] Run t/db_dependent/Reserves.t Signed-off-by: Marcel de Rooy --- C4/ILSDI/Services.pm | 2 +- C4/SIP/ILS/Item.pm | 2 +- Koha/Biblio.pm | 6 +++--- acqui/parcel.pl | 2 +- serials/routing-preview.pl | 2 +- t/db_dependent/Koha/Biblios.t | 6 +++--- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm index 64630b6..287ac02 100644 --- a/C4/ILSDI/Services.pm +++ b/C4/ILSDI/Services.pm @@ -219,7 +219,7 @@ sub GetRecords { # Get most of the needed data my $biblioitemnumber = $biblioitem->{'biblioitemnumber'}; my $biblio = Koha::Biblios->find( $biblionumber ); - my $holds = $biblio->holds_placed_before_today->unblessed; + my $holds = $biblio->current_holds->unblessed; my $issues = GetBiblioIssues($biblionumber); my $items = GetItemsByBiblioitemnumber($biblioitemnumber); diff --git a/C4/SIP/ILS/Item.pm b/C4/SIP/ILS/Item.pm index c7b8ea7..3329497 100644 --- a/C4/SIP/ILS/Item.pm +++ b/C4/SIP/ILS/Item.pm @@ -95,7 +95,7 @@ sub new { my $borrower = GetMember(borrowernumber=>$issue->{'borrowernumber'}); $item->{patron} = $borrower->{'cardnumber'}; my $biblio = Koha::Biblios->find( $item->{biblionumber } ); - my $holds = $biblio->holds_placed_before_today->unblessed; + my $holds = $biblio->current_holds->unblessed; $item->{hold_queue} = $holds; $item->{hold_shelf} = [( grep { defined $_->{found} and $_->{found} eq 'W' } @{$item->{hold_queue}} )]; $item->{pending_queue} = [( grep {(! defined $_->{found}) or $_->{found} ne 'W' } @{$item->{hold_queue}} )]; diff --git a/Koha/Biblio.pm b/Koha/Biblio.pm index 5b3ce08..7c86d5a 100644 --- a/Koha/Biblio.pm +++ b/Koha/Biblio.pm @@ -265,16 +265,16 @@ sub holds { return Koha::Holds->_new_from_dbic($hold_rs); } -=head3 holds_placed_before_today +=head3 current_holds -my $holds = $biblio->holds_placed_before_today +my $holds = $biblio->current_holds Return the holds placed on this bibliographic record. It does not include future holds. =cut -sub holds_placed_before_today { +sub current_holds { my ($self) = @_; my $dtf = Koha::Database->new->schema->storage->datetime_parser; return $self->holds( diff --git a/acqui/parcel.pl b/acqui/parcel.pl index 8d59182..c874781 100755 --- a/acqui/parcel.pl +++ b/acqui/parcel.pl @@ -141,7 +141,7 @@ for my $order ( @orders ) { $line{holds} = 0; my @itemnumbers = GetItemnumbersFromOrder( $order->{ordernumber} ); my $biblio = Koha::Biblios->find( $order->{ordernumber} ); - $line{holds} = $biblio->holds_placed_before_today->search( + $line{holds} = $biblio->current_holds->search( { itemnumber => { -in => \@itemnumbers }, } diff --git a/serials/routing-preview.pl b/serials/routing-preview.pl index 47d373f..491bf2b 100755 --- a/serials/routing-preview.pl +++ b/serials/routing-preview.pl @@ -74,7 +74,7 @@ if($ok){ # get existing reserves ..... my $biblio = Koha::Biblios->find( $biblionumber ); - my $holds = $biblio->holds_placed_before_today; + my $holds = $biblio->current_holds; my $count = $holds->count; while ( my $hold = $holds->next ) { $count-- if $hold->is_waiting; diff --git a/t/db_dependent/Koha/Biblios.t b/t/db_dependent/Koha/Biblios.t index dce43ad..d39b2f9 100644 --- a/t/db_dependent/Koha/Biblios.t +++ b/t/db_dependent/Koha/Biblios.t @@ -44,7 +44,7 @@ my $biblioitem = $schema->resultset('Biblioitem')->new( } )->insert(); -subtest 'holds + holds_placed_before_today' => sub { +subtest 'holds + current_holds' => sub { plan tests => 5; C4::Reserves::AddReserve( $patron->branchcode, $patron->borrowernumber, $biblio->biblionumber ); my $holds = $biblio->holds; @@ -57,8 +57,8 @@ subtest 'holds + holds_placed_before_today' => sub { C4::Reserves::AddReserve( $patron->branchcode, $patron->borrowernumber, $biblio->biblionumber, undef, undef, dt_from_string->add( days => 2 ) ); $holds = $biblio->holds; is( $holds->count, 1, '->holds should return future holds' ); - $holds = $biblio->holds_placed_before_today; - is( $holds->count, 0, '->holds_placed_before_today should not return future holds' ); + $holds = $biblio->current_holds; + is( $holds->count, 0, '->current_holds should not return future holds' ); $holds->delete; }; -- 2.1.4