From 1b4cd9eeaad48e890fc86f073114beecca0e6b31 Mon Sep 17 00:00:00 2001 From: Matthias Meusburger Date: Fri, 27 Apr 2018 16:22:28 +0200 Subject: [PATCH] Bug 21284: ILS-DI: Allow GetPatronInfo to tell if a loaned item is on hold by someone else. This patch adds two new entries in the loans section of GetPatronInfo response: - itemonhold: number of holds on this specific item. - recordonhold: number of holds on the record. It allows an ILS-DI client to know if a loaned item is already on hold by someone else, and how many holds there are. Test plan: 1. Apply the patch. 2. Enable the ILS-DI system preference. 3. Check out an item for a patron and make sure there no other holds at either an item or record level. 4. Check that the new itemonhold and recordonhold entries displayed are equal to zero (example: http://127.0.0.1:8080/cgi-bin/koha/ilsdi.pl?service=GetPatronInfo&patron_id=19&show_contact=0&show_loans=1). 5. Add either a record or item level hold for the record used in step 2. 6. Check that itemonhold and recordonhold values are incremented accordingly. Note: a hold at an item level counts as a hold at a record level, but not vice-versa. 7. Run the tests and make sure they pass: prove t/db_dependent/ILSDI_Services.t 8. Sign-off! Signed-off-by: David Nind Signed-off-by: Kyle M Hall Signed-off-by: Tomas Cohen Arazi (cherry picked from commit d1d5811279fe6a2c8fc0953142fffe3adc9f249b) Signed-off-by: Fridolin Somers --- C4/ILSDI/Services.pm | 7 ++ .../opac-tmpl/bootstrap/en/modules/ilsdi.tt | 4 + t/db_dependent/ILSDI_Services.t | 98 ++++++++++++++++++- 3 files changed, 108 insertions(+), 1 deletion(-) diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm index 9327e3bafd..8ed86b61b5 100644 --- a/C4/ILSDI/Services.pm +++ b/C4/ILSDI/Services.pm @@ -529,6 +529,13 @@ sub GetPatronInfo { # FIXME We should only retrieve what is needed in the template my $issue = $c->unblessed_all_relateds; delete $issue->{'more_subfields_xml'}; + + # Is the item already on hold by another user? + $issue->{'itemonhold'} = Koha::Holds->search({ itemnumber => $issue->{'itemnumber'} })->count; + + # Is the record (next available item) on hold by another user? + $issue->{'recordonhold'} = Koha::Holds->search({ biblionumber => $issue->{'biblionumber'} })->count; + push @checkouts, $issue } $borrower->{'loans'}->{'loan'} = \@checkouts; diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt index 5af7fdf14f..551fda9a37 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/ilsdi.tt @@ -602,6 +602,8 @@ <location>Salle de lecture</location> <itemlost>0</itemlost> <publicationyear>1985</publicationyear> + <recordonhold>0</recordonhold> + <itemonhold>0</itemonhold> <issues>1</issues> <homebranch>BIB</homebranch> <holdingbranch>BIB</holdingbranch> @@ -640,6 +642,8 @@ <location>Salle de lecture</location> <itemlost>0</itemlost> <publicationyear>2007</publicationyear> + <recordonhold>1</recordonhold> + <itemonhold>1</itemonhold> <issues>1</issues> <homebranch>BIB</homebranch> <holdingbranch>BIB</holdingbranch> diff --git a/t/db_dependent/ILSDI_Services.t b/t/db_dependent/ILSDI_Services.t index 65120df27a..0b2003c17b 100755 --- a/t/db_dependent/ILSDI_Services.t +++ b/t/db_dependent/ILSDI_Services.t @@ -19,7 +19,7 @@ use Modern::Perl; use CGI qw ( -utf8 ); -use Test::More tests => 12; +use Test::More tests => 13; use Test::MockModule; use t::lib::Mocks; use t::lib::TestBuilder; @@ -122,6 +122,102 @@ subtest 'AuthenticatePatron test' => sub { $schema->storage->txn_rollback; }; +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; + + # Configure Koha to enable ILS-DI server + t::lib::Mocks::mock_preference( 'ILS-DI', 1 ); + + my $library = $builder->build_object({ + class => 'Koha::Libraries', + }); + + # Create new users: + 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 $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 } }); + + # 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); + + # Prepare and send web request for IL-SDI server: + my $query = new CGI; + $query->param( 'service', 'GetPatronInfo' ); + $query->param( 'patron_id', $brwr->borrowernumber ); + $query->param( 'show_loans', '1' ); + my $reply = C4::ILSDI::Services::GetPatronInfo( $query ); + + # Check that this loan is not on hold + is ( $reply->{loans}->{loan}[0]->{recordonhold}, "0", "Record is not on hold"); + is ( $reply->{loans}->{loan}[0]->{itemonhold}, "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 }); + + # Check that it is on hold on biblio level + $reply = C4::ILSDI::Services::GetPatronInfo( $query ); + is ( $reply->{loans}->{loan}[0]->{recordonhold}, "1", "Record is on hold"); + is ( $reply->{loans}->{loan}[0]->{itemonhold}, "0", "Item is on hold"); + + # Delete holds + $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 + }); + + # 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]->{recordonhold}, "1", "Record is on hold"); + is ( $reply->{loans}->{loan}[0]->{itemonhold}, "1", "Item is on hold"); + + # Add another hold on the biblio + $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]->{recordonhold}, "2", "Record is on hold twice"); + is ( $reply->{loans}->{loan}[0]->{itemonhold}, "1", "Item is on hold"); + + # Cleanup + $schema->storage->txn_rollback; + +}; subtest 'GetPatronInfo/GetBorrowerAttributes test for extended patron attributes' => sub { -- 2.39.5