Improve the frontend 2

services/tenant/app/models/tenants.py

@@ -38,7 +38,6 @@ class Tenant(Base):
     
     # Status
     is_active = Column(Boolean, default=True)
-    subscription_tier = Column(String(50), default="starter")
 
     # Demo account flags
     is_demo = Column(Boolean, default=False, index=True)
@@ -63,9 +62,24 @@ class Tenant(Base):
 
     # Relationships - only within tenant service
     members = relationship("TenantMember", back_populates="tenant", cascade="all, delete-orphan")
-    
+    subscriptions = relationship("Subscription", back_populates="tenant", cascade="all, delete-orphan")
+
     # REMOVED: users relationship - no cross-service SQLAlchemy relationships
-    
+
+    @property
+    def subscription_tier(self):
+        """
+        Get current subscription tier from active subscription
+
+        Note: This is a computed property that requires subscription relationship to be loaded.
+        For performance-critical operations, use the subscription cache service directly.
+        """
+        # Find active subscription
+        for subscription in self.subscriptions:
+            if subscription.status == 'active':
+                return subscription.plan
+        return "starter"  # Default fallback
+
     def __repr__(self):
         return f"<Tenant(id={self.id}, name={self.name})>"