fix: depreciated ordering

Author: JayDwee

koala/rest/api.py

@@ -12,6 +12,7 @@
 from aiohttp.abc import Request
 from aiohttp.typedefs import Handler
 
+from koala.errors import KoalaException
 from koala.log import logger
 # Own modules
 from koala.models import BaseModel
@@ -122,9 +123,13 @@ async def wrapper(*args, **kwargs):
 
             try:
                 result = await func(self, **{arg_name: available_args[arg_name] for arg_name in available_args.keys()})
-            except Exception as e:
+
+            except KoalaException as e:
                 logger.error("API Failed", exc_info=e)
                 return build_response(BAD_REQUEST, ApiError(type(e).__name__, str(e)))
+            except Exception as e:
+                logger.error("API Failed", exc_info=e)
+                raise e
             if raw_response:
                 return result
             else:

requirements.txt

@@ -21,7 +21,7 @@ pyparsing==2.4.7
 pytest==7.2.1
 pytest-asyncio==0.20.3
 pytest-env==0.8.1
-pytest-ordering==0.6
+pytest-order==1.1.0
 python-dotenv==1.0.0
 requests==2.28.2
 six==1.16.0

tests/cogs/twitch_alert/test_cog.py

@@ -9,7 +9,6 @@
 import mock
 import pytest
 import pytest_asyncio
-import pytest_ordering as pytest
 from discord.ext import commands
 from sqlalchemy import select, and_
 
@@ -68,7 +67,8 @@ async def test_twitch_is_enabled_false(twitch_cog: cog.TwitchAlert):
 
 
 # @mock.patch("koala.utils.random_id", mock.MagicMock(return_value=7357))
-@pytest.mark.asyncio(order=1)
+@pytest.mark.order(1)
+@pytest.mark.asyncio
 async def test_edit_default_message_default_from_none(twitch_cog):
     this_channel = dpytest.get_config().channels[0]
     assert_embed = discord.Embed(title="Default Message Edited",
@@ -81,7 +81,8 @@ async def test_edit_default_message_default_from_none(twitch_cog):
 
 
 # @mock.patch("koala.utils.random_id", mock.MagicMock(return_value=7357))
-@pytest.mark.asyncio(order=2)
+@pytest.mark.order(2)
+@pytest.mark.asyncio
 async def test_edit_default_message_existing(twitch_cog):
     this_channel = dpytest.get_config().channels[0]
     assert_embed = discord.Embed(title="Default Message Edited",
@@ -92,8 +93,8 @@ async def test_edit_default_message_existing(twitch_cog):
     await dpytest.message(koalabot.COMMAND_PREFIX + "twitch editMsg " + str(this_channel.id) + " {user} is bad")
     assert dpytest.verify().message().embed(embed=assert_embed)
 
-
-@pytest.mark.asyncio(order=3)
+@pytest.mark.order(3)
+@pytest.mark.asyncio
 async def test_add_user_to_twitch_alert(twitch_cog):
     assert_embed = discord.Embed(title="Added User to Twitch Alert",
                                  description=f"Channel: {dpytest.get_config().channels[0].id}\n"
@@ -105,8 +106,8 @@ async def test_add_user_to_twitch_alert(twitch_cog):
         f"{koalabot.COMMAND_PREFIX}twitch add monstercat {dpytest.get_config().channels[0].id}")
     assert dpytest.verify().message().embed(embed=assert_embed)
 
-
-@pytest.mark.asyncio(order=3)
+@pytest.mark.order(3)
+@pytest.mark.asyncio
 async def test_add_user_to_twitch_alert_wrong_guild(twitch_cog: twitch_alert.cog.TwitchAlert):
     guild = dpytest.backend.make_guild(name="TestGuild")
     channel = dpytest.backend.make_text_channel(name="TestChannel", guild=guild)
@@ -121,8 +122,8 @@ async def test_add_user_to_twitch_alert_wrong_guild(twitch_cog: twitch_alert.cog
         f"{koalabot.COMMAND_PREFIX}twitch add monstercat {dpytest.get_config().guilds[0].channels[0].id}",
         channel=-1, member=member)
 
-
-@pytest.mark.asyncio(order=3)
+@pytest.mark.order(3)
+@pytest.mark.asyncio
 async def test_add_user_to_twitch_alert_custom_message(twitch_cog: twitch_alert.cog.TwitchAlert):
     test_custom_message = "We be live gamers!"
 
@@ -184,8 +185,8 @@ async def test_remove_user_from_twitch_alert_with_message(twitch_cog: twitch_ale
         result_after = session.execute(sql_check_updated_server).one_or_none()
         assert result_after is None
 
-
-@pytest.mark.asyncio(order=3)
+@pytest.mark.order(3)
+@pytest.mark.asyncio
 async def test_remove_user_from_twitch_alert_wrong_guild(twitch_cog):
     guild = dpytest.backend.make_guild(name="TestGuild")
     channel = dpytest.backend.make_text_channel(name="TestChannel", guild=guild)
@@ -283,8 +284,8 @@ async def test_remove_team_from_twitch_alert_with_message(twitch_cog):
     assert dpytest.verify().message().embed(new_embed)
     pass
 
-
-@pytest.mark.asyncio(order=3)
+@pytest.mark.order(3)
+@pytest.mark.asyncio
 async def test_remove_team_from_twitch_alert_wrong_guild(twitch_cog):
     guild = dpytest.backend.make_guild(name="TestGuild")
     channel = dpytest.backend.make_text_channel(name="TestChannel", guild=guild)

tests/cogs/twitch_alert/test_db.py

@@ -15,7 +15,6 @@
 import mock
 import pytest
 import pytest_asyncio
-import pytest_ordering as pytest
 from discord.ext import commands
 from sqlalchemy import select, update, insert, delete, and_, or_
 from twitchAPI.object import Stream