fix: Update dashboard data live instead of mock data for admin/instructor/student. Change the ai generate quiz form in the quiz editor page to be similar to the one in the course editor page.

Author: hoangphuc841

apps/api/src/admin/admin.service.spec.ts

@@ -21,7 +21,9 @@ describe('AdminService', () => {
 
   const mockCoursesService: Partial<jest.Mocked<CoursesService>> = {
     count: jest.fn(),
+    countPublished: jest.fn(),
     countEnrollments: jest.fn(),
+    countPublishedEnrollments: jest.fn(),
     getCourseGrowthStats: jest.fn(),
     getEnrollmentGrowthStats: jest.fn(),
     getRevenueGrowthStats: jest.fn(),
@@ -62,8 +64,10 @@ describe('AdminService', () => {
       usersService.getGrowthStats.mockResolvedValue([]);
       usersService.getActiveInstructorsCount.mockResolvedValue(5);
 
-      coursesService.count.mockResolvedValue(courseCount);
-      coursesService.countEnrollments.mockResolvedValue(enrollmentCount);
+      coursesService.countPublished.mockResolvedValue(courseCount);
+      coursesService.countPublishedEnrollments.mockResolvedValue(
+        enrollmentCount,
+      );
       coursesService.getCourseGrowthStats.mockResolvedValue([]);
       coursesService.getEnrollmentGrowthStats.mockResolvedValue([]);
       coursesService.getRevenueGrowthStats.mockResolvedValue([]);
@@ -74,8 +78,8 @@ describe('AdminService', () => {
       const result = await service.getSystemStats();
 
       expect(usersService.count).toHaveBeenCalledTimes(1);
-      expect(coursesService.count).toHaveBeenCalledTimes(1);
-      expect(coursesService.countEnrollments).toHaveBeenCalledTimes(1);
+      expect(coursesService.countPublished).toHaveBeenCalledTimes(1);
+      expect(coursesService.countPublishedEnrollments).toHaveBeenCalledTimes(1);
 
       expect(result).toEqual({
         totalUsers: userCount,
@@ -97,8 +101,8 @@ describe('AdminService', () => {
       usersService.getGrowthStats.mockResolvedValue([]);
       usersService.getActiveInstructorsCount.mockResolvedValue(0);
 
-      coursesService.count.mockResolvedValue(0);
-      coursesService.countEnrollments.mockResolvedValue(0);
+      coursesService.countPublished.mockResolvedValue(0);
+      coursesService.countPublishedEnrollments.mockResolvedValue(0);
       coursesService.getCourseGrowthStats.mockResolvedValue([]);
       coursesService.getEnrollmentGrowthStats.mockResolvedValue([]);
       coursesService.getRevenueGrowthStats.mockResolvedValue([]);

apps/api/src/admin/admin.service.ts

@@ -26,8 +26,9 @@ export class AdminService {
 
   async getSystemStats(): Promise<SystemStats> {
     const totalUsers = await this.usersService.count();
-    const totalCourses = await this.coursesService.count();
-    const totalEnrollments = await this.coursesService.countEnrollments();
+    const totalCourses = await this.coursesService.countPublished();
+    const totalEnrollments =
+      await this.coursesService.countPublishedEnrollments();
 
     // Get trend data (last 30 days)
     const userGrowth = await this.usersService.getGrowthStats(30);

apps/api/src/courses/courses.service.ts

@@ -459,7 +459,14 @@ export class CoursesService {
     const { archived = false, status = 'all' } = options;
 
     const enrollments = await this.enrollmentRepository.find({
-      where: { userId, isArchived: archived },
+      where: {
+        userId,
+        isArchived: archived,
+        course: {
+          isPublished: true,
+          status: CourseStatus.PUBLISHED,
+        },
+      },
       relations: [
         'course',
         'course.instructor',
@@ -974,12 +981,27 @@ export class CoursesService {
     return await this.coursesRepository.count();
   }
 
+  async countPublished(): Promise<number> {
+    return await this.coursesRepository.count({
+      where: { isPublished: true, status: CourseStatus.PUBLISHED },
+    });
+  }
+
   // --- Statistics ---
 
   async countEnrollments(): Promise<number> {
     return await this.enrollmentRepository.count();
   }
 
+  async countPublishedEnrollments(): Promise<number> {
+    return await this.enrollmentRepository
+      .createQueryBuilder('enrollment')
+      .leftJoin('enrollment.course', 'course')
+      .where('course.isPublished = :isPublished', { isPublished: true })
+      .andWhere('course.status = :status', { status: CourseStatus.PUBLISHED })
+      .getCount();
+  }
+
   // --- Moderation ---
 
   async submitForApproval(id: string, userId: string): Promise<Course> {
@@ -1068,7 +1090,9 @@ export class CoursesService {
       .createQueryBuilder('course')
       .select("TO_CHAR(course.createdAt, 'YYYY-MM-DD')", 'date')
       .addSelect('COUNT(*)', 'count')
+      .addSelect('COUNT(*)', 'count')
       .where("course.createdAt >= NOW() - INTERVAL '30 days'")
+      .andWhere('course.isPublished = :isPublished', { isPublished: true })
       .groupBy("TO_CHAR(course.createdAt, 'YYYY-MM-DD')")
       .orderBy('date', 'ASC')
       .getRawMany();
@@ -1082,9 +1106,12 @@ export class CoursesService {
   async getEnrollmentGrowthStats(_days = 30): Promise<CourseDailyStat[]> {
     const data = await this.enrollmentRepository
       .createQueryBuilder('enrollment')
+      .leftJoin('enrollment.course', 'course')
       .select("TO_CHAR(enrollment.enrolledAt, 'YYYY-MM-DD')", 'date')
       .addSelect('COUNT(*)', 'count')
       .where("enrollment.enrolledAt >= NOW() - INTERVAL '30 days'")
+      .andWhere('course.isPublished = :isPublished', { isPublished: true })
+      .andWhere('course.status = :status', { status: CourseStatus.PUBLISHED })
       .groupBy("TO_CHAR(enrollment.enrolledAt, 'YYYY-MM-DD')")
       .orderBy('date', 'ASC')
       .getRawMany();
@@ -1102,6 +1129,8 @@ export class CoursesService {
       .select("TO_CHAR(enrollment.enrolledAt, 'YYYY-MM-DD')", 'date')
       .addSelect('SUM(course.price)', 'count') // Reusing 'count' field for value to match interface
       .where("enrollment.enrolledAt >= NOW() - INTERVAL '30 days'")
+      .andWhere('course.isPublished = :isPublished', { isPublished: true })
+      .andWhere('course.status = :status', { status: CourseStatus.PUBLISHED })
       .groupBy("TO_CHAR(enrollment.enrolledAt, 'YYYY-MM-DD')")
       .orderBy('date', 'ASC')
       .getRawMany();
@@ -1131,6 +1160,8 @@ export class CoursesService {
       await this.enrollmentRepository
         .createQueryBuilder('enrollment')
         .leftJoin('enrollment.course', 'course')
+        .where('course.isPublished = :isPublished', { isPublished: true })
+        .andWhere('course.status = :status', { status: CourseStatus.PUBLISHED })
         .select('SUM(course.price)', 'total')
         .getRawOne();
 
@@ -1144,6 +1175,8 @@ export class CoursesService {
       .createQueryBuilder('course')
       .select('course.level', 'name')
       .addSelect('COUNT(*)', 'value')
+      .where('course.isPublished = :isPublished', { isPublished: true })
+      .andWhere('course.status = :status', { status: CourseStatus.PUBLISHED })
       .groupBy('course.level')
       .getRawMany();
 

apps/api/src/dashboard/dashboard.module.ts

@@ -3,14 +3,16 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 
 import { Course } from '../courses/entities/course.entity';
 import { Enrollment } from '../courses/entities/enrollment.entity';
-import { Lesson } from '../courses/entities/lesson.entity';
+import { QuizSubmission } from '../quizzes/entities/quiz-submission.entity';
 import { User } from '../users/entities/user.entity';
 
 import { DashboardController } from './dashboard.controller';
 import { DashboardService } from './dashboard.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([User, Course, Enrollment, Lesson])],
+  imports: [
+    TypeOrmModule.forFeature([User, Course, Enrollment, QuizSubmission]),
+  ],
   controllers: [DashboardController],
   providers: [DashboardService],
 })

apps/api/src/dashboard/dashboard.service.spec.ts

@@ -3,6 +3,7 @@ import { getRepositoryToken } from '@nestjs/typeorm';
 
 import { Course } from '../courses/entities/course.entity';
 import { Enrollment } from '../courses/entities/enrollment.entity';
+import { QuizSubmission } from '../quizzes/entities/quiz-submission.entity';
 import { User } from '../users/entities/user.entity';
 import { UserRole } from '../users/enums/user-role.enum';
 
@@ -13,6 +14,7 @@ describe('DashboardService', () => {
   let mockUserRepository: Record<string, jest.Mock>;
   let mockCourseRepository: Record<string, jest.Mock>;
   let mockEnrollmentRepository: Record<string, jest.Mock>;
+  let mockQuizSubmissionRepository: Record<string, jest.Mock>;
 
   const mockStudent: User = {
     id: 'student-1',
@@ -42,25 +44,43 @@ describe('DashboardService', () => {
     mockUserRepository = {
       count: jest.fn(),
       find: jest.fn(),
+      createQueryBuilder: jest.fn(() => ({
+        where: jest.fn().mockReturnThis(),
+        getCount: jest.fn().mockResolvedValue(10),
+      })),
     };
 
     mockCourseRepository = {
       count: jest.fn(),
       find: jest.fn(),
+      createQueryBuilder: jest.fn(() => ({
+        where: jest.fn().mockReturnThis(),
+        andWhere: jest.fn().mockReturnThis(),
+        getCount: jest.fn().mockResolvedValue(5),
+      })),
     };
 
     mockEnrollmentRepository = {
       count: jest.fn(),
       find: jest.fn(),
       createQueryBuilder: jest.fn(() => ({
         leftJoin: jest.fn().mockReturnThis(),
-        where: jest.fn().mockReturnThis(),
         select: jest.fn().mockReturnThis(),
+        where: jest.fn().mockReturnThis(),
+        andWhere: jest.fn().mockReturnThis(),
         getCount: jest.fn().mockResolvedValue(5),
         getRawOne: jest.fn().mockResolvedValue({ total: '10' }),
       })),
     };
 
+    mockQuizSubmissionRepository = {
+      createQueryBuilder: jest.fn(() => ({
+        select: jest.fn().mockReturnThis(),
+        where: jest.fn().mockReturnThis(),
+        getRawOne: jest.fn().mockResolvedValue({ avgScore: '0' }),
+      })),
+    };
+
     const module: TestingModule = await Test.createTestingModule({
       providers: [
         DashboardService,
@@ -76,6 +96,10 @@ describe('DashboardService', () => {
           provide: getRepositoryToken(Enrollment),
           useValue: mockEnrollmentRepository,
         },
+        {
+          provide: getRepositoryToken(QuizSubmission),
+          useValue: mockQuizSubmissionRepository,
+        },
       ],
     }).compile();
 
@@ -98,8 +122,10 @@ describe('DashboardService', () => {
         expect(result).toEqual({
           totalUsers: 100,
           totalCourses: 25,
-          totalEnrollments: 500,
+          totalEnrollments: 5, // queryBuilder mock returns 5
           activeStudents: 5,
+          newUsersCount: 10,
+          newCoursesCount: 5,
         });
       });
     });
@@ -113,7 +139,8 @@ describe('DashboardService', () => {
         expect(result).toEqual({
           coursesCreated: 5,
           totalStudents: 10,
-          averageRating: 0,
+          activeStudents: 10,
+          newStudentsCount: 10,
         });
         expect(mockCourseRepository.count).toHaveBeenCalledWith({
           where: { instructor: { id: 'instructor-1' } },