Tweaks

lunarphp · Oct 15, 2024 · 0a36b6d · 0a36b6d
1 parent bc06fc1
commit 0a36b6d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 10 deletions.
diff --git a/packages/search/config/search.php b/packages/search/config/search.php
@@ -3,13 +3,13 @@
 return [
     'facets' => [
         \Lunar\Models\Product::class => [
-            'brand' => [],
-            'size' => [],
-            'colour' => [
-                'Red' => [
-                    'hex_value' => '#FF0000',
-                ],
-            ],
+            //            'brand' => [],
+            //            'size' => [],
+            //            'colour' => [
+            //                'Red' => [
+            //                    'hex_value' => '#FF0000',
+            //                ],
+            //            ],
         ],
     ],
 ];
diff --git a/packages/search/src/Data/SearchFacet.php b/packages/search/src/Data/SearchFacet.php
@@ -9,6 +9,7 @@
 class SearchFacet extends Data
 {
     public function __construct(
+        public string $label,
         public string $field,
         #[DataCollectionOf(FacetValue::class)]
         public array $values,

diff --git a/packages/search/src/Engines/MeilisearchEngine.php b/packages/search/src/Engines/MeilisearchEngine.php
@@ -9,7 +9,7 @@
 
 class MeilisearchEngine extends AbstractEngine
 {
-    public function get(): mixed
+    public function get(): SearchResults
     {
         $paginator = $this->getRawResults(function (Indexes $indexes, string $query, array $options) {
 

diff --git a/packages/search/src/Engines/TypesenseEngine.php b/packages/search/src/Engines/TypesenseEngine.php
@@ -9,7 +9,7 @@
 
 class TypesenseEngine extends AbstractEngine
 {
-    public function get(): mixed
+    public function get(): SearchResults
     {
         $paginator = $this->getRawResults(function (Documents $documents, string $query, array $options) {
 
@@ -34,7 +34,10 @@ public function get(): mixed
             }
 
             $options['q'] = $query;
-            $options['facet_by'] = 'brand,colour,size';
+            $facets = $this->getFacetConfig();
+
+            $options['facet_by'] = implode(',', array_keys($facets));
+            $options['max_facet_values'] = 50;
             $options['per_page'] = $this->perPage;
             $options['sort_by'] = $this->sort;
 
@@ -60,6 +63,7 @@ public function get(): mixed
 
         $facets = collect($results['facet_counts'])->map(
             fn ($facet) => SearchFacet::from([
+                'label' => $this->getFacetConfig($facet['field_name'])['label'] ?? '',
                 'field' => $facet['field_name'],
                 'values' => collect($facet['counts'])->map(
                     fn ($value) => SearchFacet\FacetValue::from([
@@ -72,6 +76,7 @@ public function get(): mixed
 
         foreach ($facets as $facet) {
             $facetConfig = $this->getFacetConfig($facet->field);
+
             foreach ($facet->values as $faceValue) {
                 if (empty($facetConfig[$faceValue->value])) {
                     continue;