refaktor címtár

backend/app/api/v1/endpoints/admin_providers.py

@@ -29,6 +29,7 @@ from sqlalchemy.exc import IntegrityError
 from sqlalchemy.ext.asyncio import AsyncSession
 
 from app.api import deps
+from app.schemas.address import AddressIn, AddressOut
 from app.db.session import get_db
 from app.models.identity import User
 from app.models.identity.social import (
@@ -75,10 +76,7 @@ class ProviderDetail(BaseModel):
     name: str
     address: str
     city: Optional[str] = None
-    address_zip: Optional[str] = None
-    address_street_name: Optional[str] = None
-    address_street_type: Optional[str] = None
-    address_house_number: Optional[str] = None
+    address_detail: Optional[AddressOut] = None
     plus_code: Optional[str] = None
     contact_phone: Optional[str] = None
     contact_email: Optional[str] = None
@@ -130,10 +128,7 @@ class ProviderUpdateInput(BaseModel):
     name: Optional[str] = Field(None, min_length=1, max_length=255, description="Szolgáltató neve")
     address: Optional[str] = Field(None, max_length=500, description="Teljes cím")
     city: Optional[str] = Field(None, max_length=100, description="Város")
-    address_zip: Optional[str] = Field(None, max_length=20, description="Irányítószám")
-    address_street_name: Optional[str] = Field(None, max_length=255, description="Utca név")
-    address_street_type: Optional[str] = Field(None, max_length=50, description="Utca típusa (pl. utca, tér, út)")
-    address_house_number: Optional[str] = Field(None, max_length=20, description="Házszám")
+    address_detail: Optional[AddressIn] = Field(None, description="Cím részletes adatai (egységes AddressIn séma)")
     plus_code: Optional[str] = Field(None, max_length=50, description="Plus Code (Google Maps)")
     contact_phone: Optional[str] = Field(None, max_length=50, description="Telefonszám")
     contact_email: Optional[str] = Field(None, max_length=255, description="Email cím")
@@ -290,6 +285,7 @@ def _build_unified_providers_query(
     alkalmazzuk (nem az egyes részekre), hogy elkerüljük az enum típusütközéseket.
     """
     from app.models.marketplace.organization import Organization
+    from app.models.identity.address import Address, GeoPostalCode
 
     # --- 1. ServiceProvider lekérdezés ---
     provider_conditions = []
@@ -355,17 +351,17 @@ def _build_unified_providers_query(
         Organization.id.label("id"),
         Organization.name.label("name"),
         func.concat(
-            Organization.address_zip,
+            GeoPostalCode.zip_code,
             literal(' '),
-            Organization.address_city,
+            GeoPostalCode.city,
             literal(', '),
-            Organization.address_street_name,
+            Address.street_name,
             literal(' '),
-            Organization.address_street_type,
+            Address.street_type,
             literal(' '),
-            Organization.address_house_number,
+            Address.house_number,
         ).label("address"),
-        Organization.address_city.label("city"),
+        GeoPostalCode.city.label("city"),
         literal(None).label("category"),
         literal("approved").label("status"),
         literal("verified_org").label("source"),
@@ -373,6 +369,12 @@ def _build_unified_providers_query(
         literal(100).label("validation_score"),
         literal(None).label("added_by_user_id"),
         Organization.created_at.label("created_at"),
+    ).outerjoin(
+        Address,
+        Address.id == Organization.address_id,
+    ).outerjoin(
+        GeoPostalCode,
+        GeoPostalCode.id == Address.postal_code_id,
     )
     if org_conditions:
         org_stmt = org_stmt.where(*org_conditions)
@@ -562,10 +564,13 @@ async def get_provider_detail(
             name=sp.name,
             address=sp.address or "",
             city=sp.city,
-            address_zip=sp.address_zip,
-            address_street_name=sp.address_street_name,
-            address_street_type=sp.address_street_type,
-            address_house_number=sp.address_house_number,
+            address_detail=AddressOut(
+                zip=sp.address_zip,
+                city=sp.city,
+                street_name=sp.address_street_name,
+                street_type=sp.address_street_type,
+                house_number=sp.address_house_number,
+            ),
             plus_code=sp.plus_code,
             contact_phone=sp.contact_phone,
             contact_email=sp.contact_email,
@@ -1148,6 +1153,39 @@ async def update_provider(
     # Mezők frissítése (csak a nem None értékeket)
     update_fields = update_data.model_dump(exclude_none=True)
 
+    # =====================================================================
+    # STEP 0: Extract address_detail (AddressIn) and map to flat model fields
+    # =====================================================================
+    address_detail: Optional[dict] = update_fields.pop("address_detail", None)
+    if address_detail:
+        # Map AddressIn fields to ServiceProvider flat columns
+        addr_mapping = {
+            "zip": "address_zip",
+            "city": None,  # city is a direct column, handled separately
+            "street_name": "address_street_name",
+            "street_type": "address_street_type",
+            "house_number": "address_house_number",
+            "stairwell": "address_stairwell",
+            "floor": "address_floor",
+            "door": "address_door",
+            "parcel_id": "address_hrsz",
+            "full_address_text": None,  # maps to address field
+            "latitude": None,  # maps to latitude
+            "longitude": None,  # maps to longitude
+        }
+        for addr_field, model_field in addr_mapping.items():
+            if addr_field in address_detail and address_detail[addr_field] is not None:
+                if model_field:
+                    update_fields[model_field] = address_detail[addr_field]
+                elif addr_field == "full_address_text":
+                    update_fields["address"] = address_detail[addr_field]
+                elif addr_field == "latitude":
+                    update_fields["latitude"] = address_detail[addr_field]
+                elif addr_field == "longitude":
+                    update_fields["longitude"] = address_detail[addr_field]
+                elif addr_field == "city":
+                    update_fields["city"] = address_detail[addr_field]
+
     # =====================================================================
     # STEP 1: Extract multi-dimensional arrays and JSONB from payload
     # =====================================================================
@@ -1298,10 +1336,13 @@ async def update_provider(
         name=provider.name,
         address=provider.address or "",
         city=provider.city,
-        address_zip=provider.address_zip,
-        address_street_name=provider.address_street_name,
-        address_street_type=provider.address_street_type,
-        address_house_number=provider.address_house_number,
+        address_detail=AddressOut(
+            zip=provider.address_zip,
+            city=provider.city,
+            street_name=provider.address_street_name,
+            street_type=provider.address_street_type,
+            house_number=provider.address_house_number,
+        ),
         plus_code=provider.plus_code,
         contact_phone=provider.contact_phone,
         contact_email=provider.contact_email,