Merge pull request #366 from Whist-Team/fix/invalid_room_id

tests/whist_server/services/test_room_db_service.py

@@ -37,6 +37,11 @@ def test_not_existing(self):
         with self.assertRaisesRegex(RoomNotFoundError, error_msg):
             self.service.get(game_id)
 
+    def test_get_invalid_room_id(self):
+        room_id = '1'
+        error_msg = f'Room with id "{room_id}" not found.'
+        with self.assertRaisesRegex(RoomNotFoundError, error_msg):
+            self.service.get(room_id)
     def test_get_by_name(self):
         game_id = self.service.add(self.room)
         self.room.id = ObjectId(game_id)

whist_server/services/room_db_service.py

@@ -1,6 +1,7 @@
 """Room database connector"""
 from typing import Optional
 
+import bson.errors
 from bson import ObjectId
 from whist_core.user.player import Player
 
@@ -70,7 +71,10 @@ def get(cls, room_id: str) -> RoomInDb:
         :param room_id: of the room
         :return: the room database object
         """
-        room = cls._rooms.find_one(ObjectId(room_id))
+        try:
+            room = cls._rooms.find_one(ObjectId(room_id))
+        except bson.errors.InvalidId as id_error:
+            raise RoomNotFoundError(room_id) from id_error
         if room is None:
             raise RoomNotFoundError(room_id)
         return RoomInDb(**room)