Feat: Updating routes and controllers to use the updated Services coming from boboko/core

app/Http/Controllers/CategoryController.php

@@ -2,18 +2,23 @@
 
 namespace App\Http\Controllers;
 
-use Lunar\Models\Collection;
+use Illuminate\Http\Response;
 use Modules\Core\Catalog\DTOs\ProductFilters;
+use Modules\Core\Catalog\Services\CollectionService;
 use Modules\Core\Catalog\Services\ProductService;
 
 class CategoryController extends Controller
 {
     public function __construct(
         private readonly ProductService $products,
+        private readonly CollectionService $collections,
     ) {}
 
-    public function show(string $locale, Collection $collection)
+    public function show(string $locale, int $collection)
     {
+        $collectionData = $this->collections->getById($collection);
+        abort_if($collectionData === null, Response::HTTP_NOT_FOUND);
+
         $perPage = 12;
         $page = (int) request('page', 1);
 
@@ -22,7 +27,7 @@ public function show(string $locale, Collection $collection)
         // real LengthAwarePaginator of plain arrays (already localized/flattened),
         // not Product models.
         $products = $this->products->list(
-            filters: new ProductFilters(collectionId: $collection->id),
+            filters: new ProductFilters(collectionId: $collectionData['id']),
             perPage: $perPage,
             page: $page,
         )->through(fn (array $product) => [
@@ -33,7 +38,7 @@ public function show(string $locale, Collection $collection)
         ]);
 
         return view('category.show', [
-            'collection' => $collection,
+            'collection' => $collectionData,
             'products' => $products,
         ]);
     }

app/Http/Controllers/ProductController.php

@@ -3,7 +3,6 @@
 namespace App\Http\Controllers;
 
 use Illuminate\Http\Response;
-use Lunar\Models\Collection;
 use Modules\Core\Catalog\Services\ProductService;
 
 class ProductController extends Controller
@@ -16,7 +15,6 @@ public function show(string $locale, int $id)
         abort_if($product === null, Response::HTTP_NOT_FOUND);
 
         $collection = $product['collections'][0] ?? null;
-        $collectionModel = $collection !== null ? Collection::find($collection['id']) : null;
 
         $variantsData = collect($product['variants'])
             ->map(fn (array $variant) => [
@@ -30,12 +28,8 @@ public function show(string $locale, int $id)
         $firstVariant = $product['variants'][0] ?? null;
         $option = $firstVariant['options'][0]['option'] ?? null;
 
-        // temp categories here
-        $categories = Collection::orderBy('_lft')->get();
-
         return view('product.show', [
-            'categories' => $categories,
-            'collection' => $collectionModel,
+            'collection' => $collection,
             'product' => $product,
             'option' => $option,
             'variantsData' => $variantsData,