fixed same bug for nested List inside MapField, little code refactori…

…ng, added test for nested list and nested reference fields
MongoEngine · Apr 30, 2015 · ebaba95 · ebaba95
1 parent 31f7769
commit ebaba95
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/mongoengine/dereference.py b/mongoengine/dereference.py
@@ -219,11 +219,9 @@ def _attach_objects(self, items, depth=0, instance=None, name=None):
                         data[k]._data[field_name] = self.object_map.get(v.id, v)
                     elif isinstance(v, (dict, SON)) and '_ref' in v:
                         data[k]._data[field_name] = self.object_map.get(v['_ref'].id, v)
-                    elif isinstance(v, dict) and depth <= self.max_depth:
+                    elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                         item_name = "{0}.{1}.{2}".format(name, k, field_name)
                         data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=item_name)
-                    elif isinstance(v, (list, tuple)) and depth <= self.max_depth:
-                        data[k]._data[field_name] = self._attach_objects(v, depth, instance=instance, name=name)
             elif isinstance(v, (dict, list, tuple)) and depth <= self.max_depth:
                 item_name = '%s.%s' % (name, k) if name else name
                 data[k] = self._attach_objects(v, depth - 1, instance=instance, name=item_name)

diff --git a/tests/document/delta.py b/tests/document/delta.py
@@ -828,12 +828,17 @@ class User(Document):
         self.assertEqual(org2.name, 'New Org 2')
 
     def test_delta_for_nested_map_fields(self):
+        class UInfoDocument(Document):
+            phone = StringField()
+
         class EmbeddedRole(EmbeddedDocument):
             type = StringField()
 
         class EmbeddedUser(EmbeddedDocument):
             name = StringField()
             roles = MapField(field=EmbeddedDocumentField(EmbeddedRole))
+            rolist = ListField(field=EmbeddedDocumentField(EmbeddedRole))
+            info = ReferenceField(UInfoDocument)
 
         class Doc(Document):
             users = MapField(field=EmbeddedDocumentField(EmbeddedUser))
@@ -845,11 +850,21 @@ class Doc(Document):
         doc.users["007"] = EmbeddedUser(name="Agent007")
         doc.save()
 
+        uinfo = UInfoDocument(phone="79089269066")
+        uinfo.save()
+
         d = Doc.objects(num=1).first()
         d.users["007"]["roles"]["666"] = EmbeddedRole(type="superadmin")
+        d.users["007"]["rolist"].append(EmbeddedRole(type="oops"))
+        d.users["007"]["info"] = uinfo
         delta = d._delta()
+        print delta
         self.assertEqual(True, "users.007.roles.666" in delta[0])
+        self.assertEqual(True, "users.007.rolist" in delta[0])
+        self.assertEqual(True, "users.007.info" in delta[0])
         self.assertEqual('superadmin', delta[0]["users.007.roles.666"]["type"])
+        self.assertEqual('oops', delta[0]["users.007.rolist"][0]["type"])
+        self.assertEqual(uinfo.id, delta[0]["users.007.info"])
 
 if __name__ == '__main__':
     unittest.main()