diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 189c8c2..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Bug report -about: 버그 및 수정 사항을 알려주세요. -title: "[bug] bug desc ... " -labels: '' -assignees: '' - ---- - -## 🐞 버그 설명 -스크린 샷, 작동 환경 (OS, device 등)을 적어주세요. - -## 📝 todo -- [ ] todo ! diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md new file mode 100644 index 0000000..de83046 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature.md @@ -0,0 +1,21 @@ +--- +name: 💡 feature +about: 새로운 기능 추가 +title: "[feat] New feature" +labels: 🍀 feature +--- + +## 💡 New Feature + +새롭게 추가할 기능에 대해 소개해주세요. + +## 📝 To Do + +- [ ] 새로운 기능 A 추가 +- [ ] 새로운 기능 B 추가 +- [ ] 테스트 코드 작성 + +## ✅ Issue check list + +1. Assignees, Labels 확인하기 +2. Milestone 연결 확인하기 diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index a06cc1b..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,14 +0,0 @@ ---- -name: Feature request -about: 새로운 기능을 추가합니다. -title: "[feat] feat desc ..." -labels: '' -assignees: '' - ---- - -## 💡 Issue -이슈에 대한 내용을 설명해주세요. - -## 📝 todo -- [ ] todo ! diff --git a/.github/ISSUE_TEMPLATE/fix.md b/.github/ISSUE_TEMPLATE/fix.md new file mode 100644 index 0000000..10c2fdd --- /dev/null +++ b/.github/ISSUE_TEMPLATE/fix.md @@ -0,0 +1,20 @@ +--- +name: 🐞 fix +about: 오작동 코드 바로잡기 +title: "[fix] Change description" +labels: 🔨 fix +--- + +## 🐞 Change + +현재의 잘못되고 있는 점에 대한 설명과 수정 후 예상 변화에 대해 설명해주세요. + +## 📝 To Do + +- [ ] logic A 변경 +- [ ] logic B 변경 + +## ✅ Issue check list + +1. Assignees, Labels 확인하기 +2. Milestone 연결 확인하기 diff --git a/.github/ISSUE_TEMPLATE/refactor.md b/.github/ISSUE_TEMPLATE/refactor.md new file mode 100644 index 0000000..85a86f4 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/refactor.md @@ -0,0 +1,20 @@ +--- +name: 🧐 refactor +about: 코드 리팩토링 +title: "[refactor] Refactor object" +labels: 🌈 refactor +--- + +## 🧐 Refactoring Target + +해당 리팩토링의 대상과 목적을 요약해 적어주세요. + +## 📝 To Do + +- [ ] file A 리팩토링 +- [ ] file B 리팩토링 + +## ✅ Issue check list + +1. Assignees, Labels 확인하기 +2. Milestone 연결 확인하기 diff --git a/.github/PULL_REQUEST_TEMPLATE b/.github/PULL_REQUEST_TEMPLATE index fe78935..0735f7c 100644 --- a/.github/PULL_REQUEST_TEMPLATE +++ b/.github/PULL_REQUEST_TEMPLATE @@ -1,16 +1,25 @@ -### ✅ PR check list -- [ ] commit message가 적절한지 확인해주세요. -- [ ] 마지막으로 Coding Convention을 준수했는지 확인해주세요. -- [ ] 적절한 branch로 요청했는지 확인해주세요. -- [ ] Assignees, Label을 붙여주세요. -- [ ] 가능한 이슈를 Link 해주세요. -- [ ] PR이 승인된 경우 해당 브랜치는 삭제 부탁드립니다. +## 🌈 PR 요약 / Linked Issue +해당 PR에서 작업한 내용을 한 줄로 요약해주세요. +close #{no} -## 🌈 PR 요약 -해당 pr에서 작업한 내역을 적어주세요. ## 📌 변경 사항 -변경사항 및 주의 사항 (모듈 설치 등)을 적어주세요. +디테일한 작업 내역을 적어주세요. +주의할 사항이 있다면 적어주세요. +변경사항 (모듈 설치 등)이 있다면 적어주세요. + + +## ✅ PR check list +### 1. 제목 양식 준수 확인 +[feat] PR title + +### 2. 테스트 코드 작동 스크린샷 +`npm run mocha` + + +## ✅ After merge check list +### 1. 릴리즈 노트 변경 +[릴리즈 노트](https://www.notion.so/2c17ef784e684d94a51e3c23f4e7c814) To Do에서 Done으로 옮기기 + +### 2. 브랜치 삭제 -#### Linked Issue -close `#Issue number` diff --git a/.gitignore b/.gitignore index 20167e5..5f64d93 100644 --- a/.gitignore +++ b/.gitignore @@ -126,4 +126,6 @@ out .yarn/unplugged .yarn/build-state.yml .yarn/install-state.gz -.pnp.* \ No newline at end of file +.pnp.* + +.idea/ \ No newline at end of file diff --git a/README.md b/README.md index f12a3f4..63ae776 100644 --- a/README.md +++ b/README.md @@ -183,7 +183,8 @@ SOPT 29th APPJAM # 🛠 Version -| Version | Content | Detail | Date | -| :-----: | :-------------- | :----: | :--------: | -| 1.0.0 | initial version | link | 2022.02.06 | -| 1.0.1 | bug fix, add api | link | 2022.02.10 | +| Version | Content | Detail | Date | +| :-----: | :------------------ | :---------------------------------------------------------------------: | :--------: | +| 1.0.0 | initial version | [📄](https://github.com/TeamBookTez/booktez-server/releases/tag/v1.0.0) | 2022.02.06 | +| 1.0.1 | bug fix, add api | [📄](https://github.com/TeamBookTez/booktez-server/releases/tag/v1.0.1) | 2022.02.10 | +| 1.0.2 | bug fix, modify api | [📄](https://github.com/TeamBookTez/booktez-server/releases/tag/v1.0.2) | 2022.02.21 | diff --git a/dist/middleware/authMiddleware.js b/dist/middleware/authMiddleware.js index 35bd52d..de12e78 100644 --- a/dist/middleware/authMiddleware.js +++ b/dist/middleware/authMiddleware.js @@ -15,8 +15,6 @@ Object.defineProperty(exports, "__esModule", { value: true }); exports.isLogin = exports.auth = void 0; const jsonwebtoken_1 = __importDefault(require("jsonwebtoken")); const config_1 = __importDefault(require("../config")); -// slack -const slack_1 = __importDefault(require("../others/slack/slack")); // library const response_1 = __importDefault(require("../library/response")); const returnCode_1 = __importDefault(require("../library/returnCode")); @@ -44,11 +42,9 @@ const auth = (req, res, next) => __awaiter(void 0, void 0, void 0, function* () } catch (err) { if (err.message === "jwt expired") { - slack_1.default.slackWebhook(req, err.message); return response_1.default.basicResponse(res, returnCode_1.default.UNAUTHORIZED, false, "만료된 토큰입니다"); } else { - slack_1.default.slackWebhook(req, err.message); return response_1.default.basicResponse(res, returnCode_1.default.UNAUTHORIZED, false, "적합하지 않은 토큰입니다"); } } @@ -77,7 +73,6 @@ const isLogin = (req, res, next) => __awaiter(void 0, void 0, void 0, function* return next(); } catch (err) { - slack_1.default.slackWebhook(req, err.message); return next(); } }); diff --git a/dist/middleware/authMiddleware.js.map b/dist/middleware/authMiddleware.js.map index 9d923ec..47e4cf3 100644 --- a/dist/middleware/authMiddleware.js.map +++ b/dist/middleware/authMiddleware.js.map @@ -1 +1 @@ -{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/middleware/authMiddleware.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"authMiddleware.js","sourceRoot":"","sources":["../../src/middleware/authMiddleware.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AACA,gEAA+B;AAC/B,uDAA+B;AAE/B,UAAU;AACV,mEAA2C;AAC3C,uEAA+C;AAE/C,QAAQ;AACR,0DAAkC;AAE3B,MAAM,IAAI,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IAC9D,QAAQ;IACR,IACE,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,EAAE;QAChC,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI;QAClC,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,EACvC;QACA,OAAO,kBAAQ,CAAC,aAAa,CAC3B,GAAG,EACH,oBAAU,CAAC,WAAW,EACtB,KAAK,EACL,kBAAkB,CACnB,CAAC;KACH;IAED,eAAe;IACf,IAAI;QACF,MAAM,KAAK,GAAW,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAChD,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAM,CAAC,SAAS,CAAC,CAAC;QAEpD,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;SACjD,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,kBAAQ,CAAC,aAAa,CAC3B,GAAG,EACH,oBAAU,CAAC,WAAW,EACtB,KAAK,EACL,gBAAgB,CACjB,CAAC;SACH;QAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAChB,OAAO,IAAI,EAAE,CAAC;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,IAAI,GAAG,CAAC,OAAO,KAAK,aAAa,EAAE;YACjC,OAAO,kBAAQ,CAAC,aAAa,CAC3B,GAAG,EACH,oBAAU,CAAC,YAAY,EACvB,KAAK,EACL,WAAW,CACZ,CAAC;SACH;aAAM;YACL,OAAO,kBAAQ,CAAC,aAAa,CAC3B,GAAG,EACH,oBAAU,CAAC,YAAY,EACvB,KAAK,EACL,eAAe,CAChB,CAAC;SACH;KACF;AACH,CAAC,CAAA,CAAC;AApDW,QAAA,IAAI,QAoDf;AAEK,MAAM,OAAO,GAAG,CAAO,GAAY,EAAE,GAAa,EAAE,IAAI,EAAE,EAAE;IACjE,SAAS;IACT,YAAY;IACZ,IACE,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,EAAE;QAChC,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,IAAI;QAClC,GAAG,CAAC,OAAO,CAAC,aAAa,KAAK,SAAS,EACvC;QACA,OAAO,IAAI,EAAE,CAAC;KACf;IAED,IAAI;QACF,gBAAgB;QAChB,SAAS;QACT,MAAM,KAAK,GAAW,GAAG,CAAC,OAAO,CAAC,aAAa,CAAC;QAChD,MAAM,OAAO,GAAG,sBAAG,CAAC,MAAM,CAAC,KAAK,EAAE,gBAAM,CAAC,SAAS,CAAC,CAAC;QAEpD,MAAM,IAAI,GAAG,MAAM,cAAI,CAAC,OAAO,CAAC;YAC9B,KAAK,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE;SACjD,CAAC,CAAC;QAEH,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,IAAI,EAAE,CAAC;SACf;QAED,GAAG,CAAC,IAAI,GAAG,IAAI,CAAC;QAEhB,OAAO,IAAI,EAAE,CAAC;KACf;IAAC,OAAO,GAAG,EAAE;QACZ,OAAO,IAAI,EAAE,CAAC;KACf;AACH,CAAC,CAAA,CAAC;AA/BW,QAAA,OAAO,WA+BlB"} \ No newline at end of file diff --git a/dist/service/auth.js b/dist/service/auth.js index 498098e..28f0721 100644 --- a/dist/service/auth.js +++ b/dist/service/auth.js @@ -115,7 +115,7 @@ const postLoginService = (email, password) => __awaiter(void 0, void 0, void 0, }; const nickname = user.nickname; const token = jsonwebtoken_1.default.sign(payload, config_1.default.jwtSecret, { expiresIn: "14d" }); - return { nickname, token }; + return { email: user.email, nickname, token }; }); /** * @회원가입 diff --git a/dist/service/auth.js.map b/dist/service/auth.js.map index aa640bf..6d76c94 100644 --- a/dist/service/auth.js.map +++ b/dist/service/auth.js.map @@ -1 +1 @@ -{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/service/auth.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../src/service/auth.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/dist/service/review.js b/dist/service/review.js index a53dc47..98d0588 100644 --- a/dist/service/review.js +++ b/dist/service/review.js @@ -83,7 +83,12 @@ const getQuestionService = (userId, reviewId) => __awaiter(void 0, void 0, void if (!review) { return constant_1.default.WRONG_REQUEST_VALUE; } - return { questionList: review.questionList }; + // 질문리스트 default response + let questionList = review.questionList; + if (questionList.length == 0) { + questionList = [""]; + } + return { questionList }; }); /** @@ -161,11 +166,16 @@ const getReviewService = (userId, reviewId) => __awaiter(void 0, void 0, void 0, const bookToShow = yield models_1.Book.findOne({ where: { id: reviewToShow.bookId }, }); + // 질문리스트 default response + let questionList = reviewToShow.questionList; + if (questionList.length == 0) { + questionList = [""]; + } return { bookTitle: bookToShow.title, answerOne: reviewToShow.answerOne, answerTwo: reviewToShow.answerTwo, - questionList: reviewToShow.questionList, + questionList, answerThree: reviewToShow.answerThree, reviewSt: reviewToShow.reviewSt, finishSt: reviewToShow.finishSt, @@ -195,10 +205,15 @@ const getReviewPreService = (userId, reviewId) => __awaiter(void 0, void 0, void if (!reviewToShow) { return constant_1.default.WRONG_REQUEST_VALUE; } + // 질문리스트 default response + let questionList = reviewToShow.questionList; + if (questionList.length == 0) { + questionList = [""]; + } return { answerOne: reviewToShow.answerOne, answerTwo: reviewToShow.answerTwo, - questionList: reviewToShow.questionList, + questionList, reviewSt: reviewToShow.reviewSt, finishSt: reviewToShow.finishSt, }; diff --git a/dist/service/review.js.map b/dist/service/review.js.map index b335988..8e29a3a 100644 --- a/dist/service/review.js.map +++ b/dist/service/review.js.map @@ -1 +1 @@ -{"version":3,"file":"review.js","sourceRoot":"","sources":["../../src/service/review.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"review.js","sourceRoot":"","sources":["../../src/service/review.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/middleware/authMiddleware.ts b/src/middleware/authMiddleware.ts index 09c23cb..50465ff 100644 --- a/src/middleware/authMiddleware.ts +++ b/src/middleware/authMiddleware.ts @@ -2,9 +2,6 @@ import { Request, Response } from "express"; import jwt from "jsonwebtoken"; import config from "../config"; -// slack -import slack from "../others/slack/slack"; - // library import response from "../library/response"; import returnCode from "../library/returnCode"; @@ -49,7 +46,6 @@ export const auth = async (req: Request, res: Response, next) => { return next(); } catch (err) { if (err.message === "jwt expired") { - slack.slackWebhook(req, err.message); return response.basicResponse( res, returnCode.UNAUTHORIZED, @@ -57,7 +53,6 @@ export const auth = async (req: Request, res: Response, next) => { "만료된 토큰입니다" ); } else { - slack.slackWebhook(req, err.message); return response.basicResponse( res, returnCode.UNAUTHORIZED, @@ -97,7 +92,6 @@ export const isLogin = async (req: Request, res: Response, next) => { return next(); } catch (err) { - slack.slackWebhook(req, err.message); return next(); } }; diff --git a/src/service/auth.ts b/src/service/auth.ts index f35af87..a9ac49d 100644 --- a/src/service/auth.ts +++ b/src/service/auth.ts @@ -121,7 +121,7 @@ const postLoginService = async (email: string, password: string) => { }; const nickname = user.nickname; const token = jwt.sign(payload, index.jwtSecret, { expiresIn: "14d" }); - return { nickname, token }; + return { email: user.email, nickname, token }; }; /** diff --git a/src/service/review.ts b/src/service/review.ts index 2bec3a2..20df387 100644 --- a/src/service/review.ts +++ b/src/service/review.ts @@ -89,7 +89,13 @@ const getQuestionService = async (userId: number, reviewId: number) => { return constant.WRONG_REQUEST_VALUE; } - return { questionList: review.questionList }; + // 질문리스트 default response + let questionList = review.questionList; + if (questionList.length == 0) { + questionList = [""]; + } + + return { questionList }; }; /** @@ -187,11 +193,17 @@ const getReviewService = async (userId: number, reviewId: number) => { where: { id: reviewToShow.bookId }, }); + // 질문리스트 default response + let questionList = reviewToShow.questionList; + if (questionList.length == 0) { + questionList = [""]; + } + return { bookTitle: bookToShow.title, answerOne: reviewToShow.answerOne, answerTwo: reviewToShow.answerTwo, - questionList: reviewToShow.questionList, + questionList, answerThree: reviewToShow.answerThree, reviewSt: reviewToShow.reviewSt, finishSt: reviewToShow.finishSt, @@ -224,10 +236,16 @@ const getReviewPreService = async (userId: number, reviewId: number) => { return constant.WRONG_REQUEST_VALUE; } + // 질문리스트 default response + let questionList = reviewToShow.questionList; + if (questionList.length == 0) { + questionList = [""]; + } + return { answerOne: reviewToShow.answerOne, answerTwo: reviewToShow.answerTwo, - questionList: reviewToShow.questionList, + questionList, reviewSt: reviewToShow.reviewSt, finishSt: reviewToShow.finishSt, };