- customers 表新增 rating_score/rating_time(V13 迁移 + V10 SQL + init-dev 同步)
- 新端点 PUT /customers/{id}/rating:评分是档案属性,只存总分与评级时间(五项明细不落库)
- 列表排序 order_by=rating_score,未评分客户升序/降序都垫底,id desc 兜底稳定分页
- 前端 RatingCalculatorDialog 并入客户管理(评分列 + 评级计算按钮),删除独立页与路由
- 测试:评级保存/越界/排序垫底 3 例,test_customers.py 18 passed;schema 同步 216 passed
172 lines
6.4 KiB
Python
172 lines
6.4 KiB
Python
"""客户数据访问(含归属变更留痕)。
|
||
|
||
本层只 flush 不 commit —— 事务边界由 services 层控制。
|
||
"""
|
||
|
||
from sqlalchemy import ColumnElement, Row, Select, func, or_, select
|
||
from sqlalchemy.orm import Session
|
||
|
||
from app.models import Customer, OwnershipChangeLog, Personnel
|
||
from app.models.customer import OWNER_TYPE_CUSTOMER
|
||
from app.repositories import ownership_log_repository
|
||
from app.repositories.ownership_log_repository import OwnershipLogRef
|
||
from app.repositories.query_utils import fuzzy
|
||
from app.schemas.customer import CustomerQuery
|
||
|
||
# ==================== 读取 ====================
|
||
|
||
|
||
def get_by_id(session: Session, customer_id: int) -> Customer | None:
|
||
"""按主键查询客户。"""
|
||
return session.get(Customer, customer_id)
|
||
|
||
|
||
def count_business_refs(session: Session, customer_id: int) -> int:
|
||
"""被业务单据引用的次数(删除保护;业务表就位后补齐的检查)。"""
|
||
from app.models import Business
|
||
|
||
return int(
|
||
session.execute(
|
||
select(func.count()).select_from(Business).where(Business.customer_id == customer_id)
|
||
).scalar_one()
|
||
)
|
||
|
||
|
||
def get_with_owner_name(session: Session, customer_id: int) -> Row | None:
|
||
"""查单个客户并带出归属人员姓名(详情、编辑回显与归属变更共用)。"""
|
||
stmt = _base_select().where(Customer.id == customer_id)
|
||
return session.execute(stmt).first()
|
||
|
||
|
||
def get_by_company_owner(session: Session, company_name: str, owner_name: str) -> Customer | None:
|
||
"""按「公司名称 + 负责人」查客户(uk_customers_company_owner 的先查后写兜底)。"""
|
||
stmt = select(Customer).where(
|
||
Customer.company_name == company_name,
|
||
Customer.owner_name == owner_name,
|
||
)
|
||
return session.execute(stmt).scalar_one_or_none()
|
||
|
||
|
||
def list_customers(session: Session, query: CustomerQuery) -> list[Row]:
|
||
"""分页查询客户,行内容为 (客户, 归属人员姓名)。
|
||
|
||
归属人员外键非空但统一用 outerjoin:人员行不可考(被物理删除的脏数据)
|
||
不应让客户行整个查不出来(同 personnel_repository 的韧性口径)。
|
||
排序键由查询白名单决定(见 ``CustomerQuery.order_by``):
|
||
id 倒序 = 新建档靠前,rating_score 按分数排、未评分垫底。
|
||
"""
|
||
stmt = _apply_filters(_base_select(), query)
|
||
stmt = _apply_order(stmt, query)
|
||
stmt = stmt.offset(query.offset).limit(query.page_size)
|
||
return list(session.execute(stmt).all())
|
||
|
||
|
||
def count_customers(session: Session, query: CustomerQuery) -> int:
|
||
"""统计符合条件的客户总数,供分页使用。
|
||
|
||
筛选条件全部落在主表上,计数无需 join(列表与计数的筛选口径由
|
||
``_apply_filters`` 单点保证)。
|
||
"""
|
||
stmt = _apply_filters(select(func.count(Customer.id)), query)
|
||
return int(session.execute(stmt).scalar_one())
|
||
|
||
|
||
def list_ownership_logs(
|
||
session: Session,
|
||
*,
|
||
customer_id: int,
|
||
offset: int,
|
||
limit: int,
|
||
) -> list[Row]:
|
||
"""查某客户的归属变更留痕(共享实现,owner_type/customer_id 参数化)。"""
|
||
return ownership_log_repository.list_by_ref(
|
||
session,
|
||
_customer_log_ref(customer_id),
|
||
offset=offset,
|
||
limit=limit,
|
||
)
|
||
|
||
|
||
def count_ownership_logs(session: Session, *, customer_id: int) -> int:
|
||
"""统计某客户的归属留痕总数,供分页使用。"""
|
||
return ownership_log_repository.count_by_ref(session, _customer_log_ref(customer_id))
|
||
|
||
|
||
def _customer_log_ref(customer_id: int) -> OwnershipLogRef:
|
||
"""客户维度的归属留痕锚点。"""
|
||
return OwnershipLogRef(
|
||
owner_type=OWNER_TYPE_CUSTOMER,
|
||
ref_column=OwnershipChangeLog.customer_id,
|
||
ref_id=customer_id,
|
||
)
|
||
|
||
|
||
def _base_select() -> Select:
|
||
"""客户主表外联归属人员姓名。"""
|
||
return select(Customer, Personnel.personnel_name).outerjoin(
|
||
Personnel, Customer.owner_personnel_id == Personnel.id
|
||
)
|
||
|
||
|
||
def _apply_filters(stmt: Select, query: CustomerQuery) -> Select:
|
||
"""应用通用筛选条件。列表与计数共用,避免两处口径不一致。"""
|
||
if query.keyword:
|
||
stmt = stmt.where(_keyword_clause(query.keyword))
|
||
if query.customer_type:
|
||
stmt = stmt.where(Customer.customer_type == query.customer_type)
|
||
if query.owner_personnel_id is not None:
|
||
stmt = stmt.where(Customer.owner_personnel_id == query.owner_personnel_id)
|
||
return stmt
|
||
|
||
|
||
def _keyword_clause(keyword: str) -> ColumnElement[bool]:
|
||
"""关键词条件:公司名称或客户负责人两列 OR 模糊。
|
||
|
||
借 ``query_utils.fuzzy`` 在空 select 上生成单列条件后取 whereclause 做
|
||
OR 合并 —— LIKE 通配符转义口径单点维护;两处手写 ``contains`` 迟早有
|
||
一处漏掉 ``autoescape``(人名含下划线是常态,不转义会当单字符通配执行)。
|
||
"""
|
||
probe = select(Customer.id)
|
||
return or_(
|
||
fuzzy(probe, Customer.company_name, keyword).whereclause,
|
||
fuzzy(probe, Customer.owner_name, keyword).whereclause,
|
||
)
|
||
|
||
|
||
def _apply_order(stmt: Select, query: CustomerQuery) -> Select:
|
||
"""应用排序。排序键已由 schema 白名单收口,此处只做键 → 列的映射。
|
||
|
||
MySQL 把 NULL 视为最小值:ASC 时未评分(null)会排最前,但「没打分」
|
||
不该压在「打了低分」之上 —— ASC 分支用 ``is_(None)`` 布尔键把 null
|
||
挪到末尾;DESC 分支 null 天然在最后,无需处理。尾部再按 id 倒序兜底,
|
||
保证同分行的次序稳定(分页不跳行)。
|
||
"""
|
||
if query.order_by == "rating_score":
|
||
score = Customer.rating_score
|
||
if query.order == "asc":
|
||
stmt = stmt.order_by(score.is_(None), score.asc())
|
||
else:
|
||
stmt = stmt.order_by(score.desc())
|
||
return stmt.order_by(Customer.id.desc())
|
||
|
||
|
||
# ==================== 写入 ====================
|
||
|
||
|
||
def create(session: Session, customer: Customer) -> Customer:
|
||
"""新增客户。只 flush 以取得自增 id。"""
|
||
session.add(customer)
|
||
session.flush()
|
||
return customer
|
||
|
||
|
||
def delete(session: Session, customer: Customer) -> None:
|
||
"""删除客户。调用方须先完成引用保护校验。"""
|
||
session.delete(customer)
|
||
session.flush()
|
||
|
||
|
||
def add_ownership_log(session: Session, log: OwnershipChangeLog) -> OwnershipChangeLog:
|
||
"""写入一条归属变更留痕(共享实现)。只 flush 不 commit,与主表更新同事务。"""
|
||
return ownership_log_repository.add(session, log)
|