Merge pull request #29 from mash-up-kr/develop

Develop - Header 추가, 밈 조회 관련 모든 응답에 isSaved 추가, 키워드 응답 형식 변경
mash-up-kr · Jul 14, 2024 · 2dbaa38 · 2dbaa38
2 parents 4754f22 + f19c8e7
commit 2dbaa38
Show file tree

Hide file tree

Showing 21 changed files with 799 additions and 346 deletions.
diff --git a/example.env b/example.env
diff --git a/get-s3.js b/get-s3.js
@@ -0,0 +1 @@
+const AWS = require('aws-sdk')
diff --git a/src/controller/meme.controller.ts b/src/controller/meme.controller.ts
@@ -40,25 +40,18 @@ const getMeme = async (req: Request, res: Response, next: NextFunction) => {
   }
 };
 
-const getMemeWithKeywords = async (req: Request, res: Response, next: NextFunction) => {
-  const memeId = req.params?.memeId || null;
-
-  if (_.isNull(memeId)) {
-    return next(new CustomError(`'memeId' field should be provided`, HttpCode.BAD_REQUEST));
-  }
-
-  if (!mongoose.Types.ObjectId.isValid(memeId)) {
-    return next(new CustomError(`'memeId' is not a valid ObjectId`, HttpCode.BAD_REQUEST));
-  }
+const getMemeWithKeywords = async (req: CustomRequest, res: Response, next: NextFunction) => {
+  const user = req.requestedUser;
+  const meme = req.requestedMeme;
 
   try {
-    const meme = await MemeService.getMemeWithKeywords(memeId);
-    if (_.isNull(meme)) {
-      return next(new CustomError(`Meme(${memeId}) not found.`, HttpCode.NOT_FOUND));
+    const ret = await MemeService.getMemeWithKeywords(user, meme);
+    if (_.isNull(ret)) {
+      return next(new CustomError(`Meme(${meme._id}) not found.`, HttpCode.NOT_FOUND));
     }
 
-    logger.info(`Get meme with keywords - ${memeId})`);
-    return res.json(createSuccessResponse(HttpCode.OK, 'Get Meme', meme));
+    logger.info(`Get meme with keywords - ${meme._id})`);
+    return res.json(createSuccessResponse(HttpCode.OK, 'Get Meme', ret));
   } catch (err) {
     return next(new CustomError(err.message, err.status));
   }
@@ -120,7 +113,8 @@ const deleteMeme = async (req: CustomRequest, res: Response, next: NextFunction)
   }
 };
 
-const getAllMemeList = async (req: Request, res: Response, next: NextFunction) => {
+const getAllMemeList = async (req: CustomRequest, res: Response, next: NextFunction) => {
+  const user = req.requestedUser;
   const page = parseInt(req.query.page as string) || 1;
   if (page < 1) {
     return next(new CustomError(`Invalid 'page' parameter`, HttpCode.BAD_REQUEST));
@@ -132,7 +126,7 @@ const getAllMemeList = async (req: Request, res: Response, next: NextFunction) =
   }
 
   try {
-    const memeList = await MemeService.getAllMemeList(page, size);
+    const memeList = await MemeService.getAllMemeList(page, size, user);
 
     const data = {
       pagination: {
@@ -151,7 +145,8 @@ const getAllMemeList = async (req: Request, res: Response, next: NextFunction) =
   }
 };
 
-const getTodayMemeList = async (req: Request, res: Response, next: NextFunction) => {
+const getTodayMemeList = async (req: CustomRequest, res: Response, next: NextFunction) => {
+  const user = req.requestedUser;
   const size = parseInt(req.query.size as string) || 5;
 
   if (size > 5) {
@@ -164,14 +159,15 @@ const getTodayMemeList = async (req: Request, res: Response, next: NextFunction)
   }
 
   try {
-    const todayMemeList = await MemeService.getTodayMemeList(size);
+    const todayMemeList = await MemeService.getTodayMemeList(size, user);
     return res.json(createSuccessResponse(HttpCode.OK, 'Get today meme list', todayMemeList));
   } catch (err) {
     return next(new CustomError(err.message, err.status));
   }
 };
 
 const searchMemeListByKeyword = async (req: CustomRequest, res: Response, next: NextFunction) => {
+  const user = req.requestedUser;
   const keyword = req.requestedKeyword;
 
   const page = parseInt(req.query.page as string) || 1;
@@ -185,7 +181,7 @@ const searchMemeListByKeyword = async (req: CustomRequest, res: Response, next:
   }
 
   try {
-    const memeList = await MemeService.searchMemeByKeyword(page, size, keyword);
+    const memeList = await MemeService.searchMemeByKeyword(page, size, keyword, user);
     const data = {
       pagination: {
         total: memeList.total,

diff --git a/src/controller/user.controller.ts b/src/controller/user.controller.ts
@@ -4,7 +4,6 @@ import _ from 'lodash';
 import CustomError from '../errors/CustomError';
 import { HttpCode } from '../errors/HttpCode';
 import { CustomRequest } from '../middleware/requestedInfo';
-import { InteractionType, MemeInteractionModel } from '../model/memeInteraction';
 import * as UserService from '../service/user.service';
 import { createSuccessResponse } from '../util/response';
 
@@ -26,48 +25,26 @@ const getUser = async (req: CustomRequest, res: Response, next: NextFunction) =>
   const user = req.requestedUser;
 
   try {
-    const countInteractionType = (type: InteractionType) =>
-      MemeInteractionModel.countDocuments({
-        deviceId: user.deviceId,
-        interactionType: type,
-      });
-
-    const [watch, reaction, share, save] = await Promise.all([
-      countInteractionType(InteractionType.WATCH),
-      countInteractionType(InteractionType.REACTION),
-      countInteractionType(InteractionType.SHARE),
-      countInteractionType(InteractionType.SAVE),
-    ]);
-
-    const level = getLevel(watch, reaction, share);
-
-    return res.json(
-      createSuccessResponse(HttpCode.OK, 'Get User', {
-        ...user,
-        watch,
-        reaction,
-        share,
-        save,
-        level,
-      }),
-    );
+    const userInfos = await UserService.makeUserInfos(user.deviceId);
+    const level = getLevel(userInfos.watch, userInfos.reaction, userInfos.share);
+    return res.json(createSuccessResponse(HttpCode.OK, 'Get User', { ...userInfos, level }));
   } catch (err) {
     return next(new CustomError(err.message, err.status));
   }
 };
 
-const getLastSeenMemes = async (req: CustomRequest, res: Response, next: NextFunction) => {
+const getLastSeenMemeList = async (req: CustomRequest, res: Response, next: NextFunction) => {
   const user = req.requestedUser;
 
   try {
-    const memeList = await UserService.getLastSeenMemes(user);
+    const memeList = await UserService.getLastSeenMemeList(user);
     return res.json(createSuccessResponse(HttpCode.OK, 'Get Last Seen Meme', memeList));
   } catch (err) {
     return next(new CustomError(err.message, err.status));
   }
 };
 
-const getSavedMemes = async (req: CustomRequest, res: Response, next: NextFunction) => {
+const getSavedMemeList = async (req: CustomRequest, res: Response, next: NextFunction) => {
   const user = req.requestedUser;
 
   const page = parseInt(req.query.page as string) || 1;
@@ -81,7 +58,7 @@ const getSavedMemes = async (req: CustomRequest, res: Response, next: NextFuncti
   }
 
   try {
-    const memeList = await UserService.getSavedMemes(page, size, user);
+    const memeList = await UserService.getSavedMemeList(page, size, user);
 
     const data = {
       pagination: {
@@ -99,7 +76,7 @@ const getSavedMemes = async (req: CustomRequest, res: Response, next: NextFuncti
   }
 };
 
-export { getUser, createUser, getLastSeenMemes, getSavedMemes };
+export { getUser, createUser, getLastSeenMemeList, getSavedMemeList };
 
 function getLevel(watch: number, reaction: number, share: number): number {
   let level = 1;

diff --git a/src/middleware/requestedInfo.ts b/src/middleware/requestedInfo.ts
@@ -56,8 +56,7 @@ export const getKeywordInfoByName = async (
   }
 
   const keyword = await getKeywordByName(keywordName);
-
-  if (!keyword) {
+  if (_.isNull(keyword)) {
     return next(
       new CustomError(`Keyword with name ${keywordName} does not exist`, HttpCode.NOT_FOUND),
     );
@@ -100,7 +99,7 @@ export const getRequestedUserInfo = async (
 
   const user = await getUser(deviceId);
 
-  if (!user) {
+  if (_.isNull(user)) {
     return next(new CustomError(`user(${deviceId}) does not exist`, HttpCode.NOT_FOUND));
   }
 

diff --git a/src/model/keyword.ts b/src/model/keyword.ts
@@ -14,6 +14,11 @@ export interface IKeywordWithImage extends IKeyword {
   topReactionImage: string;
 }
 
+export interface IKeywordGetResponse {
+  _id: Types.ObjectId;
+  name: string;
+}
+
 export interface IKeyword {
   name: string;
   category: string;

diff --git a/src/model/meme.ts b/src/model/meme.ts
@@ -1,5 +1,7 @@
 import mongoose, { Schema, Document, Types } from 'mongoose';
 
+import { IKeywordGetResponse } from './keyword';
+
 export interface IMemeCreatePayload {
   title: string;
   keywordIds: Types.ObjectId[];
@@ -23,6 +25,11 @@ export interface IMeme {
   isTodayMeme: boolean;
 }
 
+export interface IMemeGetResponse extends Omit<IMemeDocument, 'keywordIds'> {
+  keywords: IKeywordGetResponse[];
+  isSaved: boolean; // 나의 파밈함 저장 여부
+}
+
 export interface IMemeDocument extends Document {
   _id: Types.ObjectId;
   title: string;
@@ -36,11 +43,6 @@ export interface IMemeDocument extends Document {
   isDeleted: boolean;
 }
 
-// keywordIds로 조회한 keywords로 대체된 Meme 정보
-export interface IMemeWithKeywords extends Omit<IMemeDocument, 'keywordIds'> {
-  keywords: string[];
-}
-
 const MemeSchema: Schema = new Schema(
   {
     title: { type: String, required: true },

diff --git a/src/model/memeInteraction.ts b/src/model/memeInteraction.ts
@@ -8,14 +8,14 @@ export enum InteractionType {
 }
 
 export interface IMemeInteraction {
-  deviceId: String;
+  deviceId: string;
   memeId: Types.ObjectId;
   interactionType: InteractionType;
 }
 
-export interface IMemeInteraction extends Document {
+export interface IMemeInteractionDocument extends Document {
   _id: Types.ObjectId;
-  deviceId: String;
+  deviceId: string;
   memeId: Types.ObjectId;
   interactionType: InteractionType;
   isDeleted: boolean;
@@ -37,7 +37,7 @@ const MemeInteractionSchema: Schema = new Schema(
   },
 );
 
-export const MemeInteractionModel = mongoose.model<IMemeInteraction>(
+export const MemeInteractionModel = mongoose.model<IMemeInteractionDocument>(
   'memeInteraction',
   MemeInteractionSchema,
 );
diff --git a/src/routes/keyword.ts b/src/routes/keyword.ts
@@ -267,7 +267,7 @@ router.delete('/:keywordId', getKeywordInfoById, deleteKeyword);
  *                         example: 100
  *                       topReactionImage:
  *                         type: string
- *                         example: "https://example.com/top-reaction-image.jpg"
+ *                         example: "https://ppac-meme.s3.ap-northeast-2.amazonaws.com/17207029441190.png"
  *                       createdAt:
  *                         type: string
  *                         example: "2024-07-05T15:21:34.012Z"
@@ -446,13 +446,17 @@ router.patch('/count', getKeywordInfoByName, increaseSearchCount);
  *                         type: string
  *                         example: "상황"
  *                       keywords:
- *                         type: array
- *                         items:
- *                           type: string
- *                           example:
- *                             - "키워드1"
- *                             - "키워드2"
- *                             - "키워드3"
+ *                         type: object
+ *                         properties:
+ *                           _id:
+ *                              type: string
+ *                              example: "667ff3d1239eeaf78630a283"
+ *                           name:
+ *                              type: string
+ *                              example: "웃긴"
+ *               name:
+ *                 type: string
+ *                 example: "웃긴"
  *       500:
  *         description: Internal server error
  *         content: