diff --git a/src/controllers/mind23Controller.ts b/src/controllers/mind23Controller.ts index 124a10e..47cb5ac 100644 --- a/src/controllers/mind23Controller.ts +++ b/src/controllers/mind23Controller.ts @@ -4,7 +4,6 @@ import statusCode from '../modules/statusCode'; import util from '../modules/util'; import { Mind23Service } from '../services'; import { Types } from 'mongoose'; -import { QuestionDto } from '../intefaces/mind23/QuestionDto'; import { QuestionResponseDto } from '../intefaces/mind23/QuestionResponseDto'; import { TypedRequest } from '../types/TypedRequest'; @@ -64,7 +63,7 @@ const getCommentList = async ( * @access Public */ const createComment = async ( - req: Request, + req: TypedRequest<{ content: string }, any, { questionId: string }>, res: Response, next: NextFunction ) => { @@ -89,13 +88,13 @@ const createComment = async ( * @access Public */ const createPrizeEntry = async ( - req: Request, + req: TypedRequest<{ prizeEntryStatus: boolean }>, res: Response, next: NextFunction ) => { try { const userId: Types.ObjectId | undefined = req.user?.id; - const prizeEntryStatus: Boolean = req.body.prizeEntryStatus; + const prizeEntryStatus: boolean = req.body.prizeEntryStatus; await Mind23Service.createPrizeEntry(userId, prizeEntryStatus); return res .status(statusCode.OK) diff --git a/src/models/mind23/question.ts b/src/models/mind23/question.ts index 31b4293..dcc7568 100644 --- a/src/models/mind23/question.ts +++ b/src/models/mind23/question.ts @@ -3,14 +3,14 @@ import IDocument from '../interface/Document'; interface IQuestion { content: string; - essential: Boolean; + tags: string[]; } type QuestionDocument = IQuestion & IDocument; const questionSchema = new Schema({ content: String, - essential: Boolean + tags: [String] }); const Question = model('Question', questionSchema); diff --git a/src/services/mind23Service.ts b/src/services/mind23Service.ts index d885159..c3f4901 100644 --- a/src/services/mind23Service.ts +++ b/src/services/mind23Service.ts @@ -23,7 +23,7 @@ const createCardResponse = ( return { _id: question._id, content: question.content, - tags: [], + tags: question.tags, category: [], filter: [], isBookmark: false @@ -33,7 +33,7 @@ const createCardResponse = ( const checkCommentStatus = ( authorId: Types.ObjectId, userId?: Types.ObjectId -): Boolean => { +): boolean => { if (!userId) { return false; } @@ -101,12 +101,11 @@ const createComment = async ( const createPrizeEntry = async ( userId?: Types.ObjectId, - prizeEntryStatus?: Boolean + prizeEntryStatus?: boolean ) => { if (!userId) { throw new IllegalArgumentException('해당하는 아이디의 유저가 없습니다.'); } - console.log(prizeEntryStatus); const prizeEntry = new PrizeEntry({ user: userId, prizeEntryStatus: prizeEntryStatus diff --git a/src/types/TypedRequest.ts b/src/types/TypedRequest.ts index 35981c3..f350d60 100644 --- a/src/types/TypedRequest.ts +++ b/src/types/TypedRequest.ts @@ -1,7 +1,7 @@ import { Request } from 'express'; -export type TypedRequest = Request< - any, +export type TypedRequest = Request< + P, any, ReqB, ReqQ