Attachment 140767 Details for Bug 31028 – Bug 31028: Add catalog concerns endpoints

[patch] Bug 31028: Add catalog concerns endpoints

Bug-31028-Add-catalog-concerns-endpoints.patch (text/plain), 15.64 KB, created by Martin Renvoize (ashimema) on 2022-09-20 11:23:39 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2022-09-20 11:23:39 UTC

Size: 15.64 KB

patch

obsolete

>From 9df430063f56e88ffbc244481de35cfe0b8c9fd9 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 7 Jul 2022 17:59:29 +0100
>Subject: [PATCH] Bug 31028: Add catalog concerns endpoints
>
>This patch adds the staff accessible REST API endpoints for catalog
>concerns.
>
>New endpoints available:
>* POST /catalog/concerns
>* GET /catalog/concerns
>* GET /catalog/concerns/{concern_id}
>* PUT /catalog/concerns/{concern_id}
>* DELETE /catalog/concenrs/{concern_id}
>---
> Koha/Catalog/Concern.pm                       |  52 +++++
> Koha/Catalog/Concerns.pm                      |  49 +++++
> Koha/REST/V1/Catalog/Concerns.pm              | 141 ++++++++++++
> .../swagger/definitions/catalog_concern.yaml  |  38 ++++
> api/v1/swagger/paths/catalog_concerns.yaml    | 200 ++++++++++++++++++
> api/v1/swagger/swagger.yaml                   |  12 ++
> 6 files changed, 492 insertions(+)
> create mode 100644 Koha/Catalog/Concern.pm
> create mode 100644 Koha/Catalog/Concerns.pm
> create mode 100644 Koha/REST/V1/Catalog/Concerns.pm
> create mode 100644 api/v1/swagger/definitions/catalog_concern.yaml
> create mode 100644 api/v1/swagger/paths/catalog_concerns.yaml
>
>diff --git a/Koha/Catalog/Concern.pm b/Koha/Catalog/Concern.pm
>new file mode 100644
>index 0000000000..d608da7512
>--- /dev/null
>+++ b/Koha/Catalog/Concern.pm
>@@ -0,0 +1,52 @@
>+package Koha::Catalog::Concern;
>+
>+# This file is part of Koha.
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+use Modern::Perl;
>+
>+
>+use base qw(Koha::Object);
>+
>+=head1 NAME
>+
>+Koha::Catalog::Concern - Koha Catalog::Concern Object class
>+
>+=head1 API
>+
>+=head2 Internal methods
>+
>+=cut
>+
>+=head3 to_api_mapping
>+
>+This method returns the mapping for representing a Koha::Catalog::Concern object
>+on the API.
>+
>+=cut
>+
>+sub to_api_mapping {
>+    return { id => 'concern_id', };
>+}
>+
>+=head3 _type
>+
>+=cut
>+
>+sub _type {
>+    return 'CatalogConcern';
>+}
>+
>+1;
>diff --git a/Koha/Catalog/Concerns.pm b/Koha/Catalog/Concerns.pm
>new file mode 100644
>index 0000000000..ec4652f31c
>--- /dev/null
>+++ b/Koha/Catalog/Concerns.pm
>@@ -0,0 +1,49 @@
>+package Koha::Catalog::Concerns;
>+
>+# This file is part of Koha.
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+use Modern::Perl;
>+
>+
>+use base qw(Koha::Objects);
>+
>+=head1 NAME
>+
>+Koha::Tag - Koha Tag Object class
>+
>+=head1 API
>+
>+=head2 Internal methods
>+
>+=cut
>+
>+=head3 _type
>+
>+=cut
>+
>+sub _type {
>+    return 'CatalogConcern';
>+}
>+
>+=head3 object_class
>+
>+=cut
>+
>+sub object_class {
>+    return 'Koha::Catalog::Concern';
>+}
>+
>+1;
>diff --git a/Koha/REST/V1/Catalog/Concerns.pm b/Koha/REST/V1/Catalog/Concerns.pm
>new file mode 100644
>index 0000000000..2ce15bfd79
>--- /dev/null
>+++ b/Koha/REST/V1/Catalog/Concerns.pm
>@@ -0,0 +1,141 @@
>+package Koha::REST::V1::Catalog::Concerns;
>+
>+# This file is part of Koha.
>+#
>+# Koha is free software; you can redistribute it and/or modify it
>+# under the terms of the GNU General Public License as published by
>+# the Free Software Foundation; either version 3 of the License, or
>+# (at your option) any later version.
>+#
>+# Koha is distributed in the hope that it will be useful, but
>+# WITHOUT ANY WARRANTY; without even the implied warranty of
>+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
>+# GNU General Public License for more details.
>+#
>+# You should have received a copy of the GNU General Public License
>+# along with Koha; if not, see <http://www.gnu.org/licenses>.
>+
>+use Modern::Perl;
>+
>+use Mojo::Base 'Mojolicious::Controller';
>+
>+use Koha::Catalog::Concern;
>+use Koha::Catalog::Concerns;
>+
>+use Try::Tiny qw( catch try );
>+
>+=head1 API
>+
>+=head2 Methods
>+
>+=head3 list
>+
>+=cut
>+
>+sub list {
>+    my $c = shift->openapi->valid_input or return;
>+
>+    return try {
>+        my $concerns_set = Koha::Catalog::Concerns->new;
>+        my $concerns = $c->objects->search( $concerns_set );
>+        return $c->render( status => 200, openapi => $concerns );
>+    }
>+    catch {
>+        $c->unhandled_exception($_);
>+    };
>+
>+}
>+
>+=head3 get
>+
>+=cut
>+
>+sub get {
>+    my $c = shift->openapi->valid_input or return;
>+
>+    return try {
>+        my $concern = Koha::Catalog::Concerns->find( $c->validation->param('concern_id') );
>+        unless ($concern) {
>+            return $c->render( status  => 404,
>+                            openapi => { error => "Catalog::Concern not found" } );
>+        }
>+
>+        return $c->render( status => 200, openapi => $concern->to_api );
>+    }
>+    catch {
>+        $c->unhandled_exception($_);
>+    }
>+}
>+
>+=head3 add
>+
>+=cut
>+
>+sub add {
>+    my $c = shift->openapi->valid_input or return;
>+
>+    return try {
>+        my $body    = $c->validation->param('body');
>+        my $concern = Koha::Catalog::Concern->new_from_api($body)->store;
>+        $concern->discard_changes;
>+        $c->res->headers->location( $c->req->url->to_string . '/' . $concern->id );
>+        return $c->render(
>+              status  => 201,
>+              openapi => $concern->to_api
>+        );
>+    }
>+    catch {
>+          $c->unhandled_exception($_);
>+    };
>+}
>+
>+=head3 update
>+
>+=cut
>+
>+sub update {
>+    my $c = shift->openapi->valid_input or return;
>+
>+    my $concern = Koha::Catalog::Concerns->find( $c->validation->param('concern_id') );
>+
>+    if ( not defined $concern ) {
>+        return $c->render( status  => 404,
>+                           openapi => { error => "Object not found" } );
>+    }
>+
>+    return try {
>+        $concern->set_from_api( $c->validation->param('body') );
>+        $concern->store();
>+        return $c->render( status => 200, openapi => $concern->to_api );
>+    }
>+    catch {
>+        $c->unhandled_exception($_);
>+    };
>+}
>+
>+=head3 delete
>+
>+=cut
>+
>+sub delete {
>+    my $c = shift->openapi->valid_input or return;
>+
>+    my $concern = Koha::Catalog::Concerns->find( $c->validation->param('concern_id') );
>+    if ( not defined $concern ) {
>+        return $c->render( status  => 404,
>+                           openapi => { error => "Object not found" } );
>+    }
>+
>+    return try {
>+        $concern->delete;
>+        return $c->render(
>+            status  => 204,
>+            openapi => q{}
>+        );
>+    }
>+    catch {
>+        $c->unhandled_exception($_);
>+    };
>+}
>+
>+1;
>diff --git a/api/v1/swagger/definitions/catalog_concern.yaml b/api/v1/swagger/definitions/catalog_concern.yaml
>new file mode 100644
>index 0000000000..01e7b87b92
>--- /dev/null
>+++ b/api/v1/swagger/definitions/catalog_concern.yaml
>@@ -0,0 +1,38 @@
>+---
>+type: object
>+properties:
>+  concern_id:
>+    type: integer
>+    description: Internal concern identifier
>+  added_date:
>+    type:
>+      - string
>+      - "null"
>+    format: date-time
>+    description: Date the concern was reported
>+  biblio_id:
>+    type: integer
>+    description: Internal identifier for the biblio the concern is related to
>+  message:
>+    type: string
>+    description: Concern details
>+  patron_id:
>+    type: integer
>+    description: Internal identifier for the patron the concern was submitted by
>+  resolved_by:
>+    type:
>+      - integer
>+      - "null"
>+    description: Internal identifier for the patron the concern was resolved by
>+  resolved_date:
>+    type:
>+      - string
>+      - "null"
>+    format: date-time
>+    description: Date the concern was resolved_date
>+  resolution_message:
>+    type:
>+        - string
>+        - "null"
>+    description: Resolution details
>+additionalProperties: false
>diff --git a/api/v1/swagger/paths/catalog_concerns.yaml b/api/v1/swagger/paths/catalog_concerns.yaml
>new file mode 100644
>index 0000000000..138d51986b
>--- /dev/null
>+++ b/api/v1/swagger/paths/catalog_concerns.yaml
>@@ -0,0 +1,200 @@
>+---
>+/catalog/concerns:
>+  get:
>+    x-mojo-to: Catalog::Concerns#list
>+    operationId: listConcerns
>+    tags:
>+      - concerns
>+    summary: List concerns
>+    produces:
>+      - application/json
>+    parameters:
>+      - $ref: "../swagger.yaml#/parameters/match"
>+      - $ref: "../swagger.yaml#/parameters/order_by"
>+      - $ref: "../swagger.yaml#/parameters/page"
>+      - $ref: "../swagger.yaml#/parameters/per_page"
>+      - $ref: "../swagger.yaml#/parameters/q_param"
>+      - $ref: "../swagger.yaml#/parameters/q_body"
>+      - $ref: "../swagger.yaml#/parameters/q_header"
>+      - $ref: "../swagger.yaml#/parameters/request_id_header"
>+    responses:
>+      "200":
>+        description: A list of concerns
>+        schema:
>+          type: array
>+          items:
>+            $ref: "../swagger.yaml#/definitions/catalog_concern"
>+      "403":
>+        description: Access forbidden
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "500":
>+        description: |
>+          Internal server error. Possible `error_code` attribute values:
>+
>+          * `internal_server_error`
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "503":
>+        description: Under maintenance
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+    x-koha-authorization:
>+      permissions:
>+        catalogue: "1"
>+  post:
>+    x-mojo-to: Catalog::Concerns#add
>+    operationId: addConcern
>+    tags:
>+      - concerns
>+    summary: Add catalog concern
>+    parameters:
>+      - name: body
>+        in: body
>+        description: A JSON object containing informations about the new hold
>+        required: true
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/catalog_concern"
>+    produces:
>+      - application/json
>+    responses:
>+      "201":
>+        description: Concern added
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/catalog_concern"
>+      "401":
>+        description: Authentication required
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "403":
>+        description: Access forbidden
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "500":
>+        description: |
>+          Internal server error. Possible `error_code` attribute values:
>+
>+          * `internal_server_error`
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "503":
>+        description: Under maintenance
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+    x-koha-authorization:
>+      permissions:
>+        catalogue: "1"
>+"/catalog/concerns/{concern_id}":
>+  get:
>+    x-mojo-to: Catalog::Concerns#get
>+    operationId: getConcern
>+    tags:
>+      - concerns
>+    summary: Get catalog concern
>+    parameters:
>+      - $ref: "../swagger.yaml#/parameters/concern_id_pp"
>+    produces:
>+      - application/json
>+    responses:
>+      "200":
>+        description: A catalog concern
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/catalog_concern"
>+      "404":
>+        description: Concern not found
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "500":
>+        description: |
>+          Internal server error. Possible `error_code` attribute values:
>+
>+          * `internal_server_error`
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "503":
>+        description: Under maintenance
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+    x-koha-authorization:
>+      permissions:
>+        catalogue: "1"
>+  put:
>+    x-mojo-to: Catalog::Concerns#update
>+    operationId: updateConcern
>+    tags:
>+      - concerns
>+    summary: Update catalog concern
>+    parameters:
>+      - $ref: "../swagger.yaml#/parameters/concern_id_pp"
>+      - name: body
>+        in: body
>+        description: A catalog concern object
>+        required: true
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/catalog_concern"
>+    produces:
>+      - application/json
>+    responses:
>+      "200":
>+        description: A catalog concern
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/catalog_concern"
>+      "401":
>+        description: Authentication required
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "403":
>+        description: Access forbidden
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "404":
>+        description: Concern not found
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "500":
>+        description: Internal error
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "503":
>+        description: Under maintenance
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+    x-koha-authorization:
>+      permissions:
>+        editcatalogue: edit_catalogue
>+  delete:
>+    x-mojo-to: Catalog::Concerns#delete
>+    operationId: deleteConcern
>+    tags:
>+      - concerns
>+    summary: Delete catalog concern
>+    parameters:
>+      - $ref: "../swagger.yaml#/parameters/concern_id_pp"
>+    produces:
>+      - application/json
>+    responses:
>+      "204":
>+        description: Concern deleted
>+      "401":
>+        description: Authentication required
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "403":
>+        description: Access forbidden
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "404":
>+        description: Concern not found
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "500":
>+        description: Internal error
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+      "503":
>+        description: Under maintenance
>+        schema:
>+          $ref: "../swagger.yaml#/definitions/error"
>+    x-koha-authorization:
>+      permissions:
>+        editcatalogue: edit_catalogue
>diff --git a/api/v1/swagger/swagger.yaml b/api/v1/swagger/swagger.yaml
>index a10f2408b6..39f7f04e6f 100644
>--- a/api/v1/swagger/swagger.yaml
>+++ b/api/v1/swagger/swagger.yaml
>@@ -14,6 +14,8 @@ definitions:
>     $ref: ./definitions/bundle_link.yaml
>   cashup:
>     $ref: ./definitions/cashup.yaml
>+  catalog_concern:
>+    $ref: ./definitions/catalog_concern.yaml
>   checkout:
>     $ref: ./definitions/checkout.yaml
>   checkouts:
>@@ -123,6 +125,10 @@ paths:
>     $ref: "./paths/cash_registers.yaml#/~1cash_registers~1{cash_register_id}~1cashups"
>   "/cashups/{cashup_id}":
>     $ref: "./paths/cash_registers.yaml#/~1cashups~1{cashup_id}"
>+  "/catalog/concerns":
>+    $ref: "./paths/catalog_concerns.yaml#/~1catalog~1concerns"
>+  "/catalog/concerns/{concern_id}":
>+    $ref: "./paths/catalog_concerns.yaml#/~1catalog~1concerns~1{concern_id}"
>   /checkouts:
>     $ref: ./paths/checkouts.yaml#/~1checkouts
>   "/checkouts/{checkout_id}":
>@@ -284,6 +290,12 @@ parameters:
>     name: checkout_id
>     required: true
>     type: integer
>+  concern_id_pp:
>+    description: Internal concern identifier
>+    in: path
>+    name: concern_id
>+    required: true
>+    type: integer
>   city_id_pp:
>     description: City internal identifier
>     in: path
>-- 
>2.20.1

Actions: View | Diff | Splinter Review

Attachments on bug 31028: 137412 | 139222 | 139223 | 139224 | 139225 | 139226 | 139227 | 139228 | 139229 | 139230 | 139231 | 139232 | 139233 | 139234 | 139235 | 139236 | 139237 | 139238 | 139572 | 139573 | 139574 | 139575 | 139576 | 139577 | 139578 | 139579 | 139580 | 139581 | 139582 | 139583 | 139584 | 139585 | 139586 | 139587 | 139588 | 139589 | 139590 | 139591 | 140289 | 140290 | 140291 | 140292 | 140293 | 140294 | 140295 | 140296 | 140297 | 140298 | 140299 | 140300 | 140301 | 140302 | 140303 | 140304 | 140305 | 140306 | 140307 | 140308 | 140436 | 140437 | 140438 | 140439 | 140440 | 140441 | 140442 | 140443 | 140444 | 140445 | 140446 | 140447 | 140448 | 140449 | 140450 | 140451 | 140452 | 140453 | 140454 | 140455 | 140764 | 140765 | 140766 | 140767 | 140768 | 140769 | 140770 | 140771 | 140772 | 140773 | 140774 | 140775 | 140776 | 140777 | 140778 | 140779 | 140780 | 140781 | 140782 | 140783 | 140793 | 140929 | 140930 | 140931 | 140932 | 140933 | 140934 | 140935 | 140936 | 140937 | 140938 | 140939 | 140940 | 140941 | 140942 | 140943 | 140944 | 140945 | 140946 | 140947 | 140948 | 140949 | 140950 | 141133 | 141134 | 141135 | 141136 | 141137 | 141138 | 141139 | 141140 | 141141 | 141142 | 141143 | 141144 | 141145 | 141146 | 141147 | 141148 | 141149 | 141150 | 141151 | 141152 | 141153 | 141154 | 141440 | 141441 | 141442 | 141443 | 141444 | 141445 | 141446 | 141447 | 141448 | 141449 | 141450 | 141451 | 141452 | 141453 | 141454 | 141455 | 141456 | 141457 | 141458 | 141459 | 141460 | 142164 | 142165 | 142166 | 142167 | 142168 | 142169 | 142170 | 142171 | 142172 | 142173 | 142174 | 142175 | 142177 | 142179 | 142180 | 142181 | 142182 | 142183 | 142184 | 142185 | 142186 | 142187 | 142188 | 142189 | 142190 | 142191 | 142616 | 142617 | 142618 | 142619 | 142620 | 142621 | 142622 | 142623 | 142624 | 142625 | 142626 | 142627 | 142932 | 142933 | 142934 | 142935 | 142936 | 142937 | 142938 | 142939 | 142940 | 142941 | 142942 | 142943 | 142944 | 142945 | 142946 | 142947 | 142948 | 142949 | 143238 | 143239 | 143240 | 143241 | 143242 | 143243 | 143244 | 143245 | 143246 | 143247 | 143248 | 143249 | 143250 | 143251 | 143252 | 143253 | 143254 | 143255 | 143256 | 143257 | 143302 | 143303 | 143304 | 143305 | 143306 | 143307 | 143308 | 143309 | 143310 | 143311 | 143312 | 143313 | 143314 | 143315 | 143316 | 143317 | 143318 | 143319 | 143320 | 143321 | 143322 | 143323 | 143324 | 143325 | 143326 | 143327 | 143328 | 143329 | 143330 | 143331 | 143332 | 143333 | 143334 | 143335 | 143336 | 143337 | 143338 | 143339 | 143340 | 143341 | 143470 | 143471 | 143472 | 143473 | 143474 | 143475 | 143476 | 143477 | 143478 | 143479 | 143480 | 143481 | 143482 | 143483 | 143484 | 143485 | 143486 | 143487 | 143488 | 143489 | 143490 | 143647 | 143648 | 143649 | 143650 | 143651 | 143652 | 143653 | 143654 | 143655 | 143656 | 143657 | 143658 | 143659 | 143660 | 143661 | 143662 | 143663 | 143664 | 143665 | 143666 | 143667 | 143708 | 143709 | 143710 | 143711 | 143712 | 143713 | 143714 | 143715 | 143716 | 143717 | 143718 | 143719 | 143720 | 143721 | 143722 | 143723 | 143724 | 143725 | 143726 | 143727 | 144647 | 144648 | 144649 | 144650 | 144651 | 144652 | 144653 | 144654 | 144655 | 144656 | 144657 | 144658 | 144659 | 144660 | 144661 | 144662 | 144663 | 144664 | 144665 | 144666 | 144667 | 144668 | 145542 | 146214 | 146215 | 146216 | 146217 | 146218 | 146219 | 146220 | 146221 | 146222 | 146223 | 146224 | 146225 | 146226 | 146227 | 146228 | 146229 | 146230 | 146231 | 146232 | 146233 | 146234 | 146235 | 146236 | 146237 | 146238 | 146239 | 146240 | 146241 | 146242 | 146243 | 146244 | 146245 | 146246 | 146247 | 146248 | 146249 | 146250 | 146251 | 146252 | 146253 | 146254 | 146255 | 146256 | 146257 | 146258 | 146259 | 146260 | 146261 | 146262 | 146697 | 146870 | 146871 | 146872 | 146873 | 146874 | 146875 | 146876 | 146877 | 146878 | 146879 | 146880 | 146881 | 146882 | 146883 | 146884 | 146885 | 146886 | 146887 | 146888 | 146889 | 146890 | 146891 | 146892 | 146893 | 146894 | 146895 | 146896 | 147797 | 147840 | 147841 | 147844 | 147859 | 147860 | 147861 | 147866 | 148673 | 149931