Merge branch 'feature/client-portal-dashboard' into staging

Modules/Client/Http/Controllers/Api/CorporateMemberController.php

@@ -3,50 +3,26 @@
 namespace Modules\Client\Http\Controllers\Api;
 
 use App\Helpers\Helper;
-use App\Models\Member;
+use App\Services\CorporateMemberService;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
-use Modules\Client\Transformers\MemberResources;
+use Modules\Client\Transformers\Dashboard\MemberResources;
 
 class CorporateMemberController extends Controller
 {
+    public function __construct(public CorporateMemberService $corporateMemberService)
+    {
+    }
+
     /**
      * Display a listing of the resource.
      * @return Renderable
      */
     public function index(Request $request, $corporate_id)
     {
-        $limit = $request->has('per_page') ? $request->per_page : 10;
+        $members = $this->corporateMemberService->getAllDashboardMembers($corporate_id, $request);
 
-        $members = Member::query()
-            ->whereHas('employeds', function ($corporateEmployee) use ($corporate_id) {
-                $corporateEmployee->where('corporate_id', $corporate_id);
-            })->when($request->input('search'), function ($query, $search) {
-                $query->where('member_id', 'like', "%" . $search . "%")
-                    ->orWhere('name', 'like', "%" . $search . "%");
-            });
-
-        if ($request->input('claimMember') === 'false') {
-            $members = $members->when($request->input('division'), function ($division, $division_id) {
-                $division->whereHas('division', function ($corporateEmployee) use ($division_id) {
-                    $corporateEmployee->where('division_id', $division_id);
-                });
-            })->when($request->has('orderBy'), function ($query) use ($request) {
-                $query->orderBy($request->orderBy, $request->order);
-            });
-        }
-        //  else {
-        //     $members = $members->get();
-
-        //     return response()->json(MemberResources::collection($members));
-        // }
-        $members->with('currentPlan');
-        $members->withSum('claims', 'total_claim');
-
-        $members = $members->paginate($limit);
-        // return $members;
-        
         return response()->json(Helper::paginateResources(MemberResources::collection($members)));
     }
 

Modules/Client/Http/Controllers/Api/CorporatePolicyController.php

@@ -2,11 +2,12 @@
 
 namespace Modules\Client\Http\Controllers\Api;
 
+use App\Helpers\Helper;
 use Illuminate\Contracts\Support\Renderable;
 use Illuminate\Http\Request;
 use Illuminate\Routing\Controller;
 use Illuminate\Support\Facades\Auth;
-use Modules\Client\Transformers\DashboardResources;
+use Modules\Client\Transformers\Dashboard\LimitResources;
 
 class CorporatePolicyController extends Controller
 {
@@ -16,14 +17,13 @@ class CorporatePolicyController extends Controller
      */
     public function index(Request $request, $corporate_id)
     {
-        $user = Auth::user();
-        $currentCorporate = $user->managedCorporates()
+        $currentCorporate = Auth::user()->managedCorporates()
             ->with(['currentPolicy', 'employees'])
             ->find($corporate_id);
 
-        $data = DashboardResources::make($currentCorporate);
+        $data = LimitResources::make($currentCorporate);
 
-        return response()->json($data);
+        return Helper::responseJson($data);
     }
 
     /**

Modules/Client/Transformers/Dashboard/LimitResources.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace Modules\Client\Transformers;
+namespace Modules\Client\Transformers\Dashboard;
 
-use App\Helpers\Helper;
 use Illuminate\Http\Resources\Json\JsonResource;
 
-class DashboardResources extends JsonResource
+class LimitResources extends JsonResource
 {
     /**
      * Transform the resource into an array.
@@ -22,17 +21,15 @@ class DashboardResources extends JsonResource
         $lockPercentage = (int)$this->currentPolicy->minimal_stop_service_percentage;
 
         return [
-            'policy' => [
-                'myLimit' => [
-                    'balance' => $myLimitBalance,
-                    'total' => $myLimitTotal,
-                    'percentage' => $myLimitTotal ? (($myLimitBalance / $myLimitTotal) * 100) : 0,
-                ],
-                'lockLimit' => [
-                    'balance' => $lockBalance,
-                    'percentage' => $lockPercentage
-                ]
+            'myLimit' => [
+                'balance' => $myLimitBalance,
+                'total' => $myLimitTotal,
+                'percentage' => $myLimitTotal ? round(($myLimitBalance / $myLimitTotal) * 100, 2) : 0,
             ],
+            'lockLimit' => [
+                'balance' => $lockBalance,
+                'percentage' => $lockPercentage
+            ]
         ];
     }
 }

Modules/Client/Transformers/Dashboard/MemberResources.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Modules\Client\Transformers;
+namespace Modules\Client\Transformers\Dashboard;
 
 use Illuminate\Http\Resources\Json\JsonResource;
 
@@ -18,15 +18,13 @@ class MemberResources extends JsonResource
             'id' => $this->id,
             'memberId' => $this->member_id,
             'fullName' => $this->full_name,
-            $this->mergeWhen($request->input('claimMember') === 'false', [
-                'division' => $this->division->name ?? '',
-                'status' => $this->active
-            ]),
+            'division' => $this->division_name ?? '',
             'limit' => [
                 'current' => $this->claims_sum_total_claim,
                 'total' => $this->currentPlan->limit_rules ?? 0,
                 'percentage' => (!empty($this->currentPlan->limit_rules ?? 0)) ? (($this->claims_sum_total_claim / $this->currentPlan->limit_rules) * 100) : 0
             ],
+            'status' => $this->active,
         ];
     }
 }