From 1fe6db943db7439d9e5e88113690dd8d34d87d67 Mon Sep 17 00:00:00 2001 From: Irina Peshinskaya Date: Wed, 5 Dec 2018 01:45:45 +0100 Subject: [PATCH] TT#48198 Use items array from paginations in all api controllers Change-Id: I1856cd4f073d32b4465d0778baf5f9f7c708f78c --- lib/NGCP/Panel/Controller/API/AutoAttendants.pm | 4 ++-- lib/NGCP/Panel/Controller/API/BalanceIntervals.pm | 2 +- lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm | 4 ++-- lib/NGCP/Panel/Controller/API/BillingFees.pm | 4 ++-- lib/NGCP/Panel/Controller/API/BillingNetworks.pm | 4 ++-- lib/NGCP/Panel/Controller/API/BillingProfiles.pm | 4 ++-- lib/NGCP/Panel/Controller/API/BillingZones.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CCMapEntries.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CFDestinationSets.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CFMappings.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CFSourceSets.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CFTimeSets.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CallForwards.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CallLists.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Calls.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Capabilities.pm | 2 +- lib/NGCP/Panel/Controller/API/Contracts.pm | 2 +- lib/NGCP/Panel/Controller/API/CustomerBalances.pm | 2 +- lib/NGCP/Panel/Controller/API/CustomerContacts.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CustomerLocations.pm | 4 ++-- lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Customers.pm | 2 +- lib/NGCP/Panel/Controller/API/Domains.pm | 4 ++-- lib/NGCP/Panel/Controller/API/EmailTemplates.pm | 4 ++-- lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm | 4 ++-- lib/NGCP/Panel/Controller/API/EmergencyMappings.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Events.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Interceptions.pm | 4 ++-- lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm | 4 ++-- lib/NGCP/Panel/Controller/API/LnpCarriers.pm | 4 ++-- lib/NGCP/Panel/Controller/API/LnpNumbers.pm | 4 ++-- lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm | 4 ++-- lib/NGCP/Panel/Controller/API/MaliciousCalls.pm | 4 ++-- lib/NGCP/Panel/Controller/API/ManagerSecretary.pm | 4 ++-- lib/NGCP/Panel/Controller/API/NcosLevels.pm | 4 ++-- lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm | 4 ++-- lib/NGCP/Panel/Controller/API/NcosPatterns.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PbxDevices.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PeeringGroups.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PeeringRules.pm | 4 ++-- lib/NGCP/Panel/Controller/API/PeeringServers.pm | 4 ++-- lib/NGCP/Panel/Controller/API/ProfilePackages.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Reminders.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Resellers.pm | 4 ++-- lib/NGCP/Panel/Controller/API/RtcApps.pm | 4 ++-- lib/NGCP/Panel/Controller/API/RtcNetworks.pm | 4 ++-- lib/NGCP/Panel/Controller/API/RtcSessions.pm | 4 ++-- lib/NGCP/Panel/Controller/API/SoundFiles.pm | 4 ++-- lib/NGCP/Panel/Controller/API/SoundHandles.pm | 4 ++-- lib/NGCP/Panel/Controller/API/SpeedDials.pm | 4 ++-- lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm | 2 +- lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm | 4 ++-- lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm | 4 ++-- lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Subscribers.pm | 2 +- lib/NGCP/Panel/Controller/API/SystemContacts.pm | 4 ++-- lib/NGCP/Panel/Controller/API/TopupLogs.pm | 4 ++-- lib/NGCP/Panel/Controller/API/TrustedSources.pm | 4 ++-- lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm | 4 ++-- lib/NGCP/Panel/Controller/API/VoicemailSettings.pm | 4 ++-- lib/NGCP/Panel/Controller/API/Voicemails.pm | 6 +++--- lib/NGCP/Panel/Controller/API/Vouchers.pm | 4 ++-- lib/NGCP/Panel/Role/Entities.pm | 5 ++--- lib/NGCP/Panel/Utils/Journal.pm | 4 ++-- 71 files changed, 136 insertions(+), 137 deletions(-) diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm index ea0e871890..ca4fd7dc9d 100644 --- a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm +++ b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm @@ -50,9 +50,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $subscribers = $self->item_rs($c); - (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); + (my $total_count, $subscribers, my $subscribers_rows) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); - for my $subscriber ($subscribers->all) { + for my $subscriber (@$subscribers_rows) { push @embedded, $self->hal_from_item($c, $subscriber); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm index 76a47c225e..a420602a70 100644 --- a/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm +++ b/lib/NGCP/Panel/Controller/API/BalanceIntervals.pm @@ -97,7 +97,7 @@ sub GET :Allow { { my $now = NGCP::Panel::Utils::DateTime::current_local; my $contracts_rs = $self->item_rs($c,0,$now); - (my $total_count, $contracts_rs) = $self->paginate_order_collection($c, $contracts_rs); + (my $total_count, $contracts_rs, my $contracts_rows) = $self->paginate_order_collection($c, $contracts_rs); my $contracts = NGCP::Panel::Utils::ProfilePackages::lock_contracts(c => $c, rs => $contracts_rs, contract_id_field => 'id'); diff --git a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm index 27505071af..44ed247be3 100644 --- a/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm +++ b/lib/NGCP/Panel/Controller/API/BalanceIntervalsItem.pm @@ -105,10 +105,10 @@ sub GET :Allow { my $contract = $self->contract_by_id($c, $id); last unless $self->resource_exists($c, contract => $contract); my $balances = $self->balances_rs($c,$contract,$now); - (my $total_count, $balances) = $self->paginate_order_collection($c, $balances); + (my $total_count, $balances, my $balances_rows) = $self->paginate_order_collection($c, $balances); my (@embedded, @links); my $form = $self->get_form($c); - for my $balance ($balances->all) { + for my $balance (@$balances_rows) { my $hal = $self->hal_from_balance($c, $balance, $form, $now); $hal->_forcearray(1); push @embedded, $hal; diff --git a/lib/NGCP/Panel/Controller/API/BillingFees.pm b/lib/NGCP/Panel/Controller/API/BillingFees.pm index 4bb5842262..603ecbf6b2 100644 --- a/lib/NGCP/Panel/Controller/API/BillingFees.pm +++ b/lib/NGCP/Panel/Controller/API/BillingFees.pm @@ -79,10 +79,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $fees = $self->item_rs($c); - (my $total_count, $fees) = $self->paginate_order_collection($c, $fees); + (my $total_count, $fees, my $fees_rows) = $self->paginate_order_collection($c, $fees); my (@embedded, @links); my $form = $self->get_form($c); - for my $fee ($fees->all) { + for my $fee (@$fees_rows) { push @embedded, $self->hal_from_fee($c, $fee, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm index f132a6a1f3..3da090ffe7 100644 --- a/lib/NGCP/Panel/Controller/API/BillingNetworks.pm +++ b/lib/NGCP/Panel/Controller/API/BillingNetworks.pm @@ -85,9 +85,9 @@ sub GET :Allow { { my $bns = $self->item_rs($c); - (my $total_count, $bns) = $self->paginate_order_collection($c, $bns); + (my $total_count, $bns, my $bns_rows) = $self->paginate_order_collection($c, $bns); my (@embedded, @links); - for my $bn ($bns->all) { + for my $bn (@$bns_rows) { push @embedded, $self->hal_from_item($c, $bn, "billingnetworks"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm index 312721c9fa..29261d13f3 100644 --- a/lib/NGCP/Panel/Controller/API/BillingProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/BillingProfiles.pm @@ -71,10 +71,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $profiles = $self->item_rs($c); - (my $total_count, $profiles) = $self->paginate_order_collection($c, $profiles); + (my $total_count, $profiles, my $profiles_rows) = $self->paginate_order_collection($c, $profiles); my (@embedded, @links); my $form = $self->get_form($c); - for my $profile ($profiles->all) { + for my $profile (@$profiles_rows) { push @embedded, $self->hal_from_profile($c, $profile, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/BillingZones.pm b/lib/NGCP/Panel/Controller/API/BillingZones.pm index dd0e7b1972..bbcb8885e9 100644 --- a/lib/NGCP/Panel/Controller/API/BillingZones.pm +++ b/lib/NGCP/Panel/Controller/API/BillingZones.pm @@ -69,10 +69,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $zones = $self->item_rs($c); - (my $total_count, $zones) = $self->paginate_order_collection($c, $zones); + (my $total_count, $zones, my $zones_rows) = $self->paginate_order_collection($c, $zones); my (@embedded, @links); my $form = $self->get_form($c); - for my $zone ($zones->all) { + for my $zone (@$zones_rows) { push @embedded, $self->hal_from_zone($c, $zone, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm index ba76b1324b..d5db3bc652 100644 --- a/lib/NGCP/Panel/Controller/API/CCMapEntries.pm +++ b/lib/NGCP/Panel/Controller/API/CCMapEntries.pm @@ -48,9 +48,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $cfs = $self->item_rs($c); - (my $total_count, $cfs) = $self->paginate_order_collection($c, $cfs); + (my $total_count, $cfs, my $cfs_rows) = $self->paginate_order_collection($c, $cfs); my (@embedded, @links); - for my $cf ($cfs->all) { + for my $cf (@$cfs_rows) { try { push @embedded, $self->hal_from_item($c, $cf, "ccmapentries"); push @links, Data::HAL::Link->new( diff --git a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm index f64a7a2074..74f48aedb5 100644 --- a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm @@ -74,9 +74,9 @@ sub GET :Allow { { my $dsets = $self->item_rs($c); - (my $total_count, $dsets) = $self->paginate_order_collection($c, $dsets); + (my $total_count, $dsets, my $dsets_rows) = $self->paginate_order_collection($c, $dsets); my (@embedded, @links); - for my $dset ($dsets->all) { + for my $dset (@$dsets_rows) { push @embedded, $self->hal_from_item($c, $dset, "cfdestinationsets"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CFMappings.pm b/lib/NGCP/Panel/Controller/API/CFMappings.pm index 62dd8d0d23..23a27f1cea 100644 --- a/lib/NGCP/Panel/Controller/API/CFMappings.pm +++ b/lib/NGCP/Panel/Controller/API/CFMappings.pm @@ -67,9 +67,9 @@ sub GET :Allow { { my $items = $self->item_rs($c); # items is actually a voip_subscribers - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); - for my $subs ($items->all) { + for my $subs (@$items_rows) { push @embedded, $self->hal_from_item($c, $subs, "cfmappings"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CFSourceSets.pm b/lib/NGCP/Panel/Controller/API/CFSourceSets.pm index 3f7c6682c9..c4e0ad2aba 100644 --- a/lib/NGCP/Panel/Controller/API/CFSourceSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFSourceSets.pm @@ -81,9 +81,9 @@ sub GET :Allow { { my $ssets = $self->item_rs($c); - (my $total_count, $ssets) = $self->paginate_order_collection($c, $ssets); + (my $total_count, $ssets, my $ssets_rows) = $self->paginate_order_collection($c, $ssets); my (@embedded, @links); - for my $sset ($ssets->all) { + for my $sset (@$ssets_rows) { push @embedded, $self->hal_from_item($c, $sset, "cfsourcesets"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm index 0232913096..cabb6533c5 100644 --- a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm @@ -74,9 +74,9 @@ sub GET :Allow { { my $timesets = $self->item_rs($c); - (my $total_count, $timesets) = $self->paginate_order_collection($c, $timesets); + (my $total_count, $timesets, my $timesets_rows) = $self->paginate_order_collection($c, $timesets); my (@embedded, @links); - for my $tset ($timesets->all) { + for my $tset (@$timesets_rows) { push @embedded, $self->hal_from_item($c, $tset, "cftimesets"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CallForwards.pm b/lib/NGCP/Panel/Controller/API/CallForwards.pm index 7e711859dc..4f8b59b6a8 100644 --- a/lib/NGCP/Panel/Controller/API/CallForwards.pm +++ b/lib/NGCP/Panel/Controller/API/CallForwards.pm @@ -67,10 +67,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $cfs = $self->item_rs($c, "callforwards"); - (my $total_count, $cfs) = $self->paginate_order_collection($c, $cfs); + (my $total_count, $cfs, my $cfs_rows) = $self->paginate_order_collection($c, $cfs); my (@embedded, @links); my $form = $self->get_form($c); - for my $cf ($cfs->all) { + for my $cf (@$cfs_rows) { try { push @embedded, $self->hal_from_item($c, $cf, $form); push @links, Data::HAL::Link->new( diff --git a/lib/NGCP/Panel/Controller/API/CallLists.pm b/lib/NGCP/Panel/Controller/API/CallLists.pm index 799fd16993..042f70a547 100644 --- a/lib/NGCP/Panel/Controller/API/CallLists.pm +++ b/lib/NGCP/Panel/Controller/API/CallLists.pm @@ -313,13 +313,13 @@ sub GET :Allow { last unless $owner; $c->stash(owner => $owner); # for query_param: direction my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); my $href_data = $owner->{subscriber} ? "subscriber_id=".$owner->{subscriber}->id : "customer_id=".$owner->{customer}->id; - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form, { 'owner' => $owner }); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm b/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm index f6118adf0d..a3f4ce9434 100644 --- a/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm +++ b/lib/NGCP/Panel/Controller/API/CallRecordingStreams.pm @@ -79,10 +79,10 @@ sub GET :Allow { return; } my $callrecordingstreams = $self->item_rs($c); - (my $total_count, $callrecordingstreams) = $self->paginate_order_collection($c, $callrecordingstreams); + (my $total_count, $callrecordingstreams, my $callrecordingstreams_rows) = $self->paginate_order_collection($c, $callrecordingstreams); my (@embedded, @links); my $form = $self->get_form($c); - for my $domain ($callrecordingstreams->all) { + for my $domain (@$callrecordingstreams_rows) { push @embedded, $self->hal_from_item($c, $domain, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Calls.pm b/lib/NGCP/Panel/Controller/API/Calls.pm index bc732d03af..384a2e5618 100644 --- a/lib/NGCP/Panel/Controller/API/Calls.pm +++ b/lib/NGCP/Panel/Controller/API/Calls.pm @@ -83,10 +83,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Capabilities.pm b/lib/NGCP/Panel/Controller/API/Capabilities.pm index 8de3d7c271..e31302bca8 100644 --- a/lib/NGCP/Panel/Controller/API/Capabilities.pm +++ b/lib/NGCP/Panel/Controller/API/Capabilities.pm @@ -54,7 +54,7 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $capabilities = $self->item_rs($c); - (my $total_count, $capabilities) = $self->paginate_order_collection($c, $capabilities); + (my $total_count, $capabilities, my $capabilities_rows) = $self->paginate_order_collection($c, $capabilities); my (@embedded, @links); my $form = $self->get_form($c); for my $cap (@{ $capabilities }) { diff --git a/lib/NGCP/Panel/Controller/API/Contracts.pm b/lib/NGCP/Panel/Controller/API/Contracts.pm index f4c1d4c0b3..b6c7bfafb7 100644 --- a/lib/NGCP/Panel/Controller/API/Contracts.pm +++ b/lib/NGCP/Panel/Controller/API/Contracts.pm @@ -87,7 +87,7 @@ sub GET :Allow { { my $now = NGCP::Panel::Utils::DateTime::current_local; my $contracts_rs = $self->item_rs($c,0,$now); - (my $total_count, $contracts_rs) = $self->paginate_order_collection($c, $contracts_rs); + (my $total_count, $contracts_rs, my $contracts_rows) = $self->paginate_order_collection($c, $contracts_rs); my $contracts = NGCP::Panel::Utils::ProfilePackages::lock_contracts(c => $c, rs => $contracts_rs, contract_id_field => 'id'); diff --git a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm index b9d7aaa97b..e6e63581dc 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerBalances.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerBalances.pm @@ -129,7 +129,7 @@ sub GET :Allow { { my $now = NGCP::Panel::Utils::DateTime::current_local; my $items_rs = $self->item_rs($c,0,$now); - (my $total_count, $items_rs) = $self->paginate_order_collection($c, $items_rs); + (my $total_count, $items_rs, my $items_rows) = $self->paginate_order_collection($c, $items_rs); my $items = NGCP::Panel::Utils::ProfilePackages::lock_contracts(c => $c, rs => $items_rs, contract_id_field => 'id'); diff --git a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm index aed2a75953..f037fdd1f9 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm @@ -72,10 +72,10 @@ sub GET :Allow { my $contacts = $self->item_rs($c); #todo - is it really necessary? move to item_rs? $contacts = $contacts->search_rs({}, {prefetch => ['reseller']}); - (my $total_count, $contacts) = $self->paginate_order_collection($c, $contacts); + (my $total_count, $contacts, my $contacts_rows) = $self->paginate_order_collection($c, $contacts); my (@embedded, @links); my $form = $self->get_form($c); - for my $contact ($contacts->all) { + for my $contact (@$contacts_rows) { push @embedded, $self->hal_from_contact($c, $contact, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm index f719f11b9e..ff0c2a879d 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerFraudEvents.pm @@ -62,10 +62,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm b/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm index 1ddc596fb6..4545c02bbc 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerFraudPreferences.pm @@ -85,10 +85,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $customer_rs = $self->item_rs($c,0); - (my $total_count, $customer_rs) = $self->paginate_order_collection($c, $customer_rs); + (my $total_count, $customer_rs, my $customer_rows) = $self->paginate_order_collection($c, $customer_rs); my (@embedded, @links); my $form = $self->get_form($c); - for my $customer ($customer_rs->all) { + for my $customer (@$customer_rows) { push @embedded, $self->hal_from_item($c, $customer, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CustomerLocations.pm b/lib/NGCP/Panel/Controller/API/CustomerLocations.pm index 7bd842c30c..783741a6d1 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerLocations.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerLocations.pm @@ -73,9 +73,9 @@ sub GET :Allow { { my $cls = $self->item_rs($c); - (my $total_count, $cls) = $self->paginate_order_collection($c, $cls); + (my $total_count, $cls, my $cls_rows) = $self->paginate_order_collection($c, $cls); my (@embedded, @links); - for my $cl ($cls->all) { + for my $cl (@$cls_rows) { push @embedded, $self->hal_from_item($c, $cl, $self->resource_name); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm index 6e1334ce98..7558ddbcc2 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm @@ -70,12 +70,12 @@ sub GET :Allow { { my $field_devs = $self->item_rs($c); - (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); + (my $total_count, $field_devs, my $field_devs_rows) = $self->paginate_order_collection($c, $field_devs); my $query_string = $self->query_param_string($c); return unless $query_string; my (@embedded, @links); my $error_flag = 0; - for my $dev ($field_devs->all) { + for my $dev (@$field_devs_rows) { my $hal = $self->hal_from_item($c, $dev); $error_flag = 1 unless $hal; push @embedded, $hal; diff --git a/lib/NGCP/Panel/Controller/API/Customers.pm b/lib/NGCP/Panel/Controller/API/Customers.pm index 3bc7649391..dd7bc78fc1 100644 --- a/lib/NGCP/Panel/Controller/API/Customers.pm +++ b/lib/NGCP/Panel/Controller/API/Customers.pm @@ -159,7 +159,7 @@ sub GET :Allow { { my $now = NGCP::Panel::Utils::DateTime::current_local; my $customers_rs = $self->item_rs($c,$now); - (my $total_count, $customers_rs) = $self->paginate_order_collection($c, $customers_rs); + (my $total_count, $customers_rs, my $customers_rows) = $self->paginate_order_collection($c, $customers_rs); my $customers = NGCP::Panel::Utils::ProfilePackages::lock_contracts(c => $c, rs => $customers_rs, contract_id_field => 'id'); diff --git a/lib/NGCP/Panel/Controller/API/Domains.pm b/lib/NGCP/Panel/Controller/API/Domains.pm index 4a7891a4ad..23f1953f81 100644 --- a/lib/NGCP/Panel/Controller/API/Domains.pm +++ b/lib/NGCP/Panel/Controller/API/Domains.pm @@ -72,10 +72,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $domains = $self->item_rs($c); - (my $total_count, $domains) = $self->paginate_order_collection($c, $domains); + (my $total_count, $domains, my $domains_rows) = $self->paginate_order_collection($c, $domains); my (@embedded, @links); my $form = $self->get_form($c); - for my $domain ($domains->all) { + for my $domain (@$domains_rows) { push @embedded, $self->hal_from_item($c, $domain, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm index 63837b3848..7c14eba2eb 100644 --- a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm @@ -69,10 +69,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm b/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm index 4bebe82e79..78339a485a 100644 --- a/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm +++ b/lib/NGCP/Panel/Controller/API/EmergencyMappingContainers.pm @@ -70,10 +70,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm b/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm index 52faa8635d..5e473140a2 100644 --- a/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm +++ b/lib/NGCP/Panel/Controller/API/EmergencyMappings.pm @@ -110,10 +110,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Events.pm b/lib/NGCP/Panel/Controller/API/Events.pm index f50d0a9ad4..2d255aeb33 100644 --- a/lib/NGCP/Panel/Controller/API/Events.pm +++ b/lib/NGCP/Panel/Controller/API/Events.pm @@ -105,10 +105,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { my $hal = $self->hal_from_item($c, $item, $form); $hal->_forcearray(1); push @embedded,$hal; diff --git a/lib/NGCP/Panel/Controller/API/Interceptions.pm b/lib/NGCP/Panel/Controller/API/Interceptions.pm index 72ce8f350e..c1d2c68b20 100644 --- a/lib/NGCP/Panel/Controller/API/Interceptions.pm +++ b/lib/NGCP/Panel/Controller/API/Interceptions.pm @@ -82,10 +82,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm index a25f7176f5..5fb47fe1bb 100644 --- a/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/InvoiceTemplates.pm @@ -71,10 +71,10 @@ sub GET :Allow { my $items = $self->item_rs($c); #todo - is it really necessary? move to item_rs? $items = $items->search_rs({}, {prefetch => ['reseller']}); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/LnpCarriers.pm b/lib/NGCP/Panel/Controller/API/LnpCarriers.pm index ed54d6a268..1ce872de55 100644 --- a/lib/NGCP/Panel/Controller/API/LnpCarriers.pm +++ b/lib/NGCP/Panel/Controller/API/LnpCarriers.pm @@ -70,10 +70,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/LnpNumbers.pm b/lib/NGCP/Panel/Controller/API/LnpNumbers.pm index c525f16a96..6a250da990 100644 --- a/lib/NGCP/Panel/Controller/API/LnpNumbers.pm +++ b/lib/NGCP/Panel/Controller/API/LnpNumbers.pm @@ -98,13 +98,13 @@ sub GET :Allow { $c->request->params->{'actual'}, $c->request->params->{'number'}); #my $t1 = time; - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); #my $t2 = time; print(($t2 - $t1) . "secs\n"); $t1 = time; #my @test = $items->all; #$t2 = time; print("page: " . ($t2 - $t1) . "secs\n"); $t1 = time; my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm b/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm index f5ee98543d..1c73233e20 100644 --- a/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm +++ b/lib/NGCP/Panel/Controller/API/MailToFaxSettings.pm @@ -80,9 +80,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $cfs = $self->item_rs($c); - (my $total_count, $cfs) = $self->paginate_order_collection($c, $cfs); + (my $total_count, $cfs, my $cfs_rows) = $self->paginate_order_collection($c, $cfs); my (@embedded, @links); - for my $cf ($cfs->all) { + for my $cf (@$cfs_rows) { try { push @embedded, $self->hal_from_item($c, $cf); push @links, Data::HAL::Link->new( diff --git a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm index 8f426f5a43..365bd3fd18 100644 --- a/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm +++ b/lib/NGCP/Panel/Controller/API/MaliciousCalls.pm @@ -127,10 +127,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm b/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm index badda200e3..12ef2d2e61 100644 --- a/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm +++ b/lib/NGCP/Panel/Controller/API/ManagerSecretary.pm @@ -55,7 +55,7 @@ sub GET :Allow { my $preference = $self->require_preference($c); my $cfs = $self->item_rs($c, "managersecretary"); - (my $total_count, $cfs) = $self->paginate_order_collection($c, $cfs); + (my $total_count, $cfs, my $cfs_rows) = $self->paginate_order_collection($c, $cfs); if ($preference && $preference eq 'internal') { my @items = (); @@ -70,7 +70,7 @@ sub GET :Allow { my (@embedded, @links); my $form = $self->get_form($c); - for my $cf ($cfs->all) { + for my $cf (@$cfs_rows) { try { push @embedded, $self->hal_from_item($c, $cf, $form); push @links, Data::HAL::Link->new( diff --git a/lib/NGCP/Panel/Controller/API/NcosLevels.pm b/lib/NGCP/Panel/Controller/API/NcosLevels.pm index 4892612c9a..98c0081d0d 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLevels.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLevels.pm @@ -71,10 +71,10 @@ sub GET :Allow { my $items = $self->item_rs($c); #todo - is it really necessary? move to item_rs? $items = $items->search_rs({}, {prefetch => ['reseller']}); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm b/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm index f4853f9725..00ae2ceb0b 100644 --- a/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm +++ b/lib/NGCP/Panel/Controller/API/NcosLnpCarriers.pm @@ -69,10 +69,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm index ef9bff4e32..8870ebfc39 100644 --- a/lib/NGCP/Panel/Controller/API/NcosPatterns.pm +++ b/lib/NGCP/Panel/Controller/API/NcosPatterns.pm @@ -58,10 +58,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm index c37501c537..f9c5f095c4 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm @@ -80,10 +80,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm index ee6bf55788..3e812f8f4e 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceFirmwares.pm @@ -81,10 +81,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm index 2ff849dced..43aaeece22 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm @@ -71,9 +71,9 @@ sub GET :Allow { { my $field_devs = $self->item_rs($c); - (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); + (my $total_count, $field_devs, my $field_devs_rows) = $self->paginate_order_collection($c, $field_devs); my (@embedded, @links); - for my $dev ($field_devs->all) { + for my $dev (@$field_devs_rows) { push @embedded, $self->hal_from_item($c, $dev); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PbxDevices.pm b/lib/NGCP/Panel/Controller/API/PbxDevices.pm index 4d809d9ab1..4647669ed9 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm @@ -77,9 +77,9 @@ sub GET :Allow { { my $field_devs = $self->item_rs($c); - (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); + (my $total_count, $field_devs, my $field_devs_rows) = $self->paginate_order_collection($c, $field_devs); my (@embedded, @links); - for my $dev ($field_devs->all) { + for my $dev (@$field_devs_rows) { push @embedded, $self->hal_from_item($c, $dev); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PeeringGroups.pm b/lib/NGCP/Panel/Controller/API/PeeringGroups.pm index b518fd20f4..3d993d0894 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringGroups.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringGroups.pm @@ -57,10 +57,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm b/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm index dd957249b1..ba79367eed 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringInboundRules.pm @@ -81,10 +81,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PeeringRules.pm b/lib/NGCP/Panel/Controller/API/PeeringRules.pm index be4b291bf1..7d06c45cb2 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringRules.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringRules.pm @@ -81,10 +81,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/PeeringServers.pm b/lib/NGCP/Panel/Controller/API/PeeringServers.pm index ec0f990acf..7ee6feb643 100644 --- a/lib/NGCP/Panel/Controller/API/PeeringServers.pm +++ b/lib/NGCP/Panel/Controller/API/PeeringServers.pm @@ -102,10 +102,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm index 109243fe71..1224dbb30d 100644 --- a/lib/NGCP/Panel/Controller/API/ProfilePackages.pm +++ b/lib/NGCP/Panel/Controller/API/ProfilePackages.pm @@ -98,10 +98,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $packages = $self->item_rs($c); - (my $total_count, $packages) = $self->paginate_order_collection($c, $packages); + (my $total_count, $packages, my $packages_rows) = $self->paginate_order_collection($c, $packages); my (@embedded, @links); my $form = $self->get_form($c); - for my $package ($packages->all) { + for my $package (@$packages_rows) { push @embedded, $self->hal_from_item($c, $package, "profilepackages", $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Reminders.pm b/lib/NGCP/Panel/Controller/API/Reminders.pm index 914af49c5b..de25d11bab 100644 --- a/lib/NGCP/Panel/Controller/API/Reminders.pm +++ b/lib/NGCP/Panel/Controller/API/Reminders.pm @@ -75,10 +75,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Resellers.pm b/lib/NGCP/Panel/Controller/API/Resellers.pm index 60fa969e94..f35ebc8ba2 100644 --- a/lib/NGCP/Panel/Controller/API/Resellers.pm +++ b/lib/NGCP/Panel/Controller/API/Resellers.pm @@ -61,10 +61,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $resellers = $self->item_rs($c); - (my $total_count, $resellers) = $self->paginate_order_collection($c, $resellers); + (my $total_count, $resellers, my $resellers_rows) = $self->paginate_order_collection($c, $resellers); my (@embedded, @links); my $form = $self->get_form($c); - for my $reseller ($resellers->all) { + for my $reseller (@$resellers_rows) { push @embedded, $self->hal_from_reseller($c, $reseller, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/RtcApps.pm b/lib/NGCP/Panel/Controller/API/RtcApps.pm index b77188e52d..cb0730129a 100644 --- a/lib/NGCP/Panel/Controller/API/RtcApps.pm +++ b/lib/NGCP/Panel/Controller/API/RtcApps.pm @@ -46,9 +46,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $resellers = $self->item_rs($c); - (my $total_count, $resellers) = $self->paginate_order_collection($c, $resellers); + (my $total_count, $resellers, my $resellers_rows) = $self->paginate_order_collection($c, $resellers); my (@embedded, @links); - for my $reseller ($resellers->all) { + for my $reseller (@$resellers_rows) { push @embedded, $self->hal_from_item($c, $reseller); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/RtcNetworks.pm b/lib/NGCP/Panel/Controller/API/RtcNetworks.pm index bccc4f3edc..e66dc27404 100644 --- a/lib/NGCP/Panel/Controller/API/RtcNetworks.pm +++ b/lib/NGCP/Panel/Controller/API/RtcNetworks.pm @@ -46,9 +46,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $resellers = $self->item_rs($c); - (my $total_count, $resellers) = $self->paginate_order_collection($c, $resellers); + (my $total_count, $resellers, my $resellers_rows) = $self->paginate_order_collection($c, $resellers); my (@embedded, @links); - for my $subscriber ($resellers->all) { + for my $subscriber (@$resellers_rows) { push @embedded, $self->hal_from_item($c, $subscriber); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/RtcSessions.pm b/lib/NGCP/Panel/Controller/API/RtcSessions.pm index 364e85e9c0..34eb5a9f01 100644 --- a/lib/NGCP/Panel/Controller/API/RtcSessions.pm +++ b/lib/NGCP/Panel/Controller/API/RtcSessions.pm @@ -48,9 +48,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $subscribers = $self->item_rs($c); - (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); + (my $total_count, $subscribers, my $subscribers_rows) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); - for my $subscriber ($subscribers->all) { + for my $subscriber (@$subscribers_rows) { my $hal = $self->hal_from_item($c, $subscriber); next unless $hal; push @embedded, $hal; diff --git a/lib/NGCP/Panel/Controller/API/SoundFiles.pm b/lib/NGCP/Panel/Controller/API/SoundFiles.pm index b39cb5c0b1..a85f63bc9e 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFiles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFiles.pm @@ -67,10 +67,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/SoundHandles.pm b/lib/NGCP/Panel/Controller/API/SoundHandles.pm index a5d137c17f..336f33d656 100644 --- a/lib/NGCP/Panel/Controller/API/SoundHandles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundHandles.pm @@ -60,10 +60,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/SpeedDials.pm b/lib/NGCP/Panel/Controller/API/SpeedDials.pm index 7603ebceae..f34669b4cd 100644 --- a/lib/NGCP/Panel/Controller/API/SpeedDials.pm +++ b/lib/NGCP/Panel/Controller/API/SpeedDials.pm @@ -64,9 +64,9 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $subscribers = $self->item_rs($c); - (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); + (my $total_count, $subscribers, my $subscribers_rows) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); - for my $subscriber ($subscribers->all) { + for my $subscriber (@$subscribers_rows) { push @embedded, $self->hal_from_item($c, $subscriber); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm index d1c0fd93fc..9edc3fe839 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm @@ -90,7 +90,7 @@ sub GET :Allow { my $guard = $c->model('DB')->txn_scope_guard; { my $subscribers_rs = $self->item_rs($c, "subscribers"); - (my $total_count, $subscribers_rs) = $self->paginate_order_collection($c, $subscribers_rs); + (my $total_count, $subscribers_rs, my $subscribers_rows) = $self->paginate_order_collection($c, $subscribers_rs); my $subscribers = NGCP::Panel::Utils::ProfilePackages::lock_contracts(c => $c, rs => $subscribers_rs, contract_id_field => 'contract_id'); diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm index fcef7c1bd0..32cbfb9031 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm @@ -71,10 +71,10 @@ sub GET :Allow { my $items = $self->item_rs($c); #todo - is it really necessary? move to item_rs? $items = $items->search_rs({}, {prefetch => ['reseller']}); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm index 98d6b752d5..6ad5e34523 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm @@ -69,10 +69,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm index 5ef9c64b91..6a90e2cf1c 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm @@ -78,10 +78,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { my $halitem = $self->hal_from_item($c, $item, $form); next unless($halitem); push @embedded, $halitem; diff --git a/lib/NGCP/Panel/Controller/API/Subscribers.pm b/lib/NGCP/Panel/Controller/API/Subscribers.pm index 5d77fda0db..dc7fd7d7bf 100644 --- a/lib/NGCP/Panel/Controller/API/Subscribers.pm +++ b/lib/NGCP/Panel/Controller/API/Subscribers.pm @@ -288,7 +288,7 @@ sub GET :Allow { my $guard = $schema->txn_scope_guard; { my $subscribers_rs = $self->item_rs($c); - (my $total_count, $subscribers_rs) = $self->paginate_order_collection($c, $subscribers_rs); + (my $total_count, $subscribers_rs, my $subscribers_rows) = $self->paginate_order_collection($c, $subscribers_rs); my $subscribers = NGCP::Panel::Utils::ProfilePackages::lock_contracts(c => $c, rs => $subscribers_rs, contract_id_field => 'contract_id'); diff --git a/lib/NGCP/Panel/Controller/API/SystemContacts.pm b/lib/NGCP/Panel/Controller/API/SystemContacts.pm index dee2773e2e..acbb893674 100644 --- a/lib/NGCP/Panel/Controller/API/SystemContacts.pm +++ b/lib/NGCP/Panel/Controller/API/SystemContacts.pm @@ -61,10 +61,10 @@ sub GET :Allow { my $contacts = $self->item_rs($c); #todo - is it really necessary? move to item_rs? $contacts = $contacts->search_rs({}, {prefetch => ['reseller']}); - (my $total_count, $contacts) = $self->paginate_order_collection($c, $contacts); + (my $total_count, $contacts, my $contacts_rows) = $self->paginate_order_collection($c, $contacts); my (@embedded, @links); my $form = $self->get_form($c); - for my $contact ($contacts->all) { + for my $contact (@$contacts_rows) { push @embedded, $self->hal_from_contact($c, $contact, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/TopupLogs.pm b/lib/NGCP/Panel/Controller/API/TopupLogs.pm index 3784786da8..7900bad717 100644 --- a/lib/NGCP/Panel/Controller/API/TopupLogs.pm +++ b/lib/NGCP/Panel/Controller/API/TopupLogs.pm @@ -164,10 +164,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { my $hal = $self->hal_from_item($c, $item, $form); $hal->_forcearray(1); push @embedded,$hal; diff --git a/lib/NGCP/Panel/Controller/API/TrustedSources.pm b/lib/NGCP/Panel/Controller/API/TrustedSources.pm index cc66a4970b..8be70f2f71 100644 --- a/lib/NGCP/Panel/Controller/API/TrustedSources.pm +++ b/lib/NGCP/Panel/Controller/API/TrustedSources.pm @@ -63,10 +63,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm b/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm index f7133c2187..4448847cd1 100644 --- a/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm +++ b/lib/NGCP/Panel/Controller/API/UpnRewriteSets.pm @@ -62,10 +62,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm index 1c17c95460..f8961f6f97 100644 --- a/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm +++ b/lib/NGCP/Panel/Controller/API/VoicemailSettings.pm @@ -62,10 +62,10 @@ sub GET :Allow { my $rows = $c->request->params->{rows} // 10; { my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Voicemails.pm b/lib/NGCP/Panel/Controller/API/Voicemails.pm index 904c27dbae..bed0ff61ca 100644 --- a/lib/NGCP/Panel/Controller/API/Voicemails.pm +++ b/lib/NGCP/Panel/Controller/API/Voicemails.pm @@ -78,10 +78,10 @@ sub GET :Allow { my $page = $c->request->params->{page} // 1; my $rows = $c->request->params->{rows} // 10; { - my $items = $self->item_rs($c); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + my $items = $self->get_list($c); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Vouchers.pm b/lib/NGCP/Panel/Controller/API/Vouchers.pm index e184a403b3..f2ee552a23 100644 --- a/lib/NGCP/Panel/Controller/API/Vouchers.pm +++ b/lib/NGCP/Panel/Controller/API/Vouchers.pm @@ -71,10 +71,10 @@ sub GET :Allow { my $items = $self->item_rs($c); #todo - is it really necessary? move to item_rs? $items = $items->search_rs({}, {prefetch => ['reseller']}); - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->all) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Role/Entities.pm b/lib/NGCP/Panel/Role/Entities.pm index d1dd1a7664..2d55e9a755 100644 --- a/lib/NGCP/Panel/Role/Entities.pm +++ b/lib/NGCP/Panel/Role/Entities.pm @@ -204,11 +204,10 @@ sub get { { my $items = $self->get_list($c); return unless $items; - (my $total_count, $items) = $self->paginate_order_collection($c, $items); + (my $total_count, $items, my $items_rows) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my ($form) = $self->get_form($c); - my @items = 'ARRAY' eq ref $items ? @$items : $items->all; - for my $item (@items) { + for my $item (@$items_rows) { push @embedded, $self->hal_from_item($c, $item, $form, {}); push @links, grep { $_->relation->_original eq 'ngcp:'.$self->resource_name } @{$embedded[-1]->links}; } diff --git a/lib/NGCP/Panel/Utils/Journal.pm b/lib/NGCP/Panel/Utils/Journal.pm index 4001a78637..da913794d1 100644 --- a/lib/NGCP/Panel/Utils/Journal.pm +++ b/lib/NGCP/Panel/Utils/Journal.pm @@ -232,10 +232,10 @@ sub handle_api_journals_get { last unless $controller->valid_id($c, $item_id); my $journals = get_journal_rs($controller,$c,$item_id); - (my $total_count, $journals) = $controller->paginate_order_collection($c,$journals); + (my $total_count, $journals, my $journals_rows ) = $controller->paginate_order_collection($c,$journals); my (@embedded, @links); - for my $journal($journals->all) { + for my $journal(@$journals_rows) { my $hal = hal_from_journal($controller,$c,$journal); $hal->_forcearray(1); push @embedded,$hal;