From 7f27ef71e26720604b738c86c084b91858ef7c1a Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 7 Aug 2017 17:29:43 -0300 Subject: [PATCH] Bug 19056: Replace C4::Reserves::GetReserveCount with Koha::Patron->holds->count MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit This subroutine is only used once and can easily be replaced with Koha::Patron->holds->count Test plan: - Set maxreserves=5 - Place 3 holds for a given patron - Place again 3 holds for this patron 3+3 > 5 => The holds must not be placed Signed-off-by: Marc Véron Signed-off-by: Julian Maurice Signed-off-by: Jonathan Druart --- C4/Reserves.pm | 25 ------------------------- reserve/request.pl | 3 +-- t/db_dependent/Holds.t | 5 +---- 3 files changed, 2 insertions(+), 31 deletions(-) diff --git a/C4/Reserves.pm b/C4/Reserves.pm index f07dd7f042..924ce5fde6 100644 --- a/C4/Reserves.pm +++ b/C4/Reserves.pm @@ -106,7 +106,6 @@ BEGIN { &GetReserve &GetReservesForBranch - &GetReserveCount &GetReserveStatus &GetOtherReserves @@ -475,30 +474,6 @@ sub CanReserveBeCanceledFromOpac { } -=head2 GetReserveCount - - $number = &GetReserveCount($borrowernumber); - -this function returns the number of reservation for a borrower given on input arg. - -=cut - -sub GetReserveCount { - my ($borrowernumber) = @_; - - my $dbh = C4::Context->dbh; - - my $query = " - SELECT COUNT(*) AS counter - FROM reserves - WHERE borrowernumber = ? - "; - my $sth = $dbh->prepare($query); - $sth->execute($borrowernumber); - my $row = $sth->fetchrow_hashref; - return $row->{counter}; -} - =head2 GetOtherReserves ($messages,$nextreservinfo)=$GetOtherReserves(itemnumber); diff --git a/reserve/request.pl b/reserve/request.pl index 7cda03dce2..272817086e 100755 --- a/reserve/request.pl +++ b/reserve/request.pl @@ -142,8 +142,7 @@ if ($borrowernumber_hold && !$action) { # we check the reserves of the user, and if they can reserve a document # FIXME At this time we have a simple count of reservs, but, later, we could improve the infos "title" ... - my $reserves_count = - GetReserveCount( $patron->borrowernumber ); + my $reserves_count = $patron->holds->count; my $new_reserves_count = scalar( @biblionumbers ); diff --git a/t/db_dependent/Holds.t b/t/db_dependent/Holds.t index 584acb281d..871d68704f 100755 --- a/t/db_dependent/Holds.t +++ b/t/db_dependent/Holds.t @@ -7,7 +7,7 @@ use t::lib::TestBuilder; use C4::Context; -use Test::More tests => 57; +use Test::More tests => 56; use MARC::Record; use C4::Biblio; use C4::Items; @@ -127,9 +127,6 @@ $holds = $patron->holds; is( $holds->next->borrowernumber, $borrowernumbers[0], "Test Koha::Patron->holds"); -ok( GetReserveCount( $borrowernumbers[0] ), "Test GetReserveCount()" ); - - CancelReserve({ 'reserve_id' => $reserve_id }); $holds = $biblio->holds; is( $holds->count, $borrowers_count - 1, "Test CancelReserve()" ); -- 2.39.5