From c0bd2b4851b188d911277d3ae4f264df035b4159 Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Tue, 31 Dec 2019 10:42:38 -0300 Subject: [PATCH] Bug 24321: Clean /acquisitions/funds Signed-off-by: Josef Moravec --- Koha/REST/V1/Acquisitions/Funds.pm | 88 +++------------------------- api/v1/swagger/paths/acquisitions_funds.json | 14 ++++- 2 files changed, 22 insertions(+), 80 deletions(-) diff --git a/Koha/REST/V1/Acquisitions/Funds.pm b/Koha/REST/V1/Acquisitions/Funds.pm index 21f5e4bacf..fe3f7da3e4 100644 --- a/Koha/REST/V1/Acquisitions/Funds.pm +++ b/Koha/REST/V1/Acquisitions/Funds.pm @@ -29,37 +29,25 @@ Koha::REST::V1::Acquisitions::Funds =head1 API -=head2 Methods +=head2 Class methods -=head3 list_funds +=head3 list Controller function that handles listing Funds =cut -sub list_funds { +sub list { my $c = shift->openapi->valid_input or return; - my $args = _to_model($c->req->params->to_hash); - my $filter; - - for my $filter_param ( keys %$args ) { - if ($args->{$filter_param}) { - if ($filter_param eq "budget_owner_id") { - # Perform an exact search on the borrowernumber - $filter->{$filter_param} = { "=" => $args->{$filter_param} } - } else { - # And a "start with" search on the budget name - $filter->{$filter_param} = { LIKE => $args->{$filter_param} . "%" } - } - } - } - return try { - my $funds = Koha::Acquisition::Funds->search($filter); + + my $funds_rs = Koha::Acquisition::Funds->new; + my $funds = $c->objects->search( $funds_rs ); + return $c->render( status => 200, - openapi => $funds->to_api + openapi => $funds ); } catch { @@ -69,67 +57,9 @@ sub list_funds { } else { return $c->render( status => 500, - openapi => { error => "Something went wrong, check the logs. $_ $filter" } ); + openapi => { error => "Something went wrong, check the logs. $_" } ); } }; } -=head3 _to_api - -Helper function that maps a Fund into -the attribute names the exposed REST api spec. - -=cut - -sub _to_api { - my $fund = shift; - my $returnfund; - $returnfund->{fund_id} = delete $fund->{budget_id}; - $returnfund->{code} = delete $fund->{budget_code}; - $returnfund->{name} = delete $fund->{budget_name}; - $returnfund->{library_id} = delete $fund->{budget_branchcode}; - $returnfund->{total_amount} = delete $fund->{budget_amount}; - $returnfund->{warn_at_percentage} = delete $fund->{budget_encumb}; - $returnfund->{warn_at_amount} = delete $fund->{budget_expend}; - $returnfund->{notes} = delete $fund->{budget_notes}; - $returnfund->{budget_id} = delete $fund->{budget_period_id}; - $returnfund->{timestamp} = delete $fund->{timestamp}; - $returnfund->{fund_owner_id} = delete $fund->{budget_owner_id}; - $returnfund->{fund_access} = delete $fund->{budget_permission}; - $returnfund->{statistic1_auth_value_category} = delete $fund->{sort1_authcat}; - $returnfund->{statistic2_auth_value_category} = delete $fund->{sort2_authcat}; - - return $returnfund; -} - -=head3 _to_model - -Helper function that maps REST api objects into Fund -attribute names. - -=cut - -sub _to_model { - my $fund = shift; - my $returnfund; - - # Rename back - $returnfund->{budget_id} = delete $fund->{fund_id}; - $returnfund->{budget_code} = delete $fund->{code}; - $returnfund->{budget_name} = delete $fund->{name}; - $returnfund->{budget_branchcode} = delete $fund->{library_id}; - $returnfund->{budget_amount} = delete $fund->{total_amount}; - $returnfund->{budget_encumb} = delete $fund->{warn_at_percentage}; - $returnfund->{budget_expend} = delete $fund->{warn_at_amount}; - $returnfund->{budget_notes} = delete $fund->{notes}; - $returnfund->{budget_period_id} = delete $fund->{budget_id}; - $returnfund->{budget_owner_id} = delete $fund->{fund_owner_id}; - $returnfund->{timestamp} = delete $fund->{timestamp}; - $returnfund->{budget_permission} = delete $fund->{fund_access}; - $returnfund->{sort1_authcat} = delete $fund->{statistic1_auth_value_category}; - $returnfund->{sort2_authcat} = delete $fund->{statistic2_auth_value_category}; - - return $returnfund; -} - 1; diff --git a/api/v1/swagger/paths/acquisitions_funds.json b/api/v1/swagger/paths/acquisitions_funds.json index 44f72774a2..1b0ebce147 100644 --- a/api/v1/swagger/paths/acquisitions_funds.json +++ b/api/v1/swagger/paths/acquisitions_funds.json @@ -1,7 +1,7 @@ { "/acquisitions/funds": { "get": { - "x-mojo-to": "Acquisitions::Funds#list_funds", + "x-mojo-to": "Acquisitions::Funds#list", "operationId": "listFunds", "tags": ["acquisitions","funds"], "produces": [ @@ -20,6 +20,18 @@ "description": "Display only the funds that belongs to the given patron ID", "required": false, "type": "integer" + }, + { + "$ref": "../parameters.json#/match" + }, + { + "$ref": "../parameters.json#/order_by" + }, + { + "$ref": "../parameters.json#/page" + }, + { + "$ref": "../parameters.json#/per_page" } ], "responses": { -- 2.11.0