f726558510
Refactor the most performance critical subroutines in Circulation.pm to take objects instead of unblessed ones to reduce unnecessary unblessings and generally clean up the code. To test: 1) Ensure the following tests all pass: t/db_dependent/Circulation.t t/db_dependent/Circulation/CalcDateDue.t t/db_dependent/Circulation/CheckIfIssuedToPatron.t t/db_dependent/Circulation/GetPendingOnSiteCheckouts.t t/db_dependent/Circulation/GetTopIssues.t t/db_dependent/Circulation/IsItemIssued.t t/db_dependent/Circulation/MarkIssueReturned.t t/db_dependent/Circulation/ReturnClaims.t t/db_dependent/Circulation/Returns.t t/db_dependent/Circulation/SwitchOnSiteCheckouts.t t/db_dependent/Circulation/TooMany.t t/db_dependent/Circulation/dateexpiry.t t/db_dependent/Circulation/issue.t t/db_dependent/Circulation/maxsuspensiondays.t t/db_dependent/Circulation/transferbook.t t/db_dependent/Circulation_holdsqueue.t t/db_dependent/DecreaseLoanHighHolds.t t/db_dependent/Holds/DisallowHoldIfItemsAvailable.t t/db_dependent/Holds/RevertWaitingStatus.t t/db_dependent/ILSDI_Services.t t/db_dependent/Illrequests.t t/db_dependent/Koha/Account/Line.t t/db_dependent/Koha/Biblio.t t/db_dependent/Koha/Items.t t/db_dependent/Koha/Object.t t/db_dependent/Koha/Patrons.t t/db_dependent/Koha/Pseudonymization.t t/db_dependent/Koha/Template/Plugin/CirculationRules.t t/db_dependent/Letters/TemplateToolkit.t t/db_dependent/Members/GetAllIssues.t t/db_dependent/Members/IssueSlip.t t/db_dependent/Patron/Borrower_Discharge.t t/db_dependent/Patron/Borrower_PrevCheckout.t t/db_dependent/SIP/ILS.t t/db_dependent/Holds.t t/db_dependent/Holds/LocalHoldsPriority.t t/db_dependent/Holds/HoldFulfillmentPolicy.t t/db_dependent/Holds/HoldItemtypeLimit.t t/db_dependent/Reserves/GetReserveFee.t t/db_dependent/api/v1/return_claims.t t/db_dependent/api/v1/biblios.t t/db_dependent/api/v1/checkouts.t t/db_dependent/Reserves.t t/db_dependent/HoldsQueue.t t/db_dependent/selenium/regressions.t t/db_dependent/Koha/Plugins/Circulation_hooks.t t/db_dependent/Koha/Plugins/Recall_hooks.t t/db_dependent/Koha/Recalls.t t/db_dependent/Koha/Recall.t t/db_dependent/Circulation/_CalculateAndUpdateFine.t Sponsored-by: Gothenburg University Library Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org> Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
135 lines
5.3 KiB
Perl
Executable file
135 lines
5.3 KiB
Perl
Executable file
#!/usr/bin/perl
|
|
|
|
# This file is part of Koha.
|
|
#
|
|
# Koha is free software; you can redistribute it and/or modify it
|
|
# under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# Koha is distributed in the hope that it will be useful, but
|
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with Koha; if not, see <http://www.gnu.org/licenses>.
|
|
|
|
use Modern::Perl;
|
|
|
|
use DateTime;
|
|
use Time::HiRes qw/gettimeofday time/;
|
|
use Test::More tests => 2;
|
|
use C4::Members;
|
|
use Koha::DateUtils qw( dt_from_string output_pref );
|
|
use Koha::Database;
|
|
|
|
use t::lib::TestBuilder;
|
|
use t::lib::Mocks qw( mock_preference );
|
|
|
|
my $schema = Koha::Database->new->schema;
|
|
$schema->storage->txn_begin;
|
|
|
|
my $builder = t::lib::TestBuilder->new();
|
|
|
|
my $patron_category = $builder->build({ source => 'Category', value => { category_type => 'P', enrolmentfee => 0 } });
|
|
|
|
subtest 'Tests for CanBookBeIssued related to dateexpiry' => sub {
|
|
plan tests => 4;
|
|
can_book_be_issued();
|
|
};
|
|
subtest 'Tests for CalcDateDue related to dateexpiry' => sub {
|
|
plan tests => 4;
|
|
calc_date_due();
|
|
};
|
|
|
|
sub can_book_be_issued {
|
|
my $item = $builder->build_sample_item;
|
|
my $patron = $builder->build_object(
|
|
{ class => 'Koha::Patrons',
|
|
value => {
|
|
dateexpiry => '9999-12-31',
|
|
categorycode => $patron_category->{categorycode},
|
|
}
|
|
}
|
|
);
|
|
my $duration = gettimeofday();
|
|
my ( $issuingimpossible, $needsconfirmation ) = C4::Circulation::CanBookBeIssued( $patron, $item->barcode );
|
|
$duration = gettimeofday() - $duration;
|
|
cmp_ok $duration, '<', 1, "CanBookBeIssued should not be take more than 1s if the patron is expired";
|
|
is( not( exists $issuingimpossible->{EXPIRED} ), 1, 'The patron should not be considered as expired if dateexpiry is 9999-*' );
|
|
|
|
$item = $builder->build_sample_item;
|
|
$patron = $builder->build_object(
|
|
{ class => 'Koha::Patrons',
|
|
value => {
|
|
dateexpiry => undef,
|
|
categorycode => $patron_category->{categorycode},
|
|
}
|
|
}
|
|
);
|
|
( $issuingimpossible, $needsconfirmation ) = C4::Circulation::CanBookBeIssued( $patron, $item->barcode );
|
|
is( not( exists $issuingimpossible->{EXPIRED} ), 1, 'The patron should not be considered as expired if dateexpiry is not set' );
|
|
|
|
my $tomorrow = dt_from_string->add_duration( DateTime::Duration->new( days => 1 ) );
|
|
$item = $builder->build_sample_item;
|
|
$patron = $builder->build_object(
|
|
{ class => 'Koha::Patrons',
|
|
value => {
|
|
dateexpiry => output_pref( { dt => $tomorrow, dateonly => 1, dateformat => 'sql' } ),
|
|
categorycode => $patron_category->{categorycode},
|
|
},
|
|
}
|
|
);
|
|
( $issuingimpossible, $needsconfirmation ) = C4::Circulation::CanBookBeIssued( $patron, $item->barcode );
|
|
is( not( exists $issuingimpossible->{EXPIRED} ), 1, 'The patron should not be considered as expired if dateexpiry is tomorrow' );
|
|
|
|
}
|
|
|
|
sub calc_date_due {
|
|
t::lib::Mocks::mock_preference( 'ReturnBeforeExpiry', 1 );
|
|
|
|
# this triggers the compare between expiry and due date
|
|
|
|
my $patron = $builder->build_object(
|
|
{
|
|
class => 'Koha::Patrons',
|
|
value => {
|
|
categorycode => $patron_category->{categorycode},
|
|
}
|
|
}
|
|
);
|
|
my $item = $builder->build_sample_item;
|
|
my $branch = $builder->build( { source => 'Branch' } );
|
|
my $today = dt_from_string();
|
|
|
|
# first test with empty expiry date
|
|
# note that this expiry date will never lead to an issue btw !!
|
|
$patron->dateexpiry(undef)->store;
|
|
my $d = C4::Circulation::CalcDateDue( $today, $item->effective_itemtype, $branch->{branchcode}, $patron );
|
|
is( ref $d eq "DateTime" && $d->mdy() =~ /^\d+/, 1, "CalcDateDue with expiry undef" );
|
|
|
|
# second test expiry date==today
|
|
my $d2 = output_pref( { dt => $today, dateonly => 1, dateformat => 'sql' } );
|
|
$patron->dateexpiry($d2)->store;
|
|
$d = C4::Circulation::CalcDateDue( $today, $item->effective_itemtype, $branch->{branchcode}, $patron );
|
|
is( ref $d eq "DateTime" && DateTime->compare( $d->truncate( to => 'day' ), $today->truncate( to => 'day' ) ) == 0, 1, "CalcDateDue with expiry today" );
|
|
|
|
# third test expiry date tomorrow
|
|
my $dur = DateTime::Duration->new( days => 1 );
|
|
my $tomorrow = $today->clone->add_duration($dur);
|
|
$d2 = output_pref( { dt => $tomorrow, dateonly => 1, dateformat => 'sql' } );
|
|
$patron->dateexpiry($d2)->store;
|
|
$d = C4::Circulation::CalcDateDue( $today, $item->effective_itemtype, $branch->{branchcode}, $patron );
|
|
is( ref $d eq "DateTime" && $d->mdy() =~ /^\d+/, 1, "CalcDateDue with expiry tomorrow" );
|
|
|
|
# fourth test far future
|
|
$patron->dateexpiry('9876-12-31')->store;
|
|
my $t1 = time;
|
|
$d = C4::Circulation::CalcDateDue( $today, $item->effective_itemtype, $branch->{branchcode}, $patron );
|
|
my $t2 = time;
|
|
is( ref $d eq "DateTime" && $t2 - $t1 < 1, 1, "CalcDateDue with expiry in year 9876 in " . sprintf( "%6.4f", $t2 - $t1 ) . " seconds." );
|
|
}
|
|
|
|
$schema->storage->txn_rollback;
|
|
|