From c1c09fa6b4c832b99afeea83d19d290468689fe4 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Tue, 21 Nov 2017 21:56:26 +0800
Subject: [PATCH 1/4] fix validatione error for invalid embedded document
 instance #1067

---
 mongoengine/fields.py      |  6 +++++-
 tests/queryset/queryset.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/mongoengine/fields.py b/mongoengine/fields.py
index 6c4a06c9..0aa51b2d 100644
--- a/mongoengine/fields.py
+++ b/mongoengine/fields.py
@@ -688,6 +688,11 @@ class GenericEmbeddedDocumentField(BaseField):
         return value
 
     def validate(self, value, clean=True):
+        if self.choices and isinstance(value, SON):
+            for choice in self.choices:
+                if value['_cls'] == choice._class_name:
+                    return True
+
         if not isinstance(value, EmbeddedDocument):
             self.error('Invalid embedded document instance provided to an '
                        'GenericEmbeddedDocumentField')
@@ -705,7 +710,6 @@ class GenericEmbeddedDocumentField(BaseField):
     def to_mongo(self, document, use_db_field=True, fields=None):
         if document is None:
             return None
-
         data = document.to_mongo(use_db_field, fields)
         if '_cls' not in data:
             data['_cls'] = document._class_name
diff --git a/tests/queryset/queryset.py b/tests/queryset/queryset.py
index 28e84af4..43800fff 100644
--- a/tests/queryset/queryset.py
+++ b/tests/queryset/queryset.py
@@ -2086,6 +2086,23 @@ class QuerySetTest(unittest.TestCase):
             Site.objects(id=s.id).update_one(
                 pull_all__collaborators__helpful__user=['Ross'])
 
+    def test_pull_in_genericembedded_field(self):
+
+        class Foo(EmbeddedDocument):
+            name = StringField()
+
+        class Bar(Document):
+            foos = ListField(GenericEmbeddedDocumentField(
+                choices=[Foo, ]))
+
+        Bar.drop_collection()
+
+        foo = Foo(name="bar")
+        bar = Bar(foos=[foo]).save()
+        Bar.objects(id=bar.id).update(pull__foos=foo)
+        bar.reload()
+        self.assertEqual(len(bar.foos), 0)
+
     def test_update_one_pop_generic_reference(self):
 
         class BlogTag(Document):
@@ -2179,6 +2196,24 @@ class QuerySetTest(unittest.TestCase):
         self.assertEqual(message.authors[1].name, "Ross")
         self.assertEqual(message.authors[2].name, "Adam")
 
+    def test_set_generic_embedded_documents(self):
+
+        class Bar(EmbeddedDocument):
+            name = StringField()
+
+        class User(Document):
+            username = StringField()
+            bar = GenericEmbeddedDocumentField(choices=[Bar,])
+
+        User.drop_collection()
+
+        User(username='abc').save()
+        User.objects(username='abc').update(
+            set__bar=Bar(name='test'), upsert=True)
+
+        user = User.objects(username='abc').first()
+        self.assertEqual(user.bar.name, "test")
+
     def test_reload_embedded_docs_instance(self):
 
         class SubDoc(EmbeddedDocument):

From 60758dd76b4ae1831e4f3f389c71b95b0e77abd2 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 18:56:12 +0800
Subject: [PATCH 2/4] add changelog

---
 docs/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 1e9ac7fc..b4852178 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,6 +5,7 @@ Changelog
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
+- Fix validation error for invalid embedded document instance #1067
 
 Changes in 0.14.1
 =================

From 79486e33936d6302e1cb898c38a9535648563343 Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 19:27:35 +0800
Subject: [PATCH 3/4] change description in changelog

---
 docs/changelog.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index b4852178..249d4659 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,7 +5,7 @@ Changelog
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
-- Fix validation error for invalid embedded document instance #1067
+- Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.14.1
 =================

From 0ce081323fd66ad00b00eb4bc9edc6b888a5fa2d Mon Sep 17 00:00:00 2001
From: Erdenezul Batmunkh <erdenezul@shine.mn>
Date: Wed, 22 Nov 2017 22:19:50 +0800
Subject: [PATCH 4/4] move changes to development

---
 docs/changelog.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/changelog.rst b/docs/changelog.rst
index 249d4659..f96fc11b 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -2,10 +2,13 @@
 Changelog
 =========
 
+Development
+===========
+- Fix validation error instance in GenericEmbeddedDocumentField #1067
+
 Changes in 0.15.0
 =================
 - Add LazyReferenceField and GenericLazyReferenceField to address #1230
-- Fix validation error instance in GenericEmbeddedDocumentField #1067
 
 Changes in 0.14.1
 =================