Merge pull request #69 from nhandang02/develop

refactor: chang response data for endpoint imoport csv

Author: nhandang02

src/files/files.service.ts

@@ -40,6 +40,7 @@ export class FilesService {
         accessKeyId: process.env.CLOUDFLARE_R2_ACCESS_KEY!,
         secretAccessKey: process.env.CLOUDFLARE_R2_SECRET_KEY!,
       },
+      forcePathStyle: true, // Required for Cloudflare R2 compatibility
     });
   }
 

src/question-banks/question-banks.controller.ts

@@ -70,12 +70,30 @@ export class QuestionBanksController {
     description: 'Lấy danh sách questions. Chỉ instructor mới có thể xem. Có thể filter theo courseId. Instructor chỉ thấy questions của courses mà họ tạo.'
   })
   @ApiQuery({ name: 'courseId', required: false, description: 'Filter by course ID' })
+  @ApiQuery({ name: 'page', required: false, type: Number, description: 'Page number (default: 1)' })
+  @ApiQuery({ name: 'limit', required: false, type: Number, description: 'Items per page (default: 50, max: 100)' })
   @ApiResponse({ status: 200, description: 'Questions retrieved successfully' })
   findAll(
     @Req() req: RequestWithUser,
     @Query('courseId') courseId?: string,
+    @Query('page') page?: string,
+    @Query('limit') limit?: string,
   ) {
-    return this.questionBanksService.findAll(req.user, courseId);
+    const pageNum = page ? Math.max(1, parseInt(page, 10)) : 1;
+    const limitNum = limit ? Math.min(100, Math.max(1, parseInt(limit, 10))) : 50;
+    
+    const result = this.questionBanksService.findAll(req.user, courseId, pageNum, limitNum);
+    return result.then((data) => ({
+      success: true,
+      message: 'Questions retrieved successfully',
+      data: data.data,
+      pagination: {
+        total: data.total,
+        page: data.page,
+        limit: data.limit,
+        totalPages: Math.ceil(data.total / data.limit),
+      },
+    }));
   }
 
   @Get(':id')

src/question-banks/question-banks.service.ts

@@ -51,6 +51,24 @@ export class QuestionBanksService {
       throw new BadRequestException('At least 2 choices are required');
     }
 
+    // Kiểm tra trùng lặp questionText trong cùng course
+    const questionTextLower = createQuestionDto.questionText.toLowerCase().trim();
+    const allQuestionsInCourse = await this.questionRepository.find({
+      where: { courseId: createQuestionDto.courseId },
+      select: ['questionText'],
+    });
+
+    const isDuplicate = allQuestionsInCourse.some(
+      (q) => q.questionText.toLowerCase().trim() === questionTextLower,
+    );
+
+    if (isDuplicate) {
+      throw new BadRequestException({
+        message: 'Question already exists in question bank',
+        statusCode: 400,
+      });
+    }
+
     // Set createdById from user
     const question = this.questionRepository.create({
       ...createQuestionDto,
@@ -59,11 +77,21 @@ export class QuestionBanksService {
     return this.questionRepository.save(question);
   }
 
-  async findAll(user?: User, courseId?: string): Promise<Question[]> {
+  async findAll(
+    user?: User,
+    courseId?: string,
+    page: number = 1,
+    limit: number = 50,
+  ): Promise<{ data: Question[]; total: number; page: number; limit: number }> {
     if (!user || user.role !== UserRole.INSTRUCTOR) {
       throw new ForbiddenException('Only instructors can view questions');
     }
 
+    // Validate pagination parameters
+    const pageNum = Math.max(1, page);
+    const limitNum = Math.min(100, Math.max(1, limit));
+    const skip = (pageNum - 1) * limitNum;
+
     // Instructor: Xem questions của courses mà họ tạo
     const queryBuilder = this.questionRepository
       .createQueryBuilder('question')
@@ -76,7 +104,17 @@ export class QuestionBanksService {
       queryBuilder.andWhere('question.courseId = :courseId', { courseId });
     }
 
-    return queryBuilder.orderBy('question.createdAt', 'DESC').getMany();
+    // Get total count
+    const total = await queryBuilder.getCount();
+
+    // Get paginated data
+    const data = await queryBuilder
+      .orderBy('question.createdAt', 'DESC')
+      .skip(skip)
+      .take(limitNum)
+      .getMany();
+
+    return { data, total, page: pageNum, limit: limitNum };
   }
 
   async findOne(id: string, user?: User): Promise<Question> {
@@ -188,28 +226,103 @@ export class QuestionBanksService {
     const worksheet = workbook.Sheets[sheetName];
     const data = xlsx.utils.sheet_to_json(worksheet);
 
-    const questionsToCreate: CreateQuestionDto[] = [];
-    const errors: string[] = [];
-
+    // Lấy danh sách questionText hiện có trong course để kiểm tra trùng lặp
+    const existingQuestions = await this.questionRepository.find({
+      where: { courseId },
+      select: ['questionText'],
+    });
+    const existingQuestionTexts = new Set(
+      existingQuestions.map((q) => q.questionText.toLowerCase().trim()),
+    );
+
+    // Mảng để lưu kết quả từng câu hỏi
+    const questionResults: Array<{
+      rowNumber: number;
+      questionText: string;
+      success: boolean;
+      questionId?: string;
+      error?: string;
+    }> = [];
+
+    // Mảng để lưu các câu hỏi hợp lệ để tạo (kèm index để map lại)
+    const questionsToCreate: Array<{ dto: CreateQuestionDto; resultIndex: number }> = [];
+    const questionTextsInFile = new Set<string>(); // Để kiểm tra trùng lặp trong file
+
+    // Xử lý từng dòng trong file
     for (const [index, row] of data.entries()) {
       const rowNumber = index + 2; // 1-based index + header row
+      const rowData = row as Record<string, any>;
+      const questionText = rowData['Question Text']?.toString().trim() || '';
+
+      // Kiểm tra trùng lặp trong file
+      const questionTextLower = questionText.toLowerCase();
+      if (questionTextsInFile.has(questionTextLower)) {
+        questionResults.push({
+          rowNumber,
+          questionText,
+          success: false,
+          error: 'Question is duplicated in file',
+        });
+        continue;
+      }
+      questionTextsInFile.add(questionTextLower);
+
+      // Kiểm tra trùng lặp với database
+      if (existingQuestionTexts.has(questionTextLower)) {
+        questionResults.push({
+          rowNumber,
+          questionText,
+          success: false,
+          error: 'Question already exists in question bank',
+        });
+        continue;
+      }
+
+      // Validate và map dữ liệu
       try {
-        const questionDto = this.mapRowToQuestionDto(row, courseId, user.id);
-        questionsToCreate.push(questionDto);
+        const questionDto = this.mapRowToQuestionDto(rowData, courseId, user.id);
+        const resultIndex = questionResults.length;
+        questionsToCreate.push({ dto: questionDto, resultIndex });
+        
+        // Tạm thời đánh dấu là success, sẽ cập nhật questionId sau khi save
+        questionResults.push({
+          rowNumber,
+          questionText,
+          success: true,
+        });
       } catch (error) {
-        errors.push(`Row ${rowNumber}: ${error.message}`);
+        questionResults.push({
+          rowNumber,
+          questionText,
+          success: false,
+          error: error.message || 'Unknown error',
+        });
       }
     }
 
+    // Lưu các câu hỏi hợp lệ vào database
     if (questionsToCreate.length > 0) {
-      await this.questionRepository.save(this.questionRepository.create(questionsToCreate));
+      const dtosToCreate = questionsToCreate.map((item) => item.dto);
+      const savedQuestions = await this.questionRepository.save(
+        this.questionRepository.create(dtosToCreate),
+      );
+
+      // Cập nhật questionId cho các câu hỏi đã lưu thành công
+      for (let i = 0; i < questionsToCreate.length; i++) {
+        const { resultIndex } = questionsToCreate[i];
+        questionResults[resultIndex].questionId = savedQuestions[i].id;
+      }
     }
 
+    // Tính toán thống kê
+    const imported = questionResults.filter((r) => r.success).length;
+    const failed = questionResults.filter((r) => !r.success).length;
+
     return {
       total: data.length,
-      imported: questionsToCreate.length,
-      failed: errors.length,
-      errors,
+      imported,
+      failed,
+      questions: questionResults, // Mảng chi tiết từng câu hỏi
     };
   }