Handle ObjectID conversion errors

api/schemas/aircraft.py

@@ -1,6 +1,6 @@
 from enum import Enum
 
-from bson import ObjectId
+from utils import to_objectid
 from pydantic import BaseModel, field_validator
 from pydantic_core.core_schema import ValidationInfo
 
@@ -145,7 +145,7 @@ def aircraft_add_helper(aircraft: dict, user: str) -> dict:
     :param user: User that created aircraft
     :return: Combined dict that can be inserted into db
     """
-    aircraft["user"] = ObjectId(user)
+    aircraft["user"] = to_objectid(user)
     aircraft["aircraft_category"] = aircraft["aircraft_category"].name
     aircraft["aircraft_class"] = aircraft["aircraft_class"].name
 

api/schemas/flight.py

@@ -1,9 +1,7 @@
 import datetime
-import typing
 from typing import Optional, Dict, Union, List
 
-from bson import ObjectId
-from fastapi import UploadFile, File
+from utils import to_objectid
 from pydantic import BaseModel
 
 from schemas.utils import PositiveFloatNullable, PositiveFloat, PositiveInt, PyObjectId
@@ -162,6 +160,6 @@ def flight_add_helper(flight: dict, user: str) -> dict:
     :param user: User that created flight
     :return: Combined dict that can be inserted into db
     """
-    flight["user"] = ObjectId(user)
+    flight["user"] = to_objectid(user)
 
     return flight