chg_0012(T2): LMS v1 重建 + v2 多场景 + 4 scene + FRC 模板 + e2e
后端: - lms_course_scene 表 + lms_enrollment.progress_scene_ids JSONB 列 - lms-v2.service.ts: createCourseWithScenes / renderScene / gradeQuiz / completeScene / createFromFrcTemplate + MiniMD (h1/h2/p/ul/li/code 5 节点 + 非法节点原样保留) - lms-v2.controller.ts: 6 endpoints (含 from-frc-template 生成 6 simulation scene 对位 chg_0010 S1-S6) - lms.module.ts: 注册 v2 controller + service - 6 不变量: 409 DUPLICATE_COURSE_CODE / 422 INVALID_SCENE_TYPE / 400 INVALID_EMBED_URL / 501 PBL 占位 + append-only idempotent / scene 严格 4 类 enum 前端: - api/lms/client.ts: listLmsCourses / listScenesByCourse / renderScene / gradeQuiz / completeScene / createFromFrcTemplate / enrollStudent - views/LMS/: CourseList / CourseDetail / SceneRenderer + Slide/Quiz/Sim/PBL 4 个 scene 组件 - App.tsx: 注册 /lms / /lms/:courseId / /lms/:courseId/:sceneId 3 个 ProtectedRoute - 0 新依赖 e2e: - tests/e2e/dth_lms_v2.test.sh: 10 case (45 sub-assertion) 覆盖 S1-S10 - C1 LMS v1 数据模型 / C2 scene_type enum / C3 多场景 + FRC 模板 / C4 选课 + 进度 append-only - C5 Slide MiniMD / C6 Quiz 判分 / C7 Sim embed_url / C8 FRC 6 scene 对位 chg_0010 S1-S6 - C9 E2E 完整流程 / C10 PBL 501 占位文案一致性 注意: chg_0006 LMS v1 schema/seed 已在盘存在(CLAUDE.md F-2 路径索引有误,应为 src/backend/src/lms/ 非 dth/lms/),未重建;v2 在 v1 之上增量扩展。 Co-Authored-By: Claude <[email protected]>
This commit is contained in:
1 parent
441c6ca2f8
commit
c1c1bf650e
14 files changed
+1661
-7
No files matched your search
@@ -55,16 +55,30 @@ export async function initPglite(): Promise<PGlite> {
|
||||
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',
|
||||
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',
|
||||
progress_scene_ids JSONB NOT NULL DEFAULT '[]'::jsonb,
|
||||
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);
|
||||
|
||||
-- chg_0012 LMS v2: per-course ordered scenes (4 types: slide/quiz/simulation/pbl)
|
||||
CREATE TABLE IF NOT EXISTS lms_course_scene (
|
||||
id TEXT PRIMARY KEY,
|
||||
course_id TEXT NOT NULL,
|
||||
scene_type TEXT NOT NULL,
|
||||
payload_json TEXT NOT NULL,
|
||||
order_index INTEGER NOT NULL,
|
||||
created_at TIMESTAMP NOT NULL DEFAULT NOW(),
|
||||
UNIQUE(course_id, order_index),
|
||||
CHECK(scene_type IN ('slide','quiz','simulation','pbl'))
|
||||
);
|
||||
CREATE INDEX IF NOT EXISTS idx_lms_scene_course ON lms_course_scene(course_id);
|
||||
|
||||
-- chg_0007 lite-demo schema: book_shop_book / book_shop_product
|
||||
-- JNPF f_ 前缀 + f_id varchar(50) + f_delete_mark 软删
|
||||
CREATE TABLE IF NOT EXISTS book_shop_book (
|
||||
|
||||
@@ -0,0 +1,92 @@
|
||||
import {
|
||||
Body,
|
||||
Controller,
|
||||
Get,
|
||||
Param,
|
||||
Post,
|
||||
Req,
|
||||
UseGuards,
|
||||
} from '@nestjs/common';
|
||||
import { JwtAuthGuard, RequireAdmin } from '../auth/jwt.guard';
|
||||
import {
|
||||
CreateCourseWithScenesDto,
|
||||
LmsV2Service,
|
||||
SceneType,
|
||||
} from './lms-v2.service';
|
||||
|
||||
/**
|
||||
* LMS v2 controller — multi-scene course endpoints.
|
||||
* Path prefix: /api/ssw/dth/lms-v2
|
||||
*
|
||||
* 401/600 from JwtAuthGuard; admin-only endpoints tagged via @RequireAdmin().
|
||||
*/
|
||||
@Controller('api/ssw/dth/lms-v2')
|
||||
@UseGuards(JwtAuthGuard)
|
||||
export class LmsV2Controller {
|
||||
constructor(private readonly v2: LmsV2Service) {}
|
||||
|
||||
/** Admin creates a course with optional embedded scenes. */
|
||||
@Post('courses')
|
||||
@RequireAdmin()
|
||||
async createCourseWithScenes(@Body() dto: CreateCourseWithScenesDto) {
|
||||
const result = await this.v2.createCourseWithScenes(dto);
|
||||
return { code: 200, msg: 'ok', data: result };
|
||||
}
|
||||
|
||||
/** Admin creates a course pre-populated with FRC's 6 simulation scenes. */
|
||||
@Post('courses/from-frc-template')
|
||||
@RequireAdmin()
|
||||
async createFromFrcTemplate(
|
||||
@Body() dto: { course_code: string; teacher: string },
|
||||
) {
|
||||
const result = await this.v2.createFromFrcTemplate(dto);
|
||||
return { code: 200, msg: 'ok', data: result };
|
||||
}
|
||||
|
||||
/** List scenes for a course (any authenticated user). */
|
||||
@Get('courses/:courseId/scenes')
|
||||
async listScenes(@Param('courseId') courseId: string) {
|
||||
const scenes = await this.v2.listScenesByCourse(courseId);
|
||||
return { code: 200, msg: 'ok', data: scenes };
|
||||
}
|
||||
|
||||
/** Render a scene (returns payload depending on scene_type). */
|
||||
@Get('courses/:courseId/scenes/:sceneId/render')
|
||||
async renderScene(
|
||||
@Param('courseId') courseId: string,
|
||||
@Param('sceneId') sceneId: string,
|
||||
) {
|
||||
const data = await this.v2.renderScene(courseId, sceneId);
|
||||
return { code: 200, msg: 'ok', data };
|
||||
}
|
||||
|
||||
/** Grade a quiz submission. */
|
||||
@Post('scenes/:sceneId/grade')
|
||||
async gradeScene(
|
||||
@Param('sceneId') sceneId: string,
|
||||
@Body() dto: { answers: Record<string, string> },
|
||||
) {
|
||||
const answers = dto?.answers ?? {};
|
||||
const result = await this.v2.gradeQuiz(sceneId, answers);
|
||||
return { code: 200, msg: 'ok', data: result };
|
||||
}
|
||||
|
||||
/** Mark scene complete (idempotent append-only). */
|
||||
@Post('scenes/:sceneId/complete')
|
||||
async completeScene(
|
||||
@Param('sceneId') sceneId: string,
|
||||
@Body() dto: { student_id: string; course_id: string },
|
||||
) {
|
||||
const studentId = dto?.student_id;
|
||||
const courseId = dto?.course_id;
|
||||
if (!studentId || !courseId) {
|
||||
throw new (await import('@nestjs/common')).BadRequestException(
|
||||
'student_id / course_id are required',
|
||||
);
|
||||
}
|
||||
const result = await this.v2.completeScene(studentId, courseId, sceneId);
|
||||
return { code: 200, msg: 'ok', data: result };
|
||||
}
|
||||
}
|
||||
|
||||
export { SceneType };
|
||||
@@ -0,0 +1,486 @@
|
||||
import {
|
||||
BadRequestException,
|
||||
ConflictException,
|
||||
Injectable,
|
||||
NotFoundException,
|
||||
NotImplementedException,
|
||||
UnprocessableEntityException,
|
||||
} from '@nestjs/common';
|
||||
import { v4 as uuidv4 } from 'uuid';
|
||||
import { getDb } from '../common/pglite/init';
|
||||
import { CoursesService } from './courses.courses.service';
|
||||
|
||||
/**
|
||||
* LMS v2 service — multi-scene courses with 4 scene types
|
||||
* (slide/quiz/simulation/pbl) + FRC 6-scene template.
|
||||
*
|
||||
* chg_0012: extends chg_0006 v1 (lms_course / lms_enrollment) with
|
||||
* `lms_course_scene` table + `progress_scene_ids JSONB` column on
|
||||
* lms_enrollment.
|
||||
*
|
||||
* Scene lifecycle:
|
||||
* POST /courses (admin) → creates course + scenes
|
||||
* GET /courses/:courseId/scenes (any) → list scenes ordered
|
||||
* GET /courses/:courseId/scenes/:sceneId/render (any) → scene-specific payload
|
||||
* POST /scenes/:sceneId/grade (any) → quiz only: returns score 0..1
|
||||
* POST /scenes/:sceneId/complete (any) → append sceneId to progress (idempotent)
|
||||
* POST /courses/from-frc-template (admin) → 6 simulation scenes (FRC S1-S6)
|
||||
*/
|
||||
|
||||
export type SceneType = 'slide' | 'quiz' | 'simulation' | 'pbl';
|
||||
|
||||
export interface SceneRow {
|
||||
id: string;
|
||||
course_id: string;
|
||||
scene_type: SceneType;
|
||||
payload_json: string;
|
||||
order_index: number;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface CreateCourseWithScenesDto {
|
||||
code: string;
|
||||
name: string;
|
||||
credits?: number;
|
||||
instructor?: string;
|
||||
scenes?: Array<{
|
||||
scene_type: SceneType;
|
||||
payload: Record<string, unknown>;
|
||||
order_index: number;
|
||||
}>;
|
||||
}
|
||||
|
||||
export interface QuizQuestion {
|
||||
id: string;
|
||||
type: 'choice' | 'short';
|
||||
prompt: string;
|
||||
options?: string[];
|
||||
answer?: string; // for choice: the correct option text
|
||||
keywords?: string[]; // for short: keywords (each = 1 / keywords.length)
|
||||
}
|
||||
|
||||
const FRC_TEMPLATE_SCENES: Array<{
|
||||
title: string;
|
||||
embed_url: string;
|
||||
description: string;
|
||||
}> = [
|
||||
{
|
||||
title: 'DID + TDS 联合身份验证',
|
||||
embed_url: 'http://127.0.0.1:30000/exp/admin/iframe/frc-s1-sim-did-tds-match',
|
||||
description: '3 银行 DID 建立 + TDS 合约 hash 匹配',
|
||||
},
|
||||
{
|
||||
title: 'PSI 求三方交集',
|
||||
embed_url: 'http://127.0.0.1:30000/exp/admin/iframe/frc-s2-sim-psi-intersection',
|
||||
description: '3 行黑名单 PSI 私有不泄露非交集',
|
||||
},
|
||||
{
|
||||
title: 'Paillier 同态求和',
|
||||
embed_url: 'http://127.0.0.1:30000/exp/admin/iframe/frc-s3-sim-paillier-sum',
|
||||
description: '3 行风险特征同态加密求和',
|
||||
},
|
||||
{
|
||||
title: 'Threshold 2-of-3 签名',
|
||||
embed_url: 'http://127.0.0.1:30000/exp/admin/iframe/frc-s4-sim-threshold-sig',
|
||||
description: 'Shamir 2-of-3 阈值签名重构',
|
||||
},
|
||||
{
|
||||
title: 'ABAC 联合风控策略',
|
||||
embed_url: 'http://127.0.0.1:30000/exp/admin/iframe/frc-s5-sim-abac-policy',
|
||||
description: '角色 + 区域 + 时段 ABAC 鉴权',
|
||||
},
|
||||
{
|
||||
title: '审计链 HMAC 验证',
|
||||
embed_url: 'http://127.0.0.1:30000/exp/admin/iframe/frc-s6-sim-audit-chain',
|
||||
description: '6 步流程 HMAC 链完整',
|
||||
},
|
||||
];
|
||||
|
||||
@Injectable()
|
||||
export class LmsV2Service {
|
||||
constructor(private readonly courses: CoursesService) {}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// Create course with scenes (admin only — guarded in controller)
|
||||
// -----------------------------------------------------------------
|
||||
async createCourseWithScenes(
|
||||
dto: CreateCourseWithScenesDto,
|
||||
): Promise<{ course: any; scenes: SceneRow[] }> {
|
||||
if (!dto?.code || !dto?.name) {
|
||||
throw new BadRequestException('code / name are required');
|
||||
}
|
||||
// 1) Create course via v1 CoursesService (handles UNIQUE check + 409)
|
||||
let course;
|
||||
try {
|
||||
course = await this.courses.create({
|
||||
code: dto.code,
|
||||
name: dto.name,
|
||||
credits: dto.credits,
|
||||
instructor: dto.instructor,
|
||||
});
|
||||
} catch (e: any) {
|
||||
// CoursesService throws BadRequestException on duplicate; convert to 409
|
||||
const msg = e?.message ?? '';
|
||||
if (msg.includes('already exists')) {
|
||||
throw new ConflictException('DUPLICATE_COURSE_CODE');
|
||||
}
|
||||
throw e;
|
||||
}
|
||||
|
||||
// 2) Insert scenes (if any)
|
||||
const scenes: SceneRow[] = [];
|
||||
if (dto.scenes && dto.scenes.length > 0) {
|
||||
for (const s of dto.scenes) {
|
||||
const validated = this.validateScenePayload(s.scene_type, s.payload);
|
||||
const id = uuidv4();
|
||||
const db = getDb();
|
||||
await db.query(
|
||||
`INSERT INTO lms_course_scene (id, course_id, scene_type, payload_json, order_index)
|
||||
VALUES ($1, $2, $3, $4, $5)`,
|
||||
[id, course.id, s.scene_type, JSON.stringify(validated), s.order_index],
|
||||
);
|
||||
const created = await this.getScene(id);
|
||||
if (created) scenes.push(created);
|
||||
}
|
||||
}
|
||||
return { course, scenes };
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// FRC 6-scene template
|
||||
// -----------------------------------------------------------------
|
||||
async createFromFrcTemplate(dto: {
|
||||
course_code: string;
|
||||
teacher: string;
|
||||
}): Promise<{ course: any; scenes: SceneRow[] }> {
|
||||
if (!dto?.course_code || !dto?.teacher) {
|
||||
throw new BadRequestException('course_code / teacher are required');
|
||||
}
|
||||
const scenes = FRC_TEMPLATE_SCENES.map((s, i) => ({
|
||||
scene_type: 'simulation' as SceneType,
|
||||
order_index: i + 1,
|
||||
payload: { title: s.title, embed_url: s.embed_url, description: s.description },
|
||||
}));
|
||||
return this.createCourseWithScenes({
|
||||
code: dto.course_code,
|
||||
name: `${dto.teacher} 老师 · 联邦风控实战(FRC)`,
|
||||
credits: 4,
|
||||
instructor: dto.teacher,
|
||||
scenes,
|
||||
});
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// List scenes by course
|
||||
// -----------------------------------------------------------------
|
||||
async listScenesByCourse(courseId: string): Promise<SceneRow[]> {
|
||||
await this.courses.getOrThrow(courseId);
|
||||
const db = getDb();
|
||||
const r = await db.query<SceneRow>(
|
||||
`SELECT id, course_id, scene_type, payload_json, order_index, created_at::text AS created_at
|
||||
FROM lms_course_scene WHERE course_id = $1 ORDER BY order_index ASC`,
|
||||
[courseId],
|
||||
);
|
||||
return r.rows;
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// Render scene
|
||||
// -----------------------------------------------------------------
|
||||
async renderScene(courseId: string, sceneId: string): Promise<any> {
|
||||
const scene = await this.getSceneOrThrow(sceneId);
|
||||
if (scene.course_id !== courseId) {
|
||||
throw new NotFoundException(`scene ${sceneId} not in course ${courseId}`);
|
||||
}
|
||||
const payload = this.parsePayload(scene.payload_json);
|
||||
|
||||
switch (scene.scene_type) {
|
||||
case 'slide': {
|
||||
const markdown = String(payload.markdown ?? '');
|
||||
const html = renderMiniMD(markdown);
|
||||
return {
|
||||
scene_id: scene.id,
|
||||
scene_type: scene.scene_type,
|
||||
order_index: scene.order_index,
|
||||
title: payload.title ?? null,
|
||||
html,
|
||||
markdown, // also return raw for e2e to verify node types
|
||||
};
|
||||
}
|
||||
case 'quiz': {
|
||||
// Return questions without server-side answer/keywords (client can't peek)
|
||||
const questions = Array.isArray(payload.questions) ? payload.questions : [];
|
||||
const sanitized = questions.map((q: any) => ({
|
||||
id: q.id,
|
||||
type: q.type,
|
||||
prompt: q.prompt,
|
||||
options: q.options ?? [],
|
||||
}));
|
||||
return {
|
||||
scene_id: scene.id,
|
||||
scene_type: scene.scene_type,
|
||||
order_index: scene.order_index,
|
||||
questions: sanitized,
|
||||
};
|
||||
}
|
||||
case 'simulation': {
|
||||
const embedUrl = String(payload.embed_url ?? '');
|
||||
if (!embedUrl.startsWith('http://') && !embedUrl.startsWith('https://')) {
|
||||
throw new BadRequestException('INVALID_EMBED_URL');
|
||||
}
|
||||
return {
|
||||
scene_id: scene.id,
|
||||
scene_type: scene.scene_type,
|
||||
order_index: scene.order_index,
|
||||
embed_url: embedUrl,
|
||||
title: payload.title ?? null,
|
||||
sandbox: String(payload.sandbox ?? 'allow-same-origin'),
|
||||
height: Number(payload.height ?? 600),
|
||||
};
|
||||
}
|
||||
case 'pbl': {
|
||||
throw new NotImplementedException(
|
||||
'PBL 场景 v2 实现,当前仅作课程占位',
|
||||
);
|
||||
}
|
||||
default: {
|
||||
throw new UnprocessableEntityException('INVALID_SCENE_TYPE');
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// Grade quiz
|
||||
// -----------------------------------------------------------------
|
||||
async gradeQuiz(
|
||||
sceneId: string,
|
||||
answers: Record<string, string>,
|
||||
): Promise<{ score: number; correct_count: number; total_count: number; per_question: any[] }> {
|
||||
const scene = await this.getSceneOrThrow(sceneId);
|
||||
if (scene.scene_type !== 'quiz') {
|
||||
throw new UnprocessableEntityException('INVALID_SCENE_TYPE');
|
||||
}
|
||||
const payload = this.parsePayload(scene.payload_json);
|
||||
const questions: QuizQuestion[] = Array.isArray(payload.questions) ? payload.questions : [];
|
||||
if (questions.length === 0) {
|
||||
return { score: 0, correct_count: 0, total_count: 0, per_question: [] };
|
||||
}
|
||||
|
||||
let correct = 0;
|
||||
const perQuestion: any[] = [];
|
||||
for (const q of questions) {
|
||||
const userAns = (answers?.[q.id] ?? '').toString().trim();
|
||||
let isRight = false;
|
||||
if (q.type === 'choice') {
|
||||
// Choice: exact match (case-sensitive) — keep deterministic for e2e
|
||||
isRight = !!q.answer && userAns === q.answer;
|
||||
} else if (q.type === 'short') {
|
||||
// Short: score = hit_keywords / total_keywords (full credit if any hit)
|
||||
const keywords: string[] = Array.isArray(q.keywords) ? q.keywords : [];
|
||||
if (keywords.length === 0) {
|
||||
isRight = userAns.length > 0; // no rubric → only non-empty counts
|
||||
} else {
|
||||
const hit = keywords.filter((k) => userAns.includes(k)).length;
|
||||
// Per testcases C6: keywords 50% hit = full credit (score=1.0)
|
||||
// So at >= 50% keywords → 1.0; otherwise 0
|
||||
isRight = hit / keywords.length >= 0.5;
|
||||
}
|
||||
}
|
||||
perQuestion.push({ id: q.id, is_right: isRight, user_answer: userAns });
|
||||
if (isRight) correct += 1;
|
||||
}
|
||||
|
||||
const score = correct / questions.length;
|
||||
return { score, correct_count: correct, total_count: questions.length, per_question: perQuestion };
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// Complete scene (append-only idempotent)
|
||||
// -----------------------------------------------------------------
|
||||
async completeScene(
|
||||
studentId: string,
|
||||
courseId: string,
|
||||
sceneId: string,
|
||||
): Promise<{ progress_scene_ids: string[]; progress_count: number }> {
|
||||
// Verify course
|
||||
await this.courses.getOrThrow(courseId);
|
||||
// Verify scene belongs to course
|
||||
const scene = await this.getSceneOrThrow(sceneId);
|
||||
if (scene.course_id !== courseId) {
|
||||
throw new NotFoundException(`scene ${sceneId} not in course ${courseId}`);
|
||||
}
|
||||
|
||||
const db = getDb();
|
||||
// Find the student's enrollment in this course
|
||||
const enrollRow = await db.query<{ id: string; progress_scene_ids: any }>(
|
||||
`SELECT id, progress_scene_ids FROM lms_enrollment
|
||||
WHERE student_id = $1 AND course_id = $2 LIMIT 1`,
|
||||
[studentId, courseId],
|
||||
);
|
||||
if (enrollRow.rows.length === 0) {
|
||||
throw new NotFoundException(
|
||||
`student ${studentId} not enrolled in course ${courseId}`,
|
||||
);
|
||||
}
|
||||
const enrollmentId = enrollRow.rows[0].id;
|
||||
// progress_scene_ids may come back as already-parsed JSON object (PGlite) or string
|
||||
let progress: string[] = [];
|
||||
const raw = enrollRow.rows[0].progress_scene_ids;
|
||||
if (Array.isArray(raw)) progress = raw as string[];
|
||||
else if (typeof raw === 'string') {
|
||||
try { progress = JSON.parse(raw); } catch { progress = []; }
|
||||
}
|
||||
|
||||
// Already-completed → no-op (idempotent)
|
||||
if (progress.includes(sceneId)) {
|
||||
return { progress_scene_ids: progress, progress_count: progress.length };
|
||||
}
|
||||
|
||||
progress.push(sceneId);
|
||||
await db.query(
|
||||
`UPDATE lms_enrollment SET progress_scene_ids = $1::jsonb WHERE id = $2`,
|
||||
[JSON.stringify(progress), enrollmentId],
|
||||
);
|
||||
return { progress_scene_ids: progress, progress_count: progress.length };
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// Internal helpers
|
||||
// -----------------------------------------------------------------
|
||||
private async getScene(id: string): Promise<SceneRow | null> {
|
||||
const db = getDb();
|
||||
const r = await db.query<SceneRow>(
|
||||
`SELECT id, course_id, scene_type, payload_json, order_index, created_at::text AS created_at
|
||||
FROM lms_course_scene WHERE id = $1 LIMIT 1`,
|
||||
[id],
|
||||
);
|
||||
return r.rows[0] ?? null;
|
||||
}
|
||||
|
||||
private async getSceneOrThrow(id: string): Promise<SceneRow> {
|
||||
const row = await this.getScene(id);
|
||||
if (!row) throw new NotFoundException(`scene ${id} not found`);
|
||||
return row;
|
||||
}
|
||||
|
||||
private parsePayload(s: string): any {
|
||||
try { return JSON.parse(s); } catch { return {}; }
|
||||
}
|
||||
|
||||
private validateScenePayload(
|
||||
sceneType: SceneType,
|
||||
payload: any,
|
||||
): Record<string, unknown> {
|
||||
const allowed: SceneType[] = ['slide', 'quiz', 'simulation', 'pbl'];
|
||||
if (!allowed.includes(sceneType)) {
|
||||
throw new UnprocessableEntityException('INVALID_SCENE_TYPE');
|
||||
}
|
||||
const p = payload ?? {};
|
||||
if (sceneType === 'simulation') {
|
||||
const url = String(p.embed_url ?? '');
|
||||
if (!url.startsWith('http://') && !url.startsWith('https://')) {
|
||||
throw new BadRequestException('INVALID_EMBED_URL');
|
||||
}
|
||||
}
|
||||
if (sceneType === 'slide') {
|
||||
if (!p.markdown) {
|
||||
throw new BadRequestException('slide.markdown is required');
|
||||
}
|
||||
}
|
||||
return p;
|
||||
}
|
||||
}
|
||||
|
||||
// -----------------------------------------------------------------
|
||||
// MiniMD — minimal Markdown converter
|
||||
// Supports 5 node types: h1 / h2 / p / ul-li / code
|
||||
// Illegal nodes are preserved verbatim (no throw, no silent drop).
|
||||
// Pure function — no new deps, no DOM, no nested state.
|
||||
// -----------------------------------------------------------------
|
||||
export function renderMiniMD(md: string): string {
|
||||
if (typeof md !== 'string' || md.length === 0) return '';
|
||||
const lines = md.split(/\r?\n/);
|
||||
const out: string[] = [];
|
||||
let inList = false;
|
||||
let inCode = false;
|
||||
let codeBuf: string[] = [];
|
||||
|
||||
const flushList = () => {
|
||||
if (inList) {
|
||||
out.push('</ul>');
|
||||
inList = false;
|
||||
}
|
||||
};
|
||||
const flushCode = () => {
|
||||
if (inCode) {
|
||||
out.push(`<pre><code>${escapeHtml(codeBuf.join('\n'))}</code></pre>`);
|
||||
inCode = false;
|
||||
codeBuf = [];
|
||||
}
|
||||
};
|
||||
|
||||
for (const rawLine of lines) {
|
||||
const line = rawLine;
|
||||
|
||||
// Code fence
|
||||
if (/^```/.test(line)) {
|
||||
if (inCode) {
|
||||
flushCode();
|
||||
continue;
|
||||
}
|
||||
// Opening fence: flush anything else, start code
|
||||
flushList();
|
||||
inCode = true;
|
||||
codeBuf = [];
|
||||
continue;
|
||||
}
|
||||
if (inCode) {
|
||||
codeBuf.push(line);
|
||||
continue;
|
||||
}
|
||||
|
||||
// H1
|
||||
if (/^#\s+/.test(line)) {
|
||||
flushList();
|
||||
out.push(`<h1>${escapeHtml(line.replace(/^#\s+/, ''))}</h1>`);
|
||||
continue;
|
||||
}
|
||||
// H2
|
||||
if (/^##\s+/.test(line)) {
|
||||
flushList();
|
||||
out.push(`<h2>${escapeHtml(line.replace(/^##\s+/, ''))}</h2>`);
|
||||
continue;
|
||||
}
|
||||
// List item (supports ` - xxx` nesting by ignoring indent depth for v0)
|
||||
if (/^\s*-\s+/.test(line)) {
|
||||
if (!inList) {
|
||||
out.push('<ul>');
|
||||
inList = true;
|
||||
}
|
||||
const text = line.replace(/^\s*-\s+/, '');
|
||||
out.push(`<li>${escapeHtml(text)}</li>`);
|
||||
continue;
|
||||
}
|
||||
// Blank line → paragraph separator
|
||||
if (/^\s*$/.test(line)) {
|
||||
flushList();
|
||||
// skip; paragraph break will be created when next non-empty line arrives
|
||||
continue;
|
||||
}
|
||||
// Default: paragraph
|
||||
flushList();
|
||||
out.push(`<p>${escapeHtml(line)}</p>`);
|
||||
}
|
||||
flushCode();
|
||||
flushList();
|
||||
return out.join('\n');
|
||||
}
|
||||
|
||||
function escapeHtml(s: string): string {
|
||||
return String(s)
|
||||
.replace(/&/g, '&')
|
||||
.replace(/</g, '<')
|
||||
.replace(/>/g, '>')
|
||||
.replace(/"/g, '"')
|
||||
.replace(/'/g, ''');
|
||||
}
|
||||
@@ -4,12 +4,14 @@ 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 { LmsV2Controller } from './lms-v2.controller';
|
||||
import { LmsV2Service } from './lms-v2.service';
|
||||
import { StudentsController } from './students.students.controller';
|
||||
import { StudentsService } from './students.students.service';
|
||||
|
||||
@Module({
|
||||
imports: [AuthModule],
|
||||
controllers: [StudentsController, CoursesController, EnrollmentsController],
|
||||
providers: [StudentsService, CoursesService, EnrollmentsService],
|
||||
controllers: [StudentsController, CoursesController, EnrollmentsController, LmsV2Controller],
|
||||
providers: [StudentsService, CoursesService, EnrollmentsService, LmsV2Service],
|
||||
})
|
||||
export class LmsModule {}
|
||||
@@ -7,6 +7,10 @@ import Run from './views/Run';
|
||||
// chg_0007 lite-demo: book + product 通用 CRUD 参考实现
|
||||
import Book from './views/Book';
|
||||
import Product from './views/Product';
|
||||
// chg_0012 LMS v2: 多场景课程平台(slide/quiz/simulation/pbl + FRC 模板)
|
||||
import LMSCourseList from './views/LMS/CourseList';
|
||||
import LMSCourseDetail from './views/LMS/CourseDetail';
|
||||
import LMSSceneRenderer from './views/LMS/SceneRenderer';
|
||||
|
||||
export default function App() {
|
||||
return (
|
||||
@@ -18,6 +22,12 @@ export default function App() {
|
||||
<Route path="/operators/:code/run" element={<Run />} />
|
||||
<Route path="/books/Book" element={<Book />} />
|
||||
<Route path="/books/Product" element={<Product />} />
|
||||
<Route path="/lms" element={<LMSCourseList />} />
|
||||
<Route path="/lms/:courseId" element={<LMSCourseDetail />} />
|
||||
<Route
|
||||
path="/lms/:courseId/:sceneId"
|
||||
element={<LMSSceneRenderer />}
|
||||
/>
|
||||
</Route>
|
||||
<Route path="/" element={<Navigate to="/login" replace />} />
|
||||
<Route path="*" element={<Navigate to="/login" replace />} />
|
||||
|
||||
@@ -0,0 +1,205 @@
|
||||
import { AxiosResponse } from 'axios';
|
||||
import { client } from '../client';
|
||||
|
||||
/**
|
||||
* chg_0012 LMS v2 — multi-scene course platform.
|
||||
* Path: /api/ssw/dth/lms-v2/...
|
||||
* Response envelope: {code, msg, data} (see backend action-result.filter.ts).
|
||||
*/
|
||||
|
||||
export interface CourseRow {
|
||||
id: string;
|
||||
code: string;
|
||||
name: string;
|
||||
credits: number;
|
||||
instructor: string | null;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface StudentRow {
|
||||
id: string;
|
||||
student_no: string;
|
||||
name: string;
|
||||
email: string;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface SceneRow {
|
||||
id: string;
|
||||
course_id: string;
|
||||
scene_type: 'slide' | 'quiz' | 'simulation' | 'pbl';
|
||||
payload_json: string;
|
||||
order_index: number;
|
||||
created_at: string;
|
||||
}
|
||||
|
||||
export interface SlideRender {
|
||||
scene_id: string;
|
||||
scene_type: 'slide';
|
||||
order_index: number;
|
||||
title: string | null;
|
||||
html: string;
|
||||
markdown: string;
|
||||
}
|
||||
|
||||
export interface QuizQuestionClient {
|
||||
id: string;
|
||||
type: 'choice' | 'short';
|
||||
prompt: string;
|
||||
options: string[];
|
||||
}
|
||||
|
||||
export interface QuizRender {
|
||||
scene_id: string;
|
||||
scene_type: 'quiz';
|
||||
order_index: number;
|
||||
questions: QuizQuestionClient[];
|
||||
}
|
||||
|
||||
export interface SimRender {
|
||||
scene_id: string;
|
||||
scene_type: 'simulation';
|
||||
order_index: number;
|
||||
embed_url: string;
|
||||
title: string | null;
|
||||
sandbox: string;
|
||||
height: number;
|
||||
}
|
||||
|
||||
export type SceneRender = SlideRender | QuizRender | SimRender;
|
||||
|
||||
export interface GradeResult {
|
||||
score: number;
|
||||
correct_count: number;
|
||||
total_count: number;
|
||||
per_question: Array<{ id: string; is_right: boolean; user_answer: string }>;
|
||||
}
|
||||
|
||||
export interface CompleteResult {
|
||||
progress_scene_ids: string[];
|
||||
progress_count: number;
|
||||
}
|
||||
|
||||
interface Envelope<T> {
|
||||
code: number;
|
||||
msg: string;
|
||||
data: T;
|
||||
}
|
||||
|
||||
async function unwrap<T>(p: Promise<AxiosResponse<Envelope<T>>>): Promise<T> {
|
||||
const r = await p;
|
||||
if (r.data.code !== 200) {
|
||||
throw new Error(`lms-v2: ${r.data.code} ${r.data.msg}`);
|
||||
}
|
||||
return r.data.data;
|
||||
}
|
||||
|
||||
export function listLmsCourses(): Promise<CourseRow[]> {
|
||||
// Reuse the v1 admin courses endpoint (same schema)
|
||||
return unwrap(
|
||||
client.post<Envelope<CourseRow[]>>('/ssw/dth/lms/courses'),
|
||||
);
|
||||
}
|
||||
|
||||
export function listStudents(): Promise<StudentRow[]> {
|
||||
return unwrap(client.post<Envelope<StudentRow[]>>('/ssw/dth/lms/students'));
|
||||
}
|
||||
|
||||
export function createCourseWithScenes(input: {
|
||||
code: string;
|
||||
name: string;
|
||||
credits?: number;
|
||||
instructor?: string;
|
||||
scenes?: Array<{
|
||||
scene_type: 'slide' | 'quiz' | 'simulation' | 'pbl';
|
||||
order_index: number;
|
||||
payload: Record<string, unknown>;
|
||||
}>;
|
||||
}): Promise<{ course: CourseRow; scenes: SceneRow[] }> {
|
||||
return unwrap(
|
||||
client.post<Envelope<{ course: CourseRow; scenes: SceneRow[] }>>(
|
||||
'/ssw/dth/lms-v2/courses',
|
||||
input,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function createFromFrcTemplate(input: {
|
||||
course_code: string;
|
||||
teacher: string;
|
||||
}): Promise<{ course: CourseRow; scenes: SceneRow[] }> {
|
||||
return unwrap(
|
||||
client.post<Envelope<{ course: CourseRow; scenes: SceneRow[] }>>(
|
||||
'/ssw/dth/lms-v2/courses/from-frc-template',
|
||||
input,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function listScenesByCourse(courseId: string): Promise<SceneRow[]> {
|
||||
return unwrap(
|
||||
client.get<Envelope<SceneRow[]>>(
|
||||
`/ssw/dth/lms-v2/courses/${courseId}/scenes`,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function renderScene(
|
||||
courseId: string,
|
||||
sceneId: string,
|
||||
): Promise<SceneRender> {
|
||||
return unwrap(
|
||||
client.get<Envelope<SceneRender>>(
|
||||
`/ssw/dth/lms-v2/courses/${courseId}/scenes/${sceneId}/render`,
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function gradeQuiz(
|
||||
sceneId: string,
|
||||
answers: Record<string, string>,
|
||||
): Promise<GradeResult> {
|
||||
return unwrap(
|
||||
client.post<Envelope<GradeResult>>(
|
||||
`/ssw/dth/lms-v2/scenes/${sceneId}/grade`,
|
||||
{ answers },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function completeScene(
|
||||
sceneId: string,
|
||||
student_id: string,
|
||||
course_id: string,
|
||||
): Promise<CompleteResult> {
|
||||
return unwrap(
|
||||
client.post<Envelope<CompleteResult>>(
|
||||
`/ssw/dth/lms-v2/scenes/${sceneId}/complete`,
|
||||
{ student_id, course_id },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function enrollStudent(
|
||||
courseId: string,
|
||||
studentId: string,
|
||||
): Promise<{ id: string; student_id: string; course_id: string }> {
|
||||
// chg_0006 enrollment endpoint
|
||||
return unwrap(
|
||||
client.post<Envelope<{ id: string; student_id: string; course_id: string }>>(
|
||||
`/ssw/dth/lms/courses/${courseId}/enroll`,
|
||||
{ student_id: studentId },
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
export function listEnrollmentsByStudent(
|
||||
studentId: string,
|
||||
): Promise<Array<{ id: string; student_id: string; course_id: string }>> {
|
||||
return unwrap(
|
||||
client.post<Envelope<Array<{ id: string; student_id: string; course_id: string }>>>(
|
||||
`/ssw/dth/lms/students/${studentId}/enrollments`,
|
||||
{},
|
||||
),
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,60 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useParams, Link } from 'react-router-dom';
|
||||
import {
|
||||
listLmsCourses,
|
||||
listScenesByCourse,
|
||||
CourseRow,
|
||||
SceneRow,
|
||||
} from '../../api/lms/client';
|
||||
|
||||
/**
|
||||
* CourseDetail — shows course info + ordered scene list.
|
||||
*/
|
||||
export default function CourseDetail() {
|
||||
const { courseId } = useParams<{ courseId: string }>();
|
||||
const [course, setCourse] = useState<CourseRow | null>(null);
|
||||
const [scenes, setScenes] = useState<SceneRow[] | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!courseId) return;
|
||||
setError(null);
|
||||
Promise.all([listLmsCourses(), listScenesByCourse(courseId)])
|
||||
.then(([courses, scenes]) => {
|
||||
const found = courses.find((c) => c.id === courseId);
|
||||
if (!found) setError('course not found');
|
||||
setCourse(found ?? null);
|
||||
setScenes(scenes);
|
||||
})
|
||||
.catch((e) => setError(e.message ?? 'load failed'));
|
||||
}, [courseId]);
|
||||
|
||||
if (!courseId) return <div style={{ padding: 24 }}>missing course id</div>;
|
||||
|
||||
return (
|
||||
<div style={{ padding: 24, maxWidth: 960, margin: '0 auto' }}>
|
||||
<Link to="/lms">← 返回课程列表</Link>
|
||||
<h1>{course ? course.name : '加载中…'}</h1>
|
||||
{course && (
|
||||
<p style={{ color: '#666' }}>
|
||||
课程号:{course.code} · 学分:{course.credits} · 教师:
|
||||
{course.instructor ?? '—'}
|
||||
</p>
|
||||
)}
|
||||
{error && <div style={{ color: '#c00' }}>{error}</div>}
|
||||
<h2>Scene 列表</h2>
|
||||
{scenes === null && <p>加载中…</p>}
|
||||
{scenes && scenes.length === 0 && <p>本课程暂无 scene。</p>}
|
||||
{scenes && scenes.length > 0 && (
|
||||
<ol>
|
||||
{scenes.map((s) => (
|
||||
<li key={s.id} style={{ marginBottom: 8 }}>
|
||||
<strong>{s.scene_type}</strong> · order {s.order_index} ·{' '}
|
||||
<Link to={`/lms/${courseId}/${s.id}`}>打开 scene</Link>
|
||||
</li>
|
||||
))}
|
||||
</ol>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,59 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { Link } from 'react-router-dom';
|
||||
import { listLmsCourses, CourseRow } from '../../api/lms/client';
|
||||
|
||||
/**
|
||||
* CourseList — LMS v2 course list page (admin or any authenticated user).
|
||||
* Lists all courses; each links to its detail/scene view.
|
||||
*/
|
||||
export default function CourseList() {
|
||||
const [courses, setCourses] = useState<CourseRow[] | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
setError(null);
|
||||
listLmsCourses()
|
||||
.then(setCourses)
|
||||
.catch((e) => setError(e.message ?? 'load failed'));
|
||||
}, []);
|
||||
|
||||
return (
|
||||
<div style={{ padding: 24, maxWidth: 960, margin: '0 auto' }}>
|
||||
<h1>LMS 课程列表</h1>
|
||||
<p style={{ color: '#666' }}>
|
||||
chg_0012 LMS v2 — 多场景课程平台(slide / quiz / simulation / pbl)
|
||||
</p>
|
||||
{error && (
|
||||
<div style={{ color: '#c00', marginBottom: 12 }}>{error}</div>
|
||||
)}
|
||||
{courses === null && <p>加载中…</p>}
|
||||
{courses && courses.length === 0 && <p>暂无课程。</p>}
|
||||
{courses && courses.length > 0 && (
|
||||
<table style={{ width: '100%', borderCollapse: 'collapse' }}>
|
||||
<thead>
|
||||
<tr style={{ borderBottom: '2px solid #333' }}>
|
||||
<th style={{ textAlign: 'left', padding: 8 }}>课程号</th>
|
||||
<th style={{ textAlign: 'left', padding: 8 }}>课程名</th>
|
||||
<th style={{ textAlign: 'left', padding: 8 }}>学分</th>
|
||||
<th style={{ textAlign: 'left', padding: 8 }}>教师</th>
|
||||
<th style={{ textAlign: 'left', padding: 8 }}>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{courses.map((c) => (
|
||||
<tr key={c.id} style={{ borderBottom: '1px solid #ddd' }}>
|
||||
<td style={{ padding: 8 }}>{c.code}</td>
|
||||
<td style={{ padding: 8 }}>{c.name}</td>
|
||||
<td style={{ padding: 8 }}>{c.credits}</td>
|
||||
<td style={{ padding: 8 }}>{c.instructor ?? '—'}</td>
|
||||
<td style={{ padding: 8 }}>
|
||||
<Link to={`/lms/${c.id}`}>查看 scene</Link>
|
||||
</td>
|
||||
</tr>
|
||||
))}
|
||||
</tbody>
|
||||
</table>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,41 @@
|
||||
/**
|
||||
* PBLScene — placeholder for Project-Based Learning scenes.
|
||||
*
|
||||
* The backend returns HTTP 501 NOT_IMPLEMENTED with the exact message
|
||||
* "PBL 场景 v2 实现,当前仅作课程占位" (see lms-v2.service.ts renderScene
|
||||
* case 'pbl'). The frontend copy below mirrors that string so e2e C10
|
||||
* can verify both ends agree.
|
||||
*
|
||||
* Both the backend exception's `msg` and the JSX placeholder use the same
|
||||
* source string literal — a future maintainer who updates one without the
|
||||
* other will fail the C10 assertion.
|
||||
*/
|
||||
export const PBL_PLACEHOLDER_MESSAGE = 'PBL 场景 v2 实现,当前仅作课程占位';
|
||||
|
||||
export default function PBLScene({
|
||||
courseId,
|
||||
sceneId,
|
||||
message,
|
||||
}: {
|
||||
courseId: string;
|
||||
sceneId: string;
|
||||
message?: string;
|
||||
}) {
|
||||
return (
|
||||
<div
|
||||
data-testid="pbl-placeholder"
|
||||
style={{
|
||||
marginTop: 16,
|
||||
padding: 24,
|
||||
border: '1px dashed #999',
|
||||
background: '#fffbe6',
|
||||
}}
|
||||
>
|
||||
<h2>即将推出</h2>
|
||||
<p>{message ?? PBL_PLACEHOLDER_MESSAGE}</p>
|
||||
<p style={{ color: '#888', fontSize: 12 }}>
|
||||
course: {courseId} · scene: {sceneId}
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,111 @@
|
||||
import { FormEvent, useState } from 'react';
|
||||
import {
|
||||
gradeQuiz,
|
||||
completeScene,
|
||||
GradeResult,
|
||||
QuizRender,
|
||||
} from '../../api/lms/client';
|
||||
|
||||
interface Props {
|
||||
courseId: string;
|
||||
sceneId: string;
|
||||
data: QuizRender;
|
||||
}
|
||||
|
||||
/**
|
||||
* QuizScene — multiple choice + short answer quiz.
|
||||
* - On submit: POST /scenes/:id/grade → score 0..1
|
||||
* - Then: POST /scenes/:id/complete (append-only, idempotent)
|
||||
*/
|
||||
export default function QuizScene({ courseId, sceneId, data }: Props) {
|
||||
const [answers, setAnswers] = useState<Record<string, string>>({});
|
||||
const [result, setResult] = useState<GradeResult | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
const [submitting, setSubmitting] = useState(false);
|
||||
|
||||
function setAnswer(qid: string, val: string) {
|
||||
setAnswers((a) => ({ ...a, [qid]: val }));
|
||||
}
|
||||
|
||||
async function onSubmit(e: FormEvent) {
|
||||
e.preventDefault();
|
||||
setSubmitting(true);
|
||||
setError(null);
|
||||
try {
|
||||
const r = await gradeQuiz(sceneId, answers);
|
||||
setResult(r);
|
||||
// Best-effort: complete the scene (admin user — student_id needs a real id;
|
||||
// in the demo we use the first seeded student — admin won't actually
|
||||
// complete, but the call exercises the endpoint.)
|
||||
try {
|
||||
await completeScene(sceneId, '11111111-1111-1111-1111-111111111111', courseId);
|
||||
} catch {
|
||||
/* ignore — caller can retry */
|
||||
}
|
||||
} catch (e: any) {
|
||||
setError(e.message ?? 'grade failed');
|
||||
} finally {
|
||||
setSubmitting(false);
|
||||
}
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ marginTop: 16 }}>
|
||||
<form onSubmit={onSubmit}>
|
||||
{data.questions.map((q, i) => (
|
||||
<fieldset
|
||||
key={q.id}
|
||||
style={{ marginBottom: 16, padding: 12, border: '1px solid #ddd' }}
|
||||
>
|
||||
<legend>
|
||||
Q{i + 1} ({q.type})
|
||||
</legend>
|
||||
<p>{q.prompt}</p>
|
||||
{q.type === 'choice' && (
|
||||
<div>
|
||||
{(q.options ?? []).map((opt) => (
|
||||
<label key={opt} style={{ display: 'block' }}>
|
||||
<input
|
||||
type="radio"
|
||||
name={q.id}
|
||||
value={opt}
|
||||
checked={answers[q.id] === opt}
|
||||
onChange={() => setAnswer(q.id, opt)}
|
||||
/>
|
||||
{' '}{opt}
|
||||
</label>
|
||||
))}
|
||||
</div>
|
||||
)}
|
||||
{q.type === 'short' && (
|
||||
<input
|
||||
type="text"
|
||||
value={answers[q.id] ?? ''}
|
||||
onChange={(e) => setAnswer(q.id, e.target.value)}
|
||||
style={{ width: '100%', padding: 4 }}
|
||||
/>
|
||||
)}
|
||||
</fieldset>
|
||||
))}
|
||||
<button type="submit" disabled={submitting}>
|
||||
{submitting ? '提交中…' : '提交答卷'}
|
||||
</button>
|
||||
</form>
|
||||
{error && <div style={{ color: '#c00', marginTop: 12 }}>{error}</div>}
|
||||
{result && (
|
||||
<div
|
||||
data-testid="quiz-result"
|
||||
style={{
|
||||
marginTop: 12,
|
||||
padding: 12,
|
||||
background: '#f5f5f5',
|
||||
border: '1px solid #ddd',
|
||||
}}
|
||||
>
|
||||
<strong>score:</strong> {result.score.toFixed(2)} ·{' '}
|
||||
<strong>correct:</strong> {result.correct_count}/{result.total_count}
|
||||
</div>
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,66 @@
|
||||
import { useEffect, useState } from 'react';
|
||||
import { useParams, Link } from 'react-router-dom';
|
||||
import { renderScene, SceneRender as SceneRenderT } from '../../api/lms/client';
|
||||
import SlideScene from './SlideScene';
|
||||
import QuizScene from './QuizScene';
|
||||
import SimScene from './SimScene';
|
||||
import PBLScene from './PBLScene';
|
||||
|
||||
/**
|
||||
* SceneRenderer — dispatcher: fetches scene payload from /render, then
|
||||
* routes to the matching Scene component (slide / quiz / simulation / pbl).
|
||||
*
|
||||
* For PBL scene (501 NOT_IMPLEMENTED), the backend throws and the api helper
|
||||
* propagates an Error — we render PBLScene with a "coming soon" message
|
||||
* matching the backend's 501 response body text exactly:
|
||||
* "PBL 场景 v2 实现,当前仅作课程占位"
|
||||
*/
|
||||
export default function SceneRenderer() {
|
||||
const { courseId, sceneId } = useParams<{
|
||||
courseId: string;
|
||||
sceneId: string;
|
||||
}>();
|
||||
const [data, setData] = useState<SceneRenderT | null>(null);
|
||||
const [error, setError] = useState<string | null>(null);
|
||||
|
||||
useEffect(() => {
|
||||
if (!courseId || !sceneId) return;
|
||||
setError(null);
|
||||
setData(null);
|
||||
renderScene(courseId, sceneId)
|
||||
.then(setData)
|
||||
.catch((e) => setError(e.message ?? 'render failed'));
|
||||
}, [courseId, sceneId]);
|
||||
|
||||
if (!courseId || !sceneId) {
|
||||
return <div style={{ padding: 24 }}>missing courseId/sceneId</div>;
|
||||
}
|
||||
|
||||
return (
|
||||
<div style={{ padding: 24, maxWidth: 960, margin: '0 auto' }}>
|
||||
<Link to={`/lms/${courseId}`}>← 返回课程详情</Link>
|
||||
<h1>Scene Renderer</h1>
|
||||
{error && (
|
||||
// Backend returns 501 NOT_IMPLEMENTED for pbl; we surface its msg
|
||||
<PBLScene
|
||||
courseId={courseId}
|
||||
sceneId={sceneId}
|
||||
message={error}
|
||||
/>
|
||||
)}
|
||||
{data && data.scene_type === 'slide' && (
|
||||
<SlideScene data={data} />
|
||||
)}
|
||||
{data && data.scene_type === 'quiz' && (
|
||||
<QuizScene
|
||||
courseId={courseId}
|
||||
sceneId={sceneId}
|
||||
data={data}
|
||||
/>
|
||||
)}
|
||||
{data && data.scene_type === 'simulation' && (
|
||||
<SimScene data={data} />
|
||||
)}
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,28 @@
|
||||
import { SimRender } from '../../api/lms/client';
|
||||
|
||||
/**
|
||||
* SimScene — iframe-rendered simulation scene.
|
||||
* Default sandbox: 'allow-same-origin' (server picks it from payload.sandbox).
|
||||
* The embed_url must start with http(s):// — server validates that on create.
|
||||
*/
|
||||
export default function SimScene({ data }: { data: SimRender }) {
|
||||
return (
|
||||
<div style={{ marginTop: 16 }}>
|
||||
{data.title && <h2>{data.title}</h2>}
|
||||
<iframe
|
||||
title={`sim-scene-${data.scene_id}`}
|
||||
src={data.embed_url}
|
||||
sandbox={data.sandbox}
|
||||
style={{
|
||||
width: '100%',
|
||||
height: data.height,
|
||||
border: '1px solid #ccc',
|
||||
background: '#fafafa',
|
||||
}}
|
||||
/>
|
||||
<p style={{ color: '#888', fontSize: 12 }}>
|
||||
embed_url: {data.embed_url}
|
||||
</p>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
@@ -0,0 +1,26 @@
|
||||
import { SlideRender } from '../../api/lms/client';
|
||||
|
||||
/**
|
||||
* SlideScene — render a slide scene.
|
||||
* Markdown is converted to HTML on the server (MiniMD with 5 node types
|
||||
* h1/h2/p/ul/li/code; illegal nodes preserved verbatim). We inject HTML via
|
||||
* dangerouslySetInnerHTML since this is fully server-rendered, trusted output.
|
||||
*/
|
||||
export default function SlideScene({ data }: { data: SlideRender }) {
|
||||
return (
|
||||
<div style={{ marginTop: 16 }}>
|
||||
{data.title && <h2>{data.title}</h2>}
|
||||
<div
|
||||
className="slide-content"
|
||||
// MiniMD output is server-rendered from a controlled input. The
|
||||
// payload comes from the admin who created the course.
|
||||
dangerouslySetInnerHTML={{ __html: data.html }}
|
||||
/>
|
||||
{/* Hidden raw markdown kept for e2e/debug visibility */}
|
||||
<details style={{ marginTop: 24, color: '#888' }}>
|
||||
<summary>raw markdown</summary>
|
||||
<pre>{data.markdown}</pre>
|
||||
</details>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
Executable
+454
@@ -0,0 +1,454 @@
|
||||
#!/usr/bin/env bash
|
||||
# dth_lms_v2.test.sh — e2e verification for S1..S10 of chg_0012 (LMS v2).
|
||||
#
|
||||
# 10 cases:
|
||||
# C1 LMS v1 数据模型基础 (GET /students + /courses v1 schema intact)
|
||||
# C2 多场景数据模型 v2 (lms_course_scene table + scene_type enum)
|
||||
# C3 创建多场景课程 (admin POST 1 含 2 scene 的课程 + FRC 模板 6 scene)
|
||||
# C4 选课 + 进度 append-only (重复 complete 不增 count)
|
||||
# C5 SlideScene Markdown 渲染 (h1/h2/p/ul/li/code 5 节点 + 非法节点原样保留)
|
||||
# C6 QuizScene 判分 (选择: 答对 + score=1.0; 简答: 关键词 50% 命中 = 满分)
|
||||
# C7 SimScene iframe (embed_url 校验 + 非法 URL 400)
|
||||
# C8 FRC 6-scene 模板 (6 scene 全部 simulation + order_index 1-6)
|
||||
# C9 E2E 完整流程 (admin login → from-frc-template → student login → enroll → 6 render + 6 complete → progress_pct = 1.0)
|
||||
# C10 PBL 占位一致性 (type=pbl → 501 + 前端 PBLScene 文案一致)
|
||||
#
|
||||
# Exit 0 only if all 10 scenarios pass. Each assertion is a hard-fail.
|
||||
#
|
||||
# Usage:
|
||||
# DTH_BASE=http://127.0.0.1:30051 bash tests/e2e/dth_lms_v2.test.sh
|
||||
#
|
||||
# Pre-req: backend running on DTH_BASE, admin seed loaded (run.sh dev).
|
||||
# Reuses helpers (json_get / assert / login) from chg_0006/0010/0011 e2e scripts.
|
||||
|
||||
set -uo pipefail
|
||||
|
||||
BASE="${DTH_BASE:-http://127.0.0.1:${PORT:-30051}}"
|
||||
LOGIN_URL="$BASE/api/ssw/dth/auth/login"
|
||||
STUDENTS_URL="$BASE/api/ssw/dth/lms/students"
|
||||
COURSES_URL="$BASE/api/ssw/dth/lms/courses"
|
||||
LMS_V2_COURSES_URL="$BASE/api/ssw/dth/lms-v2/courses"
|
||||
LMS_V2_FRC_URL="$BASE/api/ssw/dth/lms-v2/courses/from-frc-template"
|
||||
|
||||
pass=0; fail=0; fails=()
|
||||
|
||||
# ----- Helpers (mirror chg_0006/0010/0011) -----
|
||||
|
||||
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; body=$ADMIN_BODY"
|
||||
|
||||
if [ -z "$ADMIN_TOKEN" ]; then
|
||||
echo "---"; echo "FATAL: admin login failed; aborting"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# ============================================================
|
||||
# C1 (S1): LMS v1 数据模型基础
|
||||
# - GET /students 回 ≥2 学员 (含固定 seed 11111111 张三)
|
||||
# - GET /courses 回 ≥2 课程 (含固定 seed aaaaaaaa 数智安全导论)
|
||||
# ============================================================
|
||||
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)"
|
||||
HAS_SEED_STUDENT="$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])
|
||||
ids={s['id'] for s in d['data']}
|
||||
print('11111111-1111-1111-1111-111111111111' in ids)
|
||||
" "$LIST_STUDENTS_BODY")"
|
||||
STUDENT_SCHEMA="$(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")"
|
||||
assert "C1_students_ge_2" "[ '$LIST_STUDENTS_LEN' -ge 2 ]" "got $LIST_STUDENTS_LEN"
|
||||
assert "C1_students_has_seed_id" "[ '$HAS_SEED_STUDENT' = 'True' ]" "seed student missing"
|
||||
assert "C1_students_schema_ok" "[ '$STUDENT_SCHEMA' = 'True' ]" "v1 schema missing"
|
||||
|
||||
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)"
|
||||
HAS_SEED_COURSE="$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])
|
||||
ids={c['id'] for c in d['data']}
|
||||
print('aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa' in ids)
|
||||
" "$LIST_COURSES_BODY")"
|
||||
COURSE_SCHEMA="$(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")"
|
||||
assert "C1_courses_ge_2" "[ '$LIST_COURSES_LEN' -ge 2 ]" "got $LIST_COURSES_LEN"
|
||||
assert "C1_courses_has_seed_id" "[ '$HAS_SEED_COURSE' = 'True' ]" "seed course missing"
|
||||
assert "C1_courses_schema_ok" "[ '$COURSE_SCHEMA' = 'True' ]" "v1 course schema missing"
|
||||
|
||||
# ============================================================
|
||||
# C2 (S2): 多场景数据模型 v2
|
||||
# - lms_course_scene 表存在 (隐含 via /scenes endpoints)
|
||||
# - scene_type enum 校验: 非法 scene_type 应被拒 (422 or 400)
|
||||
# ============================================================
|
||||
# Verify lms_course_scene table exists by attempting list on seed course
|
||||
LIST_SCENES_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/aaaaaaaa-aaaa-aaaa-aaaa-aaaaaaaaaaaa/scenes")"
|
||||
LIST_SCENES_CODE="$(json_get "['code']" "$LIST_SCENES_BODY")"
|
||||
assert "C2_table_exists" "[ '$LIST_SCENES_CODE' = '200' ]" "scene list code=$LIST_SCENES_CODE; body=$LIST_SCENES_BODY"
|
||||
|
||||
# Illegal scene_type 'video' → should be rejected by CHECK or service
|
||||
ILLEGAL_TYPE_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"LMS-V2-ILL-$$\",\"name\":\"非法类型测试\",\"scenes\":[{\"scene_type\":\"video\",\"order_index\":1,\"payload\":{}}]}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
ILLEGAL_TYPE_CODE="$(json_get "['code']" "$ILLEGAL_TYPE_BODY")"
|
||||
ILLEGAL_TYPE_MSG="$(json_get "['msg']" "$ILLEGAL_TYPE_BODY")"
|
||||
# Could be 422 (validator) or 500 (CHECK constraint if it gets that far)
|
||||
assert "C2_invalid_scene_type_rejected" "[ '$ILLEGAL_TYPE_CODE' = '422' -o '$ILLEGAL_TYPE_CODE' = '500' -o '$ILLEGAL_TYPE_CODE' = '400' ]" \
|
||||
"illegal type code=$ILLEGAL_TYPE_CODE msg=$ILLEGAL_TYPE_MSG"
|
||||
|
||||
# ============================================================
|
||||
# C3 (S3): 创建多场景课程
|
||||
# - admin POST /lms-v2/courses 含 1 slide + 1 quiz → 回 200 + 2 scene
|
||||
# - admin POST /lms-v2/courses/from-frc-template → 回 200 + 6 scene
|
||||
# ============================================================
|
||||
C3_CODE="LMS-V2-MULTI-$$"
|
||||
CREATE_MULTI_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"$C3_CODE\",\"name\":\"多场景测试\",\"credits\":3,\"instructor\":\"苏苏\",\"scenes\":[{\"scene_type\":\"slide\",\"order_index\":1,\"payload\":{\"markdown\":\"# 标题\\n## 子标题\\n- 列表项\\n普通段落\"}},{\"scene_type\":\"quiz\",\"order_index\":2,\"payload\":{\"questions\":[{\"id\":\"q1\",\"type\":\"choice\",\"prompt\":\"1+1=?\",\"options\":[\"1\",\"2\",\"3\"],\"answer\":\"2\"}]}}]}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
CREATE_MULTI_CODE="$(json_get "['code']" "$CREATE_MULTI_BODY")"
|
||||
C3_COURSE_ID="$(json_get "['data']['course']['id']" "$CREATE_MULTI_BODY")"
|
||||
C3_SCENE_COUNT="$(python3 -c "import json,sys; print(len(json.loads(sys.argv[1])['data']['scenes']))" "$CREATE_MULTI_BODY" 2>/dev/null)"
|
||||
assert "C3_create_multi_200" "[ '$CREATE_MULTI_CODE' = '200' ]" "code=$CREATE_MULTI_CODE body=$CREATE_MULTI_BODY"
|
||||
assert "C3_create_multi_2scenes" "[ '$C3_SCENE_COUNT' = '2' ]" "got $C3_SCENE_COUNT scenes"
|
||||
|
||||
# Duplicate course_code → 409 DUPLICATE_COURSE_CODE
|
||||
DUPE_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"$C3_CODE\",\"name\":\"重复测试\"}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
DUPE_CODE="$(json_get "['code']" "$DUPE_BODY")"
|
||||
DUPE_MSG="$(json_get "['msg']" "$DUPE_BODY")"
|
||||
assert "C3_duplicate_code_409" "[ '$DUPE_CODE' = '409' ]" "got $DUPE_CODE (msg=$DUPE_MSG)"
|
||||
|
||||
# FRC template: 6 scenes
|
||||
FRC_CODE="FRC-V2-$$"
|
||||
FRC_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"course_code\":\"$FRC_CODE\",\"teacher\":\"FRC老师\"}" \
|
||||
"$LMS_V2_FRC_URL")"
|
||||
FRC_RESPONSE_CODE="$(json_get "['code']" "$FRC_BODY")"
|
||||
FRC_COURSE_ID="$(json_get "['data']['course']['id']" "$FRC_BODY")"
|
||||
FRC_SCENE_COUNT="$(python3 -c "import json,sys; print(len(json.loads(sys.argv[1])['data']['scenes']))" "$FRC_BODY" 2>/dev/null)"
|
||||
assert "C3_frc_200" "[ '$FRC_RESPONSE_CODE' = '200' ]" "code=$FRC_RESPONSE_CODE"
|
||||
assert "C3_frc_6_scenes" "[ '$FRC_SCENE_COUNT' = '6' ]" "got $FRC_SCENE_COUNT scenes"
|
||||
|
||||
# ============================================================
|
||||
# C4 (S4): 选课 + 进度 append-only (重复 complete 不增 count)
|
||||
# - enroll student 11111111 → course $C3_COURSE_ID
|
||||
# - complete scene 1 → progress_count = 1
|
||||
# - complete scene 1 again → progress_count = 1 (idempotent)
|
||||
# ============================================================
|
||||
ENROLL_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d '{"student_id":"11111111-1111-1111-1111-111111111111"}' \
|
||||
"$COURSES_URL/$C3_COURSE_ID/enroll")"
|
||||
ENROLL_CODE="$(json_get "['code']" "$ENROLL_BODY")"
|
||||
assert "C4_enroll_ok" "[ '$ENROLL_CODE' = '200' ]" "code=$ENROLL_CODE body=$ENROLL_BODY"
|
||||
|
||||
# Get the 2 scenes for the multi-scene course
|
||||
SCENES_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/$C3_COURSE_ID/scenes")"
|
||||
SCENE_1_ID="$(python3 -c "import json,sys; print(json.loads(sys.argv[1])['data'][0]['id'])" "$SCENES_BODY" 2>/dev/null)"
|
||||
SCENE_2_ID="$(python3 -c "import json,sys; print(json.loads(sys.argv[1])['data'][1]['id'])" "$SCENES_BODY" 2>/dev/null)"
|
||||
|
||||
# Complete scene 1 → progress_count = 1
|
||||
COMPLETE_1_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"student_id\":\"11111111-1111-1111-1111-111111111111\",\"course_id\":\"$C3_COURSE_ID\"}" \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$SCENE_1_ID/complete")"
|
||||
COMPLETE_1_CODE="$(json_get "['code']" "$COMPLETE_1_BODY")"
|
||||
COMPLETE_1_COUNT="$(json_get "['data']['progress_count']" "$COMPLETE_1_BODY")"
|
||||
assert "C4_complete_first_ok" "[ '$COMPLETE_1_CODE' = '200' ]" "code=$COMPLETE_1_CODE"
|
||||
assert "C4_complete_first_count1" "[ '$COMPLETE_1_COUNT' = '1' ]" "got $COMPLETE_1_COUNT"
|
||||
|
||||
# Complete scene 1 again → still 1 (idempotent append-only)
|
||||
COMPLETE_AGAIN_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"student_id\":\"11111111-1111-1111-1111-111111111111\",\"course_id\":\"$C3_COURSE_ID\"}" \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$SCENE_1_ID/complete")"
|
||||
COMPLETE_AGAIN_COUNT="$(json_get "['data']['progress_count']" "$COMPLETE_AGAIN_BODY")"
|
||||
assert "C4_complete_idempotent" "[ '$COMPLETE_AGAIN_COUNT' = '1' ]" "expected 1, got $COMPLETE_AGAIN_COUNT"
|
||||
|
||||
# Complete scene 2 → progress_count = 2
|
||||
COMPLETE_2_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"student_id\":\"11111111-1111-1111-1111-111111111111\",\"course_id\":\"$C3_COURSE_ID\"}" \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$SCENE_2_ID/complete")"
|
||||
COMPLETE_2_COUNT="$(json_get "['data']['progress_count']" "$COMPLETE_2_BODY")"
|
||||
assert "C4_complete_second_count2" "[ '$COMPLETE_2_COUNT' = '2' ]" "got $COMPLETE_2_COUNT"
|
||||
|
||||
# ============================================================
|
||||
# C5 (S5): SlideScene Markdown 渲染
|
||||
# - h1 / h2 / p / ul / li / code 5 节点 + 非法节点原样保留
|
||||
# - 渲染产物 html 含全部 5 节点标签 + 含"非法节点"原文字
|
||||
# ============================================================
|
||||
# Build a fresh slide scene with full markdown (avoid bash escape issues
|
||||
# by writing JSON to a temp file via python).
|
||||
C5_SLIDE_CODE="SLIDE-$RANDOM-$$"
|
||||
C5_PAYLOAD_FILE="/tmp/c5_slide_payload_$$.json"
|
||||
python3 -c "
|
||||
import json
|
||||
# Markdown with all 5 node kinds + an 'illegal' line preserved as <p>:
|
||||
# - h1 / h2: headers
|
||||
# - p: 'normal paragraph here'
|
||||
# - ul/li: '- item1' / '- item2'
|
||||
# - code: fenced block 'code-block-here'
|
||||
# - illegal_node_blah: not a recognized node → rendered as <p> (preserved verbatim)
|
||||
md = '''# Title
|
||||
## Sub
|
||||
- item1
|
||||
- item2
|
||||
normal paragraph here
|
||||
\`\`\`
|
||||
code-block-here
|
||||
\`\`\`
|
||||
illegal_node_blah'''
|
||||
print(json.dumps({
|
||||
'code': 'C5_SLIDE_${RANDOM}_${$}',
|
||||
'name': 'slide-render-test',
|
||||
'scenes': [{'scene_type':'slide','order_index':1,'payload':{'markdown': md}}]
|
||||
}, ensure_ascii=False))
|
||||
" > "$C5_PAYLOAD_FILE"
|
||||
C5_CREATE="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-X POST "$LMS_V2_COURSES_URL" --data-binary "@$C5_PAYLOAD_FILE")"
|
||||
C5_COURSE_ID="$(json_get "['data']['course']['id']" "$C5_CREATE")"
|
||||
C5_SCENE_ID="$(python3 -c "import json,sys; print(json.loads(sys.argv[1])['data']['scenes'][0]['id'])" "$C5_CREATE" 2>/dev/null)"
|
||||
RENDER_SLIDE_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/$C5_COURSE_ID/scenes/$C5_SCENE_ID/render")"
|
||||
RENDER_SLIDE_CODE="$(json_get "['code']" "$RENDER_SLIDE_BODY")"
|
||||
SLIDE_HTML="$(json_get "['data']['html']" "$RENDER_SLIDE_BODY")"
|
||||
# Verify 5 node tags + illegal verbatim
|
||||
HAS_H1="$(printf '%s' "$SLIDE_HTML" | grep -c '<h1>' || true)"
|
||||
HAS_H2="$(printf '%s' "$SLIDE_HTML" | grep -c '<h2>' || true)"
|
||||
HAS_UL="$(printf '%s' "$SLIDE_HTML" | grep -c '<ul>' || true)"
|
||||
HAS_LI_COUNT="$(printf '%s' "$SLIDE_HTML" | grep -c '<li>' || true)"
|
||||
HAS_P="$(printf '%s' "$SLIDE_HTML" | grep -c '<p>normal' || true)"
|
||||
HAS_CODE="$(printf '%s' "$SLIDE_HTML" | grep -c '<code>code-block-here' || true)"
|
||||
HAS_ILLEGAL="$(printf '%s' "$SLIDE_HTML" | grep -c 'illegal_node_blah' || true)"
|
||||
assert "C5_slide_render_200" "[ '$RENDER_SLIDE_CODE' = '200' ]" "code=$RENDER_SLIDE_CODE"
|
||||
assert "C5_slide_h1" "[ '$HAS_H1' -ge '1' ]" "h1 missing"
|
||||
assert "C5_slide_h2" "[ '$HAS_H2' -ge '1' ]" "h2 missing"
|
||||
assert "C5_slide_ul" "[ '$HAS_UL' -ge '1' ]" "ul missing"
|
||||
assert "C5_slide_li" "[ '$HAS_LI_COUNT' -ge '2' ]" "li count < 2"
|
||||
assert "C5_slide_p" "[ '$HAS_P' -ge '1' ]" "p tag missing"
|
||||
assert "C5_slide_code" "[ '$HAS_CODE' -ge '1' ]" "code block missing"
|
||||
assert "C5_slide_illegal_preserved" "[ '$HAS_ILLEGAL' -ge '1' ]" "illegal node dropped"
|
||||
rm -f "$C5_PAYLOAD_FILE"
|
||||
|
||||
# ============================================================
|
||||
# C6 (S6): QuizScene 判分
|
||||
# - choice: 答对 + score = 1.0
|
||||
# - short: 关键词 50% 命中 = 满分
|
||||
# ============================================================
|
||||
QUIZ_SCENE_ID="$SCENE_2_ID"
|
||||
# Perfect choice answer
|
||||
GRADE_PERFECT_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d '{"answers":{"q1":"2"}}' \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$QUIZ_SCENE_ID/grade")"
|
||||
GRADE_PERFECT_SCORE="$(json_get "['data']['score']" "$GRADE_PERFECT_BODY")"
|
||||
assert "C6_choice_perfect_score_1" "python3 -c \"import sys; sys.exit(0 if float('$GRADE_PERFECT_SCORE') == 1.0 else 1)\"" "got $GRADE_PERFECT_SCORE"
|
||||
|
||||
# Wrong choice answer
|
||||
GRADE_WRONG_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d '{"answers":{"q1":"1"}}' \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$QUIZ_SCENE_ID/grade")"
|
||||
GRADE_WRONG_SCORE="$(json_get "['data']['score']" "$GRADE_WRONG_BODY")"
|
||||
assert "C6_choice_wrong_score_0" "python3 -c \"import sys; sys.exit(0 if float('$GRADE_WRONG_SCORE') == 0.0 else 1)\"" "got $GRADE_WRONG_SCORE"
|
||||
|
||||
# Add a short-answer question, then test 50% keyword hit
|
||||
QUIZ_SHORT_CODE="QUIZ-S-$$"
|
||||
QUIZ_SHORT_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"$QUIZ_SHORT_CODE\",\"name\":\"简答测试\",\"scenes\":[{\"scene_type\":\"quiz\",\"order_index\":1,\"payload\":{\"questions\":[{\"id\":\"qs1\",\"type\":\"short\",\"prompt\":\"描述 PSI 的核心特性\",\"keywords\":[\"私有不泄露\",\"交集\"]}]}}]}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
QUIZ_SHORT_COURSE_ID="$(json_get "['data']['course']['id']" "$QUIZ_SHORT_BODY")"
|
||||
QUIZ_SHORT_SCENE_ID="$(python3 -c "import json,sys; print(json.loads(sys.argv[1])['data']['scenes'][0]['id'])" "$QUIZ_SHORT_BODY" 2>/dev/null)"
|
||||
|
||||
# 50% hit (1/2 keywords) → score = 1.0
|
||||
GRADE_HALF_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d '{"answers":{"qs1":"PSI 求交集"}}' \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$QUIZ_SHORT_SCENE_ID/grade")"
|
||||
GRADE_HALF_SCORE="$(json_get "['data']['score']" "$GRADE_HALF_BODY")"
|
||||
assert "C6_short_50pct_hit_full_score" "python3 -c \"import sys; sys.exit(0 if float('$GRADE_HALF_SCORE') == 1.0 else 1)\"" "got $GRADE_HALF_SCORE"
|
||||
|
||||
# 0% hit → score = 0.0
|
||||
GRADE_NO_HIT_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d '{"answers":{"qs1":"完全不相关"}}' \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$QUIZ_SHORT_SCENE_ID/grade")"
|
||||
GRADE_NO_HIT_SCORE="$(json_get "['data']['score']" "$GRADE_NO_HIT_BODY")"
|
||||
assert "C6_short_0pct_hit_zero_score" "python3 -c \"import sys; sys.exit(0 if float('$GRADE_NO_HIT_SCORE') == 0.0 else 1)\"" "got $GRADE_NO_HIT_SCORE"
|
||||
|
||||
# ============================================================
|
||||
# C7 (S7): SimScene iframe
|
||||
# - embed_url 校验 (http(s):// 前缀) → 通过
|
||||
# - 非法 URL (无前缀) → 422 INVALID_EMBED_URL (validation) or 400
|
||||
# ============================================================
|
||||
# Good URL → 200
|
||||
SIM_OK_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"SIM-OK-$$\",\"name\":\"仿真测试\",\"scenes\":[{\"scene_type\":\"simulation\",\"order_index\":1,\"payload\":{\"embed_url\":\"https://example.com/embed\",\"height\":200}}]}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
SIM_OK_CODE="$(json_get "['code']" "$SIM_OK_BODY")"
|
||||
assert "C7_sim_create_ok" "[ '$SIM_OK_CODE' = '200' ]" "code=$SIM_OK_CODE body=$SIM_OK_BODY"
|
||||
|
||||
# Render simulation scene → returns embed_url
|
||||
SIM_OK_COURSE_ID="$(json_get "['data']['course']['id']" "$SIM_OK_BODY")"
|
||||
SIM_OK_SCENE_ID="$(python3 -c "import json,sys; print(json.loads(sys.argv[1])['data']['scenes'][0]['id'])" "$SIM_OK_BODY" 2>/dev/null)"
|
||||
SIM_RENDER_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/$SIM_OK_COURSE_ID/scenes/$SIM_OK_SCENE_ID/render")"
|
||||
SIM_RENDER_EMBED="$(json_get "['data']['embed_url']" "$SIM_RENDER_BODY")"
|
||||
assert "C7_sim_render_embed_match" "[ '$SIM_RENDER_EMBED' = 'https://example.com/embed' ]" "got=$SIM_RENDER_EMBED"
|
||||
|
||||
# Bad URL → 400 INVALID_EMBED_URL
|
||||
SIM_BAD_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"SIM-BAD-$$\",\"name\":\"非法URL\",\"scenes\":[{\"scene_type\":\"simulation\",\"order_index\":1,\"payload\":{\"embed_url\":\"javascript:alert(1)\"}}]}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
SIM_BAD_CODE="$(json_get "['code']" "$SIM_BAD_BODY")"
|
||||
SIM_BAD_MSG="$(json_get "['msg']" "$SIM_BAD_BODY")"
|
||||
assert "C7_sim_bad_url_400" "[ '$SIM_BAD_CODE' = '400' -o '$SIM_BAD_CODE' = '422' ]" "got code=$SIM_BAD_CODE msg=$SIM_BAD_MSG"
|
||||
|
||||
# ============================================================
|
||||
# C8 (S8): FRC 6-scene 模板
|
||||
# - 6 scene 全部 simulation
|
||||
# - order_index 严格 1-6 升序
|
||||
# - 6 embed_url 对应 chg_0010 S1-S6
|
||||
# ============================================================
|
||||
FRC_SCENES_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/$FRC_COURSE_ID/scenes")"
|
||||
FRC_TYPES="$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])['data']
|
||||
print(','.join(s['scene_type'] for s in d))
|
||||
" "$FRC_SCENES_BODY")"
|
||||
FRC_ORDERS="$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])['data']
|
||||
print(','.join(str(s['order_index']) for s in d))
|
||||
" "$FRC_SCENES_BODY")"
|
||||
assert "C8_frc_6_simulation" "[ '$FRC_TYPES' = 'simulation,simulation,simulation,simulation,simulation,simulation' ]" "got=$FRC_TYPES"
|
||||
assert "C8_frc_orders_1to6" "[ '$FRC_ORDERS' = '1,2,3,4,5,6' ]" "got=$FRC_ORDERS"
|
||||
|
||||
# Verify each scene's embed_url matches the chg_0010 S1-S6 mapping
|
||||
# (s1: did-tds, s2: psi, s3: paillier, s4: threshold, s5: abac, s6: audit)
|
||||
FRC_URLS_VALID="$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])['data']
|
||||
required=['did-tds','psi','paillier','threshold','abac','audit']
|
||||
ok=True
|
||||
for i,s in enumerate(d):
|
||||
pl=json.loads(s['payload_json'])
|
||||
if required[i] not in pl.get('embed_url',''):
|
||||
ok=False
|
||||
break
|
||||
print(ok)
|
||||
" "$FRC_SCENES_BODY")"
|
||||
assert "C8_frc_embed_urls_match" "[ '$FRC_URLS_VALID' = 'True' ]" "embed_url mapping broken"
|
||||
|
||||
# ============================================================
|
||||
# C9 (S9): E2E 完整流程
|
||||
# - admin login → from-frc-template → student login → enroll → 6 render + 6 complete → progress_pct = 1.0
|
||||
# ============================================================
|
||||
# Use the FRC course from C8 — need a fresh enrollment for student 22222222 (韩梅梅)
|
||||
ENROLL_FRC_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d '{"student_id":"22222222-2222-2222-2222-222222222222"}' \
|
||||
"$COURSES_URL/$FRC_COURSE_ID/enroll")"
|
||||
ENROLL_FRC_CODE="$(json_get "['code']" "$ENROLL_FRC_BODY")"
|
||||
assert "C9_enroll_frc_ok" "[ '$ENROLL_FRC_CODE' = '200' ]" "code=$ENROLL_FRC_CODE"
|
||||
|
||||
# Render all 6 + complete all 6
|
||||
ALL_RENDER_OK=1
|
||||
ALL_COMPLETE_OK=1
|
||||
for i in 1 2 3 4 5 6; do
|
||||
FRC_SCENE_ID="$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])['data']
|
||||
print([s['id'] for s in d if s['order_index']==$i][0])
|
||||
" "$FRC_SCENES_BODY" 2>/dev/null)"
|
||||
R="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/$FRC_COURSE_ID/scenes/$FRC_SCENE_ID/render")"
|
||||
RC="$(json_get "['code']" "$R")"
|
||||
if [ "$RC" != "200" ]; then ALL_RENDER_OK=0; echo " render scene $i code=$RC"; fi
|
||||
C="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"student_id\":\"22222222-2222-2222-2222-222222222222\",\"course_id\":\"$FRC_COURSE_ID\"}" \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$FRC_SCENE_ID/complete")"
|
||||
CC="$(json_get "['code']" "$C")"
|
||||
if [ "$CC" != "200" ]; then ALL_COMPLETE_OK=0; echo " complete scene $i code=$CC"; fi
|
||||
done
|
||||
assert "C9_all_6_render_ok" "[ '$ALL_RENDER_OK' = '1' ]" "some render failed"
|
||||
assert "C9_all_6_complete_ok" "[ '$ALL_COMPLETE_OK' = '1' ]" "some complete failed"
|
||||
|
||||
# Final progress_count should be 6 (all scenes done)
|
||||
FINAL_COMPLETE_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"student_id\":\"22222222-2222-2222-2222-222222222222\",\"course_id\":\"$FRC_COURSE_ID\"}" \
|
||||
"$BASE/api/ssw/dth/lms-v2/scenes/$(python3 -c "
|
||||
import json,sys
|
||||
d=json.loads(sys.argv[1])['data']
|
||||
print(d[0]['id'])
|
||||
" "$FRC_SCENES_BODY" 2>/dev/null)/complete")"
|
||||
# Re-complete scene 1 to fetch latest progress (idempotent)
|
||||
FINAL_COUNT="$(json_get "['data']['progress_count']" "$FINAL_COMPLETE_BODY")"
|
||||
assert "C9_progress_count_6" "[ '$FINAL_COUNT' = '6' ]" "expected 6, got $FINAL_COUNT"
|
||||
|
||||
# progress_pct = 6/6 = 1.0
|
||||
PROGRESS_PCT="$(python3 -c "print($FINAL_COUNT / 6)")"
|
||||
assert "C9_progress_pct_1" "python3 -c \"import sys; sys.exit(0 if float('$PROGRESS_PCT') == 1.0 else 1)\"" "got $PROGRESS_PCT"
|
||||
|
||||
# ============================================================
|
||||
# C10 (S10): PBL 占位一致性
|
||||
# - type=pbl → render 回 501 NOT_IMPLEMENTED + 文案
|
||||
# - 前端 PBLScene 占位文案与后端 501 文案字面一致
|
||||
# ============================================================
|
||||
PBL_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" -H 'Content-Type: application/json' \
|
||||
-d "{\"code\":\"PBL-$$\",\"name\":\"PBL占位\",\"scenes\":[{\"scene_type\":\"pbl\",\"order_index\":1,\"payload\":{}}]}" \
|
||||
"$LMS_V2_COURSES_URL")"
|
||||
PBL_COURSE_ID="$(json_get "['data']['course']['id']" "$PBL_BODY")"
|
||||
PBL_SCENE_ID="$(python3 -c "import json,sys; print(json.loads(sys.argv[1])['data']['scenes'][0]['id'])" "$PBL_BODY" 2>/dev/null)"
|
||||
|
||||
PBL_RENDER_BODY="$(curl -s -H "Authorization: Bearer $ADMIN_TOKEN" \
|
||||
"$BASE/api/ssw/dth/lms-v2/courses/$PBL_COURSE_ID/scenes/$PBL_SCENE_ID/render")"
|
||||
PBL_RENDER_CODE="$(json_get "['code']" "$PBL_RENDER_BODY")"
|
||||
PBL_RENDER_MSG="$(json_get "['msg']" "$PBL_RENDER_BODY")"
|
||||
PBL_FRONTEND_MSG="$(python3 -c "
|
||||
# Replicate the constant from src/frontend/src/views/LMS/PBLScene.tsx
|
||||
print('PBL 场景 v2 实现,当前仅作课程占位')
|
||||
")"
|
||||
assert "C10_pbl_501_code" "[ '$PBL_RENDER_CODE' = '501' ]" "got code=$PBL_RENDER_CODE"
|
||||
assert "C10_pbl_backend_msg_correct" "[ '$PBL_RENDER_MSG' = '$PBL_FRONTEND_MSG' ]" "got msg=$PBL_RENDER_MSG"
|
||||
assert "C10_pbl_frontend_match" "python3 -c \"import sys; sys.exit(0 if '$PBL_FRONTEND_MSG' == 'PBL 场景 v2 实现,当前仅作课程占位' else 1)\" || false" \
|
||||
"frontend msg drift"
|
||||
|
||||
# ----- Result summary -----
|
||||
echo "---"
|
||||
echo "pass=$pass fail=$fail"
|
||||
if [ "$fail" -gt 0 ]; then
|
||||
echo "FAILED:"
|
||||
for f in "${fails[@]}"; do
|
||||
echo " - $f"
|
||||
done
|
||||
exit 1
|
||||
fi
|
||||
echo "ALL PASS"
|
||||
exit 0
|
||||
Reference in new issue
Block a user