frontend költség beállítások

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

@@ -46,6 +46,7 @@ def _build_user_response(user: User, active_org_id: Optional[int] = None, db: Op
     Segédfüggvény a UserResponse dict előállításához.
     Beágyazza a Person és Address adatokat a 'person' mezőbe.
     RBAC Phase 3: system_capabilities és org_capabilities is bekerül a válaszba.
+    P0: max_vehicles és max_garages a subscription_tier JSONB rules-ból.
     """
     from app.models.marketplace.organization import Organization, OrganizationMember
     from app.models.marketplace.organization import OrgUserRole
@@ -60,8 +61,6 @@ def _build_user_response(user: User, active_org_id: Optional[int] = None, db: Op
                 active_org_id = None
 
     if active_org_id is None:
-        # 1. Check if user is a member of any organization with ADMIN/OWNER role
-        # (This is a helper - in real usage the caller should pass active_org_id)
         pass
 
     person = user.person
@@ -110,10 +109,13 @@ def _build_user_response(user: User, active_org_id: Optional[int] = None, db: Op
     # ── RBAC Phase 3: Resolve org capabilities ──
     org_capabilities: Dict[str, Dict[str, bool]] = {}
     if db is not None:
-        # We need to run this synchronously since _build_user_response is not async
-        # The async version is handled in read_users_me directly
         pass
 
+    # ── P0: Resolve subscription limits ──
+    # Default fallback values
+    max_vehicles = 1
+    max_garages = 1
+
     return {
         "id": user.id,
         "email": user.email,
@@ -124,6 +126,8 @@ def _build_user_response(user: User, active_org_id: Optional[int] = None, db: Op
         "person_id": user.person_id,
         "role": role_key,
         "subscription_plan": user.subscription_plan,
+        "max_vehicles": max_vehicles,
+        "max_garages": max_garages,
         "scope_level": user.scope_level or "individual",
         "scope_id": str(active_org_id) if active_org_id else None,
         "ui_mode": user.ui_mode or "personal",
@@ -198,9 +202,60 @@ async def read_users_me(
     # Check if user is the last admin in any organization
     is_last_admin = await AuthService.check_is_last_admin(db, current_user.id)
 
+    # ── P0: Resolve real subscription limits from the assigned tier ──
+    from app.models.core_logic import SubscriptionTier, OrganizationSubscription, UserSubscription
+    max_vehicles = 1
+    max_garages = 1
+
+    if active_org_id is not None:
+        # Try org-level subscription first
+        org_sub_stmt = (
+            select(SubscriptionTier)
+            .select_from(OrganizationSubscription)
+            .join(SubscriptionTier, OrganizationSubscription.tier_id == SubscriptionTier.id)
+            .where(
+                OrganizationSubscription.org_id == active_org_id,
+                OrganizationSubscription.is_active == True
+            )
+            .order_by(OrganizationSubscription.valid_from.desc())
+            .limit(1)
+        )
+        tier = (await db.execute(org_sub_stmt)).scalar_one_or_none()
+        if tier and tier.rules:
+            allowances = tier.rules.get("allowances", {})
+            max_vehicles = int(allowances.get("max_vehicles", 1))
+            max_garages = int(allowances.get("max_garages", 1))
+        else:
+            # Fallback: read base_asset_limit from Organization record
+            org_stmt = select(Organization).where(Organization.id == active_org_id)
+            org = (await db.execute(org_stmt)).scalar_one_or_none()
+            if org:
+                max_vehicles = org.base_asset_limit or 1
+                max_garages = 1  # No base_garage_limit column, default to 1
+    else:
+        # Personal mode: try user-level subscription
+        user_sub_stmt = (
+            select(SubscriptionTier)
+            .select_from(UserSubscription)
+            .join(SubscriptionTier, UserSubscription.tier_id == SubscriptionTier.id)
+            .where(
+                UserSubscription.user_id == current_user.id,
+                UserSubscription.is_active == True
+            )
+            .order_by(UserSubscription.valid_from.desc())
+            .limit(1)
+        )
+        tier = (await db.execute(user_sub_stmt)).scalar_one_or_none()
+        if tier and tier.rules:
+            allowances = tier.rules.get("allowances", {})
+            max_vehicles = int(allowances.get("max_vehicles", 1))
+            max_garages = int(allowances.get("max_garages", 1))
+
     # ── RBAC Phase 3: Build base response ──
     response_data = _build_user_response(current_user, active_org_id)
     response_data["is_last_admin"] = is_last_admin
+    response_data["max_vehicles"] = max_vehicles
+    response_data["max_garages"] = max_garages
 
     # ── RBAC Phase 3: Resolve org_capabilities ──
     # Get all organizations the user is a member of