refactor files

src/File/FileService.php

@@ -14,6 +14,7 @@ use Lucent\LucentException;
 use Lucent\Record\FileData as RecordFile;
 use Lucent\Record\QueryRecord;
 use Lucent\Schema\FilesSchema;
+use Lucent\Schema\Schema;
 use Spatie\ImageOptimizer\OptimizerChainFactory;
 
 class FileService
@@ -65,7 +66,7 @@ class FileService
             );
         }
 
-        $disk = $this->loadDisk();
+        $disk = $this->loadDisk($schema);
         $path = $schema->path . "/" . $filename;
         $res = $disk->put(
             $path,
@@ -108,22 +109,10 @@ class FileService
         return in_array($mimetype, $imageMimes);
     }
 
-    public function loadDisk(): Filesystem
+    public function loadDisk(Schema $schema): Filesystem
     {
-        return Storage::disk('lucent');
-        return Storage::build([
-            'driver' => 'lucent',
-//        'key' => config("filesystems.disks.s3.key"),
-//        'secret' => config("filesystems.disks.s3.secret"),
-//        'region' => config("filesystems.disks.s3.region"),
-//        'bucket' => config("filesystems.disks.s3.bucket"),
-//        // 'url' => $schema->objectStorageUrl,
-//        'endpoint' => $schema->objectStorageEndpoint,
-//            'use_path_style_endpoint' => false,
-            'visibility' => 'public', // now managed by aws policy
-            'root' => storage_path('app/public'),
-            'throw' => true,
-        ]);
+        return Storage::disk($schema->disk);
+
     }
 
     private function checkDuplicate(string $schemaName, string $checksum, int $filesize): string
@@ -155,7 +144,7 @@ class FileService
 
         $image->fit(300, 300);
         try {
-            $this->loadDisk()->put($thumbDir . $filename, $image->encode('webp', 75));
+             $disk->put($thumbDir . $filename, $image->encode('webp', 75));
 //            $image->encode('webp', 75)->save($thumbDir . $filename);
         } catch (Exception $e) {
             logger($e->getMessage());