Improve the frontend 2

services/tenant/app/repositories/tenant_repository.py

@@ -53,8 +53,6 @@ class TenantRepository(TenantBaseRepository):
                 tenant_data["city"] = "Madrid"
             if "is_active" not in tenant_data:
                 tenant_data["is_active"] = True
-            if "subscription_tier" not in tenant_data:
-                tenant_data["subscription_tier"] = "basic"
             if "ml_model_trained" not in tenant_data:
                 tenant_data["ml_model_trained"] = False
             
@@ -189,35 +187,6 @@ class TenantRepository(TenantBaseRepository):
                         error=str(e))
             raise DatabaseError(f"Failed to update model status: {str(e)}")
     
-    async def update_subscription_tier(
-        self,
-        tenant_id: str,
-        subscription_tier: str
-    ) -> Optional[Tenant]:
-        """Update tenant subscription tier"""
-        try:
-            valid_tiers = ["basic", "professional", "enterprise"]
-            if subscription_tier not in valid_tiers:
-                raise ValidationError(f"Invalid subscription tier. Must be one of: {valid_tiers}")
-            
-            updated_tenant = await self.update(tenant_id, {
-                "subscription_tier": subscription_tier,
-                "updated_at": datetime.utcnow()
-            })
-            
-            logger.info("Tenant subscription tier updated",
-                       tenant_id=tenant_id,
-                       subscription_tier=subscription_tier)
-            
-            return updated_tenant
-            
-        except ValidationError:
-            raise
-        except Exception as e:
-            logger.error("Failed to update subscription tier",
-                        tenant_id=tenant_id,
-                        error=str(e))
-            raise DatabaseError(f"Failed to update subscription: {str(e)}")
     
     async def get_tenants_by_location(
         self,
@@ -291,17 +260,21 @@ class TenantRepository(TenantBaseRepository):
             result = await self.session.execute(business_type_query)
             business_type_stats = {row.business_type: row.count for row in result.fetchall()}
             
-            # Get tenants by subscription tier
+            # Get tenants by subscription tier - now from subscriptions table
             tier_query = text("""
-                SELECT subscription_tier, COUNT(*) as count 
-                FROM tenants 
-                WHERE is_active = true
-                GROUP BY subscription_tier
+                SELECT s.plan as subscription_tier, COUNT(*) as count 
+                FROM tenants t
+                LEFT JOIN subscriptions s ON t.id = s.tenant_id AND s.status = 'active'
+                WHERE t.is_active = true
+                GROUP BY s.plan
                 ORDER BY count DESC
             """)
             
             tier_result = await self.session.execute(tier_query)
-            tier_stats = {row.subscription_tier: row.count for row in tier_result.fetchall()}
+            tier_stats = {}
+            for row in tier_result.fetchall():
+                tier = row.subscription_tier if row.subscription_tier else "no_subscription"
+                tier_stats[tier] = row.count
             
             # Get model training statistics
             model_query = text("""