Bugzilla – Attachment 56507 Details for
Bug 17003
Add API route to get checkout's renewability
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 17003: Add API route to get checkout's renewability
Bug-17003-Add-API-route-to-get-checkouts-renewabil.patch (text/plain), 5.69 KB, created by
Lari Taskula
on 2016-10-14 11:08:10 UTC
(
hide
)
Description:
Bug 17003: Add API route to get checkout's renewability
Filename:
MIME Type:
Creator:
Lari Taskula
Created:
2016-10-14 11:08:10 UTC
Size:
5.69 KB
patch
obsolete
>From 1aaeefbf22f7cfcc163e0fcd473d19dd4c999ff5 Mon Sep 17 00:00:00 2001 >From: Lari Taskula <larit@student.uef.fi> >Date: Mon, 22 Aug 2016 17:35:44 +0300 >Subject: [PATCH] Bug 17003: Add API route to get checkout's renewability > >GET /checkouts/{checkout_id}/renewability (renewability status) > >Response: >- 200: renewable (empty response object {}) >- 403: not renewable (or not authorized to make renewals) > >To test: >1. Login to Koha >2. Checkout something for yourself >3. Make GET request to http://yourlibrary/api/v1/checkouts/YYY/renewability > where YYY is checkout_id of your checkout. >4. Observe returned data and HTTP code (200 for renewable, 403 for not renewable) > If not renewable, an error should also be presented. >5. Run t/db_dependent/api/v1/checkouts.t >--- > Koha/REST/V1/Checkout.pm | 35 +++++++++++++++++++++++++++++++++++ > api/v1/swagger/paths.json | 3 +++ > api/v1/swagger/paths/checkouts.json | 30 ++++++++++++++++++++++++++++++ > t/db_dependent/api/v1/checkouts.t | 20 +++++++++++++++++++- > 4 files changed, 87 insertions(+), 1 deletion(-) > >diff --git a/Koha/REST/V1/Checkout.pm b/Koha/REST/V1/Checkout.pm >index ac5dea5..24dd43c 100644 >--- a/Koha/REST/V1/Checkout.pm >+++ b/Koha/REST/V1/Checkout.pm >@@ -18,6 +18,7 @@ package Koha::REST::V1::Checkout; > use Modern::Perl; > > use Mojo::Base 'Mojolicious::Controller'; >+use Mojo::JSON; > > use C4::Auth qw( haspermission ); > use C4::Context; >@@ -86,4 +87,38 @@ sub renew { > return $c->$cb($checkout->unblessed, 200); > } > >+sub renewability { >+ my ($c, $args, $cb) = @_; >+ >+ my $user = $c->stash('koha.user'); >+ >+ my $checkout_id = $args->{checkout_id}; >+ my $checkout = Koha::Issues->find($checkout_id); >+ >+ if (!$checkout) { >+ return $c->$cb({ >+ error => "Checkout doesn't exist" >+ }, 404); >+ } >+ >+ my $borrowernumber = $checkout->borrowernumber; >+ my $itemnumber = $checkout->itemnumber; >+ >+ my $OpacRenewalAllowed; >+ if ($user->borrowernumber == $borrowernumber) { >+ $OpacRenewalAllowed = C4::Context->preference('OpacRenewalAllowed'); >+ } >+ >+ unless ($user && ($OpacRenewalAllowed >+ || haspermission($user->userid, { circulate => "circulate_remaining_permissions" }))) { >+ return $c->$cb({error => "You don't have the required permission"}, 403); >+ } >+ >+ my ($can_renew, $error) = C4::Circulation::CanBookBeRenewed( >+ $borrowernumber, $itemnumber); >+ >+ return $c->$cb({}, 200) if $can_renew; >+ return $c->$cb({error => "Renewal not authorized ($error)"}, 403); >+} >+ > 1; >diff --git a/api/v1/swagger/paths.json b/api/v1/swagger/paths.json >index 05c29aa..b55c0b8 100644 >--- a/api/v1/swagger/paths.json >+++ b/api/v1/swagger/paths.json >@@ -11,6 +11,9 @@ > "/checkouts/{checkout_id}": { > "$ref": "paths/checkouts.json#/~1checkouts~1{checkout_id}" > }, >+ "/checkouts/{checkout_id}/renewability": { >+ "$ref": "paths/checkouts.json#/~1checkouts~1{checkout_id}~1renewability" >+ }, > "/patrons": { > "$ref": "paths/patrons.json#/~1patrons" > }, >diff --git a/api/v1/swagger/paths/checkouts.json b/api/v1/swagger/paths/checkouts.json >index e49a33e..469334b 100644 >--- a/api/v1/swagger/paths/checkouts.json >+++ b/api/v1/swagger/paths/checkouts.json >@@ -93,5 +93,35 @@ > } > } > } >+ }, >+ "/checkouts/{checkout_id}/renewability": { >+ "get": { >+ "operationId": "renewabilityCheckout", >+ "tags": ["patrons", "checkouts"], >+ "parameters": [{ >+ "name": "checkout_id", >+ "in": "path", >+ "description": "Internal checkout identifier", >+ "required": true, >+ "type": "integer" >+ }], >+ "produces": ["application/json"], >+ "responses": { >+ "200": { >+ "description": "Checkout is renewable", >+ "schema": { >+ "type": "object" >+ } >+ }, >+ "403": { >+ "description": "Checkout is not renewable", >+ "schema": { "$ref": "../definitions.json#/error" } >+ }, >+ "404": { >+ "description": "Checkout not found", >+ "schema": { "$ref": "../definitions.json#/error" } >+ } >+ } >+ } > } > } >diff --git a/t/db_dependent/api/v1/checkouts.t b/t/db_dependent/api/v1/checkouts.t >index 5298d7f..3dcdf61 100644 >--- a/t/db_dependent/api/v1/checkouts.t >+++ b/t/db_dependent/api/v1/checkouts.t >@@ -17,7 +17,7 @@ > > use Modern::Perl; > >-use Test::More tests => 57; >+use Test::More tests => 66; > use Test::MockModule; > use Test::Mojo; > use t::lib::Mocks; >@@ -189,7 +189,19 @@ $t->request_ok($tx) > ->status_is(403) > ->json_is({ error => "Opac Renewal not allowed" }); > >+$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue2->issue_id . "/renewability"); >+$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); >+$t->request_ok($tx) >+ ->status_is(403) >+ ->json_is({ error => "You don't have the required permission" }); >+ > t::lib::Mocks::mock_preference( "OpacRenewalAllowed", 1 ); >+$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue2->issue_id . "/renewability"); >+$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); >+$t->request_ok($tx) >+ ->status_is(200) >+ ->json_is({}); >+ > $tx = $t->ua->build_tx(PUT => "/api/v1/checkouts/" . $issue2->issue_id); > $tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); > $t->request_ok($tx) >@@ -202,6 +214,12 @@ $t->request_ok($tx) > ->status_is(403) > ->json_is({ error => 'Renewal not authorized (too_many)' }); > >+$tx = $t->ua->build_tx(GET => "/api/v1/checkouts/" . $issue2->issue_id . "/renewability"); >+$tx->req->cookies({name => 'CGISESSID', value => $patron_session->id}); >+$t->request_ok($tx) >+ ->status_is(403) >+ ->json_is({ error => 'Renewal not authorized (too_many)' }); >+ > sub create_biblio { > my ($title) = @_; > >-- >1.9.1
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 17003
:
54709
|
54710
|
56507
|
57489
|
57493
|
58099
|
85475
|
85476
|
87155
|
87156
|
87157
|
87445
|
87446
|
88260
|
88261
|
88262
|
88589
|
88590
|
88591
|
91102
|
91103
|
91104
|
91105