Refactor

Author: WaVEV

django_mongodb_backend/fields/embedded_model_array.py

@@ -66,55 +66,56 @@ class EMFArrayExact(EMFExact):
     def as_mql(self, compiler, connection):
         lhs_mql = process_lhs(self, compiler, connection)
         value = process_rhs(self, compiler, connection)
-        if isinstance(self.lhs, Col | KeyTransform):
-            if isinstance(self.lhs, Col):
-                inner_lhs_mql = "$$item"
-            else:
-                lhs_mql, inner_lhs_mql = lhs_mql
-            if isinstance(value, models.Model):
-                value, emf_data = self.model_to_dict(value)
-                # Get conditions for any nested EmbeddedModelFields.
-                conditions = self.get_conditions({inner_lhs_mql: (value, emf_data)})
-                return {
-                    "$anyElementTrue": {
-                        "$ifNull": [
-                            {
-                                "$map": {
-                                    "input": lhs_mql,
-                                    "as": "item",
-                                    "in": {"$and": conditions},
-                                }
-                            },
-                            [],
-                        ]
-                    }
-                }
+        if isinstance(self.lhs, KeyTransform):
+            lhs_mql, inner_lhs_mql = lhs_mql
+        else:
+            inner_lhs_mql = "$$item"
+        if isinstance(value, models.Model):
+            value, emf_data = self.model_to_dict(value)
+            # Get conditions for any nested EmbeddedModelFields.
+            conditions = self.get_conditions({inner_lhs_mql: (value, emf_data)})
             return {
                 "$anyElementTrue": {
                     "$ifNull": [
                         {
                             "$map": {
                                 "input": lhs_mql,
                                 "as": "item",
-                                "in": {"$eq": [inner_lhs_mql, value]},
+                                "in": {"$and": conditions},
                             }
                         },
                         [],
                     ]
                 }
             }
-        return connection.mongo_operators[self.lookup_name](lhs_mql, value)
+        return {
+            "$anyElementTrue": {
+                "$ifNull": [
+                    {
+                        "$map": {
+                            "input": lhs_mql,
+                            "as": "item",
+                            "in": {"$eq": [inner_lhs_mql, value]},
+                        }
+                    },
+                    [],
+                ]
+            }
+        }
 
 
 class KeyTransform(Transform):
     # it should be different class than EMF keytransform even most of the methods are equal.
     def __init__(self, key_name, base_field, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.base_field = base_field
-        #  TODO: Need to create a column, will refactor this thing.
+        self.key_name = key_name
+        # The iteration items begins from the base_field, a virtual column with
+        # base field output type is created.
         column_target = base_field.clone()
-        column_target.db_column = f"$item.{key_name}"
-        column_target.set_attributes_from_name(f"$item.{key_name}")
+        column_name = f"$item.{key_name}"
+        column_target.db_column = column_name
+        column_target.set_attributes_from_name(column_name)
         self._lhs = Col(None, column_target)
         self._sub_transform = None
 
@@ -125,19 +126,8 @@ def __call__(self, this, *args, **kwargs):
     def get_lookup(self, name):
         return self.output_field.get_lookup(name)
 
-    def get_transform(self, name):
-        """
-        Validate that `name` is either a field of an embedded model or a
-        lookup on an embedded model's field.
-        """
-        if isinstance(self._lhs, Transform):
-            transform = self._lhs.get_transform(name)
-        else:
-            transform = self.base_field.get_transform(name)
-        if transform:
-            self._sub_transform = transform
-            return self
-        suggested_lookups = difflib.get_close_matches(name, self.base_field.get_lookups())
+    def _get_missing_field_or_lookup_exception(self, lhs, name):
+        suggested_lookups = difflib.get_close_matches(name, lhs.get_lookups())
         if suggested_lookups:
             suggested_lookups = " or ".join(suggested_lookups)
             suggestion = f", perhaps you meant {suggested_lookups}?"
@@ -149,6 +139,25 @@ def get_transform(self, name):
             f"{suggestion}"
         )
 
+    def get_transform(self, name):
+        """
+        Validate that `name` is either a field of an embedded model or a
+        lookup on an embedded model's field.
+        """
+        # Once the sub lhs is a transform, all the filter are applied over it.
+
+        transform = (
+            self._lhs.get_transform(name)
+            if isinstance(self._lhs, Transform)
+            else self.base_field.get_transform(name)
+        )
+        if transform:
+            self._sub_transform = transform
+            return self
+        raise self._get_missing_field_or_lookup_exception(
+            self._lhs if isinstance(self._lhs, Transform) else self.base_field, name
+        )
+
     def as_mql(self, compiler, connection):
         inner_lhs_mql = self._lhs.as_mql(compiler, connection)
         lhs_mql = process_lhs(self, compiler, connection)

tests/model_fields_/models.py

@@ -188,17 +188,12 @@ class ExhibitSection(EmbeddedModel):
     artifacts = EmbeddedModelArrayField(ArtifactDetail, null=True)
 
 
-class ExhibitMeta(EmbeddedModel):
-    curator_name = models.CharField(max_length=255)
-    artifacts = EmbeddedModelArrayField(ArtifactDetail, null=True)
-
-
 class MuseumExhibit(models.Model):
     """An exhibit in the museum, composed of multiple sections."""
 
     exhibit_name = models.CharField(max_length=255)
     sections = EmbeddedModelArrayField(ExhibitSection, null=True)
-    meta = EmbeddedModelField(ExhibitMeta, null=True)
+    main_section = EmbeddedModelField(ExhibitSection, null=True)
 
     def __str__(self):
         return self.exhibit_name

tests/model_fields_/test_embedded_model.py

@@ -23,7 +23,6 @@
     Author,
     Book,
     Data,
-    ExhibitMeta,
     ExhibitSection,
     Holder,
     Library,
@@ -202,8 +201,8 @@ def setUpTestData(cls):
         )
         cls.lost_empires = MuseumExhibit.objects.create(
             exhibit_name="Lost Empires",
-            meta=ExhibitMeta(
-                curator_name="Dr. Amina Hale",
+            main_section=ExhibitSection(
+                section_number=3,
                 artifacts=[
                     ArtifactDetail(
                         name="Bronze Statue",