Large file processing in third party storage fixed 🐛

rahulhaque · Jul 30, 2024 · 2c93a0a · 2c93a0a
1 parent 6695802
commit 2c93a0a
Show file tree

Hide file tree

Showing 10 changed files with 334 additions and 178 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -39,4 +39,4 @@ jobs:
           composer update --${{ matrix.stability }} --prefer-dist --no-interaction
 
       - name: Execute tests
-        run: vendor/bin/phpunit
+        run: vendor/bin/phpunit --exclude-group disk-test
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,12 @@
 
 All notable changes to `laravel-filepond` will be documented in this file.
 
+## 11.0.2 - 2024-07-30
+
+- Fixed large file processing in third party storage 🐛.
+- Docker development environment isolated 🐳.
+- Filepond disk test cases added ✅.
+
 ## 11.0.1 - 2024-07-10
 
 - Fixed large file processing (out of memory exception) 🐛.

diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 A straight forward backend support for Laravel application to work with [FilePond](https://pqina.nl/filepond/) file upload javascript library. This package keeps tracks of all the uploaded files and provides an easier interface for the developers to interact with them. It currently features - 
 
 - Single and multiple file uploads.
-- Chunk uploads with resume.
+- Chunk uploads with resume support.
 - Third party storage support.
 - Global server side validation for temporary files.
 - Controller/Request level validation before moving the temporary files to permanent location.

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,11 +1,10 @@
-version: '3'
 services:
   laravel-filepond:
+    image: laravel-filepond-development:11.x
     build:
       context: ./docker/8.2
       dockerfile: Dockerfile
-    image: laravel-filepond-development
-    container_name: laravel-filepond-11
+    container_name: laravel-filepond-11-dev
     stdin_open: true
     tty: true
     volumes:

diff --git a/phpunit.xml b/phpunit.xml
@@ -12,6 +12,11 @@
   <php>
     <env name="DB_CONNECTION" value="testing"/>
     <env name="APP_KEY" value="base64:2fl+Ktvkfl+Fuz4Qp/A75G2RTiWVA/ZoKZvp6fiiM10="/>
+    <env name="AWS_ENDPOINT" value="http://minio:9000"/>
+    <env name="AWS_ACCESS_KEY_ID" value="key"/>
+    <env name="AWS_SECRET_ACCESS_KEY" value="secret"/>
+    <env name="AWS_DEFAULT_REGION" value="us-east-1"/>
+    <env name="AWS_BUCKET" value="emulated-s3"/>
   </php>
   <source>
     <include>

diff --git a/src/Filepond.php b/src/Filepond.php
@@ -185,7 +185,11 @@ private function putFile(FilepondModel $filepond, string $path, string $disk, st
 
         $pathInfo = pathinfo($path);
 
-        Storage::disk($permanentDisk)->putFileAs($pathInfo['dirname'], new File(Storage::disk($this->getTempDisk())->path($filepond->filepath)), $pathInfo['filename'].'.'.$filepond->extension, $visibility);
+        Storage::disk($permanentDisk)->writeStream(
+            $pathInfo['dirname'].DIRECTORY_SEPARATOR.$pathInfo['filename'].'.'.$filepond->extension,
+            Storage::disk($this->getTempDisk())->readStream($filepond->filepath),
+            ['visibility' => $visibility],
+        );
 
         return [
             'id' => $filepond->id,

diff --git a/tests/Feature/FilepondFacadeTest.php b/tests/Feature/FilepondFacadeTest.php
@@ -2,185 +2,15 @@
 
 namespace RahulHaque\Filepond\Tests\Feature;
 
-use Illuminate\Http\Request;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\Storage;
-use Illuminate\Validation\Rule;
-use Illuminate\Validation\ValidationException;
 use PHPUnit\Framework\Attributes\Test;
 use RahulHaque\Filepond\Facades\Filepond;
 use RahulHaque\Filepond\Tests\TestCase;
 use RahulHaque\Filepond\Tests\User;
 
 class FilepondFacadeTest extends TestCase
 {
-    #[Test]
-    public function can_validate_null_filepond_file_upload()
-    {
-        Storage::disk(config('filepond.temp_disk', 'local'))->deleteDirectory(config('filepond.temp_folder', 'filepond/temp'));
-
-        $request = new Request([
-            'avatar' => null,
-        ]);
-
-        try {
-            $request->validate([
-                'avatar' => Rule::filepond('required|image|mimes:jpg|size:30'),
-            ]);
-        } catch (ValidationException $e) {
-            $this->assertEquals($e->errors(), ['avatar' => ['The avatar field is required.']]);
-        }
-    }
-
-    #[Test]
-    public function can_validate_after_filepond_file_upload()
-    {
-        Storage::disk(config('filepond.temp_disk', 'local'))->deleteDirectory(config('filepond.temp_folder', 'filepond/temp'));
-
-        $user = User::factory()->create();
-
-        $response = $this
-            ->actingAs($user)
-            ->post(route('filepond-process'), [
-                'avatar' => UploadedFile::fake()->image('avatar.png', 1024, 1024),
-            ], [
-                'Content-Type' => 'multipart/form-data',
-                'accept' => 'application/json',
-            ]);
-
-        $request = new Request([
-            'avatar' => $response->content(),
-        ]);
-
-        try {
-            $request->validate([
-                'avatar' => Rule::filepond('required|image|mimes:jpg|size:30'),
-            ]);
-        } catch (ValidationException $e) {
-            $this->assertEquals($e->errors(), [
-                'avatar' => [
-                    'The avatar field must be a file of type: jpg.',
-                    'The avatar field must be 30 kilobytes.',
-                ],
-            ]);
-        }
-    }
-
-    #[Test]
-    public function can_validate_after_multiple_filepond_file_upload()
-    {
-        Storage::disk(config('filepond.temp_disk', 'local'))->deleteDirectory(config('filepond.temp_folder', 'filepond/temp'));
-
-        $user = User::factory()->create();
-
-        $responses = [];
-
-        // Create 5 temporary file uploads
-        for ($i = 1; $i <= 5; $i++) {
-            $response = $this->actingAs($user)
-                ->post(route('filepond-process'), [
-                    'gallery' => UploadedFile::fake()->image('gallery-'.$i.'.png', 1024, 1024),
-                ], [
-                    'Content-Type' => 'multipart/form-data',
-                    'accept' => 'application/json',
-                ]);
-
-            $responses[] = $response->content();
-        }
-
-        $request = new Request([
-            'gallery' => $responses,
-        ]);
-
-        try {
-            $request->validate([
-                'gallery.*' => Rule::filepond('required|image|mimes:jpg|size:30'),
-            ]);
-        } catch (ValidationException $e) {
-            $this->assertEquals($e->errors(), [
-                'gallery.0' => [
-                    'The gallery.0 field must be a file of type: jpg.',
-                    'The gallery.0 field must be 30 kilobytes.',
-                ],
-                'gallery.1' => [
-                    'The gallery.1 field must be a file of type: jpg.',
-                    'The gallery.1 field must be 30 kilobytes.',
-                ],
-                'gallery.2' => [
-                    'The gallery.2 field must be a file of type: jpg.',
-                    'The gallery.2 field must be 30 kilobytes.',
-                ],
-                'gallery.3' => [
-                    'The gallery.3 field must be a file of type: jpg.',
-                    'The gallery.3 field must be 30 kilobytes.',
-                ],
-                'gallery.4' => [
-                    'The gallery.4 field must be a file of type: jpg.',
-                    'The gallery.4 field must be 30 kilobytes.',
-                ],
-            ]);
-        }
-    }
-
-    #[Test]
-    public function can_validate_after_nested_multiple_filepond_file_upload()
-    {
-        Storage::disk(config('filepond.temp_disk', 'local'))->deleteDirectory(config('filepond.temp_folder', 'filepond/temp'));
-
-        $user = User::factory()->create();
-
-        $responses = [];
-
-        // Create 5 temporary file uploads
-        for ($i = 1; $i <= 5; $i++) {
-            $response = $this->actingAs($user)
-                ->post(route('filepond-process'), [
-                    'galleries' => UploadedFile::fake()->image('gallery-'.$i.'.png', 1024, 1024),
-                ], [
-                    'Content-Type' => 'multipart/form-data',
-                    'accept' => 'application/json',
-                ]);
-
-            $responses[] = [
-                'title' => fake()->name(),
-                'image' => $response->content(),
-            ];
-        }
-
-        $request = new Request([
-            'galleries' => $responses,
-        ]);
-
-        try {
-            $request->validate([
-                'galleries.*.image' => Rule::filepond('required|image|mimes:jpg|size:30'),
-            ]);
-        } catch (ValidationException $e) {
-            $this->assertEquals($e->errors(), [
-                'galleries.0.image' => [
-                    'The galleries.0.image field must be a file of type: jpg.',
-                    'The galleries.0.image field must be 30 kilobytes.',
-                ],
-                'galleries.1.image' => [
-                    'The galleries.1.image field must be a file of type: jpg.',
-                    'The galleries.1.image field must be 30 kilobytes.',
-                ],
-                'galleries.2.image' => [
-                    'The galleries.2.image field must be a file of type: jpg.',
-                    'The galleries.2.image field must be 30 kilobytes.',
-                ],
-                'galleries.3.image' => [
-                    'The galleries.3.image field must be a file of type: jpg.',
-                    'The galleries.3.image field must be 30 kilobytes.',
-                ],
-                'galleries.4.image' => [
-                    'The galleries.4.image field must be a file of type: jpg.',
-                    'The galleries.4.image field must be 30 kilobytes.',
-                ],
-            ]);
-        }
-    }
-
     #[Test]
     public function can_get_temporary_file_after_filepond_file_upload()
     {