Database & Migrations: - Add application_logs table migration for hybrid cloud logging - Add companies table migration and restructure vendor relationships Logging System: - Implement hybrid logging system (database + file) - Add log_service for centralized log management - Create admin logs page with filtering and viewing capabilities - Add init_log_settings.py script for log configuration - Enhance core logging with database integration Marketplace Integration: - Add marketplace admin page with product management - Create marketplace vendor page with product listings - Implement marketplace.js for both admin and vendor interfaces - Add marketplace integration documentation Admin Enhancements: - Add imports management page and functionality - Create settings page for admin configuration - Add vendor themes management page - Enhance vendor detail and edit pages - Improve code quality dashboard and violation details - Add logs viewing and management - Update icons guide and shared icon system Architecture & Documentation: - Document frontend structure and component architecture - Document models structure and relationships - Add vendor-in-token architecture documentation - Add vendor RBAC (role-based access control) documentation - Document marketplace integration patterns - Update architecture patterns documentation Infrastructure: - Add platform static files structure (css, img, js) - Move architecture_scan.py to proper models location - Update model imports and registrations - Enhance exception handling - Update dependency injection patterns UI/UX: - Improve vendor edit interface - Update admin user interface - Enhance page templates documentation - Add vendor marketplace interface
120 lines
4.1 KiB
Python
120 lines
4.1 KiB
Python
# models/database/user.py - IMPROVED VERSION
|
|
"""
|
|
User model with authentication support.
|
|
|
|
ROLE CLARIFICATION:
|
|
- User.role should ONLY contain platform-level roles:
|
|
* "admin" - Platform administrator (full system access)
|
|
* "vendor" - Any user who owns or is part of a vendor team
|
|
|
|
- Vendor-specific roles (manager, staff, etc.) are stored in VendorUser.role
|
|
- Customers are NOT in the User table - they use the Customer model
|
|
"""
|
|
|
|
import enum
|
|
|
|
from sqlalchemy import Boolean, Column, DateTime, Integer, String
|
|
from sqlalchemy.orm import relationship
|
|
|
|
from app.core.database import Base
|
|
from models.database.base import TimestampMixin
|
|
|
|
|
|
class UserRole(str, enum.Enum):
|
|
"""Platform-level user roles."""
|
|
|
|
ADMIN = "admin" # Platform administrator
|
|
VENDOR = "vendor" # Vendor owner or team member
|
|
|
|
|
|
class User(Base, TimestampMixin):
|
|
"""Represents a platform user (admins and vendors only)."""
|
|
|
|
__tablename__ = "users"
|
|
|
|
id = Column(Integer, primary_key=True, index=True)
|
|
email = Column(String, unique=True, index=True, nullable=False)
|
|
username = Column(String, unique=True, index=True, nullable=False)
|
|
first_name = Column(String)
|
|
last_name = Column(String)
|
|
hashed_password = Column(String, nullable=False)
|
|
|
|
# Platform-level role only (admin or vendor)
|
|
role = Column(String, nullable=False, default=UserRole.VENDOR.value)
|
|
|
|
is_active = Column(Boolean, default=True, nullable=False)
|
|
is_email_verified = Column(Boolean, default=False, nullable=False)
|
|
last_login = Column(DateTime, nullable=True)
|
|
|
|
# Relationships
|
|
marketplace_import_jobs = relationship(
|
|
"MarketplaceImportJob", back_populates="user"
|
|
)
|
|
owned_companies = relationship("Company", back_populates="owner")
|
|
owned_vendors = relationship("Vendor", back_populates="owner")
|
|
vendor_memberships = relationship(
|
|
"VendorUser", foreign_keys="[VendorUser.user_id]", back_populates="user"
|
|
)
|
|
|
|
def __repr__(self):
|
|
"""String representation of the User object."""
|
|
return f"<User(id={self.id}, username='{self.username}', email='{self.email}', role='{self.role}')>"
|
|
|
|
@property
|
|
def full_name(self):
|
|
"""Returns the full name of the user, combining first and last names if available."""
|
|
if self.first_name and self.last_name:
|
|
return f"{self.first_name} {self.last_name}"
|
|
return self.username
|
|
|
|
@property
|
|
def is_admin(self) -> bool:
|
|
"""Check if user is a platform admin."""
|
|
return self.role == UserRole.ADMIN.value
|
|
|
|
@property
|
|
def is_vendor(self) -> bool:
|
|
"""Check if user is a vendor (owner or team member)."""
|
|
return self.role == UserRole.VENDOR.value
|
|
|
|
def is_owner_of(self, vendor_id: int) -> bool:
|
|
"""Check if user is the owner of a specific vendor."""
|
|
return any(v.id == vendor_id for v in self.owned_vendors)
|
|
|
|
def is_member_of(self, vendor_id: int) -> bool:
|
|
"""Check if user is a member of a specific vendor (owner or team)."""
|
|
# Check if owner
|
|
if self.is_owner_of(vendor_id):
|
|
return True
|
|
# Check if team member
|
|
return any(
|
|
vm.vendor_id == vendor_id and vm.is_active for vm in self.vendor_memberships
|
|
)
|
|
|
|
def get_vendor_role(self, vendor_id: int) -> str:
|
|
"""Get user's role within a specific vendor."""
|
|
# Check if owner
|
|
if self.is_owner_of(vendor_id):
|
|
return "owner"
|
|
|
|
# Check team membership
|
|
for vm in self.vendor_memberships:
|
|
if vm.vendor_id == vendor_id and vm.is_active:
|
|
return vm.role.name if vm.role else "member"
|
|
|
|
return None
|
|
|
|
def has_vendor_permission(self, vendor_id: int, permission: str) -> bool:
|
|
"""Check if user has a specific permission in a vendor."""
|
|
# Owners have all permissions
|
|
if self.is_owner_of(vendor_id):
|
|
return True
|
|
|
|
# Check team member permissions
|
|
for vm in self.vendor_memberships:
|
|
if vm.vendor_id == vendor_id and vm.is_active:
|
|
if vm.role and permission in vm.role.permissions:
|
|
return True
|
|
|
|
return False
|