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

Bug 27921: Log correct timestamp for HOLD MODIFY when set waiting 

The HOLD MODIFY log at the end of ModReserveAffect is not using an
up-to-date $hold object.

$hold is modified at
1201         $hold->set_waiting($desk_id);
But not refreshed before logged (and so the timestamp is not logged
correctly).

Test plan:
Turn on HoldsLog
Place an item on hold
Check it in to mark it waiting

Confirm that the timestamp logged is the one from the check in, not when
you created the hold

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit cb03909af6)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
(cherry picked from commit 66a698fc72)

Signed-off-by: Andrew Fuerste-Henry <andrew@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2021-03-11 16:11:15 +01:00 committed by Andrew Fuerste-Henry
parent 20d66fdfd6
commit 5ef04da974
2 changed files with 47 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
C4/Reserves.pm
View File

@ -1186,7 +1186,7 @@ sub ModReserveAffect {
CartToShelf( $itemnumber );
}
logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, Dumper($hold->unblessed) )
logaction( 'HOLDS', 'MODIFY', $hold->reserve_id, Dumper($hold->get_from_storage->unblessed) )
if C4::Context->preference('HoldsLog');
return;

47
t/db_dependent/Reserves.t
View File

@ -17,7 +17,7 @@
use Modern::Perl;
use Test::More tests => 64;
use Test::More tests => 65;
use Test::MockModule;
use Test::Warn;
@ -32,6 +32,7 @@ use C4::Items;
use C4::Biblio;
use C4::Members;
use C4::Reserves;
use Koha::ActionLogs;
use Koha::Caches;
use Koha::DateUtils;
use Koha::Holds;
@ -1156,6 +1157,50 @@ subtest 'CheckReserves additional test' => sub {
};
subtest 'ModReserveAffect logging' => sub {
plan tests => 4;
my $item = $builder->build_sample_item;
my $patron = $builder->build_object(
{
class => "Koha::Patrons",
value => { branchcode => $item->homebranch }
}
);
t::lib::Mocks::mock_userenv({ patron => $patron });
t::lib::Mocks::mock_preference('HoldsLog', 1);
my $reserve_id = AddReserve(
{
branchcode => $item->homebranch,
borrowernumber => $patron->borrowernumber,
biblionumber => $item->biblionumber,
priority => 1,
itemnumber => $item->itemnumber,
}
);
my $hold = Koha::Holds->find($reserve_id);
my $previous_timestamp = '1970-01-01 12:34:56';
$hold->timestamp($previous_timestamp)->store;
$hold = Koha::Holds->find($reserve_id);
is( $hold->timestamp, $previous_timestamp, 'Make sure the previous timestamp has been used' );
# Mark it waiting
ModReserveAffect( $item->itemnumber, $patron->borrowernumber );
$hold = Koha::Holds->find($reserve_id);
is( $hold->found, 'W', 'Hold has been set waiting' );
isnt( $hold->timestamp, $previous_timestamp, 'The timestamp has been modified' );
my $log = Koha::ActionLogs->search({ module => 'HOLDS', action => 'MODIFY', object => $hold->reserve_id })->next;
my $expected = sprintf q{'timestamp' => '%s'}, $hold->timestamp;
like( $log->info, qr{$expected}, 'Timestamp logged is the current one' );
};
sub count_hold_print_messages {
my $message_count = $dbh->selectall_arrayref(q{
SELECT COUNT(*)