Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat!: Tag && Type #557

Merged
merged 55 commits into from
Jul 9, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
d45f0dd
fix(wrapAsyncController.ts): reviews 에러 수정 (#457) (#460)
middlefitting May 17, 2023
3dc210e
feat: 태그 업데이트 기능 추가 (#472)
nyj001012 May 23, 2023
4289620
455 태그 생성 기능 추가 (#473)
cjho0316 May 23, 2023
b732f3a
chore(tag): merge 후 동작하지 않는 부분 수정 (#475)
nyj001012 May 23, 2023
ce3601d
467 태그로 도서 검색 가능하게 하기 (#477)
cjho0316 May 23, 2023
30a0e0a
태그 기능 조회 추가 작업 (#476)
nyj001012 May 23, 2023
fe4abbc
/api/tags/{bookInfo} 에서 login도 조회 가능하게 함 (#478)
nyj001012 May 23, 2023
0c059e1
/api/tags/{bookInfoId}의 count를 number로 형변환하여 반환 (#480)
nyj001012 May 24, 2023
60f4987
feat(tag): bookInfoId가 유효한지 확인하는 모듈 추가 (#479)
nyj001012 May 25, 2023
0da83ba
get tags 공개여부 응답값 추가 (#482)
nyj001012 May 31, 2023
34f5722
/api/tags/{bookInfoId}에 반환 값 type 추가 (#486)
nyj001012 May 31, 2023
1b22baf
feat(tag): 서브 태그 공개 여부 수정은 사서만 가능하게 함 (#487)
nyj001012 May 31, 2023
c66f830
build: 패키지 관리자를 프론트엔드와 같은 pnpm으로 통일 (#484)
scarf005 Jun 1, 2023
b326279
태그를 병합할 때, 서브 태그를 디폴트 태그로 다시 옮길 수 있게 함 (#490)
nyj001012 Jun 5, 2023
9895ad4
488 post tagssuper 응답값으로 새로 생성된 태그 정보 반환 (#494)
cjho0316 Jun 7, 2023
eb4b9aa
태그 생성 시, 중복 검사 모듈 추가 (#493)
nyj001012 Jun 8, 2023
4c6b3d6
feat(tag): /api/tags의 검색 조건 title에서 query로 변경 (#489)
nyj001012 Jun 8, 2023
c4e3296
bug sub태그 default태그로 머지 시도시 실종됨 (#492)
nyj001012 Jun 8, 2023
d17ee2b
500 tag 기능 이용 시 too many connections 발생 (#502)
nyj001012 Jun 11, 2023
fdf7f00
style: `interface`에서 `type`으로 전환 (#504)
scarf005 Jun 14, 2023
e74db64
refactor: `getReviewsPage` 타입 추가
scarf005 Jun 14, 2023
2f4af48
FEAT: any 반환하는 reservations repository 의 serarchReservations() 에 타입 추가
jimin52 Jun 14, 2023
e95434c
FEAT: reservations.repository.ts 의 함수에 명시적인 리턴값 추가.
jimin52 Jun 14, 2023
92e03e9
CHORE: Todo 추가. Repository 함수에서 Select Query Builder 타입을 리턴하고 있음.
jimin52 Jun 14, 2023
145e10f
refactor: 최신 `orderBy` API 사용, any 제거
scarf005 Jun 14, 2023
b9feafc
Merge remote-tracking branch 'origin/505-repostiroy-에-type-없는-경우-만들기'…
scarf005 Jun 14, 2023
c6a4f3d
496 patch tagsbookinfoidmerge body 중 supertagid null 값 허용안함 (#498)
nyj001012 Jun 14, 2023
e31e3a8
497 delete tagssupernan 요청시 sql 에러 (#499)
nyj001012 Jun 14, 2023
8a2bbf2
Update backend/src/books/books.repository.ts
jimin52 Jun 20, 2023
5558682
docs: 환경 변수 설명 docstring 추가 (#512)
scarf005 Jun 20, 2023
720dc2e
fix: bookId 를 와일드카드로 검색하던 버그 수정 (#518)
scarf005 Jun 20, 2023
19cfc28
Merge pull request #507 from jiphyeonjeon-42/505-repostiroy-에-type-없는…
jimin52 Jun 20, 2023
e32dcf7
build: zod 설치
Jun 20, 2023
b89f08d
chore: typescript-eslint 사용
scarf005 Jun 20, 2023
22b3a7f
feat: .env로부터 DB 옵션 파싱을 타입 안전하게 변경
scarf005 Jun 20, 2023
a3dd80f
fix: 전체 대출반납 기록 조회 시 정렬 순서가 최신 순이 아님 (#438)
nyj001012 Jun 21, 2023
9f7162c
495 post tagsdefault 응답값으로 새로 생성된 태그 정보 반환 (#524)
cjho0316 Jun 21, 2023
669393e
style: eslint 적용 (#522)
scarf005 Jun 22, 2023
fdc2a71
refactor: config.ts에서 connectOption 사용 (#526)
scarf005 Jun 22, 2023
fe7aad3
build: 개발용과 배포용 tsconfig 분리 (#520)
scarf005 Jun 22, 2023
0a32ceb
refactor: 환경 변수를 zod로 파싱 (#530)
scarf005 Jun 25, 2023
ee7f923
refactor: `users/search`에 zod 적용 (#523)
scarf005 Jun 26, 2023
29aba61
fix(tag): 기본 태그 등록시 response 값 안보내던것 수정
chanhihi Jun 28, 2023
85da511
fix: extended 옵션을 명시적으로 추가 (#536)
scarf005 Jun 28, 2023
363ea65
feat: 서버 종료시 점유한 자원 반환 (#538)
scarf005 Jun 28, 2023
4d450b2
fix: 슬랙봇 토큰이 필수가 아니게 변경 (#535)
scarf005 Jun 28, 2023
db9318b
refactor: review 컨트롤러 스키마 zod로 변경 (#539)
scarf005 Jun 28, 2023
e1b63f6
build: devDependencies 및 노드 버전 최신화 (#527)
scarf005 Jul 1, 2023
243e7bc
fix: review 스키마 타입 검증 완화, disabled 필드 기본값 추가 (#549)
scarf005 Jul 8, 2023
1dbd9b8
fix: 배포 노드 버전을 18 LTS로 다운그레이드 (#548)
scarf005 Jul 8, 2023
b6757fe
fix: booleanLikeSchema 타입을 boolean으로 변경 (#552)
scarf005 Jul 8, 2023
82dd571
style: 엔티티 (#554)
scarf005 Jul 9, 2023
d1a289a
fix: `VLendingForSearchUser` 쿼리러너 통합 (#556)
scarf005 Jul 9, 2023
30ba3dc
ci: 배포 준비 (#558)
scarf005 Jul 9, 2023
39c8e44
Merge remote-tracking branch 'origin/main' into develop
scarf005 Jul 9, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
name: Deploy to Amazon EC2

on:
workflow_dispatch:
push:
branches:
- main
Expand All @@ -12,7 +13,7 @@ env:
S3_BUCKET_NAME: jipbackdeploy
CODE_DEPLOY_APPLICATION_NAME: newjiphyeonjeon
CODE_DEPLOY_DEPLOYMENT_GROUP_NAME: deploy

jobs:
deploy:
name: Deploy
Expand Down Expand Up @@ -45,30 +46,33 @@ jobs:
- name: setup node.js
uses: actions/setup-node@master
with:
node-version: 16.x
node-version: 18.x

- name: setup pnpm
uses: pnpm/action-setup@v2

- name: install dependencies
run: |
cd backend && yarn install
cd backend && pnpm install

- name: build file
run: |
cd backend && yarn build
cd backend && pnpm build

- name: Configure AWS credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ap-northeast-2

- name: Upload to AWS S3
run: |
aws deploy push \
--application-name ${{ env.CODE_DEPLOY_APPLICATION_NAME }} \
--s3-location s3://$S3_BUCKET_NAME/$GITHUB_SHA.zip \
--source .

- name: Deploy to AWS EC2 from S3
run: |
aws deploy create-deployment \
Expand Down
9 changes: 6 additions & 3 deletions backend/.eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,14 @@
"es2021": true,
"jest": true
},
"extends": ["airbnb-base"],
"root": true,
"extends": ["airbnb-base", "plugin:@typescript-eslint/recommended"],
"parser": "@typescript-eslint/parser",
"plugins": ["@typescript-eslint"],
"parserOptions": {
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint"],
"rules": {
"import/extensions": [
"error",
Expand All @@ -21,7 +22,9 @@
"json": "never"
}
],
"linebreak-style": "off"
"linebreak-style": "off",
"no-use-before-define": "off",
"@typescript-eslint/no-use-before-define": "error"
},
"settings": {
"import/resolver": {
Expand Down
13 changes: 10 additions & 3 deletions backend/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,13 @@
FROM node:16
FROM node:18-alpine
# https://github.com/pnpm/pnpm/issues/4495#issuecomment-1317831712
ENV PNPM_HOME="/root/.local/share/pnpm"
ENV PATH="${PATH}:${PNPM_HOME}"
RUN npm install --global pnpm

COPY . .
RUN yarn
RUN pnpm install

ENTRYPOINT [ "sh", "start.sh"]
RUN pnpm install --global pm2
RUN pm2-runtime --version || exit 1

ENTRYPOINT [ "sh", "start.sh"]
52 changes: 28 additions & 24 deletions backend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,41 +6,43 @@
"repository": "https://github.com/jiphyeonjeon-42/backend-express.git",
"author": "jolim, chanykim, tkim, jimin, wocho, seongyle, seunam",
"license": "MIT",
"engines": {
"node": ">=20.3.1 || >=18.16.1 <20.0.0"
},
"scripts": {
"start": "node dist/server.js",
"build": "npx tsc -p .",
"build": "npx tsc -p ./tsconfig.prod.json",
"dev": "nodemon --watch \"src/**/*.ts\" --exec \"ts-node\" src/server.ts",
"prod": "npx tsc -p . && yarn start",
"prod": "npx tsc -p ./tsconfig.prod.json && npm start",
"lint": "eslint --fix --ext .js,.ts src",
"test": "jest"
},
"devDependencies": {
"@types/bcrypt": "^5.0.0",
"@types/cookie-parser": "^1.4.2",
"@types/cookie-parser": "^1.4.3",
"@types/cors": "^2.8.13",
"@types/dotenv": "^8.2.0",
"@types/express": "^4.17.13",
"@types/http-errors": "^1.8.2",
"@types/jest": "^27.4.1",
"@types/jsonwebtoken": "^9.0.1",
"@types/morgan": "^1.9.3",
"@types/node": "^17.0.15",
"@types/express": "^4.17.17",
"@types/http-errors": "^2.0.1",
"@types/jest": "^29.5.2",
"@types/jsonwebtoken": "^9.0.2",
"@types/morgan": "^1.9.4",
"@types/node": "^18.16.1",
"@types/node-schedule": "^2.1.0",
"@types/passport": "^1.0.7",
"@types/passport-jwt": "^3.0.6",
"@types/passport": "^1.0.12",
"@types/passport-jwt": "^3.0.8",
"@types/swagger-jsdoc": "^6.0.1",
"@types/swagger-ui-express": "^4.1.3",
"@types/winston": "^2.4.4",
"@typescript-eslint/eslint-plugin": "^5.10.2",
"@typescript-eslint/parser": "^5.10.2",
"eslint": "^7.32.0",
"@typescript-eslint/eslint-plugin": "^5.60.0",
"@typescript-eslint/parser": "^5.60.0",
"eslint": "^8.43.0",
"eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "^2.25.4",
"jest": "^27.5.1",
"nodemon": "^2.0.15",
"prettier": "^2.5.1",
"ts-jest": "^29.0.3",
"ts-node": "^10.4.0",
"typescript": "^4.5.5"
"eslint-plugin-import": "^2.27.5",
"jest": "^29.5.0",
"nodemon": "^2.0.22",
"prettier": "^2.8.8",
"ts-jest": "^29.1.0",
"ts-node": "^10.9.1",
"typescript": "5.0.4"
},
"dependencies": {
"@slack/web-api": "^6.7.1",
Expand All @@ -53,6 +55,7 @@
"express": "^4.17.2",
"http-errors": "^2.0.0",
"http-status": "^1.5.0",
"http-terminator": "^3.2.0",
"inversify": "^6.0.1",
"jest-mock-extended": "^3.0.4",
"jsonwebtoken": "^8.5.1",
Expand All @@ -71,6 +74,7 @@
"typeorm": "^0.3.11",
"typeorm-model-generator": "^0.4.6",
"winston": "^3.6.0",
"winston-daily-rotate-file": "^4.6.1"
"winston-daily-rotate-file": "^4.6.1",
"zod": "^3.21.4"
}
}
Loading