Attachment 168882 Details for Bug 36641 – Bug 36641: Optionally filter to default rules using *

[patch] Bug 36641: Optionally filter to default rules using *

Bug-36641-Optionally-filter-to-default-rules-using.patch (text/plain), 4.68 KB, created by Martin Renvoize (ashimema) on 2024-07-12 10:27:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2024-07-12 10:27:38 UTC

Size: 4.68 KB

patch

obsolete

>From e683b8148e23c06fd8dd1f628d663adaf7f7a0c5 Mon Sep 17 00:00:00 2001
>From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>Date: Thu, 11 Jul 2024 18:01:50 +0100
>Subject: [PATCH] Bug 36641: Optionally filter to default rules using *
>
>---
> Koha/REST/V1/CirculationRules.pm | 78 ++++++++++++++++++++------------
> 1 file changed, 49 insertions(+), 29 deletions(-)
>
>diff --git a/Koha/REST/V1/CirculationRules.pm b/Koha/REST/V1/CirculationRules.pm
>index 00b69893e1e..05fe52c2999 100644
>--- a/Koha/REST/V1/CirculationRules.pm
>+++ b/Koha/REST/V1/CirculationRules.pm
>@@ -51,48 +51,64 @@ sub list_rules {
> 
>     return try {
>         my $effective       = $c->param('effective') // 1;
>+        my $kinds           = $c->param('rules') // [ keys %{ Koha::CirculationRules->rule_kinds } ];
>         my $item_type       = $c->param('item_type_id');
>         my $branchcode      = $c->param('library_id');
>         my $patron_category = $c->param('patron_category_id');
>-        my $kinds           = $c->param('rules') // [ keys %{ Koha::CirculationRules->rule_kinds } ];
>+        my ($filter_branch, $filter_itemtype, $filter_patron);
> 
>         if ($item_type) {
>-            my $type = Koha::ItemTypes->find($item_type);
>-            return $c->render_invalid_parameter_value(
>-                {
>-                    path   => '/query/item_type_id',
>-                    values => {
>-                        uri   => '/api/v1/item_types',
>-                        field => 'item_type_id'
>+            $filter_itemtype = 1;
>+            if ( $item_type eq '*' ) {
>+                $item_type = undef;
>+            } else {
>+                my $type = Koha::ItemTypes->find($item_type);
>+                return $c->render_invalid_parameter_value(
>+                    {
>+                        path   => '/query/item_type_id',
>+                        values => {
>+                            uri   => '/api/v1/item_types',
>+                            field => 'item_type_id'
>+                        }
>                     }
>-                }
>-            ) unless $type;
>+                ) unless $type;
>+            }
>         }
> 
>         if ($branchcode) {
>-            my $library = Koha::Libraries->find($branchcode);
>-            return $c->render_invalid_parameter_value(
>-                {
>-                    path   => '/query/library_id',
>-                    values => {
>-                        uri   => '/api/v1/libraries',
>-                        field => 'library_id'
>+            $filter_branch = 1;
>+            if ( $branchcode eq '*' ) {
>+                $branchcode = undef;
>+            } else {
>+                my $library = Koha::Libraries->find($branchcode);
>+                return $c->render_invalid_parameter_value(
>+                    {
>+                        path   => '/query/library_id',
>+                        values => {
>+                            uri   => '/api/v1/libraries',
>+                            field => 'library_id'
>+                        }
>                     }
>-                }
>-            ) unless $library;
>+                ) unless $library;
>+            }
>         }
> 
>         if ($patron_category) {
>-            my $category = Koha::Patron::Categories->find($patron_category);
>-            return $c->render_invalid_parameter_value(
>-                {
>-                    path   => '/query/patron_category_id',
>-                    values => {
>-                        uri   => '/api/v1/patron_categories',
>-                        field => 'patron_category_id'
>+            $filter_patron = 1;
>+            if ( $patron_category eq '*' ) {
>+                $patron_category = undef;
>+            } else {
>+                my $category = Koha::Patron::Categories->find($patron_category);
>+                return $c->render_invalid_parameter_value(
>+                    {
>+                        path   => '/query/patron_category_id',
>+                        values => {
>+                            uri   => '/api/v1/patron_categories',
>+                            field => 'patron_category_id'
>+                        }
>                     }
>-                }
>-            ) unless $category;
>+                ) unless $category;
>+            }
>         }
> 
>         my $rules;
>@@ -116,7 +132,11 @@ sub list_rules {
>             }
> 
>             $rules = Koha::CirculationRules->search(
>-                {},
>+                {
>+                    ( $filter_branch   ? ( branchcode   => $branchcode )      : () ),
>+                    ( $filter_itemtype ? ( itemtype     => $item_type )       : () ),
>+                    ( $filter_patron   ? ( categorycode => $patron_category ) : () )
>+                },
>                 {
>                     select   => $select,
>                     as       => $as,
>-- 
>2.45.2

Actions: View | Diff | Splinter Review

Attachments on bug 36641: 165086 | 167937 | 167938 | 167946 | 167947 | 168018 | 168019 | 168020 | 168023 | 168024 | 168025 | 168365 | 168366 | 168367 | 168368 | 168369 | 168370 | 168378 | 168379 | 168395 | 168396 | 168397 | 168398 | 168399 | 168400 | 168401 | 168841 | 168874 | 168875 | 168876 | 168877 | 168878 | 168879 | 168880 | 168881 | 168882 | 168883 | 168884 | 168905 | 168906 | 168907 | 168908 | 168909 | 168910 | 168911 | 168912 | 168913 | 168914 | 168915 | 168916 | 168926 | 168927 | 168928 | 168929 | 168930 | 168931 | 168932 | 168933 | 168934 | 168935 | 168936 | 168937 | 168938 | 168940 | 169013 | 169014 | 169015 | 169016 | 169017 | 169018 | 169019 | 169020 | 169021 | 169022 | 169023 | 169024 | 169025 | 169026