Round 15: Timetable, Resource Library, Advanced Analytics, Accessibility
This commit is contained in:
1 parent
0a7cfae311
commit
a94f900ae0
15 files changed
+4580
-1079
No files matched your search
@@ -419,6 +419,256 @@ export async function GET(request: Request) {
|
||||
) / 100
|
||||
: 0;
|
||||
|
||||
// ── Advanced: School Overview counts ──
|
||||
const classGroupWhere: Record<string, unknown> = {};
|
||||
if (schoolId) classGroupWhere.schoolId = schoolId;
|
||||
if (schoolYearId) classGroupWhere.schoolYearId = schoolYearId;
|
||||
if (classGroupId) classGroupWhere.id = classGroupId;
|
||||
|
||||
const [totalClasses, totalTeachers, totalCompetencies] = await Promise.all([
|
||||
db.classGroup.count({ where: classGroupWhere }).catch(() => 0),
|
||||
db.classGroupTeacher.findMany({
|
||||
where: Object.keys(classGroupWhere).length > 0
|
||||
? { classGroup: classGroupWhere }
|
||||
: {},
|
||||
select: { userId: true },
|
||||
}).then((rows) => new Set(rows.map((r) => r.userId)).size).catch(() => 0),
|
||||
db.competency.count().catch(() => 0),
|
||||
]);
|
||||
|
||||
// ── Advanced: Subject Mastery Avg ──
|
||||
const subjectAgg = new Map<string, { subjectName: string; total: number; count: number }>();
|
||||
for (const e of entries) {
|
||||
const cat = e.competency?.category;
|
||||
if (!cat) continue;
|
||||
const sid = cat.id;
|
||||
const cur = subjectAgg.get(sid) ?? { subjectName: cat.name, total: 0, count: 0 };
|
||||
cur.total += e.masteryLevelValue;
|
||||
cur.count += 1;
|
||||
subjectAgg.set(sid, cur);
|
||||
}
|
||||
const subjectMasteryAvg = Array.from(subjectAgg.entries())
|
||||
.map(([categoryId, v]) => ({
|
||||
categoryId,
|
||||
categoryName: v.subjectName,
|
||||
avgMastery: v.count > 0 ? Math.round((v.total / v.count) * 100) / 100 : 0,
|
||||
entryCount: v.count,
|
||||
}))
|
||||
.sort((a, b) => b.avgMastery - a.avgMastery);
|
||||
|
||||
// ── Advanced: Teacher Performance ──
|
||||
const teacherAssessments = await db.assessment.findMany({
|
||||
where: {
|
||||
...(classGroupId ? { classGroupId } : {}),
|
||||
...(schoolYearId ? { classGroup: { schoolYearId } } : {}),
|
||||
...(schoolId ? { classGroup: { schoolId } } : {}),
|
||||
},
|
||||
select: {
|
||||
teacherId: true,
|
||||
teacher: { select: { firstName: true, lastName: true } },
|
||||
},
|
||||
}).catch(() => []);
|
||||
|
||||
const teacherProgressEntries = await db.learningProgressEntry.findMany({
|
||||
where,
|
||||
select: {
|
||||
classGroupId: true,
|
||||
classGroup: {
|
||||
select: {
|
||||
teachers: { select: { userId: true, user: { select: { firstName: true, lastName: true } } } },
|
||||
},
|
||||
},
|
||||
},
|
||||
}).catch(() => []);
|
||||
|
||||
// Build teacher stats
|
||||
const teacherStatsMap = new Map<string, { name: string; assessmentCount: number; progressCount: number }>();
|
||||
for (const a of teacherAssessments) {
|
||||
const name = `${a.teacher?.firstName ?? ''} ${a.teacher?.lastName ?? ''}`.trim();
|
||||
const cur = teacherStatsMap.get(a.teacherId) ?? { name: name || a.teacherId, assessmentCount: 0, progressCount: 0 };
|
||||
cur.assessmentCount += 1;
|
||||
teacherStatsMap.set(a.teacherId, cur);
|
||||
}
|
||||
for (const p of teacherProgressEntries) {
|
||||
for (const t of p.classGroup?.teachers ?? []) {
|
||||
const name = `${t.user?.firstName ?? ''} ${t.user?.lastName ?? ''}`.trim();
|
||||
const cur = teacherStatsMap.get(t.userId) ?? { name: name || t.userId, assessmentCount: 0, progressCount: 0 };
|
||||
cur.progressCount += 1;
|
||||
teacherStatsMap.set(t.userId, cur);
|
||||
}
|
||||
}
|
||||
|
||||
// Compute student improvement rate per teacher
|
||||
// Batch-fetch all class teachers for students in scope
|
||||
const classGroupIds = new Set(enrollments.map((enr) => enr.classGroup?.id).filter(Boolean) as string[]);
|
||||
const allClassTeachers = classGroupIds.size > 0
|
||||
? await db.classGroupTeacher.findMany({
|
||||
where: { classGroupId: { in: Array.from(classGroupIds) } },
|
||||
select: { classGroupId: true, userId: true },
|
||||
}).catch(() => [])
|
||||
: [];
|
||||
const classTeacherMap = new Map<string, string[]>();
|
||||
for (const ct of allClassTeachers) {
|
||||
const arr = classTeacherMap.get(ct.classGroupId) ?? [];
|
||||
arr.push(ct.userId);
|
||||
classTeacherMap.set(ct.classGroupId, arr);
|
||||
}
|
||||
|
||||
const teacherImprovementMap = new Map<string, { improved: number; total: number }>();
|
||||
for (const [studentId, eArr] of studentEntries) {
|
||||
if (eArr.length < 2) continue;
|
||||
const sorted = eArr.sort((a, b) => a.date.getTime() - b.date.getTime());
|
||||
const firstHalf = sorted.slice(0, Math.floor(sorted.length / 2));
|
||||
const secondHalf = sorted.slice(Math.floor(sorted.length / 2));
|
||||
const firstAvg = firstHalf.reduce((s, e) => s + e.masteryLevelValue, 0) / firstHalf.length;
|
||||
const secondAvg = secondHalf.reduce((s, e) => s + e.masteryLevelValue, 0) / secondHalf.length;
|
||||
const improved = secondAvg > firstAvg;
|
||||
|
||||
// Find the student's class teacher(s) for attribution
|
||||
const studentEnr = enrollments.find((enr) => enr.studentId === studentId);
|
||||
const teacherIds = studentEnr?.classGroup?.id ? (classTeacherMap.get(studentEnr.classGroup.id) ?? []) : [];
|
||||
for (const tid of teacherIds) {
|
||||
const cur = teacherImprovementMap.get(tid) ?? { improved: 0, total: 0 };
|
||||
cur.total += 1;
|
||||
if (improved) cur.improved += 1;
|
||||
teacherImprovementMap.set(tid, cur);
|
||||
}
|
||||
}
|
||||
|
||||
// Notebook usage per teacher
|
||||
const teacherNotebookCounts = await db.notebook.groupBy({
|
||||
by: ['ownerId'],
|
||||
where: {
|
||||
ownerType: 'TEACHER',
|
||||
...(schoolId ? { schoolId } : {}),
|
||||
deletedAt: null,
|
||||
},
|
||||
_count: { id: true },
|
||||
}).catch(() => []);
|
||||
|
||||
const teacherPerformance = Array.from(teacherStatsMap.entries())
|
||||
.map(([teacherId, v]) => {
|
||||
const imp = teacherImprovementMap.get(teacherId);
|
||||
const notebook = teacherNotebookCounts.find((n) => n.ownerId === teacherId);
|
||||
return {
|
||||
teacherId,
|
||||
teacherName: v.name,
|
||||
assessmentCount: v.assessmentCount,
|
||||
progressCount: v.progressCount,
|
||||
improvementRate: imp && imp.total > 0 ? Math.round((imp.improved / imp.total) * 1000) / 10 : 0,
|
||||
notebookCount: notebook?._count.id ?? 0,
|
||||
};
|
||||
})
|
||||
.sort((a, b) => b.assessmentCount - a.assessmentCount);
|
||||
|
||||
// ── Advanced: Self-Assessment vs Teacher Gap Analysis ──
|
||||
const selfAssessmentData = await db.selfAssessment.findMany({
|
||||
where: {
|
||||
...(schoolId ? { schoolId } : {}),
|
||||
...(classGroupId ? { classGroupId } : {}),
|
||||
deletedAt: null,
|
||||
},
|
||||
select: {
|
||||
studentId: true,
|
||||
competencyId: true,
|
||||
selfLevel: true,
|
||||
createdAt: true,
|
||||
student: { select: { firstName: true, lastName: true } },
|
||||
},
|
||||
}).catch(() => []);
|
||||
|
||||
// For each self-assessment, find the latest teacher progress entry for the same student+competency
|
||||
const gapAnalysis: Array<{
|
||||
studentId: string;
|
||||
studentName: string;
|
||||
competencyId: string;
|
||||
selfLevel: number;
|
||||
teacherLevel: number;
|
||||
gap: number;
|
||||
}> = [];
|
||||
for (const sa of selfAssessmentData) {
|
||||
const teacherEntries = studentEntries.get(sa.studentId)
|
||||
?.filter((e) => e.masteryLevelValue > 0)
|
||||
?? [];
|
||||
if (teacherEntries.length === 0) continue;
|
||||
const latestTeacher = teacherEntries.sort((a, b) => b.date.getTime() - a.date.getTime())[0];
|
||||
const gap = sa.selfLevel - latestTeacher.masteryLevelValue;
|
||||
gapAnalysis.push({
|
||||
studentId: sa.studentId,
|
||||
studentName: `${sa.student?.firstName ?? ''} ${sa.student?.lastName ?? ''}`.trim() || sa.studentId,
|
||||
competencyId: sa.competencyId,
|
||||
selfLevel: sa.selfLevel,
|
||||
teacherLevel: Math.round(latestTeacher.masteryLevelValue * 100) / 100,
|
||||
gap: Math.round(gap * 100) / 100,
|
||||
});
|
||||
}
|
||||
|
||||
// Aggregate gap analysis for chart
|
||||
const selfVsTeacherAgg = gapAnalysis.length > 0 ? {
|
||||
avgSelfLevel: Math.round((gapAnalysis.reduce((s, g) => s + g.selfLevel, 0) / gapAnalysis.length) * 100) / 100,
|
||||
avgTeacherLevel: Math.round((gapAnalysis.reduce((s, g) => s + g.teacherLevel, 0) / gapAnalysis.length) * 100) / 100,
|
||||
avgGap: Math.round((gapAnalysis.reduce((s, g) => s + g.gap, 0) / gapAnalysis.length) * 100) / 100,
|
||||
totalComparisons: gapAnalysis.length,
|
||||
} : null;
|
||||
|
||||
// ── Advanced: Competency Coverage ──
|
||||
const assessedCompetencyIds = new Set(entries.map((e) => e.competencyId));
|
||||
const competencyCoveragePct = totalCompetencies > 0
|
||||
? Math.round((assessedCompetencyIds.size / totalCompetencies) * 1000) / 10
|
||||
: 0;
|
||||
|
||||
// ── Advanced: Students Excelling (improvement trajectory) ──
|
||||
const excellingStudents: Array<{
|
||||
studentId: string;
|
||||
studentName: string;
|
||||
className: string;
|
||||
latestMastery: number;
|
||||
improvement: number;
|
||||
}> = [];
|
||||
for (const [studentId, eArr] of studentEntries) {
|
||||
if (eArr.length < 4) continue;
|
||||
const sorted = eArr.sort((a, b) => a.date.getTime() - b.date.getTime());
|
||||
const first2 = sorted.slice(0, 2);
|
||||
const last2 = sorted.slice(-2);
|
||||
const firstAvg = first2.reduce((s, e) => s + e.masteryLevelValue, 0) / 2;
|
||||
const lastAvg = last2.reduce((s, e) => s + e.masteryLevelValue, 0) / 2;
|
||||
const improvement = Math.round((lastAvg - firstAvg) * 100) / 100;
|
||||
if (improvement > 0.5) {
|
||||
const meta = studentMeta.get(studentId);
|
||||
if (meta) {
|
||||
excellingStudents.push({
|
||||
studentId,
|
||||
studentName: meta.studentName,
|
||||
className: meta.className,
|
||||
latestMastery: Math.round(lastAvg * 100) / 100,
|
||||
improvement,
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
excellingStudents.sort((a, b) => b.improvement - a.improvement);
|
||||
|
||||
// ── Advanced: Class Radar Data ──
|
||||
// For each class, compute multi-dimensional scores
|
||||
const classRadarData = Array.from(classAgg.entries()).map(([classId, v]) => {
|
||||
const classStudents = Array.from(v.students);
|
||||
const classAttendance = classStudents.reduce((sum, sid) => {
|
||||
const att = attendanceMap.get(sid);
|
||||
return sum + (att && att.total > 0 ? (att.present / att.total) * 100 : 0);
|
||||
}, 0) / (classStudents.length || 1);
|
||||
const engagement = Math.min(100, (v.count / Math.max(1, v.students.size)) * 20);
|
||||
const progress = v.count > 0 ? (v.total / v.count / 4) * 100 : 0;
|
||||
return {
|
||||
classId,
|
||||
className: v.className,
|
||||
mastery: Math.round((v.count > 0 ? (v.total / v.count / 4) * 100 : 0) * 10) / 10,
|
||||
attendance: Math.round(classAttendance * 10) / 10,
|
||||
engagement: Math.round(engagement * 10) / 10,
|
||||
progress: Math.round(progress * 10) / 10,
|
||||
behavior: Math.round(((v.count > 0 ? (v.total / v.count / 4) * 100 : 0) * 0.6 + classAttendance * 0.4) * 10) / 10,
|
||||
};
|
||||
});
|
||||
|
||||
return NextResponse.json({
|
||||
masteryTrend,
|
||||
classComparison,
|
||||
@@ -431,6 +681,17 @@ export async function GET(request: Request) {
|
||||
totalEntries,
|
||||
totalStudents,
|
||||
overallAvgMastery,
|
||||
// New fields
|
||||
totalClasses,
|
||||
totalTeachers,
|
||||
totalCompetencies,
|
||||
competencyCoveragePct,
|
||||
subjectMasteryAvg,
|
||||
teacherPerformance,
|
||||
selfVsTeacherAgg,
|
||||
gapAnalysis: gapAnalysis.slice(0, 50),
|
||||
excellingStudents: excellingStudents.slice(0, 10),
|
||||
classRadarData,
|
||||
});
|
||||
} catch (error) {
|
||||
console.error('Analytics GET error:', error);
|
||||
|
||||
@@ -0,0 +1,169 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { z } from 'zod';
|
||||
import { db } from '@/lib/db';
|
||||
import { getSession } from '@/lib/auth';
|
||||
|
||||
const resourceTypeEnum = z.enum([
|
||||
'document', 'worksheet', 'presentation', 'video_link', 'image', 'link', 'audio',
|
||||
]);
|
||||
|
||||
const updateResourceSchema = z.object({
|
||||
title: z.string().min(1).max(300).optional(),
|
||||
description: z.string().max(5000).optional().nullable(),
|
||||
resourceType: resourceTypeEnum.optional(),
|
||||
url: z.string().optional().nullable(),
|
||||
content: z.string().optional().nullable(),
|
||||
subjectId: z.string().optional().nullable(),
|
||||
classGroupId: z.string().optional().nullable(),
|
||||
gradeLevel: z.number().int().min(1).max(13).optional().nullable(),
|
||||
tags: z.array(z.string()).optional().nullable(),
|
||||
isPublic: z.boolean().optional(),
|
||||
incrementDownload: z.boolean().optional(),
|
||||
});
|
||||
|
||||
function isTeacherOrAdmin(role: string | undefined): boolean {
|
||||
return role === 'TEACHER' || role === 'SCHOOL_ADMIN' || role === 'SUPER_ADMIN';
|
||||
}
|
||||
|
||||
export async function GET(
|
||||
_request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
|
||||
const { id } = await params;
|
||||
const resource = await db.resource.findUnique({
|
||||
where: { id, deletedAt: null },
|
||||
include: {
|
||||
author: { select: { id: true, firstName: true, lastName: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
},
|
||||
});
|
||||
|
||||
if (!resource) {
|
||||
return NextResponse.json({ error: 'Resource not found' }, { status: 404 });
|
||||
}
|
||||
|
||||
// Students can only see public resources
|
||||
if (session.user?.role === 'STUDENT' && !resource.isPublic) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
return NextResponse.json(resource);
|
||||
} catch (error) {
|
||||
console.error('Resources GET [id] error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function PUT(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
if (!isTeacherOrAdmin(session.user?.role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
const { id } = await params;
|
||||
const body = await request.json();
|
||||
const parsed = updateResourceSchema.safeParse(body);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Validation failed', details: parsed.error.issues },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
const existing = await db.resource.findUnique({ where: { id, deletedAt: null } });
|
||||
if (!existing) {
|
||||
return NextResponse.json({ error: 'Resource not found' }, { status: 404 });
|
||||
}
|
||||
|
||||
// Only the author or admins can edit
|
||||
if (session.user?.role === 'TEACHER' && existing.authorId !== session.userId) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
// Handle download increment separately
|
||||
if (parsed.data.incrementDownload) {
|
||||
await db.resource.update({
|
||||
where: { id },
|
||||
data: { downloadCount: { increment: 1 } },
|
||||
});
|
||||
return NextResponse.json({ success: true });
|
||||
}
|
||||
|
||||
const updateData: Record<string, unknown> = {};
|
||||
if (parsed.data.title !== undefined) updateData.title = parsed.data.title;
|
||||
if (parsed.data.description !== undefined) updateData.description = parsed.data.description;
|
||||
if (parsed.data.resourceType !== undefined) updateData.resourceType = parsed.data.resourceType;
|
||||
if (parsed.data.url !== undefined) updateData.url = parsed.data.url;
|
||||
if (parsed.data.content !== undefined) updateData.content = parsed.data.content;
|
||||
if (parsed.data.subjectId !== undefined) updateData.subjectId = parsed.data.subjectId || null;
|
||||
if (parsed.data.classGroupId !== undefined) updateData.classGroupId = parsed.data.classGroupId || null;
|
||||
if (parsed.data.gradeLevel !== undefined) updateData.gradeLevel = parsed.data.gradeLevel;
|
||||
if (parsed.data.tags !== undefined) updateData.tags = parsed.data.tags ? JSON.stringify(parsed.data.tags) : null;
|
||||
if (parsed.data.isPublic !== undefined) updateData.isPublic = parsed.data.isPublic;
|
||||
|
||||
const resource = await db.resource.update({
|
||||
where: { id },
|
||||
data: updateData,
|
||||
include: {
|
||||
author: { select: { id: true, firstName: true, lastName: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json(resource);
|
||||
} catch (error) {
|
||||
console.error('Resources PUT [id] error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function DELETE(
|
||||
_request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
if (!isTeacherOrAdmin(session.user?.role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
const { id } = await params;
|
||||
const existing = await db.resource.findUnique({ where: { id, deletedAt: null } });
|
||||
if (!existing) {
|
||||
return NextResponse.json({ error: 'Resource not found' }, { status: 404 });
|
||||
}
|
||||
|
||||
// Only the author or admins can delete
|
||||
if (session.user?.role === 'TEACHER' && existing.authorId !== session.userId) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
await db.resource.update({
|
||||
where: { id },
|
||||
data: { deletedAt: new Date() },
|
||||
});
|
||||
|
||||
return NextResponse.json({ success: true });
|
||||
} catch (error) {
|
||||
console.error('Resources DELETE [id] error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,164 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { z } from 'zod';
|
||||
import { db } from '@/lib/db';
|
||||
import { getSession } from '@/lib/auth';
|
||||
|
||||
const resourceTypeEnum = z.enum([
|
||||
'document', 'worksheet', 'presentation', 'video_link', 'image', 'link', 'audio',
|
||||
]);
|
||||
|
||||
const createResourceSchema = z.object({
|
||||
schoolId: z.string().min(1),
|
||||
title: z.string().min(1).max(300),
|
||||
description: z.string().max(5000).optional().nullable(),
|
||||
resourceType: resourceTypeEnum,
|
||||
url: z.string().optional().nullable(),
|
||||
content: z.string().optional().nullable(),
|
||||
subjectId: z.string().optional().nullable(),
|
||||
classGroupId: z.string().optional().nullable(),
|
||||
gradeLevel: z.number().int().min(1).max(13).optional().nullable(),
|
||||
tags: z.array(z.string()).optional().nullable(),
|
||||
isPublic: z.boolean().optional().default(true),
|
||||
});
|
||||
|
||||
function isTeacherOrAdmin(role: string | undefined): boolean {
|
||||
return role === 'TEACHER' || role === 'SCHOOL_ADMIN' || role === 'SUPER_ADMIN';
|
||||
}
|
||||
|
||||
export async function GET(request: Request) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
|
||||
const { searchParams } = new URL(request.url);
|
||||
const schoolIdParam = searchParams.get('schoolId');
|
||||
const resourceType = searchParams.get('resourceType');
|
||||
const subjectId = searchParams.get('subjectId');
|
||||
const classGroupId = searchParams.get('classGroupId');
|
||||
const search = searchParams.get('search');
|
||||
const isPublic = searchParams.get('isPublic');
|
||||
|
||||
let schoolId: string | undefined;
|
||||
if (session.user?.role === 'SCHOOL_ADMIN') {
|
||||
schoolId = session.user.schoolId ?? undefined;
|
||||
} else {
|
||||
schoolId = schoolIdParam ?? session.user?.schoolId ?? undefined;
|
||||
}
|
||||
|
||||
if (!schoolId) {
|
||||
return NextResponse.json([]);
|
||||
}
|
||||
|
||||
const where: Record<string, unknown> = { schoolId, deletedAt: null };
|
||||
|
||||
// Students can only see public resources
|
||||
if (session.user?.role === 'STUDENT') {
|
||||
where.isPublic = true;
|
||||
}
|
||||
|
||||
if (resourceType && resourceType !== 'all') where.resourceType = resourceType;
|
||||
if (subjectId && subjectId !== 'all') where.subjectId = subjectId;
|
||||
if (classGroupId && classGroupId !== 'all') where.classGroupId = classGroupId;
|
||||
if (isPublic === 'true') where.isPublic = true;
|
||||
if (isPublic === 'false') where.isPublic = false;
|
||||
|
||||
if (search) {
|
||||
where.OR = [
|
||||
{ title: { contains: search } },
|
||||
{ description: { contains: search } },
|
||||
];
|
||||
}
|
||||
|
||||
const resources = await db.resource.findMany({
|
||||
where,
|
||||
orderBy: { createdAt: 'desc' },
|
||||
include: {
|
||||
author: { select: { id: true, firstName: true, lastName: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json(resources);
|
||||
} catch (error) {
|
||||
console.error('Resources GET error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
if (!isTeacherOrAdmin(session.user?.role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
const body = await request.json();
|
||||
const parsed = createResourceSchema.safeParse(body);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Validation failed', details: parsed.error.issues },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
const { schoolId, subjectId, classGroupId, tags, ...rest } = parsed.data;
|
||||
|
||||
// Verify school
|
||||
const school = await db.school.findUnique({ where: { id: schoolId } });
|
||||
if (!school) {
|
||||
return NextResponse.json({ error: 'School not found' }, { status: 404 });
|
||||
}
|
||||
if (session.user?.role === 'SCHOOL_ADMIN' && session.user.schoolId && school.id !== session.user.schoolId) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
// Verify subject if provided
|
||||
if (subjectId) {
|
||||
const subject = await db.subject.findUnique({ where: { id: subjectId } });
|
||||
if (!subject) {
|
||||
return NextResponse.json({ error: 'Subject not found' }, { status: 404 });
|
||||
}
|
||||
}
|
||||
|
||||
// Verify classGroup if provided
|
||||
if (classGroupId) {
|
||||
const classGroup = await db.classGroup.findUnique({ where: { id: classGroupId } });
|
||||
if (!classGroup || classGroup.schoolId !== schoolId) {
|
||||
return NextResponse.json({ error: 'Class group not found in this school' }, { status: 404 });
|
||||
}
|
||||
}
|
||||
|
||||
const resource = await db.resource.create({
|
||||
data: {
|
||||
schoolId,
|
||||
authorId: session.userId,
|
||||
title: rest.title,
|
||||
description: rest.description ?? null,
|
||||
resourceType: rest.resourceType,
|
||||
url: rest.url ?? null,
|
||||
content: rest.content ?? null,
|
||||
subjectId: subjectId || null,
|
||||
classGroupId: classGroupId || null,
|
||||
gradeLevel: rest.gradeLevel ?? null,
|
||||
tags: tags ? JSON.stringify(tags) : null,
|
||||
isPublic: rest.isPublic,
|
||||
},
|
||||
include: {
|
||||
author: { select: { id: true, firstName: true, lastName: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json(resource, { status: 201 });
|
||||
} catch (error) {
|
||||
console.error('Resources POST error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,136 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { z } from 'zod';
|
||||
import { db } from '@/lib/db';
|
||||
import { getSession } from '@/lib/auth';
|
||||
|
||||
const updateSlotSchema = z.object({
|
||||
subjectId: z.string().optional().nullable(),
|
||||
teacherId: z.string().optional().nullable(),
|
||||
roomId: z.string().optional().nullable(),
|
||||
startTime: z.string().optional(),
|
||||
endTime: z.string().optional(),
|
||||
dayOfWeek: z.number().int().min(0).max(4).optional(),
|
||||
period: z.number().int().min(1).max(8).optional(),
|
||||
isBreak: z.boolean().optional(),
|
||||
});
|
||||
|
||||
function isTeacherOrAdmin(role: string | undefined): boolean {
|
||||
return role === 'TEACHER' || role === 'SCHOOL_ADMIN' || role === 'SUPER_ADMIN';
|
||||
}
|
||||
|
||||
export async function GET(
|
||||
_request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
|
||||
const { id } = await params;
|
||||
const slot = await db.timetableSlot.findUnique({
|
||||
where: { id, deletedAt: null },
|
||||
include: {
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
teacher: { select: { id: true, firstName: true, lastName: true } },
|
||||
},
|
||||
});
|
||||
|
||||
if (!slot) {
|
||||
return NextResponse.json({ error: 'Timetable slot not found' }, { status: 404 });
|
||||
}
|
||||
|
||||
return NextResponse.json(slot);
|
||||
} catch (error) {
|
||||
console.error('Timetable GET [id] error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function PUT(
|
||||
request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
if (!isTeacherOrAdmin(session.user?.role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
const { id } = await params;
|
||||
const body = await request.json();
|
||||
const parsed = updateSlotSchema.safeParse(body);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Validation failed', details: parsed.error.issues },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
const existing = await db.timetableSlot.findUnique({ where: { id, deletedAt: null } });
|
||||
if (!existing) {
|
||||
return NextResponse.json({ error: 'Timetable slot not found' }, { status: 404 });
|
||||
}
|
||||
|
||||
const updateData: Record<string, unknown> = {};
|
||||
if (parsed.data.subjectId !== undefined) updateData.subjectId = parsed.data.subjectId || null;
|
||||
if (parsed.data.teacherId !== undefined) updateData.teacherId = parsed.data.teacherId || null;
|
||||
if (parsed.data.roomId !== undefined) updateData.roomId = parsed.data.roomId || null;
|
||||
if (parsed.data.startTime !== undefined) updateData.startTime = parsed.data.startTime;
|
||||
if (parsed.data.endTime !== undefined) updateData.endTime = parsed.data.endTime;
|
||||
if (parsed.data.dayOfWeek !== undefined) updateData.dayOfWeek = parsed.data.dayOfWeek;
|
||||
if (parsed.data.period !== undefined) updateData.period = parsed.data.period;
|
||||
if (parsed.data.isBreak !== undefined) updateData.isBreak = parsed.data.isBreak;
|
||||
|
||||
const slot = await db.timetableSlot.update({
|
||||
where: { id },
|
||||
data: updateData,
|
||||
include: {
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
teacher: { select: { id: true, firstName: true, lastName: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json(slot);
|
||||
} catch (error) {
|
||||
console.error('Timetable PUT [id] error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function DELETE(
|
||||
_request: Request,
|
||||
{ params }: { params: Promise<{ id: string }> }
|
||||
) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
if (!isTeacherOrAdmin(session.user?.role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
const { id } = await params;
|
||||
const existing = await db.timetableSlot.findUnique({ where: { id, deletedAt: null } });
|
||||
if (!existing) {
|
||||
return NextResponse.json({ error: 'Timetable slot not found' }, { status: 404 });
|
||||
}
|
||||
|
||||
await db.timetableSlot.update({
|
||||
where: { id },
|
||||
data: { deletedAt: new Date() },
|
||||
});
|
||||
|
||||
return NextResponse.json({ success: true });
|
||||
} catch (error) {
|
||||
console.error('Timetable DELETE [id] error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,196 @@
|
||||
import { NextResponse } from 'next/server';
|
||||
import { z } from 'zod';
|
||||
import { db } from '@/lib/db';
|
||||
import { getSession } from '@/lib/auth';
|
||||
|
||||
const createSlotSchema = z.object({
|
||||
schoolId: z.string().min(1),
|
||||
classGroupId: z.string().min(1),
|
||||
dayOfWeek: z.number().int().min(0).max(4),
|
||||
period: z.number().int().min(1).max(8),
|
||||
subjectId: z.string().optional().nullable(),
|
||||
teacherId: z.string().optional().nullable(),
|
||||
roomId: z.string().optional().nullable(),
|
||||
startTime: z.string().min(1),
|
||||
endTime: z.string().min(1),
|
||||
isBreak: z.boolean().optional().default(false),
|
||||
});
|
||||
|
||||
const batchCreateSchema = z.object({
|
||||
schoolId: z.string().min(1),
|
||||
classGroupId: z.string().min(1),
|
||||
slots: z.array(createSlotSchema.omit({ schoolId: true, classGroupId: true })),
|
||||
});
|
||||
|
||||
function isTeacherOrAdmin(role: string | undefined): boolean {
|
||||
return role === 'TEACHER' || role === 'SCHOOL_ADMIN' || role === 'SUPER_ADMIN';
|
||||
}
|
||||
|
||||
export async function GET(request: Request) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
|
||||
const { searchParams } = new URL(request.url);
|
||||
const schoolIdParam = searchParams.get('schoolId');
|
||||
const classGroupId = searchParams.get('classGroupId');
|
||||
|
||||
let schoolId: string | undefined;
|
||||
if (session.user?.role === 'SCHOOL_ADMIN') {
|
||||
schoolId = session.user.schoolId ?? undefined;
|
||||
} else {
|
||||
schoolId = schoolIdParam ?? session.user?.schoolId ?? undefined;
|
||||
}
|
||||
|
||||
if (!schoolId) {
|
||||
return NextResponse.json([]);
|
||||
}
|
||||
|
||||
const where: Record<string, unknown> = { schoolId, deletedAt: null };
|
||||
if (classGroupId && classGroupId !== 'all') where.classGroupId = classGroupId;
|
||||
|
||||
const slots = await db.timetableSlot.findMany({
|
||||
where,
|
||||
orderBy: [{ dayOfWeek: 'asc' }, { period: 'asc' }],
|
||||
include: {
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
teacher: { select: { id: true, firstName: true, lastName: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json(slots);
|
||||
} catch (error) {
|
||||
console.error('Timetable GET error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
|
||||
export async function POST(request: Request) {
|
||||
try {
|
||||
const session = await getSession();
|
||||
if (!session) {
|
||||
return NextResponse.json({ error: 'Not authenticated' }, { status: 401 });
|
||||
}
|
||||
if (!isTeacherOrAdmin(session.user?.role)) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
const body = await request.json();
|
||||
|
||||
// Check if this is a batch create request
|
||||
if (Array.isArray(body.slots)) {
|
||||
const parsed = batchCreateSchema.safeParse(body);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Validation failed', details: parsed.error.issues },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
const { schoolId, classGroupId, slots } = parsed.data;
|
||||
|
||||
// Verify school
|
||||
const school = await db.school.findUnique({ where: { id: schoolId } });
|
||||
if (!school) {
|
||||
return NextResponse.json({ error: 'School not found' }, { status: 404 });
|
||||
}
|
||||
if (session.user?.role === 'SCHOOL_ADMIN' && session.user.schoolId && school.id !== session.user.schoolId) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
// Verify classGroup
|
||||
const classGroup = await db.classGroup.findUnique({ where: { id: classGroupId } });
|
||||
if (!classGroup || classGroup.schoolId !== schoolId) {
|
||||
return NextResponse.json({ error: 'Class group not found in this school' }, { status: 404 });
|
||||
}
|
||||
|
||||
const created = await db.timetableSlot.createMany({
|
||||
data: slots.map((slot) => ({
|
||||
schoolId,
|
||||
classGroupId,
|
||||
dayOfWeek: slot.dayOfWeek,
|
||||
period: slot.period,
|
||||
subjectId: slot.subjectId || null,
|
||||
teacherId: slot.teacherId || null,
|
||||
roomId: slot.roomId || null,
|
||||
startTime: slot.startTime,
|
||||
endTime: slot.endTime,
|
||||
isBreak: slot.isBreak,
|
||||
})),
|
||||
skipDuplicates: true,
|
||||
});
|
||||
|
||||
return NextResponse.json({ count: created.count }, { status: 201 });
|
||||
}
|
||||
|
||||
// Single slot create
|
||||
const parsed = createSlotSchema.safeParse(body);
|
||||
if (!parsed.success) {
|
||||
return NextResponse.json(
|
||||
{ error: 'Validation failed', details: parsed.error.issues },
|
||||
{ status: 400 }
|
||||
);
|
||||
}
|
||||
|
||||
const { schoolId, classGroupId, subjectId, teacherId, ...rest } = parsed.data;
|
||||
|
||||
// Verify school
|
||||
const school = await db.school.findUnique({ where: { id: schoolId } });
|
||||
if (!school) {
|
||||
return NextResponse.json({ error: 'School not found' }, { status: 404 });
|
||||
}
|
||||
if (session.user?.role === 'SCHOOL_ADMIN' && session.user.schoolId && school.id !== session.user.schoolId) {
|
||||
return NextResponse.json({ error: 'Forbidden' }, { status: 403 });
|
||||
}
|
||||
|
||||
// Verify classGroup
|
||||
const classGroup = await db.classGroup.findUnique({ where: { id: classGroupId } });
|
||||
if (!classGroup || classGroup.schoolId !== schoolId) {
|
||||
return NextResponse.json({ error: 'Class group not found in this school' }, { status: 404 });
|
||||
}
|
||||
|
||||
// Verify subject if provided
|
||||
if (subjectId) {
|
||||
const subject = await db.subject.findUnique({ where: { id: subjectId } });
|
||||
if (!subject) {
|
||||
return NextResponse.json({ error: 'Subject not found' }, { status: 404 });
|
||||
}
|
||||
}
|
||||
|
||||
// Verify teacher if provided
|
||||
if (teacherId) {
|
||||
const teacher = await db.user.findUnique({ where: { id: teacherId, deletedAt: null } });
|
||||
if (!teacher) {
|
||||
return NextResponse.json({ error: 'Teacher not found' }, { status: 404 });
|
||||
}
|
||||
}
|
||||
|
||||
const slot = await db.timetableSlot.create({
|
||||
data: {
|
||||
schoolId,
|
||||
classGroupId,
|
||||
subjectId: subjectId || null,
|
||||
teacherId: teacherId || null,
|
||||
roomId: rest.roomId || null,
|
||||
dayOfWeek: rest.dayOfWeek,
|
||||
period: rest.period,
|
||||
startTime: rest.startTime,
|
||||
endTime: rest.endTime,
|
||||
isBreak: rest.isBreak,
|
||||
},
|
||||
include: {
|
||||
classGroup: { select: { id: true, name: true, gradeLevel: true } },
|
||||
subject: { select: { id: true, name: true } },
|
||||
teacher: { select: { id: true, firstName: true, lastName: true } },
|
||||
},
|
||||
});
|
||||
|
||||
return NextResponse.json(slot, { status: 201 });
|
||||
} catch (error) {
|
||||
console.error('Timetable POST error:', error);
|
||||
return NextResponse.json({ error: 'Internal server error' }, { status: 500 });
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user