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");