feat: 新增备课模块并修复全模块 P0/P1/P2 缺陷
Some checks failed
Security / deep-security-scan (push) Failing after 20m5s
DR Drill / dr-drill (push) Failing after 1m31s
CI / scheduled-backup (push) Failing after 1m31s
CI / backup-verify (push) Has been skipped
CI / weekly-dr-drill (push) Failing after 0s
CI / build-deploy (push) Has been cancelled
CI / security-scan (push) Has been cancelled
Some checks failed
Security / deep-security-scan (push) Failing after 20m5s
DR Drill / dr-drill (push) Failing after 1m31s
CI / scheduled-backup (push) Failing after 1m31s
CI / backup-verify (push) Has been skipped
CI / weekly-dr-drill (push) Failing after 0s
CI / build-deploy (push) Has been cancelled
CI / security-scan (push) Has been cancelled
主要变更: - 新增 lesson-preparation 模块: 备课编辑器、节点编辑、AI 建议、知识点选择、版本历史、作业发布 - 新增 shared 通用组件: charts/question-bank-filters/schedule-list/ui (chip-nav/filter-bar/page-header/stat-card/stat-item) - 新增 student/admin 端 loading.tsx 与 error.tsx, 优化加载与错误态体验 - 新增 teacher/lesson-plans 页面 (列表/新建/编辑) - 新增 drizzle 迁移 0002_tiny_lionheart 及 snapshot - 新增 textbooks/schema.ts 与 exams/utils/normalize-structure.ts - 修复 Tiptap v3 SSR hydration 崩溃 (rich-text-block immediatelyRender: false) - 重构多模块 data-access/actions/组件, 修复权限校验与类型规范 - 同步架构文档 004/005 反映新增模块、导出、依赖关系 - 归档 bugs/* 测试报告与 e2e 测试脚本 (admin/parent/student/teacher web_test)
This commit is contained in:
@@ -1,13 +1,12 @@
|
||||
import "server-only"
|
||||
|
||||
import { cache } from "react"
|
||||
import { asc, eq } from "drizzle-orm"
|
||||
import { and, asc, eq } from "drizzle-orm"
|
||||
|
||||
import { db } from "@/shared/db"
|
||||
import { parentStudentRelations } from "@/shared/db/schema"
|
||||
import {
|
||||
getClassNameById,
|
||||
getStudentActiveClassId,
|
||||
getStudentActiveClass,
|
||||
getStudentClasses,
|
||||
getStudentSchedule,
|
||||
} from "@/modules/classes/data-access"
|
||||
@@ -16,12 +15,12 @@ import {
|
||||
getStudentHomeworkAssignments,
|
||||
} from "@/modules/homework/data-access"
|
||||
import { getStudentGradeSummary } from "@/modules/grades/data-access"
|
||||
import { getGradeOptions } from "@/modules/school/data-access"
|
||||
import { getGradeNameById } from "@/modules/school/data-access"
|
||||
import { getUserBasicInfo, getUserNamesByIds } from "@/modules/users/data-access"
|
||||
import type {
|
||||
ChildBasicInfo,
|
||||
ChildDashboardData,
|
||||
ChildHomeworkSummary,
|
||||
ChildHomeworkSummaryData,
|
||||
ChildScheduleItem,
|
||||
ParentChildRelation,
|
||||
ParentDashboardData,
|
||||
@@ -63,6 +62,26 @@ export const getChildren = cache(async (parentId: string): Promise<ParentChildRe
|
||||
}))
|
||||
})
|
||||
|
||||
/**
|
||||
* 校验家长与子女的关系是否存在,并返回关系类型。
|
||||
* 同时按 parentId 与 studentId 过滤,防止跨家庭信息泄露。
|
||||
*/
|
||||
export const verifyParentChildRelation = cache(
|
||||
async (studentId: string, parentId: string): Promise<string | null> => {
|
||||
const [row] = await db
|
||||
.select({ relation: parentStudentRelations.relation })
|
||||
.from(parentStudentRelations)
|
||||
.where(
|
||||
and(
|
||||
eq(parentStudentRelations.studentId, studentId),
|
||||
eq(parentStudentRelations.parentId, parentId),
|
||||
),
|
||||
)
|
||||
.limit(1)
|
||||
return row?.relation ?? null
|
||||
},
|
||||
)
|
||||
|
||||
export const getChildBasicInfo = cache(
|
||||
async (
|
||||
studentId: string,
|
||||
@@ -72,31 +91,20 @@ export const getChildBasicInfo = cache(
|
||||
|
||||
if (!student) return null
|
||||
|
||||
// gradeName 与 classId 相互独立,并行拉取
|
||||
const [gradeOptions, classId] = await Promise.all([
|
||||
student.gradeId ? getGradeOptions() : Promise.resolve([]),
|
||||
getStudentActiveClassId(studentId),
|
||||
// gradeName 与 activeClass 相互独立,并行拉取
|
||||
const [gradeName, activeClass] = await Promise.all([
|
||||
student.gradeId ? getGradeNameById(student.gradeId) : Promise.resolve(null),
|
||||
getStudentActiveClass(studentId),
|
||||
])
|
||||
|
||||
let gradeName: string | null = null
|
||||
if (student.gradeId) {
|
||||
const grade = gradeOptions.find((g) => g.id === student.gradeId)
|
||||
gradeName = grade?.name ?? null
|
||||
}
|
||||
|
||||
let className: string | null = null
|
||||
if (classId) {
|
||||
className = await getClassNameById(classId)
|
||||
}
|
||||
|
||||
return {
|
||||
id: student.id,
|
||||
name: student.name,
|
||||
email: student.email,
|
||||
image: student.image,
|
||||
gradeName,
|
||||
className,
|
||||
classId,
|
||||
className: activeClass?.className ?? null,
|
||||
classId: activeClass?.classId ?? null,
|
||||
relation,
|
||||
}
|
||||
},
|
||||
@@ -104,10 +112,8 @@ export const getChildBasicInfo = cache(
|
||||
|
||||
const buildHomeworkSummary = (
|
||||
assignments: Awaited<ReturnType<typeof getStudentHomeworkAssignments>>,
|
||||
): ChildHomeworkSummary => {
|
||||
): ChildHomeworkSummaryData => {
|
||||
const now = new Date()
|
||||
const in7Days = new Date(now)
|
||||
in7Days.setDate(in7Days.getDate() + 7)
|
||||
|
||||
let pendingCount = 0
|
||||
let submittedCount = 0
|
||||
@@ -133,8 +139,8 @@ const buildHomeworkSummary = (
|
||||
}
|
||||
}
|
||||
|
||||
const recentAssignments = [...assignments]
|
||||
.sort((a, b) => {
|
||||
const recentAssignments = assignments
|
||||
.toSorted((a, b) => {
|
||||
const aDue = a.dueAt ? new Date(a.dueAt).getTime() : Number.POSITIVE_INFINITY
|
||||
const bDue = b.dueAt ? new Date(b.dueAt).getTime() : Number.POSITIVE_INFINITY
|
||||
return aDue - bDue
|
||||
|
||||
Reference in New Issue
Block a user