AIKU-C75 - Add searchable_text to products table

app/Actions/CRM/Customer/UI/GetProductsForPortfolioSelect.php

@@ -9,6 +9,7 @@
 use App\InertiaTable\InertiaTable;
 use App\Models\Catalogue\Product;
 use App\Models\Dropshipping\CustomerSalesChannel;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
 use Illuminate\Pagination\LengthAwarePaginator;
@@ -19,6 +20,7 @@
 class GetProductsForPortfolioSelect extends OrgAction
 {
     use WithCRMEditAuthorisation;
+    use HasSearchableText;
 
     public function handle(CustomerSalesChannel $customerSalesChannel, $prefix = null): LengthAwarePaginator
     {
@@ -52,8 +54,17 @@
                 default:
                     // Search products by their own attributes (name, code, etc.)
                     $query->where(function ($query) use ($value) {
-                        $query->whereAnyWordStartWith('products.name', $value)
-                            ->orWhereStartWith('products.code', $value);
+                        $normalizedValue = $this->normalizeSearchableText($value);
+
+                        // Ignore if search token is less than 2 words
+                        $searchTokens = array_values(array_filter(
+                            explode(' ', trim($normalizedValue)),
+                            fn ($t) => strlen($t) >= 2
+                        ));
+
+                        foreach ($searchTokens as $searchToken) {
+                            $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                        }
                     });
                     break;
             }

app/Actions/CRM/Customer/UI/IndexCustomers.php

@@ -98,11 +98,11 @@ public function handle(Group|Organisation|Shop|Product|TrafficSource $parent, $p
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) use ($parent) {
             $query->where(function ($query) use ($value, $parent) {
-                $value = $this->normalizeSearchableText($value);
+                $normalizedValue = $this->normalizeSearchableText($value);
 
                 // Ignore if search token is less than 2 words
                 $searchTokens = array_values(array_filter(
-                    explode(' ', trim($value)),
+                    explode(' ', trim($normalizedValue)),
                     fn ($t) => strlen($t) >= 2
                 ));
 

app/Actions/Catalogue/Product/Json/GetOrderProducts.php

@@ -14,6 +14,7 @@
 use App\Http\Resources\Catalogue\OrderProductsResource;
 use App\Models\Catalogue\Product;
 use App\Models\Ordering\Order;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -23,14 +24,23 @@
 class GetOrderProducts extends OrgAction
 {
     use WithCatalogueAuthorisation;
-
+    use HasSearchableText;
 
     public function handle(Order $order, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetOrderProductsForModification.php

@@ -14,6 +14,7 @@
 use App\Http\Resources\Catalogue\OrderProductsForModifyResource;
 use App\Models\Catalogue\Product;
 use App\Models\Ordering\Order;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -23,14 +24,23 @@
 class GetOrderProductsForModification extends OrgAction
 {
     use WithCatalogueAuthorisation;
-
+    use HasSearchableText;
 
     public function handle(Order $order, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetOutOfStockProductsInProductCategory.php

@@ -13,6 +13,7 @@
 use App\Http\Resources\Catalogue\ProductsWebpageResource;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\ProductCategory;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -21,12 +22,23 @@
 
 class GetOutOfStockProductsInProductCategory extends OrgAction
 {
+    use HasSearchableText;
+
     public function handle(ProductCategory $parent, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetProductsForVolGrGift.php

@@ -15,6 +15,7 @@
 use App\Http\Resources\Discounts\ProductsForVolGrGiftResource;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\Shop;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -24,15 +25,25 @@
 class GetProductsForVolGrGift extends OrgAction
 {
     use WithCatalogueAuthorisation;
+    use HasSearchableText;
 
     private Shop $parent;
 
     public function handle(Shop $parent, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetProductsInCollection.php

@@ -15,6 +15,7 @@
 use App\InertiaTable\InertiaTable;
 use App\Models\Catalogue\Collection;
 use App\Models\Catalogue\Product;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -23,12 +24,23 @@
 
 class GetProductsInCollection extends OrgAction
 {
+    use HasSearchableText;
+
     public function handle(Collection $collection, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetProductsInProductCategory.php

@@ -14,6 +14,7 @@
 use App\Http\Resources\Catalogue\ProductsWebpageResource;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\ProductCategory;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -22,12 +23,23 @@
 
 class GetProductsInProductCategory extends OrgAction
 {
+    use HasSearchableText;
+
     public function handle(ProductCategory $parent, $prefix = null, $seeAlso = false): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetProductsInWorkshop.php

@@ -14,6 +14,7 @@
 use App\Http\Resources\Catalogue\ProductsWebpageResource;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\Shop;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -23,15 +24,25 @@
 class GetProductsInWorkshop extends OrgAction
 {
     use WithCatalogueAuthorisation;
+    use HasSearchableText;
 
     private Shop $parent;
 
     public function handle(Shop $parent, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetProductsNotAttachedToACollection.php

@@ -14,6 +14,7 @@
 use App\Models\Catalogue\Collection;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\Shop;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -23,15 +24,25 @@
 class GetProductsNotAttachedToACollection extends OrgAction
 {
     use WithCatalogueAuthorisation;
+    use HasSearchableText;
 
     private Shop $parent;
 
     public function handle(Shop $parent, Collection $collection, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetProductsWithNoWebpage.php

@@ -14,6 +14,7 @@
 use App\InertiaTable\InertiaTable;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\Shop;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -22,12 +23,23 @@
 
 class GetProductsWithNoWebpage extends OrgAction
 {
+    use HasSearchableText;
+
     public function handle(Shop $shop, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });
 

app/Actions/Catalogue/Product/Json/GetTopProductsInProductCategory.php

@@ -14,6 +14,7 @@
 use App\InertiaTable\InertiaTable;
 use App\Models\Catalogue\Product;
 use App\Models\Catalogue\ProductCategory;
+use App\Models\Traits\HasSearchableText;
 use App\Services\QueryBuilder;
 use Illuminate\Contracts\Pagination\LengthAwarePaginator;
 use Illuminate\Http\Resources\Json\AnonymousResourceCollection;
@@ -22,12 +23,23 @@
 
 class GetTopProductsInProductCategory extends OrgAction
 {
+    use HasSearchableText;
+
     public function handle(ProductCategory $productCategory, $prefix = null): LengthAwarePaginator
     {
         $globalSearch = AllowedFilter::callback('global', function ($query, $value) {
             $query->where(function ($query) use ($value) {
-                $query->whereAnyWordStartWith('products.name', $value)
-                    ->orWhereStartWith('products.code', $value);
+                $normalizedValue = $this->normalizeSearchableText($value);
+
+                // Ignore if search token is less than 2 words
+                $searchTokens = array_values(array_filter(
+                    explode(' ', trim($normalizedValue)),
+                    fn ($t) => strlen($t) >= 2
+                ));
+
+                foreach ($searchTokens as $searchToken) {
+                    $query->where('searchable_text', 'ILIKE', "% {$searchToken}%");
+                }
             });
         });