refactor: Return post if found via fetching active or archived threads

Author: Sanielia

src/bot.py

@@ -13,7 +13,7 @@
     SimpleProjectItemEvent,
 )
 from src.utils.error import ForumChannelNotFound
-from src.utils.logging import bot_info
+from src.utils.logging import bot_error, bot_info
 from src.utils.utils import fetch_forum_channel, get_new_tag, get_post_id, retrieve_discord_id
 
 
@@ -44,11 +44,11 @@ async def process_update(
 ):
     event = await state.get()
     bot_info(f"Processing event for item: {event.name}")
-    post_id = await get_post_id(event.name, discord_guild_id, forum_channel_id, client)
+    post_id_or_post = await get_post_id(event.name, discord_guild_id, forum_channel_id, client)
     author_discord_id = retrieve_discord_id(event.sender)
     user_mentions = [author_discord_id] if author_discord_id else []
     user_text_mention = f"<@{author_discord_id}>" if author_discord_id else "nieznany użytkownik"
-    if post_id is None:
+    if post_id_or_post is None:
         bot_info(f"Post not found, creating new post for item: {event.name}")
         message = f"Nowy task stworzony {event.name} przez: {user_text_mention}.>"
         post: GuildPublicThread = await client.create_forum_post(
@@ -58,10 +58,16 @@ async def process_update(
             auto_archive_duration=10080,
             user_mentions=user_mentions,
         )
+    elif isinstance(post_id_or_post, int):
+        post = await client.fetch_channel(post_id_or_post)
     else:
-        post = await client.fetch_channel(post_id)
+        post = post_id_or_post
 
     if not isinstance(post, GuildPublicThread):
+        try:
+            bot_error(f"Post with ID {post.id} is not a GuildPublicThread.")
+        except AttributeError:
+            bot_error(f"Post with ID {post_id_or_post} is not a Discord channel object.")
         return
 
     if isinstance(event, SimpleProjectItemEvent):

src/tests/test_integration/test_bot.py

@@ -69,6 +69,7 @@ async def test_basic_event_only_creation(
     mock_fetch_public_archived_threads.return_value = []
     mock_create_forum_post.return_value = None
     mock_shelve_open.return_value = MockShelf({})
+    mock_create_forum_post.return_value = "created_forum_post"
     update_queue = asyncio.Queue()
     await update_queue.put(ProjectItemEvent(name="Test Item", sender="test_sender"))
     await run(update_queue, stop_after_one_event=True)

src/tests/test_unit/test_bot.py

@@ -77,7 +77,7 @@ async def test_process_update_already_exists(
 ):
     state = asyncio.Queue()
     await state.put(SimpleProjectItemEvent("mmmocking", "norbiros", SimpleProjectItemEventType.CREATED))
-    mock_get_post_id.return_value = "1"
+    mock_get_post_id.return_value = 1
     mock_retrieve_discord_id.return_value = "2137696742041"
 
     await process_update(rest_client_mock, 1, 1, forum_channel_mock, state)
@@ -101,7 +101,7 @@ async def test_process_update_archived(
 ):
     state = asyncio.Queue()
     await state.put(SimpleProjectItemEvent("audacity4", "norbiros", SimpleProjectItemEventType.ARCHIVED))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock
@@ -130,7 +130,7 @@ async def test_process_update_restored(
 ):
     state = asyncio.Queue()
     await state.put(SimpleProjectItemEvent("audacity4", "norbiros", SimpleProjectItemEventType.RESTORED))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock
@@ -157,7 +157,7 @@ async def test_process_update_deleted(
 ):
     state = asyncio.Queue()
     await state.put(SimpleProjectItemEvent("audacity4", "norbiros", SimpleProjectItemEventType.DELETED))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     mock_retrieve_discord_id.return_value = "niepodam@norbiros.dev"
     mock_fetch_channel.return_value = post_mock
 
@@ -180,7 +180,7 @@ async def test_process_update_assignees(
 ):
     state = asyncio.Queue()
     await state.put(ProjectItemEditedAssignees("audacity4", "norbiros", ["norbiros"]))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock
@@ -206,7 +206,7 @@ async def test_process_update_body(
     state = asyncio.Queue()
     new_body = "Nowy opis taska"
     await state.put(ProjectItemEditedBody("audacity4", "norbiros", new_body))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock
@@ -232,7 +232,7 @@ async def test_process_update_title(
     state = asyncio.Queue()
     new_title = "Nowy opis taska"
     await state.put(ProjectItemEditedTitle("audacity4", "norbiros", new_title))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock
@@ -258,7 +258,7 @@ async def test_process_update_single_select(
 ):
     state = asyncio.Queue()
     await state.put(ProjectItemEditedSingleSelect("audacity4", "norbiros", "big", SingleSelectType.SIZE))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock
@@ -287,7 +287,7 @@ async def test_process_update_single_select_tag_unavailable(
 ):
     state = asyncio.Queue()
     await state.put(ProjectItemEditedSingleSelect("audacity4", "norbiros", "big", SingleSelectType.SIZE))
-    mock_get_post_id.return_value = "621"
+    mock_get_post_id.return_value = 621
     user_id = 2137696742041
     mock_retrieve_discord_id.return_value = user_id
     mock_fetch_channel.return_value = post_mock

src/tests/test_unit/test_utils.py

@@ -172,7 +172,7 @@ async def test_get_post_id_active_thread(mock_shelve_open, mock_fetch_active_thr
     mock_shelve_open.return_value = mock_shelf
     mock_fetch_active_threads.return_value = [post_mock]
 
-    assert await utils.get_post_id("audacity4", 1, 1, rest_client_mock) == 621
+    assert await utils.get_post_id("audacity4", 1, 1, rest_client_mock) == post_mock
     assert mock_shelf.get("audacity4") == 621
 
 
@@ -187,7 +187,7 @@ async def test_get_post_id_archived_thread(
     mock_fetch_active_threads.return_value = []
     mock_fetch_public_archived_threads.return_value = [post_mock]
 
-    assert await utils.get_post_id("audacity4", 1, 1, rest_client_mock) == 621
+    assert await utils.get_post_id("audacity4", 1, 1, rest_client_mock) == post_mock
     assert mock_shelf.get("audacity4") == 621
 
 

src/utils/logging.py

@@ -13,8 +13,8 @@ def bot_info(text: str):
 # def bot_warning(text: str):
 #     rich_print(f"[bold blue]BOT: [/bold blue][bold yellow]WARNING:[/bold yellow] {text}")
 #
-# def bot_error(text: str):
-#     rich_print(f"[bold blue]BOT: [/bold blue][bold red]ERROR:[/bold red] {text}")
+def bot_error(text: str):
+    rich_print(f"[bold blue]BOT: [/bold blue][bold red]ERROR:[/bold red] {text}")
 
 
 def server(text: str):

src/utils/utils.py

@@ -5,7 +5,7 @@
 
 import aiohttp
 import yaml
-from hikari import ForumTag, GuildForumChannel
+from hikari import ForumTag, GuildForumChannel, GuildThreadChannel
 from hikari.impl import RESTClientImpl
 
 
@@ -156,22 +156,21 @@ async def fetch_single_select_value(item_node_id: str | None, field_name: str |
 
 async def get_post_id(
     name: str, discord_guild_id: int, forum_channel_id: int, rest_client: RESTClientImpl
-) -> int | None:
+) -> int | GuildThreadChannel | None:
     with shelve.open("post_id.db") as db:
         try:
             post_id: str = db[name]
             return int(post_id)
         except KeyError:
             pass
-        # todo: return post if found in active threads or in archived threads
         for thread in await rest_client.fetch_active_threads(discord_guild_id):
             if thread.name == name:
                 db[name] = thread.id
-                return thread.id
+                return thread
         for thread in await rest_client.fetch_public_archived_threads(forum_channel_id):
             if thread.name == name:
                 db[name] = thread.id
-                return thread.id
+                return thread
 
     return None