checkpoint: DB baseline reset (v10) with perfect column order for n8n.

Integrated catalog_robot.py logic for structured data ingestion.
Updated models and documentation for the Robot Ecosystem.

backend/app/models/__init__.py

@@ -14,7 +14,7 @@ from .asset import (
 )
 
 # Szerviz és Szakértelem (ÚJ)
-from .service import ServiceProfile, ExpertiseTag, ServiceExpertise
+from .service import ServiceProfile, ExpertiseTag, ServiceExpertise, ServiceStaging
 
 # Földrajzi adatok és Címek
 from .address import Address, GeoPostalCode, GeoStreet, GeoStreetType
@@ -45,11 +45,13 @@ __all__ = [
     "Organization", "OrganizationMember",
     "Asset", "AssetCatalog", "AssetCost", "AssetEvent", "AssetFinancials", 
     "AssetTelemetry", "AssetReview", "ExchangeRate",
-    "ServiceProfile", "ExpertiseTag", "ServiceExpertise", # <--- HOZZÁADVA
     "Address", "GeoPostalCode", "GeoStreet", "GeoStreetType", 
     "PointRule", "LevelConfig", "UserStats", "Badge", "UserBadge", "Rating", "PointsLedger",
     "SystemParameter", "Document", "Translation", "PendingAction",
     "SubscriptionTier", "OrganizationSubscription",
     "CreditTransaction", "ServiceSpecialty", "AuditLog", "VehicleOwnership",
+    # --- SZERVIZ MODUL (Tisztítva) ---
+    "ServiceProfile", "ExpertiseTag", "ServiceExpertise", "ServiceStaging",
+    # --- ALIASOK ---
     "Vehicle", "UserVehicle", "VehicleCatalog", "ServiceRecord"
 ]

backend/app/models/service.py

@@ -69,4 +69,46 @@ class ServiceExpertise(Base):
     validation_level = Column(Integer, default=0)
     
     service = relationship("ServiceProfile", back_populates="expertises")
-    expertise = relationship("ExpertiseTag")
+    expertise = relationship("ExpertiseTag")
+
+class ServiceStaging(Base):
+    """
+    Átmeneti tábla a Hunter (n8n/scraping) adatoknak.
+    A címek itt már darabolva (IRSZ, Város, Utca, Házszám) szerepelnek 
+    a jobb kereshetőség és validálás érdekében.
+    """
+    __tablename__ = "service_staging"
+    __table_args__ = {"schema": "data"}
+
+    id = Column(Integer, primary_key=True, index=True)
+    
+    # --- Alapadatok ---
+    name = Column(String, nullable=False, index=True)
+    
+    # --- Strukturált cím adatok (A kérésedre bontva) ---
+    postal_code = Column(String(10), nullable=True, index=True)  # Irányítószám
+    city = Column(String(100), nullable=True, index=True)         # Település
+    street = Column(String(255), nullable=True)                  # Utca és közterület jellege (pl. Diófa utca)
+    house_number = Column(String(50), nullable=True)             # Házszám, emelet, ajtó
+    full_address = Column(String, nullable=True)                 # Az eredeti, egybefüggő cím (ha van)
+
+    # --- Elérhetőségek ---
+    contact_phone = Column(String, nullable=True)
+    email = Column(String, nullable=True)
+    website = Column(String, nullable=True)
+    
+    # --- Forrás és Azonosítás ---
+    source = Column(String(50), nullable=True, index=True)       # Forrás: 'OSM', 'Facebook', stb.
+    external_id = Column(String(100), nullable=True, index=True) # Külső ID (pl. OSM node id)
+    
+    # --- Adatmentés ---
+    # Itt landol a teljes robot-zsákmány minden apró részlettel
+    raw_data = Column(JSONB, server_default=text("'{}'::jsonb"))
+    
+    # --- Státusz és Bizalom ---
+    # status lehet: pending (feldolgozás alatt), enriched (nyomozó által bővített), 
+    # duplicate (már megvan), verified (élesítésre kész)
+    status = Column(String(20), server_default=text("'pending'"), index=True)
+    trust_score = Column(Integer, default=0)
+    
+    created_at = Column(DateTime(timezone=True), server_default=func.now())

backend/app/workers/catalog_robot.py

@@ -3,196 +3,177 @@ import httpx
 import logging
 import json
 import re
+import os
+import datetime
 from sqlalchemy.ext.asyncio import AsyncSession
 from sqlalchemy import select, func, or_, text
 from app.db.session import SessionLocal
 from app.models.asset import AssetCatalog
 
 logging.basicConfig(level=logging.INFO)
-logger = logging.getLogger("Robot1-Master-Fleet-DeepDive")
+logger = logging.getLogger("Robot1-Ghost-Commander-v1.1.9")
 
 class CatalogScout:
     """
-    Robot 1: Univerzális Járműkatalógus Építő és Audit Robot.
-    Logika: EU-Elsődlegesség (CarQuery) -> US-Kiegészítés (NHTSA).
-    Kategóriák: Car, Motorcycle, Bus, Truck, Trailer, ATV, Marine, Aerial.
-    Szekvenciák: 
-        1. Deep Dive (Motorvariánsok gyűjtése)
-        2. Audit (Hiányos adatok pótlása)
+    Robot 1.1.9: Environment Master.
+    - .env alapú hitelesítés (RDW App Token)
+    - Prioritás: RDW (EU) -> NHTSA (US) -> CarQuery (Ban-figyeléssel)
+    - 2.5s lekérési frissítés a biztonságért
     """
     
     CQ_URL = "https://www.carqueryapi.com/api/0.3/"
     NHTSA_BASE = "https://vpic.nhtsa.dot.gov/api/vehicles/GetModelsForMakeYear/make/"
-
+    RDW_URL = "https://opendata.rdw.nl/resource/ed7h-m8uz.json"
+    
+    # Adatok beolvasása környezeti változókból
+    RDW_TOKEN = os.getenv("RDW_APP_TOKEN")
+    
     HEADERS = {
-        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36",
-        "Accept": "application/json"
+        "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36",
+        "Accept": "application/json",
+        "X-App-Token": RDW_TOKEN
     }
+    
+    # BAN FIGYELŐ ÁLLAPOT
+    cq_banned_until = None 
 
-    # --- KATEGÓRIA DEFINÍCIÓK (Szigorú flotta-szétválasztás) ---
+    # --- KATEGÓRIA DEFINÍCIÓK (Szigorúan az eredeti lista szerint) ---
     MOTO_MAKES = ['ducati', 'ktm', 'triumph', 'aprilia', 'benelli', 'vespa', 'simson', 'mz', 'etz', 'jawa', 'husqvarna', 'gasgas', 'sherco']
     MARINE_IDS = ['DF', 'DT', 'OUTBOARD', 'MARINE', 'JET SKI', 'SEA-DOO', 'WAVERUNNER', 'YACHT', 'BOAT']
     AERIAL_IDS = ['CESSNA', 'PIPER', 'AIRBUS', 'BOEING', 'HELICOPTER', 'AIRCRAFT', 'BEECHCRAFT', 'EMBRAER', 'DRONE']
     ATV_IDS = ['LT-', 'LTZ', 'LTR', 'KINGQUAD', 'QUAD', 'POLARIS', 'CAN-AM', 'MULE', 'RZR', 'ARCTIC CAT', 'UTV', 'SIDE-BY-SIDE']
-    
-    # Versenygépek (Motorkerékpárként, üzemóra alapú szervizhez)
     RACING_IDS = ['RM-Z', 'KX', 'CRF', 'YZ', 'SX-F', 'XC-W', 'RM125', 'RM250', 'CR125', 'CR250', 'MC450']
     MOTO_KEYWORDS = ['CBR', 'GSX', 'YZF', 'NINJA', 'Z1000', 'DR-Z', 'MT-0', 'V-STROM', 'ADVENTURE', 'SCRAMBLER', 'CBF', 'VFR', 'HAYABUSA']
-
-    # Flotta kategóriák szétválasztása
     BUS_KEYWORDS = ['BUS', 'COACH', 'INTERCITY', 'SHUTTLE', 'TRANSIT']
     TRUCK_KEYWORDS = ['TRUCK', 'SEMI', 'TRACTOR', 'HAULER', 'ACTROS', 'MAN', 'SCANIA', 'IVECO', 'VOLVO FH', 'DAF', 'TGX', 'RENAULT T']
     TRAILER_KEYWORDS = ['TRAILER', 'SEMITRAILER', 'PÓTKOCSI', 'UTÁNFUTÓ', 'SCHMITZ', 'KRONE', 'KÖGEL']
 
+    FALLBACK_BRANDS = ['Audi', 'BMW', 'Mercedes-Benz', 'Volkswagen', 'Toyota', 'Ford', 'Honda', 'Hyundai', 'Kia', 'Mazda', 'Nissan', 'Volvo', 'Skoda', 'Opel', 'Tesla', 'Lexus', 'Porsche', 'Dacia', 'Suzuki']
+
     @classmethod
     def identify_class(cls, make: str, model: str) -> str:
-        """Kategória meghatározás flottakezelési szempontok alapján."""
-        m_full = f"{make} {model}".upper()
-        
+        m_full = f"{str(make)} {str(model)}".upper()
         if any(x in m_full for x in cls.AERIAL_IDS): return "aerial"
         if any(x in m_full for x in cls.MARINE_IDS): return "marine"
         if any(x in m_full for x in cls.ATV_IDS): return "atv"
-        
-        # Motorkerékpárok (Versenygépekkel együtt)
-        if any(x in m_full for x in cls.RACING_IDS) or make.lower() in cls.MOTO_MAKES:
+        if any(x in m_full or str(make).lower() in cls.MOTO_MAKES for x in (cls.RACING_IDS + cls.MOTO_KEYWORDS)):
             return "motorcycle"
-        if any(x in m_full for x in cls.MOTO_KEYWORDS):
-            return "motorcycle"
-            
-        # Flotta (Busz vs Teherautó vs Pótkocsi)
         if any(x in m_full for x in cls.BUS_KEYWORDS): return "bus"
         if any(x in m_full for x in cls.TRUCK_KEYWORDS): return "truck"
         if any(x in m_full for x in cls.TRAILER_KEYWORDS): return "trailer"
-            
         return "car"
 
     @classmethod
     async def fetch_api(cls, url, params=None, is_cq=False):
-        """API hívó JSONP tisztítással és sebességkorlátozással."""
-        async with httpx.AsyncClient(headers=cls.HEADERS) as client:
+        if is_cq and cls.cq_banned_until and datetime.datetime.now() < cls.cq_banned_until:
+            return "SILENT_SKIP"
+
+        async with httpx.AsyncClient(headers=cls.HEADERS, follow_redirects=True) as client:
             try:
-                # 1.5s várakozás a Free API limitjei miatt
-                await asyncio.sleep(1.5)
+                # CarQuery: 5.0mp szünet (Hard Ban ellen), többi: 2.5mp (User kérése szerint)
+                await asyncio.sleep(5.0 if is_cq else 2.5)
                 resp = await client.get(url, params=params, timeout=35)
-                if resp.status_code != 200: return None
                 
+                if resp.status_code == 403 or "denied" in resp.text.lower():
+                    logger.error("🚫 CarQuery BAN! 2 óra kényszerpihenő aktiválva.")
+                    cls.cq_banned_until = datetime.datetime.now() + datetime.timedelta(hours=2)
+                    return "DENIED"
+
+                if resp.status_code != 200: return None
                 content = resp.text.strip()
                 if is_cq:
-                    # Robusztusabb JSONP tisztítás regexszel
                     match = re.search(r'(\{.*\}|\[.*\])', content, re.DOTALL)
-                    if match:
-                        content = match.group(0)
-                    elif "(" in content and ")" in content:
-                        content = content[content.find("(") + 1 : content.rfind(")")]
-                
+                    if match: content = match.group(0)
                 return json.loads(content)
             except Exception as e:
-                logger.error(f"❌ API hiba: {e} | URL: {url}")
+                logger.error(f"❌ API hiba: {e}")
                 return None
 
     @classmethod
-    async def enrich_missing_data(cls):
-        """
-        SEQUENCE 2: Audit Robot. 
-        Keresi a hiányos technikai adatokat és próbálja dúsítani őket.
-        """
-        logger.info("🔍 Audit szekvencia indítása (hiányos adatok keresése)...")
-        async with SessionLocal() as db:
-            # Keressük azokat a rekordokat, ahol hiányzik a köbcenti vagy a teljesítmény
-            stmt = select(AssetCatalog).where(
-                or_(
-                    AssetCatalog.factory_data == text("'{}'::jsonb"),
-                    AssetCatalog.engine_variant == 'Standard',
-                    AssetCatalog.fuel_type == None
-                )
-            ).limit(100) # Egyszerre csak 100-at nézünk
+    async def is_model_processed(cls, db: AsyncSession, make: str, model: str, year: int):
+        stmt = select(AssetCatalog.id).where(AssetCatalog.make == make, AssetCatalog.model == model, AssetCatalog.year_from == year).limit(1)
+        result = await db.execute(stmt)
+        return result.scalars().first() is not None
+
+    @classmethod
+    async def auto_heal(cls, db: AsyncSession, cq_active: bool):
+        logger.info("🛠️ Auto-Heal: Hiányos rekordok dúsítása...")
+        stmt = select(AssetCatalog).where(AssetCatalog.engine_variant == 'Standard', AssetCatalog.fuel_type == 'Unknown').limit(20)
+        results = await db.execute(stmt)
+        for r in results.scalars().all():
+            # 1. RDW javítás (Holland Open Data + Token)
+            rdw = await cls.fetch_api(cls.RDW_URL, {"merk": r.make.upper(), "handelsbenaming": r.model.upper(), "$limit": 1})
+            if rdw and isinstance(rdw, list) and len(rdw) > 0:
+                item = rdw[0]
+                r.fuel_type = item.get("brandstof_omschrijving", "Unknown")
+                r.factory_data.update({"hp": item.get("netto_maximum_vermogen"), "cc": item.get("cilinderinhoud"), "source": "heal_v1.9_rdw"})
+                continue
             
-            results = await db.execute(stmt)
-            incomplete_records = results.scalars().all()
-            
-            for record in incomplete_records:
-                logger.info(f"🛠 Audit: {record.make} {record.model} ({record.year_from}) dúsítása...")
-                pass
+            # 2. CQ javítás (Ha nem vagyunk kitiltva)
+            if cq_active:
+                t_data = await cls.fetch_api(cls.CQ_URL, {"cmd": "getTrims", "make": r.make.lower(), "model": r.model, "year": r.year_from}, is_cq=True)
+                if t_data and t_data not in ["DENIED", "SILENT_SKIP"] and "Trims" in t_data:
+                    t = t_data["Trims"][0]
+                    r.engine_variant = t.get("model_trim") or "Standard"
+                    r.factory_data.update({"hp": t.get("model_engine_power_ps"), "cc": t.get("model_engine_cc"), "source": "heal_v1.9_cq"})
+        await db.commit()
 
     @classmethod
     async def run(cls):
-        logger.info("🤖 Robot 1: EU-Elsődlegességű Deep Dive szinkron indítása...")
-        
-        # 2026-tól visszafelé haladunk (Modern flották prioritása)
-        for year in range(2026, 1989, -1):
-            logger.info(f"📅 Feldolgozás alatt: {year} évjárat")
-            
-            makes_data = await cls.fetch_api(cls.CQ_URL, {"cmd": "getMakes", "year": year}, is_cq=True)
-            if not makes_data or "Makes" not in makes_data: continue
+        logger.info(f"🤖 Robot 1.9.2 indítása (RDW Token: {'Aktív' if cls.RDW_TOKEN else 'HIÁNYZIK!'})")
 
-            for make_entry in makes_data.get("Makes", []):
-                m_id = make_entry["make_id"]
-                m_display = make_entry["make_display"]
-                
-                # MODELL GYŰJTÉS: EU + US fúzió
+        for year in range(2026, 1989, -1):
+            logger.info(f"📅 --- CIKLUS: {year} ---")
+            
+            cq_now_active = not (cls.cq_banned_until and datetime.datetime.now() < cls.cq_banned_until)
+            
+            async with SessionLocal() as db:
+                await cls.auto_heal(db, cq_now_active)
+
+            # 1. MÁRKALISTA (NHTSA + Fallback)
+            makes_to_process = []
+            for b in cls.FALLBACK_BRANDS:
+                makes_to_process.append({"id": b.lower(), "display": b})
+
+            for make in makes_to_process:
                 models_to_fetch = set()
                 
-                # 🇪🇺 EU Forrás
-                cq_models = await cls.fetch_api(cls.CQ_URL, {"cmd": "getModels", "make": m_id, "year": year}, is_cq=True)
-                if cq_models and cq_models.get("Models"):
-                    for m in cq_models["Models"]: models_to_fetch.add(m["model_name"])
-                
-                # 🇺🇸 US Forrás kiegészítés
-                n_data = await cls.fetch_api(f"{cls.NHTSA_BASE}{m_display}/modelyear/{year}?format=json")
+                # A: NHTSA (US)
+                n_data = await cls.fetch_api(f"{cls.NHTSA_BASE}{make['display']}/modelyear/{year}?format=json")
                 if n_data and n_data.get("Results"):
                     for r in n_data["Results"]: models_to_fetch.add(r["Model_Name"])
 
+                # B: RDW (Holland) - Tokennel védve
+                rdw_m = await cls.fetch_api(cls.RDW_URL, {"merk": make['display'].upper(), "$limit": 30})
+                if rdw_m and isinstance(rdw_m, list):
+                    for r in rdw_m: models_to_fetch.add(r.get("handelsbenaming"))
+
                 async with SessionLocal() as db:
                     for model_name in models_to_fetch:
-                        # DEEP DIVE: Motorvariánsok (Trims) lekérése
-                        trims_data = await cls.fetch_api(cls.CQ_URL, {
-                            "cmd": "getTrims", "make": m_id, "model": model_name, "year": year
-                        }, is_cq=True)
+                        if not model_name or await cls.is_model_processed(db, make["display"], model_name, year):
+                            continue
+
+                        # C: CarQuery (Csak ha nincs ban)
+                        found_trims = []
+                        t_data = await cls.fetch_api(cls.CQ_URL, {"cmd": "getTrims", "make": make["id"], "model": model_name, "year": year}, is_cq=True)
+                        if t_data and t_data not in ["DENIED", "SILENT_SKIP"] and "Trims" in t_data:
+                            found_trims = t_data["Trims"]
 
-                        found_trims = trims_data.get("Trims", []) if trims_data else []
-                        
-                        # Ha nincs trim adat, egy standard sor mindenképpen kell
                         if not found_trims:
-                            found_trims = [{"model_trim": "Standard", "model_engine_fuel": None}]
+                            found_trims = [{"model_trim": "Standard", "model_engine_fuel": "Unknown"}]
 
                         for t in found_trims:
-                            variant = t.get("model_trim") or "Standard"
-                            fuel = t.get("model_engine_fuel") or "Unknown"
-                            v_class = cls.identify_class(m_display, model_name)
-
-                            # Szigorú duplikáció-ellenőrzés (UniqueConstraint alapú lekérdezés)
-                            stmt = select(AssetCatalog).where(
-                                AssetCatalog.make == m_display,
-                                AssetCatalog.model == model_name,
-                                AssetCatalog.year_from == year,
-                                AssetCatalog.engine_variant == variant,
-                                AssetCatalog.fuel_type == fuel
-                            )
-                            result = await db.execute(stmt)
-                            if not result.scalars().first():
-                                db.add(AssetCatalog(
-                                    make=m_display, 
-                                    model=model_name, 
-                                    year_from=year,
-                                    engine_variant=variant, 
-                                    fuel_type=fuel,
-                                    vehicle_class=v_class,
-                                    factory_data={
-                                        "cc": t.get("model_engine_cc"),
-                                        "hp": t.get("model_engine_power_ps"),
-                                        "cylinders": t.get("model_engine_cyl"),
-                                        "transmission": t.get("model_transmission_type"),
-                                        "source": "master_v7_deep_dive",
-                                        "sync_date": str(func.now())
-                                    }
-                                ))
-                    
-                    # JAVÍTÁS: Márkánkénti véglegesítés az adatbázisban a session-ön belül
+                            db.add(AssetCatalog(
+                                make=make["display"], model=model_name, year_from=year,
+                                engine_variant=t.get("model_trim") or "Standard",
+                                fuel_type=t.get("model_engine_fuel") or "Unknown",
+                                vehicle_class=cls.identify_class(make["display"], model_name),
+                                factory_data={
+                                    "hp": t.get("model_engine_power_ps"), "cc": t.get("model_engine_cc"),
+                                    "source": "ghost_v1.9.2", "sync_date": str(datetime.datetime.now())
+                                }
+                            ))
                     await db.commit()
-                    logger.info(f"✅ {m_display} ({year}) összes variánsa rögzítve.")
-
-        # SEQUENCE 2: Miután végeztünk a fő listával, nézzük meg a hiányosakat
-        await cls.enrich_missing_data()
 
 if __name__ == "__main__":
     asyncio.run(CatalogScout.run())

backend/migrations/versions/0adbe75a0b3f_complete_sync.py

@@ -1,554 +0,0 @@
-"""complete_sync
-
-Revision ID: 0adbe75a0b3f
-Revises: 
-Create Date: 2026-02-09 17:49:12.955967
-
-"""
-from typing import Sequence, Union
-
-from alembic import op
-import sqlalchemy as sa
-from sqlalchemy.dialects import postgresql
-
-# revision identifiers, used by Alembic.
-revision: str = '0adbe75a0b3f'
-down_revision: Union[str, Sequence[str], None] = None
-branch_labels: Union[str, Sequence[str], None] = None
-depends_on: Union[str, Sequence[str], None] = None
-
-
-def upgrade() -> None:
-    """Upgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.create_table('badges',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', sa.String(), nullable=False),
-    sa.Column('description', sa.String(), nullable=False),
-    sa.Column('icon_url', sa.String(), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('name'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_badges_id'), 'badges', ['id'], unique=False, schema='data')
-    op.create_table('exchange_rates',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('base_currency', sa.String(length=3), nullable=True),
-    sa.Column('target_currency', sa.String(length=3), nullable=True),
-    sa.Column('rate', sa.Numeric(precision=18, scale=6), nullable=True),
-    sa.Column('rate_date', sa.DateTime(), nullable=True),
-    sa.Column('updated_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('geo_postal_codes',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('country_code', sa.String(length=5), nullable=True),
-    sa.Column('zip_code', sa.String(length=10), nullable=False),
-    sa.Column('city', sa.String(length=100), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('geo_street_types',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', sa.String(length=50), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('name'),
-    schema='data'
-    )
-    op.create_table('level_configs',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('level_number', sa.Integer(), nullable=False),
-    sa.Column('min_points', sa.Integer(), nullable=False),
-    sa.Column('rank_name', sa.String(), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('level_number'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_level_configs_id'), 'level_configs', ['id'], unique=False, schema='data')
-    op.create_table('point_rules',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('action_key', sa.String(), nullable=False),
-    sa.Column('points', sa.Integer(), nullable=False),
-    sa.Column('description', sa.String(), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_point_rules_action_key'), 'point_rules', ['action_key'], unique=True, schema='data')
-    op.create_index(op.f('ix_data_point_rules_id'), 'point_rules', ['id'], unique=False, schema='data')
-    op.create_table('regional_settings',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('country_code', sa.String(), nullable=False),
-    sa.Column('currency', sa.String(), nullable=False),
-    sa.Column('is_active', sa.Boolean(), nullable=False),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('country_code'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_regional_settings_id'), 'regional_settings', ['id'], unique=False, schema='data')
-    op.create_table('service_specialties',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('parent_id', sa.Integer(), nullable=True),
-    sa.Column('name', sa.String(), nullable=False),
-    sa.Column('slug', sa.String(), nullable=True),
-    sa.ForeignKeyConstraint(['parent_id'], ['data.service_specialties.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('slug'),
-    schema='data'
-    )
-    op.create_table('subscription_tiers',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('name', sa.String(), nullable=True),
-    sa.Column('rules', sa.JSON(), nullable=True),
-    sa.Column('is_custom', sa.Boolean(), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('name'),
-    schema='data'
-    )
-    op.create_table('system_parameters',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('key', sa.String(length=50), nullable=True),
-    sa.Column('value', sa.JSON(), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=True),
-    sa.Column('description', sa.String(), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_system_parameters_id'), 'system_parameters', ['id'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_system_parameters_key'), 'system_parameters', ['key'], unique=True, schema='data')
-    op.create_table('vehicle_catalog',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('make', sa.String(), nullable=False),
-    sa.Column('model', sa.String(), nullable=False),
-    sa.Column('generation', sa.String(), nullable=True),
-    sa.Column('year_from', sa.Integer(), nullable=True),
-    sa.Column('year_to', sa.Integer(), nullable=True),
-    sa.Column('vehicle_class', sa.String(), nullable=True),
-    sa.Column('fuel_type', sa.String(), nullable=True),
-    sa.Column('engine_code', sa.String(), nullable=True),
-    sa.Column('factory_data', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_vehicle_catalog_id'), 'vehicle_catalog', ['id'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_vehicle_catalog_make'), 'vehicle_catalog', ['make'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_vehicle_catalog_model'), 'vehicle_catalog', ['model'], unique=False, schema='data')
-    op.create_table('addresses',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('postal_code_id', sa.Integer(), nullable=True),
-    sa.Column('street_name', sa.String(length=200), nullable=False),
-    sa.Column('street_type', sa.String(length=50), nullable=False),
-    sa.Column('house_number', sa.String(length=50), nullable=False),
-    sa.Column('stairwell', sa.String(length=20), nullable=True),
-    sa.Column('floor', sa.String(length=20), nullable=True),
-    sa.Column('door', sa.String(length=20), nullable=True),
-    sa.Column('parcel_id', sa.String(length=50), nullable=True),
-    sa.Column('full_address_text', sa.Text(), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['postal_code_id'], ['data.geo_postal_codes.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('assets',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('vin', sa.String(length=17), nullable=False),
-    sa.Column('license_plate', sa.String(length=20), nullable=True),
-    sa.Column('name', sa.String(), nullable=True),
-    sa.Column('year_of_manufacture', sa.Integer(), nullable=True),
-    sa.Column('catalog_id', sa.Integer(), nullable=True),
-    sa.Column('is_verified', sa.Boolean(), nullable=True),
-    sa.Column('status', sa.String(length=20), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
-    sa.ForeignKeyConstraint(['catalog_id'], ['data.vehicle_catalog.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_assets_license_plate'), 'assets', ['license_plate'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_assets_vin'), 'assets', ['vin'], unique=True, schema='data')
-    op.create_table('geo_streets',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('postal_code_id', sa.Integer(), nullable=True),
-    sa.Column('name', sa.String(length=200), nullable=False),
-    sa.ForeignKeyConstraint(['postal_code_id'], ['data.geo_postal_codes.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('asset_events',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('asset_id', sa.UUID(), nullable=False),
-    sa.Column('event_type', sa.String(length=50), nullable=False),
-    sa.Column('recorded_mileage', sa.Integer(), nullable=True),
-    sa.Column('data', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.ForeignKeyConstraint(['asset_id'], ['data.assets.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('asset_financials',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('asset_id', sa.UUID(), nullable=True),
-    sa.Column('acquisition_price', sa.Numeric(precision=18, scale=2), nullable=True),
-    sa.Column('acquisition_date', sa.DateTime(), nullable=True),
-    sa.Column('financing_type', sa.String(), nullable=True),
-    sa.Column('residual_value_estimate', sa.Numeric(precision=18, scale=2), nullable=True),
-    sa.ForeignKeyConstraint(['asset_id'], ['data.assets.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('asset_id'),
-    schema='data'
-    )
-    op.create_table('asset_telemetry',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('asset_id', sa.UUID(), nullable=True),
-    sa.Column('current_mileage', sa.Integer(), nullable=True),
-    sa.Column('mileage_unit', sa.String(length=10), nullable=True),
-    sa.Column('vqi_score', sa.Numeric(precision=5, scale=2), nullable=True),
-    sa.Column('dbs_score', sa.Numeric(precision=5, scale=2), nullable=True),
-    sa.ForeignKeyConstraint(['asset_id'], ['data.assets.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('asset_id'),
-    schema='data'
-    )
-    op.create_table('persons',
-    sa.Column('id', sa.BigInteger(), nullable=False),
-    sa.Column('id_uuid', sa.UUID(), nullable=False),
-    sa.Column('address_id', sa.UUID(), nullable=True),
-    sa.Column('last_name', sa.String(), nullable=False),
-    sa.Column('first_name', sa.String(), nullable=False),
-    sa.Column('mothers_last_name', sa.String(), nullable=True),
-    sa.Column('mothers_first_name', sa.String(), nullable=True),
-    sa.Column('birth_place', sa.String(), nullable=True),
-    sa.Column('birth_date', sa.DateTime(), nullable=True),
-    sa.Column('phone', sa.String(), nullable=True),
-    sa.Column('identity_docs', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.Column('medical_emergency', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.Column('ice_contact', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=False),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
-    sa.ForeignKeyConstraint(['address_id'], ['data.addresses.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('id_uuid'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_persons_id'), 'persons', ['id'], unique=False, schema='data')
-    op.create_table('users',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('email', sa.String(), nullable=False),
-    sa.Column('hashed_password', sa.String(), nullable=True),
-    sa.Column('role', sa.Enum('admin', 'user', 'service', 'fleet_manager', 'driver', name='userrole'), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=True),
-    sa.Column('region_code', sa.String(), nullable=True),
-    sa.Column('is_deleted', sa.Boolean(), nullable=True),
-    sa.Column('person_id', sa.BigInteger(), nullable=True),
-    sa.Column('preferred_language', sa.String(length=5), nullable=True),
-    sa.Column('preferred_currency', sa.String(length=3), nullable=True),
-    sa.Column('timezone', sa.String(length=50), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['person_id'], ['data.persons.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_users_email'), 'users', ['email'], unique=True, schema='data')
-    op.create_index(op.f('ix_data_users_id'), 'users', ['id'], unique=False, schema='data')
-    op.create_table('asset_reviews',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('asset_id', sa.UUID(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('overall_rating', sa.Integer(), nullable=True),
-    sa.Column('criteria_scores', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.Column('comment', sa.Text(), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['asset_id'], ['data.assets.id'], ),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('audit_logs',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('target_type', sa.String(), nullable=True),
-    sa.Column('target_id', sa.String(), nullable=True),
-    sa.Column('action', sa.String(), nullable=False),
-    sa.Column('changes', sa.JSON(), nullable=True),
-    sa.Column('timestamp', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_audit_logs_id'), 'audit_logs', ['id'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_audit_logs_target_id'), 'audit_logs', ['target_id'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_audit_logs_target_type'), 'audit_logs', ['target_type'], unique=False, schema='data')
-    op.create_table('documents',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('parent_type', sa.String(length=20), nullable=False),
-    sa.Column('parent_id', sa.String(length=50), nullable=False),
-    sa.Column('doc_type', sa.String(length=50), nullable=True),
-    sa.Column('original_name', sa.String(length=255), nullable=False),
-    sa.Column('file_hash', sa.String(length=64), nullable=False),
-    sa.Column('file_ext', sa.String(length=10), nullable=True),
-    sa.Column('mime_type', sa.String(length=100), nullable=True),
-    sa.Column('file_size', sa.Integer(), nullable=True),
-    sa.Column('has_thumbnail', sa.Boolean(), nullable=True),
-    sa.Column('thumbnail_path', sa.String(length=255), nullable=True),
-    sa.Column('uploaded_by', sa.Integer(), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['uploaded_by'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('organizations',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('address_id', sa.UUID(), nullable=True),
-    sa.Column('full_name', sa.String(), nullable=False),
-    sa.Column('name', sa.String(), nullable=False),
-    sa.Column('display_name', sa.String(length=50), nullable=True),
-    sa.Column('default_currency', sa.String(length=3), nullable=True),
-    sa.Column('country_code', sa.String(length=2), nullable=True),
-    sa.Column('language', sa.String(length=5), nullable=True),
-    sa.Column('address_zip', sa.String(length=10), nullable=True),
-    sa.Column('address_city', sa.String(length=100), nullable=True),
-    sa.Column('address_street_name', sa.String(length=150), nullable=True),
-    sa.Column('address_street_type', sa.String(length=50), nullable=True),
-    sa.Column('address_house_number', sa.String(length=20), nullable=True),
-    sa.Column('address_hrsz', sa.String(length=50), nullable=True),
-    sa.Column('address_stairwell', sa.String(length=20), nullable=True),
-    sa.Column('address_floor', sa.String(length=20), nullable=True),
-    sa.Column('address_door', sa.String(length=20), nullable=True),
-    sa.Column('tax_number', sa.String(length=20), nullable=True),
-    sa.Column('reg_number', sa.String(length=50), nullable=True),
-    sa.Column('org_type', postgresql.ENUM('individual', 'service', 'service_provider', 'fleet_owner', 'club', 'business', name='orgtype', schema='data', inherit_schema=True), nullable=True),
-    sa.Column('status', sa.String(length=30), nullable=True),
-    sa.Column('is_deleted', sa.Boolean(), nullable=True),
-    sa.Column('notification_settings', sa.JSON(), server_default=sa.text('\'{ "notify_owner": true, "alert_days_before": [30, 15, 7, 1] }\'::jsonb'), nullable=True),
-    sa.Column('external_integration_config', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.Column('owner_id', sa.Integer(), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=True),
-    sa.Column('is_transferable', sa.Boolean(), nullable=True),
-    sa.Column('is_verified', sa.Boolean(), nullable=True),
-    sa.Column('verification_expires_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('updated_at', sa.DateTime(timezone=True), nullable=True),
-    sa.ForeignKeyConstraint(['address_id'], ['data.addresses.id'], ),
-    sa.ForeignKeyConstraint(['owner_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_organizations_id'), 'organizations', ['id'], unique=False, schema='data')
-    op.create_index(op.f('ix_data_organizations_tax_number'), 'organizations', ['tax_number'], unique=True, schema='data')
-    op.create_table('points_ledger',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('points', sa.Integer(), nullable=False),
-    sa.Column('reason', sa.String(), nullable=False),
-    sa.Column('created_at', sa.DateTime(), nullable=False),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_points_ledger_id'), 'points_ledger', ['id'], unique=False, schema='data')
-    op.create_table('ratings',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('author_id', sa.Integer(), nullable=False),
-    sa.Column('target_type', sa.String(length=20), nullable=False),
-    sa.Column('target_id', sa.UUID(), nullable=False),
-    sa.Column('score', sa.Integer(), nullable=False),
-    sa.Column('comment', sa.String(), nullable=True),
-    sa.ForeignKeyConstraint(['author_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('user_badges',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('badge_id', sa.Integer(), nullable=False),
-    sa.Column('earned_at', sa.DateTime(), nullable=False),
-    sa.ForeignKeyConstraint(['badge_id'], ['data.badges.id'], ),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_user_badges_id'), 'user_badges', ['id'], unique=False, schema='data')
-    op.create_table('user_stats',
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('total_xp', sa.Integer(), nullable=False),
-    sa.Column('social_points', sa.Integer(), nullable=False),
-    sa.Column('current_level', sa.Integer(), nullable=False),
-    sa.Column('updated_at', sa.DateTime(), nullable=False),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('user_id'),
-    schema='data'
-    )
-    op.create_table('vehicle_ownerships',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('vehicle_id', sa.UUID(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('start_date', sa.Date(), nullable=False),
-    sa.Column('end_date', sa.Date(), nullable=True),
-    sa.Column('notes', sa.Text(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.ForeignKeyConstraint(['vehicle_id'], ['data.assets.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_vehicle_ownerships_id'), 'vehicle_ownerships', ['id'], unique=False, schema='data')
-    op.create_table('verification_tokens',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('token', sa.UUID(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('token_type', sa.String(length=20), nullable=False),
-    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('expires_at', sa.DateTime(timezone=True), nullable=False),
-    sa.Column('is_used', sa.Boolean(), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ondelete='CASCADE'),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('token'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_verification_tokens_id'), 'verification_tokens', ['id'], unique=False, schema='data')
-    op.create_table('wallets',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=True),
-    sa.Column('coin_balance', sa.Numeric(precision=18, scale=2), nullable=True),
-    sa.Column('credit_balance', sa.Numeric(precision=18, scale=2), nullable=True),
-    sa.Column('currency', sa.String(length=3), nullable=True),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    sa.UniqueConstraint('user_id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_wallets_id'), 'wallets', ['id'], unique=False, schema='data')
-    op.create_table('asset_assignments',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('asset_id', sa.UUID(), nullable=False),
-    sa.Column('organization_id', sa.Integer(), nullable=False),
-    sa.Column('assigned_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('released_at', sa.DateTime(timezone=True), nullable=True),
-    sa.Column('status', sa.String(length=30), nullable=True),
-    sa.ForeignKeyConstraint(['asset_id'], ['data.assets.id'], ),
-    sa.ForeignKeyConstraint(['organization_id'], ['data.organizations.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('asset_costs',
-    sa.Column('id', sa.UUID(), nullable=False),
-    sa.Column('asset_id', sa.UUID(), nullable=False),
-    sa.Column('organization_id', sa.Integer(), nullable=False),
-    sa.Column('driver_id', sa.Integer(), nullable=True),
-    sa.Column('cost_type', sa.String(length=50), nullable=False),
-    sa.Column('amount', sa.Numeric(precision=18, scale=2), nullable=False),
-    sa.Column('currency', sa.String(length=3), nullable=True),
-    sa.Column('net_amount', sa.Numeric(precision=18, scale=2), nullable=True),
-    sa.Column('vat_rate', sa.Numeric(precision=5, scale=2), nullable=True),
-    sa.Column('exchange_rate_at_cost', sa.Numeric(precision=18, scale=6), nullable=True),
-    sa.Column('date', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
-    sa.Column('mileage_at_cost', sa.Integer(), nullable=True),
-    sa.Column('data', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.ForeignKeyConstraint(['asset_id'], ['data.assets.id'], ),
-    sa.ForeignKeyConstraint(['driver_id'], ['data.users.id'], ),
-    sa.ForeignKeyConstraint(['organization_id'], ['data.organizations.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('credit_logs',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('org_id', sa.Integer(), nullable=True),
-    sa.Column('amount', sa.Numeric(precision=10, scale=2), nullable=True),
-    sa.Column('description', sa.String(), nullable=True),
-    sa.Column('created_at', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
-    sa.ForeignKeyConstraint(['org_id'], ['data.organizations.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('org_subscriptions',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('org_id', sa.Integer(), nullable=True),
-    sa.Column('tier_id', sa.Integer(), nullable=True),
-    sa.Column('valid_from', sa.DateTime(), server_default=sa.text('now()'), nullable=True),
-    sa.Column('valid_until', sa.DateTime(), nullable=True),
-    sa.Column('is_active', sa.Boolean(), nullable=True),
-    sa.ForeignKeyConstraint(['org_id'], ['data.organizations.id'], ),
-    sa.ForeignKeyConstraint(['tier_id'], ['data.subscription_tiers.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_table('organization_members',
-    sa.Column('id', sa.Integer(), nullable=False),
-    sa.Column('organization_id', sa.Integer(), nullable=False),
-    sa.Column('user_id', sa.Integer(), nullable=False),
-    sa.Column('role', sa.String(), nullable=True),
-    sa.Column('permissions', sa.JSON(), server_default=sa.text("'{}'::jsonb"), nullable=True),
-    sa.ForeignKeyConstraint(['organization_id'], ['data.organizations.id'], ),
-    sa.ForeignKeyConstraint(['user_id'], ['data.users.id'], ),
-    sa.PrimaryKeyConstraint('id'),
-    schema='data'
-    )
-    op.create_index(op.f('ix_data_organization_members_id'), 'organization_members', ['id'], unique=False, schema='data')
-    # ### end Alembic commands ###
-
-
-def downgrade() -> None:
-    """Downgrade schema."""
-    # ### commands auto generated by Alembic - please adjust! ###
-    op.drop_index(op.f('ix_data_organization_members_id'), table_name='organization_members', schema='data')
-    op.drop_table('organization_members', schema='data')
-    op.drop_table('org_subscriptions', schema='data')
-    op.drop_table('credit_logs', schema='data')
-    op.drop_table('asset_costs', schema='data')
-    op.drop_table('asset_assignments', schema='data')
-    op.drop_index(op.f('ix_data_wallets_id'), table_name='wallets', schema='data')
-    op.drop_table('wallets', schema='data')
-    op.drop_index(op.f('ix_data_verification_tokens_id'), table_name='verification_tokens', schema='data')
-    op.drop_table('verification_tokens', schema='data')
-    op.drop_index(op.f('ix_data_vehicle_ownerships_id'), table_name='vehicle_ownerships', schema='data')
-    op.drop_table('vehicle_ownerships', schema='data')
-    op.drop_table('user_stats', schema='data')
-    op.drop_index(op.f('ix_data_user_badges_id'), table_name='user_badges', schema='data')
-    op.drop_table('user_badges', schema='data')
-    op.drop_table('ratings', schema='data')
-    op.drop_index(op.f('ix_data_points_ledger_id'), table_name='points_ledger', schema='data')
-    op.drop_table('points_ledger', schema='data')
-    op.drop_index(op.f('ix_data_organizations_tax_number'), table_name='organizations', schema='data')
-    op.drop_index(op.f('ix_data_organizations_id'), table_name='organizations', schema='data')
-    op.drop_table('organizations', schema='data')
-    op.drop_table('documents', schema='data')
-    op.drop_index(op.f('ix_data_audit_logs_target_type'), table_name='audit_logs', schema='data')
-    op.drop_index(op.f('ix_data_audit_logs_target_id'), table_name='audit_logs', schema='data')
-    op.drop_index(op.f('ix_data_audit_logs_id'), table_name='audit_logs', schema='data')
-    op.drop_table('audit_logs', schema='data')
-    op.drop_table('asset_reviews', schema='data')
-    op.drop_index(op.f('ix_data_users_id'), table_name='users', schema='data')
-    op.drop_index(op.f('ix_data_users_email'), table_name='users', schema='data')
-    op.drop_table('users', schema='data')
-    op.drop_index(op.f('ix_data_persons_id'), table_name='persons', schema='data')
-    op.drop_table('persons', schema='data')
-    op.drop_table('asset_telemetry', schema='data')
-    op.drop_table('asset_financials', schema='data')
-    op.drop_table('asset_events', schema='data')
-    op.drop_table('geo_streets', schema='data')
-    op.drop_index(op.f('ix_data_assets_vin'), table_name='assets', schema='data')
-    op.drop_index(op.f('ix_data_assets_license_plate'), table_name='assets', schema='data')
-    op.drop_table('assets', schema='data')
-    op.drop_table('addresses', schema='data')
-    op.drop_index(op.f('ix_data_vehicle_catalog_model'), table_name='vehicle_catalog', schema='data')
-    op.drop_index(op.f('ix_data_vehicle_catalog_make'), table_name='vehicle_catalog', schema='data')
-    op.drop_index(op.f('ix_data_vehicle_catalog_id'), table_name='vehicle_catalog', schema='data')
-    op.drop_table('vehicle_catalog', schema='data')
-    op.drop_index(op.f('ix_data_system_parameters_key'), table_name='system_parameters', schema='data')
-    op.drop_index(op.f('ix_data_system_parameters_id'), table_name='system_parameters', schema='data')
-    op.drop_table('system_parameters', schema='data')
-    op.drop_table('subscription_tiers', schema='data')
-    op.drop_table('service_specialties', schema='data')
-    op.drop_index(op.f('ix_data_regional_settings_id'), table_name='regional_settings', schema='data')
-    op.drop_table('regional_settings', schema='data')
-    op.drop_index(op.f('ix_data_point_rules_id'), table_name='point_rules', schema='data')
-    op.drop_index(op.f('ix_data_point_rules_action_key'), table_name='point_rules', schema='data')
-    op.drop_table('point_rules', schema='data')
-    op.drop_index(op.f('ix_data_level_configs_id'), table_name='level_configs', schema='data')
-    op.drop_table('level_configs', schema='data')
-    op.drop_table('geo_street_types', schema='data')
-    op.drop_table('geo_postal_codes', schema='data')
-    op.drop_table('exchange_rates', schema='data')
-    op.drop_index(op.f('ix_data_badges_id'), table_name='badges', schema='data')
-    op.drop_table('badges', schema='data')
-    # ### end Alembic commands ###

backend/migrations/versions/92616f34cdd3_baseline_and_staging_init.py

@@ -0,0 +1,253 @@
+"""baseline_and_staging_init
+
+Revision ID: 92616f34cdd3
+Revises: 
+Create Date: 2026-02-14 15:23:12.091715
+
+"""
+from typing import Sequence, Union
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+# revision identifiers, used by Alembic.
+revision: str = '92616f34cdd3'
+down_revision: Union[str, Sequence[str], None] = None
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+
+def upgrade() -> None:
+    """Upgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.create_table('service_staging',
+    sa.Column('id', sa.Integer(), nullable=False),
+    sa.Column('name', sa.String(), nullable=False),
+    sa.Column('postal_code', sa.String(length=10), nullable=True),
+    sa.Column('city', sa.String(length=100), nullable=True),
+    sa.Column('street', sa.String(length=255), nullable=True),
+    sa.Column('house_number', sa.String(length=50), nullable=True),
+    sa.Column('full_address', sa.String(), nullable=True),
+    sa.Column('contact_phone', sa.String(), nullable=True),
+    sa.Column('email', sa.String(), nullable=True),
+    sa.Column('website', sa.String(), nullable=True),
+    sa.Column('source', sa.String(length=50), nullable=True),
+    sa.Column('external_id', sa.String(length=100), nullable=True),
+    sa.Column('raw_data', postgresql.JSONB(astext_type=sa.Text()), server_default=sa.text("'{}'::jsonb"), nullable=True),
+    sa.Column('status', sa.String(length=20), server_default=sa.text("'pending'"), nullable=True),
+    sa.Column('trust_score', sa.Integer(), nullable=True),
+    sa.Column('created_at', sa.DateTime(timezone=True), server_default=sa.text('now()'), nullable=True),
+    sa.PrimaryKeyConstraint('id'),
+    schema='data'
+    )
+    op.create_index(op.f('ix_data_service_staging_city'), 'service_staging', ['city'], unique=False, schema='data')
+    op.create_index(op.f('ix_data_service_staging_external_id'), 'service_staging', ['external_id'], unique=False, schema='data')
+    op.create_index(op.f('ix_data_service_staging_id'), 'service_staging', ['id'], unique=False, schema='data')
+    op.create_index(op.f('ix_data_service_staging_name'), 'service_staging', ['name'], unique=False, schema='data')
+    op.create_index(op.f('ix_data_service_staging_postal_code'), 'service_staging', ['postal_code'], unique=False, schema='data')
+    op.create_index(op.f('ix_data_service_staging_source'), 'service_staging', ['source'], unique=False, schema='data')
+    op.create_index(op.f('ix_data_service_staging_status'), 'service_staging', ['status'], unique=False, schema='data')
+    op.drop_constraint(op.f('addresses_postal_code_id_fkey'), 'addresses', type_='foreignkey')
+    op.create_foreign_key(None, 'addresses', 'geo_postal_codes', ['postal_code_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('asset_assignments_asset_id_fkey'), 'asset_assignments', type_='foreignkey')
+    op.drop_constraint(op.f('asset_assignments_organization_id_fkey'), 'asset_assignments', type_='foreignkey')
+    op.create_foreign_key(None, 'asset_assignments', 'assets', ['asset_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'asset_assignments', 'organizations', ['organization_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('asset_costs_driver_id_fkey'), 'asset_costs', type_='foreignkey')
+    op.drop_constraint(op.f('asset_costs_asset_id_fkey'), 'asset_costs', type_='foreignkey')
+    op.drop_constraint(op.f('asset_costs_organization_id_fkey'), 'asset_costs', type_='foreignkey')
+    op.create_foreign_key(None, 'asset_costs', 'users', ['driver_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'asset_costs', 'organizations', ['organization_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'asset_costs', 'assets', ['asset_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('asset_events_asset_id_fkey'), 'asset_events', type_='foreignkey')
+    op.create_foreign_key(None, 'asset_events', 'assets', ['asset_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('asset_financials_asset_id_fkey'), 'asset_financials', type_='foreignkey')
+    op.create_foreign_key(None, 'asset_financials', 'assets', ['asset_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('asset_reviews_asset_id_fkey'), 'asset_reviews', type_='foreignkey')
+    op.drop_constraint(op.f('asset_reviews_user_id_fkey'), 'asset_reviews', type_='foreignkey')
+    op.create_foreign_key(None, 'asset_reviews', 'assets', ['asset_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'asset_reviews', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('asset_telemetry_asset_id_fkey'), 'asset_telemetry', type_='foreignkey')
+    op.create_foreign_key(None, 'asset_telemetry', 'assets', ['asset_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('assets_catalog_id_fkey'), 'assets', type_='foreignkey')
+    op.drop_constraint(op.f('assets_current_organization_id_fkey'), 'assets', type_='foreignkey')
+    op.create_foreign_key(None, 'assets', 'vehicle_catalog', ['catalog_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'assets', 'organizations', ['current_organization_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('audit_logs_user_id_fkey'), 'audit_logs', type_='foreignkey')
+    op.create_foreign_key(None, 'audit_logs', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('credit_logs_org_id_fkey'), 'credit_logs', type_='foreignkey')
+    op.create_foreign_key(None, 'credit_logs', 'organizations', ['org_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('documents_uploaded_by_fkey'), 'documents', type_='foreignkey')
+    op.create_foreign_key(None, 'documents', 'users', ['uploaded_by'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('geo_streets_postal_code_id_fkey'), 'geo_streets', type_='foreignkey')
+    op.create_foreign_key(None, 'geo_streets', 'geo_postal_codes', ['postal_code_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('org_subscriptions_org_id_fkey'), 'org_subscriptions', type_='foreignkey')
+    op.drop_constraint(op.f('org_subscriptions_tier_id_fkey'), 'org_subscriptions', type_='foreignkey')
+    op.create_foreign_key(None, 'org_subscriptions', 'subscription_tiers', ['tier_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'org_subscriptions', 'organizations', ['org_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('organization_financials_organization_id_fkey'), 'organization_financials', type_='foreignkey')
+    op.create_foreign_key(None, 'organization_financials', 'organizations', ['organization_id'], ['id'], source_schema='data', referent_schema='data')
+    op.alter_column('organization_members', 'role',
+               existing_type=postgresql.ENUM('OWNER', 'ADMIN', 'FLEET_MANAGER', 'DRIVER', 'MECHANIC', 'RECEPTIONIST', name='orguserrole'),
+               type_=postgresql.ENUM('OWNER', 'ADMIN', 'FLEET_MANAGER', 'DRIVER', 'MECHANIC', 'RECEPTIONIST', name='orguserrole', schema='data', inherit_schema=True),
+               existing_nullable=True)
+    op.drop_constraint(op.f('organization_members_user_id_fkey'), 'organization_members', type_='foreignkey')
+    op.drop_constraint(op.f('organization_members_person_id_fkey'), 'organization_members', type_='foreignkey')
+    op.drop_constraint(op.f('organization_members_organization_id_fkey'), 'organization_members', type_='foreignkey')
+    op.create_foreign_key(None, 'organization_members', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'organization_members', 'organizations', ['organization_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'organization_members', 'persons', ['person_id'], ['id'], source_schema='data', referent_schema='data')
+    op.alter_column('organizations', 'org_type',
+               existing_type=postgresql.ENUM('individual', 'service', 'service_provider', 'fleet_owner', 'club', 'business', name='orgtype'),
+               type_=postgresql.ENUM('individual', 'service', 'service_provider', 'fleet_owner', 'club', 'business', name='orgtype', schema='data', inherit_schema=True),
+               existing_nullable=True)
+    op.drop_constraint(op.f('organizations_address_id_fkey'), 'organizations', type_='foreignkey')
+    op.drop_constraint(op.f('organizations_owner_id_fkey'), 'organizations', type_='foreignkey')
+    op.create_foreign_key(None, 'organizations', 'users', ['owner_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'organizations', 'addresses', ['address_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('pending_actions_approver_id_fkey'), 'pending_actions', type_='foreignkey')
+    op.drop_constraint(op.f('pending_actions_requester_id_fkey'), 'pending_actions', type_='foreignkey')
+    op.create_foreign_key(None, 'pending_actions', 'users', ['approver_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'pending_actions', 'users', ['requester_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('persons_address_id_fkey'), 'persons', type_='foreignkey')
+    op.create_foreign_key(None, 'persons', 'addresses', ['address_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('points_ledger_user_id_fkey'), 'points_ledger', type_='foreignkey')
+    op.create_foreign_key(None, 'points_ledger', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('ratings_author_id_fkey'), 'ratings', type_='foreignkey')
+    op.create_foreign_key(None, 'ratings', 'users', ['author_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('service_expertises_expertise_id_fkey'), 'service_expertises', type_='foreignkey')
+    op.drop_constraint(op.f('service_expertises_service_id_fkey'), 'service_expertises', type_='foreignkey')
+    op.create_foreign_key(None, 'service_expertises', 'expertise_tags', ['expertise_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'service_expertises', 'service_profiles', ['service_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('service_profiles_organization_id_fkey'), 'service_profiles', type_='foreignkey')
+    op.create_foreign_key(None, 'service_profiles', 'organizations', ['organization_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('service_specialties_parent_id_fkey'), 'service_specialties', type_='foreignkey')
+    op.create_foreign_key(None, 'service_specialties', 'service_specialties', ['parent_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('social_accounts_user_id_fkey'), 'social_accounts', type_='foreignkey')
+    op.create_foreign_key(None, 'social_accounts', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data', ondelete='CASCADE')
+    op.drop_constraint(op.f('user_badges_user_id_fkey'), 'user_badges', type_='foreignkey')
+    op.drop_constraint(op.f('user_badges_badge_id_fkey'), 'user_badges', type_='foreignkey')
+    op.create_foreign_key(None, 'user_badges', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'user_badges', 'badges', ['badge_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('user_stats_user_id_fkey'), 'user_stats', type_='foreignkey')
+    op.create_foreign_key(None, 'user_stats', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('users_person_id_fkey'), 'users', type_='foreignkey')
+    op.create_foreign_key(None, 'users', 'persons', ['person_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('vehicle_ownerships_user_id_fkey'), 'vehicle_ownerships', type_='foreignkey')
+    op.drop_constraint(op.f('vehicle_ownerships_vehicle_id_fkey'), 'vehicle_ownerships', type_='foreignkey')
+    op.create_foreign_key(None, 'vehicle_ownerships', 'assets', ['vehicle_id'], ['id'], source_schema='data', referent_schema='data')
+    op.create_foreign_key(None, 'vehicle_ownerships', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    op.drop_constraint(op.f('verification_tokens_user_id_fkey'), 'verification_tokens', type_='foreignkey')
+    op.create_foreign_key(None, 'verification_tokens', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data', ondelete='CASCADE')
+    op.drop_constraint(op.f('wallets_user_id_fkey'), 'wallets', type_='foreignkey')
+    op.create_foreign_key(None, 'wallets', 'users', ['user_id'], ['id'], source_schema='data', referent_schema='data')
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    """Downgrade schema."""
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.drop_constraint(None, 'wallets', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('wallets_user_id_fkey'), 'wallets', 'users', ['user_id'], ['id'])
+    op.drop_constraint(None, 'verification_tokens', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('verification_tokens_user_id_fkey'), 'verification_tokens', 'users', ['user_id'], ['id'], ondelete='CASCADE')
+    op.drop_constraint(None, 'vehicle_ownerships', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'vehicle_ownerships', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('vehicle_ownerships_vehicle_id_fkey'), 'vehicle_ownerships', 'assets', ['vehicle_id'], ['id'])
+    op.create_foreign_key(op.f('vehicle_ownerships_user_id_fkey'), 'vehicle_ownerships', 'users', ['user_id'], ['id'])
+    op.drop_constraint(None, 'users', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('users_person_id_fkey'), 'users', 'persons', ['person_id'], ['id'])
+    op.drop_constraint(None, 'user_stats', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('user_stats_user_id_fkey'), 'user_stats', 'users', ['user_id'], ['id'])
+    op.drop_constraint(None, 'user_badges', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'user_badges', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('user_badges_badge_id_fkey'), 'user_badges', 'badges', ['badge_id'], ['id'])
+    op.create_foreign_key(op.f('user_badges_user_id_fkey'), 'user_badges', 'users', ['user_id'], ['id'])
+    op.drop_constraint(None, 'social_accounts', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('social_accounts_user_id_fkey'), 'social_accounts', 'users', ['user_id'], ['id'], ondelete='CASCADE')
+    op.drop_constraint(None, 'service_specialties', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('service_specialties_parent_id_fkey'), 'service_specialties', 'service_specialties', ['parent_id'], ['id'])
+    op.drop_constraint(None, 'service_profiles', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('service_profiles_organization_id_fkey'), 'service_profiles', 'organizations', ['organization_id'], ['id'])
+    op.drop_constraint(None, 'service_expertises', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'service_expertises', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('service_expertises_service_id_fkey'), 'service_expertises', 'service_profiles', ['service_id'], ['id'])
+    op.create_foreign_key(op.f('service_expertises_expertise_id_fkey'), 'service_expertises', 'expertise_tags', ['expertise_id'], ['id'])
+    op.drop_constraint(None, 'ratings', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('ratings_author_id_fkey'), 'ratings', 'users', ['author_id'], ['id'])
+    op.drop_constraint(None, 'points_ledger', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('points_ledger_user_id_fkey'), 'points_ledger', 'users', ['user_id'], ['id'])
+    op.drop_constraint(None, 'persons', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('persons_address_id_fkey'), 'persons', 'addresses', ['address_id'], ['id'])
+    op.drop_constraint(None, 'pending_actions', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'pending_actions', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('pending_actions_requester_id_fkey'), 'pending_actions', 'users', ['requester_id'], ['id'])
+    op.create_foreign_key(op.f('pending_actions_approver_id_fkey'), 'pending_actions', 'users', ['approver_id'], ['id'])
+    op.drop_constraint(None, 'organizations', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'organizations', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('organizations_owner_id_fkey'), 'organizations', 'users', ['owner_id'], ['id'])
+    op.create_foreign_key(op.f('organizations_address_id_fkey'), 'organizations', 'addresses', ['address_id'], ['id'])
+    op.alter_column('organizations', 'org_type',
+               existing_type=postgresql.ENUM('individual', 'service', 'service_provider', 'fleet_owner', 'club', 'business', name='orgtype', schema='data', inherit_schema=True),
+               type_=postgresql.ENUM('individual', 'service', 'service_provider', 'fleet_owner', 'club', 'business', name='orgtype'),
+               existing_nullable=True)
+    op.drop_constraint(None, 'organization_members', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'organization_members', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'organization_members', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('organization_members_organization_id_fkey'), 'organization_members', 'organizations', ['organization_id'], ['id'])
+    op.create_foreign_key(op.f('organization_members_person_id_fkey'), 'organization_members', 'persons', ['person_id'], ['id'])
+    op.create_foreign_key(op.f('organization_members_user_id_fkey'), 'organization_members', 'users', ['user_id'], ['id'])
+    op.alter_column('organization_members', 'role',
+               existing_type=postgresql.ENUM('OWNER', 'ADMIN', 'FLEET_MANAGER', 'DRIVER', 'MECHANIC', 'RECEPTIONIST', name='orguserrole', schema='data', inherit_schema=True),
+               type_=postgresql.ENUM('OWNER', 'ADMIN', 'FLEET_MANAGER', 'DRIVER', 'MECHANIC', 'RECEPTIONIST', name='orguserrole'),
+               existing_nullable=True)
+    op.drop_constraint(None, 'organization_financials', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('organization_financials_organization_id_fkey'), 'organization_financials', 'organizations', ['organization_id'], ['id'])
+    op.drop_constraint(None, 'org_subscriptions', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'org_subscriptions', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('org_subscriptions_tier_id_fkey'), 'org_subscriptions', 'subscription_tiers', ['tier_id'], ['id'])
+    op.create_foreign_key(op.f('org_subscriptions_org_id_fkey'), 'org_subscriptions', 'organizations', ['org_id'], ['id'])
+    op.drop_constraint(None, 'geo_streets', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('geo_streets_postal_code_id_fkey'), 'geo_streets', 'geo_postal_codes', ['postal_code_id'], ['id'])
+    op.drop_constraint(None, 'documents', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('documents_uploaded_by_fkey'), 'documents', 'users', ['uploaded_by'], ['id'])
+    op.drop_constraint(None, 'credit_logs', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('credit_logs_org_id_fkey'), 'credit_logs', 'organizations', ['org_id'], ['id'])
+    op.drop_constraint(None, 'audit_logs', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('audit_logs_user_id_fkey'), 'audit_logs', 'users', ['user_id'], ['id'])
+    op.drop_constraint(None, 'assets', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'assets', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('assets_current_organization_id_fkey'), 'assets', 'organizations', ['current_organization_id'], ['id'])
+    op.create_foreign_key(op.f('assets_catalog_id_fkey'), 'assets', 'vehicle_catalog', ['catalog_id'], ['id'])
+    op.drop_constraint(None, 'asset_telemetry', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('asset_telemetry_asset_id_fkey'), 'asset_telemetry', 'assets', ['asset_id'], ['id'])
+    op.drop_constraint(None, 'asset_reviews', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'asset_reviews', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('asset_reviews_user_id_fkey'), 'asset_reviews', 'users', ['user_id'], ['id'])
+    op.create_foreign_key(op.f('asset_reviews_asset_id_fkey'), 'asset_reviews', 'assets', ['asset_id'], ['id'])
+    op.drop_constraint(None, 'asset_financials', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('asset_financials_asset_id_fkey'), 'asset_financials', 'assets', ['asset_id'], ['id'])
+    op.drop_constraint(None, 'asset_events', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('asset_events_asset_id_fkey'), 'asset_events', 'assets', ['asset_id'], ['id'])
+    op.drop_constraint(None, 'asset_costs', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'asset_costs', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'asset_costs', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('asset_costs_organization_id_fkey'), 'asset_costs', 'organizations', ['organization_id'], ['id'])
+    op.create_foreign_key(op.f('asset_costs_asset_id_fkey'), 'asset_costs', 'assets', ['asset_id'], ['id'])
+    op.create_foreign_key(op.f('asset_costs_driver_id_fkey'), 'asset_costs', 'users', ['driver_id'], ['id'])
+    op.drop_constraint(None, 'asset_assignments', schema='data', type_='foreignkey')
+    op.drop_constraint(None, 'asset_assignments', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('asset_assignments_organization_id_fkey'), 'asset_assignments', 'organizations', ['organization_id'], ['id'])
+    op.create_foreign_key(op.f('asset_assignments_asset_id_fkey'), 'asset_assignments', 'assets', ['asset_id'], ['id'])
+    op.drop_constraint(None, 'addresses', schema='data', type_='foreignkey')
+    op.create_foreign_key(op.f('addresses_postal_code_id_fkey'), 'addresses', 'geo_postal_codes', ['postal_code_id'], ['id'])
+    op.drop_index(op.f('ix_data_service_staging_status'), table_name='service_staging', schema='data')
+    op.drop_index(op.f('ix_data_service_staging_source'), table_name='service_staging', schema='data')
+    op.drop_index(op.f('ix_data_service_staging_postal_code'), table_name='service_staging', schema='data')
+    op.drop_index(op.f('ix_data_service_staging_name'), table_name='service_staging', schema='data')
+    op.drop_index(op.f('ix_data_service_staging_id'), table_name='service_staging', schema='data')
+    op.drop_index(op.f('ix_data_service_staging_external_id'), table_name='service_staging', schema='data')
+    op.drop_index(op.f('ix_data_service_staging_city'), table_name='service_staging', schema='data')
+    op.drop_table('service_staging', schema='data')
+    # ### end Alembic commands ###