merge sandbox/f0cf2f4: chg_0006 LMS bootstrap (3 子系统 + 5 S 场景 + 6 cases)

Co-Authored-By: Claude Code <[email protected]>
This commit is contained in:
xstudio agentandClaude Code committed 2026-09-28 16:46:52 +08:00
1 parent f1a15c44f4
commit 5c27b0fd39
17 files changed
+1039 -1

No files matched your search

+32
View File
@@ -0,0 +1,32 @@
=== chg_0005 experiment_platform_extend ===
PASS
改动文件清单(每文件一句话):
- docs/dth/experiment-platform/operators-design.md: T1 设计文档(6 算子架构/算法/接口契约)
- src/backend/src/dth/experiment/operators/scql.ts: scql 安全聚合算子(真求和 + 列数/总值/columns)
- src/backend/src/dth/experiment/operators/horizontal-fedavg.ts: 横向 FedAvg 权重均值聚合
- src/backend/src/dth/experiment/operators/secure-mlp.ts: 安全 MLP 推理(sigmoid + DP 噪声)
- src/backend/src/dth/experiment/operators/tee-inference.ts: TEE 远程推理 + attestation mock
- src/backend/src/dth/experiment/operators/prompt-defense.ts: prompt 注入检测(威胁分级 high/medium/low)
- src/backend/src/dth/experiment/operators/compliance-audit.ts: 合规审计 trail(UUID + 评分)
- src/backend/src/dth/experiment/operators.service.ts: 注册 6 新算子到 OperatorsService
- src/backend/src/dth/experiment/experiment.module.ts: providers 追加 6 新算子
- .gitignore: 加入 .pglite / .env 等本地运行时产物
- tests/e2e/dth_experiment_extend.test.sh: 8 case (admin login + 6 算子 e2e + list ≥9 断言)
- openspec/changes/chg_0005_experiment_platform_extend/{proposal,spec,tasks,testcases.map.yaml,testcases}.md: 5 openspec 工件
门禁:
- check_spec_coverage.sh: chg_0005 gap=0(chg_0005 OK);整体 exit=1 由 chg_0002/0003/0004 archive 预存的 map.yaml 注释 id 与目录 basename 不一致导致(与 chg_0005 无关,先前 session 遗留)
- tsc --noEmit -p src/backend: chg_0005 文件 0 error;vertical-lr.ts:52 TS2352 是 chg_0002 预存错误
- e2e dth_experiment_extend.test.sh: pass=27/fail=0(含 list ≥9 + 6 算子 + admin login)
- e2e dth_experiment.test.sh (chg_0002 回归): pass=16/fail=0
git log sandbox --oneline | head -3:
- d42537c feat(dth): chg_0005 T1-T5 6 new operators + registration + 8 e2e cases (gate PASS)
- 9eeb9a8 feat(dispatch-helpers): A-2 prep-sandbox-space.sh + dispatch-preflight.sh; B-2 brainstorming↔openspec 映射; E-2 prompt 模板
- 77337ae docs(learnings): 14:00 实查 — probe-ccc PASS,G-1/A-1/鉴权 全修,skills 已拷到 ccc
修复说明:
- T5 验证中发现 spec.md 漏写 `### all` 标题(map.yaml 声明了 all scenario 但 spec.md 缺该字面标题导致 chg_0005 gate FAIL)——已在 commit d42537c 中补齐 5 行 `### all test_runner_and_gate_pass` + WHEN/THEN。
是否建议合并:chg_0005 本身 PASS 可合;如需整仓零 blocker,需先修 chg_0002/0003/0004 archive 内 map.yaml 注释 id(不在本任务范围)。
+149
View File
@@ -0,0 +1,149 @@
# LMS Module Design — chg_0006
## Overview
LMS 是数智安全人才平台的核心子系统(需求 §6.1)。本 chg 落地三个最小子系统:
学员管理 + 课程管理 + 选课。新 capability `lms`,S 编号从 1 起。
## 1. 3 表 Schema(PGlite)
### lms_student
```sql
CREATE TABLE IF NOT EXISTS lms_student (
id TEXT PRIMARY KEY,
student_no TEXT UNIQUE NOT NULL,
name TEXT NOT NULL,
email TEXT NOT NULL,
created_at TIMESTAMP NOT NULL DEFAULT NOW()
);
```
### lms_course
```sql
CREATE TABLE IF NOT EXISTS lms_course (
id TEXT PRIMARY KEY,
code TEXT UNIQUE NOT NULL,
name TEXT NOT NULL,
credits INTEGER NOT NULL DEFAULT 1,
instructor TEXT,
created_at TIMESTAMP NOT NULL DEFAULT NOW()
);
```
### lms_enrollment
```sql
CREATE TABLE IF NOT EXISTS lms_enrollment (
id TEXT PRIMARY KEY,
student_id TEXT NOT NULL,
course_id TEXT NOT NULL,
enrolled_at TIMESTAMP NOT NULL DEFAULT NOW(),
status TEXT NOT NULL DEFAULT 'active',
UNIQUE(student_id, course_id)
);
```
**设计要点**:
- `id` 用 TEXT(UUID v4),与现有 chg_0002 的 `run_id` 一致(字符串 UUID 而非 bigint)
- `student_no` / `code` 业务唯一键(学号 / 课程号),UNIQUE 约束避免重复
- `lms_enrollment.UNIQUE(student_id, course_id)` 保证同一学生同一课程不重复选课
- `status` 默认 `'active'`,预留 future 退课 / 完成状态
## 2. Seed 数据(启动期)
```sql
INSERT INTO lms_student (id, student_no, name, email) VALUES
('11111111-1111-1111-1111-111111111111', 'S20200001', '李雷', '[email protected]'),
('22222222-2222-2222-2222-222222222222', 'S20200002', '韩梅梅', '[email protected]')
ON CONFLICT DO NOTHING;
INSERT INTO lms_course (id, code, name, credits, instructor) VALUES
('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'CS101', '数据安全导论', 3, '王老师'),
('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'CS201', '隐私计算实战', 4, '陈老师')
ON CONFLICT DO NOTHING;
```
固定 UUID 便于 e2e 测试稳定引用(`S4` 直接用 `111...`/`aaaa...` 即可断言)。
## 3. 模块结构
```
src/backend/src/lms/
├── lms.module.ts
├── students.students.controller.ts
├── students.students.service.ts
├── courses.courses.controller.ts
├── courses.courses.service.ts
├── enrollments.enrollments.controller.ts
└── enrollments.enrollments.service.ts
```
命名沿用 chg_0002 风格(`<resource>.<resource>.controller.ts`)。
## 4. 7 类 Endpoint
### 学员
| Method | Path | 说明 | RBAC |
|--------|------|------|------|
| GET | `/api/ssw/dth/lms/students` | 列表 | admin |
| POST | `/api/ssw/dth/lms/students` | 创建(body: student_no/name/email) | admin |
| GET | `/api/ssw/dth/lms/students/:id` | 单个 | admin |
| PUT | `/api/ssw/dth/lms/students/:id` | 更新(body: name/email) | admin |
| DELETE | `/api/ssw/dth/lms/students/:id` | 删除 | admin |
| GET | `/api/ssw/dth/lms/students/:id/enrollments` | 该生选课列表 | admin |
### 课程
| Method | Path | 说明 | RBAC |
|--------|------|------|------|
| GET | `/api/ssw/dth/lms/courses` | 列表 | admin |
| POST | `/api/ssw/dth/lms/courses` | 创建(body: code/name/credits/instructor) | admin |
| GET | `/api/ssw/dth/lms/courses/:id` | 单个 | admin |
| PUT | `/api/ssw/dth/lms/courses/:id` | 更新 | admin |
| DELETE | `/api/ssw/dth/lms/courses/:id` | 删除 | admin |
### 选课
| Method | Path | 说明 | RBAC |
|--------|------|------|------|
| POST | `/api/ssw/dth/lms/courses/:id/enroll` | 选课(body: `{student_id}`) | admin |
| GET | `/api/ssw/dth/lms/courses/:id/enrollments` | 该课程选课列表 | admin |
## 5. 响应格式
沿用 chg_0002 的 ActionResultFilter 格式:
```json
{ "code": 200, "msg": "ok", "data": ... }
```
- 成功:`code = 200`
- 未登录:`code = 600`(JwtAuthGuard)
- 业务错误:`code = 400`(BadRequestException,比如 student_no 重复 / student_id 不存在)
- 权限不足:`code = 403`(RequireAdmin)
- 资源不存在:`code = 404`(NotFoundException)
## 6. RBAC
所有 LMS 端点套 `@UseGuards(JwtAuthGuard)` + `@RequireAdmin()`:
- 复用 chg_0002 的 `JwtAuthGuard` + `RequireAdmin()`(`src/backend/src/auth/jwt.guard.ts`)
- 不引入新鉴权机制
## 7. 与现有架构的关系
- **复用**:JwtAuthGuard / ActionResultFilter / PGlite init 入口 / uuid v4
- **不修改**:auth/、common/{cipher,action-result.filter}.ts、dth/、dth_user / dth_experiment_run 表
- **新增**:3 张 LMS 表 + 6 服务/控制器文件 + 1 module + e2e 测试
- **依赖**:仅 `@nestjs/common` / `@nestjs/jwt` / `uuid` / `bcryptjs`(均已装,不引入新依赖)
## 8. 错误处理边界条件(自评审)
- **缺参删除**:`DELETE /students/:id` 不存在 → 404
- **越权隔离**:非 admin 调用 → 403(RequireAdmin)
- **空列表**:新建项目 → list 返回 `[]`(业务兜底)
- **超长输入**:email 太长 / name 含特殊字符 → 业务层不严格校验(trust admin 输入;MVP 范围)
- **幂等重复 enroll**:同 (student_id, course_id) → UNIQUE 冲突 → 返回 400
## 9. 4 S 场景覆盖矩阵
| S | 触达端点 | 验证点 |
|---|----------|--------|
| S1 | GET /students | list.length ≥ 2 + 字段 schema |
| S2 | POST /students → GET /students/:id | id 是 UUID + name 一致 |
| S3 | GET /courses | list.length ≥ 2 + 字段 schema |
| S4 | POST /courses/:id/enroll → GET /students/:id/enrollments | code=200 + enrollments 含 course_id |
| all | tests/e2e/dth_lms.test.sh + check_spec_coverage.sh | exit 0 + gap=0 |
@@ -0,0 +1,44 @@
---
change_id: chg_0006
status: proposed
owner: pm@dth
stakeholders: [pd, dev, qa]
priority: P1
target_release: v0.5
created: 2026-09-28
skip_coverage: false
---
# Change: LMS 起头(学员 + 课程 + 选课)
## Why
需求 §6.1 LMS 是数智安全人才平台的核心子系统之一。本 chg 落地 LMS 三个最小子系统:学员管理(学号/姓名/邮箱)、课程管理(代码/学分/教师)、选课(学员 ↔ 课程)。
## Who
高校教师 / 学员 / 教务管理员。
## Scope
- 学员管理:list / create / get / update / delete
- 课程管理:list / create / get / update / delete
- 选课:enroll / list-by-student / list-by-course
- 3 张 PGlite 表:lms_student / lms_course / lms_enrollment
- e2e:tests/e2e/dth_lms.test.sh(4 case 对应 S1-S4)
## Non-Goals
- 不做 LMS 前端(前端 chg_0004 已定,operator 列表的 UI 模式可直接复用)
- 不做作业 / 考试 / 题库 / 教师端(后续 chg)
- 不做权限分层(admin 端管所有 LMS 资源;非 admin 暂不允许)
- 不做学员能力图谱(5 模块雷达图)
## Impact
- 新 capability `lms`(独立元能力,S 编号从 1 起)
## Acceptance
- [ ] admin GET /api/ssw/dth/lms/students 返回 ≥ 2 学员(seed 后)
- [ ] admin POST /api/ssw/dth/lms/students 创建新学员,GET /api/ssw/dth/lms/students/:id 返回该学员
- [ ] admin GET /api/ssw/dth/lms/courses 返回 ≥ 2 课程(seed 后)
- [ ] admin POST /api/ssw/dth/lms/courses/:id/enroll 把学生加入课程,GET /api/ssw/dth/lms/students/:id/enrollments 列出该生所有课程
- [ ] check_spec_coverage.sh gap=0
## Rollout
合并 main;后端 :30000 重启即生效。PGlite 启动期创建 3 表 + seed 2 学员 2 课程。
@@ -0,0 +1,38 @@
---
change_id: chg_0006
owner: pd@dth
status: draft
requires_human_validation: false
---
# Spec: lms
## Requirement
WHEN 管理员调用学员/课程列表接口 THE SYSTEM SHALL 返回资源列表(含 seed 初始数据)。
WHEN 管理员对学员/课程发起 create/update/delete/enroll THE SYSTEM SHALL 返回操作结果。
## ADDED Scenarios
### S1 list_students_returns_seeded
- **WHEN** admin GET /api/ssw/dth/lms/students
- **THEN** 响应 data 数组长度 ≥ 2,每个元素含 id/student_no/name/email/created_at
### S2 create_then_get_student
- **WHEN** admin POST /api/ssw/dth/lms/students body={"student_no":"S2026001","name":"张三","email":"zhangsan@school.edu"}
- **THEN** data.id 为 36 位 UUID
- **AND** GET /api/ssw/dth/lms/students/:id 的 data.name == "张三"
### S3 list_courses_returns_seeded
- **WHEN** admin GET /api/ssw/dth/lms/courses
- **THEN** 响应 data 数组长度 ≥ 2,每个元素含 id/code/name/credits/instructor/created_at
### S4 enroll_student_to_course
- **WHEN** admin POST /api/ssw/dth/lms/courses/:courseId/enroll body={"student_id":"<seed student id>"}
- **THEN** 响应 code = 200
- **AND** GET /api/ssw/dth/lms/students/:studentId/enrollments 返回 ≥ 1 条含 course_id=enrolled
### all test_runner_and_gate_pass
- **WHEN** 跑 `bash tests/e2e/dth_lms.test.sh`
- **THEN** C5_test_runner_passes_all 通过(≥4 S 场景断言)
- **AND** 跑 `bash openspec/scripts/check_spec_coverage.sh`
- **AND** C6_check_spec_coverage_gap_zero 通过(gap=0)
@@ -0,0 +1,30 @@
# Tasks (DAG)
- id: T1
type: architect
depends_on: []
output: docs/dth/lms/design.md(3 表 schema + 接口契约 + seed 策略)
verification: design covers 3 表 + 4 S 场景 + seed 数据
- id: T2
type: implementer
depends_on: [T1]
output: src/backend/src/common/pglite/init.ts 追加 3 张表 + seed 2 学员 2 课程
verification: 启动期能 CREATE TABLE IF NOT EXISTS + seed 成功
- id: T3
type: implementer
depends_on: [T2]
output: src/backend/src/lms/{students,courses,enrollments}.{service,controller}.ts + lms.module.ts
verification: 3 子模块 6 文件 + module 注册到 app.module.ts
- id: T4
type: tester
depends_on: [T3]
output: tests/e2e/dth_lms.test.sh(4 case 对应 S1-S4)
verification: 4/4 pass
- id: T5
type: qa
depends_on: [T4]
output: PROJECT_ROOT=. bash openspec/scripts/check_spec_coverage.sh
verification: stdout PASS gap=0
@@ -0,0 +1,21 @@
# spec: lms@chg_0006
scenarios:
- id: S1
cases: [C1_list_students_has_seeded]
- id: S2
cases: [C2_create_and_get_student]
- id: S3
cases: [C3_list_courses_has_seeded]
- id: S4
cases: [C4_enroll_student_to_course]
- id: all
cases: [C5_test_runner_passes_all, C6_check_spec_coverage_gap_zero]
gate:
blocking_gap_tolerance: 0
implementation_files:
- src/backend/src/lms/
- src/backend/src/common/pglite/init.ts
- tests/e2e/dth_lms.test.sh
test_files:
- tests/e2e/
@@ -0,0 +1,64 @@
---
change_id: chg_0006
owner: qa@dth
status: draft
spec_ref: spec.md
---
# Testcases
## Cases
### C1_list_students_has_seeded
- Scenario: S1
- Type: integration
- Priority: P0
- Given: admin token
- When: GET /api/ssw/dth/lms/students
- Then: data 数组长度 ≥ 2;每项含 id/student_no/name/email/created_at
- Bound Task: T4
### C2_create_and_get_student
- Scenario: S2
- Type: integration
- Priority: P0
- Given: admin token
- When: POST /api/ssw/dth/lms/students body={"student_no":"S2026001","name":"张三","email":"zhangsan@school.edu"}
- Then: data.id 匹配 UUID 正则;GET /students/:id 的 data.name == "张三"
- Bound Task: T4
### C3_list_courses_has_seeded
- Scenario: S3
- Type: integration
- Priority: P0
- Given: admin token
- When: GET /api/ssw/dth/lms/courses
- Then: data 数组长度 ≥ 2;每项含 id/code/name/credits/instructor/created_at
- Bound Task: T4
### C4_enroll_student_to_course
- Scenario: S4
- Type: integration
- Priority: P0
- Given: admin token + 1 个 seed student id + 1 个 seed course id
- When: POST /courses/:courseId/enroll body={"student_id":"<student id>"}
- Then: code = 200;GET /students/:studentId/enrollments 长度 ≥ 1 含 course_id
- Bound Task: T4
### C5_test_runner_passes_all
- Scenario: all
- Type: e2e
- Priority: P0
- Given: 后端运行
- When: bash tests/e2e/dth_lms.test.sh
- Then: exit 0
- Bound Task: T4
### C6_check_spec_coverage_gap_zero
- Scenario: all
- Type: e2e
- Priority: P0
- Given: chg 工件齐备
- When: PROJECT_ROOT=. bash openspec/scripts/check_spec_coverage.sh
- Then: stdout PASS gap=0
- Bound Task: T5
+2 -1
View File
@@ -1,8 +1,9 @@
import { Module } from '@nestjs/common'; import { Module } from '@nestjs/common';
import { AuthModule } from './auth/auth.module'; import { AuthModule } from './auth/auth.module';
import { DthExperimentModule } from './dth/experiment/experiment.module'; import { DthExperimentModule } from './dth/experiment/experiment.module';
import { LmsModule } from './lms/lms.module';
@Module({ @Module({
imports: [AuthModule, DthExperimentModule], imports: [AuthModule, DthExperimentModule, LmsModule],
}) })
export class AppModule {} export class AppModule {}
+45
View File
@@ -33,6 +33,37 @@ export async function initPglite(): Promise<PGlite> {
is_admin BOOLEAN NOT NULL DEFAULT FALSE, is_admin BOOLEAN NOT NULL DEFAULT FALSE,
created_at TIMESTAMP NOT NULL DEFAULT NOW() created_at TIMESTAMP NOT NULL DEFAULT NOW()
); );
-- chg_0006 LMS schema: lms_student / lms_course / lms_enrollment
CREATE TABLE IF NOT EXISTS lms_student (
id TEXT PRIMARY KEY,
student_no TEXT UNIQUE NOT NULL,
name TEXT NOT NULL,
email TEXT NOT NULL,
created_at TIMESTAMP NOT NULL DEFAULT NOW()
);
CREATE INDEX IF NOT EXISTS idx_lms_student_no ON lms_student(student_no);
CREATE TABLE IF NOT EXISTS lms_course (
id TEXT PRIMARY KEY,
code TEXT UNIQUE NOT NULL,
name TEXT NOT NULL,
credits INTEGER NOT NULL DEFAULT 1,
instructor TEXT,
created_at TIMESTAMP NOT NULL DEFAULT NOW()
);
CREATE INDEX IF NOT EXISTS idx_lms_course_code ON lms_course(code);
CREATE TABLE IF NOT EXISTS lms_enrollment (
id TEXT PRIMARY KEY,
student_id TEXT NOT NULL,
course_id TEXT NOT NULL,
enrolled_at TIMESTAMP NOT NULL DEFAULT NOW(),
status TEXT NOT NULL DEFAULT 'active',
UNIQUE(student_id, course_id)
);
CREATE INDEX IF NOT EXISTS idx_lms_enroll_student ON lms_enrollment(student_id);
CREATE INDEX IF NOT EXISTS idx_lms_enroll_course ON lms_enrollment(course_id);
`); `);
// Seed admin if not present // Seed admin if not present
@@ -53,6 +84,20 @@ export async function initPglite(): Promise<PGlite> {
ON CONFLICT (username) DO NOTHING;`, ON CONFLICT (username) DO NOTHING;`,
); );
// chg_0006 LMS seed: 2 students + 2 courses (fixed UUIDs for e2e stability)
await db.exec(
`INSERT INTO lms_student (id, student_no, name, email) VALUES
('11111111-1111-1111-1111-111111111111', 'S20200001', '李雷', '[email protected]'),
('22222222-2222-2222-2222-222222222222', 'S20200002', '韩梅梅', '[email protected]')
ON CONFLICT (id) DO NOTHING;`,
);
await db.exec(
`INSERT INTO lms_course (id, code, name, credits, instructor) VALUES
('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa', 'CS101', '数据安全导论', 3, '王老师'),
('bbbbbbbb-bbbb-bbbb-bbbb-bbbbbbbbbbbb', 'CS201', '隐私计算实战', 4, '陈老师')
ON CONFLICT (id) DO NOTHING;`,
);
return db; return db;
} }
@@ -0,0 +1,52 @@
import {
Body,
Controller,
Delete,
Get,
Param,
Post,
Put,
UseGuards,
} from '@nestjs/common';
import { JwtAuthGuard, RequireAdmin } from '../auth/jwt.guard';
import {
CoursesService,
CreateCourseDto,
UpdateCourseDto,
} from './courses.courses.service';
@Controller('api/ssw/dth/lms/courses')
@UseGuards(JwtAuthGuard)
export class CoursesController {
constructor(private readonly courses: CoursesService) {}
@Get()
@RequireAdmin()
async listCourses() {
return { code: 200, msg: 'ok', data: await this.courses.list() };
}
@Post()
@RequireAdmin()
async createCourse(@Body() dto: CreateCourseDto) {
return { code: 200, msg: 'ok', data: await this.courses.create(dto) };
}
@Get(':id')
@RequireAdmin()
async getCourse(@Param('id') id: string) {
return { code: 200, msg: 'ok', data: await this.courses.getOrThrow(id) };
}
@Put(':id')
@RequireAdmin()
async updateCourse(@Param('id') id: string, @Body() dto: UpdateCourseDto) {
return { code: 200, msg: 'ok', data: await this.courses.update(id, dto) };
}
@Delete(':id')
@RequireAdmin()
async deleteCourse(@Param('id') id: string) {
return { code: 200, msg: 'ok', data: await this.courses.delete(id) };
}
}
@@ -0,0 +1,116 @@
import {
BadRequestException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { v4 as uuidv4 } from 'uuid';
import { getDb } from '../common/pglite/init';
export interface CourseRow {
id: string;
code: string;
name: string;
credits: number;
instructor: string | null;
created_at: string;
}
export interface CreateCourseDto {
code: string;
name: string;
credits?: number;
instructor?: string;
}
export interface UpdateCourseDto {
name?: string;
credits?: number;
instructor?: string;
}
@Injectable()
export class CoursesService {
async list(): Promise<CourseRow[]> {
const db = getDb();
const r = await db.query<CourseRow>(
`SELECT id, code, name, credits, instructor, created_at::text AS created_at
FROM lms_course ORDER BY created_at ASC`,
);
return r.rows;
}
async create(dto: CreateCourseDto): Promise<CourseRow> {
if (!dto?.code || !dto?.name) {
throw new BadRequestException('code / name are required');
}
const db = getDb();
const exist = await db.query<{ id: string }>(
`SELECT id FROM lms_course WHERE code = $1 LIMIT 1`,
[dto.code],
);
if (exist.rows.length > 0) {
throw new BadRequestException(`course code ${dto.code} already exists`);
}
const id = uuidv4();
const credits = dto.credits ?? 1;
await db.query(
`INSERT INTO lms_course (id, code, name, credits, instructor)
VALUES ($1, $2, $3, $4, $5)`,
[id, dto.code, dto.name, credits, dto.instructor ?? null],
);
return (await this.get(id))!;
}
async get(id: string): Promise<CourseRow | null> {
const db = getDb();
const r = await db.query<CourseRow>(
`SELECT id, code, name, credits, instructor, created_at::text AS created_at
FROM lms_course WHERE id = $1 LIMIT 1`,
[id],
);
return r.rows[0] ?? null;
}
async getOrThrow(id: string): Promise<CourseRow> {
const row = await this.get(id);
if (!row) throw new NotFoundException(`course ${id} not found`);
return row;
}
async update(id: string, dto: UpdateCourseDto): Promise<CourseRow> {
await this.getOrThrow(id);
const sets: string[] = [];
const params: any[] = [];
if (dto.name !== undefined) {
params.push(dto.name);
sets.push(`name = $${params.length}`);
}
if (dto.credits !== undefined) {
params.push(dto.credits);
sets.push(`credits = $${params.length}`);
}
if (dto.instructor !== undefined) {
params.push(dto.instructor);
sets.push(`instructor = $${params.length}`);
}
if (sets.length === 0) {
return this.getOrThrow(id);
}
params.push(id);
const db = getDb();
await db.query(
`UPDATE lms_course SET ${sets.join(', ')} WHERE id = $${params.length}`,
params,
);
return this.getOrThrow(id);
}
async delete(id: string): Promise<{ id: string }> {
await this.getOrThrow(id);
const db = getDb();
// Cascade: 课程被删则其选课记录也清掉
await db.query(`DELETE FROM lms_enrollment WHERE course_id = $1`, [id]);
await db.query(`DELETE FROM lms_course WHERE id = $1`, [id]);
return { id };
}
}
@@ -0,0 +1,46 @@
import {
Body,
Controller,
Get,
Param,
Post,
UseGuards,
} from '@nestjs/common';
import { JwtAuthGuard, RequireAdmin } from '../auth/jwt.guard';
import { EnrollDto, EnrollmentsService } from './enrollments.enrollments.service';
@Controller('api/ssw/dth/lms')
@UseGuards(JwtAuthGuard)
export class EnrollmentsController {
constructor(private readonly enrollments: EnrollmentsService) {}
@Post('courses/:id/enroll')
@RequireAdmin()
async enroll(@Param('id') courseId: string, @Body() dto: EnrollDto) {
return {
code: 200,
msg: 'ok',
data: await this.enrollments.enroll(courseId, dto),
};
}
@Get('courses/:id/enrollments')
@RequireAdmin()
async listByCourse(@Param('id') courseId: string) {
return {
code: 200,
msg: 'ok',
data: await this.enrollments.listByCourse(courseId),
};
}
@Get('students/:id/enrollments')
@RequireAdmin()
async listByStudent(@Param('id') studentId: string) {
return {
code: 200,
msg: 'ok',
data: await this.enrollments.listByStudent(studentId),
};
}
}
@@ -0,0 +1,89 @@
import {
BadRequestException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { v4 as uuidv4 } from 'uuid';
import { getDb } from '../common/pglite/init';
import { CoursesService } from './courses.courses.service';
import { StudentsService } from './students.students.service';
export interface EnrollmentRow {
id: string;
student_id: string;
course_id: string;
enrolled_at: string;
status: string;
}
export interface EnrollDto {
student_id: string;
}
@Injectable()
export class EnrollmentsService {
constructor(
private readonly students: StudentsService,
private readonly courses: CoursesService,
) {}
async enroll(courseId: string, dto: EnrollDto): Promise<EnrollmentRow> {
if (!dto?.student_id) {
throw new BadRequestException('student_id is required');
}
// 课程 + 学员必须存在(先校验,让 NotFound 比 UNIQUE 冲突优先)
await this.courses.getOrThrow(courseId);
await this.students.getOrThrow(dto.student_id);
const db = getDb();
const exist = await db.query<{ id: string }>(
`SELECT id FROM lms_enrollment WHERE student_id = $1 AND course_id = $2 LIMIT 1`,
[dto.student_id, courseId],
);
if (exist.rows.length > 0) {
throw new BadRequestException(
`student ${dto.student_id} already enrolled in course ${courseId}`,
);
}
const id = uuidv4();
await db.query(
`INSERT INTO lms_enrollment (id, student_id, course_id, status)
VALUES ($1, $2, $3, 'active')`,
[id, dto.student_id, courseId],
);
return (await this.get(id))!;
}
async get(id: string): Promise<EnrollmentRow | null> {
const db = getDb();
const r = await db.query<EnrollmentRow>(
`SELECT id, student_id, course_id, enrolled_at::text AS enrolled_at, status
FROM lms_enrollment WHERE id = $1 LIMIT 1`,
[id],
);
return r.rows[0] ?? null;
}
async listByStudent(studentId: string): Promise<EnrollmentRow[]> {
// 校验学生存在(404 比空 [] 更明确)
await this.students.getOrThrow(studentId);
const db = getDb();
const r = await db.query<EnrollmentRow>(
`SELECT id, student_id, course_id, enrolled_at::text AS enrolled_at, status
FROM lms_enrollment WHERE student_id = $1 ORDER BY enrolled_at ASC`,
[studentId],
);
return r.rows;
}
async listByCourse(courseId: string): Promise<EnrollmentRow[]> {
await this.courses.getOrThrow(courseId);
const db = getDb();
const r = await db.query<EnrollmentRow>(
`SELECT id, student_id, course_id, enrolled_at::text AS enrolled_at, status
FROM lms_enrollment WHERE course_id = $1 ORDER BY enrolled_at ASC`,
[courseId],
);
return r.rows;
}
}
+15
View File
@@ -0,0 +1,15 @@
import { Module } from '@nestjs/common';
import { AuthModule } from '../auth/auth.module';
import { CoursesController } from './courses.courses.controller';
import { CoursesService } from './courses.courses.service';
import { EnrollmentsController } from './enrollments.enrollments.controller';
import { EnrollmentsService } from './enrollments.enrollments.service';
import { StudentsController } from './students.students.controller';
import { StudentsService } from './students.students.service';
@Module({
imports: [AuthModule],
controllers: [StudentsController, CoursesController, EnrollmentsController],
providers: [StudentsService, CoursesService, EnrollmentsService],
})
export class LmsModule {}
@@ -0,0 +1,52 @@
import {
Body,
Controller,
Delete,
Get,
Param,
Post,
Put,
UseGuards,
} from '@nestjs/common';
import { JwtAuthGuard, RequireAdmin } from '../auth/jwt.guard';
import {
CreateStudentDto,
StudentsService,
UpdateStudentDto,
} from './students.students.service';
@Controller('api/ssw/dth/lms/students')
@UseGuards(JwtAuthGuard)
export class StudentsController {
constructor(private readonly students: StudentsService) {}
@Get()
@RequireAdmin()
async listStudents() {
return { code: 200, msg: 'ok', data: await this.students.list() };
}
@Post()
@RequireAdmin()
async createStudent(@Body() dto: CreateStudentDto) {
return { code: 200, msg: 'ok', data: await this.students.create(dto) };
}
@Get(':id')
@RequireAdmin()
async getStudent(@Param('id') id: string) {
return { code: 200, msg: 'ok', data: await this.students.getOrThrow(id) };
}
@Put(':id')
@RequireAdmin()
async updateStudent(@Param('id') id: string, @Body() dto: UpdateStudentDto) {
return { code: 200, msg: 'ok', data: await this.students.update(id, dto) };
}
@Delete(':id')
@RequireAdmin()
async deleteStudent(@Param('id') id: string) {
return { code: 200, msg: 'ok', data: await this.students.delete(id) };
}
}
@@ -0,0 +1,110 @@
import {
BadRequestException,
Injectable,
NotFoundException,
} from '@nestjs/common';
import { v4 as uuidv4 } from 'uuid';
import { getDb } from '../common/pglite/init';
export interface StudentRow {
id: string;
student_no: string;
name: string;
email: string;
created_at: string;
}
export interface CreateStudentDto {
student_no: string;
name: string;
email: string;
}
export interface UpdateStudentDto {
name?: string;
email?: string;
}
@Injectable()
export class StudentsService {
async list(): Promise<StudentRow[]> {
const db = getDb();
const r = await db.query<StudentRow>(
`SELECT id, student_no, name, email, created_at::text AS created_at
FROM lms_student ORDER BY created_at ASC`,
);
return r.rows;
}
async create(dto: CreateStudentDto): Promise<StudentRow> {
if (!dto?.student_no || !dto?.name || !dto?.email) {
throw new BadRequestException('student_no / name / email are required');
}
const db = getDb();
// Pre-check uniqueness (UNIQUE 约束兜底;这里给出更友好提示)
const exist = await db.query<{ id: string }>(
`SELECT id FROM lms_student WHERE student_no = $1 LIMIT 1`,
[dto.student_no],
);
if (exist.rows.length > 0) {
throw new BadRequestException(`student_no ${dto.student_no} already exists`);
}
const id = uuidv4();
await db.query(
`INSERT INTO lms_student (id, student_no, name, email)
VALUES ($1, $2, $3, $4)`,
[id, dto.student_no, dto.name, dto.email],
);
return (await this.get(id))!;
}
async get(id: string): Promise<StudentRow | null> {
const db = getDb();
const r = await db.query<StudentRow>(
`SELECT id, student_no, name, email, created_at::text AS created_at
FROM lms_student WHERE id = $1 LIMIT 1`,
[id],
);
return r.rows[0] ?? null;
}
async getOrThrow(id: string): Promise<StudentRow> {
const row = await this.get(id);
if (!row) throw new NotFoundException(`student ${id} not found`);
return row;
}
async update(id: string, dto: UpdateStudentDto): Promise<StudentRow> {
await this.getOrThrow(id);
const sets: string[] = [];
const params: any[] = [];
if (dto.name !== undefined) {
params.push(dto.name);
sets.push(`name = $${params.length}`);
}
if (dto.email !== undefined) {
params.push(dto.email);
sets.push(`email = $${params.length}`);
}
if (sets.length === 0) {
// no-op: just return as-is
return this.getOrThrow(id);
}
params.push(id);
const db = getDb();
await db.query(
`UPDATE lms_student SET ${sets.join(', ')} WHERE id = $${params.length}`,
params,
);
return this.getOrThrow(id);
}
async delete(id: string): Promise<{ id: string }> {
await this.getOrThrow(id);
const db = getDb();
// Cascade: 学员被删则其选课记录也清掉(lms_enrollment 是依附资源)
await db.query(`DELETE FROM lms_enrollment WHERE student_id = $1`, [id]);
await db.query(`DELETE FROM lms_student WHERE id = $1`, [id]);
return { id };
}
}
+134
View File
@@ -0,0 +1,134 @@
#!/usr/bin/env bash
# dth_lms.test.sh — e2e verification for S1..S4 of chg_0006 (LMS bootstrap).
# Exit 0 only if all 4 scenarios pass. Each assertion is a hard-fail.
#
# Usage:
# DTH_BASE=http://127.0.0.1:30000 bash tests/e2e/dth_lms.test.sh
#
# Pre-req: backend is running and admin + 2 LMS students / 2 LMS courses seeded.
set -uo pipefail
BASE="${DTH_BASE:-http://127.0.0.1:${PORT:-30000}}"
LOGIN_URL="$BASE/api/ssw/dth/auth/login"
STUDENTS_URL="$BASE/api/ssw/dth/lms/students"
COURSES_URL="$BASE/api/ssw/dth/lms/courses"
# Fixed seed UUIDs (from pglite/init.ts chg_0006 LMS seed)
SEED_STUDENT_ID="11111111-1111-1111-1111-111111111111"
SEED_COURSE_ID="aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa"
pass=0; fail=0; fails=()
json_get() {
local field="$1"; local body="$2"
python3 -c "import json,sys; d=json.loads(sys.argv[1]); print(d${field})" "$body" 2>/dev/null
}
login() {
curl -s -X POST "$LOGIN_URL" -H 'Content-Type: application/json' \
-d "{\"username\":\"$1\",\"password\":\"$2\"}"
}
assert() {
local id="$1"; local cond="$2"; local detail="$3"
if eval "$cond"; then
pass=$((pass+1))
printf " ✓ %s\n" "$id"
else
fail=$((fail+1))
fails+=("$id: $detail")
printf " ✗ %s — %s\n" "$id" "$detail"
fi
}
# ----- pre: login admin -----
ADMIN_BODY="$(login admin 123456)"
ADMIN_TOKEN="$(json_get "['data']['token']" "$ADMIN_BODY")"
assert "pre_admin_login" "[ -n '$ADMIN_TOKEN' ]" "admin token empty; login body=$ADMIN_BODY"
# ----- S1: list ≥2 students with correct schema -----
LIST_STUDENTS_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$STUDENTS_URL")"
LIST_STUDENTS_LEN="$(python3 -c "import json,sys; print(len(json.loads(sys.argv[1])['data']))" "$LIST_STUDENTS_BODY" 2>/dev/null)"
STUDENT_HAS_FIELDS="$(python3 -c "
import json,sys
d=json.loads(sys.argv[1])
need={'id','student_no','name','email','created_at'}
print(all(need.issubset(set(s.keys())) for s in d['data']))
" "$LIST_STUDENTS_BODY")"
HAS_SEED_STUDENT="$(python3 -c "
import json,sys
d=json.loads(sys.argv[1])
ids={s['id'] for s in d['data']}
print('$SEED_STUDENT_ID' in ids)
" "$LIST_STUDENTS_BODY")"
assert "S1_students_ge_2" "[ '$LIST_STUDENTS_LEN' -ge 2 ]" "got $LIST_STUDENTS_LEN"
assert "S1_students_schema_ok" "[ '$STUDENT_HAS_FIELDS' = 'True' ]" "schema missing fields"
assert "S1_students_has_seed_id" "[ '$HAS_SEED_STUDENT' = 'True' ]" "seed student id missing"
# ----- S2: POST /students creates new, then GET /students/:id returns it -----
CREATE_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
-d '{"student_no":"S2026001","name":"张三","email":"[email protected]"}' \
"$STUDENTS_URL")"
NEW_STUDENT_ID="$(json_get "['data']['id']" "$CREATE_BODY")"
NEW_STUDENT_NAME="$(json_get "['data']['name']" "$CREATE_BODY")"
assert "S2_create_id_uuid" "echo '$NEW_STUDENT_ID' | grep -Eq '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$'" "id=$NEW_STUDENT_ID"
assert "S2_create_name_zhangsan" "[ '$NEW_STUDENT_NAME' = '张三' ]" "name=$NEW_STUDENT_NAME"
GET_NEW_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$STUDENTS_URL/$NEW_STUDENT_ID")"
GET_NEW_NAME="$(json_get "['data']['name']" "$GET_NEW_BODY")"
GET_NEW_EMAIL="$(json_get "['data']['email']" "$GET_NEW_BODY")"
GET_NEW_NO="$(json_get "['data']['student_no']" "$GET_NEW_BODY")"
assert "S2_get_name_zhangsan" "[ '$GET_NEW_NAME' = '张三' ]" "name=$GET_NEW_NAME"
assert "S2_get_email_correct" "[ '$GET_NEW_EMAIL' = '[email protected]' ]" "email=$GET_NEW_EMAIL"
assert "S2_get_no_correct" "[ '$GET_NEW_NO' = 'S2026001' ]" "student_no=$GET_NEW_NO"
# ----- S3: list ≥2 courses with correct schema -----
LIST_COURSES_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" "$COURSES_URL")"
LIST_COURSES_LEN="$(python3 -c "import json,sys; print(len(json.loads(sys.argv[1])['data']))" "$LIST_COURSES_BODY" 2>/dev/null)"
COURSE_HAS_FIELDS="$(python3 -c "
import json,sys
d=json.loads(sys.argv[1])
need={'id','code','name','credits','instructor','created_at'}
print(all(need.issubset(set(c.keys())) for c in d['data']))
" "$LIST_COURSES_BODY")"
HAS_SEED_COURSE="$(python3 -c "
import json,sys
d=json.loads(sys.argv[1])
ids={c['id'] for c in d['data']}
print('$SEED_COURSE_ID' in ids)
" "$LIST_COURSES_BODY")"
assert "S3_courses_ge_2" "[ '$LIST_COURSES_LEN' -ge 2 ]" "got $LIST_COURSES_LEN"
assert "S3_courses_schema_ok" "[ '$COURSE_HAS_FIELDS' = 'True' ]" "schema missing fields"
assert "S3_courses_has_seed_id" "[ '$HAS_SEED_COURSE' = 'True' ]" "seed course id missing"
# ----- S4: enroll student → course, then list enrollments shows it -----
ENROLL_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
-d "{\"student_id\":\"$SEED_STUDENT_ID\"}" \
"$COURSES_URL/$SEED_COURSE_ID/enroll")"
ENROLL_CODE="$(json_get "['code']" "$ENROLL_BODY")"
ENROLL_STUDENT_ID="$(json_get "['data']['student_id']" "$ENROLL_BODY")"
ENROLL_COURSE_ID="$(json_get "['data']['course_id']" "$ENROLL_BODY")"
assert "S4_enroll_code_200" "[ '$ENROLL_CODE' = '200' ]" "code=$ENROLL_CODE"
assert "S4_enroll_student_id" "[ '$ENROLL_STUDENT_ID' = '$SEED_STUDENT_ID' ]" "student_id=$ENROLL_STUDENT_ID"
assert "S4_enroll_course_id" "[ '$ENROLL_COURSE_ID' = '$SEED_COURSE_ID' ]" "course_id=$ENROLL_COURSE_ID"
LIST_ENR_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
"$STUDENTS_URL/$SEED_STUDENT_ID/enrollments")"
LIST_ENR_LEN="$(python3 -c "import json,sys; print(len(json.loads(sys.argv[1])['data']))" "$LIST_ENR_BODY" 2>/dev/null)"
HAS_COURSE_IN_LIST="$(python3 -c "
import json,sys
d=json.loads(sys.argv[1])
ids={e['course_id'] for e in d['data']}
print('$SEED_COURSE_ID' in ids)
" "$LIST_ENR_BODY")"
assert "S4_list_enrollments_ge_1" "[ '$LIST_ENR_LEN' -ge 1 ]" "got $LIST_ENR_LEN"
assert "S4_list_enrollments_has_course" "[ '$HAS_COURSE_IN_LIST' = 'True' ]" "course_id not in list"
echo "---"
echo "e2e dth_lms: pass=$pass fail=$fail"
if [ $fail -gt 0 ]; then
printf 'FAILED:\n'; printf ' - %s\n' "${fails[@]}"
exit 1
fi
exit 0