@@ -, +, @@ $ ktd --shell k$ prove t/db_dependent/api/v1 --- Koha/REST/V1/Acquisitions/Orders.pm | 10 ++-------- Koha/REST/V1/Acquisitions/Vendors.pm | 9 ++------- Koha/REST/V1/AdvancedEditorMacro.pm | 10 ++++------ Koha/REST/V1/ArticleRequests.pm | 13 +++---------- Koha/REST/V1/Auth/Identity/Provider/Domains.pm | 5 +---- Koha/REST/V1/Auth/Identity/Providers.pm | 8 ++------ Koha/REST/V1/Authorities.pm | 5 ++--- Koha/REST/V1/Biblios.pm | 2 +- Koha/REST/V1/Biblios/ItemGroups.pm | 5 ++--- Koha/REST/V1/Biblios/ItemGroups/Items.pm | 8 ++------ Koha/REST/V1/Bookings.pm | 5 +---- Koha/REST/V1/Cities.pm | 5 +---- Koha/REST/V1/Config/SMTP/Servers.pm | 9 ++------- Koha/REST/V1/ERM/Agreements.pm | 8 ++------ Koha/REST/V1/ERM/EHoldings/Packages/Local.pm | 8 ++------ Koha/REST/V1/ERM/EHoldings/Titles/Local.pm | 8 ++------ Koha/REST/V1/ERM/EUsage/CounterFiles.pm | 5 +---- Koha/REST/V1/ERM/EUsage/DefaultUsageReports.pm | 5 +---- Koha/REST/V1/ERM/EUsage/UsageDataProviders.pm | 5 +---- Koha/REST/V1/ERM/Licenses.pm | 5 +---- Koha/REST/V1/Holds.pm | 7 ++----- Koha/REST/V1/IllbatchStatuses.pm | 2 +- Koha/REST/V1/Illbatches.pm | 2 +- Koha/REST/V1/ImportBatchProfiles.pm | 9 ++------- Koha/REST/V1/Items.pm | 11 ++--------- Koha/REST/V1/Libraries.pm | 2 +- Koha/REST/V1/Patrons.pm | 5 +---- Koha/REST/V1/Patrons/Attributes.pm | 5 +---- Koha/REST/V1/Patrons/Holds.pm | 5 +---- Koha/REST/V1/Preservation/Processings.pm | 5 +---- Koha/REST/V1/Preservation/Trains.pm | 11 ++--------- Koha/REST/V1/Preservation/WaitingList.pm | 5 +---- Koha/REST/V1/Quotes.pm | 5 +---- Koha/REST/V1/ReturnClaims.pm | 8 ++------ Koha/REST/V1/SearchFilter.pm | 5 ++--- Koha/REST/V1/Suggestions.pm | 8 ++------ Koha/REST/V1/Tickets.pm | 8 ++------ Koha/REST/V1/TransferLimits.pm | 4 ++-- Koha/REST/V1/TwoFactorAuth.pm | 2 +- t/db_dependent/api/v1/responses.t | 2 +- 40 files changed, 64 insertions(+), 185 deletions(-) --- a/Koha/REST/V1/Acquisitions/Orders.pm +++ a/Koha/REST/V1/Acquisitions/Orders.pm @@ -197,15 +197,9 @@ sub delete { } return try { - $order->delete; - - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Acquisitions/Vendors.pm +++ a/Koha/REST/V1/Acquisitions/Vendors.pm @@ -146,13 +146,8 @@ sub delete { unless $vendor; $vendor->delete; - - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/AdvancedEditorMacro.pm +++ a/Koha/REST/V1/AdvancedEditorMacro.pm @@ -264,9 +264,8 @@ sub delete { return try { $macro->delete; - return $c->render( status => 204, openapi => q{} ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } @@ -292,9 +291,8 @@ sub delete_shared { return try { $macro->delete; - return $c->render( status => 204, openapi => q{} ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/ArticleRequests.pm +++ a/Koha/REST/V1/ArticleRequests.pm @@ -58,10 +58,7 @@ sub cancel { notes => $notes } ); - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; @@ -99,12 +96,8 @@ sub patron_cancel { notes => $notes } ); - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Auth/Identity/Provider/Domains.pm +++ a/Koha/REST/V1/Auth/Identity/Provider/Domains.pm @@ -186,10 +186,7 @@ sub delete { return try { $domain->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/Auth/Identity/Providers.pm +++ a/Koha/REST/V1/Auth/Identity/Providers.pm @@ -202,12 +202,8 @@ sub delete { return try { $provider->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Authorities.pm +++ a/Koha/REST/V1/Authorities.pm @@ -112,9 +112,8 @@ sub delete { return try { DelAuthority( { authid => $authority->authid } ); - return $c->render( status => 204, openapi => q{} ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Biblios.pm +++ a/Koha/REST/V1/Biblios.pm @@ -135,7 +135,7 @@ sub delete { ); } else { - return $c->render( status => 204, openapi => "" ); + return $c->resource_deleted; } } catch { --- a/Koha/REST/V1/Biblios/ItemGroups.pm +++ a/Koha/REST/V1/Biblios/ItemGroups.pm @@ -211,9 +211,8 @@ sub delete { return try { $item_group->delete; - return $c->render( status => 204, openapi => '' ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Biblios/ItemGroups/Items.pm +++ a/Koha/REST/V1/Biblios/ItemGroups/Items.pm @@ -136,12 +136,8 @@ sub delete { return try { $item_link->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Bookings.pm +++ a/Koha/REST/V1/Bookings.pm @@ -140,10 +140,7 @@ sub delete { return try { $booking->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/Cities.pm +++ a/Koha/REST/V1/Cities.pm @@ -119,10 +119,7 @@ sub delete { return try { $city->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/Config/SMTP/Servers.pm +++ a/Koha/REST/V1/Config/SMTP/Servers.pm @@ -164,13 +164,8 @@ sub delete { return try { $smtp_server->delete; - - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/ERM/Agreements.pm +++ a/Koha/REST/V1/ERM/Agreements.pm @@ -247,12 +247,8 @@ sub delete { return try { $agreement->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/ERM/EHoldings/Packages/Local.pm +++ a/Koha/REST/V1/ERM/EHoldings/Packages/Local.pm @@ -220,12 +220,8 @@ sub delete { return try { $package->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/ERM/EHoldings/Titles/Local.pm +++ a/Koha/REST/V1/ERM/EHoldings/Titles/Local.pm @@ -216,12 +216,8 @@ sub delete { return try { $title->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/ERM/EUsage/CounterFiles.pm +++ a/Koha/REST/V1/ERM/EUsage/CounterFiles.pm @@ -85,10 +85,7 @@ sub delete { return try { $counter_file->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/ERM/EUsage/DefaultUsageReports.pm +++ a/Koha/REST/V1/ERM/EUsage/DefaultUsageReports.pm @@ -119,10 +119,7 @@ sub delete { return try { $default_report->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/ERM/EUsage/UsageDataProviders.pm +++ a/Koha/REST/V1/ERM/EUsage/UsageDataProviders.pm @@ -263,10 +263,7 @@ sub delete { return try { $usage_data_provider->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/ERM/Licenses.pm +++ a/Koha/REST/V1/ERM/Licenses.pm @@ -228,10 +228,7 @@ sub delete { return try { $license->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/Holds.pm +++ a/Koha/REST/V1/Holds.pm @@ -322,10 +322,7 @@ sub delete { $hold->cancel; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); @@ -389,7 +386,7 @@ sub resume { return try { $hold->resume; - return $c->render( status => 204, openapi => {} ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/IllbatchStatuses.pm +++ a/Koha/REST/V1/IllbatchStatuses.pm @@ -148,7 +148,7 @@ sub delete { return try { $status->delete_and_log; - return $c->render( status => 204, openapi => '' ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/Illbatches.pm +++ a/Koha/REST/V1/Illbatches.pm @@ -165,7 +165,7 @@ sub delete { return try { $batch->delete_and_log; - return $c->render( status => 204, openapi => '' ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/ImportBatchProfiles.pm +++ a/Koha/REST/V1/ImportBatchProfiles.pm @@ -121,13 +121,8 @@ sub delete { return try { $profile->delete; - - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Items.pm +++ a/Koha/REST/V1/Items.pm @@ -158,11 +158,7 @@ sub delete { } $item->safe_delete; - - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); @@ -421,10 +417,7 @@ sub remove_from_bundle { return try { $bundle_item->remove_from_bundle; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { if ( ref($_) eq 'Koha::Exceptions::Item::Bundle::BundleIsCheckedOut' ) { return $c->render( --- a/Koha/REST/V1/Libraries.pm +++ a/Koha/REST/V1/Libraries.pm @@ -152,7 +152,7 @@ sub delete { return try { $library->delete; - return $c->render( status => 204, openapi => ''); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/Patrons.pm +++ a/Koha/REST/V1/Patrons.pm @@ -414,10 +414,7 @@ sub delete { $patron->move_to_deleted; $patron->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } ); } catch { --- a/Koha/REST/V1/Patrons/Attributes.pm +++ a/Koha/REST/V1/Patrons/Attributes.pm @@ -285,10 +285,7 @@ sub delete { unless $attribute; $attribute->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/Patrons/Holds.pm +++ a/Koha/REST/V1/Patrons/Holds.pm @@ -78,10 +78,7 @@ sub delete_public { if ( $hold->is_cancelable_from_opac ) { $hold->cancel; - return $c->render( - status => 204, - openapi => q{}, - ); + return $c->resource_deleted; } elsif ( $hold->is_waiting and $hold->cancellation_requestable_from_opac ) { $hold->add_cancellation_request; return $c->render( --- a/Koha/REST/V1/Preservation/Processings.pm +++ a/Koha/REST/V1/Preservation/Processings.pm @@ -208,10 +208,7 @@ sub delete { } return try { $processing->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/Preservation/Trains.pm +++ a/Koha/REST/V1/Preservation/Trains.pm @@ -200,10 +200,7 @@ sub delete { return try { $train->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; @@ -509,11 +506,7 @@ sub remove_item { return try { $train_item->delete; - - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/Preservation/WaitingList.pm +++ a/Koha/REST/V1/Preservation/WaitingList.pm @@ -145,10 +145,7 @@ sub remove_item { $item->notforloan(0)->store; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); }; --- a/Koha/REST/V1/Quotes.pm +++ a/Koha/REST/V1/Quotes.pm @@ -121,10 +121,7 @@ sub delete { return try { $quote->delete; - return $c->render( - status => 204, - openapi => q{} - ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/ReturnClaims.pm +++ a/Koha/REST/V1/ReturnClaims.pm @@ -192,12 +192,8 @@ sub delete_claim { $claim->delete(); - return $c->render( - status => 204, - openapi => {} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/SearchFilter.pm +++ a/Koha/REST/V1/SearchFilter.pm @@ -135,9 +135,8 @@ sub delete { return try { $filter->delete; - return $c->render( status => 204, openapi => q{} ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Suggestions.pm +++ a/Koha/REST/V1/Suggestions.pm @@ -201,12 +201,8 @@ sub delete { return try { $suggestion->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/Tickets.pm +++ a/Koha/REST/V1/Tickets.pm @@ -132,12 +132,8 @@ sub delete { return try { $ticket->delete; - return $c->render( - status => 204, - openapi => q{} - ); - } - catch { + return $c->resource_deleted; + } catch { $c->unhandled_exception($_); }; } --- a/Koha/REST/V1/TransferLimits.pm +++ a/Koha/REST/V1/TransferLimits.pm @@ -109,7 +109,7 @@ sub delete { return try { $transfer_limit->delete; - return $c->render( status => 204, openapi => ''); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); @@ -217,7 +217,7 @@ sub batch_delete { Koha::Item::Transfer::Limits->search($search_params)->delete; - return $c->render( status => 204, openapi => q{} ); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/Koha/REST/V1/TwoFactorAuth.pm +++ a/Koha/REST/V1/TwoFactorAuth.pm @@ -173,7 +173,7 @@ sub verification { ); } - return $c->render(status => 204, openapi => {}); + return $c->resource_deleted; } catch { $c->unhandled_exception($_); --- a/t/db_dependent/api/v1/responses.t +++ a/t/db_dependent/api/v1/responses.t @@ -105,7 +105,7 @@ subtest 'resource_deleted() tests' => sub { 'delete', sub { my $c = shift->openapi->valid_input or return; - $c->resource_deleted; + return $c->resource_deleted; } ); --