move domain code out of datatypes/domain

backend/magic_plan/address_matcher.py

@@ -1,7 +1,7 @@
 import re
 from typing import Optional
 
-from datatypes.magicplan.api.response import PlanSummary
+from domain.magicplan.api.response import PlanSummary
 
 _UK_POSTCODE_RE = re.compile(r"[A-Z]{1,2}\d[A-Z\d]?\s*\d[A-Z]{2}", re.IGNORECASE)
 

backend/magic_plan/handler.py

@@ -4,7 +4,7 @@ from backend.app.config import get_settings
 from infrastructure.magic_plan.magic_plan_client import MagicPlanClient
 from orchestration.magic_plan_orchestrator import MagicPlanService
 from backend.magic_plan.magic_plan_trigger_request import MagicPlanTriggerRequest
-from datatypes.magicplan.domain.models import Plan
+from domain.magicplan.models import Plan
 from backend.app.db.models.tasks import SourceEnum
 from backend.utils.subtasks import task_handler
 from utils.logger import setup_logger

backend/magic_plan/tests/test_address_matcher.py

@@ -1,4 +1,4 @@
-from datatypes.magicplan.api.response import PlanSummary
+from domain.magicplan.api.response import PlanSummary
 from backend.magic_plan.address_matcher import find_matching_plan, _extract_postcode
 
 

domain/magicplan/mapper.py

@@ -1,8 +1,8 @@
 from typing import Optional
 
-import datatypes.magicplan.api.response as api
-from datatypes.magicplan.api.response import MagicPlanPlan
-from datatypes.magicplan.domain.models import (
+import domain.magicplan.api.response as api
+from domain.magicplan.api.response import MagicPlanPlan
+from domain.magicplan.models import (
     Door,
     DoorVentilation,
     Floor,

infrastructure/magic_plan/magic_plan_client.py

@@ -1,6 +1,6 @@
 import requests
 
-from datatypes.magicplan.api.response import MagicPlanPlan, PlanSummary, PlansListResponse
+from domain.magicplan.api.response import MagicPlanPlan, PlanSummary, PlansListResponse
 
 _BASE_URL = "https://cloud.magicplan.app/api/v2"
 

infrastructure/postgres/magic_plan_tables.py

@@ -4,7 +4,7 @@ from typing import ClassVar, Optional
 
 from sqlmodel import Field, SQLModel
 
-from datatypes.magicplan.domain.models import (
+from domain.magicplan.models import (
     Door,
     DoorVentilation,
     Floor,

orchestration/magic_plan_orchestrator.py

@@ -3,9 +3,9 @@ import json
 from datetime import datetime, timezone
 from typing import Optional, cast
 
-from datatypes.magicplan.api.response import MagicPlanPlan, PlanSummary
-from datatypes.magicplan.domain.mapper import map_plan
-from datatypes.magicplan.domain.models import Plan
+from domain.magicplan.api.response import MagicPlanPlan, PlanSummary
+from domain.magicplan.mapper import map_plan
+from domain.magicplan.models import Plan
 
 from backend.app.db.connection import db_session
 from backend.app.db.models.uploaded_file import (

repositories/magic_plan/magic_plan_postgres_repository.py

@@ -6,7 +6,7 @@ from sqlalchemy import delete, select
 from sqlalchemy.dialects.postgresql import insert as pg_insert
 from sqlmodel import Session, col
 
-from datatypes.magicplan.domain.models import Floor, Plan
+from domain.magicplan.models import Floor, Plan
 from infrastructure.postgres.magic_plan_tables import (
     MagicPlanDoorModel,
     MagicPlanDoorVentilationModel,

repositories/magic_plan/magic_plan_repository.py

@@ -2,7 +2,7 @@ from __future__ import annotations
 
 from abc import ABC, abstractmethod
 
-from datatypes.magicplan.domain.models import Plan
+from domain.magicplan.models import Plan
 
 
 class MagicPlanRepository(ABC):

tests/domain/magicplan/test_mapper.py

@@ -4,16 +4,16 @@ from typing import Any
 
 import pytest
 
-import datatypes.magicplan.api.response as api
-from datatypes.magicplan.api.response import MagicPlanPlan, Symbol, Vec3, WallItem
-from datatypes.magicplan.domain.mapper import (
+import domain.magicplan.api.response as api
+from domain.magicplan.api.response import MagicPlanPlan, Symbol, Vec3, WallItem
+from domain.magicplan.mapper import (
     _map_window,  # pyright: ignore[reportPrivateUsage]
     map_address,
     map_plan,
 )
-from datatypes.magicplan.domain.models import Plan
+from domain.magicplan.models import Plan
 
-FIXTURE_DIR = Path(__file__).parents[4] / "tests" / "magic_plan"
+FIXTURE_DIR = Path(__file__).parents[3] / "tests" / "magic_plan"
 PLAN_ID = "72efd2e0-b2b9-48cd-b82e-41f5b3166c9a"
 
 

tests/domain/magicplan/test_response.py

@@ -4,9 +4,9 @@ from typing import Any
 
 import pytest
 
-from datatypes.magicplan.api.response import MagicPlanPlan, PlansListResponse
+from domain.magicplan.api.response import MagicPlanPlan, PlansListResponse
 
-FIXTURE_DIR = Path(__file__).parents[4] / "tests" / "magic_plan"
+FIXTURE_DIR = Path(__file__).parents[3] / "tests" / "magic_plan"
 PLAN_ID = "72efd2e0-b2b9-48cd-b82e-41f5b3166c9a"
 
 

tests/infrastructure/magic_plan/test_magic_plan_client.py

@@ -7,7 +7,7 @@ import pytest
 import requests
 
 from infrastructure.magic_plan.magic_plan_client import MagicPlanClient
-from datatypes.magicplan.api.response import MagicPlanPlan, PlanSummary
+from domain.magicplan.api.response import MagicPlanPlan, PlanSummary
 
 FIXTURE_DIR = Path(__file__).parents[2] / "magic_plan"
 BASE_URL = "https://cloud.magicplan.app/api/v2"

tests/orchestration/magic_plan/test_magic_plan_orchestrator.py

@@ -4,9 +4,9 @@ from unittest.mock import ANY, MagicMock, patch
 
 import pytest
 
-from datatypes.magicplan.api.response import MagicPlanPlan, PlanSummary
-from datatypes.magicplan.domain.mapper import map_plan
-from datatypes.magicplan.domain.models import Plan
+from domain.magicplan.api.response import MagicPlanPlan, PlanSummary
+from domain.magicplan.mapper import map_plan
+from domain.magicplan.models import Plan
 
 from backend.app.db.models.uploaded_file import (
     FileSourceEnum,

tests/repositories/magic_plan/test_magic_plan_postgres_repository.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from sqlalchemy import Engine
 from sqlmodel import Session, select
 
-from datatypes.magicplan.domain.models import (
+from domain.magicplan.models import (
     Door,
     DoorVentilation,
     Floor,