alter the options to include analyzer/searchanalyzer

Author: Jibola

django_mongodb_backend/indexes.py

@@ -193,7 +193,7 @@ def get_pymongo_index_model(
         if self.search_analyzer is not None:
             analyzers["searchAnalyzer"] = self.search_analyzer
         return SearchIndexModel(
-            definition={"mappings": {"dynamic": False, "fields": fields, **analyzers}},
+            definition={"mappings": {"dynamic": False, "fields": fields}, **analyzers},
             name=self.name,
         )
 

django_mongodb_backend/introspection.py

@@ -44,7 +44,11 @@ def _get_search_index_info(self, table_name):
                 type_ = VectorSearchIndex.suffix
                 options = details
             else:
-                options = details["latestDefinition"]["mappings"]
+                options = {
+                    "analyzer": details["latestDefinition"].get("analyzer"),
+                    "searchAnalyzer": details["latestDefinition"].get("searchAnalyzer"),
+                    "mappings": details["latestDefinition"]["mappings"],
+                }
                 columns = list(options.get("fields", {}).keys())
                 type_ = SearchIndex.suffix
             constraints[details["name"]] = {

tests/indexes_/test_search_indexes.py

@@ -202,7 +202,7 @@ def test_valid_fields(self):
                 },
             }
             self.assertCountEqual(index_info[index.name]["columns"], index.fields)
-            self.assertEqual(index_info[index.name]["options"], expected_options)
+            self.assertEqual(index_info[index.name]["options"]["mappings"], expected_options)
         finally:
             with connection.schema_editor() as editor:
                 editor.remove_index(index=index, model=SearchIndexTestModel)
@@ -212,12 +212,10 @@ def test_field_mappings(self):
             name="recent_test_idx",
             field_mappings={
                 "char": {
-                    "type": "string",
-                    "analyzer": "lucene.standard",
-                    "searchAnalyzer": "lucene.standard",
+                    "indexOptions": "offsets",
                     "norms": "include",
                     "store": True,
-                    "indexOptions": "offsets",
+                    "type": "string",
                 }
             },
         )
@@ -232,17 +230,15 @@ def test_field_mappings(self):
                 "dynamic": False,
                 "fields": {
                     "char": {
-                        "type": "string",
-                        "analyzer": "lucene.standard",
-                        "searchAnalyzer": "lucene.standard",
+                        "indexOptions": "offsets",
                         "norms": "include",
                         "store": True,
-                        "indexOptions": "offsets",
+                        "type": "string",
                     }
                 },
             }
             self.assertCountEqual(index_info[index.name]["columns"], index.fields)
-            self.assertEqual(index_info[index.name]["options"], expected_options)
+            self.assertEqual(index_info[index.name]["options"]["mappings"], expected_options)
         finally:
             with connection.schema_editor() as editor:
                 editor.remove_index(index=index, model=SearchIndexTestModel)
@@ -262,16 +258,18 @@ def test_analyzer_inclusion(self):
                 table_name=SearchIndexTestModel._meta.db_table,
             )
             expected_options = {
-                "dynamic": False,
                 "analyzer": "lucene.simple",
                 "searchAnalyzer": "lucene.simple",
-                "fields": {
-                    "char": {
-                        "indexOptions": "offsets",
-                        "norms": "include",
-                        "store": True,
-                        "type": "string",
-                    }
+                "mappings": {
+                    "dynamic": False,
+                    "fields": {
+                        "char": {
+                            "indexOptions": "offsets",
+                            "norms": "include",
+                            "store": True,
+                            "type": "string",
+                        }
+                    },
                 },
             }
             self.assertCountEqual(index_info[index.name]["columns"], index.fields)