-
Notifications
You must be signed in to change notification settings - Fork 0
[H조] 백엔드파트 코드리뷰용 PR #75
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
Open
pkl0912
wants to merge
243
commits into
review
Choose a base branch
from
dev
base: review
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
243 commits
Select commit
Hold shift + click to select a range
e69d231
chore: readme 수정
yeonjookang 9d61586
chore
yeonjookang 5a4fb50
chore: readme 수정
yeonjookang 18f5b98
Merge branch 'main' of https://github.com/Kusitms-POPTATO-DEV/Poptato…
yeonjookang 5c9120a
chore: issue template 생성
yeonjookang 6de6f73
chore: pr template 생성
yeonjookang c05dbd9
chore: 자동 reviewer, assignee 설정
yeonjookang 4ac0f0e
chore: 자동 label 설정
yeonjookang 88bb69d
feat: ci/cd 설정
yeonjookang 78b63e4
chore: 외부 라이브러리 추가
yeonjookang 90ec71f
feat: Base 응답 클래스, 에러 클래스 추가
yeonjookang 6005762
fix: ci.yml 파일 수정
yeonjookang 278640b
Merge branch 'dev' into chore/1-add-library-and-base-class
yeonjookang 3dbbc04
fix: ci 시 테스트 제외
yeonjookang 1d32f56
Merge pull request #2 from Kusitms-POPTATO-DEV/chore/1-add-library-an…
yeonjookang 5e3e0a5
fix: cd 파일 수정
yeonjookang 5932357
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
yeonjookang 6c9e908
fix: cd 파일 수정
yeonjookang 015e7ba
fix: cd 파일 수정
yeonjookang 05bee64
fix: cd 파일 수정
yeonjookang ed61ff5
fix: cd 파일 수정
yeonjookang 5fa618b
fix: cd 파일 수정
yeonjookang 3e79b46
fix: cd 파일 수정
yeonjookang 2572b87
chore: token record 추가
b8c7df5
chore: config 추가
f37f394
chore: auth dto 추가
ceca9bd
feat: Auth service, controller 추가
3321ca9
feat: 카카오 관련 기능 추가 - external 패키지
1edacc5
chore: user 도메인 및 엔티디 추가 및 response 수정
3180770
fix: 회원가입, 로그인 시 응답 구분
feed5ea
feat: 카카오에서 이름 가져오기 추가
193b15d
fix: userId 추가
5f70786
feat: 이메일 가져오기 기능 추가
e38ea07
refactor: repository 분리
5f9a2f9
refactor: 회원가입 로직 분리
c88cbcc
refactor: userId resolver로 변경
58fd3b5
refactor: login api 수정
a02e70b
Merge pull request #4 from Kusitms-POPTATO-DEV/feat/1-kakao-login
pkl0912 ee33bfe
chore: label.yml 생성
yeonjookang 76f83dd
fix: auto-assign 파일 수정
yeonjookang d1d0895
fix: labeler.yml 파일 수정
yeonjookang 438dcc7
fix: labeler.yml 파일 수정
yeonjookang 296d235
fix: labeler.yml 파일 수정
yeonjookang fe11a3a
Merge branch 'dev' into fix/auto-assign
yeonjookang 82b724e
fix: label.yml 파일 수정
yeonjookang 6afd056
fix: label.yml 파일 수정
yeonjookang 5444385
Merge branch 'fix/auto-assign' of https://github.com/Kusitms-POPTATO-…
yeonjookang 9ee382e
fix: label.yml 파일 수정
yeonjookang 5f83205
Merge pull request #5 from Kusitms-POPTATO-DEV/fix/auto-assign
yeonjookang 53b719c
fix: pr 내용에 따라 label 자동 설정
yeonjookang e33a7b7
fix: 제목만 인식하도록 수정
yeonjookang 3d735ba
fix: synchronize 추가
yeonjookang 2eb8d6c
Merge pull request #7 from Kusitms-POPTATO-DEV/fix/auto-label
yeonjookang 2455d7f
docs: webconfig 위치 이동
yeonjookang a5c39fe
test: controller test 기반 코드 작성
yeonjookang e016d52
chore: today controller, service 클래스만 생성
yeonjookang 08e1fe3
chore: todo 엔티티 생성
yeonjookang a140244
chore: todo 엔티티에 userId를 필드로 추가
yeonjookang 97913c3
fix: labeler.yml 수정
yeonjookang 0d5e138
fix: labeler.yml 수정
yeonjookang 6323ffe
fix: labeler.yml 수정
yeonjookang 642fe29
Merge pull request #10 from Kusitms-POPTATO-DEV/chore/generate-todo-e…
yeonjookang c864d56
Merge branch 'dev' into feat/8-feat-today-list
yeonjookang 17129a9
chore: test code 짜기
b2ff82c
feat: delete user 기능 추가
40d280b
chore: todoRepository 추가
1b1624e
fix: ci/cd test 포함하도록 수정
yeonjookang b92b1bb
fix: user가 예약어라 users로 수정
yeonjookang 01469fe
test: todoController에 대한 테스트코드 작성
yeonjookang 0ed7b82
feat: todoController 구현
yeonjookang ef0a067
fix: ci.yml 순서 번경
yeonjookang 6bd0a90
fix: ci.yml 번경
yeonjookang 72b9bb1
fix: ci.yml 번경
yeonjookang 85ae28d
fix: ci.yml 번경
yeonjookang 2a84d6a
fix: ci.yml 번경
yeonjookang 75c95d4
fix: ci.yml 번경
yeonjookang 8de7f1b
fix: ci.yml 번경
yeonjookang 03ad6ce
fix: ci.yml 번경
yeonjookang 1d83e9f
fix: ci.yml 번경
yeonjookang 6282614
fix: ci.yml 번경
yeonjookang b94d2a0
fix: redisTemplate을 mocking
yeonjookang eaa6675
chore controller test code 작성
4100e7a
chore: usercontroller 추가
5a9c318
refactor: 코드 정리
83d946f
refactor: repository import 수정
f36fe2f
chore: test 파일 추가
9c777c1
refactor: origin 빼기 + todorepository 수정
6b85c43
fix: 카카오 로그인 수정
671d099
refactor: import문 삭제
fee3002
Merge pull request #13 from Kusitms-POPTATO-DEV/feat/user-delete
pkl0912 2e965ba
fix: 카카오로그인 수정
cf7514b
Merge pull request #16 from Kusitms-POPTATO-DEV/fix/kako-login
pkl0912 b1cb142
fix: code 를 accesstoken 으로 수정
dea04dc
Merge pull request #18 from Kusitms-POPTATO-DEV/fix/kako-login-2
pkl0912 c683cd7
test: todoService 테스트 코드 작성
yeonjookang 76c3854
merge: dev 브랜치 merge
yeonjookang d357aba
feat: 투데이 목록 조회 구현
yeonjookang 32f37f1
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
cb5da58
refactor: 안쓰는 kako 서비스 삭제
42f4899
chored: todocontrollertest 추가
a3eb4ac
chore: todo service test 추가
48a464a
feat: 투두 삭제 기능 추가
e08fd98
fix: totalPageCount를 반환하기 위해 paging을 직접 구현하도록 수정
yeonjookang b0f7467
fix: 로그인시 응답 jwt 토큰 반환
5292131
Merge pull request #20 from Kusitms-POPTATO-DEV/fix/kakao-response
pkl0912 a98d905
test: 페이지 수에 대한 테스트코드 추가
yeonjookang b66e300
Merge pull request #12 from Kusitms-POPTATO-DEV/feat/8-today-list
yeonjookang b052fba
fix:update cd.yml
yeonjookang 15084a7
fix: cd.yml 파일 수정
yeonjookang 7ce0604
fix: cd.yml 파일 수정
yeonjookang aed5b9d
fix: cd.yml 파일 수정
yeonjookang 901878b
test: 백로그 목록 조회 테스트코드 작성
yeonjookang ba30730
test: 백로그 목록 조회 api 작성
yeonjookang 57da08c
Merge pull request #22 from Kusitms-POPTATO-DEV/feat/21-backlog-list
yeonjookang 8037cc6
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
a2e62f2
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
944f9be
Merge pull request #24 from Kusitms-POPTATO-DEV/feat/todo-delete
yeonjookang f48dcc2
feat: bookmark 수정 기능 구현
8ea275f
feat: controller 기능 구현
fc1e18a
refactor: save 삭제
075e2e2
test: 스와이프 테스트코드 구현
yeonjookang 6934cb1
Merge pull request #26 from Kusitms-POPTATO-DEV/feat/change-bookmark
yeonjookang e07844f
feat: 히스토리 조회 기능 구현
5e0cbc6
refactor: todoservice 수정
68ecf6c
refactor: todoservicetest 수정
fdfe395
feat: 스와이프 기능 구현
yeonjookang 03a98c1
fix: 테스트코드 수정
yeonjookang 2f82296
Merge pull request #28 from Kusitms-POPTATO-DEV/feat/23-swipe
yeonjookang b23763e
feat: 드래그앤드롭 기능 구현
yeonjookang 31b3408
fix: 테스트를 위한 주석 해제
yeonjookang 272c65d
Merge pull request #30 from Kusitms-POPTATO-DEV/feat/29-drag-and-drop
pkl0912 6232688
refactor: 영속성 컨텍스트
3a36021
fix: 로직 수정
yeonjookang 403ecd2
test: 테스트코드 오류 수정
yeonjookang d56a111
Merge pull request #32 from Kusitms-POPTATO-DEV/feat/29-drag-and-drop
yeonjookang e9405bb
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
f38580d
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
4d832e4
Merge pull request #33 from Kusitms-POPTATO-DEV/feat/get-histories
pkl0912 d9ce352
chore: dto, repository 설정
6cd8592
test: 백로그 생성 테스트코드 작성
yeonjookang cd23e6a
feat: 백로그 생성 API 구현
yeonjookang b109c91
merge: 히스토리 브랜치 합병
yeonjookang 5302670
chore: import 제거
yeonjookang 36d295a
feat: 어제 한 일 목록 조회
a757165
fix: 테스트코드 수정
yeonjookang cab488c
Merge pull request #35 from Kusitms-POPTATO-DEV/feat/31-create-backlog
yeonjookang 33defeb
test: 테스트코드 작성
yeonjookang 78430d6
feat: api 구현
yeonjookang 5c20668
Merge pull request #37 from Kusitms-POPTATO-DEV/feat/36-get-todo-info
yeonjookang 293ac05
feat: controller 추가
07547da
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
9f00104
Merge pull request #39 from Kusitms-POPTATO-DEV/feat/get-yesterdays
yeonjookang 2573447
test: 테스트코드 작성
yeonjookang 0cd15e3
feat: api 구현
yeonjookang 28ba209
feat: 이름 변경 service 추가
e052d95
fix: test 코드 수정
yeonjookang 5a32f47
fix: test 코드 수정
yeonjookang 1f80d2e
Merge pull request #41 from Kusitms-POPTATO-DEV/feat/38-update-deadline
pkl0912 0a816f2
fix: test 코드 수정
yeonjookang 57126e6
Merge pull request #43 from Kusitms-POPTATO-DEV/feat/38-update-deadline
yeonjookang 2d19d11
test: test 코드 작성
yeonjookang 6572627
feat: 할일 수정 기능 구현
yeonjookang 847eb2e
Merge pull request #44 from Kusitms-POPTATO-DEV/feat/update-todo-content
pkl0912 23faad5
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
5601cdd
feat: controller 추가
06f26f8
refactor: test 코드 수정
1b08d16
test: 달성여부 수정 테스트코드 작성
yeonjookang 68ffaf7
feat: 달성여부 수정 기능 구현
yeonjookang 636ba19
fix: 할 일 리스트 조회에 마감기한 데이터 응답 추가
yeonjookang 1636f3d
chore: auth exception 추가
1601266
fix: 테스트코드 수정
yeonjookang af0b1e6
Merge pull request #46 from Kusitms-POPTATO-DEV/feat/45-update-is-com…
yeonjookang a84f882
Merge branch 'dev' of https://github.com/Kusitms-POPTATO-DEV/Poptato_…
09316e9
refactor: 메소드 변경
49575ee
refactor: save 삭제
dea37a6
Merge pull request #47 from Kusitms-POPTATO-DEV/feat/change-mypage-name
pkl0912 46a3862
feat: 스케줄러 기능 구현
yeonjookang f95650d
Merge pull request #49 from Kusitms-POPTATO-DEV/feat/48-scheduler
yeonjookang 7067d42
feat: user 프로필 조회 기능 구현
9ee6d63
refactor: service 수정
6cdab87
Merge pull request #51 from Kusitms-POPTATO-DEV/feat/get-mypage
pkl0912 0c446e1
refactor: 날짜 내림차순으로 변경
d3f7ae9
Merge pull request #53 from Kusitms-POPTATO-DEV/refactor/change-histo…
pkl0912 4a02c76
fix: 백로그 조회 시 마감기한이 항상 null로 조회되는 문제 해결
yeonjookang 517ec54
Merge pull request #54 from Kusitms-POPTATO-DEV/fix/deadline-always-null
yeonjookang 8204306
refactor: exception 수정
6a30319
Merge pull request #56 from Kusitms-POPTATO-DEV/refactor/change-token…
yeonjookang b250f94
fix: 히스토리 정렬 수정
85fc364
Merge pull request #58 from Kusitms-POPTATO-DEV/fix/histories
pkl0912 3fcef0c
fix: 투데이/백로그 조회 시 데이터가 없을 경우 예외가 아닌 빈 리스트 반환으로 수정
yeonjookang 2d213ef
fix: 투데이/백로그 빈 문자열로 응답 통일(유혀하지 않은 페이지 예외 없앰)
yeonjookang e411891
Merge pull request #60 from Kusitms-POPTATO-DEV/fix/todo-list-null
yeonjookang 1c7bf1b
fix: 토큰 만료 에러 응답 상태코드 수정
yeonjookang 6c72886
Merge pull request #61 from Kusitms-POPTATO-DEV/fix/response-status
yeonjookang 06f1ca9
fix: 달성못한 할 일이 YESTSERDAY로 가도록 수정
yeonjookang 5e4298c
Merge pull request #62 from Kusitms-POPTATO-DEV/fix/scheduler-error
yeonjookang d059809
fix: 토큰관련 예외 400->401
b79f9f7
Merge pull request #63 from Kusitms-POPTATO-DEV/fix/token-exception-s…
pkl0912 131da33
feat: 도메인,레포지토리 추가
54f0c09
chore: Policy exception 추가
439ccf0
Merge pull request #65 from Kusitms-POPTATO-DEV/feat/get-policy
pkl0912 aa14255
fix: 백로그 생성 시 id 반환
yeonjookang 7c6d313
Merge pull request #66 from Kusitms-POPTATO-DEV/fix/create-backlog-re…
yeonjookang 245f2e3
fix: userId 1로만 백로그 생성되는 버그 수정
yeonjookang bed310f
chore: timezone 띄우도록 수정
yeonjookang 9142e4a
fix: timezone을 서울로 되도록 cd 파일 수정
yeonjookang a686288
refactor: baseException-> userException
4a284c7
fix: 투두 삭제 시 userId 검증 추가
9991812
refactor: 마이페이지 편집 제거
060c707
refactor: 즐겨찾기 userId 추가
c256eb4
Merge pull request #68 from Kusitms-POPTATO-DEV/refactor/exception-re…
pkl0912 1d7079c
fix: push될 때만 cd 파일이 돌도록 cd 파일 수정
yeonjookang 9075bec
Merge pull request #69 from Kusitms-POPTATO-DEV/fix/cd.yml
yeonjookang c62db58
refactor: login API 리팩토링
yeonjookang 3cd29d4
refactor: login API 리팩토링
yeonjookang edd370b
refactor: logout, reissue API 리팩토링
yeonjookang 99b2a8d
refactor: 투데이 목록 조회, 백로그 목록 조회 API 리팩토링
yeonjookang 64a035a
refactor: Todo 도메인, Policy 도메인 API 리팩토링
yeonjookang 2b75ba7
fix: 완료된 할 일 desc -> ascr
6f3cebf
Merge pull request #71 from Kusitms-POPTATO-DEV/fix/sort-today-finished
pkl0912 456edf4
test: 테스트코드 수정 및 추가
yeonjookang f030917
merge: dev 브랜치 합병
yeonjookang fc0ac5f
fix: ci에서 redis image 받도록 ci.yml 수정
yeonjookang 587d72c
fix: ci에서 redis 실행하도록 ci.yml 수정
yeonjookang 18cfe40
fix: ci에서 redis 실행하도록 ci.yml 수정
yeonjookang 092c703
fix: ci에서 redis 실행하도록 ci.yml 수정
yeonjookang 0ad3913
Merge pull request #72 from Kusitms-POPTATO-DEV/refactor/mvp
pkl0912 e5b004a
fix: @TestContainers를 사용하여 test용 redis 사용하도록 수정
yeonjookang 8f4309e
Merge pull request #73 from Kusitms-POPTATO-DEV/fix/test-redis-docker
pkl0912 23cb539
Chore: README 추가
pkl0912 fd6b0cf
fix: test용 redis 포트번호 수정
yeonjookang a117ee1
Fix: Readme 이미지 수정
pkl0912 ae180e8
Merge pull request #74 from Kusitms-POPTATO-DEV/fix/test-redis-port
yeonjookang 2af54c9
fix: backlog 리스트 조회 시 todayStatus가 null인 데이터도 조회하도록 수정
yeonjookang 1d873fd
fix: findBacklogs 버그 수정
yeonjookang 852398d
Merge pull request #76 from Kusitms-POPTATO-DEV/fix/backlog-list
yeonjookang 227eb8b
refactor: 스케줄러 클래스 메소드 추출
yeonjookang 6887b4f
test: 스케줄러 테스트코드 수정 및 추가
yeonjookang 8ebbe6d
Merge pull request #77 from Kusitms-POPTATO-DEV/refactor/scheduler
yeonjookang fb16c91
feat: 튜토리얼 블럭 생성
bc761e9
chore: 튜토리얼 test 추가
dcac011
Merge pull request #80 from Kusitms-POPTATO-DEV/feat/create-tutorial-…
pkl0912 672f79a
Update README.md
yeonjookang File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| --- | ||
| name: "\U0001F954Poptato Server Issue Template" | ||
| about: Poptato팀의 Server Issue Template 입니다. | ||
| title: '' | ||
| labels: '' | ||
| assignees: '' | ||
|
|
||
| --- | ||
|
|
||
| <!-- Title convention | ||
| Format → <Type><Scope>: <서술> | ||
| Type : Label 중 대표성을 띄는 것 하나를 선택 | ||
| Scope : 선택사항, 해당 이슈가 속한 (클래스, 메서드, 패키지 등) 범위를 선택 | ||
| 서술 : 첫 글자는 대문자. | ||
| --> | ||
|
|
||
| ## 📌 목적 / 이슈 내용 | ||
|
|
||
| > 내용 | ||
|
|
||
| ## 📝 상세 내용 | ||
|
|
||
| - 내용 | ||
|
|
||
| ## ✔ 체크 리스트 | ||
| - [ ] 내용 | ||
|
|
||
| ## 💡 비고 | ||
|
|
||
| - (참고 사항 및 레퍼런스) | ||
| - 내용 | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| <!-- Title Convention | ||
| - 하나의 커밋일 경우 해당 커밋 메시지와 동일하게 작성한다. | ||
| - 여러 커밋이 포함된 경우 요약되어야 한다. | ||
| - 서술 : 첫 글자는 대문자. | ||
| - 예) Feat(jwt)#13: Add JWT Token For Authorization | ||
| --> | ||
|
|
||
| Resolves #{이슈-번호} | ||
| <!-- | ||
| e.g. Resolves #10 / Resolves #123,#345,#456 / Resolves #없음 | ||
| --> | ||
|
|
||
| ## Issue Define | ||
| <!-- 해당 이슈를 정의/설명해 주세요 --> | ||
| - | ||
|
|
||
| ## Summary of resolutions or improvements | ||
| <!-- 해결/개선 사항을 요약해 주세요. 이미지를 첨부해도 좋습니다. --> | ||
| - | ||
|
|
||
| ### Note | ||
|
|
||
| <!-- 참고 자료, 참고 사항, 리뷰어에게 전하는 메시지 등 --> | ||
| - |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,19 @@ | ||
| # Set to true to add reviewers to pull requests | ||
| addReviewers: true | ||
|
|
||
| # Set to true to add assignees to pull requests | ||
| addAssignees: author | ||
|
|
||
| # A list of reviewers to be added to pull requests (GitHub user name) | ||
| reviewers: | ||
| - yeonjookang | ||
| - pkl0912 | ||
|
|
||
| # A number of reviewers added to the pull request | ||
| # Set 0 to add all the reviewers (default: 0) | ||
| numberOfReviewers: 1 | ||
|
|
||
| # A number of assignees to add to the pull request | ||
| # Set to 0 to add all of the assignees. | ||
| # Uses numberOfReviewers if unset. | ||
| numberOfAssignees: 1 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,30 @@ | ||
| filters: | ||
| - label: feat | ||
| regexs: | ||
| - /feat/i | ||
| - /feature/i | ||
| targets: [title] | ||
| - label: bug | ||
| regexs: | ||
| - /bug/i | ||
| targets: [title] | ||
| - label: documentation | ||
| regexs: | ||
| - /docs/i | ||
| targets: [title] | ||
| - label: test | ||
| regexs: | ||
| - /test/i | ||
| targets: [title] | ||
| - label: fix | ||
| regexs: | ||
| - /fix/i | ||
| targets: [title] | ||
| - label: chore | ||
| regexs: | ||
| - /chore/i | ||
| targets: [title] | ||
| - label: refactor | ||
| regexs: | ||
| - /refactor/i | ||
| targets: [title] |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| name: Java CD with Gradle | ||
|
|
||
| on: | ||
| push: | ||
| branches: [ "dev", "main" ] | ||
|
|
||
| jobs: | ||
| deploy: | ||
| runs-on: ubuntu-latest | ||
| steps: | ||
| - name: Connect to EC2 via SSH | ||
| uses: appleboy/ssh-action@master | ||
| env: | ||
| APPLICATION_YML: ${{ secrets.APPLICATION_YML }} | ||
| APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} | ||
| TEST_DATA_SQL: ${{ secrets.TEST_DATA_SQL }} | ||
| with: | ||
| host: ${{ secrets.EC2_HOST }} | ||
| username: ${{ secrets.EC2_USERNAME }} | ||
| key: ${{ secrets.EC2_PRIVATE_KEY }} | ||
| script_stop: true | ||
| envs: APPLICATION_YML, APPLICATION_TEST_YML, TEST_DATA_SQL | ||
| # git clone 같은 초기 작업은 ec2에서 먼저 진행 | ||
| script: | | ||
| cd /home/ubuntu/poptato_server/Poptato_Server | ||
|
|
||
| git switch dev | ||
|
|
||
| git pull origin dev | ||
|
|
||
| rm -rf src/main/resources/application.yml | ||
|
|
||
| mkdir -p src/main/resources | ||
|
|
||
| echo "$APPLICATION_YML" > src/main/resources/application.yml | ||
|
|
||
| rm -rf src/test/resources/application.yml | ||
|
|
||
| mkdir -p src/test/resources | ||
|
|
||
| echo "$APPLICATION_TEST_YML" > src/test/resources/application.yml | ||
|
|
||
| rm -rf src/test/resources/data.sql | ||
|
|
||
| echo "$TEST_DATA_SQL" > src/test/resources/data.sql | ||
|
|
||
| chmod +x gradlew | ||
|
|
||
| ./gradlew clean | ||
| ./gradlew build | ||
|
|
||
| sudo fuser -k -n tcp "${{ secrets.SERVER_PORT }}" || true | ||
|
|
||
| nohup java -Duser.timezone=Asia/Seoul -jar build/libs/*SNAPSHOT.jar > ./output.log 2>&1 & |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| name: Java CI with Gradle | ||
|
|
||
| # dev 브랜치로 PR할 때 CI 적용 | ||
| on: | ||
| pull_request: | ||
| branches: [ "dev" ] | ||
| types: [ opened, synchronize ] | ||
| push: | ||
| branches: | ||
| - dev | ||
|
|
||
| # build 작업 | ||
| jobs: | ||
| build: | ||
| runs-on: ubuntu-latest | ||
| permissions: | ||
| contents: read | ||
| steps: | ||
| # 코드 체크아웃 | ||
| - name: Checkout code | ||
| uses: actions/checkout@v4 | ||
|
|
||
| # JDK 17 설치 | ||
| - name: Set up JDK 17 | ||
| uses: actions/setup-java@v4 | ||
| with: | ||
| java-version: '17' | ||
| distribution: 'temurin' | ||
|
|
||
| # Redis 실행 | ||
| - name: Start Redis | ||
| uses: supercharge/[email protected] | ||
| with: | ||
| redis-version: 6 | ||
|
|
||
| # main의 resources 디렉토리 생성 | ||
| - name: Create main resources directory | ||
| run: mkdir -p src/main/resources | ||
|
|
||
| # test의 resources 디렉토리 생성 | ||
| - name: Create test resources directory | ||
| run: mkdir -p src/test/resources | ||
|
|
||
| # main의 application.yml 생성 | ||
| - name: Set Release YML File | ||
| run: | | ||
| echo "${{ secrets.APPLICATION_YML }}" > src/main/resources/application.yml | ||
|
|
||
| # test의 data.sql 생성 | ||
| - name: Set Test DATA SQL File | ||
| run: | | ||
| echo "${{ secrets.TEST_DATA_SQL }}" > src/test/resources/data.sql | ||
|
|
||
| # test의 application.yml 생성 | ||
| - name: Set Release Test YML File | ||
| run: | | ||
| echo "${{ secrets.APPLICATION_TEST_YML }}" > src/test/resources/application.yml | ||
|
|
||
| # Gradle 설정 및 의존성 다운 | ||
| - name: Setup Gradle | ||
| uses: gradle/actions/[email protected] | ||
|
|
||
| # gradlew 파일 실행 권한 부여 | ||
| - name: Make gradlew executable | ||
| run: chmod +x ./gradlew | ||
|
|
||
| # 빌드 작업 실행(테스트 포함) | ||
| - name: Build with Gradle Wrapper | ||
| run: ./gradlew build |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| # example | ||
| name: Issue PR Labeler | ||
|
|
||
| on: | ||
| issues: | ||
| types: | ||
| - opened | ||
| - edited | ||
| pull_request: # or pull_request_target | ||
| types: | ||
| - opened | ||
| - reopened | ||
| - synchronize | ||
|
|
||
| jobs: | ||
| main: | ||
| runs-on: ubuntu-latest | ||
|
|
||
| permissions: | ||
| contents: read # required to read configuration yml file | ||
| issues: write # required to add labels to issues | ||
| pull-requests: write # required to add labels to pull requests | ||
|
|
||
| steps: | ||
| - name: Run Issue PR Labeler | ||
| uses: hoho4190/[email protected] | ||
| with: | ||
| token: ${{ secrets.GITHUB_TOKEN }} |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| ## 🥔 Poptato Backend Server 🥔 | ||
|
|
||
| --- | ||
|
|
||
| ### 📘 ERD (Entity-Relationship Diagram) | ||
|
|
||
|  | ||
|
|
||
|
|
||
| --- | ||
|
|
||
| ### 🛠 System Architecture | ||
|
|
||
|  | ||
|
|
||
|
|
||
| --- | ||
|
|
||
| ### 📄 API 명세서 | ||
|
|
||
| [🔗 API 명세서 바로가기](https://mountain-fang-96a.notion.site/API-7fc88f1d9d1f448f8926e959e1605cc9?pvs=4) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
🥔