distinguish search index conditions applied as preconditions

dolmit-tanel-paaro · dolmit-tanel-paaro · commit da0d7765b52a · 2025-05-28T09:06:06.000+03:00
diff --git a/src/FilterService/FilterType/SearchIndex/Input.php b/src/FilterService/FilterType/SearchIndex/Input.php
@@ -47,7 +47,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
 
         if (!empty($value)) {
             $value = '.*"' . $value .  '".*';
-            $productList->addCondition(['regexp' => ['attributes.' . $field => $value]], $field);
+            $productList->addCondition(
+                ['regexp' => ['attributes.' . $field => $value]],
+                $this->getConditionField($field, $isPrecondition)
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SearchIndex/MultiSelect.php b/src/FilterService/FilterType/SearchIndex/MultiSelect.php
@@ -83,10 +83,13 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             if (!empty($quotedValues)) {
                 if ($filterDefinition->getUseAndCondition()) {
                     foreach ($quotedValues as $value) {
-                        $productList->addCondition($value, $field);
+                        $productList->addCondition($value, $this->getConditionField($field, $isPrecondition));
                     }
                 } else {
-                    $productList->addCondition(['terms' => ['attributes.' . $field => $quotedValues]], $field);
+                    $productList->addCondition(
+                        ['terms' => ['attributes.' . $field => $quotedValues]],
+                        $this->getConditionField($field, $isPrecondition)
+                    );
                 }
             }
         }
diff --git a/src/FilterService/FilterType/SearchIndex/MultiSelectFromMultiSelect.php b/src/FilterService/FilterType/SearchIndex/MultiSelectFromMultiSelect.php
@@ -72,15 +72,21 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
 
             if ($filterDefinition->getUseAndCondition()) {
                 foreach ($value as $entry) {
-                    $productList->addCondition(['term' => ['attributes.' . $field => $entry]], $field);
+                    $productList->addCondition(
+                        ['term' => ['attributes.' . $field => $entry]],
+                        $this->getConditionField($field, $isPrecondition)
+                    );
                 }
             } else {
                 $boolArray = [];
                 foreach ($value as $entry) {
                     $boolArray[] = ['term' => ['attributes.' . $field => $entry]];
                 }
 
-                $productList->addCondition(['bool' => ['should' => $boolArray, 'minimum_should_match' => 1]], $field);
+                $productList->addCondition(
+                    ['bool' => ['should' => $boolArray, 'minimum_should_match' => 1]],
+                    $this->getConditionField($field, $isPrecondition)
+                );
             }
         }
 
diff --git a/src/FilterService/FilterType/SearchIndex/MultiSelectRelation.php b/src/FilterService/FilterType/SearchIndex/MultiSelectRelation.php
@@ -75,10 +75,13 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             if (!empty($quotedValues)) {
                 if ($filterDefinition->getUseAndCondition()) {
                     foreach ($quotedValues as $value) {
-                        $productList->addRelationCondition($field, $value);
+                        $productList->addRelationCondition($this->getConditionField($field, $isPrecondition), $value);
                     }
                 } else {
-                    $productList->addRelationCondition($field, ['terms' => ['relations.' . $field => $quotedValues]]);
+                    $productList->addRelationCondition(
+                        $this->getConditionField($field, $isPrecondition),
+                        ['terms' => ['relations.' . $field => $quotedValues]]
+                    );
                 }
             }
         }
diff --git a/src/FilterService/FilterType/SearchIndex/NumberRange.php b/src/FilterService/FilterType/SearchIndex/NumberRange.php
@@ -48,7 +48,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             if (strlen($value['to']) > 0) {
                 $range['lte'] = $value['to'];
             }
-            $productList->addCondition(['range' => ['attributes.' . $field => $range]], $field);
+            $productList->addCondition(
+                ['range' => ['attributes.' . $field => $range]],
+                $this->getConditionField($field, $isPrecondition),
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SearchIndex/NumberRangeSelection.php b/src/FilterService/FilterType/SearchIndex/NumberRangeSelection.php
@@ -55,7 +55,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             if (!empty($value['to'])) {
                 $range['lte'] = $value['to'];
             }
-            $productList->addCondition(['range' => ['attributes.' . $field => $range]], $field);
+            $productList->addCondition(
+                ['range' => ['attributes.' . $field => $range]],
+                $this->getConditionField($field, $isPrecondition)
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SearchIndex/Select.php b/src/FilterService/FilterType/SearchIndex/Select.php
@@ -42,7 +42,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
         $currentFilter[$field] = $value;
 
         if (!empty($value)) {
-            $productList->addCondition(trim($value), $field);
+            $productList->addCondition(trim($value), $this->getConditionField($field, $isPrecondition));
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SearchIndex/SelectCategory.php b/src/FilterService/FilterType/SearchIndex/SelectCategory.php
@@ -55,7 +55,8 @@ public function getFilterValues(AbstractFilterDefinitionType $filterDefinition,
 
     public function addCondition(AbstractFilterDefinitionType $filterDefinition, ProductListInterface $productList, array $currentFilter, array $params, bool $isPrecondition = false): array
     {
-        $value = $params[$filterDefinition->getField()] ?? null;
+        $field = $this->getField($filterDefinition);
+        $value = $params[$field] ?? null;
         $isReload = $params['is_reload'] ?? null;
 
         if ($value == AbstractFilterType::EMPTY_STRING) {
@@ -67,11 +68,11 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
             }
         }
 
-        $currentFilter[$filterDefinition->getField()] = $value;
+        $currentFilter[$field] = $value;
 
         if (!empty($value)) {
             $value = trim((string)$value);
-            $productList->addCondition($value, $filterDefinition->getField());
+            $productList->addCondition($value, $this->getConditionField($field, $isPrecondition));
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SearchIndex/SelectClassificationStoreAttributes.php b/src/FilterService/FilterType/SearchIndex/SelectClassificationStoreAttributes.php
@@ -133,7 +133,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
                     $currentFilter[$field][$keyId] = $filterValue;
 
                     $valueField = $nestedPath . '.' . $keyId . '.keyword';
-                    $productList->addCondition($filterValue, $valueField);
+                    $productList->addCondition($filterValue, $this->getConditionField($valueField, $isPrecondition));
                 }
             }
         }
diff --git a/src/FilterService/FilterType/SearchIndex/SelectFromMultiSelect.php b/src/FilterService/FilterType/SearchIndex/SelectFromMultiSelect.php
@@ -45,7 +45,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
         $currentFilter[$field] = $value;
 
         if (!empty($value)) {
-            $productList->addCondition(['term' => ['attributes.' . $field => $value]], $field);
+            $productList->addCondition(
+                ['term' => ['attributes.' . $field => $value]],
+                $this->getConditionField($field, $isPrecondition)
+            );
         }
 
         return $currentFilter;
diff --git a/src/FilterService/FilterType/SearchIndex/SelectRelation.php b/src/FilterService/FilterType/SearchIndex/SelectRelation.php
@@ -44,7 +44,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro
         $currentFilter[$field] = $value;
 
         if (!empty($value)) {
-            $productList->addRelationCondition($field, $value);
+            $productList->addRelationCondition($this->getConditionField($field, $isPrecondition), $value);
         }
 
         return $currentFilter;

Original file line number	Diff line number	Diff line change
`@@ -83,10 +83,13 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`83`	`83`	`if (!empty($quotedValues)) {`
`84`	`84`	`if ($filterDefinition->getUseAndCondition()) {`
`85`	`85`	`foreach ($quotedValues as $value) {`
`86`		`- $productList->addCondition($value, $field);`
	`86`	`+ $productList->addCondition($value, $this->getConditionField($field, $isPrecondition));`
`87`	`87`	`}`
`88`	`88`	`} else {`
`89`		`- $productList->addCondition(['terms' => ['attributes.' . $field => $quotedValues]], $field);`
	`89`	`+ $productList->addCondition(`
	`90`	`+ ['terms' => ['attributes.' . $field => $quotedValues]],`
	`91`	`+ $this->getConditionField($field, $isPrecondition)`
	`92`	`+ );`
`90`	`93`	`}`
`91`	`94`	`}`
`92`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,15 +72,21 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`72`	`72`
`73`	`73`	`if ($filterDefinition->getUseAndCondition()) {`
`74`	`74`	`foreach ($value as $entry) {`
`75`		`- $productList->addCondition(['term' => ['attributes.' . $field => $entry]], $field);`
	`75`	`+ $productList->addCondition(`
	`76`	`+ ['term' => ['attributes.' . $field => $entry]],`
	`77`	`+ $this->getConditionField($field, $isPrecondition)`
	`78`	`+ );`
`76`	`79`	`}`
`77`	`80`	`} else {`
`78`	`81`	`$boolArray = [];`
`79`	`82`	`foreach ($value as $entry) {`
`80`	`83`	`$boolArray[] = ['term' => ['attributes.' . $field => $entry]];`
`81`	`84`	`}`
`82`	`85`
`83`		`- $productList->addCondition(['bool' => ['should' => $boolArray, 'minimum_should_match' => 1]], $field);`
	`86`	`+ $productList->addCondition(`
	`87`	`+ ['bool' => ['should' => $boolArray, 'minimum_should_match' => 1]],`
	`88`	`+ $this->getConditionField($field, $isPrecondition)`
	`89`	`+ );`
`84`	`90`	`}`
`85`	`91`	`}`
`86`	`92`
Original file line number	Diff line number	Diff line change
`@@ -75,10 +75,13 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`75`	`75`	`if (!empty($quotedValues)) {`
`76`	`76`	`if ($filterDefinition->getUseAndCondition()) {`
`77`	`77`	`foreach ($quotedValues as $value) {`
`78`		`- $productList->addRelationCondition($field, $value);`
	`78`	`+ $productList->addRelationCondition($this->getConditionField($field, $isPrecondition), $value);`
`79`	`79`	`}`
`80`	`80`	`} else {`
`81`		`- $productList->addRelationCondition($field, ['terms' => ['relations.' . $field => $quotedValues]]);`
	`81`	`+ $productList->addRelationCondition(`
	`82`	`+ $this->getConditionField($field, $isPrecondition),`
	`83`	`+ ['terms' => ['relations.' . $field => $quotedValues]]`
	`84`	`+ );`
`82`	`85`	`}`
`83`	`86`	`}`
`84`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`48`	`48`	`if (strlen($value['to']) > 0) {`
`49`	`49`	`$range['lte'] = $value['to'];`
`50`	`50`	`}`
`51`		`- $productList->addCondition(['range' => ['attributes.' . $field => $range]], $field);`
	`51`	`+ $productList->addCondition(`
	`52`	`+ ['range' => ['attributes.' . $field => $range]],`
	`53`	`+ $this->getConditionField($field, $isPrecondition),`
	`54`	`+ );`
`52`	`55`	`}`
`53`	`56`
`54`	`57`	`return $currentFilter;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,10 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`55`	`55`	`if (!empty($value['to'])) {`
`56`	`56`	`$range['lte'] = $value['to'];`
`57`	`57`	`}`
`58`		`- $productList->addCondition(['range' => ['attributes.' . $field => $range]], $field);`
	`58`	`+ $productList->addCondition(`
	`59`	`+ ['range' => ['attributes.' . $field => $range]],`
	`60`	`+ $this->getConditionField($field, $isPrecondition)`
	`61`	`+ );`
`59`	`62`	`}`
`60`	`63`
`61`	`64`	`return $currentFilter;`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`42`	`42`	`$currentFilter[$field] = $value;`
`43`	`43`
`44`	`44`	`if (!empty($value)) {`
`45`		`- $productList->addCondition(trim($value), $field);`
	`45`	`+ $productList->addCondition(trim($value), $this->getConditionField($field, $isPrecondition));`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`return $currentFilter;`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,8 @@ public function getFilterValues(AbstractFilterDefinitionType $filterDefinition,`
`55`	`55`
`56`	`56`	`public function addCondition(AbstractFilterDefinitionType $filterDefinition, ProductListInterface $productList, array $currentFilter, array $params, bool $isPrecondition = false): array`
`57`	`57`	`{`
`58`		`- $value = $params[$filterDefinition->getField()] ?? null;`
	`58`	`+ $field = $this->getField($filterDefinition);`
	`59`	`+ $value = $params[$field] ?? null;`
`59`	`60`	`$isReload = $params['is_reload'] ?? null;`
`60`	`61`
`61`	`62`	`if ($value == AbstractFilterType::EMPTY_STRING) {`
`@@ -67,11 +68,11 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`
`70`		`- $currentFilter[$filterDefinition->getField()] = $value;`
	`71`	`+ $currentFilter[$field] = $value;`
`71`	`72`
`72`	`73`	`if (!empty($value)) {`
`73`	`74`	`$value = trim((string)$value);`
`74`		`- $productList->addCondition($value, $filterDefinition->getField());`
	`75`	`+ $productList->addCondition($value, $this->getConditionField($field, $isPrecondition));`
`75`	`76`	`}`
`76`	`77`
`77`	`78`	`return $currentFilter;`
Original file line number	Diff line number	Diff line change
`@@ -133,7 +133,7 @@ public function addCondition(AbstractFilterDefinitionType $filterDefinition, Pro`
`133`	`133`	`$currentFilter[$field][$keyId] = $filterValue;`
`134`	`134`
`135`	`135`	`$valueField = $nestedPath . '.' . $keyId . '.keyword';`
`136`		`- $productList->addCondition($filterValue, $valueField);`
	`136`	`+ $productList->addCondition($filterValue, $this->getConditionField($valueField, $isPrecondition));`
`137`	`137`	`}`
`138`	`138`	`}`
`139`	`139`	`}`