Confluence update_or_create doesn't respect parent_id #956

Author: gonchik

atlassian/confluence/server/__init__.py

@@ -1887,8 +1887,15 @@ def update_or_create(
                 raise ApiValueError("space is required when parent_id is omitted")
             space = self.get_page_space(parent_id)
 
-        if self.page_exists(space, title):
-            page_id = self.get_page_id(space, title)
+        # A title is only unique among siblings.  Searching the whole space
+        # when a parent is supplied could update and move a same-titled page
+        # from another branch (#956).
+        if parent_id is not None:
+            page_id = self.get_descendant_page_id(space, parent_id, title) or None
+        else:
+            page_id = self.get_page_id(space, title) if self.page_exists(space, title) else None
+
+        if page_id is not None:
             parent_id = parent_id if parent_id is not None else self.get_parent_content_id(page_id)
             result = self.update_page(
                 parent_id=parent_id,

docs/confluence.rst

@@ -259,7 +259,8 @@ Page actions
     # Get every contributor for a collaboratively edited page revision.
     contributors = confluence.get_page_version_contributors(page_id, version_number)
 
-    # Update page or create page if it is not exists. parent_id is optional;
+    # Update the page only when the title exists under parent_id; a same-titled
+    # page elsewhere in the space is left untouched. parent_id is optional;
     # use a space key to create or update a top-level page.
     confluence.update_or_create(parent_id, title, body, representation='storage', full_width=False)
     confluence.update_or_create(title=title, body=body, space='SPACEKEY')

tests/confluence/test_confluence_server.py

@@ -353,6 +353,51 @@ def test_update_or_create_requires_space_for_a_top_level_page(self, confluence_s
         with pytest.raises(ApiValueError, match="space is required"):
             confluence_server.update_or_create(title="Top level", body="<p>Body</p>")
 
+    @patch.object(ConfluenceServer, "create_page")
+    @patch.object(ConfluenceServer, "page_exists")
+    @patch.object(ConfluenceServer, "get_descendant_page_id", return_value="")
+    def test_update_or_create_creates_when_same_title_is_under_another_parent(
+        self, mock_descendant_id, mock_page_exists, mock_create_page, confluence_server
+    ):
+        mock_create_page.return_value = {"id": "new", "_links": {"tinyui": "/x/new"}}
+
+        confluence_server.update_or_create("parent-a", "Report", "<p>Body</p>", space="TEAM")
+
+        mock_descendant_id.assert_called_once_with("TEAM", "parent-a", "Report")
+        mock_page_exists.assert_not_called()
+        mock_create_page.assert_called_once_with(
+            space="TEAM",
+            parent_id="parent-a",
+            title="Report",
+            body="<p>Body</p>",
+            representation="storage",
+            editor=None,
+            full_width=False,
+        )
+
+    @patch.object(ConfluenceServer, "update_page")
+    @patch.object(ConfluenceServer, "page_exists")
+    @patch.object(ConfluenceServer, "get_descendant_page_id", return_value="child-a")
+    def test_update_or_create_updates_only_the_matching_child(
+        self, mock_descendant_id, mock_page_exists, mock_update_page, confluence_server
+    ):
+        mock_update_page.return_value = {"id": "child-a", "_links": {"tinyui": "/x/child"}}
+
+        confluence_server.update_or_create("parent-a", "Report", "<p>Body</p>", space="TEAM")
+
+        mock_descendant_id.assert_called_once_with("TEAM", "parent-a", "Report")
+        mock_page_exists.assert_not_called()
+        mock_update_page.assert_called_once_with(
+            parent_id="parent-a",
+            page_id="child-a",
+            title="Report",
+            body="<p>Body</p>",
+            representation="storage",
+            minor_edit=False,
+            version_comment=None,
+            full_width=False,
+        )
+
     @patch.object(ConfluenceServer, "update_page")
     def test_update_existing_page_preserves_confluence_image_storage_markup(self, mock_update_page, confluence_server):
         body = '<table><tr><td><ac:image><ri:attachment ri:filename="chart.png" /></ac:image></td></tr></table>'