INTPYTHON-599 Make a field's custom lookups available in embedded model queries

Author: timgraham

django_mongodb_backend/fields/embedded_model.py

@@ -155,6 +155,9 @@ def __init__(self, key_name, ref_field, *args, **kwargs):
         self.key_name = str(key_name)
         self.ref_field = ref_field
 
+    def get_lookup(self, name):
+        return self.ref_field.get_lookup(name)
+
     def get_transform(self, name):
         """
         Validate that `name` is either a field of an embedded model or a
@@ -204,6 +207,10 @@ def as_mql(self, compiler, connection):
             result = build_json_mql_path(result, json_key_transforms)
         return result
 
+    @property
+    def output_field(self):
+        return self.ref_field
+
 
 class KeyTransformFactory:
     def __init__(self, key_name, ref_field):

tests/model_fields_/models.py

@@ -110,12 +110,14 @@ class Address(EmbeddedModel):
     city = models.CharField(max_length=20)
     state = models.CharField(max_length=2)
     zip_code = models.IntegerField(db_index=True)
+    tags = ArrayField(models.CharField(max_length=100), null=True, blank=True)
 
 
 class Author(EmbeddedModel):
     name = models.CharField(max_length=10)
     age = models.IntegerField()
     address = EmbeddedModelField(Address)
+    skills = ArrayField(models.CharField(max_length=100), null=True, blank=True)
 
 
 class Book(models.Model):

tests/model_fields_/test_embedded_model.py

@@ -185,6 +185,29 @@ def test_nested(self):
         )
         self.assertCountEqual(Book.objects.filter(author__address__city="NYC"), [obj])
 
+    def test_embedded_array_field_lookups(self):
+        obj = Book.objects.create(
+            author=Author(
+                name="Shakespeare",
+                age=55,
+                skills=["writing", "editing"],
+                address=Address(city="NYC", state="NY", tags=["home", "shipping"]),
+            ),
+        )
+        self.assertCountEqual(Book.objects.filter(author__skills__contains=["nonexistent"]), [])
+        self.assertCountEqual(Book.objects.filter(author__skills__contains=["writing"]), [obj])
+        self.assertCountEqual(
+            Book.objects.filter(author__skills__contained_by=["writing", "editing", "publishing"]),
+            [obj],
+        )
+        self.assertCountEqual(
+            Book.objects.filter(author__address__tags__contains=["nonexistent"]), []
+        )
+        self.assertCountEqual(Book.objects.filter(author__address__tags__contains=["home"]), [obj])
+        self.assertCountEqual(
+            Book.objects.filter(author__address__tags__overlap=["shipping", "work"]), [obj]
+        )
+
 
 class InvalidLookupTests(SimpleTestCase):
     def test_invalid_field(self):