user zipping

src/Domain/Zip/Controllers/ZipController.php

@@ -0,0 +1,65 @@
+<?php
+
+
+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\ZipAction;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+use STS\ZipStream\ZipStream;
+
+class ZipController extends Controller
+{
+    public function __construct(
+        public ZipAction $zip,
+        public RecordDownloadAction $recordDownload,
+    ) {}
+
+    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();
+
+        $zip = ($this->zip)($folders, $files);
+
+        ($this->recordDownload)(
+            file_size: $zip->predictZipSize(),
+            user_id: $user_id,
+        );
+
+        return $zip;
+    }
+}

src/Domain/Zip/Controllers/ZipFilesController.php

@@ -1,36 +0,0 @@
-<?php
-namespace Domain\Zip\Controllers;
-
-use Illuminate\Http\Request;
-use STS\ZipStream\ZipStream;
-use Domain\Files\Models\File;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Domain\Zip\Actions\ZipFilesAction;
-use Domain\Traffic\Actions\RecordDownloadAction;
-
-class ZipFilesController extends Controller
-{
-    public function __construct(
-        private ZipFilesAction $zipFiles,
-        private RecordDownloadAction $recordDownload,
-    ) {
-    }
-
-    public function __invoke(
-        Request $request,
-    ): ZipStream {
-        $files = File::whereUserId(Auth::id())
-            ->whereIn('id', explode(',', $request->get('ids')))
-            ->get();
-
-        $zip = ($this->zipFiles)($files);
-
-        ($this->recordDownload)(
-            file_size: $zip->predictZipSize(),
-            user_id: Auth::id(),
-        );
-
-        return $zip;
-    }
-}

src/Domain/Zip/Controllers/ZipFolderController.php

@@ -1,38 +0,0 @@
-<?php
-namespace Domain\Zip\Controllers;
-
-use STS\ZipStream\ZipStream;
-use Domain\Folders\Models\Folder;
-use App\Http\Controllers\Controller;
-use Illuminate\Support\Facades\Auth;
-use Domain\Zip\Actions\ZipFolderAction;
-use Domain\Traffic\Actions\RecordDownloadAction;
-
-class ZipFolderController extends Controller
-{
-    public function __construct(
-        private ZipFolderAction $zipFolder,
-        private RecordDownloadAction $recordDownload,
-    ) {
-    }
-
-    public function __invoke(
-        string $id,
-    ): ZipStream {
-        $folder = Folder::whereUserId(Auth::id())
-            ->where('id', $id);
-
-        if (! $folder->exists()) {
-            response("Requested folder doesn't exists.", 404);
-        }
-
-        $zip = ($this->zipFolder)($id);
-
-        ($this->recordDownload)(
-            file_size: $zip->predictZipSize(),
-            user_id: Auth::id(),
-        );
-
-        return $zip;
-    }
-}