Merge pull request #1 from utking/Switch-to-working-with-Confluence-Cloud

Switch to work with Confluence Cloud

Author: utking

src/confluence/confluence.py

@@ -1,7 +1,7 @@
 from enum import Enum
 from datetime import datetime
 from .confluence_elements import ConfluenceElements
-from atlassian import Confluence
+import requests
 
 
 class HeaderSize(Enum):
@@ -25,12 +25,6 @@ def __init__(self, url: str, api_username: str, api_password: str, page_id: str,
         self.__page_id = page_id
         self.__page_title = page_title
 
-        self.app = Confluence(
-            url=self.__url,
-            username=self.__api_username,
-            password=self.__api_password,
-        )
-
     def append_string(self, content: str) -> None:
         """
         Appends a single string to the content
@@ -51,14 +45,44 @@ def append_block(self, title_size: HeaderSize, title_text: str,
 
     def update_page(self):
         """
-        Publishes the prepared content. If you want to test the content first,
+        Publishes the prepared content to Confluence Cloud. If you want to test the content first,
         please check printContent()
         """
-        return self.app.update_page(
-            page_id=self.__page_id,
-            title=self.__page_title,
-            body=self.__content
-        )
+        try:
+            if self.__page_id:
+                try:
+                    # Make GET request to retrieve current page info and version number
+                    page_info = requests.get(self.__url, auth=(self.__api_username, self.__api_password)).json()
+                    current_version = page_info['version']['number']
+                    # Prepare update payload
+                    update_payload = {
+                        "id": self.__page_id,
+                        "status": "current",
+                        "title": self.__page_title,
+                        "body": {
+                            "representation": "storage",
+                            "value": self.__content,
+                        },
+                        "version": {
+                            "number": current_version + 1,
+                        },
+                    }
+                    # Make PUT request to update the page
+                    response = requests.put(self.__url, json=update_payload, auth=(self.__api_username, self.__api_password))
+                    response.raise_for_status()
+                except Exception as e:
+                    raise Exception(f"An error occurred during page update: {e}")
+            else:
+                raise Exception("Page ID is not specified!")
+
+        except Exception as e:
+            print(f"An error occurred: {e}")
+
+    def get_content(self) -> str:
+        """
+        Returns the prepared content as a string. Can be used for test purposes
+        """
+        return self.__content
 
     def printContent(self) -> None:
         """

tests/test_confluence.py

@@ -1,8 +1,7 @@
 import unittest
 
-from unittest.mock import patch
+from unittest.mock import patch, MagicMock
 from src.confluence import HeaderSize, ConfluenceGenerator, ConfluenceElements
-from atlassian import Confluence
 from freezegun import freeze_time
 
 
@@ -22,11 +21,7 @@ def test_H4(self):
     def test_H5_fail(self):
         self.assertRaises(AttributeError)
 
-    def confluence_app(self, url: str, username: str, password: str):
-        return None
-
     @freeze_time("2012-01-01")
-    @patch.object(Confluence, '__init__', confluence_app)
     def test_append_string(self):
         confluence = ConfluenceGenerator("url", "api_username", "api_password", "page_id", "page_title")
         confluence.append_string("test")
@@ -44,9 +39,8 @@ def test_append_string(self):
 
     def confluence_elements_render(title_text: str, title_size: int, table_headers: list, table_data: list):
         return "TestRender"
-    
+
     @freeze_time("2012-01-01")
-    @patch.object(Confluence, '__init__', confluence_app)
     @patch.object(ConfluenceElements, 'render', confluence_elements_render)
     def test_append_block(self):
         confluence = ConfluenceGenerator("url", "api_username", "api_password", "page_id", "page_title")
@@ -68,18 +62,35 @@ def test_append_block(self):
             confluence._ConfluenceGenerator__content
         )
 
-    def confluence_update_page(self, page_id, title, body):
-        return True
-
     @freeze_time("2012-01-01")
-    @patch.object(Confluence, '__init__', confluence_app)
-    @patch.object(Confluence, 'update_page', confluence_update_page)
-    def test_update_page(self):
+    @patch('src.confluence.confluence.requests.put')
+    @patch('src.confluence.confluence.requests.get')
+    def test_update_page(self, mock_get, mock_put):
+        mock_get.return_value.json.return_value = {'version': {'number': 5}}
+        mock_put.return_value.raise_for_status = MagicMock()
+
         confluence = ConfluenceGenerator("url", "api_username", "api_password", "page_id", "page_title")
 
         self.assertEqual(
             "<ac:structured-macro ac:name=\"toc\"><ac:parameter ac:name=\"levels\">2</ac:parameter></ac:structured-macro><p>Automatically generated at 01/01/2012 00:00:00</p>",
             confluence._ConfluenceGenerator__content
         )
 
-        self.assertTrue(confluence.update_page())
+        confluence.update_page()
+
+        mock_get.assert_called_once_with("url", auth=("api_username", "api_password"))
+        mock_put.assert_called_once_with(
+            "url",
+            json={
+                "id": "page_id",
+                "status": "current",
+                "title": "page_title",
+                "body": {
+                    "representation": "storage",
+                    "value": confluence._ConfluenceGenerator__content,
+                },
+                "version": {"number": 6},
+            },
+            auth=("api_username", "api_password"),
+        )
+        mock_put.return_value.raise_for_status.assert_called_once()