chore!: remove chunky facade and add more test cases

BREAKING CHANGE: chunky no longer has a facade in favor of using DI to resolve it

Author: NeoIsRecursive

src/Backuper.php

@@ -15,6 +15,8 @@
 use Itiden\Backup\Models\Metadata;
 use Throwable;
 
+use function Illuminate\Filesystem\join_paths;
+
 final class Backuper
 {
     public function __construct(
@@ -35,7 +37,7 @@ public function backup(): BackupDto
         try {
             $this->stateManager->setState(State::BackupInProgress);
 
-            $temp_zip_path = config('backup.temp_path') . '/temp.zip';
+            $temp_zip_path = join_paths(config('backup.temp_path'), 'temp.zip');
 
             $zipper = Zipper::write($temp_zip_path);
 

src/Http/Controllers/UploadController.php

@@ -11,13 +11,17 @@
 use Itiden\Backup\DataTransferObjects\ChunkyTestDto;
 use Itiden\Backup\DataTransferObjects\ChunkyUploadDto;
 use Itiden\Backup\Http\Requests\ChunkyUploadRequest;
-use Itiden\Backup\Support\Facades\Chunky;
+use Itiden\Backup\Support\Chunky;
 
 final readonly class UploadController
 {
-    public function __invoke(ChunkyUploadRequest $request, BackupRepository $repo, Backuper $backuper): JsonResponse
-    {
-        return Chunky::put(ChunkyUploadDto::fromRequest($request), onCompleted: function (string $completeFile) use (
+    public function __invoke(
+        ChunkyUploadRequest $request,
+        Chunky $chunky,
+        BackupRepository $repo,
+        Backuper $backuper,
+    ): JsonResponse {
+        return $chunky->put(ChunkyUploadDto::fromRequest($request), onCompleted: function (string $completeFile) use (
             $repo,
             $backuper,
         ): void {
@@ -29,8 +33,8 @@ public function __invoke(ChunkyUploadRequest $request, BackupRepository $repo, B
         });
     }
 
-    public function test(Request $request): JsonResponse
+    public function test(Request $request, Chunky $chunky): JsonResponse
     {
-        return Chunky::exists(ChunkyTestDto::fromRequest($request));
+        return $chunky->exists(ChunkyTestDto::fromRequest($request));
     }
 }

src/Support/Facades/Chunky.php

@@ -2,14 +2,12 @@
 
 declare(strict_types=1);
 
-use Illuminate\Http\File as HttpFile;
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use Itiden\Backup\Contracts\Repositories\BackupRepository;
-use Itiden\Backup\DataTransferObjects\ChunkyUploadDto;
 use Itiden\Backup\Facades\Backuper;
-use Itiden\Backup\Support\Facades\Chunky;
+use Itiden\Backup\Support\Chunky;
 
 use function Illuminate\Filesystem\join_paths;
 use function Itiden\Backup\Tests\chunk_file;
@@ -63,7 +61,7 @@
         $res->assertSuccessful();
         expect(app(BackupRepository::class)->all())->toHaveCount(2);
 
-        File::cleanDirectory(Chunky::path());
+        File::cleanDirectory(app(Chunky::class)->path());
         File::cleanDirectory(config('backup.temp_path'));
         app(BackupRepository::class)->empty();
     });
@@ -109,8 +107,27 @@
             $res->assertStatus(200);
         });
 
-        File::cleanDirectory(Chunky::path());
+        File::cleanDirectory(app(Chunky::class)->path());
         File::cleanDirectory(config('backup.temp_path'));
         app(BackupRepository::class)->empty();
     });
+
+    it('returns correct response when chunk doesnt exist', function () {
+        File::cleanDirectory(config('backup.temp_path'));
+        Storage::disk(config('backup.destination.disk'))->deleteDirectory(config('backup.destination.path'));
+
+        $user = user();
+        $user->makeSuper();
+        $user->save();
+
+        actingAs($user);
+
+        $res = getJson(cp_route('itiden.backup.chunky.test', [
+            'resumableIdentifier' => 'test-chunk-identifier',
+            'resumableFilename' => 'test-file.txt',
+            'resumableChunkNumber' => 1,
+        ]));
+
+        $res->assertStatus(404);
+    });
 });

tests/Feature/UploadControllerTest.php

@@ -6,7 +6,7 @@
 use Illuminate\Http\UploadedFile;
 use Illuminate\Support\Facades\File;
 use Itiden\Backup\DataTransferObjects\ChunkyUploadDto;
-use Itiden\Backup\Support\Facades\Chunky;
+use Itiden\Backup\Support\Chunky;
 
 use function Itiden\Backup\Tests\chunk_file;
 
@@ -16,11 +16,11 @@
 
         $dto = new ChunkyUploadDto('name', 1, 1, 1000, $file->hashName(), $file);
 
-        $res = Chunky::put($dto);
+        $res = app(Chunky::class)->put($dto);
 
         expect($res->getStatusCode())->toBe(201);
         expect($res->getData(true))->toHaveAttribute('message');
-        expect(Chunky::path() . '/' . $file->hashName() . '/' . $dto->filename . '.part1')->toBeFile();
+        expect(app(Chunky::class)->path() . '/' . $file->hashName() . '/' . $dto->filename . '.part1')->toBeFile();
     });
 
     it('can assemble file', function (): void {
@@ -46,7 +46,7 @@
         $uploadedFile = null;
 
         $responses = $dtos->map(function (ChunkyUploadDto $r) use (&$uploadedFile): JsonResponse {
-            return Chunky::put($r, onCompleted: function (string $file) use (&$uploadedFile): void {
+            return app(Chunky::class)->put($r, onCompleted: function (string $file) use (&$uploadedFile): void {
                 $uploadedFile = $file;
             });
         });
@@ -56,15 +56,15 @@
             ->last()
             ->getData(true))->toHaveKey('file');
 
-        expect(Chunky::path('assembled/homepage.md'))->toBeFile();
+        expect(app(Chunky::class)->path('assembled/homepage.md'))->toBeFile();
 
-        expect(File::get(Chunky::path('/assembled/homepage.md')))->toBe(File::get(
+        expect(File::get(app(Chunky::class)->path('/assembled/homepage.md')))->toBe(File::get(
             __DIR__ . '/../__fixtures__/content/collections/pages/homepage.md',
         ));
 
-        expect($uploadedFile)->toEqual(Chunky::path('/assembled/homepage.md'));
+        expect($uploadedFile)->toEqual(app(Chunky::class)->path('/assembled/homepage.md'));
 
-        File::deleteDirectory(Chunky::path());
+        File::deleteDirectory(app(Chunky::class)->path());
         File::deleteDirectory(config('backup.temp_path') . '/chunks');
     });
 })->group('chunky');