Issue57 fix

tastypie_mongoengine/fields.py

@@ -256,11 +256,7 @@ def build_schema(self):
         }
 
     def dehydrate(self, bundle, for_list=True):
-        if not bundle.obj or not bundle.obj.pk:
-            if not self.null:
-                raise exceptions.ApiFieldError("The document %r does not have a primary key and can not be used in a ReferencedList context." % bundle.obj)
-
-            return []
+        assert bundle.obj
 
         the_m2ms = None
 

tastypie_mongoengine/test_runner.py

@@ -7,6 +7,21 @@
 from mongoengine import connect, connection
 from mongoengine.django import tests
 
+DB_NAME = 'test_%s' % settings.MONGO_DATABASE_NAME
+
+
+def _connect():
+    connection.disconnect()
+    connect(DB_NAME, **getattr(settings, 'MONGO_DATABASE_OPTIONS', {}))
+
+
+# We need to call this at module load time, because unit test discover will
+# cause all of the resource classes to be loaded, and they will all construct
+# their querysets using the default connection, so we need to be sure that
+# it points to our test database.
+_connect()
+
+
 class MongoEngineTestSuiteRunner(simple.DjangoTestSuiteRunner):
     """
     It is the same as in DjangoTestSuiteRunner, but without relational databases.
@@ -42,8 +57,7 @@ def build_suite(self, test_labels, extra_tests=None, **kwargs):
         return simple.reorder_suite(suite, (testcases.TestCase,))
 
     def setup_databases(self, **kwargs):
-        connection.disconnect()
-        connect(self.db_name, **getattr(settings, 'MONGO_DATABASE_OPTIONS', {}))
+        _connect()
 
     def teardown_databases(self, old_config, **kwargs):
         connection.get_connection().drop_database(self.db_name)

tests/test_project/test_app/api/resources.py

@@ -227,6 +227,30 @@ class Meta:
         allowed_methods = ('get', 'post', 'put', 'patch', 'delete')
         authorization = tastypie_authorization.Authorization()
 
+class EmbeddedWithReferencedListResource(resources.MongoEngineResource):
+    referencedlist = fields.ReferencedListField(of='test_project.test_app.api.resources.PersonResource', attribute='referencedlist', full=False, null=True)
+
+    class Meta:
+        object_class = documents.EmbeddedWithReferencedList
+        allowed_methods = ('get', 'post', 'put', 'patch', 'delete')
+        authorization = tastypie_authorization.Authorization()
+
+class EmbeddedReferencedListFieldTestResource(resources.MongoEngineResource):
+    embedded = fields.EmbeddedDocumentField(embedded='test_project.test_app.api.resources.EmbeddedWithReferencedListResource', attribute='embedded')
+
+    class Meta:
+        queryset = documents.EmbeddedReferencedListFieldTest.objects.all()
+        allowed_methods = ('get', 'post', 'put', 'patch', 'delete')
+        authorization = tastypie_authorization.Authorization()
+
+class ListOfEmbeddedReferencedListFieldTestResource(resources.MongoEngineResource):
+    embeddedlist = fields.EmbeddedListField(of='test_project.test_app.api.resources.EmbeddedWithReferencedListResource', attribute='embeddedlist', full=True)
+
+    class Meta:
+        queryset = documents.ListOfEmbeddedReferencedListFieldTest.objects.all()
+        allowed_methods = ('get', 'post', 'put', 'patch', 'delete')
+        authorization = tastypie_authorization.Authorization()
+
 class AutoAllocationFieldTestResource(resources.MongoEngineResource):
     slug = tastypie_fields.CharField(readonly=True, attribute='slug')
 

tests/test_project/test_app/documents.py

@@ -96,6 +96,15 @@ class EmbeddedListWithFlagFieldTest(InheritableDocument):
     embeddedlist = mongoengine.ListField(mongoengine.EmbeddedDocumentField(EmbeddedPerson))
     is_published = mongoengine.BooleanField(default=False, required=True)
 
+class EmbeddedWithReferencedList(InheritableEmbeddedDocument):
+    referencedlist = mongoengine.ListField(mongoengine.ReferenceField(Person))
+
+class EmbeddedReferencedListFieldTest(InheritableDocument):
+    embedded = mongoengine.EmbeddedDocumentField(EmbeddedWithReferencedList)
+
+class ListOfEmbeddedReferencedListFieldTest(InheritableDocument):
+    embeddedlist = mongoengine.ListField(mongoengine.EmbeddedDocumentField(EmbeddedWithReferencedList))
+
 class AutoAllocationFieldTest(InheritableDocument):
     name = mongoengine.StringField(required=True)
     slug = mongoengine.StringField(required=True)

tests/test_project/test_app/tests/test_basic.py

@@ -913,6 +913,34 @@ def test_referencedlistnonfull(self):
 
         self.assertEqual(response['name'], 'Person 1')
 
+    def test_embeddedreferencedlist_get(self):
+        person = documents.Person.objects.create(name="Person 1")
+        obj = documents.EmbeddedReferencedListFieldTest.objects.create(embedded=documents.EmbeddedWithReferencedList(referencedlist=[person]))
+
+        response = self.c.get(resources.EmbeddedReferencedListFieldTestResource().get_resource_uri(obj))
+        self.assertEqual(response.status_code, 200)
+        response = json.loads(response.content)
+
+        embedded = response['embedded']
+        self.assertIn('referencedlist', embedded)
+        self.assertEqual(embedded['referencedlist'], [resources.PersonResource().get_resource_uri(person)])
+
+    def test_listofembeddedreferencedlist_get(self):
+        person = documents.Person.objects.create(name="Person 1")
+        obj = documents.ListOfEmbeddedReferencedListFieldTest.objects.create(embeddedlist=[
+            documents.EmbeddedWithReferencedList(referencedlist=[person])
+        ])
+
+        response = self.c.get(resources.ListOfEmbeddedReferencedListFieldTestResource().get_resource_uri(obj))
+        self.assertEqual(response.status_code, 200)
+        response = json.loads(response.content)
+
+        self.assertIn('embeddedlist', response)
+        self.assertEqual(len(response['embeddedlist']), 1)
+        embedded = response['embeddedlist'][0]
+        self.assertIn('referencedlist', embedded)
+        self.assertEqual(embedded['referencedlist'], [resources.PersonResource().get_resource_uri(person)])
+
     def test_polymorphic_schema(self):
         person_schema_uri = self.resourceListURI('person') + 'schema/'
 

tests/test_project/urls.py

@@ -25,6 +25,9 @@
 v1_api.register(resources.ReferencedListFieldNonFullTestResource())
 v1_api.register(resources.BooleanMapTestResource())
 v1_api.register(resources.EmbeddedListWithFlagFieldTestResource())
+v1_api.register(resources.EmbeddedWithReferencedListResource())
+v1_api.register(resources.EmbeddedReferencedListFieldTestResource())
+v1_api.register(resources.ListOfEmbeddedReferencedListFieldTestResource())
 v1_api.register(resources.AutoAllocationFieldTestResource())
 v1_api.register(resources.ExporterResource())
 v1_api.register(resources.PipeResource())