diff --git a/app/Http/Controllers/ActivityController.php b/app/Http/Controllers/ActivityController.php
index bfb447f..f1d79d8 100644
--- a/app/Http/Controllers/ActivityController.php
+++ b/app/Http/Controllers/ActivityController.php
@@ -33,48 +33,33 @@ class ActivityController extends Controller
 
     public function progres_activity()
     {
-        // Ambil user yang sedang login
-        $user = auth()->user();
-        $roles = $user->load('roles');
+        // Ambil user yang sedang login dengan roles
+        $user = auth()->user()->load('roles');
 
-        // Inisialisasi regionId dan teamId sebagai null agar bisa dinamis
-        $regionId = null;
-        $teamId = null;
+        // Inisialisasi regionId dan teamId
+        $regionId = $teamId = null;
 
-        if ($roles->roles->pluck('name')->contains('senior-officer')) {
-            $userTeam = TeamsUsers::with('team')
-                ->where('user_id', $user->id)
-                ->first();
+        if ($user->roles->pluck('name')->contains('senior-officer')) {
+            $userTeam = TeamsUsers::with('team')->firstWhere('user_id', $user->id);
             $regionId = $userTeam?->team->regions_id;
             $teamId = $userTeam?->teams_id;
-
         }
 
         $teamsActivity = TeamsUsers::with(['user', 'team', 'team.regions', 'user.roles'])
             ->whereHas('team', function ($q) use ($regionId, $teamId) {
-                if ($regionId) {
-                    $q->where('regions_id', $regionId);
-                }
-                if ($teamId) {
-                    $q->where('id', $teamId); // Hanya tim yang sama
-                }
+                $q->when($regionId, fn($q) => $q->where('regions_id', $regionId))
+                  ->when($teamId, fn($q) => $q->where('id', $teamId));
             })
             ->where('user_id', '!=', $user->id)
-            ->whereHas('user.roles', function ($query) {
-                // Filter hanya peran 'surveyor' atau 'surveyor-penilai'
-                $query->whereIn('name', ['surveyor', 'surveyor-penilai']);
-            })
+            ->whereHas('user.roles', fn($q) => $q->whereIn('name', ['surveyor', 'surveyor-penilai']))
             ->get();
 
-
-
-
         return view('lpj::activity.progres_activity.index', compact('teamsActivity'));
     }
 
 
     function updateTeamAssingment(Request $request) {
-    
+
         try {
             $id = $request->input('id');
             $user = PenilaianTeam::where('penilaian_id', $id)->get();
@@ -86,7 +71,7 @@ class ActivityController extends Controller
                 }
                 return redirect()->route('activity.progres.index')->with('success', 'Surveyor berhasil diganti');
             }
-        
+
         } catch (\Throwable $th) {
             return redirect()->route('activity.progres.index')->with('success', $th->getMessage());
         }