gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 25723: Update cache flushing calls 

This patch updates the previous single_holidays and exeption_holidays
cache flushing calls to match the new cache key structure of the updated
routines.

Signed-off-by: Emma Perks <Emma.Perks2@uhb.nhs.uk>
Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
Signed-off-by: Joonas Kylmälä <joonas.kylmala@helsinki.fi>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
This commit is contained in:
Martin Renvoize 2020-06-17 13:18:24 +01:00 committed by Jonathan Druart
parent ae0b2befe8
commit 61141c28b0
5 changed files with 32 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
C4/Calendar.pm
View File

@ -277,8 +277,8 @@ sub insert_single_holiday {
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
return $self;
@ -322,8 +322,8 @@ sub insert_exception_holiday {
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
return $self;
}
@ -423,8 +423,8 @@ UPDATE special_holidays SET title = ?, description = ?
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
return $self;
}
@ -466,8 +466,8 @@ UPDATE special_holidays SET title = ?, description = ?
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
return $self;
}
@ -547,8 +547,8 @@ sub delete_holiday {
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
return $self;
}
@ -578,8 +578,8 @@ sub delete_holiday_range {
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
}
@ -632,8 +632,8 @@ sub delete_exception_holiday_range {
# changed the 'single_holidays' table, lets force/reset its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
$cache->clear_from_cache( 'exception_holidays') ;
my $key = $self->{branchcode} . "_holidays";
$cache->clear_from_cache($key);
}
=head2 isHoliday

8
t/Calendar.t
View File

@ -77,8 +77,8 @@ fixtures_ok [
], "add fixtures";
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays' ) ;
$cache->clear_from_cache( 'exception_holidays' ) ;
$cache->clear_from_cache('MPL_holidays');
$cache->clear_from_cache('CPL_holidays');
# 'MPL' branch is arbitrary, is not used at all but is needed for initialization
my $cal = Koha::Calendar->new( branchcode => 'MPL' );
@ -310,6 +310,6 @@ subtest 'days_mode parameter' => sub {
};
END {
$cache->clear_from_cache( 'single_holidays' ) ;
$cache->clear_from_cache( 'exception_holidays' ) ;
$cache->clear_from_cache('MPL_holidays');
$cache->clear_from_cache('CPL_holidays');
};

12
t/db_dependent/Circulation.t
View File

@ -110,7 +110,11 @@ $mocked_datetime->mock( 'now', sub { return $now_value->clone; } );
my $cache = Koha::Caches->get_instance();
$dbh->do(q|DELETE FROM special_holidays|);
$dbh->do(q|DELETE FROM repeatable_holidays|);
$cache->clear_from_cache('single_holidays');
my $branches = Koha::Libraries->search();
for my $branch ( $branches->next ) {
my $key = $branch->branchcode . "_holidays";
$cache->clear_from_cache($key);
}
# Start with a clean slate
$dbh->do('DELETE FROM issues');
@ -4060,4 +4064,8 @@ subtest 'Filling a hold should cancel existing transfer' => sub {
$schema->storage->txn_rollback;
C4::Context->clear_syspref_cache();
$cache->clear_from_cache('single_holidays');
$branches = Koha::Libraries->search();
for my $branch ( $branches->next ) {
my $key = $branch->branchcode . "_holidays";
$cache->clear_from_cache($key);
}

8
t/db_dependent/Circulation/CalcDateDue.t
View File

@ -43,8 +43,9 @@ Koha::CirculationRules->set_rules(
t::lib::Mocks::mock_preference('ReturnBeforeExpiry', 1);
t::lib::Mocks::mock_preference('useDaysMode', 'Days');
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache('single_holidays');
my $cache = Koha::Caches->get_instance();
my $key = $branchcode . "_holidays";
$cache->clear_from_cache($key);
my $dateexpiry = '2013-01-01';
@ -302,6 +303,5 @@ $calendar->delete_holiday(
weekday => 6
);
$cache->clear_from_cache('single_holidays');
$cache->clear_from_cache($key);
$schema->storage->txn_rollback;

3
tools/newHolidays.pl
View File

@ -143,7 +143,4 @@ sub add_holiday {
}
}
}
# we updated the single_holidays table, so wipe its cache
my $cache = Koha::Caches->get_instance();
$cache->clear_from_cache( 'single_holidays') ;
}