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

Renewal #32

Open
wants to merge 190 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
190 commits
Select commit Hold shift + click to select a range
b02fc31
refactor: auth dto, entity
kyeahxx19 Jan 27, 2024
a0f1447
refactor(auth): 중복 코드 합치기
kyeahxx19 Jan 27, 2024
9984628
refactor: drop userName
kyeahxx19 Jan 27, 2024
8db9874
Merge branch 'main' into kyeah@refactor
kyeahxx19 Jan 27, 2024
ce43d14
Refactor auth DTOs and decorators
kyeahxx19 Jan 27, 2024
9df365c
Merge branch 'main' into kyeah@refactor
kyeahxx19 Feb 9, 2024
ae58590
feat: update dto & apply index
kyeahxx19 Feb 9, 2024
5b7fcd7
Merge branch 'main' into kyeah@refactor
kyeahxx19 Mar 31, 2024
e019066
fix dto
kyeahxx19 Mar 31, 2024
a201bf7
add enum: blurting state
kyeahxx19 Mar 31, 2024
794695b
fix custom decorator, return value
kyeahxx19 Mar 31, 2024
2c7ed2e
etc
kyeahxx19 Mar 31, 2024
89aec83
refactor service code
kyeahxx19 Mar 31, 2024
f503f6e
add repository layer
kyeahxx19 Apr 4, 2024
fc85964
add dtos
kyeahxx19 Apr 4, 2024
7125b69
apply repository pattern
kyeahxx19 Apr 4, 2024
bd5bb7c
refactor firebase service
overthestream Apr 11, 2024
58fc6d5
remove unnecessary import
overthestream Apr 11, 2024
530f3a8
remove test
overthestream Apr 11, 2024
563b617
refactor fcm docs
overthestream Apr 11, 2024
b65959f
remove test
overthestream Apr 11, 2024
ca77669
guard 변경
overthestream Apr 11, 2024
8db6086
fix: apply review
kyeahxx19 Apr 12, 2024
48af4d7
Merge branch 'main' into kyeah@refactor
kyeahxx19 Apr 12, 2024
403cc25
refactor(geocoding): delete test file
kyeahxx19 Apr 28, 2024
e4b1742
refactor(home): add repository func
kyeahxx19 Apr 28, 2024
130f95b
refactor(home): add decorator
kyeahxx19 Apr 28, 2024
6d52a15
refactor(home): apply repository pattern
kyeahxx19 Apr 28, 2024
335d8d6
refactor(home): apply decorator docs
kyeahxx19 Apr 28, 2024
3ccadc0
refactor(geo): apply decorator docs
kyeahxx19 Apr 28, 2024
2a8c6f4
refactor(report): apply decorator docs
kyeahxx19 Apr 28, 2024
2dc0e9a
fix(home): dto validator
kyeahxx19 May 1, 2024
34aae7f
refactor: apply getDateTimeOfNow()
kyeahxx19 May 1, 2024
024f5dd
refactor(home): fix logic about home info
kyeahxx19 May 1, 2024
46949b3
refactor(home): add answerWithQuestion dto static method
kyeahxx19 May 1, 2024
ce927a0
refactor(report): apply reportRepository pattern
kyeahxx19 May 1, 2024
8ec566f
refactor(auth): apply repository pattern
kyeahxx19 May 5, 2024
bb095df
feat(auth): delete university and email validation
kyeahxx19 May 5, 2024
967bd86
refactor(dto): fix class-validator
kyeahxx19 May 5, 2024
1d42faa
fix(auth): delete unused module imports
kyeahxx19 May 5, 2024
dfa84e4
feat(auth): add birth, job column in signup
kyeahxx19 May 5, 2024
9d91e20
fix(auth): fix Christian to 개신교
kyeahxx19 May 5, 2024
8c1e690
refactor point
overthestream May 7, 2024
b5a5c92
refactor user domain
overthestream May 7, 2024
74639bd
infra: renewal CI/CD
kyeahxx19 May 11, 2024
67cbddd
fix: renewal cicd
kyeahxx19 May 11, 2024
29d7b0b
cicd: fix port setting
kyeahxx19 May 16, 2024
2c92163
feat: blurting point from first answer
kyeahxx19 May 16, 2024
4da3227
feat: block whisper after blurting end
kyeahxx19 May 16, 2024
5cf0d2f
infra: fix redis error
kyeahxx19 May 16, 2024
55ea78f
infra: fix redis error
kyeahxx19 May 16, 2024
fb19d88
infra: fix redis error
kyeahxx19 May 16, 2024
d6a30da
fix: religion delete type enum in db
kyeahxx19 May 17, 2024
324386f
infra: port error
kyeahxx19 May 17, 2024
5d403a8
fix: reset religion enum in db
kyeahxx19 May 17, 2024
69b4a48
fix: delete university in db
kyeahxx19 May 17, 2024
bd4ef2b
fix: add job in userInfo
kyeahxx19 May 17, 2024
6b048ab
Merge branch 'renewal' into refactoring/hoon
kyeahxx19 May 28, 2024
9afe887
renewal: update random nickname
kyeahxx19 May 29, 2024
9f87e2c
feat(home): today's random users
kyeahxx19 May 29, 2024
f862f57
전화번호 추가
overthestream May 31, 2024
973e751
Merge pull request #31 from DevKor-github/refactoring/hoon
kyeahxx19 Jun 4, 2024
0ab81dc
fix: run build bug
kyeahxx19 Jun 4, 2024
4dee5bd
Merge pull request #28 from DevKor-github/kyeah@refactor
kyeahxx19 Jun 4, 2024
23633a0
fix home time to 3 hour part
overthestream Jun 5, 2024
74a4d6d
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
overthestream Jun 5, 2024
04e2c83
fix directory structure
overthestream Jun 5, 2024
62d5240
fix: 오타 수정
kyeahxx19 Jun 5, 2024
f932207
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
kyeahxx19 Jun 5, 2024
7488bd4
validation implementation
overthestream Jun 5, 2024
6eb739b
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
overthestream Jun 5, 2024
6550b14
add docs
overthestream Jun 5, 2024
acfc9be
dynamic import
overthestream Jun 5, 2024
68c2c5c
debug: master phonenumber
kyeahxx19 Jun 30, 2024
0c8a525
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
kyeahxx19 Jun 30, 2024
2b5597d
fix: completed user error
kyeahxx19 Jun 30, 2024
dd98667
refactor: dtos in chat folder
kyeahxx19 Jul 4, 2024
86d89ff
feat(chat): check freeExpired
kyeahxx19 Jul 4, 2024
5a9282b
fix: exclude page complete in signup
kyeahxx19 Jul 6, 2024
04725b9
Merge branch 'renewal' into refactoring/kyeah
kyeahxx19 Jul 6, 2024
9206231
Merge branch 'renewal' into refactoring/kyeah
kyeahxx19 Jul 6, 2024
8b5aa81
debug: add master phoneNumber
kyeahxx19 Jul 6, 2024
5241e30
feat(blurting): Arrowing per part and Result
kyeahxx19 Jul 17, 2024
d2158b5
hotfix: separate queue
kyeahxx19 Jul 19, 2024
96df25d
hotfix: queue name error
kyeahxx19 Jul 19, 2024
9a38981
hotfix: blurting part over check error
kyeahxx19 Jul 19, 2024
f4b3550
feat: delete major
kyeahxx19 Aug 5, 2024
e35ed8e
feat: force profile update
kyeahxx19 Aug 5, 2024
38d8cd6
debug: add master phonenumber
kyeahxx19 Aug 8, 2024
7c1bf2e
[#35] add envs
overthestream Aug 10, 2024
00421d0
add package
overthestream Aug 10, 2024
47f7fda
[#35] change sms infra
overthestream Aug 10, 2024
7a7da90
fix: get blurting number Nan error
kyeahxx19 Aug 10, 2024
bf28c89
feat/37
overthestream Aug 18, 2024
601a15a
feat-37/ add push notification
overthestream Aug 18, 2024
0866b61
Merge pull request #39 from DevKor-github/feat/37
overthestream Aug 18, 2024
2feb696
Merge pull request #36 from DevKor-github/feat/35
overthestream Aug 18, 2024
cc83a22
Merge pull request #33 from DevKor-github/refactoring/kyeah
overthestream Aug 18, 2024
e98af46
feat/apple
overthestream Aug 18, 2024
31c7f61
Merge branch 'renewal' into feat/37
overthestream Aug 18, 2024
c35ca52
Merge pull request #41 from DevKor-github/feat/37
overthestream Aug 18, 2024
2e9c199
Merge branch 'main' of https://github.com/DevKor-github/BLURTING-back…
overthestream Aug 18, 2024
a743947
lockfile
overthestream Aug 18, 2024
7f6bd45
fix build error
overthestream Aug 18, 2024
966b056
addlogs
overthestream Aug 18, 2024
c55ae23
no type import
overthestream Aug 18, 2024
81b0888
addport
overthestream Aug 18, 2024
67de9b8
enum
overthestream Aug 24, 2024
b706f75
no namespace
overthestream Aug 24, 2024
10ee5b8
hotfix
overthestream Aug 25, 2024
806b7b6
synchronize
overthestream Aug 25, 2024
ca29997
log
overthestream Aug 25, 2024
ebb7831
null check
overthestream Aug 25, 2024
3a735ee
await promise....
overthestream Aug 25, 2024
8412641
low
overthestream Aug 25, 2024
2044b61
add 매칭실패
overthestream Aug 25, 2024
3be4f61
hotTopic.repository.ts 업데이트
overthestream Aug 25, 2024
7ec5450
hotTopic.controller.ts 업데이트
overthestream Aug 25, 2024
6f89d1f
arr
overthestream Aug 27, 2024
7319861
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
overthestream Aug 27, 2024
072bf93
overthestream Aug 27, 2024
c42bb62
remove error
overthestream Aug 27, 2024
ecefeef
add null check
overthestream Aug 27, 2024
590e48d
null check
overthestream Aug 27, 2024
3ea9bfe
fix chatroom
overthestream Aug 27, 2024
fb4be01
fix: send_chat error
kyeahxx19 Sep 5, 2024
51c363b
delete: console.log
kyeahxx19 Sep 5, 2024
efe6ba3
add answer
overthestream Sep 5, 2024
3794120
feature
overthestream Sep 5, 2024
5eabbcb
개발용 딜레이 수정
overthestream Sep 5, 2024
8e6d01f
feat: get other profile at home
kyeahxx19 Sep 7, 2024
67b43af
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
kyeahxx19 Sep 7, 2024
032de3b
feat: check point body
kyeahxx19 Sep 8, 2024
1323572
fix: docs point
kyeahxx19 Sep 8, 2024
e635337
fix: home profile error
kyeahxx19 Sep 9, 2024
4017295
fix npm vulnerabilities
miridih-jhrho Sep 10, 2024
7ec6b6c
fix npm vulnerabilities
miridih-jhrho Sep 10, 2024
8e35c9f
remove typeimport
overthestream Sep 10, 2024
c5efbe5
복구
overthestream Sep 10, 2024
0d5e944
resolve dependency
overthestream Sep 10, 2024
0153f88
loggin
overthestream Sep 10, 2024
84d31c9
admob validation
overthestream Sep 10, 2024
142d496
이슈 대응
overthestream Sep 10, 2024
5f78975
Update time.ts
overthestream Sep 11, 2024
33256f6
fix: home other profile format
kyeahxx19 Sep 11, 2024
92d7daf
fix: point check to post
kyeahxx19 Sep 14, 2024
5e9cd18
blurting4
overthestream Sep 18, 2024
8f0d79b
fix: blur error
kyeahxx19 Sep 24, 2024
78170d4
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
kyeahxx19 Sep 24, 2024
0ac271a
fix: freeExipred doesn't change even after blurting ends
kyeahxx19 Sep 24, 2024
651c248
gender
overthestream Sep 28, 2024
d7ed516
Merge branch 'renewal' of https://github.com/Devkor-github/BLURTING-b…
overthestream Sep 28, 2024
37af190
add log
overthestream Sep 29, 2024
524b7e4
fix: point minus error
kyeahxx19 Oct 2, 2024
9c89e90
Merge branch 'renewal' of https://github.com/DevKor-github/BLURTING-b…
kyeahxx19 Oct 2, 2024
a243144
좋아요 3개 이상만 best로 선정
overthestream Oct 5, 2024
07bb908
redis 대신 cron job 사용
overthestream Oct 5, 2024
d3fc7ea
빌드 에러 해결
overthestream Oct 5, 2024
f8bef59
패키지 빌드 에러 해결
overthestream Oct 5, 2024
fd44765
nullable
overthestream Oct 5, 2024
4b1815f
null check
overthestream Oct 5, 2024
c1a19ce
validation
overthestream Oct 5, 2024
36454a9
parse
overthestream Oct 5, 2024
9c506b2
parse
overthestream Oct 5, 2024
ec5679b
fix build error
overthestream Oct 6, 2024
d742647
fix: profile error & try to fix check part
kyeahxx19 Oct 8, 2024
0866f0f
fix
overthestream Oct 13, 2024
81c1e89
fix
overthestream Oct 13, 2024
6aa6c31
fix
overthestream Oct 13, 2024
8a2daa8
Merge pull request #42 from overthestream/renewal
overthestream Oct 13, 2024
5fc4d54
fix
overthestream Oct 13, 2024
8a3ea3c
Merge branch 'DevKor-github:renewal' into renewal
overthestream Oct 13, 2024
392b656
Merge pull request #43 from overthestream/renewal
overthestream Oct 13, 2024
9918bba
fix
overthestream Oct 13, 2024
6511831
Merge branch 'renewal' of https://github.com/overthestream/BLURTING-b…
overthestream Oct 13, 2024
0e5a764
Merge pull request #44 from overthestream/renewal
overthestream Oct 13, 2024
080fe2d
fix
overthestream Oct 13, 2024
ce778c9
Merge pull request #45 from overthestream/renewal
overthestream Oct 13, 2024
a5afd10
fix: 1st question posted even at night
kyeahxx19 Oct 21, 2024
0fed101
fix: change starting time of each part
kyeahxx19 Oct 22, 2024
46f8572
bug fix
overthestream Nov 3, 2024
46036b2
Merge branch 'renewal' into renewal
overthestream Nov 4, 2024
5a41dbb
Merge pull request #46 from overthestream/renewal
overthestream Nov 4, 2024
94a12a7
fff
overthestream Dec 6, 2024
04dc415
Merge branch 'renewal' of https://github.com/overthestream/BLURTING-b…
overthestream Dec 6, 2024
4036430
아휴
overthestream Dec 6, 2024
8aae999
Merge pull request #47 from overthestream/renewal
overthestream Dec 6, 2024
5adb11e
renew
overthestream Dec 7, 2024
86c94d8
Merge pull request #48 from overthestream/renewal
overthestream Dec 7, 2024
8c1438d
Update cicd.yml
kyeahxx19 Jan 27, 2025
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
28 changes: 21 additions & 7 deletions .github/workflows/cicd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,16 @@ name: docker-build

on:
push:
branches: ['main']
branches:
- main
- renewal

env:
DOCKER_IMAGE: ghcr.io/overthestream/blurting
DOCKER_CONTAINER: blurting
DB_DATABASE: ${{ (github.ref_name == 'main' && secrets.DB_DATABASE_MAIN) || (github.ref_name == 'renewal' && secrets.DB_DATABASE_RENEWAL) }}
DOCKER_IMAGE_MAIN: ghcr.io/overthestream/blurting:latest
DOCKER_CONTAINER_MAIN: blurting
DOCKER_IMAGE_RENEWAL: ghcr.io/overthestream/blurting:renewal
DOCKER_CONTAINER_RENEWAL: blurting-renewal

jobs:
build:
Expand All @@ -31,7 +36,7 @@ jobs:
uses: docker/build-push-action@v3
with:
push: true
tags: ${{ env.DOCKER_IMAGE }}:latest
tags: ${{ github.ref_name == 'main' && env.DOCKER_IMAGE_MAIN || env.DOCKER_IMAGE_RENEWAL }}

deploy:
needs: build
Expand All @@ -43,7 +48,7 @@ jobs:
echo "DB_PORT=${{ secrets.DB_PORT }}" >> .env
echo "DB_PASSWORD=${{ secrets.DB_PASSWORD }}" >> .env
echo "DB_USERNAME=${{ secrets.DB_USERNAME }}" >> .env
echo "DB_DATABASE=${{ secrets.DB_DATABASE }}" >> .env
echo "DB_DATABASE=${{ env.DB_DATABASE }}" >> .env
echo "JWT_SECRET_KEY=${{ secrets.JWT_SECRET_KEY }}" >> .env
echo "ACCESS_TOKEN_SECRET_KEY=${{ secrets.ACCESS_TOKEN_SECRET_KEY }}" >> .env
echo "REFRESH_TOKEN_SECRET_KEY=${{ secrets.REFRESH_TOKEN_SECRET_KEY }}" >> .env
Expand Down Expand Up @@ -73,7 +78,16 @@ jobs:
echo "FCM_CLIENT_CERT_URL=${{ secrets.FCM_CLIENT_CERT_URL }}" >> .env
echo "FCM_UNIVERSE_DOMAIN=${{ secrets.FCM_UNIVERSE_DOMAIN }}" >> .env
echo "DISCORD_TOKEN=${{secrets.DISCORD_TOKEN}}" >> .env
echo "APP_STORE_KID=${{secrets.APP_STORE_KID}}" >> .env
echo "APP_STORE_PK=${{secrets.APP_STORE_PK}}" >> .env
echo "APP_STORE_ISSUER_ID=${{secrets.APP_STORE_ISSUER_ID}}" >> .env
echo "APP_STORE_BUNDLE_ID=${{secrets.APP_STORE_BUNDLE_ID}}" >> .env
echo "MESSAGE_API_KEY=${{secrets.MESSAGE_API_KEY}}" >> .env
echo "MESSAGE_API_SECRET=${{secrets.MESSAGE_API_SECRET}}" >> .env
- name: Run Docker
run: |
docker stop ${{env.DOCKER_CONTAINER}} && docker rm ${{env.DOCKER_CONTAINER}} && docker rmi ${{env.DOCKER_IMAGE}}:latest
docker run --env-file ./.env -d -p 3080:3080 --name ${{env.DOCKER_CONTAINER}} --network host --restart always ${{env.DOCKER_IMAGE}}:latest
docker stop ${{ github.ref_name == 'main' && env.DOCKER_CONTAINER_MAIN || env.DOCKER_CONTAINER_RENEWAL }} || true
docker rm ${{ github.ref_name == 'main' && env.DOCKER_CONTAINER_MAIN || env.DOCKER_CONTAINER_RENEWAL }} || true
docker rmi ${{ github.ref_name == 'main' && env.DOCKER_IMAGE_MAIN || env.DOCKER_IMAGE_RENEWAL }} || true
docker run --env-file ./.env -d -p ${{ github.ref_name == 'main' && '3080:3080' || '3081:3081' }} --name ${{ github.ref_name == 'main' && env.DOCKER_CONTAINER_MAIN || env.DOCKER_CONTAINER_RENEWAL }} --network host --restart always ${{ github.ref_name == 'main' && env.DOCKER_IMAGE_MAIN || env.DOCKER_IMAGE_RENEWAL }}

1 change: 0 additions & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,3 @@ RUN npm run build
EXPOSE 3080

ENTRYPOINT npm run start:prod

Loading