diff --git a/api/apps.py b/api/apps.py deleted file mode 100644 index 14b89a8298..0000000000 --- a/api/apps.py +++ /dev/null @@ -1,5 +0,0 @@ -from django.apps import AppConfig - - -class ApiConfig(AppConfig): - name = "api" diff --git a/config/settings.py b/config/settings.py index c8592beb8e..b251a6ddb7 100644 --- a/config/settings.py +++ b/config/settings.py @@ -80,6 +80,7 @@ class Common(Environment): "tinymce", "subforms", # Our apps + "tilavarauspalvelu", "common", "users", "applications", @@ -93,7 +94,6 @@ class Common(Environment): "services", "spaces", "terms_of_use", - "api", ] MIDDLEWARE = [ @@ -391,7 +391,7 @@ def OIDC_API_TOKEN_AUTH(cls): # --- Graphene settings ------------------------------------------------------------------------------------------ GRAPHENE = { - "SCHEMA": "api.graphql.schema.schema", + "SCHEMA": "tilavarauspalvelu.api.graphql.schema.schema", "MIDDLEWARE": [ "config.middleware.GraphQLSentryMiddleware", ], diff --git a/config/urls.py b/config/urls.py index 44b4440523..8477c5b455 100644 --- a/config/urls.py +++ b/config/urls.py @@ -5,9 +5,9 @@ from django.views.decorators.csrf import csrf_exempt from graphene_django_extensions import FileUploadGraphQLView -from api.gdpr.views import TilavarauspalveluGDPRAPIView -from api.rest.views import csrf_view, reservation_ical, terms_of_use_pdf -from api.webhooks.urls import webhook_router +from tilavarauspalvelu.api.gdpr.views import TilavarauspalveluGDPRAPIView +from tilavarauspalvelu.api.rest.views import csrf_view, reservation_ical, terms_of_use_pdf +from tilavarauspalvelu.api.webhooks.urls import webhook_router # Mock the `each_context` method to add some custom context variables. original_each_context = admin.site.each_context @@ -34,7 +34,7 @@ path("v1/terms_of_use_pdf/", terms_of_use_pdf, name="terms_of_use_pdf"), path("v1/webhook/", include(webhook_router.urls)), path("pysocial/", include("social_django.urls", namespace="social")), - path("helauth/", include("api.helauth.urls")), + path("helauth/", include("tilavarauspalvelu.api.helauth.urls")), re_path( # GDPR UUID's are v1, not v4! r"gdpr/v1/user/(?P[\da-fA-F]{8}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{4}-[\da-fA-F]{12})/?$", diff --git a/email_notification/helpers/email_builder_reservation.py b/email_notification/helpers/email_builder_reservation.py index 5140191320..2564d1aa04 100644 --- a/email_notification/helpers/email_builder_reservation.py +++ b/email_notification/helpers/email_builder_reservation.py @@ -191,7 +191,7 @@ def _get_reservation_reservation_unit_name(reservation: Reservation, language: L @staticmethod def _get_reservation_subsidised_price(reservation: Reservation) -> Decimal: - from api.graphql.types.reservation.serializers.mixins import ReservationPriceMixin + from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ReservationPriceMixin if not reservation.applying_for_free_of_charge: return reservation.price diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index a3ff34c7ee..5ea5bd46bb 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -39,23 +39,23 @@ msgstr "" msgid "My bookings" msgstr "Omat Varaukset" -#: api/gdpr/views.py +#: tilavarauspalvelu/api/gdpr/views.py msgid "User has upcoming or too recent reservations." msgstr "Käyttäjällä on tulevia tai liian äskettäisiä varauksia." -#: api/gdpr/views.py +#: tilavarauspalvelu/api/gdpr/views.py msgid "User has an unhandled application." msgstr "Käyttäjällä on käsittelemätön hakemus." -#: api/gdpr/views.py +#: tilavarauspalvelu/api/gdpr/views.py msgid "User has open payments." msgstr "Käyttäjällä on avoimia maksuja." -#: api/graphql/extensions/fields.py +#: tilavarauspalvelu/api/graphql/extensions/fields.py msgid "A valid integer is required." msgstr "Syötä oikea kokonaisluku." -#: api/graphql/extensions/fields.py +#: tilavarauspalvelu/api/graphql/extensions/fields.py #, python-format msgid "" "Choice \"%(choice)s\" is not allowed. Allowed choices are: " diff --git a/locale/sv/LC_MESSAGES/django.po b/locale/sv/LC_MESSAGES/django.po index c3c67d5e17..1a427436fe 100644 --- a/locale/sv/LC_MESSAGES/django.po +++ b/locale/sv/LC_MESSAGES/django.po @@ -39,23 +39,23 @@ msgstr "" msgid "My bookings" msgstr "Mina bokningar" -#: api/gdpr/views.py +#: tilavarauspalvelu/api/gdpr/views.py msgid "User has upcoming or too recent reservations." msgstr "" -#: api/gdpr/views.py +#: tilavarauspalvelu/api/gdpr/views.py msgid "User has an unhandled application." msgstr "" -#: api/gdpr/views.py +#: tilavarauspalvelu/api/gdpr/views.py msgid "User has open payments." msgstr "" -#: api/graphql/extensions/fields.py +#: tilavarauspalvelu/api/graphql/extensions/fields.py msgid "A valid integer is required." msgstr "" -#: api/graphql/extensions/fields.py +#: tilavarauspalvelu/api/graphql/extensions/fields.py #, python-format msgid "" "Choice \"%(choice)s\" is not allowed. Allowed choices are: " diff --git a/pyproject.toml b/pyproject.toml index 5e28a7bce7..52a5314391 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -91,7 +91,6 @@ unsafe-fixes = true line-length = 120 target-version = "py312" extend-exclude = [ - "api/examples.py", "build", "local_settings.py", "migrations", @@ -211,11 +210,11 @@ lint.ignore = [ "utils/query_performance.py" = [ "PLR0912", # This one is allowed to be as complex as it needs to be. ] -"api/webhooks/serializers.py" = [ +"tilavarauspalvelu/api/webhooks/serializers.py" = [ "N802", # Allow non-lowercase function names for webhook serializers. "N815", # Allow mixedCase variables for webhook serializers. ] -"api/graphql/extensions/error_codes.py" = [ +"tilavarauspalvelu/api/graphql/extensions/error_codes.py" = [ "ERA001", # Commented code is fine here. ] "test_*.py" = [ @@ -342,7 +341,6 @@ filterwarnings = [ [tool.coverage.run] source = [ "allocation/", - "api/", "applications/", "email_notification/", "merchants/", diff --git a/tests/test_graphql_api/test_application_round/helpers.py b/tests/test_graphql_api/test_application_round/helpers.py index f3b167c9eb..23323225e9 100644 --- a/tests/test_graphql_api/test_application_round/helpers.py +++ b/tests/test_graphql_api/test_application_round/helpers.py @@ -14,6 +14,8 @@ @contextlib.contextmanager def disable_reservation_generation(): - path = "api.graphql.types.application_round.serializers.generate_reservation_series_from_allocations" + path = ( + "tilavarauspalvelu.api.graphql.types.application_round.serializers.generate_reservation_series_from_allocations" + ) with patch(path, return_value=None) as mock: yield mock diff --git a/tests/test_graphql_api/test_banner_notification/test_query.py b/tests/test_graphql_api/test_banner_notification/test_query.py index 4789420aba..a968fb1576 100644 --- a/tests/test_graphql_api/test_banner_notification/test_query.py +++ b/tests/test_graphql_api/test_banner_notification/test_query.py @@ -4,9 +4,9 @@ from graphene_django_extensions.testing.utils import parametrize_helper from graphql_relay import to_global_id -from api.graphql.types.banner_notification.types import BannerNotificationNode from common.enums import BannerNotificationTarget from tests.factories import BannerNotificationFactory, UserFactory +from tilavarauspalvelu.api.graphql.types.banner_notification.types import BannerNotificationNode # Applied to all tests pytestmark = [ diff --git a/tests/test_graphql_api/test_reservation/test_pricing_calculation.py b/tests/test_graphql_api/test_reservation/test_pricing_calculation.py index c2990f4e3e..8e77f1af32 100644 --- a/tests/test_graphql_api/test_reservation/test_pricing_calculation.py +++ b/tests/test_graphql_api/test_reservation/test_pricing_calculation.py @@ -3,10 +3,10 @@ import pytest -from api.graphql.types.reservation.serializers.mixins import ReservationPriceMixin from common.date_utils import local_datetime from reservation_units.enums import PriceUnit, PricingStatus, PricingType from tests.factories import ReservationUnitFactory, ReservationUnitPricingFactory +from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ReservationPriceMixin # Applied to all tests pytestmark = [ diff --git a/api/__init__.py b/tilavarauspalvelu/__init__.py similarity index 100% rename from api/__init__.py rename to tilavarauspalvelu/__init__.py diff --git a/api/gdpr/__init__.py b/tilavarauspalvelu/admin/__init__.py similarity index 100% rename from api/gdpr/__init__.py rename to tilavarauspalvelu/admin/__init__.py diff --git a/api/graphql/__init__.py b/tilavarauspalvelu/admin/address/__init__.py similarity index 100% rename from api/graphql/__init__.py rename to tilavarauspalvelu/admin/address/__init__.py diff --git a/api/graphql/extensions/__init__.py b/tilavarauspalvelu/admin/address/admin.py similarity index 100% rename from api/graphql/extensions/__init__.py rename to tilavarauspalvelu/admin/address/admin.py diff --git a/api/graphql/types/__init__.py b/tilavarauspalvelu/admin/affecting_time_span/__init__.py similarity index 100% rename from api/graphql/types/__init__.py rename to tilavarauspalvelu/admin/affecting_time_span/__init__.py diff --git a/api/graphql/types/ability_group/__init__.py b/tilavarauspalvelu/admin/affecting_time_span/admin.py similarity index 100% rename from api/graphql/types/ability_group/__init__.py rename to tilavarauspalvelu/admin/affecting_time_span/admin.py diff --git a/api/graphql/types/address/__init__.py b/tilavarauspalvelu/admin/age_group/__init__.py similarity index 100% rename from api/graphql/types/address/__init__.py rename to tilavarauspalvelu/admin/age_group/__init__.py diff --git a/api/graphql/types/age_group/__init__.py b/tilavarauspalvelu/admin/age_group/admin.py similarity index 100% rename from api/graphql/types/age_group/__init__.py rename to tilavarauspalvelu/admin/age_group/admin.py diff --git a/api/graphql/types/allocated_time_slot/__init__.py b/tilavarauspalvelu/admin/allocated_timeslot/__init__.py similarity index 100% rename from api/graphql/types/allocated_time_slot/__init__.py rename to tilavarauspalvelu/admin/allocated_timeslot/__init__.py diff --git a/api/graphql/types/application/__init__.py b/tilavarauspalvelu/admin/allocated_timeslot/admin.py similarity index 100% rename from api/graphql/types/application/__init__.py rename to tilavarauspalvelu/admin/allocated_timeslot/admin.py diff --git a/api/graphql/types/application_round/__init__.py b/tilavarauspalvelu/admin/application/__init__.py similarity index 100% rename from api/graphql/types/application_round/__init__.py rename to tilavarauspalvelu/admin/application/__init__.py diff --git a/api/graphql/types/application_round_time_slot/__init__.py b/tilavarauspalvelu/admin/application/admin.py similarity index 100% rename from api/graphql/types/application_round_time_slot/__init__.py rename to tilavarauspalvelu/admin/application/admin.py diff --git a/api/graphql/types/application_section/__init__.py b/tilavarauspalvelu/admin/application_round/__init__.py similarity index 100% rename from api/graphql/types/application_section/__init__.py rename to tilavarauspalvelu/admin/application_round/__init__.py diff --git a/api/graphql/types/banner_notification/__init__.py b/tilavarauspalvelu/admin/application_round/admin.py similarity index 100% rename from api/graphql/types/banner_notification/__init__.py rename to tilavarauspalvelu/admin/application_round/admin.py diff --git a/api/graphql/types/building/__init__.py b/tilavarauspalvelu/admin/application_round_time_slot/__init__.py similarity index 100% rename from api/graphql/types/building/__init__.py rename to tilavarauspalvelu/admin/application_round_time_slot/__init__.py diff --git a/api/graphql/types/city/__init__.py b/tilavarauspalvelu/admin/application_round_time_slot/admin.py similarity index 100% rename from api/graphql/types/city/__init__.py rename to tilavarauspalvelu/admin/application_round_time_slot/admin.py diff --git a/api/graphql/types/equipment/__init__.py b/tilavarauspalvelu/admin/application_section/__init__.py similarity index 100% rename from api/graphql/types/equipment/__init__.py rename to tilavarauspalvelu/admin/application_section/__init__.py diff --git a/api/graphql/types/equipment_category/__init__.py b/tilavarauspalvelu/admin/application_section/admin.py similarity index 100% rename from api/graphql/types/equipment_category/__init__.py rename to tilavarauspalvelu/admin/application_section/admin.py diff --git a/api/graphql/types/helsinki_profile/__init__.py b/tilavarauspalvelu/admin/banner_notification/__init__.py similarity index 100% rename from api/graphql/types/helsinki_profile/__init__.py rename to tilavarauspalvelu/admin/banner_notification/__init__.py diff --git a/api/graphql/types/keyword/__init__.py b/tilavarauspalvelu/admin/banner_notification/admin.py similarity index 100% rename from api/graphql/types/keyword/__init__.py rename to tilavarauspalvelu/admin/banner_notification/admin.py diff --git a/api/graphql/types/location/__init__.py b/tilavarauspalvelu/admin/building/__init__.py similarity index 100% rename from api/graphql/types/location/__init__.py rename to tilavarauspalvelu/admin/building/__init__.py diff --git a/api/graphql/types/merchants/__init__.py b/tilavarauspalvelu/admin/building/admin.py similarity index 100% rename from api/graphql/types/merchants/__init__.py rename to tilavarauspalvelu/admin/building/admin.py diff --git a/api/graphql/types/organisation/__init__.py b/tilavarauspalvelu/admin/cancel_reason/__init__.py similarity index 100% rename from api/graphql/types/organisation/__init__.py rename to tilavarauspalvelu/admin/cancel_reason/__init__.py diff --git a/api/graphql/types/permissions/__init__.py b/tilavarauspalvelu/admin/cancel_reason/admin.py similarity index 100% rename from api/graphql/types/permissions/__init__.py rename to tilavarauspalvelu/admin/cancel_reason/admin.py diff --git a/api/graphql/types/person/__init__.py b/tilavarauspalvelu/admin/cancellation_rule/__init__.py similarity index 100% rename from api/graphql/types/person/__init__.py rename to tilavarauspalvelu/admin/cancellation_rule/__init__.py diff --git a/api/graphql/types/purpose/__init__.py b/tilavarauspalvelu/admin/cancellation_rule/admin.py similarity index 100% rename from api/graphql/types/purpose/__init__.py rename to tilavarauspalvelu/admin/cancellation_rule/admin.py diff --git a/api/graphql/types/qualifier/__init__.py b/tilavarauspalvelu/admin/city/__init__.py similarity index 100% rename from api/graphql/types/qualifier/__init__.py rename to tilavarauspalvelu/admin/city/__init__.py diff --git a/api/graphql/types/real_estate/__init__.py b/tilavarauspalvelu/admin/city/admin.py similarity index 100% rename from api/graphql/types/real_estate/__init__.py rename to tilavarauspalvelu/admin/city/admin.py diff --git a/api/graphql/types/recurring_reservation/__init__.py b/tilavarauspalvelu/admin/deny_reason/__init__.py similarity index 100% rename from api/graphql/types/recurring_reservation/__init__.py rename to tilavarauspalvelu/admin/deny_reason/__init__.py diff --git a/api/graphql/types/rejected_occurrence/__init__.py b/tilavarauspalvelu/admin/deny_reason/admin.py similarity index 100% rename from api/graphql/types/rejected_occurrence/__init__.py rename to tilavarauspalvelu/admin/deny_reason/admin.py diff --git a/api/graphql/types/reservation/__init__.py b/tilavarauspalvelu/admin/email_template/__init__.py similarity index 100% rename from api/graphql/types/reservation/__init__.py rename to tilavarauspalvelu/admin/email_template/__init__.py diff --git a/api/graphql/types/reservation_cancel_reason/__init__.py b/tilavarauspalvelu/admin/email_template/admin.py similarity index 100% rename from api/graphql/types/reservation_cancel_reason/__init__.py rename to tilavarauspalvelu/admin/email_template/admin.py diff --git a/api/graphql/types/reservation_deny_reason/__init__.py b/tilavarauspalvelu/admin/equipment/__init__.py similarity index 100% rename from api/graphql/types/reservation_deny_reason/__init__.py rename to tilavarauspalvelu/admin/equipment/__init__.py diff --git a/api/graphql/types/reservation_metadata/__init__.py b/tilavarauspalvelu/admin/equipment/admin.py similarity index 100% rename from api/graphql/types/reservation_metadata/__init__.py rename to tilavarauspalvelu/admin/equipment/admin.py diff --git a/api/graphql/types/reservation_purpose/__init__.py b/tilavarauspalvelu/admin/equipment_category/__init__.py similarity index 100% rename from api/graphql/types/reservation_purpose/__init__.py rename to tilavarauspalvelu/admin/equipment_category/__init__.py diff --git a/api/graphql/types/reservation_unit/__init__.py b/tilavarauspalvelu/admin/equipment_category/admin.py similarity index 100% rename from api/graphql/types/reservation_unit/__init__.py rename to tilavarauspalvelu/admin/equipment_category/admin.py diff --git a/api/graphql/types/reservation_unit_cancellation_rule/__init__.py b/tilavarauspalvelu/admin/general_permission/__init__.py similarity index 100% rename from api/graphql/types/reservation_unit_cancellation_rule/__init__.py rename to tilavarauspalvelu/admin/general_permission/__init__.py diff --git a/api/graphql/types/reservation_unit_image/__init__.py b/tilavarauspalvelu/admin/general_permission/admin.py similarity index 100% rename from api/graphql/types/reservation_unit_image/__init__.py rename to tilavarauspalvelu/admin/general_permission/admin.py diff --git a/api/graphql/types/reservation_unit_option/__init__.py b/tilavarauspalvelu/admin/hauki_resource/__init__.py similarity index 100% rename from api/graphql/types/reservation_unit_option/__init__.py rename to tilavarauspalvelu/admin/hauki_resource/__init__.py diff --git a/api/graphql/types/reservation_unit_payment_type/__init__.py b/tilavarauspalvelu/admin/hauki_resource/admin.py similarity index 100% rename from api/graphql/types/reservation_unit_payment_type/__init__.py rename to tilavarauspalvelu/admin/hauki_resource/admin.py diff --git a/api/graphql/types/reservation_unit_pricing/__init__.py b/tilavarauspalvelu/admin/introduction/__init__.py similarity index 100% rename from api/graphql/types/reservation_unit_pricing/__init__.py rename to tilavarauspalvelu/admin/introduction/__init__.py diff --git a/api/graphql/types/reservation_unit_type/__init__.py b/tilavarauspalvelu/admin/introduction/admin.py similarity index 100% rename from api/graphql/types/reservation_unit_type/__init__.py rename to tilavarauspalvelu/admin/introduction/admin.py diff --git a/api/graphql/types/resource/__init__.py b/tilavarauspalvelu/admin/keyword/__init__.py similarity index 100% rename from api/graphql/types/resource/__init__.py rename to tilavarauspalvelu/admin/keyword/__init__.py diff --git a/api/graphql/types/service/__init__.py b/tilavarauspalvelu/admin/keyword/admin.py similarity index 100% rename from api/graphql/types/service/__init__.py rename to tilavarauspalvelu/admin/keyword/admin.py diff --git a/api/graphql/types/service_sector/__init__.py b/tilavarauspalvelu/admin/keyword_category/__init__.py similarity index 100% rename from api/graphql/types/service_sector/__init__.py rename to tilavarauspalvelu/admin/keyword_category/__init__.py diff --git a/api/graphql/types/space/__init__.py b/tilavarauspalvelu/admin/keyword_category/admin.py similarity index 100% rename from api/graphql/types/space/__init__.py rename to tilavarauspalvelu/admin/keyword_category/admin.py diff --git a/api/graphql/types/suitable_time_range/__init__.py b/tilavarauspalvelu/admin/keyword_group/__init__.py similarity index 100% rename from api/graphql/types/suitable_time_range/__init__.py rename to tilavarauspalvelu/admin/keyword_group/__init__.py diff --git a/api/graphql/types/tax_percentage/__init__.py b/tilavarauspalvelu/admin/keyword_group/admin.py similarity index 100% rename from api/graphql/types/tax_percentage/__init__.py rename to tilavarauspalvelu/admin/keyword_group/admin.py diff --git a/api/graphql/types/terms_of_use/__init__.py b/tilavarauspalvelu/admin/location/__init__.py similarity index 100% rename from api/graphql/types/terms_of_use/__init__.py rename to tilavarauspalvelu/admin/location/__init__.py diff --git a/api/graphql/types/unit/__init__.py b/tilavarauspalvelu/admin/location/admin.py similarity index 100% rename from api/graphql/types/unit/__init__.py rename to tilavarauspalvelu/admin/location/admin.py diff --git a/api/graphql/types/unit_group/__init__.py b/tilavarauspalvelu/admin/metadata_field/__init__.py similarity index 100% rename from api/graphql/types/unit_group/__init__.py rename to tilavarauspalvelu/admin/metadata_field/__init__.py diff --git a/api/graphql/types/user/__init__.py b/tilavarauspalvelu/admin/metadata_field/admin.py similarity index 100% rename from api/graphql/types/user/__init__.py rename to tilavarauspalvelu/admin/metadata_field/admin.py diff --git a/api/helauth/__init__.py b/tilavarauspalvelu/admin/metadata_set/__init__.py similarity index 100% rename from api/helauth/__init__.py rename to tilavarauspalvelu/admin/metadata_set/__init__.py diff --git a/api/rest/__init__.py b/tilavarauspalvelu/admin/metadata_set/admin.py similarity index 100% rename from api/rest/__init__.py rename to tilavarauspalvelu/admin/metadata_set/admin.py diff --git a/api/webhooks/__init__.py b/tilavarauspalvelu/admin/organisation/__init__.py similarity index 100% rename from api/webhooks/__init__.py rename to tilavarauspalvelu/admin/organisation/__init__.py diff --git a/tilavarauspalvelu/admin/organisation/admin.py b/tilavarauspalvelu/admin/organisation/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_accounting/__init__.py b/tilavarauspalvelu/admin/payment_accounting/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_accounting/admin.py b/tilavarauspalvelu/admin/payment_accounting/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_merchant/__init__.py b/tilavarauspalvelu/admin/payment_merchant/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_merchant/admin.py b/tilavarauspalvelu/admin/payment_merchant/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_order/__init__.py b/tilavarauspalvelu/admin/payment_order/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_order/admin.py b/tilavarauspalvelu/admin/payment_order/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_product/__init__.py b/tilavarauspalvelu/admin/payment_product/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/payment_product/admin.py b/tilavarauspalvelu/admin/payment_product/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/person/__init__.py b/tilavarauspalvelu/admin/person/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/person/admin.py b/tilavarauspalvelu/admin/person/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/pricing/__init__.py b/tilavarauspalvelu/admin/pricing/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/pricing/admin.py b/tilavarauspalvelu/admin/pricing/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/purpose/__init__.py b/tilavarauspalvelu/admin/purpose/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/purpose/admin.py b/tilavarauspalvelu/admin/purpose/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/qualifier/__init__.py b/tilavarauspalvelu/admin/qualifier/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/qualifier/admin.py b/tilavarauspalvelu/admin/qualifier/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/real_estate/__init__.py b/tilavarauspalvelu/admin/real_estate/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/real_estate/admin.py b/tilavarauspalvelu/admin/real_estate/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/recurring_reservation/__init__.py b/tilavarauspalvelu/admin/recurring_reservation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/recurring_reservation/admin.py b/tilavarauspalvelu/admin/recurring_reservation/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/rejected_occurrence/__init__.py b/tilavarauspalvelu/admin/rejected_occurrence/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/rejected_occurrence/admin.py b/tilavarauspalvelu/admin/rejected_occurrence/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/request_log/__init__.py b/tilavarauspalvelu/admin/request_log/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/request_log/admin.py b/tilavarauspalvelu/admin/request_log/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservable_timespan/__init__.py b/tilavarauspalvelu/admin/reservable_timespan/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservable_timespan/admin.py b/tilavarauspalvelu/admin/reservable_timespan/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation/__init__.py b/tilavarauspalvelu/admin/reservation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation/admin.py b/tilavarauspalvelu/admin/reservation/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_purpose/__init__.py b/tilavarauspalvelu/admin/reservation_purpose/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_purpose/admin.py b/tilavarauspalvelu/admin/reservation_purpose/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_statistic/__init__.py b/tilavarauspalvelu/admin/reservation_statistic/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_statistic/admin.py b/tilavarauspalvelu/admin/reservation_statistic/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit/__init__.py b/tilavarauspalvelu/admin/reservation_unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit/admin.py b/tilavarauspalvelu/admin/reservation_unit/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_hierarchy/__init__.py b/tilavarauspalvelu/admin/reservation_unit_hierarchy/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_hierarchy/admin.py b/tilavarauspalvelu/admin/reservation_unit_hierarchy/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_image/__init__.py b/tilavarauspalvelu/admin/reservation_unit_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_image/admin.py b/tilavarauspalvelu/admin/reservation_unit_image/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_option/__init__.py b/tilavarauspalvelu/admin/reservation_unit_option/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_option/admin.py b/tilavarauspalvelu/admin/reservation_unit_option/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_payment_type/__init__.py b/tilavarauspalvelu/admin/reservation_unit_payment_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_payment_type/admin.py b/tilavarauspalvelu/admin/reservation_unit_payment_type/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_type/__init__.py b/tilavarauspalvelu/admin/reservation_unit_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/reservation_unit_type/admin.py b/tilavarauspalvelu/admin/reservation_unit_type/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/resource/__init__.py b/tilavarauspalvelu/admin/resource/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/resource/admin.py b/tilavarauspalvelu/admin/resource/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/service/__init__.py b/tilavarauspalvelu/admin/service/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/service/admin.py b/tilavarauspalvelu/admin/service/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/space/__init__.py b/tilavarauspalvelu/admin/space/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/space/admin.py b/tilavarauspalvelu/admin/space/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/sql_log/__init__.py b/tilavarauspalvelu/admin/sql_log/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/sql_log/admin.py b/tilavarauspalvelu/admin/sql_log/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/suitable_time_range/__init__.py b/tilavarauspalvelu/admin/suitable_time_range/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/suitable_time_range/admin.py b/tilavarauspalvelu/admin/suitable_time_range/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/tax_percentage/__init__.py b/tilavarauspalvelu/admin/tax_percentage/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/tax_percentage/admin.py b/tilavarauspalvelu/admin/tax_percentage/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/terms_of_use/__init__.py b/tilavarauspalvelu/admin/terms_of_use/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/terms_of_use/admin.py b/tilavarauspalvelu/admin/terms_of_use/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/unit/__init__.py b/tilavarauspalvelu/admin/unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/unit/admin.py b/tilavarauspalvelu/admin/unit/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/unit_permission/__init__.py b/tilavarauspalvelu/admin/unit_permission/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/unit_permission/admin.py b/tilavarauspalvelu/admin/unit_permission/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/user/__init__.py b/tilavarauspalvelu/admin/user/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/admin/user/admin.py b/tilavarauspalvelu/admin/user/admin.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/api/__init__.py b/tilavarauspalvelu/api/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/api/gdpr/__init__.py b/tilavarauspalvelu/api/gdpr/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/gdpr/views.py b/tilavarauspalvelu/api/gdpr/views.py similarity index 100% rename from api/gdpr/views.py rename to tilavarauspalvelu/api/gdpr/views.py diff --git a/tilavarauspalvelu/api/graphql/__init__.py b/tilavarauspalvelu/api/graphql/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/api/graphql/extensions/__init__.py b/tilavarauspalvelu/api/graphql/extensions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/extensions/error_codes.py b/tilavarauspalvelu/api/graphql/extensions/error_codes.py similarity index 98% rename from api/graphql/extensions/error_codes.py rename to tilavarauspalvelu/api/graphql/extensions/error_codes.py index f37c1993e9..101d5e86cd 100644 --- a/api/graphql/extensions/error_codes.py +++ b/tilavarauspalvelu/api/graphql/extensions/error_codes.py @@ -1,7 +1,7 @@ # This file should contain all possible error codes that can be returned by the GraphQL API (WIP) # Do not put anything else but error codes in this file, so that the error codes can be used like this: # -# from api.graphql.extensions import error_codes +# from tilavarauspalvelu.api.graphql.extensions import error_codes # # error_codes.ERROR_CODE_NAME # diff --git a/api/graphql/extensions/fields.py b/tilavarauspalvelu/api/graphql/extensions/fields.py similarity index 100% rename from api/graphql/extensions/fields.py rename to tilavarauspalvelu/api/graphql/extensions/fields.py diff --git a/api/graphql/extensions/filters.py b/tilavarauspalvelu/api/graphql/extensions/filters.py similarity index 100% rename from api/graphql/extensions/filters.py rename to tilavarauspalvelu/api/graphql/extensions/filters.py diff --git a/api/graphql/extensions/order_filter.py b/tilavarauspalvelu/api/graphql/extensions/order_filter.py similarity index 100% rename from api/graphql/extensions/order_filter.py rename to tilavarauspalvelu/api/graphql/extensions/order_filter.py diff --git a/api/graphql/extensions/serializers.py b/tilavarauspalvelu/api/graphql/extensions/serializers.py similarity index 100% rename from api/graphql/extensions/serializers.py rename to tilavarauspalvelu/api/graphql/extensions/serializers.py diff --git a/api/graphql/extensions/validation_errors.py b/tilavarauspalvelu/api/graphql/extensions/validation_errors.py similarity index 100% rename from api/graphql/extensions/validation_errors.py rename to tilavarauspalvelu/api/graphql/extensions/validation_errors.py diff --git a/api/graphql/mutations.py b/tilavarauspalvelu/api/graphql/mutations.py similarity index 73% rename from api/graphql/mutations.py rename to tilavarauspalvelu/api/graphql/mutations.py index 09a6e44c29..059a8057dd 100644 --- a/api/graphql/mutations.py +++ b/tilavarauspalvelu/api/graphql/mutations.py @@ -14,11 +14,8 @@ # Import all queries before importing any mutations! See explanation above. from .queries import * # noqa: F403 # isort:skip -from api.graphql.types.allocated_time_slot.mutations import ( - AllocatedTimeSlotCreateMutation, - AllocatedTimeSlotDeleteMutation, -) -from api.graphql.types.application.mutations import ( +from .types.allocated_time_slot.mutations import AllocatedTimeSlotCreateMutation, AllocatedTimeSlotDeleteMutation +from .types.application.mutations import ( ApplicationCancelMutation, ApplicationCreateMutation, ApplicationSendMutation, @@ -26,37 +23,33 @@ RejectAllApplicationOptionsMutation, RestoreAllApplicationOptionsMutation, ) -from api.graphql.types.application_round.mutation import SetApplicationRoundHandledMutation -from api.graphql.types.application_section.mutations import ( +from .types.application_round.mutation import SetApplicationRoundHandledMutation +from .types.application_section.mutations import ( ApplicationSectionCreateMutation, ApplicationSectionDeleteMutation, ApplicationSectionUpdateMutation, RejectAllSectionOptionsMutation, RestoreAllSectionOptionsMutation, ) -from api.graphql.types.banner_notification.mutations import ( +from .types.banner_notification.mutations import ( BannerNotificationCreateMutation, BannerNotificationDeleteMutation, BannerNotificationUpdateMutation, ) -from api.graphql.types.equipment.mutations import ( - EquipmentCreateMutation, - EquipmentDeleteMutation, - EquipmentUpdateMutation, -) -from api.graphql.types.equipment_category.mutations import ( +from .types.equipment.mutations import EquipmentCreateMutation, EquipmentDeleteMutation, EquipmentUpdateMutation +from .types.equipment_category.mutations import ( EquipmentCategoryCreateMutation, EquipmentCategoryDeleteMutation, EquipmentCategoryUpdateMutation, ) -from api.graphql.types.merchants.mutations import RefreshOrderMutation -from api.graphql.types.purpose.mutations import PurposeCreateMutation, PurposeUpdateMutation -from api.graphql.types.recurring_reservation.mutations import ( +from .types.merchants.mutations import RefreshOrderMutation +from .types.purpose.mutations import PurposeCreateMutation, PurposeUpdateMutation +from .types.recurring_reservation.mutations import ( RecurringReservationCreateMutation, RecurringReservationUpdateMutation, ReservationSeriesCreateMutation, ) -from api.graphql.types.reservation.mutations import ( +from .types.reservation.mutations import ( ReservationAdjustTimeMutation, ReservationApproveMutation, ReservationCancellationMutation, @@ -72,17 +65,17 @@ ReservationUpdateMutation, ReservationWorkingMemoMutation, ) -from api.graphql.types.reservation_unit.mutations import ReservationUnitCreateMutation, ReservationUnitUpdateMutation -from api.graphql.types.reservation_unit_image.mutations import ( +from .types.reservation_unit.mutations import ReservationUnitCreateMutation, ReservationUnitUpdateMutation +from .types.reservation_unit_image.mutations import ( ReservationUnitImageCreateMutation, ReservationUnitImageDeleteMutation, ReservationUnitImageUpdateMutation, ) -from api.graphql.types.reservation_unit_option.mutations import ReservationUnitOptionUpdateMutation -from api.graphql.types.resource.mutations import ResourceCreateMutation, ResourceDeleteMutation, ResourceUpdateMutation -from api.graphql.types.space.mutations import SpaceCreateMutation, SpaceDeleteMutation, SpaceUpdateMutation -from api.graphql.types.unit.mutations import UnitUpdateMutation -from api.graphql.types.user.mutations import UserUpdateMutation +from .types.reservation_unit_option.mutations import ReservationUnitOptionUpdateMutation +from .types.resource.mutations import ResourceCreateMutation, ResourceDeleteMutation, ResourceUpdateMutation +from .types.space.mutations import SpaceCreateMutation, SpaceDeleteMutation, SpaceUpdateMutation +from .types.unit.mutations import UnitUpdateMutation +from .types.user.mutations import UserUpdateMutation __all__ = [ "AllocatedTimeSlotCreateMutation", diff --git a/api/graphql/queries.py b/tilavarauspalvelu/api/graphql/queries.py similarity index 100% rename from api/graphql/queries.py rename to tilavarauspalvelu/api/graphql/queries.py diff --git a/api/graphql/schema.py b/tilavarauspalvelu/api/graphql/schema.py similarity index 100% rename from api/graphql/schema.py rename to tilavarauspalvelu/api/graphql/schema.py diff --git a/tilavarauspalvelu/api/graphql/types/__init__.py b/tilavarauspalvelu/api/graphql/types/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/api/graphql/types/ability_group/__init__.py b/tilavarauspalvelu/api/graphql/types/ability_group/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/ability_group/permissions.py b/tilavarauspalvelu/api/graphql/types/ability_group/permissions.py similarity index 100% rename from api/graphql/types/ability_group/permissions.py rename to tilavarauspalvelu/api/graphql/types/ability_group/permissions.py diff --git a/api/graphql/types/ability_group/types.py b/tilavarauspalvelu/api/graphql/types/ability_group/types.py similarity index 79% rename from api/graphql/types/ability_group/types.py rename to tilavarauspalvelu/api/graphql/types/ability_group/types.py index 4afab47019..09dde971a4 100644 --- a/api/graphql/types/ability_group/types.py +++ b/tilavarauspalvelu/api/graphql/types/ability_group/types.py @@ -1,8 +1,9 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.ability_group.permissions import AbilityGroupPermission from reservations.models import AbilityGroup +from .permissions import AbilityGroupPermission + class AbilityGroupNode(DjangoNode): class Meta: diff --git a/tilavarauspalvelu/api/graphql/types/address/__init__.py b/tilavarauspalvelu/api/graphql/types/address/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/address/permissions.py b/tilavarauspalvelu/api/graphql/types/address/permissions.py similarity index 100% rename from api/graphql/types/address/permissions.py rename to tilavarauspalvelu/api/graphql/types/address/permissions.py diff --git a/api/graphql/types/address/serializers.py b/tilavarauspalvelu/api/graphql/types/address/serializers.py similarity index 100% rename from api/graphql/types/address/serializers.py rename to tilavarauspalvelu/api/graphql/types/address/serializers.py diff --git a/api/graphql/types/address/types.py b/tilavarauspalvelu/api/graphql/types/address/types.py similarity index 83% rename from api/graphql/types/address/types.py rename to tilavarauspalvelu/api/graphql/types/address/types.py index 262f4ab53f..09559f8955 100644 --- a/api/graphql/types/address/types.py +++ b/tilavarauspalvelu/api/graphql/types/address/types.py @@ -1,8 +1,9 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.address.permissions import AddressPermission from applications.models import Address +from .permissions import AddressPermission + class AddressNode(DjangoNode): class Meta: diff --git a/tilavarauspalvelu/api/graphql/types/age_group/__init__.py b/tilavarauspalvelu/api/graphql/types/age_group/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/age_group/permissions.py b/tilavarauspalvelu/api/graphql/types/age_group/permissions.py similarity index 100% rename from api/graphql/types/age_group/permissions.py rename to tilavarauspalvelu/api/graphql/types/age_group/permissions.py diff --git a/api/graphql/types/age_group/types.py b/tilavarauspalvelu/api/graphql/types/age_group/types.py similarity index 82% rename from api/graphql/types/age_group/types.py rename to tilavarauspalvelu/api/graphql/types/age_group/types.py index f10507d752..88dd726812 100644 --- a/api/graphql/types/age_group/types.py +++ b/tilavarauspalvelu/api/graphql/types/age_group/types.py @@ -1,8 +1,9 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.age_group.permissions import AgeGroupPermission from reservations.models import AgeGroup +from .permissions import AgeGroupPermission + __all__ = [ "AgeGroupNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/allocated_time_slot/__init__.py b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/allocated_time_slot/filtersets.py b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/filtersets.py similarity index 100% rename from api/graphql/types/allocated_time_slot/filtersets.py rename to tilavarauspalvelu/api/graphql/types/allocated_time_slot/filtersets.py diff --git a/api/graphql/types/allocated_time_slot/mutations.py b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/mutations.py similarity index 85% rename from api/graphql/types/allocated_time_slot/mutations.py rename to tilavarauspalvelu/api/graphql/types/allocated_time_slot/mutations.py index 5d6e4b3189..55ca24426a 100644 --- a/api/graphql/types/allocated_time_slot/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/mutations.py @@ -2,10 +2,11 @@ from graphene_django_extensions.typing import AnyUser from rest_framework.exceptions import ValidationError -from api.graphql.types.allocated_time_slot.permissions import AllocatedTimeSlotPermission -from api.graphql.types.allocated_time_slot.serializers import AllocatedTimeSlotCreateSerializer from applications.models import AllocatedTimeSlot +from .permissions import AllocatedTimeSlotPermission +from .serializers import AllocatedTimeSlotCreateSerializer + __all__ = [ "AllocatedTimeSlotCreateMutation", ] diff --git a/api/graphql/types/allocated_time_slot/permissions.py b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/permissions.py similarity index 96% rename from api/graphql/types/allocated_time_slot/permissions.py rename to tilavarauspalvelu/api/graphql/types/allocated_time_slot/permissions.py index 3137ee6d31..7fb26472c7 100644 --- a/api/graphql/types/allocated_time_slot/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/permissions.py @@ -3,9 +3,9 @@ from graphene_django_extensions.errors import GQLCodeError from graphene_django_extensions.permissions import BasePermission -from api.graphql.extensions import error_codes from applications.models import AllocatedTimeSlot, ReservationUnitOption from common.typing import AnyUser +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "AllocatedTimeSlotPermission", diff --git a/api/graphql/types/allocated_time_slot/serializers.py b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/serializers.py similarity index 99% rename from api/graphql/types/allocated_time_slot/serializers.py rename to tilavarauspalvelu/api/graphql/types/allocated_time_slot/serializers.py index faa6321db3..136fbd028e 100644 --- a/api/graphql/types/allocated_time_slot/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/serializers.py @@ -5,10 +5,10 @@ from rest_framework import serializers from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes from applications.enums import Weekday from applications.models import AllocatedTimeSlot, ApplicationSection, ReservationUnitOption, SuitableTimeRange from common.date_utils import time_difference, timedelta_to_json +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "AllocatedTimeSlotCreateSerializer", diff --git a/api/graphql/types/allocated_time_slot/types.py b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/types.py similarity index 75% rename from api/graphql/types/allocated_time_slot/types.py rename to tilavarauspalvelu/api/graphql/types/allocated_time_slot/types.py index d548e7a675..7018261aaf 100644 --- a/api/graphql/types/allocated_time_slot/types.py +++ b/tilavarauspalvelu/api/graphql/types/allocated_time_slot/types.py @@ -1,9 +1,10 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.allocated_time_slot.filtersets import AllocatedTimeSlotFilterSet -from api.graphql.types.allocated_time_slot.permissions import AllocatedTimeSlotPermission from applications.models import AllocatedTimeSlot +from .filtersets import AllocatedTimeSlotFilterSet +from .permissions import AllocatedTimeSlotPermission + __all__ = [ "AllocatedTimeSlotNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/application/__init__.py b/tilavarauspalvelu/api/graphql/types/application/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/application/filtersets.py b/tilavarauspalvelu/api/graphql/types/application/filtersets.py similarity index 100% rename from api/graphql/types/application/filtersets.py rename to tilavarauspalvelu/api/graphql/types/application/filtersets.py diff --git a/api/graphql/types/application/mutations.py b/tilavarauspalvelu/api/graphql/types/application/mutations.py similarity index 90% rename from api/graphql/types/application/mutations.py rename to tilavarauspalvelu/api/graphql/types/application/mutations.py index 49bf3249fb..1c47ad6f2a 100644 --- a/api/graphql/types/application/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/application/mutations.py @@ -1,7 +1,7 @@ from graphene_django_extensions import CreateMutation, UpdateMutation -from api.graphql.types.application.permissions import ApplicationPermission, UpdateAllApplicationOptionsPermission -from api.graphql.types.application.serializers import ( +from .permissions import ApplicationPermission, UpdateAllApplicationOptionsPermission +from .serializers import ( ApplicationCancelSerializer, ApplicationCreateSerializer, ApplicationSendSerializer, diff --git a/api/graphql/types/application/permissions.py b/tilavarauspalvelu/api/graphql/types/application/permissions.py similarity index 100% rename from api/graphql/types/application/permissions.py rename to tilavarauspalvelu/api/graphql/types/application/permissions.py diff --git a/api/graphql/types/application/serializers.py b/tilavarauspalvelu/api/graphql/types/application/serializers.py similarity index 92% rename from api/graphql/types/application/serializers.py rename to tilavarauspalvelu/api/graphql/types/application/serializers.py index d8563640be..76ddef24b8 100644 --- a/api/graphql/types/application/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/application/serializers.py @@ -9,15 +9,17 @@ from rest_framework.exceptions import ValidationError from rest_framework.settings import api_settings -from api.graphql.extensions import error_codes -from api.graphql.types.address.serializers import AddressSerializer -from api.graphql.types.application_section.serializers import ApplicationSectionForApplicationSerializer -from api.graphql.types.organisation.serializers import OrganisationSerializer -from api.graphql.types.person.serializers import PersonSerializer from applications.enums import ApplicationStatusChoice from applications.models import AllocatedTimeSlot, Application, ReservationUnitOption from common.fields.serializer import CurrentUserDefaultNullable from email_notification.helpers.application_email_notification_sender import ApplicationEmailNotificationSender +from tilavarauspalvelu.api.graphql.extensions import error_codes +from tilavarauspalvelu.api.graphql.types.address.serializers import AddressSerializer +from tilavarauspalvelu.api.graphql.types.application_section.serializers import ( + ApplicationSectionForApplicationSerializer, +) +from tilavarauspalvelu.api.graphql.types.organisation.serializers import OrganisationSerializer +from tilavarauspalvelu.api.graphql.types.person.serializers import PersonSerializer if TYPE_CHECKING: from common.typing import AnyUser diff --git a/api/graphql/types/application/types.py b/tilavarauspalvelu/api/graphql/types/application/types.py similarity index 92% rename from api/graphql/types/application/types.py rename to tilavarauspalvelu/api/graphql/types/application/types.py index fe4bbe5913..6437779277 100644 --- a/api/graphql/types/application/types.py +++ b/tilavarauspalvelu/api/graphql/types/application/types.py @@ -6,17 +6,18 @@ from query_optimizer import AnnotatedField from query_optimizer.optimizer import QueryOptimizer -from api.graphql.types.application.filtersets import ApplicationFilterSet -from api.graphql.types.application.permissions import ApplicationPermission -from api.graphql.types.application_section.types import ApplicationSectionNode -from api.graphql.types.user.types import ApplicantNode from applications.enums import ApplicationStatusChoice from applications.models import Application, ApplicationRound from applications.querysets.application import ApplicationQuerySet from common.typing import GQLInfo from permissions.enums import UserRoleChoice +from tilavarauspalvelu.api.graphql.types.application_section.types import ApplicationSectionNode +from tilavarauspalvelu.api.graphql.types.user.types import ApplicantNode from users.models import User +from .filtersets import ApplicationFilterSet +from .permissions import ApplicationPermission + __all__ = [ "ApplicationNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/application_round/__init__.py b/tilavarauspalvelu/api/graphql/types/application_round/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/application_round/filtersets.py b/tilavarauspalvelu/api/graphql/types/application_round/filtersets.py similarity index 100% rename from api/graphql/types/application_round/filtersets.py rename to tilavarauspalvelu/api/graphql/types/application_round/filtersets.py diff --git a/api/graphql/types/application_round/mutation.py b/tilavarauspalvelu/api/graphql/types/application_round/mutation.py similarity index 100% rename from api/graphql/types/application_round/mutation.py rename to tilavarauspalvelu/api/graphql/types/application_round/mutation.py diff --git a/api/graphql/types/application_round/permissions.py b/tilavarauspalvelu/api/graphql/types/application_round/permissions.py similarity index 100% rename from api/graphql/types/application_round/permissions.py rename to tilavarauspalvelu/api/graphql/types/application_round/permissions.py diff --git a/api/graphql/types/application_round/serializers.py b/tilavarauspalvelu/api/graphql/types/application_round/serializers.py similarity index 95% rename from api/graphql/types/application_round/serializers.py rename to tilavarauspalvelu/api/graphql/types/application_round/serializers.py index 977200b283..4a86929d49 100644 --- a/api/graphql/types/application_round/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/application_round/serializers.py @@ -4,11 +4,11 @@ from lookup_property import L from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes from applications.enums import ApplicationRoundStatusChoice, ApplicationStatusChoice from applications.models import ApplicationRound from applications.tasks import generate_reservation_series_from_allocations from common.date_utils import local_datetime +from tilavarauspalvelu.api.graphql.extensions import error_codes class SetApplicationRoundHandledSerializer(NestingModelSerializer): diff --git a/api/graphql/types/application_round/types.py b/tilavarauspalvelu/api/graphql/types/application_round/types.py similarity index 94% rename from api/graphql/types/application_round/types.py rename to tilavarauspalvelu/api/graphql/types/application_round/types.py index a8e3243b45..885241480b 100644 --- a/api/graphql/types/application_round/types.py +++ b/tilavarauspalvelu/api/graphql/types/application_round/types.py @@ -5,8 +5,6 @@ from query_optimizer import AnnotatedField from query_optimizer.optimizer import QueryOptimizer -from api.graphql.types.application_round.filtersets import ApplicationRoundFilterSet -from api.graphql.types.application_round.permissions import ApplicationRoundPermission from applications.enums import ApplicationRoundReservationCreationStatusChoice, ApplicationRoundStatusChoice from applications.models import Application, ApplicationRound from applications.querysets.application_round import ApplicationRoundQuerySet @@ -14,6 +12,9 @@ from common.typing import AnyUser, GQLInfo from reservation_units.models import ReservationUnit +from .filtersets import ApplicationRoundFilterSet +from .permissions import ApplicationRoundPermission + class ApplicationRoundNode(DjangoNode): status = AnnotatedField( diff --git a/tilavarauspalvelu/api/graphql/types/application_round_time_slot/__init__.py b/tilavarauspalvelu/api/graphql/types/application_round_time_slot/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/application_round_time_slot/permissions.py b/tilavarauspalvelu/api/graphql/types/application_round_time_slot/permissions.py similarity index 100% rename from api/graphql/types/application_round_time_slot/permissions.py rename to tilavarauspalvelu/api/graphql/types/application_round_time_slot/permissions.py diff --git a/api/graphql/types/application_round_time_slot/serializers.py b/tilavarauspalvelu/api/graphql/types/application_round_time_slot/serializers.py similarity index 100% rename from api/graphql/types/application_round_time_slot/serializers.py rename to tilavarauspalvelu/api/graphql/types/application_round_time_slot/serializers.py diff --git a/api/graphql/types/application_round_time_slot/types.py b/tilavarauspalvelu/api/graphql/types/application_round_time_slot/types.py similarity index 86% rename from api/graphql/types/application_round_time_slot/types.py rename to tilavarauspalvelu/api/graphql/types/application_round_time_slot/types.py index c65c6594fa..bebe8673ae 100644 --- a/api/graphql/types/application_round_time_slot/types.py +++ b/tilavarauspalvelu/api/graphql/types/application_round_time_slot/types.py @@ -1,10 +1,11 @@ from graphene_django_extensions import DjangoNode from graphene_django_extensions.fields.graphql import TypedDictListField -from api.graphql.types.application_round_time_slot.permissions import ApplicationRoundTimeSlotPermission from applications.models.application_round_time_slot import ApplicationRoundTimeSlot from applications.typing import TimeSlot +from .permissions import ApplicationRoundTimeSlotPermission + __all__ = [ "ApplicationRoundTimeSlotNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/application_section/__init__.py b/tilavarauspalvelu/api/graphql/types/application_section/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/application_section/filtersets.py b/tilavarauspalvelu/api/graphql/types/application_section/filtersets.py similarity index 100% rename from api/graphql/types/application_section/filtersets.py rename to tilavarauspalvelu/api/graphql/types/application_section/filtersets.py diff --git a/api/graphql/types/application_section/mutations.py b/tilavarauspalvelu/api/graphql/types/application_section/mutations.py similarity index 89% rename from api/graphql/types/application_section/mutations.py rename to tilavarauspalvelu/api/graphql/types/application_section/mutations.py index fa024ce215..71d4d74c17 100644 --- a/api/graphql/types/application_section/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/application_section/mutations.py @@ -1,17 +1,15 @@ from graphene_django_extensions import CreateMutation, DeleteMutation, UpdateMutation from rest_framework.exceptions import ValidationError -from api.graphql.types.application_section.permissions import ( - ApplicationSectionPermission, - UpdateAllSectionOptionsPermission, -) -from api.graphql.types.application_section.serializers import ( +from applications.models import ApplicationSection +from common.typing import AnyUser + +from .permissions import ApplicationSectionPermission, UpdateAllSectionOptionsPermission +from .serializers import ( ApplicationSectionSerializer, RejectAllSectionOptionsSerializer, RestoreAllSectionOptionsSerializer, ) -from applications.models import ApplicationSection -from common.typing import AnyUser __all__ = [ "ApplicationSectionCreateMutation", diff --git a/api/graphql/types/application_section/permissions.py b/tilavarauspalvelu/api/graphql/types/application_section/permissions.py similarity index 97% rename from api/graphql/types/application_section/permissions.py rename to tilavarauspalvelu/api/graphql/types/application_section/permissions.py index 515d2d490f..c734f4416a 100644 --- a/api/graphql/types/application_section/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/application_section/permissions.py @@ -3,9 +3,9 @@ from graphene_django_extensions.errors import GQLCodeError from graphene_django_extensions.permissions import BasePermission -from api.graphql.extensions import error_codes from applications.models import Application, ApplicationSection from common.typing import AnyUser +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ApplicationSectionPermission", diff --git a/api/graphql/types/application_section/serializers.py b/tilavarauspalvelu/api/graphql/types/application_section/serializers.py similarity index 96% rename from api/graphql/types/application_section/serializers.py rename to tilavarauspalvelu/api/graphql/types/application_section/serializers.py index 89ba44e1de..549b95961d 100644 --- a/api/graphql/types/application_section/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/application_section/serializers.py @@ -5,11 +5,13 @@ from graphene_django_extensions.serializers import NotProvided from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes -from api.graphql.types.reservation_unit_option.serializers import ReservationUnitOptionApplicantSerializer -from api.graphql.types.suitable_time_range.serializers import SuitableTimeRangeSerializer from applications.models import AllocatedTimeSlot, Application, ApplicationRound, ApplicationSection from common.utils import comma_sep_str +from tilavarauspalvelu.api.graphql.extensions import error_codes +from tilavarauspalvelu.api.graphql.types.reservation_unit_option.serializers import ( + ReservationUnitOptionApplicantSerializer, +) +from tilavarauspalvelu.api.graphql.types.suitable_time_range.serializers import SuitableTimeRangeSerializer if TYPE_CHECKING: import datetime diff --git a/api/graphql/types/application_section/types.py b/tilavarauspalvelu/api/graphql/types/application_section/types.py similarity index 95% rename from api/graphql/types/application_section/types.py rename to tilavarauspalvelu/api/graphql/types/application_section/types.py index 335288f488..6670a5b67e 100644 --- a/api/graphql/types/application_section/types.py +++ b/tilavarauspalvelu/api/graphql/types/application_section/types.py @@ -5,8 +5,6 @@ from query_optimizer import AnnotatedField from query_optimizer.optimizer import QueryOptimizer -from api.graphql.types.application_section.filtersets import ApplicationSectionFilterSet -from api.graphql.types.application_section.permissions import ApplicationSectionPermission from applications.enums import ApplicationSectionStatusChoice from applications.models import Application, ApplicationSection from applications.querysets.application import ApplicationQuerySet @@ -15,6 +13,9 @@ from permissions.enums import UserRoleChoice from users.models import User +from .filtersets import ApplicationSectionFilterSet +from .permissions import ApplicationSectionPermission + class ApplicationSectionNode(DjangoNode): status = AnnotatedField(graphene.Enum.from_enum(ApplicationSectionStatusChoice), expression=L("status")) diff --git a/tilavarauspalvelu/api/graphql/types/banner_notification/__init__.py b/tilavarauspalvelu/api/graphql/types/banner_notification/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/banner_notification/filtersets.py b/tilavarauspalvelu/api/graphql/types/banner_notification/filtersets.py similarity index 100% rename from api/graphql/types/banner_notification/filtersets.py rename to tilavarauspalvelu/api/graphql/types/banner_notification/filtersets.py diff --git a/api/graphql/types/banner_notification/mutations.py b/tilavarauspalvelu/api/graphql/types/banner_notification/mutations.py similarity index 81% rename from api/graphql/types/banner_notification/mutations.py rename to tilavarauspalvelu/api/graphql/types/banner_notification/mutations.py index ba948c2be4..dbf531b0cc 100644 --- a/api/graphql/types/banner_notification/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/banner_notification/mutations.py @@ -1,9 +1,10 @@ from graphene_django_extensions import CreateMutation, DeleteMutation, UpdateMutation -from api.graphql.types.banner_notification.permissions import BannerNotificationPermission -from api.graphql.types.banner_notification.serializers import BannerNotificationSerializer from common.models import BannerNotification +from .permissions import BannerNotificationPermission +from .serializers import BannerNotificationSerializer + __all__ = [ "BannerNotificationCreateMutation", "BannerNotificationDeleteMutation", diff --git a/api/graphql/types/banner_notification/permissions.py b/tilavarauspalvelu/api/graphql/types/banner_notification/permissions.py similarity index 100% rename from api/graphql/types/banner_notification/permissions.py rename to tilavarauspalvelu/api/graphql/types/banner_notification/permissions.py diff --git a/api/graphql/types/banner_notification/serializers.py b/tilavarauspalvelu/api/graphql/types/banner_notification/serializers.py similarity index 100% rename from api/graphql/types/banner_notification/serializers.py rename to tilavarauspalvelu/api/graphql/types/banner_notification/serializers.py diff --git a/api/graphql/types/banner_notification/types.py b/tilavarauspalvelu/api/graphql/types/banner_notification/types.py similarity index 88% rename from api/graphql/types/banner_notification/types.py rename to tilavarauspalvelu/api/graphql/types/banner_notification/types.py index b41cdbd3d7..03e4627938 100644 --- a/api/graphql/types/banner_notification/types.py +++ b/tilavarauspalvelu/api/graphql/types/banner_notification/types.py @@ -2,12 +2,13 @@ from graphene_django_extensions import DjangoNode from graphene_django_extensions.permissions import restricted_field -from api.graphql.types.banner_notification.filtersets import BannerNotificationFilterSet -from api.graphql.types.banner_notification.permissions import BannerNotificationPermission from common.enums import BannerNotificationState from common.models import BannerNotification from common.typing import GQLInfo +from .filtersets import BannerNotificationFilterSet +from .permissions import BannerNotificationPermission + __all__ = [ "BannerNotificationNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/building/__init__.py b/tilavarauspalvelu/api/graphql/types/building/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/building/types.py b/tilavarauspalvelu/api/graphql/types/building/types.py similarity index 100% rename from api/graphql/types/building/types.py rename to tilavarauspalvelu/api/graphql/types/building/types.py diff --git a/tilavarauspalvelu/api/graphql/types/city/__init__.py b/tilavarauspalvelu/api/graphql/types/city/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/city/permissions.py b/tilavarauspalvelu/api/graphql/types/city/permissions.py similarity index 100% rename from api/graphql/types/city/permissions.py rename to tilavarauspalvelu/api/graphql/types/city/permissions.py diff --git a/api/graphql/types/city/types.py b/tilavarauspalvelu/api/graphql/types/city/types.py similarity index 82% rename from api/graphql/types/city/types.py rename to tilavarauspalvelu/api/graphql/types/city/types.py index 0ac039928c..703ab2b8d3 100644 --- a/api/graphql/types/city/types.py +++ b/tilavarauspalvelu/api/graphql/types/city/types.py @@ -1,8 +1,9 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.city.permissions import CityPermission from applications.models import City +from .permissions import CityPermission + class CityNode(DjangoNode): class Meta: diff --git a/tilavarauspalvelu/api/graphql/types/equipment/__init__.py b/tilavarauspalvelu/api/graphql/types/equipment/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/equipment/filtersets.py b/tilavarauspalvelu/api/graphql/types/equipment/filtersets.py similarity index 100% rename from api/graphql/types/equipment/filtersets.py rename to tilavarauspalvelu/api/graphql/types/equipment/filtersets.py diff --git a/api/graphql/types/equipment/mutations.py b/tilavarauspalvelu/api/graphql/types/equipment/mutations.py similarity index 83% rename from api/graphql/types/equipment/mutations.py rename to tilavarauspalvelu/api/graphql/types/equipment/mutations.py index ca294879b9..b5f6401cbc 100644 --- a/api/graphql/types/equipment/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/equipment/mutations.py @@ -1,9 +1,10 @@ from graphene_django_extensions import CreateMutation, DeleteMutation, UpdateMutation -from api.graphql.types.equipment.permissions import EquipmentPermission -from api.graphql.types.equipment.serializers import EquipmentSerializer from reservation_units.models import Equipment +from .permissions import EquipmentPermission +from .serializers import EquipmentSerializer + __all__ = [ "EquipmentCreateMutation", "EquipmentDeleteMutation", diff --git a/api/graphql/types/equipment/permissions.py b/tilavarauspalvelu/api/graphql/types/equipment/permissions.py similarity index 100% rename from api/graphql/types/equipment/permissions.py rename to tilavarauspalvelu/api/graphql/types/equipment/permissions.py diff --git a/api/graphql/types/equipment/serializers.py b/tilavarauspalvelu/api/graphql/types/equipment/serializers.py similarity index 100% rename from api/graphql/types/equipment/serializers.py rename to tilavarauspalvelu/api/graphql/types/equipment/serializers.py diff --git a/api/graphql/types/equipment/types.py b/tilavarauspalvelu/api/graphql/types/equipment/types.py similarity index 71% rename from api/graphql/types/equipment/types.py rename to tilavarauspalvelu/api/graphql/types/equipment/types.py index 6b699751a1..3500449225 100644 --- a/api/graphql/types/equipment/types.py +++ b/tilavarauspalvelu/api/graphql/types/equipment/types.py @@ -1,9 +1,10 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.equipment.filtersets import EquipmentFilterSet -from api.graphql.types.equipment.permissions import EquipmentPermission from reservation_units.models import Equipment +from .filtersets import EquipmentFilterSet +from .permissions import EquipmentPermission + class EquipmentNode(DjangoNode): class Meta: diff --git a/tilavarauspalvelu/api/graphql/types/equipment_category/__init__.py b/tilavarauspalvelu/api/graphql/types/equipment_category/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/equipment_category/filtersets.py b/tilavarauspalvelu/api/graphql/types/equipment_category/filtersets.py similarity index 100% rename from api/graphql/types/equipment_category/filtersets.py rename to tilavarauspalvelu/api/graphql/types/equipment_category/filtersets.py diff --git a/api/graphql/types/equipment_category/mutations.py b/tilavarauspalvelu/api/graphql/types/equipment_category/mutations.py similarity index 100% rename from api/graphql/types/equipment_category/mutations.py rename to tilavarauspalvelu/api/graphql/types/equipment_category/mutations.py diff --git a/api/graphql/types/equipment_category/permissions.py b/tilavarauspalvelu/api/graphql/types/equipment_category/permissions.py similarity index 100% rename from api/graphql/types/equipment_category/permissions.py rename to tilavarauspalvelu/api/graphql/types/equipment_category/permissions.py diff --git a/api/graphql/types/equipment_category/serializers.py b/tilavarauspalvelu/api/graphql/types/equipment_category/serializers.py similarity index 100% rename from api/graphql/types/equipment_category/serializers.py rename to tilavarauspalvelu/api/graphql/types/equipment_category/serializers.py diff --git a/api/graphql/types/equipment_category/types.py b/tilavarauspalvelu/api/graphql/types/equipment_category/types.py similarity index 70% rename from api/graphql/types/equipment_category/types.py rename to tilavarauspalvelu/api/graphql/types/equipment_category/types.py index 91f441a76a..883f3d47a8 100644 --- a/api/graphql/types/equipment_category/types.py +++ b/tilavarauspalvelu/api/graphql/types/equipment_category/types.py @@ -1,9 +1,10 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.equipment_category.filtersets import EquipmentCategoryFilterSet -from api.graphql.types.equipment_category.permissions import EquipmentCategoryPermission from reservation_units.models import EquipmentCategory +from .filtersets import EquipmentCategoryFilterSet +from .permissions import EquipmentCategoryPermission + __all__ = [ "EquipmentCategoryNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/helsinki_profile/__init__.py b/tilavarauspalvelu/api/graphql/types/helsinki_profile/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/helsinki_profile/types.py b/tilavarauspalvelu/api/graphql/types/helsinki_profile/types.py similarity index 98% rename from api/graphql/types/helsinki_profile/types.py rename to tilavarauspalvelu/api/graphql/types/helsinki_profile/types.py index 41bfc05307..e8f3cba9e6 100644 --- a/api/graphql/types/helsinki_profile/types.py +++ b/tilavarauspalvelu/api/graphql/types/helsinki_profile/types.py @@ -5,10 +5,10 @@ from graphql import GraphQLError from query_optimizer.selections import get_field_selections -from api.graphql.extensions import error_codes from applications.models import Application from common.typing import AnyUser, GQLInfo from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions import error_codes from users.helauth.clients import HelsinkiProfileClient from users.helauth.typing import LoginMethod, UserProfileInfo from users.models import User diff --git a/tilavarauspalvelu/api/graphql/types/keyword/__init__.py b/tilavarauspalvelu/api/graphql/types/keyword/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/keyword/filtersets.py b/tilavarauspalvelu/api/graphql/types/keyword/filtersets.py similarity index 100% rename from api/graphql/types/keyword/filtersets.py rename to tilavarauspalvelu/api/graphql/types/keyword/filtersets.py diff --git a/api/graphql/types/keyword/permissions.py b/tilavarauspalvelu/api/graphql/types/keyword/permissions.py similarity index 100% rename from api/graphql/types/keyword/permissions.py rename to tilavarauspalvelu/api/graphql/types/keyword/permissions.py diff --git a/api/graphql/types/keyword/types.py b/tilavarauspalvelu/api/graphql/types/keyword/types.py similarity index 100% rename from api/graphql/types/keyword/types.py rename to tilavarauspalvelu/api/graphql/types/keyword/types.py diff --git a/tilavarauspalvelu/api/graphql/types/location/__init__.py b/tilavarauspalvelu/api/graphql/types/location/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/location/types.py b/tilavarauspalvelu/api/graphql/types/location/types.py similarity index 100% rename from api/graphql/types/location/types.py rename to tilavarauspalvelu/api/graphql/types/location/types.py diff --git a/tilavarauspalvelu/api/graphql/types/merchants/__init__.py b/tilavarauspalvelu/api/graphql/types/merchants/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/merchants/mutations.py b/tilavarauspalvelu/api/graphql/types/merchants/mutations.py similarity index 90% rename from api/graphql/types/merchants/mutations.py rename to tilavarauspalvelu/api/graphql/types/merchants/mutations.py index c5300e9a38..4802ce8657 100644 --- a/api/graphql/types/merchants/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/merchants/mutations.py @@ -3,15 +3,16 @@ from graphene_django_extensions.bases import DjangoMutation -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.merchants.permissions import OrderRefreshPermission -from api.graphql.types.merchants.serializers import RefreshOrderInputSerializer, RefreshOrderOutputSerializer from common.typing import GQLInfo from merchants.enums import OrderStatus from merchants.models import PaymentOrder from merchants.verkkokauppa.payment.exceptions import GetPaymentError +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode from utils.sentry import SentryLogger +from .permissions import OrderRefreshPermission +from .serializers import RefreshOrderInputSerializer, RefreshOrderOutputSerializer + class RefreshOrderMutationOutput(NamedTuple): order_uuid: uuid.UUID diff --git a/api/graphql/types/merchants/permissions.py b/tilavarauspalvelu/api/graphql/types/merchants/permissions.py similarity index 96% rename from api/graphql/types/merchants/permissions.py rename to tilavarauspalvelu/api/graphql/types/merchants/permissions.py index 88899c172d..b9c981452f 100644 --- a/api/graphql/types/merchants/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/merchants/permissions.py @@ -4,9 +4,9 @@ from graphene_django_extensions.permissions import BasePermission from query_optimizer.typing import GraphQLFilterInfo -from api.graphql.extensions import error_codes from common.typing import AnyUser from merchants.models import PaymentOrder +from tilavarauspalvelu.api.graphql.extensions import error_codes if TYPE_CHECKING: import uuid diff --git a/api/graphql/types/merchants/serializers.py b/tilavarauspalvelu/api/graphql/types/merchants/serializers.py similarity index 100% rename from api/graphql/types/merchants/serializers.py rename to tilavarauspalvelu/api/graphql/types/merchants/serializers.py diff --git a/api/graphql/types/merchants/types.py b/tilavarauspalvelu/api/graphql/types/merchants/types.py similarity index 97% rename from api/graphql/types/merchants/types.py rename to tilavarauspalvelu/api/graphql/types/merchants/types.py index 8aa950adac..fd6f86103a 100644 --- a/api/graphql/types/merchants/types.py +++ b/tilavarauspalvelu/api/graphql/types/merchants/types.py @@ -2,12 +2,13 @@ from graphene_django_extensions import DjangoNode from query_optimizer import MultiField -from api.graphql.types.merchants.permissions import PaymentOrderPermission from common.date_utils import local_datetime from common.typing import GQLInfo from merchants.enums import OrderStatus, PaymentType from merchants.models import PaymentMerchant, PaymentOrder, PaymentProduct +from .permissions import PaymentOrderPermission + __all__ = [ "PaymentMerchantNode", "PaymentOrderNode", diff --git a/tilavarauspalvelu/api/graphql/types/organisation/__init__.py b/tilavarauspalvelu/api/graphql/types/organisation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/organisation/permissions.py b/tilavarauspalvelu/api/graphql/types/organisation/permissions.py similarity index 100% rename from api/graphql/types/organisation/permissions.py rename to tilavarauspalvelu/api/graphql/types/organisation/permissions.py diff --git a/api/graphql/types/organisation/serializers.py b/tilavarauspalvelu/api/graphql/types/organisation/serializers.py similarity index 88% rename from api/graphql/types/organisation/serializers.py rename to tilavarauspalvelu/api/graphql/types/organisation/serializers.py index 9424698bff..e7c3e2bac2 100644 --- a/api/graphql/types/organisation/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/organisation/serializers.py @@ -1,7 +1,7 @@ from graphene_django_extensions import NestingModelSerializer -from api.graphql.types.address.serializers import AddressSerializer from applications.models import Organisation +from tilavarauspalvelu.api.graphql.types.address.serializers import AddressSerializer class OrganisationSerializer(NestingModelSerializer): diff --git a/api/graphql/types/organisation/types.py b/tilavarauspalvelu/api/graphql/types/organisation/types.py similarity index 86% rename from api/graphql/types/organisation/types.py rename to tilavarauspalvelu/api/graphql/types/organisation/types.py index 03193285f6..6f9c624059 100644 --- a/api/graphql/types/organisation/types.py +++ b/tilavarauspalvelu/api/graphql/types/organisation/types.py @@ -1,8 +1,9 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.organisation.permissions import OrganisationPermission from applications.models import Organisation +from .permissions import OrganisationPermission + class OrganisationNode(DjangoNode): class Meta: diff --git a/tilavarauspalvelu/api/graphql/types/permissions/__init__.py b/tilavarauspalvelu/api/graphql/types/permissions/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/permissions/types.py b/tilavarauspalvelu/api/graphql/types/permissions/types.py similarity index 100% rename from api/graphql/types/permissions/types.py rename to tilavarauspalvelu/api/graphql/types/permissions/types.py diff --git a/tilavarauspalvelu/api/graphql/types/person/__init__.py b/tilavarauspalvelu/api/graphql/types/person/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/person/serializers.py b/tilavarauspalvelu/api/graphql/types/person/serializers.py similarity index 100% rename from api/graphql/types/person/serializers.py rename to tilavarauspalvelu/api/graphql/types/person/serializers.py diff --git a/api/graphql/types/person/types.py b/tilavarauspalvelu/api/graphql/types/person/types.py similarity index 100% rename from api/graphql/types/person/types.py rename to tilavarauspalvelu/api/graphql/types/person/types.py diff --git a/tilavarauspalvelu/api/graphql/types/purpose/__init__.py b/tilavarauspalvelu/api/graphql/types/purpose/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/purpose/filtersets.py b/tilavarauspalvelu/api/graphql/types/purpose/filtersets.py similarity index 100% rename from api/graphql/types/purpose/filtersets.py rename to tilavarauspalvelu/api/graphql/types/purpose/filtersets.py diff --git a/api/graphql/types/purpose/mutations.py b/tilavarauspalvelu/api/graphql/types/purpose/mutations.py similarity index 77% rename from api/graphql/types/purpose/mutations.py rename to tilavarauspalvelu/api/graphql/types/purpose/mutations.py index cb283b5d21..774222542a 100644 --- a/api/graphql/types/purpose/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/purpose/mutations.py @@ -1,7 +1,7 @@ from graphene_django_extensions import CreateMutation, UpdateMutation -from api.graphql.types.purpose.permissions import PurposePermission -from api.graphql.types.purpose.serializers import PurposeSerializer +from .permissions import PurposePermission +from .serializers import PurposeSerializer __all__ = [ "PurposeCreateMutation", diff --git a/api/graphql/types/purpose/permissions.py b/tilavarauspalvelu/api/graphql/types/purpose/permissions.py similarity index 100% rename from api/graphql/types/purpose/permissions.py rename to tilavarauspalvelu/api/graphql/types/purpose/permissions.py diff --git a/api/graphql/types/purpose/serializers.py b/tilavarauspalvelu/api/graphql/types/purpose/serializers.py similarity index 100% rename from api/graphql/types/purpose/serializers.py rename to tilavarauspalvelu/api/graphql/types/purpose/serializers.py diff --git a/api/graphql/types/purpose/types.py b/tilavarauspalvelu/api/graphql/types/purpose/types.py similarity index 91% rename from api/graphql/types/purpose/types.py rename to tilavarauspalvelu/api/graphql/types/purpose/types.py index 79bbd62185..251d9b8111 100644 --- a/api/graphql/types/purpose/types.py +++ b/tilavarauspalvelu/api/graphql/types/purpose/types.py @@ -4,11 +4,12 @@ from graphene_django_extensions import DjangoNode from query_optimizer import AnnotatedField -from api.graphql.types.purpose.filtersets import PurposeFilterSet -from api.graphql.types.purpose.permissions import PurposePermission from common.typing import GQLInfo from reservation_units.models import Purpose +from .filtersets import PurposeFilterSet +from .permissions import PurposePermission + __all__ = [ "PurposeNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/qualifier/__init__.py b/tilavarauspalvelu/api/graphql/types/qualifier/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/qualifier/filtersets.py b/tilavarauspalvelu/api/graphql/types/qualifier/filtersets.py similarity index 100% rename from api/graphql/types/qualifier/filtersets.py rename to tilavarauspalvelu/api/graphql/types/qualifier/filtersets.py diff --git a/api/graphql/types/qualifier/permissions.py b/tilavarauspalvelu/api/graphql/types/qualifier/permissions.py similarity index 100% rename from api/graphql/types/qualifier/permissions.py rename to tilavarauspalvelu/api/graphql/types/qualifier/permissions.py diff --git a/api/graphql/types/qualifier/types.py b/tilavarauspalvelu/api/graphql/types/qualifier/types.py similarity index 72% rename from api/graphql/types/qualifier/types.py rename to tilavarauspalvelu/api/graphql/types/qualifier/types.py index e4e1f01262..3ee0727d1e 100644 --- a/api/graphql/types/qualifier/types.py +++ b/tilavarauspalvelu/api/graphql/types/qualifier/types.py @@ -1,9 +1,10 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.qualifier.filtersets import QualifierFilterSet -from api.graphql.types.qualifier.permissions import QualifierPermission from reservation_units.models import Qualifier +from .filtersets import QualifierFilterSet +from .permissions import QualifierPermission + __all__ = [ "QualifierNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/real_estate/__init__.py b/tilavarauspalvelu/api/graphql/types/real_estate/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/real_estate/types.py b/tilavarauspalvelu/api/graphql/types/real_estate/types.py similarity index 100% rename from api/graphql/types/real_estate/types.py rename to tilavarauspalvelu/api/graphql/types/real_estate/types.py diff --git a/tilavarauspalvelu/api/graphql/types/recurring_reservation/__init__.py b/tilavarauspalvelu/api/graphql/types/recurring_reservation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/recurring_reservation/filtersets.py b/tilavarauspalvelu/api/graphql/types/recurring_reservation/filtersets.py similarity index 100% rename from api/graphql/types/recurring_reservation/filtersets.py rename to tilavarauspalvelu/api/graphql/types/recurring_reservation/filtersets.py diff --git a/api/graphql/types/recurring_reservation/mutations.py b/tilavarauspalvelu/api/graphql/types/recurring_reservation/mutations.py similarity index 84% rename from api/graphql/types/recurring_reservation/mutations.py rename to tilavarauspalvelu/api/graphql/types/recurring_reservation/mutations.py index 6ae1a4305d..5c34c652ce 100644 --- a/api/graphql/types/recurring_reservation/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/recurring_reservation/mutations.py @@ -1,7 +1,7 @@ from graphene_django_extensions import CreateMutation, UpdateMutation -from api.graphql.types.recurring_reservation.permissions import RecurringReservationPermission -from api.graphql.types.recurring_reservation.serializers import ( +from .permissions import RecurringReservationPermission +from .serializers import ( RecurringReservationCreateSerializer, RecurringReservationUpdateSerializer, ReservationSeriesSerializer, diff --git a/api/graphql/types/recurring_reservation/permissions.py b/tilavarauspalvelu/api/graphql/types/recurring_reservation/permissions.py similarity index 96% rename from api/graphql/types/recurring_reservation/permissions.py rename to tilavarauspalvelu/api/graphql/types/recurring_reservation/permissions.py index e8c8f3ead3..39fe4a93f3 100644 --- a/api/graphql/types/recurring_reservation/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/recurring_reservation/permissions.py @@ -4,10 +4,10 @@ from graphene_django_extensions.permissions import BasePermission from query_optimizer.typing import GraphQLFilterInfo -from api.graphql.extensions import error_codes from common.typing import AnyUser from reservation_units.models import ReservationUnit from reservations.models import RecurringReservation +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "RecurringReservationPermission", diff --git a/api/graphql/types/recurring_reservation/serializers.py b/tilavarauspalvelu/api/graphql/types/recurring_reservation/serializers.py similarity index 99% rename from api/graphql/types/recurring_reservation/serializers.py rename to tilavarauspalvelu/api/graphql/types/recurring_reservation/serializers.py index a9522df352..b81e022580 100644 --- a/api/graphql/types/recurring_reservation/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/recurring_reservation/serializers.py @@ -10,7 +10,6 @@ from rest_framework.exceptions import ValidationError from actions.recurring_reservation import ReservationDetails -from api.graphql.extensions import error_codes from applications.enums import WeekdayChoice from common.date_utils import local_date from common.fields.serializer import CurrentUserDefaultNullable, input_only_field @@ -20,6 +19,7 @@ from reservations.enums import ReservationStateChoice, ReservationTypeStaffChoice from reservations.models import RecurringReservation, Reservation from reservations.tasks import create_or_update_reservation_statistics, update_affecting_time_spans_task +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "RecurringReservationCreateSerializer", diff --git a/api/graphql/types/recurring_reservation/types.py b/tilavarauspalvelu/api/graphql/types/recurring_reservation/types.py similarity index 91% rename from api/graphql/types/recurring_reservation/types.py rename to tilavarauspalvelu/api/graphql/types/recurring_reservation/types.py index dd5307d166..6a1405a541 100644 --- a/api/graphql/types/recurring_reservation/types.py +++ b/tilavarauspalvelu/api/graphql/types/recurring_reservation/types.py @@ -2,11 +2,12 @@ from django.db import models from graphene_django_extensions import DjangoNode -from api.graphql.types.recurring_reservation.filtersets import RecurringReservationFilterSet -from api.graphql.types.recurring_reservation.permissions import RecurringReservationPermission from common.typing import GQLInfo from reservations.models import RecurringReservation +from .filtersets import RecurringReservationFilterSet +from .permissions import RecurringReservationPermission + __all__ = [ "RecurringReservationNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/rejected_occurrence/__init__.py b/tilavarauspalvelu/api/graphql/types/rejected_occurrence/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/rejected_occurrence/filtersets.py b/tilavarauspalvelu/api/graphql/types/rejected_occurrence/filtersets.py similarity index 100% rename from api/graphql/types/rejected_occurrence/filtersets.py rename to tilavarauspalvelu/api/graphql/types/rejected_occurrence/filtersets.py diff --git a/api/graphql/types/rejected_occurrence/permissions.py b/tilavarauspalvelu/api/graphql/types/rejected_occurrence/permissions.py similarity index 100% rename from api/graphql/types/rejected_occurrence/permissions.py rename to tilavarauspalvelu/api/graphql/types/rejected_occurrence/permissions.py diff --git a/api/graphql/types/rejected_occurrence/types.py b/tilavarauspalvelu/api/graphql/types/rejected_occurrence/types.py similarity index 100% rename from api/graphql/types/rejected_occurrence/types.py rename to tilavarauspalvelu/api/graphql/types/rejected_occurrence/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation/filtersets.py similarity index 99% rename from api/graphql/types/reservation/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation/filtersets.py index f4187f87c2..1fcdbbf903 100644 --- a/api/graphql/types/reservation/filtersets.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/filtersets.py @@ -8,13 +8,13 @@ from graphene_django_extensions import ModelFilterSet from graphene_django_extensions.filters import EnumMultipleChoiceFilter, IntMultipleChoiceFilter -from api.graphql.extensions.filters import TimezoneAwareDateFilter from common.db import text_search from common.utils import log_text_search from merchants.enums import OrderStatusWithFree from permissions.enums import UserRoleChoice from reservations.enums import CustomerTypeChoice, ReservationStateChoice, ReservationTypeChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.filters import TimezoneAwareDateFilter if TYPE_CHECKING: from common.typing import AnyUser diff --git a/api/graphql/types/reservation/mutations.py b/tilavarauspalvelu/api/graphql/types/reservation/mutations.py similarity index 98% rename from api/graphql/types/reservation/mutations.py rename to tilavarauspalvelu/api/graphql/types/reservation/mutations.py index 5135d3b925..9d69ad5da2 100644 --- a/api/graphql/types/reservation/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/mutations.py @@ -4,13 +4,13 @@ from django.core.exceptions import ValidationError from graphene_django_extensions import CreateMutation, DeleteMutation, UpdateMutation -from api.graphql.types.merchants.types import PaymentOrderNode from common.date_utils import local_datetime from common.typing import AnyUser from merchants.enums import OrderStatus from merchants.verkkokauppa.order.exceptions import CancelOrderError from reservations.enums import ReservationStateChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.types.merchants.types import PaymentOrderNode from .permissions import ( ReservationCommentPermission, diff --git a/api/graphql/types/reservation/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation/permissions.py similarity index 98% rename from api/graphql/types/reservation/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation/permissions.py index a93647b68d..ce96f8a8cb 100644 --- a/api/graphql/types/reservation/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/permissions.py @@ -3,10 +3,10 @@ from graphene_django_extensions.errors import GQLCodeError from graphene_django_extensions.permissions import BasePermission -from api.graphql.extensions import error_codes from common.typing import AnyUser from reservation_units.models import ReservationUnit from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ReservationCommentPermission", diff --git a/api/graphql/types/reservation/serializers/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/__init__.py similarity index 100% rename from api/graphql/types/reservation/serializers/__init__.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/__init__.py diff --git a/api/graphql/types/reservation/serializers/adjust_time_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/adjust_time_serializers.py similarity index 94% rename from api/graphql/types/reservation/serializers/adjust_time_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/adjust_time_serializers.py index cd556ee8dc..daa9d1c027 100644 --- a/api/graphql/types/reservation/serializers/adjust_time_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/adjust_time_serializers.py @@ -4,13 +4,16 @@ from django.utils.timezone import get_default_timezone from graphene_django_extensions.fields import EnumFriendlyChoiceField -from api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.serializers.mixins import ReservationPriceMixin, ReservationSchedulingMixin from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender from reservation_units.models import ReservationUnit from reservations.enums import ReservationStateChoice, ReservationTypeChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ( + ReservationPriceMixin, + ReservationSchedulingMixin, +) DEFAULT_TIMEZONE = get_default_timezone() diff --git a/api/graphql/types/reservation/serializers/approve_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/approve_serializers.py similarity index 96% rename from api/graphql/types/reservation/serializers/approve_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/approve_serializers.py index 9c5aa597ac..f2d2e13053 100644 --- a/api/graphql/types/reservation/serializers/approve_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/approve_serializers.py @@ -4,11 +4,11 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes from common.date_utils import local_datetime from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender from reservations.enums import ReservationStateChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ReservationApproveSerializer", diff --git a/api/graphql/types/reservation/serializers/cancellation_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/cancellation_serializers.py similarity index 98% rename from api/graphql/types/reservation/serializers/cancellation_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/cancellation_serializers.py index 459d20267e..bc5b867bfe 100644 --- a/api/graphql/types/reservation/serializers/cancellation_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/cancellation_serializers.py @@ -4,13 +4,13 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes from common.date_utils import local_datetime from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender from merchants.enums import OrderStatus from reservations.enums import ReservationStateChoice from reservations.models import Reservation from reservations.tasks import refund_paid_reservation_task +from tilavarauspalvelu.api.graphql.extensions import error_codes if TYPE_CHECKING: from merchants.models import PaymentOrder diff --git a/api/graphql/types/reservation/serializers/confirm_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/confirm_serializers.py similarity index 97% rename from api/graphql/types/reservation/serializers/confirm_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/confirm_serializers.py index 1ef6c4be63..d42dcb24f4 100644 --- a/api/graphql/types/reservation/serializers/confirm_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/confirm_serializers.py @@ -3,8 +3,6 @@ from django.conf import settings from graphene_django_extensions.fields import EnumFriendlyChoiceField -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.serializers.update_serializers import ReservationUpdateSerializer from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender from merchants.enums import Language, OrderStatus from merchants.models import PaymentOrder @@ -15,6 +13,8 @@ from reservation_units.utils.reservation_unit_pricing_helper import ReservationUnitPricingHelper from reservations.enums import ReservationStateChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.update_serializers import ReservationUpdateSerializer from utils.sentry import SentryLogger if TYPE_CHECKING: diff --git a/api/graphql/types/reservation/serializers/create_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/create_serializers.py similarity index 96% rename from api/graphql/types/reservation/serializers/create_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/create_serializers.py index 0cbe2f3e61..a8a59ecee3 100644 --- a/api/graphql/types/reservation/serializers/create_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/create_serializers.py @@ -6,10 +6,6 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField, IntegerPrimaryKeyField from rest_framework import serializers -from api.graphql.extensions.fields import DurationField, OldChoiceCharField -from api.graphql.extensions.serializers import OldPrimaryKeySerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.serializers.mixins import ReservationPriceMixin, ReservationSchedulingMixin from applications.models import City from common.typing import AnyUser, WSGIRequest from reservation_units.enums import ReservationKind @@ -21,6 +17,13 @@ ReservationTypeChoice, ) from reservations.models import AgeGroup, Reservation, ReservationPurpose +from tilavarauspalvelu.api.graphql.extensions.fields import DurationField, OldChoiceCharField +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeySerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ( + ReservationPriceMixin, + ReservationSchedulingMixin, +) from users.helauth.clients import HelsinkiProfileClient from utils.external_service.errors import ExternalServiceError from utils.sentry import SentryLogger diff --git a/api/graphql/types/reservation/serializers/deny_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/deny_serializers.py similarity index 97% rename from api/graphql/types/reservation/serializers/deny_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/deny_serializers.py index 472ea8b423..7d109fecb1 100644 --- a/api/graphql/types/reservation/serializers/deny_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/deny_serializers.py @@ -4,12 +4,12 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes from common.date_utils import local_datetime from common.utils import comma_sep_str from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender from reservations.enums import ReservationStateChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ReservationDenySerializer", diff --git a/api/graphql/types/reservation/serializers/handling_required_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/handling_required_serializers.py similarity index 96% rename from api/graphql/types/reservation/serializers/handling_required_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/handling_required_serializers.py index a908eba280..2c00f47e18 100644 --- a/api/graphql/types/reservation/serializers/handling_required_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/handling_required_serializers.py @@ -4,11 +4,11 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes from common.utils import comma_sep_str from email_notification.helpers.reservation_email_notification_sender import ReservationEmailNotificationSender from reservations.enums import ReservationStateChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ReservationRequiresHandlingSerializer", diff --git a/api/graphql/types/reservation/serializers/memo_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/memo_serializers.py similarity index 80% rename from api/graphql/types/reservation/serializers/memo_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/memo_serializers.py index 71eb3f2db4..9f68ee198f 100644 --- a/api/graphql/types/reservation/serializers/memo_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/memo_serializers.py @@ -1,5 +1,5 @@ -from api.graphql.extensions.serializers import OldPrimaryKeySerializer from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeySerializer class ReservationWorkingMemoSerializer(OldPrimaryKeySerializer): diff --git a/api/graphql/types/reservation/serializers/mixins.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/mixins.py similarity index 98% rename from api/graphql/types/reservation/serializers/mixins.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/mixins.py index 243e7e2bf0..96576e26eb 100644 --- a/api/graphql/types/reservation/serializers/mixins.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/mixins.py @@ -7,14 +7,14 @@ from django.utils import timezone from django.utils.timezone import get_default_timezone -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.types import ReservationNode from common.date_utils import local_datetime, local_start_of_day from reservation_units.enums import PriceUnit, PricingType, ReservationStartInterval, ReservationUnitPublishingState from reservation_units.models import ReservationUnit, ReservationUnitPricing from reservation_units.utils.reservation_unit_pricing_helper import ReservationUnitPricingHelper from reservations.enums import ReservationTypeChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.types import ReservationNode class PriceCalculationResult: diff --git a/api/graphql/types/reservation/serializers/refund_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/refund_serializers.py similarity index 90% rename from api/graphql/types/reservation/serializers/refund_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/refund_serializers.py index a078d5dc40..71b54e887a 100644 --- a/api/graphql/types/reservation/serializers/refund_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/refund_serializers.py @@ -3,14 +3,14 @@ from django.utils.timezone import get_default_timezone -from api.graphql.extensions.serializers import OldPrimaryKeySerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode from common.utils import comma_sep_str from merchants.enums import OrderStatus from merchants.models import PaymentOrder from reservations.enums import ReservationStateChoice from reservations.models import Reservation from reservations.tasks import refund_paid_reservation_task +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeySerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode DEFAULT_TIMEZONE = get_default_timezone() diff --git a/api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py similarity index 93% rename from api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py index d121eed7c4..0a6a8c3b4a 100644 --- a/api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_adjust_time_serializers.py @@ -4,13 +4,13 @@ from django.utils.timezone import get_default_timezone from graphene_django_extensions.fields import EnumFriendlyChoiceField -from api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -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 reservations.enums import ReservationStateChoice, ReservationTypeChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ReservationSchedulingMixin if TYPE_CHECKING: from reservation_units.models import ReservationUnit diff --git a/api/graphql/types/reservation/serializers/staff_create_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_create_serializers.py similarity index 95% rename from api/graphql/types/reservation/serializers/staff_create_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_create_serializers.py index 7436b6d4de..e2e8bd4c92 100644 --- a/api/graphql/types/reservation/serializers/staff_create_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_create_serializers.py @@ -5,10 +5,6 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField, IntegerPrimaryKeyField from rest_framework import serializers -from api.graphql.extensions.fields import OldChoiceCharField -from api.graphql.extensions.serializers import OldPrimaryKeySerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.serializers.mixins import ReservationSchedulingMixin from applications.models import City from common.date_utils import local_datetime from reservation_units.models import ReservationUnit @@ -19,6 +15,10 @@ ReservationTypeChoice, ) from reservations.models import AgeGroup, RecurringReservation, Reservation, ReservationPurpose +from tilavarauspalvelu.api.graphql.extensions.fields import OldChoiceCharField +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeySerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ReservationSchedulingMixin if TYPE_CHECKING: from common.typing import AnyUser diff --git a/api/graphql/types/reservation/serializers/staff_reservation_modify_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_reservation_modify_serializers.py similarity index 94% rename from api/graphql/types/reservation/serializers/staff_reservation_modify_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_reservation_modify_serializers.py index 29f0a00270..6c0c206a18 100644 --- a/api/graphql/types/reservation/serializers/staff_reservation_modify_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/staff_reservation_modify_serializers.py @@ -5,10 +5,6 @@ from graphene_django_extensions.fields import EnumFriendlyChoiceField, IntegerPrimaryKeyField from rest_framework import serializers -from api.graphql.extensions.fields import DurationField -from api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.serializers.mixins import ReservationSchedulingMixin from applications.models import City from reservation_units.models import ReservationUnit from reservations.enums import ( @@ -18,6 +14,10 @@ ReservationTypeChoice, ) from reservations.models import AgeGroup, Reservation, ReservationPurpose +from tilavarauspalvelu.api.graphql.extensions.fields import DurationField +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.mixins import ReservationSchedulingMixin DEFAULT_TIMEZONE = get_default_timezone() diff --git a/api/graphql/types/reservation/serializers/update_serializers.py b/tilavarauspalvelu/api/graphql/types/reservation/serializers/update_serializers.py similarity index 93% rename from api/graphql/types/reservation/serializers/update_serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation/serializers/update_serializers.py index 666d80ed59..7bf38621e7 100644 --- a/api/graphql/types/reservation/serializers/update_serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/serializers/update_serializers.py @@ -3,11 +3,11 @@ from django.utils.timezone import get_default_timezone from graphene.utils.str_converters import to_camel_case -from api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer -from api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode -from api.graphql.types.reservation.serializers.create_serializers import ReservationCreateSerializer from reservations.enums import CustomerTypeChoice, ReservationStateChoice from reservations.models import Reservation +from tilavarauspalvelu.api.graphql.extensions.serializers import OldPrimaryKeyUpdateSerializer +from tilavarauspalvelu.api.graphql.extensions.validation_errors import ValidationErrorCodes, ValidationErrorWithCode +from tilavarauspalvelu.api.graphql.types.reservation.serializers.create_serializers import ReservationCreateSerializer DEFAULT_TIMEZONE = get_default_timezone() diff --git a/api/graphql/types/reservation/types.py b/tilavarauspalvelu/api/graphql/types/reservation/types.py similarity index 98% rename from api/graphql/types/reservation/types.py rename to tilavarauspalvelu/api/graphql/types/reservation/types.py index d5760ee05e..277bd73817 100644 --- a/api/graphql/types/reservation/types.py +++ b/tilavarauspalvelu/api/graphql/types/reservation/types.py @@ -7,8 +7,6 @@ from query_optimizer.optimizer import QueryOptimizer from rest_framework.reverse import reverse -from api.graphql.types.merchants.types import PaymentOrderNode -from api.graphql.types.reservation.permissions import ReservationPermission from common.db import SubqueryArray from common.typing import AnyUser, GQLInfo from common.utils import ical_hmac_signature @@ -18,9 +16,11 @@ from reservations.enums import ReservationTypeChoice as ReservationTypeField from reservations.models import Reservation from reservations.querysets import ReservationQuerySet +from tilavarauspalvelu.api.graphql.types.merchants.types import PaymentOrderNode from users.models import User from .filtersets import ReservationFilterSet +from .permissions import ReservationPermission __all__ = [ "ReservationNode", diff --git a/tilavarauspalvelu/api/graphql/types/reservation_cancel_reason/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_cancel_reason/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_cancel_reason/filersets.py b/tilavarauspalvelu/api/graphql/types/reservation_cancel_reason/filersets.py similarity index 100% rename from api/graphql/types/reservation_cancel_reason/filersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_cancel_reason/filersets.py diff --git a/api/graphql/types/reservation_cancel_reason/types.py b/tilavarauspalvelu/api/graphql/types/reservation_cancel_reason/types.py similarity index 100% rename from api/graphql/types/reservation_cancel_reason/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_cancel_reason/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_deny_reason/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_deny_reason/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_deny_reason/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation_deny_reason/filtersets.py similarity index 100% rename from api/graphql/types/reservation_deny_reason/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_deny_reason/filtersets.py diff --git a/api/graphql/types/reservation_deny_reason/types.py b/tilavarauspalvelu/api/graphql/types/reservation_deny_reason/types.py similarity index 100% rename from api/graphql/types/reservation_deny_reason/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_deny_reason/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_metadata/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_metadata/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_metadata/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_metadata/permissions.py similarity index 100% rename from api/graphql/types/reservation_metadata/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_metadata/permissions.py diff --git a/api/graphql/types/reservation_metadata/types.py b/tilavarauspalvelu/api/graphql/types/reservation_metadata/types.py similarity index 100% rename from api/graphql/types/reservation_metadata/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_metadata/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_purpose/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_purpose/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_purpose/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation_purpose/filtersets.py similarity index 100% rename from api/graphql/types/reservation_purpose/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_purpose/filtersets.py diff --git a/api/graphql/types/reservation_purpose/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_purpose/permissions.py similarity index 100% rename from api/graphql/types/reservation_purpose/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_purpose/permissions.py diff --git a/api/graphql/types/reservation_purpose/types.py b/tilavarauspalvelu/api/graphql/types/reservation_purpose/types.py similarity index 100% rename from api/graphql/types/reservation_purpose/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_purpose/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/filtersets.py similarity index 100% rename from api/graphql/types/reservation_unit/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit/filtersets.py diff --git a/api/graphql/types/reservation_unit/mutations.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/mutations.py similarity index 71% rename from api/graphql/types/reservation_unit/mutations.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit/mutations.py index e0a58a9cf9..043d11bb19 100644 --- a/api/graphql/types/reservation_unit/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit/mutations.py @@ -1,7 +1,7 @@ from graphene_django_extensions import CreateMutation, UpdateMutation -from api.graphql.types.reservation_unit.permissions import ReservationUnitPermission -from api.graphql.types.reservation_unit.serializers import ReservationUnitSerializer +from .permissions import ReservationUnitPermission +from .serializers import ReservationUnitSerializer class ReservationUnitCreateMutation(CreateMutation): diff --git a/api/graphql/types/reservation_unit/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/permissions.py similarity index 95% rename from api/graphql/types/reservation_unit/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit/permissions.py index c476173c9c..26ac86e712 100644 --- a/api/graphql/types/reservation_unit/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit/permissions.py @@ -3,10 +3,10 @@ from graphene_django_extensions.errors import GQLCodeError from graphene_django_extensions.permissions import BasePermission -from api.graphql.extensions import error_codes from common.typing import AnyUser from reservation_units.models import ReservationUnit from spaces.models import Unit +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ReservationUnitPermission", diff --git a/api/graphql/types/reservation_unit/serializers.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/serializers.py similarity index 96% rename from api/graphql/types/reservation_unit/serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit/serializers.py index e0887ad3c6..9e710196d2 100644 --- a/api/graphql/types/reservation_unit/serializers.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit/serializers.py @@ -7,15 +7,17 @@ from graphql import GraphQLError from rest_framework.exceptions import ValidationError -from api.graphql.extensions import error_codes -from api.graphql.types.application_round_time_slot.serializers import ApplicationRoundTimeSlotSerializer -from api.graphql.types.reservation_unit_image.serializers import ReservationUnitImageFieldSerializer -from api.graphql.types.reservation_unit_pricing.serializers import ReservationUnitPricingSerializer from applications.enums import WeekdayChoice from opening_hours.utils.hauki_resource_hash_updater import HaukiResourceHashUpdater from reservation_units.enums import PricingStatus, ReservationStartInterval from reservation_units.models import ReservationUnit, ReservationUnitPricing from reservation_units.utils.reservation_unit_pricing_helper import ReservationUnitPricingHelper +from tilavarauspalvelu.api.graphql.extensions import error_codes +from tilavarauspalvelu.api.graphql.types.application_round_time_slot.serializers import ( + ApplicationRoundTimeSlotSerializer, +) +from tilavarauspalvelu.api.graphql.types.reservation_unit_image.serializers import ReservationUnitImageFieldSerializer +from tilavarauspalvelu.api.graphql.types.reservation_unit_pricing.serializers import ReservationUnitPricingSerializer from utils.external_service.errors import ExternalServiceError if TYPE_CHECKING: diff --git a/api/graphql/types/reservation_unit/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit/types.py similarity index 97% rename from api/graphql/types/reservation_unit/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit/types.py index 6bb171652e..6a14ab5391 100644 --- a/api/graphql/types/reservation_unit/types.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit/types.py @@ -11,10 +11,6 @@ from query_optimizer import AnnotatedField, DjangoListField, ManuallyOptimizedField from query_optimizer.optimizer import QueryOptimizer -from api.graphql.types.location.types import LocationNode -from api.graphql.types.reservation.types import ReservationNode -from api.graphql.types.reservation_unit.filtersets import ReservationUnitFilterSet -from api.graphql.types.reservation_unit.permissions import ReservationUnitPermission from common.db import SubqueryCount from common.typing import GQLInfo from merchants.models import PaymentMerchant @@ -25,6 +21,11 @@ from reservations.enums import ReservationTypeChoice from reservations.models import Reservation from spaces.models import Location, Space, Unit +from tilavarauspalvelu.api.graphql.types.location.types import LocationNode +from tilavarauspalvelu.api.graphql.types.reservation.types import ReservationNode + +from .filtersets import ReservationUnitFilterSet +from .permissions import ReservationUnitPermission __all__ = [ "ReservationUnitNode", diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit_cancellation_rule/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/filtersets.py similarity index 100% rename from api/graphql/types/reservation_unit_cancellation_rule/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/filtersets.py diff --git a/api/graphql/types/reservation_unit_cancellation_rule/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/permissions.py similarity index 100% rename from api/graphql/types/reservation_unit_cancellation_rule/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/permissions.py diff --git a/api/graphql/types/reservation_unit_cancellation_rule/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/types.py similarity index 71% rename from api/graphql/types/reservation_unit_cancellation_rule/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/types.py index b21c542860..6e1546a7a1 100644 --- a/api/graphql/types/reservation_unit_cancellation_rule/types.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit_cancellation_rule/types.py @@ -1,9 +1,10 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.reservation_unit_cancellation_rule.filtersets import ReservationUnitCancellationRuleFilterSet -from api.graphql.types.reservation_unit_cancellation_rule.permissions import ReservationUnitCancellationRulePermission from reservation_units.models import ReservationUnitCancellationRule +from .filtersets import ReservationUnitCancellationRuleFilterSet +from .permissions import ReservationUnitCancellationRulePermission + __all__ = [ "ReservationUnitCancellationRuleNode", ] diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit_image/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit_image/mutations.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/mutations.py similarity index 77% rename from api/graphql/types/reservation_unit_image/mutations.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_image/mutations.py index 4d7824654a..e0e72f41b5 100644 --- a/api/graphql/types/reservation_unit_image/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/mutations.py @@ -1,12 +1,10 @@ from graphene_django_extensions import CreateMutation, DeleteMutation, UpdateMutation -from api.graphql.types.reservation_unit_image.permissions import ReservationUnitImagePermission -from api.graphql.types.reservation_unit_image.serializers import ( - ReservationUnitImageCreateSerializer, - ReservationUnitImageUpdateSerializer, -) from reservation_units.models import ReservationUnitImage +from .permissions import ReservationUnitImagePermission +from .serializers import ReservationUnitImageCreateSerializer, ReservationUnitImageUpdateSerializer + __all__ = [ "ReservationUnitImageCreateMutation", "ReservationUnitImageDeleteMutation", diff --git a/api/graphql/types/reservation_unit_image/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/permissions.py similarity index 96% rename from api/graphql/types/reservation_unit_image/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_image/permissions.py index baf2f8244c..5385e1e4d6 100644 --- a/api/graphql/types/reservation_unit_image/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/permissions.py @@ -3,10 +3,10 @@ from graphene_django_extensions.errors import GQLCodeError from graphene_django_extensions.permissions import BasePermission -from api.graphql.extensions import error_codes from common.typing import AnyUser from reservation_units.models import ReservationUnit, ReservationUnitImage from spaces.models import Unit +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "ReservationUnitImagePermission", diff --git a/api/graphql/types/reservation_unit_image/serializers.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/serializers.py similarity index 100% rename from api/graphql/types/reservation_unit_image/serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_image/serializers.py diff --git a/api/graphql/types/reservation_unit_image/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_image/types.py similarity index 100% rename from api/graphql/types/reservation_unit_image/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_image/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit_option/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit_option/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/filtersets.py similarity index 100% rename from api/graphql/types/reservation_unit_option/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_option/filtersets.py diff --git a/api/graphql/types/reservation_unit_option/mutations.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/mutations.py similarity index 61% rename from api/graphql/types/reservation_unit_option/mutations.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_option/mutations.py index 2f097184cb..714eb92ac1 100644 --- a/api/graphql/types/reservation_unit_option/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/mutations.py @@ -1,7 +1,7 @@ from graphene_django_extensions import UpdateMutation -from api.graphql.types.reservation_unit_option.permissions import ReservationUnitOptionPermission -from api.graphql.types.reservation_unit_option.serializers import ReservationUnitOptionHandlerSerializer +from .permissions import ReservationUnitOptionPermission +from .serializers import ReservationUnitOptionHandlerSerializer __all__ = [ "ReservationUnitOptionUpdateMutation", diff --git a/api/graphql/types/reservation_unit_option/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/permissions.py similarity index 100% rename from api/graphql/types/reservation_unit_option/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_option/permissions.py diff --git a/api/graphql/types/reservation_unit_option/serializers.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/serializers.py similarity index 100% rename from api/graphql/types/reservation_unit_option/serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_option/serializers.py diff --git a/api/graphql/types/reservation_unit_option/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/types.py similarity index 86% rename from api/graphql/types/reservation_unit_option/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_option/types.py index c4e6e78055..76b912a501 100644 --- a/api/graphql/types/reservation_unit_option/types.py +++ b/tilavarauspalvelu/api/graphql/types/reservation_unit_option/types.py @@ -1,9 +1,10 @@ from graphene_django_extensions import DjangoNode from graphene_django_extensions.permissions import AllowAuthenticated -from api.graphql.types.reservation_unit_option.filtersets import ReservationUnitOptionFilterSet from applications.models import ReservationUnitOption +from .filtersets import ReservationUnitOptionFilterSet + class ReservationUnitOptionNode(DjangoNode): class Meta: diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit_payment_type/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_payment_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit_payment_type/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_payment_type/types.py similarity index 100% rename from api/graphql/types/reservation_unit_payment_type/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_payment_type/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit_pricing/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_pricing/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit_pricing/serializers.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_pricing/serializers.py similarity index 100% rename from api/graphql/types/reservation_unit_pricing/serializers.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_pricing/serializers.py diff --git a/api/graphql/types/reservation_unit_pricing/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_pricing/types.py similarity index 100% rename from api/graphql/types/reservation_unit_pricing/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_pricing/types.py diff --git a/tilavarauspalvelu/api/graphql/types/reservation_unit_type/__init__.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/reservation_unit_type/filtersets.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_type/filtersets.py similarity index 100% rename from api/graphql/types/reservation_unit_type/filtersets.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_type/filtersets.py diff --git a/api/graphql/types/reservation_unit_type/permissions.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_type/permissions.py similarity index 100% rename from api/graphql/types/reservation_unit_type/permissions.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_type/permissions.py diff --git a/api/graphql/types/reservation_unit_type/types.py b/tilavarauspalvelu/api/graphql/types/reservation_unit_type/types.py similarity index 100% rename from api/graphql/types/reservation_unit_type/types.py rename to tilavarauspalvelu/api/graphql/types/reservation_unit_type/types.py diff --git a/tilavarauspalvelu/api/graphql/types/resource/__init__.py b/tilavarauspalvelu/api/graphql/types/resource/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/resource/filtersets.py b/tilavarauspalvelu/api/graphql/types/resource/filtersets.py similarity index 100% rename from api/graphql/types/resource/filtersets.py rename to tilavarauspalvelu/api/graphql/types/resource/filtersets.py diff --git a/api/graphql/types/resource/mutations.py b/tilavarauspalvelu/api/graphql/types/resource/mutations.py similarity index 80% rename from api/graphql/types/resource/mutations.py rename to tilavarauspalvelu/api/graphql/types/resource/mutations.py index 9b8a5b8a9a..71ea6fe689 100644 --- a/api/graphql/types/resource/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/resource/mutations.py @@ -1,9 +1,10 @@ from graphene_django_extensions import CreateMutation, DeleteMutation, UpdateMutation -from api.graphql.types.resource.permissions import ResourcePermission -from api.graphql.types.resource.serializers import ResourceSerializer from resources.models import Resource +from .permissions import ResourcePermission +from .serializers import ResourceSerializer + class ResourceCreateMutation(CreateMutation): class Meta: diff --git a/api/graphql/types/resource/permissions.py b/tilavarauspalvelu/api/graphql/types/resource/permissions.py similarity index 100% rename from api/graphql/types/resource/permissions.py rename to tilavarauspalvelu/api/graphql/types/resource/permissions.py diff --git a/api/graphql/types/resource/serializers.py b/tilavarauspalvelu/api/graphql/types/resource/serializers.py similarity index 100% rename from api/graphql/types/resource/serializers.py rename to tilavarauspalvelu/api/graphql/types/resource/serializers.py diff --git a/api/graphql/types/resource/types.py b/tilavarauspalvelu/api/graphql/types/resource/types.py similarity index 81% rename from api/graphql/types/resource/types.py rename to tilavarauspalvelu/api/graphql/types/resource/types.py index fa4c53ed57..1d7822305e 100644 --- a/api/graphql/types/resource/types.py +++ b/tilavarauspalvelu/api/graphql/types/resource/types.py @@ -1,11 +1,12 @@ import graphene from graphene_django_extensions import DjangoNode -from api.graphql.types.resource.filtersets import ResourceFilterSet -from api.graphql.types.resource.permissions import ResourcePermission from resources.enums import ResourceLocationType from resources.models import Resource +from .filtersets import ResourceFilterSet +from .permissions import ResourcePermission + class ResourceNode(DjangoNode): location_type = graphene.Field(graphene.Enum.from_enum(ResourceLocationType)) diff --git a/tilavarauspalvelu/api/graphql/types/service/__init__.py b/tilavarauspalvelu/api/graphql/types/service/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/service/permissions.py b/tilavarauspalvelu/api/graphql/types/service/permissions.py similarity index 100% rename from api/graphql/types/service/permissions.py rename to tilavarauspalvelu/api/graphql/types/service/permissions.py diff --git a/api/graphql/types/service/types.py b/tilavarauspalvelu/api/graphql/types/service/types.py similarity index 100% rename from api/graphql/types/service/types.py rename to tilavarauspalvelu/api/graphql/types/service/types.py diff --git a/tilavarauspalvelu/api/graphql/types/service_sector/__init__.py b/tilavarauspalvelu/api/graphql/types/service_sector/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/service_sector/permissions.py b/tilavarauspalvelu/api/graphql/types/service_sector/permissions.py similarity index 100% rename from api/graphql/types/service_sector/permissions.py rename to tilavarauspalvelu/api/graphql/types/service_sector/permissions.py diff --git a/api/graphql/types/service_sector/types.py b/tilavarauspalvelu/api/graphql/types/service_sector/types.py similarity index 100% rename from api/graphql/types/service_sector/types.py rename to tilavarauspalvelu/api/graphql/types/service_sector/types.py diff --git a/tilavarauspalvelu/api/graphql/types/space/__init__.py b/tilavarauspalvelu/api/graphql/types/space/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/space/filtersets.py b/tilavarauspalvelu/api/graphql/types/space/filtersets.py similarity index 100% rename from api/graphql/types/space/filtersets.py rename to tilavarauspalvelu/api/graphql/types/space/filtersets.py diff --git a/api/graphql/types/space/mutations.py b/tilavarauspalvelu/api/graphql/types/space/mutations.py similarity index 89% rename from api/graphql/types/space/mutations.py rename to tilavarauspalvelu/api/graphql/types/space/mutations.py index 43ea643b07..9ffa4f5e64 100644 --- a/api/graphql/types/space/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/space/mutations.py @@ -1,12 +1,13 @@ from django.core.exceptions import ValidationError from graphene_django_extensions.bases import CreateMutation, DeleteMutation, UpdateMutation -from api.graphql.types.space.permissions import SpacePermission -from api.graphql.types.space.serializers import SpaceSerializer from applications.models import ApplicationRound from common.typing import AnyUser from spaces.models import Space +from .permissions import SpacePermission +from .serializers import SpaceSerializer + __all__ = [ "SpaceCreateMutation", "SpaceDeleteMutation", diff --git a/api/graphql/types/space/permissions.py b/tilavarauspalvelu/api/graphql/types/space/permissions.py similarity index 95% rename from api/graphql/types/space/permissions.py rename to tilavarauspalvelu/api/graphql/types/space/permissions.py index 6e19d4747f..d4f4eb68f3 100644 --- a/api/graphql/types/space/permissions.py +++ b/tilavarauspalvelu/api/graphql/types/space/permissions.py @@ -3,9 +3,9 @@ from graphene_django_extensions.errors import GQLCodeError from graphene_django_extensions.permissions import BasePermission -from api.graphql.extensions import error_codes from common.typing import AnyUser from spaces.models import Space, Unit +from tilavarauspalvelu.api.graphql.extensions import error_codes __all__ = [ "SpacePermission", diff --git a/api/graphql/types/space/serializers.py b/tilavarauspalvelu/api/graphql/types/space/serializers.py similarity index 100% rename from api/graphql/types/space/serializers.py rename to tilavarauspalvelu/api/graphql/types/space/serializers.py diff --git a/api/graphql/types/space/types.py b/tilavarauspalvelu/api/graphql/types/space/types.py similarity index 93% rename from api/graphql/types/space/types.py rename to tilavarauspalvelu/api/graphql/types/space/types.py index 9791cb7b8b..23a607bd3e 100644 --- a/api/graphql/types/space/types.py +++ b/tilavarauspalvelu/api/graphql/types/space/types.py @@ -3,11 +3,11 @@ from graphene_django_extensions.fields import RelatedField from query_optimizer import DjangoListField -from api.graphql.types.space.permissions import SpacePermission from common.typing import GQLInfo from spaces.models import Space from .filtersets import SpaceFilterSet +from .permissions import SpacePermission __all__ = [ "SpaceNode", diff --git a/tilavarauspalvelu/api/graphql/types/suitable_time_range/__init__.py b/tilavarauspalvelu/api/graphql/types/suitable_time_range/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/suitable_time_range/filtersets.py b/tilavarauspalvelu/api/graphql/types/suitable_time_range/filtersets.py similarity index 100% rename from api/graphql/types/suitable_time_range/filtersets.py rename to tilavarauspalvelu/api/graphql/types/suitable_time_range/filtersets.py diff --git a/api/graphql/types/suitable_time_range/serializers.py b/tilavarauspalvelu/api/graphql/types/suitable_time_range/serializers.py similarity index 100% rename from api/graphql/types/suitable_time_range/serializers.py rename to tilavarauspalvelu/api/graphql/types/suitable_time_range/serializers.py diff --git a/api/graphql/types/suitable_time_range/types.py b/tilavarauspalvelu/api/graphql/types/suitable_time_range/types.py similarity index 89% rename from api/graphql/types/suitable_time_range/types.py rename to tilavarauspalvelu/api/graphql/types/suitable_time_range/types.py index cfa3a9e0ef..86f4791e0f 100644 --- a/api/graphql/types/suitable_time_range/types.py +++ b/tilavarauspalvelu/api/graphql/types/suitable_time_range/types.py @@ -4,9 +4,10 @@ from lookup_property import L from query_optimizer import AnnotatedField -from api.graphql.types.suitable_time_range.filtersets import SuitableTimeRangeFilterSet from applications.models import SuitableTimeRange +from .filtersets import SuitableTimeRangeFilterSet + class SuitableTimeRangeNode(DjangoNode): fulfilled = AnnotatedField(graphene.Boolean, expression=L("fulfilled")) diff --git a/tilavarauspalvelu/api/graphql/types/tax_percentage/__init__.py b/tilavarauspalvelu/api/graphql/types/tax_percentage/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/tax_percentage/filtersets.py b/tilavarauspalvelu/api/graphql/types/tax_percentage/filtersets.py similarity index 100% rename from api/graphql/types/tax_percentage/filtersets.py rename to tilavarauspalvelu/api/graphql/types/tax_percentage/filtersets.py diff --git a/api/graphql/types/tax_percentage/permissions.py b/tilavarauspalvelu/api/graphql/types/tax_percentage/permissions.py similarity index 100% rename from api/graphql/types/tax_percentage/permissions.py rename to tilavarauspalvelu/api/graphql/types/tax_percentage/permissions.py diff --git a/api/graphql/types/tax_percentage/types.py b/tilavarauspalvelu/api/graphql/types/tax_percentage/types.py similarity index 85% rename from api/graphql/types/tax_percentage/types.py rename to tilavarauspalvelu/api/graphql/types/tax_percentage/types.py index f51c86b6cc..4def3b2b24 100644 --- a/api/graphql/types/tax_percentage/types.py +++ b/tilavarauspalvelu/api/graphql/types/tax_percentage/types.py @@ -1,8 +1,8 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.tax_percentage.filtersets import TaxPercentageFilterSet from reservation_units.models import TaxPercentage +from .filtersets import TaxPercentageFilterSet from .permissions import TaxPercentagePermission __all__ = [ diff --git a/tilavarauspalvelu/api/graphql/types/terms_of_use/__init__.py b/tilavarauspalvelu/api/graphql/types/terms_of_use/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/terms_of_use/filtersets.py b/tilavarauspalvelu/api/graphql/types/terms_of_use/filtersets.py similarity index 100% rename from api/graphql/types/terms_of_use/filtersets.py rename to tilavarauspalvelu/api/graphql/types/terms_of_use/filtersets.py diff --git a/api/graphql/types/terms_of_use/permissions.py b/tilavarauspalvelu/api/graphql/types/terms_of_use/permissions.py similarity index 100% rename from api/graphql/types/terms_of_use/permissions.py rename to tilavarauspalvelu/api/graphql/types/terms_of_use/permissions.py diff --git a/api/graphql/types/terms_of_use/types.py b/tilavarauspalvelu/api/graphql/types/terms_of_use/types.py similarity index 100% rename from api/graphql/types/terms_of_use/types.py rename to tilavarauspalvelu/api/graphql/types/terms_of_use/types.py diff --git a/tilavarauspalvelu/api/graphql/types/unit/__init__.py b/tilavarauspalvelu/api/graphql/types/unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/unit/filtersets.py b/tilavarauspalvelu/api/graphql/types/unit/filtersets.py similarity index 99% rename from api/graphql/types/unit/filtersets.py rename to tilavarauspalvelu/api/graphql/types/unit/filtersets.py index 4e83122720..1ac8a0fcee 100644 --- a/api/graphql/types/unit/filtersets.py +++ b/tilavarauspalvelu/api/graphql/types/unit/filtersets.py @@ -6,11 +6,11 @@ from graphene_django_extensions import ModelFilterSet from graphene_django_extensions.filters import IntMultipleChoiceFilter -from api.graphql.types.unit.types import Unit from common.date_utils import local_datetime from permissions.enums import UserRoleChoice from reservation_units.enums import ReservationKind from spaces.querysets.unit import UnitQuerySet +from tilavarauspalvelu.api.graphql.types.unit.types import Unit if TYPE_CHECKING: from common.typing import AnyUser diff --git a/api/graphql/types/unit/mutations.py b/tilavarauspalvelu/api/graphql/types/unit/mutations.py similarity index 100% rename from api/graphql/types/unit/mutations.py rename to tilavarauspalvelu/api/graphql/types/unit/mutations.py diff --git a/api/graphql/types/unit/permissions.py b/tilavarauspalvelu/api/graphql/types/unit/permissions.py similarity index 100% rename from api/graphql/types/unit/permissions.py rename to tilavarauspalvelu/api/graphql/types/unit/permissions.py diff --git a/api/graphql/types/unit/serializers.py b/tilavarauspalvelu/api/graphql/types/unit/serializers.py similarity index 100% rename from api/graphql/types/unit/serializers.py rename to tilavarauspalvelu/api/graphql/types/unit/serializers.py diff --git a/api/graphql/types/unit/types.py b/tilavarauspalvelu/api/graphql/types/unit/types.py similarity index 94% rename from api/graphql/types/unit/types.py rename to tilavarauspalvelu/api/graphql/types/unit/types.py index 86b6b3dd16..e2380ec077 100644 --- a/api/graphql/types/unit/types.py +++ b/tilavarauspalvelu/api/graphql/types/unit/types.py @@ -1,10 +1,10 @@ from graphene_django_extensions import DjangoNode -from api.graphql.types.unit.permissions import UnitPermission from common.typing import AnyUser from spaces.models import Unit from .filtersets import UnitFilterSet +from .permissions import UnitPermission __all__ = [ "UnitNode", diff --git a/tilavarauspalvelu/api/graphql/types/unit_group/__init__.py b/tilavarauspalvelu/api/graphql/types/unit_group/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/unit_group/permissions.py b/tilavarauspalvelu/api/graphql/types/unit_group/permissions.py similarity index 100% rename from api/graphql/types/unit_group/permissions.py rename to tilavarauspalvelu/api/graphql/types/unit_group/permissions.py diff --git a/api/graphql/types/unit_group/types.py b/tilavarauspalvelu/api/graphql/types/unit_group/types.py similarity index 100% rename from api/graphql/types/unit_group/types.py rename to tilavarauspalvelu/api/graphql/types/unit_group/types.py diff --git a/tilavarauspalvelu/api/graphql/types/user/__init__.py b/tilavarauspalvelu/api/graphql/types/user/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/graphql/types/user/mutations.py b/tilavarauspalvelu/api/graphql/types/user/mutations.py similarity index 61% rename from api/graphql/types/user/mutations.py rename to tilavarauspalvelu/api/graphql/types/user/mutations.py index 960f6b36fc..f17dca91d0 100644 --- a/api/graphql/types/user/mutations.py +++ b/tilavarauspalvelu/api/graphql/types/user/mutations.py @@ -1,7 +1,7 @@ from graphene_django_extensions import UpdateMutation -from api.graphql.types.user.permissions import UserPermission -from api.graphql.types.user.serializers import UserUpdateSerializer +from .permissions import UserPermission +from .serializers import UserUpdateSerializer class UserUpdateMutation(UpdateMutation): diff --git a/api/graphql/types/user/permissions.py b/tilavarauspalvelu/api/graphql/types/user/permissions.py similarity index 100% rename from api/graphql/types/user/permissions.py rename to tilavarauspalvelu/api/graphql/types/user/permissions.py diff --git a/api/graphql/types/user/serializers.py b/tilavarauspalvelu/api/graphql/types/user/serializers.py similarity index 100% rename from api/graphql/types/user/serializers.py rename to tilavarauspalvelu/api/graphql/types/user/serializers.py diff --git a/api/graphql/types/user/types.py b/tilavarauspalvelu/api/graphql/types/user/types.py similarity index 97% rename from api/graphql/types/user/types.py rename to tilavarauspalvelu/api/graphql/types/user/types.py index dcb7315cdf..a636a06305 100644 --- a/api/graphql/types/user/types.py +++ b/tilavarauspalvelu/api/graphql/types/user/types.py @@ -6,11 +6,12 @@ from graphene_django_extensions import DjangoNode from query_optimizer import AnnotatedField -from api.graphql.types.user.permissions import UserPermission from common.typing import GQLInfo from users.models import User from users.tasks import save_personal_info_view_log +from .permissions import UserPermission + __all__ = [ "ApplicantNode", "UserNode", diff --git a/tilavarauspalvelu/api/helauth/__init__.py b/tilavarauspalvelu/api/helauth/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/helauth/urls.py b/tilavarauspalvelu/api/helauth/urls.py similarity index 100% rename from api/helauth/urls.py rename to tilavarauspalvelu/api/helauth/urls.py diff --git a/api/helauth/views.py b/tilavarauspalvelu/api/helauth/views.py similarity index 100% rename from api/helauth/views.py rename to tilavarauspalvelu/api/helauth/views.py diff --git a/tilavarauspalvelu/api/rest/__init__.py b/tilavarauspalvelu/api/rest/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/rest/views.py b/tilavarauspalvelu/api/rest/views.py similarity index 100% rename from api/rest/views.py rename to tilavarauspalvelu/api/rest/views.py diff --git a/tilavarauspalvelu/api/webhooks/__init__.py b/tilavarauspalvelu/api/webhooks/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/api/webhooks/permissions.py b/tilavarauspalvelu/api/webhooks/permissions.py similarity index 100% rename from api/webhooks/permissions.py rename to tilavarauspalvelu/api/webhooks/permissions.py diff --git a/api/webhooks/serializers.py b/tilavarauspalvelu/api/webhooks/serializers.py similarity index 100% rename from api/webhooks/serializers.py rename to tilavarauspalvelu/api/webhooks/serializers.py diff --git a/api/webhooks/urls.py b/tilavarauspalvelu/api/webhooks/urls.py similarity index 100% rename from api/webhooks/urls.py rename to tilavarauspalvelu/api/webhooks/urls.py diff --git a/api/webhooks/views.py b/tilavarauspalvelu/api/webhooks/views.py similarity index 100% rename from api/webhooks/views.py rename to tilavarauspalvelu/api/webhooks/views.py diff --git a/tilavarauspalvelu/apps.py b/tilavarauspalvelu/apps.py new file mode 100644 index 0000000000..dfb1dceef1 --- /dev/null +++ b/tilavarauspalvelu/apps.py @@ -0,0 +1,9 @@ +from django.apps import AppConfig + + +class TilavarauspalveluConfig(AppConfig): + name = "tilavarauspalvelu" + + def ready(self) -> None: + # Register signals + import tilavarauspalvelu.signals # noqa: F401 diff --git a/tilavarauspalvelu/constants.py b/tilavarauspalvelu/constants.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/enums.py b/tilavarauspalvelu/enums.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/management/__init__.py b/tilavarauspalvelu/management/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/management/commands/__init__.py b/tilavarauspalvelu/management/commands/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/migrations/0001_initial.py b/tilavarauspalvelu/migrations/0001_initial.py new file mode 100644 index 0000000000..2371d5069c --- /dev/null +++ b/tilavarauspalvelu/migrations/0001_initial.py @@ -0,0 +1,14 @@ +# Generated by Django 5.1.1 on 2024-09-26 15:13 + +from django.db import migrations + + +# Empty migration file is required to move user model correctly. +class Migration(migrations.Migration): + initial = True + + dependencies = [] + + run_before = [] + + operations = [] diff --git a/tilavarauspalvelu/migrations/__init__.py b/tilavarauspalvelu/migrations/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/__init__.py b/tilavarauspalvelu/models/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/address/__init__.py b/tilavarauspalvelu/models/address/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/address/actions.py b/tilavarauspalvelu/models/address/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/address/model.py b/tilavarauspalvelu/models/address/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/address/queryset.py b/tilavarauspalvelu/models/address/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/affecting_time_span/__init__.py b/tilavarauspalvelu/models/affecting_time_span/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/affecting_time_span/actions.py b/tilavarauspalvelu/models/affecting_time_span/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/affecting_time_span/model.py b/tilavarauspalvelu/models/affecting_time_span/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/affecting_time_span/queryset.py b/tilavarauspalvelu/models/affecting_time_span/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/age_group/__init__.py b/tilavarauspalvelu/models/age_group/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/age_group/actions.py b/tilavarauspalvelu/models/age_group/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/age_group/model.py b/tilavarauspalvelu/models/age_group/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/age_group/queryset.py b/tilavarauspalvelu/models/age_group/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/allocated_timeslot/__init__.py b/tilavarauspalvelu/models/allocated_timeslot/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/allocated_timeslot/actions.py b/tilavarauspalvelu/models/allocated_timeslot/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/allocated_timeslot/model.py b/tilavarauspalvelu/models/allocated_timeslot/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/allocated_timeslot/queryset.py b/tilavarauspalvelu/models/allocated_timeslot/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application/__init__.py b/tilavarauspalvelu/models/application/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application/actions.py b/tilavarauspalvelu/models/application/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application/model.py b/tilavarauspalvelu/models/application/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application/queryset.py b/tilavarauspalvelu/models/application/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round/__init__.py b/tilavarauspalvelu/models/application_round/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round/actions.py b/tilavarauspalvelu/models/application_round/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round/model.py b/tilavarauspalvelu/models/application_round/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round/queryset.py b/tilavarauspalvelu/models/application_round/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round_time_slot/__init__.py b/tilavarauspalvelu/models/application_round_time_slot/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round_time_slot/actions.py b/tilavarauspalvelu/models/application_round_time_slot/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round_time_slot/model.py b/tilavarauspalvelu/models/application_round_time_slot/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_round_time_slot/queryset.py b/tilavarauspalvelu/models/application_round_time_slot/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_section/__init__.py b/tilavarauspalvelu/models/application_section/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_section/actions.py b/tilavarauspalvelu/models/application_section/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_section/model.py b/tilavarauspalvelu/models/application_section/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/application_section/queryset.py b/tilavarauspalvelu/models/application_section/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/banner_notification/__init__.py b/tilavarauspalvelu/models/banner_notification/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/banner_notification/actions.py b/tilavarauspalvelu/models/banner_notification/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/banner_notification/model.py b/tilavarauspalvelu/models/banner_notification/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/banner_notification/queryset.py b/tilavarauspalvelu/models/banner_notification/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/building/__init__.py b/tilavarauspalvelu/models/building/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/building/actions.py b/tilavarauspalvelu/models/building/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/building/model.py b/tilavarauspalvelu/models/building/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/building/queryset.py b/tilavarauspalvelu/models/building/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancel_reason/__init__.py b/tilavarauspalvelu/models/cancel_reason/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancel_reason/actions.py b/tilavarauspalvelu/models/cancel_reason/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancel_reason/model.py b/tilavarauspalvelu/models/cancel_reason/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancel_reason/queryset.py b/tilavarauspalvelu/models/cancel_reason/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancellation_rule/__init__.py b/tilavarauspalvelu/models/cancellation_rule/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancellation_rule/actions.py b/tilavarauspalvelu/models/cancellation_rule/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancellation_rule/model.py b/tilavarauspalvelu/models/cancellation_rule/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/cancellation_rule/queryset.py b/tilavarauspalvelu/models/cancellation_rule/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/city/__init__.py b/tilavarauspalvelu/models/city/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/city/actions.py b/tilavarauspalvelu/models/city/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/city/model.py b/tilavarauspalvelu/models/city/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/city/queryset.py b/tilavarauspalvelu/models/city/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/deny_reason/__init__.py b/tilavarauspalvelu/models/deny_reason/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/deny_reason/actions.py b/tilavarauspalvelu/models/deny_reason/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/deny_reason/model.py b/tilavarauspalvelu/models/deny_reason/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/deny_reason/queryset.py b/tilavarauspalvelu/models/deny_reason/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/email_template/__init__.py b/tilavarauspalvelu/models/email_template/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/email_template/actions.py b/tilavarauspalvelu/models/email_template/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/email_template/model.py b/tilavarauspalvelu/models/email_template/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/email_template/queryset.py b/tilavarauspalvelu/models/email_template/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment/__init__.py b/tilavarauspalvelu/models/equipment/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment/actions.py b/tilavarauspalvelu/models/equipment/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment/model.py b/tilavarauspalvelu/models/equipment/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment/queryset.py b/tilavarauspalvelu/models/equipment/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment_category/__init__.py b/tilavarauspalvelu/models/equipment_category/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment_category/actions.py b/tilavarauspalvelu/models/equipment_category/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment_category/model.py b/tilavarauspalvelu/models/equipment_category/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/equipment_category/queryset.py b/tilavarauspalvelu/models/equipment_category/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/general_permission/__init__.py b/tilavarauspalvelu/models/general_permission/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/general_permission/actions.py b/tilavarauspalvelu/models/general_permission/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/general_permission/model.py b/tilavarauspalvelu/models/general_permission/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/general_permission/queryset.py b/tilavarauspalvelu/models/general_permission/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/hauki_resource/__init__.py b/tilavarauspalvelu/models/hauki_resource/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/hauki_resource/actions.py b/tilavarauspalvelu/models/hauki_resource/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/hauki_resource/model.py b/tilavarauspalvelu/models/hauki_resource/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/hauki_resource/queryset.py b/tilavarauspalvelu/models/hauki_resource/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/introduction/__init__.py b/tilavarauspalvelu/models/introduction/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/introduction/actions.py b/tilavarauspalvelu/models/introduction/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/introduction/model.py b/tilavarauspalvelu/models/introduction/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/introduction/queryset.py b/tilavarauspalvelu/models/introduction/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword/__init__.py b/tilavarauspalvelu/models/keyword/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword/actions.py b/tilavarauspalvelu/models/keyword/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword/model.py b/tilavarauspalvelu/models/keyword/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword/queryset.py b/tilavarauspalvelu/models/keyword/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_category/__init__.py b/tilavarauspalvelu/models/keyword_category/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_category/actions.py b/tilavarauspalvelu/models/keyword_category/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_category/model.py b/tilavarauspalvelu/models/keyword_category/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_category/queryset.py b/tilavarauspalvelu/models/keyword_category/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_group/__init__.py b/tilavarauspalvelu/models/keyword_group/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_group/actions.py b/tilavarauspalvelu/models/keyword_group/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_group/model.py b/tilavarauspalvelu/models/keyword_group/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/keyword_group/queryset.py b/tilavarauspalvelu/models/keyword_group/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/location/__init__.py b/tilavarauspalvelu/models/location/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/location/actions.py b/tilavarauspalvelu/models/location/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/location/model.py b/tilavarauspalvelu/models/location/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/location/queryset.py b/tilavarauspalvelu/models/location/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_field/__init__.py b/tilavarauspalvelu/models/metadata_field/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_field/actions.py b/tilavarauspalvelu/models/metadata_field/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_field/model.py b/tilavarauspalvelu/models/metadata_field/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_field/queryset.py b/tilavarauspalvelu/models/metadata_field/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_set/__init__.py b/tilavarauspalvelu/models/metadata_set/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_set/actions.py b/tilavarauspalvelu/models/metadata_set/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_set/model.py b/tilavarauspalvelu/models/metadata_set/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/metadata_set/queryset.py b/tilavarauspalvelu/models/metadata_set/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/organisation/__init__.py b/tilavarauspalvelu/models/organisation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/organisation/actions.py b/tilavarauspalvelu/models/organisation/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/organisation/model.py b/tilavarauspalvelu/models/organisation/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/organisation/queryset.py b/tilavarauspalvelu/models/organisation/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_accounting/__init__.py b/tilavarauspalvelu/models/payment_accounting/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_accounting/actions.py b/tilavarauspalvelu/models/payment_accounting/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_accounting/model.py b/tilavarauspalvelu/models/payment_accounting/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_accounting/queryset.py b/tilavarauspalvelu/models/payment_accounting/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_merchant/__init__.py b/tilavarauspalvelu/models/payment_merchant/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_merchant/actions.py b/tilavarauspalvelu/models/payment_merchant/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_merchant/model.py b/tilavarauspalvelu/models/payment_merchant/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_merchant/queryset.py b/tilavarauspalvelu/models/payment_merchant/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_order/__init__.py b/tilavarauspalvelu/models/payment_order/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_order/actions.py b/tilavarauspalvelu/models/payment_order/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_order/model.py b/tilavarauspalvelu/models/payment_order/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_order/queryset.py b/tilavarauspalvelu/models/payment_order/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_product/__init__.py b/tilavarauspalvelu/models/payment_product/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_product/actions.py b/tilavarauspalvelu/models/payment_product/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_product/model.py b/tilavarauspalvelu/models/payment_product/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/payment_product/queryset.py b/tilavarauspalvelu/models/payment_product/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/person/__init__.py b/tilavarauspalvelu/models/person/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/person/actions.py b/tilavarauspalvelu/models/person/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/person/model.py b/tilavarauspalvelu/models/person/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/person/queryset.py b/tilavarauspalvelu/models/person/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/pricing/__init__.py b/tilavarauspalvelu/models/pricing/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/pricing/actions.py b/tilavarauspalvelu/models/pricing/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/pricing/model.py b/tilavarauspalvelu/models/pricing/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/pricing/queryset.py b/tilavarauspalvelu/models/pricing/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/purpose/__init__.py b/tilavarauspalvelu/models/purpose/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/purpose/actions.py b/tilavarauspalvelu/models/purpose/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/purpose/model.py b/tilavarauspalvelu/models/purpose/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/purpose/queryset.py b/tilavarauspalvelu/models/purpose/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/qualifier/__init__.py b/tilavarauspalvelu/models/qualifier/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/qualifier/actions.py b/tilavarauspalvelu/models/qualifier/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/qualifier/model.py b/tilavarauspalvelu/models/qualifier/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/qualifier/queryset.py b/tilavarauspalvelu/models/qualifier/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/real_estate/__init__.py b/tilavarauspalvelu/models/real_estate/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/real_estate/actions.py b/tilavarauspalvelu/models/real_estate/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/real_estate/model.py b/tilavarauspalvelu/models/real_estate/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/real_estate/queryset.py b/tilavarauspalvelu/models/real_estate/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/recurring_reservation/__init__.py b/tilavarauspalvelu/models/recurring_reservation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/recurring_reservation/actions.py b/tilavarauspalvelu/models/recurring_reservation/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/recurring_reservation/model.py b/tilavarauspalvelu/models/recurring_reservation/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/recurring_reservation/queryset.py b/tilavarauspalvelu/models/recurring_reservation/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/rejected_occurrence/__init__.py b/tilavarauspalvelu/models/rejected_occurrence/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/rejected_occurrence/actions.py b/tilavarauspalvelu/models/rejected_occurrence/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/rejected_occurrence/model.py b/tilavarauspalvelu/models/rejected_occurrence/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/rejected_occurrence/queryset.py b/tilavarauspalvelu/models/rejected_occurrence/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/request_log/__init__.py b/tilavarauspalvelu/models/request_log/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/request_log/actions.py b/tilavarauspalvelu/models/request_log/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/request_log/model.py b/tilavarauspalvelu/models/request_log/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/request_log/queryset.py b/tilavarauspalvelu/models/request_log/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservable_timespan/__init__.py b/tilavarauspalvelu/models/reservable_timespan/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservable_timespan/actions.py b/tilavarauspalvelu/models/reservable_timespan/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservable_timespan/model.py b/tilavarauspalvelu/models/reservable_timespan/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservable_timespan/queryset.py b/tilavarauspalvelu/models/reservable_timespan/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation/__init__.py b/tilavarauspalvelu/models/reservation/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation/actions.py b/tilavarauspalvelu/models/reservation/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation/model.py b/tilavarauspalvelu/models/reservation/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation/queryset.py b/tilavarauspalvelu/models/reservation/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_purpose/__init__.py b/tilavarauspalvelu/models/reservation_purpose/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_purpose/actions.py b/tilavarauspalvelu/models/reservation_purpose/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_purpose/model.py b/tilavarauspalvelu/models/reservation_purpose/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_purpose/queryset.py b/tilavarauspalvelu/models/reservation_purpose/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_statistic/__init__.py b/tilavarauspalvelu/models/reservation_statistic/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_statistic/actions.py b/tilavarauspalvelu/models/reservation_statistic/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_statistic/model.py b/tilavarauspalvelu/models/reservation_statistic/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_statistic/queryset.py b/tilavarauspalvelu/models/reservation_statistic/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit/__init__.py b/tilavarauspalvelu/models/reservation_unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit/actions.py b/tilavarauspalvelu/models/reservation_unit/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit/model.py b/tilavarauspalvelu/models/reservation_unit/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit/queryset.py b/tilavarauspalvelu/models/reservation_unit/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_hierarchy/__init__.py b/tilavarauspalvelu/models/reservation_unit_hierarchy/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_hierarchy/actions.py b/tilavarauspalvelu/models/reservation_unit_hierarchy/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_hierarchy/model.py b/tilavarauspalvelu/models/reservation_unit_hierarchy/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_hierarchy/queryset.py b/tilavarauspalvelu/models/reservation_unit_hierarchy/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_image/__init__.py b/tilavarauspalvelu/models/reservation_unit_image/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_image/actions.py b/tilavarauspalvelu/models/reservation_unit_image/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_image/model.py b/tilavarauspalvelu/models/reservation_unit_image/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_image/queryset.py b/tilavarauspalvelu/models/reservation_unit_image/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_option/__init__.py b/tilavarauspalvelu/models/reservation_unit_option/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_option/actions.py b/tilavarauspalvelu/models/reservation_unit_option/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_option/model.py b/tilavarauspalvelu/models/reservation_unit_option/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_option/queryset.py b/tilavarauspalvelu/models/reservation_unit_option/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_payment_type/__init__.py b/tilavarauspalvelu/models/reservation_unit_payment_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_payment_type/actions.py b/tilavarauspalvelu/models/reservation_unit_payment_type/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_payment_type/model.py b/tilavarauspalvelu/models/reservation_unit_payment_type/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_payment_type/queryset.py b/tilavarauspalvelu/models/reservation_unit_payment_type/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_type/__init__.py b/tilavarauspalvelu/models/reservation_unit_type/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_type/actions.py b/tilavarauspalvelu/models/reservation_unit_type/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_type/model.py b/tilavarauspalvelu/models/reservation_unit_type/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/reservation_unit_type/queryset.py b/tilavarauspalvelu/models/reservation_unit_type/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/resource/__init__.py b/tilavarauspalvelu/models/resource/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/resource/actions.py b/tilavarauspalvelu/models/resource/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/resource/model.py b/tilavarauspalvelu/models/resource/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/resource/queryset.py b/tilavarauspalvelu/models/resource/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/service/__init__.py b/tilavarauspalvelu/models/service/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/service/actions.py b/tilavarauspalvelu/models/service/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/service/model.py b/tilavarauspalvelu/models/service/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/service/queryset.py b/tilavarauspalvelu/models/service/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/space/__init__.py b/tilavarauspalvelu/models/space/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/space/actions.py b/tilavarauspalvelu/models/space/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/space/model.py b/tilavarauspalvelu/models/space/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/space/queryset.py b/tilavarauspalvelu/models/space/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/sql_log/__init__.py b/tilavarauspalvelu/models/sql_log/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/sql_log/actions.py b/tilavarauspalvelu/models/sql_log/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/sql_log/model.py b/tilavarauspalvelu/models/sql_log/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/sql_log/queryset.py b/tilavarauspalvelu/models/sql_log/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/suitable_time_range/__init__.py b/tilavarauspalvelu/models/suitable_time_range/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/suitable_time_range/actions.py b/tilavarauspalvelu/models/suitable_time_range/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/suitable_time_range/model.py b/tilavarauspalvelu/models/suitable_time_range/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/suitable_time_range/queryset.py b/tilavarauspalvelu/models/suitable_time_range/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/tax_percentage/__init__.py b/tilavarauspalvelu/models/tax_percentage/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/tax_percentage/actions.py b/tilavarauspalvelu/models/tax_percentage/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/tax_percentage/model.py b/tilavarauspalvelu/models/tax_percentage/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/tax_percentage/queryset.py b/tilavarauspalvelu/models/tax_percentage/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/terms_of_use/__init__.py b/tilavarauspalvelu/models/terms_of_use/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/terms_of_use/actions.py b/tilavarauspalvelu/models/terms_of_use/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/terms_of_use/model.py b/tilavarauspalvelu/models/terms_of_use/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/terms_of_use/queryset.py b/tilavarauspalvelu/models/terms_of_use/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit/__init__.py b/tilavarauspalvelu/models/unit/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit/actions.py b/tilavarauspalvelu/models/unit/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit/model.py b/tilavarauspalvelu/models/unit/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit/queryset.py b/tilavarauspalvelu/models/unit/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit_permission/__init__.py b/tilavarauspalvelu/models/unit_permission/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit_permission/actions.py b/tilavarauspalvelu/models/unit_permission/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit_permission/model.py b/tilavarauspalvelu/models/unit_permission/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/unit_permission/queryset.py b/tilavarauspalvelu/models/unit_permission/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/user/__init__.py b/tilavarauspalvelu/models/user/__init__.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/user/actions.py b/tilavarauspalvelu/models/user/actions.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/user/model.py b/tilavarauspalvelu/models/user/model.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/models/user/queryset.py b/tilavarauspalvelu/models/user/queryset.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/signals.py b/tilavarauspalvelu/signals.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/tasks.py b/tilavarauspalvelu/tasks.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/translation.py b/tilavarauspalvelu/translation.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/typing.py b/tilavarauspalvelu/typing.py new file mode 100644 index 0000000000..e69de29bb2 diff --git a/tilavarauspalvelu/utils/__init__.py b/tilavarauspalvelu/utils/__init__.py new file mode 100644 index 0000000000..e69de29bb2