From 8d97e6631f9cf896b65beaed89ce78037ec634a2 Mon Sep 17 00:00:00 2001
From: Kirill Solomko <ksolomko@sipwise.com>
Date: Thu, 4 Apr 2024 12:06:46 +0200
Subject: [PATCH] MT#59797 /api/headerruleconditions (actions) fix reseller
 role

* fix resultset when user role is reseller so that reseller_id
  is joined correctly and a db error is not produced anymore.

Change-Id: I2a1b357037d983f23770bb59519fc2cb8b68a7e4
(cherry picked from commit bf249f9d969230f7de3eabf1bf77f65f4b9b52a8)
---
 lib/NGCP/Panel/Role/API/HeaderRuleActions.pm    | 16 ++++++++--------
 lib/NGCP/Panel/Role/API/HeaderRuleConditions.pm | 14 ++++++++------
 2 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/lib/NGCP/Panel/Role/API/HeaderRuleActions.pm b/lib/NGCP/Panel/Role/API/HeaderRuleActions.pm
index c317fbe914..e3654d3d68 100644
--- a/lib/NGCP/Panel/Role/API/HeaderRuleActions.pm
+++ b/lib/NGCP/Panel/Role/API/HeaderRuleActions.pm
@@ -26,21 +26,21 @@ sub _item_rs {
         join => { rule => 'ruleset' }
     });
 
-    if ($c->user->roles eq "reseller") {
-        $item_rs = $c->model('DB')->resultset('voip_header_rule_actions')->search_rs({
-            'ruleset.reseller_id' => $c->user->reseller_id,
-        });
+    if ($c->user->roles eq 'reseller') {
+        $item_rs = $item_rs->search_rs({                                                                                                      'ruleset.reseller_id' => $c->user->reseller_id,                                                                               });
     }
 
     if (my $subscriber_id = $c->req->param('subscriber_id')) {
         my $prov_subscriber_id = NGCP::Panel::Utils::Subscriber::billing_to_prov_subscriber_id(
             c => $c, subscriber_id => $subscriber_id
         );
-        $item_rs = $item_rs->search_rs(
-            { 'ruleset.subscriber_id' => $prov_subscriber_id });
+        $item_rs = $item_rs->search_rs({
+            'ruleset.subscriber_id' => $prov_subscriber_id
+        });
     } else {
-        $item_rs = $item_rs->search_rs(
-            { 'ruleset.subscriber_id' => undef });
+        $item_rs = $item_rs->search_rs({
+            'ruleset.subscriber_id' => undef
+        });
     }
 
     return $item_rs;
diff --git a/lib/NGCP/Panel/Role/API/HeaderRuleConditions.pm b/lib/NGCP/Panel/Role/API/HeaderRuleConditions.pm
index 0436bd4132..40cba79ff9 100644
--- a/lib/NGCP/Panel/Role/API/HeaderRuleConditions.pm
+++ b/lib/NGCP/Panel/Role/API/HeaderRuleConditions.pm
@@ -27,8 +27,8 @@ sub _item_rs {
         join => { rule => 'ruleset' }
     });
 
-    if ($c->user->roles eq "reseller") {
-        $item_rs = $c->model('DB')->resultset('voip_header_rule_conditions')->search_rs({
+    if ($c->user->roles eq 'reseller') {
+        $item_rs = $item_rs->search_rs({
             'ruleset.reseller_id' => $c->user->reseller_id,
         });
     }
@@ -37,11 +37,13 @@ sub _item_rs {
         my $prov_subscriber_id = NGCP::Panel::Utils::Subscriber::billing_to_prov_subscriber_id(
             c => $c, subscriber_id => $subscriber_id
         );
-        $item_rs = $item_rs->search_rs(
-            { 'ruleset.subscriber_id' => $prov_subscriber_id });
+        $item_rs = $item_rs->search_rs({
+            'ruleset.subscriber_id' => $prov_subscriber_id
+        });
     } else {
-        $item_rs = $item_rs->search_rs(
-            { 'ruleset.subscriber_id' => undef });
+        $item_rs = $item_rs->search_rs({
+            'ruleset.subscriber_id' => undef
+        });
     }
 
     return $item_rs;