fix: 修复测试发现的 7 个问题 + 全 workspace clippy 清零
功能修复: 1. 患者创建空名称验证:后端添加 name.trim().is_empty() 检查 2. 仪表盘统计容错:单个查询失败返回零值而非 500 3. FHIR 路由修复:从 /fhir 移到 /api/v1/fhir 保持一致 4. 冻结模块后端中间件:新增 frozen_module_middleware 拦截冻结路径 5. 积分端点权限码:health.health-data.list → health.points.list 6. 角色权限迁移:护士补充 devices.list,运营补充 points.list/manage 7. 测试结果文档:R01-R05 角色测试 + T00/T10 结果归档 Clippy 全 workspace 清零(14→0 errors): - erp-core: 修复 empty doc line、collapsible if、redundant closure 等 9 处 - erp-health: 修复 too_many_arguments、unused var、unnecessary parens 等 58 处 - erp-ai: 修复 dead_code、unused import 等 11 处 - erp-plugin: 修复 too_many_arguments、wildcard pattern 等 11 处 - erp-server-migration: 修复 enum_variant_names 5 处 - erp-auth/config/workflow/message: 各 1-3 处 工程改进: - lint-staged 配置迁移到 .lintstagedrc.js(函数式避免文件列表传给 clippy) - cargo fmt 统一格式化
This commit is contained in:
@@ -6,8 +6,8 @@ use axum::extract::{Extension, Query};
|
||||
use axum::http::HeaderMap;
|
||||
use axum::response::sse::{Event, KeepAlive, Sse};
|
||||
use futures::stream::Stream;
|
||||
use serde::Deserialize;
|
||||
use sea_orm::ConnectionTrait;
|
||||
use serde::Deserialize;
|
||||
use uuid::Uuid;
|
||||
|
||||
use erp_core::error::AppError;
|
||||
@@ -73,12 +73,11 @@ pub async fn message_stream(
|
||||
}
|
||||
|
||||
// Last-Event-ID 恢复:跳过已发送的事件
|
||||
if let Some(skip_until) = last_event_id_cell.take() {
|
||||
if event.id <= skip_until {
|
||||
if let Some(skip_until) = last_event_id_cell.take()
|
||||
&& event.id <= skip_until {
|
||||
last_event_id_cell.set(Some(skip_until));
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
match event.event_type.as_str() {
|
||||
"message.sent" => {
|
||||
@@ -101,11 +100,10 @@ pub async fn message_stream(
|
||||
.and_then(|v| v.as_str());
|
||||
|
||||
// 患者订阅过滤
|
||||
if let (Some(pid_str), Some(subscribed)) = (patient_id, &subscribed_patient_ids) {
|
||||
if !subscribed.contains(pid_str) {
|
||||
if let (Some(pid_str), Some(subscribed)) = (patient_id, &subscribed_patient_ids)
|
||||
&& !subscribed.contains(pid_str) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(pid_str) = patient_id {
|
||||
let pid = Uuid::parse_str(pid_str).ok();
|
||||
@@ -130,11 +128,10 @@ pub async fn message_stream(
|
||||
.and_then(|v| v.as_str());
|
||||
|
||||
// 患者订阅过滤
|
||||
if let (Some(pid_str), Some(subscribed)) = (patient_id, &subscribed_patient_ids) {
|
||||
if !subscribed.contains(pid_str) {
|
||||
if let (Some(pid_str), Some(subscribed)) = (patient_id, &subscribed_patient_ids)
|
||||
&& !subscribed.contains(pid_str) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(pid_str) = patient_id {
|
||||
let pid = Uuid::parse_str(pid_str).ok();
|
||||
@@ -186,11 +183,7 @@ async fn is_doctor_for_patient(
|
||||
sea_orm::DatabaseBackend::Postgres,
|
||||
r#"SELECT COUNT(*) AS cnt FROM patient_doctor_relation
|
||||
WHERE tenant_id = $1 AND doctor_id = $2 AND patient_id = $3 AND deleted_at IS NULL"#,
|
||||
[
|
||||
tenant_id.into(),
|
||||
user_id.into(),
|
||||
patient_id.into(),
|
||||
],
|
||||
[tenant_id.into(), user_id.into(), patient_id.into()],
|
||||
);
|
||||
match db.query_one(sql).await {
|
||||
Ok(Some(row)) => {
|
||||
@@ -251,7 +244,9 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn sse_query_parses_patient_ids() {
|
||||
let query = SseQuery { patient_ids: Some("id1,id2,id3".into()) };
|
||||
let query = SseQuery {
|
||||
patient_ids: Some("id1,id2,id3".into()),
|
||||
};
|
||||
assert!(query.patient_ids.is_some());
|
||||
let ids = query.patient_ids.unwrap();
|
||||
assert_eq!(ids, "id1,id2,id3");
|
||||
@@ -265,7 +260,9 @@ mod tests {
|
||||
|
||||
#[test]
|
||||
fn subscribed_patient_ids_parsing() {
|
||||
let query = SseQuery { patient_ids: Some("aaa,bbb,ccc".into()) };
|
||||
let query = SseQuery {
|
||||
patient_ids: Some("aaa,bbb,ccc".into()),
|
||||
};
|
||||
let set: Option<HashSet<String>> = query.patient_ids.map(|s: String| {
|
||||
s.split(',')
|
||||
.map(|id: &str| id.trim().to_string())
|
||||
|
||||
Reference in New Issue
Block a user