Attachment 106556 Details for Bug 23070 – Bug 23070: Use Koha::Hold in C4::Reserves::RevertWaitingStatus

[patch] Bug 23070: Use Koha::Hold in C4::Reserves::RevertWaitingStatus

Bug-23070-Use-KohaHold-in-C4ReservesRevertWaitingS.patch (text/plain), 2.55 KB, created by Katrin Fischer on 2020-07-05 16:28:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-07-05 16:28:37 UTC

Size: 2.55 KB

patch

obsolete

>From e9cd1442546936c9fb64e6c03f1716aa2b8071c2 Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Thu, 6 Jun 2019 15:14:28 -0500
>Subject: [PATCH] Bug 23070: Use Koha::Hold in
> C4::Reserves::RevertWaitingStatus
>
>We are using raw SQL statements, we should use Koha::Hold instead.
>
>This patch does not seem optimal, we would like to increment priority in
>only 1 statement and without the need to fetch and loop all holds.
>
>== Test plan ==
>- apply patch
>- place some holds on the same record
>- check that the priorities look good
>- mark one hold as waiting by doing a check-in
>- revert the waiting status
>- confirm that the priorities are recalculated correctly
>
>Signed-off-by: Victor Grousset/tuxayo <victor@tuxayo.net>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> C4/Reserves.pm | 34 ++++++++++++----------------------
> 1 file changed, 12 insertions(+), 22 deletions(-)
>
>diff --git a/C4/Reserves.pm b/C4/Reserves.pm
>index 2c17d53235..197e00181a 100644
>--- a/C4/Reserves.pm
>+++ b/C4/Reserves.pm
>@@ -1990,31 +1990,21 @@ sub RevertWaitingStatus {
>     my $dbh = C4::Context->dbh;
> 
>     ## Get the waiting reserve we want to revert
>-    my $query = "
>-        SELECT * FROM reserves
>-        WHERE itemnumber = ?
>-        AND found IS NOT NULL
>-    ";
>-    my $sth = $dbh->prepare( $query );
>-    $sth->execute( $itemnumber );
>-    my $reserve = $sth->fetchrow_hashref();
>-
>-    my $hold = Koha::Holds->find( $reserve->{reserve_id} ); # TODO Remove the next raw SQL statements and use this instead
>+    my $hold = Koha::Holds->search(
>+        {
>+            itemnumber => $itemnumber,
>+            found => { not => undef },
>+        }
>+    )->next;
> 
>     ## Increment the priority of all other non-waiting
>     ## reserves for this bib record
>-    $query = "
>-        UPDATE reserves
>-        SET
>-          priority = priority + 1
>-        WHERE
>-          biblionumber =  ?
>-        AND
>-          priority > 0
>-    ";
>-    $sth = $dbh->prepare( $query );
>-    $sth->execute( $reserve->{'biblionumber'} );
>+    my $holds = Koha::Holds->search({ biblionumber => $hold->biblionumber, priority => { '>' => 0 } });
>+    while ( my $h = $holds->next ) {
>+        $h->priority( $h->priority + 1 )->store;
>+    }
> 
>+    ## Fix up the currently waiting reserve
>     $hold->set(
>         {
>             priority    => 1,
>@@ -2024,7 +2014,7 @@ sub RevertWaitingStatus {
>         }
>     )->store();
> 
>-    _FixPriority( { biblionumber => $reserve->{biblionumber} } );
>+    _FixPriority( { biblionumber => $hold->biblionumber } );
> 
>     return $hold;
> }
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23070: 90400 | 97976 | 97977 | 99168 | 99169 | 99170 | 103907 | 103908 | 103909 | 103910 | 104253 | 104261 | 104262 | 104263 | 104264 | 106556 | 106557 | 106558 | 106559