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

마지막 산출물용 Pull Request 입니다 #236

Merged
merged 18 commits into from
Nov 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
6472e57
Refactor : ArgumentResolver -> Interceptor로 변경 (#200)
2iedo Nov 8, 2024
d2e8c7d
Feat: 진행중인(대기상태, 요청상태) 포인트 충전, 출금 요청 존재하면 추가 요청 불가 로직 추가 (#206)
zzoe2346 Nov 9, 2024
d0c6e35
Feat: 최소 출금 포인트 설정, 첫 가입시 무료 포인트 적립 (#205)
zzoe2346 Nov 9, 2024
cb3c9c4
HotFix: 포인트 로그 조회에서 content 는 `String` 으로 반환하도록 롤백 (#210)
zzoe2346 Nov 9, 2024
46fb8d9
Feat: 카카오페이로 송금 카카오메시지에 추가 (#208)
GitJIHO Nov 9, 2024
8fb6c0d
HotFix: 보호자의 회원가입때만 환영 포인트 지급하도록 수정 (#212)
zzoe2346 Nov 10, 2024
e5a7981
HotFix: 시니또 가입시 포인트 연관 시키기 (#215)
zzoe2346 Nov 11, 2024
d1d9211
Feat: 관리자 인증 및 인가 기능 구현 (#213)
eunsoni Nov 11, 2024
21e0988
HotFix: 시니또용 카테고리별 가이드라인 조회 검증 로직 수정 (#221)
eunsoni Nov 12, 2024
cfdd709
Refactor: 6차 코드리뷰 반영 (#219)
GitJIHO Nov 12, 2024
169f884
Feat: 콜백 가이드라인 type 추가 (#223)
eunsoni Nov 12, 2024
4d21f97
Refactor: 더미데이터 수정 및 Swagger 조회 편의성을 위한 개선 (#225)
GitJIHO Nov 12, 2024
ec24173
Feat: 배포파일 및 테스트코드 name 분리, 테스트코드 결과 제공, 배포 성공여부 슬랙메세지 전송 (#228)
GitJIHO Nov 13, 2024
f1fbed1
Fix: 포인트 로그관련 더미데이터 각 유저의 역할에 맞는 로그가 남도록 수정 (#230)
zzoe2346 Nov 13, 2024
e96a130
Deploy: 더미데이터로의 초기화 방지용 수정 (#232)
GitJIHO Nov 13, 2024
dad2e4a
Feat: 최종프로젝트 심사를 위한 관리자 페이지 계정정보 추가 (#235)
eunsoni Nov 15, 2024
4afeb64
Docs: README.md 작성 (#233)
zzoe2346 Nov 15, 2024
eb18588
Deploy: cors 설정 (#238)
zzoe2346 Nov 15, 2024
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
20 changes: 17 additions & 3 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,30 @@ jobs:
runs-on: ubuntu-latest

steps:
- name: Checkout code
- name: 📥 Checkout Repository
uses: actions/checkout@v4

- name: Set up SSH
- name: 🔐 Set Up SSH Authentication
uses: webfactory/[email protected]
with:
ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }}

- name: Run deployment script on server
- name: 🚀 Run Deployment Script on Server
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
run: |
ssh -o StrictHostKeyChecking=no ubuntu@${{ secrets.SERVER_IP }} "SLACK_WEBHOOK_URL=${{ secrets.SLACK_WEBHOOK_URL }} bash /home/ubuntu/deploy.sh"
# 서버의 deploy.sh 스크립트를 통해 무중단 배포를 진행합니다.
# 무중단 배포 성공 시 Slack 알림을 전송하도록 설정되어 있습니다.

- name: 📢 Notify Deployment Status on Slack
if: always()
env:
SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
run: |
if [ $? -eq 0 ]; then
curl -X POST -H 'Content-type: application/json' --data '{"text": "🎉 *최종 배포 성공* - 배포가 성공적으로 완료되었습니다!"}' $SLACK_WEBHOOK_URL
else
curl -X POST -H 'Content-type: application/json' --data '{"text": "⚠️ *배포 실패* - 배포 과정에서 문제가 발생했습니다."}' $SLACK_WEBHOOK_URL
fi
# 배포 스크립트가 성공적으로 실행되었는지 여부를 Slack으로 알립니다.
23 changes: 18 additions & 5 deletions .github/workflows/testcode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ on:
pull_request:
branches:
- Weekly
permissions: write-all

jobs:
test:
Expand Down Expand Up @@ -33,18 +34,17 @@ jobs:
--health-interval 10s
--health-timeout 5s
--health-retries 5

steps:
- name: Checkout code
- name: 📥 Checkout Repository
uses: actions/checkout@v4

- name: Set up JDK
- name: Set up JDK
uses: actions/setup-java@v4
with:
java-version: '21'
distribution: 'temurin'

- name: Run Tests
- name: 🧪 Run Tests and Generate Results
env:
SPRING_DATASOURCE_URL: ${{ secrets.MYSQL_URL }}
SPRING_DATASOURCE_USERNAME: ${{ secrets.MYSQL_USERNAME }}
Expand All @@ -54,4 +54,17 @@ jobs:
SLACK_NOTICE_WEBHOOK_URL: ${{ secrets.SLACK_NOTICE_WEBHOOK_URL }}
SLACK_CHARGE_REQUEST_URL: ${{ secrets.SLACK_CHARGE_REQUEST_URL }}
SLACK_WITHDRAW_REQUEST_URL: ${{ secrets.SLACK_WITHDRAW_REQUEST_URL }}
run: ./gradlew test
run: ./gradlew clean build -Dspring.profiles.active=test

- name: 📑 Publish Test Results as PR Comment
uses: EnricoMi/publish-unit-test-result-action@v1
if: always()
with:
files: '**/build/test-results/test/TEST-*.xml'

- name: ✅ Add Check Comments for Failed Code Lines
uses: mikepenz/action-junit-report@v3
if: always()
with:
report_paths: '**/build/test-results/test/TEST-*.xml'
token: ${{ github.token }}
Loading