Refactor model to use alias.

Author: Andrey

bugout/app.py

@@ -799,7 +799,7 @@ def create_entries_tags(
         self.journal.timeout = timeout
 
         entries_tags_obj = data.BugoutJournalEntriesTagsRequest(
-            entries_tags=[
+            entries=[
                 data.BugoutJournalEntryTagsRequest(**entry_tags)
                 for entry_tags in entries_tags
             ]
@@ -881,7 +881,7 @@ def delete_entries_tags(
     ) -> data.BugoutJournalEntries:
         self.journal.timeout = timeout
         entries_tags_obj = data.BugoutJournalEntriesTagsRequest(
-            entries_tags=[
+            entries=[
                 data.BugoutJournalEntryTagsRequest(**entry_tags)
                 for entry_tags in entries_tags
             ]

bugout/calls.py

@@ -1,6 +1,6 @@
 from typing import Any, Dict
 
-import requests
+import requests  # type: ignore
 
 from .data import Method
 from .exceptions import BugoutResponseException, BugoutUnexpectedResponse

bugout/data.py

@@ -240,12 +240,17 @@ class BugoutJournalEntryTags(BaseModel):
 
 
 class BugoutJournalEntryTagsRequest(BaseModel):
-    entry_id: uuid.UUID
+    entry_id: uuid.UUID = Field(alias="journal_entry_id")
     tags: List[str]
 
+    class Config:
+        # Required configuration because in Spire we use "journal_entry_id" instead of "entry_id"
+        # during creation and deletion of new tags for journal entry
+        allow_population_by_field_name = True
+
 
 class BugoutJournalEntriesTagsRequest(BaseModel):
-    entries_tags: List[BugoutJournalEntryTagsRequest] = Field(default_factory=list)
+    entries: List[BugoutJournalEntryTagsRequest] = Field(default_factory=list)
 
 
 class BugoutSearchResult(BaseModel):

bugout/journal.py

@@ -477,15 +477,7 @@ def create_entries_tags(
         headers = {
             "Authorization": f"{auth_type.value} {token}",
         }
-        json = {
-            "entries": [
-                {
-                    "journal_entry_id": str(entry.entry_id),
-                    "tags": entry.tags,
-                }
-                for entry in entries_tags.entries_tags
-            ]
-        }
+        json = entries_tags.dict()
         if "headers" in kwargs.keys():
             headers.update(kwargs["headers"])
         result = self._call(
@@ -567,15 +559,7 @@ def delete_entries_tags(
         headers = {
             "Authorization": f"{auth_type.value} {token}",
         }
-        json = {
-            "entries": [
-                {
-                    "journal_entry_id": str(entry.entry_id),
-                    "tags": entry.tags,
-                }
-                for entry in entries_tags.entries_tags
-            ]
-        }
+        json = entries_tags.dict()
         if "headers" in kwargs.keys():
             headers.update(kwargs["headers"])
         result = self._call(