Merge branch 'origin/develop' into feature/HES-2289

heseya · Sep 21, 2023 · 9b066f6 · 9b066f6
2 parents 9441aaa + 29f7be8
commit 9b066f6
Show file tree

Hide file tree

Showing 202 changed files with 1,699 additions and 4,678 deletions.
diff --git a/.env.example b/.env.example
@@ -28,9 +28,6 @@ REDIS_CACHE_HOST=redis
 REDIS_CACHE_PASSWORD=null
 REDIS_CACHE_PORT=6379
 
-SCOUT_DRIVER=database
-SCOUT_QUEUE=false
-
 EMAIL_HOST=mail.example.com
 EMAIL_PORT=587
 EMAIL_ENCRYPTION=tls

diff --git a/app/Casts/MetadataValue.php b/app/Casts/MetadataValue.php
@@ -19,7 +19,7 @@ public function get($model, string $key, $value, array $attributes): mixed
         return match ($model->value_type->value) {
             MetadataType::BOOLEAN => (bool) $value,
             MetadataType::NUMBER => (float) $value,
-            default => $value
+            default => $value,
         };
     }
 

diff --git a/app/Console/Commands/RefreshProduct.php b/app/Console/Commands/RefreshProduct.php
@@ -39,7 +39,6 @@ public function handle(): int
 
         $productService = app(ProductServiceContract::class);
         $productService->updateMinMaxPrices($product);
-        $product->searchable();
 
         $this->info('Done.');
 

diff --git a/app/Criteria/MediaSearch.php b/app/Criteria/MediaSearch.php
@@ -10,10 +10,13 @@ class MediaSearch extends Criterion
     public function query(Builder $query): Builder
     {
         if ($this->value) {
-            $query->where('url', 'like', "%{$this->value}%")
-                ->orWhere('slug', 'like', "%{$this->value}%")
-                ->orWhere('alt', 'like', "%{$this->value}%")
-                ->orWhere('type', 'like', "%{$this->value}%");
+            $query->where(function (Builder $query): void {
+                $query
+                    ->where('url', 'like', "%{$this->value}%")
+                    ->orWhere('slug', 'like', "%{$this->value}%")
+                    ->orWhere('alt', 'like', "%{$this->value}%")
+                    ->orWhere('type', 'like', "%{$this->value}%");
+            });
         }
 
         return $query;

diff --git a/app/Criteria/ProductAttributeSearch.php b/app/Criteria/ProductAttributeSearch.php
@@ -22,15 +22,15 @@ public function query(Builder $query): Builder
                         $query
                             ->from('product_attribute_attribute_option')
                             ->whereRaw(
-                                '`product_attribute`.`id` = `product_attribute_attribute_option`.`product_attribute_id`'
+                                '`product_attribute`.`id` = `product_attribute_attribute_option`.`product_attribute_id`',
                             );
 
                         if (is_array($value)) {
                             $query->join(
                                 'attribute_options',
                                 'product_attribute_attribute_option.attribute_option_id',
                                 '=',
-                                'attribute_options.id'
+                                'attribute_options.id',
                             );
 
                             $key = is_numeric(Arr::first($value)) ?

diff --git a/app/Criteria/ProductNotAttributeSearch.php b/app/Criteria/ProductNotAttributeSearch.php
@@ -22,15 +22,15 @@ public function query(Builder $query): Builder
                         $query
                             ->from('product_attribute_attribute_option')
                             ->whereRaw(
-                                '`product_attribute`.`id` = `product_attribute_attribute_option`.`product_attribute_id`'
+                                '`product_attribute`.`id` = `product_attribute_attribute_option`.`product_attribute_id`',
                             );
 
                         if (is_array($value)) {
                             $query->join(
                                 'attribute_options',
                                 'product_attribute_attribute_option.attribute_option_id',
                                 '=',
-                                'attribute_options.id'
+                                'attribute_options.id',
                             );
 
                             $key = is_numeric(Arr::first($value)) ?

diff --git a/app/Criteria/ProductSearch.php b/app/Criteria/ProductSearch.php
@@ -9,15 +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->where('id', 'LIKE', '%' . $this->value . '%')
-                ->orWhere('slug', 'LIKE', '%' . $this->value . '%')
-                ->orWhere('name', 'LIKE', '%' . $this->value . '%')
-                ->orWhere('description_html', 'LIKE', '%' . $this->value . '%');
-        });
+        return $query->whereFullText([
+            'name',
+            'slug',
+            'description_html',
+            'description_short',
+            'search_values',
+        ], $this->value);
     }
 }
diff --git a/app/Criteria/WhereHasBuyer.php b/app/Criteria/WhereHasBuyer.php
@@ -16,13 +16,13 @@ public function query(Builder $query): Builder
             fn (Builder $query) => $query
                 ->whereDoesntHave(
                     'status',
-                    fn (Builder $query) => $query->where('cancel', '!=', false)
+                    fn (Builder $query) => $query->where('cancel', '!=', false),
                 )
                 ->whereHasMorph(
                     'buyer',
                     $this->key === 'user' ? [User::class] : [App::class],
                     fn (Builder $query) => $query->where('id', $this->value),
-                )
+                ),
         );
     }
 }
diff --git a/app/Dtos/AttributeDto.php b/app/Dtos/AttributeDto.php
@@ -26,7 +26,7 @@ public function __construct(
     ) {}
 
     public static function instantiateFromRequest(
-        AttributeStoreRequest|AttributeUpdateRequest|FormRequest $request
+        AttributeStoreRequest|AttributeUpdateRequest|FormRequest $request,
     ): self {
         return new self(
             id: $request->input('id', new Missing()),

diff --git a/app/Dtos/BannerMediaDto.php b/app/Dtos/BannerMediaDto.php
@@ -22,7 +22,7 @@ public static function fromDataArray(array $data): self
             title: $data['title'] ?? null,
             subtitle: $data['subtitle'] ?? null,
             media: Collection::make($responsiveMedia)
-                ->map(fn ($media) => ResponsiveMediaDto::fromDataArray($media))
+                ->map(fn ($media) => ResponsiveMediaDto::fromDataArray($media)),
         );
     }
 

diff --git a/app/Dtos/ConditionGroupDto.php b/app/Dtos/ConditionGroupDto.php
@@ -13,7 +13,7 @@ class ConditionGroupDto extends Dto
     public static function fromArray(array $array): self
     {
         return new self(
-            conditions: self::transformArrayToConditionDtos($array)
+            conditions: self::transformArrayToConditionDtos($array),
         );
     }
 
@@ -39,7 +39,7 @@ private static function transformArrayToConditionDtos(array $conditions): array
                 ConditionType::WEEKDAY_IN => WeekDayInConditionDto::fromArray($condition),
                 ConditionType::CART_LENGTH => CartLengthConditionDto::fromArray($condition),
                 ConditionType::COUPONS_COUNT => CouponsCountConditionDto::fromArray($condition),
-                default => throw new Exception('Unknown condition type.')
+                default => throw new Exception('Unknown condition type.'),
             };
         }
 

diff --git a/app/Dtos/CouponDto.php b/app/Dtos/CouponDto.php
@@ -19,7 +19,7 @@ final class CouponDto extends SaleDto implements InstantiateFromRequest
     protected array|Missing $metadata;
 
     public static function instantiateFromRequest(
-        CouponCreateRequest|CouponUpdateRequest|FormRequest|SaleCreateRequest|StatusUpdateRequest $request
+        CouponCreateRequest|CouponUpdateRequest|FormRequest|SaleCreateRequest|StatusUpdateRequest $request,
     ): self {
         return new self(
             code: $request->input('code', new Missing()),

diff --git a/app/Dtos/MediaAttachmentDto.php b/app/Dtos/MediaAttachmentDto.php
@@ -37,7 +37,7 @@ public static function instantiateFromRequest(FormRequest $request): self
             name: $request->input('name'),
             type: $type,
             visibility: $visibility,
-            description: $request->input('description') ?? new Missing()
+            description: $request->input('description') ?? new Missing(),
         );
     }
 }
diff --git a/app/Dtos/ProductSearchDto.php b/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()),
@@ -66,30 +66,15 @@ public static function instantiateFromRequest(FormRequest|ProductIndexRequest $r
             metadata: self::array('metadata', $request),
             metadata_private: self::array('metadata_private', $request),
             price_min: $request->input('price.min', new Missing()),
-            price_max: $request->input('price.max', new Missing())
+            price_max: $request->input('price.max', new Missing()),
         );
     }
 
-    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)) {

diff --git a/app/Dtos/ProductSetDto.php b/app/Dtos/ProductSetDto.php
@@ -31,7 +31,7 @@ public function __construct(
      * @throws DtoException
      */
     public static function instantiateFromRequest(
-        FormRequest|ProductSetStoreRequest|ProductSetUpdateRequest $request
+        FormRequest|ProductSetStoreRequest|ProductSetUpdateRequest $request,
     ): self {
         return new self(
             id: $request->input('id') ?? new Missing(),

diff --git a/app/Dtos/ProductSetUpdateDto.php b/app/Dtos/ProductSetUpdateDto.php
@@ -23,7 +23,7 @@ class ProductSetUpdateDto extends Dto implements InstantiateFromRequest
     private array|Missing|null $attributes_ids;
 
     public static function instantiateFromRequest(
-        FormRequest|ProductSetStoreRequest|ProductSetUpdateRequest $request
+        FormRequest|ProductSetStoreRequest|ProductSetUpdateRequest $request,
     ): self {
         return new self(
             name: $request->input('name', new Missing()),

diff --git a/app/Dtos/ProductsReorderDto.php b/app/Dtos/ProductsReorderDto.php
@@ -12,7 +12,7 @@ final class ProductsReorderDto extends Dto
     protected array|Missing $products;
 
     public static function instantiateFromRequest(
-        FormRequest|ProductSetProductReorderRequest $request
+        FormRequest|ProductSetProductReorderRequest $request,
     ): self {
         return new self(
             products: $request->input('products', new Missing()),

diff --git a/app/Dtos/UserPreferencesDto.php b/app/Dtos/UserPreferencesDto.php
@@ -24,7 +24,7 @@ public static function instantiateFromRequest(Request $request): self
             new_localization_login_alert: $request
                 ->input('preferences.new_localization_login_alert', new Missing()),
             recovery_code_changed_alert: $request
-                ->input('preferences.recovery_code_changed_alert', new Missing())
+                ->input('preferences.recovery_code_changed_alert', new Missing()),
         );
     }
 

diff --git a/app/Enums/ExceptionsEnums/Exceptions.php b/app/Enums/ExceptionsEnums/Exceptions.php
@@ -144,7 +144,7 @@ public static function getCode(string $value): int
             self::SERVER_ERROR,
             self::SERVER_ORDER_STATUSES_NOT_CONFIGURED,
             self::SERVER_PAYMENT_MICROSERVICE_ERROR => 500,
-            default => 422
+            default => 422,
         };
     }
 }
diff --git a/app/Events/ProductPriceUpdated.php b/app/Events/ProductPriceUpdated.php
@@ -9,11 +9,11 @@ class ProductPriceUpdated extends WebHookEvent
     private string $updatedAt;
 
     public function __construct(
-        private string $id,
-        private ?float $oldPriceMin,
-        private ?float $oldPriceMax,
-        private float $newPriceMin,
-        private float $newPriceMax,
+        private readonly string $id,
+        private readonly ?float $oldPriceMin,
+        private readonly ?float $oldPriceMax,
+        private readonly float $newPriceMin,
+        private readonly float $newPriceMax,
     ) {
         $this->updatedAt = Carbon::now()->toIso8601String();
         parent::__construct();

diff --git a/app/Events/ProductSearchValueEvent.php b/app/Events/ProductSearchValueEvent.php
@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Events;
+
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Queue\SerializesModels;
+
+class ProductSearchValueEvent
+{
+    use Dispatchable;
+    use SerializesModels;
+
+    public function __construct(
+        public readonly array $product_ids,
+    ) {}
+}
diff --git a/app/Exceptions/AuthException.php b/app/Exceptions/AuthException.php
@@ -10,7 +10,7 @@ public function __construct(
         string $message = '',
         int $code = 0,
         ?Throwable $previous = null,
-        bool $simpleLogs = false
+        bool $simpleLogs = false,
     ) {
         parent::__construct($message, $code, $previous, $simpleLogs);
     }

diff --git a/app/Exceptions/DiscountException.php b/app/Exceptions/DiscountException.php
@@ -9,7 +9,7 @@ class DiscountException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/app/Exceptions/Error.php b/app/Exceptions/Error.php
@@ -12,7 +12,7 @@ public function __construct(
         public int $code = 500,
         public string $key = 'INTERNAL_SERVER_ERROR',
         public array $errors = [],
-        public array $stack = []
+        public array $stack = [],
     ) {}
 
     /**

diff --git a/app/Exceptions/Handler.php b/app/Exceptions/Handler.php
@@ -218,7 +218,7 @@ private function createValidationAttributeData(string $key, array $data): array
             ValidationError::GTE => [
                 'field' => $data[0],
             ],
-            default => []
+            default => [],
         };
     }
 }
diff --git a/app/Exceptions/ItemException.php b/app/Exceptions/ItemException.php
@@ -9,7 +9,7 @@ class ItemException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/app/Exceptions/MediaCriticalException.php b/app/Exceptions/MediaCriticalException.php
@@ -9,7 +9,7 @@ class MediaCriticalException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/app/Exceptions/MediaException.php b/app/Exceptions/MediaException.php
@@ -9,7 +9,7 @@ class MediaException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/app/Exceptions/OrderException.php b/app/Exceptions/OrderException.php
@@ -9,7 +9,7 @@ class OrderException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/app/Exceptions/PackageAuthException.php b/app/Exceptions/PackageAuthException.php
@@ -9,7 +9,7 @@ class PackageAuthException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }

diff --git a/app/Exceptions/RoleException.php b/app/Exceptions/RoleException.php
@@ -9,7 +9,7 @@ class RoleException extends StoreException
     public function __construct(
         string $message = '',
         int $code = 0,
-        ?Throwable $previous = null
+        ?Throwable $previous = null,
     ) {
         parent::__construct($message, $code, $previous);
     }