api refactoring part 2

src/Domain/Homepage/Controllers/IndexController.php

@@ -1,14 +1,15 @@
 <?php
 namespace Domain\Homepage\Controllers;
 
-use Domain\Settings\Actions\GetConfigAction;
 use Illuminate\Contracts\View\View;
+use Domain\Settings\Actions\GetConfigAction;
 
 class IndexController
 {
     public function __construct(
         public GetConfigAction $getConfig,
-    ) {}
+    ) {
+    }
 
     /**
      * Show index page

src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php

@@ -1,16 +1,17 @@
 <?php
 namespace Domain\RemoteUpload\Controllers;
 
-use DB;
 use Domain\Folders\Models\Folder;
 use Domain\UploadRequest\Models\UploadRequest;
 use Domain\RemoteUpload\Requests\RemoteUploadRequest;
 use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
+use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
 
 class UploadFilesRemotelyForUploadRequestController
 {
     public function __construct(
-        private GetContentFromExternalSource $getContentFromExternalSource,
+        public GetContentFromExternalSource $getContentFromExternalSource,
+        public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
     ) {
     }
 
@@ -26,7 +27,7 @@ class UploadFilesRemotelyForUploadRequestController
 
         // Create folder if not exist
         if ($folder->doesntExist()) {
-            $this->createFolder($uploadRequest);
+            ($this->createUploadRequestRootFolder)($uploadRequest);
         }
 
         // Set default parent_id for uploaded file
@@ -54,28 +55,4 @@ class UploadFilesRemotelyForUploadRequestController
             'message' => 'Files were successfully added to the upload queue.',
         ], 201);
     }
-
-    /**
-     * Create root Upload Request folder
-     */
-    private function createFolder(UploadRequest $uploadRequest): void
-    {
-        // Format timestamp
-        $timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
-
-        // Create folder
-        DB::table('folders')->insert([
-            'id'         => $uploadRequest->id,
-            'parent_id'  => $uploadRequest->folder_id ?? null,
-            'user_id'    => $uploadRequest->user_id,
-            'name'       => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        // Update upload request status
-        $uploadRequest->update([
-            'status' => 'filling',
-        ]);
-    }
 }

src/Domain/Settings/Actions/GetConfigAction.php

@@ -1,21 +1,21 @@
 <?php
-
 namespace Domain\Settings\Actions;
 
 use DB;
-use Domain\Pages\Models\Page;
-use Domain\Settings\Controllers\GetServerStatusController;
-use Monolog\Handler\MissingExtensionException;
 use PDOException;
+use Domain\Pages\Models\Page;
+use Monolog\Handler\MissingExtensionException;
 use VueFileManager\Subscription\Domain\Plans\Models\Plan;
-use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
+use Domain\Settings\Controllers\GetServerStatusController;
 use VueFileManager\Subscription\Domain\Transactions\Models\Transaction;
+use VueFileManager\Subscription\Domain\Subscriptions\Models\Subscription;
 
 class GetConfigAction
 {
     public function __construct(
         public GetServerStatusController $getServerSetupStatus,
-    ) {}
+    ) {
+    }
 
     public function __invoke(): array
     {
@@ -80,7 +80,6 @@ class GetConfigAction
             $uploadLimitFormatted = isset($settings->upload_limit)
                 ? toMegabytes($settings->upload_limit)
                 : null;
-
         } catch (MissingExtensionException $e) {
             $storageDefaultSpaceFormatted = '5GB';
             $uploadLimit = 'undefined';
@@ -190,4 +189,4 @@ class GetConfigAction
             'legal'                        => $pages ? json_encode($pages) : 'undefined',
         ];
     }
-}
+}

src/Domain/Settings/Controllers/GetConfigController.php

@@ -1,20 +1,19 @@
 <?php
-
 namespace Domain\Settings\Controllers;
 
-use Domain\Settings\Actions\GetConfigAction;
-use App\Http\Controllers\Controller;
 use Illuminate\Http\JsonResponse;
-
+use App\Http\Controllers\Controller;
+use Domain\Settings\Actions\GetConfigAction;
 
 class GetConfigController extends Controller
 {
     public function __construct(
         public GetConfigAction $getConfigAction,
-    ) {}
+    ) {
+    }
 
     public function __invoke(): JsonResponse
     {
         return response()->json(($this->getConfigAction)());
     }
-}
+}

src/Domain/UploadRequest/Actions/CreateUploadRequestRootFolderAction.php

@@ -0,0 +1,32 @@
+<?php
+namespace Domain\UploadRequest\Actions;
+
+use DB;
+use Domain\UploadRequest\Models\UploadRequest;
+
+class CreateUploadRequestRootFolderAction
+{
+    /**
+     * Create root Upload Request folder
+     */
+    public function __invoke(UploadRequest $uploadRequest): void
+    {
+        // Format timestamp
+        $timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
+
+        // Create folder
+        DB::table('folders')->insert([
+            'id'         => $uploadRequest->id,
+            'parent_id'  => $uploadRequest->folder_id ?? null,
+            'user_id'    => $uploadRequest->user_id,
+            'name'       => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
+            'created_at' => now(),
+            'updated_at' => now(),
+        ]);
+
+        // Update upload request status
+        $uploadRequest->update([
+            'status' => 'filling',
+        ]);
+    }
+}

src/Domain/UploadRequest/Controllers/CreateFolderController.php

@@ -2,6 +2,7 @@
 namespace Domain\UploadRequest\Controllers;
 
 use Domain\Folders\Models\Folder;
+use Illuminate\Http\JsonResponse;
 use Domain\Folders\Resources\FolderResource;
 use Domain\Folders\Actions\CreateFolderAction;
 use Domain\UploadRequest\Models\UploadRequest;
@@ -16,16 +17,21 @@ class CreateFolderController
     ) {
     }
 
-    public function __invoke(CreateFolderRequest $request, UploadRequest $uploadRequest)
-    {
+    public function __invoke(
+        CreateFolderRequest $request,
+        UploadRequest $uploadRequest,
+    ): JsonResponse {
         // Check privileges
-        if (! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
-            return response('Access Denied', 403);
+        if ($request->has('parent_id') && ! in_array($request->input('parent_id'), getChildrenFolderIds($uploadRequest->id))) {
+            return response()->json([
+                'type'    => 'error',
+                'message' => "You don't have privileges to create folder here",
+            ], 403);
         }
 
         // Create new folder
         $folder = Folder::create([
-            'parent_id'   => $request->input('parent_id'),
+            'parent_id'   => $request->input('parent_id') ?? $uploadRequest->id,
             'name'        => $request->input('name'),
             'color'       => $request->input('color') ?? null,
             'emoji'       => $request->input('emoji') ?? null,
@@ -35,6 +41,6 @@ class CreateFolderController
         ]);
 
         // Return new folder
-        return response(new FolderResource($folder), 201);
+        return response()->json(new FolderResource($folder), 201);
     }
 }

src/Domain/UploadRequest/Controllers/DeleteFileOrFolderController.php

@@ -4,14 +4,22 @@ namespace Domain\UploadRequest\Controllers;
 use Illuminate\Support\Arr;
 use Domain\Files\Models\File;
 use Domain\Folders\Models\Folder;
+use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Storage;
 use Domain\Items\Requests\DeleteItemRequest;
 use Domain\UploadRequest\Models\UploadRequest;
 
 class DeleteFileOrFolderController
 {
-    public function __invoke(DeleteItemRequest $request, UploadRequest $uploadRequest)
-    {
+    public function __invoke(
+        DeleteItemRequest $request,
+        UploadRequest $uploadRequest
+    ): JsonResponse {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'Items was successfully deleted.',
+        ];
+
         foreach ($request->input('items') as $file) {
             // Get file or folder item
             $item = get_item($file['type'], $file['id']);
@@ -27,7 +35,7 @@ class DeleteFileOrFolderController
             }
         }
 
-        return response('Done', 204);
+        return response()->json($successMessage);
     }
 
     private function destroyFile(File $file): void

src/Domain/UploadRequest/Controllers/MoveItemInUploadRequestController.php

@@ -4,24 +4,28 @@ namespace Domain\UploadRequest\Controllers;
 use App\Http\Controllers\Controller;
 use Domain\Items\Requests\MoveItemRequest;
 use Domain\UploadRequest\Models\UploadRequest;
+use Symfony\Component\HttpFoundation\JsonResponse;
 
 class MoveItemInUploadRequestController extends Controller
 {
     public function __invoke(
         MoveItemRequest $request,
         UploadRequest $uploadRequest,
-    ) {
+    ): JsonResponse {
         foreach ($request->input('items') as $item) {
             $item = get_item($item['type'], $item['id']);
 
             // Check privileges
             if (! in_array($item['parent_id'], getChildrenFolderIds($uploadRequest->id))) {
-                return response('Access Denied', 403);
+                return response()->json(accessDeniedError(), 403);
             }
 
             $item->update(['parent_id' => $request->input('to_id') ?? $uploadRequest->id]);
         }
 
-        return response('Done.', 204);
+        return response()->json([
+            'type'    => 'success',
+            'message' => 'Items was successfully moved.',
+        ]);
     }
 }

src/Domain/UploadRequest/Controllers/SetUploadRequestAsFilledController.php

@@ -1,16 +1,13 @@
 <?php
 namespace Domain\UploadRequest\Controllers;
 
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Domain\UploadRequest\Models\UploadRequest;
-use Illuminate\Contracts\Foundation\Application;
-use Illuminate\Contracts\Routing\ResponseFactory;
-use Domain\UploadRequest\Resources\UploadRequestResource;
 use Domain\UploadRequest\Notifications\UploadRequestFulfilledNotification;
 
 class SetUploadRequestAsFilledController
 {
-    public function __invoke(UploadRequest $uploadRequest): Response|Application|ResponseFactory
+    public function __invoke(UploadRequest $uploadRequest): JsonResponse
     {
         $uploadRequest->update([
             'status' => 'filled',
@@ -21,6 +18,9 @@ class SetUploadRequestAsFilledController
             $uploadRequest->user->notify(new UploadRequestFulfilledNotification($uploadRequest));
         }
 
-        return response(new UploadRequestResource($uploadRequest), 201);
+        return response()->json([
+            'type'    => 'success',
+            'message' => 'File request was successfully set as filled',
+        ]);
     }
 }

src/Domain/UploadRequest/Controllers/UploadFileChunksForUploadRequestController.php

@@ -1,7 +1,6 @@
 <?php
 namespace Domain\UploadRequest\Controllers;
 
-use DB;
 use Storage;
 use Illuminate\Support\Str;
 use Domain\Folders\Models\Folder;
@@ -11,12 +10,14 @@ use Domain\Files\Requests\UploadChunkRequest;
 use Domain\UploadRequest\Models\UploadRequest;
 use Domain\Files\Actions\StoreFileChunksAction;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
 
 class UploadFileChunksForUploadRequestController
 {
     public function __construct(
-        private ProcessFileAction $processFie,
-        private StoreFileChunksAction $storeFileChunks,
+        public ProcessFileAction $processFie,
+        public StoreFileChunksAction $storeFileChunks,
+        public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
     ) {
     }
 
@@ -30,7 +31,7 @@ class UploadFileChunksForUploadRequestController
 
         // Create folder if not exist
         if ($folder->doesntExist()) {
-            $this->createFolder($uploadRequest);
+            ($this->createUploadRequestRootFolder)($uploadRequest);
         }
 
         // Set default parent_id for uploaded file
@@ -61,28 +62,4 @@ class UploadFileChunksForUploadRequestController
             return response(new FileResource($file), 201);
         }
     }
-
-    /**
-     * Create root Upload Request folder
-     */
-    private function createFolder(UploadRequest $uploadRequest): void
-    {
-        // Format timestamp
-        $timestamp = format_date($uploadRequest->created_at, 'd. M. Y');
-
-        // Create folder
-        DB::table('folders')->insert([
-            'id'         => $uploadRequest->id,
-            'parent_id'  => $uploadRequest->folder_id ?? null,
-            'user_id'    => $uploadRequest->user_id,
-            'name'       => $uploadRequest->name ?? __t('upload_request_default_folder', ['timestamp' => $timestamp]),
-            'created_at' => now(),
-            'updated_at' => now(),
-        ]);
-
-        // Update upload request status
-        $uploadRequest->update([
-            'status' => 'filling',
-        ]);
-    }
 }

src/Domain/UploadRequest/Controllers/UploadFileForUploadRequestController.php

@@ -0,0 +1,56 @@
+<?php
+namespace Domain\UploadRequest\Controllers;
+
+use Storage;
+use Illuminate\Support\Str;
+use Domain\Folders\Models\Folder;
+use Illuminate\Http\JsonResponse;
+use Domain\Files\Resources\FileResource;
+use Domain\Files\Actions\ProcessFileAction;
+use Domain\Files\Requests\UploadFileRequest;
+use Domain\UploadRequest\Models\UploadRequest;
+use Domain\UploadRequest\Actions\CreateUploadRequestRootFolderAction;
+
+class UploadFileForUploadRequestController
+{
+    public function __construct(
+        public ProcessFileAction $processFie,
+        public CreateUploadRequestRootFolderAction $createUploadRequestRootFolder,
+    ) {
+    }
+
+    public function __invoke(
+        UploadFileRequest $request,
+        UploadRequest $uploadRequest
+    ): JsonResponse {
+        // Get upload request root folder query
+        $folder = Folder::where('id', $uploadRequest->id);
+
+        // Create folder if it doesn't exist
+        if ($folder->doesntExist()) {
+            ($this->createUploadRequestRootFolder)($uploadRequest);
+        }
+
+        // Set default parent_id for uploaded file
+        if (is_null($request->input('parent_id'))) {
+            $request->merge(['parent_id' => $uploadRequest->id]);
+        }
+
+        // Get file name
+        $name = Str::uuid() . '.' . $request->input('extension');
+
+        // Move file to user directory
+        Storage::disk('local')->put("files/{$uploadRequest->user->id}/$name", $request->file('file')->get());
+
+        // Process file
+        $file = ($this->processFie)($request, $uploadRequest->user, $name);
+
+        // Set public access url
+        $file->setUploadRequestPublicUrl($uploadRequest->id);
+
+        // Set timestamp for auto filling
+        cache()->set("auto-filling.$uploadRequest->id", now()->toString());
+
+        return response()->json(new FileResource($file), 201);
+    }
+}

src/Domain/UploadRequest/Middleware/ProtectUploadRequestRoutes.php

@@ -16,7 +16,10 @@ class ProtectUploadRequestRoutes
 
         // Check if upload request is active
         if (! in_array($uploadRequest->status, ['active', 'filling'])) {
-            return response('Gone', 410);
+            return response()->json([
+                'type'    => 'gone',
+                'message' => 'The file request is not active anymore',
+            ], 410);
         }
 
         return $next($request);