Merge pull request #27 from Code-the-Dream-School/feature/dashboard-login

Connect dashboard + quizzes + shared header

Author: nataliasirt

backend/src/controllers/dashboard.controller.ts

@@ -1,5 +1,5 @@
 import { Request, Response } from 'express';
-import { buildDashboard } from '../services/dashboard.service.js';
+import { buildDashboard, buildActivityLog } from '../services/dashboard.service.js';
 import { UnauthenticatedError } from '../errors/index.js';
 
 export const getDashboardData = async (req: Request, res: Response) => {
@@ -18,3 +18,25 @@ export const getDashboardData = async (req: Request, res: Response) => {
     res.status(500).json({ message: 'Failed to load dashboard' });
   }
 };
+
+export const getDashboardActivity = async (req: Request, res: Response) => {
+  try {
+    const userId = req.user?.id;
+
+    if (!userId) {
+      throw new UnauthenticatedError('User not authenticated');
+    }
+
+    const limitParam = typeof req.query.limit === 'string' ? Number(req.query.limit) : undefined;
+    const limit = Number.isFinite(limitParam) ? limitParam : undefined;
+    const activity = await buildActivityLog(
+      userId,
+      typeof limit === 'number' ? { limit } : {}
+    );
+
+    res.json(activity);
+  } catch (error) {
+    console.error('Dashboard activity error:', error);
+    res.status(500).json({ message: 'Failed to load dashboard activity' });
+  }
+};

backend/src/controllers/flashcards.controller.ts

@@ -4,6 +4,7 @@ import mongoose from 'mongoose';
 import { FlashcardSetModel } from '../models/FlashcardSet';
 import { FlashcardModel } from '../models/Flashcard';
 import { Resource } from '../models/Resource';
+import { FlashcardStudySessionModel } from '../models/FlashcardStudySession';
 import { generateFlashcardsFromText } from '../services/flashcardsGenerator';
 
 const getOwnerId = (req: Request): string | undefined =>
@@ -287,3 +288,63 @@ export const deleteFlashcardsSet = async (req: Request, res: Response) => {
     return res.status(500).json({ message: msg });
   }
 };
+
+export const recordFlashcardStudySession = async (req: Request, res: Response) => {
+  try {
+    const ownerIdStr = getOwnerId(req);
+    if (!ownerIdStr) {
+      return res.status(401).json({ message: 'Unauthorized.' });
+    }
+    if (!mongoose.Types.ObjectId.isValid(ownerIdStr)) {
+      return res.status(400).json({ message: 'Invalid ownerId.' });
+    }
+
+    const ownerId = new mongoose.Types.ObjectId(ownerIdStr);
+
+    const setIdStr = req.params.setId;
+    if (!setIdStr || !mongoose.Types.ObjectId.isValid(setIdStr)) {
+      return res.status(400).json({ message: 'Invalid setId.' });
+    }
+    const setId = new mongoose.Types.ObjectId(setIdStr);
+
+    const { cardsReviewed, startedAt, finishedAt } = req.body as {
+      cardsReviewed?: number;
+      startedAt?: string;
+      finishedAt?: string;
+    };
+
+    if (typeof cardsReviewed !== 'number' || cardsReviewed < 0) {
+      return res.status(400).json({ message: 'cardsReviewed must be a non-negative number.' });
+    }
+
+    if (!startedAt || !finishedAt) {
+      return res.status(400).json({ message: 'startedAt and finishedAt are required.' });
+    }
+
+    const started = new Date(startedAt);
+    const finished = new Date(finishedAt);
+    if (Number.isNaN(started.getTime()) || Number.isNaN(finished.getTime())) {
+      return res.status(400).json({ message: 'Invalid date format.' });
+    }
+
+    const set = await FlashcardSetModel.findOne({ _id: setId, ownerId }).lean();
+    if (!set) {
+      return res.status(404).json({ message: 'Flashcard set not found.' });
+    }
+
+    const session = await FlashcardStudySessionModel.create({
+      ownerId,
+      setId,
+      cardsReviewed,
+      startedAt: started,
+      finishedAt: finished,
+    });
+
+    return res.status(201).json({
+      sessionId: session._id.toString(),
+    });
+  } catch (e) {
+    const msg = e instanceof Error ? e.message : 'Unknown error';
+    return res.status(500).json({ message: msg });
+  }
+};

backend/src/models/FlashcardStudySession.ts

@@ -0,0 +1,38 @@
+import mongoose, { Schema } from "mongoose";
+
+export type FlashcardStudySession = {
+  ownerId: mongoose.Types.ObjectId;
+  setId: mongoose.Types.ObjectId;
+  cardsReviewed: number;
+  startedAt: Date;
+  finishedAt: Date;
+  createdAt: Date;
+};
+
+const FlashcardStudySessionSchema = new Schema<FlashcardStudySession>(
+  {
+    ownerId: { type: Schema.Types.ObjectId, required: true, index: true, ref: "User" },
+    setId: { type: Schema.Types.ObjectId, required: true, index: true, ref: "FlashcardSet" },
+    cardsReviewed: { type: Number, required: true, min: 0 },
+    startedAt: { type: Date, required: true },
+    finishedAt: { type: Date, required: true },
+  },
+  {
+    collection: "flashcard_study_sessions",
+    timestamps: { createdAt: true, updatedAt: false },
+  }
+);
+
+FlashcardStudySessionSchema.pre("validate", function (next) {
+  if (this.startedAt >= this.finishedAt) {
+    return next(new Error("finishedAt must be after startedAt"));
+  }
+  next();
+});
+
+FlashcardStudySessionSchema.index({ ownerId: 1, finishedAt: -1 });
+
+export const FlashcardStudySessionModel: mongoose.Model<FlashcardStudySession> =
+  mongoose.models.FlashcardStudySession
+    ? (mongoose.models.FlashcardStudySession as mongoose.Model<FlashcardStudySession>)
+    : mongoose.model<FlashcardStudySession>("FlashcardStudySession", FlashcardStudySessionSchema);

backend/src/routes/dashboard.routes.ts

@@ -1,8 +1,9 @@
 import { Router } from 'express';
-import { getDashboardData } from '../controllers/dashboard.controller';
+import { getDashboardActivity, getDashboardData } from '../controllers/dashboard.controller';
 
 const router = Router();
 
 router.get('/', getDashboardData);
+router.get('/activity', getDashboardActivity);
 
 export default router;

backend/src/routes/flashcards.routes.ts

@@ -5,6 +5,7 @@ import {
   listFlashcardsSetsByResource,
   getFlashcardsSet,
   deleteFlashcardsSet,
+  recordFlashcardStudySession,
 } from '../controllers/flashcards.controller';
 
 const router = express.Router();
@@ -14,5 +15,6 @@ router.get('/flashcard-sets', listAllFlashcardSets);
 router.get('/resources/:resourceId/flashcard-sets', listFlashcardsSetsByResource);
 router.get('/flashcard-sets/:setId', getFlashcardsSet);
 router.delete('/flashcard-sets/:setId', deleteFlashcardsSet);
+router.post('/flashcard-sets/:setId/sessions', recordFlashcardStudySession);
 
 export default router;