diff --git a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm index b4aab54a9f..147145e6b1 100644 --- a/lib/NGCP/Panel/Controller/API/AutoAttendants.pm +++ b/lib/NGCP/Panel/Controller/API/AutoAttendants.pm @@ -69,7 +69,7 @@ sub GET :Allow { my $subscribers = $self->item_rs($c); (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); - for my $subscriber ($subscribers->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $subscriber ($subscribers->all) { 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/CFDestinationSets.pm b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm index 70f8809712..b682081a67 100644 --- a/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFDestinationSets.pm @@ -91,7 +91,7 @@ sub GET :Allow { (my $total_count, $dsets) = $self->paginate_order_collection($c, $dsets); my (@embedded, @links); - for my $dset ($dsets->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $dset ($dsets->all) { 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 e720d61282..ee7985401c 100644 --- a/lib/NGCP/Panel/Controller/API/CFMappings.pm +++ b/lib/NGCP/Panel/Controller/API/CFMappings.pm @@ -68,7 +68,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); - for my $subs ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $subs ($items->all) { 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/CFTimeSets.pm b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm index eb2c1b3732..524ee51e08 100644 --- a/lib/NGCP/Panel/Controller/API/CFTimeSets.pm +++ b/lib/NGCP/Panel/Controller/API/CFTimeSets.pm @@ -91,7 +91,7 @@ sub GET :Allow { (my $total_count, $timesets) = $self->paginate_order_collection($c, $timesets); my (@embedded, @links); - for my $tset ($timesets->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $tset ($timesets->all) { 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/Calls.pm b/lib/NGCP/Panel/Controller/API/Calls.pm index 403616909e..7c9cdef202 100644 --- a/lib/NGCP/Panel/Controller/API/Calls.pm +++ b/lib/NGCP/Panel/Controller/API/Calls.pm @@ -102,7 +102,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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/CustomerContacts.pm b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm index 021c7037bf..cf38a3c944 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerContacts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerContacts.pm @@ -88,7 +88,7 @@ sub GET :Allow { (my $total_count, $contacts) = $self->paginate_order_collection($c, $contacts); my (@embedded, @links); my $form = $self->get_form($c); - for my $contact ($contacts->search({}, {order_by => {-asc => 'me.id'}, prefetch => ['reseller']})->all) { + for my $contact ($contacts->search({}, {prefetch => ['reseller']})->all) { 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/CustomerZoneCosts.pm b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm index 5369a35d06..2e4d86e9cc 100644 --- a/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm +++ b/lib/NGCP/Panel/Controller/API/CustomerZoneCosts.pm @@ -82,7 +82,7 @@ sub GET :Allow { return unless $query_string; my (@embedded, @links); my $error_flag = 0; - for my $dev ($field_devs->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $dev ($field_devs->all) { my $hal = $self->hal_from_item($c, $dev); $error_flag = 1 unless $hal; push @embedded, $hal; diff --git a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm index a08e807672..96f0732d19 100644 --- a/lib/NGCP/Panel/Controller/API/DomainPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/DomainPreferences.pm @@ -58,7 +58,7 @@ sub GET :Allow { my $domains = $self->item_rs($c, "domains"); (my $total_count, $domains) = $self->paginate_order_collection($c, $domains); my (@embedded, @links); - for my $domain ($domains->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $domain ($domains->all) { push @embedded, $self->hal_from_item($c, $domain, "domains"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/Domains.pm b/lib/NGCP/Panel/Controller/API/Domains.pm index d44f459381..2808eea124 100644 --- a/lib/NGCP/Panel/Controller/API/Domains.pm +++ b/lib/NGCP/Panel/Controller/API/Domains.pm @@ -90,7 +90,7 @@ sub GET :Allow { (my $total_count, $domains) = $self->paginate_order_collection($c, $domains); my (@embedded, @links); my $form = $self->get_form($c); - for my $domain ($domains->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $domain ($domains->all) { 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 c475e33fe4..98258250ab 100644 --- a/lib/NGCP/Panel/Controller/API/EmailTemplates.pm +++ b/lib/NGCP/Panel/Controller/API/EmailTemplates.pm @@ -77,7 +77,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}, prefetch => ['reseller']})->all) { + for my $item ($items->search({}, {prefetch => ['reseller']})->all) { 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 f071073385..027b991732 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceConfigs.pm @@ -88,7 +88,7 @@ sub GET :Allow { (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); my (@embedded, @links); - for my $dev ($field_devs->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $dev ($field_devs->all) { 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/PbxDeviceModels.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm index 6abb23d686..f357cfac92 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceModels.pm @@ -88,7 +88,7 @@ sub GET :Allow { (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); my (@embedded, @links); - for my $dev ($field_devs->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $dev ($field_devs->all) { 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/PbxDeviceProfiles.pm b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm index 806b580b1f..a28a87cb25 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDeviceProfiles.pm @@ -77,7 +77,7 @@ sub GET :Allow { (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); my (@embedded, @links); - for my $dev ($field_devs->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $dev ($field_devs->all) { 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 6e2c137a64..d1cd17a09a 100644 --- a/lib/NGCP/Panel/Controller/API/PbxDevices.pm +++ b/lib/NGCP/Panel/Controller/API/PbxDevices.pm @@ -99,7 +99,7 @@ sub GET :Allow { (my $total_count, $field_devs) = $self->paginate_order_collection($c, $field_devs); my (@embedded, @links); - for my $dev ($field_devs->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $dev ($field_devs->all) { 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/Reminders.pm b/lib/NGCP/Panel/Controller/API/Reminders.pm index 6c8d71350e..d22aa7bbb0 100644 --- a/lib/NGCP/Panel/Controller/API/Reminders.pm +++ b/lib/NGCP/Panel/Controller/API/Reminders.pm @@ -81,7 +81,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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/RewriteRuleSets.pm b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm index 7ae9f788d3..dd1270d0b4 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRuleSets.pm @@ -99,7 +99,7 @@ sub GET :Allow { my $rwr_set = $self->item_rs($c, "rulesets"); (my $total_count, $rwr_set) = $self->paginate_order_collection($c, $rwr_set); my (@embedded, @links); - for my $set ($rwr_set->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $set ($rwr_set->all) { push @embedded, $self->hal_from_item($c, $set, "rewriterulesets"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/RewriteRules.pm b/lib/NGCP/Panel/Controller/API/RewriteRules.pm index 4e69ac9013..349d552134 100644 --- a/lib/NGCP/Panel/Controller/API/RewriteRules.pm +++ b/lib/NGCP/Panel/Controller/API/RewriteRules.pm @@ -88,7 +88,7 @@ sub GET :Allow { (my $total_count, $rules) = $self->paginate_order_collection($c, $rules); my (@embedded, @links); - for my $rule ($rules->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $rule ($rules->all) { push @embedded, $self->hal_from_item($c, $rule, "rewriterules"); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name, diff --git a/lib/NGCP/Panel/Controller/API/SoundFiles.pm b/lib/NGCP/Panel/Controller/API/SoundFiles.pm index 7ef0e7ebed..6183b7b84a 100644 --- a/lib/NGCP/Panel/Controller/API/SoundFiles.pm +++ b/lib/NGCP/Panel/Controller/API/SoundFiles.pm @@ -77,7 +77,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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/SoundSets.pm b/lib/NGCP/Panel/Controller/API/SoundSets.pm index 1023822112..f62f1892dc 100644 --- a/lib/NGCP/Panel/Controller/API/SoundSets.pm +++ b/lib/NGCP/Panel/Controller/API/SoundSets.pm @@ -88,7 +88,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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 35385560b3..9d90a70ec6 100644 --- a/lib/NGCP/Panel/Controller/API/SpeedDials.pm +++ b/lib/NGCP/Panel/Controller/API/SpeedDials.pm @@ -83,7 +83,7 @@ sub GET :Allow { my $subscribers = $self->item_rs($c); (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); - for my $subscriber ($subscribers->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $subscriber ($subscribers->all) { 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 bb3375c23c..ca2bed3ae3 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberPreferences.pm @@ -58,7 +58,7 @@ sub GET :Allow { my $subscribers = $self->item_rs($c, "subscribers"); (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); - for my $subscriber ($subscribers->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $subscriber ($subscribers->all) { next unless($subscriber->provisioning_voip_subscriber); push @embedded, $self->hal_from_item($c, $subscriber, "subscribers"); push @links, Data::HAL::Link->new( diff --git a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm index 99e8a3798b..9447c39786 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfileSets.pm @@ -77,7 +77,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}, prefetch => ['reseller']})->all) { + for my $item ($items->search({}, {prefetch => ['reseller']})->all) { 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 6b3c0c6b71..dc8c8413a7 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberProfiles.pm @@ -77,7 +77,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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 b53b63bafd..00ae82527e 100644 --- a/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm +++ b/lib/NGCP/Panel/Controller/API/SubscriberRegistrations.pm @@ -85,7 +85,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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 0498063ee2..0332fb6388 100644 --- a/lib/NGCP/Panel/Controller/API/Subscribers.pm +++ b/lib/NGCP/Panel/Controller/API/Subscribers.pm @@ -144,7 +144,7 @@ sub GET :Allow { (my $total_count, $subscribers) = $self->paginate_order_collection($c, $subscribers); my (@embedded, @links); my $form = $self->get_form($c); - for my $subscriber ($subscribers->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $subscriber ($subscribers->all) { my $resource = $self->resource_from_item($c, $subscriber, $form); push @embedded, $self->hal_from_item($c, $subscriber, $resource, $form); push @links, Data::HAL::Link->new( diff --git a/lib/NGCP/Panel/Controller/API/SystemContacts.pm b/lib/NGCP/Panel/Controller/API/SystemContacts.pm index a59422e3f1..f62790730c 100644 --- a/lib/NGCP/Panel/Controller/API/SystemContacts.pm +++ b/lib/NGCP/Panel/Controller/API/SystemContacts.pm @@ -77,7 +77,7 @@ sub GET :Allow { (my $total_count, $contacts) = $self->paginate_order_collection($c, $contacts); my (@embedded, @links); my $form = $self->get_form($c); - for my $contact ($contacts->search({}, {order_by => {-asc => 'me.id'}, prefetch => ['reseller']})->all) { + for my $contact ($contacts->search({}, {prefetch => ['reseller']})->all) { 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/TrustedSources.pm b/lib/NGCP/Panel/Controller/API/TrustedSources.pm index f689a659db..0dde45c665 100644 --- a/lib/NGCP/Panel/Controller/API/TrustedSources.pm +++ b/lib/NGCP/Panel/Controller/API/TrustedSources.pm @@ -81,7 +81,7 @@ sub GET :Allow { (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); my $form = $self->get_form($c); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { 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 cd831efd59..9c41648a13 100644 --- a/lib/NGCP/Panel/Controller/API/Voicemails.pm +++ b/lib/NGCP/Panel/Controller/API/Voicemails.pm @@ -77,7 +77,7 @@ sub GET :Allow { my $items = $self->item_rs($c); (my $total_count, $items) = $self->paginate_order_collection($c, $items); my (@embedded, @links); - for my $item ($items->search({}, {order_by => {-asc => 'me.id'}})->all) { + for my $item ($items->all) { push @embedded, $self->hal_from_item($c, $item); push @links, Data::HAL::Link->new( relation => 'ngcp:'.$self->resource_name,