Merge pull request #319 from tmddus2/fix/240325-mongoose-type-error

Fix(#320): Mongoose Schema 속성 타입 Uint8Array 지원 안 하는 문제 해결

backend/src/lecture/dto/response/response-lecture-record.dto.ts

@@ -1,6 +1,7 @@
 import { ApiProperty } from '@nestjs/swagger';
 import { WhiteboardEventDto } from '../whiteboard-event.dto';
 import { Subtitle } from '../../interfaces/Subtitle';
+import { WhiteboardLog } from 'src/lecture/schema/whiteboard-log.schema';
 
 export class LectureRecordDto {
   @ApiProperty()
@@ -12,8 +13,8 @@ export class LectureRecordDto {
   @ApiProperty()
   audio_file: string;
 
-  constructor(logs: WhiteboardEventDto[], subtitles: [Subtitle], audio_file: string) {
-    this.logs = logs;
+  constructor(logs: WhiteboardLog[], subtitles: [Subtitle], audio_file: string) {
+    this.logs = logs.map((log) => new WhiteboardEventDto(log));
     this.subtitles = subtitles;
     this.audio_file = audio_file;
   }

backend/src/lecture/dto/whiteboard-event.dto.ts

@@ -1,3 +1,5 @@
+import { WhiteboardLog } from "../schema/whiteboard-log.schema";
+
 export class WhiteboardEventDto {
   objects: Uint8Array;
 
@@ -8,4 +10,14 @@ export class WhiteboardEventDto {
   width: number;
 
   height: number;
+
+  constructor(log?: WhiteboardLog) {
+    if (log) {
+      this.objects = new Uint8Array(log.objects);
+      this.viewport = log.viewport;
+      this.eventTime = log.eventTime;
+      this.width = log.width;
+      this.height = log.height;
+    }
+  }
 }

backend/src/lecture/lecture.controller.ts

@@ -107,7 +107,7 @@ export class LectureController {
     if (!enterCodeDocument) {
       throw new HttpException('해당 강의가 없습니다.', HttpStatus.NOT_FOUND);
     }
-
+    
     await this.lectureService.saveWhiteBoardLog(enterCodeDocument.lecture_id, whiteboardEventDto);
     res.status(HttpStatus.CREATED).send();
   }

backend/src/lecture/lecture.module.ts

@@ -2,7 +2,7 @@ import { Module } from '@nestjs/common';
 import { MongooseModule } from '@nestjs/mongoose';
 import { User, UserSchema } from 'src/user/user.schema';
 import { UserService } from 'src/user/user.service';
-import { LectureSubtitle, LectureSubtitleSchema } from './lecture-subtitle.schema';
+import { LectureSubtitle, LectureSubtitleSchema } from './schema/lecture-subtitle.schema';
 import { LectureController } from './lecture.controller';
 import { Lecture, LectureSchema } from './schema/lecture.schema';
 import { LectureService } from './lecture.service';

backend/src/lecture/lecture.service.ts

@@ -5,7 +5,7 @@ import { CreateLectureDto } from './dto/create-lecture.dto';
 import { UpdateLectureDto } from './dto/update-lecture.dto';
 import { WhiteboardLog } from './schema/whiteboard-log.schema';
 import { WhiteboardEventDto } from './dto/whiteboard-event.dto';
-import { LectureSubtitle } from './lecture-subtitle.schema';
+import { LectureSubtitle } from './schema/lecture-subtitle.schema';
 import { Lecture } from './schema/lecture.schema';
 import { EnterCode } from './schema/lecture-code.schema';
 import { generateRandomNumber } from 'src/utils/GenerateUtils';
@@ -71,7 +71,7 @@ export class LectureService {
 
   async saveWhiteBoardLog(lecture: Lecture, whiteboardEventDto: WhiteboardEventDto) {
     const whiteboardLog = new this.whiteboardLogModel({
-      objects: whiteboardEventDto.objects,
+      objects: whiteboardEventDto.objects['data'],
       viewport: whiteboardEventDto.viewport,
       eventTime: whiteboardEventDto.eventTime,
       width: whiteboardEventDto.width,
@@ -102,7 +102,7 @@ export class LectureService {
   async findLectureRecord(id: Types.ObjectId) {
     const lecture = await this.lectureModel.findById(id).exec();
     const logs = await this.findLogs(lecture);
-    const subtitles = (await this.lectureSubtitleModel.findOne({ lecture_id: lecture }).exec()).subtitle;
+    const subtitles = (await this.lectureSubtitleModel.findOne({ lecture_id: lecture }).exec())?.subtitle;
     const audioFile = lecture.audio_file;
     return new LectureRecordDto(logs, subtitles, audioFile);
   }

backend/src/lecture/lecture-subtitle.schema.ts → backend/src/lecture/schema/lecture-subtitle.schema.ts

@@ -1,7 +1,7 @@
 import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
 import mongoose from 'mongoose';
-import { Subtitle } from './interfaces/Subtitle';
-import { Lecture } from './schema/lecture.schema';
+import { Subtitle } from '../interfaces/Subtitle';
+import { Lecture } from './lecture.schema';
 
 @Schema()
 export class LectureSubtitle {

backend/src/lecture/schema/whiteboard-log.schema.ts

@@ -7,7 +7,7 @@ export type WhiteBoardLogDocument = HydratedDocument<WhiteboardLog>;
 @Schema()
 export class WhiteboardLog {
   @Prop({ required: true })
-  objects: Uint8Array;
+  objects: number[];
 
   @Prop({ required: true })
   viewport: number[];