visitor zipping

src/Domain/Zip/Controllers/VisitorZipController.php

@@ -0,0 +1,68 @@
+<?php
+
+
+namespace Domain\Zip\Controllers;
+
+
+use App\Http\Controllers\Controller;
+use Domain\Files\Models\File;
+use Domain\Sharing\Actions\ProtectShareRecordAction;
+use Domain\Sharing\Actions\VerifyAccessToItemAction;
+use Domain\Sharing\Models\Share;
+use Domain\Traffic\Actions\RecordDownloadAction;
+use Domain\Zip\Actions\GetItemsListFromUrlParamAction;
+use Domain\Zip\Actions\ZipAction;
+use Illuminate\Http\Request;
+use ZipStream\ZipStream;
+
+class VisitorZipController extends Controller
+{
+    public function __construct(
+        public GetItemsListFromUrlParamAction $getItemsListFromUrlParam,
+        public ProtectShareRecordAction $protectShareRecord,
+        public VerifyAccessToItemAction $verifyAccessToItem,
+        public RecordDownloadAction $recordDownload,
+        public ZipAction $zip,
+    ) {}
+
+    public function __invoke(
+        Request $request,
+        Share $shared,
+    ): ZipStream {
+
+        // Check ability to access protected share record
+        ($this->protectShareRecord)($shared);
+
+        list($folders, $files) = ($this->getItemsListFromUrlParam)($shared->user_id);
+
+        // Check access to requested folders
+        if ($folders->isNotEmpty()) {
+            $folders->each(
+                fn ($folder) => ($this->verifyAccessToItem)($folder->id, $shared)
+            );
+        }
+
+        // Check access to requested files
+        if ($files->isNotEmpty()) {
+
+            $file_parent_folders = File::whereUserId($shared->user_id)
+                ->whereIn('id', $files->pluck('id'))
+                ->get()
+                ->pluck('folder_id')
+                ->toArray();
+
+            // Check access to requested directory
+            ($this->verifyAccessToItem)($file_parent_folders, $shared);
+        }
+
+        // Zip items
+        $zip = ($this->zip)($folders, $files, $shared);
+
+        ($this->recordDownload)(
+            file_size: $zip->predictZipSize(),
+            user_id: $shared->user_id,
+        );
+
+        return $zip;
+    }
+}

src/Domain/Zip/Controllers/VisitorZipFilesController.php

@@ -1,58 +0,0 @@
-<?php
-namespace Domain\Zip\Controllers;
-
-use Illuminate\Http\Request;
-use Domain\Files\Models\File;
-use Domain\Sharing\Models\Share;
-use App\Http\Controllers\Controller;
-use Domain\Zip\Actions\ZipFilesAction;
-use Domain\Traffic\Actions\RecordDownloadAction;
-use Domain\Sharing\Actions\ProtectShareRecordAction;
-use Domain\Sharing\Actions\VerifyAccessToItemAction;
-use STS\ZipStream\ZipStream;
-
-/**
- * Guest download multiple files via zip
- */
-class VisitorZipFilesController extends Controller
-{
-    public function __construct(
-        private ProtectShareRecordAction $protectShareRecord,
-        private VerifyAccessToItemAction $verifyAccessToItem,
-        private RecordDownloadAction $recordDownload,
-        private ZipFilesAction $zipFiles,
-    ) {
-    }
-
-    public function __invoke(
-        Request $request,
-        Share $shared,
-    ): ZipStream {
-        // Check ability to access protected share record
-        ($this->protectShareRecord)($shared);
-
-        $file_parent_folders = File::whereUserId($shared->user_id)
-            ->whereIn('id', $request->items)
-            ->get()
-            ->pluck('folder_id')
-            ->toArray();
-
-        // Check access to requested directory
-        ($this->verifyAccessToItem)($file_parent_folders, $shared);
-
-        // Get requested files
-        $files = File::whereUserId($shared->user_id)
-            ->whereIn('id', $request->items)
-            ->get();
-
-        // Create zip
-        $zip = ($this->zipFiles)($files, $shared);
-
-        ($this->recordDownload)(
-            file_size: $zip->predictZipSize(),
-            user_id: $shared->user_id,
-        );
-
-        return $zip;
-    }
-}

src/Domain/Zip/Controllers/VisitorZipFolderController.php

@@ -1,54 +0,0 @@
-<?php
-namespace Domain\Zip\Controllers;
-
-use STS\ZipStream\ZipStream;
-use Domain\Sharing\Models\Share;
-use Domain\Folders\Models\Folder;
-use App\Http\Controllers\Controller;
-use Domain\Zip\Actions\ZipFolderAction;
-use Domain\Traffic\Actions\RecordDownloadAction;
-use Domain\Sharing\Actions\ProtectShareRecordAction;
-use Domain\Sharing\Actions\VerifyAccessToItemAction;
-
-/**
- * Guest download folder via zip
- */
-class VisitorZipFolderController extends Controller
-{
-    public function __construct(
-        private ProtectShareRecordAction $protectShareRecord,
-        private VerifyAccessToItemAction $verifyAccessToItem,
-        private RecordDownloadAction $recordDownload,
-        private ZipFolderAction $zipFolder,
-    ) {
-    }
-
-    public function __invoke(
-        string $id,
-        Share $shared,
-    ): ZipStream {
-        // Check ability to access protected share record
-        ($this->protectShareRecord)($shared);
-
-        // Check access to requested folder
-        ($this->verifyAccessToItem)($id, $shared);
-
-        // Get folder
-        $folder = Folder::whereUserId($shared->user_id)
-            ->where('id', $id);
-
-        if (! $folder->exists()) {
-            abort(404, "Requested folder doesn't exists.");
-        }
-
-        // Create zip
-        $zip = ($this->zipFolder)($id, $shared);
-
-        ($this->recordDownload)(
-            file_size: $zip->predictZipSize(),
-            user_id: $shared->user_id,
-        );
-
-        return $zip;
-    }
-}

src/Domain/Zip/Controllers/ZipController.php

@@ -5,9 +5,8 @@ namespace Domain\Zip\Controllers;
 
 
 use App\Http\Controllers\Controller;
-use Domain\Files\Models\File;
-use Domain\Folders\Models\Folder;
 use Domain\Traffic\Actions\RecordDownloadAction;
+use Domain\Zip\Actions\GetItemsListFromUrlParamAction;
 use Domain\Zip\Actions\ZipAction;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -18,40 +17,15 @@ class ZipController extends Controller
     public function __construct(
         public ZipAction $zip,
         public RecordDownloadAction $recordDownload,
+        public GetItemsListFromUrlParamAction $getItemsListFromUrlParam,
     ) {}
 
     public function __invoke(
         Request $request,
     ): ZipStream {
-
         $user_id = Auth::id();
-        $items = explode(',', $request->get('items'));
 
-        $itemList = collect($items)
-            ->map(function ($chunk) {
-                $items = explode('|', $chunk);
-
-                return [
-                    'id'   => $items[0],
-                    'type' => $items[1],
-                ];
-            });
-
-        $folderIds = $itemList
-            ->where('type', 'folder')
-            ->pluck('id');
-
-        $fileIds = $itemList
-            ->where('type', 'file')
-            ->pluck('id');
-
-        $folders = Folder::whereUserId($user_id)
-            ->whereIn('id', $folderIds)
-            ->get();
-
-        $files = File::whereUserId($user_id)
-            ->whereIn('id', $fileIds)
-            ->get();
+        list($folders, $files) = ($this->getItemsListFromUrlParam)($user_id);
 
         $zip = ($this->zip)($folders, $files);