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

RAC-67 deploy : 운영 배포 #118

Closed
wants to merge 910 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
910 commits
Select commit Hold shift + click to select a range
9d10f12
RAC-274 deploy : ci/cd 분리
ywj9811 Jan 3, 2024
5109bc0
RAC-274 deploy: jdk경령화 변경
ywj9811 Jan 3, 2024
612a8a2
Merge pull request #86 from WE-ARE-RACCOONS/RAC-274
ywj9811 Jan 3, 2024
93c5707
Merge pull request #85 from WE-ARE-RACCOONS/RAC-265
ywj9811 Jan 3, 2024
a3cd2cc
RAC-257 feat : Payment 생성
ywj9811 Jan 5, 2024
02e698a
RAC-257 feat : Payment 조회 및 관리
ywj9811 Jan 5, 2024
9ecc296
RAC-257 refactor : Salary 월단위 변경
ywj9811 Jan 5, 2024
a595ad1
RAC-257 refactor : 기존 로직 변경
ywj9811 Jan 5, 2024
a3d0f70
RAC-257 fix : 잘못된 문법 수정
ywj9811 Jan 5, 2024
c837d19
RAC-257 refactor : Payment추가 반영
ywj9811 Jan 5, 2024
5370e6a
RAC-257 fix : ManyToOne수정
ywj9811 Jan 5, 2024
a796a40
RAC-257 fix : 수수료 수정
ywj9811 Jan 5, 2024
b13be44
RAC-257 refactor : 선배 멘토링 조회 수정 및 완료된 멘토링 조회 분리
ywj9811 Jan 5, 2024
24b4f3c
RAC-257 refactor : 정산 목록 조회 수정
ywj9811 Jan 5, 2024
4e53892
RAC-257 refactor : 선배 필드 검색 수정
ywj9811 Jan 5, 2024
6970a77
RAC-257 fix : Senior프로필 업데이트시 가능시간 중복 생성 수정
ywj9811 Jan 6, 2024
263cdda
RAC-257 fix : Cancel, Refuse 상태의 멘토링 상세보기 막도록 수정
ywj9811 Jan 6, 2024
1c8e98b
RAC-257 fix : Cancel, Refuse 상태의 멘토링 상세보기 막도록 수정
ywj9811 Jan 6, 2024
eb1b2ba
RAC-257 refactor : Mentoring Test 수정사항 반영
ywj9811 Jan 6, 2024
02288b9
RAC-257 refactor : SalaryTest 수정사항 적용
ywj9811 Jan 6, 2024
3511c0a
RAC-257 refactor : 조회 쿼리 수정
ywj9811 Jan 6, 2024
d5f8748
RAC-257 refactor : Salary내부 조회 시도 및 주석처리
ywj9811 Jan 6, 2024
072e4d3
RAC-257 feat : Senior생성시 Salary동시 생성
ywj9811 Jan 6, 2024
61fd478
RAC-257 feat : Account 생성/수정시 Salary반영
ywj9811 Jan 6, 2024
1633425
RAC-257 test : 테스트 실패 수정
ywj9811 Jan 6, 2024
90624a9
Merge pull request #87 from WE-ARE-RACCOONS/RAC-257
ywj9811 Jan 6, 2024
9c93f3a
Revert "RAC-257 feat : 결제 기능 추가 및 리팩토링"
ywj9811 Jan 6, 2024
292d2df
Merge pull request #88 from WE-ARE-RACCOONS/revert-87-RAC-257
ywj9811 Jan 6, 2024
ceb3910
Revert "Revert "RAC-257 feat : 결제 기능 추가 및 리팩토링""
ywj9811 Jan 6, 2024
1c47a51
Merge pull request #89 from WE-ARE-RACCOONS/revert-88-revert-87-RAC-257
ywj9811 Jan 7, 2024
bf8c0ac
RAC-254 feat: 테스트 의존성 추가
ay-eonii Jan 8, 2024
4f5d7d2
Merge branch 'develop' of https://github.com/WE-ARE-RACCOONS/postgrad…
ay-eonii Jan 8, 2024
e880eb3
RAC-277 fix : 응답코드 변경
ywj9811 Jan 8, 2024
4e02975
RAC-254 feat: 대학생 멘토링 조회 상태별 테스트
ay-eonii Jan 9, 2024
b9ef6e1
RAC-254 test: 대학생 멘토링 상세조회
ay-eonii Jan 9, 2024
4b9995b
RAC-254 test: 대학생 멘토링 신청
ay-eonii Jan 9, 2024
f0ac27b
RAC-254 test: 대학생 멘토링 상태변경
ay-eonii Jan 10, 2024
c379692
RAC-254 test: 대학원생 멘토링 조회
ay-eonii Jan 10, 2024
ec0bd6a
RAC-254 fix: @EnumSource 사용
ay-eonii Jan 10, 2024
d178b24
RAC-254 test: 대학원생 멘토링 상태 변경
ay-eonii Jan 10, 2024
dbc5536
RAC-254 test: 소셜 로그인
ay-eonii Jan 10, 2024
4ed6ac3
RAC-254 test: 회원가입
ay-eonii Jan 10, 2024
6abe99c
RAC-254 test: 추가 가입
ay-eonii Jan 10, 2024
2d3ef13
RAC-254 test: 권한 변경
ay-eonii Jan 10, 2024
db48fdf
RAC-254 test: 리프레시 토큰 재발급
ay-eonii Jan 10, 2024
16cff8a
RAC-254 test: 로그아웃
ay-eonii Jan 10, 2024
797f8ef
RAC-254 test: @Disabled 추가
ay-eonii Jan 10, 2024
9f25dab
RAC-254 fix: redis MockBean 사용
ay-eonii Jan 10, 2024
7a524be
RAC-277 feat : 멘토링 삭제 구현(결제 실패시)
ywj9811 Jan 10, 2024
2abb265
RAC-277 feat : 정산시 슬랙 메시지 발송 구현
ywj9811 Jan 10, 2024
decc2f9
RAC-277 test : 기존 테스트 수정
ywj9811 Jan 10, 2024
32dcd8c
RAC-277 test : 기존 테스트 수정
ywj9811 Jan 10, 2024
c2b8ec8
RAC-277 refactor : Slack에서 조회 쿼리 삭제
ywj9811 Jan 10, 2024
9179cab
RAC-277 refactor : Salary 자동 생성 로직 수정
ywj9811 Jan 10, 2024
275e7e1
RAC-277 refactor : Salary자동 생성시 성능 개선
ywj9811 Jan 10, 2024
9c85d19
RAC-277 refactor : 스케쥴러 동작 함수 private 변경
ywj9811 Jan 10, 2024
9f15a30
RAC-277 feat : OrderId 추가 (환불시 필요)
ywj9811 Jan 10, 2024
caf9d68
RAC-277 fix : @Scheduled public변경
ywj9811 Jan 10, 2024
bfdf576
RAC-277 feat : 환불 로직 추가(미완성)
ywj9811 Jan 10, 2024
2233564
RAC-254 fix: 응답 enum 사용
ay-eonii Jan 11, 2024
1f364cd
RAC-254 test: 멘토링 상태변경 예외 테스트
ay-eonii Jan 11, 2024
d3071b3
RAC-254 test: 멘토링 신청 날짜 예외 테스트
ay-eonii Jan 11, 2024
b623a40
RAC-254 fix: 응답 Role enum 사용
ay-eonii Jan 11, 2024
45a67ed
RAC-254 fix: 선배로 변경 시 선배가입여부 확인
ay-eonii Jan 11, 2024
c9c696a
RAC-254 test: 후배 정보가 없는 경우 변경 예외 테스트
ay-eonii Jan 11, 2024
88cf5b1
RAC-254 test: 선배 정보가 없는 경우 변경 예외 테스트
ay-eonii Jan 11, 2024
6a15f7a
RAC-254 comment: log 전송 주석처리
ay-eonii Jan 11, 2024
11125d1
!HOTFIX: log 전송 주석처리
ay-eonii Jan 11, 2024
5342044
Merge branch 'develop' of https://github.com/WE-ARE-RACCOONS/postgrad…
ay-eonii Jan 12, 2024
87bf0a5
RAC-254 test: 유저 마이페이지 테스트
ay-eonii Jan 12, 2024
e7f072e
RAC-254 test: 잘못된 번호 수정 예외
ay-eonii Jan 12, 2024
fb17efb
RAC-254 test: 대학원생 등록
ay-eonii Jan 12, 2024
5bb659d
RAC-254 test: 계좌 생성 테스트
ay-eonii Jan 12, 2024
78a8f03
RAC-254 test: 선배 마이페이지 테스트
ay-eonii Jan 12, 2024
5930e5d
RAC-254 test: 선배 상세조회 테스트
ay-eonii Jan 12, 2024
cf8e3fd
RAC-254 test: 선배 검색 테스트
ay-eonii Jan 12, 2024
59167cd
RAC-254 test: 후배 전환 가능 테스트
ay-eonii Jan 12, 2024
934f3e9
RAC-254 test: 키워드 개수 예외
ay-eonii Jan 13, 2024
fd5f12b
RAC-254 test: 정산 통합 테스트
ay-eonii Jan 13, 2024
c1ea351
RAC-254 feat: 가능한 요일 예외 추가
ay-eonii Jan 13, 2024
afa0be8
RAC-254 test: 가능한 요일 예외 테스트
ay-eonii Jan 13, 2024
1ad90da
RAC-254 test: 계좌 미등록 예외
ay-eonii Jan 13, 2024
b09b333
Merge pull request #91 from WE-ARE-RACCOONS/RAC-254
ay-eonii Jan 13, 2024
97c1c39
RAC-277 feat : 로그 서버 연결 실패시 슬랙 메시지 전송
ywj9811 Jan 13, 2024
185c724
RAC-277 feat : Timeout설정 및 서버연결 예외 처리
ywj9811 Jan 13, 2024
5ded42f
RAC-277 fix : conflict 해결
ywj9811 Jan 13, 2024
91a3826
RAC-277 fix : 쿼리문 수정
ywj9811 Jan 14, 2024
be006b2
Merge pull request #92 from WE-ARE-RACCOONS/RAC-277
ywj9811 Jan 14, 2024
eff5838
Merge branch 'develop' of https://github.com/WE-ARE-RACCOONS/postgrad…
ay-eonii Jan 14, 2024
2276676
RAC-254 test: slack mock 등록
ay-eonii Jan 14, 2024
0de7345
RAC-254 fix: 정산 예정/완료 API에서 결제 완료(`DONE`)만 조회하도록 수정
ay-eonii Jan 15, 2024
2aa8d97
RAC-254 feat: 선배 마이페이지 소셜아이디 반환
ay-eonii Jan 15, 2024
da99c2d
RAC-254 feat: 멘토링 취소 시 payment 상태 CANCEL 로 변경
ay-eonii Jan 15, 2024
4a00622
RAC-254 test: 멘토링 취소 관련 테스트 수정
ay-eonii Jan 15, 2024
ac625e0
RAC-254 comment: todo 추가
ay-eonii Jan 17, 2024
2befaa3
RAC-288 refactor : 응답 형식 수정
ywj9811 Jan 17, 2024
7ae98b2
RAC-288 feat : prometheus 모니터링용 의존성 추가
ywj9811 Jan 17, 2024
ee4e2f7
RAC-288 refactor : socialId 추가
ywj9811 Jan 17, 2024
ac38078
RAC-288 test : 변경점 테스트 반영
ywj9811 Jan 17, 2024
0132592
Merge pull request #94 from WE-ARE-RACCOONS/RAC-288
ywj9811 Jan 18, 2024
adb3d42
RAC-288 fix : socialId 추가(프론트 요구사항)
ywj9811 Jan 18, 2024
316ff3f
RAC-285 feat: 프로필 미등록 예외
ay-eonii Jan 19, 2024
8decb6e
RAC-285 test: 프로필 미등록 예외
ay-eonii Jan 19, 2024
0414afe
RAC-285 test: @Valid 예외
ay-eonii Jan 19, 2024
b11b3ef
RAC-285 test: 응답 확인 추가
ay-eonii Jan 19, 2024
25e280d
RAC-285 fix: List<AvailableCreateRequest> `@Valid` 추가
ay-eonii Jan 19, 2024
2a0332b
RAC-285 test: 대학원생 마이페이지 프로필 수정 valid 예외
ay-eonii Jan 19, 2024
e70fd82
RAC-285 test: 계좌 미등록 시 null 반환
ay-eonii Jan 19, 2024
9fb2ab9
RAC-254 refactor: 중복 코드 제거
ay-eonii Jan 19, 2024
fcc158e
RAC-254 test: 마이페이지 계정 valid 예외
ay-eonii Jan 19, 2024
b911082
RAC-254 test: 응답 필드 테스트 추가
ay-eonii Jan 19, 2024
19d4745
RAC-254 test: 멘토링 조회 권한 예외
ay-eonii Jan 19, 2024
5841c7f
RAC-254 test: 멘토링 @Valid 예외
ay-eonii Jan 19, 2024
b65dd37
RAC-254 test: 정산 not found 예외
ay-eonii Jan 19, 2024
80685c0
Merge pull request #95 from WE-ARE-RACCOONS/RAC-288
ywj9811 Jan 19, 2024
33986ec
RAC-288 feat : seniorId 리스트 조회 추가
ywj9811 Jan 20, 2024
112632e
Merge pull request #96 from WE-ARE-RACCOONS/RAC-288
ywj9811 Jan 20, 2024
46888e1
RAC-254 test: 후배 회원가입 시 선택사항 미입력 테스트
ay-eonii Jan 21, 2024
2bb91e4
RAC-254 test: 선배 회원가입 시 필수사항 미입력 테스트
ay-eonii Jan 21, 2024
5a5017f
Merge branch 'develop' of https://github.com/WE-ARE-RACCOONS/postgrad…
ay-eonii Jan 21, 2024
6816e96
RAC-288 feat : 개발용 소셜 로그인 추가
ywj9811 Jan 21, 2024
cafdabb
Merge pull request #97 from WE-ARE-RACCOONS/RAC-288
ywj9811 Jan 21, 2024
48f1165
Merge pull request #93 from WE-ARE-RACCOONS/RAC-254
ay-eonii Jan 21, 2024
4f98a7f
RAC-292 feat : log설정 추가
ywj9811 Jan 21, 2024
499aed7
RAC-292 fix : 파일명 수정
ywj9811 Jan 21, 2024
20e98e4
RAC-292 fix : 저장 정보 수정
ywj9811 Jan 21, 2024
4837b6f
RAC-292 deploy : mkdir제거
ywj9811 Jan 21, 2024
79fad63
RAC-292 deploy : mkdir제거
ywj9811 Jan 21, 2024
004c15f
Merge pull request #98 from WE-ARE-RACCOONS/RAC-292
ywj9811 Jan 21, 2024
aacb930
RAC-292 fix : logback 수정
ywj9811 Jan 21, 2024
e88e945
Merge pull request #99 from WE-ARE-RACCOONS/RAC-292
ywj9811 Jan 21, 2024
b5c3c3f
RAC-292 feat : 선배 상세보기 본인여부 확인 추가
ywj9811 Jan 22, 2024
1ba141c
RAC-292 test : 선배 상세 조회 변경에 의한 테스트 확인
ywj9811 Jan 22, 2024
bdcfdb5
Merge pull request #100 from WE-ARE-RACCOONS/RAC-288
ywj9811 Jan 22, 2024
dd71582
RAC-286 fix: 선배 response 통일
ay-eonii Jan 28, 2024
0f243dc
RAC-286 fix: 유저 response 통일
ay-eonii Jan 28, 2024
20beb20
RAC-286 fix: Wish response 통일
ay-eonii Jan 28, 2024
f1e15d6
RAC-286 fix: Auth response 통일
ay-eonii Jan 28, 2024
39d7215
RAC-286 fix: 중복 코드번호 수정
ay-eonii Jan 28, 2024
712abcc
RAC-286 fix: request 유효성 검사
ay-eonii Jan 28, 2024
2a38464
RAC-286 fix: 메서드명 통일
ay-eonii Jan 28, 2024
01ff8a1
RAC-286 test: `@Valid` test 수정
ay-eonii Jan 28, 2024
9cf09cb
RAC-286 feat: security 권한 추가
ay-eonii Jan 30, 2024
ca4a18f
RAC-286 test: security 권한 추가
ay-eonii Jan 30, 2024
4d1d9de
RAC-286 feat: 닉네임 유효성 메시지 추가
ay-eonii Jan 30, 2024
a6af1e4
RAC-286 fix: 인증 예외 200 처리
ay-eonii Jan 30, 2024
d7d8492
Merge pull request #101 from WE-ARE-RACCOONS/RAC-286
ywj9811 Jan 30, 2024
4715a7b
RAC-304 fix : 비로그인 상태 선배 상세조회 가능하도록 수정
ywj9811 Jan 31, 2024
3ebb56e
Merge pull request #102 from WE-ARE-RACCOONS/RAC-304
ywj9811 Jan 31, 2024
0ee85d5
RAC-304 fix : mentoring 기본 term 30분 수정
ywj9811 Jan 31, 2024
8b86b70
RAC-304 fix : mentoring 조회시 본인확인 실패 로그 추가
ywj9811 Jan 31, 2024
d6511eb
Merge pull request #103 from WE-ARE-RACCOONS/RAC-304
ywj9811 Jan 31, 2024
3a15ff7
RAC-306 deploy : sonarCloud 추가
ywj9811 Feb 1, 2024
d2cf9be
RAC-306 deploy : sonarCloud 플러그인 추가
ywj9811 Feb 1, 2024
46d6386
RAC-306 deploy : sonarCloud 플러그인 수정
ywj9811 Feb 1, 2024
6945b08
RAC-306 deploy : sonarCloud 플러그인 수정
ywj9811 Feb 1, 2024
11ec06a
RAC-306 deploy : stackTrace추가
ywj9811 Feb 1, 2024
b1aa9d5
RAC-306 fix : error라인 삭제
ywj9811 Feb 1, 2024
a67801a
RAC-306 deploy : workflow 수정
ywj9811 Feb 1, 2024
8515261
RAC-306 deploy : jacoco 추가
ywj9811 Feb 1, 2024
f142ec3
RAC-306 deploy : 워크플로우 수정
ywj9811 Feb 1, 2024
6e08b52
RAC-306 deploy : sonar 플러그인 추가 및 workflow수정
ywj9811 Feb 1, 2024
74d5422
RAC-306 deploy : jacoco 추가
ywj9811 Feb 1, 2024
93ec48d
RAC-306 deploy : application.yml 읽도록 수정
ywj9811 Feb 1, 2024
70d1a2b
RAC-306 deploy : sonarcloud workflow 수정
ywj9811 Feb 1, 2024
3c2de95
RAC-306 deploy : CI와 sonarCloud 통합
ywj9811 Feb 1, 2024
7e940ea
RAC-306 deploy : pr시 동작하도록 수정
ywj9811 Feb 1, 2024
4d4c3bb
RAC-306 deploy : pr시 동작하도록 수정
ywj9811 Feb 1, 2024
5533191
RAC-306 test : 빌드 실패 테스트
ywj9811 Feb 1, 2024
b4fc778
RAC-306 test : 테스트 성공하도록 수정
ywj9811 Feb 1, 2024
7d1cd8d
RAC-306 deploy : workflow 내용 수정
ywj9811 Feb 1, 2024
3b5b0e5
RAC-306 deploy : jacoco 설정 추가
ywj9811 Feb 1, 2024
271f595
RAC-306 deploy : workFlow SonarScan 수정
ywj9811 Feb 1, 2024
b1bed7a
RAC-306 fix : jacoco 설정 수정
ywj9811 Feb 1, 2024
8098f9d
RAC-306 deploy : CI 분리
ywj9811 Feb 1, 2024
6992011
Merge pull request #104 from WE-ARE-RACCOONS/RAC-306
ywj9811 Feb 1, 2024
c9d741f
RAC-306 fix : jacoco file위치 수정
ywj9811 Feb 1, 2024
da1f973
Merge pull request #105 from WE-ARE-RACCOONS/RAC-306
ywj9811 Feb 2, 2024
9fb6018
RAC-307 fix : Mentoring Payment연관관계 수정
ywj9811 Feb 3, 2024
5e06eb4
RAC-307 fix : Mentoring Payment연관관계 수정
ywj9811 Feb 4, 2024
359bef8
RAC-307 fix : Mentoring 신청 수정
ywj9811 Feb 4, 2024
68a0419
RAC-307 fix : Mentoring 조회 수정
ywj9811 Feb 4, 2024
a4d3624
RAC-307 fix : Payment 관련 수정
ywj9811 Feb 4, 2024
f8b3b32
RAC-307 fix : Salary 관련 수정
ywj9811 Feb 4, 2024
e8cf7be
RAC-307 test : 변경점 테스트 반영
ywj9811 Feb 4, 2024
a8dc284
RAC-307 fix : mentoring 신청시 결제 정보 추가
ywj9811 Feb 4, 2024
a0e6203
RAC-307 fix : 결제 리다이렉트 추가 및 로직 수정
ywj9811 Feb 4, 2024
7ce045a
RAC-307 feat : senior 닉네임 조회
ywj9811 Feb 4, 2024
3d32813
RAC-307 test : 변경사항 테스트 반영
ywj9811 Feb 4, 2024
66c880b
RAC-307 fix : 불필요한 조회 삭제
ywj9811 Feb 5, 2024
ed88d99
RAC-307 fix : 불필요한 조회 삭제
ywj9811 Feb 5, 2024
6bb1588
RAC-307 feat : 조회시 데이터 추가
ywj9811 Feb 5, 2024
a1402ec
Merge pull request #106 from WE-ARE-RACCOONS/RAC-307
ywj9811 Feb 5, 2024
b21e874
RAC-308 refactor : 유틸리티 클래스 private 생성자 추가
ywj9811 Feb 5, 2024
e2baadc
RAC-308 refactor : Inheritance tree of classes should not be too deep 해결
ywj9811 Feb 5, 2024
ee6e657
RAC-308 refactor : Null pointers should not be dereferenced 해결
ywj9811 Feb 5, 2024
eb3cd4d
RAC-308 refactor : Raw types should not be used 해결
ywj9811 Feb 5, 2024
018ae56
RAC-308 refactor : Raw types should not be used 해결
ywj9811 Feb 5, 2024
d2c6380
RAC-308 refactor : 불필요한 import및 코드 삭제
ywj9811 Feb 5, 2024
7f7b51e
RAC-308 refactor : Inheritance tree of classes should not be too deep 해결
ywj9811 Feb 5, 2024
01c9892
RAC-308 refactor : deprecated 대상 수정
ywj9811 Feb 5, 2024
bc28935
RAC-308 refactor : JUnit5 test classes and methods should have defaul…
ywj9811 Feb 5, 2024
fb4dc71
RAC-308 deploy : 커버리지 최소 0으로 수정 (추후 수정)
ywj9811 Feb 5, 2024
23b1373
RAC-308 deploy : jacoco rule 수정
ywj9811 Feb 5, 2024
0741ea1
Merge pull request #107 from WE-ARE-RACCOONS/RAC-308
ywj9811 Feb 6, 2024
a220d47
RAC-308 feat : orderId unique 설정 추가
ywj9811 Feb 8, 2024
082efba
RAC-308 feat : 결제 결과 받으면 payment 저장
ywj9811 Feb 8, 2024
4fc6409
RAC-308 feat : user와 orderId를 통한 결제 조회
ywj9811 Feb 8, 2024
ba17e31
RAC-308 test : 변경사항 테스트 반영
ywj9811 Feb 8, 2024
055d28b
RAC-308 test : 사용하지 않는 메소드 테스트 변경
ywj9811 Feb 8, 2024
76f2648
RAC-308 refactor : redirect url 숨김처리
ywj9811 Feb 8, 2024
0368968
RAC-308 feat : 로컬용 api추가
ywj9811 Feb 9, 2024
7438beb
Merge pull request #108 from WE-ARE-RACCOONS/RAC-282
ywj9811 Feb 9, 2024
4f28278
RAC-276 refactor : mentoringApplyUseCase와 MentoringManageUseCase 통합
ywj9811 Feb 12, 2024
063736e
RAC-276 feat : 환불 로직 추가
ywj9811 Feb 12, 2024
c646fb1
RAC-276 feat : 환불 로직 분리
ywj9811 Feb 12, 2024
e444ddd
RAC-276 feat : 멘토링 신청 오류시 환불 처리 및 자동 취소시 환불 추가
ywj9811 Feb 12, 2024
65c4fef
RAC-276 test : 변경사항 테스트 적용
ywj9811 Feb 12, 2024
1a18a72
RAC-276 style : 주석 제거
ywj9811 Feb 12, 2024
1a47c92
RAC-276 refactor : code smell 해결
ywj9811 Feb 12, 2024
a1cee9f
RAC-276 fix : Value값 수정
ywj9811 Feb 12, 2024
92aa129
Merge pull request #109 from WE-ARE-RACCOONS/RAC-276
ywj9811 Feb 12, 2024
bd90930
RAC-276 fix : 모든 Exception 처리
ywj9811 Feb 12, 2024
921de90
RAC-276 refactor : code smell 해결
ywj9811 Feb 12, 2024
7c311ff
Merge pull request #110 from WE-ARE-RACCOONS/RAC-276
ywj9811 Feb 12, 2024
c553c7c
RAC-276 fix : 리다이렉트 수정
ywj9811 Feb 13, 2024
9b7e996
RAC-276 fix : code smell 수정
ywj9811 Feb 13, 2024
a38389e
Merge pull request #111 from WE-ARE-RACCOONS/RAC-276
ywj9811 Feb 13, 2024
2f0af31
RAC-276 fix : 환불 로직 수정
ywj9811 Feb 13, 2024
7dc6482
Merge pull request #112 from WE-ARE-RACCOONS/RAC-276
ywj9811 Feb 13, 2024
c10a302
RAC-276 fix : 환불 실패 커스텀 예외 수정
ywj9811 Feb 13, 2024
85d7973
Merge pull request #113 from WE-ARE-RACCOONS/RAC-276
ywj9811 Feb 13, 2024
ba0f932
RAC-276 fix : 환불 파라미터 수정
ywj9811 Feb 13, 2024
0fcc252
RAC-276 fix : 환불 webClient 요청 수정
ywj9811 Feb 13, 2024
e954347
RAC-276 fix : 예외 메시지 수정
ywj9811 Feb 13, 2024
b20eecb
RAC-276 fix : webClient Timeout 설정
ywj9811 Feb 13, 2024
7c148e5
RAC-311 fix : term 30분으로 수정
ywj9811 Feb 14, 2024
071f778
RAC-311 fix : 자동 갱신시 오류 발생하면 슬랙 메시지 전송 후 계속하도록 수정
ywj9811 Feb 14, 2024
fbcac2c
RAC-311 refactor : 슬랙 메시지 전송 클래스 분리
ywj9811 Feb 14, 2024
8f55f9b
RAC-311 feat : 멘토링 실패시 메시지 전송
ywj9811 Feb 14, 2024
00d1bfc
Merge pull request #114 from WE-ARE-RACCOONS/RAC-311
ywj9811 Feb 14, 2024
46fe498
RAC-311 fix : SalaryDate 계산 수정
ywj9811 Feb 15, 2024
1654649
Merge pull request #115 from WE-ARE-RACCOONS/RAC-311
ywj9811 Feb 15, 2024
ec526e0
RAC-311 fix : 거절시 환불
ywj9811 Feb 17, 2024
9285815
RAC-304 test : 환불 테스트시 외부 API 사용 주석 처리
ywj9811 Feb 18, 2024
a8ec0d2
Merge pull request #116 from WE-ARE-RACCOONS/RAC-304
ywj9811 Feb 18, 2024
f74d73a
RAC-67 docs : gitignore 업데이트
ywj9811 Feb 19, 2024
13d33b6
RAC-67 deploy : 운영용 cicd workflow 작성
ywj9811 Feb 19, 2024
3bb1d5a
RAC-67 fix : 로그 전송 webClient 사용으로 변경
ywj9811 Feb 19, 2024
b933de1
Merge pull request #117 from WE-ARE-RACCOONS/RAC-67
ywj9811 Feb 19, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
5 changes: 2 additions & 3 deletions .github/workflows/CD-develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ jobs:

- name: Create application.yml
run: |
mkdir ./src/main/resources
echo "${{env.APPLICATION}}" > ./src/main/resources/application.yml

- name: Grant execute permission for gradlew
Expand All @@ -60,8 +59,8 @@ jobs:

- name: Build and Push Docker image
run: |
docker build -t ywj9811/postgraduate_devlop:latest .
docker push ywj9811/postgraduate_devlop:latest
docker build -t ywj9811/postgraduate_develop:latest .
docker push ywj9811/postgraduate_develop:latest

- name: Deploy
uses: appleboy/ssh-action@master
Expand Down
77 changes: 77 additions & 0 deletions .github/workflows/CD-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
name: Java CD with Gradle

on:
push:
branches: [ "main" ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest
env :
working-directory: ./
APPLICATION: ${{ secrets.APPLICATION_PROD }}

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'

- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Create application.yml
run: |
echo "${{env.APPLICATION}}" > ./src/main/resources/application.yml

- name: Grant execute permission for gradlew
run: chmod +x gradlew
working-directory: ${{ env.working-directory }}

- name: Build with Gradle
run: ./gradlew build
working-directory: ${{ env.working-directory }}

- name: Cleanup Gradle Cache
if: ${{ always() }}
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties

- name: Login to DockerHub
uses: docker/login-action@v1
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}

- name: Build and Push Docker image
run: |
docker build -t ywj9811/kimseonbae:latest .
docker push ywj9811/kimseonbae:latest

- name: Deploy
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.EC2_SERVER_HOST_PROD }}
username: ${{ secrets.EC2_SERVER_USERNAME }}
key: ${{ secrets.PRIVATE_KEY_PROD }}
envs: GITHUB_SHA
script: |
chmod +x /home/ec2-user/config/deploy.sh
/home/ec2-user/config/deploy.sh
debug: true


52 changes: 52 additions & 0 deletions .github/workflows/CI-develop.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Java CI with Gradle

on:
pull_request:
branches: [ "develop" ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest
env :
working-directory: ./
APPLICATION: ${{ secrets.APPLICATION }}

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'

- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Create application.yml
run: |
echo "${{env.APPLICATION}}" > ./src/main/resources/application.yml

- name: Grant execute permission for gradlew
run: chmod +x gradlew
working-directory: ${{ env.working-directory }}

- name: Build with Gradle
run: ./gradlew build
working-directory: ${{ env.working-directory }}

- name: Cleanup Gradle Cache
if: ${{ always() }}
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
52 changes: 52 additions & 0 deletions .github/workflows/CI-prod.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: Java CI with Gradle

on:
pull_request:
branches: [ "main" ]

permissions:
contents: read

jobs:
build:

runs-on: ubuntu-latest
env :
working-directory: ./
APPLICATION: ${{ secrets.APPLICATION_PROD }}

steps:
- uses: actions/checkout@v2
- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'

- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Create application.yml
run: |
echo "${{env.APPLICATION}}" > ./src/main/resources/application.yml

- name: Grant execute permission for gradlew
run: chmod +x gradlew
working-directory: ${{ env.working-directory }}

- name: Build with Gradle
run: ./gradlew build
working-directory: ${{ env.working-directory }}

- name: Cleanup Gradle Cache
if: ${{ always() }}
run: |
rm -f ~/.gradle/caches/modules-2/modules-2.lock
rm -f ~/.gradle/caches/modules-2/gc.properties
53 changes: 53 additions & 0 deletions .github/workflows/SonarCloud.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
name: SonarCloudScan
on:
pull_request:
branches: [ "develop" ]
jobs:
sonarcloud:
name: SonarCloud
runs-on: ubuntu-latest
env:
working-directory: ./
APPLICATION: ${{ secrets.APPLICATION }}

steps:
- uses: actions/checkout@v3
with:
fetch-depth: 0

- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'adopt'

- name: Cache Gradle packages
uses: actions/cache@v2
with:
path: |
~/.gradle/caches
~/.gradle/wrapper
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
restore-keys: |
${{ runner.os }}-gradle-

- name: Create application.yml
run: |
echo "${{env.APPLICATION}}" > ./src/main/resources/application.yml

- name: Grant execute permission for gradlew
run: chmod +x gradlew
working-directory: ${{ env.working-directory }}

- name: Cache SonarCloud packages
uses: actions/cache@v3
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar

- name: SonarCloud scan
run: ./gradlew sonar --info --stacktrace
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,5 @@ out/
.vscode/

### yml ###
application.yml
application.yml
application-*.yml
4 changes: 4 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
FROM openjdk:17-jdk-alpine3.14
ARG JAR_FILE=./build/libs/postgraduate-0.0.1-SNAPSHOT.jar
COPY ${JAR_FILE} app.jar
ENTRYPOINT ["java","-jar","/app.jar"]
Loading
Loading