=test_update_homework_tests_and_work_log

src/modules/homework/data-access.ts

@@ -7,12 +7,14 @@ import { auth } from "@/auth"
 import { db } from "@/shared/db"
 import {
   classEnrollments,
+  exams,
   homeworkAnswers,
   homeworkAssignmentQuestions,
   homeworkAssignmentTargets,
   homeworkAssignments,
   homeworkSubmissions,
   roles,
+  subjects,
   users,
   usersToRoles,
 } from "@/shared/db/schema"
@@ -584,14 +586,27 @@ export const getStudentHomeworkAssignments = cache(async (studentId: string): Pr
     .from(homeworkAssignmentTargets)
     .where(eq(homeworkAssignmentTargets.studentId, studentId))
 
-  const assignments = await db.query.homeworkAssignments.findMany({
-    where: and(
-      eq(homeworkAssignments.status, "published"),
-      inArray(homeworkAssignments.id, targetAssignmentIds),
-      or(isNull(homeworkAssignments.availableAt), lte(homeworkAssignments.availableAt, now))
-    ),
-    orderBy: [desc(homeworkAssignments.dueAt), desc(homeworkAssignments.createdAt)],
-  })
+  const assignments = await db
+    .select({
+      id: homeworkAssignments.id,
+      title: homeworkAssignments.title,
+      dueAt: homeworkAssignments.dueAt,
+      availableAt: homeworkAssignments.availableAt,
+      maxAttempts: homeworkAssignments.maxAttempts,
+      createdAt: homeworkAssignments.createdAt,
+      subjectName: subjects.name,
+    })
+    .from(homeworkAssignments)
+    .innerJoin(exams, eq(homeworkAssignments.sourceExamId, exams.id))
+    .leftJoin(subjects, eq(exams.subjectId, subjects.id))
+    .where(
+      and(
+        eq(homeworkAssignments.status, "published"),
+        inArray(homeworkAssignments.id, targetAssignmentIds),
+        or(isNull(homeworkAssignments.availableAt), lte(homeworkAssignments.availableAt, now))
+      )
+    )
+    .orderBy(desc(homeworkAssignments.dueAt), desc(homeworkAssignments.createdAt))
 
   if (assignments.length === 0) return []
 
@@ -620,6 +635,7 @@ export const getStudentHomeworkAssignments = cache(async (studentId: string): Pr
     const item: StudentHomeworkAssignmentListItem = {
       id: a.id,
       title: a.title,
+      subjectName: a.subjectName ?? null,
       dueAt: a.dueAt ? a.dueAt.toISOString() : null,
       availableAt: a.availableAt ? a.availableAt.toISOString() : null,
       maxAttempts: a.maxAttempts,