rin pint

CESNET · Jul 23, 2024 · a002d72 · a002d72
1 parent 42f5791
commit a002d72
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 29 deletions.
diff --git a/app/Http/Controllers/EntityFederationController.php b/app/Http/Controllers/EntityFederationController.php
@@ -4,7 +4,6 @@
 
 use App\Http\Requests\JoinFederation;
 use App\Jobs\FolderDeleteMembership;
-use App\Jobs\Old_GitDeleteFromFederation;
 use App\Models\Entity;
 use App\Models\Federation;
 use App\Models\User;
@@ -82,7 +81,7 @@ public function destroy(Request $request, Entity $entity)
         foreach (request('federations') as $f) {
             $federation = Federation::find($f);
 
-            FolderDeleteMembership::dispatch($entity,$federation);
+            FolderDeleteMembership::dispatch($entity, $federation);
             //GitDeleteFromFederation::dispatch($entity, $federation, Auth::user());
             Notification::send($entity->operators, new EntityDeletedFromFederation($entity, $federation));
             Notification::send(User::activeAdmins()->select('id', 'email')->get(), new EntityDeletedFromFederation($entity, $federation));

diff --git a/app/Http/Controllers/MembershipController.php b/app/Http/Controllers/MembershipController.php
@@ -83,9 +83,9 @@ public function destroy(Membership $membership)
 
         $membership->delete();
 
-/*        $admins = User::activeAdmins()->select('id', 'email')->get();
-        Notification::send($operators, new MembershipRejected($entity, $federation));
-        Notification::send($admins, new MembershipRejected($entity, $federation));*/
+        /*        $admins = User::activeAdmins()->select('id', 'email')->get();
+                Notification::send($operators, new MembershipRejected($entity, $federation));
+                Notification::send($admins, new MembershipRejected($entity, $federation));*/
 
         return redirect()
             ->back()

diff --git a/app/Jobs/EduGainRunMdaScript.php b/app/Jobs/EduGainRunMdaScript.php
@@ -9,7 +9,6 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Mockery\Exception;
 

diff --git a/app/Jobs/FolderAddMembership.php b/app/Jobs/FolderAddMembership.php
@@ -7,7 +7,6 @@
 use App\Models\Federation;
 use App\Models\Membership;
 use App\Notifications\EntityAddedToHfd;
-use App\Notifications\EntityStateChanged;
 use App\Notifications\MembershipAccepted;
 use App\Services\NotificationService;
 use App\Traits\HandlesJobsFailuresTrait;
@@ -58,10 +57,9 @@ public function handle(): void
 
             NotificationService::sendEntityNotification($entity, new MembershipAccepted($this->membership));
 
-/*            if($this->membership->entity->hfd) {
-                NotificationService::sendEntityNotification($entity, new EntityAddedToHfd($this->membership->entity));
-            }*/
-
+            /*            if($this->membership->entity->hfd) {
+                            NotificationService::sendEntityNotification($entity, new EntityAddedToHfd($this->membership->entity));
+                        }*/
 
             RunMdaScript::dispatch($federation, $lock->owner());
         } catch (Exception $e) {

diff --git a/app/Jobs/FolderDeleteEntity.php b/app/Jobs/FolderDeleteEntity.php
@@ -4,7 +4,6 @@
 
 use App\Facades\EntityFacade;
 use App\Models\Entity;
-use App\Notifications\EntityDeletedFromHfd;
 use App\Notifications\EntityStateChanged;
 use App\Services\NotificationService;
 use App\Traits\HandlesJobsFailuresTrait;
@@ -14,7 +13,6 @@
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Cache;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 use Mockery\Exception;
 
@@ -65,7 +63,7 @@ public function handle(): void
 
                 RunMdaScript::dispatch($federation, $lock->owner());
             } catch (Exception $e) {
-               $this->fail($e);
+                $this->fail($e);
             } finally {
                 if ($lock->isOwnedByCurrentProcess()) {
                     $lock->release();

diff --git a/app/Jobs/FolderDeleteMembership.php b/app/Jobs/FolderDeleteMembership.php
@@ -5,9 +5,6 @@
 use App\Facades\EntityFacade;
 use App\Models\Entity;
 use App\Models\Federation;
-use App\Models\Membership;
-use App\Notifications\EntityDeletedFromHfd;
-use App\Notifications\EntityStateChanged;
 use App\Notifications\MembershipRejected;
 use App\Services\NotificationService;
 use App\Traits\HandlesJobsFailuresTrait;
@@ -26,9 +23,9 @@ class FolderDeleteMembership implements ShouldQueue
     use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
     use HandlesJobsFailuresTrait;
 
-    public Federation  $federation;
-    public Entity $entity;
+    public Federation $federation;
 
+    public Entity $entity;
 
     /**
      * Create a new job instance.
@@ -59,8 +56,7 @@ public function handle(): void
             $lock->block(61);
             EntityFacade::deleteEntityMetadataFromFolder($entity->file, $federation->xml_id);
 
-
-            NotificationService::sendEntityNotification($entity,new MembershipRejected($entity->entityid,$federation->name));
+            NotificationService::sendEntityNotification($entity, new MembershipRejected($entity->entityid, $federation->name));
 
             RunMdaScript::dispatch($federation, $lock->owner());
         } catch (Exception $e) {

diff --git a/app/Models/Entity.php b/app/Models/Entity.php
@@ -3,9 +3,6 @@
 namespace App\Models;
 
 use App\Enums\EntityType;
-use App\Events\CreateEntity;
-use App\Events\DeleteEntity;
-use App\Events\UpdateEntity;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
 use Illuminate\Database\Eloquent\SoftDeletes;
@@ -93,5 +90,4 @@ public function scopeSearch($query, ?string $search = null)
             ->orWhere('description_en', 'like', "%$search%")
             ->orWhere('description_cs', 'like', "%$search%");
     }
-
 }
diff --git a/app/Observers/EntityObserver.php b/app/Observers/EntityObserver.php
@@ -28,9 +28,9 @@ public function updated(Entity $entity): void
         if ($entity->wasChanged('xml_file')
         ) {
             FolderAddEntity::dispatch($entity);
-        } elseif ($entity->approved == 1 && !$entity->wasChanged('approved') ){
+        } elseif ($entity->approved == 1 && ! $entity->wasChanged('approved')) {
 
-            if(!$entity->wasChanged('edugain') && !$entity->wasChanged('deleted_at')){
+            if (! $entity->wasChanged('edugain') && ! $entity->wasChanged('deleted_at')) {
                 NotificationService::sendUpdateNotification($entity);
             }
 

diff --git a/app/Services/EntityService.php b/app/Services/EntityService.php
@@ -6,7 +6,6 @@
 use App\Models\Federation;
 use Exception;
 use http\Exception\InvalidArgumentException;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Storage;
 
 class EntityService
@@ -58,7 +57,7 @@ public function deleteEntityMetadataFromFolder($fileName, $folderName): void
             try {
                 Storage::disk($diskName)->delete($pathToFile);
             } catch (Exception $e) {
-               throw new InvalidArgumentException("Unable to delete file $pathToFile");
+                throw new InvalidArgumentException("Unable to delete file $pathToFile");
             }
         } else {
             throw new InvalidArgumentException("Unable to delete file $pathToFile");