Merge branch 'develop' into feat/book-detail-api

src/controller/book.ts

@@ -28,7 +28,7 @@ const postBookController = async (req: Request, res: Response) => {
       req.body.title,
       req.body.author,
       req.body.translator,
-      req.body.publicationDate
+      req.body.publicationDt
     );
 
     if (resData === constant.NULL_VALUE) {
@@ -65,8 +65,8 @@ const postBookController = async (req: Request, res: Response) => {
     return response.dataResponse(
       res,
       returnCode.OK,
-      true,
       "책 선택이 완료되었습니다.",
+      true,
       resData
     );
   } catch (err) {

src/controller/review.ts

@@ -13,21 +13,21 @@ import reviewService from "../service/review";
 
 /**
  *  @독서중 독서 전 작성
- *  @route PATCH /review/before/:reviewId
+ *  @route PATCH /review/:reviewId/pre
  *  @access private
  *  @error
  *      1. 요청 값이 잘못됨
  *      2. 존재하지 않는 Review
  */
-const patchReviewBeforeController = async (req: Request, res: Response) => {
+const patchReviewPreController = async (req: Request, res: Response) => {
   try {
-    const resData = await reviewService.patchReviewBeforeController(
+    const resData = await reviewService.patchReviewPreService(
       Number(req.params.reviewId),
       req.user.id,
       req.body.answerOne,
       req.body.answerTwo,
       req.body.questionList,
-      req.body.progress
+      req.body.reviewSt
     );
 
     if (resData === constant.NULL_VALUE) {
@@ -51,8 +51,8 @@ const patchReviewBeforeController = async (req: Request, res: Response) => {
     return response.dataResponse(
       res,
       returnCode.OK,
+      "작성/수정이 완료되었습니다.",
       true,
-      "수정이 완료되었습니다.",
       resData
     );
   } catch (err) {
@@ -121,19 +121,19 @@ const getQuestionController = async (req: Request, res: Response) => {
 
 /**
  *  @독서중 독서 중 작성
- *  @route PATCH /review/now/:reviewId
+ *  @route PATCH /review/:reviewId/peri
  *  @access private
  *  @error
  *      1. 요청 값이 잘못됨
  *      2. 존재하지 않는 Review
  */
-const patchReviewNowController = async (req: Request, res: Response) => {
+const patchReviewPeriController = async (req: Request, res: Response) => {
   try {
-    const resData = await reviewService.patchReviewNowService(
+    const resData = await reviewService.patchReviewPeriService(
       Number(req.params.reviewId),
       req.user.id,
       req.body.answerThree,
-      req.body.progress
+      req.body.reviewSt
     );
 
     if (resData === constant.NULL_VALUE) {
@@ -157,8 +157,8 @@ const patchReviewNowController = async (req: Request, res: Response) => {
     return response.dataResponse(
       res,
       returnCode.OK,
+      "작성/수정이 완료되었습니다.",
       true,
-      "작성이 완료되었습니다.",
       resData
     );
   } catch (err) {
@@ -340,9 +340,9 @@ const deleteReviewController = async (req: Request, res: Response) => {
 };
 
 const reviewController = {
-  patchReviewBeforeController,
+  patchReviewPreController,
   getQuestionController,
-  patchReviewNowController,
+  patchReviewPeriController,
   getReviewController,
   patchReviewController,
   deleteReviewController,

src/router/review.ts

@@ -9,11 +9,7 @@ import reviewController from "../controller/review";
 const router = express.Router();
 
 // 독서 전
-router.patch(
-  "/before/:reviewId",
-  auth,
-  reviewController.patchReviewBeforeController
-);
+router.patch("/:reviewId/pre", auth, reviewController.patchReviewPreController);
 
 // 질문리스트 조회
 router.get(
@@ -23,7 +19,11 @@ router.get(
 );
 
 // 독서 중
-router.patch("/now/:reviewId", auth, reviewController.patchReviewNowController);
+router.patch(
+  "/:reviewId/peri",
+  auth,
+  reviewController.patchReviewPeriController
+);
 
 // 독후감 조회
 router.get("/:reviewId", auth, reviewController.getReviewController);

src/service/book.ts

@@ -22,9 +22,9 @@ const postBookService = async (
   title: string,
   author: string[],
   translator: string[],
-  publicationDate: string
+  publicationDt: string
 ) => {
-  if (!isbn || !title || !author || !translator || !publicationDate) {
+  if (!isbn || !title || !author || !translator || !publicationDt) {
     return constant.NULL_VALUE;
   }
 
@@ -70,7 +70,7 @@ const postBookService = async (
       author,
       ...(thumbnail && { thumbnail }),
       translator,
-      publicationDt: publicationDate,
+      publicationDt,
     });
   } else {
     book = bookExist;

src/service/review.ts

@@ -6,27 +6,27 @@ import { User, Book, Review } from "../models";
 
 /**
  *  @독서중 독서 전 작성
- *  @route PATCH /review/before/:reviewId
+ *  @route PATCH /review/:reviewId/pre
  *  @access private
  *  @error
  *      1. 요청 값이 잘못됨
  *      2. 존재하지 않는 Review
  */
-const patchReviewBeforeController = async (
+const patchReviewPreService = async (
   reviewId: number,
   userId: number,
   answerOne: string,
   answerTwo: string,
   questionList: string[],
-  progress: number
+  reviewSt: number
 ) => {
   if (
     !reviewId ||
     !userId ||
     !answerOne ||
     !answerTwo ||
     !questionList ||
-    !progress
+    !reviewSt
   ) {
     return constant.NULL_VALUE;
   }
@@ -49,7 +49,7 @@ const patchReviewBeforeController = async (
     questionList,
     answerOne,
     answerTwo,
-    reviewSt: progress,
+    reviewSt,
     finishSt: false,
   });
 
@@ -92,19 +92,19 @@ const getQuestionService = async (userId: number, reviewId: number) => {
 /**
 
  *  @독서중 독서 중 작성
- *  @route PATCH /review/now/:reviewId
+ *  @route PATCH /review/:reviewId/peri
  *  @access private
  *  @error
  *      1. 요청 값이 잘못됨
  *      2. 존재하지 않는 Review
  */
-const patchReviewNowService = async (
+const patchReviewPeriService = async (
   reviewId: number,
   userId: number,
   answerThree: object,
-  progress: number
+  reviewSt: number
 ) => {
-  if (!reviewId || !userId || !answerThree || !progress) {
+  if (!reviewId || !userId || !answerThree || !reviewSt) {
     return constant.NULL_VALUE;
   }
 
@@ -121,12 +121,12 @@ const patchReviewNowService = async (
     return constant.WRONG_REQUEST_VALUE;
   }
 
-  let finishSt = Number(progress) === 4 ? true : false;
+  let finishSt = Number(reviewSt) === 4 ? true : false;
 
   // 3. review update
   await review.update({
     answerThree,
-    reviewSt: progress,
+    reviewSt,
     finishSt,
   });
 
@@ -141,8 +141,8 @@ const patchReviewNowService = async (
     bookData: {
       thumbnail: book.thumbnail,
       title: book.title,
-      authors: book.author,
-      translators: book.translator,
+      author: book.author,
+      translator: book.translator,
       publicationDt: book.publicationDt,
     },
   };
@@ -184,8 +184,8 @@ const getReviewService = async (userId: number, reviewId: number) => {
     answerTwo: reviewToShow.answerTwo,
     questionList: reviewToShow.questionList,
     answerThree: reviewToShow.answerThree,
-    reviewState: reviewToShow.reviewSt,
-    finishState: reviewToShow.finishSt,
+    reviewSt: reviewToShow.reviewSt,
+    finishSt: reviewToShow.finishSt,
   };
 };
 
@@ -273,9 +273,9 @@ const deleteReviewService = async (userId: number, reviewId: number) => {
 };
 
 const reviewService = {
-  patchReviewBeforeController,
+  patchReviewPreService,
   getQuestionService,
-  patchReviewNowService,
+  patchReviewPeriService,
   getReviewService,
   patchReviewService,
   deleteReviewService,

src/test/service/review.spec.ts

@@ -40,21 +40,20 @@ describe("reviewService test", async () => {
   //MARK: - 독서 전 작성 테스트
   describe("patchReviewBefore test", async () => {
     it("success: patchReviewBefore returns reviewId correctly", async () => {
-      const patchedReview: any =
-        await reviewService.patchReviewBeforeController(
-          testReview.id,
-          testUser.id,
-          testReview.answerOne,
-          testReview.answerTwo,
-          testReview.questionList,
-          3
-        );
+      const patchedReview: any = await reviewService.patchReviewPreService(
+        testReview.id,
+        testUser.id,
+        testReview.answerOne,
+        testReview.answerTwo,
+        testReview.questionList,
+        3
+      );
       assert.ok(patchedReview.reviewId === testReview.id);
     });
 
     it("fail: try to patch review which doesn't exist", async () => {
       assert.strictEqual(
-        await reviewService.patchReviewBeforeController(
+        await reviewService.patchReviewPreService(
           -50,
           testUser.id,
           testReview.answerOne,
@@ -158,7 +157,7 @@ describe("reviewService test", async () => {
           },
         ],
       };
-      await reviewService.patchReviewNowService(
+      await reviewService.patchReviewPeriService(
         testReview.id,
         testReview.userId,
         answerThree,
@@ -173,7 +172,7 @@ describe("reviewService test", async () => {
     });
     it("fail: return null when arguments are null", async () => {
       assert.strictEqual(
-        await reviewService.patchReviewNowService(
+        await reviewService.patchReviewPeriService(
           testReview.id,
           testReview.userId,
           null,
@@ -184,7 +183,7 @@ describe("reviewService test", async () => {
     });
     it("fail: return wrong request value when request wrong", async () => {
       assert.strictEqual(
-        await reviewService.patchReviewNowService(
+        await reviewService.patchReviewPeriService(
           -100,
           testReview.userId,
           { test: "hi" },