Migrate all API types into each domain

backend/api/orders/query.py

@@ -3,8 +3,8 @@
 from api.context import Info
 import strawberry
 from api.permissions import IsAuthenticated
-from api.pretix.query import get_order
-from api.pretix.types import PretixOrder
+from pretix.api.query import get_order
+from pretix.api.types import PretixOrder
 from conferences.models import Conference
 
 

backend/api/schema.py

@@ -1,33 +1,33 @@
 import strawberry
 from strawberry_django.optimizer import DjangoOptimizerExtension
 
-from api.participants.mutations import ParticipantMutations
-from .users.mutations import UsersMutations
-from .files_upload.schema import FilesUploadMutation
-from .checklist.query import ChecklistQuery
-from .conferences.schema import ConferenceQuery
-from .countries.schema import CountryQuery
-from .grants.mutations import GrantMutation
-from .job_board.schema import JobBoardQuery
-from .newsletters.schema import NewsletterMutations
+from participants.api.mutations import ParticipantMutations
+from users.api.mutations import UsersMutations
+from files_upload.api.schema import FilesUploadMutation
+from checklist.api.query import ChecklistQuery
+from conferences.api.schema import ConferenceQuery
+from countries.api.schema import CountryQuery
+from grants.api.mutations import GrantMutation
+from job_board.api.schema import JobBoardQuery
+from newsletters.api.schema import NewsletterMutations
 from .orders.mutations import OrdersMutations
 from .orders.query import OrdersQuery
-from .pages.schema import PagesQuery
-from .pretix.mutations import AttendeeTicketMutation
-from .schedule.schema import ScheduleQuery, ScheduleMutations
-from .submissions.mutations import SubmissionsMutations
-from .submissions.schema import SubmissionsQuery
-from .volunteers_notifications.mutations import VolunteersNotificationsMutation
-from .volunteers_notifications.query import VolunteersNotificationsQuery
-from .voting.mutations import VotesMutations
-from .badge_scanner.schema import BadgeScannerQuery, BadgeScannerMutation
-from .participants.queries import ParticipantQueries
-from .users.queries import UserQuery
-from .association_membership.mutation import AssociationMembershipMutation
-from .cms.schema import CMSQuery
-from .sponsors.schema import SponsorsMutation
-from .visa.query import VisaQuery
-from .visa.mutation import VisaMutation
+from pages.api.schema import PagesQuery
+from pretix.api.mutations import AttendeeTicketMutation
+from schedule.api.schema import ScheduleQuery, ScheduleMutations
+from submissions.api.mutations import SubmissionsMutations
+from submissions.api.schema import SubmissionsQuery
+from volunteers_notifications.api.mutations import VolunteersNotificationsMutation
+from volunteers_notifications.api.query import VolunteersNotificationsQuery
+from voting.api.mutations import VotesMutations
+from badge_scanner.api.schema import BadgeScannerQuery, BadgeScannerMutation
+from participants.api.queries import ParticipantQueries
+from users.api.queries import UserQuery
+from association_membership.api.mutation import AssociationMembershipMutation
+from cms.api.schema import CMSQuery
+from sponsors.api.schema import SponsorsMutation
+from visa.api.query import VisaQuery
+from visa.api.mutation import VisaMutation
 
 
 @strawberry.type

backend/api/tests/association_membership/mutations/test_manage_user_association_subscription.py

@@ -28,7 +28,7 @@ def test_manage_user_subscription(graphql_client):
     }"""
 
     with patch(
-        "api.association_membership.mutations.manage_user_subscription.stripe.billing_portal.Session.create",
+        "association_membership.api.mutations.manage_user_subscription.stripe.billing_portal.Session.create",
     ) as mock_create:
         mock_create.return_value.url = (
             "https://stripe.com/stripe_test_customer_portal/cus_test_12345"

backend/api/tests/association_membership/mutations/test_subscribe_user_to_association.py

@@ -26,9 +26,9 @@ def test_subscribe_user_to_association(
     }"""
 
     with patch(
-        "api.association_membership.mutations.subscribe_user_to_association.stripe.checkout.Session.create",
+        "association_membership.api.mutations.subscribe_user_to_association.stripe.checkout.Session.create",
     ) as mock_create_session, patch(
-        "api.association_membership.mutations.subscribe_user_to_association.stripe.Customer.create"
+        "association_membership.api.mutations.subscribe_user_to_association.stripe.Customer.create"
     ) as mock_customers_create:
         mock_customers_create.return_value.id = "cus_created"
         mock_create_session.return_value.id = "cs_xxx"
@@ -59,7 +59,7 @@ def test_subscribe_user_to_association_with_existing_canceled_subscription(
     }"""
 
     with patch(
-        "api.association_membership.mutations.subscribe_user_to_association.stripe.checkout.Session.create",
+        "association_membership.api.mutations.subscribe_user_to_association.stripe.checkout.Session.create",
     ) as mock_create:
         mock_create.return_value.id = "cs_xxx"
         response = graphql_client.query(query, variables={})

backend/api/tests/schema/badge_scanner/test_scan_badge.py

@@ -56,7 +56,7 @@ def test_works_when_user_is_logged_in(user, graphql_client, mocker):
     graphql_client.force_login(user)
 
     get_order_position_mock = mocker.patch(
-        "api.badge_scanner.mutation.pretix.get_order_position",
+        "badge_scanner.api.mutation.pretix.get_order_position",
         return_value={
             "attendee_name": "Test User",
             "attendee_email": "barko@marco.pizza",
@@ -100,7 +100,7 @@ def test_works_when_user_is_logged_in_but_no_user_on_service(
     graphql_client.force_login(user)
 
     get_order_position_mock = mocker.patch(
-        "api.badge_scanner.mutation.pretix.get_order_position",
+        "badge_scanner.api.mutation.pretix.get_order_position",
         return_value={
             "attendee_name": "Test User",
             "attendee_email": "barko@marco.pizza",

backend/api/tests/schema/conference/test_conference.py

@@ -17,7 +17,7 @@
 from pytest import mark
 import zoneinfo
 
-from api.conferences.types import DeadlineStatus
+from conferences.api.types import DeadlineStatus
 
 
 pytestmark = mark.django_db

backend/api/tests/schema/conference/test_tickets.py

@@ -1,12 +1,12 @@
 from conferences.tests.factories import ConferenceFactory
 from pytest import mark
 
-from api.pretix.types import TicketItem
+from pretix.api.types import TicketItem
 
 
 @mark.django_db
 def test_returns_tickets(graphql_client, mocker):
-    get_tickets_mock = mocker.patch("api.conferences.types.get_conference_tickets")
+    get_tickets_mock = mocker.patch("conferences.api.types.get_conference_tickets")
     get_tickets_mock.return_value = [
         TicketItem(
             name="Example Ticket",
@@ -47,7 +47,7 @@ def test_returns_tickets(graphql_client, mocker):
 
 @mark.django_db
 def test_is_business(graphql_client, mocker):
-    get_tickets_mock = mocker.patch("api.conferences.types.get_conference_tickets")
+    get_tickets_mock = mocker.patch("conferences.api.types.get_conference_tickets")
     get_tickets_mock.return_value = [
         TicketItem(
             name="Business Ticket",

backend/api/tests/schema/test_get_order.py

@@ -6,7 +6,7 @@ def test_calls_get_order(graphql_client, user, mocker):
 
     graphql_client.force_login(user)
 
-    get_order_mock = mocker.patch("api.pretix.query.pretix.get_order")
+    get_order_mock = mocker.patch("pretix.api.query.pretix.get_order")
     get_order_mock.return_value = {
         "code": "abc",
         "status": "p",
@@ -35,7 +35,7 @@ def test_calls_returns_none(graphql_client, user, mocker):
 
     graphql_client.force_login(user)
 
-    get_order_mock = mocker.patch("api.pretix.query.pretix.get_order")
+    get_order_mock = mocker.patch("pretix.api.query.pretix.get_order")
     get_order_mock.return_value = None
 
     response = graphql_client.query(
@@ -58,7 +58,7 @@ def test_calls_returns_none_when_email_is_different(graphql_client, user, mocker
 
     graphql_client.force_login(user)
 
-    get_order_mock = mocker.patch("api.pretix.query.pretix.get_order")
+    get_order_mock = mocker.patch("pretix.api.query.pretix.get_order")
     get_order_mock.return_value = {
         "code": "abc",
         "status": "p",

backend/api/tests/schema/test_newsletter.py

@@ -29,7 +29,7 @@ def test_subscribe_to_newsletter(graphql_client):
     """
 
     with patch(
-        "api.newsletters.mutations.subscribe_to_newsletter.subscribe"
+        "newsletters.api.mutations.subscribe_to_newsletter.subscribe"
     ) as mock_subscription:
         mock_subscription.return_value = SubscriptionResult.SUBSCRIBED
 
@@ -71,7 +71,7 @@ def test_subscribe_to_newsletter_fails_on_api_side(graphql_client, exception):
     """
 
     with patch(
-        "api.newsletters.mutations.subscribe_to_newsletter.subscribe"
+        "newsletters.api.mutations.subscribe_to_newsletter.subscribe"
     ) as mock_subscription:
         mock_subscription.side_effect = exception
 
@@ -104,7 +104,7 @@ def test_subscribe_to_newsletter_with_invalid_email_fails(graphql_client, email)
     """
 
     with patch(
-        "api.newsletters.mutations.subscribe_to_newsletter.subscribe"
+        "newsletters.api.mutations.subscribe_to_newsletter.subscribe"
     ) as mock_subscription:
         mock_subscription.return_value = SubscriptionResult.SUBSCRIBED
 
@@ -142,7 +142,7 @@ def test_subscribe_to_newsletter_with_invalid_conference_code(
     """
 
     with patch(
-        "api.newsletters.mutations.subscribe_to_newsletter.subscribe"
+        "newsletters.api.mutations.subscribe_to_newsletter.subscribe"
     ) as mock_subscription:
         mock_subscription.return_value = SubscriptionResult.SUBSCRIBED
         resp = graphql_client.query(query, variables={"input": variables})

backend/api/association_membership/mutation.py → backend/association_membership/api/mutation.py

@@ -1,9 +1,9 @@
 from strawberry.tools import create_type
 
-from api.association_membership.mutations.manage_user_subscription import (
+from association_membership.api.mutations.manage_user_subscription import (
     manage_user_subscription,
 )
-from api.association_membership.mutations.subscribe_user_to_association import (
+from association_membership.api.mutations.subscribe_user_to_association import (
     subscribe_user_to_association,
 )
 

backend/api/cms/base/blocks/map.py → backend/cms/api/base/blocks/map.py

@@ -1,6 +1,6 @@
 from decimal import Decimal
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 from api.context import Info
 from django.conf import settings
 import strawberry

backend/api/cms/home/blocks/home_intro_section.py → backend/cms/api/home/blocks/home_intro_section.py

@@ -1,5 +1,5 @@
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
 

backend/api/cms/news/blocks/news_grid_section.py → backend/cms/api/news/blocks/news_grid_section.py

@@ -1,5 +1,5 @@
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
 

backend/api/cms/news/queries/news_article.py → backend/cms/api/news/queries/news_article.py

@@ -1,7 +1,7 @@
 import strawberry_django
 
-from api.cms.news.types import NewsArticle
-from api.cms.utils import get_site_by_host
+from cms.api.news.types import NewsArticle
+from cms.api.utils import get_site_by_host
 from cms.components.news import models
 
 

backend/api/cms/news/queries/news_articles.py → backend/cms/api/news/queries/news_articles.py

@@ -1,7 +1,7 @@
 import strawberry_django
 
-from api.cms.news.types import NewsArticle
-from api.cms.utils import get_site_by_host
+from cms.api.news.types import NewsArticle
+from cms.api.utils import get_site_by_host
 from cms.components.news import models
 
 

backend/api/cms/page/blocks/checkout_section.py → backend/cms/api/page/blocks/checkout_section.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
 

backend/api/cms/page/blocks/communities_section.py → backend/cms/api/page/blocks/communities_section.py

@@ -1,6 +1,6 @@
 from typing import Self
 import strawberry
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 
 
 @strawberry.type

backend/api/cms/page/blocks/dynamic_content_display_section.py → backend/cms/api/page/blocks/dynamic_content_display_section.py

@@ -1,6 +1,6 @@
 from typing import Self
 import strawberry
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import enum
 
 

backend/api/cms/page/blocks/homepage_hero.py → backend/cms/api/page/blocks/homepage_hero.py

@@ -1,6 +1,6 @@
 from enum import Enum
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
 

backend/api/cms/page/blocks/information_section.py → backend/cms/api/page/blocks/information_section.py

@@ -1,9 +1,9 @@
 import datetime
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
-from api.cms.base.blocks.cta import CTA
+from cms.api.base.blocks.cta import CTA
 
 
 @register_page_block()

backend/api/cms/page/blocks/keynoters_section.py → backend/cms/api/page/blocks/keynoters_section.py

@@ -1,8 +1,8 @@
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
-from api.cms.base.blocks.cta import CTA
+from cms.api.base.blocks.cta import CTA
 
 
 @register_page_block

backend/api/cms/page/blocks/live_streaming_section.py → backend/cms/api/page/blocks/live_streaming_section.py

@@ -1,5 +1,5 @@
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
 

backend/api/cms/page/blocks/schedule_preview_section.py → backend/cms/api/page/blocks/schedule_preview_section.py

@@ -1,8 +1,8 @@
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
-from api.cms.base.blocks.cta import CTA
+from cms.api.base.blocks.cta import CTA
 
 
 @register_page_block

backend/api/cms/page/blocks/slider_cards_section.py → backend/cms/api/page/blocks/slider_cards_section.py

@@ -1,9 +1,9 @@
 from typing import Annotated, Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
-from api.cms.base.blocks.cta import CTA
-from api.cms.base.types import Spacing
+from cms.api.base.blocks.cta import CTA
+from cms.api.base.types import Spacing
 
 
 @strawberry.type

backend/api/cms/page/blocks/socials_section.py → backend/cms/api/page/blocks/socials_section.py

@@ -1,5 +1,5 @@
 from typing import Self
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
 

backend/api/cms/page/blocks/special_guest_section.py → backend/cms/api/page/blocks/special_guest_section.py

@@ -1,9 +1,9 @@
 import datetime
 from typing import Any
-from api.cms.page.registry import register_page_block
+from cms.api.page.registry import register_page_block
 import strawberry
 
-from api.cms.base.blocks.cta import CTA
+from cms.api.base.blocks.cta import CTA
 
 
 @register_page_block