From 6088d0bf77ae3e5f616a975ab3e034b57373ef67 Mon Sep 17 00:00:00 2001
From: Irina Peshinskaya <ipeshinskaya@sipwise.com>
Date: Sun, 21 Jan 2018 23:50:14 +0200
Subject: [PATCH] TT#28460 Fix UpnRewriteSets API

Consider terminated subscribers

Change-Id: I7177c3a81da4a2492bfc3de4328834946d6af10c
(cherry picked from commit 6950268a978836d416e21b996da8e9f103514b97)
---
 lib/NGCP/Panel/Role/API/UpnRewriteSets.pm | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/NGCP/Panel/Role/API/UpnRewriteSets.pm b/lib/NGCP/Panel/Role/API/UpnRewriteSets.pm
index ba7206384b..7333e62812 100644
--- a/lib/NGCP/Panel/Role/API/UpnRewriteSets.pm
+++ b/lib/NGCP/Panel/Role/API/UpnRewriteSets.pm
@@ -15,13 +15,19 @@ sub _item_rs {
     my ($self, $c) = @_;
 
     my $item_rs = $c->model('DB')->resultset('upn_rewrite_set')
-        ->search_rs(undef, {prefetch => 'upn_rewrite_sources'});
+        ->search_rs({
+            'voip_subscriber.id' => { '!=' => undef },
+            'voip_subscriber.status' => { '!=' => 'terminated' },
+        }, {
+            join => { subscriber => 'voip_subscriber' },
+            prefetch => 'upn_rewrite_sources'
+        });
     if($c->user->roles eq "admin") {
     } elsif($c->user->roles eq "reseller") {
         $item_rs = $item_rs->search({
             'contact.reseller_id' => $c->user->reseller_id
         },{
-            join => { subscriber => { voip_subscriber => { contract => 'contact' } } },
+            join =>{ subscriber => { voip_subscriber => { contract => 'contact' } } },
         });
     }
     return $item_rs;