test

app/Jobs/Dashboard/Product/Child.php

@@ -53,9 +53,19 @@ class Child
                 foreach ($color['screens'] as $screen) {
                     $folder = Carbon::now()->format('Y/m/d');
 
-                    $path = $screen['image']->store($screen['image']);
+                    // Store original
+                    $path = $screen['image']->store("uploads/screens/{$folder}");
 
-                    $thumbPath = $this->storeImageToS3($screen['image']);
+                    // Store and resize thumb
+                    $tempPath = $screen['image']->store('temp', 'public');
+                    $thumbPath = $this->image->resize($tempPath, 322, 'screens', true);
+
+                    // Get screen size (local or s3)
+                    if (env('FILESYSTEM_DISK') == 's3') {
+                        $this->size = Storage::disk('s3')->size($path);
+                    } else {
+                        $this->size = filesize(public_path($path));
+                    }
 
                     Screen::create([
                         'path' => $path,
@@ -68,28 +78,4 @@ class Child
             }
         }
     }
-
-    private function storeImageToS3($image): string
-    {
-        $path = '';
-        // first store temp file and resize it, then upload to s3
-        // 1 - store temp file
-        $tempPath = $image->store('temp', 'public');
-        if ($tempPath) {
-            $tempFilePath = storage_path('app/public/' . $tempPath);
-            $image = new ImageResize();
-            $path = $image->resize($tempPath, 322, 'screens');
-
-            $this->size = filesize(public_path($path));
-
-            // 2 - upload local $path to s3
-            // Store the image on S3
-            if (in_array(env('FILESYSTEM_DISK'), ['s3', 'minio'])) {
-                Storage::disk('s3')->put($path, file_get_contents(public_path($path)));
-                unlink($path);
-            }
-        }
-
-        return $path;
-    }
 }