Change fields for search and fix deepspaceobjects mapping

Astro-Otter-Space · Mar 25, 2024 · 2c70e10 · 2c70e10
1 parent 9344b67
commit 2c70e10
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 13 deletions.
diff --git a/api/config/elasticsearch/mappings/deepspaceobjects.mapping.json b/api/config/elasticsearch/mappings/deepspaceobjects.mapping.json
@@ -19,7 +19,8 @@
         "type": "text",
         "fields": {
           "keyword": {
-            "type": "keyword"
+            "type": "keyword",
+            "normalizer": "lowercase_normalizer"
           }
         }
       },
@@ -115,7 +116,8 @@
         "fielddata": true,
         "fields": {
           "keyword": {
-            "type": "keyword"
+            "type": "keyword",
+            "normalizer": "lowercase_normalizer"
           }
         }
       },
@@ -126,7 +128,8 @@
         "type": "text",
         "fields": {
           "keyword": {
-            "type": "keyword"
+            "type": "keyword",
+            "normalizer": "lowercase_normalizer"
           }
         }
       },

diff --git a/api/src/Repository/ElasticsearchRepository/DsoRepository.php b/api/src/Repository/ElasticsearchRepository/DsoRepository.php
@@ -100,25 +100,46 @@ public function getRandomDso(int $offset, int $limit): array
     // GetDsoCatalogs
     public function getDsosFiltersBy(array $filters, int $offset, int $limit): array
     {
+
         $fieldsFilters = [
             'query' => [
                 'bool' => [
                     'must' =>
                         array_map(function(string $field, string $value): array {
-                            return [
-                                'term' => [$field => $value]
-                            ];
+                            if ('magnitude' !== $field) {
+                                $field = self::$listAggregates[$field]['field'];
+                                $value = strtolower($value);
+                                return [
+                                    'term' => [$field => $value]
+                                ];
+                            } else {
+                                $keyRange = array_search($value, array_column(self::$listAggregatesRange[$field]['ranges'], 'key'), true);
+                                $range = self::$listAggregatesRange[$field]['ranges'][$keyRange];
+                                if (array_key_exists('to', $range)) {
+                                    $paramRange['lte'] = $range['to'];
+                                }
+                                if (array_key_exists('from', $range)) {
+                                    $paramRange['gte'] = $range['from'];
+                                }
+                                $field = self::$listAggregatesRange[$field]['field'];
+                                return [
+                                    'range' => [$field => $paramRange]
+                                ];
+                            }
+
                         }, array_keys($filters), $filters)
                 ]
             ]
         ];
+
         $sort = [
             'sort' => [
                 ['order' => 'asc']
             ],
             'from' => $offset,
             'size' => $limit
         ];
+
         $aggregates = [
             'aggs' =>
                 array_merge(
@@ -145,13 +166,11 @@ public function getDsosFiltersBy(array $filters, int $offset, int $limit): array
                 )
         ];
 
-
         $param = [
             'index' => $this->getIndex(),
             'body' => array_merge($fieldsFilters, $sort, $aggregates),
         ];
 
-
         $results = $this->client->search($param);
         ['total' => $total, 'hits' => $hits] = $results['hits'];
         ['aggregations' => $aggregations] = $results;

diff --git a/api/src/State/DsoStateProvider.php b/api/src/State/DsoStateProvider.php
@@ -41,11 +41,6 @@ public function provide(
                 return in_array($paramKey, $authorizedQueryParams);
             }, ARRAY_FILTER_USE_KEY);
 
-            if (array_key_exists('constellation', $filters)) {
-                $filters['constId'] = $filters['constellation'];
-                unset($filters['constellation']);
-            }
-
             [
                 'total' => $total,
                 'documents' => $documents,