Merge pull request #35 from mash-up-kr/feature/fix-meme-recommend-watch

추천 밈 보기 로직 개선, MemeRecommendWatchModel schema 변경
mash-up-kr · Jul 23, 2024 · f1f4b4c · f1f4b4c
2 parents 2bf7b3c + d9a0457
commit f1f4b4c
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 35 deletions.
diff --git a/src/model/memeRecommendWatch.ts b/src/model/memeRecommendWatch.ts
@@ -3,26 +3,20 @@ import mongoose, { Schema, Document, Types } from 'mongoose';
 export interface IMemeRecommendWatchCreatePayload {
   deviceId: string;
   startDate: Date;
-  memeIds: Types.ObjectId[];
-}
-
-export interface IMemeRecommendWatchUpdatePayload {
-  deviceId?: string;
-  startDate?: Date;
-  memeIds?: Types.ObjectId[];
+  memeId: Types.ObjectId;
 }
 
 export interface IMemeRecommendWatch {
   deviceId: string;
   startDate: Date;
-  memeIds: Types.ObjectId[];
+  memeId: Types.ObjectId;
 }
 
 export interface IMemeRecommendWatchDocument extends Document {
   _id: Types.ObjectId;
   deviceId: string;
   startDate: Date;
-  memeIds: Types.ObjectId[];
+  memeId: Types.ObjectId;
   createdAt: Date;
   updatedAt: Date;
 }
@@ -32,7 +26,7 @@ const MemeRecommendWatchSchema: Schema = new Schema(
     deviceId: { type: String, required: true },
     startDate: { type: Date, required: true },
     isDeleted: { type: Boolean, required: true, default: false },
-    memeIds: [{ type: Types.ObjectId, ref: 'Meme', required: true }],
+    memeId: { type: Types.ObjectId, ref: 'Meme', required: true },
   },
   {
     timestamps: true,
@@ -42,6 +36,6 @@ const MemeRecommendWatchSchema: Schema = new Schema(
 );
 
 export const MemeRecommendWatchModel = mongoose.model<IMemeRecommendWatchDocument>(
-  'MemeRecommendWatch',
+  'memeRecommendWatch',
   MemeRecommendWatchSchema,
 );
diff --git a/src/service/user.service.ts b/src/service/user.service.ts
@@ -10,7 +10,6 @@ import { IMemeDocument, IMemeGetResponse, MemeModel } from '../model/meme';
 import { InteractionType, MemeInteractionModel } from '../model/memeInteraction';
 import {
   MemeRecommendWatchModel,
-  IMemeRecommendWatchUpdatePayload,
   IMemeRecommendWatchCreatePayload,
 } from '../model/memeRecommendWatch';
 import { IUser, IUserDocument, IUserInfos, UserModel } from '../model/user';
@@ -202,40 +201,40 @@ async function getSavedMemeList(
 async function createMemeRecommendWatch(user: IUserDocument, meme: IMemeDocument): Promise<number> {
   try {
     const todayWeekStart = startOfWeek(new Date(), { weekStartsOn: 1 });
+
     const memeRecommendWatch = await MemeRecommendWatchModel.findOne({
-      memeIds: meme._id,
+      memeId: meme._id,
       startDate: todayWeekStart,
       deviceId: user.deviceId,
       isDeleted: false,
     });
 
-    if (!_.isNull(memeRecommendWatch)) {
-      logger.info(`Already watched recommend meme - deviceId(${user.deviceId})`);
-
-      const updatedMemeList = Array.from(
-        new Set([...memeRecommendWatch.memeIds, meme._id].map((id) => id.toString())),
-      ).map((id) => new Types.ObjectId(id));
-
-      const updatePayload: IMemeRecommendWatchUpdatePayload = {
-        memeIds: updatedMemeList,
+    // 해당 추천 밈을 처음 보는 경우
+    if (_.isNull(memeRecommendWatch)) {
+      // 추천 밈 본 기록 남기기
+      const createPayload: IMemeRecommendWatchCreatePayload = {
+        deviceId: user.deviceId,
+        startDate: startOfWeek(new Date(), { weekStartsOn: 1 }),
+        memeId: meme._id,
       };
 
-      await MemeRecommendWatchModel.findOneAndUpdate(
-        { _id: memeRecommendWatch._id },
-        { $set: updatePayload },
-      );
-      return updatePayload.memeIds.length;
+      // MemeRecommendWatch에 memeId 추가
+      // MemeInteraction에 memeId의 watch 타입 추가
+      await Promise.all([
+        MemeRecommendWatchModel.create(createPayload),
+        MemeService.createMemeInteraction(user, meme, InteractionType.WATCH),
+      ]);
+    } else {
+      logger.info(`Already watched recommend meme - deviceId(${user.deviceId})`);
     }
 
-    const createPayload: IMemeRecommendWatchCreatePayload = {
+    const memeRecommendWatchCount = await MemeRecommendWatchModel.countDocuments({
+      startDate: todayWeekStart,
       deviceId: user.deviceId,
-      startDate: startOfWeek(new Date(), { weekStartsOn: 1 }),
-      memeIds: [meme._id],
-    };
-
-    await MemeRecommendWatchModel.create(createPayload);
+      isDeleted: false,
+    });
 
-    return 1;
+    return memeRecommendWatchCount;
   } catch (err) {
     logger.error(`Failed create memeRecommendWatch`, err.message);
     throw new CustomError(

diff --git a/test/meme/get-meme-list.test.ts b/test/meme/get-meme-list.test.ts
@@ -37,7 +37,7 @@ describe("[GET] '/api/meme/list' ", () => {
     expect(response.body.data.pagination.page).toBe(1);
     expect(response.body.data.pagination.totalPages).toBe(2);
     expect(response.body.data.memeList.length).toBe(10);
-    expect(response.body.data.memeList[0]).toHaveProperty('keywordIds');
+    expect(response.body.data.memeList[0]).toHaveProperty('keywords');
     expect(response.body.data.memeList[0]).toHaveProperty('image');
     expect(response.body.data.memeList[0]).toHaveProperty('source');
     expect(response.body.data.memeList[0]).toHaveProperty('isTodayMeme');