Models (6 + 1 association table): - User: Authentication with bcrypt, admin role check, last_login tracking - Player: Digital signage devices with auth codes, status tracking, online detection - Group: Player/content organization with statistics properties - Content: Media files with type detection, file size helpers, position ordering - ServerLog: Audit trail with class methods for logging levels - PlayerFeedback: Player status updates with error tracking - group_content: Many-to-many association table for groups and content Model improvements: - Added type hints to all methods and properties - Added database indexes on frequently queried columns (username, auth_code, group_id, player_id, position, level, timestamp, status) - Added comprehensive docstrings - Added helper properties (is_online, is_admin, file_size_mb, etc.) - Added relationship back_populates for bidirectional navigation - Added timestamps (created_at, updated_at, last_seen, uploaded_at) Utils (4 modules): - logger.py: Logging utility with level-based functions (info, warning, error) - uploads.py: File upload handling with progress tracking, video optimization - group_player_management.py: Player/group status tracking and bulk operations - pptx_converter.py: PowerPoint to PDF conversion using LibreOffice Utils improvements: - Full type hints on all functions - Comprehensive error handling - Progress tracking for long-running operations - Video optimization (H.264, 30fps, max 1080p, 8Mbps) - Helper functions for time formatting and statistics - Proper logging of all operations Performance optimizations: - Database indexes on all foreign keys and frequently filtered columns - Lazy loading for relationships where appropriate - Efficient queries with proper ordering - Helper properties to avoid repeated calculations Ready for template migration and testing
44 lines
1.5 KiB
Python
44 lines
1.5 KiB
Python
"""User model for authentication and authorization."""
|
|
from datetime import datetime
|
|
from typing import Optional
|
|
|
|
from flask_login import UserMixin
|
|
|
|
from app.extensions import db
|
|
|
|
|
|
class User(db.Model, UserMixin):
|
|
"""User model for application authentication.
|
|
|
|
Attributes:
|
|
id: Primary key
|
|
username: Unique username for login
|
|
password: Bcrypt hashed password
|
|
role: User role (user or admin)
|
|
theme: UI theme preference (light or dark)
|
|
created_at: Account creation timestamp
|
|
last_login: Last successful login timestamp
|
|
"""
|
|
__tablename__ = 'user'
|
|
|
|
id = db.Column(db.Integer, primary_key=True)
|
|
username = db.Column(db.String(80), unique=True, nullable=False, index=True)
|
|
password = db.Column(db.String(120), nullable=False)
|
|
role = db.Column(db.String(20), nullable=False, default='user', index=True)
|
|
theme = db.Column(db.String(20), default='light')
|
|
created_at = db.Column(db.DateTime, default=datetime.utcnow, nullable=False)
|
|
last_login = db.Column(db.DateTime, nullable=True)
|
|
|
|
def __repr__(self) -> str:
|
|
"""String representation of User."""
|
|
return f'<User {self.username} (role={self.role})>'
|
|
|
|
@property
|
|
def is_admin(self) -> bool:
|
|
"""Check if user has admin role."""
|
|
return self.role == 'admin'
|
|
|
|
def update_last_login(self) -> None:
|
|
"""Update last login timestamp."""
|
|
self.last_login = datetime.utcnow()
|