feat: TM search filter by app/licence (dvsa/olcs-backend#145)

dvsa · Apr 17, 2024 · f701c59 · f701c59
1 parent 42ec4db
commit f701c59
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 1 deletion.
diff --git a/app/api/module/Olcs/Db/src/Service/Search/QueryTemplate.php b/app/api/module/Olcs/Db/src/Service/Search/QueryTemplate.php
@@ -14,6 +14,7 @@
 class QueryTemplate extends Query
 {
     public const FILTER_TYPE_DYNAMIC = 'DYNAMIC';
+    public const FILTER_TYPE_FIXED = 'FIXED';
     public const FILTER_TYPE_BOOLEAN = 'BOOLEAN';
 
     public function __construct(
@@ -69,6 +70,16 @@ private function applyFilters(array $filters, array $filterTypes): self
             }
 
             switch ($filterTypes[$field]) {
+                case self::FILTER_TYPE_FIXED:
+                    $fields = explode('|', $field);
+                    foreach ($fields as $subField) {
+                        $this->_params['query']['bool']['must']['bool']['must']['bool']['should'][] = [
+                            'terms' => [
+                                $subField => explode('|', $value),
+                            ],
+                        ];
+                    }
+                    break;
                 case self::FILTER_TYPE_DYNAMIC:
                     $this->_params['query']['bool']['filter'][] = [
                         'term' => [

diff --git a/app/api/test/module/Olcs/Db/src/Service/Search/QueryTemplateTest.php b/app/api/test/module/Olcs/Db/src/Service/Search/QueryTemplateTest.php
@@ -224,11 +224,13 @@ public function queryTemplateDataProvider()
                     'field_1' => 'value1',
                     'field_2' => 'value2',
                     'field_3' => '0',
+                    'field_4|field_5' => 'value3|value4',
                 ],
                 [
                     'field_1' => 'DYNAMIC',
                     'field_2' => 'DYNAMIC',
                     'field_3' => 'BOOLEAN',
+                    'field_4|field_5' => 'FIXED'
                 ],
                 [],
                 [
@@ -241,7 +243,23 @@ public function queryTemplateDataProvider()
                                             'field_1' => 'SMITH'
                                         ]
                                     ]
-                                ]
+                                ],
+                                'must' => [
+                                    'bool' => [
+                                        'should' => [
+                                            [
+                                                'terms' => [
+                                                    'field_4' => ['value3', 'value4'],
+                                                ]
+                                            ],
+                                            [
+                                                'terms' => [
+                                                    'field_5' => ['value3', 'value4'],
+                                                ]
+                                            ],
+                                        ],
+                                    ],
+                                ],
                             ]
                         ],
                         'filter' => [