From 6e2dae12d03c8b5367b4127939c711f3db53d54b Mon Sep 17 00:00:00 2001 From: Rene Krenn Date: Wed, 2 May 2018 11:29:51 +0200 Subject: [PATCH] TT#33369 remove check for LI number in 3306 db (again) Revert "TT#11701 check existence of voip number in InterceptionDB" This reverts commit b803c1ae3ec5a45b07178a851775d510e119ca33. Change-Id: I56832cf412a97c4f0fc9f169498a60653d979614 (cherry picked from commit 17082b3b381a61f724e96fbaf1e7f4226e5c7b90) --- lib/NGCP/Panel/Controller/API/Interceptions.pm | 11 +---------- lib/NGCP/Panel/Role/API/Interceptions.pm | 12 +----------- 2 files changed, 2 insertions(+), 21 deletions(-) diff --git a/lib/NGCP/Panel/Controller/API/Interceptions.pm b/lib/NGCP/Panel/Controller/API/Interceptions.pm index 3ea669b92e..76e80902ce 100644 --- a/lib/NGCP/Panel/Controller/API/Interceptions.pm +++ b/lib/NGCP/Panel/Controller/API/Interceptions.pm @@ -182,19 +182,10 @@ sub POST :Allow { my $num_rs = $c->model('DB')->resultset('voip_numbers')->search( \[ 'concat(cc,ac,sn) = ?', [ {} => $resource->{number} ]] ); - if(not $num_rs->first) { + unless($num_rs->first) { $c->log->error("invalid number '$$resource{number}'"); $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number does not exist"); last; - } else { - my $intercept_num_rs = $c->model('InterceptDB')->resultset('voip_numbers')->search( - \[ 'concat(cc,ac,sn) = ?', [ {} => $resource->{number} ]] - ); - if(not $intercept_num_rs->first) { - $c->log->error("invalid local number '$$resource{number}'"); - $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number does not exist locally"); - last; - } } # use the long way, since with ossbss provisioning, the reseller_id # is not set in this case diff --git a/lib/NGCP/Panel/Role/API/Interceptions.pm b/lib/NGCP/Panel/Role/API/Interceptions.pm index aab591f7e1..ce1ed8679e 100644 --- a/lib/NGCP/Panel/Role/API/Interceptions.pm +++ b/lib/NGCP/Panel/Role/API/Interceptions.pm @@ -180,21 +180,11 @@ sub subresnum_from_number { my $num_rs = $c->model('DB')->resultset('voip_numbers')->search( \[ 'concat(cc,ac,sn) = ?', [ {} => $number ]] ); - if (not $num_rs->first) { + unless($num_rs->first) { $c->log->error("invalid number '$number'"); $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number does not exist"); return; - } else { - my $intercept_num_rs = $c->model('InterceptDB')->resultset('voip_numbers')->search( - \[ 'concat(cc,ac,sn) = ?', [ {} => $number ]] - ); - if(not $intercept_num_rs->first) { - $c->log->error("invalid local number '$number'"); - $self->error($c, HTTP_UNPROCESSABLE_ENTITY, "Number does not exist locally"); - return; - } } - my $sub = $num_rs->first->subscriber; unless($sub) { $c->log->error("invalid number '$number', not assigned to any subscriber");