TT#65505 deflate RedisLocation from unixtime to datetime

Change-Id: Icd50516fac03bc4d3ffbadb6bf7918f2ba40369a
(cherry picked from commit cd7e213703)
changes/69/32669/2
Kirill Solomko 6 years ago
parent 5ed34eaf8b
commit 882849f26b

@ -8,6 +8,7 @@ use NGCP::Panel::Utils::RedisLocationResultSource;
use Data::Dumper; use Data::Dumper;
use Time::HiRes qw(time); use Time::HiRes qw(time);
use POSIX qw(strftime);
has _c => ( has _c => (
is => 'ro', is => 'ro',
@ -96,6 +97,12 @@ sub find {
my %entry = $self->_redis->hgetall("location:entry::$id"); my %entry = $self->_redis->hgetall("location:entry::$id");
$entry{id} = $entry{ruid}; $entry{id} = $entry{ruid};
# deflate expires column
if ($entry{expires}) {
$entry{expires} = strftime("%Y-%m-%d %H:%M:%S", localtime($entry{expires}));
} else {
$entry{expires} = "1970-01-01 00:00:00";
}
if (exists $filter->{reseller_id} && $filter->{reseller_id} != $self->_domain_resellers->{$entry{domain}}) { if (exists $filter->{reseller_id} && $filter->{reseller_id} != $self->_domain_resellers->{$entry{domain}}) {
return; return;
} }
@ -165,10 +172,18 @@ sub _rows_from_mapkey {
foreach my $key (@{ $keys }) { foreach my $key (@{ $keys }) {
my %entry = $self->_redis->hgetall($key); my %entry = $self->_redis->hgetall($key);
$entry{id} = $entry{ruid}; $entry{id} = $entry{ruid};
# deflate expires column
if ($entry{expires}) {
$entry{expires} = strftime("%Y-%m-%d %H:%M:%S", localtime($entry{expires}));
} else {
$entry{expires} = "1970-01-01 00:00:00";
}
if (exists $filter->{reseller_id} && $filter->{reseller_id} != $self->_domain_resellers->{$entry{domain}}) { if (exists $filter->{reseller_id} && $filter->{reseller_id} != $self->_domain_resellers->{$entry{domain}}) {
next; next;
} }
my $res = NGCP::Panel::Utils::RedisLocationResultSource->new(_data => \%entry); my $res = NGCP::Panel::Utils::RedisLocationResultSource->new(_data => \%entry);
push @rows, $res; push @rows, $res;
} }
return \@rows; return \@rows;

Loading…
Cancel
Save