Refactor quiz management and enhance tracking features

apps/api/package.json

@@ -19,6 +19,7 @@
     "@prisma/client": "6.11.1",
     "@tiptap/extension-horizontal-rule": "2.1.13",
     "adminjs": "^7.8.17",
+    "axios": "^1.11.0",
     "better-auth": "^1.2.12",
     "cors": "^2.8.5",
     "dotenv": "^17.2.1",

apps/api/prisma/migrations/20250813194643_adding_unique_id_quiz/migration.sql

@@ -0,0 +1,16 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[userId,createdAt]` on the table `DailyQuiz` will be added. If there are existing duplicate values, this will fail.
+
+*/
+-- AlterTable
+ALTER TABLE "DailyQuiz" ADD COLUMN     "totalQuestions" INTEGER NOT NULL DEFAULT 10;
+
+-- AlterTable
+ALTER TABLE "Topic" ADD COLUMN     "attempted" INTEGER NOT NULL DEFAULT 0,
+ADD COLUMN     "difficulty" "QuestionDifficulty" NOT NULL DEFAULT 'easy',
+ADD COLUMN     "solved" INTEGER NOT NULL DEFAULT 0;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "DailyQuiz_userId_createdAt_key" ON "DailyQuiz"("userId", "createdAt");

apps/api/prisma/migrations/20250819194732_adding_quiz_date/migration.sql

@@ -0,0 +1,15 @@
+/*
+  Warnings:
+
+  - A unique constraint covering the columns `[userId,quizDate]` on the table `DailyQuiz` will be added. If there are existing duplicate values, this will fail.
+  - Added the required column `quizDate` to the `DailyQuiz` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropIndex
+DROP INDEX "DailyQuiz_userId_createdAt_key";
+
+-- AlterTable
+ALTER TABLE "DailyQuiz" ADD COLUMN     "quizDate" TIMESTAMP(3) NOT NULL;
+
+-- CreateIndex
+CREATE UNIQUE INDEX "DailyQuiz_userId_quizDate_key" ON "DailyQuiz"("userId", "quizDate");

apps/api/prisma/schema.prisma

@@ -67,6 +67,12 @@ model Topic {
   userCompletions   UserCompletion[]
   questions         Question[]
   userPerformances  UserTopicPerformance[]
+
+
+  difficulty        QuestionDifficulty              @default(easy) 
+  attempted         Int              @default(0)
+  solved            Int              @default(0)
+
   notes             Note[]
 }
 
@@ -85,6 +91,7 @@ model Note {
   topic    Topic  @relation(fields: [topicId], references: [id], onDelete: Cascade)
   courseId String
   course   Course @relation(fields: [courseId], references: [id], onDelete: Cascade)
+
 }
 
 model UserCompletion {
@@ -153,6 +160,10 @@ model DailyQuiz {
   createdAt   DateTime  @default(now())
   updatedAt   DateTime  @updatedAt
   submittedAt DateTime?
+  totalQuestions Int @default(10)
+  quizDate    DateTime  // Should be set to the date (midnight) of the quiz, without time component
+
+  @@unique([userId, quizDate])
 }
 
 model User {
@@ -246,3 +257,4 @@ model Jwks {
 
   @@map("jwks")
 }
+

apps/api/src/app.ts

@@ -3,6 +3,7 @@ import express from "express";
 import { auth } from "./lib/auth.js";
 import { toNodeHandler } from "better-auth/node";
 import { admin, adminRouter } from "./lib/admin.js";
+import { quizzesRouter } from "./routes/quizzes.js";
 import api from "./routes/index.js";
 import { notesRouter } from "./routes/notes.js";
 
@@ -12,8 +13,12 @@ app.disable("x-powered-by");
 app.all("/api/auth/*", toNodeHandler(auth));
 app.use(admin.options.rootPath, adminRouter);
 console.log(`AdminJS is running under ${admin.options.rootPath}`);
+
 app.use(express.json());
+
 app.use(notesRouter);
 app.use("/api", api);
+app.use("/api/quizzes", quizzesRouter);
+
 
 export default app;

apps/api/src/controller/calendar.controller.ts

@@ -0,0 +1,84 @@
+import { Request, Response } from "express";
+import type { Session, User } from "better-auth";
+import { prisma } from "../lib/prisma.js";
+
+declare global {
+  // Ensure session typing just like other controllers
+  namespace Express {
+    interface Request {
+      session?: Session;
+      user?: User;
+    }
+  }
+}
+
+interface ApiResponse<T> {
+  status: string;
+  message?: string;
+  data?: T;
+}
+const send = <T>(res: Response, code: number, body: ApiResponse<T>) =>
+  res.status(code).json(body);
+
+// Utility to get month boundaries in local time (00:00:00.000 inclusive to next month start exclusive)
+const monthRange = (year: number, month0: number) => {
+  const start = new Date(year, month0, 1, 0, 0, 0, 0);
+  const end = new Date(year, month0 + 1, 1, 0, 0, 0, 0);
+  return { start, end };
+};
+
+/**
+ * Returns an array of booleans (index 0 = day 1) for the requested month indicating
+ * which days the user submitted a quiz (DailyQuiz.submittedAt not null).
+ * Query params: year=YYYY, month=1-12 (defaults to current year/month if omitted)
+ */
+export const getQuizSubmissionCalendar = async (
+  req: Request,
+  res: Response
+): Promise<void> => {
+  if (!req.session) {
+    send(res, 401, { status: "fail", message: "Unauthorized" });
+    return;
+  }
+  const userId = req.session.userId;
+
+  // Parse month/year with fallbacks
+  const now = new Date();
+  const year = Number(req.query.year) || now.getFullYear();
+  const monthParam = Number(req.query.month); // 1-12
+  const month0 =
+    monthParam && monthParam >= 1 && monthParam <= 12 ?
+      monthParam - 1
+    : now.getMonth();
+
+  try {
+    const { start, end } = monthRange(year, month0);
+    const daysInMonth = new Date(year, month0 + 1, 0).getDate();
+    const days: boolean[] = Array(daysInMonth).fill(false);
+
+    const submissions = await prisma.dailyQuiz.findMany({
+      where: {
+        userId,
+        submittedAt: { not: null, gte: start, lt: end },
+      },
+      select: { submittedAt: true },
+    });
+
+    for (const s of submissions) {
+      if (!s.submittedAt) continue;
+      const day = s.submittedAt.getDate(); // 1-based
+      if (day >= 1 && day <= daysInMonth) days[day - 1] = true;
+    }
+
+    send(res, 200, {
+      status: "success",
+      data: { year, month: month0 + 1, days },
+    });
+  } catch (err) {
+    console.error("[getQuizSubmissionCalendar] error", err);
+    send(res, 500, {
+      status: "error",
+      message: "Failed to fetch calendar",
+    });
+  }
+};

apps/api/src/controller/quiz.controller.ts

@@ -0,0 +1,130 @@
+import { Request, Response } from "express";
+import type { Session, User } from "better-auth";
+import { fetchAiRecommendation } from "../services/ai.service.js";
+import { buildUserQuizData } from "../services/quiz-data.service.js";
+import { fetchQuestionsByRecommendation } from "../services/question.service.js";
+import {
+  saveOrUpdateDailyQuiz,
+  findTodayDailyQuiz,
+} from "../services/daily-quiz.service.js";
+import {
+  gradeAnswers,
+  SubmittedAnswerInput,
+} from "../services/quiz-submission.service.js";
+import { updateDailyQuizScoreByUserToday } from "../services/daily-quiz.service.js";
+
+declare global {
+  namespace Express {
+    interface Request {
+      session?: Session;
+      user?: User;
+    }
+  }
+}
+
+// Utility helpers -------------------------------------------------------------
+const startOfDay = (d: Date) =>
+  new Date(d.getFullYear(), d.getMonth(), d.getDate());
+
+interface ApiResponse<T> {
+  status: string;
+  message?: string;
+  data?: T;
+}
+const send = <T>(res: Response, code: number, body: ApiResponse<T>) =>
+  res.status(code).json(body);
+
+export const getQuiz = async (req: Request, res: Response): Promise<void> => {
+  if (!req.session) {
+    send(res, 401, { status: "fail", message: "Unauthorized" });
+    return;
+  }
+  const userId = req.session.userId;
+  const today = new Date();
+
+  try {
+    // Fetch existing quiz (by date range) if any
+    const existingQuiz = await findTodayDailyQuiz(userId, today);
+    const totalQuestions = existingQuiz?.totalQuestions || 10;
+
+    // Build data for AI
+    const quizData = await buildUserQuizData(userId, totalQuestions);
+    if (!quizData) {
+      send(res, 404, {
+        status: "fail",
+        message: "User hasn't completed any topics yet",
+      });
+      return;
+    }
+
+    const aiRecommendation = await fetchAiRecommendation(quizData);
+    const questions = await fetchQuestionsByRecommendation(
+      aiRecommendation,
+      totalQuestions
+    );
+
+    // Persist / update quiz record (schema only stores counts currently)
+    const savedQuiz = await saveOrUpdateDailyQuiz(
+      userId,
+      startOfDay(today),
+      totalQuestions
+    );
+
+    send(res, 200, {
+      status: "success",
+      data: { quiz: savedQuiz, questions, aiRecommendation },
+    });
+  } catch (err) {
+    console.error("[getQuiz] error", err);
+    send(res, 500, {
+      status: "error",
+      message: "Failed to generate quiz",
+    });
+  }
+};
+
+export const submitQuiz = async (
+  req: Request,
+  res: Response
+): Promise<void> => {
+  if (!req.session) {
+    send(res, 401, { status: "fail", message: "Unauthorized" });
+    return;
+  }
+  const userId = req.session.userId;
+  const today = new Date();
+
+  try {
+    const { answers } = req.body as { answers: SubmittedAnswerInput[] };
+    if (!Array.isArray(answers) || answers.length === 0) {
+      send(res, 400, {
+        status: "fail",
+        message: "answers array required",
+      });
+      return;
+    }
+
+    const grading = await gradeAnswers(answers);
+    await updateDailyQuizScoreByUserToday(
+      userId,
+      today,
+      grading.scorePercentage
+    );
+
+    send(res, 200, {
+      status: "success",
+      data: {
+        score: grading.scorePercentage,
+        correctCount: grading.correctCount,
+        total: grading.total,
+        answers: grading.graded,
+      },
+    });
+  } catch (err) {
+    console.error("[submitQuiz] error", err);
+    send(res, 500, {
+      status: "error",
+      message: "Failed to submit quiz",
+    });
+  }
+};

apps/api/src/routes/quizzes.ts

@@ -1,23 +1,29 @@
 import { Router } from "express";
 import { validate } from "../middlewares/validate.js";
+import { requireAuth } from "../middlewares/auth.js";
 import { submitDailyQuizBodySchema } from "../schemas/quizzes.js";
+import { getQuiz, submitQuiz } from "../controller/quiz.controller.js";
+import { getQuizSubmissionCalendar } from "../controller/calendar.controller.js";
 
 const router = Router();
 
-router.get("/monthly-stats", (req, res) => {
-  res.send(req.url);
-});
+// Calendar of submissions (month view)
+router.get(
+  "/calendar",
+  requireAuth,
+  // optional validation for query could be added later
+  getQuizSubmissionCalendar
+);
 
-router.get("/daily", (req, res) => {
-  res.send(req.url);
-});
+// Fetch / (re)generate today's quiz for the user
+router.get("/daily", requireAuth, getQuiz);
 
+// Submit answers for today's quiz
 router.post(
   "/daily",
+  requireAuth,
   validate({ body: submitDailyQuizBodySchema }),
-  (req, res) => {
-    res.send(req.url);
-  },
+  submitQuiz
 );
 
 export { router as quizzesRouter };

apps/api/src/schemas/quizzes.ts

@@ -1,10 +1,12 @@
 import z from "zod";
 
 export const submitDailyQuizBodySchema = z.object({
-  answers: z.array(
-    z.object({
-      questionId: z.string().uuid(),
-      answer: z.string().optional(),
-    }),
-  ),
+  answers: z
+    .array(
+      z.object({
+        questionId: z.string().uuid(),
+        choiceIndex: z.number().int().min(0),
+      })
+    )
+    .min(1),
 });

apps/api/src/services/ai.service.ts

@@ -0,0 +1,15 @@
+import axios from "axios";
+
+export const fetchAiRecommendation = async (quizData: any) => {
+  try {
+    const aiApiUrl = process.env.AI_API_URL || "http://localhost:5000/api/data";
+    const response = await axios.post(
+      aiApiUrl,
+      quizData
+    );
+    return response.data;
+  } catch (err) {
+    console.error("AI Recommendation error:", err);
+    throw new Error("Failed to get AI recommendation");
+  }
+};