From 352b23331b8486761415a117f9c017efb90569c6 Mon Sep 17 00:00:00 2001
From: Trevor Hall <trevor.jacob.hall@gmail.com>
Date: Wed, 5 Dec 2018 20:18:48 -0600
Subject: [PATCH 1/2] Fix bug #1965 of $position and $push operators do not
 work with list in an EmbeddedDocument. Set key value to joined parts
 excluding the index at the end. Added test case

---
 AUTHORS                           |  1 +
 mongoengine/queryset/transform.py |  2 +-
 tests/document/instance.py        | 18 +++++++++++++++++-
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/AUTHORS b/AUTHORS
index b38825dca..5998520a2 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -247,3 +247,4 @@ that much better:
  * Erdenezul Batmunkh (https://github.com/erdenezul)
  * Andy Yankovsky (https://github.com/werat)
  * Bastien Gérard (https://github.com/bagerard)
+ * Trevor Hall (https://github.com/tjhall13)
diff --git a/mongoengine/queryset/transform.py b/mongoengine/queryset/transform.py
index 41f99bbce..2d22c3507 100644
--- a/mongoengine/queryset/transform.py
+++ b/mongoengine/queryset/transform.py
@@ -345,7 +345,7 @@ def update(_doc_cls=None, **update):
             value = {key: {'$each': value}}
         elif op in ('push', 'pushAll'):
             if parts[-1].isdigit():
-                key = parts[0]
+                key = '.'.join(parts[0:-1])
                 position = int(parts[-1])
                 # $position expects an iterable. If pushing a single value,
                 # wrap it in a list.
diff --git a/tests/document/instance.py b/tests/document/instance.py
index ad22c0863..5319ace41 100644
--- a/tests/document/instance.py
+++ b/tests/document/instance.py
@@ -842,10 +842,16 @@ def test_modify_update(self):
 
     @requires_mongodb_gte_26
     def test_modify_with_positional_push(self):
+        class Content(EmbeddedDocument):
+            keywords = ListField(StringField())
+
         class BlogPost(Document):
             tags = ListField(StringField())
+            content = EmbeddedDocumentField(Content)
+
+        post = BlogPost.objects.create(
+            tags=['python'], content=Content(keywords=['ipsum']))
 
-        post = BlogPost.objects.create(tags=['python'])
         self.assertEqual(post.tags, ['python'])
         post.modify(push__tags__0=['code', 'mongo'])
         self.assertEqual(post.tags, ['code', 'mongo', 'python'])
@@ -856,6 +862,16 @@ class BlogPost(Document):
             ['code', 'mongo', 'python']
         )
 
+        self.assertEqual(post.content.keywords, ['ipsum'])
+        post.modify(push__content__keywords__0=['lorem'])
+        self.assertEqual(post.content.keywords, ['lorem', 'ipsum'])
+
+        # Assert same order of the list items is maintained in the db
+        self.assertEqual(
+            BlogPost._get_collection().find_one({'_id': post.pk})['content']['keywords'],
+            ['lorem', 'ipsum']
+        )
+
     def test_save(self):
         """Ensure that a document may be saved in the database."""
 

From d3b4af116eb9bdc0f1ec280b79a9be0a9920b22a Mon Sep 17 00:00:00 2001
From: Trevor Hall <trevor.jacob.hall@gmail.com>
Date: Wed, 5 Dec 2018 23:35:36 -0600
Subject: [PATCH 2/2] Add fix to changelog.rst #1965

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

diff --git a/docs/changelog.rst b/docs/changelog.rst
index d9742d6fa..30b881650 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -6,6 +6,11 @@ Development
 ===========
 - (Fill this out as you fix issues and develop your features).
 
+=================
+Changes in 0.16.3
+=================
+- Fix $push with $position operator not working with lists in embedded document #1965
+
 =================
 Changes in 0.16.2
 =================