From e3f1a2816d343a66df4323a941a9a1cbe775ed40 Mon Sep 17 00:00:00 2001
From: sayliraut <sayliraut2903@gmail.com>
Date: Thu, 24 Apr 2025 12:37:42 +0530
Subject: [PATCH] Change in filter alarm

---
 app/Http/Controllers/AlarmControllerCommon.php | 7 +++----
 app/Services/AlarmService.php                  | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/AlarmControllerCommon.php b/app/Http/Controllers/AlarmControllerCommon.php
index 5f222f5..1c243a9 100644
--- a/app/Http/Controllers/AlarmControllerCommon.php
+++ b/app/Http/Controllers/AlarmControllerCommon.php
@@ -212,8 +212,6 @@ class AlarmControllerCommon extends Controller
     public function filterAlarm(Request $request)
     {
         try {
-            $token = readHeaderToken();
-            $useId = $token['sub'];
 
             $alarmData = $request->only([
                 'severity',
@@ -222,10 +220,11 @@ class AlarmControllerCommon extends Controller
                 'startTs',
                 'endTs',
                 'deviceId',
-                'assetId'
+                'assetId',
+                'assignId',
             ]);
 
-            $apiResponse = $this->alarmService->filterAlarm($alarmData, $useId);
+            $apiResponse = $this->alarmService->filterAlarm($alarmData);
 
             return jsonResponseWithSuccessMessage('Alarm data retrieved successfully', ['api_response' => $apiResponse]);
         } catch (Exception $e) {
diff --git a/app/Services/AlarmService.php b/app/Services/AlarmService.php
index a7a1fe4..74614aa 100644
--- a/app/Services/AlarmService.php
+++ b/app/Services/AlarmService.php
@@ -313,10 +313,9 @@ class AlarmService
     }
 
 
-    public function filterAlarm(array $data, $useId)
+    public function filterAlarm(array $data)
     {
         $token = $this->getToken();
-
         $deviceId = null;
 
         if (!empty($data['deviceId'])) {
@@ -337,12 +336,12 @@ class AlarmService
 
         $queryParams = array_filter([
             'severityList'  => $data['severity'] ?? null,
-            'assigneeId'    => $useId,
+            'assigneeId'    => $data['assignId'] ?? null,
             'pageSize'      => $data['pageSize'] ?? 10,
             'page'          => $data['page'] ?? 0,
             'startTime'     => $data['startTs'] ?? null,
             'endTime'       => $data['endTs'] ?? null,
-            'deviceId'      => $deviceId, 
+            'deviceId'      => $deviceId,
         ], function ($value) {
             return $value !== null;
         });
-- 
2.34.1