controller refactoring part 17

src/Domain/Files/Actions/UploadFileAction.php

@@ -1,7 +1,6 @@
 <?php
 namespace Domain\Files\Actions;
 
-use App\Users\Models\User;
 use Domain\Sharing\Models\Share;
 use Support\Services\HelperService;
 use Illuminate\Support\Facades\Auth;
@@ -9,11 +8,13 @@ use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Storage;
 use Domain\Files\Requests\UploadRequest;
 use Domain\Files\Models\File as UserFile;
+use Domain\Traffic\Actions\RecordUploadAction;
 
-class UploadFilesAction
+class UploadFileAction
 {
     public function __construct(
         public HelperService $helper,
+        public RecordUploadAction $recordUpload,
     ) {
     }
 
@@ -77,8 +78,7 @@ class UploadFilesAction
             }
 
             // Store user upload size
-            User::find($user_id)
-                ->recordUpload($file_size);
+            ($this->recordUpload)($file_size, $user_id);
 
             // Return new file
             return UserFile::create([

src/Domain/Files/Controllers/EditorUploadFilesController.php

@@ -7,7 +7,7 @@ use Support\Services\HelperService;
 use App\Http\Controllers\Controller;
 use Support\Demo\Actions\DemoService;
 use Domain\Files\Requests\UploadRequest;
-use Domain\Files\Actions\UploadFilesAction;
+use Domain\Files\Actions\UploadFileAction;
 
 /**
  * guest user upload file into shared folder
@@ -21,7 +21,7 @@ class EditorUploadFilesController extends Controller
     }
 
     public function __invoke(
-        UploadFilesAction $uploadFile,
+        UploadFileAction $uploadFile,
         UploadRequest $request,
         Share $shared,
     ): Response | array {

src/Domain/Files/Controllers/FileAccessController.php

@@ -8,11 +8,13 @@ use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Storage;
 use Domain\Files\Models\File as UserFile;
+use Domain\Traffic\Actions\RecordDownloadAction;
 
 class FileAccessController extends Controller
 {
     public function __construct(
         public HelperService $helper,
+        public RecordDownloadAction $recordDownload,
     ) {
     }
 
@@ -79,8 +81,9 @@ class FileAccessController extends Controller
         }*/
 
         // Store user download size
-        $request->user()->recordDownload(
-            (int) $file->getRawOriginal('filesize')
+        ($this->recordDownload)(
+            (int) $file->getRawOriginal('filesize'),
+            Auth::id()
         );
 
         return $this->helper->download_file($file, Auth::id());
@@ -100,11 +103,11 @@ class FileAccessController extends Controller
             ->where('user_id', Auth::id())
             ->firstOrFail();
 
-        $zip
-            ->user
-            ->recordDownload(
-                $disk->size("zip/$zip->basename")
-            );
+        // Store user download size
+        ($this->recordDownload)(
+            $disk->size("zip/$zip->basename"),
+            $zip->user_id
+        );
 
         return $disk->download("zip/$zip->basename", $zip->basename, [
             'Content-Type'        => 'application/zip',

src/Domain/Files/Controllers/UploadFilesController.php

@@ -4,7 +4,7 @@ namespace Domain\Files\Controllers;
 use Domain\Files\Models\File;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\UploadRequest;
-use Domain\Files\Actions\UploadFilesAction;
+use Domain\Files\Actions\UploadFileAction;
 
 class UploadFilesController extends Controller
 {
@@ -13,7 +13,7 @@ class UploadFilesController extends Controller
      */
     public function __invoke(
         UploadRequest $request,
-        UploadFilesAction $uploadFiles,
+        UploadFileAction $uploadFiles,
     ): File {
         if (is_demo_account('howdy@hi5ve.digital')) {
             return $this->demo->upload($request);