Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 21284: (QA follow-up) Fix QA script issues

Browse source 
Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
This commit is contained in:
Kyle Hall 2023-11-03 16:45:22 +00:00 committed by Tomas Cohen Arazi
parent 37c8cf6e34
commit db19d3f18d
Signed by: tomascohen
GPG key ID: 0A272EA1B2F3C15F
2 changed files with 78 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
C4/ILSDI/Services.pm
View file

@ -531,10 +531,10 @@ sub GetPatronInfo {
delete $issue->{'more_subfields_xml'};
# Is the item already on hold by another user?
$issue->{'holds_on_item'} = Koha::Holds->search({ itemnumber => $issue->{'itemnumber'} })->count;
$issue->{'holds_on_item'} = Koha::Holds->search( { itemnumber => $issue->{'itemnumber'} } )->count;
# Is the record (next available item) on hold by another user?
$issue->{'holds_on_record'} = Koha::Holds->search({ biblionumber => $issue->{'biblionumber'} })->count;
$issue->{'holds_on_record'} = Koha::Holds->search( { biblionumber => $issue->{'biblionumber'} } )->count;
push @checkouts, $issue
}

130
t/db_dependent/ILSDI_Services.t
View file

@ -127,93 +127,115 @@ subtest 'GetPatronInfo test for holds' => sub {
plan tests => 8;
$schema->storage->txn_begin;
$schema->resultset( 'Issue' )->delete_all;
$schema->resultset( 'Reserve' )->delete_all;
$schema->resultset( 'Borrower' )->delete_all;
$schema->resultset( 'Category' )->delete_all;
$schema->resultset( 'Item' )->delete_all; # 'Branch' deps. on this
$schema->resultset( 'Branch' )->delete_all;
$schema->resultset('Issue')->delete_all;
$schema->resultset('Reserve')->delete_all;
$schema->resultset('Borrower')->delete_all;
$schema->resultset('Category')->delete_all;
$schema->resultset('Item')->delete_all; # 'Branch' deps. on this
$schema->resultset('Branch')->delete_all;
# Configure Koha to enable ILS-DI server
t::lib::Mocks::mock_preference( 'ILS-DI', 1 );
my $library = $builder->build_object({
class => 'Koha::Libraries',
});
my $library = $builder->build_object(
{
class => 'Koha::Libraries',
}
);
# Create new users:
my $brwr = $builder->build_object( {
class => 'Koha::Patrons',
value => {
branchcode => $library->branchcode,
my $brwr = $builder->build_object(
{
class => 'Koha::Patrons',
value => {
branchcode => $library->branchcode,
}
}
} );
my $brwr2 = $builder->build_object( {
class => 'Koha::Patrons',
value => {
branchcode => $library->branchcode,
);
my $brwr2 = $builder->build_object(
{
class => 'Koha::Patrons',
value => {
branchcode => $library->branchcode,
}
}
} );
my $brwr3 = $builder->build_object( {
class => 'Koha::Patrons',
value => {
branchcode => $library->branchcode,
);
my $brwr3 = $builder->build_object(
{
class => 'Koha::Patrons',
value => {
branchcode => $library->branchcode,
}
}
} );
);
my $module = Test::MockModule->new('C4::Context');
$module->mock('userenv', sub { { branch => $library->branchcode } });
$module->mock( 'userenv', sub { { branch => $library->branchcode } } );
# Place a loan
my $biblio = $builder->build_object( { class => 'Koha::Biblios' } );
my $itemtype = $builder->build_object({ class => 'Koha::ItemTypes' });
my $biblioitem = $builder->build_object( { class => 'Koha::Biblioitems', value => { biblionumber => $biblio->biblionumber } } );
my $item = $builder->build_sample_item({ biblionumber => $biblio->biblionumber, library => $library->branchcode, itype => $itemtype->itemtype });
my $issue = AddIssue($brwr, $item->barcode);
my $biblio = $builder->build_object( { class => 'Koha::Biblios' } );
my $itemtype = $builder->build_object( { class => 'Koha::ItemTypes' } );
my $biblioitem =
$builder->build_object( { class => 'Koha::Biblioitems', value => { biblionumber => $biblio->biblionumber } } );
my $item = $builder->build_sample_item(
{ biblionumber => $biblio->biblionumber, library => $library->branchcode, itype => $itemtype->itemtype } );
my $issue = AddIssue( $brwr, $item->barcode );
# Prepare and send web request for IL-SDI server:
my $query = new CGI;
$query->param( 'service', 'GetPatronInfo' );
$query->param( 'patron_id', $brwr->borrowernumber );
my $query = CGI->new();
$query->param( 'service', 'GetPatronInfo' );
$query->param( 'patron_id', $brwr->borrowernumber );
$query->param( 'show_loans', '1' );
my $reply = C4::ILSDI::Services::GetPatronInfo( $query );
my $reply = C4::ILSDI::Services::GetPatronInfo($query);
# Check that this loan is not on hold
is ( $reply->{loans}->{loan}[0]->{holds_on_record}, "0", "Record is not on hold");
is ( $reply->{loans}->{loan}[0]->{holds_on_item}, "0", "Item is not on hold");
is( $reply->{loans}->{loan}[0]->{holds_on_record}, "0", "Record is not on hold" );
is( $reply->{loans}->{loan}[0]->{holds_on_item}, "0", "Item is not on hold" );
# Place a loan
# Add a hold on the biblio
my $biblioreserve = AddReserve({ branchcode => $library->branchcode, borrowernumber => $brwr2->borrowernumber, biblionumber => $biblio->biblionumber });
my $biblioreserve = AddReserve(
{
branchcode => $library->branchcode, borrowernumber => $brwr2->borrowernumber,
biblionumber => $biblio->biblionumber
}
);
# Check that it is on hold on biblio level
$reply = C4::ILSDI::Services::GetPatronInfo( $query );
is ( $reply->{loans}->{loan}[0]->{holds_on_record}, "1", "Record is on hold");
is ( $reply->{loans}->{loan}[0]->{holds_on_item}, "0", "Item is on hold");
$reply = C4::ILSDI::Services::GetPatronInfo($query);
is( $reply->{loans}->{loan}[0]->{holds_on_record}, "1", "Record is on hold" );
is( $reply->{loans}->{loan}[0]->{holds_on_item}, "0", "Item is on hold" );
# Delete holds
$schema->resultset( 'Reserve' )->delete_all;
$schema->resultset('Reserve')->delete_all;
# Add a hold on the item
my $itemreserve = AddReserve({
branchcode => $library->branchcode,
borrowernumber => $brwr2->borrowernumber,
biblionumber => $biblio->biblionumber,
itemnumber => $item->itemnumber
});
my $itemreserve = AddReserve(
{
branchcode => $library->branchcode,
borrowernumber => $brwr2->borrowernumber,
biblionumber => $biblio->biblionumber,
itemnumber => $item->itemnumber
}
);
# When a specific item has a reserve, the item is on hold as well as the record
$reply = C4::ILSDI::Services::GetPatronInfo( $query );
is ( $reply->{loans}->{loan}[0]->{holds_on_record}, "1", "Record is on hold");
is ( $reply->{loans}->{loan}[0]->{holds_on_item}, "1", "Item is on hold");
$reply = C4::ILSDI::Services::GetPatronInfo($query);
is( $reply->{loans}->{loan}[0]->{holds_on_record}, "1", "Record is on hold" );
is( $reply->{loans}->{loan}[0]->{holds_on_item}, "1", "Item is on hold" );
# Add another hold on the biblio
$biblioreserve = AddReserve({ branchcode => $library->branchcode, borrowernumber => $brwr3->borrowernumber, biblionumber => $biblio->biblionumber });
$biblioreserve = AddReserve(
{
branchcode => $library->branchcode, borrowernumber => $brwr3->borrowernumber,
biblionumber => $biblio->biblionumber
}
);
# Check that there are 2 holds on the biblio and 1 on this specific item
$reply = C4::ILSDI::Services::GetPatronInfo( $query );
is ( $reply->{loans}->{loan}[0]->{holds_on_record}, "2", "Record is on hold twice");
is ( $reply->{loans}->{loan}[0]->{holds_on_item}, "1", "Item is on hold");
$reply = C4::ILSDI::Services::GetPatronInfo($query);
is( $reply->{loans}->{loan}[0]->{holds_on_record}, "2", "Record is on hold twice" );
is( $reply->{loans}->{loan}[0]->{holds_on_item}, "1", "Item is on hold" );
# Cleanup
$schema->storage->txn_rollback;