Merge branch 'feature/HES-2219' into 'release/5.2'

Resolve HES-2219 "Feature/"

See merge request heseya/core!380

app/Criteria/ProductSearch.php

@@ -9,16 +9,12 @@ class ProductSearch extends Criterion
 {
     public function query(Builder $query): Builder
     {
-        if ($this->value === null) {
-            return $query;
-        }
-
-        return $query
-            ->where(function (Builder $query): void {
-                $query
-                    ->whereFullText(['search_values'], $this->value)
-                    ->orWhere('id', 'LIKE', '%' . $this->value . '%')
-                    ->orWhere('slug', 'LIKE', '%' . $this->value . '%');
-            });
+        return $query->whereFullText([
+            'name',
+            'slug',
+            'description_html',
+            'description_short',
+            'search_values',
+        ], $this->value);
     }
 }

app/Dtos/ProductSearchDto.php

@@ -11,7 +11,7 @@
 
 class ProductSearchDto extends Dto implements InstantiateFromRequest
 {
-    private ?string $search;
+    private Missing|string $search;
     private ?string $sort;
 
     private array|Missing $ids;
@@ -46,7 +46,7 @@ public static function instantiateFromRequest(FormRequest|ProductIndexRequest $r
             ? Str::replace('price:desc', 'price_max:desc', $sort) : $sort;
 
         return new self(
-            search: $request->input('search'),
+            search: $request->input('search', new Missing()),
             sort: $sort,
             ids: $request->input('ids', new Missing()),
             slug: $request->input('slug', new Missing()),
@@ -70,26 +70,11 @@ public static function instantiateFromRequest(FormRequest|ProductIndexRequest $r
         );
     }
 
-    public function getSearch(): ?string
-    {
-        return $this->search;
-    }
-
     public function getSort(): ?string
     {
         return $this->sort;
     }
 
-    public function getPriceMin(): float|Missing
-    {
-        return $this->price_min;
-    }
-
-    public function getPriceMax(): float|Missing
-    {
-        return $this->price_max;
-    }
-
     private static function boolean(string $key, FormRequest|ProductIndexRequest $request): bool|Missing
     {
         if (!$request->has($key)) {

app/Events/ProductSearchValueEvent.php

@@ -10,10 +10,7 @@ class ProductSearchValueEvent
     use Dispatchable;
     use SerializesModels;
 
-    public function __construct(protected array $productIds) {}
-
-    public function getProductIds(): array
-    {
-        return $this->productIds;
-    }
+    public function __construct(
+        public readonly array $product_ids,
+    ) {}
 }

app/Http/Controllers/ProductController.php

@@ -17,7 +17,7 @@
 use App\Http\Resources\ResourceCollection;
 use App\Models\MediaAttachment;
 use App\Models\Product;
-use App\Repositories\Contracts\ProductRepositoryContract;
+use App\Repositories\ProductRepository;
 use App\Services\Contracts\MediaAttachmentServiceContract;
 use App\Services\Contracts\ProductServiceContract;
 use Illuminate\Http\JsonResponse;
@@ -29,9 +29,9 @@
 class ProductController extends Controller
 {
     public function __construct(
-        private ProductServiceContract $productService,
-        private ProductRepositoryContract $productRepository,
-        private MediaAttachmentServiceContract $attachmentService,
+        private readonly ProductRepository $productRepository,
+        private readonly ProductServiceContract $productService,
+        private readonly MediaAttachmentServiceContract $attachmentService,
     ) {}
 
     public function index(ProductIndexRequest $request): JsonResource

app/Http/Requests/ProductIndexRequest.php

@@ -21,7 +21,7 @@ public function rules(): array
         }
 
         return [
-            'search' => ['nullable', 'string', 'max:255'],
+            'search' => ['sometimes', 'string', 'max:255'],
 
             'ids' => ['array'],
             'ids.*' => ['uuid'],

app/Listeners/ProductSearchValueListener.php

@@ -5,14 +5,14 @@
 use App\Events\ProductSearchValueEvent;
 use App\Services\Contracts\ProductServiceContract;
 
-class ProductSearchValueListener
+readonly class ProductSearchValueListener
 {
     public function __construct(
         private ProductServiceContract $productService,
     ) {}
 
     public function handle(ProductSearchValueEvent $event): void
     {
-        $this->productService->updateProductsSearchValues($event->getProductIds());
+        $this->productService->updateProductsSearchValues($event->product_ids);
     }
 }

app/Models/Contracts/SortableContract.php

@@ -9,8 +9,4 @@ interface SortableContract
     public function scopeSort(Builder $query, ?string $sortString = null): Builder;
 
     public function getSortable(): array;
-
-    public function getDefaultSortBy(): string;
-
-    public function getDefaultSortDirection(): string;
 }

app/Models/Order.php

@@ -114,9 +114,6 @@ class Order extends Model implements AuditableContract, SortableContract
         'summary',
     ];
 
-    protected string $defaultSortBy = 'created_at';
-    protected string $defaultSortDirection = 'desc';
-
     protected $casts = [
         'paid' => 'boolean',
         'invoice_requested' => 'boolean',

app/Models/Product.php

@@ -78,6 +78,7 @@ class Product extends Model implements AuditableContract, SortableContract
         'purchase_limit_per_user',
         'search_values',
     ];
+
     protected array $auditInclude = [
         'name',
         'slug',
@@ -89,6 +90,7 @@ class Product extends Model implements AuditableContract, SortableContract
         'price_max',
         'available',
     ];
+
     protected $casts = [
         'shipping_date' => 'date',
         'price' => 'float',
@@ -101,6 +103,7 @@ class Product extends Model implements AuditableContract, SortableContract
         'shipping_digital' => 'bool',
         'purchase_limit_per_user' => 'float',
     ];
+
     protected array $sortable = [
         'id',
         'price',
@@ -114,6 +117,7 @@ class Product extends Model implements AuditableContract, SortableContract
         'attribute.*',
         'set.*',
     ];
+
     protected array $criteria = [
         'search' => ProductSearch::class,
         'ids' => WhereInIds::class,
@@ -136,8 +140,6 @@ class Product extends Model implements AuditableContract, SortableContract
         'has_schemas' => WhereHasSchemas::class,
         'shipping_digital' => Equals::class,
     ];
-    protected string $defaultSortBy = 'products.created_at';
-    protected string $defaultSortDirection = 'desc';
 
     public function sets(): BelongsToMany
     {

app/Models/WebHook.php

@@ -62,9 +62,6 @@ class WebHook extends Model implements AuditableContract, SortableContract
         'updated_at',
     ];
 
-    protected string $defaultSortBy = 'created_at';
-    protected string $defaultSortDirection = 'desc';
-
     public function logs(): HasMany
     {
         return $this->hasMany(WebHookEventLogEntry::class);

app/Repositories/ProductRepository.php

@@ -6,12 +6,11 @@
 
 use App\Dtos\ProductSearchDto;
 use App\Models\Product;
-use App\Repositories\Contracts\ProductRepositoryContract;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\Gate;
 
-class ProductRepository implements ProductRepositoryContract
+class ProductRepository
 {
     public function search(ProductSearchDto $dto): LengthAwarePaginator
     {

app/Services/ProductService.php

@@ -188,8 +188,9 @@ public function updateMinMaxPrices(Product $product): void
 
     public function updateProductsSearchValues(array $productIds): void
     {
-        Product::whereIn('id', $productIds)
-            ->with(['tags', 'sets', 'relatedSets', 'attributes', 'attributes.options'])
+        Product::query()
+            ->whereIn('id', $productIds)
+            ->with(['tags', 'sets', 'attributes', 'attributes.options'])
             ->each(fn (Product $product) => $this->prepareProductSearchValues($product)->save());
     }
 
@@ -297,22 +298,23 @@ private function bestMinMax(Collection $minmaxCol): array
 
     private function prepareProductSearchValues(Product $product): Product
     {
-        $searchValues = rtrim($product->name . ' ' . $product->description_html . ' ' . $product->description_short);
-        $searchValues .= rtrim(' ' . $product->tags->pluck('name')->implode(' '));
-        $searchValues .= rtrim(' ' . $product->allProductSet()->pluck('name')->implode(' '));
-        $searchValues .= rtrim(' ' . $product->relatedSets->pluck('name')->implode(' '));
+        $searchValues = [
+            ...$product->tags->pluck('name'),
+            ...$product->sets->pluck('name'),
+        ];
 
         /** @var Attribute $attribute */
         foreach ($product->attributes as $attribute) {
-            $searchValues .= rtrim(' ' . $attribute->name);
+            $searchValues[] = $attribute->name;
             /** @var AttributeOption $option */
             foreach ($attribute->pivot->options as $option) {
-                $searchValues .= rtrim(' ' . $option->name . ' ' . $option->value_number . ' ' . $option->value_date);
+                $searchValues[] = $option->name;
+                $searchValues[] = $option->value_number;
+                $searchValues[] = $option->value_date;
             }
         }
-        $product->update([
-            'search_values' => $searchValues,
-        ]);
+
+        $product->search_values = implode(' ', $searchValues);
 
         return $product;
     }

app/Traits/HasUuid.php

@@ -23,7 +23,7 @@ public static function boot(): void
     {
         static::creating(function ($model): void {
             if (!$model->getKey()) {
-                $model->{$model->getKeyName()} = Str::uuid()->toString();
+                $model->{$model->getKeyName()} = Str::orderedUuid()->toString();
             }
         });
 

app/Traits/Sortable.php

@@ -9,32 +9,17 @@ trait Sortable
 {
     public function scopeSort(Builder $query, ?string $sortString = null): Builder
     {
-        if ($sortString !== null) {
-            $query = app(SortServiceContract::class)
-                ->sort($query, $sortString, $this->getSortable());
+        if ($sortString === null) {
+            return $query;
         }
 
-        return $query->orderBy(
-            $this->getDefaultSortBy(),
-            $this->getDefaultSortDirection(),
-        );
+        return app(SortServiceContract::class)
+            ->sort($query, $sortString, $this->getSortable());
     }
 
     public function getSortable(): array
     {
         // @phpstan-ignore-next-line
         return $this->sortable ?? [];
     }
-
-    public function getDefaultSortBy(): string
-    {
-        // @phpstan-ignore-next-line
-        return $this->defaultSortBy ?? 'created_at';
-    }
-
-    public function getDefaultSortDirection(): string
-    {
-        // @phpstan-ignore-next-line
-        return $this->defaultSortDirection ?? 'asc';
-    }
 }

config/app.php

@@ -174,7 +174,6 @@
 
         // Application Service Providers...
         App\Providers\AppServiceProvider::class,
-        App\Providers\RepositoryServiceProvider::class,
         App\Providers\AuthServiceProvider::class,
         App\Providers\EventServiceProvider::class,
         App\Providers\RouteServiceProvider::class,

database/migrations/2023_09_19_195946_update_products_indexes.php

@@ -0,0 +1,26 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    public function up(): void
+    {
+        Schema::table('products', function (Blueprint $table): void {
+            $table->dropFullText('products_search_values_fulltext');
+            $table->fullText(
+                ['search_values', 'slug', 'name', 'description_short', 'description_html'],
+                'products_fulltext',
+            );
+        });
+    }
+
+    public function down(): void
+    {
+        Schema::table('products', function (Blueprint $table): void {
+            $table->dropFullText('products_fulltext');
+            $table->fullText('search_values');
+        });
+    }
+};

tests/Feature/ProductTest.php

@@ -246,11 +246,8 @@ public function testIndex($user): void
             ->json('GET', '/products', ['limit' => 100])
             ->assertOk()
             ->assertJsonCount(2, 'data')
-            ->assertJson([
-                'data' => [
-                    1 => $this->expected_short,
-                ],
-            ])->assertJsonFragment([
+            ->assertJsonFragment([
+                ...$this->expected_short,
                 'price_min' => $this->product->price_min,
                 'price_max' => $this->product->price_max,
             ]);