Federation code cleaning

app/Http/Controllers/FederationController.php

@@ -10,16 +10,12 @@
 use App\Notifications\FederationRequested;
 use App\Notifications\FederationUpdated;
 use App\Services\NotificationService;
-use App\Traits\GitTrait;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Notification;
-use Illuminate\Support\Facades\Storage;
 
 class FederationController extends Controller
 {
-    use GitTrait;
-
     /**
      * Display a listing of the resource.
      *
@@ -85,9 +81,7 @@ public function show(Federation $federation)
     {
         $this->authorize('view', $federation);
 
-        return view('federations.show', [
-            'federation' => $federation,
-        ]);
+        return view('federations.show', compact('federation'));
     }
 
     /**
@@ -99,9 +93,7 @@ public function edit(Federation $federation)
     {
         $this->authorize('update', $federation);
 
-        return view('federations.edit', [
-            'federation' => $federation,
-        ]);
+        return view('federations.edit', compact('federation'));
     }
 
     /**
@@ -120,9 +112,9 @@ public function update(UpdateFederation $request, Federation $federation)
         if (isset($validated['name'])) {
             $id = generateFederationID($validated['name']);
         }
-        $additionalFilters = $request->input('sp_and_ip_feed', 0);
         $filters = $id;
 
+        $additionalFilters = $request->input('sp_and_ip_feed', 0);
         if ($additionalFilters) {
             $filters .= ', '.$id.'+idp';
             $filters .= ', '.$id.'+sp';
@@ -137,7 +129,6 @@ public function update(UpdateFederation $request, Federation $federation)
                 ->route('federations.show', $federation);
         }
         NotificationService::sendModelNotification($federation, new FederationUpdated($federation));
-        //  GitUpdateFederation::dispatch($federation, Auth::user());
 
         return redirect()
             ->route('federations.show', $federation)

app/Http/Controllers/FederationEntityController.php

@@ -58,7 +58,6 @@ public function store(Federation $federation)
         return redirect()
             ->route('federations.entities.index', $federation)
             ->with('status', __('federations.entities_added'));
-
     }
 
     /**
@@ -77,8 +76,7 @@ public function destroy(Federation $federation)
         $federation->entities()->detach(request('entities'));
 
         foreach (request('entities') as $id) {
-            $entity = Entity::find($id);
-            FolderDeleteMembership::dispatch($entity, $federation);
+            FolderDeleteMembership::dispatch(Entity::find($id), $federation);
         }
 
         $old_entities = Entity::whereIn('id', request('entities'))->get();

app/Http/Controllers/FederationOperatorController.php

@@ -46,13 +46,12 @@ public function store(Federation $federation)
         $new_operators = User::whereIn('id', request('operators'))->get();
         $federation->operators()->attach(request('operators'));
 
-        Notification::sendNow($new_operators, new YourFederationRightsChanged($federation, 'added'));
+        Notification::send($new_operators, new YourFederationRightsChanged($federation, 'added'));
         NotificationService::sendOperatorNotification($old_operators, new FederationOperatorsChanged($federation, $new_operators, 'added'));
 
         return redirect()
             ->route('federations.operators.index', $federation)
             ->with('status', __('federations.operators_added'));
-
     }
 
     /**
@@ -73,12 +72,11 @@ public function destroy(Federation $federation)
         $federation->operators()->toggle(request('operators'));
         $new_operators = $federation->operators;
 
-        Notification::sendNow($old_operators, new YourFederationRightsChanged($federation, 'deleted'));
+        Notification::send($old_operators, new YourFederationRightsChanged($federation, 'deleted'));
         NotificationService::sendOperatorNotification($new_operators, new FederationOperatorsChanged($federation, $old_operators, 'added'));
 
         return redirect()
             ->route('federations.operators.index', $federation)
             ->with('status', __('federations.operators_deleted'));
-
     }
 }

app/Http/Controllers/FederationStateController.php

@@ -8,7 +8,7 @@
 
 class FederationStateController extends Controller
 {
-    public function state(Federation $federation)
+    public function update(Federation $federation)
     {
         $this->authorize('delete', $federation);
 
@@ -23,6 +23,5 @@ public function state(Federation $federation)
             ->route('federations.show', $federation)
             ->with('status', __("federations.$state", ['name' => $federation->name]))
             ->with('color', $color);
-
     }
 }

app/Jobs/FolderDeleteMembership.php

@@ -21,21 +21,15 @@
 
 class FolderDeleteMembership implements ShouldQueue
 {
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-    use HandlesJobsFailuresTrait;
-
-    private Federation $federation;
-
-    private Entity $entity;
+    use Dispatchable, HandlesJobsFailuresTrait, InteractsWithQueue, Queueable, SerializesModels;
 
     /**
      * Create a new job instance.
      */
-    public function __construct(Entity $entity, Federation $federation)
-    {
-        $this->federation = $federation;
-        $this->entity = $entity;
-    }
+    public function __construct(
+        private Entity $entity,
+        private Federation $federation
+    ) {}
 
     public function getFederation(): Federation
     {
@@ -58,12 +52,12 @@ public function handle(): void
 
         try {
             $pathToDirectory = FederationService::getFederationFolder($federation);
-
         } catch (\Exception $e) {
             $this->fail($e);
 
             return;
         }
+
         $pathToFile = $federation->xml_id.'/'.$entity->file;
 
         if (! Storage::disk($diskName)->exists($pathToFile)) {
@@ -84,6 +78,7 @@ public function handle(): void
 
                 return;
             }
+
             RunMdaScript::dispatch($federation->id, $lock->owner());
         } catch (Exception $e) {
             $this->fail($e);
@@ -94,6 +89,5 @@ public function handle(): void
                 Log::warning("Lock not owned by current process or lock lost for key: $lockKey");
             }
         }
-
     }
 }