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

10주차 개발 내역 정리 #136

Merged
merged 82 commits into from
Nov 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
82 commits
Select commit Hold shift + click to select a range
3d2b364
feat: Add CORS configs
jagaldol Nov 5, 2023
8ec552c
CORS 설정 하드코딩하여 직접 추가 (#114)
jagaldol Nov 5, 2023
079a020
s3 관련 프록시 설정 및 프론트 배포 (#118)
sososo0 Nov 6, 2023
fe07995
메시지 테스트 및 API문서화 완료 (#116)
yunzae Nov 6, 2023
6d3c8c9
fix: Remove join fetch
xcelxlorx Nov 6, 2023
004556e
fix: Add additional query to get district
xcelxlorx Nov 6, 2023
8773397
feat: Add check logic for duplicate user name
xcelxlorx Nov 6, 2023
48107c4
feat: Add try-catch to update profile
xcelxlorx Nov 6, 2023
1c88dc3
feat: Add file exception for missing file
xcelxlorx Nov 6, 2023
1ea3361
refactor: Remove duplicate codes
xcelxlorx Nov 6, 2023
6de57f9
test: Add Post-getPosts test
yunzae Nov 6, 2023
473177c
fix: Add missing request information
yunzae Nov 6, 2023
f3822af
docs: Add api docs for getPosts
yunzae Nov 6, 2023
a90bd17
test: Add post-getPost test
yunzae Nov 6, 2023
4a0864a
참여 기록 조회, 프로필 수정 버그 수정 (#121)
jagaldol Nov 6, 2023
7edc2ee
docs: Add docs for getPost
yunzae Nov 6, 2023
9c7c9f4
refactor: Extract allowedExtensions to private final List
jagaldol Nov 6, 2023
2211763
허용된 파일 확장자 리스트를 상수로 관리 (#122)
jagaldol Nov 6, 2023
846f4b7
test: Add getUserParticipationRecords test
yunzae Nov 6, 2023
ea211be
fix: Modify score read logic
sososo0 Nov 6, 2023
8935e8c
docs: Add getUserParticipationRecords api doc
yunzae Nov 6, 2023
0a2a497
fix: Modify score related update and delete
sososo0 Nov 6, 2023
c68ba5d
fix: Add queryString didn't received situation in get score
sososo0 Nov 6, 2023
6425404
fix: Apply findScores in readScores
sososo0 Nov 6, 2023
8fa3b79
점수 관련 버그 수정 (#124)
sososo0 Nov 6, 2023
5fe56b0
test: Init ScoreControllerTest
jagaldol Nov 6, 2023
76b9c09
test: Add Applicant test - getScores
jagaldol Nov 6, 2023
b32a2b6
test: Add Applicant test - createScore
jagaldol Nov 6, 2023
629355d
test: Add Applicant test - updateScore
jagaldol Nov 6, 2023
d05bfe1
test: Add Applicant test - deleteScoreImage
jagaldol Nov 6, 2023
8150783
test: Add Applicant test - deleteScore
jagaldol Nov 6, 2023
2efa9ab
test: Add queryParameter userId to getScores
jagaldol Nov 6, 2023
c93a7e3
test: Init ApplicantControllerTest
jagaldol Nov 6, 2023
504718c
test: Add Applicant test - getApplicants
jagaldol Nov 6, 2023
df5245e
test: Add Applicant test - create
jagaldol Nov 6, 2023
c32b800
test: Add Applicant test - accept
jagaldol Nov 6, 2023
c2a51d8
test: Add Applicant test - reject
jagaldol Nov 6, 2023
5123504
test: Add Applicant test - checkStatus
jagaldol Nov 6, 2023
cd34a31
test: Add createPost test
yunzae Nov 6, 2023
e6857dc
hotfix: Edit profile name
jagaldol Nov 6, 2023
f7dfb89
docs: Add createPost api doc
yunzae Nov 6, 2023
aea4e84
test: Add updatePost test
yunzae Nov 6, 2023
c29cb72
docs: Add updatePost api doc
yunzae Nov 6, 2023
8c21e5d
fix: Update Delete Post API
yunzae Nov 7, 2023
7809bfd
doc: Add deletePost API doc
yunzae Nov 7, 2023
fe77f6d
test: Add patchPost API test
yunzae Nov 7, 2023
ec37254
docs: Add patchPost API doc
yunzae Nov 7, 2023
915778d
fix: Change postId in delete test
yunzae Nov 7, 2023
ed9ae85
test: Add update password API Test
yunzae Nov 7, 2023
6129b78
docs: Add update password API doc
yunzae Nov 7, 2023
1a1abee
test: Add sendVerificationForPasswordReset API test
yunzae Nov 7, 2023
8651812
docs: Add sendVerificationForPasswordReset API doc
yunzae Nov 7, 2023
321b1ab
test: Add confirmEmailAndSendTempPassword API test
yunzae Nov 7, 2023
34ac66f
docs: Add confirmEmailAndSendTempPassword API docs
yunzae Nov 7, 2023
6740822
fix: Update code about docs
yunzae Nov 7, 2023
b8030a3
fix: Change responseDTO name in docs
yunzae Nov 7, 2023
3dcc975
fix: Enable to pass test and Add Insufficient Information
jagaldol Nov 7, 2023
32ae707
fix: Edit typo
jagaldol Nov 7, 2023
2458925
Post 테스트 및 문서화 완료 (#126)
jagaldol Nov 7, 2023
14de685
ScoreController api 문서화 완료 (#125)
jagaldol Nov 7, 2023
a5ce0af
ApplicantController api 문서화 완료 (#120)
jagaldol Nov 7, 2023
b174ba9
비밀번호 API 테스트 및 문서화 완료 (#127)
jagaldol Nov 7, 2023
a5fccb0
fix: Update User Permission to User When join
jagaldol Nov 7, 2023
de17fe3
chore: Create CI Pipeline
jagaldol Nov 8, 2023
3262205
chore: Create nohup.sh
jagaldol Nov 8, 2023
bb63b99
chore: Create deploy.yml
jagaldol Nov 8, 2023
23a567c
chore:Add run permission nohup.sh
Nov 8, 2023
9d1b51a
chore: Add set env variable of continuous deployment
jagaldol Nov 8, 2023
dbbaae0
CI/CD 파이프라인 구축 (#129)
jagaldol Nov 9, 2023
007d2ca
fix: Edit typo in directory name
jagaldol Nov 9, 2023
b7b2f02
workflows 폴더명 수정 (#130)
jagaldol Nov 9, 2023
37faf87
SMTP를 통한 이메일 인증 구현 (#133)
sososo0 Nov 9, 2023
d76ba95
fix: Modify file name
sososo0 Nov 10, 2023
ec4a354
fix: Change frontend docker file
sososo0 Nov 10, 2023
07a678f
fix: Modify build filename method
sososo0 Nov 10, 2023
dd46e35
fix: Change frontend docker image
sososo0 Nov 10, 2023
2c780c1
리드미 작성 (#131)
yunzae Nov 10, 2023
db6dba4
fix: Remove enter
sososo0 Nov 10, 2023
1fb7c98
파일명 작성 함수 수정 (#134)
sososo0 Nov 10, 2023
d5157ea
fix: Modify access token exp
jagaldol Nov 11, 2023
75861f8
fix: delete refresh when logout
jagaldol Nov 11, 2023
d4ea44b
토큰 관련 이슈 해결 (#135)
jagaldol Nov 11, 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
1 change: 1 addition & 0 deletions .env.example
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ MYSQL_USERNAME="bungae"
MYSQL_PASSWORD="0000"
GOOGLE_MAP_API_KEY="API_KEY"
SSL_KEY_PASSWORD="bungae"
FLASK_MAIL_SERVER="http://localhost:5000"
23 changes: 23 additions & 0 deletions .github/workflows/build_test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
name: Java CI with Gradle

on:
pull_request:
branches:
- 'master'
- 'develop'
- 'weekly/**'

jobs:
build-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: '17'
distribution: 'temurin'
- name: Grant execute permission for gradlew
run: chmod +x gradlew
- name: Build with Gradle
run: ./gradlew build
31 changes: 31 additions & 0 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
name: Java CD on AWS EC2 with SSH Connection

on:
push:
branches:
- 'master'
- 'develop'
- 'weekly/**'

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- name: SSH Remote Commands
uses: appleboy/[email protected]
with:
host: ${{ secrets.REMOTE_IP }}
username: ${{ secrets.REMOTE_USER }}
password: ${{ secrets.SSH_PASSWORD }}
port: 22
script: |
cd Team3_BE
git pull
./gradlew clean build || exit 1 # 빌드 실패 시 스크립트 종료

# 환경변수 설정
set -a
source .env
set +a

./nohup.sh # 기존 서버 종료 후 백그라운드로 서버 실행
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -117,3 +117,4 @@ open-api-3.0.1.json

goorm.manifest

aws/
9 changes: 6 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@ WORKDIR project
# Spring 소스 코드를 이미지에 복사
COPY . .

# DATABASE_URL을 환경 변수로 삽입
ENV DATABASE_URL=jdbc:mysql://mysql/bungaebowling_db

# API URL 삽입
ENV API_SERVER_URL=https://ka02fa9a0d9a2a.user-app.krampoline.com

# gradle 빌드 시 proxy 설정을 gradle.properties에 추가
RUN echo "systemProp.http.proxyHost=krmp-proxy.9rum.cc\nsystemProp.http.proxyPort=3128\nsystemProp.https.proxyHost=krmp-proxy.9rum.cc\nsystemProp.https.proxyPort=3128" > /root/.gradle/gradle.properties

Expand All @@ -25,9 +31,6 @@ RUN ./gradlew clean build
FROM builder AS final
COPY --from=builder /home/gradle/project/build/libs/server-0.0.1.jar .

# DATABASE_URL을 환경 변수로 삽입
ENV DATABASE_URL=jdbc:mysql://mysql/bungaebowling_db

# yml 선택
ENV PROFILE deploy

Expand Down
Loading