Merge branch 'dev' of https://github.com/SAIG-KMITL/edusaig-api into dev

src/app.module.ts

@@ -34,6 +34,7 @@ import { UserOccupationModule } from './user-occupation/user-occupation.module';
 import { UserStreakModule } from './user-streak/user-streak.module';
 import { UserModule } from './user/user.module';
 import { UserRewardModule } from './user-reward/user-reward.module';
+import { PretestModule } from './pretest/pretest.module';
 
 @Module({
   imports: [
@@ -79,6 +80,7 @@ import { UserRewardModule } from './user-reward/user-reward.module';
     RewardModule,
     UserRewardModule,
     RoadmapModule,
+    PretestModule,
   ],
   controllers: [AppController],
   providers: [

src/chapter/chapter.controller.ts

@@ -66,14 +66,13 @@ export class ChapterController {
     type: String,
     description: 'Course id',
   })
-  @ApiBearerAuth()
+  @Public()
   @ApiResponse({
     status: HttpStatus.OK,
     description: 'Get chapter video',
     type: StreamableFile,
   })
   async getVideo(
-    @Req() request: AuthenticatedRequest,
     @Param(
       'id',
       new ParseUUIDPipe({
@@ -83,11 +82,9 @@ export class ChapterController {
     )
     id: string,
   ): Promise<StreamableFile> {
-    const chapter = await this.chapterService.findOneWithOwnership(
-      request.user.id,
-      request.user.role,
-      { where: { id } },
-    );
+    const chapter = await this.chapterService.findOne({
+      where: { id },
+    });
 
     const file = await this.fileService.get(Folder.CHAPTER_VIDEOS, chapter.videoKey);
     return new StreamableFile(file, {

src/enrollment/enrollment.service.ts

@@ -42,13 +42,6 @@ export class EnrollmentService {
     return enrollments;
   }
 
-  async findEnrollmentByUserId(userId: string): Promise<Enrollment[]> {
-    const enrollment = this.enrollmentRepository.find({
-      where: { user: { id: userId } },
-    });
-    return enrollment;
-  }
-
   async findOne(where: FindOptionsWhere<Enrollment>): Promise<Enrollment> {
     const options: FindOneOptions<Enrollment> = {
       where,

src/exam-attempt/dtos/create-exam-attempt.dto.ts

@@ -31,3 +31,33 @@ export class CreateExamAttemptDto {
   })
   status: ExamAttemptStatus;
 }
+
+export class CreateExamAttemptPretestDto {
+  @IsNotEmpty()
+  @ApiProperty({
+    description: 'Pretest ID',
+    type: String,
+    example: '8d4887aa-28e7-4d0e-844c-28a8ccead003',
+  })
+  pretestId: string;
+
+  @IsOptional()
+  @Min(0)
+  @IsInt()
+  @ApiProperty({
+    description: 'Score',
+    type: Number,
+    example: 0,
+  })
+  score?: number;
+
+  @IsNotEmpty()
+  @IsEnum(ExamAttemptStatus)
+  @ApiProperty({
+    description: 'Exam attempt status',
+    type: String,
+    example: ExamAttemptStatus.IN_PROGRESS,
+    enum: ExamAttemptStatus,
+  })
+  status: ExamAttemptStatus;
+}

src/exam-attempt/dtos/exam-attempt-pretest.dto.ts

@@ -0,0 +1,100 @@
+import { ExamAttemptStatus } from 'src/shared/enums';
+import { ApiProperty } from '@nestjs/swagger';
+import { PaginatedResponse } from 'src/shared/pagination/dtos/paginate-response.dto';
+import { UserResponseDto } from 'src/user/dtos/user-response.dto';
+import { ExamAttempt } from '../exam-attempt.entity';
+import { PretestResponseDto } from 'src/pretest/dtos/pretest-response.dto';
+
+export class ExamAttemptPretestResponseDto {
+  @ApiProperty({
+    description: 'Exam Attempy ID',
+    type: String,
+    example: '123e4567-e89b-12d3-a456-426614174000',
+  })
+  id: string;
+
+  @ApiProperty({
+    description: 'Pretest Data',
+    type: PretestResponseDto,
+    example: {
+      id: '123e4567-e89b-12d3-a456-426614174000',
+      title: 'Exam title',
+      description: 'Exam description',
+      timeLimit: 20,
+      passingScore: 3,
+      maxAttempts: 1,
+      createdAt: '2024-11-26T11:10:00.257Z',
+      updatedAt: '2024-11-26T11:10:00.257Z',
+    },
+  })
+  pretest: PretestResponseDto;
+
+  @ApiProperty({
+    description: 'User Data',
+    type: String,
+    example: {
+      id: '389d1065-b898-4249-9d3d-e17e100336a7',
+      username: 'johndoe',
+      fullname: 'John Doe',
+      role: 'student',
+      email: 'johndoe@gmail.com',
+      profileKey: null,
+    },
+  })
+  user: UserResponseDto;
+
+  @ApiProperty({
+    description: 'Score',
+    type: String,
+    example: 0,
+  })
+  score: number;
+
+  @ApiProperty({
+    description: 'Exam attempt status',
+    type: String,
+    example: ExamAttemptStatus.IN_PROGRESS,
+    enum: ExamAttemptStatus,
+  })
+  status: ExamAttemptStatus;
+
+  @ApiProperty({
+    description: 'Exam attempt start at',
+    type: Date,
+    example: new Date(),
+  })
+  startedAt: Date;
+
+  @ApiProperty({
+    description: 'Exam attempt submit at',
+    type: Date,
+    example: new Date(),
+  })
+  submittedAt: Date;
+
+  constructor(examAttempt: ExamAttempt) {
+    this.id = examAttempt.id;
+    this.pretest = examAttempt.pretest;
+    this.user = examAttempt.user;
+    this.score = examAttempt.score;
+    this.status = examAttempt.status;
+    this.startedAt = examAttempt.startedAt;
+    this.submittedAt = examAttempt.submittedAt;
+  }
+}
+
+export class PaginatedExamAttemptPretestResponseDto extends PaginatedResponse(
+  ExamAttemptPretestResponseDto,
+) {
+  constructor(
+    examAttempt: ExamAttempt[],
+    total: number,
+    pageSize: number,
+    currentPage: number,
+  ) {
+    const examAttemptDtos = examAttempt.map(
+      (examAttempt) => new ExamAttemptPretestResponseDto(examAttempt),
+    );
+    super(examAttemptDtos, total, pageSize, currentPage);
+  }
+}

src/exam-attempt/dtos/update-exam-attempt.dto.ts

@@ -1,6 +1,13 @@
 import { OmitType, PartialType } from '@nestjs/swagger';
-import { CreateExamAttemptDto } from './create-exam-attempt.dto';
+import {
+  CreateExamAttemptDto,
+  CreateExamAttemptPretestDto,
+} from './create-exam-attempt.dto';
 
 export class UpdateExamAttemptDto extends PartialType(
   OmitType(CreateExamAttemptDto, ['examId'] as const),
 ) {}
+
+export class UpdateExamAttemptPretestDto extends PartialType(
+  OmitType(CreateExamAttemptPretestDto, ['pretestId'] as const),
+) {}