Attachment 105963 Details for Bug 25723 – Bug 25723: Drop DateTime::Set dependancy

[patch] Bug 25723: Drop DateTime::Set dependancy

Bug-25723-Drop-DateTimeSet-dependancy.patch (text/plain), 4.43 KB, created by Martin Renvoize (ashimema) on 2020-06-17 13:07:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2020-06-17 13:07:25 UTC

Size: 4.43 KB

patch

obsolete

>From 217d6089259b845da608e61e94d97ee727cf4478 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Fri, 12 Jun 2020 11:53:49 +0100
>Subject: [PATCH] Bug 25723: Drop DateTime::Set dependancy
>
>This patch removes our use of DateTime::Set and replaces it with a quick
>hashref implimentation
>---
> Koha/Calendar.pm | 73 +++++++++++++++++++++++++++++++-----------------
> 1 file changed, 48 insertions(+), 25 deletions(-)
>
>diff --git a/Koha/Calendar.pm b/Koha/Calendar.pm
>index ef397cd838..09150c139a 100644
>--- a/Koha/Calendar.pm
>+++ b/Koha/Calendar.pm
>@@ -4,7 +4,6 @@ use warnings;
> use 5.010;
> 
> use DateTime;
>-use DateTime::Set;
> use DateTime::Duration;
> use C4::Context;
> use Koha::Caches;
>@@ -55,30 +54,42 @@ sub _init {
> sub exception_holidays {
>     my ( $self ) = @_;
> 
>-    my $cache  = Koha::Caches->get_instance();
>-    my $cached = $cache->get_from_cache('exception_holidays');
>-    return $cached if $cached;
>+    my $cache              = Koha::Caches->get_instance();
>+    my $exception_holidays = $cache->get_from_cache('exception_holidays');
> 
>-    my $dbh = C4::Context->dbh;
>-    my $branch = $self->{branchcode};
>-    my $exception_holidays_sth = $dbh->prepare(
>-'SELECT day, month, year FROM special_holidays WHERE branchcode = ? AND isexception = 1'
>-    );
>-    $exception_holidays_sth->execute( $branch );
>-    my $dates = [];
>-    while ( my ( $day, $month, $year ) = $exception_holidays_sth->fetchrow ) {
>-        push @{$dates},
>-          DateTime->new(
>-            day       => $day,
>-            month     => $month,
>-            year      => $year,
>-            time_zone => "floating",
>-          )->truncate( to => 'day' );
>+    # Populate the cache is necessary
>+    unless ($exception_holidays) {
>+        my $dbh = C4::Context->dbh;
>+        $exception_holidays = {};
>+
>+        # Push holidays for each branch
>+        my $exception_holidays_sth = $dbh->prepare(
>+'SELECT day, month, year, branchcode FROM special_holidays WHERE isexception = 1'
>+        );
>+        $exception_holidays_sth->execute();
>+        my $dates = [];
>+        while ( my ( $day, $month, $year, $branch ) =
>+            $exception_holidays_sth->fetchrow )
>+        {
>+            my $datestring =
>+                sprintf( "%04d", $year )
>+              . sprintf( "%02d", $month )
>+              . sprintf( "%02d", $day );
>+
>+            $exception_holidays->{$branch}->{$datestring} = 1;
>+        }
>+        $cache->set_in_cache( 'exception_holidays', $exception_holidays,
>+            { expiry => 76800 } );
>     }
>-    $self->{exception_holidays} =
>-      DateTime::Set->from_datetimes( dates => $dates );
>-    $cache->set_in_cache( 'exception_holidays', $self->{exception_holidays} );
>-    return $self->{exception_holidays};
>+
>+    return $exception_holidays->{$self->{branchcode}} // {};
>+}
>+
>+sub is_exception_holiday {
>+    my ( $self, $date ) = @_;
>+
>+    return 1 if ( $self->exception_holidays->{$date} );
>+    return 0;
> }
> 
> sub single_holidays {
>@@ -127,6 +138,7 @@ sub single_holidays {
>         $cache->set_in_cache( 'single_holidays', $single_holidays,
>             { expiry => 76800 } )    #24 hrs ;
>     }
>+
>     my $holidays  = ( $single_holidays->{$branchcode} );
>     for my $hols  (@$holidays ) {
>             return 1 if ( $date == $hols )   #match ymds;
>@@ -250,13 +262,14 @@ sub is_holiday {
>     my $localdt = $dt->clone();
>     my $day   = $localdt->day;
>     my $month = $localdt->month;
>+    my $ymd   = $localdt->ymd('')  ;
> 
>     #Change timezone to "floating" before doing any calculations or comparisons
>     $localdt->set_time_zone("floating");
>     $localdt->truncate( to => 'day' );
> 
> 
>-    if ( $self->exception_holidays->contains($localdt) ) {
>+    if ( $self->is_exception_holiday( $ymd ) == 1 ) {
>         # exceptions are not holidays
>         return 0;
>     }
>@@ -277,7 +290,6 @@ sub is_holiday {
>         return 1;
>     }
> 
>-    my $ymd   = $localdt->ymd('')  ;
>     if ($self->single_holidays(  $ymd  ) == 1 ) {
>         return 1;
>     }
>@@ -484,6 +496,17 @@ my $rc = $self->single_holidays(  $ymd  );
> 
> Passed a $date in Ymd (yyyymmdd) format -  returns 1 if date is a single_holiday, or 0 if not.
> 
>+=head2 exception_holidays
>+
>+my $exceptions = $self->exception_holidays;
>+
>+Returns a hashref of exception holidays for the branch
>+
>+=head2 is_exception_holiday
>+
>+my $rc = $self->is_exception_holiday( $ymd );
>+
>+Passed a $date in Ymd (yyyymmdd) format - returns 1 if the date is an exception_holiday, or 0 if not.
> 
> =head2 is_holiday
> 
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 25723: 105789 | 105792 | 105793 | 105830 | 105831 | 105832 | 105833 | 105834 | 105835 | 105836 | 105936 | 105937 | 105939 | 105941 | 105947 | 105954 | 105955 | 105956 | 105957 | 105958 | 105959 | 105960 | 105961 | 105962 | 105963 | 105964 | 105965 | 105966 | 105967 | 105968 | 105969 | 105970 | 106991 | 106992 | 106993 | 106994 | 106995 | 106996 | 106997 | 106998 | 106999 | 107000 | 107001 | 107002 | 107003 | 107004 | 107005 | 107006 | 107007 | 107008 | 107009 | 107010 | 107013 | 107014 | 107015 | 107016 | 107017 | 107018 | 107019 | 107020 | 107021 | 107022 | 107023 | 107025