zikai
9af28f41b4
死代码移除: - whiteboard_hub.py: 移除未引用的 reset_hub 单例重置函数 - tunnel_service.py: 移除未引用的 is_port_allowed (逻辑已在 sftp_server 内联) - tunnel_session_dao.py: 移除未引用的 get_active_by_port - pdf_job_dao.py: 移除未用 datetime 导入 - pdf_converter.py: 移除未用 shutil 导入 - pdf_service.py: 移除未用 PdfSubmitResponse 导入 + _do_convert 内未用 hashlib 导入 - upload_html.py: 移除未用 escape 导入 (JS 侧自有 escapeHtml) - pdf_controller.py: 移除 _resolve_cookie 内未用 cfg 局部变量 提前失败/分层修复: - database.py init_db_schema: 建表后用 inspector 校验既有表列与模型一致, 缺列即抛 RuntimeError (fail-fast on schema drift), 避免运行期才暴露 - whiteboard_dao.get_or_create: 仅 IntegrityError 才回滚重读, 其他异常向上抛 (原 except Exception 会掩盖 schema/连接等真实故障) - pdf_service.admin_delete/_safe_delete_file: 改用 PdfJobDAO.delete / UploadedFileDAO.delete, 不再直接操作 job_dao.db / file_dao.db (修复分层契约: DAO 头注释声明 service 不直接操作 session) - PdfJobDAO 新增 delete(job) 方法 日志补全 (8 处 silent catch): - whiteboard_hub.py disconnect/close_board 关闭 ws: logger.debug - whiteboard_controller _safe_send/_safe_close: logger.debug - sftp_server _close_tunnel_dao/读用户名: logger.debug - sftp_server validate_public_key: logger.warning (auth 路径, 避免静默失败) 文档: - 新增 docs/routes.md, docs/configuration.md, docs/error-handling.md - README.md 精简为简介/结构/外部依赖/apache2 配置/Ubuntu 安装/docs 链接
72 lines
2.2 KiB
Python
72 lines
2.2 KiB
Python
"""PdfJob 的 DAO。
|
||
|
||
所有写操作均在该层 commit，service 不直接操作 session。
|
||
用户/管理两条查询路径分别按 user_deleted 过滤。
|
||
"""
|
||
|
||
from __future__ import annotations
|
||
|
||
from sqlalchemy import func, select
|
||
from sqlalchemy.orm import Session
|
||
|
||
from ..models.pdf_job import PdfJob
|
||
|
||
|
||
class PdfJobDAO:
|
||
def __init__(self, db: Session) -> None:
|
||
self.db = db
|
||
|
||
def create(self, job: PdfJob) -> PdfJob:
|
||
self.db.add(job)
|
||
self.db.commit()
|
||
self.db.refresh(job)
|
||
return job
|
||
|
||
def get(self, job_id: int) -> PdfJob | None:
|
||
return self.db.get(PdfJob, job_id)
|
||
|
||
def update(self, job: PdfJob) -> PdfJob:
|
||
"""提交对 job 的就地修改并刷新。"""
|
||
self.db.commit()
|
||
self.db.refresh(job)
|
||
return job
|
||
|
||
def delete(self, job: PdfJob) -> None:
|
||
"""硬删 PdfJob 行（管理视角真正删除，不可恢复）。"""
|
||
self.db.delete(job)
|
||
self.db.commit()
|
||
|
||
def list_for_user(self, owner_cookie: str, limit: int = 100, offset: int = 0) -> list[PdfJob]:
|
||
"""用户视角：仅未软删的任务，按创建时间倒序。"""
|
||
stmt = (
|
||
select(PdfJob)
|
||
.where(PdfJob.owner_cookie == owner_cookie)
|
||
.where(PdfJob.user_deleted == False) # noqa: E712
|
||
.order_by(PdfJob.created_at.desc())
|
||
.limit(limit)
|
||
.offset(offset)
|
||
)
|
||
return list(self.db.scalars(stmt).all())
|
||
|
||
def count_for_user(self, owner_cookie: str) -> int:
|
||
stmt = (
|
||
select(func.count())
|
||
.select_from(PdfJob)
|
||
.where(PdfJob.owner_cookie == owner_cookie)
|
||
.where(PdfJob.user_deleted == False) # noqa: E712
|
||
)
|
||
return self.db.scalar(stmt) or 0
|
||
|
||
def list_all(self, limit: int = 100, offset: int = 0) -> list[PdfJob]:
|
||
"""管理视角：全部任务（含已软删），按创建时间倒序。"""
|
||
stmt = (
|
||
select(PdfJob)
|
||
.order_by(PdfJob.created_at.desc())
|
||
.limit(limit)
|
||
.offset(offset)
|
||
)
|
||
return list(self.db.scalars(stmt).all())
|
||
|
||
def count_all(self) -> int:
|
||
return self.db.scalar(select(func.count()).select_from(PdfJob)) or 0
|