From aca289b5a6708d6c0438a80ed6da1523c402c022 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C4=8Carodej?= <peterpapp@makingcg.com>
Date: Tue, 3 May 2022 07:55:48 +0200
Subject: [PATCH] remote upload api update

---
 .../RemoteUploadFileController.php            | 31 +++++++++++++------
 .../Requests/RemoteUploadRequest.php          |  2 +-
 src/Support/helpers.php                       | 10 ++++++
 3 files changed, 32 insertions(+), 11 deletions(-)

diff --git a/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
index 080548eb..678ae13a 100644
--- a/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
+++ b/src/Domain/RemoteUpload/Controllers/RemoteUploadFileController.php
@@ -1,7 +1,7 @@
 <?php
 namespace Domain\RemoteUpload\Controllers;
 
-use Illuminate\Http\Response;
+use Illuminate\Http\JsonResponse;
 use Domain\Sharing\Models\Share;
 use Domain\Folders\Models\Folder;
 use App\Http\Controllers\Controller;
@@ -15,10 +15,15 @@ class RemoteUploadFileController extends Controller
     ) {
     }
 
-    public function __invoke(RemoteUploadRequest $request, ?Share $shared = null): Response|array
+    public function __invoke(RemoteUploadRequest $request, ?Share $shared = null): JsonResponse
     {
+        $successMessage = [
+            'type'    => 'success',
+            'message' => 'Files was successfully uploaded.',
+        ];
+
         if (is_demo_account()) {
-            return response('Files were successfully added to the upload queue', 201);
+            return response()->json($successMessage);
         }
 
         // Get user
@@ -28,15 +33,21 @@ class RemoteUploadFileController extends Controller
                 ->user
             : auth()->user();
 
-        // Get content from external sources
-        if (isBroadcasting()) {
-            ($this->getContentFromExternalSource)
-                ->onQueue()
-                ->execute($request->all(), $user);
-        } else {
+        // If it isn't broadcasting, download files immediately in the request
+        if (isNotBroadcasting()) {
             ($this->getContentFromExternalSource)($request->all(), $user);
+
+            return response()->json($successMessage);
         }
 
-        return response('Files were successfully added to the upload queue', 201);
+        // Add links to the upload queue
+        ($this->getContentFromExternalSource)
+            ->onQueue()
+            ->execute($request->all(), $user);
+
+        return response()->json([
+            'type'    => 'success',
+            'message' => 'Files were successfully added to the upload queue.',
+        ]);
     }
 }
diff --git a/src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php b/src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php
index bbb2da52..5ff7fe91 100644
--- a/src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php
+++ b/src/Domain/RemoteUpload/Requests/RemoteUploadRequest.php
@@ -23,8 +23,8 @@ class RemoteUploadRequest extends FormRequest
     public function rules()
     {
         return [
-            'urls.*'       => 'required|url',
             'parent_id'    => 'nullable|uuid',
+            'urls.*'       => 'required|url',
         ];
     }
 }
diff --git a/src/Support/helpers.php b/src/Support/helpers.php
index 2acc02dc..4b556380 100644
--- a/src/Support/helpers.php
+++ b/src/Support/helpers.php
@@ -48,6 +48,16 @@ if (! function_exists('isBroadcasting')) {
     }
 }
 
+if (! function_exists('isNotBroadcasting')) {
+    /**
+     * Check if cron is running
+     */
+    function isNotBroadcasting(): bool
+    {
+        return config('broadcasting.default') === null;
+    }
+}
+
 if (! function_exists('isRunningCron')) {
     /**
      * Check if cron is running