Added main journal handlers

Author: kompotkot

bugout/app.py

@@ -153,8 +153,58 @@ def update_group(
     def delete_group(self, token: uuid.UUID, group_id: uuid.UUID) -> data.BugoutGroup:
         return self.group.delete_group(token, group_id)
 
+    # Journal scopes handlers
+    def get_scopes(self):
+        pass
+
+    def get_journal_scopes(self):
+        pass
+
+    def update_journal_scopes(self):
+        pass
+
+    def delete_journal_scopes(self):
+        pass
+
     # Journal handlers
+    def create_journal(self, token: uuid.UUID, name: str) -> data.BugoutJournal:
+        return self.journal.create_journal(token, name)
+
+    def list_journals(self, token: uuid.UUID) -> data.BugoutJournals:
+        return self.journal.list_journals(token)
+
     def get_journal(
-        self, journal_id: uuid.UUID, token: uuid.UUID
+        self, token: uuid.UUID, journal_id: uuid.UUID
+    ) -> data.BugoutJournal:
+        return self.journal.get_journal(token, journal_id)
+
+    def update_journal(
+        self, token: uuid.UUID, journal_id: uuid.UUID, name: str
     ) -> data.BugoutJournal:
-        return self.journal.get_journal(journal_id, token)
+        return self.journal.update_journal(token, journal_id, name)
+
+    def delete_journal(
+        self, token: uuid.UUID, journal_id: uuid.UUID
+    ) -> data.BugoutJournal:
+        return self.journal.delete_journal(token, journal_id)
+
+    # Journal entries
+    def create_entry(self):
+        pass
+
+    def get_entry(self):
+        pass
+
+    def get_entries(self):
+        pass
+
+    def get_entry_content(self):
+        pass
+
+    def update_entry_content(self):
+        pass
+
+    def delete_entry(self):
+        pass
+
+    # Tags

bugout/data.py

@@ -1,6 +1,6 @@
 from datetime import datetime
 from enum import Enum, unique
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict, List, Optional, Set
 import uuid
 
 from pydantic import BaseModel, Field
@@ -88,7 +88,11 @@ class BugoutGroupMembers(BaseModel):
 class BugoutJournal(BaseModel):
     id: uuid.UUID
     bugout_user_id: uuid.UUID
-    holder_ids: List[uuid.UUID]
+    holder_ids: Set[uuid.UUID] = Field(default_factory=set)
     name: str
     created_at: datetime
     updated_at: datetime
+
+
+class BugoutJournals(BaseModel):
+    journals: List[BugoutJournal]

bugout/journal.py

@@ -2,7 +2,7 @@
 import uuid
 
 from .calls import make_request, InvalidUrlSpec
-from .data import BugoutJournal, Method
+from .data import BugoutJournal, BugoutJournals, Method
 
 
 class Journal:
@@ -20,17 +20,55 @@ def _call(self, method: Method, path: str, **kwargs):
         result = make_request(method=method, url=url, **kwargs)
         return result
 
-    def get_journal(self, journal_id: uuid.UUID, token: uuid.UUID) -> BugoutJournal:
-        get_group_path = f"journals/{journal_id}"
+    # Journal module
+    def create_journal(self, token: uuid.UUID, name: str) -> BugoutJournal:
+        journal_path = "journals/"
+        json = {
+            "name": name,
+        }
         headers = {
             "Authorization": f"Bearer {token}",
         }
-        result = self._call(method=Method.get, path=get_group_path, headers=headers)
-        return BugoutJournal(
-            id=result.get("id"),
-            bugout_user_id=result.get("bugout_user_id"),
-            holder_ids=result.get("holder_ids"),
-            name=result.get("name"),
-            created_at=result.get("created_at"),
-            updated_at=result.get("updated_at"),
+        result = self._call(
+            method=Method.post, path=journal_path, headers=headers, json=json
         )
+        return BugoutJournal(**result)
+
+    def list_journals(self, token: uuid.UUID) -> BugoutJournals:
+        journal_path = "journals/"
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        result = self._call(method=Method.get, path=journal_path, headers=headers)
+        return BugoutJournals(**result)
+
+    def get_journal(self, token: uuid.UUID, journal_id: uuid.UUID) -> BugoutJournal:
+        journal_id_path = f"journals/{journal_id}"
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        result = self._call(method=Method.get, path=journal_id_path, headers=headers)
+        return BugoutJournal(**result)
+
+    def update_journal(
+        self, token: uuid.UUID, journal_id: uuid.UUID, name: str
+    ) -> BugoutJournal:
+        journal_id_path = f"journals/{journal_id}"
+        json = {
+            "name": name,
+        }
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        result = self._call(
+            method=Method.put, path=journal_id_path, headers=headers, json=json
+        )
+        return BugoutJournal(**result)
+
+    def delete_journal(self, token: uuid.UUID, journal_id: uuid.UUID) -> BugoutJournal:
+        journal_id_path = f"journals/{journal_id}"
+        headers = {
+            "Authorization": f"Bearer {token}",
+        }
+        result = self._call(method=Method.delete, path=journal_id_path, headers=headers)
+        return BugoutJournal(**result)