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

[feat] 모임 생성참여 구현 #5

Merged
merged 42 commits into from
Jan 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
1ff471a
[feat] #3 모임 관련 엔티티 생성
ehs208 Dec 30, 2024
596d56f
[feat] #3 JPA 레포지토리 생성
ehs208 Dec 30, 2024
1c72ae6
[mod] #3 BaseTimeEntity 직접 구현
ehs208 Dec 30, 2024
15c3bff
[mod] #3 시큐리티 전체 허용
ehs208 Dec 31, 2024
e73b8b5
[feat] #3 모임 생성 구현
ehs208 Dec 31, 2024
dc5a334
[feat] #3 CustomUserDetails 생성
ehs208 Dec 31, 2024
62b100f
[feat] #3 미팅 생성자 컬럼 생성
ehs208 Dec 31, 2024
a438e5d
[feat] #3 미팅 참여제한 생성자 생성
ehs208 Dec 31, 2024
f146ee9
[mod] #3 유효성 검증 로직 추가
ehs208 Jan 1, 2025
ac97b6e
[refactor] #3 변수명 변경
ehs208 Jan 1, 2025
f8a1865
[refactor] #3 불필요 메소드 주석처리
ehs208 Jan 1, 2025
3888250
[refactor] #3 정적 팩토리 메소드
ehs208 Jan 1, 2025
2ae004a
[mod] #3 성별 값 변경
ehs208 Jan 1, 2025
4d2d8e5
[feat] #3 예외처리
ehs208 Jan 1, 2025
40bd637
[feat] #3 중복되는 부분 리팩토링
ehs208 Jan 1, 2025
a126040
[mod] #3 모임 소유자 컬럼 제거
ehs208 Jan 1, 2025
247e9e5
[mod] #3 타입 수정
ehs208 Jan 1, 2025
6e34836
[mod] #3 에러 코드 반환값 수정
ehs208 Jan 1, 2025
e14d040
[feat] #3 모임 참가 기능 구현
ehs208 Jan 1, 2025
a954b97
[feat] #3 예외처리 추가
ehs208 Jan 1, 2025
ac0fdd7
[refactor] #3 메소드명 변경
ehs208 Jan 1, 2025
2422c40
[del] #3 build 폴더 Git 트래킹 제외
ehs208 Jan 1, 2025
ddf3915
[chore] #3 OAUTH, JWT 관련 환경변수 생성
ehs208 Jan 1, 2025
9d95c23
[feat] #3 밥, 술 모임 검증 플래그 추가
ehs208 Jan 1, 2025
3b31cd3
[feat] #3 오프라인 모임 목록 조회
ehs208 Jan 1, 2025
01c1221
[refactor] #3 오탈자 수정
ehs208 Jan 1, 2025
c901cab
[refactor] #3 import문, 줄간격 등 전체 코드 리팩토링
ehs208 Jan 1, 2025
deca996
[feat] #3 성별 제한 예외처리 구현
ehs208 Jan 2, 2025
b9ffdb9
[feat] #3 배달 마감시간 로직 변경
ehs208 Jan 2, 2025
535363f
[mod] #3 성별제한 설명 수정
ehs208 Jan 2, 2025
fd089e6
[feat] #3 모임 상세 조회 기능 구현
ehs208 Jan 2, 2025
1e75420
[chore] #3 GA스크립트 오타 수정
ehs208 Jan 2, 2025
2e439ee
[chore] #3 GA스크립트 수정
ehs208 Jan 2, 2025
af5514e
[chore] #3 PR시에도 YML 파일 생성
ehs208 Jan 2, 2025
a10644a
[chore] #3 PR시에도 YML 파일 생성
ehs208 Jan 2, 2025
b52f594
[feat] #3 동시성 문제 관련 테스트코드 작성
ehs208 Jan 2, 2025
492a8c0
[chore] #3 swagger 버전 변경
ehs208 Jan 2, 2025
23dbc5a
[chore] #3 accesslevel 설정
ehs208 Jan 2, 2025
ed87442
[mod] #3 테이블 구분 컬럼 수정
ehs208 Jan 2, 2025
1ab7ef4
[mod] #3 조건 수정
ehs208 Jan 2, 2025
43f5b43
[mod] #3 오타 수정
ehs208 Jan 2, 2025
d41e56f
[mod] #3 대소문자 수정
ehs208 Jan 2, 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
37 changes: 30 additions & 7 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ jobs:
# 환경별 yml 파일 생성(1) - application.yml
- name: make application.yml
if: |
contains(github.ref, 'dev')
contains(github.ref, 'dev') ||
(github.event_name == 'pull_request')
run: |
mkdir ./src/main/resources # resources 폴더 생성
cd ./src/main/resources # resources 폴더로 이동
Expand All @@ -33,14 +34,36 @@ jobs:

# 환경별 yml 파일 생성(2) - dev
- name: make application-dev.yml
if: contains(github.ref, 'dev')
if: |
contains(github.ref, 'dev') ||
(github.event_name == 'pull_request')
run: |
cd ./src/main/resources
touch ./application-dev.yml
echo "${{ secrets.YML_DEV }}" > ./application-dev.yml
shell: bash
- name: Grant execute permission for gradlew
run: chmod +x gradlew

# 환경별 yml 파일 생성(3) - oauth
- name: make application-oauth.yml
if: |
contains(github.ref, 'dev') ||
(github.event_name == 'pull_request')
run: |
cd ./src/main/resources
touch ./application-oauth.yml
echo "${{ secrets.YML_OAUTH }}" > ./application-oauth.yml
shell: bash

# 환경별 yml 파일 생성(3) - jwt
- name: make application-jwt.yml
if: |
contains(github.ref, 'dev') ||
(github.event_name == 'pull_request')
run: |
cd ./src/main/resources
touch ./application-jwt.yml
echo "${{ secrets.YML_JWT }}" > ./application-jwt.yml
shell: bash

# Gradle Build (test는 제외)
- name: Build with Gradle
Expand All @@ -62,23 +85,23 @@ jobs:

deploy:
runs-on: ubuntu-latest
needs: build
needs: build
steps:
- name: Configure AWS Credentials
uses: aws-actions/configure-aws-credentials@v1
with:
aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
aws-region: ap-northeast-2

- name: Get Public IP
id: ip
uses: haythem/[email protected]

- name: Add GitHub Actions IP to Security Group
run: |
aws ec2 authorize-security-group-ingress --group-id ${{ secrets.AWS_SG_ID }} --protocol tcp --port 22 --cidr ${{ steps.ip.outputs.ipv4 }}/32

- name: Deploy to EC2
uses: appleboy/[email protected]
with:
Expand Down
56 changes: 28 additions & 28 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,49 +1,49 @@
plugins {
id 'java'
id 'org.springframework.boot' version '3.4.1'
id 'io.spring.dependency-management' version '1.1.7'
id 'java'
id 'org.springframework.boot' version '3.4.1'
id 'io.spring.dependency-management' version '1.1.7'
}

group = 'com.example'
version = '0.0.1-SNAPSHOT'

java {
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
toolchain {
languageVersion = JavaLanguageVersion.of(17)
}
}

configurations {
compileOnly {
extendsFrom annotationProcessor
}
compileOnly {
extendsFrom annotationProcessor
}
}

repositories {
mavenCentral()
mavenCentral()
}

dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
implementation 'com.auth0:java-jwt:4.2.1'
implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final'
implementation 'jakarta.validation:jakarta.validation-api:3.0.2'
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
implementation 'com.auth0:java-jwt:4.2.1'
implementation 'org.hibernate.validator:hibernate-validator:8.0.0.Final'
implementation 'jakarta.validation:jakarta.validation-api:3.0.2'

runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5'
runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5'
compileOnly 'org.projectlombok:lombok'
runtimeOnly 'com.mysql:mysql-connector-j'
annotationProcessor 'org.projectlombok:lombok'
testImplementation 'org.springframework.boot:spring-boot-starter-test'
testImplementation 'org.springframework.security:spring-security-test'
testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
}

tasks.named('test') {
useJUnitPlatform()
useJUnitPlatform()
}
Loading
Loading