From 30fc2201bd2f899f36469db98faa7afeca96f969 Mon Sep 17 00:00:00 2001
From: Muhammad Fajar <muhammadfajar191@gmail.com>
Date: Sat, 13 Jan 2024 14:26:31 +0700
Subject: [PATCH] [Client Portal] Fix Alarm Center Query

---
 .../Api/CorporateMemberController.php         |  2 +-
 app/Services/CorporateMemberService.php       | 22 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
index 7e81fa11..6eb5a470 100644
--- a/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
+++ b/Modules/Client/Http/Controllers/Api/CorporateMemberController.php
@@ -196,7 +196,7 @@ class CorporateMemberController extends Controller
             })
             ->find($member_id);
 
-        return response()->json(['full_name' => $data->full_name, 'paginations' => Helper::paginateResources(DataListClaimMemberResource::collection($data->requestLogs()->paginate($per_page)))]);
+        return response()->json(['full_name' => $data->full_name ?? null, 'paginations' => Helper::paginateResources(DataListClaimMemberResource::collection($data->requestLogs()->paginate($per_page)))]);
     }
 
     public function serviceMonitoring(int $corporate_id, int $request_log_id)
diff --git a/app/Services/CorporateMemberService.php b/app/Services/CorporateMemberService.php
index 94db6738..fd7d741d 100644
--- a/app/Services/CorporateMemberService.php
+++ b/app/Services/CorporateMemberService.php
@@ -153,11 +153,11 @@ class CorporateMemberService
 
         // dd($request);
         return Member::query()
-            ->joinCorporateEmployees('left')
-            ->joinMemberPlans('left')
-            ->joinPlans('left')
-            ->with(['currentPlan', 'person'])
-            ->where('corporate_employees.corporate_id', $corporateId)
+            // ->joinCorporateEmployees('left')
+            // ->joinMemberPlans('left')
+            // ->joinPlans('left')
+            // ->with(['currentPlan', 'person'])
+            // ->where('corporate_employees.corporate_id', $corporateId)
             ->when($request->input('search'), function (Builder $query, $search) {
                 $query->where(function (Builder $query) use ($search) {
                     $query->orWhere('members.member_id', 'like', "%" . $search . "%")
@@ -180,10 +180,10 @@ class CorporateMemberService
                 $orderBy = match ($request->input('orderBy')) {
                     'memberId' => 'member_id',
                     'fullName' => 'name',
-                    'status' => 'active',
+                    // 'status' => 'active',
                     'start_date' => 'member_plans.start',
                     'end_date' => 'member_plans.end',
-                    'service' => 'plans.service_code',
+                        // 'service' => 'plans.service_code',
 
                     default => ''
                 };
@@ -197,11 +197,11 @@ class CorporateMemberService
                 'members.name',
                 'members.members_effective_date', // Use the actual property name
                 'members.members_expire_date',      // Use the actual property name
-                'plans.active',
-                'plans.service_code'
+                // 'plans.active',
+                // 'plans.service_code'
             ])
-            ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
-            ->groupBy('member_id')
+            // ->selectRaw("(select sum(`claims`.`total_claim`) from `claims` where `members`.`id` = `claims`.`member_id` AND `claims`.`deleted_at` IS NULL) AS `claims_sum_total_claim`")
+            // ->groupBy('member_id')
             ->paginate($limit);
     }