diff --git a/backend/tests/conftest.py b/backend/tests/conftest.py index 16a2a01f..50482cfc 100644 --- a/backend/tests/conftest.py +++ b/backend/tests/conftest.py @@ -46,6 +46,12 @@ def _load_env_from_base_or_parent() -> None: _load_env_from_base_or_parent() +from tests.types import BookingCreateData # noqa: E402 +from tests.types import BookingUpdateData # noqa: E402 +from tests.types import RoomData # noqa: E402 +from tests.types import RoomUpdateData # noqa: E402 +from tests.types import UserData # noqa: E402 + from backend.main import app # noqa: E402 from backend.models import Booking # noqa: E402 from backend.models import BookingList # noqa: E402 @@ -54,11 +60,6 @@ from backend.models import RoomList # noqa: E402 from backend.models import User # noqa: E402 from backend.models import UserList # noqa: E402 from backend.schemas.bookings import BookingCreate # noqa: E402 -from tests.types import BookingCreateData # noqa: E402 -from tests.types import BookingUpdateData # noqa: E402 -from tests.types import RoomData # noqa: E402 -from tests.types import RoomUpdateData # noqa: E402 -from tests.types import UserData # noqa: E402 # Modern handler type for exception handlers diff --git a/backend/tests/routers/test_bookings.py b/backend/tests/routers/test_bookings.py index 84dad424..f4f554f4 100644 --- a/backend/tests/routers/test_bookings.py +++ b/backend/tests/routers/test_bookings.py @@ -9,6 +9,9 @@ from httpx import AsyncClient from sqlalchemy.exc import NoResultFound from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.ext.asyncio import AsyncSession +from tests.types import BookingCreateData +from tests.types import BookingData +from tests.types import BookingUpdateData from backend.dependencies.bookings import delete_booking_service from backend.dependencies.bookings import get_booking_service @@ -23,9 +26,6 @@ from backend.models import BookingList from backend.models import Room from backend.routers.rooms import publish_room_availability_event from backend.services.bookings import update_booking -from tests.types import BookingCreateData -from tests.types import BookingData -from tests.types import BookingUpdateData # Useful constants for booking router tests diff --git a/backend/tests/routers/test_rooms.py b/backend/tests/routers/test_rooms.py index 01134a74..c65cc50b 100644 --- a/backend/tests/routers/test_rooms.py +++ b/backend/tests/routers/test_rooms.py @@ -10,6 +10,8 @@ from httpx import AsyncClient from httpx import Response from sqlalchemy.exc import NoResultFound from sqlalchemy.exc import SQLAlchemyError +from tests.types import RoomData +from tests.types import RoomUpdateData from backend.dependencies.rooms import delete_room_service from backend.dependencies.rooms import get_room_service @@ -21,8 +23,6 @@ from backend.models import Room from backend.models import RoomList from backend.routers.rooms import publish_room_availability_event from backend.routers.rooms import room_availability_subscribers -from tests.types import RoomData -from tests.types import RoomUpdateData # Useful constants for rooms router tests diff --git a/backend/tests/routers/test_users.py b/backend/tests/routers/test_users.py index 1b6a9520..cb4d1f31 100644 --- a/backend/tests/routers/test_users.py +++ b/backend/tests/routers/test_users.py @@ -6,11 +6,11 @@ import pytest import sqlalchemy.exc from httpx import AsyncClient from sqlalchemy.exc import SQLAlchemyError +from tests.types import UserData from backend.dependencies.users import get_users_service from backend.main import app from backend.models import UserList -from tests.types import UserData # Useful constants for users router tests diff --git a/backend/tests/services/test_bookings.py b/backend/tests/services/test_bookings.py index bff9de70..767ca42f 100644 --- a/backend/tests/services/test_bookings.py +++ b/backend/tests/services/test_bookings.py @@ -29,6 +29,8 @@ from sqlalchemy import update from sqlalchemy.exc import NoResultFound from sqlalchemy.exc import SQLAlchemyError from sqlalchemy.ext.asyncio import AsyncSession +from tests.types import BookingData +from tests.types import BookingUpdateData from backend.models import Booking from backend.models import BookingList @@ -46,8 +48,6 @@ from backend.services.bookings import validate_new_booking_room_exists from backend.services.bookings import validate_new_booking_time_constraints from backend.services.bookings import validate_no_overlap from backend.services.bookings import validate_time_constraints -from tests.types import BookingData -from tests.types import BookingUpdateData # Error message constants