Attachment 86621 Details for Bug 14591 – Bug 14591: (QA follow-up) Optimize DateTime passing

[patch] Bug 14591: (QA follow-up) Optimize DateTime passing

Bug-14591-QA-follow-up-Optimize-DateTime-passing.patch (text/plain), 4.18 KB, created by Martin Renvoize (ashimema) on 2019-03-14 16:57:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2019-03-14 16:57:19 UTC

Size: 4.18 KB

patch

obsolete

>From 0e315f94b07b867c969d78eb42e4f581204ff238 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 14 Mar 2019 16:30:55 +0000
>Subject: [PATCH] Bug 14591: (QA follow-up) Optimize DateTime passing
>
>We were passing around possibly undefined $return_date variables from
>AddReturn and then instantiating a new DateTime object as a default for
>each routine. This followup sets the default higher up the stack within
>AddReturn which provider clearer logic and a small performance
>improvment.
>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> C4/Circulation.pm | 22 ++++++++++------------
> 1 file changed, 10 insertions(+), 12 deletions(-)
>
>diff --git a/C4/Circulation.pm b/C4/Circulation.pm
>index 76e6c74058..b74fdff712 100644
>--- a/C4/Circulation.pm
>+++ b/C4/Circulation.pm
>@@ -1837,6 +1837,7 @@ sub AddReturn {
>         undef $branch;
>     }
>     $branch = C4::Context->userenv->{'branch'} unless $branch;  # we trust userenv to be a safe fallback/default
>+    $return_date //= dt_from_string();
>     my $messages;
>     my $patron;
>     my $doreturn       = 1;
>@@ -1931,8 +1932,6 @@ sub AddReturn {
>     }
> 
>     # case of a return of document (deal with issues and holdingbranch)
>-    my $today = DateTime->now( time_zone => C4::Context->tz() );
>-
>     if ($doreturn) {
>         my $is_overdue;
>         die "The item is not issed and cannot be returned" unless $issue; # Just in case...
>@@ -2023,8 +2022,7 @@ sub AddReturn {
> 
>         if ( $issue and $issue->is_overdue ) {
>         # fix fine days
>-            $today = $return_date if $return_date;
>-            my ($debardate,$reminder) = _debar_user_on_return( $patron_unblessed, $item_unblessed, dt_from_string($issue->date_due), $today );
>+            my ($debardate,$reminder) = _debar_user_on_return( $patron_unblessed, $item_unblessed, dt_from_string($issue->date_due), $return_date );
>             if ($reminder){
>                 $messages->{'PrevDebarred'} = $debardate;
>             } else {
>@@ -2037,7 +2035,7 @@ sub AddReturn {
>              } else {
>                   my $borrower_debar_dt = dt_from_string( $patron->debarred );
>                   $borrower_debar_dt->truncate(to => 'day');
>-                  my $today_dt = $today->clone()->truncate(to => 'day');
>+                  my $today_dt = $return_date->clone()->truncate(to => 'day');
>                   if ( DateTime->compare( $borrower_debar_dt, $today_dt ) != -1 ) {
>                       $messages->{'PrevDebarred'} = $patron->debarred;
>                   }
>@@ -2192,7 +2190,7 @@ sub MarkIssueReturned {
> 
> =head2 _debar_user_on_return
> 
>-    _debar_user_on_return($borrower, $item, $datedue, today);
>+    _debar_user_on_return($borrower, $item, $datedue, $returndate);
> 
> C<$borrower> borrower hashref
> 
>@@ -2200,7 +2198,7 @@ C<$item> item hashref
> 
> C<$datedue> date due DateTime object
> 
>-C<$return_date> DateTime object representing the return time
>+C<$returndate> DateTime object representing the return time
> 
> Internal function, called only by AddReturn that calculates and updates
>  the user fine days, and debars them if necessary.
>@@ -2213,6 +2211,7 @@ sub _debar_user_on_return {
>     my ( $borrower, $item, $dt_due, $return_date ) = @_;
> 
>     my $branchcode = _GetCircControlBranch( $item, $borrower );
>+    $return_date //= dt_from_string();
> 
>     my $circcontrol = C4::Context->preference('CircControl');
>     my $issuing_rule = Koha::IssuingRules->get_effective_issuing_rule(
>@@ -2302,21 +2301,20 @@ sub _debar_user_on_return {
> 
> =head2 _FixOverduesOnReturn
> 
>-   &_FixOverduesOnReturn($brn,$itm, $exemptfine, $dropboxmode);
>+   &_FixOverduesOnReturn($borrowernumber, $itemnumber, $exemptfine);
> 
>-C<$brn> borrowernumber
>+C<$borrowernumber> borrowernumber
> 
>-C<$itm> itemnumber
>+C<$itemnumber> itemnumber
> 
> C<$exemptfine> BOOL -- remove overdue charge associated with this issue. 
>-C<$dropboxmode> BOOL -- remove lastincrement on overdue charge associated with this issue.
> 
> Internal function
> 
> =cut
> 
> sub _FixOverduesOnReturn {
>-    my ($borrowernumber, $item, $exemptfine ) = @_;
>+    my ( $borrowernumber, $item, $exemptfine ) = @_;
>     unless( $borrowernumber ) {
>         warn "_FixOverduesOnReturn() not supplied valid borrowernumber";
>         return;
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 14591: 86611 | 86612 | 86613 | 86614 | 86615 | 86616 | 86618 | 86619 | 86620 | 86621 | 86639 | 86640 | 86641 | 86642 | 86643 | 86676