Feat: Updating COntrollers to remove business logic moved to boboko/core

app/Catalog/CategoryListing.php

@@ -19,8 +19,8 @@ final class CategoryListing
 {
     private function __construct(
         public readonly ?ProductSort $sort,
-        public readonly ?int $minPrice,
-        public readonly ?int $maxPrice,
+        public readonly ?float $minPrice,
+        public readonly ?float $maxPrice,
         public readonly bool $inStockOnly,
         public readonly int $page,
     ) {}
@@ -29,8 +29,8 @@ public static function fromRequest(Request $request): self
     {
         return new self(
             sort: ProductSort::tryFrom((string) $request->query('sort')),
-            minPrice: self::intOrNull($request->query('price_min')),
-            maxPrice: self::intOrNull($request->query('price_max')),
+            minPrice: self::floatOrNull($request->query('price_min')),
+            maxPrice: self::floatOrNull($request->query('price_max')),
             inStockOnly: $request->boolean('in_stock'),
             page: max(1, (int) $request->query('page', 1)),
         );
@@ -79,8 +79,8 @@ public function isRefined(): bool
             || $this->page > 1;
     }
 
-    private static function intOrNull(mixed $value): ?int
+    private static function floatOrNull(mixed $value): ?float
     {
-        return is_numeric($value) ? (int) $value : null;
+        return is_numeric($value) ? (float) $value : null;
     }
 }

app/Catalog/ProductCard.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Catalog;
+
+/**
+ * Presentation shaping — how a product listing/grid card is built from
+ * ProductService's localized array shape (list()/getById()/random() all
+ * return it). Deliberately not in boboko-core: `href` depends on this
+ * storefront's own routes, and another app built on the same core package
+ * could want an entirely different card shape. Kept in one place so
+ * HomeController/CategoryController don't each hand-write the same
+ * name/price/image/href mapping.
+ */
+final class ProductCard
+{
+    /**
+     * @param  array  $product  One item from ProductService's localized array shape.
+     * @return array{name: ?string, price: ?float, image: ?string, href: string}
+     */
+    public static function fromIndexed(array $product): array
+    {
+        return [
+            'name' => $product['name'],
+            'price' => $product['price'],
+            'image' => $product['media'][0]['url'] ?? null,
+            'href' => route('product.show', ['id' => $product['id']]),
+        ];
+    }
+}

app/Http/Controllers/CategoryController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers;
 
 use App\Catalog\CategoryListing;
+use App\Catalog\ProductCard;
 use Illuminate\Http\Response;
 use Modules\Core\Catalog\Services\CollectionService;
 use Modules\Core\Catalog\Services\ProductService;
@@ -23,42 +24,29 @@ public function show(string $locale, int $collection)
         $filters = $listing->filters($collectionData['id']);
         $perPage = 12;
 
-        // Listing/filtering reads from the Meilisearch index via ProductService,
-        // not Eloquent — see Modules\Core\Catalog\Services\ProductService. list() returns a
-        // real LengthAwarePaginator of plain arrays (already localized/flattened),
-        // not Product models. Sort/filter/page all come from the query string via
-        // CategoryListing, which is the single source of truth for that state.
-        $products = $this->products->list(
+        // One call for both the product page and the price slider's bounds —
+        // see ProductService::list()'s own docblock for why a controller no
+        // longer orchestrates list() + priceSliderBounds() itself.
+        $listingResult = $this->products->list(
             filters: $filters,
             perPage: $perPage,
             page: $listing->page,
             sort: $listing->sort,
-        )->through(fn (array $product) => [
-            'name' => $product['name'],
-            'price' => $product['price'],
-            'image' => $product['media'][0]['url'] ?? null,
-            'href' => route('product.show', ['id' => $product['id']]),
-        ])->appends($listing->query(['page' => null]));
+        );
 
-        // Slider bounds — the price span of everything matching the *other*
-        // filters (priceRange() drops the price filter itself, so the handles
-        // don't collapse to whatever's already selected). Whole euros.
-        $priceRange = $this->products->priceRange($filters);
-        $priceFloor = $priceRange['min'] !== null ? (int) floor($priceRange['min']) : null;
-        $priceCeil = $priceRange['max'] !== null ? (int) ceil($priceRange['max']) : null;
+        $products = $listingResult->products
+            ->through(fn (array $product) => ProductCard::fromIndexed($product))
+            ->appends($listing->query(['page' => null]));
 
-        // A price param is only a real filter if it's tighter than the bounds —
-        // drives whether the "clear" link shows.
-        $priceFiltered = ($listing->minPrice !== null && $listing->minPrice > ($priceFloor ?? PHP_INT_MIN))
-            || ($listing->maxPrice !== null && $listing->maxPrice < ($priceCeil ?? PHP_INT_MAX));
+        $priceBounds = $listingResult->priceBounds;
 
         return view('category.show', [
             'collection' => $collectionData,
             'products' => $products,
             'listing' => $listing,
-            'priceFloor' => $priceFloor,
-            'priceCeil' => $priceCeil,
-            'priceFiltered' => $priceFiltered,
+            'priceFloor' => $priceBounds->floor,
+            'priceCeil' => $priceBounds->ceil,
+            'priceFiltered' => $priceBounds->filtered,
         ]);
     }
 }

app/Http/Controllers/HomeController.php

@@ -2,11 +2,14 @@
 
 namespace App\Http\Controllers;
 
+use App\Catalog\ProductCard;
 use App\Models\StoicPage;
-use Lunar\Models\Product;
+use Modules\Core\Catalog\Services\ProductService;
 
 class HomeController extends Controller
 {
+    public function __construct(private readonly ProductService $products) {}
+
     public function index(string $locale)
     {
         $page = StoicPage::firstWhere('slug', 'home');
@@ -15,16 +18,8 @@ public function index(string $locale)
             abort(404);
         }
 
-        $products = Product::with(['variants.prices.currency', 'media'])
-            ->inRandomOrder()
-            ->limit(13)
-            ->get()
-            ->map(fn (Product $product) => [
-                'name' => $product->translateAttribute('name'),
-                'price' => $product->variants->first()?->prices->first()?->price->decimal,
-                'image' => $product->media->first()?->getUrl(),
-                'href' => route('product.show', ['id' => $product->id]),
-            ]);
+        $products = collect($this->products->random(13))
+            ->map(fn (array $product) => ProductCard::fromIndexed($product));
 
         return view('home', [
             'page' => $page,

app/Http/Controllers/ProductController.php

@@ -16,14 +16,7 @@ public function show(string $locale, int $id)
 
         $collection = $product['collections'][0] ?? null;
 
-        $variantsData = collect($product['variants'])
-            ->map(fn (array $variant) => [
-                'id' => $variant['id'],
-                'price' => $variant['prices'][0]['price'] ?? null,
-                'image' => $variant['media'][0]['url'] ?? null,
-            ])
-            ->values()
-            ->all();
+        $variantsData = $this->products->variantSummaries($product);
 
         $firstVariant = $product['variants'][0] ?? null;
         $option = $firstVariant['options'][0]['option'] ?? null;

docker-compose.dev.yml

@@ -114,7 +114,7 @@ services:
       - "${VALKEY_PORT:-6339}:6379"
 
   meilisearch:
-    image: getmeili/meilisearch:v1.10
+    image: getmeili/meilisearch:v1.12
     ports:
       - "${MEILISEARCH_PORT:-7700}:7700"
     environment:

docker-compose.yml

@@ -116,7 +116,7 @@ services:
             - valkeydata:/data
 
     meilisearch:
-        image: getmeili/meilisearch:v1.10
+        image: getmeili/meilisearch:v1.12
         restart: unless-stopped
         environment:
             MEILI_MASTER_KEY: ${MEILISEARCH_KEY:?MEILISEARCH_KEY is required}

docker/entrypoint.sh

@@ -86,6 +86,7 @@ php artisan lunar:install --quiet || true
 # just shipped, same reasoning as optimize:clear above.
 echo "[entrypoint] Syncing search indexes..."
 php artisan lunar:meilisearch:setup
+php artisan lunar:meilisearch:tune-product-search --quiet || true
 php artisan lunar:search:index --quiet || true
 
 if [ "$APP_ENV" = "production" ]; then

resources/views/search.blade.php

@@ -0,0 +1,100 @@
+@extends('layouts.app')
+
+@section('title', 'Αναζήτηση')
+
+@section('content')
+
+    <section class="px-8 py-16 lg:px-16">
+
+        <form method="GET" action="{{ route('search') }}" class="max-w-xl mb-12">
+            <x-ui.field label="Αναζήτηση" for="search-q">
+                <x-ui.input id="search-q" name="q" value="{{ $query }}" autocomplete="off" />
+            </x-ui.field>
+        </form>
+
+        @if ($query === '')
+            <p class="text-neutral-500">Πληκτρολόγησε κάτι για αναζήτηση.</p>
+        @else
+            <div class="grid grid-cols-1 lg:grid-cols-[1fr_230px] gap-14">
+
+                <div>
+                    @if ($results->isEmpty())
+                        <p class="text-neutral-500">Δεν βρέθηκαν αποτελέσματα για "{{ $query }}".</p>
+                    @else
+                        <p class="mb-6 text-neutral-500">{{ $results->count() }} αποτελέσματα για "{{ $query }}"</p>
+
+                        <ul>
+                            @foreach ($results as $product)
+                                <li>
+                                    #{{ $product->id }} —
+                                    <a href="{{ route('product.show', ['id' => $product->id]) }}">
+                                        {{ $product->translateAttribute('name') ?? '(no name — id: ' . $product->id . ')' }}
+                                    </a>
+                                </li>
+                            @endforeach
+                        </ul>
+                    @endif
+                </div>
+
+                {{-- Filter sidebar — same shape/components as category/partials/listing.blade.php,
+                     adapted to SearchListing's query() (which always carries `q`) instead of
+                     CategoryListing's collection-scoped one. --}}
+                <aside class="flex flex-col gap-10">
+
+                    <form
+                        method="get"
+                        action="{{ route('search') }}"
+                        data-controller="auto-submit"
+                        data-action="change->auto-submit#submit range-slider:change->auto-submit#submit"
+                        class="contents"
+                    >
+                        <input type="hidden" name="q" value="{{ $listing->query }}">
+
+                        @if ($listing->sort)
+                            <input type="hidden" name="sort" value="{{ $listing->sort->value }}">
+                        @endif
+
+                        @if ($priceFloor !== null && $priceCeil !== null && $priceCeil > $priceFloor)
+                            <div class="flex flex-col gap-4">
+                                <p class="font-extrabold text-h4">{{ __('storefront.shop.filter_price') }}</p>
+
+                                <x-ui.range-slider
+                                    name="price"
+                                    :min="$priceFloor"
+                                    :max="$priceCeil"
+                                    :min-value="max($priceFloor, $listing->minPrice ?? $priceFloor)"
+                                    :max-value="min($priceCeil, $listing->maxPrice ?? $priceCeil)"
+                                    prefix="€"
+                                    separator=" - "
+                                    :legend="__('storefront.shop.filter_price')"
+                                    :min-label="__('storefront.shop.price_min')"
+                                    :max-label="__('storefront.shop.price_max')"
+                                >
+                                    @if ($priceFiltered)
+                                        <a
+                                            href="{{ route('search', $listing->query(['price_min' => null, 'price_max' => null, 'page' => null])) }}"
+                                            class="underline-slide [--slide-h:1px] font-display text-sm font-bold uppercase italic"
+                                        >{{ __('storefront.shop.reset') }}</a>
+                                    @endif
+                                </x-ui.range-slider>
+                            </div>
+                        @endif
+
+                        <div class="flex flex-col gap-4 [&_label]:text-base">
+                            <p class="font-extrabold text-h4">{{ __('storefront.shop.availability') }}</p>
+                            <x-ui.checkbox id="search-in-stock" name="in_stock" :checked="$listing->inStockOnly">
+                                {{ __('storefront.shop.in_stock_only') }}
+                            </x-ui.checkbox>
+                        </div>
+
+                        <button type="submit" class="sr-only">{{ __('storefront.shop.apply') }}</button>
+                    </form>
+
+                </aside>
+
+            </div>
+        @endif
+
+    </section>
+
+@endsection

resources/views/vendor/core/order/notifications/captured.blade.php

@@ -0,0 +1,3 @@
+<p>Hi,</p>
+
+<p>Payment of <strong>{{ $amount }}</strong> for your order <strong>{{ $reference }}</strong> has been captured.</p>

resources/views/vendor/core/order/notifications/delivered.blade.php

@@ -0,0 +1,3 @@
+<p>Hi,</p>
+
+<p>Good news — your order <strong>{{ $reference }}</strong> has been delivered.</p>

resources/views/vendor/core/order/notifications/refunded.blade.php

@@ -0,0 +1,3 @@
+<p>Hi,</p>
+
+<p>A refund of <strong>{{ $amount }}</strong> has been issued for your order <strong>{{ $reference }}</strong>.</p>

resources/views/vendor/core/order/notifications/status-updated.blade.php

@@ -0,0 +1,3 @@
+<p>Hi,</p>
+
+<p>Your order <strong>{{ $reference }}</strong> is now: <strong>{{ $statusLabel }}</strong></p>