From d0e40124ddf5d1a6becfc36b0e2edb0e4d427042 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Thu, 11 Mar 2021 09:34:05 -0300 Subject: [PATCH] Bug 27894: Adapt /holds/:hold_id/pickup_locations This patch makes the controller for the route, return all valid pickup locations (i.e. pickup_location => 1) when AllowHoldPolicyOverride is set to 'Allow', but also adds a calculated attribute: 'needs_override' so the consumer knows the specific pickup location needs an override (and thus be able to provide visual feedback on a single run). To test: 1. Apply the regression tests 2. Run: $ kshell k$ prove t/db_dependent/api/v1/holds.t => FAILURE: Tests fail, the change is not implemented 3. Apply this patch 4. Repeat 2 => SUCCESS: Tests pass! 5. Sign off :-D Signed-off-by: Kyle M Hall --- Koha/REST/V1/Holds.pm | 27 ++++++++++++++++++++++++- api/v1/swagger/definitions/library.json | 4 ++++ 2 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Koha/REST/V1/Holds.pm b/Koha/REST/V1/Holds.pm index 9020c57a47..1adc997ec6 100644 --- a/Koha/REST/V1/Holds.pm +++ b/Koha/REST/V1/Holds.pm @@ -472,10 +472,35 @@ sub pickup_locations { } my $pickup_locations = $c->objects->search( $ps_set ); + my @response = (); + + if ( C4::Context->preference('AllowHoldPolicyOverride') ) { + + my $libraries_rs = Koha::Libraries->search( { pickup_location => 1 } ); + my $libraries = $c->objects->search($libraries_rs); + + @response = map { + my $library = $_; + $library->{needs_override} = ( + any { $_->{library_id} eq $library->{library_id} } + @{$pickup_locations} + ) + ? Mojo::JSON->false + : Mojo::JSON->true; + $library; + } @{$libraries}; + + return $c->render( + status => 200, + openapi => \@response + ); + } + + @response = map { $_->{needs_override} = Mojo::JSON->false; $_; } @{$pickup_locations}; return $c->render( status => 200, - openapi => $pickup_locations + openapi => \@response ); } catch { diff --git a/api/v1/swagger/definitions/library.json b/api/v1/swagger/definitions/library.json index 14b0b4c97d..def00d3c4f 100644 --- a/api/v1/swagger/definitions/library.json +++ b/api/v1/swagger/definitions/library.json @@ -91,6 +91,10 @@ "smtp_server": { "type": ["object", "null"], "description": "The library effective SMTP server" + }, + "needs_override": { + "type": "boolean", + "description": "If the library needs an override to act as pickup location for a hold" } }, "additionalProperties": false, -- 2.24.1 (Apple Git-126)