feat: multi-robot architecture, car-robot rename, and credit-based OCR logic spec
This commit is contained in:
@@ -1,130 +0,0 @@
|
||||
from datetime import datetime, timezone, timedelta
|
||||
from typing import Optional, Dict, Any
|
||||
import logging
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, and_, text
|
||||
|
||||
from app.models.identity import User, Person, Wallet, UserRole
|
||||
from app.models.organization import Organization, OrgType
|
||||
from app.models.vehicle import OrganizationMember
|
||||
from app.schemas.auth import UserRegister
|
||||
from app.core.security import get_password_hash
|
||||
from app.services.email_manager import email_manager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class AuthService:
|
||||
@staticmethod
|
||||
async def get_setting(db: AsyncSession, key: str, default: Any = None) -> Any:
|
||||
"""Kiolvassa a beállítást az adatbázisból (Admin UI kompatibilis)."""
|
||||
try:
|
||||
stmt = text("SELECT value FROM data.system_settings WHERE key = :key")
|
||||
result = await db.execute(stmt, {"key": key})
|
||||
val = result.scalar()
|
||||
return val if val is not None else default
|
||||
except Exception:
|
||||
return default
|
||||
|
||||
@staticmethod
|
||||
async def register_new_user(db: AsyncSession, user_in: UserRegister, ip_address: str):
|
||||
try:
|
||||
# 1. KYC Adatcsomag összeállítása (JSONB tároláshoz)
|
||||
kyc_data = {
|
||||
"id_card": {
|
||||
"number": user_in.id_card_number,
|
||||
"expiry": str(user_in.id_card_expiry) if user_in.id_card_expiry else None
|
||||
},
|
||||
"driver_license": {
|
||||
"number": user_in.driver_license_number,
|
||||
"expiry": str(user_in.driver_license_expiry) if user_in.driver_license_expiry else None,
|
||||
"categories": user_in.driver_license_categories
|
||||
},
|
||||
"special_licenses": {
|
||||
"boat": user_in.boat_license_number,
|
||||
"pilot": user_in.pilot_license_number
|
||||
}
|
||||
}
|
||||
|
||||
# 2. Person létrehozása
|
||||
new_person = Person(
|
||||
first_name=user_in.first_name,
|
||||
last_name=user_in.last_name,
|
||||
mothers_name=user_in.mothers_name,
|
||||
birth_place=user_in.birth_place,
|
||||
birth_date=user_in.birth_date,
|
||||
identity_docs=kyc_data
|
||||
)
|
||||
db.add(new_person)
|
||||
await db.flush()
|
||||
|
||||
# 3. User létrehozása
|
||||
hashed_pwd = get_password_hash(user_in.password) if user_in.password else None
|
||||
new_user = User(
|
||||
email=user_in.email,
|
||||
hashed_password=hashed_pwd,
|
||||
social_provider=user_in.social_provider,
|
||||
social_id=user_in.social_id,
|
||||
person_id=new_person.id,
|
||||
role=UserRole.USER,
|
||||
region_code=user_in.region_code,
|
||||
is_active=True
|
||||
)
|
||||
db.add(new_user)
|
||||
await db.flush()
|
||||
|
||||
# 4. Wallet inicializálás
|
||||
new_wallet = Wallet(user_id=new_user.id, coin_balance=0.00, xp_balance=0)
|
||||
db.add(new_wallet)
|
||||
|
||||
# 5. Privát Flotta (SZABÁLY: Nem átruházható)
|
||||
new_org = Organization(
|
||||
name=f"{user_in.last_name} {user_in.first_name} flottája",
|
||||
org_type=OrgType.INDIVIDUAL,
|
||||
owner_id=new_user.id,
|
||||
is_active=True,
|
||||
is_transferable=False
|
||||
)
|
||||
db.add(new_org)
|
||||
await db.flush()
|
||||
|
||||
# 6. Tagság rögzítése
|
||||
db.add(OrganizationMember(organization_id=new_org.id, user_id=new_user.id, role="owner"))
|
||||
|
||||
# 7. Audit Log
|
||||
audit_stmt = text("""
|
||||
INSERT INTO data.audit_logs (user_id, action, endpoint, method, ip_address, created_at)
|
||||
VALUES (:uid, 'USER_REGISTERED_V1.3_FULL_KYC', '/api/v1/auth/register', 'POST', :ip, :now)
|
||||
""")
|
||||
await db.execute(audit_stmt, {
|
||||
"uid": new_user.id,
|
||||
"ip": ip_address,
|
||||
"now": datetime.now(timezone.utc)
|
||||
})
|
||||
|
||||
# 8. Jutalmazás (Dinamikus)
|
||||
reward_days = await AuthService.get_setting(db, "auth.reward_days", 14)
|
||||
|
||||
# 9. Email küldés (Try-Except, hogy a regisztráció ne akadjon el)
|
||||
try:
|
||||
await email_manager.send_email(
|
||||
recipient=user_in.email,
|
||||
template_key="registration_welcome",
|
||||
variables={"first_name": user_in.first_name, "reward_days": reward_days},
|
||||
user_id=new_user.id
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(f"Email delivery failed: {str(e)}")
|
||||
|
||||
await db.commit()
|
||||
return new_user
|
||||
|
||||
except Exception as e:
|
||||
await db.rollback()
|
||||
logger.error(f"Critical error in register_new_user: {str(e)}")
|
||||
raise e
|
||||
|
||||
@staticmethod
|
||||
async def check_email_availability(db: AsyncSession, email: str) -> bool:
|
||||
query = select(User).where(and_(User.email == email, User.is_deleted == False))
|
||||
result = await db.execute(query)
|
||||
return result.scalar_one_or_none() is None
|
||||
@@ -1,145 +0,0 @@
|
||||
# /opt/docker/dev/service_finder/backend/app/services/auth_service.py
|
||||
from datetime import datetime, timezone, timedelta
|
||||
from typing import Optional, Dict, Any
|
||||
import logging
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, and_, text
|
||||
|
||||
from app.models.identity import User, Person, Wallet, UserRole
|
||||
from app.models.organization import Organization, OrgType
|
||||
from app.models.vehicle import OrganizationMember
|
||||
from app.schemas.auth import UserRegister
|
||||
from app.core.security import get_password_hash, create_access_token
|
||||
from app.services.email_manager import email_manager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class AuthService:
|
||||
@staticmethod
|
||||
async def get_setting(db: AsyncSession, key: str, default: Any = None) -> Any:
|
||||
"""Admin felületről állítható változók lekérése."""
|
||||
try:
|
||||
stmt = text("SELECT value FROM data.system_settings WHERE key = :key")
|
||||
result = await db.execute(stmt, {"key": key})
|
||||
val = result.scalar()
|
||||
return val if val is not None else default
|
||||
except Exception:
|
||||
return default
|
||||
|
||||
@staticmethod
|
||||
async def register_new_user(db: AsyncSession, user_in: UserRegister, ip_address: str):
|
||||
"""
|
||||
MASTER REGISTRATION FLOW v1.3 (Full Integration)
|
||||
"""
|
||||
try:
|
||||
# 1. KYC ADATOK (Banki szintű nyilvántartás)
|
||||
kyc_data = {
|
||||
"id_card": {
|
||||
"number": user_in.id_card_number,
|
||||
"expiry": str(user_in.id_card_expiry) if user_in.id_card_expiry else None
|
||||
},
|
||||
"driver_license": {
|
||||
"number": user_in.driver_license_number,
|
||||
"expiry": str(user_in.driver_license_expiry) if user_in.driver_license_expiry else None,
|
||||
"categories": user_in.driver_license_categories
|
||||
},
|
||||
"special_licenses": {
|
||||
"boat": user_in.boat_license_number,
|
||||
"pilot": user_in.pilot_license_number
|
||||
}
|
||||
}
|
||||
|
||||
# 2. PERSON LÉTREHOZÁSA (Digitális Iker alapja)
|
||||
new_person = Person(
|
||||
first_name=user_in.first_name,
|
||||
last_name=user_in.last_name,
|
||||
mothers_name=user_in.mothers_name,
|
||||
birth_place=user_in.birth_place,
|
||||
birth_date=user_in.birth_date,
|
||||
identity_docs=kyc_data
|
||||
)
|
||||
db.add(new_person)
|
||||
await db.flush()
|
||||
|
||||
# 3. USER LÉTREHOZÁSA (Hibrid Auth támogatás)
|
||||
hashed_pwd = get_password_hash(user_in.password) if user_in.password else None
|
||||
new_user = User(
|
||||
email=user_in.email,
|
||||
hashed_password=hashed_pwd,
|
||||
social_provider=user_in.social_provider,
|
||||
social_id=user_in.social_id,
|
||||
person_id=new_person.id,
|
||||
role=UserRole.USER,
|
||||
region_code=user_in.region_code,
|
||||
is_active=True
|
||||
)
|
||||
db.add(new_user)
|
||||
await db.flush()
|
||||
|
||||
# 4. ECONOMY: WALLET ÉS REFERRAL SNAPSHOT
|
||||
# Itt olvassuk ki az adminból a jutalék szintet (pl. 10%)
|
||||
l1_commission = await AuthService.get_setting(db, "referral.level1", 10)
|
||||
|
||||
db.add(Wallet(user_id=new_user.id, coin_balance=0.00, xp_balance=0))
|
||||
|
||||
# 5. FLEET: AUTOMATIKUS PRIVÁT FLOTTA (Nem eladható)
|
||||
new_org = Organization(
|
||||
name=f"{user_in.last_name} {user_in.first_name} Private Fleet",
|
||||
org_type=OrgType.INDIVIDUAL,
|
||||
owner_id=new_user.id,
|
||||
is_transferable=False
|
||||
)
|
||||
db.add(new_org)
|
||||
await db.flush()
|
||||
|
||||
# Saját flotta tulajdonjog rögzítése
|
||||
db.add(OrganizationMember(organization_id=new_org.id, user_id=new_user.id, role="owner"))
|
||||
|
||||
# 6. MEGHÍVÓ FELDOLGOZÁSA (Csatlakozás másik céghez)
|
||||
if user_in.invite_token:
|
||||
# Egyszerűsített logika: megnézzük a tokent (példa hívás)
|
||||
# Itt valójában egy 'invitations' táblából kellene lekérni az adatokat
|
||||
# De a logika készen áll a bekötésre:
|
||||
logger.info(f"Processing invite token: {user_in.invite_token}")
|
||||
# db.add(OrganizationMember(organization_id=invited_org_id, user_id=new_user.id, role=invited_role))
|
||||
|
||||
# 7. AUDIT LOG (Minden lépés visszakövethető)
|
||||
audit_stmt = text("""
|
||||
INSERT INTO data.audit_logs (user_id, action, endpoint, method, ip_address, created_at)
|
||||
VALUES (:uid, 'USER_REGISTERED_COMPLETE_V1.3', '/api/v1/auth/register', 'POST', :ip, :now)
|
||||
""")
|
||||
await db.execute(audit_stmt, {
|
||||
"uid": new_user.id, "ip": ip_address, "now": datetime.now(timezone.utc)
|
||||
})
|
||||
|
||||
# 8. JUTALMAZÁS (Admin beállítás alapján)
|
||||
reward_days = await AuthService.get_setting(db, "auth.reward_days", 14)
|
||||
|
||||
# 9. EMAIL KÜLDÉS
|
||||
try:
|
||||
await email_manager.send_email(
|
||||
recipient=user_in.email,
|
||||
template_key="registration_welcome",
|
||||
variables={
|
||||
"first_name": user_in.first_name,
|
||||
"reward_days": reward_days
|
||||
},
|
||||
user_id=new_user.id
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(f"Email delivery skipped during reg: {str(e)}")
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(new_user)
|
||||
return new_user
|
||||
|
||||
except Exception as e:
|
||||
await db.rollback()
|
||||
logger.error(f"Critical error in register_new_user: {str(e)}")
|
||||
raise e
|
||||
|
||||
@staticmethod
|
||||
async def check_email_availability(db: AsyncSession, email: str) -> bool:
|
||||
query = select(User).where(and_(User.email == email, User.is_deleted == False))
|
||||
result = await db.execute(query)
|
||||
return result.scalar_one_or_none() is None
|
||||
@@ -1,129 +0,0 @@
|
||||
# /opt/docker/dev/service_finder/backend/app/services/auth_service.py
|
||||
from datetime import datetime, timezone
|
||||
from typing import Optional, Dict, Any
|
||||
import logging
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, and_, text
|
||||
|
||||
from app.models.identity import User, Person, Wallet, UserRole
|
||||
from app.models.organization import Organization, OrgType
|
||||
from app.models.vehicle import OrganizationMember
|
||||
from app.schemas.auth import UserRegister
|
||||
from app.core.security import get_password_hash, create_access_token
|
||||
from app.services.email_manager import email_manager
|
||||
|
||||
logger = logging.getLogger(__name__)
|
||||
|
||||
class AuthService:
|
||||
@staticmethod
|
||||
async def get_setting(db: AsyncSession, key: str, default: Any = None) -> Any:
|
||||
"""Kiolvassa az Admin felületről állítható változókat."""
|
||||
try:
|
||||
stmt = text("SELECT value FROM data.system_settings WHERE key = :key")
|
||||
result = await db.execute(stmt, {"key": key})
|
||||
val = result.scalar()
|
||||
return val if val is not None else default
|
||||
except Exception:
|
||||
return default
|
||||
|
||||
@staticmethod
|
||||
async def register_new_user(db: AsyncSession, user_in: UserRegister, ip_address: str):
|
||||
"""
|
||||
MASTER ONBOARDING v1.3 - Atomi folyamat:
|
||||
Person -> User -> Wallet -> Organization -> Membership -> Audit -> Email
|
||||
"""
|
||||
try:
|
||||
# 1. KYC Adatok struktúrálása
|
||||
kyc_data = {
|
||||
"id_card": {"number": user_in.id_card_number, "expiry": str(user_in.id_card_expiry) if user_in.id_card_expiry else None},
|
||||
"driver_license": {
|
||||
"number": user_in.driver_license_number,
|
||||
"expiry": str(user_in.driver_license_expiry) if user_in.driver_license_expiry else None,
|
||||
"categories": user_in.driver_license_categories
|
||||
},
|
||||
"special_licenses": {"boat": user_in.boat_license_number, "pilot": user_in.pilot_license_number}
|
||||
}
|
||||
|
||||
# 2. Person (Identitás) létrehozása
|
||||
new_person = Person(
|
||||
first_name=user_in.first_name,
|
||||
last_name=user_in.last_name,
|
||||
mothers_name=user_in.mothers_name,
|
||||
birth_place=user_in.birth_place,
|
||||
birth_date=user_in.birth_date,
|
||||
identity_docs=kyc_data
|
||||
)
|
||||
db.add(new_person)
|
||||
await db.flush()
|
||||
|
||||
# 3. User (Auth) létrehozása
|
||||
hashed_pwd = get_password_hash(user_in.password) if user_in.password else None
|
||||
new_user = User(
|
||||
email=user_in.email,
|
||||
hashed_password=hashed_pwd,
|
||||
social_provider=user_in.social_provider,
|
||||
social_id=user_in.social_id,
|
||||
person_id=new_person.id,
|
||||
role=UserRole.USER,
|
||||
region_code=user_in.region_code,
|
||||
is_active=True
|
||||
)
|
||||
db.add(new_user)
|
||||
await db.flush()
|
||||
|
||||
# 4. Economy: Wallet
|
||||
db.add(Wallet(user_id=new_user.id, coin_balance=0.00, xp_balance=0))
|
||||
|
||||
# 5. Fleet: Automatikus Privát Flotta (SZABÁLY: Nem átruházható)
|
||||
new_org = Organization(
|
||||
name=f"{user_in.last_name} {user_in.first_name} Private Fleet",
|
||||
org_type=OrgType.INDIVIDUAL,
|
||||
owner_id=new_user.id,
|
||||
is_transferable=False
|
||||
)
|
||||
db.add(new_org)
|
||||
await db.flush()
|
||||
|
||||
# 6. Tagság rögzítése (Privát flotta tulajdonos)
|
||||
db.add(OrganizationMember(organization_id=new_org.id, user_id=new_user.id, role="owner"))
|
||||
|
||||
# 7. Meghívó kezelése (Ha másik céghez is csatlakozik)
|
||||
if user_in.invite_token and user_in.invite_token != "string":
|
||||
logger.info(f"Processing invite token: {user_in.invite_token}")
|
||||
# Itt majd az invitation tábla alapján adunk hozzá plusz tagságot
|
||||
|
||||
# 8. Audit Log
|
||||
audit_stmt = text("""
|
||||
INSERT INTO data.audit_logs (user_id, action, endpoint, method, ip_address, created_at)
|
||||
VALUES (:uid, 'REGISTER_V1.3_KYC_FULL', '/api/v1/auth/register', 'POST', :ip, :now)
|
||||
""")
|
||||
await db.execute(audit_stmt, {"uid": new_user.id, "ip": ip_address, "now": datetime.now(timezone.utc)})
|
||||
|
||||
# 9. Dinamikus jutalom beállítása (Adminból)
|
||||
reward_days = await AuthService.get_setting(db, "auth.reward_days", 14)
|
||||
|
||||
# 10. Email küldés
|
||||
try:
|
||||
await email_manager.send_email(
|
||||
recipient=user_in.email,
|
||||
template_key="registration_welcome",
|
||||
variables={"first_name": user_in.first_name, "reward_days": reward_days},
|
||||
user_id=new_user.id
|
||||
)
|
||||
except Exception as e:
|
||||
logger.warning(f"Email skipped: {str(e)}")
|
||||
|
||||
await db.commit()
|
||||
await db.refresh(new_user)
|
||||
return new_user
|
||||
|
||||
except Exception as e:
|
||||
await db.rollback()
|
||||
logger.error(f"REGISTER CRASH: {str(e)}")
|
||||
raise e
|
||||
|
||||
@staticmethod
|
||||
async def check_email_availability(db: AsyncSession, email: str) -> bool:
|
||||
query = select(User).where(and_(User.email == email, User.is_deleted == False))
|
||||
result = await db.execute(query)
|
||||
return result.scalar_one_or_none() is None
|
||||
34
backend/app/services/harvester_base.py
Normal file
34
backend/app/services/harvester_base.py
Normal file
@@ -0,0 +1,34 @@
|
||||
import httpx
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select
|
||||
from app.models.vehicle import VehicleCatalog
|
||||
|
||||
class BaseHarvester:
|
||||
def __init__(self, category: str):
|
||||
self.category = category
|
||||
self.headers = {"User-Agent": "ServiceFinder-Harvester-Bot/2.0"}
|
||||
|
||||
async def check_exists(self, db: AsyncSession, brand: str, model: str):
|
||||
"""Ellenőrzi, hogy az adott modell létezik-e már."""
|
||||
stmt = select(VehicleCatalog).where(
|
||||
VehicleCatalog.brand == brand,
|
||||
VehicleCatalog.model == model,
|
||||
VehicleCatalog.category == self.category
|
||||
)
|
||||
result = await db.execute(stmt)
|
||||
return result.scalar_one_or_none()
|
||||
|
||||
async def log_entry(self, db: AsyncSession, brand: str, model: str, specs: dict = None):
|
||||
"""Létrehoz vagy frissít egy katalógus bejegyzést."""
|
||||
existing = await self.check_exists(db, brand, model)
|
||||
if not existing:
|
||||
new_v = VehicleCatalog(
|
||||
brand=brand,
|
||||
model=model,
|
||||
category=self.category,
|
||||
factory_specs=specs or {},
|
||||
verification_status="incomplete" if not specs else "verified"
|
||||
)
|
||||
db.add(new_v)
|
||||
return True
|
||||
return False
|
||||
12
backend/app/services/harvester_bikes.py
Normal file
12
backend/app/services/harvester_bikes.py
Normal file
@@ -0,0 +1,12 @@
|
||||
from .harvester_base import BaseHarvester
|
||||
|
||||
class BikeHarvester(BaseHarvester):
|
||||
def __init__(self):
|
||||
super().__init__(category="motorcycle")
|
||||
self.api_url = "https://api.example-bikes.com/v1/" # Példa forrás
|
||||
|
||||
async def harvest_all(self, db):
|
||||
# Ide jön a motor-specifikus API hívás logikája
|
||||
print("🏍️ Motor Robot: Adatgyűjtés indul...")
|
||||
# ... fetch és mentés loop ...
|
||||
await db.commit()
|
||||
8
backend/app/services/harvester_trucks.py
Normal file
8
backend/app/services/harvester_trucks.py
Normal file
@@ -0,0 +1,8 @@
|
||||
from .harvester_base import BaseHarvester
|
||||
|
||||
class TruckHarvester(BaseHarvester):
|
||||
def __init__(self):
|
||||
super().__init__(category="truck")
|
||||
|
||||
async def run(self, db):
|
||||
print("🚛 Truck Robot: Nehézgépek és teherautók keresése...")
|
||||
22
backend/app/services/robot_manager.py
Normal file
22
backend/app/services/robot_manager.py
Normal file
@@ -0,0 +1,22 @@
|
||||
import asyncio
|
||||
from .harvester_robot import CarHarvester # A korábbi CarHarvester-t nevezzük át így
|
||||
from .harvester_bikes import BikeHarvester
|
||||
from .harvester_trucks import TruckHarvester
|
||||
|
||||
class RobotManager:
|
||||
@staticmethod
|
||||
async def run_full_sync(db):
|
||||
"""Sorban lefuttatja az összes robotot."""
|
||||
robots = [
|
||||
CarHarvester(),
|
||||
BikeHarvester(),
|
||||
TruckHarvester()
|
||||
]
|
||||
|
||||
for robot in robots:
|
||||
try:
|
||||
await robot.run(db)
|
||||
# Pihenő a kategóriák között, hogy ne kapjunk IP-tiltást
|
||||
await asyncio.sleep(5)
|
||||
except Exception as e:
|
||||
print(f"❌ Hiba a {robot.category} robotnál: {e}")
|
||||
Reference in New Issue
Block a user