fix bug

CESNET · Jul 29, 2024 · f2844bc · f2844bc
1 parent 3c922e5
commit f2844bc
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/app/Jobs/FolderAddEntity.php b/app/Jobs/FolderAddEntity.php
@@ -49,8 +49,6 @@ public function handle(): void
             ->where('approved', 1)
             ->get();
 
-        $diskName = config('storageCfg.name');
-
         foreach ($federationMembershipId as $fedId) {
 
             $federation = Federation::where('id', $fedId->federation_id)->first();

diff --git a/app/Jobs/FolderDeleteEntity.php b/app/Jobs/FolderDeleteEntity.php
@@ -43,7 +43,6 @@ public function handle(): void
 
         $entity = $this->entity;
         $federations = $entity->federations;
-        $diskName = config('storageCfg.name');
         foreach ($federations as $federation) {
 
             try {

diff --git a/app/Jobs/FolderDeleteMembership.php b/app/Jobs/FolderDeleteMembership.php
@@ -48,25 +48,27 @@ public function handle(): void
         $diskName = config('storageCfg.name');
 
         try {
-            $pathToFile = FederationService::getFederationFolder($federation).'/'.$entity->file;
+            $pathToDirectory = FederationService::getFederationFolder($federation);
+
         } catch (\Exception $e) {
             $this->fail($e);
-        }
 
+            return;
+        }
+        $pathToFile = $federation->xml_id.'/'.$entity->file;
+        Log::info($pathToFile);
         if (! Storage::disk($diskName)->exists($pathToFile)) {
             NotificationService::sendModelNotification($entity, new MembershipRejected($entity->entityid, $federation->name));
 
             return;
         }
 
-        $pathToDirectory = Storage::disk($diskName)->path($federation->name);
         $lockKey = 'directory-'.md5($pathToDirectory).'-lock';
         $lock = Cache::lock($lockKey, 61);
 
         try {
             $lock->block(61);
             EntityFacade::deleteEntityMetadataFromFolder($entity->file, $federation->xml_id);
-
             RunMdaScript::dispatch($federation, $lock->owner());
         } catch (Exception $e) {
             $this->fail($e);

diff --git a/app/Observers/MembershipObserver.php b/app/Observers/MembershipObserver.php
@@ -13,7 +13,9 @@ class MembershipObserver
      */
     public function created(Membership $membership): void
     {
-        //
+        if ($membership->approved == 1) {
+            FolderAddMembership::dispatch($membership);
+        }
     }
 
     /**
@@ -34,7 +36,6 @@ public function deleted(Membership $membership): void
         $entity = $membership->entity;
         $federation = $membership->federation;
         FolderDeleteMembership::dispatch($entity, $federation);
-
     }
 
     /**
@@ -50,6 +51,6 @@ public function restored(Membership $membership): void
      */
     public function forceDeleted(Membership $membership): void
     {
-        //
+
     }
 }