fix : 유저가 업로드한 영상 응답 시 업로드가 매긴 별점으로 응답되던 버그 수정

boostcampwm2023 · Dec 13, 2023 · 6292eb4 · 6292eb4
1 parent eb96adf
commit 6292eb4
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 7 deletions.
diff --git a/server/src/action/action.controller.ts b/server/src/action/action.controller.ts
@@ -30,7 +30,7 @@ export class ActionController {
     @RequestUser() user: User,
     @Query() query: SeedQueryDto,
   ) {
-    console.log(`조회수 증가 API : ${JSON.stringify(query)}`);
+    console.log(`${user.id} 조회수 증가 API : ${JSON.stringify(query)}`);
     return this.actionService.viewVideo(videoId, user.id, query.seed);
   }
 }
diff --git a/server/src/user/user.controller.ts b/server/src/user/user.controller.ts
@@ -61,9 +61,11 @@ export class UserController {
   getUploadedVideos(
     @Param('userId') userId: string,
     @Query() query: UserUploadedVideoQueryDto,
+    @RequestUser() user: User,
   ) {
     return this.userService.getUploadedVideos(
       userId,
+      user.id,
       query.limit,
       query.lastId,
     );

diff --git a/server/src/user/user.service.ts b/server/src/user/user.service.ts
@@ -91,7 +91,12 @@ export class UserService {
     };
   }
 
-  async getUploadedVideos(uuid: string, limit: number, lastId: string) {
+  async getUploadedVideos(
+    uuid: string,
+    viewerUuid: string,
+    limit: number,
+    lastId: string,
+  ) {
     const uploaderData = await this.UserModel.findOne({ uuid }, { actions: 0 });
     if (!uploaderData) {
       throw new UserNotFoundException();
@@ -116,7 +121,7 @@ export class UserService {
       .sort({ _id: -1 })
       .limit(limit);
 
-    const videos = await this.getVideoInfos(videoData, uploader, uuid);
+    const videos = await this.getVideoInfos(videoData, uploader, viewerUuid);
     return { videos };
   }
 
@@ -140,7 +145,11 @@ export class UserService {
     return { uploader, uploaderId };
   }
 
-  async getVideoInfos(videoData: Array<any>, uploader: object, uuid: string) {
+  async getVideoInfos(
+    videoData: Array<any>,
+    uploader: object,
+    viewerUuid: string,
+  ) {
     const videos = await Promise.all(
       videoData.map(async (video) => {
         const { thumbnailExtension, raterCount, totalRating, ...videoInfo } =
@@ -149,7 +158,7 @@ export class UserService {
           ? (totalRating / raterCount).toFixed(1)
           : null;
         const userRating = await this.videoService.getUserRating(
-          uuid,
+          viewerUuid,
           videoInfo._id,
         );
         const manifest = `${process.env.MANIFEST_URL_PREFIX}/${videoInfo._id}_master.m3u8`;

diff --git a/server/src/video/video.controller.ts b/server/src/video/video.controller.ts
@@ -58,7 +58,7 @@ export class VideoController {
     @Query() query: RandomVideoQueryDto,
     @RequestUser() user: User,
   ) {
-    console.log(`랜덤 비디오 응답 API : ${JSON.stringify(query)}`);
+    console.log(`${user.id} 랜덤 비디오 응답 API : ${JSON.stringify(query)}`);
     return this.videoService.getRandomVideo(query, user.id);
   }
 

diff --git a/server/src/video/video.service.ts b/server/src/video/video.service.ts
@@ -37,7 +37,6 @@ export class VideoService {
     { category, limit, seed }: RandomVideoQueryDto,
     userId: string,
   ) {
-    console.log('random video response:', category, limit, seed);
     const actions = await this.UserModel.aggregate([
       { $match: { uuid: userId } },
       { $unwind: '$actions' },