Attachment 75688 Details for Bug 19945 – Bug 19945: ILSDI - Return the reason a reserve is impossible

[patch] Bug 19945: ILSDI - Return the reason a reserve is impossible

Bug-19945-ILSDI---Return-the-reason-a-reserve-is-i.patch (text/plain), 5.06 KB, created by Jonathan Druart on 2018-05-30 19:06:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-05-30 19:06:16 UTC

Size: 5.06 KB

patch

obsolete

>From 8a13fb474b20877429f7220fbd95a037bb75caca Mon Sep 17 00:00:00 2001
>From: Alex Arnaud <alex.arnaud@biblibre.com>
>Date: Wed, 10 Jan 2018 15:31:54 +0000
>Subject: [PATCH] Bug 19945: ILSDI - Return the reason a reserve is impossible
>
>Currently, the ILDSI services HoldTitle and HoldItem always return a
>"NotHoldable" code is the reserve is impossible. We need to know why
>
>Test plan:
>
> - Apply this patch
> - Place a hold on a non reservable title using ILS-DI web service
>   (http://koha-opac.example.org/cgi-bin/koha/ilsdi.pl?service=HoldTitle&patron_id=1&bib_id=1&request_location=)
> - you should get the reason instead of NotHoldable,
> - Place a hold on a non reservable item using ILS-DI web service
>   (http://koha-opac.example.org/cgi-bin/koha/ilsdi.pl?service=HoldItem&patron_id=1&bib_id=1&item_id=1)
> - you should get the reason instead of NotHoldable,
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>
>Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>---
> C4/ILSDI/Services.pm            |  6 ++-
> t/db_dependent/ILSDI_Services.t | 95 +++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 99 insertions(+), 2 deletions(-)
>
>diff --git a/C4/ILSDI/Services.pm b/C4/ILSDI/Services.pm
>index 158ff8e0cb..f30b081d5f 100644
>--- a/C4/ILSDI/Services.pm
>+++ b/C4/ILSDI/Services.pm
>@@ -663,7 +663,8 @@ sub HoldTitle {
>     my $title = $biblio ? $biblio->title : '';
> 
>     # Check if the biblio can be reserved
>-    return { code => 'NotHoldable' } unless CanBookBeReserved( $borrowernumber, $biblionumber ) eq 'OK';
>+    my $code = CanBookBeReserved( $borrowernumber, $biblionumber );
>+    return { code => $code } unless ( $code eq 'OK' );
> 
>     my $branch;
> 
>@@ -741,7 +742,8 @@ sub HoldItem {
>     # Check for item disponibility
>     my $canitembereserved = C4::Reserves::CanItemBeReserved( $borrowernumber, $itemnumber );
>     my $canbookbereserved = C4::Reserves::CanBookBeReserved( $borrowernumber, $biblionumber );
>-    return { code => 'NotHoldable' } unless $canbookbereserved eq 'OK' and $canitembereserved eq 'OK';
>+    return { code => $canitembereserved } unless $canitembereserved eq 'OK';
>+    return { code => $canbookbereserved } unless $canbookbereserved eq 'OK';
> 
>     # Pickup branch management
>     my $branch;
>diff --git a/t/db_dependent/ILSDI_Services.t b/t/db_dependent/ILSDI_Services.t
>index d918e43a73..0b27bd093a 100644
>--- a/t/db_dependent/ILSDI_Services.t
>+++ b/t/db_dependent/ILSDI_Services.t
>@@ -262,3 +262,98 @@ subtest 'LookupPatron test' => sub {
>     # Cleanup
>     $schema->storage->txn_rollback;
> };
>+
>+
>+subtest 'Holds test' => sub {
>+
>+    plan tests => 3;
>+
>+    $schema->storage->txn_begin;
>+
>+    t::lib::Mocks::mock_preference( 'AllowHoldsOnDamagedItems', 0 );
>+
>+    my $patron = $builder->build({
>+        source => 'Borrower',
>+    });
>+
>+    my $biblio = $builder->build({
>+        source => 'Biblio',
>+    });
>+
>+    my $biblioitems = $builder->build({
>+        source => 'Biblioitem',
>+        value => {
>+            biblionumber => $biblio->{biblionumber},
>+        }
>+    });
>+
>+    my $item = $builder->build({
>+        source => 'Item',
>+        value => {
>+            biblionumber => $biblio->{biblionumber},
>+            damaged => 1
>+        }
>+    });
>+
>+    my $query = new CGI;
>+    $query->param( 'patron_id', $patron->{borrowernumber});
>+    $query->param( 'bib_id', $biblio->{biblionumber});
>+
>+    my $reply = C4::ILSDI::Services::HoldTitle( $query );
>+    is( $reply->{code}, 'damaged', "Item damaged" );
>+
>+    my $item_o = Koha::Items->find($item->{itemnumber});
>+    $item_o->damaged(0)->store;
>+
>+    my $hold = $builder->build({
>+        source => 'Reserve',
>+        value => {
>+            borrowernumber => $patron->{borrowernumber},
>+            biblionumber => $biblio->{biblionumber},
>+            itemnumber => $item->{itemnumber}
>+        }
>+    });
>+
>+    $reply = C4::ILSDI::Services::HoldTitle( $query );
>+    is( $reply->{code}, 'itemAlreadyOnHold', "Item already on hold" );
>+
>+    my $biblio2 = $builder->build({
>+        source => 'Biblio',
>+    });
>+
>+    my $biblioitems2 = $builder->build({
>+        source => 'Biblioitem',
>+        value => {
>+            biblionumber => $biblio2->{biblionumber},
>+        }
>+    });
>+
>+    my $item2 = $builder->build({
>+        source => 'Item',
>+        value => {
>+            biblionumber => $biblio2->{biblionumber},
>+            damaged => 0
>+        }
>+    });
>+
>+    t::lib::Mocks::mock_preference( 'ReservesControlBranch', 'PatronLibrary' );
>+    my $issuingrule = $builder->build({
>+        source => 'Issuingrule',
>+        value => {
>+            categorycode => $patron->{categorycode},
>+            itemtype => $item2->{itype},
>+            branchcode => $patron->{branchcode},
>+            reservesallowed => 0,
>+        }
>+    });
>+
>+    $query = new CGI;
>+    $query->param( 'patron_id', $patron->{borrowernumber});
>+    $query->param( 'bib_id', $biblio2->{biblionumber});
>+    $query->param( 'item_id', $item2->{itemnumber});
>+
>+    $reply = C4::ILSDI::Services::HoldItem( $query );
>+    is( $reply->{code}, 'tooManyReserves', "Too many reserves" );
>+
>+    $schema->storage->txn_rollback;
>+};
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 19945: 70409 | 73351 | 73352 | 75688 | 75689 | 79046 | 79047 | 79048 | 79049 | 81371 | 81372 | 81373 | 81374 | 83745 | 83746 | 83747 | 83748