TT#5549 improve fax journal numbers representation for the API

* normalise /api/faxes numbers by using the new common
      NGCP::Panel::Utils::Fax::process_fax_journal_item

Change-Id: Ibf00109eb69bc13a6819424d451e34da072e5749
changes/39/9539/1
Kirill Solomko 9 years ago
parent 0b3308defb
commit 5d73a12fb4

@ -13,6 +13,7 @@ use HTTP::Status qw(:constants);
use DateTime::Format::Strptime; use DateTime::Format::Strptime;
use NGCP::Panel::Form::Subscriber::WebfaxAPI; use NGCP::Panel::Form::Subscriber::WebfaxAPI;
use NGCP::Panel::Utils::Subscriber; use NGCP::Panel::Utils::Subscriber;
use NGCP::Panel::Utils::Fax;
sub _item_rs { sub _item_rs {
my ($self, $c) = @_; my ($self, $c) = @_;
@ -68,20 +69,24 @@ sub resource_from_item {
$form //= $self->get_form($c); $form //= $self->get_form($c);
my $datetime_fmt = DateTime::Format::Strptime->new( my $datetime_fmt = DateTime::Format::Strptime->new(
pattern => '%F %T', pattern => '%F %T',
); );
my $subscriber = $item->provisioning_voip_subscriber->voip_subscriber;
my %resource = (); my %resource = ();
$resource{id} = int($item->id); $resource{id} = int($item->id);
$resource{time} = $datetime_fmt->format_datetime($item->time); $resource{time} = $datetime_fmt->format_datetime($item->time);
$resource{subscriber_id} = int($item->provisioning_voip_subscriber->voip_subscriber->id); $resource{subscriber_id} = int($subscriber->id);
foreach(qw/direction caller callee reason status quality filename/){ foreach(qw/direction caller callee reason status quality filename/){
$resource{$_} = $item->$_; $resource{$_} = $item->$_;
} }
foreach(qw/duration pages signal_rate/){ foreach(qw/duration pages signal_rate/){
$resource{$_} = is_int($item->$_) ? $item->$_ : 0; $resource{$_} = is_int($item->$_) ? $item->$_ : 0;
} }
my $data = NGCP::Panel::Utils::Fax::process_fax_journal_item($c, $item, $subscriber);
map { $resource{$_} = $data->{$_} } qw(caller callee);
return \%resource; return \%resource;
} }

Loading…
Cancel
Save