Attachment 88590 Details for Bug 17003 – Bug 17003: Adapt to OpenAPI

[patch] Bug 17003: Adapt to OpenAPI

0002-Bug-17003-Adapt-to-OpenAPI.patch (text/plain), 4.48 KB, created by Johanna Räisä on 2019-04-24 05:51:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Johanna Räisä

Created: 2019-04-24 05:51:32 UTC

Size: 4.48 KB

patch

obsolete

>From 9b356341d55a07f88195cd18d36a25ba5cd34dc9 Mon Sep 17 00:00:00 2001
>From: Josef Moravec <josef.moravec@gmail.com>
>Date: Thu, 21 Feb 2019 02:30:00 +0000
>Subject: [PATCH 2/7] Bug 17003: Adapt to OpenAPI
>
>Test plan:
>prove t/db_dependent/api/v1/checkouts.t
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>
>Signed-off-by: Michal Denar <black23@gmail.com>
>Signed-off-by: Johanna Raisa <johanna.raisa@gmail.com>
>---
> Koha/REST/V1/Checkouts.pm           | 40 +++++++++++------------------
> api/v1/swagger/paths/checkouts.json |  3 +--
> t/db_dependent/api/v1/checkouts.t   |  8 ++----
> 3 files changed, 18 insertions(+), 33 deletions(-)
>
>diff --git a/Koha/REST/V1/Checkouts.pm b/Koha/REST/V1/Checkouts.pm
>index a45974369a..b1bc8632e6 100644
>--- a/Koha/REST/V1/Checkouts.pm
>+++ b/Koha/REST/V1/Checkouts.pm
>@@ -129,37 +129,27 @@ sub renew {
> }
> 
> sub renewability {
>-    my ($c, $args, $cb) = @_;
>-
>-    my $user = $c->stash('koha.user');
>-
>-    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 $c = shift->openapi->valid_input or return;
> 
>-    my $checkout_id = $args->{checkout_id};
>-    my $checkout = Koha::Issues->find($checkout_id);
>+    my $checkout_id = $c->validation->param('checkout_id');
>+    my $checkout = Koha::Checkouts->find( $checkout_id );
> 
>-    if (!$checkout) {
>-        return $c->$cb({
>-            error => "Checkout doesn't exist"
>-        }, 404);
>+    unless ($checkout) {
>+        return $c->render(
>+            status => 404,
>+            openapi => { error => "Checkout doesn't exist" }
>+        );
>     }
> 
>-    my $borrowernumber = $checkout->borrowernumber;
>-    my $itemnumber = $checkout->itemnumber;
>-
>     my ($can_renew, $error) = C4::Circulation::CanBookBeRenewed(
>-        $borrowernumber, $itemnumber);
>+        $checkout->borrowernumber, $checkout->itemnumber);
> 
>-    return $c->$cb({ renewable => Mojo::JSON->true, error => undef }, 200) if $can_renew;
>-    return $c->$cb({ renewable => Mojo::JSON->false, error => $error }, 200);
>+    my $renewable = Mojo::JSON->false;
>+    $renewable = Mojo::JSON->true if $can_renew;
>+    return $c->render(
>+        status => 200,
>+        openapi => { renewable => $renewable, error => $error }
>+    );
> }
> 
> =head3 _to_api
>diff --git a/api/v1/swagger/paths/checkouts.json b/api/v1/swagger/paths/checkouts.json
>index 7049ca635f..4aa4f12c9d 100644
>--- a/api/v1/swagger/paths/checkouts.json
>+++ b/api/v1/swagger/paths/checkouts.json
>@@ -95,6 +95,7 @@
>   },
>   "/checkouts/{checkout_id}/renewability": {
>     "get": {
>+      "x-mojo-to": "Checkout#renewability",
>       "operationId": "renewabilityCheckout",
>       "tags": ["patrons", "checkouts"],
>       "parameters": [{
>@@ -116,8 +117,6 @@
>         }
>       },
>       "x-koha-authorization": {
>-        "allow-owner": true,
>-        "allow-guarantor": true,
>         "permissions": {
>           "circulate": "circulate_remaining_permissions"
>         }
>diff --git a/t/db_dependent/api/v1/checkouts.t b/t/db_dependent/api/v1/checkouts.t
>index 3636f754ba..ea513d5061 100644
>--- a/t/db_dependent/api/v1/checkouts.t
>+++ b/t/db_dependent/api/v1/checkouts.t
>@@ -144,9 +144,7 @@ $t->post_ok( "//$unauth_userid:$unauth_password@/api/v1/checkouts/" . $issue3->i
>               required_permissions => { circulate => "circulate_remaining_permissions" }
>             });
> 
>-$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)
>+$t->get_ok( "//$userid:$password@/api/v1/checkouts/" . $issue2->issue_id . "/renewability")
>   ->status_is(200)
>   ->json_is({ renewable => Mojo::JSON->true, error => undef });
> 
>@@ -160,8 +158,6 @@ $t->post_ok( "//$userid:$password@/api/v1/checkouts/" . $issue1->issue_id . "/re
>   ->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)
>+$t->get_ok( "//$userid:$password@/api/v1/checkouts/" . $issue2->issue_id . "/renewability")
>   ->status_is(200)
>   ->json_is({ renewable => Mojo::JSON->false, error => 'too_many' });
>-- 
>2.17.1
>

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