remote upload refactoring

src/App/Console/Commands/SetupWebsocketEnvironment.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace App\Console\Commands;
 
 use Illuminate\Console\Command;

src/App/Console/Kernel.php

@@ -1,13 +1,13 @@
 <?php
 namespace App\Console;
 
-use App\Console\Commands\SetupWebsocketEnvironment;
 use Illuminate\Console\Scheduling\Schedule;
 use App\Console\Commands\SetupDevEnvironment;
 use App\Console\Commands\SetupProdEnvironment;
 use Support\Scheduler\Actions\ReportUsageAction;
 use Support\Upgrading\Actions\UpdateSystemAction;
 use Support\Demo\Actions\ClearHowdyDemoDataAction;
+use App\Console\Commands\SetupWebsocketEnvironment;
 use Support\Scheduler\Actions\DeleteFailedFilesAction;
 use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
 use Support\Scheduler\Actions\DeleteUnverifiedUsersAction;

src/Domain/RemoteUpload/Actions/GetContentFromExternalSource.php

@@ -1,9 +1,6 @@
 <?php
+namespace Domain\RemoteUpload\Actions;
 
-namespace Domain\Files\Actions;
-
-use Domain\Files\Events\NewFileWasStoredEvent;
-use Domain\Files\Resources\FileResource;
 use Log;
 use Error;
 use ErrorException;
@@ -12,23 +9,31 @@ use Illuminate\Support\Str;
 use Domain\Files\Models\File;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
+use Domain\Files\Resources\FileResource;
+use Domain\Files\Actions\ProcessFileAction;
 use Spatie\QueueableAction\QueueableAction;
+use Domain\Files\Actions\MoveFileToFTPStorageAction;
+use Domain\Files\Actions\ProcessImageThumbnailAction;
+use Domain\Files\Actions\StoreFileExifMetadataAction;
+use Domain\RemoteUpload\Events\RemoteFileCreatedEvent;
+use Domain\Files\Actions\MoveFileToExternalStorageAction;
 
 class GetContentFromExternalSource
 {
     use QueueableAction;
 
     public function __construct(
-        public ProcessFileAction               $processFile,
-        public StoreFileExifMetadataAction     $storeExifMetadata,
-        public MoveFileToFTPStorageAction      $moveFileToFTPStorage,
-        public ProcessImageThumbnailAction     $createImageThumbnail,
+        public ProcessFileAction $processFile,
+        public StoreFileExifMetadataAction $storeExifMetadata,
+        public MoveFileToFTPStorageAction $moveFileToFTPStorage,
+        public ProcessImageThumbnailAction $createImageThumbnail,
         public MoveFileToExternalStorageAction $moveFileToExternalStorage,
-    ) {}
+    ) {
+    }
 
     public function __invoke(
         array $payload,
-        User  $user,
+        User $user,
     ) {
         $total = count($payload['urls']);
         $processed = 0;
@@ -91,7 +96,7 @@ class GetContentFromExternalSource
                 $processed++;
 
                 // Broadcast new file into the frontend
-                NewFileWasStoredEvent::dispatch([
+                RemoteFileCreatedEvent::dispatch([
                     'progress' => [
                         'total'     => $total,
                         'processed' => $processed,
@@ -105,7 +110,7 @@ class GetContentFromExternalSource
                 $failed++;
 
                 // Broadcast new file into the frontend
-                NewFileWasStoredEvent::dispatch([
+                RemoteFileCreatedEvent::dispatch([
                     'progress' => [
                         'total'     => $total,
                         'processed' => $processed,

src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php

@@ -1,12 +1,12 @@
 <?php
-namespace Domain\Files\Controllers;
+namespace Domain\RemoteUpload\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
 use Domain\Files\Requests\RemoteUploadRequest;
-use Domain\Files\Actions\GetContentFromExternalSource;
+use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
 
 class RemoteUploadFileController extends Controller
 {

src/Domain/RemoteUpload/Controllers/UploadFilesRemotelyForUploadRequestController.php

@@ -1,12 +1,12 @@
 <?php
-namespace Domain\UploadRequest\Controllers;
+namespace Domain\RemoteUpload\Controllers;
 
 use DB;
 use Domain\Folders\Models\Folder;
 use Domain\Files\Requests\RemoteUploadRequest;
 use Domain\UploadRequest\Models\UploadRequest;
-use Domain\Files\Actions\GetContentFromExternalSource;
 use Illuminate\Contracts\Filesystem\FileNotFoundException;
+use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
 
 class UploadFilesRemotelyForUploadRequestController
 {

src/Domain/RemoteUpload/Controllers/VisitorRemoteUploadFileController.php

@@ -1,5 +1,5 @@
 <?php
-namespace Domain\Files\Controllers;
+namespace Domain\RemoteUpload\Controllers;
 
 use Illuminate\Http\Response;
 use Domain\Sharing\Models\Share;
@@ -7,7 +7,7 @@ use App\Http\Controllers\Controller;
 use Domain\Files\Requests\RemoteUploadRequest;
 use Domain\Sharing\Actions\ProtectShareRecordAction;
 use Domain\Sharing\Actions\VerifyAccessToItemAction;
-use Domain\Files\Actions\GetContentFromExternalSource;
+use Domain\RemoteUpload\Actions\GetContentFromExternalSource;
 
 class VisitorRemoteUploadFileController extends Controller
 {

src/Domain/RemoteUpload/Events/RemoteFileCreatedEvent.php

@@ -1,15 +1,13 @@
 <?php
+namespace Domain\RemoteUpload\Events;
 
-namespace Domain\Files\Events;
-
-use Domain\Files\Resources\FileResource;
-use Illuminate\Broadcasting\InteractsWithSockets;
-use Illuminate\Broadcasting\PrivateChannel;
-use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
-use Illuminate\Foundation\Events\Dispatchable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Broadcasting\PrivateChannel;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcastNow;
 
-class NewFileWasStoredEvent implements ShouldBroadcastNow
+class RemoteFileCreatedEvent implements ShouldBroadcastNow
 {
     use Dispatchable, InteractsWithSockets, SerializesModels;
 
@@ -20,14 +18,15 @@ class NewFileWasStoredEvent implements ShouldBroadcastNow
      */
     public function __construct(
         public array $payload,
-    ) {}
+    ) {
+    }
 
     /**
      * The event's broadcast name.
      */
     public function broadcastAs(): string
     {
-        return 'file.created';
+        return 'RemoteFile.Created';
     }
 
     /**

src/Domain/Settings/Actions/TestS3ConnectionAction.php

@@ -1,5 +1,4 @@
 <?php
-
 namespace Domain\Settings\Actions;
 
 use Storage;