ruff: Enable flake8-type-checking ruleset

- Fix any new issues raised by the ruleset

Author: ranta

actions/recurring_reservation.py

@@ -2,22 +2,23 @@
 
 import dataclasses
 import datetime
-from collections.abc import Collection, Iterable
 from itertools import chain
 from typing import TYPE_CHECKING, Any, TypedDict
 
-from django.db import models
-
 from common.date_utils import DEFAULT_TIMEZONE, combine, get_periods_between
-from opening_hours.models import ReservableTimeSpan
 from opening_hours.utils.reservable_time_span_client import merge_overlapping_time_span_elements
 from opening_hours.utils.time_span_element import TimeSpanElement
 from reservation_units.models import ReservationUnit
-from reservations.choices import CustomerTypeChoice, ReservationStateChoice, ReservationTypeChoice
 from reservations.models import RecurringReservation, Reservation, ReservationPurpose
 
 if TYPE_CHECKING:
+    from collections.abc import Collection, Iterable
+
+    from django.db import models
+
     from applications.models import City
+    from opening_hours.models import ReservableTimeSpan
+    from reservations.choices import CustomerTypeChoice, ReservationStateChoice, ReservationTypeChoice
     from users.models import User
 
 

actions/reservation_unit.py

@@ -1,11 +1,8 @@
 from __future__ import annotations
 
 import datetime
-from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
-from django.db import models
-
 from common.date_utils import DEFAULT_TIMEZONE, time_as_timedelta
 from opening_hours.errors import HaukiAPIError
 from opening_hours.models import OriginHaukiResource, ReservableTimeSpan
@@ -15,6 +12,10 @@
 from utils.external_service.errors import ExternalServiceError
 
 if TYPE_CHECKING:
+    from collections.abc import Iterable
+
+    from django.db import models
+
     from reservation_units.models import ReservationUnit
     from reservations.models import Reservation
     from spaces.models import Building, Location

api/graphql/types/application/permissions.py

@@ -6,7 +6,6 @@
 from graphene_django_extensions.permissions import BasePermission
 
 from applications.models import ReservationUnitOption
-from common.typing import AnyUser
 from permissions.helpers import (
     can_modify_application,
     can_read_application,
@@ -16,6 +15,7 @@
 
 if TYPE_CHECKING:
     from applications.models import Application
+    from common.typing import AnyUser
 
 
 class ApplicationPermission(BasePermission):

api/graphql/types/application_round/filtersets.py

@@ -1,13 +1,17 @@
+from typing import TYPE_CHECKING
+
 import django_filters
 from django.db import models
 from graphene_django_extensions import ModelFilterSet
 from graphene_django_extensions.filters import IntMultipleChoiceFilter
 
 from applications.models import ApplicationRound
 from common.date_utils import local_datetime
-from common.typing import AnyUser
 from permissions.helpers import has_general_permission
 
+if TYPE_CHECKING:
+    from common.typing import AnyUser
+
 
 class ApplicationRoundFilterSet(ModelFilterSet):
     pk = IntMultipleChoiceFilter()

api/graphql/types/application_section/serializers.py

@@ -1,5 +1,4 @@
-import datetime
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from django.db import models
 from graphene_django_extensions import NestingModelSerializer
@@ -12,6 +11,9 @@
 from applications.models import AllocatedTimeSlot, Application, ApplicationRound, ApplicationSection
 from common.utils import comma_sep_str
 
+if TYPE_CHECKING:
+    import datetime
+
 __all__ = [
     "ApplicationSectionSerializer",
 ]

api/graphql/types/merchants/permissions.py

@@ -1,5 +1,4 @@
-import uuid
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from graphene_django_extensions.errors import GQLCodeError
 from graphene_django_extensions.permissions import BasePermission
@@ -10,6 +9,9 @@
 from merchants.models import PaymentOrder
 from permissions.helpers import can_handle_reservation, can_refresh_order
 
+if TYPE_CHECKING:
+    import uuid
+
 __all__ = [
     "OrderRefreshPermission",
     "PaymentOrderPermission",

api/graphql/types/reservation/serializers/confirm_serializers.py

@@ -1,3 +1,5 @@
+from typing import TYPE_CHECKING
+
 from django.conf import settings
 
 from api.graphql.extensions.fields import OldChoiceCharField
@@ -7,7 +9,6 @@
 from merchants.models import Language, OrderStatus, PaymentOrder
 from merchants.verkkokauppa.helpers import create_mock_verkkokauppa_order, get_verkkokauppa_order_params
 from merchants.verkkokauppa.order.exceptions import CreateOrderError
-from merchants.verkkokauppa.order.types import CreateOrderParams, Order
 from merchants.verkkokauppa.verkkokauppa_api_client import VerkkokauppaAPIClient
 from reservation_units.enums import PaymentType, PricingType
 from reservation_units.utils.reservation_unit_pricing_helper import ReservationUnitPricingHelper
@@ -16,6 +17,9 @@
 from utils.decimal_utils import round_decimal
 from utils.sentry import SentryLogger
 
+if TYPE_CHECKING:
+    from merchants.verkkokauppa.order.types import CreateOrderParams, Order
+
 
 class ReservationConfirmSerializer(ReservationUpdateSerializer):
     instance: Reservation

api/graphql/types/reservation/serializers/create_serializers.py

@@ -1,8 +1,7 @@
 import datetime
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 from django.conf import settings
-from django.core.handlers.wsgi import WSGIRequest
 from django.utils.timezone import get_default_timezone
 from graphene_django_extensions.fields import IntegerPrimaryKeyField
 from graphql import GraphQLError
@@ -25,10 +24,14 @@
 )
 from reservations.models import AgeGroup, Reservation, ReservationPurpose
 from users.helauth.clients import HelsinkiProfileClient
-from users.models import User
 from utils.external_service.errors import ExternalServiceError
 from utils.sentry import SentryLogger
 
+if TYPE_CHECKING:
+    from django.core.handlers.wsgi import WSGIRequest
+
+    from users.models import User
+
 DEFAULT_TIMEZONE = get_default_timezone()
 
 

api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py

@@ -1,4 +1,5 @@
 import datetime
+from typing import TYPE_CHECKING
 
 from django.utils.timezone import get_default_timezone
 
@@ -7,10 +8,12 @@
 from api.graphql.types.reservation.serializers.mixins import ReservationSchedulingMixin
 from common.date_utils import local_datetime
 from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender
-from reservation_units.models import ReservationUnit
 from reservations.choices import ReservationStateChoice, ReservationTypeChoice
 from reservations.models import Reservation
 
+if TYPE_CHECKING:
+    from reservation_units.models import ReservationUnit
+
 DEFAULT_TIMEZONE = get_default_timezone()
 
 

api/graphql/types/reservation_unit/filtersets.py

@@ -1,8 +1,6 @@
 import operator
-from datetime import date, time
-from decimal import Decimal
 from functools import reduce
-from typing import Any
+from typing import TYPE_CHECKING, Any
 
 import django_filters
 from django.db.models import Expression, F, Q, QuerySet
@@ -18,6 +16,10 @@
 from reservation_units.utils.reservation_unit_reservation_state_helper import ReservationUnitReservationStateHelper
 from reservation_units.utils.reservation_unit_state_helper import ReservationUnitStateHelper
 
+if TYPE_CHECKING:
+    from datetime import date, time
+    from decimal import Decimal
+
 __all__ = [
     "ReservationUnitFilterSet",
 ]