Attachment 142075 Details for Bug 31095 – Bug 31095: Remove GetDebarments from Koha::Patron::Debarments

[patch] Bug 31095: Remove GetDebarments from Koha::Patron::Debarments

Bug-31095-Remove-GetDebarments-from-KohaPatronDeba.patch (text/plain), 3.36 KB, created by Martin Renvoize (ashimema) on 2022-10-18 14:09:53 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-10-18 14:09:53 UTC

Size: 3.36 KB

patch

obsolete

>From 94e5e7153d451c383070265fb6cb5bdd35c6c7c2 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 25 Aug 2022 10:22:39 +0100
>Subject: [PATCH] Bug 31095: Remove GetDebarments from Koha::Patron::Debarments
>
>This patch finally removes GetDebarments from the codebase.
>
>Test plan
>1. Confirm GetDebarments is no longer mentioned in the codebase. `git
>   grep GetDebarments`
>2. Confirm t/db_dependent/Patron/Borrower_Debarments.t continues to pass
>
>Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
>---
> Koha/Patron/Debarments.pm | 46 +++++++++++++--------------------------
> 1 file changed, 15 insertions(+), 31 deletions(-)
>
>diff --git a/Koha/Patron/Debarments.pm b/Koha/Patron/Debarments.pm
>index 52e1036850..60c3f5504e 100644
>--- a/Koha/Patron/Debarments.pm
>+++ b/Koha/Patron/Debarments.pm
>@@ -27,8 +27,6 @@ BEGIN {
>     require Exporter;
>     @ISA       = qw(Exporter);
>     @EXPORT_OK = qw(
>-      GetDebarments
>-
>       AddDebarment
>       DelDebarment
>       ModDebarment
>@@ -45,28 +43,6 @@ Koha::Patron::Debarments - Module for managing patron debarments
> 
> =cut
> 
>-=head2 GetDebarments
>-
>-my $arrayref = GetDebarments({ borrowernumber => $borrowernumber [, key => $value ] );
>-
>-=cut
>-
>-sub GetDebarments {
>-    my ($params) = @_;
>-
>-    return unless ( $params->{'borrowernumber'} );
>-
>-    my @keys   = keys %$params;
>-    my @values = values %$params;
>-
>-    my $where = join( ' AND ', map { "$_ = ?" } @keys );
>-    my $sql   = "SELECT * FROM borrower_debarments WHERE $where";
>-    my $sth   = C4::Context->dbh->prepare($sql);
>-    $sth->execute(@values);
>-
>-    return $sth->fetchall_arrayref( {} );
>-}
>-
> =head2 AddDebarment
> 
> my $success = AddDebarment({
>@@ -197,18 +173,22 @@ sub AddUniqueDebarment {
> 
>     return unless ( $borrowernumber && $type );
> 
>-    my $debarment = @{ GetDebarments( { borrowernumber => $borrowernumber, type => $type } ) }[0];
>+    my $patron = Koha::Patrons->find($borrowernumber);
>+    return unless $patron;
>+
>+    my $debarment =
>+      $patron->restrictions->search( { type => $type }, { rows => 1 } )->single;
> 
>     my $r;
>     if ($debarment) {
> 
>         # We don't want to shorten a unique debarment's period, so if this 'update' would do so, just keep the current expiration date instead
>-        $params->{'expiration'} = $debarment->{'expiration'}
>-          if ( $debarment->{'expiration'}
>-            && $debarment->{'expiration'} gt $params->{'expiration'} );
>+        $params->{'expiration'} = $debarment->expiration
>+          if ( $debarment->expiration
>+            && $debarment->expiration gt $params->{'expiration'} );
> 
>         $params->{'borrower_debarment_id'} =
>-          $debarment->{'borrower_debarment_id'};
>+          $debarment->borrower_debarment_id;
>         $r = ModDebarment($params);
>     } else {
> 
>@@ -242,11 +222,15 @@ sub DelUniqueDebarment {
> 
>     return unless ( $borrowernumber && $type );
> 
>-    my $debarment = @{ GetDebarments( { borrowernumber => $borrowernumber, type => $type } ) }[0];
>+    my $patron = Koha::Patrons->find($borrowernumber);
>+    return unless $patron;
>+
>+    my $debarment =
>+      $patron->restrictions->search( { type => $type }, { rows => 1 } )->single;
> 
>     return unless ( $debarment );
> 
>-    return DelDebarment( $debarment->{'borrower_debarment_id'} );
>+    return DelDebarment( $debarment->borrower_debarment_id );
> }
> 
> =head2 UpdateBorrowerDebarmentFlags
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31095: 139614 | 139719 | 139720 | 139721 | 139722 | 139723 | 139724 | 139725 | 139726 | 139727 | 139728 | 139742 | 139743 | 139744 | 139745 | 139746 | 139747 | 139748 | 139749 | 139750 | 139751 | 139752 | 139753 | 139754 | 139755 | 139756 | 139757 | 139758 | 140714 | 140715 | 140716 | 140717 | 140718 | 140719 | 140720 | 140721 | 140722 | 140723 | 140724 | 140725 | 140726 | 140727 | 140728 | 140729 | 140730 | 140731 | 142059 | 142060 | 142061 | 142062 | 142063 | 142064 | 142065 | 142066 | 142067 | 142068 | 142069 | 142070 | 142071 | 142072 | 142073 | 142074 | 142075 | 142076 | 143745 | 143746 | 143747 | 143748 | 143749 | 143750 | 143751 | 143752 | 143753 | 143754 | 143755 | 143756 | 143757 | 143758 | 143759 | 143760 | 143761 | 143762 | 143763 | 144903 | 144904 | 144905 | 144906 | 144907 | 144908 | 144909 | 144910 | 144911 | 144912 | 144913 | 144914 | 144915 | 144916 | 144917 | 144918 | 144919 | 144920 | 144921 | 145800 | 145801 | 145803 | 145845