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>
140 lines
6 KiB
Perl
Executable file
140 lines
6 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 Test::More tests => 21;
|
|
use Test::MockModule;
|
|
use t::lib::TestBuilder;
|
|
|
|
use C4::Circulation qw( CheckIfIssuedToPatron AddIssue );
|
|
use C4::Items;
|
|
use C4::Biblio qw( AddBiblio );
|
|
use Koha::Library;
|
|
use Koha::Patrons;
|
|
use MARC::Record;
|
|
|
|
my $schema = Koha::Database->schema;
|
|
$schema->storage->txn_begin;
|
|
my $dbh = C4::Context->dbh;
|
|
|
|
my $builder = t::lib::TestBuilder->new;
|
|
|
|
$dbh->do(q|DELETE FROM issues|);
|
|
$dbh->do(q|DELETE FROM items|);
|
|
$dbh->do(q|DELETE FROM borrowers|);
|
|
$dbh->do(q|DELETE FROM branches|);
|
|
$dbh->do(q|DELETE FROM biblio|);
|
|
$dbh->do(q|DELETE FROM items|);
|
|
$dbh->do(q|DELETE FROM categories|);
|
|
|
|
|
|
## Create sample data
|
|
# Add a branch
|
|
my $branchcode = $builder->build( { source => 'Branch' } )->{branchcode};
|
|
|
|
# Add a category
|
|
my $categorycode = $builder->build( { source => 'Category' } )->{categorycode};
|
|
|
|
# Add an itemtype
|
|
my $itemtype = $builder->build( { source => 'Itemtype' } )->{itemtype};
|
|
|
|
my %item_info = (
|
|
homebranch => $branchcode,
|
|
holdingbranch => $branchcode,
|
|
itype => $itemtype
|
|
);
|
|
|
|
my ($biblionumber1) = AddBiblio(MARC::Record->new, '');
|
|
my $barcode1 = '0101';
|
|
Koha::Item->new({ barcode => $barcode1, %item_info, biblionumber => $biblionumber1 })->store;
|
|
my ($biblionumber2) = AddBiblio(MARC::Record->new, '');
|
|
my $barcode2 = '0202';
|
|
Koha::Item->new({ barcode => $barcode2, %item_info, biblionumber => $biblionumber2 })->store;
|
|
|
|
my $patron1 = $builder->build_object(
|
|
{
|
|
class => 'Koha::Patrons',
|
|
value => {
|
|
categorycode => $categorycode,
|
|
branchcode => $branchcode
|
|
}
|
|
}
|
|
);
|
|
my $patron2 = $builder->build_object(
|
|
{
|
|
class => 'Koha::Patrons',
|
|
value => {
|
|
categorycode => $categorycode,
|
|
branchcode => $branchcode
|
|
}
|
|
}
|
|
);
|
|
|
|
my $borrowernumber1 = $patron1->borrowernumber;
|
|
my $borrowernumber2 = $patron2->borrowernumber;
|
|
|
|
my $module = Test::MockModule->new('C4::Context');
|
|
$module->mock('userenv', sub { { branch => $branchcode } });
|
|
|
|
|
|
my $check_if_issued = C4::Circulation::CheckIfIssuedToPatron();
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without argument returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron(undef, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without the borrower number returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, undef);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without the biblio number returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns unef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, $biblionumber2);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber2, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber2, $biblionumber2);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
|
|
AddIssue($patron1, '0101');
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron();
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without argument returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron(undef, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without the borrower number returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, undef);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without the biblio number returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, $biblionumber1);
|
|
is( $check_if_issued, 1, 'CheckIfIssuedToPatron returns true' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, $biblionumber2);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber2, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber2, $biblionumber2);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
|
|
AddIssue($patron2, '0202');
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron();
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without argument returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron(undef, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without the borrower number returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, undef);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron without the biblio number returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, $biblionumber1);
|
|
is( $check_if_issued, 1, 'CheckIfIssuedToPatron returns true' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber1, $biblionumber2);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber2, $biblionumber1);
|
|
is( $check_if_issued, undef, 'CheckIfIssuedToPatron returns undef' );
|
|
$check_if_issued = C4::Circulation::CheckIfIssuedToPatron($borrowernumber2, $biblionumber2);
|
|
is( $check_if_issued, 1, 'CheckIfIssuedToPatron returns true' );
|