refactor.

Author: WaVEV

django_mongodb/fields/embedded_model.py

@@ -151,24 +151,25 @@ def get_transform(self, name):
             new_field = opts.get_field(name)
             result = KeyTransformFactory(name, new_field)
         else:
-            if self.ref_field is not None and self.ref_field.get_transform(name) is None:
+            if self.ref_field.get_transform(name) is None:
                 raise FieldDoesNotExist(
                     f"{self.ref_field.model._meta.object_name} has no field named '{name}'"
                 )
-            result = KeyTransformFactory(name, None)
+            result = KeyTransformFactory(name, self.ref_field)
         return result
 
     def preprocess_lhs(self, compiler, connection):
         previous = self
         embedded_key_transforms = []
         json_key_transforms = []
         while isinstance(previous, KeyTransform):
-            if previous.ref_field is not None:
+            if isinstance(previous.ref_field, EmbeddedModelField):
                 embedded_key_transforms.insert(0, previous.key_name)
             else:
                 json_key_transforms.insert(0, previous.key_name)
             previous = previous.lhs
         mql = previous.as_mql(compiler, connection)
+        embedded_key_transforms.append(json_key_transforms.pop(0))
         return mql, embedded_key_transforms, json_key_transforms
 
 

tests/model_fields_/test_embedded_model.py

@@ -179,7 +179,6 @@ def test_embedded_with_json_field(self):
     def _truncate_ms(time):
         return time - timedelta(microseconds=time.microsecond)
 
-    ################
     def test_ordering_by_embedded_field(self):
         query = (
             EmbeddedModelFieldModel.objects.filter(simple__someint__gt=3)