TT#48198 Use items array from paginations in all api controllers

Change-Id: I1856cd4f073d32b4465d0778baf5f9f7c708f78c
(cherry picked from commit b912d7bea4)
changes/56/25356/2
Irina Peshinskaya 7 years ago
parent 7f2cac2787
commit bc2f5062bf

@ -75,9 +75,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -122,7 +122,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');

@ -124,10 +124,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;

@ -86,10 +86,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -110,9 +110,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -95,10 +95,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -93,10 +93,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -73,9 +73,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, NGCP::Panel::Utils::DataHalLink->new(

@ -99,9 +99,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -90,9 +90,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -106,9 +106,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -99,9 +99,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -91,10 +91,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, NGCP::Panel::Utils::DataHalLink->new(

@ -337,13 +337,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, $owner, $form, $href_data);
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -104,10 +104,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -106,10 +106,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -79,7 +79,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 }) {

@ -112,7 +112,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');

@ -154,7 +154,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');

@ -97,10 +97,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -86,10 +86,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -110,10 +110,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -98,9 +98,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -95,12 +95,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;

@ -184,7 +184,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');

@ -97,10 +97,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -93,10 +93,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -94,10 +94,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -135,10 +135,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -129,10 +129,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;

@ -99,10 +99,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -95,10 +95,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -94,10 +94,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -123,13 +123,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -105,9 +105,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, NGCP::Panel::Utils::DataHalLink->new(

@ -151,10 +151,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -80,7 +80,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 = ();
@ -95,7 +95,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, NGCP::Panel::Utils::DataHalLink->new(

@ -95,10 +95,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -93,10 +93,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -104,10 +104,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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) {
push @embedded, $self->hal_from_item($c, $item, $form);
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -96,9 +96,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -108,9 +108,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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) {
push @embedded, $self->hal_from_item($c, $item, $form);
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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) {
push @embedded, $self->hal_from_item($c, $item, $form);
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -126,10 +126,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -122,10 +122,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -100,10 +100,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -85,10 +85,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -71,9 +71,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -71,9 +71,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -73,9 +73,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;

@ -84,10 +84,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -84,10 +84,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -89,9 +89,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -111,7 +111,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');

@ -95,10 +95,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -93,10 +93,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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) {
my $halitem = $self->hal_from_item($c, $item, $form);
next unless($halitem);
push @embedded, $halitem;

@ -309,7 +309,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');

@ -85,10 +85,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -188,10 +188,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;

@ -87,10 +87,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -86,10 +86,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -86,10 +86,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -103,9 +103,9 @@ 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);
for my $item ($items->all) {
for my $item (@$items_rows) {
push @embedded, $self->hal_from_item($c, $item);
push @links, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -95,10 +95,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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -60,11 +60,10 @@ sub get {
my $rows = $c->request->params->{rows} // 10;
{
my $items = $self->get_list($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 @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, NGCP::Panel::Utils::DataHalLink->new(
relation => 'ngcp:'.$self->resource_name,

@ -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;

Loading…
Cancel
Save