rewrite metadata storage name to config file

CESNET · Jul 8, 2024 · fa6a79e · fa6a79e
1 parent 61553ca
commit fa6a79e
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/app/Listeners/CreateFederationFolder.php b/app/Listeners/CreateFederationFolder.php
@@ -23,10 +23,11 @@ public function __construct()
      */
     public function handle(FederationApprove $event): void
     {
+        $diskName = config('storageCfg.name');
 
         $federation = $event->federation;
         if ($federation->approved) {
-            if (! Storage::disk('metadata')->exists($federation->name)) {
+            if (! Storage::disk($diskName)->exists($federation->name)) {
                 $this->createFederationFolder($federation->name);
             }
         }

diff --git a/app/Services/EntityService.php b/app/Services/EntityService.php
@@ -31,17 +31,20 @@ public function saveMetadataToFederationFolder($entity_id, $federation_id): void
      */
     public function saveEntityMetadataToFolder($entity_id, $folderName): void
     {
+        $diskName = config('storageCfg.name');
+
+
         $entity = Entity::find($entity_id);
         if (! $entity) {
             throw new Exception("Entity not found with id $entity_id");
         }
         $fileName = $entity->file;
-        if (! Storage::disk('metadata')->exists($folderName)) {
-            Storage::disk('metadata')->makeDirectory($folderName);
+        if (! Storage::disk($diskName)->exists($folderName)) {
+            Storage::disk($diskName)->makeDirectory($folderName);
         }
         $filePath = $folderName.'/'.$fileName;
         $content = $entity->xml_file;
-        Storage::disk('metadata')->put($filePath, $content);
+        Storage::disk($diskName)->put($filePath, $content);
 
     }
 }
diff --git a/app/Traits/FederationTrait.php b/app/Traits/FederationTrait.php
@@ -7,17 +7,21 @@
 
 trait FederationTrait
 {
+
+
+
     public function createFederationFolder(string $name): void
     {
-        Storage::disk('metadata')->makeDirectory($name);
+
+        Storage::disk(config('storageCfg.name'))->makeDirectory($name);
     }
 
     public function updateFederationFolders(): void
     {
         $federations = Federation::select('name')->get();
 
         foreach ($federations as $fed) {
-            if (! Storage::disk('metadata')->exists($fed['name'])) {
+            if (! Storage::disk(config('storageCfg.name'))->exists($fed['name'])) {
                 $this->createFederationFolder($fed['name']);
             }
         }

diff --git a/config/storageCfg.php b/config/storageCfg.php
@@ -0,0 +1,4 @@
+<?php
+return [
+    'name' => 'metadata',
+];