灵应
a57a26cb67
Deploy / Build Production Runtime Images (push) Has been skipped
Deploy / Deploy Production (push) Has been skipped
Deploy / Production Browser E2E (push) Has been skipped
Deploy / Staging E2E Tests (push) Failing after 107h15m3s
Deploy / Deploy Staging (push) Failing after 107h16m41s
CI/CD Pipeline / Frontend Lint (push) Failing after 107h17m11s
CI/CD Pipeline / Validate Code Quality And Tests (push) Failing after 107h17m18s
根因：test_subscription_api._install_mocks() 在模块导入时替换了 packages.domain / packages.ports 等命名空间包，导致后续测试文件 无法导入真实的 GeneratedVideo 等实体类。 修复：移除所有 packages.* 命名空间包的 fake module 创建，仅保留 必要的叶子 mock（redis/smtp 适配器、app.config/auth/dependencies）。 让 packages.* 模块从磁盘正常加载。 同时包含： - P2: asset_diagnosis 单素材诊断支持 - P2: edit_plans/edit_templates 管理员权限校验 - P2: edit_plans project 归属鉴权 - P3: test_error_scenarios 限流计数器重置 - P3: test_asset_diagnosis/test_edit_templates 测试修复 - P3: Alembic 迁移 024_add_user_is_admin
92 lines
3.7 KiB
Python
92 lines
3.7 KiB
Python
from __future__ import annotations
|
|
|
|
from sqlalchemy.orm import Session
|
|
|
|
from packages.adapters.sqlalchemy_impl.models import UserModel
|
|
from packages.domain.entities import User
|
|
from packages.ports.user_repository import UserRepository
|
|
|
|
|
|
class SQLAlchemyUserRepository(UserRepository):
|
|
def __init__(self, session: Session):
|
|
self.session = session
|
|
|
|
def save(self, user: User) -> None:
|
|
model = self.session.get(UserModel, user.id)
|
|
if model is None:
|
|
model = UserModel(id=user.id)
|
|
self.session.add(model)
|
|
|
|
model.email = user.email
|
|
model.username = user.username
|
|
model.display_name = user.display_name
|
|
model.password_hash = user.password_hash
|
|
model.email_verified = user.email_verified
|
|
model.email_verification_token = user.email_verification_token
|
|
model.password_reset_token = user.password_reset_token
|
|
model.password_reset_expires_at = user.password_reset_expires_at
|
|
model.last_login_at = user.last_login_at
|
|
model.last_login_ip = user.last_login_ip
|
|
model.subscription_plan = user.subscription_plan
|
|
model.subscription_status = user.subscription_status
|
|
model.subscription_expires_at = user.subscription_expires_at
|
|
model.max_projects = user.max_projects
|
|
model.max_storage_gb = user.max_storage_gb
|
|
model.is_admin = user.is_admin
|
|
model.created_at = user.created_at
|
|
|
|
self.session.commit()
|
|
self.session.refresh(model)
|
|
|
|
def find_by_id(self, user_id: str) -> User | None:
|
|
return self._to_entity(self.session.get(UserModel, user_id))
|
|
|
|
def find_by_email(self, email: str) -> User | None:
|
|
model = self.session.query(UserModel).filter(UserModel.email == email.strip().lower()).first()
|
|
return self._to_entity(model)
|
|
|
|
def find_by_username(self, username: str) -> User | None:
|
|
model = self.session.query(UserModel).filter(UserModel.username == username.strip()).first()
|
|
return self._to_entity(model)
|
|
|
|
def find_by_verification_token(self, token: str) -> User | None:
|
|
model = self.session.query(UserModel).filter(UserModel.email_verification_token == token).first()
|
|
return self._to_entity(model)
|
|
|
|
def find_by_password_reset_token(self, token: str) -> User | None:
|
|
model = self.session.query(UserModel).filter(UserModel.password_reset_token == token).first()
|
|
return self._to_entity(model)
|
|
|
|
def delete(self, user_id: str) -> bool:
|
|
model = self.session.get(UserModel, user_id)
|
|
if model is None:
|
|
return False
|
|
self.session.delete(model)
|
|
self.session.commit()
|
|
return True
|
|
|
|
@staticmethod
|
|
def _to_entity(model: UserModel | None) -> User | None:
|
|
if model is None:
|
|
return None
|
|
return User(
|
|
id=model.id,
|
|
email=model.email,
|
|
username=model.username or "",
|
|
display_name=model.display_name,
|
|
password_hash=model.password_hash,
|
|
email_verified=model.email_verified,
|
|
email_verification_token=model.email_verification_token,
|
|
password_reset_token=model.password_reset_token,
|
|
password_reset_expires_at=model.password_reset_expires_at,
|
|
last_login_at=model.last_login_at,
|
|
last_login_ip=model.last_login_ip,
|
|
subscription_plan=model.subscription_plan or "free",
|
|
subscription_status=model.subscription_status or "active",
|
|
subscription_expires_at=model.subscription_expires_at,
|
|
max_projects=model.max_projects or 3,
|
|
max_storage_gb=model.max_storage_gb or 10,
|
|
is_admin=model.is_admin or False,
|
|
created_at=model.created_at,
|
|
)
|