diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..d5db2565 Binary files /dev/null and b/.DS_Store differ diff --git "a/.github/ISSUE_TEMPLATE/\354\204\261\353\212\245 \353\266\204\354\204\235.md" "b/.github/ISSUE_TEMPLATE/\354\204\261\353\212\245 \353\266\204\354\204\235.md" new file mode 100644 index 00000000..11040ded --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\354\204\261\353\212\245 \353\266\204\354\204\235.md" @@ -0,0 +1,97 @@ +--- +name: 성능 테스트 및 개선 리포트 +about: 성능 병목 테스트 및 개선 과정을 기록합니다. +title: "[📈 성능 개선] OOO 기능의 부하 테스트 및 최적화" +labels: "성능개선, 부하테스트, 최적화" +assignees: "" +--- + +## 🎯 테스트 시나리오 정의 + +> 어떤 기능에 대해 어떤 상황을 가정하여 성능 테스트를 진행할 것인지 구체적으로 작성합니다. + +- **테스트 대상 API**: `[HTTP Method] /api/v1/...` +- **핵심 로직**: (예: 게시글 목록 조회, 복잡한 조인 쿼리 포함) +- **부하 테스트 도구**: (예: nGrinder, JMeter, k6) +- **테스트 환경**: (예: 로컬 MacBook Pro (M1, 16GB), DB는 Docker, 애플리케이션 메모리 1GB) + +--- + +## 📊 1차 성능 측정 결과 (개선 전) + +> 개선 작업을 진행하기 전의 성능 지표를 기록합니다. (Before) + +| 지표 (Metric) | 측정 값 (Value) | 단위 (Unit) | +|:----------------------------|:-------------|:----------| +| **VUser (가상 사용자 수)** | | 명 | +| **TPS (초당 트랜잭션 수)** | | tps | +| **평균 응답 시간 (Avg. Latency)** | | ms | +| **최대 응답 시간 (Max. Latency)** | | ms | +| **에러율 (Error Rate)** | | % | + +**[nGrinder, JMeter 등 결과 그래프 스크린샷을 여기에 첨부해 주세요]** + + +--- + +## 🧐 병목 지점 분석 및 가설 + +> 1차 측정 결과를 바탕으로 어떤 부분에서 병목이 발생하고 있는지 분석하고, 원인에 대한 가설을 세웁니다. + +**가설**: +(예: N+1 쿼리 문제로 인해 DB 조회 시간이 과도하게 소요될 것으로 추정됨.) + +**근거**: + +- [ ] APM(Pinpoint, Sentry 등)에서 특정 메서드 지연 확인 +- [ ] 느린 쿼리 로그(Slow Query Log)에서 해당 쿼리 발견 +- [ ] 높은 CPU / Memory 사용량 확인 (구간: ) +- [ ] 코드 리뷰 (비효율적인 로직, 불필요한 API 호출 등) +- **기타**: + +--- + +## 🛠️ 개선 전략 및 실행 + +> 위 가설을 바탕으로 어떤 방식으로 문제를 해결할 것인지 구체적인 전략을 작성하고 실행합니다. + +**전략**: +(예: JPA의 Fetch Join을 사용하여 N+1 문제를 해결. 또는, 자주 변경되지 않는 데이터에 캐싱(Redis, Caffeine)을 적용.) + +**관련 PR**: + +- #(PR 번호) + +--- + +## 📊 2차 성능 측정 결과 (개선 후) + +> 개선 작업 후, 1차 측정과 동일한 조건으로 다시 성능을 측정하여 기록합니다. (After) + +| 지표 (Metric) | 측정 값 (Value) | 단위 (Unit) | +|:----------------------------|:-------------|:----------| +| **VUser (가상 사용자 수)** | | 명 | +| **TPS (초당 트랜잭션 수)** | | tps | +| **평균 응답 시간 (Avg. Latency)** | | ms | +| **최대 응답 시간 (Max. Latency)** | | ms | +| **에러율 (Error Rate)** | | % | + +**[개선 후 결과 그래프 스크린샷을 여기에 첨부해 주세요]** + + +--- + +## ✨ 최종 결론 + +> 개선 전/후 지표를 비교하여 개선 효과를 정량적으로 요약하고, 결론을 작성합니다. + +**개선 효과 요약**: + +- **TPS**: `(개선 전 값)` -> `(개선 후 값)` **( 약 O 배 증가 )** +- **평균 응답 시간**: `(개선 전 값)` -> `(개선 후 값)` **( 약 O % 감소 )** + +**결론**: +(예: Fetch Join 적용으로 N+1 문제를 해결하여 DB I/O를 크게 줄였고, 그 결과 TPS는 2.5배 증가, 평균 응답 시간은 60% 감소하는 효과를 확인했습니다.) + +**추가 논의 사항**: +(예: 향후 트래픽 증가 시 스케일 아웃 전략 필요, 캐시 동기화 문제에 대한 추가 논의 필요 등) \ No newline at end of file diff --git a/.github/workflows/docker-ci.yaml b/.github/workflows/docker-ci.yaml index a876a80b..55c80009 100644 --- a/.github/workflows/docker-ci.yaml +++ b/.github/workflows/docker-ci.yaml @@ -2,12 +2,9 @@ name: Docker CI/CD on: pull_request: - branches: - - 'develop' + branches: [ develop ] push: - branches: - - 'develop' - + branches: [ develop ] workflow_dispatch: jobs: @@ -24,8 +21,24 @@ jobs: java-version: '21' distribution: 'temurin' + - name: Cache Gradle files + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle-${{ runner.os }}- + + - name: Clone external repo with jar into libs/ + run: | + mkdir -p libs + git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/mosu-dev/mosu-kmc-jar.git temp-jar + cp temp-jar/*.jar libs/ + - name: Build with Gradle - run: ./gradlew clean build -x test + run: ./gradlew build -x test - name: Log in to DockerHub uses: docker/login-action@v3 @@ -34,9 +47,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Build Docker image - run: | - docker build -t kangtaehyun1107/mosu-server:${{ github.sha }} . - + run: docker build -t kangtaehyun1107/mosu-server:${{ github.sha }} . + working-directory: - name: Push Docker image - run: | - docker push kangtaehyun1107/mosu-server:${{ github.sha }} \ No newline at end of file + run: docker push kangtaehyun1107/mosu-server:${{ github.sha }} diff --git a/.github/workflows/docker-depoly.yaml b/.github/workflows/docker-depoly.yaml index 8ac4f4b7..fb544e6e 100644 --- a/.github/workflows/docker-depoly.yaml +++ b/.github/workflows/docker-depoly.yaml @@ -22,10 +22,9 @@ jobs: script: | cd /home/ubuntu/mosu - echo "${{ secrets.env }}" > .env.prod + echo "${{ secrets.ENV_BLUE }}" > .env.blue + echo "${{ secrets.ENV_GREEN }}" > .env.green - echo "APP_IMAGE_VERSION=${{ github.sha }}" >> .env.prod - - sudo docker compose pull - sudo docker compose down - sudo docker compose -f docker-compose.yml --env-file .env.prod up -d --build + echo "APP_IMAGE_VERSION=${{ github.sha }}" >> .env.blue + echo "APP_IMAGE_VERSION=${{ github.sha }}" >> .env.green + ./deploy.sh diff --git a/.github/workflows/docker-pr-build.yaml b/.github/workflows/docker-pr-build.yaml new file mode 100644 index 00000000..c109a22f --- /dev/null +++ b/.github/workflows/docker-pr-build.yaml @@ -0,0 +1,38 @@ +name: Docker PR build + +on: + pull_request: + branches: [ develop ] + +jobs: + build-and-deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout source + uses: actions/checkout@v3 + + - name: Set up JDK 21 + uses: actions/setup-java@v3 + with: + java-version: '21' + distribution: 'temurin' + + - name: Cache Gradle files + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: gradle-${{ runner.os }}-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + gradle-${{ runner.os }}- + + - name: Clone external repo with jar into libs/ + run: | + mkdir -p libs + git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/mosu-dev/mosu-kmc-jar.git temp-jar + cp temp-jar/*.jar libs/ + + - name: Build with Gradle + run: ./gradlew build -x test diff --git a/.github/workflows/self-depoly.yaml b/.github/workflows/self-depoly.yaml new file mode 100644 index 00000000..20a1ebf8 --- /dev/null +++ b/.github/workflows/self-depoly.yaml @@ -0,0 +1,24 @@ +name: Docker CI/CD - Deploy + +on: + workflow_dispatch: + branches: + - test +jobs: + deploy: + runs-on: self-hosted + + steps: + - name: Deploy via SSH + run: | + cd ~/mosu-server + + echo "${{ secrets.TEST_ENV_BLUE }}" > .env.blue + echo "${{ secrets.TEST_ENV_GREEN }}" > .env.green + echo "APP_IMAGE_VERSION=${{ github.sha }}" >> .env.blue + echo "APP_IMAGE_VERSION=${{ github.sha }}" >> .env.green + sudo docker stop $(sudo docker ps -aq) || true + sudo docker rm $(sudo docker ps -aq) || true + echo "Stopping all containers..." + + sudo ./deploy.sh diff --git a/.gitignore b/.gitignore index b9ef67ee..99e9f3dd 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/ !gradle/wrapper/gradle-wrapper.jar !**/src/main/**/build/ !**/src/test/**/build/ +src/main/generated ### STS ### .apt_generated @@ -37,4 +38,8 @@ out/ .vscode/ docker-compose/.env -docker-compose/.env.local \ No newline at end of file +docker-compose/.env.local +docker-compose/.env.prod + +/logs/** +/libs/** \ No newline at end of file diff --git a/Dockerfile b/Dockerfile index be8c34a3..c4084ee4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM openjdk:21-jdk -ARG JAR_FILE=build/libs/*.jar -ADD ${JAR_FILE} app.jar -ENTRYPOINT ["java", "-Duser.timezone=GMT+9", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.jar"] \ No newline at end of file +FROM amazoncorretto:21 +COPY build/libs/*SNAPSHOT.war app.war + +ENTRYPOINT ["java", "-Duser.timezone=GMT+9", "-Djava.security.egd=file:/dev/./urandom", "-jar", "/app.war"] \ No newline at end of file diff --git a/build.gradle b/build.gradle index f9c4143b..99ddb470 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.4.5' id 'io.spring.dependency-management' version '1.1.7' + id 'war' } group = 'life.mosu' @@ -24,7 +25,7 @@ repositories { } dependencies { - + implementation fileTree(dir: 'libs', include: ['*.jar']) implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springframework.boot:spring-boot-starter-validation' @@ -38,8 +39,12 @@ dependencies { testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + // 인증사 관련 의존성 + implementation 'javax.servlet:jstl:1.2' + implementation "org.apache.tomcat.embed:tomcat-embed-jasper" + // swagger - implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0" + implementation "org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.9" // jwt implementation 'io.jsonwebtoken:jjwt-api:0.11.5' @@ -58,9 +63,17 @@ dependencies { implementation 'org.flywaydb:flyway-mysql' runtimeOnly 'com.mysql:mysql-connector-j' + // Testcontainers + testImplementation 'org.springframework.boot:spring-boot-testcontainers:3.3.5' + testImplementation 'org.testcontainers:testcontainers:1.19.3' + testImplementation 'org.testcontainers:junit-jupiter:1.19.3' + testImplementation 'org.testcontainers:mysql:1.20.0' + + // security implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' + implementation 'com.github.ben-manes.caffeine:caffeine:3.1.8' // aws implementation platform('software.amazon.awssdk:bom:2.20.0') @@ -85,6 +98,31 @@ dependencies { // poi-excel implementation 'org.apache.poi:poi-ooxml:5.4.0' + + implementation 'org.springframework.boot:spring-boot-starter-webflux' + + runtimeOnly 'com.h2database:h2' + + testImplementation 'org.springframework.boot:spring-boot-testcontainers:3.3.5' + testImplementation 'org.testcontainers:testcontainers:1.19.3' + testImplementation 'org.testcontainers:junit-jupiter:1.19.3' + testImplementation 'org.testcoscntainers:mysql:1.20.0' + + annotationProcessor "org.springframework.boot:spring-boot-configuration-processor" + + implementation 'org.apache.commons:commons-pool2:2.12.1' + + //scheduler + implementation 'org.springframework.boot:spring-boot-starter-quartz' + + //타임리프 + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' +} + +configurations.configureEach { + resolutionStrategy { + force 'org.apache.commons:commons-lang3:3.18.0' + } } tasks.named('test') { diff --git a/deploy.sh b/deploy.sh new file mode 100644 index 00000000..31fef75d --- /dev/null +++ b/deploy.sh @@ -0,0 +1,77 @@ +#!/bin/bash + +BLUE_ENV=".env.blue" +GREEN_ENV=".env.green" +BASE_COMPOSE="docker-compose.base.yml" +BLUE_COMPOSE="docker-compose.blue.yml" +GREEN_COMPOSE="docker-compose.green.yml" +if sudo docker ps --filter "name=mosu-server-blue" --format '{{.Names}}' | grep -q "mosu-server-blue"; then + CURRENT_ENV=$BLUE_ENV + CURRENT_CONTAINER="mosu-server-blue" +elif sudo docker ps --filter "name=mosu-server-green" --format '{{.Names}}' | grep -q "mosu-server-green"; then + CURRENT_ENV=$GREEN_ENV + CURRENT_CONTAINER="mosu-server-green" +else + echo "실행 중인 컨테이너가 없습니다." + exit 1 +fi +CURRENT_PORT=$(grep SPRING_PORT $CURRENT_ENV | cut -d '=' -f2) + +echo "현재 포트 : $CURRENT_PORT" +if [ "$CURRENT_PORT" == "8081" ]; then + TARGET_PORT=8082 + TARGET_ENV=$GREEN_ENV + TARGET_COMPOSE=$GREEN_COMPOSE + PREV_CONTAINER="mosu-server-blue" +else + TARGET_PORT=8081 + TARGET_ENV=$BLUE_ENV + TARGET_COMPOSE=$BLUE_COMPOSE + PREV_CONTAINER="mosu-server-green" +fi + +echo "=== 배포 대상 ===" +echo "포트: $TARGET_PORT" +echo "env 파일: $TARGET_ENV" +echo "compose 파일: $TARGET_COMPOSE" +echo "이전 컨테이너: $PREV_CONTAINER" + +sudo docker compose -f $BASE_COMPOSE -f $TARGET_COMPOSE --env-file $TARGET_ENV up -d --build + +check_heartbeat() { + local url=$1 + local retries=100 + local wait=3 + local count=0 + + while [ $count -lt $retries ]; do + if curl --silent --fail "$url" > /dev/null; then + return 0 + fi + echo "헬스 체크 실패, 재시도 중... ($((count+1))/$retries)" + sleep $wait + ((count++)) + done + return 1 +} + +HEALTH_URL="http://localhost:${TARGET_PORT}/api/v1/actuator/health" +echo "새 컨테이너 헬스 체크 시작: $HEALTH_URL" + +if ! check_heartbeat "$HEALTH_URL"; then + echo "❌ 새 컨테이너 헬스 체크 실패. 배포 중단." + exit 1 +fi + +echo "✅ 새 컨테이너 헬스 체크 성공." + +sudo sed -i -E "s|(reverse_proxy /api/v1/\* localhost:)[0-9]+|\1${TARGET_PORT}|" /etc/caddy/Caddyfile +sudo systemctl reload caddy +echo "Caddy 라우팅 ${TARGET_PORT} 로 변경 완료." + +echo "이전 컨테이너 $PREV_CONTAINER 중지 및 제거" +sudo docker stop $PREV_CONTAINER || true +sudo docker rm $PREV_CONTAINER || true + + +echo "✅ 배포 완료! 현재 운영 포트: $TARGET_PORT" diff --git a/gradle/.DS_Store b/gradle/.DS_Store new file mode 100644 index 00000000..ac242498 Binary files /dev/null and b/gradle/.DS_Store differ diff --git a/src/.DS_Store b/src/.DS_Store new file mode 100644 index 00000000..6afdc204 Binary files /dev/null and b/src/.DS_Store differ diff --git a/src/main/.DS_Store b/src/main/.DS_Store new file mode 100644 index 00000000..51ecff9d Binary files /dev/null and b/src/main/.DS_Store differ diff --git a/src/main/java/life/mosu/mosuserver/MosuServerApplication.java b/src/main/java/life/mosu/mosuserver/MosuServerApplication.java index 31446349..ea49db4f 100644 --- a/src/main/java/life/mosu/mosuserver/MosuServerApplication.java +++ b/src/main/java/life/mosu/mosuserver/MosuServerApplication.java @@ -9,5 +9,4 @@ public class MosuServerApplication { public static void main(String[] args) { SpringApplication.run(MosuServerApplication.class, args); } - } diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminApplicationService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminApplicationService.java new file mode 100644 index 00000000..56a78b42 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/admin/AdminApplicationService.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.application.admin; + +import java.util.List; +import life.mosu.mosuserver.domain.admin.repository.ApplicationQueryRepository; +import life.mosu.mosuserver.presentation.admin.dto.ApplicationExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; +import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminApplicationService { + + private final ApplicationQueryRepository applicationQueryRepository; + + public Page getByFilterAndPage(ApplicationFilter filter, + Pageable pageable) { + return applicationQueryRepository.searchAllApplications(filter, pageable); + } + + public List getExcelData() { + return applicationQueryRepository.searchAllApplicationsForExcel(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminBannerService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminBannerService.java new file mode 100644 index 00000000..f57d25ff --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/admin/AdminBannerService.java @@ -0,0 +1,59 @@ +package life.mosu.mosuserver.application.admin; + +import java.util.List; +import life.mosu.mosuserver.domain.banner.BannerJpaEntity; +import life.mosu.mosuserver.domain.banner.BannerJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.admin.dto.BannerInfoResponse; +import life.mosu.mosuserver.presentation.admin.dto.BannerInfoResponse.AttachmentResponse; +import life.mosu.mosuserver.presentation.admin.dto.BannerRequest; +import life.mosu.mosuserver.presentation.admin.dto.BannerResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class AdminBannerService { + + private final BannerJpaRepository bannerJpaRepository; + private final S3Service s3Service; + + public List getAll() { + return bannerJpaRepository.findAll().stream() + .map(BannerResponse::of) + .toList(); + } + + public BannerInfoResponse getByBannerId(Long bannerId) { + BannerJpaEntity banner = bannerJpaRepository.findById(bannerId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.BANNER_NOT_FOUND)); + + String url = null; + if (banner.getS3Key() != null) { + url = s3Service.getPublicUrl(banner.getS3Key()); + } + + AttachmentResponse attachment = AttachmentResponse.of(banner.getFileName(), url); + return BannerInfoResponse.of(banner.getTitle(), banner.getDeadline(), banner.getLink(), + attachment); + } + + @Transactional + public void create(BannerRequest request) { + BannerJpaEntity banner = request.toEntity(); + bannerJpaRepository.save(banner); + } + + + @Transactional + public void deleteByBannerId(Long bannerId) { + try { + bannerJpaRepository.deleteById(bannerId); + } catch (Exception e) { + throw new CustomRuntimeException(ErrorCode.BANNER_DELETE_FAILURE); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminDashboardService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminDashboardService.java new file mode 100644 index 00000000..e772217f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/admin/AdminDashboardService.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.application.admin; + +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.presentation.admin.dto.DashBoardResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminDashboardService { + + private final ExamApplicationJpaRepository examApplicationJpaRepository; + private final UserJpaRepository userJpaRepository; + private final RefundJpaRepository refundJpaRepository; + + // 대시보드 정보 조회 + public DashBoardResponse getAll() { + Long applicationCounts = examApplicationJpaRepository.count(); + Long refundCounts = refundJpaRepository.count(); + Long userCounts = userJpaRepository.count(); + return new DashBoardResponse(applicationCounts, refundCounts, userCounts); + } + + +} diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminRecommendationService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminRecommendationService.java new file mode 100644 index 00000000..87783544 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/admin/AdminRecommendationService.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.admin; + +import java.util.List; +import life.mosu.mosuserver.domain.admin.projection.RecommendationDetailsProjection; +import life.mosu.mosuserver.domain.recommendation.RecommendationJpaRepository; +import life.mosu.mosuserver.presentation.admin.dto.RecommendationExcelDto; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminRecommendationService { + + private final RecommendationJpaRepository recommendationJpaRepository; + + public List getExcelData() { + + List recommendations = recommendationJpaRepository.findRecommendationDetails(); + return recommendations.stream().map( + RecommendationExcelDto::of).toList(); + + + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminRefundService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminRefundService.java new file mode 100644 index 00000000..cec0edc7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/admin/AdminRefundService.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.application.admin; + +import java.util.List; +import life.mosu.mosuserver.domain.admin.repository.RefundQueryRepository; +import life.mosu.mosuserver.presentation.admin.dto.RefundExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.RefundListResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminRefundService { + + private final RefundQueryRepository refundQueryRepository; + + public Page getByPage(Pageable pageable) { + return refundQueryRepository.searchAllRefunds(pageable); + } + + public List getExcelData() { + return refundQueryRepository.searchAllRefundsForExcel(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminService.java deleted file mode 100644 index 5f6c7293..00000000 --- a/src/main/java/life/mosu/mosuserver/application/admin/AdminService.java +++ /dev/null @@ -1,48 +0,0 @@ -package life.mosu.mosuserver.application.admin; - -import java.util.List; -import life.mosu.mosuserver.domain.admin.ApplicationQueryRepositoryImpl; -import life.mosu.mosuserver.domain.admin.StudentQueryRepositoryImpl; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationExcelDto; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; -import life.mosu.mosuserver.presentation.admin.dto.SchoolLunchResponse; -import life.mosu.mosuserver.presentation.admin.dto.StudentExcelDto; -import life.mosu.mosuserver.presentation.admin.dto.StudentFilter; -import life.mosu.mosuserver.presentation.admin.dto.StudentListResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -@RequiredArgsConstructor -public class AdminService { - - private final StudentQueryRepositoryImpl studentQueryRepository; - private final ApplicationQueryRepositoryImpl applicationQueryRepository; - - public Page getStudents(StudentFilter filter, Pageable pageable) { - return studentQueryRepository.searchAllStudents(filter, pageable); - } - - public List getStudentExcelData() { - return studentQueryRepository.searchAllStudentsForExcel(); - } - - public List getLunchCounts() { - return applicationQueryRepository.searchAllSchoolLunches(); - } - - public Page getApplications(ApplicationFilter filter, - Pageable pageable) { - return applicationQueryRepository.searchAllApplications(filter, pageable); - } - - public List getApplicationExcelData() { - return applicationQueryRepository.searchAllApplicationsForExcel(); - } - -} diff --git a/src/main/java/life/mosu/mosuserver/application/admin/AdminStudentService.java b/src/main/java/life/mosu/mosuserver/application/admin/AdminStudentService.java new file mode 100644 index 00000000..e763b078 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/admin/AdminStudentService.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.admin; + +import java.util.List; +import life.mosu.mosuserver.domain.admin.repository.StudentQueryRepository; +import life.mosu.mosuserver.presentation.admin.dto.StudentExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.StudentFilter; +import life.mosu.mosuserver.presentation.admin.dto.StudentListResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class AdminStudentService { + + private final StudentQueryRepository studentQueryRepository; + + public Page getByFilterAndPage(StudentFilter filter, Pageable pageable) { + return studentQueryRepository.searchAllStudents(filter, pageable); + } + + public List getExcelData() { + return studentQueryRepository.searchAllStudentsForExcel(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/ApplicationContext.java b/src/main/java/life/mosu/mosuserver/application/application/ApplicationContext.java new file mode 100644 index 00000000..878cc771 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/ApplicationContext.java @@ -0,0 +1,121 @@ +package life.mosu.mosuserver.application.application; + +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.function.Function; +import java.util.stream.Collectors; + +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.presentation.application.dto.ApplicationResponse; +import life.mosu.mosuserver.presentation.application.dto.ExamApplicationResponse; +import life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationWithStatus; + +public record ApplicationContext( + List applications, + List examApplications, + Map examMap, + Map> subjectMap, + Map paymentMap, + Map refundMap +) { + + public ApplicationContext( + List applications, + List examApplications + ) { + this(applications, examApplications, Map.of(), Map.of(), Map.of(), Map.of()); + } + + public ApplicationContext fetchExams(Function, List> fetcher) { + Map newExamMap = fetcher.apply( + examApplications.stream() + .map(e -> e.examApplication().getExamId()) + .distinct() + .toList() + ).stream().collect(Collectors.toMap(ExamJpaEntity::getId, Function.identity())); + + return new ApplicationContext(applications, examApplications, newExamMap, subjectMap, paymentMap, refundMap); + } + + public ApplicationContext fetchSubjects(Function, List> fetcher) { + Map> newSubjectMap = fetcher.apply( + examApplications.stream() + .map(e -> e.examApplication().getId()) + .toList() + ).stream().collect(Collectors.groupingBy(ExamSubjectJpaEntity::getExamApplicationId)); + + return new ApplicationContext(applications, examApplications, examMap, newSubjectMap, paymentMap, refundMap); + } + + public ApplicationContext fetchPayments(Function, List> fetcher) { + Map newPaymentMap = fetcher.apply( + examApplications.stream() + .map(e -> e.examApplication().getId()) + .toList() + ).stream().collect(Collectors.toMap(PaymentJpaEntity::getExamApplicationId, Function.identity())); + + return new ApplicationContext(applications, examApplications, examMap, subjectMap, newPaymentMap, refundMap); + } + + public ApplicationContext fetchRefunds(Function, List> fetcher) { + Map newRefundMap = fetcher.apply( + examApplications.stream() + .map(e -> e.examApplication().getId()) + .toList() + ).stream().collect(Collectors.toMap(RefundJpaEntity::getExamApplicationId, Function.identity())); + + return new ApplicationContext(applications, examApplications, examMap, subjectMap, paymentMap, newRefundMap); + } + + public List assemble() { + Map> grouped = examApplications.stream() + .map(this::createExamApplicationResponse) + .filter(Objects::nonNull) + .collect(Collectors.groupingBy(Map.Entry::getKey, + Collectors.mapping(Map.Entry::getValue, Collectors.toList()))); + + return applications.stream() + .map(app -> ApplicationResponse.of(app.getId(), + grouped.getOrDefault(app.getId(), List.of()))) + .toList(); + } + + private Map.Entry createExamApplicationResponse(ExamApplicationWithStatus item) { + ExamApplicationJpaEntity examApp = item.examApplication(); + ExamJpaEntity exam = examMap.get(examApp.getExamId()); + if (exam == null) return null; + + Set subjects = subjectMap.getOrDefault(examApp.getId(), List.of()).stream() + .map(s -> s.getSubject().getSubjectName()).collect(Collectors.toSet()); + + PaymentJpaEntity payment = paymentMap.get(examApp.getId()); + RefundJpaEntity refund = refundMap.get(examApp.getId()); + + Integer totalAmount = Optional.ofNullable(payment) + .map(p -> p.getPaymentAmount().getTotalAmount()) + .orElse(0); + String lunchName = examApp.getIsLunchChecked() ? exam.getLunchName() : null; + String status = item.status(); + + ExamApplicationResponse response = ExamApplicationResponse.of( + examApp.getId(), + examApp.getCreatedAt(), + status, + totalAmount, + exam.getSchoolName(), + exam.getExamDate(), + subjects, + lunchName + ); + + return Map.entry(examApp.getApplicationId(), response); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/application/ApplicationEventService.java b/src/main/java/life/mosu/mosuserver/application/application/ApplicationEventService.java new file mode 100644 index 00000000..bc5e33f8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/ApplicationEventService.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.application.application; + +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.entity.ApplicationStatus; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ApplicationEventService { + + private final ApplicationJpaRepository applicationJpaRepository; + + @Transactional + public void changeStatus(Long applicationId, ApplicationStatus newStatus) { + ApplicationJpaEntity application = applicationJpaRepository.findById(applicationId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.APPLICATION_LIST_NOT_FOUND)); + application.changeStatus(newStatus); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/ApplicationProcessingContext.java b/src/main/java/life/mosu/mosuserver/application/application/ApplicationProcessingContext.java new file mode 100644 index 00000000..8f942e5a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/ApplicationProcessingContext.java @@ -0,0 +1,20 @@ +package life.mosu.mosuserver.application.application; + +import life.mosu.mosuserver.presentation.common.FileRequest; + +public record ApplicationProcessingContext( + Long applicationId, + FileRequest fileRequest +) { + + public static ApplicationProcessingContext of( + Long applicationId, + FileRequest fileRequest + ) { + return new ApplicationProcessingContext( + applicationId, + fileRequest + ); + } + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/application/ApplicationService.java b/src/main/java/life/mosu/mosuserver/application/application/ApplicationService.java index 2831ad9c..84198f13 100644 --- a/src/main/java/life/mosu/mosuserver/application/application/ApplicationService.java +++ b/src/main/java/life/mosu/mosuserver/application/application/ApplicationService.java @@ -1,22 +1,25 @@ package life.mosu.mosuserver.application.application; -import java.util.ArrayList; import java.util.List; import java.util.Set; -import life.mosu.mosuserver.domain.application.AdmissionTicketImageJpaEntity; -import life.mosu.mosuserver.domain.application.AdmissionTicketImageJpaRepository; -import life.mosu.mosuserver.domain.application.ApplicationJpaEntity; -import life.mosu.mosuserver.domain.application.ApplicationJpaRepository; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaEntity; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaRepository; -import life.mosu.mosuserver.domain.school.SchoolJpaEntity; -import life.mosu.mosuserver.domain.school.SchoolJpaRepository; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.application.application.dto.RegisterApplicationCommand; +import life.mosu.mosuserver.application.application.processor.GetApplicationsStepProcessor; +import life.mosu.mosuserver.application.application.processor.RegisterApplicationStepProcessor; +import life.mosu.mosuserver.application.application.processor.SaveExamTicketStepProcessor; +import life.mosu.mosuserver.application.application.vaildator.ApplicationValidator; +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.application.user.UserService; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.presentation.application.dto.ApplicationGuestRequest; import life.mosu.mosuserver.presentation.application.dto.ApplicationRequest; import life.mosu.mosuserver.presentation.application.dto.ApplicationResponse; -import life.mosu.mosuserver.presentation.application.dto.ApplicationSchoolRequest; +import life.mosu.mosuserver.presentation.application.dto.CreateApplicationResponse; +import life.mosu.mosuserver.presentation.application.dto.ExamApplicationRequest; +import life.mosu.mosuserver.presentation.common.FileRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -28,66 +31,74 @@ @Slf4j public class ApplicationService { + private final UserService userService; + private final ApplicationJpaRepository applicationJpaRepository; - private final ApplicationSchoolJpaRepository applicationSchoolJpaRepository; - private final AdmissionTicketImageJpaRepository admissionTicketImageJpaRepository; - private final SchoolJpaRepository schoolJpaRepository; + private final ExamJpaRepository examJpaRepository; + private final ExamQuotaCacheManager cacheManager; + private final RegisterApplicationStepProcessor registerApplicationStepProcessor; + private final SaveExamTicketStepProcessor saveExamTicketStepProcessor; + private final GetApplicationsStepProcessor getApplicationsStepProcessor; + private final ApplicationValidator validator; - // 신청 @Transactional - public ApplicationResponse apply(Long userId, ApplicationRequest request) { - Set schoolRequests = request.schools(); - List savedEntities = new ArrayList<>(); - - ApplicationJpaEntity application = applicationJpaRepository.save(request.toEntity(userId)); - Long applicationId = application.getId(); - - admissionTicketImageJpaRepository.save( - createAdmissionTicketImageIfPresent(request.admissionTicket(), applicationId)); - - for (ApplicationSchoolRequest schoolRequest : schoolRequests) { - Long schoolId = schoolJpaRepository.findBySchoolNameAndAreaAndExamDate( - schoolRequest.schoolName(), - schoolRequest.validatedArea(schoolRequest.area()), - schoolRequest.examDate()) - .orElseThrow(() -> new CustomRuntimeException(ErrorCode.SCHOOL_NOT_FOUND)) - .getId(); - - if (applicationSchoolJpaRepository.existsByUserIdAndSchoolId(userId, schoolId)) { - throw new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_ALREADY_APPLIED); - } - - SchoolJpaEntity school = schoolJpaRepository.findById(schoolId) - .orElseThrow(() -> new CustomRuntimeException(ErrorCode.SCHOOL_NOT_FOUND)); - - ApplicationSchoolJpaEntity applicationSchool = schoolRequest.toEntity(userId, - applicationId, school); - savedEntities.add(applicationSchoolJpaRepository.save(applicationSchool)); - } + public CreateApplicationResponse apply(Long userId, ApplicationRequest request) { + List examIds = request.examApplication().stream() + .map(ExamApplicationRequest::examId) + .toList(); + return handleApplication( + userId, + examIds, + request.getSubjects(), + request.toApplicationJpaEntity(userId), + request.examApplication(), + request.admissionTicket() + ); + } - return ApplicationResponse.of(applicationId, savedEntities); + @Transactional + public CreateApplicationResponse applyByGuest(ApplicationGuestRequest request) { + Long userId = userService.saveUser(request.toUserJpaEntity()); + CreateApplicationResponse response = handleApplication( + userId, + List.of(request.examApplication().examId()), + request.getSubjects(), + request.toApplicationJpaEntity(userId), + List.of(request.examApplication()), + request.admissionTicket()); + cacheManager.increaseCurrentApplications(request.examApplication().examId()); + return response; } + private CreateApplicationResponse handleApplication( + Long userId, + List examIds, + Set subjects, + ApplicationJpaEntity applicationEntity, + List examApplications, + FileRequest admissionTicket + ) { + validator.requestNoDuplicateExams(examIds); + List exams = examJpaRepository.findAllById(examIds); + validator.examDateNotPassed(exams); + validator.examNotFull(exams); + validator.examIdsAndLunchSelection(examApplications); + validator.noDuplicateApplication(userId, examIds); + + ApplicationJpaEntity savedApplication = applicationJpaRepository.save(applicationEntity); + Long applicationId = savedApplication.getId(); + + registerApplicationStepProcessor.process( + RegisterApplicationCommand.of(userId, applicationId, examApplications, subjects)); + + saveExamTicketStepProcessor.process( + ApplicationProcessingContext.of(applicationId, admissionTicket)); + + return CreateApplicationResponse.of(applicationId); + } - // 전체 신청 내역 조회 @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) public List getApplications(Long userId) { - List applications = applicationJpaRepository.findAllByUserId(userId); - - return applications.stream() - .map(application -> { - List schools = applicationSchoolJpaRepository.findAllByApplicationId( - application.getId()); - return ApplicationResponse.of(application.getId(), schools); - }) - .toList(); - } - - private AdmissionTicketImageJpaEntity createAdmissionTicketImageIfPresent( - FileRequest fileRequest, Long applicationId) { - return admissionTicketImageJpaRepository.save( - fileRequest.toAdmissionTicketImageEntity(fileRequest.fileName(), - fileRequest.s3Key(), applicationId)); + return getApplicationsStepProcessor.process(userId); } - -} \ No newline at end of file +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/cron/ApplicationFailureLogCleanup.java b/src/main/java/life/mosu/mosuserver/application/application/cron/ApplicationFailureLogCleanup.java new file mode 100644 index 00000000..2d1c9fda --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/cron/ApplicationFailureLogCleanup.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.application.application.cron; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.application.repository.ApplicationFailureLogJpaRepository; +import life.mosu.mosuserver.global.support.LogCleanup; +import lombok.RequiredArgsConstructor; +import org.quartz.DisallowConcurrentExecution; +import org.springframework.stereotype.Component; + +@DisallowConcurrentExecution +@Component +@RequiredArgsConstructor +public class ApplicationFailureLogCleanup implements LogCleanup { + + private final ApplicationFailureLogJpaRepository applicationFailureLogJpaRepository; + + @Override + public int deleteLogsBefore(LocalDateTime before) { + return applicationFailureLogJpaRepository.deleteByCreatedAtBefore(before); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/cron/ApplicationFailureLogDomainArchiver.java b/src/main/java/life/mosu/mosuserver/application/application/cron/ApplicationFailureLogDomainArchiver.java new file mode 100644 index 00000000..9989c403 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/cron/ApplicationFailureLogDomainArchiver.java @@ -0,0 +1,87 @@ +package life.mosu.mosuserver.application.application.cron; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.List; +import java.util.Objects; +import life.mosu.mosuserver.application.application.factory.ApplicationFailureLogFactory; +import life.mosu.mosuserver.domain.application.entity.ApplicationFailureLogJpaEntity; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.repository.ApplicationFailureLogJpaRepository; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.global.support.DomainArchiver; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.quartz.DisallowConcurrentExecution; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@DisallowConcurrentExecution +@Component +@RequiredArgsConstructor +public class ApplicationFailureLogDomainArchiver implements DomainArchiver { + + private final static Duration DURATION_HOURS_STANDARD = Duration.ofHours(1); + private final static int BATCH_SIZE = 500; + + private final ApplicationFailureLogFactory applicationFailureLogFactory; + + private final ApplicationJpaRepository applicationJpaRepository; + private final ApplicationFailureLogJpaRepository applicationFailureLogJpaRepository; + + @Override + @Transactional + public void archive() { + //TODO: exam 까지 find 로 가져오게 정정 필요 + List targets = findFailedApplications(); + + for (int i = 0; i < targets.size(); i += BATCH_SIZE) { + int end = Math.min(i + BATCH_SIZE, targets.size()); + List batch = targets.subList(i, end); + try { + List logs = batch.stream() + .map(this::createApplicationFailureLog) + .filter(Objects::nonNull) + .toList(); + + if (!logs.isEmpty()) { + //batch 로 삭제 + applicationFailureLogJpaRepository.saveAllUsingBatch(logs); + applicationJpaRepository.batchDeleteAllWithExamApplications(batch); + log.debug("Successfully archived {} failed applications", batch.size()); + } + } catch (Exception e) { + log.error("Failed to archive batch starting at index {}", i, e); + } + } + } + + @Override + public String getName() { + return "application"; + } + + private List findFailedApplications() { + Instant threshold = Instant.now().minus(DURATION_HOURS_STANDARD); // 3 hours ago + LocalDateTime time = LocalDateTime.ofInstant(threshold, ZoneId.systemDefault()); + return applicationJpaRepository.findFailedApplications(time); + } + + private ApplicationFailureLogJpaEntity createApplicationFailureLog( + ApplicationJpaEntity application) { + return switch (application.getStatus()) { + case ABORT -> applicationFailureLogFactory.create(application, "결제에 실패하였습니다."); + case PENDING -> applicationFailureLogFactory.create(application, "신청정보가 만료 되었습니다."); + default -> { + log.debug( + "Application {} is not in a failure state, skipping log creation.", + application.getId() + ); + yield null; + } + }; + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/dto/AppExam.java b/src/main/java/life/mosu/mosuserver/application/application/dto/AppExam.java new file mode 100644 index 00000000..9e22d558 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/dto/AppExam.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.application.application.dto; + +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; + +public record AppExam( + Long examApplicationId, + ExamJpaEntity exam +) { + + public static AppExam of(Long examApplicationId, ExamJpaEntity exam) { + return new AppExam(examApplicationId, exam); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/dto/AppExamSubject.java b/src/main/java/life/mosu/mosuserver/application/application/dto/AppExamSubject.java new file mode 100644 index 00000000..ccbbaf56 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/dto/AppExamSubject.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.application.application.dto; + +import java.util.List; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; + +public record AppExamSubject( + Long examApplicationId, + List examSubjects +) { + + public static AppExamSubject of( + Long examApplicationId, + List examSubjects) { + return new AppExamSubject(examApplicationId, examSubjects); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/dto/AppPayment.java b/src/main/java/life/mosu/mosuserver/application/application/dto/AppPayment.java new file mode 100644 index 00000000..135c94b7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/dto/AppPayment.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.application.application.dto; + +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; + +public record AppPayment( + Long examApplicationId, + PaymentJpaEntity payment +) { + + public static AppPayment of(Long examApplicationId, PaymentJpaEntity payment) { + return new AppPayment(examApplicationId, payment); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/dto/RegisterApplicationCommand.java b/src/main/java/life/mosu/mosuserver/application/application/dto/RegisterApplicationCommand.java new file mode 100644 index 00000000..6f285880 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/dto/RegisterApplicationCommand.java @@ -0,0 +1,33 @@ +package life.mosu.mosuserver.application.application.dto; + +import java.util.List; +import java.util.Set; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.presentation.application.dto.ExamApplicationRequest; + +public record RegisterApplicationCommand( + Long userId, + Long applicationId, + List examApplication, + Set subjects +) { + + public static RegisterApplicationCommand of( + Long userId, + Long applicationId, + List examApplication, + Set subjects + ) { + return new RegisterApplicationCommand(userId, applicationId, examApplication, subjects); + } + + public static RegisterApplicationCommand of( + Long userId, + Long applicationId, + ExamApplicationRequest examApplication, + Set subjects + ) { + return new RegisterApplicationCommand(userId, applicationId, List.of(examApplication), + subjects); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/factory/ApplicationFailureLogFactory.java b/src/main/java/life/mosu/mosuserver/application/application/factory/ApplicationFailureLogFactory.java new file mode 100644 index 00000000..87ced208 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/factory/ApplicationFailureLogFactory.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.application.application.factory; + +import com.fasterxml.jackson.databind.ObjectMapper; +import life.mosu.mosuserver.domain.application.entity.ApplicationFailureLogJpaEntity; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.global.factory.AbstractFailureLogFactory; +import org.springframework.stereotype.Component; + +@Component +public class ApplicationFailureLogFactory extends + AbstractFailureLogFactory { + + public ApplicationFailureLogFactory(ObjectMapper objectMapper) { + super(objectMapper); + } + + public ApplicationFailureLogJpaEntity create(ApplicationJpaEntity application, String reason) { + return new ApplicationFailureLogJpaEntity( + application.getId(), + application.getUserId(), + reason, + toJson(application) + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/processor/GetApplicationsStepProcessor.java b/src/main/java/life/mosu/mosuserver/application/application/processor/GetApplicationsStepProcessor.java new file mode 100644 index 00000000..e664b43b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/processor/GetApplicationsStepProcessor.java @@ -0,0 +1,53 @@ +package life.mosu.mosuserver.application.application.processor; + +import java.util.List; +import life.mosu.mosuserver.application.application.ApplicationContext; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.examapplication.repository.ExamSubjectJpaRepository; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.global.processor.StepProcessor; +import life.mosu.mosuserver.presentation.application.dto.ApplicationResponse; +import life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationWithStatus; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class GetApplicationsStepProcessor implements + StepProcessor> { + + private final ApplicationJpaRepository applicationJpaRepository; + private final ExamSubjectJpaRepository examSubjectJpaRepository; + private final ExamApplicationJpaRepository examApplicationJpaRepository; + private final ExamJpaRepository examJpaRepository; + private final PaymentJpaRepository paymentJpaRepository; + private final RefundJpaRepository refundJpaRepository; + + @Override + public List process(Long userId) { + + List applications = applicationJpaRepository.findAllByUserId(userId); + log.info("applications info: {}", applications.size()); + if (applications.isEmpty()) { + return List.of(); + } + + List applicationIds = applications.stream().map(ApplicationJpaEntity::getId).toList(); + List examApplications = examApplicationJpaRepository.findByApplicationIdIn( + applicationIds); + + return new ApplicationContext(applications, examApplications) + .fetchExams(examJpaRepository::findByIdIn) + .fetchSubjects(examSubjectJpaRepository::findByExamApplicationIdIn) + .fetchPayments(paymentJpaRepository::findByExamApplicationIdIn) + .fetchRefunds(refundJpaRepository::findByExamApplicationIdIn) + .assemble(); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/processor/RegisterApplicationStepProcessor.java b/src/main/java/life/mosu/mosuserver/application/application/processor/RegisterApplicationStepProcessor.java new file mode 100644 index 00000000..61a0757c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/processor/RegisterApplicationStepProcessor.java @@ -0,0 +1,44 @@ +package life.mosu.mosuserver.application.application.processor; + +import jakarta.transaction.Transactional; +import java.util.List; +import life.mosu.mosuserver.application.application.dto.RegisterApplicationCommand; +import life.mosu.mosuserver.application.examapplication.ExamApplicationService; +import life.mosu.mosuserver.application.examapplication.dto.RegisterExamApplicationEvent; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.global.processor.StepProcessor; +import life.mosu.mosuserver.infra.persistence.jpa.ExamApplicationBulkRepository; +import life.mosu.mosuserver.presentation.application.dto.ExamApplicationRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class RegisterApplicationStepProcessor implements + StepProcessor { + + private final ApplicationJpaRepository applicationJpaRepository; + private final ExamApplicationService examApplicationService; + private final ExamApplicationBulkRepository examApplicationBulkRepository; + + @Override + @Transactional + public RegisterApplicationCommand process(RegisterApplicationCommand command) { + final List examApplicationRequests = command.examApplication(); + final Long applicationId = command.applicationId(); + final Long userId = command.userId(); + + List examApplicationEntities = examApplicationService.register( + RegisterExamApplicationEvent.of(examApplicationRequests, + applicationId, userId) + ); + + // 시험 신청 목록과 과목 multi-insert + examApplicationBulkRepository.saveAllExamApplicationsWithSubjects(examApplicationEntities, + command.subjects()); + return command; + } + + +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/processor/SaveExamTicketStepProcessor.java b/src/main/java/life/mosu/mosuserver/application/application/processor/SaveExamTicketStepProcessor.java new file mode 100644 index 00000000..2bc6ef63 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/processor/SaveExamTicketStepProcessor.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.application.application.processor; + +import life.mosu.mosuserver.application.application.ApplicationProcessingContext; +import life.mosu.mosuserver.domain.application.entity.ExamTicketImageJpaEntity; +import life.mosu.mosuserver.domain.application.repository.ExamTicketImageJpaRepository; +import life.mosu.mosuserver.global.processor.StepProcessor; +import life.mosu.mosuserver.presentation.common.FileRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class SaveExamTicketStepProcessor implements + StepProcessor { + + private final ExamTicketImageJpaRepository examTicketImageJpaRepository; + + @Override + public ApplicationProcessingContext process(ApplicationProcessingContext context) { + Long applicationId = context.applicationId(); + FileRequest fileReq = context.fileRequest(); + + if (fileReq.fileName() != null && fileReq.s3Key() != null) { + ExamTicketImageJpaEntity examTicketImage = fileReq + .toExamTicketImageEntity(applicationId); + + examTicketImageJpaRepository.save(examTicketImage); + } + return context; + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/stream/IdStream.java b/src/main/java/life/mosu/mosuserver/application/application/stream/IdStream.java new file mode 100644 index 00000000..d3719ed1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/stream/IdStream.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.application.application.stream; + +import java.util.function.Function; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; + +@FunctionalInterface +public interface IdStream extends Function { + + Long apply(ExamSubjectJpaEntity examSubject); + +} diff --git a/src/main/java/life/mosu/mosuserver/application/application/vaildator/ApplicationValidator.java b/src/main/java/life/mosu/mosuserver/application/application/vaildator/ApplicationValidator.java new file mode 100644 index 00000000..4df221c6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/application/vaildator/ApplicationValidator.java @@ -0,0 +1,113 @@ +package life.mosu.mosuserver.application.application.vaildator; + +import java.time.LocalDateTime; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.domain.exam.entity.ExamStatus; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.application.dto.ExamApplicationRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ApplicationValidator { + + private final ExamJpaRepository examJpaRepository; + private final ApplicationJpaRepository applicationJpaRepository; + private final ExamQuotaCacheManager examQuotaCacheManager; + + public void requestNoDuplicateExams(List examIds) { + Set examIdSet = new HashSet<>(examIds); + if (examIds.size() != examIdSet.size()) { + throw new CustomRuntimeException(ErrorCode.EXAM_DUPLICATED); + } + } + + public void examIdsAndLunchSelection(List requests) { + if (requests == null || requests.isEmpty()) { + throw new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND); + } + + List requestedExamIds = requests.stream() + .map(ExamApplicationRequest::examId) + .toList(); + + List existingExams = examJpaRepository.findAllById(requestedExamIds); + + if (existingExams.size() != requestedExamIds.size()) { + throw new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND); + } + + lunchSelection(requests, existingExams); + } + + private void lunchSelection(List requests, + List exams) { + Set examsWithoutLunch = exams.stream() + .filter(ExamJpaEntity::hasNotLunch) + .map(ExamJpaEntity::getId) + .collect(Collectors.toSet()); + + boolean hasInvalidLunchRequest = requests.stream() + .anyMatch(req -> examsWithoutLunch.contains(req.examId()) && req.isLunchChecked()); + + if (hasInvalidLunchRequest) { + throw new CustomRuntimeException(ErrorCode.LUNCH_SELECTION_INVALID); + } + } + + public void noDuplicateApplication(Long userId, List examIds) { + boolean alreadyApplied = applicationJpaRepository.existsByUserIdAndExamIds(userId, examIds); + if (alreadyApplied) { + throw new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_DUPLICATED); + } + } + + public void examDateNotPassed(List exams) { + boolean hasPassedExam = false; + + for (ExamJpaEntity exam : exams) { + if (exam.getDeadlineTime().isBefore(LocalDateTime.now())) { + exam.close(); + hasPassedExam = true; + } + } + + if (hasPassedExam) { + throw new CustomRuntimeException(ErrorCode.EXAM_DATE_PASSED); + } + } + + public void examNotFull(List exams) { + boolean isFull = exams.stream() + .anyMatch(exam -> { + + if (exam.getExamStatus() == ExamStatus.CLOSED) { + return true; + } + + Long currentApplications = examQuotaCacheManager.getCurrentApplications( + exam.getId()) + .orElseThrow(() -> new CustomRuntimeException( + ErrorCode.EXAM_QUOTA_NOT_FOUND)); + + Long maxCapacity = examQuotaCacheManager.getMaxCapacity(exam.getId()) + .orElseThrow(() -> new CustomRuntimeException( + ErrorCode.EXAM_QUOTA_NOT_FOUND)); + + return currentApplications >= maxCapacity; + }); + + if (isFull) { + throw new CustomRuntimeException(ErrorCode.APPLICATION_CLOSED); + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/applicationschool/ApplicationSchoolService.java b/src/main/java/life/mosu/mosuserver/application/applicationschool/ApplicationSchoolService.java deleted file mode 100644 index 56f75eda..00000000 --- a/src/main/java/life/mosu/mosuserver/application/applicationschool/ApplicationSchoolService.java +++ /dev/null @@ -1,129 +0,0 @@ -package life.mosu.mosuserver.application.applicationschool; - -import java.time.Duration; -import java.util.Set; -import java.util.stream.Collectors; -import life.mosu.mosuserver.domain.application.AdmissionTicketImageJpaEntity; -import life.mosu.mosuserver.domain.application.AdmissionTicketImageJpaRepository; -import life.mosu.mosuserver.domain.application.ApplicationJpaEntity; -import life.mosu.mosuserver.domain.application.ApplicationJpaRepository; -import life.mosu.mosuserver.domain.application.Subject; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaEntity; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaRepository; -import life.mosu.mosuserver.domain.profile.ProfileJpaEntity; -import life.mosu.mosuserver.domain.profile.ProfileJpaRepository; -import life.mosu.mosuserver.domain.refund.RefundJpaRepository; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; -import life.mosu.mosuserver.infra.property.S3Properties; -import life.mosu.mosuserver.infra.storage.application.S3Service; -import life.mosu.mosuserver.presentation.application.dto.ApplicationSchoolResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.AdmissionTicketResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.RefundRequest; -import life.mosu.mosuserver.presentation.applicationschool.dto.SubjectUpdateRequest; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Slf4j -public class ApplicationSchoolService { - - private final ApplicationSchoolJpaRepository applicationSchoolJpaRepository; - private final ApplicationJpaRepository applicationJpaRepository; - private final RefundJpaRepository refundJpaRepository; - private final ProfileJpaRepository profileJpaRepository; - private final AdmissionTicketImageJpaRepository admissionTicketImageJpaRepository; - private final S3Service s3Service; - private final S3Properties s3Properties; - - - @Transactional - public ApplicationSchoolResponse updateSubjects( - Long applicationSchoolId, - SubjectUpdateRequest request - ) { - ApplicationSchoolJpaEntity applicationSchool = applicationSchoolJpaRepository.findById( - applicationSchoolId) - .orElseThrow( - () -> new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_NOT_FOUND)); - - applicationSchool.updateSubjects(request.subjects()); - return ApplicationSchoolResponse.from(applicationSchool); - } - - @Transactional - public void cancelApplicationSchool( - Long applicationSchoolId, - RefundRequest request - ) { - ApplicationSchoolJpaEntity applicationSchool = applicationSchoolJpaRepository.findById( - applicationSchoolId) - .orElseThrow( - () -> new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_NOT_FOUND)); - - Long applicationId = applicationSchool.getApplicationId(); - applicationSchoolJpaRepository.deleteById(applicationSchoolId); - - if (!applicationSchoolJpaRepository.existsByApplicationId(applicationId)) { - applicationJpaRepository.deleteById(applicationId); - } - - refundJpaRepository.save(request.toEntity(applicationSchoolId)); - } - - // 신청 내역 단건 조회 - @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public ApplicationSchoolResponse getApplicationSchool(Long applicationSchoolId) { - ApplicationSchoolJpaEntity applicationSchool = applicationSchoolJpaRepository.findById( - applicationSchoolId) - .orElseThrow( - () -> new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_NOT_FOUND)); - - return ApplicationSchoolResponse.from(applicationSchool); - } - - // 수험표 조회 - @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public AdmissionTicketResponse getAdmissionTicket(Long userId, Long applicationSchoolId) { - ProfileJpaEntity profile = profileJpaRepository.findById(userId) - .orElseThrow(() -> new CustomRuntimeException(ErrorCode.PROFILE_NOT_FOUND)); - - ApplicationSchoolJpaEntity applicationSchool = applicationSchoolJpaRepository.findById( - applicationSchoolId) - .orElseThrow( - () -> new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_NOT_FOUND)); - - ApplicationJpaEntity application = applicationJpaRepository.findById( - applicationSchool.getApplicationId()) - .orElseThrow(() -> new CustomRuntimeException(ErrorCode.APPLICATION_NOT_FOUND)); - - AdmissionTicketImageJpaEntity admissionTicketImage = admissionTicketImageJpaRepository.findByApplicationId( - application.getId()); - - Set subjectNames = applicationSchool.getSubjects().stream() - .map(Subject::getSubjectName) - .collect(Collectors.toSet()); - - return AdmissionTicketResponse.of( - getAdmissionTicketImageUrl(admissionTicketImage), - profile.getUserName(), - profile.getBirth(), - applicationSchool.getExaminationNumber(), - subjectNames, - applicationSchool.getSchoolName() - ); - - } - - private String getAdmissionTicketImageUrl(AdmissionTicketImageJpaEntity admissionTicketImage) { - return s3Service.getPreSignedUrl( - admissionTicketImage.getS3Key(), - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ); - } - -} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/AccessTokenService.java b/src/main/java/life/mosu/mosuserver/application/auth/AccessTokenService.java deleted file mode 100644 index 560bb259..00000000 --- a/src/main/java/life/mosu/mosuserver/application/auth/AccessTokenService.java +++ /dev/null @@ -1,19 +0,0 @@ -package life.mosu.mosuserver.application.auth; - -import life.mosu.mosuserver.domain.user.UserJpaRepository; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -@Service -public class AccessTokenService extends JwtTokenService { - - @Autowired - public AccessTokenService( - @Value("${jwt.access-token.expire-time}") final Long expireTime, - @Value("${jwt.secret}") final String secretKey, - final UserJpaRepository userRepositoy - ) { - super(expireTime, secretKey, "Access", "Authorization", userRepositoy); - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/AuthService.java b/src/main/java/life/mosu/mosuserver/application/auth/AuthService.java index c911dfba..4221181b 100644 --- a/src/main/java/life/mosu/mosuserver/application/auth/AuthService.java +++ b/src/main/java/life/mosu/mosuserver/application/auth/AuthService.java @@ -1,43 +1,49 @@ package life.mosu.mosuserver.application.auth; -import jakarta.servlet.http.HttpServletRequest; -import life.mosu.mosuserver.domain.user.UserJpaEntity; +import life.mosu.mosuserver.application.auth.provider.AuthTokenManager; +import life.mosu.mosuserver.application.auth.support.LoginAttemptService; +import life.mosu.mosuserver.application.user.UserQueryService; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.auth.dto.LoginCommandResponse; import life.mosu.mosuserver.presentation.auth.dto.LoginRequest; -import life.mosu.mosuserver.presentation.auth.dto.Token; import lombok.RequiredArgsConstructor; -import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; -import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder; -import org.springframework.security.core.Authentication; +import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor public class AuthService { - private final AuthenticationManagerBuilder authenticationManagerBuilder; + private final AuthTokenManager authTokenManager; + private final PasswordEncoder passwordEncoder; + private final UserQueryService userQueryService; + private final LoginAttemptService loginAttemptService; + + public LoginCommandResponse login(final LoginRequest request) { + final UserJpaEntity user = userQueryService.getByLoginId(request.id()); + if (loginAttemptService.isBlocked(user.getLoginId())) { + throw new CustomRuntimeException(ErrorCode.LOGIN_BLOCKED); + } - @Transactional - public Token login(final LoginRequest request) { - try { - final UsernamePasswordAuthenticationToken authenticationToken = - new UsernamePasswordAuthenticationToken(request.id(), request.password()); - final Authentication authentication = authenticationManagerBuilder - .getObject() - .authenticate(authenticationToken); - final PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal(); - final UserJpaEntity user = principalDetails.user(); - - return authTokenManager.generateAuthToken(user); - } catch (final Exception e) { + if (!passwordEncoder.matches(request.password(), user.getPassword())) { + loginAttemptService.loginFailed(user.getLoginId()); throw new CustomRuntimeException(ErrorCode.INCORRECT_ID_OR_PASSWORD); } + + Boolean isProfileRegistered = isProfileRegistered(user); + + loginAttemptService.loginSucceeded(user.getLoginId()); + return LoginCommandResponse.of( + authTokenManager.generateAuthToken(user), + isProfileRegistered, + user + ); } - @Transactional - public Token reissueAccessToken(final HttpServletRequest servletRequest) { - return authTokenManager.reissueAccessToken(servletRequest); + private Boolean isProfileRegistered(UserJpaEntity user) { + return UserRole.ROLE_USER.equals(user.getUserRole()); } } diff --git a/src/main/java/life/mosu/mosuserver/application/auth/AuthTokenManager.java b/src/main/java/life/mosu/mosuserver/application/auth/AuthTokenManager.java deleted file mode 100644 index 4cb36d6c..00000000 --- a/src/main/java/life/mosu/mosuserver/application/auth/AuthTokenManager.java +++ /dev/null @@ -1,47 +0,0 @@ -package life.mosu.mosuserver.application.auth; - -import jakarta.servlet.http.HttpServletRequest; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; -import life.mosu.mosuserver.presentation.auth.dto.Token; -import lombok.RequiredArgsConstructor; -import org.springframework.security.core.Authentication; -import org.springframework.stereotype.Component; - -@Component -@RequiredArgsConstructor -public class AuthTokenManager { - - private final AccessTokenService accessTokenService; - private final RefreshTokenService refreshTokenService; - - public Token generateAuthToken(final UserJpaEntity user) { - final String accessToken = accessTokenService.generateJwtToken(user); - final String refreshToken = refreshTokenService.generateJwtToken(user); - - refreshTokenService.cacheRefreshToken(user.getId(), refreshToken); - - return Token.of(JwtTokenService.BEARER_TYPE, accessToken, refreshToken); - } - - public Token reissueAccessToken(final HttpServletRequest servletRequest) { - final String refreshTokenString = refreshTokenService.resolveToken(servletRequest); - if (refreshTokenString == null) { - throw new CustomRuntimeException(ErrorCode.NOT_FOUND_REFRESH_TOKEN); - } - - final Authentication authentication = refreshTokenService.getAuthentication( - refreshTokenString); - final PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal(); - final UserJpaEntity user = principalDetails.user(); - - refreshTokenService.deleteRefreshToken(user.getId()); - - return generateAuthToken(user); - } - - public Long getAccessTokenExpireTime() { - return accessTokenService.expireTime; - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/DanalVerificationService.java b/src/main/java/life/mosu/mosuserver/application/auth/DanalVerificationService.java deleted file mode 100644 index 5be950c8..00000000 --- a/src/main/java/life/mosu/mosuserver/application/auth/DanalVerificationService.java +++ /dev/null @@ -1,12 +0,0 @@ -package life.mosu.mosuserver.application.auth; - -import org.springframework.stereotype.Service; - -@Service -public class DanalVerificationService implements VerificationService { - //TODO: Danal 인증 서비스 구현 - @Override - public boolean verify(final String verificationCode, final String phoneNumber) { - return true; - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetails.java b/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetails.java index 14f18f33..1014edee 100644 --- a/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetails.java +++ b/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetails.java @@ -1,16 +1,19 @@ package life.mosu.mosuserver.application.auth; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import lombok.Getter; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; - import java.util.ArrayList; import java.util.Collection; import java.util.List; +import java.util.Optional; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; -public record PrincipalDetails(@Getter UserJpaEntity user) implements UserDetails { +public record PrincipalDetails( + UserJpaEntity user +) implements UserDetails { @Override public Collection getAuthorities() { @@ -30,7 +33,9 @@ public String getUsername() { } public Long getId() { - return user.getId(); + return Optional.ofNullable(user) + .map(UserJpaEntity::getId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.NOT_FOUND_ACCESS_TOKEN)); } @Override diff --git a/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetailsService.java b/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetailsService.java index 6437fc8d..6f23d9b0 100644 --- a/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetailsService.java +++ b/src/main/java/life/mosu/mosuserver/application/auth/PrincipalDetailsService.java @@ -1,7 +1,7 @@ package life.mosu.mosuserver.application.auth; -import life.mosu.mosuserver.domain.user.UserJpaRepository; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; @@ -18,6 +18,7 @@ public class PrincipalDetailsService implements UserDetailsService { @Override public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException { - return new PrincipalDetails(userRepository.findByLoginId(username).orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND))); + return new PrincipalDetails(userRepository.findByLoginId(username) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND))); } } diff --git a/src/main/java/life/mosu/mosuserver/application/auth/RefreshTokenService.java b/src/main/java/life/mosu/mosuserver/application/auth/RefreshTokenService.java deleted file mode 100644 index 58fcde33..00000000 --- a/src/main/java/life/mosu/mosuserver/application/auth/RefreshTokenService.java +++ /dev/null @@ -1,53 +0,0 @@ -package life.mosu.mosuserver.application.auth; - -import io.jsonwebtoken.Claims; -import life.mosu.mosuserver.domain.auth.security.RefreshToken; -import life.mosu.mosuserver.domain.auth.security.RefreshTokenRepository; -import life.mosu.mosuserver.domain.user.UserJpaRepository; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.stereotype.Service; - -@Service -public class RefreshTokenService extends JwtTokenService { - - private final RefreshTokenRepository refreshTokenRepository; - - @Autowired - public RefreshTokenService( - @Value("${jwt.refresh-token.expire-time}") final Long expireTime, - @Value("${jwt.secret}") final String secretKey, - final UserJpaRepository userJpaRepository, - final RefreshTokenRepository refreshTokenRepository - ) { - super(expireTime, secretKey, "Refresh", "Refresh-Token", userJpaRepository); - this.refreshTokenRepository = refreshTokenRepository; - } - - @Override - protected Claims validateAndParseToken(final String token) { - if (!refreshTokenRepository.existsByRefreshToken(token)) { - throw new CustomRuntimeException(ErrorCode.INVALID_REFRESH_TOKEN); - } - return super.validateAndParseToken(token); - } - - public void deleteRefreshToken(final Long id) { - if (!refreshTokenRepository.existsByUserId(id)) { - throw new CustomRuntimeException(ErrorCode.NOT_EXIST_REFRESH_TOKEN); - } - refreshTokenRepository.deleteByUserId(id); - } - - public void cacheRefreshToken(final Long userId, final String refreshToken) { - refreshTokenRepository.save( - RefreshToken.of( - userId, - refreshToken, - expireTime - ) - ); - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/SignUpService.java b/src/main/java/life/mosu/mosuserver/application/auth/SignUpService.java index d642396f..42cfe6ab 100644 --- a/src/main/java/life/mosu/mosuserver/application/auth/SignUpService.java +++ b/src/main/java/life/mosu/mosuserver/application/auth/SignUpService.java @@ -1,10 +1,10 @@ package life.mosu.mosuserver.application.auth; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import life.mosu.mosuserver.domain.user.UserJpaRepository; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; -import life.mosu.mosuserver.presentation.auth.dto.SignUpRequest; +import life.mosu.mosuserver.application.auth.processor.SignUpAccountStepProcessor; +import life.mosu.mosuserver.application.auth.provider.AuthTokenManager; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.presentation.auth.dto.SignUpAccountRequest; +import life.mosu.mosuserver.presentation.auth.dto.Token; import lombok.RequiredArgsConstructor; import org.springframework.security.crypto.password.PasswordEncoder; import org.springframework.stereotype.Service; @@ -14,18 +14,19 @@ @RequiredArgsConstructor public class SignUpService { + private final SignUpAccountStepProcessor signUpAccountStepProcessor; + private final AuthTokenManager authTokenManager; private final PasswordEncoder passwordEncoder; - private final UserJpaRepository userRepository; @Transactional - public void signUp(final SignUpRequest request) { + public Token signUp(final SignUpAccountRequest request) { + UserJpaEntity user = doAccountStep(request); - if (userRepository.existsByLoginId(request.id())) { - throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS); - } + return authTokenManager.generateAuthToken(user); + } + private UserJpaEntity doAccountStep(SignUpAccountRequest request) { UserJpaEntity user = request.toAuthEntity(passwordEncoder); - - userRepository.save(user); + return signUpAccountStepProcessor.process(user); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/VerificationService.java b/src/main/java/life/mosu/mosuserver/application/auth/VerificationService.java deleted file mode 100644 index fedcb162..00000000 --- a/src/main/java/life/mosu/mosuserver/application/auth/VerificationService.java +++ /dev/null @@ -1,5 +0,0 @@ -package life.mosu.mosuserver.application.auth; - -public interface VerificationService { - boolean verify(String verificationCode, String phoneNumber); -} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/kmc/KmcEventTxService.java b/src/main/java/life/mosu/mosuserver/application/auth/kmc/KmcEventTxService.java new file mode 100644 index 00000000..4c016a8e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/kmc/KmcEventTxService.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.application.auth.kmc; + +import life.mosu.mosuserver.application.auth.kmc.tx.KmcContext; +import life.mosu.mosuserver.application.auth.kmc.tx.KmcTxEventFactory; +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventPublisher; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class KmcEventTxService { + private final TxEventPublisher txEventPublisher; + private final KmcTxEventFactory eventFactory; + + @Transactional + public void publishIssueEvent(String certNum, Long expiration) { + TxEvent event = eventFactory.create( + KmcContext.ofSuccess(certNum, expiration) + ); + txEventPublisher.publish(event); + } + + @Transactional + public void publishFailureEvent(String certNum) { + TxEvent event = eventFactory.create( + KmcContext.ofFailure(certNum) + ); + txEventPublisher.publish(event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcContext.java b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcContext.java new file mode 100644 index 00000000..8ae72375 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcContext.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.auth.kmc.tx; + +import life.mosu.mosuserver.domain.auth.signup.Token; + +public record KmcContext( + String certNum, + Long expiration, + Boolean isSuccess +) { + public static KmcContext ofSuccess(String certNum, Long expiration) { + return new KmcContext(certNum, expiration, true); + } + + public static KmcContext ofFailure(String certNum) { + return new KmcContext(certNum, 0L, false); + } + + public Token toToken() { + return Token.of( + this.certNum, + this.expiration + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcIssueTxEvent.java b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcIssueTxEvent.java new file mode 100644 index 00000000..ecbabf3d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcIssueTxEvent.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.application.auth.kmc.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; + +public class KmcIssueTxEvent extends TxEvent { + + public KmcIssueTxEvent(boolean success, KmcContext context) { + super(success, context); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventFactory.java b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventFactory.java new file mode 100644 index 00000000..49047533 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventFactory.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.application.auth.kmc.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventFactory; +import org.springframework.stereotype.Component; + +@Component +public class KmcTxEventFactory implements TxEventFactory { + + @Override + public TxEvent create(KmcContext context) { + return new KmcIssueTxEvent(context.isSuccess(), context); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventListener.java b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventListener.java new file mode 100644 index 00000000..6e9b6dff --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxEventListener.java @@ -0,0 +1,39 @@ +package life.mosu.mosuserver.application.auth.kmc.tx; + +import life.mosu.mosuserver.domain.auth.signup.Token; +import life.mosu.mosuserver.domain.auth.signup.TokenRepository; +import life.mosu.mosuserver.global.tx.TxFailureHandler; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@Slf4j +@Component +@RequiredArgsConstructor +@Transactional(propagation = Propagation.NOT_SUPPORTED) +public class KmcTxEventListener { + + private final TxFailureHandler kmcFailureHandler; + private final TokenRepository repository; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void afterCommitHandler(KmcIssueTxEvent event) { + KmcContext ctx = event.getContext(); + log.debug("[AFTER_COMMIT] 커밋 후 처리 시작: certNum={}", ctx.certNum()); + Token token = ctx.toToken(); + repository.save(token); + log.debug("[AFTER_COMMIT] 커밋 후 처리 완료: certNum={}", ctx.certNum()); + } + + @TransactionalEventListener(phase = TransactionPhase.AFTER_ROLLBACK) + public void afterRollbackHandler(KmcIssueTxEvent event) { + KmcContext ctx = event.getContext(); + log.debug("[AFTER_ROLLBACK] 롤백 후 처리 시작: certNum={}", ctx.certNum()); + kmcFailureHandler.handle(event); + log.debug("[AFTER_ROLLBACK] 롤백 후 처리 완료: certNum={}", ctx.certNum()); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxFailureHandler.java b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxFailureHandler.java new file mode 100644 index 00000000..d1c02d5f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/kmc/tx/KmcTxFailureHandler.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.auth.kmc.tx; + +import life.mosu.mosuserver.global.exception.AuthenticationException; +import life.mosu.mosuserver.global.tx.TxFailureHandler; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Component +@RequiredArgsConstructor +public class KmcTxFailureHandler implements + TxFailureHandler { + + @Override + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void handle(KmcIssueTxEvent event) { + KmcContext ctx = event.getContext(); + + throw new AuthenticationException("인증 실패", ctx.certNum()); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java b/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java new file mode 100644 index 00000000..bab8cb99 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/processor/SignUpAccountStepProcessor.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.auth.processor; + +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.processor.StepProcessor; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Component +@RequiredArgsConstructor +public class SignUpAccountStepProcessor implements StepProcessor { + + private final UserJpaRepository userRepository; + + @Transactional + @Override + public UserJpaEntity process(UserJpaEntity user) { + if (userRepository.existsByLoginId(user.getLoginId())) { + throw new CustomRuntimeException(ErrorCode.USER_ALREADY_EXISTS); + } + return userRepository.save(user); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/provider/AccessTokenProvider.java b/src/main/java/life/mosu/mosuserver/application/auth/provider/AccessTokenProvider.java new file mode 100644 index 00000000..9c3487b6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/provider/AccessTokenProvider.java @@ -0,0 +1,20 @@ +package life.mosu.mosuserver.application.auth.provider; + +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class AccessTokenProvider extends JwtTokenProvider { + + private static final String TOKEN_TYPE = "Access"; + private static final String HEADER = "Authorization"; + + public AccessTokenProvider( + @Value("${jwt.access-token.expire-time}") final Long expireTime, + @Value("${jwt.secret}") final String secretKey, + final UserJpaRepository userRepository + ) { + super(expireTime, secretKey, TOKEN_TYPE, HEADER, userRepository); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/provider/AuthTokenManager.java b/src/main/java/life/mosu/mosuserver/application/auth/provider/AuthTokenManager.java new file mode 100644 index 00000000..8f344825 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/provider/AuthTokenManager.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.application.auth.provider; + +import life.mosu.mosuserver.application.auth.PrincipalDetails; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.global.cookie.TokenCookies; +import life.mosu.mosuserver.presentation.auth.dto.Token; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class AuthTokenManager { + + private final AccessTokenProvider accessTokenProvider; + private final RefreshTokenProvider refreshTokenProvider; + + public Token generateAuthToken(final UserJpaEntity user) { + final String accessToken = accessTokenProvider.generateJwtToken(user); + final String refreshToken = refreshTokenProvider.generateJwtToken(user); + + return Token.of(JwtTokenProvider.BEARER_TYPE, accessToken, refreshToken, + accessTokenProvider.expireTime, refreshTokenProvider.expireTime); + } + + public Token reissueToken(final TokenCookies tokenCookies) { + + final Authentication authentication = refreshTokenProvider.getAuthentication( + tokenCookies.refreshToken()); + final PrincipalDetails principalDetails = (PrincipalDetails) authentication.getPrincipal(); + final UserJpaEntity user = principalDetails.user(); + refreshTokenProvider.invalidateToken(user.getId()); + + return generateAuthToken(user); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/JwtTokenService.java b/src/main/java/life/mosu/mosuserver/application/auth/provider/JwtTokenProvider.java similarity index 71% rename from src/main/java/life/mosu/mosuserver/application/auth/JwtTokenService.java rename to src/main/java/life/mosu/mosuserver/application/auth/provider/JwtTokenProvider.java index bc90a54a..acc26266 100644 --- a/src/main/java/life/mosu/mosuserver/application/auth/JwtTokenService.java +++ b/src/main/java/life/mosu/mosuserver/application/auth/provider/JwtTokenProvider.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.application.auth; +package life.mosu.mosuserver.application.auth.provider; import io.jsonwebtoken.Claims; import io.jsonwebtoken.ExpiredJwtException; @@ -7,11 +7,11 @@ import io.jsonwebtoken.SignatureAlgorithm; import io.jsonwebtoken.io.Decoders; import io.jsonwebtoken.security.Keys; -import jakarta.servlet.http.HttpServletRequest; import java.security.Key; import java.util.Date; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import life.mosu.mosuserver.domain.user.UserJpaRepository; +import life.mosu.mosuserver.application.auth.PrincipalDetails; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import lombok.extern.slf4j.Slf4j; @@ -19,7 +19,7 @@ import org.springframework.security.core.Authentication; @Slf4j -public abstract class JwtTokenService { +public abstract class JwtTokenProvider { protected static final String TOKEN_TYPE_KEY = "type"; protected static final String BEARER_TYPE = "Bearer"; @@ -30,18 +30,18 @@ public abstract class JwtTokenService { protected final String header; protected final UserJpaRepository userRepository; - protected JwtTokenService( + protected JwtTokenProvider( final Long expireTime, final String secretKey, final String tokenType, final String header, - final UserJpaRepository userJpaRepository + final UserJpaRepository userRepository ) { this.expireTime = expireTime; this.key = Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey)); this.tokenType = tokenType; this.header = header; - this.userRepository = userJpaRepository; + this.userRepository = userRepository; } /** @@ -62,24 +62,6 @@ public String generateJwtToken(final UserJpaEntity user) { .compact(); } - /** - * JWT 토큰을 생성한다. - * - * @param user 토큰을 생성할 회원 - * @return 생성된 토큰 - */ - public String generateAccessToken(final UserJpaEntity user) { - final long now = System.currentTimeMillis(); - final Date expireTime = new Date(now + this.expireTime); - - return Jwts.builder() - .setSubject(user.getLoginId()) - .claim(TOKEN_TYPE_KEY, tokenType) - .setExpiration(expireTime) - .signWith(key, SignatureAlgorithm.HS256) - .compact(); - } - /** * JWT 토큰을 파싱하여 Authentication 객체를 생성한다. * @@ -131,19 +113,4 @@ protected Claims validateAndParseToken(final String token) { throw new CustomRuntimeException(ErrorCode.INVALID_TOKEN_TYPE); } } - - /** - * HttpServletRequest에서 토큰을 추출한다. 토큰이 없는 경우 null을 반환한다. - * - * @param request HttpServletRequest - * @return 추출된 토큰 - */ - public String resolveToken(final HttpServletRequest request) { - final String header = request.getHeader(this.header); - - if (header != null && header.startsWith(BEARER_TYPE)) { - return header.replace(BEARER_TYPE, "").trim(); - } - return null; - } } diff --git a/src/main/java/life/mosu/mosuserver/application/auth/provider/OneTimeTokenProvider.java b/src/main/java/life/mosu/mosuserver/application/auth/provider/OneTimeTokenProvider.java new file mode 100644 index 00000000..fad9b5ad --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/provider/OneTimeTokenProvider.java @@ -0,0 +1,76 @@ +package life.mosu.mosuserver.application.auth.provider; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import io.jsonwebtoken.io.Decoders; +import io.jsonwebtoken.security.Keys; +import java.security.Key; +import java.util.Date; +import life.mosu.mosuserver.domain.auth.signup.Token; +import life.mosu.mosuserver.domain.auth.signup.TokenRepository; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; +@Slf4j +@Service +public class OneTimeTokenProvider { + private final TokenRepository tokenRepository; + private static final String tokenType = "ONE_TIME"; + private static final String TOKEN_TYPE_KEY = "type"; + private static final String PHONE_NUMBER_KEY = "phone"; + + private final Long expireTime; + private final Key key; + + public OneTimeTokenProvider( + @Value("${jwt.access-token.expire-time}") final Long expireTime, + @Value("${jwt.secret}") final String secretKey, + TokenRepository tokenRepository + ) { + this.expireTime = expireTime; + this.key = Keys.hmacShaKeyFor(Decoders.BASE64.decode(secretKey)); + this.tokenRepository = tokenRepository; + } + + public String generateOneTimeToken(String subject, String phoneNumber) { + final long now = System.currentTimeMillis(); + final Date expireTime = new Date(now + this.expireTime); + + return Jwts.builder() + .setSubject(subject) + .claim(PHONE_NUMBER_KEY, phoneNumber) + .claim(TOKEN_TYPE_KEY, tokenType) + .setExpiration(expireTime) + .signWith(key, SignatureAlgorithm.HS256) + .compact(); + } + + public Token getToken(String token) { + Claims claims = parseClaims(token); + String certNum = claims.getSubject(); + return tokenRepository.findByCertNum(certNum); + } + + public String getPhoneNumber(String token) { + + log.info("Claims: {}", token); + Claims claims = parseClaims(token); + log.info("Claims: {}", claims); + return claims.get("phone", String.class); + } + + private Claims parseClaims(String token) { + try { + return Jwts.parserBuilder() + .setSigningKey(key) + .build() + .parseClaimsJws(token) + .getBody(); + } catch (ExpiredJwtException exception) { + return exception.getClaims(); + } + + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/provider/RefreshTokenProvider.java b/src/main/java/life/mosu/mosuserver/application/auth/provider/RefreshTokenProvider.java new file mode 100644 index 00000000..2c78b902 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/provider/RefreshTokenProvider.java @@ -0,0 +1,53 @@ +package life.mosu.mosuserver.application.auth.provider; + +import io.jsonwebtoken.Claims; +import life.mosu.mosuserver.domain.auth.refresh.RefreshToken; +import life.mosu.mosuserver.domain.auth.refresh.RefreshTokenRepository; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Service; + +@Service +public class RefreshTokenProvider extends JwtTokenProvider { + + private static final String TOKEN_TYPE = "Refresh"; + private static final String HEADER = "Refresh-Token"; + private final RefreshTokenRepository refreshTokenRepository; + + public RefreshTokenProvider( + @Value("${jwt.refresh-token.expire-time}") final Long expireTime, + @Value("${jwt.secret}") final String secretKey, + final UserJpaRepository userJpaRepository, + final RefreshTokenRepository refreshTokenRepository + ) { + super(expireTime, secretKey, TOKEN_TYPE, HEADER, userJpaRepository); + this.refreshTokenRepository = refreshTokenRepository; + } + + @Override + protected Claims validateAndParseToken(final String token) { + if (!refreshTokenRepository.existsByRefreshToken(token)) { + throw new CustomRuntimeException(ErrorCode.INVALID_REFRESH_TOKEN); + } + return super.validateAndParseToken(token); + } + + public void invalidateToken(final Long id) { + if (!refreshTokenRepository.existsByUserId(id)) { + throw new CustomRuntimeException(ErrorCode.NOT_FOUND_REFRESH_TOKEN); + } + refreshTokenRepository.deleteByUserId(id); + } + + public void cacheToken(final Long userId, final String refreshToken) { + refreshTokenRepository.save( + RefreshToken.of( + userId, + refreshToken, + expireTime + ) + ); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/auth/support/LoginAttemptProperties.java b/src/main/java/life/mosu/mosuserver/application/auth/support/LoginAttemptProperties.java new file mode 100644 index 00000000..c13fab43 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/support/LoginAttemptProperties.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.application.auth.support; + +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@ConfigurationProperties(prefix = "login") +@Component +@Data +@Validated +public class LoginAttemptProperties { + + @NotNull + private int maxAttempt; + @NotNull + private int lockTimeMilliSeconds; +} diff --git a/src/main/java/life/mosu/mosuserver/application/auth/support/LoginAttemptService.java b/src/main/java/life/mosu/mosuserver/application/auth/support/LoginAttemptService.java new file mode 100644 index 00000000..f9366715 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/auth/support/LoginAttemptService.java @@ -0,0 +1,46 @@ +package life.mosu.mosuserver.application.auth.support; + +import java.time.Duration; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class LoginAttemptService { + + private final static String LOGIN_FAIL_KEY_PREFIX = "login:fail:"; + private final LoginAttemptProperties properties; + + private final StringRedisTemplate redisTemplate; + + public boolean isBlocked(String userId) { + String key = getKey(userId); + String val = redisTemplate.opsForValue().get(key); + if (val == null) { + return false; + } + int attempts = Integer.parseInt(val); + return attempts >= properties.getMaxAttempt(); + } + + @Async + public void loginFailed(String userId) { + String key = getKey(userId); + Long attempts = redisTemplate.opsForValue().increment(key); + if (attempts != null && attempts == 1) { + redisTemplate.expire(key, Duration.ofMillis(properties.getLockTimeMilliSeconds())); + } + } + + @Async + public void loginSucceeded(String userId) { + String key = getKey(userId); + redisTemplate.delete(key); + } + + private String getKey(String userId) { + return LOGIN_FAIL_KEY_PREFIX + userId; + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/event/EventAttachmentService.java b/src/main/java/life/mosu/mosuserver/application/event/EventAttachmentService.java new file mode 100644 index 00000000..9af03bf0 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/event/EventAttachmentService.java @@ -0,0 +1,40 @@ +//package life.mosu.mosuserver.application.event; +// +//import java.util.List; +//import life.mosu.mosuserver.domain.event.EventAttachmentRepository; +//import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +//import life.mosu.mosuserver.infra.persistence.s3.AttachmentService; +//import life.mosu.mosuserver.infra.persistence.s3.FileUploadHelper; +//import life.mosu.mosuserver.presentation.common.FileRequest; +//import lombok.RequiredArgsConstructor; +//import org.springframework.stereotype.Service; +// +//@Service +//@RequiredArgsConstructor +//public class EventAttachmentService implements AttachmentService { +// +// private final EventAttachmentRepository eventAttachmentRepository; +// private final FileUploadHelper fileUploadHelper; +// +// @Override +// public void createAttachment(List request, EventJpaEntity eventEntity) { +// if (request == null || request.isEmpty()) { +// return; +// } +// fileUploadHelper.saveAttachments( +// request, +// eventEntity.getId(), +// eventAttachmentRepository, +// (fileRequest, eventId) -> fileRequest.toEventAttachmentEntity(eventEntity.getId()), +// FileRequest::s3Key +// ); +// } +// +// @Override +// public void deleteAttachment(EventJpaEntity entity) { +// if (eventAttachmentRepository.findByEventId(entity.getId()).isPresent()) { +// eventAttachmentRepository.deleteByEventId(entity.getId()); +// } +// } +// +//} diff --git a/src/main/java/life/mosu/mosuserver/application/event/EventService.java b/src/main/java/life/mosu/mosuserver/application/event/EventService.java new file mode 100644 index 00000000..0fb020ed --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/event/EventService.java @@ -0,0 +1,95 @@ +package life.mosu.mosuserver.application.event; + +import java.util.List; +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +import life.mosu.mosuserver.domain.event.repository.EventJpaRepository; +import life.mosu.mosuserver.domain.event.repository.EventQueryRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.support.CursorResponse; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.event.dto.EventRequest; +import life.mosu.mosuserver.presentation.event.dto.EventResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class EventService { + + private final EventJpaRepository eventJpaRepository; + private final EventQueryRepository eventQueryRepository; + // private final EventAttachmentService attachmentService; + private final S3Service s3Service; + + @Transactional + public void createEvent(EventRequest request) { + EventJpaEntity eventEntity = eventJpaRepository.save(request.toEntity()); +// attachmentService.createAttachment(request.optionalAttachment(), eventEntity); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public CursorResponse getEvents(Long cursorId) { + Slice eventSlice = eventQueryRepository.findAllByCursorId(cursorId); + + List events = eventSlice.getContent().stream() + .map(event -> { + String url = event.getS3Key() != null ? s3Service.getPublicUrl( + event.getS3Key()) : null; + return EventResponse.of(event, url); + }) + .toList(); + + Long nextCursor = eventSlice.hasNext() + ? eventSlice.getContent().getLast().getId() + : null; + + return CursorResponse.of( + events, + eventSlice.isLast(), + eventSlice.getNumberOfElements(), + nextCursor); + } + + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public EventResponse getEventDetail(Long eventId) { + EventJpaEntity eventEntity = eventJpaRepository.findById( + eventId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.EVENT_NOT_FOUND)); + + String eventUrl = eventEntity.getS3Key() != null ? s3Service.getPublicUrl( + eventEntity.getS3Key()) : null; + + return EventResponse.of(eventEntity, eventUrl); + } + + @Transactional + public void update(EventRequest request, Long eventId) { + EventJpaEntity eventEntity = eventJpaRepository.findById(eventId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.EVENT_NOT_FOUND)); + + eventEntity.update( + request.attachment().fileName(), + request.attachment().s3Key(), + request.title(), + request.duration().toDurationJpaVO(), + request.eventLink()); + eventJpaRepository.save(eventEntity); + +// attachmentService.deleteAttachment(eventEntity); +// attachmentService.createAttachment(request.optionalAttachment(), eventEntity); + } + + @Transactional + public void deleteEvent(Long eventId) { + EventJpaEntity eventEntity = eventJpaRepository.findById(eventId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.FILE_NOT_FOUND)); + + eventJpaRepository.delete(eventEntity); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/ExamQuotaService.java b/src/main/java/life/mosu/mosuserver/application/exam/ExamQuotaService.java new file mode 100644 index 00000000..d83ddbbf --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/ExamQuotaService.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.application.exam; + +import java.util.function.Consumer; +import life.mosu.mosuserver.application.exam.resolver.ExamQuotaEventResolver; +import life.mosu.mosuserver.presentation.exam.dto.event.ExamQuotaEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ExamQuotaService { + + private final ExamQuotaEventResolver resolver; + + public void handleExamQuotaEvent(ExamQuotaEvent event) { + Consumer handler = resolver.resolve(event); + handler.accept(event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/ExamService.java b/src/main/java/life/mosu/mosuserver/application/exam/ExamService.java new file mode 100644 index 00000000..8d47026e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/ExamService.java @@ -0,0 +1,74 @@ +package life.mosu.mosuserver.application.exam; + +import java.util.List; +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.domain.exam.entity.Area; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.exam.dto.ExamRequest; +import life.mosu.mosuserver.presentation.exam.dto.ExamResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ExamService { + + private final ExamJpaRepository examJpaRepository; + private final ExamQuotaCacheManager examQuotaCacheManager; + + @Transactional + public void register(ExamRequest request) { + ExamJpaEntity exam = request.toEntity(); + examJpaRepository.save(exam); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public List getByArea(String areaName) { + Area area = Area.from(areaName); + List foundExams = examJpaRepository.findByArea(area); + + return foundExams.stream() + .map(exam -> { + Long count = examQuotaCacheManager.getCurrentApplications( + exam.getId()).orElse(null); + return ExamResponse.of(exam, count); + }) + .toList(); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public List getDistinctAreas() { + return examJpaRepository.findDistinctAreas().stream() + .map(Area::getAreaName) + .toList(); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public List getExams() { + List exams = examJpaRepository.findAll(); + return exams.stream() + .map(exam -> { + Long count = examQuotaCacheManager.getCurrentApplications( + exam.getId()).orElse(null); + return ExamResponse.of(exam, count); + }) + .toList(); + } + + @Transactional + public void delete(Long examId) { + examJpaRepository.deleteById(examId); + } + + @Transactional + public void close(Long examId) { + ExamJpaEntity exam = examJpaRepository.findById(examId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND)); + exam.close(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/cache/AtomicExamQuotaDecrementOperator.java b/src/main/java/life/mosu/mosuserver/application/exam/cache/AtomicExamQuotaDecrementOperator.java new file mode 100644 index 00000000..85679e97 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/cache/AtomicExamQuotaDecrementOperator.java @@ -0,0 +1,53 @@ +package life.mosu.mosuserver.application.exam.cache; + +import java.util.List; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.persistence.redis.operator.VoidCacheAtomicOperator; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.DefaultRedisScript; +import org.springframework.stereotype.Component; + +@Component +public class AtomicExamQuotaDecrementOperator implements VoidCacheAtomicOperator { + + private final RedisTemplate redisTemplate; + private final DefaultRedisScript decrementScript; + + public AtomicExamQuotaDecrementOperator( + RedisTemplate redisTemplate, + @Qualifier("decrementExamQuotaScript") DefaultRedisScript decrementScript + ) { + this.redisTemplate = redisTemplate; + this.decrementScript = decrementScript; + } + + @Override + public void execute(String key) { + try { + Long result = redisTemplate.execute(decrementScript, List.of( + ExamQuotaPrefix.CURRENT_APPLICATIONS.with(key) + )); + if (result == null) { + throw new RuntimeException("Failed to execute decrement Lua script"); + } + } catch (Exception e) { + String msg = e.getMessage(); + if (msg != null && msg.contains("Current value is already zero or negative")) { + throw new CustomRuntimeException(ErrorCode.EXAM_QUOTA_ZERO_OR_NEGATIVE); + } + throw new CustomRuntimeException(ErrorCode.LUA_SCRIPT_ERROR); + } + } + + @Override + public String getName() { + return "examQuota"; + } + + @Override + public String getActionName() { + return OperationType.DECREMENT.key(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/cache/AtomicExamQuotaIncrementOperator.java b/src/main/java/life/mosu/mosuserver/application/exam/cache/AtomicExamQuotaIncrementOperator.java new file mode 100644 index 00000000..ef7657b2 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/cache/AtomicExamQuotaIncrementOperator.java @@ -0,0 +1,57 @@ +package life.mosu.mosuserver.application.exam.cache; + +import java.util.List; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.persistence.redis.operator.VoidCacheAtomicOperator; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.DefaultRedisScript; +import org.springframework.stereotype.Component; + +@Component +public class AtomicExamQuotaIncrementOperator implements VoidCacheAtomicOperator { + + private final RedisTemplate redisTemplate; + private final DefaultRedisScript decrementScript; + + public AtomicExamQuotaIncrementOperator( + RedisTemplate redisTemplate, + @Qualifier("incrementExamQuotaScript") DefaultRedisScript decrementScript + ) { + this.redisTemplate = redisTemplate; + this.decrementScript = decrementScript; + } + + @Override + public String getName() { + return "examQuota"; + } + + @Override + public String getActionName() { + return OperationType.INCREMENT.key(); + } + + @Override + public void execute(String key) { + try { + Long result = redisTemplate.execute(decrementScript, List.of( + ExamQuotaPrefix.CURRENT_APPLICATIONS.with(key), + ExamQuotaPrefix.MAX_CAPACITY.with(key) + )); + if (result == null) { + throw new RuntimeException("Failed to execute increment Lua script"); + } + } catch (Exception e) { + String msg = e.getMessage(); + if (msg != null && msg.contains("Current or Max Capacity is nil")) { + throw new CustomRuntimeException(ErrorCode.EXAM_QUOTA_NOT_FOUND); + } + if (msg != null && msg.contains("Current value has reached the maximum capacity")) { + throw new CustomRuntimeException(ErrorCode.EXAM_QUOTA_EXCEEDED); + } + throw new CustomRuntimeException(ErrorCode.LUA_SCRIPT_ERROR); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaCacheManager.java b/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaCacheManager.java new file mode 100644 index 00000000..a0056cc3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaCacheManager.java @@ -0,0 +1,143 @@ +package life.mosu.mosuserver.application.exam.cache; + +import java.time.LocalDate; +import java.util.Map; +import java.util.Optional; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.persistence.redis.KeyValueCacheManager; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheAtomicOperator; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheLoader; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheReader; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheWriter; +import life.mosu.mosuserver.infra.persistence.redis.operator.VoidCacheAtomicOperator; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Component +@Transactional +@Slf4j +public class ExamQuotaCacheManager extends KeyValueCacheManager { + + private final ExamJpaRepository examJpaRepository; + + public ExamQuotaCacheManager( + CacheLoader cacheLoader, + CacheWriter cacheWriter, + CacheReader cacheReader, + + @Qualifier("examCacheAtomicOperatorMap") + Map> cacheAtomicOperatorMap, + ExamJpaRepository examJpaRepository + ) { + super(cacheLoader, cacheWriter, cacheReader, cacheAtomicOperatorMap); + this.examJpaRepository = examJpaRepository; + } + + public Optional getMaxCapacity(Long examId) { + String key = ExamQuotaPrefix.MAX_CAPACITY.with(examId); + return cacheReader.read(key) + .or(() -> examJpaRepository.findByIdAndExamDateAfter(examId, LocalDate.now()) + .map(exam -> { + Long maxCapacity = exam.getCapacity().longValue(); + cacheWriter.writeOrUpdate(key, maxCapacity); + return maxCapacity; + })); + } + + public Optional getCurrentApplications(Long examId) { + String key = ExamQuotaPrefix.CURRENT_APPLICATIONS.with(examId); + return cacheReader.read(key) + .or(() -> examJpaRepository.countApplicationsByExamIdGroupedByExamId(examId) + .map(exam -> { + Long currentApplications = exam.applicationCount(); + cacheWriter.writeOrUpdate(key, currentApplications); + return currentApplications; + })); + } + + public void setMaxCapacity(Long examId, Long maxCapacity) { + String key = ExamQuotaPrefix.MAX_CAPACITY.with(examId); + cacheWriter.writeOrUpdate(key, maxCapacity); + } + + public void setCurrentApplications(Long examId, Long currentApplications) { + String key = ExamQuotaPrefix.CURRENT_APPLICATIONS.with(examId); + cacheWriter.writeOrUpdate(key, currentApplications); + } + + public void deleteMaxCapacity(Long examId) { + String key = ExamQuotaPrefix.MAX_CAPACITY.with(examId); + cacheWriter.delete(key); + } + + public void deleteCurrentApplications(Long examId) { + String key = ExamQuotaPrefix.CURRENT_APPLICATIONS.with(examId); + cacheWriter.delete(key); + } + + public void increaseCurrentApplications(Long examId) { + executeWithFallback(examId, OperationType.INCREMENT); + } + + public void decreaseCurrentApplications(Long examId) { + executeWithFallback(examId, OperationType.DECREMENT); + } + + public void loadMaxCapacities(Map maxCapacities) { + maxCapacities.forEach(this::setMaxCapacity); + } + + public void loadCurrentApplications(Map currentApplications) { + currentApplications.forEach(this::setCurrentApplications); + } + + private void executeWithFallback(Long examId, OperationType operationType) { + + VoidCacheAtomicOperator operator = + (VoidCacheAtomicOperator) cacheAtomicOperatorMap.get( + operationType.key()); + if (operator == null) { + log.error("Unsupported cache operation key: {}", operationType.key()); + throw new CustomRuntimeException(ErrorCode.CACHE_OPERATION_NOT_SUPPORTED); + } + try { + operator.execute(examId.toString()); + } catch (Exception e) { + log.warn("Cache {} failed for examId={}, fallback to DB", operationType.key(), examId, + e); + + if (!recoverAndRetry(examId, operator, operationType.key())) { + throw new CustomRuntimeException(ErrorCode.CACHE_UPDATE_FAIL); + } + } + } + + private boolean recoverAndRetry( + Long examId, + VoidCacheAtomicOperator operator, + String operationKey + ) { + try { + Long currentCount = examJpaRepository.countApplicationsByExamIdGroupedByExamId(examId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND)) + .applicationCount(); + Long maxCount = examJpaRepository.findByIdAndExamDateAfter(examId, LocalDate.now()) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.EXAM_NOT_FOUND)) + .getCapacity() + .longValue(); + + setCurrentApplications(examId, currentCount); + setMaxCapacity(examId, maxCount); + operator.execute(examId.toString()); + + return true; + } catch (Exception ex) { + log.error("Fallback {} failed for examId={}", operationKey, examId, ex); + return false; + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaLoadService.java b/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaLoadService.java new file mode 100644 index 00000000..f1a2637b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaLoadService.java @@ -0,0 +1,51 @@ +package life.mosu.mosuserver.application.exam.cache; + +import java.time.LocalDate; +import java.util.Objects; +import java.util.concurrent.CompletableFuture; +import java.util.stream.Collectors; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.domain.exam.projection.SchoolExamCountProjection; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class ExamQuotaLoadService { + + private final ExamJpaRepository examJpaRepository; + private final ExamQuotaCacheManager examQuotaCacheManager; + + @Async + @Transactional(readOnly = true) + public CompletableFuture loadMaxCapacities() { + var maxCapacities = examJpaRepository.findByExamDateAfter(LocalDate.now()) + .stream() + .filter(Objects::nonNull) + .collect(Collectors.toMap( + ExamJpaEntity::getId, + e -> e.getCapacity().longValue() + )); + examQuotaCacheManager.loadMaxCapacities(maxCapacities); + return CompletableFuture.completedFuture(null); + } + + @Async + @Transactional(readOnly = true) + public CompletableFuture loadCurrentApplications() { + var currentApplications = examJpaRepository.countApplicationsGroupedByExamId() + .stream() + .filter(Objects::nonNull) + .collect(Collectors.toMap( + SchoolExamCountProjection::examId, + SchoolExamCountProjection::applicationCount + )); + examQuotaCacheManager.loadCurrentApplications(currentApplications); + return CompletableFuture.completedFuture(null); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaPrefix.java b/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaPrefix.java new file mode 100644 index 00000000..a3688acb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/cache/ExamQuotaPrefix.java @@ -0,0 +1,20 @@ +package life.mosu.mosuserver.application.exam.cache; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Getter +public enum ExamQuotaPrefix { + MAX_CAPACITY("school:max_capacity:"), + CURRENT_APPLICATIONS("school:current_applications:"); + + private final String prefix; + + public String with(Long examId) { + return prefix + examId; + } + public String with(String examId) { + return prefix + examId; + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/cache/OperationType.java b/src/main/java/life/mosu/mosuserver/application/exam/cache/OperationType.java new file mode 100644 index 00000000..3c69276f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/cache/OperationType.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.application.exam.cache; + +public enum OperationType { + INCREMENT, DECREMENT; + + public String key() { + return this.name().toLowerCase(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/exam/initializer/ExamQuotaCacheInitializer.java b/src/main/java/life/mosu/mosuserver/application/exam/initializer/ExamQuotaCacheInitializer.java new file mode 100644 index 00000000..0f94cdc3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/initializer/ExamQuotaCacheInitializer.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.exam.initializer; + +import java.util.concurrent.CompletableFuture; +import life.mosu.mosuserver.application.exam.cache.ExamQuotaLoadService; +import lombok.RequiredArgsConstructor; +import org.springframework.boot.ApplicationArguments; +import org.springframework.boot.ApplicationRunner; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ExamQuotaCacheInitializer implements ApplicationRunner { + + private final ExamQuotaLoadService loadService; + + /** + * 병렬 실행으로 초기 Cache 로드 속도 최적화 + */ + @Override + public void run(ApplicationArguments args) { + CompletableFuture maxCapFuture = loadService.loadMaxCapacities(); + CompletableFuture currAppFuture = loadService.loadCurrentApplications(); + + CompletableFuture.allOf(maxCapFuture, currAppFuture).join(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/exam/resolver/ExamQuotaEventResolver.java b/src/main/java/life/mosu/mosuserver/application/exam/resolver/ExamQuotaEventResolver.java new file mode 100644 index 00000000..d54658a7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/exam/resolver/ExamQuotaEventResolver.java @@ -0,0 +1,64 @@ +package life.mosu.mosuserver.application.exam.resolver; + +import java.util.function.Consumer; +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.presentation.exam.dto.event.ApplicationEventStatus; +import life.mosu.mosuserver.presentation.exam.dto.event.ExamQuotaEvent; +import life.mosu.mosuserver.presentation.exam.dto.event.MaxCapacityStatus; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ExamQuotaEventResolver { + + private final ExamQuotaCacheManager examQuotaCacheManager; + + public Consumer resolve(ExamQuotaEvent event) { + return switch (event.getType()) { + case LOAD -> resolveLoad(event); + case DELETE_ALL -> resolveDeleteAll(event); + case CURRENT_APPLICATION -> resolveCurrentApplication(event); + case MAX_CAPACITY -> resolveMaxCapacity(event); + }; + } + + private Consumer resolveLoad(ExamQuotaEvent event) { + return e -> { + examQuotaCacheManager.setMaxCapacity(e.getExamId(), e.getValue()); + examQuotaCacheManager.setCurrentApplications(e.getExamId(), 0L); + }; + } + + private Consumer resolveDeleteAll(ExamQuotaEvent event) { + return e -> { + examQuotaCacheManager.deleteMaxCapacity(e.getExamId()); + examQuotaCacheManager.deleteCurrentApplications(e.getExamId()); + }; + } + + private Consumer resolveCurrentApplication(ExamQuotaEvent event) { + if (!(event.getStatus() instanceof ApplicationEventStatus status)) { + throw new IllegalArgumentException("Invalid status for CURRENT_APPLICATION event"); + } + + return switch (status) { + case CREATE -> + e -> examQuotaCacheManager.setCurrentApplications(e.getExamId(), e.getValue()); + case INCREASE -> e -> examQuotaCacheManager.increaseCurrentApplications(e.getExamId()); + case DECREASE -> e -> examQuotaCacheManager.decreaseCurrentApplications(e.getExamId()); + case DELETE -> e -> examQuotaCacheManager.deleteCurrentApplications(e.getExamId()); + }; + } + + private Consumer resolveMaxCapacity(ExamQuotaEvent event) { + if (!(event.getStatus() instanceof MaxCapacityStatus status)) { + throw new IllegalArgumentException("Invalid status for MAX_CAPACITY event"); + } + return switch (status) { + case CREATE, UPDATE -> + e -> examQuotaCacheManager.setMaxCapacity(e.getExamId(), e.getValue()); + case DELETE -> e -> examQuotaCacheManager.deleteMaxCapacity(e.getExamId()); + }; + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/examapplication/ExamApplicationService.java b/src/main/java/life/mosu/mosuserver/application/examapplication/ExamApplicationService.java new file mode 100644 index 00000000..8fd8d1ef --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/examapplication/ExamApplicationService.java @@ -0,0 +1,190 @@ +package life.mosu.mosuserver.application.examapplication; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import life.mosu.mosuserver.application.examapplication.dto.RegisterExamApplicationEvent; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.domain.discount.service.FixedQuantityDiscountCalculator; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; +import life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationInfoProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamTicketInfoProjection; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.examapplication.repository.ExamSubjectJpaRepository; +import life.mosu.mosuserver.domain.examapplication.service.ExamNumberGenerationService; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.admin.dto.ExamTicketResponse; +import life.mosu.mosuserver.presentation.common.AddressResponse; +import life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationInfoResponse; +import life.mosu.mosuserver.presentation.examapplication.dto.UpdateSubjectRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class ExamApplicationService { + + private final ExamApplicationJpaRepository examApplicationJpaRepository; + private final ApplicationJpaRepository applicationJpaRepository; + private final ExamSubjectJpaRepository examSubjectJpaRepository; + private final ExamNumberGenerationService examNumberGenerationService; + private final S3Service s3Service; + private final FixedQuantityDiscountCalculator calculator; + + + @Transactional + public List register(RegisterExamApplicationEvent event) { + List examApplicationEntities = event.toEntity(); + examNumberGenerationService.grantTo(examApplicationEntities); + return examApplicationEntities; + } + + @Transactional + public void updateSubjects(Long userId, Long examApplicationId, + UpdateSubjectRequest request) { + + validateUser(userId, examApplicationId); + examSubjectJpaRepository.deleteExamSubjectsWithDonePayment(examApplicationId); + List examSubjects = request.toEntityList(examApplicationId); + examSubjectJpaRepository.saveAll(examSubjects); + + } + + @Transactional(propagation = Propagation.REQUIRES_NEW) + public void deleteExamApplication(Long userId, Long examApplicationId) { + validateUser(userId, examApplicationId); + + ExamApplicationJpaEntity examApplication = examApplicationJpaRepository.findById( + examApplicationId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND)); + Long applicationId = examApplication.getApplicationId(); + + examApplicationJpaRepository.updateDeleteById(examApplicationId); + + if (!examApplicationJpaRepository.existsByApplicationId(applicationId)) { + applicationJpaRepository.deleteWithExamTicketById(applicationId); + } + + examSubjectJpaRepository.deleteByExamApplicationId(examApplicationId); + } + + + @Transactional + public ExamTicketResponse getExamTicket(Long userId, Long examApplicationId) { + ExamTicketInfoProjection examTicketInfo = examApplicationJpaRepository.findExamTicketInfoProjectionById( + userId, examApplicationId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_RESOURCE_ACCESS_DENIED)); + + validateExamTicketOpenDate(examTicketInfo.examDate(), examTicketInfo.examNumber()); + + List examSubjects = examSubjectJpaRepository.findByExamApplicationId( + examApplicationId); + + List subjects = examSubjects.stream() + .map(ExamSubjectJpaEntity::getSubject) + .map(Subject::getSubjectName) + .toList(); + + String s3Key = examTicketInfo.s3Key(); + String examTicketImgUrl = null; + + if (s3Key != null) { + examTicketImgUrl = s3Service.getPreSignedUrl(s3Key); + } + + return ExamTicketResponse.of(examTicketImgUrl, examTicketInfo.userName(), + examTicketInfo.birth(), + examTicketInfo.examNumber(), subjects, examTicketInfo.schoolName()); + + } + + + public ExamApplicationInfoResponse getApplication(Long userId, Long examApplicationId, + Long applicationId) { + validateUser(userId, examApplicationId); + + //상세 조회는 done 만 가능 +// Integer examApplicationCount = paymentJpaRepository.countByExamApplicationId( +// examApplicationId); + List examApplicationEntities = examApplicationJpaRepository.findByApplicationId( + applicationId); + int lunchCount = (int) examApplicationEntities.stream() + .filter(ExamApplicationJpaEntity::getIsLunchChecked) + .count(); + + ExamApplicationInfoProjection examApplicationInfo = examApplicationJpaRepository + .findExamApplicationInfoById(userId, examApplicationId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND)); + + List examSubjects = + examSubjectJpaRepository.findByExamApplicationId(examApplicationId); + + Set subjects = examSubjects.stream() + .map(ExamSubjectJpaEntity::getSubjectName) + .collect(Collectors.toSet()); + //totalAmount 는 Lunch 가격이 포함되었을 수도 있음 + //totalAmount - Lunch 가격으로 getAppliedDiscountAmount() 메소드에 넣어야함. + + Integer totalAmount = examApplicationInfo.paymentAmount().getTotalAmount(); + Integer discountAmount = getAppliedDiscountAmount( + lunchCount > 0 ? totalAmount - (9000 * lunchCount) + : totalAmount); + + Integer paymentAmount = + examApplicationInfo.paymentAmount().getTotalAmount() + discountAmount; + + return ExamApplicationInfoResponse.of( + examApplicationInfo.examApplicationId(), + examApplicationInfo.paymentKey(), + examApplicationInfo.examDate(), + examApplicationInfo.schoolName(), + AddressResponse.from(examApplicationInfo.address()), + subjects, + examApplicationInfo.isLunchChecked() ? examApplicationInfo.lunchName() : "신청 안 함", + paymentAmount, + discountAmount, + examApplicationInfo.paymentMethod().getName() + ); + } + + private void validateUser(Long userId, Long examApplicationId) { + boolean check = examApplicationJpaRepository.existByUserIdAndExamApplicationId( + userId, + examApplicationId); + + if (!check) { + throw new CustomRuntimeException(ErrorCode.USER_NOT_ACCESS_FORBIDDEN); + } + } + + private int getAppliedDiscountAmount(Integer totalAmount) { + try { + return calculator.getAppliedDiscountAmount(totalAmount); + } catch (Exception ex) { + throw new CustomRuntimeException(ErrorCode.PRICE_LOAD_FAILURE); + } + } + + private void validateExamTicketOpenDate(LocalDate examDate, String examNumber) { + + LocalDateTime openDateTime = examDate.minusDays(3).atTime(8, 0); + LocalDateTime now = LocalDateTime.now(); + + if (examNumber == null || now.isBefore(openDateTime)) { + throw new CustomRuntimeException(ErrorCode.EXAM_TICKET_NOT_OPEN); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/examapplication/dto/RegisterExamApplicationEvent.java b/src/main/java/life/mosu/mosuserver/application/examapplication/dto/RegisterExamApplicationEvent.java new file mode 100644 index 00000000..9a4b5b1b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/examapplication/dto/RegisterExamApplicationEvent.java @@ -0,0 +1,41 @@ +package life.mosu.mosuserver.application.examapplication.dto; + +import java.util.List; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.presentation.application.dto.ExamApplicationRequest; + +public record RegisterExamApplicationEvent( + List targetExams, + Long applicationId, + Long userId +) { + + public static RegisterExamApplicationEvent of( + List examApplicationRequests, + Long applicationId, + Long userId + ) { + List targetExams = examApplicationRequests.stream() + .map(request -> new TargetExam(request.examId(), request.isLunchChecked())) + .toList(); + return new RegisterExamApplicationEvent(targetExams, applicationId, userId); + } + + public List toEntity() { + return targetExams.stream() + .map(targetExam -> ExamApplicationJpaEntity.create( + applicationId, + userId, + targetExam.examId(), + targetExam.isLunchChecked() + )) + .toList(); + } + + public record TargetExam( + Long examId, + Boolean isLunchChecked + ) { + + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/faq/FaqAttachmentService.java b/src/main/java/life/mosu/mosuserver/application/faq/FaqAttachmentService.java deleted file mode 100644 index 2c03fed0..00000000 --- a/src/main/java/life/mosu/mosuserver/application/faq/FaqAttachmentService.java +++ /dev/null @@ -1,70 +0,0 @@ -package life.mosu.mosuserver.application.faq; - -import java.time.Duration; -import java.util.List; -import life.mosu.mosuserver.domain.faq.FaqAttachmentJpaEntity; -import life.mosu.mosuserver.domain.faq.FaqAttachmentRepository; -import life.mosu.mosuserver.domain.faq.FaqJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; -import life.mosu.mosuserver.infra.property.S3Properties; -import life.mosu.mosuserver.infra.storage.FileUploadHelper; -import life.mosu.mosuserver.infra.storage.application.AttachmentService; -import life.mosu.mosuserver.infra.storage.application.S3Service; -import life.mosu.mosuserver.presentation.faq.dto.FaqResponse; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Service; - -@Slf4j -@Service -@RequiredArgsConstructor -public class FaqAttachmentService implements AttachmentService { - - private final FaqAttachmentRepository faqAttachmentRepository; - private final FileUploadHelper fileUploadHelper; - private final S3Service s3Service; - private final S3Properties s3Properties; - - - @Override - public void createAttachment(List requests, FaqJpaEntity faqEntity) { - fileUploadHelper.saveAttachments( - requests, - faqEntity.getId(), - faqAttachmentRepository, - (req, id) -> req.toFaqAttachmentEntity( - req.fileName(), - req.s3Key(), - faqEntity.getId() - ), - FileRequest::s3Key - ); - } - - @Override - public void deleteAttachment(FaqJpaEntity entity) { - List attachments = faqAttachmentRepository.findAllByFaqId( - entity.getId()); - faqAttachmentRepository.deleteAll(attachments); - } - - - public List toAttachmentResponses(FaqJpaEntity faq) { - - List attachments = faqAttachmentRepository.findAllByFaqId( - faq.getId()); - - return attachments.stream() - .map(attachment -> new FaqResponse.AttachmentResponse( - attachment.getFileName(), - s3Service.getPreSignedUrl( - attachment.getS3Key(), - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ), - attachment.getS3Key() - )) - .toList(); - } - - -} diff --git a/src/main/java/life/mosu/mosuserver/application/faq/FaqService.java b/src/main/java/life/mosu/mosuserver/application/faq/FaqService.java index 3a2c3e8c..3083bd0b 100644 --- a/src/main/java/life/mosu/mosuserver/application/faq/FaqService.java +++ b/src/main/java/life/mosu/mosuserver/application/faq/FaqService.java @@ -2,7 +2,7 @@ import java.util.List; import life.mosu.mosuserver.domain.faq.FaqJpaEntity; -import life.mosu.mosuserver.domain.faq.FaqRepository; +import life.mosu.mosuserver.domain.faq.FaqJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.presentation.faq.dto.FaqCreateRequest; @@ -21,21 +21,17 @@ @RequiredArgsConstructor public class FaqService { - private final FaqRepository faqRepository; - private final FaqAttachmentService attachmentService; - + private final FaqJpaRepository faqJpaRepository; @Transactional - public void createFaq(FaqCreateRequest request) { - FaqJpaEntity faqEntity = faqRepository.save(request.toEntity()); - - attachmentService.createAttachment(request.attachments(), faqEntity); + public void createFaq(Long userId, FaqCreateRequest request) { + faqJpaRepository.save(request.toEntity(userId)); } @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public List getFaqWithAttachments(int page, int size) { + public List getFaqs(int page, int size) { Pageable pageable = PageRequest.of(page, size, Sort.by("id")); - Page faqPage = faqRepository.findAll(pageable); + Page faqPage = faqJpaRepository.findAll(pageable); return faqPage.stream() .map(this::toFaqResponse) @@ -44,7 +40,7 @@ public List getFaqWithAttachments(int page, int size) { @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) public FaqResponse getFaqDetail(Long faqId) { - FaqJpaEntity faq = faqRepository.findById(faqId) + FaqJpaEntity faq = faqJpaRepository.findById(faqId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.FAQ_NOT_FOUND)); return toFaqResponse(faq); @@ -52,28 +48,22 @@ public FaqResponse getFaqDetail(Long faqId) { @Transactional public void update(FaqUpdateRequest request, Long faqId) { - FaqJpaEntity faqEntity = faqRepository.findById(faqId) + FaqJpaEntity faqEntity = faqJpaRepository.findById(faqId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.FAQ_NOT_FOUND)); faqEntity.update(request.question(), request.answer(), request.author()); - faqRepository.save(faqEntity); - - attachmentService.deleteAttachment(faqEntity); - attachmentService.createAttachment(request.attachments(), faqEntity); + faqJpaRepository.save(faqEntity); } @Transactional public void deleteFaq(Long faqId) { - FaqJpaEntity faqEntity = faqRepository.findById(faqId) - .orElseThrow(() -> new CustomRuntimeException(ErrorCode.FILE_NOT_FOUND)); - faqRepository.delete(faqEntity); - attachmentService.deleteAttachment(faqEntity); + faqJpaRepository.deleteById(faqId); } private FaqResponse toFaqResponse(FaqJpaEntity faq) { - return FaqResponse.of(faq, attachmentService.toAttachmentResponses(faq)); + return FaqResponse.of(faq); } } diff --git a/src/main/java/life/mosu/mosuserver/application/form/FormService.java b/src/main/java/life/mosu/mosuserver/application/form/FormService.java new file mode 100644 index 00000000..1006ff40 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/form/FormService.java @@ -0,0 +1,44 @@ +package life.mosu.mosuserver.application.form; + +import java.util.List; +import life.mosu.mosuserver.domain.form.FormJpaEntity; +import life.mosu.mosuserver.domain.form.FormJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.form.dto.FormListResponse; +import life.mosu.mosuserver.presentation.form.dto.FormResponse; +import life.mosu.mosuserver.presentation.form.dto.RegisterFormRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class FormService { + + private final FormJpaRepository formJpaRepository; + + @Transactional + public void registerForm(RegisterFormRequest request) { + FormJpaEntity form = request.toEntity(); + formJpaRepository.save(form); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public FormResponse getFormId(Long formId) { + FormJpaEntity form = formJpaRepository.findById(formId).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.NOT_FOUND_FORM) + ); + return FormResponse.from(form); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public FormListResponse getAllForms() { + List forms = formJpaRepository.findAll() + .stream() + .map(FormResponse::from) + .toList(); + return FormListResponse.of(forms); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerAttachmentService.java b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerAttachmentService.java index 3b81af73..0440bc91 100644 --- a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerAttachmentService.java +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerAttachmentService.java @@ -1,15 +1,13 @@ package life.mosu.mosuserver.application.inquiry; -import java.time.Duration; import java.util.List; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerAttachmentEntity; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerAttachmentRepository; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; -import life.mosu.mosuserver.infra.property.S3Properties; -import life.mosu.mosuserver.infra.storage.FileUploadHelper; -import life.mosu.mosuserver.infra.storage.application.AttachmentService; -import life.mosu.mosuserver.infra.storage.application.S3Service; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerAttachmentEntity; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerJpaEntity; +import life.mosu.mosuserver.domain.inquiryAnswer.repository.InquiryAnswerAttachmentJpaRepository; +import life.mosu.mosuserver.infra.persistence.s3.AttachmentService; +import life.mosu.mosuserver.infra.persistence.s3.FileUploadHelper; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.common.FileRequest; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -19,8 +17,7 @@ public class InquiryAnswerAttachmentService implements AttachmentService { - private final S3Properties s3Properties; - private final InquiryAnswerAttachmentRepository attachmentRepository; + private final InquiryAnswerAttachmentJpaRepository attachmentRepository; private final FileUploadHelper fileUploadHelper; private final S3Service s3Service; @@ -30,11 +27,7 @@ public void createAttachment(List requests, InquiryAnswerJpaEntity requests, answerEntity.getId(), attachmentRepository, - (req, id) -> req.toInquiryAnswerAttachmentEntity( - req.fileName(), - req.s3Key(), - answerEntity.getId() - ), + (req, id) -> req.toInquiryAnswerAttachmentEntity(answerEntity.getId()), FileRequest::s3Key ); } @@ -62,27 +55,21 @@ public List toAttachmentResponse private InquiryDetailResponse.AttachmentResponse createAttachResponse( InquiryAnswerAttachmentEntity attachment) { - String presignedUrl = s3Service.getPreSignedUrl( - attachment.getS3Key(), - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ); + String preSignedUrl = s3Service.getPreSignedUrl(attachment.getS3Key()); return new InquiryDetailResponse.AttachmentResponse( attachment.getFileName(), - presignedUrl + preSignedUrl ); } private InquiryDetailResponse.AttachmentDetailResponse createAttachDetailResponse( InquiryAnswerAttachmentEntity attachment) { - String presignedUrl = s3Service.getPreSignedUrl( - attachment.getS3Key(), - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ); + String preSignedUrl = s3Service.getPreSignedUrl(attachment.getS3Key()); return new InquiryDetailResponse.AttachmentDetailResponse( attachment.getFileName(), - presignedUrl, + preSignedUrl, attachment.getS3Key() ); } diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerService.java b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerService.java index 55256a40..bac2eda8 100644 --- a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerService.java +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerService.java @@ -1,9 +1,9 @@ package life.mosu.mosuserver.application.inquiry; -import life.mosu.mosuserver.domain.inquiry.InquiryJpaEntity; -import life.mosu.mosuserver.domain.inquiry.InquiryRepository; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerJpaEntity; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerRepository; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiry.repository.InquiryJpaRepository; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerJpaEntity; +import life.mosu.mosuserver.domain.inquiryAnswer.repository.InquiryAnswerJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerRequest; @@ -11,49 +11,58 @@ import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse.InquiryAnswerDetailResponse; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +@Slf4j @Service @RequiredArgsConstructor public class InquiryAnswerService { private final InquiryAnswerAttachmentService answerAttachmentService; - private final InquiryAnswerRepository inquiryAnswerRepository; - private final InquiryRepository inquiryRepository; + private final InquiryAnswerJpaRepository inquiryAnswerJpaRepository; + private final InquiryJpaRepository inquiryJpaRepository; + + private final InquiryAnswerTxService eventTxService; @Transactional public void createInquiryAnswer(Long postId, InquiryAnswerRequest request) { - InquiryJpaEntity inquiryEntity = getInquiryOrThrow(postId); + isAnswerAlreadyRegister(postId); + InquiryJpaEntity inquiryEntity = getInquiry(postId); + Long userId = inquiryEntity.getUserId(); - if (inquiryAnswerRepository.findByInquiryId(postId).isPresent()) { - throw new CustomRuntimeException(ErrorCode.INQUIRY_ANSWER_ALREADY_EXISTS); - } + try { + InquiryAnswerJpaEntity answerEntity = inquiryAnswerJpaRepository.save( + request.toEntity(postId)); - InquiryAnswerJpaEntity answerEntity = inquiryAnswerRepository.save( - request.toEntity(postId)); + answerAttachmentService.createAttachment(request.attachments(), answerEntity); + inquiryEntity.updateStatusToComplete(); - answerAttachmentService.createAttachment(request.attachments(), answerEntity); - inquiryEntity.updateStatusToComplete(); + eventTxService.publishSuccessEvent(userId, postId); + + } catch (Exception ex) { + log.error("문의 답변 등록 실패: {}", ex.getMessage(), ex); + throw ex; + } } @Transactional public void deleteInquiryAnswer(Long postId) { - InquiryJpaEntity inquiryEntity = getInquiryOrThrow(postId); + InquiryJpaEntity inquiryEntity = getInquiry(postId); - InquiryAnswerJpaEntity answerEntity = inquiryAnswerRepository.findByInquiryId(postId) + InquiryAnswerJpaEntity answerEntity = inquiryAnswerJpaRepository.findByInquiryId(postId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.INQUIRY_ANSWER_NOT_FOUND)); - inquiryAnswerRepository.delete(answerEntity); - answerAttachmentService.deleteAttachment(answerEntity); + inquiryAnswerJpaRepository.delete(answerEntity); inquiryEntity.updateStatusToPending(); } @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) public InquiryDetailResponse.InquiryAnswerDetailResponse getInquiryAnswerDetail( Long inquiryId) { - return inquiryAnswerRepository.findByInquiryId(inquiryId) + return inquiryAnswerJpaRepository.findByInquiryId(inquiryId) .map(answer -> InquiryAnswerDetailResponse.of( answer, answerAttachmentService.toAttachmentResponses(answer) @@ -63,22 +72,28 @@ public InquiryDetailResponse.InquiryAnswerDetailResponse getInquiryAnswerDetail( @Transactional public void updateInquiryAnswer(Long postId, InquiryAnswerUpdateRequest request) { - InquiryJpaEntity inquiryEntity = getInquiryOrThrow(postId); + InquiryJpaEntity inquiryEntity = getInquiry(postId); - InquiryAnswerJpaEntity answerEntity = inquiryAnswerRepository.findByInquiryId(postId) + InquiryAnswerJpaEntity answerEntity = inquiryAnswerJpaRepository.findByInquiryId(postId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.INQUIRY_ANSWER_NOT_FOUND)); answerEntity.update(request.title(), request.content()); - inquiryAnswerRepository.save(answerEntity); + inquiryAnswerJpaRepository.save(answerEntity); answerAttachmentService.deleteAttachment(answerEntity); answerAttachmentService.createAttachment(request.attachments(), answerEntity); } - private InquiryJpaEntity getInquiryOrThrow(Long postId) { - return inquiryRepository.findById(postId) + private InquiryJpaEntity getInquiry(Long postId) { + return inquiryJpaRepository.findById(postId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.INQUIRY_NOT_FOUND)); } + private void isAnswerAlreadyRegister(Long postId) { + if (inquiryAnswerJpaRepository.existsByInquiryId(postId)) { + throw new CustomRuntimeException(ErrorCode.INQUIRY_ANSWER_ALREADY_EXISTS); + } + } + } diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerTxService.java b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerTxService.java new file mode 100644 index 00000000..f252ba7d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAnswerTxService.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.inquiry; + +import life.mosu.mosuserver.application.inquiry.tx.InquiryAnswerContext; +import life.mosu.mosuserver.application.inquiry.tx.InquiryAnswerTxEventFactory; +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class InquiryAnswerTxService { + + private final TxEventPublisher txEventPublisher; + private final InquiryAnswerTxEventFactory eventFactory; + + @Transactional + public void publishSuccessEvent(Long userId, Long inquiryId) { + TxEvent event = eventFactory.create(InquiryAnswerContext.ofSuccess(userId, inquiryId)); + txEventPublisher.publish(event); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAttachmentService.java b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAttachmentService.java index 2d913245..0298ff05 100644 --- a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAttachmentService.java +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryAttachmentService.java @@ -1,15 +1,13 @@ package life.mosu.mosuserver.application.inquiry; -import java.time.Duration; import java.util.List; -import life.mosu.mosuserver.domain.inquiry.InquiryAttachmentJpaEntity; -import life.mosu.mosuserver.domain.inquiry.InquiryAttachmentRepository; -import life.mosu.mosuserver.domain.inquiry.InquiryJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; -import life.mosu.mosuserver.infra.property.S3Properties; -import life.mosu.mosuserver.infra.storage.FileUploadHelper; -import life.mosu.mosuserver.infra.storage.application.AttachmentService; -import life.mosu.mosuserver.infra.storage.application.S3Service; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryAttachmentJpaEntity; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiry.repository.InquiryAttachmentJpaRepository; +import life.mosu.mosuserver.infra.persistence.s3.AttachmentService; +import life.mosu.mosuserver.infra.persistence.s3.FileUploadHelper; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.common.FileRequest; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -18,37 +16,32 @@ @RequiredArgsConstructor public class InquiryAttachmentService implements AttachmentService { - private final InquiryAttachmentRepository inquiryAttachmentRepository; + private final InquiryAttachmentJpaRepository inquiryAttachmentJpaRepository; private final FileUploadHelper fileUploadHelper; private final S3Service s3Service; - private final S3Properties s3Properties; @Override public void createAttachment(List requests, InquiryJpaEntity inquiryEntity) { fileUploadHelper.saveAttachments( requests, inquiryEntity.getId(), - inquiryAttachmentRepository, - (req, id) -> req.toInquiryAttachmentEntity( - req.fileName(), - req.s3Key(), - inquiryEntity.getId() - ), + inquiryAttachmentJpaRepository, + (req, id) -> req.toInquiryAttachmentEntity(inquiryEntity.getId()), FileRequest::s3Key ); } @Override public void deleteAttachment(InquiryJpaEntity entity) { - List attachments = inquiryAttachmentRepository.findAllByInquiryId( + List attachments = inquiryAttachmentJpaRepository.findAllByInquiryId( entity.getId()); - inquiryAttachmentRepository.deleteAll(attachments); + inquiryAttachmentJpaRepository.deleteAll(attachments); } public List toAttachmentResponses( InquiryJpaEntity inquiry) { - List attachments = inquiryAttachmentRepository.findAllByInquiryId( + List attachments = inquiryAttachmentJpaRepository.findAllByInquiryId( inquiry.getId()); return attachments.stream() @@ -58,14 +51,11 @@ public List toAttachmentResponse private InquiryDetailResponse.AttachmentDetailResponse createAttachDetailResponse( InquiryAttachmentJpaEntity attachment) { - String presignedUrl = s3Service.getPreSignedUrl( - attachment.getS3Key(), - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ); + String preSignedUrl = s3Service.getPreSignedUrl(attachment.getS3Key()); return new InquiryDetailResponse.AttachmentDetailResponse( attachment.getFileName(), - presignedUrl, + preSignedUrl, attachment.getS3Key() ); } diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryService.java b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryService.java index a7b80fb6..d98d6452 100644 --- a/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryService.java +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/InquiryService.java @@ -1,9 +1,12 @@ package life.mosu.mosuserver.application.inquiry; -import life.mosu.mosuserver.domain.inquiry.InquiryJpaEntity; -import life.mosu.mosuserver.domain.inquiry.InquiryRepository; -import life.mosu.mosuserver.domain.inquiry.InquiryStatus; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerRepository; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryStatus; +import life.mosu.mosuserver.domain.inquiry.repository.InquiryJpaRepository; +import life.mosu.mosuserver.domain.inquiryAnswer.repository.InquiryAnswerJpaRepository; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryCreateRequest; @@ -11,25 +14,30 @@ import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse.InquiryAnswerDetailResponse; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +@Slf4j @Service @RequiredArgsConstructor public class InquiryService { + private final UserJpaRepository userJpaRepository; private final InquiryAttachmentService inquiryAttachmentService; - private final InquiryRepository inquiryRepository; + private final InquiryJpaRepository inquiryJpaRepository; private final InquiryAnswerService inquiryAnswerService; - private final InquiryAnswerRepository inquiryAnswerRepository; + private final InquiryAnswerJpaRepository inquiryAnswerJpaRepository; @Transactional - public void createInquiry(InquiryCreateRequest request) { - InquiryJpaEntity inquiryEntity = inquiryRepository.save(request.toEntity()); - inquiryAttachmentService.createAttachment(request.attachments(), inquiryEntity); + public void createInquiry(UserJpaEntity user, InquiryCreateRequest request) { + InquiryJpaEntity inquiry = inquiryJpaRepository.save(request.toEntity(user)); + + hasPermission(inquiry.getUserId(), user); + inquiryAttachmentService.createAttachment(request.attachments(), inquiry); } @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) @@ -37,35 +45,35 @@ public Page getInquiries( InquiryStatus status, String sortField, boolean asc, - Pageable pageable) { - - return inquiryRepository.searchInquiries(status, sortField, asc, pageable); - + Pageable pageable + ) { + return inquiryJpaRepository.searchInquiries(status, sortField, asc, pageable); } @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public InquiryDetailResponse getInquiryDetail(Long postId) { - InquiryJpaEntity inquiry = getInquiryOrThrow(postId); + public InquiryDetailResponse getInquiryDetail(UserJpaEntity user, Long postId) { + InquiryJpaEntity inquiry = getInquiry(postId); + hasPermission(inquiry.getUserId(), user); return toInquiryDetailResponse(inquiry); } + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public Page getMyInquiry(Long userId, Pageable pageable) { + return inquiryJpaRepository.searchMyInquiry(userId, pageable); + } + @Transactional - public void deleteInquiry(Long postId) { - InquiryJpaEntity inquiryEntity = getInquiryOrThrow(postId); + public void deleteInquiry(UserJpaEntity user, Long postId) { + InquiryJpaEntity inquiry = getInquiry(postId); + hasPermission(inquiry.getUserId(), user); - inquiryAnswerRepository.findByInquiryId(postId).ifPresent(answer -> { + inquiryAnswerJpaRepository.findByInquiryId(postId).ifPresent(answer -> { inquiryAnswerService.deleteInquiryAnswer(postId); }); - inquiryAttachmentService.deleteAttachment(inquiryEntity); - - inquiryRepository.delete(inquiryEntity); - } - - - private InquiryResponse toInquiryResponse(InquiryJpaEntity inquiry) { - return InquiryResponse.of(inquiry); +// inquiryAttachmentService.deleteAttachment(inquiry); + inquiryJpaRepository.delete(inquiry); } private InquiryDetailResponse toInquiryDetailResponse(InquiryJpaEntity inquiry) { @@ -76,9 +84,15 @@ private InquiryDetailResponse toInquiryDetailResponse(InquiryJpaEntity inquiry) inquiryAttachmentService.toAttachmentResponses(inquiry), answer); } - private InquiryJpaEntity getInquiryOrThrow(Long postId) { - return inquiryRepository.findById(postId) + + private InquiryJpaEntity getInquiry(Long postId) { + return inquiryJpaRepository.findById(postId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.INQUIRY_NOT_FOUND)); } + private void hasPermission(Long postUserId, UserJpaEntity user) { + if (user.getUserRole() != UserRole.ROLE_ADMIN && !user.getId().equals(postUserId)) { + throw new CustomRuntimeException(ErrorCode.USER_NOT_ACCESS_FORBIDDEN); + } + } } diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerContext.java b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerContext.java new file mode 100644 index 00000000..82cb6ff8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerContext.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.application.inquiry.tx; + +public record InquiryAnswerContext( + Long userId, + Long inquiryId, + Boolean isSuccess +) { + + public static final InquiryAnswerContext ofSuccess(Long userId, Long inquiryId) { + return new InquiryAnswerContext(userId, inquiryId, true); + } + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEvent.java b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEvent.java new file mode 100644 index 00000000..07de77cb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEvent.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.application.inquiry.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; + +public class InquiryAnswerTxEvent extends TxEvent { + + public InquiryAnswerTxEvent(boolean isSuccess, InquiryAnswerContext context) { + super(isSuccess, context); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEventFactory.java b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEventFactory.java new file mode 100644 index 00000000..4973f906 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEventFactory.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.application.inquiry.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventFactory; +import org.springframework.stereotype.Component; + +@Component +public class InquiryAnswerTxEventFactory implements TxEventFactory { + + @Override + public TxEvent create(InquiryAnswerContext context) { + return new InquiryAnswerTxEvent(context.isSuccess(), context); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEventListener.java b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEventListener.java new file mode 100644 index 00000000..cee545cc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/inquiry/tx/InquiryAnswerTxEventListener.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.application.inquiry.tx; + +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus; +import life.mosu.mosuserver.infra.notify.support.NotifyEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@Slf4j +@Component +@RequiredArgsConstructor +@Transactional(propagation = Propagation.NOT_SUPPORTED) +public class InquiryAnswerTxEventListener { + + private final NotifyEventPublisher notifier; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void afterCommitHandler(InquiryAnswerTxEvent event) { + InquiryAnswerContext ctx = event.getContext(); + log.debug("[AFTER_COMMIT] 문의 답변 등록 후 알림톡 발송 시작: userId={}, inquiryId={}", ctx.userId(), + ctx.inquiryId()); + + sendNotification(ctx.userId(), ctx.inquiryId()); + } + + private void sendNotification(Long userId, Long inquiryId) { + LunaNotificationEvent lunaNotificationEvent = LunaNotificationEvent.create( + LunaNotificationStatus.INQUIRY_ANSWER_SUCCESS, userId, inquiryId); + notifier.notify(lunaNotificationEvent); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/notice/NoticeAttachmentService.java b/src/main/java/life/mosu/mosuserver/application/notice/NoticeAttachmentService.java index 77d0a5c8..4319be53 100644 --- a/src/main/java/life/mosu/mosuserver/application/notice/NoticeAttachmentService.java +++ b/src/main/java/life/mosu/mosuserver/application/notice/NoticeAttachmentService.java @@ -1,17 +1,14 @@ package life.mosu.mosuserver.application.notice; -import java.time.Duration; import java.util.List; -import life.mosu.mosuserver.domain.notice.NoticeAttachmentJpaEntity; -import life.mosu.mosuserver.domain.notice.NoticeAttachmentRepository; -import life.mosu.mosuserver.domain.notice.NoticeJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; -import life.mosu.mosuserver.infra.property.S3Properties; -import life.mosu.mosuserver.infra.storage.FileUploadHelper; -import life.mosu.mosuserver.infra.storage.application.AttachmentService; -import life.mosu.mosuserver.infra.storage.application.S3Service; +import life.mosu.mosuserver.domain.notice.entity.NoticeAttachmentJpaEntity; +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; +import life.mosu.mosuserver.domain.notice.repository.NoticeAttachmentJpaRepository; +import life.mosu.mosuserver.infra.persistence.s3.AttachmentService; +import life.mosu.mosuserver.infra.persistence.s3.FileUploadHelper; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.common.FileRequest; import life.mosu.mosuserver.presentation.notice.dto.NoticeDetailResponse; -import life.mosu.mosuserver.presentation.notice.dto.NoticeResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -21,50 +18,45 @@ @RequiredArgsConstructor public class NoticeAttachmentService implements AttachmentService { - private final NoticeAttachmentRepository noticeAttachmentRepository; + private final NoticeAttachmentJpaRepository noticeAttachmentJpaRepository; private final FileUploadHelper fileUploadHelper; private final S3Service s3Service; - private final S3Properties s3Properties; @Override public void createAttachment(List requests, NoticeJpaEntity noticeEntity) { fileUploadHelper.saveAttachments( requests, noticeEntity.getId(), - noticeAttachmentRepository, - (req, id) -> req.toNoticeAttachmentEntity( - req.fileName(), - req.s3Key(), - noticeEntity.getId() - ), + noticeAttachmentJpaRepository, + (req, id) -> req.toNoticeAttachmentEntity(noticeEntity.getId()), FileRequest::s3Key ); } @Override public void deleteAttachment(NoticeJpaEntity entity) { - List attachments = noticeAttachmentRepository.findAllByNoticeId( + List attachments = noticeAttachmentJpaRepository.findAllByNoticeId( entity.getId()); - noticeAttachmentRepository.deleteAll(attachments); + noticeAttachmentJpaRepository.deleteAll(attachments); } - public List toAttachmentResponses(NoticeJpaEntity notice) { - - List attachments = noticeAttachmentRepository.findAllByNoticeId( - notice.getId()); - - return attachments.stream() - .map(attachment -> new NoticeResponse.AttachmentResponse( - attachment.getFileName(), - fileUrl(attachment.getS3Key()) - )) - .toList(); - } +// public List toAttachmentResponses(NoticeJpaEntity notice) { +// +// List attachments = noticeAttachmentJpaRepository.findAllByNoticeId( +// notice.getId()); +// +// return attachments.stream() +// .map(attachment -> new NoticeResponse.AttachmentResponse( +// attachment.getFileName(), +// fileUrl(attachment.getS3Key()) +// )) +// .toList(); +// } public List toDetailAttResponses( NoticeJpaEntity notice) { - List attachments = noticeAttachmentRepository.findAllByNoticeId( + List attachments = noticeAttachmentJpaRepository.findAllByNoticeId( notice.getId()); return attachments.stream() @@ -78,10 +70,7 @@ public List toDetailAttResponses( } private String fileUrl(String s3Key) { - return s3Service.getPreSignedUrl( - s3Key, - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ); + return s3Service.getPreSignedUrl(s3Key); } } diff --git a/src/main/java/life/mosu/mosuserver/application/notice/NoticeService.java b/src/main/java/life/mosu/mosuserver/application/notice/NoticeService.java index f2a387f6..53bb0e93 100644 --- a/src/main/java/life/mosu/mosuserver/application/notice/NoticeService.java +++ b/src/main/java/life/mosu/mosuserver/application/notice/NoticeService.java @@ -1,8 +1,8 @@ package life.mosu.mosuserver.application.notice; import java.util.List; -import life.mosu.mosuserver.domain.notice.NoticeJpaEntity; -import life.mosu.mosuserver.domain.notice.NoticeRepository; +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; +import life.mosu.mosuserver.domain.notice.repository.NoticeJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.presentation.notice.dto.NoticeCreateRequest; @@ -10,6 +10,7 @@ import life.mosu.mosuserver.presentation.notice.dto.NoticeResponse; import life.mosu.mosuserver.presentation.notice.dto.NoticeUpdateRequest; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Pageable; @@ -18,23 +19,24 @@ import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +@Slf4j @Service @RequiredArgsConstructor public class NoticeService { - private final NoticeRepository noticeRepository; + private final NoticeJpaRepository noticeJpaRepository; private final NoticeAttachmentService attachmentService; @Transactional public void createNotice(NoticeCreateRequest request) { - NoticeJpaEntity noticeEntity = noticeRepository.save(request.toEntity()); + NoticeJpaEntity noticeEntity = noticeJpaRepository.save(request.toEntity()); attachmentService.createAttachment(request.attachments(), noticeEntity); } @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) - public List getNoticeWithAttachments(int page, int size) { + public List getNotices(int page, int size) { Pageable pageable = PageRequest.of(page, size, Sort.by("id")); - Page noticePage = noticeRepository.findAll(pageable); + Page noticePage = noticeJpaRepository.findAll(pageable); return noticePage.stream() .map(this::toNoticeResponse) @@ -51,8 +53,7 @@ public NoticeDetailResponse getNoticeDetail(Long noticeId) { @Transactional public void deleteNotice(Long noticeId) { NoticeJpaEntity noticeEntity = getNoticeOrThrow(noticeId); - noticeRepository.delete(noticeEntity); - attachmentService.deleteAttachment(noticeEntity); + noticeJpaRepository.delete(noticeEntity); } @Transactional @@ -65,7 +66,7 @@ public void updateNotice(Long noticeId, NoticeUpdateRequest request) { } private NoticeResponse toNoticeResponse(NoticeJpaEntity notice) { - return NoticeResponse.of(notice, attachmentService.toAttachmentResponses(notice)); + return NoticeResponse.of(notice); } @@ -77,7 +78,7 @@ private NoticeDetailResponse toNoticeDetailResponse(NoticeJpaEntity notice) { } private NoticeJpaEntity getNoticeOrThrow(Long noticeId) { - return noticeRepository.findById(noticeId) + return noticeJpaRepository.findById(noticeId) .orElseThrow(() -> new CustomRuntimeException(ErrorCode.NOTICE_NOT_FOUND)); } diff --git a/src/main/java/life/mosu/mosuserver/application/notify/NotifyService.java b/src/main/java/life/mosu/mosuserver/application/notify/NotifyService.java new file mode 100644 index 00000000..64edf5f7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/NotifyService.java @@ -0,0 +1,62 @@ +package life.mosu.mosuserver.application.notify; + +import life.mosu.mosuserver.domain.profile.repository.ProfileJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.notify.DiscordNotifier; +import life.mosu.mosuserver.infra.notify.component.NotifySender; +import life.mosu.mosuserver.infra.notify.dto.discord.DiscordExceptionNotifyEventRequest; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; +import life.mosu.mosuserver.infra.notify.resolver.NotifySenderResolver; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Recover; +import org.springframework.retry.annotation.Retryable; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class NotifyService { + + private final ProfileJpaRepository profileJpaRepository; + private final NotifySenderResolver senderResolver; + private final NotifyVariableFactory notifyVariableFactory; + private final DiscordNotifier discordNotifier; + + @Retryable( + maxAttempts = 3, + backoff = @Backoff(delay = 2000), + retryFor = {CustomRuntimeException.class} + ) + public void notify(LunaNotificationEvent event) { + String phone = retrievePhoneNumberByUserId(event.userId()); + LunaNotificationVariable notifyVariable = notifyVariableFactory.create(event); + NotifySender sender = senderResolver.resolve(event.status()); + + sender.send(phone, event, notifyVariable); + log.info("[NotifyService] 알림톡 전송 성공: userId={}, status={}", event.userId(), event.status()); + } + + @Recover + public void recover(CustomRuntimeException exception, LunaNotificationEvent event) { + log.warn( + "[NotifyService] 알림톡 전송 실패: userId={}, status={}, reason={}", + event.userId(), event.status(), exception.getMessage() + ); + DiscordExceptionNotifyEventRequest request = DiscordExceptionNotifyEventRequest.of( + exception.getCause() != null ? exception.getCause().toString() : "N/A", + exception.getMessage(), + event.toString() + ); + discordNotifier.send(request); + } + + private String retrievePhoneNumberByUserId(Long userId) { + return profileJpaRepository.findByUserId(userId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.PROFILE_NOT_FOUND)) + .getPhoneNumberWithoutHyphen(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/NotifyVariableFactory.java b/src/main/java/life/mosu/mosuserver/application/notify/NotifyVariableFactory.java new file mode 100644 index 00000000..2f425bdc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/NotifyVariableFactory.java @@ -0,0 +1,117 @@ +package life.mosu.mosuserver.application.notify; + +import life.mosu.mosuserver.application.notify.dto.ApplicationNotifyRequest; +import life.mosu.mosuserver.application.notify.dto.Exam1DayBeforeNotifyRequest; +import life.mosu.mosuserver.application.notify.dto.Exam1WeekBeforeNotifyRequest; +import life.mosu.mosuserver.application.notify.dto.Exam3DayBeforeNotifyRequest; +import life.mosu.mosuserver.application.notify.dto.InquiryAnswerNotifyRequest; +import life.mosu.mosuserver.application.notify.dto.RefundNotifyRequest; +import life.mosu.mosuserver.application.notify.dto.SignUpNotifyRequest; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationNotifyProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamInfoProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamInfoWithExamNumberProjection; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiry.repository.InquiryJpaRepository; +import life.mosu.mosuserver.domain.refund.projection.RefundNotifyProjection; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class NotifyVariableFactory { + + private final InquiryJpaRepository inquiryJpaRepository; + private final RefundJpaRepository refundJpaRepository; + private final ExamJpaRepository examJpaRepository; + private final ExamApplicationJpaRepository examApplicationRepository; + + public LunaNotificationVariable create(LunaNotificationEvent event) { + return switch (event.status()) { + case INQUIRY_ANSWER_SUCCESS -> + createInquiryAnswerVariable(event.targetId()); // inquiryId + case REFUND_SUCCESS -> createRefundVariable(event.targetId()); // + case APPLICATION_SUCCESS -> + createApplicationVariable(event.targetId()); // examApplicationId + case EXAM_1WEEK_BEFORE_REMINDER_INFO -> + createExam1WeekBeforeVariable(event.targetId()); // examApplicationId + case EXAM_3DAY_BEFORE_REMINDER_INFO -> + createExam3DayBeforeVariable(event.targetId()); // examApplicationId + case EXAM_1DAY_BEFORE_REMINDER_INFO -> + createExam1DayBeforeVariable(event.targetId()); // examApplicationId + case SIGN_UP_SUCCESS -> createSignUpVariable(); + default -> + throw new IllegalArgumentException("지원하지 않는 NotifyStatus: " + event.status()); + }; + } + + private LunaNotificationVariable createSignUpVariable() { + return new SignUpNotifyRequest(); + } + + private LunaNotificationVariable createInquiryAnswerVariable(Long targetId) { + InquiryJpaEntity inquiry = inquiryJpaRepository.findById(targetId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.INQUIRY_NOT_FOUND)); + return new InquiryAnswerNotifyRequest(inquiry.getTitle()); + } + + private LunaNotificationVariable createRefundVariable(Long targetId) { + RefundNotifyProjection projection = refundJpaRepository.findRefundByExamApplicationId( + targetId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.REFUND_NOT_FOUND)); + + return new RefundNotifyRequest( + projection.paymentKey(), projection.examDate(), projection.schoolName(), + projection.refundAmount(), projection.paymentMethod().getName(), projection.reason() + ); + } + + private LunaNotificationVariable createApplicationVariable(Long targetId) { + ExamApplicationNotifyProjection projection = examApplicationRepository.findExamAndPaymentByExamApplicationId( + targetId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND)); + return ApplicationNotifyRequest.from(projection); + } + + private LunaNotificationVariable createExam1WeekBeforeVariable(Long targetId) { + ExamInfoProjection examInfo = examApplicationRepository.findExamInfo(targetId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.APPLICATION_SCHOOL_NOT_FOUND)); + return new Exam1WeekBeforeNotifyRequest( + examInfo.examDate(), + examInfo.paymentKey(), + examInfo.schoolName()); + } + + private LunaNotificationVariable createExam3DayBeforeVariable(Long targetId) { + ExamInfoWithExamNumberProjection examInfoWithExamNumber = examApplicationRepository.findExamInfoWithExamNumber( + targetId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND)); + return new Exam3DayBeforeNotifyRequest( + examInfoWithExamNumber.examDate(), + examInfoWithExamNumber.paymentKey(), + examInfoWithExamNumber.examNumber(), + examInfoWithExamNumber.schoolName()); + } + + private LunaNotificationVariable createExam1DayBeforeVariable(Long targetId) { + ExamInfoWithExamNumberProjection examInfoWithExamNumber = examApplicationRepository.findExamInfoWithExamNumber( + targetId) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND)); + return new Exam1DayBeforeNotifyRequest( + examInfoWithExamNumber.examDate(), + examInfoWithExamNumber.paymentKey(), + examInfoWithExamNumber.examNumber(), + examInfoWithExamNumber.schoolName()); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/NotifyWebhookService.java b/src/main/java/life/mosu/mosuserver/application/notify/NotifyWebhookService.java new file mode 100644 index 00000000..ca1c4008 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/NotifyWebhookService.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.application.notify; + +import life.mosu.mosuserver.domain.notify.entity.NotifyJpaEntity; +import life.mosu.mosuserver.domain.notify.repository.NotifyJpaRepository; +import life.mosu.mosuserver.domain.notify.service.NotifyRetryableDetermineService; +import life.mosu.mosuserver.presentation.notify.NotifyWebhookRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Slf4j +public class NotifyWebhookService { + + private final NotifyRetryableDetermineService determineService; + private final NotifyJpaRepository notifyJpaRepository; + + @Transactional + public void process(NotifyWebhookRequest request) { + NotifyJpaEntity notifyEntity = request.toEntity(); + if (determineService.determine(notifyEntity.getResultCode())) { + notifyJpaRepository.save(notifyEntity); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/ApplicationNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/ApplicationNotifyRequest.java new file mode 100644 index 00000000..95c0523c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/ApplicationNotifyRequest.java @@ -0,0 +1,46 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.MY_PAGE; +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.WARNING_PAGE; + +import java.time.LocalDate; +import java.util.Map; +import life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationNotifyProjection; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record ApplicationNotifyRequest( + String paymentKey, + LocalDate examDate, + String schoolName, + String lunch +) implements LunaNotificationVariable { + + public static ApplicationNotifyRequest from( + ExamApplicationNotifyProjection examApplication) { + + return new ApplicationNotifyRequest(examApplication.paymentKey(), + examApplication.examDate(), examApplication.schoolName(), + examApplication.isLunchChecked() ? examApplication.lunchName() + : "선택 안 함"); + } + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.of(WARNING_PAGE, WARNING_PAGE), + NotificationButtonUrl.of(MY_PAGE, MY_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of( + "paymentKey", paymentKey, + "examDate", examDate.toString(), + "schoolName", schoolName, + "lunch", lunch + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam1DayBeforeNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam1DayBeforeNotifyRequest.java new file mode 100644 index 00000000..87efccea --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam1DayBeforeNotifyRequest.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.MY_PAGE; +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.WARNING_PAGE; + +import java.time.LocalDate; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record Exam1DayBeforeNotifyRequest( + LocalDate examDate, + String paymentKey, + String examNumber, + String schoolName +) implements LunaNotificationVariable { + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.of(WARNING_PAGE, WARNING_PAGE), + NotificationButtonUrl.of(MY_PAGE, MY_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of( + "examDate", examDate.toString(), + "paymentKey", paymentKey, + "examNumber", "examNumber", + "schoolName", schoolName + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam1WeekBeforeNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam1WeekBeforeNotifyRequest.java new file mode 100644 index 00000000..af7dfa3f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam1WeekBeforeNotifyRequest.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.WARNING_PAGE; + +import java.time.LocalDate; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record Exam1WeekBeforeNotifyRequest( + LocalDate examDate, + String paymentKey, + String schoolName +) implements LunaNotificationVariable { + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.of(WARNING_PAGE, WARNING_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of( + "examDate", examDate.toString(), + "paymentKey", paymentKey, + "schoolName", schoolName + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam3DayBeforeNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam3DayBeforeNotifyRequest.java new file mode 100644 index 00000000..bfa87392 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/Exam3DayBeforeNotifyRequest.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.MY_PAGE; +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.WARNING_PAGE; + +import java.time.LocalDate; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record Exam3DayBeforeNotifyRequest( + LocalDate examDate, + String paymentKey, + String examNumber, + String schoolName +) implements LunaNotificationVariable { + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.of(WARNING_PAGE, WARNING_PAGE), + NotificationButtonUrl.of(MY_PAGE, MY_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of( + "examDate", examDate.toString(), + "paymentKey", paymentKey, + "examNumber", examNumber, + "schoolName", schoolName + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/InquiryAnswerNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/InquiryAnswerNotifyRequest.java new file mode 100644 index 00000000..df31b749 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/InquiryAnswerNotifyRequest.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.INQUIRY_PAGE; + +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record InquiryAnswerNotifyRequest( + String title +) implements LunaNotificationVariable { + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.of(INQUIRY_PAGE, INQUIRY_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of( + "inquiryTitle", title + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/RefundNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/RefundNotifyRequest.java new file mode 100644 index 00000000..fee6ff78 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/RefundNotifyRequest.java @@ -0,0 +1,38 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.MY_PAGE; + +import java.time.LocalDate; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record RefundNotifyRequest( + String paymentKey, + LocalDate examDate, + String schoolName, + Integer refundAmount, + String paymentMethod, + String reason +) implements LunaNotificationVariable { + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.of(MY_PAGE, MY_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of( + "paymentKey", paymentKey, + "examDate", examDate.toString(), + "schoolName", schoolName, + "refundAmount", String.valueOf(refundAmount), + "paymentMethod", paymentMethod, + "reason", reason + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/notify/dto/SignUpNotifyRequest.java b/src/main/java/life/mosu/mosuserver/application/notify/dto/SignUpNotifyRequest.java new file mode 100644 index 00000000..6a7c46ba --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/notify/dto/SignUpNotifyRequest.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.notify.dto; + +import static life.mosu.mosuserver.infra.notify.constant.NotifyRedirectUrlConstants.HOME_PAGE; + +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls.NotificationButtonUrl; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; + +public record SignUpNotifyRequest( + +) implements LunaNotificationVariable { + + @Override + public LunaNotificationButtonUrls getNotificationButtonUrls() { + return LunaNotificationButtonUrls.of( + NotificationButtonUrl.empty(), + NotificationButtonUrl.of(HOME_PAGE, HOME_PAGE) + ); + } + + @Override + public Map toMap() { + return Map.of(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUser.java b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUser.java index 4bd41753..271ed746 100644 --- a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUser.java +++ b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUser.java @@ -3,28 +3,33 @@ import java.util.Collection; import java.util.Collections; import java.util.Map; -import life.mosu.mosuserver.domain.user.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; import lombok.Getter; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; -import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.oauth2.core.user.OAuth2User; -public class OAuthUser implements OAuth2User, UserDetails { +@Slf4j +public class OAuthUser implements OAuth2User { @Getter private final UserJpaEntity user; private final Map attributes; private final String attributeKey; + @Getter + Boolean isProfileRegistered; public OAuthUser( final UserJpaEntity user, final Map attributes, - final String attributeKey + final String attributeKey, + final Boolean isProfileRegistered ) { this.user = user; this.attributes = attributes; this.attributeKey = attributeKey; + this.isProfileRegistered = isProfileRegistered; } @Override @@ -44,34 +49,4 @@ public Collection getAuthorities() { new SimpleGrantedAuthority(role) ); } - - @Override - public String getPassword() { - return null; - } - - @Override - public String getUsername() { - return user.getName(); - } - - @Override - public boolean isAccountNonExpired() { - return UserDetails.super.isAccountNonExpired(); - } - - @Override - public boolean isAccountNonLocked() { - return UserDetails.super.isAccountNonLocked(); - } - - @Override - public boolean isCredentialsNonExpired() { - return UserDetails.super.isCredentialsNonExpired(); - } - - @Override - public boolean isEnabled() { - return UserDetails.super.isEnabled(); - } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserInfo.java b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserInfo.java index 5d9d7ed9..60889c4a 100644 --- a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserInfo.java +++ b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserInfo.java @@ -1,17 +1,22 @@ package life.mosu.mosuserver.application.oauth; import java.time.LocalDate; +import java.time.format.DateTimeFormatter; import java.util.Map; -import life.mosu.mosuserver.domain.profile.Gender; +import java.util.Optional; +import life.mosu.mosuserver.domain.profile.entity.Gender; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import lombok.Builder; +import lombok.extern.slf4j.Slf4j; +@Slf4j @Builder public record OAuthUserInfo( String email, String name, Gender gender, + String phoneNumber, LocalDate birthDay ) { @@ -20,36 +25,49 @@ public static OAuthUserInfo of( final Map attributes ) { return switch (oAuthProvider) { - case OAuthProvider.KAKAO -> ofKakao(attributes); + case KAKAO -> ofKakao(attributes); default -> throw new CustomRuntimeException(ErrorCode.UNSUPPORTED_OAUTH2_PROVIDER); }; } private static OAuthUserInfo ofKakao(final Map attributes) { + Map account = Optional.ofNullable( + (Map) attributes.get("kakao_account")) + .orElse(Map.of()); - final Map account = (Map) attributes.get("kakao_account"); - Map profile = null; - String email = null; - String gender = null; - String birthDay = null; - String birthYear = null; - - if (account != null) { - profile = (Map) account.get("profile"); - gender = (String) account.get("gender"); - birthDay = (String) account.get("birthDay"); - birthYear = (String) account.get("birthYear"); - } + String name = (String) account.get("name"); + String email = (String) account.get("email"); + String phoneNumber = Optional.ofNullable((String) account.get("phone_number")) + .map(p -> p.replace("+82 ", "0")) + .orElse(null); + + Gender gender = Optional.ofNullable((String) account.get("gender")) + .map(g -> g.equalsIgnoreCase("male") ? Gender.MALE : Gender.FEMALE) + .orElse(null); - if (profile != null) { - String name = (String) profile.get("name"); + String birthYear = (String) account.get("birthyear"); + String birthday = (String) account.get("birthday"); - return OAuthUserInfo.builder() - .name(name) - .email("test123@gmali.com") - .build(); - } else { - throw new CustomRuntimeException(ErrorCode.FAILED_TO_GET_KAKAO_OAUTH_USER); + LocalDate birthDate = null; + if (birthYear != null && birthday != null) { + try { + birthDate = LocalDate.parse(birthYear + birthday, + DateTimeFormatter.ofPattern("yyyyMMdd")); + } catch (Exception e) { + throw new CustomRuntimeException(ErrorCode.DO_NOT_PARSE_KAKAO_BIRTHDAY); + } } + + if (name == null || birthYear == null || birthDate == null || gender == null) { + throw new CustomRuntimeException(ErrorCode.INSUFFICIENT_KAKAO_USER_DATA); + } + + return OAuthUserInfo.builder() + .name(name) + .email(email) + .phoneNumber(phoneNumber) + .gender(gender) + .birthDay(birthDate) + .build(); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserService.java b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserService.java index ab1ca68c..03c64742 100644 --- a/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserService.java +++ b/src/main/java/life/mosu/mosuserver/application/oauth/OAuthUserService.java @@ -2,23 +2,27 @@ import java.time.LocalDate; import java.util.Map; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import life.mosu.mosuserver.domain.user.UserJpaRepository; -import life.mosu.mosuserver.domain.user.UserRole; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.profile.repository.ProfileJpaRepository; +import life.mosu.mosuserver.domain.user.entity.AuthProvider; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService; import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest; import org.springframework.security.oauth2.core.OAuth2AuthenticationException; import org.springframework.security.oauth2.core.user.OAuth2User; import org.springframework.stereotype.Service; - +@Slf4j @Service @RequiredArgsConstructor public class OAuthUserService extends DefaultOAuth2UserService { private final UserJpaRepository userRepository; + private final ProfileJpaRepository profileRepository; @Override public OAuth2User loadUser(final OAuth2UserRequest userRequest) @@ -26,7 +30,8 @@ public OAuth2User loadUser(final OAuth2UserRequest userRequest) final OAuth2User user = super.loadUser(userRequest); final Map oAuth2UserAttributes = user.getAttributes(); - System.out.println("OAuth2User Attributes: " + oAuth2UserAttributes.toString()); + log.info("KKK OAuth2User attributes: {}", oAuth2UserAttributes); + final String registrationId = userRequest.getClientRegistration().getRegistrationId(); final String userNameAttributeName = userRequest.getClientRegistration() .getProviderDetails() @@ -38,20 +43,37 @@ public OAuth2User loadUser(final OAuth2UserRequest userRequest) final UserJpaEntity oAuthUser = updateOrWrite(userInfo); - return new OAuthUser(oAuthUser, oAuth2UserAttributes, userNameAttributeName); + Boolean isProfileRegistered = profileRepository.existsByUserId(oAuthUser.getId()); + + return new OAuthUser(oAuthUser, oAuth2UserAttributes, userNameAttributeName, + isProfileRegistered); } private UserJpaEntity updateOrWrite(final OAuthUserInfo info) { return userRepository.findByLoginId(info.email()) - + .map(existingUser -> { + existingUser.updateOAuthUser( + info.gender(), + info.name(), + info.phoneNumber(), + info.birthDay() != null ? info.birthDay() : LocalDate.of(1900, 1, 1)); + return existingUser; + }) .orElseGet(() -> { final UserJpaEntity newUser = UserJpaEntity.builder() - .loginId(info.email()) - .gender(Gender.MALE) - .name(info.name()) - .password("") - .birth(LocalDate.now()) - .userRole(UserRole.ROLE_USER) + //TODO kakao 정보 null일 경우 후처리 필요, ServiceTerm 승인 시 처리 구현 + .loginId(info.email() != null ? info.email() : "NA") + .gender(info.gender() != null ? info.gender() : Gender.MALE) + .name(info.name() != null ? info.name() : "NA") + .birth(info.birthDay() != null ? info.birthDay() + : LocalDate.EPOCH) + .phoneNumber(info.phoneNumber() != null ? info.phoneNumber() + : "010-0000-0000") + .userRole(UserRole.ROLE_PENDING) + .provider(AuthProvider.KAKAO) + .agreedToTermsOfService(true) + .agreedToPrivacyPolicy(true) + .agreedToMarketing(false) .build(); return userRepository.save(newUser); }); diff --git a/src/main/java/life/mosu/mosuserver/application/payment/OrderIdGenerator.java b/src/main/java/life/mosu/mosuserver/application/payment/OrderIdGenerator.java deleted file mode 100644 index d5b1d1f4..00000000 --- a/src/main/java/life/mosu/mosuserver/application/payment/OrderIdGenerator.java +++ /dev/null @@ -1,12 +0,0 @@ -package life.mosu.mosuserver.application.payment; - -import java.util.UUID; -import org.springframework.stereotype.Component; - -@Component -public class OrderIdGenerator { - - public String generate() { - return UUID.randomUUID().toString(); - } -} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/PaymentConfirmService.java b/src/main/java/life/mosu/mosuserver/application/payment/PaymentConfirmService.java new file mode 100644 index 00000000..ed156fcd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/PaymentConfirmService.java @@ -0,0 +1,73 @@ +package life.mosu.mosuserver.application.payment; + +import java.util.List; +import life.mosu.mosuserver.application.payment.processor.TossPaymentProcessor; +import life.mosu.mosuserver.application.payment.support.PaymentQuotaSyncService; +import life.mosu.mosuserver.application.payment.tx.PaymentEventTxService; +import life.mosu.mosuserver.application.payment.verifier.PaymentVerifier; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.domain.payment.service.PaymentAmountCalculator; +import life.mosu.mosuserver.domain.payment.service.PaymentMapper; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; +import life.mosu.mosuserver.presentation.payment.dto.PaymentRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class PaymentConfirmService { + + private final TossPaymentProcessor tossProcessor; + + private final PaymentVerifier verifier; + private final PaymentJpaRepository paymentJpaRepository; + private final PaymentEventTxService eventTxService; + private final PaymentQuotaSyncService quotaSyncService; + private final PaymentMapper paymentMapper; + private final PaymentAmountCalculator amountCalculator; + + private final ExamApplicationJpaRepository examApplicationJpaRepository; + + @Transactional + public void confirm(Long userId, PaymentRequest request) { + List examApps = examApplicationJpaRepository.findByApplicationId( + request.applicationId()); + if (examApps.isEmpty()) { + throw new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND); + } + + String orderId = request.orderId(); + + int totalAmount = amountCalculator.calculateTotal(examApps); + List examIds = examApps.stream().map(ExamApplicationJpaEntity::getExamId).toList(); + List examAppIds = examApps.stream().map(ExamApplicationJpaEntity::getId).toList(); + Long appId = request.applicationId(); + try { + verifier.verifyAmount(totalAmount, request.amount()); + verifier.checkDuplicateOrder(orderId); + quotaSyncService.sync(examIds); + + ConfirmTossPaymentResponse tossResponse = tossProcessor.process(request); + List entities = paymentMapper.toEntities( + request.applicationId(), + examAppIds, + tossResponse + ); + paymentJpaRepository.saveAll(entities); + + eventTxService.publishSuccessEvent(appId, examAppIds, orderId, userId, + request.amount()); + } catch (Exception ex) { + quotaSyncService.rollbackQuota(examIds); + eventTxService.publishFailureEvent(appId, examAppIds, orderId, userId, + request.amount()); + throw ex; + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/payment/PaymentEvent.java b/src/main/java/life/mosu/mosuserver/application/payment/PaymentEvent.java deleted file mode 100644 index 6b9c4198..00000000 --- a/src/main/java/life/mosu/mosuserver/application/payment/PaymentEvent.java +++ /dev/null @@ -1,35 +0,0 @@ -package life.mosu.mosuserver.application.payment; - -import java.util.List; -import life.mosu.mosuserver.domain.payment.PaymentStatus; - -public record PaymentEvent( - List applicationSchoolIds, - String orderId, - PaymentStatus status, - Integer totalAmount -) { - - public static PaymentEvent ofSuccess(List applicationIds, String orderId, - Integer totalAmount) { - return new PaymentEvent(applicationIds, orderId, PaymentStatus.DONE, totalAmount); - } - - public static PaymentEvent ofCancelled(List applicationIds, String orderId, - Integer totalAmount) { - return new PaymentEvent(applicationIds, orderId, PaymentStatus.CANCELLED_DONE, totalAmount); - } - - public static PaymentEvent ofFailed(List applicationIds, String orderId, - Integer totalAmount) { - return new PaymentEvent(applicationIds, orderId, PaymentStatus.ABORTED, totalAmount); - } - - @Override - public String toString() { - return "PaymentEvent{" + - "orderId='" + orderId + '\'' + - ", status=" + status + - '}'; - } -} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/PaymentEventListener.java b/src/main/java/life/mosu/mosuserver/application/payment/PaymentEventListener.java deleted file mode 100644 index 9d614b1d..00000000 --- a/src/main/java/life/mosu/mosuserver/application/payment/PaymentEventListener.java +++ /dev/null @@ -1,61 +0,0 @@ -package life.mosu.mosuserver.application.payment; - -import life.mosu.mosuserver.domain.payment.PaymentRepository; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.retry.annotation.Backoff; -import org.springframework.retry.annotation.Recover; -import org.springframework.retry.annotation.Retryable; -import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.transaction.event.TransactionPhase; -import org.springframework.transaction.event.TransactionalEventListener; - -@Transactional(propagation = Propagation.NOT_SUPPORTED) -@Component -@Slf4j -@RequiredArgsConstructor -public class PaymentEventListener { - - private final PaymentRepository paymentRepository; - private final PaymentFailureHandler paymentFailureHandler; - - @TransactionalEventListener(phase = TransactionPhase.BEFORE_COMMIT) - public void beforeCommitHandler(PaymentEvent event) { - log.debug("[BEFORE_COMMIT] 커밋 직전 처리: orderId={}", event.orderId()); - // 예: 캐시 업데이트, 커밋 직전 검증 - } - - @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) - public void afterCommitHandler(PaymentEvent event) { - log.info("[AFTER_COMMIT] 커밋 성공 후 처리: orderId={}", event.orderId()); - // 예: 외부 API 호출, 메시지 큐 발행, 알림 전송 - } - - @TransactionalEventListener(phase = TransactionPhase.AFTER_ROLLBACK) - @Retryable( - retryFor = Exception.class, - maxAttempts = 3, - backoff = @Backoff(delay = 2000, multiplier = 2) - ) - public void afterRollbackHandler(PaymentEvent event) { - log.warn("[AFTER_ROLLBACK] 롤백 후 처리 시작: orderId={}", event.orderId()); - paymentFailureHandler.handlePaymentFailure(event); - log.info("[AFTER_ROLLBACK] 롤백 후 처리 완료: orderId={}", event.orderId()); - } - - @TransactionalEventListener(phase = TransactionPhase.AFTER_COMPLETION) - public void afterCompletionHandler(PaymentEvent event) { - log.debug("[AFTER_COMPLETION] 커밋/롤백 후 무조건 처리: orderId={}", event.orderId()); - // 리소스 정리, 상태 초기화 등 - } - - @Recover - public void recoverAfterRollbackHandler(Exception ex, PaymentEvent event) { - log.error("[RECOVER] 롤백 후 처리 재시도 실패: orderId={}, error={}", event.orderId(), - ex.getMessage(), ex); - } - -} - diff --git a/src/main/java/life/mosu/mosuserver/application/payment/PaymentFailureHandler.java b/src/main/java/life/mosu/mosuserver/application/payment/PaymentFailureHandler.java deleted file mode 100644 index 7e515c21..00000000 --- a/src/main/java/life/mosu/mosuserver/application/payment/PaymentFailureHandler.java +++ /dev/null @@ -1,44 +0,0 @@ -package life.mosu.mosuserver.application.payment; - -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; -import life.mosu.mosuserver.domain.payment.PaymentJpaEntity; -import life.mosu.mosuserver.domain.payment.PaymentRepository; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -@Slf4j -@RequiredArgsConstructor -@Component -public class PaymentFailureHandler { - - private final PaymentRepository paymentRepository; - - public void handlePaymentFailure(PaymentEvent event) { - List existingPayments = paymentRepository.findByOrderId(event.orderId()); - Set existingAppIds = existingPayments.stream() - .map(PaymentJpaEntity::getApplicationSchoolId) - .collect(Collectors.toSet()); - - List missingAppSchoolIds = event.applicationSchoolIds().stream() - .filter(appSchoolId -> !existingAppIds.contains(appSchoolId)) - .toList(); - - // 상태 변경 - existingPayments.forEach(payment -> payment.changeStatus(event.status())); - - // 실패 신규 엔티티 생성 ( 배치 후속 처리 필요 ) - List newPayments = missingAppSchoolIds.stream() - .map(appSchoolId -> PaymentJpaEntity.ofFailure( - appSchoolId, - event.orderId(), - event.status(), - event.totalAmount())) - .toList(); - - paymentRepository.saveAll(existingPayments); - paymentRepository.saveAll(newPayments); - } -} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/PaymentPrepareService.java b/src/main/java/life/mosu/mosuserver/application/payment/PaymentPrepareService.java new file mode 100644 index 00000000..88cbc43b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/PaymentPrepareService.java @@ -0,0 +1,34 @@ +package life.mosu.mosuserver.application.payment; + +import java.util.List; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.payment.service.PaymentAmountCalculator; +import life.mosu.mosuserver.domain.payment.service.PaymentOrderIdGenerator; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.payment.dto.PaymentPrepareResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class PaymentPrepareService { + + private final ExamApplicationJpaRepository examApplicationRepo; + private final PaymentAmountCalculator amountCalculator; + private final PaymentOrderIdGenerator orderIdGenerator; + + public PaymentPrepareResponse prepare(Long applicationId) { + List examApplications = examApplicationRepo.findByApplicationId( + applicationId); + if (examApplications.isEmpty()) { + throw new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND); + } + + String orderId = orderIdGenerator.generate(); + int totalAmount = amountCalculator.calculateTotal(examApplications); + + return PaymentPrepareResponse.of(orderId, totalAmount); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/payment/PaymentService.java b/src/main/java/life/mosu/mosuserver/application/payment/PaymentService.java deleted file mode 100644 index e4601b19..00000000 --- a/src/main/java/life/mosu/mosuserver/application/payment/PaymentService.java +++ /dev/null @@ -1,163 +0,0 @@ -package life.mosu.mosuserver.application.payment; - -import static life.mosu.mosuserver.domain.discount.DiscountPolicy.FIXED_QUANTITY; - -import java.util.List; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaRepository; -import life.mosu.mosuserver.domain.discount.DiscountPolicy; -import life.mosu.mosuserver.domain.payment.PaymentJpaEntity; -import life.mosu.mosuserver.domain.payment.PaymentRepository; -import life.mosu.mosuserver.infra.payment.TossPaymentClient; -import life.mosu.mosuserver.infra.payment.dto.ConfirmTossPaymentResponse; -import life.mosu.mosuserver.presentation.payment.dto.CancelPaymentRequest; -import life.mosu.mosuserver.presentation.payment.dto.PaymentPrepareResponse; -import life.mosu.mosuserver.presentation.payment.dto.PaymentRequest; -import life.mosu.mosuserver.presentation.payment.dto.PreparePaymentRequest; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.retry.annotation.Recover; -import org.springframework.retry.annotation.Retryable; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import org.springframework.web.client.HttpStatusCodeException; - -/** - * 영속화 처리 이미 들어올 때 할인 정책을 포함해야함 - */ -@Slf4j -@Service -@RequiredArgsConstructor -public class PaymentService { - - private final ApplicationSchoolJpaRepository applicationSchoolJpaRepository; - private final TossPaymentClient tossPayment; - private final OrderIdGenerator orderIdGenerator; - private final PaymentRepository paymentRepository; - private final ApplicationEventPublisher publisher; - - public PaymentPrepareResponse prepare(PreparePaymentRequest request) { - /** - * 인원 수 redis에 동기화 -> 인원수가 넘어가면, application 까지 rollback - */ - String uuid = orderIdGenerator.generate(); - int applicationCount = request.getSize(); - int totalAmount = DiscountPolicy.calculate(FIXED_QUANTITY, applicationCount); - - return PaymentPrepareResponse.of(uuid, totalAmount); - } - - @Transactional - @Retryable(retryFor = {HttpStatusCodeException.class}) - public void confirm(PaymentRequest request) { - String orderId = request.orderId(); - List applicationSchoolIds = request.applicationSchoolIds(); - Integer amount = request.amount(); - try { - checkApplicationsExist(applicationSchoolIds); - verifyAmount(request.applicantSize(), request.amount()); - checkDuplicatePayment(orderId); - ConfirmTossPaymentResponse response = confirmPaymentWithToss(request); - List paymentEntities = mapToPaymentEntities(request, response); - verifyPaymentSuccess(paymentEntities); - savePayments(paymentEntities); - publisher.publishEvent(PaymentEvent.ofSuccess(applicationSchoolIds, orderId, amount)); - } catch (Exception ex) { - log.error("error : {}", ex.getMessage()); - publisher.publishEvent(PaymentEvent.ofFailed(applicationSchoolIds, orderId, amount)); - throw ex; - } - } - - @Recover - public void recoverConfirm() { - - } - - @Transactional - public void cancel(String paymentId, CancelPaymentRequest request) { - //환불이 가능한가? - tossPayment.cancelPayment(paymentId, request); - // 환불 정책 - // 영속화 해지할 필요 X - // 영속화 된 거에서 환불 상태로 변경 - } - - - private void checkApplicationsExist(List applicationIds) { - boolean existsAll = applicationSchoolJpaRepository.existsAllByIds(applicationIds, - applicationIds.size()); - if (!existsAll) { - log.warn("Application IDs not found: {}", applicationIds); - throw new RuntimeException("존재하지 않는 신청입니다."); - } - } - - private void verifyAmount(int applicationCount, int requestedAmount) { - int expectedAmount = DiscountPolicy.calculate(FIXED_QUANTITY, applicationCount); - if (requestedAmount != expectedAmount) { - log.warn("Payment amount mismatch: requested={}, expected={}", requestedAmount, - expectedAmount); - throw new RuntimeException("결제 금액이 올바르지 않습니다."); - } - } - - private void checkDuplicatePayment(String orderId) { - if (paymentRepository.existsByOrderId(orderId)) { - log.warn("Duplicate payment orderId: {}", orderId); - throw new RuntimeException("이미 존재하는 결제 건 입니다."); - } - } - - private ConfirmTossPaymentResponse confirmPaymentWithToss(PaymentRequest request) { - try { - ConfirmTossPaymentResponse response = tossPayment.confirmPayment(request.toPayload()); - - log.info("Toss payment confirmed successfully: orderId={}", request.orderId()); - return response; -// return new ConfirmTossPaymentResponse( -// "tviva20250702231345mODA4", // paymentKey -// "IDMAoki7azYp8SzQ06LMt12323235", // orderId -// "DONE", // status -// "2025-07-02T23:14:33+09:00", // approvedAt -// 1_000, // totalAmount -// 1_000, // balanceAmount -// 1_000, // suppliedAmount -// 1_000, // vat -// 1_000, // taxFreeAmount -// "간편결제" // method -// ); - } catch (Exception ex) { - log.error("Toss payment confirmation failed for orderId={}", request.orderId(), ex); - throw ex; // @Retryable 에 의해 재시도 됨 - } - } - - private List mapToPaymentEntities(PaymentRequest request, - ConfirmTossPaymentResponse response) { - return request.applicationSchoolIds().stream() - .map(response::toEntity) - .toList(); - } - - private void verifyPaymentSuccess(List paymentEntities) { - List failedIds = paymentEntities.stream() - .filter(p -> !p.getPaymentStatus().isPaySuccess()) - .map(PaymentJpaEntity::getId) - .toList(); - if (!failedIds.isEmpty()) { - log.error("Payment failed for application IDs: {}", failedIds); - throw new RuntimeException("결제가 실패한 신청서가 있습니다: " + failedIds); - } - } - - private void savePayments(List paymentEntities) { - try { - paymentRepository.saveAll(paymentEntities); - log.info("Payment records saved for {} payments", paymentEntities.size()); - } catch (Exception ex) { - log.error("Failed to save payment records", ex); - throw ex; // 트랜잭션 롤백 유도 - } - } -} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/cron/PaymentFailureLogCleanup.java b/src/main/java/life/mosu/mosuserver/application/payment/cron/PaymentFailureLogCleanup.java new file mode 100644 index 00000000..0ae0aa2b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/cron/PaymentFailureLogCleanup.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.application.payment.cron; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.payment.repository.PaymentFailureLogJpaRepository; +import life.mosu.mosuserver.global.support.LogCleanup; +import lombok.RequiredArgsConstructor; +import org.quartz.DisallowConcurrentExecution; +import org.springframework.stereotype.Component; + +@DisallowConcurrentExecution +@Component +@RequiredArgsConstructor +public class PaymentFailureLogCleanup implements LogCleanup { + + private final PaymentFailureLogJpaRepository paymentFailureLogJpaRepository; + + @Override + public int deleteLogsBefore(LocalDateTime before) { + return paymentFailureLogJpaRepository.deleteByCreatedAtBefore(before); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/cron/PaymentFailureLogDomainArchiver.java b/src/main/java/life/mosu/mosuserver/application/payment/cron/PaymentFailureLogDomainArchiver.java new file mode 100644 index 00000000..acabbd1b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/cron/PaymentFailureLogDomainArchiver.java @@ -0,0 +1,84 @@ +package life.mosu.mosuserver.application.payment.cron; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.List; +import java.util.Objects; +import life.mosu.mosuserver.application.payment.factory.PaymentFailureLogFactory; +import life.mosu.mosuserver.domain.payment.entity.PaymentFailureLogJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.payment.repository.PaymentFailureLogJpaRepository; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.global.support.DomainArchiver; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.quartz.DisallowConcurrentExecution; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Component +@RequiredArgsConstructor +@DisallowConcurrentExecution +public class PaymentFailureLogDomainArchiver implements DomainArchiver { + + private final static Duration DURATION_HOURS_STANDARD = Duration.ofHours(1); + private final static int BATCH_SIZE = 500; + + private final PaymentFailureLogFactory paymentFailureLogFactory; + + private final PaymentJpaRepository paymentJpaRepository; + private final PaymentFailureLogJpaRepository paymentFailureLogJpaRepository; + + @Override + @Transactional + public void archive() { + List targets = findFailedPayments(); + for (int i = 0; i < targets.size(); i += BATCH_SIZE) { + int end = Math.min(i + BATCH_SIZE, targets.size()); + List batch = targets.subList(i, end); + try { + List logs = batch.stream() + .map(this::createPaymentFailureLog) + .filter(Objects::nonNull) + .toList(); + + if (!logs.isEmpty()) { + paymentFailureLogJpaRepository.saveAllUsingBatch(logs); + paymentJpaRepository.batchDeleteAllWithExamApplications(batch); + log.debug("Successfully archived {} failed payments", batch.size()); + } + } catch (Exception e) { + log.error("Failed to archive batch starting at index {}", i, e); + } + } + } + + @Override + public String getName() { + return "payment"; + } + + private List findFailedPayments() { + Instant threshold = Instant.now().minus(DURATION_HOURS_STANDARD); + LocalDateTime time = LocalDateTime.ofInstant(threshold, ZoneId.systemDefault()); + return paymentJpaRepository.findFailedPayments(time); + } + + private PaymentFailureLogJpaEntity createPaymentFailureLog(PaymentJpaEntity payment) { + return switch (payment.getPaymentStatus()) { + case ABORTED -> paymentFailureLogFactory.create(payment, "토스 페이먼츠 결제가 승인되지 않았습니다"); + case PREPARE, EXPIRED -> + paymentFailureLogFactory.create(payment, "토스 페이먼츠 결제가 만료되었습니다"); + default -> { + log.debug( + "Payment {} is not in a failure state, skipping log creation.", + payment.getId() + ); + yield null; + } + }; + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/factory/PaymentFailureLogFactory.java b/src/main/java/life/mosu/mosuserver/application/payment/factory/PaymentFailureLogFactory.java new file mode 100644 index 00000000..d1c98a13 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/factory/PaymentFailureLogFactory.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.application.payment.factory; + +import com.fasterxml.jackson.databind.ObjectMapper; +import life.mosu.mosuserver.domain.payment.entity.PaymentFailureLogJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.global.factory.AbstractFailureLogFactory; +import org.springframework.stereotype.Component; + +@Component +public class PaymentFailureLogFactory extends + AbstractFailureLogFactory { + + public PaymentFailureLogFactory(ObjectMapper objectMapper) { + super(objectMapper); + } + + @Override + public PaymentFailureLogJpaEntity create(PaymentJpaEntity payment, String reason) { + return new PaymentFailureLogJpaEntity( + payment.getId(), + payment.getExamApplicationId(), + payment.getApplicationId(), + reason, + toJson(payment) + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/processor/TossPaymentProcessor.java b/src/main/java/life/mosu/mosuserver/application/payment/processor/TossPaymentProcessor.java new file mode 100644 index 00000000..fb973b95 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/processor/TossPaymentProcessor.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.payment.processor; + +import life.mosu.mosuserver.global.processor.StepProcessor; +import life.mosu.mosuserver.infra.toss.TossPaymentClient; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; +import life.mosu.mosuserver.presentation.payment.dto.PaymentRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class TossPaymentProcessor implements + StepProcessor { + + private final TossPaymentClient tossPayment; + + public ConfirmTossPaymentResponse process(PaymentRequest request) { + try { + return tossPayment.confirmPayment(request.toPayload()); + } catch (Exception ex) { + throw new RuntimeException("Toss 결제 실패", ex); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/support/PaymentQuotaSyncService.java b/src/main/java/life/mosu/mosuserver/application/payment/support/PaymentQuotaSyncService.java new file mode 100644 index 00000000..b1583637 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/support/PaymentQuotaSyncService.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.payment.support; + +import java.util.List; +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.global.support.SyncService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class PaymentQuotaSyncService implements SyncService> { + + private final ExamQuotaCacheManager cacheManager; + + @Override + public void sync(List examIds) { + examIds.forEach(cacheManager::increaseCurrentApplications); + } + + @Override + public void rollbackQuota(List examIds) { + examIds.forEach(cacheManager::decreaseCurrentApplications); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentContext.java b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentContext.java new file mode 100644 index 00000000..ca138955 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentContext.java @@ -0,0 +1,49 @@ +package life.mosu.mosuserver.application.payment.tx; + +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentStatus; + +public record PaymentContext( + Long applicationId, + List examSchoolIds, + String orderId, + Long userId, + Boolean isSuccess, + PaymentStatus status, + Integer totalAmount +) { + + public static PaymentContext ofSuccess( + Long applicationId, + List examSchoolIds, + String orderId, + Long userId, + Integer totalAmount) { + return new PaymentContext( + applicationId, + examSchoolIds, + orderId, + userId, + true, + PaymentStatus.DONE, + totalAmount + ); + } + + public static PaymentContext ofFailure( + Long applicationId, + List examSchoolIds, + String orderId, + Long userId, + Integer totalAmount) { + return new PaymentContext( + applicationId, + examSchoolIds, + orderId, + userId, + false, + PaymentStatus.ABORTED, + totalAmount + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentEventTxService.java b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentEventTxService.java new file mode 100644 index 00000000..275cd7c3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentEventTxService.java @@ -0,0 +1,45 @@ +package life.mosu.mosuserver.application.payment.tx; + +import java.util.List; +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class PaymentEventTxService { + + private final TxEventPublisher txEventPublisher; + private final PaymentTxEventFactory eventFactory; + + @Transactional + public void publishSuccessEvent( + Long applicationId, + List examApplicationIds, + String orderId, + Long userId, + int amount) { + TxEvent event = eventFactory.create( + PaymentContext.ofSuccess(applicationId, examApplicationIds, orderId, userId, + amount)); + txEventPublisher.publish(event); + } + + @Transactional + public void publishFailureEvent( + Long applicationId, + List examApplicationIds, + String orderId, + Long userId, + int amount) { + TxEvent event = eventFactory.create( + PaymentContext.ofFailure(applicationId, examApplicationIds, orderId, userId, + amount)); + txEventPublisher.publish(event); + } +} + diff --git a/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEvent.java b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEvent.java new file mode 100644 index 00000000..31b42c6c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEvent.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.application.payment.tx; + + +import life.mosu.mosuserver.global.tx.TxEvent; + + +public class PaymentTxEvent extends TxEvent { + + public PaymentTxEvent(boolean success, PaymentContext context) { + super(success, context); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEventFactory.java b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEventFactory.java new file mode 100644 index 00000000..5301d8c6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEventFactory.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.application.payment.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventFactory; +import org.springframework.stereotype.Component; + +@Component +public class PaymentTxEventFactory implements TxEventFactory { + + @Override + public TxEvent create(PaymentContext context) { + return new PaymentTxEvent(context.isSuccess(), context); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEventListener.java b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEventListener.java new file mode 100644 index 00000000..5fcab221 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxEventListener.java @@ -0,0 +1,77 @@ +package life.mosu.mosuserver.application.payment.tx; + +import life.mosu.mosuserver.global.tx.TxFailureHandler; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus; +import life.mosu.mosuserver.infra.notify.support.NotifyEventPublisher; +import life.mosu.mosuserver.presentation.application.dto.event.ApplicationStatusChangeEvent; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@Slf4j +@Component +@RequiredArgsConstructor +@Transactional(propagation = Propagation.NOT_SUPPORTED) +public class PaymentTxEventListener { + + private final TxFailureHandler paymentFailureHandler; + private final ApplicationEventPublisher publisher; + private final NotifyEventPublisher notifier; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_ROLLBACK) + public void afterRollbackHandler(PaymentTxEvent event) { + PaymentContext ctx = event.getContext(); + log.warn("[AFTER_ROLLBACK] 롤백 후 처리 시작: orderId={}", ctx.orderId()); + paymentFailureHandler.handle(ctx); + log.info("[AFTER_ROLLBACK] 롤백 후 처리 완료: orderId={}", ctx.orderId()); + publishAbortEvent(ctx.applicationId()); + } + + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void afterCommitHandler(PaymentTxEvent event) { + PaymentContext ctx = event.getContext(); + log.debug("[AFTER_COMMIT] 결제 성공 후 알림톡 발송 시작: orderId={}", ctx.orderId()); + ctx.examSchoolIds().forEach(examSchoolId -> sendNotification(ctx.userId(), examSchoolId)); + publishApproveEvent(ctx.applicationId()); + } + + /** + * 외부 Notification Vendor 에 맞춰서 신청 성공에 대한 알림톡 전송 + * + * @param userId + * @param examSchoolId + */ + private void sendNotification(Long userId, Long examSchoolId) { + LunaNotificationEvent lunaNotificationEvent = LunaNotificationEvent.create( + LunaNotificationStatus.APPLICATION_SUCCESS, userId, examSchoolId); + notifier.notify(lunaNotificationEvent); + } + + /** + * 신청 상태를 ABORT로 처리하는 이벤트를 발행합니다. + * + * @param applicationId + */ + private void publishAbortEvent(Long applicationId) { + log.info("[ROLLBACK] 신청 상태를 ABORT로 처리: applicationId={}", applicationId); + publisher.publishEvent(ApplicationStatusChangeEvent.ofAbort(applicationId)); + } + + /** + * 신청 상태를 APPROVED로 처리하는 이벤트를 발행합니다. + * + * @param applicationId + */ + private void publishApproveEvent(Long applicationId) { + log.info("[COMMIT] 신청 상태를 APPROVED로 처리: applicationId={}", applicationId); + publisher.publishEvent(ApplicationStatusChangeEvent.ofApproved(applicationId)); + } +} + diff --git a/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxFailureHandler.java b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxFailureHandler.java new file mode 100644 index 00000000..9ebd6cdd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/tx/PaymentTxFailureHandler.java @@ -0,0 +1,52 @@ +package life.mosu.mosuserver.application.payment.tx; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.global.tx.TxFailureHandler; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Component +@RequiredArgsConstructor +public class PaymentTxFailureHandler implements + TxFailureHandler { + + private final PaymentJpaRepository paymentJpaRepository; + + @Transactional(propagation = Propagation.REQUIRES_NEW) + @Override + public void handle(PaymentContext ctx) { + + List existingPayments = paymentJpaRepository + .findByOrderId(ctx.orderId()); + + Set existingAppIds = existingPayments.stream() + .map(PaymentJpaEntity::getExamApplicationId) + .collect(Collectors.toSet()); + + List missingExamSchoolIds = ctx.examSchoolIds().stream() + .filter(examSchoolId -> !existingAppIds.contains(examSchoolId)) + .toList(); + + existingPayments.forEach(payment -> payment.changeStatus(ctx.status())); + + List newPayments = missingExamSchoolIds.stream() + .map(examSchoolId -> PaymentJpaEntity.ofFailure( + examSchoolId, + ctx.orderId(), + ctx.status(), + ctx.totalAmount()) + ) + .toList(); + + paymentJpaRepository.saveAll(existingPayments); + paymentJpaRepository.saveAll(newPayments); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/payment/verifier/PaymentVerifier.java b/src/main/java/life/mosu/mosuserver/application/payment/verifier/PaymentVerifier.java new file mode 100644 index 00000000..6c08c7db --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/payment/verifier/PaymentVerifier.java @@ -0,0 +1,29 @@ +package life.mosu.mosuserver.application.payment.verifier; + +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.domain.payment.service.PaymentAmountCalculator; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class PaymentVerifier { + + private final PaymentJpaRepository paymentJpaRepository; + private final PaymentAmountCalculator amountCalculator; + public void verifyAmount(int actualAmount, int requestAmount) { + try{ + amountCalculator.verifyAmount(actualAmount, requestAmount); + }catch (IllegalArgumentException | CustomRuntimeException ex) { + throw new CustomRuntimeException(ErrorCode.INVALID_PAYMENT_AMOUNT, ex); + } + } + + public void checkDuplicateOrder(String orderId) { + if (paymentJpaRepository.existsByOrderId(orderId)) { + throw new CustomRuntimeException(ErrorCode.PAYMENT_ALREADY_EXISTS); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/profile/ProfileEventTxService.java b/src/main/java/life/mosu/mosuserver/application/profile/ProfileEventTxService.java new file mode 100644 index 00000000..ff11de3a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/profile/ProfileEventTxService.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.profile; + +import life.mosu.mosuserver.application.profile.tx.ProfileContext; +import life.mosu.mosuserver.application.profile.tx.ProfileTxEventFactory; +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class ProfileEventTxService { + + private final TxEventPublisher txEventPublisher; + private final ProfileTxEventFactory eventFactory; + + @Transactional + public void publishSuccessEvent(Long userId) { + TxEvent event = eventFactory.create(ProfileContext.ofSuccess(userId)); + txEventPublisher.publish(event); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/profile/ProfileService.java b/src/main/java/life/mosu/mosuserver/application/profile/ProfileService.java index 28b76020..2e3c600a 100644 --- a/src/main/java/life/mosu/mosuserver/application/profile/ProfileService.java +++ b/src/main/java/life/mosu/mosuserver/application/profile/ProfileService.java @@ -1,34 +1,54 @@ package life.mosu.mosuserver.application.profile; -import life.mosu.mosuserver.domain.profile.ProfileJpaEntity; -import life.mosu.mosuserver.domain.profile.ProfileJpaRepository; +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; +import life.mosu.mosuserver.domain.profile.repository.ProfileJpaRepository; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.presentation.profile.dto.EditProfileRequest; import life.mosu.mosuserver.presentation.profile.dto.ProfileDetailResponse; -import life.mosu.mosuserver.presentation.profile.dto.ProfileRequest; +import life.mosu.mosuserver.presentation.profile.dto.SignUpProfileRequest; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +@Slf4j @Service @RequiredArgsConstructor public class ProfileService { + private final UserJpaRepository userRepository; private final ProfileJpaRepository profileJpaRepository; + private final ProfileEventTxService eventTxService; + @Transactional - public void registerProfile(Long userId, ProfileRequest request) { - if (profileJpaRepository.existsByUserId(userId)) { - throw new CustomRuntimeException(ErrorCode.PROFILE_ALREADY_EXISTS, userId); + public void registerProfile(Long userId, SignUpProfileRequest request) { + UserJpaEntity user = userRepository.findById(userId).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND, userId) + ); + checkIfProfileExistsForUser(user); + + try { + ProfileJpaEntity profile = request.toEntity(userId); + profileJpaRepository.save(profile); + + user.grantUserRole(); + syncUserInfoFromProfile(user, request); + + eventTxService.publishSuccessEvent(userId); + + } catch (Exception ex) { + log.error("프로필 등록 실패: {}", ex.getMessage(), ex); + throw ex; } - ProfileJpaEntity profile = request.toEntity(userId); - profileJpaRepository.save(profile); } - @Transactional public void editProfile(Long userId, EditProfileRequest request) { ProfileJpaEntity profile = profileJpaRepository.findByUserId(userId) @@ -45,5 +65,18 @@ public ProfileDetailResponse getProfile(Long userId) { return ProfileDetailResponse.from(profile); } + + private void checkIfProfileExistsForUser(UserJpaEntity user) { + if (user.getUserRole() != UserRole.ROLE_PENDING) { + throw new CustomRuntimeException(ErrorCode.PROFILE_ALREADY_EXISTS, user.getId()); + } + } + + private void syncUserInfoFromProfile(UserJpaEntity user, SignUpProfileRequest request) { + if (user.isMosuUser()) { + user.updateUserInfo(request.validatedGender(), request.userName(), + request.phoneNumber(), request.birth()); + } + } } diff --git a/src/main/java/life/mosu/mosuserver/application/profile/RecommenderService.java b/src/main/java/life/mosu/mosuserver/application/profile/RecommenderService.java index 1d3af1fc..7f0b7b5f 100644 --- a/src/main/java/life/mosu/mosuserver/application/profile/RecommenderService.java +++ b/src/main/java/life/mosu/mosuserver/application/profile/RecommenderService.java @@ -1,7 +1,7 @@ package life.mosu.mosuserver.application.profile; -import life.mosu.mosuserver.domain.profile.ProfileJpaEntity; -import life.mosu.mosuserver.domain.profile.ProfileJpaRepository; +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; +import life.mosu.mosuserver.domain.profile.repository.ProfileJpaRepository; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.presentation.profile.dto.RecommenderRegistrationRequest; diff --git a/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileContext.java b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileContext.java new file mode 100644 index 00000000..b3fa40b8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileContext.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.application.profile.tx; + +public record ProfileContext( + Long userId, + Boolean isSuccess +) { + + public static ProfileContext ofSuccess(Long userId) { + return new ProfileContext(userId, true); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEvent.java b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEvent.java new file mode 100644 index 00000000..8bb40db8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEvent.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.application.profile.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; + +public class ProfileTxEvent extends TxEvent { + + public ProfileTxEvent(boolean isSuccess, ProfileContext context) { + super(isSuccess, context); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEventFactory.java b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEventFactory.java new file mode 100644 index 00000000..8c31e05c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEventFactory.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.application.profile.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventFactory; +import org.springframework.stereotype.Component; + +@Component +public class ProfileTxEventFactory implements TxEventFactory { + + @Override + public TxEvent create(ProfileContext context) { + return new ProfileTxEvent(context.isSuccess(), context); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEventListener.java b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEventListener.java new file mode 100644 index 00000000..81d2d730 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/profile/tx/ProfileTxEventListener.java @@ -0,0 +1,34 @@ +package life.mosu.mosuserver.application.profile.tx; + +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus; +import life.mosu.mosuserver.infra.notify.support.NotifyEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@Slf4j +@Component +@RequiredArgsConstructor +@Transactional(propagation = Propagation.NOT_SUPPORTED) +public class ProfileTxEventListener { + + private final NotifyEventPublisher notifier; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void afterCommitHandler(ProfileTxEvent event) { + ProfileContext ctx = event.getContext(); + log.debug("[AFTER_COMMIT] 프로필 등록 후 알림톡 발송 시작: userId={}", ctx.userId()); + sendNotification(ctx.userId()); + } + + private void sendNotification(Long userId) { + LunaNotificationEvent lunaNotificationEvent = LunaNotificationEvent.create( + LunaNotificationStatus.SIGN_UP_SUCCESS, userId); + notifier.notify(lunaNotificationEvent); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/recommendation/RecommendationService.java b/src/main/java/life/mosu/mosuserver/application/recommendation/RecommendationService.java new file mode 100644 index 00000000..c606794b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/recommendation/RecommendationService.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.application.recommendation; + +import life.mosu.mosuserver.domain.recommendation.RecommendationJpaEntity; +import life.mosu.mosuserver.domain.recommendation.RecommendationJpaRepository; +import life.mosu.mosuserver.presentation.recommendation.dto.RecommendationRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class RecommendationService { + + private final RecommendationJpaRepository recommendationJpaRepository; + + @Transactional + public void create(Long userId, RecommendationRequest request) { + RecommendationJpaEntity recommendation = request.toEntity(userId); + recommendationJpaRepository.save(recommendation); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/RefundEventTxService.java b/src/main/java/life/mosu/mosuserver/application/refund/RefundEventTxService.java new file mode 100644 index 00000000..146b7b3c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/RefundEventTxService.java @@ -0,0 +1,47 @@ +package life.mosu.mosuserver.application.refund; + + +import life.mosu.mosuserver.application.refund.tx.RefundContext; +import life.mosu.mosuserver.application.refund.tx.RefundTxEventFactory; +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Service +@RequiredArgsConstructor +public class RefundEventTxService { + + private final TxEventPublisher txEventPublisher; + private final RefundTxEventFactory eventFactory; + + @Transactional + public void publishSuccessEvent( + String transactionKey, + Integer refundAmount, + Long userId, + Long examId, + Long examApplicationId + ) { + TxEvent event = eventFactory.create( + RefundContext.ofSuccess(transactionKey, refundAmount, userId, examId, examApplicationId)); + txEventPublisher.publish(event); + } + + @Transactional + public void publishFailureEvent( + String transactionKey, + Integer refundAmount, + Long userId, + Long examId, + Long examApplicationId + ) { + TxEvent event = eventFactory.create( + RefundContext.ofFailure(transactionKey, refundAmount, userId, examId,examApplicationId)); + txEventPublisher.publish(event); + } +} + diff --git a/src/main/java/life/mosu/mosuserver/application/refund/RefundProcessorRequest.java b/src/main/java/life/mosu/mosuserver/application/refund/RefundProcessorRequest.java new file mode 100644 index 00000000..465a947b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/RefundProcessorRequest.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.application.refund; + +import life.mosu.mosuserver.presentation.payment.dto.CancelPaymentRequest; +import life.mosu.mosuserver.presentation.refund.dto.MergedRefundRequest; + +public record RefundProcessorRequest(MergedRefundRequest request, Integer totalAmount) { + public static RefundProcessorRequest of(MergedRefundRequest request, Integer totalAmount) { + return new RefundProcessorRequest(request, totalAmount); + } + public String paymentKey() { + return request.paymentKey(); + } + public CancelPaymentRequest toPayload() { + return new CancelPaymentRequest( + request.details().refundReason(), + totalAmount + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/RefundService.java b/src/main/java/life/mosu/mosuserver/application/refund/RefundService.java new file mode 100644 index 00000000..ffd8d406 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/RefundService.java @@ -0,0 +1,90 @@ +package life.mosu.mosuserver.application.refund; + +import life.mosu.mosuserver.application.refund.processor.TossRefundProcessor; +import life.mosu.mosuserver.domain.payment.projection.PaymentWithLunchProjection; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.domain.refund.service.RefundPolicyAdapter; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.toss.dto.CancelTossPaymentResponse; +import life.mosu.mosuserver.presentation.refund.dto.MergedRefundRequest; +import life.mosu.mosuserver.presentation.refund.dto.RefundRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Slf4j +@Service +@RequiredArgsConstructor +public class RefundService { + + private final RefundJpaRepository refundJpaRepository; + private final RefundEventTxService eventTxService; + private final RefundPolicyAdapter refundPolicyAdapter; + private final TossRefundProcessor tossRefundProcessor; + private final PaymentJpaRepository paymentJpaRepository; + + @Transactional + public void doProcess(Long userId, MergedRefundRequest request) { + RefundRequest details = request.details(); + String paymentKey = request.paymentKey(); + Long examApplicationId = details.examApplicationId(); + + PaymentWithLunchProjection targetPayment = findPaymentOrThrow(paymentKey, + examApplicationId); + + int totalQuantity = getTotalPaymentCount(paymentKey); + int refundAmount = calculateRefundAmount(totalQuantity, targetPayment.lunchChecked()); + + RefundJpaEntity refundEntity = processRefund(request, refundAmount, + targetPayment.examApplicationId()); + try { + refundJpaRepository.save(refundEntity); + eventTxService.publishSuccessEvent(refundEntity.getTransactionKey(), refundAmount, + userId, targetPayment.examId(), examApplicationId); + } catch (Exception e) { + log.error("환불 이벤트 처리 중 실패", e); + eventTxService.publishFailureEvent(refundEntity.getTransactionKey(), refundAmount, + userId, targetPayment.examId(), examApplicationId); + throw e; + } + } + + private PaymentWithLunchProjection findPaymentOrThrow(String paymentKey, + Long examApplicationId) { + return paymentJpaRepository.findByPaymentKeyWithLunch(paymentKey).stream() + .filter(p -> p.examApplicationId().equals(examApplicationId)) + .findFirst() + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.PAYMENT_NOT_FOUND)); + } + + private int getTotalPaymentCount(String paymentKey) { + return paymentJpaRepository.findByPaymentKey(paymentKey).size(); + } + + private int calculateRefundAmount(int totalQuantity, boolean lunchChecked) { + try { + return refundPolicyAdapter.calculateRefundAmount(totalQuantity, lunchChecked); + } catch (Exception e) { + throw new CustomRuntimeException(ErrorCode.REFUND_CALCULATION_FAILED); + } + } + + private RefundJpaEntity processRefund(MergedRefundRequest request, int refundAmount, + Long examApplicationId) { + try { + RefundProcessorRequest processorRequest = RefundProcessorRequest.of(request, + refundAmount); + CancelTossPaymentResponse response = tossRefundProcessor.process(processorRequest); + log.info("Toss 환불 처리 성공: {}", response); + return response.toEntity(examApplicationId); + } catch (Exception e) { + log.error("Toss 환불 처리 실패", e); + throw e; + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/cron/RefundFailureLogCleanup.java b/src/main/java/life/mosu/mosuserver/application/refund/cron/RefundFailureLogCleanup.java new file mode 100644 index 00000000..fbf50778 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/cron/RefundFailureLogCleanup.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.application.refund.cron; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.refund.repository.RefundFailureLogJpaRepository; +import life.mosu.mosuserver.global.support.LogCleanup; +import lombok.RequiredArgsConstructor; +import org.quartz.DisallowConcurrentExecution; +import org.springframework.stereotype.Component; + +@DisallowConcurrentExecution +@Component +@RequiredArgsConstructor +public class RefundFailureLogCleanup implements LogCleanup { + + private final RefundFailureLogJpaRepository refundFailureLogJpaRepository; + + @Override + public int deleteLogsBefore(LocalDateTime before) { + return refundFailureLogJpaRepository.deleteByCreatedAtBefore(before); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/cron/RefundFailureLogDomainArchiver.java b/src/main/java/life/mosu/mosuserver/application/refund/cron/RefundFailureLogDomainArchiver.java new file mode 100644 index 00000000..4cc6fec6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/cron/RefundFailureLogDomainArchiver.java @@ -0,0 +1,74 @@ +package life.mosu.mosuserver.application.refund.cron; + +import java.time.Duration; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.List; +import java.util.Objects; +import life.mosu.mosuserver.application.refund.factory.RefundFailureLogFactory; +import life.mosu.mosuserver.domain.refund.entity.RefundFailureLogJpaEntity; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.repository.RefundFailureLogJpaRepository; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.global.support.DomainArchiver; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.quartz.DisallowConcurrentExecution; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Component +@RequiredArgsConstructor +@DisallowConcurrentExecution +public class RefundFailureLogDomainArchiver implements DomainArchiver { + + private final static Duration DURATION_HOURS_STANDARD = Duration.ofHours(1); + private final static int BATCH_SIZE = 500; + + private final RefundFailureLogFactory refundFailureLogFactory; + + private final RefundJpaRepository refundJpaRepository; + private final RefundFailureLogJpaRepository refundFailureLogJpaRepository; + + @Override + @Transactional + public void archive() { + List targets = findFailedRefunds(); + log.info("Archiving {} failed refunds", targets.size()); + for (int i = 0; i < targets.size(); i += BATCH_SIZE) { + int end = Math.min(i + BATCH_SIZE, targets.size()); + List batch = targets.subList(i, end); + try { + List logs = batch.stream() + .map(this::createRefundFailureLog) + .filter(Objects::nonNull) + .toList(); + + if (!logs.isEmpty()) { + refundFailureLogJpaRepository.saveAllUsingBatch(logs); + refundJpaRepository.batchDeleteAllWithExamApplications(batch); + log.debug("Successfully archived {} failed refunds", batch.size()); + } + } catch (Exception e) { + log.error("Failed to archive batch starting at index {}", i, e); + } + } + } + + @Override + public String getName() { + return "refund"; + } + + private List findFailedRefunds() { + Instant threshold = Instant.now().minus(DURATION_HOURS_STANDARD); + LocalDateTime time = LocalDateTime.ofInstant(threshold, ZoneId.systemDefault()); + return refundJpaRepository.findFailedRefunds(time); + } + + private RefundFailureLogJpaEntity createRefundFailureLog(RefundJpaEntity refund) { + return refundFailureLogFactory.create(refund, "토스 페이먼츠에서 결제 취소가 승인되지 않았습니다."); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/factory/RefundFailureLogFactory.java b/src/main/java/life/mosu/mosuserver/application/refund/factory/RefundFailureLogFactory.java new file mode 100644 index 00000000..fd57710b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/factory/RefundFailureLogFactory.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.application.refund.factory; + +import com.fasterxml.jackson.databind.ObjectMapper; +import life.mosu.mosuserver.domain.refund.entity.RefundFailureLogJpaEntity; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.global.factory.AbstractFailureLogFactory; +import org.springframework.stereotype.Component; + +@Component +public class RefundFailureLogFactory extends + AbstractFailureLogFactory { + + public RefundFailureLogFactory(ObjectMapper objectMapper) { + super(objectMapper); + } + + @Override + public RefundFailureLogJpaEntity create(RefundJpaEntity refund, String reason) { + return new RefundFailureLogJpaEntity( + refund.getId(), + refund.getExamApplicationId(), + reason, + toJson(refund) + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/processor/TossRefundProcessor.java b/src/main/java/life/mosu/mosuserver/application/refund/processor/TossRefundProcessor.java new file mode 100644 index 00000000..4682afac --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/processor/TossRefundProcessor.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.application.refund.processor; + +import life.mosu.mosuserver.application.refund.RefundProcessorRequest; +import life.mosu.mosuserver.global.processor.StepProcessor; +import life.mosu.mosuserver.infra.toss.TossPaymentClient; +import life.mosu.mosuserver.infra.toss.dto.CancelTossPaymentResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class TossRefundProcessor implements + StepProcessor { + + private final TossPaymentClient tossPayment; + + @Override + public CancelTossPaymentResponse process(RefundProcessorRequest request) { + try { + return tossPayment.cancelPayment(request.paymentKey(), request.toPayload()); + } catch (Exception ex) { + throw new RuntimeException("Toss 결제 실패", ex); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/support/RefundQuotaSyncService.java b/src/main/java/life/mosu/mosuserver/application/refund/support/RefundQuotaSyncService.java new file mode 100644 index 00000000..2d9595e8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/support/RefundQuotaSyncService.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.refund.support; + +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.global.support.SyncService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class RefundQuotaSyncService implements SyncService { + + private final ExamQuotaCacheManager cacheManager; + + @Override + public void sync(Long examId) { + cacheManager.decreaseCurrentApplications(examId); + } + + // 현재 사용하지 않아도 동기화가 보장 됨. + @Override + public void rollbackQuota(Long examId) { + cacheManager.increaseCurrentApplications(examId); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundContext.java b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundContext.java new file mode 100644 index 00000000..77d38c0d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundContext.java @@ -0,0 +1,49 @@ +package life.mosu.mosuserver.application.refund.tx; + +import life.mosu.mosuserver.domain.refund.entity.RefundStatus; + +public record RefundContext( + String transactionKey, + Integer refundAmount, + Long userId, + Long examId, + Long examApplicationId, + Boolean isSuccess, + RefundStatus status +) { + + public static RefundContext ofSuccess( + String transactionKey, + Integer refundAmount, + Long userId, + Long examId, + Long examApplicationId + ) { + return new RefundContext( + transactionKey, + refundAmount, + userId, + examId, + examApplicationId, + true, + RefundStatus.DONE); + } + + public static RefundContext ofFailure( + String transactionKey, + Integer refundAmount, + Long userId, + Long examId, + Long examApplicationId + ) { + return new RefundContext( + transactionKey, + refundAmount, + userId, + examId, + examApplicationId, + false, + RefundStatus.ABORTED + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEvent.java b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEvent.java new file mode 100644 index 00000000..16f6e3ea --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEvent.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.application.refund.tx; + +import life.mosu.mosuserver.global.tx.TxEvent; + +public class RefundTxEvent extends TxEvent { + + public RefundTxEvent(boolean success, RefundContext context) { + super(success, context); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEventFactory.java b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEventFactory.java new file mode 100644 index 00000000..16e2d0ee --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEventFactory.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.application.refund.tx; + + +import life.mosu.mosuserver.global.tx.TxEvent; +import life.mosu.mosuserver.global.tx.TxEventFactory; +import org.springframework.stereotype.Component; + +@Component +public class RefundTxEventFactory implements TxEventFactory { + + @Override + public TxEvent create(RefundContext context) { + return new RefundTxEvent(context.isSuccess(), context); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEventListener.java b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEventListener.java new file mode 100644 index 00000000..54b2fb76 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxEventListener.java @@ -0,0 +1,52 @@ +package life.mosu.mosuserver.application.refund.tx; + +import life.mosu.mosuserver.application.refund.support.RefundQuotaSyncService; +import life.mosu.mosuserver.global.tx.TxFailureHandler; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus; +import life.mosu.mosuserver.infra.notify.support.NotifyEventPublisher; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.transaction.event.TransactionPhase; +import org.springframework.transaction.event.TransactionalEventListener; + +@Component +@RequiredArgsConstructor +@Slf4j +public class RefundTxEventListener { + + private final TxFailureHandler refundFailureHandler; + private final NotifyEventPublisher notifier; + private final RefundQuotaSyncService quotaSyncService; + + @TransactionalEventListener(phase = TransactionPhase.AFTER_ROLLBACK) + public void afterRollbackHandler(RefundTxEvent event) { + RefundContext ctx = event.getContext(); + log.warn("[AFTER_ROLLBACK] 롤백 후 처리 시작: orderId={}", ctx.transactionKey()); + refundFailureHandler.handle(ctx); + log.info("[AFTER_ROLLBACK] 롤백 후 처리 완료: orderId={}", ctx.transactionKey()); + } + + @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT) + public void afterCommitHandler(RefundTxEvent event) { + RefundContext ctx = event.getContext(); + quotaSyncService.sync(ctx.examId()); + log.info("[AFTER_COMMIT] 환불 성공 후 알림톡 발송 시작: orderId={}", ctx.transactionKey()); + + sendNotification(ctx.userId(), ctx.examApplicationId()); + } + + private void sendNotification(Long userId, Long examApplicationId) { + try { + LunaNotificationEvent lunaNotificationEvent = LunaNotificationEvent.create( + LunaNotificationStatus.REFUND_SUCCESS, + userId, examApplicationId); + notifier.notify(lunaNotificationEvent); + log.debug("알림톡 발송 성공: userId={}, examApplicationId={}", userId, examApplicationId); + } catch (Exception ex) { + log.error("알림톡 발송 실패: userId={}, examApplicationId={}, error={}", + userId, examApplicationId, ex.getMessage(), ex); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxFailureHandler.java b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxFailureHandler.java new file mode 100644 index 00000000..3d556605 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/refund/tx/RefundTxFailureHandler.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.application.refund.tx; + +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.global.tx.TxFailureHandler; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Component +@RequiredArgsConstructor +public class RefundTxFailureHandler implements + TxFailureHandler { + + private final RefundJpaRepository refundJpaRepository; + + @Transactional(propagation = Propagation.REQUIRES_NEW) + @Override + public void handle(RefundContext event) { + RefundJpaEntity existingRefunds = refundJpaRepository + .findByTransactionKey(event.transactionKey()) + .orElseThrow(RuntimeException::new); + + existingRefunds.changeStatusToAbort(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/school/SchoolQuotaCacheManager.java b/src/main/java/life/mosu/mosuserver/application/school/SchoolQuotaCacheManager.java deleted file mode 100644 index 5f6319ca..00000000 --- a/src/main/java/life/mosu/mosuserver/application/school/SchoolQuotaCacheManager.java +++ /dev/null @@ -1,64 +0,0 @@ -package life.mosu.mosuserver.application.school; - -import java.util.List; -import life.mosu.mosuserver.domain.school.SchoolApplicationProjection; -import life.mosu.mosuserver.domain.school.SchoolJpaEntity; -import life.mosu.mosuserver.domain.school.SchoolRepository; -import lombok.RequiredArgsConstructor; -import org.springframework.data.redis.core.RedisTemplate; -import org.springframework.stereotype.Service; - -@Service -@RequiredArgsConstructor -public class SchoolQuotaCacheManager { - - private static final String REDIS_KEY_SCHOOL_MAX_CAPACITY = "school:max_capacity:"; - private static final String REDIS_KEY_SCHOOL_CURRENT_APPLICATIONS = "school:current_applications:"; - - private final RedisTemplate redisTemplate; - private final SchoolRepository schoolRepository; - - public void cacheSchoolMaxCapacities() { - List schools = schoolRepository.findAll(); - for (SchoolJpaEntity school : schools) { - String key = REDIS_KEY_SCHOOL_MAX_CAPACITY + school.getSchoolName(); - redisTemplate.opsForValue().set(key, school.getCapacity()); - } - } - - public void cacheSchoolCurrentApplicationCounts() { - List schoolApplications = schoolRepository.countBySchoolNameGroupBy(); - for (SchoolApplicationProjection projection : schoolApplications) { - String key = REDIS_KEY_SCHOOL_CURRENT_APPLICATIONS + projection.schoolName(); - redisTemplate.opsForValue().set(key, projection.count()); - } - } - - public Long getSchoolApplicationCounts(String schoolName) { - return redisTemplate.opsForValue() - .get(REDIS_KEY_SCHOOL_CURRENT_APPLICATIONS + schoolName); - } - - public Long getSchoolCapacities(String schoolName) { - return redisTemplate.opsForValue() - .get(REDIS_KEY_SCHOOL_MAX_CAPACITY + schoolName); - } - - public void increaseApplicationCount(String schoolName) { - String key = REDIS_KEY_SCHOOL_CURRENT_APPLICATIONS + schoolName; - redisTemplate.opsForValue().increment(key); - } - - public void decreaseApplicationCount(String schoolName) { - String key = REDIS_KEY_SCHOOL_CURRENT_APPLICATIONS + schoolName; - Long currentValue = redisTemplate.opsForValue().get(key); - if (currentValue != null && currentValue > 0) { - redisTemplate.opsForValue().decrement(key); - } - } - - public void preloadSchoolData() { - cacheSchoolMaxCapacities(); - cacheSchoolCurrentApplicationCounts(); - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/school/SchoolService.java b/src/main/java/life/mosu/mosuserver/application/school/SchoolService.java deleted file mode 100644 index bebcd14a..00000000 --- a/src/main/java/life/mosu/mosuserver/application/school/SchoolService.java +++ /dev/null @@ -1,25 +0,0 @@ -package life.mosu.mosuserver.application.school; - - -import java.util.List; -import life.mosu.mosuserver.domain.school.SchoolJpaRepository; -import life.mosu.mosuserver.presentation.school.dto.SchoolResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; -import org.springframework.transaction.annotation.Transactional; - -@Service -@RequiredArgsConstructor -@Transactional(readOnly = true, propagation = Propagation.SUPPORTS) -public class SchoolService { - - private final SchoolJpaRepository schoolJpaRepository; - - public List getSchools() { - return schoolJpaRepository.findAll() - .stream() - .map(SchoolResponse::from) - .toList(); - } -} diff --git a/src/main/java/life/mosu/mosuserver/application/user/MyUserService.java b/src/main/java/life/mosu/mosuserver/application/user/MyUserService.java new file mode 100644 index 00000000..7795544f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/user/MyUserService.java @@ -0,0 +1,62 @@ +package life.mosu.mosuserver.application.user; + +import static life.mosu.mosuserver.global.util.EncodeUtil.passwordEncode; + +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.util.PhoneNumberUtil; +import life.mosu.mosuserver.presentation.user.dto.request.ChangePasswordRequest; +import life.mosu.mosuserver.presentation.user.dto.request.FindLoginIdRequest; +import life.mosu.mosuserver.presentation.user.dto.request.FindPasswordRequest; +import life.mosu.mosuserver.presentation.user.dto.response.ChangePasswordResponse; +import life.mosu.mosuserver.presentation.user.dto.response.FindLoginIdResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class MyUserService { + + private final UserJpaRepository userJpaRepository; + private final PasswordEncoder encoder; + + @Transactional + public ChangePasswordResponse changePassword(ChangePasswordRequest request, + String phoneNumber) { + + String rgxPhone = PhoneNumberUtil.formatPhoneNumberWithHyphen(phoneNumber); + + UserJpaEntity user = userJpaRepository.findByPhoneNumber(rgxPhone) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND)); + + user.changePassword(passwordEncode(encoder, request.newPassword())); + + return ChangePasswordResponse.from(Boolean.TRUE); + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public FindLoginIdResponse findLoginId(FindLoginIdRequest request) { + UserJpaEntity user = userJpaRepository.findByNameAndPhoneNumber(request.name(), + request.phoneNumber()) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.NOT_FOUND_LOGIN_ID)); + + return FindLoginIdResponse.from(user.getLoginId()); + + } + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public void findPassword(Long userId, FindPasswordRequest request) { + UserJpaEntity user = userJpaRepository.findById(userId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND)); + + if (!user.getName().equals(request.name()) || !user.getLoginId() + .equals(request.loginId())) { + throw new CustomRuntimeException(ErrorCode.USER_INFO_INVALID); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/user/UserQueryService.java b/src/main/java/life/mosu/mosuserver/application/user/UserQueryService.java new file mode 100644 index 00000000..8375a5be --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/user/UserQueryService.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.application.user; + +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class UserQueryService { + + private final UserJpaRepository userJpaRepository; + + @Transactional(readOnly = true, propagation = Propagation.SUPPORTS) + public UserJpaEntity getByLoginId(String loginId) { + return userJpaRepository.findByLoginId(loginId).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND) + ); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/application/user/UserService.java b/src/main/java/life/mosu/mosuserver/application/user/UserService.java new file mode 100644 index 00000000..39c9a663 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/user/UserService.java @@ -0,0 +1,54 @@ +package life.mosu.mosuserver.application.user; + +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.user.dto.response.UserInfoResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class UserService { + + private final UserJpaRepository userJpaRepository; + + public String getCustomerKey(Long userId) { + return getUserOrThrow(userId) + .getCustomerKey(); + } + + public boolean isLoginIdAvailable(String loginId) { + return !userJpaRepository.existsByLoginId(loginId); + } + + public UserJpaEntity getUserOrThrow(Long userId) { + return userJpaRepository.findById(userId).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND) + ); + } + + public void syncUserInfoFromProfile(UserJpaEntity user, ProfileJpaEntity profile) { + if (user.isMosuUser()) { + user.updateUserInfo(profile.getGender(), profile.getUserName(), + profile.getPhoneNumber(), profile.getBirth()); + } + } + + public Long saveUser(UserJpaEntity user) { + Long userId = userJpaRepository.save(user).getId(); + if (userId == null) { + throw new CustomRuntimeException(ErrorCode.USER_SAVE_FAILED); + } + return userId; + } + + public UserInfoResponse getUserInfo(Long userId) { + UserJpaEntity user = userJpaRepository.findById(userId) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND)); + + return UserInfoResponse.from(user); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountCallbackService.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountCallbackService.java new file mode 100644 index 00000000..d31128ac --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountCallbackService.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.application.virtualaccount; + +import life.mosu.mosuserver.application.virtualaccount.event.DepositFailureEventHandler; +import life.mosu.mosuserver.application.virtualaccount.event.DepositSuccessEventHandler; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositFailureEvent; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositSuccessEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@RequiredArgsConstructor +@Service +public class VirtualAccountCallbackService { + + private final DepositSuccessEventHandler successHandler; + private final DepositFailureEventHandler failureHandler; + + public void handleDepositSuccessEvent(DepositSuccessEvent event) { + successHandler.handle(event); + } + + public void handleDepositFailureEvent(DepositFailureEvent event) { + failureHandler.handle(event); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountLogService.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountLogService.java new file mode 100644 index 00000000..f9810dfa --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountLogService.java @@ -0,0 +1,61 @@ +package life.mosu.mosuserver.application.virtualaccount; + + +import java.util.Objects; +import life.mosu.mosuserver.domain.virtualaccount.BankCode; +import life.mosu.mosuserver.domain.virtualaccount.DepositStatus; +import life.mosu.mosuserver.domain.virtualaccount.VirtualAccountLogJpaEntity; +import life.mosu.mosuserver.domain.virtualaccount.VirtualAccountLogJpaRepository; +import life.mosu.mosuserver.infra.toss.dto.CreateVirtualAccountResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class VirtualAccountLogService { + + private final VirtualAccountLogJpaRepository virtualAccountLogJpaRepository; + + @Async + @Transactional + public void saveVirtualAccountLog( + Long applicationId, + String orderId, + CreateVirtualAccountResponse response, + BankCode code, + String customerName, + String customerEmail + ) { + VirtualAccountLogJpaEntity entity = VirtualAccountLogJpaEntity.create( + applicationId, + orderId, + response.getVirtualAccount().getAccountNumber(), + code.getBankNameKor(), + customerName, + customerEmail + ); + virtualAccountLogJpaRepository.save(entity); + } + + @Async + @Transactional + public VirtualAccountLogJpaEntity updateVirtualAccountLog( + String orderId, + DepositStatus status + ) { + VirtualAccountLogJpaEntity existingLog = virtualAccountLogJpaRepository.findByOrderId( + orderId) + .orElseThrow(() -> new IllegalArgumentException( + "Virtual account log not found for orderId: " + orderId)); + + if (Objects.requireNonNull(status) == DepositStatus.DONE) { + existingLog.setDepositSuccess(); + } else { + existingLog.setDepositFailure(); + } + return existingLog; + } + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountOrderIdGenerator.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountOrderIdGenerator.java new file mode 100644 index 00000000..dfb035b8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountOrderIdGenerator.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.application.virtualaccount; + +import java.util.concurrent.atomic.AtomicInteger; +import life.mosu.mosuserver.global.support.NumberGenerator; +import org.springframework.stereotype.Component; + +@Component +public class VirtualAccountOrderIdGenerator implements NumberGenerator { + + private static final String PREFIX = "VA"; + private static final AtomicInteger SEQUENCE = new AtomicInteger(0); + private static final int MAX_SEQUENCE = 1_000_000; // 6자리 제한 + + @Override + public String generate() { + long millis = System.currentTimeMillis(); + int sequence = (SEQUENCE.getAndIncrement() & 0x7FFFFFFF) % MAX_SEQUENCE; + return String.format("%s-%d-%06d", PREFIX, millis, + sequence); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountService.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountService.java new file mode 100644 index 00000000..0dfd717d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/VirtualAccountService.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.application.virtualaccount; + +import life.mosu.mosuserver.application.virtualaccount.event.DepositEventPublisher; +import life.mosu.mosuserver.application.virtualaccount.processor.CreateVirtualAccountProcessor; +import life.mosu.mosuserver.presentation.virtualaccount.dto.CreateVirtualAccountRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.DepositEventRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.VirtualAccountResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class VirtualAccountService { + + private final CreateVirtualAccountProcessor createProcessor; + private final DepositEventPublisher eventPublisher; + + public VirtualAccountResponse create(CreateVirtualAccountRequest request) { + return createProcessor.process(request); + } + + public void onDepositEvent(DepositEventRequest request) { + eventPublisher.publish(request); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositEventHandler.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositEventHandler.java new file mode 100644 index 00000000..68ba0fc3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositEventHandler.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.application.virtualaccount.event; + +public interface DepositEventHandler { + + void handle(T event); +} diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositEventPublisher.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositEventPublisher.java new file mode 100644 index 00000000..9e8abc99 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositEventPublisher.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.application.virtualaccount.event; + +import life.mosu.mosuserver.domain.virtualaccount.service.DepositEventMapper; +import life.mosu.mosuserver.presentation.virtualaccount.dto.DepositEventRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Component; + +@RequiredArgsConstructor +@Component +public class DepositEventPublisher { + + private final ApplicationEventPublisher publisher; + private final DepositEventMapper eventMapper; + + public void publish(DepositEventRequest request) { + DepositEvent event = eventMapper.map(request); + publisher.publishEvent(event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositFailureEventHandler.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositFailureEventHandler.java new file mode 100644 index 00000000..2246879e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositFailureEventHandler.java @@ -0,0 +1,33 @@ +package life.mosu.mosuserver.application.virtualaccount.event; + +import life.mosu.mosuserver.application.exam.cache.ExamQuotaCacheManager; +import life.mosu.mosuserver.application.virtualaccount.VirtualAccountLogService; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.virtualaccount.DepositStatus; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositFailureEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class DepositFailureEventHandler implements DepositEventHandler { + + private final VirtualAccountLogService virtualAccountLogService; + private final ExamQuotaCacheManager cacheManager; + private final ExamApplicationJpaRepository examApplicationJpaRepository; + + @Override + public void handle(DepositFailureEvent event) { + virtualAccountLogService.updateVirtualAccountLog( + event.getOrderId(), + DepositStatus.CANCELED + ); + var examApplication = examApplicationJpaRepository.findByOrderId(event.getOrderId()) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.VIRTUAL_ACCOUNT_LOG_NOT_FOUND)); + + cacheManager.decreaseCurrentApplications(examApplication.getExamId()); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositSuccessEventHandler.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositSuccessEventHandler.java new file mode 100644 index 00000000..7bca18a7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/event/DepositSuccessEventHandler.java @@ -0,0 +1,47 @@ +package life.mosu.mosuserver.application.virtualaccount.event; + + +import life.mosu.mosuserver.application.virtualaccount.VirtualAccountLogService; +import life.mosu.mosuserver.domain.virtualaccount.DepositStatus; +import life.mosu.mosuserver.domain.virtualaccount.VirtualAccountLogJpaEntity; +import life.mosu.mosuserver.infra.notify.MailNotifier; +import life.mosu.mosuserver.infra.notify.dto.mail.DepositSuccessMailRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositSuccessEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class DepositSuccessEventHandler implements DepositEventHandler { + + private final VirtualAccountLogService virtualAccountLogService; + private final MailNotifier mailer; + + @Override + @Transactional + public void handle(DepositSuccessEvent event) { + var log = virtualAccountLogService.updateVirtualAccountLog( + event.getOrderId(), + DepositStatus.CANCELED + ); + sendMail(log, event.getFormattedCreatedAt()); + } + + /** + * 이벤트 핸들러에서 가상계좌 입금 성공 시 메일을 발송합니다. ( 관리자 확인 용) + * + * @param log + * @param createdAt + */ + private void sendMail(VirtualAccountLogJpaEntity log, String createdAt) { + DepositSuccessMailRequest request = DepositSuccessMailRequest.of( + log.getOrderId(), + log.getAccountNumber(), + log.getBankName(), + log.getCustomerName(), + createdAt + ); + mailer.send(request); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/application/virtualaccount/processor/CreateVirtualAccountProcessor.java b/src/main/java/life/mosu/mosuserver/application/virtualaccount/processor/CreateVirtualAccountProcessor.java new file mode 100644 index 00000000..a0b72233 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/application/virtualaccount/processor/CreateVirtualAccountProcessor.java @@ -0,0 +1,68 @@ +package life.mosu.mosuserver.application.virtualaccount.processor; + +import life.mosu.mosuserver.application.virtualaccount.VirtualAccountLogService; +import life.mosu.mosuserver.application.virtualaccount.VirtualAccountOrderIdGenerator; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.examapplication.service.ExamApplicationAmountCalculator; +import life.mosu.mosuserver.domain.virtualaccount.BankCode; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.processor.StepProcessor; +import life.mosu.mosuserver.infra.toss.TossVirtualAccountClient; +import life.mosu.mosuserver.infra.toss.dto.CreateVirtualAccountResponse; +import life.mosu.mosuserver.infra.toss.dto.TossVirtualAccountPayload; +import life.mosu.mosuserver.presentation.virtualaccount.dto.CreateVirtualAccountRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.VirtualAccountResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import org.springframework.web.client.RestClientException; + +@Component +@RequiredArgsConstructor +public class CreateVirtualAccountProcessor implements + StepProcessor { + + private final ExamApplicationJpaRepository examApplicationJpaRepository; + private final VirtualAccountOrderIdGenerator orderIdGenerator; + private final VirtualAccountLogService logService; + private final TossVirtualAccountClient tossClient; + private final ExamApplicationAmountCalculator amountCalculator; + + @Override + public VirtualAccountResponse process(CreateVirtualAccountRequest request) { + var application = examApplicationJpaRepository.findById(request.applicationId()) + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_NOT_FOUND)); + + int amount = amountCalculator.calculate(application); + + BankCode bankCode = BankCode.fromAlias(request.alias()) + .orElse(BankCode.DAEGU); + + String orderId = orderIdGenerator.generate(); + + TossVirtualAccountPayload payload = TossVirtualAccountPayload.ofPartnership( + orderId, request.customerName(), request.customerEmail(), bankCode, amount + ); + CreateVirtualAccountResponse response; + try { + response = tossClient.createVirtualAccount(payload); + } catch (RestClientException ex) { + throw new CustomRuntimeException(ErrorCode.VIRTUAL_ACCOUNT_CREATION_FAILED); + } + + logService.saveVirtualAccountLog( + request.applicationId(), + orderId, + response, + bankCode, + request.customerName(), + request.customerEmail() + ); + + return VirtualAccountResponse.of( + bankCode.getBankNameKor(), + response.getVirtualAccount().getAccountNumber() + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/admin/projection/RecommendationDetailsProjection.java b/src/main/java/life/mosu/mosuserver/domain/admin/projection/RecommendationDetailsProjection.java new file mode 100644 index 00000000..741804cc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/admin/projection/RecommendationDetailsProjection.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.domain.admin.projection; + +import java.time.LocalDate; +import life.mosu.mosuserver.domain.profile.entity.Gender; + +public record RecommendationDetailsProjection( + String recommenderName, + String recommenderPhoneNumber, + Gender gender, + LocalDate birth, + String recommendeeName, + String recommendeePhoneNumber, + String recommendeeBank, + String recommendeeAccountNumber +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/admin/ApplicationQueryRepository.java b/src/main/java/life/mosu/mosuserver/domain/admin/repository/ApplicationQueryRepository.java similarity index 76% rename from src/main/java/life/mosu/mosuserver/domain/admin/ApplicationQueryRepository.java rename to src/main/java/life/mosu/mosuserver/domain/admin/repository/ApplicationQueryRepository.java index 0bf98b5a..43bdeafd 100644 --- a/src/main/java/life/mosu/mosuserver/domain/admin/ApplicationQueryRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/admin/repository/ApplicationQueryRepository.java @@ -1,10 +1,9 @@ -package life.mosu.mosuserver.domain.admin; +package life.mosu.mosuserver.domain.admin.repository; import java.util.List; import life.mosu.mosuserver.presentation.admin.dto.ApplicationExcelDto; import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; -import life.mosu.mosuserver.presentation.admin.dto.SchoolLunchResponse; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -14,6 +13,4 @@ Page searchAllApplications(ApplicationFilter filter, Pageable pageable); List searchAllApplicationsForExcel(); - - List searchAllSchoolLunches(); } diff --git a/src/main/java/life/mosu/mosuserver/domain/admin/repository/RefundQueryRepository.java b/src/main/java/life/mosu/mosuserver/domain/admin/repository/RefundQueryRepository.java new file mode 100644 index 00000000..a31a41c7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/admin/repository/RefundQueryRepository.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.domain.admin.repository; + +import java.util.List; +import life.mosu.mosuserver.presentation.admin.dto.RefundExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.RefundListResponse; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; + +public interface RefundQueryRepository { + + Page searchAllRefunds(Pageable pageable); + + List searchAllRefundsForExcel(); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/admin/StudentQueryRepository.java b/src/main/java/life/mosu/mosuserver/domain/admin/repository/StudentQueryRepository.java similarity index 90% rename from src/main/java/life/mosu/mosuserver/domain/admin/StudentQueryRepository.java rename to src/main/java/life/mosu/mosuserver/domain/admin/repository/StudentQueryRepository.java index 434cc268..f8fbc23f 100644 --- a/src/main/java/life/mosu/mosuserver/domain/admin/StudentQueryRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/admin/repository/StudentQueryRepository.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.admin; +package life.mosu.mosuserver.domain.admin.repository; import java.util.List; import life.mosu.mosuserver.presentation.admin.dto.StudentExcelDto; diff --git a/src/main/java/life/mosu/mosuserver/domain/application/AdmissionTicketImageJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/application/AdmissionTicketImageJpaEntity.java deleted file mode 100644 index 1e06851e..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/application/AdmissionTicketImageJpaEntity.java +++ /dev/null @@ -1,33 +0,0 @@ -package life.mosu.mosuserver.domain.application; - -import jakarta.persistence.*; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.SoftDelete; - - -@Getter -@Entity -@Table(name = "admission_ticket_image") -@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) -@SoftDelete -public class AdmissionTicketImageJpaEntity extends File { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "admission_ticket_image_id", nullable = false) - private Long id; - - @Column(name = "application_id", nullable = false) - private Long applicationId; - - @Builder - public AdmissionTicketImageJpaEntity(final String fileName, final String s3Key, final Visibility visibility, final Long applicationId) { - super(fileName, s3Key, visibility); - this.applicationId = applicationId; - } - -} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/AdmissionTicketImageJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/application/AdmissionTicketImageJpaRepository.java deleted file mode 100644 index 1202a7c3..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/application/AdmissionTicketImageJpaRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package life.mosu.mosuserver.domain.application; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface AdmissionTicketImageJpaRepository extends JpaRepository { - - AdmissionTicketImageJpaEntity findByApplicationId(Long applicationId); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/ApplicationJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/application/ApplicationJpaRepository.java deleted file mode 100644 index da55fe09..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/application/ApplicationJpaRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package life.mosu.mosuserver.domain.application; - -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ApplicationJpaRepository extends JpaRepository { - - List findAllByUserId(Long userId); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/Lunch.java b/src/main/java/life/mosu/mosuserver/domain/application/Lunch.java deleted file mode 100644 index 16c89e26..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/application/Lunch.java +++ /dev/null @@ -1,19 +0,0 @@ -package life.mosu.mosuserver.domain.application; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum Lunch { - NONE("선택 안 함"), - OPTION1("도시락 A"), - OPTION2("도시락 B"), - OPTION3("비건 도시락"), - OPTION4("한식 도시락"), - OPTION5("양식 도시락"), - OPTION6("중식 도시락"); - - private final String lunchName; -} -//임의 구현 diff --git a/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationFailureLogJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationFailureLogJpaEntity.java new file mode 100644 index 00000000..6f63d790 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationFailureLogJpaEntity.java @@ -0,0 +1,50 @@ +package life.mosu.mosuserver.domain.application.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Table(name = "application_failure_log") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ApplicationFailureLogJpaEntity extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "application_failure_id") + private Long id; + + @Column(name = "application_id", nullable = false) + private Long applicationId; + + @Column(name = "user_id", nullable = false) + private Long userId; + + @Column(name = "reason", nullable = false, length = 255) + private String reason; + + @Column(name = "snapshot", columnDefinition = "TEXT") + private String snapshot; + + @Builder + public ApplicationFailureLogJpaEntity( + Long applicationId, + Long userId, + String reason, + String snapshot + ) { + this.applicationId = applicationId; + this.userId = userId; + this.reason = reason; + this.snapshot = snapshot; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/ApplicationJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationJpaEntity.java similarity index 61% rename from src/main/java/life/mosu/mosuserver/domain/application/ApplicationJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationJpaEntity.java index 93484f15..8e99d810 100644 --- a/src/main/java/life/mosu/mosuserver/domain/application/ApplicationJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationJpaEntity.java @@ -1,12 +1,14 @@ -package life.mosu.mosuserver.domain.application; +package life.mosu.mosuserver.domain.application.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; -import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import life.mosu.mosuserver.domain.base.BaseDeleteEntity; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -16,7 +18,7 @@ @Table(name = "application") @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ApplicationJpaEntity extends BaseTimeEntity { +public class ApplicationJpaEntity extends BaseDeleteEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -26,8 +28,12 @@ public class ApplicationJpaEntity extends BaseTimeEntity { @Column(name = "user_id") private Long userId; - @Column(name = "guardian_phone_number") - private String guardianPhoneNumber; + @Column(name = "parent_phone_number") + private String parentPhoneNumber; + + @Enumerated(EnumType.STRING) + @Column(name = "application_status", nullable = false) + private ApplicationStatus status = ApplicationStatus.PENDING; @Column(name = "agreed_to_notices") private Boolean agreedToNotices; @@ -38,15 +44,17 @@ public class ApplicationJpaEntity extends BaseTimeEntity { @Builder public ApplicationJpaEntity( final Long userId, - final String guardianPhoneNumber, + final String parentPhoneNumber, final boolean agreedToNotices, final boolean agreedToRefundPolicy - ) { this.userId = userId; - this.guardianPhoneNumber = guardianPhoneNumber; + this.parentPhoneNumber = parentPhoneNumber; this.agreedToNotices = agreedToNotices; this.agreedToRefundPolicy = agreedToRefundPolicy; } + public void changeStatus(ApplicationStatus newStatus) { + this.status = newStatus; + } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationStatus.java b/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationStatus.java new file mode 100644 index 00000000..57f3139f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/entity/ApplicationStatus.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.domain.application.entity; + +public enum ApplicationStatus { + PENDING, // 신청 대기 중 + APPROVED, // 신청 완료 + ABORT, // 신청 실패 +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/entity/ExamTicketImageJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/application/entity/ExamTicketImageJpaEntity.java new file mode 100644 index 00000000..7cb90659 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/entity/ExamTicketImageJpaEntity.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.domain.application.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + + +@Getter +@Entity +@Table(name = "exam_ticket_image") +@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) +public class ExamTicketImageJpaEntity extends File { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "exam_ticket_image_id", nullable = false) + private Long id; + + @Column(name = "application_id", nullable = false) + private Long applicationId; + + @Builder + public ExamTicketImageJpaEntity(final String fileName, final String s3Key, + final Visibility visibility, final Long applicationId) { + super(fileName, s3Key, visibility); + this.applicationId = applicationId; + } + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/entity/Lunch.java b/src/main/java/life/mosu/mosuserver/domain/application/entity/Lunch.java new file mode 100644 index 00000000..835f24e6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/entity/Lunch.java @@ -0,0 +1,30 @@ +package life.mosu.mosuserver.domain.application.entity; + +import java.util.Arrays; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum Lunch { + NONE("선택 안 함"), + OPTION1("도시락 A"), + OPTION2("도시락 B"), + OPTION3("비건 도시락"), + OPTION4("한식 도시락"), + OPTION5("양식 도시락"), + OPTION6("중식 도시락"); + + private final String lunchName; + + public static Lunch from(String lunchName) { + return Arrays.stream(values()) + .filter(e -> e.getLunchName().equals(lunchName)) + .findFirst() + .orElseThrow( + () -> new CustomRuntimeException(ErrorCode.NOT_FOUND_LUNCH) + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/Subject.java b/src/main/java/life/mosu/mosuserver/domain/application/entity/Subject.java similarity index 61% rename from src/main/java/life/mosu/mosuserver/domain/application/Subject.java rename to src/main/java/life/mosu/mosuserver/domain/application/entity/Subject.java index acab6b2c..86993a98 100644 --- a/src/main/java/life/mosu/mosuserver/domain/application/Subject.java +++ b/src/main/java/life/mosu/mosuserver/domain/application/entity/Subject.java @@ -1,5 +1,8 @@ -package life.mosu.mosuserver.domain.application; +package life.mosu.mosuserver.domain.application.entity; +import java.util.Arrays; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; import lombok.Getter; import lombok.RequiredArgsConstructor; @@ -22,7 +25,7 @@ public enum Subject { WORLD_HISTORY("세계사"), ECONOMICS("경제"), POLITICS_AND_LAW("정치와 법"), - SOCIETY_AND_CULTURE("사회･문화"), + SOCIETY_AND_CULTURE("사회와 문화"), // 과학탐구 PHYSICS_1("물리학Ⅰ"), @@ -35,4 +38,11 @@ public enum Subject { EARTH_SCIENCE_2("지구과학Ⅱ"); private final String subjectName; + + public static Subject getSubject(String subjectName) { + return Arrays.stream(values()) + .filter(subject -> subject.subjectName.equals(subjectName)) + .findFirst() + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.WRONG_SUBJECT_TYPE)); + } } diff --git a/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationFailureLogJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationFailureLogJpaRepository.java new file mode 100644 index 00000000..f4da0c3d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationFailureLogJpaRepository.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.domain.application.repository; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.application.entity.ApplicationFailureLogJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ApplicationFailureLogJpaRepository extends + JpaRepository, + ApplicationFailureLogJpaRepositoryCustom { + + int deleteByCreatedAtBefore(LocalDateTime date); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationFailureLogJpaRepositoryCustom.java b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationFailureLogJpaRepositoryCustom.java new file mode 100644 index 00000000..f966bfbd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationFailureLogJpaRepositoryCustom.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.domain.application.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.application.entity.ApplicationFailureLogJpaEntity; + +public interface ApplicationFailureLogJpaRepositoryCustom { + + void saveAllUsingBatch( + List applicationFailureLogJpaEntities); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepository.java new file mode 100644 index 00000000..4eff05c4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepository.java @@ -0,0 +1,56 @@ +package life.mosu.mosuserver.domain.application.repository; + +import java.time.LocalDateTime; +import java.util.List; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface ApplicationJpaRepository extends JpaRepository, + ApplicationJpaRepositoryCustom { + + @Query(""" + SELECT a + FROM ApplicationJpaEntity a + WHERE a.deleted = false + AND a.createdAt < :time + AND a.status IN ('PENDING', 'ABORT') + """) + List findFailedApplications(@Param("time") LocalDateTime time); + + @Query(""" + SELECT a + FROM ApplicationJpaEntity a + JOIN PaymentJpaEntity p ON p.applicationId=a.id + AND a.userId = :userId + AND p.deleted = false + """) + List findAllByUserId(@Param("userId") Long userId); + + @Query( + """ + SELECT CASE WHEN COUNT(a) > 0 THEN true ELSE false END + FROM ApplicationJpaEntity a + JOIN ExamApplicationJpaEntity ea ON a.id = ea.applicationId + JOIN ExamJpaEntity e ON ea.examId = e.id + JOIN PaymentJpaEntity p ON ea.id = p.examApplicationId + WHERE a.userId = :userId + AND p.paymentStatus = 'DONE' + AND e.id IN :examIds + """ + ) + boolean existsByUserIdAndExamIds(@Param("userId") Long userId, + @Param("examIds") List examIds); + + @Modifying + @Query(value = """ + UPDATE application a + JOIN exam_ticket_image et ON a.application_id = et.application_id + SET a.deleted = true, et.deleted = true + WHERE a.application_id = :applicationId + """, nativeQuery = true) + void deleteWithExamTicketById(Long applicationId); + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepositoryCustom.java b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepositoryCustom.java new file mode 100644 index 00000000..3a855577 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/repository/ApplicationJpaRepositoryCustom.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.domain.application.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; + +public interface ApplicationJpaRepositoryCustom { + + void batchDeleteAllWithExamApplications(List entities); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/application/repository/ExamTicketImageJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/application/repository/ExamTicketImageJpaRepository.java new file mode 100644 index 00000000..6cdf781c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/application/repository/ExamTicketImageJpaRepository.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.domain.application.repository; + +import java.util.Optional; +import life.mosu.mosuserver.domain.application.entity.ExamTicketImageJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ExamTicketImageJpaRepository extends + JpaRepository { + + Optional findByApplicationId(Long applicationId); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/applicationschool/ApplicationSchoolJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/applicationschool/ApplicationSchoolJpaEntity.java deleted file mode 100644 index 66185540..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/applicationschool/ApplicationSchoolJpaEntity.java +++ /dev/null @@ -1,94 +0,0 @@ -package life.mosu.mosuserver.domain.applicationschool; - -import jakarta.persistence.*; -import life.mosu.mosuserver.domain.application.Lunch; -import life.mosu.mosuserver.domain.application.Subject; -import life.mosu.mosuserver.domain.base.BaseTimeEntity; -import life.mosu.mosuserver.domain.school.AddressJpaVO; -import life.mosu.mosuserver.domain.school.Area; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.time.LocalDate; -import java.util.HashSet; -import java.util.Set; - -@Entity -@Table(name = "application_school") -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ApplicationSchoolJpaEntity extends BaseTimeEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "application_school_id") - private Long id; - - @Column(name = "application_id") - private Long applicationId; - - @Column(name = "user_id") - private Long userId; - - @Column(name = "school_id") - private Long schoolId; - - @Column(name = "application_school_name") - private String schoolName; - - @Enumerated(EnumType.STRING) - private Area area; - - @Embedded - private AddressJpaVO address; - - @Column(name = "exam_date") - private LocalDate examDate; - - @Enumerated(EnumType.STRING) - private Lunch lunch; - - @Column(name = "examination_number") - private String examinationNumber; - - @ElementCollection(fetch = FetchType.EAGER) - @CollectionTable(name = "exam_subject", joinColumns = @JoinColumn(name = "application_school_id")) - @Enumerated(EnumType.STRING) - private Set subjects = new HashSet<>(); - - - @Builder - public ApplicationSchoolJpaEntity( - final Long userId, - final Long applicationId, - final Long schoolId, - final String schoolName, - final Area area, - final AddressJpaVO address, - final LocalDate examDate, - final Lunch lunch, - final String examinationNumber, - final Set subjects - ) { - this.userId = userId; - this.applicationId = applicationId; - this.schoolId = schoolId; - this.schoolName = schoolName; - this.area = area; - this.address = address; - this.examDate = examDate; - this.lunch = lunch; - this.examinationNumber = examinationNumber; - this.subjects = subjects; - } - - public void generateExaminationNumber() { - - } - - public void updateSubjects(Set subjects) { - this.subjects = subjects; - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/applicationschool/ApplicationSchoolJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/applicationschool/ApplicationSchoolJpaRepository.java deleted file mode 100644 index 0c4755ce..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/applicationschool/ApplicationSchoolJpaRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package life.mosu.mosuserver.domain.applicationschool; - -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; -import org.springframework.data.repository.query.Param; - -public interface ApplicationSchoolJpaRepository extends - JpaRepository { - - - boolean existsByUserIdAndSchoolId(Long userId, Long schoolId); - - List findAllByApplicationId(Long applicationId); - - boolean existsByApplicationId(Long applicationId); - - @Query("SELECT COUNT(a) = :size FROM ApplicationSchoolJpaEntity a WHERE a.id IN :applicationSchoolIds") - boolean existsAllByIds(@Param("applicationSchoolIds") List applicationSchoolIds, - @Param("size") long size); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshToken.java b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshToken.java similarity index 83% rename from src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshToken.java rename to src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshToken.java index 2e15192f..aaff4625 100644 --- a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshToken.java +++ b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshToken.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.auth.security; +package life.mosu.mosuserver.domain.auth.refresh; public record RefreshToken( Long userId, diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenKeyValueRepository.java b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenKeyValueRepository.java similarity index 82% rename from src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenKeyValueRepository.java rename to src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenKeyValueRepository.java index 272aa9ea..a8261244 100644 --- a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenKeyValueRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenKeyValueRepository.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.auth.security; +package life.mosu.mosuserver.domain.auth.refresh; import org.springframework.data.keyvalue.repository.KeyValueRepository; diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRedisEntity.java b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRedisEntity.java similarity index 94% rename from src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRedisEntity.java rename to src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRedisEntity.java index 6587b20e..550effd5 100644 --- a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRedisEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRedisEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.auth.security; +package life.mosu.mosuserver.domain.auth.refresh; import lombok.AllArgsConstructor; import lombok.NoArgsConstructor; diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRedisRepository.java b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRedisRepository.java similarity index 69% rename from src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRedisRepository.java rename to src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRedisRepository.java index fe0399d6..9f30dfaa 100644 --- a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRedisRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRedisRepository.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.auth.security; +package life.mosu.mosuserver.domain.auth.refresh; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Repository; @@ -16,7 +16,7 @@ public boolean existsByRefreshToken(final String refreshToken) { @Override public void save(final RefreshToken refreshToken) { - final RefreshTokenRedisEntity entity = RefreshTokenRedisEntity.from(refreshToken); + RefreshTokenRedisEntity entity = RefreshTokenRedisEntity.from(refreshToken); repository.save(entity); } @@ -29,4 +29,10 @@ public boolean existsByUserId(final Long id) { public void deleteByUserId(final Long id) { repository.deleteById(id); } + + @Override + public void delete(final RefreshToken refreshToken) { + RefreshTokenRedisEntity entity = RefreshTokenRedisEntity.from(refreshToken); + repository.delete(entity); + } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRepository.java b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRepository.java similarity index 69% rename from src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRepository.java rename to src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRepository.java index 709b03d0..6fef6bc7 100644 --- a/src/main/java/life/mosu/mosuserver/domain/auth/security/RefreshTokenRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/auth/refresh/RefreshTokenRepository.java @@ -1,6 +1,7 @@ -package life.mosu.mosuserver.domain.auth.security; +package life.mosu.mosuserver.domain.auth.refresh; public interface RefreshTokenRepository { + boolean existsByRefreshToken(String refreshToken); void save(RefreshToken refreshToken); @@ -8,4 +9,6 @@ public interface RefreshTokenRepository { boolean existsByUserId(Long id); void deleteByUserId(Long id); + + void delete(RefreshToken refreshToken); } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenKeyValueRepository.java b/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenKeyValueRepository.java new file mode 100644 index 00000000..88dfe9ac --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenKeyValueRepository.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.domain.auth.signup; + +import org.springframework.data.keyvalue.repository.KeyValueRepository; + +public interface SignUpTokenKeyValueRepository extends + KeyValueRepository { +} diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisEntity.java b/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisEntity.java new file mode 100644 index 00000000..4b884a66 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisEntity.java @@ -0,0 +1,28 @@ +package life.mosu.mosuserver.domain.auth.signup; + +import java.util.concurrent.TimeUnit; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.TimeToLive; +import org.springframework.data.redis.core.index.Indexed; + +@Getter +@RedisHash(value = "token") +@AllArgsConstructor(access = lombok.AccessLevel.PRIVATE) +@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) +public class SignUpTokenRedisEntity { + + @Id + @Indexed + private String certNum; + + @TimeToLive(unit = TimeUnit.MILLISECONDS) + private Long expiration; + + public static SignUpTokenRedisEntity from(final Token token) { + return new SignUpTokenRedisEntity(token.certNum(), token.expiration()); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisRepository.java b/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisRepository.java new file mode 100644 index 00000000..b17e96b8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/auth/signup/SignUpTokenRedisRepository.java @@ -0,0 +1,35 @@ +package life.mosu.mosuserver.domain.auth.signup; + +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Repository; + +@Slf4j +@Repository +@RequiredArgsConstructor +public class SignUpTokenRedisRepository implements TokenRepository { + + private final SignUpTokenKeyValueRepository repository; + + @Override + public void save(Token signUpToken) { + SignUpTokenRedisEntity entity = SignUpTokenRedisEntity.from(signUpToken); + repository.save(entity); + } + + @Override + public Token findByCertNum(String certNum) { + log.info("findByCertNum certNum={}", certNum); + SignUpTokenRedisEntity signUpTokenRedisEntity = repository.findById(certNum).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.NOT_FOUND_TOKEN) + ); + return Token.from(signUpTokenRedisEntity); + } + + @Override + public void deleteByCertNum(String certNum) { + repository.deleteById(certNum); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/signup/Token.java b/src/main/java/life/mosu/mosuserver/domain/auth/signup/Token.java new file mode 100644 index 00000000..ce0f3f2a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/auth/signup/Token.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.domain.auth.signup; + +public record Token( + String certNum, + Long expiration +) { + public static Token of(String certNum, Long expiration) { + return new Token(certNum, expiration); + } + + public static Token from(SignUpTokenRedisEntity signUpTokenRedisEntity) { + return new Token( + signUpTokenRedisEntity.getCertNum(), + signUpTokenRedisEntity.getExpiration() + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/auth/signup/TokenRepository.java b/src/main/java/life/mosu/mosuserver/domain/auth/signup/TokenRepository.java new file mode 100644 index 00000000..4aabd62f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/auth/signup/TokenRepository.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.domain.auth.signup; + +public interface TokenRepository { + Token findByCertNum(String certNum); + + void save(Token signUpToken); + + void deleteByCertNum(String certNum); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/banner/BannerJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/banner/BannerJpaEntity.java new file mode 100644 index 00000000..03f3f921 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/banner/BannerJpaEntity.java @@ -0,0 +1,52 @@ +package life.mosu.mosuserver.domain.banner; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.file.FileWithTime; +import life.mosu.mosuserver.domain.file.Visibility; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; + +@Entity +@Table(name = "banner") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete +public class BannerJpaEntity extends FileWithTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "title") + private String title; + + @Column(name = "dead_line") + private LocalDateTime deadline; + + @Column(name = "banner_link") + private String link; + + @Builder + public BannerJpaEntity( + final String fileName, + final String s3Key, + final Visibility visibility, + final String title, + final LocalDateTime deadline, + final String link + ) { + super(fileName, s3Key, visibility); + this.title = title; + this.deadline = deadline; + this.link = link; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/banner/BannerJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/banner/BannerJpaRepository.java new file mode 100644 index 00000000..0787a079 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/banner/BannerJpaRepository.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.domain.banner; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface BannerJpaRepository extends JpaRepository { + + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/base/BaseDeleteEntity.java b/src/main/java/life/mosu/mosuserver/domain/base/BaseDeleteEntity.java new file mode 100644 index 00000000..aa7db11f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/base/BaseDeleteEntity.java @@ -0,0 +1,39 @@ +package life.mosu.mosuserver.domain.base; + + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseDeleteEntity { + + @CreatedDate + @Column(name = "created_at", updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at") + private LocalDateTime updatedAt; + + @Column(name = "deleted") + private Boolean deleted = false; + + public static String formatDate(LocalDateTime dateTime) { + return dateTime != null ? dateTime.toLocalDate().toString() : null; + } + + public String getCreatedAt() { + return createdAt != null ? createdAt.format( + DateTimeFormatter.ofPattern("yyyy-MM-dd")) : null; + } + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/base/BaseTimeEntity.java b/src/main/java/life/mosu/mosuserver/domain/base/BaseTimeEntity.java index 9082fa5f..3b675925 100644 --- a/src/main/java/life/mosu/mosuserver/domain/base/BaseTimeEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/base/BaseTimeEntity.java @@ -23,6 +23,10 @@ public abstract class BaseTimeEntity { @Column(name = "updated_at") private LocalDateTime updatedAt; + public static String formatDate(LocalDateTime dateTime) { + return dateTime != null ? dateTime.toLocalDate().toString() : null; + } + public String getCreatedAt() { return createdAt != null ? createdAt.format( DateTimeFormatter.ofPattern("yyyy-MM-dd")) : null; diff --git a/src/main/java/life/mosu/mosuserver/domain/discount/DiscountPolicy.java b/src/main/java/life/mosu/mosuserver/domain/discount/DiscountPolicy.java index c6dc7da0..cea66524 100644 --- a/src/main/java/life/mosu/mosuserver/domain/discount/DiscountPolicy.java +++ b/src/main/java/life/mosu/mosuserver/domain/discount/DiscountPolicy.java @@ -1,5 +1,8 @@ package life.mosu.mosuserver.domain.discount; +import life.mosu.mosuserver.domain.discount.service.FixedQuantityDiscountCalculator; +import life.mosu.mosuserver.domain.discount.service.QuantityPercentageDiscountCalculator; + public enum DiscountPolicy { QUANTITY_PERCENTAGE(new QuantityPercentageDiscountCalculator()), FIXED_QUANTITY(new FixedQuantityDiscountCalculator()); diff --git a/src/main/java/life/mosu/mosuserver/domain/discount/FixedQuantityDiscountCalculator.java b/src/main/java/life/mosu/mosuserver/domain/discount/FixedQuantityDiscountCalculator.java deleted file mode 100644 index fb920157..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/discount/FixedQuantityDiscountCalculator.java +++ /dev/null @@ -1,21 +0,0 @@ -package life.mosu.mosuserver.domain.discount; - -import java.util.Map; - -public class FixedQuantityDiscountCalculator implements DiscountCalculator { - - // 회차별 고정 할인 가격 (총 결제 금액 기준) - private static final Map FIXED_TOTAL_PRICE = Map.of( - 1, 49_000, - 2, 89_000, - 3, 129_000 - ); - - @Override - public int calculateDiscount(int quantity) { - if (!FIXED_TOTAL_PRICE.containsKey(quantity)) { - throw new IllegalArgumentException("지원되지 않는 회차 수입니다. (1~3회만 가능)"); - } - return FIXED_TOTAL_PRICE.get(quantity); - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/discount/service/FixedQuantityDiscountCalculator.java b/src/main/java/life/mosu/mosuserver/domain/discount/service/FixedQuantityDiscountCalculator.java new file mode 100644 index 00000000..b3eda1ba --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/discount/service/FixedQuantityDiscountCalculator.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.domain.discount.service; + +import java.util.Map; +import life.mosu.mosuserver.domain.discount.DiscountCalculator; +import org.springframework.stereotype.Component; + +@Component +public class FixedQuantityDiscountCalculator implements DiscountCalculator { + + // 회차별 고정 할인 가격 (총 결제 금액 기준) + private static final Map FIXED_TOTAL_PRICE = Map.of( + 1, 49_000, + 2, 89_000, + 3, 129_000 + ); + + @Override + public int calculateDiscount(int quantity) { + if (!FIXED_TOTAL_PRICE.containsKey(quantity)) { + throw new IllegalArgumentException("지원되지 않는 회차 수입니다. (1~3회만 가능)"); + } + return FIXED_TOTAL_PRICE.get(quantity); + } + + public int getAppliedDiscountAmount(int totalAmount) { + return FIXED_TOTAL_PRICE.entrySet() + .stream() + .filter(entry -> entry.getValue() == totalAmount) + .findFirst() + .map(entry -> { + int quantity = entry.getKey(); + int originalTotal = quantity * 49_000; + return originalTotal - totalAmount; + }) + .orElseThrow(() -> new IllegalArgumentException("해당 결제 금액에 대한 할인 정책이 없습니다.")); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/discount/QuantityPercentageDiscountCalculator.java b/src/main/java/life/mosu/mosuserver/domain/discount/service/QuantityPercentageDiscountCalculator.java similarity index 93% rename from src/main/java/life/mosu/mosuserver/domain/discount/QuantityPercentageDiscountCalculator.java rename to src/main/java/life/mosu/mosuserver/domain/discount/service/QuantityPercentageDiscountCalculator.java index e2cc26b0..8ebdbacb 100644 --- a/src/main/java/life/mosu/mosuserver/domain/discount/QuantityPercentageDiscountCalculator.java +++ b/src/main/java/life/mosu/mosuserver/domain/discount/service/QuantityPercentageDiscountCalculator.java @@ -1,4 +1,6 @@ -package life.mosu.mosuserver.domain.discount; +package life.mosu.mosuserver.domain.discount.service; + +import life.mosu.mosuserver.domain.discount.DiscountCalculator; public class QuantityPercentageDiscountCalculator implements DiscountCalculator { diff --git a/src/main/java/life/mosu/mosuserver/domain/event/EventImage.java b/src/main/java/life/mosu/mosuserver/domain/event/EventImage.java deleted file mode 100644 index 7a7e0223..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/event/EventImage.java +++ /dev/null @@ -1,20 +0,0 @@ -package life.mosu.mosuserver.domain.event; - -import jakarta.persistence.Embeddable; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Embeddable -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class EventImage extends File { - - @Builder - public EventImage(String fileName, String s3Key, Visibility visibility) { - super(fileName, s3Key, visibility); - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/event/EventJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/event/EventJpaEntity.java deleted file mode 100644 index 71fbf3f7..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/event/EventJpaEntity.java +++ /dev/null @@ -1,47 +0,0 @@ -package life.mosu.mosuserver.domain.event; - -import jakarta.persistence.*; -import life.mosu.mosuserver.domain.base.BaseTimeEntity; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Entity -@Table(name = "event") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class EventJpaEntity extends BaseTimeEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "event_id", nullable = false) - private Long id; - - @Column(name = "event_description", nullable = false) - private String eventDescription; - - @Column(name = "event_link") - private String eventLink; - - @Column(name = "event_img") - private String eventImg; - - @Embedded - private DurationJpaVO duration; - - @Column(name = "user_id", nullable = false) - private Long userId; - - @Builder - public EventJpaEntity( - final String eventDescription, - final String eventLink, - final String eventImg, - final Long userId - ) { - this.eventDescription = eventDescription; - this.eventLink = eventLink; - this.eventImg = eventImg; - this.userId = userId; - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/event/DurationJpaVO.java b/src/main/java/life/mosu/mosuserver/domain/event/entity/DurationJpaVO.java similarity index 97% rename from src/main/java/life/mosu/mosuserver/domain/event/DurationJpaVO.java rename to src/main/java/life/mosu/mosuserver/domain/event/entity/DurationJpaVO.java index 889dc261..fbc21b2d 100644 --- a/src/main/java/life/mosu/mosuserver/domain/event/DurationJpaVO.java +++ b/src/main/java/life/mosu/mosuserver/domain/event/entity/DurationJpaVO.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.event; +package life.mosu.mosuserver.domain.event.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/life/mosu/mosuserver/domain/event/entity/EventJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/event/entity/EventJpaEntity.java new file mode 100644 index 00000000..a728477f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/event/entity/EventJpaEntity.java @@ -0,0 +1,67 @@ +package life.mosu.mosuserver.domain.event.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.file.FileWithTime; +import life.mosu.mosuserver.domain.file.Visibility; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; + +@Getter +@Entity +@Table(name = "event") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete +public class EventJpaEntity extends FileWithTime { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "event_id", nullable = false) + private Long id; + + @Column(name = "event_title", nullable = false) + private String title; + + @Embedded + private DurationJpaVO duration; + + @Column(name = "event_link") + private String eventLink; + + @Builder + public EventJpaEntity( + final String fileName, + final String s3Key, + final String title, + final Visibility visibility, + final DurationJpaVO duration, + final String eventLink + ) { + super(fileName, s3Key, visibility); + this.title = title; + this.duration = duration; + this.eventLink = eventLink; + } + + public void update( + final String fileName, + final String s3Key, + final String title, + final DurationJpaVO duration, + final String eventLink + ) { + updateFile(fileName, s3Key); + this.title = title; + this.duration = duration; + this.eventLink = eventLink; + } + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/event/projection/AttachmentProjection.java b/src/main/java/life/mosu/mosuserver/domain/event/projection/AttachmentProjection.java new file mode 100644 index 00000000..f7f9b408 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/event/projection/AttachmentProjection.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.domain.event.projection; + +public record AttachmentProjection(String fileName, String s3Key) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/event/projection/EventWithAttachmentProjection.java b/src/main/java/life/mosu/mosuserver/domain/event/projection/EventWithAttachmentProjection.java new file mode 100644 index 00000000..f41accfe --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/event/projection/EventWithAttachmentProjection.java @@ -0,0 +1,13 @@ +//package life.mosu.mosuserver.domain.event.projection; +// +//import java.time.LocalDate; +// +//public record EventWithAttachmentProjection( +// Long eventId, +// String title, +// LocalDate endDate, +// String eventLink, +// AttachmentProjection attachment +//) { +// +//} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/event/repository/EventJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/event/repository/EventJpaRepository.java new file mode 100644 index 00000000..130bc1ec --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/event/repository/EventJpaRepository.java @@ -0,0 +1,42 @@ +package life.mosu.mosuserver.domain.event.repository; + +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface EventJpaRepository extends JpaRepository { + +// @Query(""" +// select new life.mosu.mosuserver.domain.event.projection.EventWithAttachmentProjection( +// e.id, +// e.title, +// e.duration.endDate, +// e.eventLink, +// new life.mosu.mosuserver.domain.event.projection.AttachmentProjection( +// ea.fileName, +// ea.s3Key +// ) +// ) +// from EventJpaEntity e +// left join EventAttachmentJpaEntity ea +// on e.id = ea.eventId +// """) +// List findAllWithAttachment(); + +// @Query(""" +// select new life.mosu.mosuserver.domain.event.projection.EventWithAttachmentProjection( +// e.id, +// e.title, +// e.duration.endDate, +// e.eventLink, +// new life.mosu.mosuserver.domain.event.projection.AttachmentProjection( +// ea.fileName, +// ea.s3Key +// ) +// ) +// from EventJpaEntity e +// left join EventAttachmentJpaEntity ea +// on e.id = ea.eventId +// WHERE e.id = :id +// """) +// Optional findWithAttachmentById(Long id); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/event/repository/EventQueryRepository.java b/src/main/java/life/mosu/mosuserver/domain/event/repository/EventQueryRepository.java new file mode 100644 index 00000000..1a554886 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/event/repository/EventQueryRepository.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.domain.event.repository; + +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +import org.springframework.data.domain.Slice; + +public interface EventQueryRepository { + + Slice findAllByCursorId(Long cursorId); + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/school/AddressJpaVO.java b/src/main/java/life/mosu/mosuserver/domain/exam/entity/AddressJpaVO.java similarity index 82% rename from src/main/java/life/mosu/mosuserver/domain/school/AddressJpaVO.java rename to src/main/java/life/mosu/mosuserver/domain/exam/entity/AddressJpaVO.java index a54a89ec..8caeed37 100644 --- a/src/main/java/life/mosu/mosuserver/domain/school/AddressJpaVO.java +++ b/src/main/java/life/mosu/mosuserver/domain/exam/entity/AddressJpaVO.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.school; +package life.mosu.mosuserver.domain.exam.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -23,9 +23,9 @@ public class AddressJpaVO { @Builder public AddressJpaVO( - String zipcode, - String street, - String detail + String zipcode, + String street, + String detail ) { this.zipcode = zipcode; this.street = street; diff --git a/src/main/java/life/mosu/mosuserver/domain/exam/entity/Area.java b/src/main/java/life/mosu/mosuserver/domain/exam/entity/Area.java new file mode 100644 index 00000000..5d6f9181 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/exam/entity/Area.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.domain.exam.entity; + +import java.util.Arrays; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.Getter; + +@Getter +public enum Area { + DAECHI("대치"), + MOKDONG("목동"), + NOWON("노원"), + DAEGU("대구"); + private final String areaName; + + private Area(String areaName) { + this.areaName = areaName; + } + + public static Area from(String areaName) { + return Arrays.stream(Area.values()) + .filter(area -> area.getAreaName().equals(areaName)) + .findFirst() + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.NOT_FOUND_AREA)); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaEntity.java new file mode 100644 index 00000000..24c157dc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaEntity.java @@ -0,0 +1,91 @@ +package life.mosu.mosuserver.domain.exam.entity; + + +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDate; +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; + +@Getter +@Entity +@Table(name = "exam") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete +public class ExamJpaEntity extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "school_name") + private String schoolName; + + @Embedded + private AddressJpaVO address; + + @Enumerated(EnumType.STRING) + private Area area; + + @Column(name = "capacity") + private Integer capacity; + + @Column(name = "deadline_time") + private LocalDateTime deadlineTime; + + @Column(name = "exam_date", nullable = false) + private LocalDate examDate; + + @Column(name = "lunch_name") + private String lunchName; + + @Column(name = "lunch_price") + private Integer lunchPrice; + + @Enumerated(EnumType.STRING) + @Column(name = "exam_status", nullable = false) + private ExamStatus examStatus = ExamStatus.OPEN; + + @Builder + public ExamJpaEntity( + String schoolName, + AddressJpaVO address, + Area area, + LocalDate examDate, + Integer capacity, + LocalDateTime deadlineTime, + String lunchName, + Integer lunchPrice + ) { + this.schoolName = schoolName; + this.address = address; + this.area = area; + this.examDate = examDate; + this.capacity = capacity; + this.deadlineTime = deadlineTime; + this.lunchName = lunchName; + this.lunchPrice = lunchPrice; + } + + public boolean hasNotLunch() { + return lunchName == null; + } + + public void close() { + if (this.examStatus != ExamStatus.CLOSED) { + this.examStatus = ExamStatus.CLOSED; + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaRepository.java new file mode 100644 index 00000000..b5510f9a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamJpaRepository.java @@ -0,0 +1,65 @@ +package life.mosu.mosuserver.domain.exam.entity; + +import io.lettuce.core.dynamic.annotation.Param; +import java.time.LocalDate; +import java.util.List; +import java.util.Optional; +import life.mosu.mosuserver.domain.exam.projection.SchoolExamCountProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamInfoProjection; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface ExamJpaRepository extends JpaRepository { + +// List findByArea(Area area); + + + @Query("SELECT DISTINCT e.area FROM ExamJpaEntity e") + List findDistinctAreas(); + + @Query(""" + SELECT new life.mosu.mosuserver.domain.examapplication.projection.ExamInfoProjection( + e.examDate, + ea.examNumber, + e.schoolName + ) + FROM ExamApplicationJpaEntity ea + JOIN ExamJpaEntity e ON ea.examId = e.id + WHERE ea.examId = :examId + """) + Optional findExamInfo(@Param("examId") Long examId); + + + List findByExamDateAfter(LocalDate today); + + Optional findByIdAndExamDateAfter(Long examId, LocalDate today); + + @Query(""" + SELECT new life.mosu.mosuserver.domain.exam.projection.SchoolExamCountProjection( + e.id, + COUNT(ea.id) + ) + FROM ExamJpaEntity e + LEFT JOIN ExamApplicationJpaEntity ea ON ea.examId = e.id + GROUP BY e.id + """) + List countApplicationsGroupedByExamId(); + + + @Query(""" + SELECT new life.mosu.mosuserver.domain.exam.projection.SchoolExamCountProjection( + e.id, + COUNT(ea.id) + ) + FROM ExamJpaEntity e + LEFT JOIN ExamApplicationJpaEntity ea ON ea.examId = e.id + where e.id = :examId + GROUP BY e.id + """) + Optional countApplicationsByExamIdGroupedByExamId( + @Param("examId") Long examId); + + List findByIdIn(List examIds); + + List findByArea(Area area); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamStatus.java b/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamStatus.java new file mode 100644 index 00000000..3158eb53 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/exam/entity/ExamStatus.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.domain.exam.entity; + +public enum ExamStatus { + OPEN, // 모집 중 + CLOSED // 마감 +} diff --git a/src/main/java/life/mosu/mosuserver/domain/exam/projection/SchoolExamCountProjection.java b/src/main/java/life/mosu/mosuserver/domain/exam/projection/SchoolExamCountProjection.java new file mode 100644 index 00000000..6b55986f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/exam/projection/SchoolExamCountProjection.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.domain.exam.projection; + +public record SchoolExamCountProjection( + Long examId, + Long applicationCount +) { + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/entity/ExamApplicationJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/entity/ExamApplicationJpaEntity.java new file mode 100644 index 00000000..f287d066 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/entity/ExamApplicationJpaEntity.java @@ -0,0 +1,69 @@ +package life.mosu.mosuserver.domain.examapplication.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.base.BaseDeleteEntity; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Getter +@Entity +@Table(name = "exam_application") +@Slf4j +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ExamApplicationJpaEntity extends BaseDeleteEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "application_id") + private Long applicationId; + + @Column(name = "user_id") + private Long userId; + + @Column(name = "exam_id") + private Long examId; + + @Column(name = "lunch_checked") + private Boolean isLunchChecked; + + @Column(name = "exam_number") + private String examNumber; + + @Builder + public ExamApplicationJpaEntity( + Long applicationId, + Long userId, + Long examId, + Boolean isLunchChecked) { + this.applicationId = applicationId; + this.userId = userId; + this.examId = examId; + this.isLunchChecked = isLunchChecked; + } + + public static ExamApplicationJpaEntity create( + Long applicationId, + Long userId, + Long examId, + Boolean isLunchChecked) { + return ExamApplicationJpaEntity.builder() + .applicationId(applicationId) + .userId(userId) + .examId(examId) + .isLunchChecked(isLunchChecked) + .build(); + } + public void grantExamNumber(String examNumber) { + this.examNumber = examNumber; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/entity/ExamSubjectJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/entity/ExamSubjectJpaEntity.java new file mode 100644 index 00000000..74210202 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/entity/ExamSubjectJpaEntity.java @@ -0,0 +1,46 @@ +package life.mosu.mosuserver.domain.examapplication.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.application.entity.Subject; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "exam_subject") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class ExamSubjectJpaEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "exam_application_id") + private Long examApplicationId; + + @Enumerated(EnumType.STRING) + private Subject subject; + + @Builder + public ExamSubjectJpaEntity(Long examApplicationId, Subject subject) { + this.examApplicationId = examApplicationId; + this.subject = subject; + } + + public static ExamSubjectJpaEntity create(Long examApplicationId, Subject subject) { + return new ExamSubjectJpaEntity(examApplicationId, subject); + } + + public String getSubjectName() { + return subject.getSubjectName(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamApplicationInfoProjection.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamApplicationInfoProjection.java new file mode 100644 index 00000000..dce2b348 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamApplicationInfoProjection.java @@ -0,0 +1,20 @@ +package life.mosu.mosuserver.domain.examapplication.projection; + +import java.time.LocalDate; +import life.mosu.mosuserver.domain.exam.entity.AddressJpaVO; +import life.mosu.mosuserver.domain.payment.entity.PaymentAmountVO; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; + +public record ExamApplicationInfoProjection( + Long examApplicationId, + String paymentKey, + LocalDate examDate, + String schoolName, + AddressJpaVO address, + Boolean isLunchChecked, + String lunchName, + PaymentAmountVO paymentAmount, + PaymentMethod paymentMethod +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamApplicationNotifyProjection.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamApplicationNotifyProjection.java new file mode 100644 index 00000000..b08ead67 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamApplicationNotifyProjection.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.domain.examapplication.projection; + +import java.time.LocalDate; + +public record ExamApplicationNotifyProjection( + String paymentKey, + LocalDate examDate, + String schoolName, + Boolean isLunchChecked, + String lunchName +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamInfoProjection.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamInfoProjection.java new file mode 100644 index 00000000..3ef30333 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamInfoProjection.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.domain.examapplication.projection; + +import java.time.LocalDate; + + +public record ExamInfoProjection( + LocalDate examDate, + String paymentKey, + String schoolName +) { + +} + diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamInfoWithExamNumberProjection.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamInfoWithExamNumberProjection.java new file mode 100644 index 00000000..9c14570b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamInfoWithExamNumberProjection.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.domain.examapplication.projection; + +import java.time.LocalDate; + +public record ExamInfoWithExamNumberProjection( + LocalDate examDate, + String paymentKey, + String examNumber, + String schoolName +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamTicketInfoProjection.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamTicketInfoProjection.java new file mode 100644 index 00000000..399dab68 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/projection/ExamTicketInfoProjection.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.domain.examapplication.projection; + +import java.time.LocalDate; + +public record ExamTicketInfoProjection( + String s3Key, + String userName, + LocalDate birth, + String examNumber, + String schoolName, + LocalDate examDate +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamApplicationJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamApplicationJpaRepository.java new file mode 100644 index 00000000..a1e378ec --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamApplicationJpaRepository.java @@ -0,0 +1,164 @@ +package life.mosu.mosuserver.domain.examapplication.repository; + +import io.lettuce.core.dynamic.annotation.Param; +import java.util.List; +import java.util.Optional; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationInfoProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationNotifyProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamInfoProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamInfoWithExamNumberProjection; +import life.mosu.mosuserver.domain.examapplication.projection.ExamTicketInfoProjection; +import life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationWithStatus; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ExamApplicationJpaRepository extends + JpaRepository { + + @Modifying + @Query(""" + UPDATE ExamApplicationJpaEntity e + SET e.deleted = true + WHERE e.id = :examApplicationId + """) + void updateDeleteById(@Param("examApplicationId") Long examApplicationId); + + List findByApplicationId(Long applicationId); + + @Query(""" + SELECT new life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationInfoProjection( + ea.id, + p.paymentKey, + e.examDate, + e.schoolName, + e.address, + ea.isLunchChecked, + e.lunchName, + p.paymentAmount, + p.paymentMethod + ) + FROM ExamApplicationJpaEntity ea + JOIN ExamJpaEntity e on ea.examId = e.id + JOIN PaymentJpaEntity p on p.examApplicationId = ea.id + WHERE ea.id = :examApplicationId + AND p.paymentStatus = 'DONE' + """) + Optional findExamApplicationInfoById(Long userId, + Long examApplicationId); + + + @Query(""" + SELECT new life.mosu.mosuserver.domain.examapplication.projection.ExamTicketInfoProjection( + et.s3Key, + u.name, + u.birth, + ea.examNumber, + e.schoolName, + e.examDate + ) + FROM ExamApplicationJpaEntity ea + LEFT JOIN ExamJpaEntity e on ea.examId = e.id + LEFT JOIN ApplicationJpaEntity a on a.id = ea.applicationId + LEFT JOIN ExamTicketImageJpaEntity et on et.applicationId = a.id + LEFT JOIN UserJpaEntity u on a.userId = u.id + LEFT JOIN PaymentJpaEntity p on p.examApplicationId = ea.id + WHERE ea.id = :examApplicationId + AND u.id = :userId + AND p.paymentStatus = 'DONE' + """) + Optional findExamTicketInfoProjectionById( + @Param("userId") Long userId, + @Param("examApplicationId") Long examApplicationId); + + boolean existsByApplicationId(Long applicationId); + + @Query(""" + SELECT new life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationWithStatus( + ea, + CASE + WHEN r.refundStatus = 'DONE' THEN '환불완료' + ELSE '결제완료' + END + ) + FROM ExamApplicationJpaEntity ea + JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id + LEFT JOIN RefundJpaEntity r ON r.examApplicationId = ea.id + WHERE p.paymentStatus = 'DONE' + AND (r IS NULL OR r.refundStatus = 'DONE') + AND ea.applicationId IN :applicationIds + """) + List findByApplicationIdIn(List applicationIds); + + + @Query(""" + SELECT new life.mosu.mosuserver.domain.examapplication.projection.ExamApplicationNotifyProjection( + p.paymentKey, + e.examDate, + e.schoolName, + ea.isLunchChecked, + e.lunchName + ) + FROM ExamApplicationJpaEntity ea + JOIN ExamJpaEntity e on ea.examId = e.id + JOIN PaymentJpaEntity p on p.examApplicationId = ea.id + WHERE ea.id = :targetId + AND p.paymentStatus = 'DONE' + """) + Optional findExamAndPaymentByExamApplicationId( + @Param("targetId") Long targetId); + + + @Query(""" + SELECT new life.mosu.mosuserver.domain.examapplication.projection.ExamInfoProjection( + e.examDate, + p.paymentKey, + e.schoolName + ) + FROM ExamApplicationJpaEntity ea + JOIN ExamJpaEntity e ON ea.examId = e.id + JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id + WHERE ea.id = :examApplicationId + AND p.paymentStatus = 'DONE' + """) + Optional findExamInfo(@Param("examApplicationId") Long examApplicationId); + + + @Query(""" + SELECT new life.mosu.mosuserver.domain.examapplication.projection.ExamInfoWithExamNumberProjection( + e.examDate, + p.paymentKey, + ea.examNumber, + e.schoolName + ) + FROM ExamApplicationJpaEntity ea + JOIN ExamJpaEntity e ON ea.examId = e.id + JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id + WHERE ea.id = :examApplicationId + AND p.paymentStatus = 'DONE' + """) + Optional findExamInfoWithExamNumber( + @Param("examApplicationId") Long examApplicationId); + + @Query(""" + SELECT case when COUNT(ea) > 0 then true else false end + FROM ExamApplicationJpaEntity ea + JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id + WHERE ea.id = :examApplicationId + AND ea.userId = :userId + AND p.paymentStatus = 'DONE' + """) + boolean existByUserIdAndExamApplicationId(@Param("userId") Long userId, + @Param("examApplicationId") Long examApplicationId); + + + @Query(""" + SELECT e + FROM ExamApplicationJpaEntity e + JOIN VirtualAccountLogJpaEntity v ON e.applicationId = v.applicationId + WHERE v.orderId = :orderId + AND e.deleted = false + """) + Optional findByOrderId(String orderId); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamSubjectJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamSubjectJpaRepository.java new file mode 100644 index 00000000..3aad5dac --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/repository/ExamSubjectJpaRepository.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.domain.examapplication.repository; + +import io.lettuce.core.dynamic.annotation.Param; +import java.util.List; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; + +public interface ExamSubjectJpaRepository extends JpaRepository { + + List findByExamApplicationId(Long examApplicationId); + + @Modifying + @Query(value = """ + UPDATE exam_subject es + JOIN payment p ON es.exam_application_id = p.exam_application_id + SET es.deleted = true + WHERE p.status = 'DONE' + AND p.exam_application_id = :examApplicationId + """, nativeQuery = true) + void deleteByExamApplicationId(@Param("examApplicationId") Long examApplicationId); + + List findByExamApplicationIdIn(List examApplicationIds); + + @Modifying + @Query(value = """ + DELETE es + FROM exam_subject es + JOIN payment p ON es.exam_application_id = p.exam_application_id + WHERE p.status = 'DONE' + AND p.exam_application_id = :examApplicationId + """, nativeQuery = true) + void deleteExamSubjectsWithDonePayment(@Param("examApplicationId") Long examApplicationId); + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/service/ExamApplicationAmountCalculator.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/service/ExamApplicationAmountCalculator.java new file mode 100644 index 00000000..e1a40886 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/service/ExamApplicationAmountCalculator.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.domain.examapplication.service; + +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import org.springframework.stereotype.Component; + +@Component +public class ExamApplicationAmountCalculator { + + private static final int BASE_AMOUNT = 40_000; + private static final int LUNCH_AMOUNT = 9_000; + + public int calculate(ExamApplicationJpaEntity application) { + return application.getIsLunchChecked().equals(Boolean.TRUE) ? + BASE_AMOUNT + LUNCH_AMOUNT : + BASE_AMOUNT; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/examapplication/service/ExamNumberGenerationService.java b/src/main/java/life/mosu/mosuserver/domain/examapplication/service/ExamNumberGenerationService.java new file mode 100644 index 00000000..9c578d8c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/examapplication/service/ExamNumberGenerationService.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.domain.examapplication.service; + +import java.util.List; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.global.support.NumberGenerator; +import org.springframework.stereotype.Component; + +@Component +public class ExamNumberGenerationService implements NumberGenerator { + + public void grantTo(List examApplicationEntities) { + examApplicationEntities.forEach(examApplicationEntity -> { + String examNumber = generate(); + examApplicationEntity.grantExamNumber(examNumber); + }); + } + + @Override + public String generate() { + return ""; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/faq/FaqAttachmentJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/faq/FaqAttachmentJpaEntity.java deleted file mode 100644 index b910d9c9..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/faq/FaqAttachmentJpaEntity.java +++ /dev/null @@ -1,30 +0,0 @@ -package life.mosu.mosuserver.domain.faq; - -import jakarta.persistence.*; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; -import org.hibernate.annotations.SoftDelete; - -@Getter -@Entity -@Table(name = "faq_attachment") -@NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) -@SoftDelete -public class FaqAttachmentJpaEntity extends File { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "faq_attachment_id", nullable = false) - private Long id; - - @Column(name = "faq_id", nullable = false) - private Long faqId; - - @Builder - public FaqAttachmentJpaEntity(final String fileName, final String s3Key, final Visibility visibility, final Long faqId) { - super(fileName, s3Key, visibility); - this.faqId = faqId; - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/faq/FaqAttachmentRepository.java b/src/main/java/life/mosu/mosuserver/domain/faq/FaqAttachmentRepository.java deleted file mode 100644 index d445a2a5..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/faq/FaqAttachmentRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package life.mosu.mosuserver.domain.faq; - -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface FaqAttachmentRepository extends JpaRepository { - List findAllByFaqId(Long faqId); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/faq/FaqFile.java b/src/main/java/life/mosu/mosuserver/domain/faq/FaqFile.java deleted file mode 100644 index 915989a3..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/faq/FaqFile.java +++ /dev/null @@ -1,20 +0,0 @@ -package life.mosu.mosuserver.domain.faq; - -import jakarta.persistence.Embeddable; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Embeddable -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class FaqFile extends File { - - @Builder - public FaqFile(String fileName, String s3Key, Visibility visibility) { - super(fileName, s3Key, visibility); - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaEntity.java index d67c2df2..15dedf57 100644 --- a/src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaEntity.java @@ -10,11 +10,13 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; @Getter @Entity @Table(name = "faq") @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) +@SoftDelete public class FaqJpaEntity extends BaseTimeEntity { @Id diff --git a/src/main/java/life/mosu/mosuserver/domain/faq/FaqRepository.java b/src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaRepository.java similarity index 57% rename from src/main/java/life/mosu/mosuserver/domain/faq/FaqRepository.java rename to src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaRepository.java index 425e320c..080fb7f7 100644 --- a/src/main/java/life/mosu/mosuserver/domain/faq/FaqRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/faq/FaqJpaRepository.java @@ -3,5 +3,6 @@ import org.springframework.data.jpa.repository.JpaRepository; -public interface FaqRepository extends JpaRepository { +public interface FaqJpaRepository extends JpaRepository { + } diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/domain/File.java b/src/main/java/life/mosu/mosuserver/domain/file/File.java similarity index 64% rename from src/main/java/life/mosu/mosuserver/infra/storage/domain/File.java rename to src/main/java/life/mosu/mosuserver/domain/file/File.java index 44ba0581..b9ae33fb 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/domain/File.java +++ b/src/main/java/life/mosu/mosuserver/domain/file/File.java @@ -1,6 +1,9 @@ -package life.mosu.mosuserver.infra.storage.domain; +package life.mosu.mosuserver.domain.file; -import jakarta.persistence.*; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MappedSuperclass; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -10,14 +13,14 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public abstract class File { - @Column(nullable = false) + @Column private String fileName; - @Column(nullable = false) + @Column private String s3Key; @Enumerated(EnumType.STRING) - @Column(nullable = false) + @Column private Visibility visibility; protected File(String fileName, String s3Key, Visibility visibility) { @@ -27,6 +30,6 @@ protected File(String fileName, String s3Key, Visibility visibility) { } public boolean isPublic() { - return this.visibility == Visibility.PUBLIC; + return this.visibility.equals(Visibility.PUBLIC); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/domain/FileMoveFailLog.java b/src/main/java/life/mosu/mosuserver/domain/file/FileMoveFailLog.java similarity index 92% rename from src/main/java/life/mosu/mosuserver/infra/storage/domain/FileMoveFailLog.java rename to src/main/java/life/mosu/mosuserver/domain/file/FileMoveFailLog.java index 9e55a76e..f934dd34 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/domain/FileMoveFailLog.java +++ b/src/main/java/life/mosu/mosuserver/domain/file/FileMoveFailLog.java @@ -1,11 +1,10 @@ -package life.mosu.mosuserver.infra.storage.domain; +package life.mosu.mosuserver.domain.file; import jakarta.persistence.Entity; -import jakarta.persistence.Id; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; import life.mosu.mosuserver.domain.base.BaseTimeEntity; -import lombok.Builder; import lombok.NoArgsConstructor; @Entity diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/domain/FileMoveFailLogRepository.java b/src/main/java/life/mosu/mosuserver/domain/file/FileMoveFailLogRepository.java similarity index 75% rename from src/main/java/life/mosu/mosuserver/infra/storage/domain/FileMoveFailLogRepository.java rename to src/main/java/life/mosu/mosuserver/domain/file/FileMoveFailLogRepository.java index fdf16095..834d749f 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/domain/FileMoveFailLogRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/file/FileMoveFailLogRepository.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.infra.storage.domain; +package life.mosu.mosuserver.domain.file; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/life/mosu/mosuserver/domain/file/FileWithTime.java b/src/main/java/life/mosu/mosuserver/domain/file/FileWithTime.java new file mode 100644 index 00000000..b179b6ff --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/file/FileWithTime.java @@ -0,0 +1,41 @@ +package life.mosu.mosuserver.domain.file; + +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.MappedSuperclass; +import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@MappedSuperclass +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public abstract class FileWithTime extends BaseTimeEntity { + + @Column + private String fileName; + + @Column + private String s3Key; + + @Enumerated(EnumType.STRING) + @Column + private Visibility visibility; + + protected FileWithTime(String fileName, String s3Key, Visibility visibility) { + this.fileName = fileName; + this.s3Key = s3Key; + this.visibility = visibility; + } + + public boolean isPublic() { + return this.visibility.equals(Visibility.PUBLIC); + } + + protected void updateFile(String fileName, String s3Key) { + this.fileName = fileName; + this.s3Key = s3Key; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/domain/Folder.java b/src/main/java/life/mosu/mosuserver/domain/file/Folder.java similarity index 78% rename from src/main/java/life/mosu/mosuserver/infra/storage/domain/Folder.java rename to src/main/java/life/mosu/mosuserver/domain/file/Folder.java index 82c0b0e5..a06927f8 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/domain/Folder.java +++ b/src/main/java/life/mosu/mosuserver/domain/file/Folder.java @@ -1,12 +1,13 @@ -package life.mosu.mosuserver.infra.storage.domain; +package life.mosu.mosuserver.domain.file; + + +import static life.mosu.mosuserver.domain.file.Visibility.PRIVATE; +import static life.mosu.mosuserver.domain.file.Visibility.PUBLIC; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import lombok.Getter; -import static life.mosu.mosuserver.infra.storage.domain.Visibility.PRIVATE; -import static life.mosu.mosuserver.infra.storage.domain.Visibility.PUBLIC; - @Getter public enum Folder { EVENT("event", PUBLIC), @@ -28,10 +29,11 @@ public enum Folder { } public static Folder validate(String folderName) { - for (Folder folder : Folder.values()) + for (Folder folder : Folder.values()) { if (folder.name().equals(folderName)) { return folder; } + } throw new CustomRuntimeException(ErrorCode.WRONG_FOLDER_TYPE); } } diff --git a/src/main/java/life/mosu/mosuserver/domain/file/Visibility.java b/src/main/java/life/mosu/mosuserver/domain/file/Visibility.java new file mode 100644 index 00000000..59bed1c3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/file/Visibility.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.domain.file; + +public enum Visibility { + PUBLIC, PRIVATE +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/form/FormJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/form/FormJpaEntity.java new file mode 100644 index 00000000..fb61eb25 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/form/FormJpaEntity.java @@ -0,0 +1,96 @@ +package life.mosu.mosuserver.domain.form; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import java.time.LocalDate; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import life.mosu.mosuserver.domain.exam.entity.Area; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@Table(name = "form") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class FormJpaEntity extends BaseTimeEntity { + + @Id + @Column(name = "form_id", nullable = false) + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "exam_date", nullable = false) + private LocalDate examDate; + + @Column(name = "org_name") + private String orgName; + + @Column(name = "password") + private String password; + + @Column(name = "user_name") + private String userName; + + @Enumerated(EnumType.STRING) + private Gender gender; + + @Column(name = "birth") + private LocalDate birth; + + @Column(name = "phone_number") + private String phoneNumber; + + @Column(name = "subjects") + @Enumerated(EnumType.STRING) + private Subject subject; + + @Column(name = "subjects2") + @Enumerated(EnumType.STRING) + private Subject subject2; + + @Column(name = "lunch") + private boolean lunch; + + @Column(name = "area") + @Enumerated(EnumType.STRING) + private Area area; + + @Column(name = "school_name") + private String schoolName; + + @Column(name = "file_name") + private String fileName; + + @Column(name = "s3_key") + private String s3Key; + + @Builder + public FormJpaEntity(LocalDate examDate, String orgName, String password, String userName, + Gender gender, LocalDate birth, String phoneNumber, Subject subject, Subject subject2, + boolean lunch, Area area, String schoolName, String fileName, String s3Key) { + this.examDate = examDate; + this.orgName = orgName; + this.password = password; + this.userName = userName; + this.gender = gender; + this.birth = birth; + this.phoneNumber = phoneNumber; + this.subject = subject; + this.subject2 = subject2; + this.lunch = lunch; + this.area = area; + this.schoolName = schoolName; + this.fileName = fileName; + this.s3Key = s3Key; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/form/FormJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/form/FormJpaRepository.java new file mode 100644 index 00000000..83feb367 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/form/FormJpaRepository.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.domain.form; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FormJpaRepository extends JpaRepository { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryRepository.java deleted file mode 100644 index 9dd40bac..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryRepository.java +++ /dev/null @@ -1,8 +0,0 @@ -package life.mosu.mosuserver.domain.inquiry; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface InquiryRepository extends JpaRepository, - InquiryQueryRepository { - -} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryStatus.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryStatus.java deleted file mode 100644 index 41cd07f9..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryStatus.java +++ /dev/null @@ -1,6 +0,0 @@ -package life.mosu.mosuserver.domain.inquiry; - -public enum InquiryStatus { - PENDING, - COMPLETED, -} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryAttachmentJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryAttachmentJpaEntity.java similarity index 81% rename from src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryAttachmentJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryAttachmentJpaEntity.java index e08fd7c7..4bbc4bac 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryAttachmentJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryAttachmentJpaEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.inquiry; +package life.mosu.mosuserver.domain.inquiry.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -6,18 +6,16 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.SoftDelete; @Getter @Entity @Table(name = "inquiry_attachment") @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) -@SoftDelete public class InquiryAttachmentJpaEntity extends File { @Id diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryFile.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryFile.java similarity index 71% rename from src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryFile.java rename to src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryFile.java index 7c3ce0f5..897b3c86 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryFile.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryFile.java @@ -1,8 +1,8 @@ -package life.mosu.mosuserver.domain.inquiry; +package life.mosu.mosuserver.domain.inquiry.entity; import jakarta.persistence.Embeddable; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryJpaEntity.java similarity index 93% rename from src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryJpaEntity.java index 22045643..73ea1319 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryJpaEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.inquiry; +package life.mosu.mosuserver.domain.inquiry.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -12,11 +12,13 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; @Getter @Entity @Table(name = "inquiry") @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) +@SoftDelete public class InquiryJpaEntity extends BaseTimeEntity { @Id diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryStatus.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryStatus.java new file mode 100644 index 00000000..a317f919 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/entity/InquiryStatus.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.domain.inquiry.entity; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum InquiryStatus { + PENDING("미응답"), + COMPLETED("완료"); + + private final String statusName; +} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryAttachmentRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryAttachmentJpaRepository.java similarity index 52% rename from src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryAttachmentRepository.java rename to src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryAttachmentJpaRepository.java index b409d086..b15f7e4e 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryAttachmentRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryAttachmentJpaRepository.java @@ -1,9 +1,10 @@ -package life.mosu.mosuserver.domain.inquiry; +package life.mosu.mosuserver.domain.inquiry.repository; import java.util.List; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryAttachmentJpaEntity; import org.springframework.data.jpa.repository.JpaRepository; -public interface InquiryAttachmentRepository extends +public interface InquiryAttachmentJpaRepository extends JpaRepository { List findAllByInquiryId(Long id); diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryJpaRepository.java new file mode 100644 index 00000000..43d2398d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryJpaRepository.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.domain.inquiry.repository; + +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface InquiryJpaRepository extends JpaRepository, + InquiryQueryRepository { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryQueryRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryQueryRepository.java similarity index 63% rename from src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryQueryRepository.java rename to src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryQueryRepository.java index fed24869..f26d0943 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryQueryRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiry/repository/InquiryQueryRepository.java @@ -1,5 +1,6 @@ -package life.mosu.mosuserver.domain.inquiry; +package life.mosu.mosuserver.domain.inquiry.repository; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryStatus; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; @@ -8,4 +9,6 @@ public interface InquiryQueryRepository { Page searchInquiries(InquiryStatus status, String sortField, boolean asc, Pageable pageable); + + Page searchMyInquiry(Long userId, Pageable pageable); } diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerRepository.java deleted file mode 100644 index 8ee8c2f1..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package life.mosu.mosuserver.domain.inquiryAnswer; - -import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface InquiryAnswerRepository extends JpaRepository { - - Optional findByInquiryId(Long id); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerAttachmentEntity.java b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerAttachmentEntity.java similarity index 81% rename from src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerAttachmentEntity.java rename to src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerAttachmentEntity.java index 4fa1b988..ba0578fc 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerAttachmentEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerAttachmentEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.inquiryAnswer; +package life.mosu.mosuserver.domain.inquiryAnswer.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -6,19 +6,17 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.hibernate.annotations.SoftDelete; @Getter @Entity @Table(name = "inquiry_answer_attachment") @NoArgsConstructor(access = lombok.AccessLevel.PROTECTED) -@SoftDelete public class InquiryAnswerAttachmentEntity extends File { @Id diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerFile.java b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerFile.java similarity index 71% rename from src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerFile.java rename to src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerFile.java index 59e1c80a..50a132cb 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerFile.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerFile.java @@ -1,8 +1,8 @@ -package life.mosu.mosuserver.domain.inquiryAnswer; +package life.mosu.mosuserver.domain.inquiryAnswer.entity; import jakarta.persistence.Embeddable; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerJpaEntity.java similarity index 92% rename from src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerJpaEntity.java index 33b342b4..3e7f08b2 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/entity/InquiryAnswerJpaEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.inquiryAnswer; +package life.mosu.mosuserver.domain.inquiryAnswer.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,11 +11,13 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; @Getter @Entity @Table(name = "inquiry_answer") @NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete public class InquiryAnswerJpaEntity extends BaseTimeEntity { @Id diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerAttachmentRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/repository/InquiryAnswerAttachmentJpaRepository.java similarity index 51% rename from src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerAttachmentRepository.java rename to src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/repository/InquiryAnswerAttachmentJpaRepository.java index 580dcb05..5bd49df5 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/InquiryAnswerAttachmentRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/repository/InquiryAnswerAttachmentJpaRepository.java @@ -1,9 +1,10 @@ -package life.mosu.mosuserver.domain.inquiryAnswer; +package life.mosu.mosuserver.domain.inquiryAnswer.repository; import java.util.List; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerAttachmentEntity; import org.springframework.data.jpa.repository.JpaRepository; -public interface InquiryAnswerAttachmentRepository extends +public interface InquiryAnswerAttachmentJpaRepository extends JpaRepository { List findAllByInquiryAnswerId(Long id); diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/repository/InquiryAnswerJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/repository/InquiryAnswerJpaRepository.java new file mode 100644 index 00000000..55f56287 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/inquiryAnswer/repository/InquiryAnswerJpaRepository.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.domain.inquiryAnswer.repository; + +import java.util.Optional; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface InquiryAnswerJpaRepository extends JpaRepository { + + Optional findByInquiryId(Long id); + + boolean existsByInquiryId(Long inquiryId); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeAttachmentRepository.java b/src/main/java/life/mosu/mosuserver/domain/notice/NoticeAttachmentRepository.java deleted file mode 100644 index de666beb..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeAttachmentRepository.java +++ /dev/null @@ -1,9 +0,0 @@ -package life.mosu.mosuserver.domain.notice; - -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface NoticeAttachmentRepository extends JpaRepository { - - List findAllByNoticeId(Long id); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeRepository.java b/src/main/java/life/mosu/mosuserver/domain/notice/NoticeRepository.java deleted file mode 100644 index 3fe628f9..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package life.mosu.mosuserver.domain.notice; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface NoticeRepository extends JpaRepository { - -} diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeAttachmentJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeAttachmentJpaEntity.java similarity index 59% rename from src/main/java/life/mosu/mosuserver/domain/notice/NoticeAttachmentJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeAttachmentJpaEntity.java index 76f88471..430beafc 100644 --- a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeAttachmentJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeAttachmentJpaEntity.java @@ -1,8 +1,13 @@ -package life.mosu.mosuserver.domain.notice; +package life.mosu.mosuserver.domain.notice.entity; -import jakarta.persistence.*; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -13,6 +18,7 @@ @Table(name = "notice_attachment") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class NoticeAttachmentJpaEntity extends File { + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "notice_attachment_id", nullable = false) @@ -22,7 +28,8 @@ public class NoticeAttachmentJpaEntity extends File { private Long noticeId; @Builder - public NoticeAttachmentJpaEntity(final String fileName, final String s3Key, final Visibility visibility, final Long noticeId) { + public NoticeAttachmentJpaEntity(final String fileName, final String s3Key, + final Visibility visibility, final Long noticeId) { super(fileName, s3Key, visibility); this.noticeId = noticeId; } diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeFile.java b/src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeFile.java similarity index 71% rename from src/main/java/life/mosu/mosuserver/domain/notice/NoticeFile.java rename to src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeFile.java index ea2db909..04246e05 100644 --- a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeFile.java +++ b/src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeFile.java @@ -1,8 +1,8 @@ -package life.mosu.mosuserver.domain.notice; +package life.mosu.mosuserver.domain.notice.entity; import jakarta.persistence.Embeddable; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Visibility; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeJpaEntity.java similarity index 93% rename from src/main/java/life/mosu/mosuserver/domain/notice/NoticeJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeJpaEntity.java index 48a9c491..2e0478ee 100644 --- a/src/main/java/life/mosu/mosuserver/domain/notice/NoticeJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/notice/entity/NoticeJpaEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.notice; +package life.mosu.mosuserver.domain.notice.entity; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -11,11 +11,13 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; @Getter @Entity @Table(name = "notice") @NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete public class NoticeJpaEntity extends BaseTimeEntity { @Id diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/repository/NoticeAttachmentJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/notice/repository/NoticeAttachmentJpaRepository.java new file mode 100644 index 00000000..77b22b70 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/notice/repository/NoticeAttachmentJpaRepository.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.domain.notice.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.notice.entity.NoticeAttachmentJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface NoticeAttachmentJpaRepository extends + JpaRepository { + + List findAllByNoticeId(Long id); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/notice/repository/NoticeJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/notice/repository/NoticeJpaRepository.java new file mode 100644 index 00000000..38c1b145 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/notice/repository/NoticeJpaRepository.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.domain.notice.repository; + +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface NoticeJpaRepository extends JpaRepository { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/notify/entity/NotifyJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/notify/entity/NotifyJpaEntity.java new file mode 100644 index 00000000..61ad749e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/notify/entity/NotifyJpaEntity.java @@ -0,0 +1,45 @@ +package life.mosu.mosuserver.domain.notify.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; + + +@Entity +@Getter +@Table(name = "notify") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete +public class NotifyJpaEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "notify_custom_key", nullable = false, unique = true) + private String customKey; + + @Enumerated(EnumType.STRING) + @Column(name = "notify_type", nullable = false) + private NotifyType type; + + @Column(name = "notify_result_code", nullable = false) + private String resultCode; + + @Builder + public NotifyJpaEntity(String customKey, NotifyType type, String resultCode) { + this.customKey = customKey; + this.type = type; + this.resultCode = resultCode; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/notify/entity/NotifyType.java b/src/main/java/life/mosu/mosuserver/domain/notify/entity/NotifyType.java new file mode 100644 index 00000000..7b9cb80c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/notify/entity/NotifyType.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.domain.notify.entity; + +import java.util.Arrays; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public enum NotifyType { + ALIM_TALK("alimtalk"), + SMS("sms"), + LMS("lms"); + + private final String delimiter; + + public static NotifyType from(String delimiter) { + return Arrays.stream(NotifyType.values()) + .filter(type -> type.delimiter.equalsIgnoreCase(delimiter)) + .findFirst() + .orElseThrow( + () -> new IllegalArgumentException( + "Unknown NotifyType code: " + delimiter)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/notify/repository/NotifyJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/notify/repository/NotifyJpaRepository.java new file mode 100644 index 00000000..b951ef3a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/notify/repository/NotifyJpaRepository.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.domain.notify.repository; + +import life.mosu.mosuserver.domain.notify.entity.NotifyJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface NotifyJpaRepository extends JpaRepository { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/notify/service/NotifyRetryableDetermineService.java b/src/main/java/life/mosu/mosuserver/domain/notify/service/NotifyRetryableDetermineService.java new file mode 100644 index 00000000..750d33a9 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/notify/service/NotifyRetryableDetermineService.java @@ -0,0 +1,16 @@ +package life.mosu.mosuserver.domain.notify.service; + +import java.util.Set; +import org.springframework.stereotype.Component; + +@Component +public class NotifyRetryableDetermineService { + + private static final Set RETRYABLE_CODES = Set.of( + "2000", "3049", "8000", "9999", "2001", "2002", "2007", "3000" + ); + + public boolean determine(String statusCode) { + return RETRYABLE_CODES.contains(statusCode); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentRepository.java b/src/main/java/life/mosu/mosuserver/domain/payment/PaymentRepository.java deleted file mode 100644 index 084863c2..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package life.mosu.mosuserver.domain.payment; - -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface PaymentRepository extends JpaRepository { - - // TODO:인덱스 처리 필요(풀스캔 위험) - boolean existsByOrderId(String orderId); - - List findByOrderId(String orderId); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentStatus.java b/src/main/java/life/mosu/mosuserver/domain/payment/PaymentStatus.java deleted file mode 100644 index edcf4208..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentStatus.java +++ /dev/null @@ -1,25 +0,0 @@ -package life.mosu.mosuserver.domain.payment; - -import java.util.Arrays; - -public enum PaymentStatus { - //결제 - PREPARE, - DONE, - EXPIRED, - ABORTED, - //환불 - CANCELLED_DONE, - CANCELLED_ABORTED; - - public static PaymentStatus from(String raw) { - return Arrays.stream(values()) - .filter(v -> v.name().equalsIgnoreCase(raw)) - .findFirst() - .orElseThrow(() -> new IllegalArgumentException("Unknown status: " + raw)); - } - - public boolean isPaySuccess() { - return this == DONE; - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentAmountVO.java b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentAmountVO.java similarity index 94% rename from src/main/java/life/mosu/mosuserver/domain/payment/PaymentAmountVO.java rename to src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentAmountVO.java index 0d39d4e9..595cc020 100644 --- a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentAmountVO.java +++ b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentAmountVO.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.payment; +package life.mosu.mosuserver.domain.payment.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; @@ -12,7 +12,7 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class PaymentAmountVO { - @Column(name = "total_amount", nullable = false) + @Column(name = "total_amount") private Integer totalAmount; @Column(name = "supplied_amount") diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentFailureLogJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentFailureLogJpaEntity.java new file mode 100644 index 00000000..b65c0cb1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentFailureLogJpaEntity.java @@ -0,0 +1,55 @@ +package life.mosu.mosuserver.domain.payment.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Table(name = "payment_failure_log") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class PaymentFailureLogJpaEntity extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "payment_failure_id") + private Long id; + + @Column(name = "payment_id", nullable = false) + private Long paymentId; + + @Column(name = "exam_application_id", nullable = false) + private Long examApplicationId; + + @Column(name = "application_id") + private Long applicationId; + + @Column(name = "reason", nullable = false, length = 255) + private String reason; + + @Column(name = "snapshot", columnDefinition = "TEXT") + private String snapshot; + + @Builder + public PaymentFailureLogJpaEntity( + Long paymentId, + Long examApplicationId, + Long applicationId, + String reason, + String snapshot + ) { + this.paymentId = paymentId; + this.examApplicationId = examApplicationId; + this.applicationId = applicationId; + this.reason = reason; + this.snapshot = snapshot; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentJpaEntity.java similarity index 73% rename from src/main/java/life/mosu/mosuserver/domain/payment/PaymentJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentJpaEntity.java index 4dc7b6d0..96f82ef2 100644 --- a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentJpaEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.payment; +package life.mosu.mosuserver.domain.payment.entity; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -8,8 +8,9 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Index; import jakarta.persistence.Table; -import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import life.mosu.mosuserver.domain.base.BaseDeleteEntity; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -17,17 +18,25 @@ @Entity @Getter -@Table(name = "payment") +@Table( + name = "payment", + indexes = { + @Index(name = "idx_status_created_at", columnList = "status, created_at") + } +) @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class PaymentJpaEntity extends BaseTimeEntity { +public class PaymentJpaEntity extends BaseDeleteEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "payment_id") private Long id; - @Column(name = "application_school_id") - private Long applicationSchoolId; + @Column(name = "exam_application_id") + private Long examApplicationId; + + @Column(name = "application_id") + private Long applicationId; @Column(name = "payment_key") private String paymentKey; @@ -48,14 +57,16 @@ public class PaymentJpaEntity extends BaseTimeEntity { @Builder(access = AccessLevel.PRIVATE) private PaymentJpaEntity( - Long applicationSchoolId, + Long examApplicationId, + Long applicationId, String paymentKey, String orderId, PaymentAmountVO paymentAmount, PaymentStatus paymentStatus, PaymentMethod paymentMethod ) { - this.applicationSchoolId = applicationSchoolId; + this.examApplicationId = examApplicationId; + this.applicationId = applicationId; this.paymentKey = paymentKey; this.orderId = orderId; this.paymentAmount = paymentAmount; @@ -64,7 +75,8 @@ private PaymentJpaEntity( } public static PaymentJpaEntity of( - Long applicationSchoolId, + Long examApplicationId, + Long applicationId, String paymentKey, String orderId, PaymentStatus paymentStatus, @@ -72,7 +84,8 @@ public static PaymentJpaEntity of( PaymentMethod paymentMethod ) { return PaymentJpaEntity.builder() - .applicationSchoolId(applicationSchoolId) + .examApplicationId(examApplicationId) + .applicationId(applicationId) .paymentKey(paymentKey) .orderId(orderId) .paymentStatus(paymentStatus) @@ -82,14 +95,14 @@ public static PaymentJpaEntity of( } public static PaymentJpaEntity ofFailure( - Long applicationSchoolId, + Long examApplicationId, String orderId, PaymentStatus paymentStatus, Integer totalAmount ) { PaymentAmountVO paymentAmount = PaymentAmountVO.ofFailure(totalAmount); return PaymentJpaEntity.builder() - .applicationSchoolId(applicationSchoolId) + .examApplicationId(examApplicationId) .orderId(orderId) .paymentStatus(paymentStatus) .paymentAmount(paymentAmount) diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentMethod.java b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentMethod.java similarity index 87% rename from src/main/java/life/mosu/mosuserver/domain/payment/PaymentMethod.java rename to src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentMethod.java index 4f9e3c23..5ef0f1bf 100644 --- a/src/main/java/life/mosu/mosuserver/domain/payment/PaymentMethod.java +++ b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentMethod.java @@ -1,11 +1,13 @@ -package life.mosu.mosuserver.domain.payment; +package life.mosu.mosuserver.domain.payment.entity; import java.util.Arrays; +import lombok.Getter; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @RequiredArgsConstructor @Slf4j +@Getter public enum PaymentMethod { EASY_PAY("간편결제"), CARD("카드"), diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentStatus.java b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentStatus.java new file mode 100644 index 00000000..3397f02a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/entity/PaymentStatus.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.domain.payment.entity; + +import java.util.Arrays; + +public enum PaymentStatus { + //결제 + PREPARE, + DONE, + EXPIRED, + ABORTED; + + public static PaymentStatus from(String raw) { + return Arrays.stream(values()) + .filter(v -> v.name().equalsIgnoreCase(raw)) + .findFirst() + .orElseThrow(() -> new IllegalArgumentException("Unknown status: " + raw)); + } + + public boolean isPaySuccess() { + return this == DONE; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/projection/PaymentWithLunchProjection.java b/src/main/java/life/mosu/mosuserver/domain/payment/projection/PaymentWithLunchProjection.java new file mode 100644 index 00000000..e18fa29f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/projection/PaymentWithLunchProjection.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.domain.payment.projection; + +public record PaymentWithLunchProjection(Long examApplicationId, Long examId, Boolean lunchChecked) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentFailureLogJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentFailureLogJpaRepository.java new file mode 100644 index 00000000..00630f25 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentFailureLogJpaRepository.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.domain.payment.repository; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.payment.entity.PaymentFailureLogJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface PaymentFailureLogJpaRepository extends + JpaRepository, PaymentFailureLogRepositoryCustom { + + int deleteByCreatedAtBefore(LocalDateTime date); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentFailureLogRepositoryCustom.java b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentFailureLogRepositoryCustom.java new file mode 100644 index 00000000..6905afcd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentFailureLogRepositoryCustom.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.domain.payment.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentFailureLogJpaEntity; + +public interface PaymentFailureLogRepositoryCustom { + + void saveAllUsingBatch( + List paymentFailureLogJpaEntities); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentJpaRepository.java new file mode 100644 index 00000000..85dfb22f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentJpaRepository.java @@ -0,0 +1,44 @@ +package life.mosu.mosuserver.domain.payment.repository; + +import java.time.LocalDateTime; +import java.util.List; +import life.mosu.mosuserver.domain.payment.projection.PaymentWithLunchProjection; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface PaymentJpaRepository extends JpaRepository, + PaymentJpaRepositoryCustom { + + // TODO:인덱스 처리 필요(풀스캔 위험) + boolean existsByOrderId(String orderId); + + List findByOrderId(String orderId); + + List findByExamApplicationIdIn(List examApplicationIds); + + @Query( + """ + SELECT new life.mosu.mosuserver.domain.payment.projection.PaymentWithLunchProjection( + p.examApplicationId, + ea.examId, + ea.isLunchChecked + ) + FROM PaymentJpaEntity p + JOIN ExamApplicationJpaEntity ea ON p.examApplicationId = ea.id + WHERE p.paymentKey = :paymentKey + """ + ) + List findByPaymentKeyWithLunch(String paymentKey); + + List findByPaymentKey(String paymentKey); + + @Query(""" + SELECT p + FROM PaymentJpaEntity p + WHERE p.createdAt < :time + AND p.paymentStatus in ('PREPARE', 'EXPIRED', 'ABORTED') + """) + List findFailedPayments(@Param("time") LocalDateTime time); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentJpaRepositoryCustom.java b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentJpaRepositoryCustom.java new file mode 100644 index 00000000..2cb53312 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/repository/PaymentJpaRepositoryCustom.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.domain.payment.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; + +public interface PaymentJpaRepositoryCustom { + + void batchDeleteAllWithExamApplications(List paymentJpaEntities); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentAmountCalculator.java b/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentAmountCalculator.java new file mode 100644 index 00000000..d694bbfe --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentAmountCalculator.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.domain.payment.service; + +import java.util.List; +import life.mosu.mosuserver.domain.discount.DiscountPolicy; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@Slf4j +public class PaymentAmountCalculator { + + private final static int LUNCH_AMOUNT = 9_000; + + public int calculateTotal(List applications) { + return calculateLunchAmount(applications) + + DiscountPolicy.calculate(DiscountPolicy.FIXED_QUANTITY, applications.size()); + } + + public int calculateLunchAmount(List applications) { + return (int) applications.stream() + .filter(ExamApplicationJpaEntity::getIsLunchChecked) + .count() + * LUNCH_AMOUNT; + } + + public void verifyAmount(int actualAmount, int requestedAmount) { + if (requestedAmount != actualAmount) { + throw new RuntimeException("결제 금액이 올바르지 않습니다."); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentMapper.java b/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentMapper.java new file mode 100644 index 00000000..e096cede --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentMapper.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.domain.payment.service; + +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; +import org.springframework.stereotype.Component; + +@Component +public class PaymentMapper { + + public List toEntities(Long applicationId, List examApplicationIds, + ConfirmTossPaymentResponse response) { + return examApplicationIds.stream() + .map(examApplicationId -> response.toEntity(applicationId, examApplicationId)) + .toList(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentOrderIdGenerator.java b/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentOrderIdGenerator.java new file mode 100644 index 00000000..8fadef28 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/payment/service/PaymentOrderIdGenerator.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.domain.payment.service; + +import java.util.UUID; +import life.mosu.mosuserver.global.support.NumberGenerator; +import org.springframework.stereotype.Component; + +@Component +public class PaymentOrderIdGenerator implements NumberGenerator { + + @Override + public String generate() { + return UUID.randomUUID().toString(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/Gender.java b/src/main/java/life/mosu/mosuserver/domain/profile/Gender.java deleted file mode 100644 index 8f4e99f4..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/profile/Gender.java +++ /dev/null @@ -1,15 +0,0 @@ -package life.mosu.mosuserver.domain.profile; - -import lombok.Getter; -import lombok.RequiredArgsConstructor; - -@Getter -@RequiredArgsConstructor -public enum Gender { - MALE("남자"), - FEMALE("여자"), - PENDING("미정"); - - private final String genderName; - -} diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/Education.java b/src/main/java/life/mosu/mosuserver/domain/profile/entity/Education.java similarity index 80% rename from src/main/java/life/mosu/mosuserver/domain/profile/Education.java rename to src/main/java/life/mosu/mosuserver/domain/profile/entity/Education.java index a0992a49..2df20ddf 100644 --- a/src/main/java/life/mosu/mosuserver/domain/profile/Education.java +++ b/src/main/java/life/mosu/mosuserver/domain/profile/entity/Education.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.profile; +package life.mosu.mosuserver.domain.profile.entity; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/entity/Gender.java b/src/main/java/life/mosu/mosuserver/domain/profile/entity/Gender.java new file mode 100644 index 00000000..74f03bf7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/profile/entity/Gender.java @@ -0,0 +1,23 @@ +package life.mosu.mosuserver.domain.profile.entity; + +import java.util.Arrays; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public enum Gender { + MALE("남자"), + FEMALE("여자"), + PENDING("미정"); + + private final String genderName; + + public static Gender fromName(String genderName) { + return Arrays.stream(Gender.values()) + .filter(g -> g.getGenderName().equals(genderName)) + .findFirst() + .orElseThrow( + () -> new IllegalArgumentException("Invalid gender name: " + genderName)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/Grade.java b/src/main/java/life/mosu/mosuserver/domain/profile/entity/Grade.java similarity index 83% rename from src/main/java/life/mosu/mosuserver/domain/profile/Grade.java rename to src/main/java/life/mosu/mosuserver/domain/profile/entity/Grade.java index 2fa853f0..2491a4b4 100644 --- a/src/main/java/life/mosu/mosuserver/domain/profile/Grade.java +++ b/src/main/java/life/mosu/mosuserver/domain/profile/entity/Grade.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.profile; +package life.mosu.mosuserver.domain.profile.entity; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/ProfileJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/profile/entity/ProfileJpaEntity.java similarity index 92% rename from src/main/java/life/mosu/mosuserver/domain/profile/ProfileJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/profile/entity/ProfileJpaEntity.java index 3ebba57a..a75d443a 100644 --- a/src/main/java/life/mosu/mosuserver/domain/profile/ProfileJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/profile/entity/ProfileJpaEntity.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.profile; +package life.mosu.mosuserver.domain.profile.entity; import jakarta.persistence.Column; import jakarta.persistence.Embedded; @@ -17,12 +17,14 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; @Entity @Getter @Table(name = "profile", uniqueConstraints = @UniqueConstraint(columnNames = "user_id")) @NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete public class ProfileJpaEntity extends BaseTimeEntity { @Id @@ -85,10 +87,6 @@ public ProfileJpaEntity( } public void edit(final EditProfileRequest request) { - this.userName = request.userName(); - this.gender = request.validatedGender(); - this.birth = request.birth(); - this.phoneNumber = request.phoneNumber(); this.email = request.email(); this.education = request.education(); this.schoolInfo = request.schoolInfo().toEntity(); @@ -98,4 +96,8 @@ public void edit(final EditProfileRequest request) { public void registerRecommenderPhoneNumber(final String recommenderPhoneNumber) { this.recommenderPhoneNumber = recommenderPhoneNumber; } + + public String getPhoneNumberWithoutHyphen() { + return getPhoneNumber().replaceAll("-", ""); + } } diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/SchoolInfoJpaVO.java b/src/main/java/life/mosu/mosuserver/domain/profile/entity/SchoolInfoJpaVO.java similarity index 90% rename from src/main/java/life/mosu/mosuserver/domain/profile/SchoolInfoJpaVO.java rename to src/main/java/life/mosu/mosuserver/domain/profile/entity/SchoolInfoJpaVO.java index e8c85c98..2d7e6293 100644 --- a/src/main/java/life/mosu/mosuserver/domain/profile/SchoolInfoJpaVO.java +++ b/src/main/java/life/mosu/mosuserver/domain/profile/entity/SchoolInfoJpaVO.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.profile; +package life.mosu.mosuserver.domain.profile.entity; import jakarta.persistence.Column; import jakarta.persistence.Embeddable; diff --git a/src/main/java/life/mosu/mosuserver/domain/profile/ProfileJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/profile/repository/ProfileJpaRepository.java similarity index 69% rename from src/main/java/life/mosu/mosuserver/domain/profile/ProfileJpaRepository.java rename to src/main/java/life/mosu/mosuserver/domain/profile/repository/ProfileJpaRepository.java index 3a7754b7..f14bcac5 100644 --- a/src/main/java/life/mosu/mosuserver/domain/profile/ProfileJpaRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/profile/repository/ProfileJpaRepository.java @@ -1,6 +1,7 @@ -package life.mosu.mosuserver.domain.profile; +package life.mosu.mosuserver.domain.profile.repository; import java.util.Optional; +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; import org.springframework.data.jpa.repository.JpaRepository; public interface ProfileJpaRepository extends JpaRepository { @@ -8,5 +9,4 @@ public interface ProfileJpaRepository extends JpaRepository findByUserId(Long userId); - } diff --git a/src/main/java/life/mosu/mosuserver/domain/recommendation/RecommendationJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/recommendation/RecommendationJpaEntity.java new file mode 100644 index 00000000..cea67d58 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/recommendation/RecommendationJpaEntity.java @@ -0,0 +1,56 @@ +package life.mosu.mosuserver.domain.recommendation; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; + +@Entity +@Table(name = "recommendation") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete +public class RecommendationJpaEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "recommendation_id", nullable = false) + private Long id; + + @Column(name = "user_id") + private Long userId; + + @Column(name = "recommeded_name") + private String name; + + @Column(name = "recommeded_phone_number") + private String phoneNumber; + + @Column(name = "bank") + private String bank; + + @Column(name = "account_number") + private String accountNumber; + + @Builder + public RecommendationJpaEntity( + Long userId, + String name, + String phoneNumber, + String bank, + String accountNumber + ) { + this.userId = userId; + this.name = name; + this.phoneNumber = phoneNumber; + this.bank = bank; + this.accountNumber = accountNumber; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/recommendation/RecommendationJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/recommendation/RecommendationJpaRepository.java new file mode 100644 index 00000000..8dfe1b66 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/recommendation/RecommendationJpaRepository.java @@ -0,0 +1,28 @@ +package life.mosu.mosuserver.domain.recommendation; + +import java.util.List; +import life.mosu.mosuserver.domain.admin.projection.RecommendationDetailsProjection; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface RecommendationJpaRepository extends + JpaRepository { + + @Query(""" + select new life.mosu.mosuserver.domain.admin.projection.RecommendationDetailsProjection( + u.name, + u.phoneNumber, + u.gender, + u.birth, + r.name, + r.phoneNumber, + r.bank, + r.accountNumber + ) + from RecommendationJpaEntity r + join UserJpaEntity u on u.id = r.userId + """) + List findRecommendationDetails(); + + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/FixedQuantityRefundAdapter.java b/src/main/java/life/mosu/mosuserver/domain/refund/FixedQuantityRefundAdapter.java deleted file mode 100644 index 47e9c97a..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/refund/FixedQuantityRefundAdapter.java +++ /dev/null @@ -1,19 +0,0 @@ -package life.mosu.mosuserver.domain.refund; - -import life.mosu.mosuserver.domain.discount.DiscountCalculator; - -public class FixedQuantityRefundAdapter implements RefundPolicyAdapter { - - private final DiscountCalculator discountCalculator; - - public FixedQuantityRefundAdapter(DiscountCalculator discountCalculator) { - this.discountCalculator = discountCalculator; - } - - @Override - public int calculateRefund(int originalQty, int cancelQty) { - int beforeDiscount = discountCalculator.calculateDiscount(originalQty); - int afterDiscount = discountCalculator.calculateDiscount(originalQty - cancelQty); - return beforeDiscount - afterDiscount; - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/RefundJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/refund/RefundJpaEntity.java deleted file mode 100644 index 991cebaa..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/refund/RefundJpaEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -package life.mosu.mosuserver.domain.refund; - -import jakarta.persistence.*; -import life.mosu.mosuserver.domain.base.BaseTimeEntity; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -import java.time.LocalDateTime; - -@Entity -@Getter -@Table(name = "refund") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class RefundJpaEntity extends BaseTimeEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "refund_id") - private Long id; - - @Column(name = "application_school_id") - private Long applicationSchoolId; - - @Column(name = "refund_reason", nullable = false) - private String reason; - - @Column(name = "refund_agreed") - private boolean refundAgreed; - - @Column(name = "agreed_at") - private LocalDateTime agreedAt; - - @Builder - public RefundJpaEntity( - final Long applicationSchoolId, - final String reason, - final Boolean refundAgreed, - final LocalDateTime agreedAt - ) { - this.applicationSchoolId = applicationSchoolId; - this.reason = reason; - this.refundAgreed = refundAgreed; - this.agreedAt = agreedAt; - } - -} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/RefundJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/refund/RefundJpaRepository.java deleted file mode 100644 index 3256da20..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/refund/RefundJpaRepository.java +++ /dev/null @@ -1,6 +0,0 @@ -package life.mosu.mosuserver.domain.refund; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface RefundJpaRepository extends JpaRepository { -} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/RefundPolicyAdapter.java b/src/main/java/life/mosu/mosuserver/domain/refund/RefundPolicyAdapter.java deleted file mode 100644 index 5df8e2cc..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/refund/RefundPolicyAdapter.java +++ /dev/null @@ -1,6 +0,0 @@ -package life.mosu.mosuserver.domain.refund; - -public interface RefundPolicyAdapter { - - int calculateRefund(int originalQty, int cancelQty); -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundFailureLogJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundFailureLogJpaEntity.java new file mode 100644 index 00000000..1c249838 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundFailureLogJpaEntity.java @@ -0,0 +1,50 @@ +package life.mosu.mosuserver.domain.refund.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.base.BaseTimeEntity; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Table(name = "refund_failure_log") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class RefundFailureLogJpaEntity extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "refund_failure_id") + private Long id; + + @Column(name = "refund_id", nullable = false) + private Long refundId; + + @Column(name = "exam_application_id", nullable = false) + private Long examApplicationId; + + @Column(name = "reason", nullable = false, length = 255) + private String reason; + + @Column(name = "snapshot", columnDefinition = "TEXT") + private String snapshot; + + @Builder + public RefundFailureLogJpaEntity( + Long refundId, + Long examApplicationId, + String reason, + String snapshot + ) { + this.refundId = refundId; + this.examApplicationId = examApplicationId; + this.reason = reason; + this.snapshot = snapshot; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundJpaEntity.java new file mode 100644 index 00000000..223dc9c3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundJpaEntity.java @@ -0,0 +1,86 @@ +package life.mosu.mosuserver.domain.refund.entity; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import life.mosu.mosuserver.domain.base.BaseDeleteEntity; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Table(name = "refund") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class RefundJpaEntity extends BaseDeleteEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "refund_id") + private Long id; + + @Column(name = "transaction_key", nullable = false) + private String transactionKey; + + @Column(name = "exam_application_id") + private Long examApplicationId; + + @Column(name = "reason", nullable = false) + private String reason; + + @Column(name = "refund_status") + @Enumerated(EnumType.STRING) + private RefundStatus refundStatus; + + @Column(name = "refunded_amount") + private Integer refundedAmount; + + @Column(name = "refundable_amount") + private Integer refundableAmount; + + + @Builder(access = AccessLevel.PROTECTED) + public RefundJpaEntity( + final Long examApplicationId, + final String transactionKey, + final String reason, + final RefundStatus refundStatus, + final Integer refundedAmount, + final Integer refundableAmount + ) { + this.examApplicationId = examApplicationId; + this.transactionKey = transactionKey; + this.reason = reason; + this.refundStatus = refundStatus; + this.refundedAmount = refundedAmount; + this.refundableAmount = refundableAmount; + } + + public static RefundJpaEntity of( + final Long examApplicationId, + final String transactionKey, + final String reason, + final RefundStatus refundStatus, + final Integer refundedAmount, + final Integer refundableAmount + ) { + return RefundJpaEntity.builder() + .examApplicationId(examApplicationId) + .transactionKey(transactionKey) + .reason(reason) + .refundStatus(refundStatus) + .refundedAmount(refundedAmount) + .refundableAmount(refundableAmount) + .build(); + } + + public void changeStatusToAbort() { + this.refundStatus = RefundStatus.ABORTED; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundStatus.java b/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundStatus.java new file mode 100644 index 00000000..2c5f6b83 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/entity/RefundStatus.java @@ -0,0 +1,16 @@ +package life.mosu.mosuserver.domain.refund.entity; + +public enum RefundStatus { + ABORTED("환불 실패"), + DONE("환불 완료"); + + private final String name; + + RefundStatus(String name) { + this.name = name; + } + + public String getName() { + return name; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/projection/RefundNotifyProjection.java b/src/main/java/life/mosu/mosuserver/domain/refund/projection/RefundNotifyProjection.java new file mode 100644 index 00000000..81559bf0 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/projection/RefundNotifyProjection.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.domain.refund.projection; + +import java.time.LocalDate; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; + +public record RefundNotifyProjection( + String paymentKey, + LocalDate examDate, + String schoolName, + Integer refundAmount, + PaymentMethod paymentMethod, + String reason +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundFailureLogJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundFailureLogJpaRepository.java new file mode 100644 index 00000000..fa3d3f57 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundFailureLogJpaRepository.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.domain.refund.repository; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.refund.entity.RefundFailureLogJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RefundFailureLogJpaRepository extends + JpaRepository, + RefundFailureLogJpaRepositoryCustom { + + int deleteByCreatedAtBefore(LocalDateTime date); + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundFailureLogJpaRepositoryCustom.java b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundFailureLogJpaRepositoryCustom.java new file mode 100644 index 00000000..f4ccd878 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundFailureLogJpaRepositoryCustom.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.domain.refund.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.refund.entity.RefundFailureLogJpaEntity; + +public interface RefundFailureLogJpaRepositoryCustom { + + void saveAllUsingBatch(List refundFailureLogJpaEntities); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundJpaRepository.java new file mode 100644 index 00000000..bea9ebcb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundJpaRepository.java @@ -0,0 +1,56 @@ +package life.mosu.mosuserver.domain.refund.repository; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.projection.RefundNotifyProjection; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface RefundJpaRepository extends JpaRepository, + RefundJpaRepositoryCustom { + + /** + * String paymentKey, LocalDate examDate, String schoolName, Integer refundAmount, PaymentMethod + * paymentMethod, String reason + */ + + @Query(""" + SELECT new life.mosu.mosuserver.domain.refund.projection.RefundNotifyProjection( + p.paymentKey, + e.examDate, + e.schoolName, + r.refundedAmount, + p.paymentMethod, + r.reason + ) + FROM ExamApplicationJpaEntity ea + JOIN RefundJpaEntity r ON r.examApplicationId = ea.id + JOIN PaymentJpaEntity p ON p.examApplicationId = ea.id + JOIN ExamJpaEntity e ON ea.examId = e.id + WHERE r.examApplicationId = :examApplicationId + AND r.refundStatus = 'DONE' + """) + Optional findRefundByExamApplicationId( + @Param("examApplicationId") Long examApplicationId); + + Optional findByTransactionKey(String transactionKey); + + @Query(""" + SELECT r + FROM RefundJpaEntity r + WHERE r.examApplicationId IN :examApplicationIds + """) + List findByExamApplicationIdIn( + @Param("examApplicationIds") List examApplicationId); + + @Query(""" + SELECT r + FROM RefundJpaEntity r + WHERE r.refundStatus in ('ABORTED') + AND r.createdAt < :time + """) + List findFailedRefunds(@Param("time") LocalDateTime time); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundJpaRepositoryCustom.java b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundJpaRepositoryCustom.java new file mode 100644 index 00000000..672ef581 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/repository/RefundJpaRepositoryCustom.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.domain.refund.repository; + +import java.util.List; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; + +public interface RefundJpaRepositoryCustom { + + void batchDeleteAllWithExamApplications(List refundJpaEntities); +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/service/FixedQuantityRefundAdapter.java b/src/main/java/life/mosu/mosuserver/domain/refund/service/FixedQuantityRefundAdapter.java new file mode 100644 index 00000000..ae854689 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/service/FixedQuantityRefundAdapter.java @@ -0,0 +1,33 @@ +package life.mosu.mosuserver.domain.refund.service; + +import life.mosu.mosuserver.domain.discount.DiscountCalculator; +import life.mosu.mosuserver.domain.discount.service.FixedQuantityDiscountCalculator; +import org.springframework.stereotype.Component; + +@Component +public class FixedQuantityRefundAdapter implements RefundPolicyAdapter { + + private final DiscountCalculator discountCalculator; + + public FixedQuantityRefundAdapter() { + this.discountCalculator = new FixedQuantityDiscountCalculator(); + } + + @Override + public int calculateRefundAmount(int originalQty, Boolean isLunchChecked) { + if (originalQty == 1) { + if (isLunchChecked) { + return 49_000 + 9_000; // 점심값 추가 + } + return 49_000; + } + int beforeDiscount = discountCalculator.calculateDiscount(originalQty); + int afterDiscount = discountCalculator.calculateDiscount(originalQty - 1); + + int refundAmount = beforeDiscount - afterDiscount; + if (isLunchChecked) { + refundAmount += 9_000; // 점심값 추가 + } + return refundAmount; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/refund/service/RefundPolicyAdapter.java b/src/main/java/life/mosu/mosuserver/domain/refund/service/RefundPolicyAdapter.java new file mode 100644 index 00000000..446938bc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/refund/service/RefundPolicyAdapter.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.domain.refund.service; + +public interface RefundPolicyAdapter { + + int calculateRefundAmount(int originalQty, Boolean isLunchChecked); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/school/Area.java b/src/main/java/life/mosu/mosuserver/domain/school/Area.java deleted file mode 100644 index 59936697..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/school/Area.java +++ /dev/null @@ -1,16 +0,0 @@ -package life.mosu.mosuserver.domain.school; - -public enum Area { - DAECHI("대치"), - MOKDONG("목동"), - NOWON("노원"); - private final String areaName; - - Area(String areaName) { - this.areaName = areaName; - } - - public String getAreaName() { - return areaName; - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/school/SchoolApplicationProjection.java b/src/main/java/life/mosu/mosuserver/domain/school/SchoolApplicationProjection.java deleted file mode 100644 index 86b24bfb..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/school/SchoolApplicationProjection.java +++ /dev/null @@ -1,5 +0,0 @@ -package life.mosu.mosuserver.domain.school; - -public record SchoolApplicationProjection(Long schoolId, String schoolName, Long count) { - -} diff --git a/src/main/java/life/mosu/mosuserver/domain/school/SchoolJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/school/SchoolJpaEntity.java deleted file mode 100644 index 241f29cd..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/school/SchoolJpaEntity.java +++ /dev/null @@ -1,52 +0,0 @@ -package life.mosu.mosuserver.domain.school; - - -import jakarta.persistence.Column; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import java.time.LocalDate; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@Getter -@Table(name = "school") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class SchoolJpaEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "school_id") - private Long id; - - @Column(name = "school_name") - private String schoolName; - - @Enumerated(EnumType.STRING) - private Area area; - - @Embedded - private AddressJpaVO address; - - @Column(name = "exam_date") - private LocalDate examDate; - - @Column(name = "capacity") - private Long capacity; - - public SchoolJpaEntity(String schoolName, Area area, AddressJpaVO address, LocalDate examDate, - Long capacity) { - this.schoolName = schoolName; - this.area = area; - this.address = address; - this.examDate = examDate; - this.capacity = capacity; - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/school/SchoolJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/school/SchoolJpaRepository.java deleted file mode 100644 index ff9facf9..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/school/SchoolJpaRepository.java +++ /dev/null @@ -1,11 +0,0 @@ -package life.mosu.mosuserver.domain.school; - -import java.time.LocalDate; -import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface SchoolJpaRepository extends JpaRepository { - - Optional findBySchoolNameAndAreaAndExamDate(String schoolName, Area area, - LocalDate examDate); -} diff --git a/src/main/java/life/mosu/mosuserver/domain/school/SchoolRepository.java b/src/main/java/life/mosu/mosuserver/domain/school/SchoolRepository.java deleted file mode 100644 index 2959fb25..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/school/SchoolRepository.java +++ /dev/null @@ -1,16 +0,0 @@ -package life.mosu.mosuserver.domain.school; - -import java.util.List; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.Query; - -public interface SchoolRepository extends JpaRepository { - - @Query(""" - SELECT new life.mosu.mosuserver.domain.school.SchoolApplicationProjection(s.id, s.schoolName, COUNT(a)) - FROM SchoolJpaEntity s - LEFT JOIN ApplicationSchoolJpaEntity a ON a.schoolId = s.id - GROUP BY s.id, s.schoolName - """) - List countBySchoolNameGroupBy(); -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/serviceterm/ServiceTermAgreementJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/serviceterm/ServiceTermAgreementJpaEntity.java deleted file mode 100644 index 779f3cec..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/serviceterm/ServiceTermAgreementJpaEntity.java +++ /dev/null @@ -1,30 +0,0 @@ -package life.mosu.mosuserver.domain.serviceterm; - -import jakarta.persistence.*; -import lombok.*; - -import java.time.LocalDateTime; - -@Entity -@Getter -@Table(name = "service_term_agreement") -@AllArgsConstructor -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class ServiceTermAgreementJpaEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(name = "user_id") - private Long userId; - - @Column(name = "service_term_id") - private Long tagId; - - @Column(name = "agreed") - private boolean agreed; - - @Column(name = "agreed_at") - private LocalDateTime agreedAt; -} diff --git a/src/main/java/life/mosu/mosuserver/domain/serviceterm/ServiceTermJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/serviceterm/ServiceTermJpaEntity.java deleted file mode 100644 index 1e58d0a3..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/serviceterm/ServiceTermJpaEntity.java +++ /dev/null @@ -1,37 +0,0 @@ -package life.mosu.mosuserver.domain.serviceterm; - - -import jakarta.persistence.*; -import life.mosu.mosuserver.domain.base.BaseTimeEntity; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@Getter -@Table(name = "service_term") -@NoArgsConstructor(access = AccessLevel.PROTECTED) -class ServiceTermJpaEntity extends BaseTimeEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "service_term_id") - private Long id; - - @Column(name = "service_term_tag") - private String tag; - - @Column(name = "required") - private boolean required; - - @Builder - public ServiceTermJpaEntity( - final String tag, - final boolean required - - ) { - this.tag = tag; - this.required = required; - } -} diff --git a/src/main/java/life/mosu/mosuserver/domain/user/UserRole.java b/src/main/java/life/mosu/mosuserver/domain/user/UserRole.java deleted file mode 100644 index 969db060..00000000 --- a/src/main/java/life/mosu/mosuserver/domain/user/UserRole.java +++ /dev/null @@ -1,5 +0,0 @@ -package life.mosu.mosuserver.domain.user; - -public enum UserRole { - ROLE_USER, ROLE_ADMIN, ROLE_PENDING; -} diff --git a/src/main/java/life/mosu/mosuserver/domain/user/entity/AuthProvider.java b/src/main/java/life/mosu/mosuserver/domain/user/entity/AuthProvider.java new file mode 100644 index 00000000..bcce3a26 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/user/entity/AuthProvider.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.domain.user.entity; + +public enum AuthProvider { + MOSU, KAKAO +} diff --git a/src/main/java/life/mosu/mosuserver/domain/user/UserJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java similarity index 54% rename from src/main/java/life/mosu/mosuserver/domain/user/UserJpaEntity.java rename to src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java index 1586a0dc..280b4a13 100644 --- a/src/main/java/life/mosu/mosuserver/domain/user/UserJpaEntity.java +++ b/src/main/java/life/mosu/mosuserver/domain/user/entity/UserJpaEntity.java @@ -1,4 +1,6 @@ -package life.mosu.mosuserver.domain.user; +package life.mosu.mosuserver.domain.user.entity; + +import static life.mosu.mosuserver.global.util.KeyGeneratorUtil.generateUUIDCustomerKey; import jakarta.persistence.Column; import jakarta.persistence.Entity; @@ -10,16 +12,18 @@ import jakarta.persistence.Table; import java.time.LocalDate; import life.mosu.mosuserver.domain.base.BaseTimeEntity; -import life.mosu.mosuserver.domain.profile.Gender; +import life.mosu.mosuserver.domain.profile.entity.Gender; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; @Entity @Table(name = "user") @Getter @NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete public class UserJpaEntity extends BaseTimeEntity { @Id @@ -27,7 +31,7 @@ public class UserJpaEntity extends BaseTimeEntity { @Column(name = "user_id") private Long id; - @Column(name = "login_id") + @Column(name = "login_id", unique = true, length = 50) private String loginId; @Column(name = "password") @@ -43,6 +47,9 @@ public class UserJpaEntity extends BaseTimeEntity { @Column(name = "birth") private LocalDate birth; + @Column(name = "phone_number") + private String phoneNumber; + @Column(name = "customer_key") private String customerKey; @@ -59,21 +66,62 @@ public class UserJpaEntity extends BaseTimeEntity { @Enumerated(EnumType.STRING) private UserRole userRole; + @Column(name = "provider") + @Enumerated(EnumType.STRING) + private AuthProvider provider; @Builder public UserJpaEntity(String loginId, String password, Gender gender, String name, - LocalDate birth, - String customerKey, boolean agreedToTermsOfService, boolean agreedToPrivacyPolicy, - boolean agreedToMarketing, UserRole userRole) { + String phoneNumber, + LocalDate birth, boolean agreedToTermsOfService, boolean agreedToPrivacyPolicy, + boolean agreedToMarketing, UserRole userRole, AuthProvider provider) { this.loginId = loginId; this.password = password; this.gender = gender; this.name = name; + this.phoneNumber = phoneNumber; this.birth = birth; - this.customerKey = customerKey; + this.customerKey = generateUUIDCustomerKey(); this.agreedToTermsOfService = agreedToTermsOfService; this.agreedToPrivacyPolicy = agreedToPrivacyPolicy; this.agreedToMarketing = agreedToMarketing; this.userRole = userRole; + this.provider = provider; + } + + public void updateOAuthUser( + Gender gender, + String name, + String phoneNumber, + LocalDate birth + ) { + this.gender = gender; + this.name = name; + this.phoneNumber = phoneNumber; + this.birth = birth; + } + + public void updateUserInfo( + Gender gender, + String name, + String phoneNumber, + LocalDate birth + ) { + this.gender = gender; + this.name = name; + this.phoneNumber = phoneNumber; + this.birth = birth; + } + + public boolean isMosuUser() { + return this.provider.equals(AuthProvider.MOSU); + } + + public void grantUserRole() { + this.userRole = UserRole.ROLE_USER; + } + + public void changePassword(String newPassword) { + this.password = newPassword; } } diff --git a/src/main/java/life/mosu/mosuserver/domain/user/entity/UserRole.java b/src/main/java/life/mosu/mosuserver/domain/user/entity/UserRole.java new file mode 100644 index 00000000..f287efae --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/user/entity/UserRole.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.domain.user.entity; + +public enum UserRole { + ROLE_USER, ROLE_ADMIN, ROLE_PENDING +} diff --git a/src/main/java/life/mosu/mosuserver/domain/user/UserJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/user/repository/UserJpaRepository.java similarity index 50% rename from src/main/java/life/mosu/mosuserver/domain/user/UserJpaRepository.java rename to src/main/java/life/mosu/mosuserver/domain/user/repository/UserJpaRepository.java index 7e81de04..cd553965 100644 --- a/src/main/java/life/mosu/mosuserver/domain/user/UserJpaRepository.java +++ b/src/main/java/life/mosu/mosuserver/domain/user/repository/UserJpaRepository.java @@ -1,11 +1,17 @@ -package life.mosu.mosuserver.domain.user; - -import org.springframework.data.jpa.repository.JpaRepository; +package life.mosu.mosuserver.domain.user.repository; import java.util.Optional; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import org.springframework.data.jpa.repository.JpaRepository; public interface UserJpaRepository extends JpaRepository { + Optional findByLoginId(String loginId); boolean existsByLoginId(String loginId); + + + Optional findByNameAndPhoneNumber(String name, String phoneNumber); + + Optional findByPhoneNumber(String phoneNumber); } diff --git a/src/main/java/life/mosu/mosuserver/domain/user/service/UserEncoderService.java b/src/main/java/life/mosu/mosuserver/domain/user/service/UserEncoderService.java new file mode 100644 index 00000000..af5a1521 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/user/service/UserEncoderService.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.domain.user.service; + +import life.mosu.mosuserver.global.annotation.DomainService; +import org.springframework.security.crypto.password.PasswordEncoder; + +@DomainService +public class UserEncoderService { + + private PasswordEncoder encoder; + + public void e(String a) { + System.out.println("Encoding: " + a); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/virtualaccount/BankCode.java b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/BankCode.java new file mode 100644 index 00000000..b17519d0 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/BankCode.java @@ -0,0 +1,55 @@ +package life.mosu.mosuserver.domain.virtualaccount; + +import java.util.Arrays; +import java.util.Optional; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Getter +public enum BankCode { + KYONGNAM("경남은행", "039", "39", "경남", "KYONGNAMBANK"), + GWANGJU("광주은행", "034", "34", "광주", "GWANGJUBANK"), + LOCALNONGHYEOP("단위농협(지역농축협)", "012", "12", "단위농협", "LOCALNONGHYEOP"), + BUSAN("부산은행", "032", "32", "부산", "BUSANBANK"), + SAEMAUL("새마을금고", "045", "45", "새마을", "SAEMAUL"), + SANLIM("산림조합", "064", "64", "산림", "SANLIM"), + SHINHAN("신한은행", "088", "88", "신한", "SHINHAN"), + SHINHYEOP("신협", "048", "48", "신협", "SHINHYEOP"), + CITI("씨티은행", "027", "27", "씨티", "CITI"), + WOORI("우리은행", "020", "20", "우리", "WOORI"), + POST("우체국예금보험", "071", "71", "우체국", "POST"), + SAVINGBANK("저축은행중앙회", "050", "50", "저축", "SAVINGBANK"), + JEONBUK("전북은행", "037", "37", "전북", "JEONBUKBANK"), + JEJU("제주은행", "035", "35", "제주", "JEJUBANK"), + KAKAOBANK("카카오뱅크", "090", "90", "카카오", "KAKAOBANK"), + KBANK("케이뱅크", "089", "89", "케이", "KBANK"), + TOSSBANK("토스뱅크", "092", "92", "토스", "TOSSBANK"), + HANA("하나은행", "081", "81", "하나", "HANA"), + HSBC("홍콩상하이은행", "054", "54", "-", "HSBC"), + IBK("IBK기업은행", "003", "03", "기업", "IBK"), + KOOKMIN("KB국민은행", "004", "06", "국민", "KOOKMIN"), + DAEGU("iM뱅크(대구)", "031", "31", "대구", "DAEGUBANK"), + KDBBANK("한국산업은행", "002", "02", "산업", "KDBBANK"), + NONGHYEOP("NH농협은행", "011", "11", "농협", "NONGHYEOP"), + SC("SC제일은행", "023", "23", "SC제일", "SC"), + SUHYEOP("Sh수협은행", "007", "07", "수협", "SUHYEOP"); + + private final String bankNameKor; + private final String bankCode; + private final String subCode; + private final String alias; + private final String engCode; + + public static Optional fromBankCode(String code) { + return Arrays.stream(values()) + .filter(bank -> bank.getBankCode().equals(code)) + .findFirst(); + } + + public static Optional fromAlias(String alias) { + return Arrays.stream(values()) + .filter(bank -> bank.getAlias().equalsIgnoreCase(alias)) + .findFirst(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/virtualaccount/DepositStatus.java b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/DepositStatus.java new file mode 100644 index 00000000..b63dd6ee --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/DepositStatus.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.domain.virtualaccount; + +public enum DepositStatus { + DONE, WAITING, CANCELED +} diff --git a/src/main/java/life/mosu/mosuserver/domain/virtualaccount/VirtualAccountLogJpaEntity.java b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/VirtualAccountLogJpaEntity.java new file mode 100644 index 00000000..5c9e1468 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/VirtualAccountLogJpaEntity.java @@ -0,0 +1,89 @@ +package life.mosu.mosuserver.domain.virtualaccount; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.annotations.SoftDelete; + +@Entity +@Table(name = "virtual_account_log") +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@SoftDelete +public class VirtualAccountLogJpaEntity { + + @Id + @GeneratedValue(strategy = jakarta.persistence.GenerationType.IDENTITY) + @Column(name = "virtual_account_log_id") + private Long id; + + @Column(name = "application_id") + private Long applicationId; + + @Column(name = "order_id") + private String orderId; + + @Column(name = "account_number") + private String accountNumber; + + @Column(name = "bank_name") + private String bankName; + + @Column(name = "customer_name") + private String customerName; + + @Column(name = "customer_email") + private String customerEmail; + + @Column(name = "deposit_status") + private DepositStatus depositStatus = DepositStatus.WAITING; + + @Builder(access = AccessLevel.PRIVATE) + public VirtualAccountLogJpaEntity( + Long applicationId, + String orderId, + String accountNumber, + String bankName, + String customerName, + String customerEmail + ) { + this.applicationId = applicationId; + this.orderId = orderId; + this.accountNumber = accountNumber; + this.bankName = bankName; + this.customerName = customerName; + this.customerEmail = customerEmail; + } + + public static VirtualAccountLogJpaEntity create( + Long applicationId, + String orderId, + String accountNumber, + String bankName, + String customerName, + String customerEmail + ) { + return VirtualAccountLogJpaEntity.builder() + .applicationId(applicationId) + .orderId(orderId) + .accountNumber(accountNumber) + .bankName(bankName) + .customerName(customerName) + .customerEmail(customerEmail) + .build(); + } + + public void setDepositSuccess() { + this.depositStatus = DepositStatus.DONE; + } + + public void setDepositFailure() { + this.depositStatus = DepositStatus.CANCELED; + } +} diff --git a/src/main/java/life/mosu/mosuserver/domain/virtualaccount/VirtualAccountLogJpaRepository.java b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/VirtualAccountLogJpaRepository.java new file mode 100644 index 00000000..a7f7add3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/VirtualAccountLogJpaRepository.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.domain.virtualaccount; + +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface VirtualAccountLogJpaRepository extends + JpaRepository { + + Optional findByOrderId(String orderId); + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/virtualaccount/service/DepositEventMapper.java b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/service/DepositEventMapper.java new file mode 100644 index 00000000..d6fd7a15 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/domain/virtualaccount/service/DepositEventMapper.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.domain.virtualaccount.service; + +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.virtualaccount.dto.DepositEventRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositEvent; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositFailureEvent; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositSuccessEvent; +import org.springframework.stereotype.Component; + +@Component +public class DepositEventMapper { + + public DepositEvent map(DepositEventRequest request) { + return switch (request.validStatus()) { + case DONE -> DepositSuccessEvent.of(request.orderId(), request.secret(), + request.createdAt()); + case CANCELED -> DepositFailureEvent.of(request.orderId(), request.secret(), + request.createdAt()); + default -> throw new CustomRuntimeException( + ErrorCode.INVALID_VIRTUAL_ACCOUNT_DEPOSIT_EVENT); + }; + } +} + diff --git a/src/main/java/life/mosu/mosuserver/global/advice/ExcelDownloadAdvice.java b/src/main/java/life/mosu/mosuserver/global/advice/ExcelDownloadAdvice.java new file mode 100644 index 00000000..ab314cde --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/advice/ExcelDownloadAdvice.java @@ -0,0 +1,89 @@ +package life.mosu.mosuserver.global.advice; + +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.io.OutputStream; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.util.List; +import life.mosu.mosuserver.global.annotation.ExcelDownload; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.util.excel.SimpleExcelFile; +import org.springframework.core.MethodParameter; +import org.springframework.http.MediaType; +import org.springframework.http.converter.HttpMessageConverter; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.http.server.ServletServerHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; + +//TODO : 추후 Spring Response 마샬링 중단 형태에 대한 개선 필요 +@Component +@ControllerAdvice +public class ExcelDownloadAdvice implements ResponseBodyAdvice { + + private static final String EXCEL_CONTENT_TYPE = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + private static final String CONTENT_DISPOSITION_HEADER = "Content-Disposition"; + private static final String FILENAME_HEADER_FORMAT = "attachment; filename*=UTF-8''%s"; + + @Override + public boolean supports(MethodParameter returnType, + Class> converterType) { + return returnType.hasMethodAnnotation(ExcelDownload.class); + } + + @Override + public Object beforeBodyWrite(Object body, + MethodParameter returnType, + MediaType selectedContentType, + Class> selectedConverterType, + ServerHttpRequest request, + ServerHttpResponse response) { + + ExcelDownload annotation = returnType.getMethodAnnotation(ExcelDownload.class); + if (annotation == null || !(body instanceof List data)) { + return body; + } + + try { + String fileName = annotation.fileName(); + Class dtoClass = annotation.dtoClass(); + SimpleExcelFile excelFile = createExcelFile(data, dtoClass); + + HttpServletResponse servletResponse = ((ServletServerHttpResponse) response).getServletResponse(); + setExcelDownloadHeaderAndFileName(servletResponse, fileName); + + try (OutputStream os = servletResponse.getOutputStream()) { + excelFile.write(os); + } + + return null; + } catch (IOException e) { + throw new CustomRuntimeException(ErrorCode.EXCEL_DOWNLOAD_FAILURE); + } + } + + @SuppressWarnings("unchecked") + private SimpleExcelFile createExcelFile(List list, Class dtoClass) { + return new SimpleExcelFile<>((List) list, (Class) dtoClass); + } + + private void setExcelDownloadHeaderAndFileName(HttpServletResponse response, String fileName) { + String encodedFileName = encodeFileName(fileName); + + response.setContentType(EXCEL_CONTENT_TYPE); + + response.setHeader(CONTENT_DISPOSITION_HEADER, + String.format(FILENAME_HEADER_FORMAT, encodedFileName)); + + } + + private String encodeFileName(String fileName) { + return URLEncoder.encode(fileName, + StandardCharsets.UTF_8) + .replaceAll("\\+", "%20"); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/CursorParam.java b/src/main/java/life/mosu/mosuserver/global/annotation/CursorParam.java new file mode 100644 index 00000000..85a74f70 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/annotation/CursorParam.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.global.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface CursorParam { + +} diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/DomainService.java b/src/main/java/life/mosu/mosuserver/global/annotation/DomainService.java new file mode 100644 index 00000000..b5053327 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/annotation/DomainService.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.global.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.core.annotation.AliasFor; +import org.springframework.stereotype.Component; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +@Documented +@Component +public @interface DomainService { + + /** + * Alias for {@link Component#value}. + */ + @AliasFor(annotation = Component.class) + String value() default ""; +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/ExcelDownload.java b/src/main/java/life/mosu/mosuserver/global/annotation/ExcelDownload.java new file mode 100644 index 00000000..9030a40e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/annotation/ExcelDownload.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.global.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExcelDownload { + + String fileName(); + + Class dtoClass(); +} diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/LoginIdPattern.java b/src/main/java/life/mosu/mosuserver/global/annotation/LoginIdPattern.java new file mode 100644 index 00000000..d9107131 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/annotation/LoginIdPattern.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.global.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Pattern(regexp = "^[a-zA-Z0-9_-]{6,12}$", message = "아이디 형식이 올바르지 않습니다.") +@NotBlank +@Target({ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +@Constraint(validatedBy = {}) +public @interface LoginIdPattern { + + String message() default "아이디는 6~12자의 영문, 숫자, 특수문자(-, _)만 사용 가능합니다."; + + Class[] groups() default {}; + + Class[] payload() default {}; +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java b/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java index 060f2d34..a0cef598 100644 --- a/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java +++ b/src/main/java/life/mosu/mosuserver/global/annotation/PasswordPattern.java @@ -2,6 +2,7 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -9,11 +10,15 @@ import java.lang.annotation.Target; @Pattern(regexp = "^(?=.*[a-z])(?=.*[A-Z])(?=.*\\d)(?=.*[@$!%*?&])[A-Za-z\\d@$!%*?&]{8,20}$", message = "비밀번호 형식이 올바르지 않습니다.") +@NotBlank @Target({ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Constraint(validatedBy = {}) public @interface PasswordPattern { + String message() default "비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다."; + Class[] groups() default {}; + Class[] payload() default {}; } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumber.java b/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumber.java new file mode 100644 index 00000000..ebe379f2 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumber.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.global.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface PhoneNumber { +} diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumberPattern.java b/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumberPattern.java index d03eb5f6..1fa17704 100644 --- a/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumberPattern.java +++ b/src/main/java/life/mosu/mosuserver/global/annotation/PhoneNumberPattern.java @@ -2,6 +2,7 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Pattern; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; @@ -12,6 +13,7 @@ regexp = "^01[016789]-\\d{3,4}-\\d{4}$", message = "전화번호 형식은 010-XXXX-XXXX 이어야 합니다." ) +@NotBlank @Target({ElementType.FIELD, ElementType.PARAMETER}) @Retention(RetentionPolicy.RUNTIME) @Constraint(validatedBy = {}) diff --git a/src/main/java/life/mosu/mosuserver/global/annotation/ReactiveEventListener.java b/src/main/java/life/mosu/mosuserver/global/annotation/ReactiveEventListener.java new file mode 100644 index 00000000..898ad70c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/annotation/ReactiveEventListener.java @@ -0,0 +1,16 @@ +package life.mosu.mosuserver.global.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import org.springframework.context.event.EventListener; +import org.springframework.scheduling.annotation.Async; + +@Target(ElementType.METHOD) +@Retention(RetentionPolicy.RUNTIME) +@Async +@EventListener +public @interface ReactiveEventListener { + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/config/ExamQuotaAtomicOperationConfig.java b/src/main/java/life/mosu/mosuserver/global/config/ExamQuotaAtomicOperationConfig.java new file mode 100644 index 00000000..e7da0024 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/config/ExamQuotaAtomicOperationConfig.java @@ -0,0 +1,66 @@ +package life.mosu.mosuserver.global.config; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; +import java.util.Map; +import life.mosu.mosuserver.application.exam.cache.AtomicExamQuotaDecrementOperator; +import life.mosu.mosuserver.application.exam.cache.AtomicExamQuotaIncrementOperator; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheAtomicOperator; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.io.Resource; +import org.springframework.data.redis.core.script.DefaultRedisScript; + +@Configuration +public class ExamQuotaAtomicOperationConfig { + + @Value("classpath:scripts/decrement_exam_quota.lua") + private Resource decrementScript; + + @Value("classpath:scripts/increment_exam_quota.lua") + private Resource incrementScript; + + @Bean + @Qualifier("decrementExamQuotaScript") + public DefaultRedisScript decrementExamQuotaScript() { + DefaultRedisScript script = new DefaultRedisScript<>(); + script.setResultType(Long.class); + try { + String lua = new String(decrementScript.getInputStream().readAllBytes(), + StandardCharsets.UTF_8); + script.setScriptText(lua); + } catch (IOException e) { + throw new RuntimeException("Failed to load decrement_exam_quota.lua", e); + } + return script; + } + + @Bean + @Qualifier("incrementExamQuotaScript") + public DefaultRedisScript incrementExamQuotaScript() { + DefaultRedisScript script = new DefaultRedisScript<>(); + script.setResultType(Long.class); + try { + String lua = new String(incrementScript.getInputStream().readAllBytes(), + StandardCharsets.UTF_8); + script.setScriptText(lua); + } catch (IOException e) { + throw new RuntimeException("Failed to load increment_exam_quota.lua", e); + } + return script; + } + + @Bean + @Qualifier("examCacheAtomicOperatorMap") + public Map> examCacheAtomicOperatorMap( + AtomicExamQuotaIncrementOperator incrementOp, + AtomicExamQuotaDecrementOperator decrementOp + ) { + return Map.of( + incrementOp.getActionName(), incrementOp, + decrementOp.getActionName(), decrementOp + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/config/IpRateLimitingProperties.java b/src/main/java/life/mosu/mosuserver/global/config/IpRateLimitingProperties.java new file mode 100644 index 00000000..d4f0ac89 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/config/IpRateLimitingProperties.java @@ -0,0 +1,20 @@ +package life.mosu.mosuserver.global.config; + +import jakarta.validation.constraints.Min; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@Data +@Component +@ConfigurationProperties(prefix = "ratelimit") +@Validated +public class IpRateLimitingProperties { + + private boolean enabled = false; + @Min(1) + private int maxRequestsPerMinute; + @Min(1) + private long timeWindowMs; +} diff --git a/src/main/java/life/mosu/mosuserver/global/config/KmcConfig.java b/src/main/java/life/mosu/mosuserver/global/config/KmcConfig.java new file mode 100644 index 00000000..b02fffbc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/config/KmcConfig.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.global.config; +import com.icert.comm.secu.IcertSecuManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class KmcConfig { + + @Bean + public IcertSecuManager icertSecuManager() { + return new IcertSecuManager(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/config/MessageSourceConfig.java b/src/main/java/life/mosu/mosuserver/global/config/MessageSourceConfig.java new file mode 100644 index 00000000..6f9cb3ea --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/config/MessageSourceConfig.java @@ -0,0 +1,18 @@ +package life.mosu.mosuserver.global.config; + +import org.springframework.context.MessageSource; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.support.ReloadableResourceBundleMessageSource; + +@Configuration +public class MessageSourceConfig { + + @Bean + public MessageSource messageSource() { + ReloadableResourceBundleMessageSource messageSource = new ReloadableResourceBundleMessageSource(); + messageSource.setBasename("classpath:messages"); + messageSource.setDefaultEncoding("UTF-8"); + return messageSource; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/config/Pbkdf2Properties.java b/src/main/java/life/mosu/mosuserver/global/config/Pbkdf2Properties.java new file mode 100644 index 00000000..a69403dc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/config/Pbkdf2Properties.java @@ -0,0 +1,23 @@ +package life.mosu.mosuserver.global.config; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@Component +@ConfigurationProperties(prefix = "pbkdf2") +@Validated +@Data +public class Pbkdf2Properties { + + @NotBlank + String secret; + @NotNull + Integer saltLength; + @NotNull + Integer iterations; +} + diff --git a/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java b/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java index f841e39c..2122e883 100644 --- a/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java +++ b/src/main/java/life/mosu/mosuserver/global/config/SecurityConfig.java @@ -1,17 +1,26 @@ package life.mosu.mosuserver.global.config; import java.util.Arrays; +import java.util.HashMap; import java.util.List; +import java.util.Map; import life.mosu.mosuserver.application.oauth.OAuthUserService; +import life.mosu.mosuserver.global.filter.TokenExceptionFilter; +import life.mosu.mosuserver.global.filter.TokenFilter; +import life.mosu.mosuserver.global.handler.AuthLogoutHandler; +import life.mosu.mosuserver.global.handler.AuthLogoutSuccessHandler; import life.mosu.mosuserver.global.handler.OAuth2LoginFailureHandler; import life.mosu.mosuserver.global.handler.OAuth2LoginSuccessHandler; import life.mosu.mosuserver.global.resolver.AuthorizationRequestRedirectResolver; -import life.mosu.mosuserver.presentation.oauth.AccessTokenFilter; -import life.mosu.mosuserver.presentation.oauth.TokenExceptionFilter; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.http.HttpMethod; +import org.springframework.security.access.expression.method.DefaultMethodSecurityExpressionHandler; +import org.springframework.security.access.expression.method.MethodSecurityExpressionHandler; +import org.springframework.security.access.hierarchicalroles.RoleHierarchy; +import org.springframework.security.access.hierarchicalroles.RoleHierarchyImpl; +import org.springframework.security.config.Customizer; import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; @@ -19,8 +28,10 @@ import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.annotation.web.configurers.HeadersConfigurer.FrameOptionsConfig; import org.springframework.security.config.http.SessionCreationPolicy; -import org.springframework.security.crypto.factory.PasswordEncoderFactories; +import org.springframework.security.crypto.password.DelegatingPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder; +import org.springframework.security.crypto.password.Pbkdf2PasswordEncoder.SecretKeyFactoryAlgorithm; import org.springframework.security.web.AuthenticationEntryPoint; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; @@ -39,20 +50,55 @@ public class SecurityConfig { "http://localhost:8080", "https://mosuedu.com", "http://api.mosuedu.com", - "https://api.mosuedu.com" + "https://api.mosuedu.com", + "https://www.mosuedu.com", + "http://www.mosuedu.com:3000", + "https://test.mosuedu.com", + "http://localhost:5173", + "https://partnership.mosuedu.com", + "http://dev.mosuedu.com:3000", + "https://dev.mosuedu.com", + "http://admin.mosuedu.com:3000", + "https://admin.mosuedu.com" ); private final OAuthUserService userService; private final OAuth2LoginSuccessHandler loginSuccessHandler; private final OAuth2LoginFailureHandler loginFailureHandler; private final AuthenticationEntryPoint authenticationEntryPoint; - private final AccessTokenFilter accessTokenFilter; + private final TokenFilter tokenFilter; private final TokenExceptionFilter tokenExceptionFilter; + private final AuthLogoutSuccessHandler logoutSuccessHandler; + private final AuthLogoutHandler logoutHandler; private final AuthorizationRequestRedirectResolver authorizationRequestRedirectResolver; @Bean - public PasswordEncoder passwordEncoder() { - return PasswordEncoderFactories.createDelegatingPasswordEncoder(); + public RoleHierarchy roleHierarchy() { + RoleHierarchyImpl hierarchy = new RoleHierarchyImpl(); + hierarchy.setHierarchy("ROLE_ADMIN > ROLE_USER \n ROLE_USER > PENDING"); + return hierarchy; + } + + @Bean + public MethodSecurityExpressionHandler methodSecurityExpressionHandler( + RoleHierarchy roleHierarchy) { + DefaultMethodSecurityExpressionHandler expressionHandler = new DefaultMethodSecurityExpressionHandler(); + expressionHandler.setRoleHierarchy(roleHierarchy); + return expressionHandler; + } + + @Bean + public PasswordEncoder pbkdf2PasswordEncoder(Pbkdf2Properties properties) { + String idForEncode = "pbkdf2"; + + Map encoders = new HashMap<>(); + encoders.put(idForEncode, new Pbkdf2PasswordEncoder( + properties.getSecret(), + properties.getSaltLength(), + properties.getIterations(), + SecretKeyFactoryAlgorithm.PBKDF2WithHmacSHA256 + )); + return new DelegatingPasswordEncoder(idForEncode, encoders); } @Bean @@ -70,21 +116,19 @@ public WebSecurityCustomizer webSecurityCustomizer() { @Bean public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws Exception { http.csrf(AbstractHttpConfigurer::disable) -// .cors(Customizer.withDefaults()) - .cors(AbstractHttpConfigurer::disable) + .cors(Customizer.withDefaults()) .httpBasic(AbstractHttpConfigurer::disable) .headers(c -> c.frameOptions(FrameOptionsConfig::disable)) .sessionManagement( session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) .formLogin(AbstractHttpConfigurer::disable) - .logout(AbstractHttpConfigurer::disable) + .logout(logout -> logout + .logoutUrl("/auth/logout") + .addLogoutHandler(logoutHandler) + .logoutSuccessHandler(logoutSuccessHandler) + ) .authorizeHttpRequests(authorize -> authorize -// .requestMatchers( -// "/api/v1/profile/**", -// "/api/v1/admin/**" -// ) -// .hasRole("ADMIN") - .anyRequest().permitAll() + .anyRequest().permitAll() ) .oauth2Login(oauth2 -> oauth2.redirectionEndpoint(redirection -> redirection.baseUri("/oauth2/callback/{registrationId}")) @@ -99,9 +143,8 @@ public SecurityFilterChain securityFilterChain(final HttpSecurity http) throws E .successHandler(loginSuccessHandler) .failureHandler(loginFailureHandler) ) - .addFilterBefore(accessTokenFilter, UsernamePasswordAuthenticationFilter.class) - .addFilterBefore(tokenExceptionFilter, accessTokenFilter.getClass()) - .logout(config -> config.logoutSuccessUrl("/")) + .addFilterBefore(tokenFilter, UsernamePasswordAuthenticationFilter.class) + .addFilterBefore(tokenExceptionFilter, tokenFilter.getClass()) .exceptionHandling(exceptions -> exceptions.authenticationEntryPoint(authenticationEntryPoint)); return http.build(); diff --git a/src/main/java/life/mosu/mosuserver/global/config/ThreadPoolConfig.java b/src/main/java/life/mosu/mosuserver/global/config/ThreadPoolConfig.java index 93d0dece..ced34fe0 100644 --- a/src/main/java/life/mosu/mosuserver/global/config/ThreadPoolConfig.java +++ b/src/main/java/life/mosu/mosuserver/global/config/ThreadPoolConfig.java @@ -1,14 +1,25 @@ package life.mosu.mosuserver.global.config; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; +import java.util.concurrent.Executor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor; @Configuration public class ThreadPoolConfig { + @Bean - public ExecutorService threadPoolTaskExecutor() { - return Executors.newFixedThreadPool(10); + public Executor threadPoolTaskExecutor() { + + int corePoolSize = 15; + int maxPoolSize = 15; + + ThreadPoolTaskExecutor taskExecutor = new ThreadPoolTaskExecutor(); + taskExecutor.setCorePoolSize(corePoolSize); + taskExecutor.setMaxPoolSize(maxPoolSize); + taskExecutor.setQueueCapacity(100); + taskExecutor.setThreadNamePrefix("async-thread-"); + taskExecutor.initialize(); + return taskExecutor; } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/config/WebClientConfig.java b/src/main/java/life/mosu/mosuserver/global/config/WebClientConfig.java new file mode 100644 index 00000000..a166b5ee --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/config/WebClientConfig.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.global.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.http.MediaType; +import org.springframework.web.reactive.function.client.WebClient; + +@Configuration +public class WebClientConfig { + + @Bean + public WebClient webClient() { + return WebClient.builder() + .defaultHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE) + .build(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java b/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java index de2ba092..0a71052d 100644 --- a/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java +++ b/src/main/java/life/mosu/mosuserver/global/config/WebMvcConfig.java @@ -1,22 +1,28 @@ package life.mosu.mosuserver.global.config; import java.util.List; -import life.mosu.mosuserver.global.resolver.UserIdArgumentResolver; -import lombok.RequiredArgsConstructor; + +import life.mosu.mosuserver.global.resolver.PhoneNumberArgumentResolver; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.CorsRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import life.mosu.mosuserver.global.resolver.UserIdArgumentResolver; +import lombok.RequiredArgsConstructor; + @Configuration @RequiredArgsConstructor public class WebMvcConfig implements WebMvcConfigurer { - private final UserIdArgumentResolver resolver; + private final UserIdArgumentResolver userIdResolver; + private final PhoneNumberArgumentResolver phoneNumberResolver; @Override public void addArgumentResolvers(final List resolvers) { - resolvers.add(resolver); + resolvers.add(userIdResolver); + resolvers.add(phoneNumberResolver); + } @Override @@ -24,9 +30,23 @@ public void addCorsMappings(CorsRegistry registry) { registry.addMapping("/**") .allowedMethods("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS") .allowedHeaders("*") - .allowedOrigins("http://localhost:3000", "http://localhost:8080", - "http://api.mosuedu.com", "https://api.mosuedu.com") + .allowedOrigins( + "http://localhost:3000", + "http://localhost:8080", + "http://api.mosuedu.com", + "https://api.mosuedu.com", + "https://www.mosuedu.com", + "http://www.mosuedu.com:3000", + "https://test.mosuedu.com", + "http://localhost:5173", + "https://partnership.mosuedu.com", + "http://dev.mosuedu.com:3000", + "https://dev.mosuedu.com", + "http://admin.mosuedu.com:3000", + "https://admin.mosuedu.com" + ) .allowCredentials(true) .maxAge(3600); } + } diff --git a/src/main/java/life/mosu/mosuserver/global/cookie/TokenCookies.java b/src/main/java/life/mosu/mosuserver/global/cookie/TokenCookies.java new file mode 100644 index 00000000..340dad24 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/cookie/TokenCookies.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.global.cookie; + +import java.util.Optional; + +public record TokenCookies( + String accessToken, + String refreshToken +) { + + public static final String ACCESS_TOKEN_NAME = "accessToken"; + public static final String REFRESH_TOKEN_NAME = "refreshToken"; + + public Optional getAccessToken() { + return Optional.ofNullable(accessToken); + } + + public Optional getRefreshToken() { + return Optional.ofNullable(refreshToken); + } + + public boolean availableReissue() { + return getAccessToken().isPresent() && getRefreshToken().isPresent(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/exception/AuthenticationException.java b/src/main/java/life/mosu/mosuserver/global/exception/AuthenticationException.java new file mode 100644 index 00000000..4c7165f4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/exception/AuthenticationException.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.global.exception; + +import lombok.Getter; + +@Getter +public class AuthenticationException extends RuntimeException { + + private final String loginId; + + public AuthenticationException(String message, String loginId) { + super(message); + this.loginId = loginId; + } + + public AuthenticationException(String message) { + super(message); + this.loginId = null; + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java b/src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java index c63d3f1b..e9918494 100644 --- a/src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java +++ b/src/main/java/life/mosu/mosuserver/global/exception/ErrorCode.java @@ -10,11 +10,15 @@ public enum ErrorCode { // Principal 관련 에러 PRINCIPAL_NOT_FOUND(HttpStatus.UNAUTHORIZED, "인증된 사용자를 찾을 수 없습니다."), + LOGIN_BLOCKED(HttpStatus.UNAUTHORIZED, "로그인 시도가 차단되었습니다. 잠시 후 다시 시도해주세요."), + TOO_MANY_REQUESTS(HttpStatus.TOO_MANY_REQUESTS, "요청이 너무 많습니다. 잠시 후 다시 시도해주세요."), // OAuth 관련 에러 UNSUPPORTED_OAUTH2_PROVIDER(HttpStatus.BAD_REQUEST, "지원하지 않는 OAuth2 제공자입니다."), OAUTH_USER_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 존재하는 OAuth 사용자입니다."), FAILED_TO_GET_KAKAO_OAUTH_USER(HttpStatus.INTERNAL_SERVER_ERROR, "OAuth 사용자 생성에 실패했습니다."), + INSUFFICIENT_KAKAO_USER_DATA(HttpStatus.BAD_REQUEST, "카카오로부터 필수 동의 항목 정보를 모두 받지 못했습니다."), + DO_NOT_PARSE_KAKAO_BIRTHDAY(HttpStatus.BAD_REQUEST, "카카오 생년월일을 파싱할 수 없습니다."), // Auth 관련 에러 INCORRECT_ID_OR_PASSWORD(HttpStatus.UNAUTHORIZED, "아이디 또는 비밀번호가 일치하지 않습니다."), @@ -22,26 +26,50 @@ public enum ErrorCode { EXPIRED_TOKEN(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다."), INVALID_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 리프레시 토큰입니다."), - NOT_FOUND_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "리프레시 토큰을 찾을 수 없습니다."), - NOT_EXIST_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "리프레시 토큰이 존재하지 않습니다."), + VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "인증에 실패했습니다."), + + //토큰 관련 에러 + INVALID_SIGN_UP_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 회원가입 인증 토큰입니다."), + MISSING_SIGNUP_TOKEN(HttpStatus.BAD_REQUEST, "회원가입 인증 토큰이 누락되었습니다."), + MISSING_PASSWORD_TOKEN(HttpStatus.BAD_REQUEST, "비밀번호 변경 토큰이 누락되었습니다."), + + NOT_FOUND_TOKEN(HttpStatus.NOT_FOUND, "인증 토큰을 찾을 수 없습니다."), + NOT_FOUND_ACCESS_TOKEN(HttpStatus.UNAUTHORIZED, "액세스 토큰을 찾을 수 없습니다."), + NOT_FOUND_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "리프레시 토큰이 존재하지 않습니다."), + EXPIRED_REFRESH_TOKEN(HttpStatus.UNAUTHORIZED, "리프레시 토큰의 유효기간이 만료 되었습니다."), // 유저 관련 에러 USER_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 존재하는 사용자입니다."), USER_NOT_FOUND(HttpStatus.NOT_FOUND, "사용자를 찾을 수 없습니다."), - + USER_INFO_INVALID(HttpStatus.BAD_REQUEST, "유효하지 않은 사용자 정보입니다."), + USER_NOT_ACCESS_FORBIDDEN(HttpStatus.BAD_REQUEST, "접근 권한이 없는 사용자입니다"), + USER_SAVE_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "사용자 저장에 실패했습니다."), // 신청 관련 에러 WRONG_SUBJECT_TYPE(HttpStatus.BAD_REQUEST, "잘못된 과목명 입니다."), WRONG_LUNCH_TYPE(HttpStatus.BAD_REQUEST, "잘못된 도시락명 입니다."), WRONG_AREA_TYPE(HttpStatus.BAD_REQUEST, "잘못된 지역명 입니다."), + WRONG_SUBJECT_COUNT(HttpStatus.BAD_REQUEST, "응시과목은 반드시 다른 과목 2개를 신청해야 합니다."), + + // 수험표 관련 에러 + EXAM_TICKET_NOT_OPEN(HttpStatus.BAD_REQUEST, "수험표 조회 기간이 아닙니다."), + EXAM_RESOURCE_ACCESS_DENIED(HttpStatus.BAD_REQUEST, "수험표 접근을 허용할 수 없습니다."), + EXAM_QUOTA_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 시험의 신청 정원을 찾을 수 없습니다."), + EXAM_QUOTA_EXCEEDED(HttpStatus.CONFLICT, "해당 시험의 신청 정원이 초과되었습니다."), + EXAM_QUOTA_ZERO_OR_NEGATIVE(HttpStatus.CONFLICT, "해당 시험의 신청 정원이 0이거나 음수입니다."), // 신청 학교 관련 에러 - APPLICATION_SCHOOL_NOT_FOUND(HttpStatus.NOT_FOUND, "신청한 학교 정보를 찾을 수 없습니다."), + EXAM_APPLICATION_NOT_FOUND(HttpStatus.NOT_FOUND, "신청한 학교 정보를 찾을 수 없습니다."), APPLICATION_SCHOOL_LIST_NOT_FOUND(HttpStatus.NOT_FOUND, "신청한 학교 목록을 찾을 수 없습니다."), - APPLICATION_NOT_FOUND(HttpStatus.NOT_FOUND, "신청 정보를 찾을 수 없습니다."), + APPLICATION_SCHOOL_NOT_FOUND(HttpStatus.NOT_FOUND, "신청 정보를 찾을 수 없습니다."), APPLICATION_LIST_NOT_FOUND(HttpStatus.NOT_FOUND, "신청 내역을 찾을 수 없습니다."), SCHOOL_NOT_FOUND(HttpStatus.NOT_FOUND, "학교가 존재하지 않습니다."), SCHOOL_FULL(HttpStatus.CONFLICT, "해당 학교의 신청 정원이 모두 찼습니다."), APPLICATION_SCHOOL_ALREADY_APPLIED(HttpStatus.CONFLICT, "해당 학교를 이미 예약하였습니다."), + APPLICATION_SCHOOL_DUPLICATED(HttpStatus.BAD_REQUEST, "동일 일자의 같은 학교를 신청할 수 없습니다."), + EXAM_DUPLICATED(HttpStatus.BAD_REQUEST, "동일한 시험을 신청할 수 없습니다."), + WRONG_APPLICATION_ID_TYPE(HttpStatus.BAD_REQUEST, "신청 ID 타입이 올바르지 않습니다."), + PRICE_LOAD_FAILURE(HttpStatus.CONFLICT, "신청 가격 정보를 가져오는데 실패했습니다."), + APPLICATION_CLOSED(HttpStatus.BAD_REQUEST, "신청이 마감되었습니다."), // 프로필 관련 에러 PROFILE_ALREADY_EXISTS(HttpStatus.CONFLICT, "프로필이 이미 존재합니다."), @@ -59,6 +87,13 @@ public enum ErrorCode { FILE_DELETE_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "파일 삭제에 실패했습니다."), WRONG_FOLDER_TYPE(HttpStatus.BAD_REQUEST, "잘못된 폴더명 입니다."), + // 이벤트 관련 에러 + EVENT_NOT_FOUND(HttpStatus.NOT_FOUND, "이벤트를 찾을 수 없습니다."), + + // Enum 관련 에러 + NOT_FOUND_AREA(HttpStatus.NOT_FOUND, "해당 지역을 찾을 수 없습니다."), + NOT_FOUND_LUNCH(HttpStatus.NOT_FOUND, "해당 도시락을 찾을 수 없습니다."), + // FAQ 관련 에러 FAQ_NOT_FOUND(HttpStatus.NOT_FOUND, "FAQ를 찾을 수 없습니다."), FAQ_CREATION_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "FAQ 등록에 실패했습니다."), @@ -75,9 +110,61 @@ public enum ErrorCode { INQUIRY_ANSWER_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 문의 답변이 존재합니다."), // 공지 관련 에러 - NOTICE_NOT_FOUND(HttpStatus.NOT_FOUND, "공지사항을 찾을 수 없습니다."); + NOTICE_NOT_FOUND(HttpStatus.NOT_FOUND, "공지사항을 찾을 수 없습니다."), + + // 알림톡 관련 에러 + NOTIFY_STATUS_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 알림을 찾을 수 없습니다."), + STRATEGY_NOT_FOUND(HttpStatus.NOT_FOUND, "해당 전략을 찾을 수 없습니다."), + INVALID_NOTIFICATION_STATUS(HttpStatus.BAD_REQUEST, "유효하지 않은 알림 상태입니다."), + + // multi-insert 관련 + EXAM_APPLICATION_MULTI_INSERT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "신청 학교 정보 삽입 실패하였습니다."), + EXAM_SUBJECT_MULTI_INSERT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "응시 과목 정보 삽입 실패하였습니다."), + + // 시험 관련 에러 + EXAM_NOT_FOUND(HttpStatus.NOT_FOUND, "시험 정보를 찾을 수 없습니다."), + EXAM_DATE_PASSED(HttpStatus.BAD_REQUEST, "이미 지난 시험입니다."), + + //lunch 관련 + LUNCH_NOT_FOUND(HttpStatus.NOT_FOUND, "점심 정보를 찾을 수 없습니다."), + LUNCH_PRICE_UPDATE_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "가격 수정에 실패하였습니다."), + LUNCH_SELECTION_INVALID(HttpStatus.BAD_REQUEST, "점심이 등록되지 않은 시험에 점심 신청을 할 수 없습니다."), + + //payment 관련 + PAYMENT_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, "이미 존재하는 결제 건 입니다."), + PAYMENT_FAILED(HttpStatus.CONFLICT, "결제에 실패하였습니다."), + PAYMENT_NOT_FOUND(HttpStatus.NOT_FOUND, "결제 정보를 찾을 수 없습니다."), + INVALID_PAYMENT_AMOUNT(HttpStatus.BAD_REQUEST, "유효하지 않은 결제 금액입니다."), + //어드민 관련 + BANNER_NOT_FOUND(HttpStatus.NOT_FOUND, "배너 정보를 찾을 수 없습니다."), + BANNER_DELETE_FAILURE(HttpStatus.CONFLICT, "배너를 삭제하는 것에 실패하였습니다."), + EXCEL_DATA_EMPTY(HttpStatus.NOT_FOUND, "엑셀 데이터가 없습니다."), + EXCEL_DOWNLOAD_FAILURE(HttpStatus.CONFLICT, "엑셀 다운로드 중 문제가 발생했습니다."), + CACHE_UPDATE_FAIL(HttpStatus.CONFLICT, "캐시 업데이트에 실패하였습니다."), + + // ID 찾기 관련 + NOT_FOUND_LOGIN_ID(HttpStatus.NOT_FOUND, "해당 아이디를 찾을 수 없습니다."), + + //결제 API 실패 + PAYMENT_API_ERROR(HttpStatus.BAD_REQUEST, "결제 API 호출에 실패하였습니다."), + + //환불 + REFUND_CALCULATION_FAILED(HttpStatus.CONFLICT, "환불 금액 계산에 실패하였습니다."), + REFUND_NOT_FOUND(HttpStatus.NOT_FOUND, "환불 정보를 찾을 수 없습니다."), + // Form 관련 에러 + NOT_FOUND_FORM(HttpStatus.NOT_FOUND, "신청서를 찾을 수 없습니다."), + + //LUA 관련 + LUA_SCRIPT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "LUA 스크립트 실행 중 오류가 발생했습니다."), + + //캐시 관련 + CACHE_OPERATION_NOT_SUPPORTED(HttpStatus.NOT_IMPLEMENTED, "캐시 작업이 지원되지 않습니다."), + + INVALID_VIRTUAL_ACCOUNT_DEPOSIT_EVENT(HttpStatus.BAD_REQUEST, "유효하지 않은 가상 계좌 입금 이벤트입니다."), + VIRTUAL_ACCOUNT_CREATION_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "가상 계좌 생성에 실패했습니다."), + VIRTUAL_ACCOUNT_LOG_NOT_FOUND(HttpStatus.NOT_FOUND, "가상 계좌 로그를 찾을 수 없습니다."), + ; private final HttpStatus status; private final String message; - } diff --git a/src/main/java/life/mosu/mosuserver/global/exception/GlobalExceptionHandler.java b/src/main/java/life/mosu/mosuserver/global/exception/GlobalExceptionHandler.java index 23cac790..59bed19a 100644 --- a/src/main/java/life/mosu/mosuserver/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/life/mosu/mosuserver/global/exception/GlobalExceptionHandler.java @@ -3,14 +3,17 @@ import jakarta.persistence.EntityNotFoundException; import java.util.LinkedHashMap; import java.util.Map; +import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.http.converter.HttpMessageNotReadableException; import org.springframework.security.access.AccessDeniedException; import org.springframework.security.core.AuthenticationException; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; +@Slf4j @RestControllerAdvice public class GlobalExceptionHandler { @@ -31,6 +34,7 @@ public ResponseEntity> handleMethodArgumentNotValidException errors.put(error.getField(), error.getDefaultMessage()); }); response.put("status", HttpStatus.BAD_REQUEST.value()); + response.put("message", "유효성 검사에 실패했습니다."); response.put("errors", errors); return ResponseEntity.badRequest().body(response); @@ -46,6 +50,7 @@ public ResponseEntity> handleIllegalArgumentException( IllegalArgumentException ex) { Map response = new LinkedHashMap<>(); response.put("status", HttpStatus.BAD_REQUEST.value()); + response.put("errors", "잘못된 요청입니다."); response.put("message", ex.getMessage()); return ResponseEntity.badRequest().body(response); @@ -61,7 +66,9 @@ public ResponseEntity> handleEntityNotFoundException( EntityNotFoundException ex) { Map response = new LinkedHashMap<>(); response.put("status", HttpStatus.NOT_FOUND.value()); - response.put("message", ex.getMessage()); + response.put("message", "요청한 리소스가 존재하지 않습니다."); + response.put("errors", ex.getMessage()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response); } @@ -75,7 +82,23 @@ public ResponseEntity> handleAuthenticationException( AuthenticationException ex) { Map response = new LinkedHashMap<>(); response.put("status", HttpStatus.UNAUTHORIZED.value()); - response.put("message", "AUTHENTICATION_ERROR"); + response.put("message", "인증에 실패했습니다"); + response.put("errors", ex.getMessage()); + + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response); + } + + /** + * 커스텀 AuthenticationException 처리 + * + * @return 401 Unauthorized + */ + @ExceptionHandler(life.mosu.mosuserver.global.exception.AuthenticationException.class) + public ResponseEntity> handleAuthenticationException( + life.mosu.mosuserver.global.exception.AuthenticationException ex) { + Map response = new LinkedHashMap<>(); + response.put("status", HttpStatus.UNAUTHORIZED.value()); + response.put("message", "인증에 실패했습니다"); response.put("errors", ex.getMessage()); return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response); @@ -91,12 +114,27 @@ public ResponseEntity> handleAccessDeniedException( AccessDeniedException ex) { Map response = new LinkedHashMap<>(); response.put("status", HttpStatus.FORBIDDEN.value()); - response.put("message", "ACCESS_DENIED"); + response.put("message", "인가를 실패 했습니다"); response.put("errors", ex.getMessage()); return ResponseEntity.status(HttpStatus.FORBIDDEN).body(response); } + /** + * @return 409 Bad Request + * @RequestBody JSON 파싱 실패 (필드명 불일치, 데이터 타입 불일치, JSON 형식 오류 등) + */ + @ExceptionHandler(HttpMessageNotReadableException.class) + public ResponseEntity> handleHttpMessageNotReadableException( + HttpMessageNotReadableException ex) { + Map response = new LinkedHashMap<>(); + response.put("status", HttpStatus.CONFLICT.value()); + response.put("message", "필드명 또는 데이터 타입이 일치하지 않습니다."); + response.put("errors", ex.getMessage()); + + return ResponseEntity.status(HttpStatus.CONFLICT).body(response); + } + @ExceptionHandler(Exception.class) public ResponseEntity> handleGeneralException(Exception ex) { System.out.println("Exception: " + ex.getMessage()); diff --git a/src/main/java/life/mosu/mosuserver/global/factory/AbstractFailureLogFactory.java b/src/main/java/life/mosu/mosuserver/global/factory/AbstractFailureLogFactory.java new file mode 100644 index 00000000..912cbde5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/factory/AbstractFailureLogFactory.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.global.factory; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public abstract class AbstractFailureLogFactory { + + protected final ObjectMapper objectMapper; + + public abstract L create(O entity, String reason); + + protected String toJson(O entity) { + try { + return objectMapper.writeValueAsString(entity); + } catch (JsonProcessingException e) { + return "{}"; + } + } +} + diff --git a/src/main/java/life/mosu/mosuserver/global/filter/AuthConstants.java b/src/main/java/life/mosu/mosuserver/global/filter/AuthConstants.java new file mode 100644 index 00000000..a2e36e42 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/AuthConstants.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.global.filter; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class AuthConstants { + + public static final String AUTH_HEADER = "Authorization"; + public static final String BEARER_TYPE = "Bearer "; + + public static final String ATTR_KMC_TOKEN = "kmcToken"; + + /* + * API Spec + */ + public static final String API_PREFIX = "/api/v1"; + + public static final String AUTH_PREFIX = API_PREFIX + "/auth"; + public static final String PATH_REISSUE = AUTH_PREFIX + "/reissue"; + public static final String PATH_SIGNUP = AUTH_PREFIX + "/signup"; + + public static final String USER_PREFIX = API_PREFIX + "/user"; + public static final String PATH_PASSWORD_CHANGE = USER_PREFIX + "/me/password"; + +} diff --git a/src/main/java/life/mosu/mosuserver/global/filter/IpRateLimitingFilter.java b/src/main/java/life/mosu/mosuserver/global/filter/IpRateLimitingFilter.java new file mode 100644 index 00000000..4cff09f7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/IpRateLimitingFilter.java @@ -0,0 +1,79 @@ +package life.mosu.mosuserver.global.filter; + +import static life.mosu.mosuserver.global.util.IpUtil.getClientIp; + +import com.github.benmanes.caffeine.cache.Cache; +import com.github.benmanes.caffeine.cache.Caffeine; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.concurrent.TimeUnit; +import life.mosu.mosuserver.global.config.IpRateLimitingProperties; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +@Slf4j +@Component +public class IpRateLimitingFilter extends OncePerRequestFilter { + + private final IpRateLimitingProperties ipRateLimitingProperties; + private final Cache ipRequestCounts; + + public IpRateLimitingFilter(IpRateLimitingProperties ipRateLimitingProperties) { + this.ipRateLimitingProperties = ipRateLimitingProperties; + this.ipRequestCounts = Caffeine.newBuilder() + .expireAfterWrite(ipRateLimitingProperties.getTimeWindowMs(), TimeUnit.MILLISECONDS) + .recordStats() + .build(); + } + + @Override + protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, + FilterChain filterChain) + throws ServletException, IOException { + + if (!ipRateLimitingProperties.isEnabled()) { + filterChain.doFilter(request, response); + return; + } + + String ip = getClientIp(request); + RequestCounter counter = ipRequestCounts.get(ip, k -> new RequestCounter()); + + synchronized (counter) { + counter.increment(); + + if (isBlocked(counter)) { + log.warn("차단된 IP: {}, 요청 횟수: {}", ip, counter.count); + handleBlockedIp(); + } + } + + log.info("IP: {}, 요청 횟수 증가 후: {}", ip, counter.count); + log.debug("Cache stats: {}", ipRequestCounts.stats()); + + filterChain.doFilter(request, response); + } + + private boolean isBlocked(RequestCounter counter) { + return counter.count >= ipRateLimitingProperties.getMaxRequestsPerMinute(); + } + + private void handleBlockedIp() { + throw new CustomRuntimeException(ErrorCode.TOO_MANY_REQUESTS); + } + + private static class RequestCounter { + + int count = 0; + + void increment() { + count++; + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/filter/KmcAuthenticationToken.java b/src/main/java/life/mosu/mosuserver/global/filter/KmcAuthenticationToken.java new file mode 100644 index 00000000..8342bb3b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/KmcAuthenticationToken.java @@ -0,0 +1,42 @@ +package life.mosu.mosuserver.global.filter; + +import java.util.Collection; +import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; + +public class KmcAuthenticationToken extends AbstractAuthenticationToken { + + private final String phoneNumber; + + public KmcAuthenticationToken(String phoneNumber) { + super(null); + this.phoneNumber = phoneNumber; + setAuthenticated(false); + } + /** + * Creates a token with the supplied array of authorities. + * + * @param authorities the collection of GrantedAuthoritys for the principal represented by + * this authentication object. + */ + public KmcAuthenticationToken(Collection authorities, String phoneNumber) { + super(authorities); + this.phoneNumber = phoneNumber; + setAuthenticated(true); + } + + + @Override + public Object getCredentials() { + return null; + } + + @Override + public Object getPrincipal() { + return null; + } + + public String getPhoneNumber() { + return phoneNumber; + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/filter/KmcTokenProcessingFilter.java b/src/main/java/life/mosu/mosuserver/global/filter/KmcTokenProcessingFilter.java new file mode 100644 index 00000000..fac608f1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/KmcTokenProcessingFilter.java @@ -0,0 +1,47 @@ +package life.mosu.mosuserver.global.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import life.mosu.mosuserver.presentation.oauth.TokenService; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +@Component +@RequiredArgsConstructor +public class KmcTokenProcessingFilter extends OncePerRequestFilter { + + private static final String UNSKIPPED_URL_PREFIXES = "/api/v1/user/me/password"; + + private final TokenService tokenService; + + @Override + protected void doFilterInternal( + HttpServletRequest request, + HttpServletResponse response, + FilterChain filterChain + ) throws ServletException, IOException { + + if (!request.getRequestURI().startsWith(UNSKIPPED_URL_PREFIXES)) { + filterChain.doFilter(request, response); + return; + } + + String kmcToken = resolveKmcTokenFromHeader(request); + String phoneNumber = tokenService.getPhoneNumber(kmcToken); + + Authentication authentication = new KmcAuthenticationToken(phoneNumber); + SecurityContextHolder.getContext().setAuthentication(authentication); + + filterChain.doFilter(request, response); + } + + private String resolveKmcTokenFromHeader(final HttpServletRequest request) { + return (String) request.getAttribute("kmcToken"); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/oauth/TokenExceptionFilter.java b/src/main/java/life/mosu/mosuserver/global/filter/TokenExceptionFilter.java similarity index 81% rename from src/main/java/life/mosu/mosuserver/presentation/oauth/TokenExceptionFilter.java rename to src/main/java/life/mosu/mosuserver/global/filter/TokenExceptionFilter.java index 9ab1d00c..8b6911e1 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/oauth/TokenExceptionFilter.java +++ b/src/main/java/life/mosu/mosuserver/global/filter/TokenExceptionFilter.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.presentation.oauth; +package life.mosu.mosuserver.global.filter; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -23,6 +23,9 @@ protected void doFilterInternal( try { filterChain.doFilter(request, response); } catch (CustomRuntimeException exception) { + response.setStatus(HttpServletResponse.SC_UNAUTHORIZED); + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); response.sendError(exception.getStatus().value(), exception.getMessage()); } } diff --git a/src/main/java/life/mosu/mosuserver/global/filter/TokenFilter.java b/src/main/java/life/mosu/mosuserver/global/filter/TokenFilter.java new file mode 100644 index 00000000..6a109baf --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/TokenFilter.java @@ -0,0 +1,127 @@ +package life.mosu.mosuserver.global.filter; + +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.Optional; +import life.mosu.mosuserver.application.auth.provider.AccessTokenProvider; +import life.mosu.mosuserver.application.auth.provider.AuthTokenManager; +import life.mosu.mosuserver.global.cookie.TokenCookies; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.handler.ReissueHandler; +import life.mosu.mosuserver.global.resolver.TokenResolver; +import life.mosu.mosuserver.presentation.auth.dto.Token; +import life.mosu.mosuserver.presentation.oauth.TokenService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.filter.OncePerRequestFilter; + +@Slf4j +@Component +@RequiredArgsConstructor +public class TokenFilter extends OncePerRequestFilter { + + private final static String tokenHeader = "Authorization"; + private static final String BEARER_TYPE = "Bearer"; + private final AccessTokenProvider accessTokenProvider; + private final AuthTokenManager authTokenManager; + private final TokenService tokenService; + private final TokenResolver tokenResolver; + private final ReissueHandler reissueHandler; + + @Override + protected void doFilterInternal( + final HttpServletRequest request, + final HttpServletResponse response, + final FilterChain filterChain + ) throws ServletException, IOException { + + if (Whitelist.isWhitelisted(request)) { + filterChain.doFilter(request, response); + return; + } + + String requestUri = request.getRequestURI(); + + if (requestUri.startsWith(AuthConstants.PATH_REISSUE)) { + reissueToken(request, response); + return; + } + + if (requestUri.startsWith(AuthConstants.PATH_SIGNUP)) { + + String signUpToken = resolveBearerTokenFromHeader(request).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.MISSING_SIGNUP_TOKEN) + ); + + validateToken(signUpToken); + + filterChain.doFilter(request, response); + return; + } + + if (requestUri.startsWith(AuthConstants.PATH_PASSWORD_CHANGE)) { + String passwordToken = resolveBearerTokenFromHeader(request).orElseThrow( + () -> new CustomRuntimeException(ErrorCode.MISSING_PASSWORD_TOKEN) + ); + + validateToken(passwordToken); + request.setAttribute("kmcToken", passwordToken); + filterChain.doFilter(request, response); + + return; + } + + final TokenCookies tokenCookies = tokenResolver.resolveTokens(request); + String accessToken = tokenCookies.getAccessToken().orElseThrow( + () -> new CustomRuntimeException(ErrorCode.NOT_FOUND_ACCESS_TOKEN) + ); + + try { + setAuthentication(accessToken); + } catch (CustomRuntimeException e) { + log.error("액세스 토큰 인증 실패: {}", e.getMessage()); + throw new CustomRuntimeException(ErrorCode.INVALID_TOKEN); + } catch (Exception e) { + log.error("액세스 토큰 인증 실패: {}", e.getMessage()); + throw new RuntimeException("액세스 토큰 인증 중 예외 발생", e); + } + + filterChain.doFilter(request, response); + } + + private void reissueToken(HttpServletRequest request, HttpServletResponse response) + throws IOException { + final TokenCookies tokenCookies = tokenResolver.resolveTokens(request); + if (!tokenCookies.availableReissue()) { + throw new CustomRuntimeException(ErrorCode.EXPIRED_REFRESH_TOKEN); + } + + Token newToken = authTokenManager.reissueToken(tokenCookies); + reissueHandler.onReissueSuccess(request, response, newToken); + } + + private void setAuthentication(final String accessToken) { + final Authentication authentication = accessTokenProvider.getAuthentication( + accessToken); + SecurityContextHolder.getContext().setAuthentication(authentication); + } + + private void validateToken(final String token) { + tokenService.validateToken(token); + } + + private Optional resolveBearerTokenFromHeader(final HttpServletRequest request) { + final String header = request.getHeader(tokenHeader); + if (header != null && header.startsWith(BEARER_TYPE)) { + return Optional.of(header.substring(BEARER_TYPE.length()).trim()); + } + return Optional.empty(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java b/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java new file mode 100644 index 00000000..df4ac672 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/Whitelist.java @@ -0,0 +1,61 @@ +package life.mosu.mosuserver.global.filter; + +import jakarta.servlet.http.HttpServletRequest; +import java.util.Arrays; +import java.util.Optional; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; + +@Getter +@Slf4j +@RequiredArgsConstructor +public enum Whitelist { + + // ALL METHOD 허용 + KMC("/api/v1/kmc", WhitelistMethod.ALL), + API_DOCS("/api/v1/api-docs", WhitelistMethod.ALL), + ACTUATOR("/api/v1/actuator", WhitelistMethod.ALL), + LOGIN("/api/v1/auth/login", WhitelistMethod.ALL), + SWAGGER("/api/v1/swagger", WhitelistMethod.ALL), + SWAGGER_UI("/api/v1/swagger-ui", WhitelistMethod.ALL), + VIRTUAL_ACCOUNT("/api/v1/virtual-account", WhitelistMethod.ALL), + ADMISSION_TICKET("/api/v1/admission-ticket", WhitelistMethod.ALL), + + // 정적 리소스 + CSS("/api/v1/css", WhitelistMethod.GET), + JS("/api/v1/js", WhitelistMethod.GET), + FONTS("/api/v1/fonts", WhitelistMethod.GET), + IMAGES("/api/v1/images", WhitelistMethod.GET), + + // OAuth 관련 + OAUTH2("/api/v1/oauth2", WhitelistMethod.ALL), + OAUTH("/api/v1/oauth", WhitelistMethod.ALL), + + // 삭제 예정 + MASTER("/api/v1/master", WhitelistMethod.ALL), + + // 조회만 가능한 PATH + EVENT("/api/v1/event", WhitelistMethod.GET), + FAQ("/api/v1/faq", WhitelistMethod.GET), + NOTICE("/api/v1/notice", WhitelistMethod.GET), + + APPLICATION_GUEST("/api/v1/applications/guest", WhitelistMethod.ALL); + private final String path; + private final WhitelistMethod method; + + public static boolean isWhitelisted(final HttpServletRequest request) { + return findMatch(request).isPresent(); + } + + private static Optional findMatch(final HttpServletRequest request) { + String requestUri = request.getRequestURI(); + String requestMethod = request.getMethod(); + + return Arrays.stream(values()) + .filter(url -> requestUri.startsWith(url.path)) + .filter(url -> url.method == WhitelistMethod.ALL || url.method.name() + .equalsIgnoreCase(requestMethod)) + .findFirst(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/filter/WhitelistMethod.java b/src/main/java/life/mosu/mosuserver/global/filter/WhitelistMethod.java new file mode 100644 index 00000000..ea262948 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/filter/WhitelistMethod.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.global.filter; + +public enum WhitelistMethod { + GET, + POST, + PUT, + DELETE, + PATCH, + OPTIONS, + HEAD, + TRACE, + ALL; +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/handler/AuthLogoutHandler.java b/src/main/java/life/mosu/mosuserver/global/handler/AuthLogoutHandler.java new file mode 100644 index 00000000..6ed0bb2f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/handler/AuthLogoutHandler.java @@ -0,0 +1,42 @@ +package life.mosu.mosuserver.global.handler; + +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import org.springframework.security.core.Authentication; +import org.springframework.security.web.authentication.logout.LogoutHandler; +import org.springframework.stereotype.Component; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import life.mosu.mosuserver.global.util.CookieBuilderUtil; +import lombok.extern.slf4j.Slf4j; + + +@Slf4j +@Component +public class AuthLogoutHandler implements LogoutHandler { + + @Override + public void logout(HttpServletRequest request, HttpServletResponse response, + Authentication authentication) { + final List targetCookieNames = List.of( + CookieBuilderUtil.ACCESS_TOKEN_COOKIE_NAME, + CookieBuilderUtil.REFRESH_TOKEN_COOKIE_NAME + ); + + Optional.ofNullable(request.getCookies()).ifPresent(cookies -> + Arrays.stream(cookies) + .filter(cookie -> targetCookieNames.contains(cookie.getName())) + .forEach(cookie -> { + cookie.setSecure(true); + cookie.setDomain("mosuedu.com"); + cookie.setValue(""); + cookie.setPath("/"); + cookie.setMaxAge(0); + response.addCookie(cookie); + }) + ); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/handler/AuthLogoutSuccessHandler.java b/src/main/java/life/mosu/mosuserver/global/handler/AuthLogoutSuccessHandler.java new file mode 100644 index 00000000..3c9fb182 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/handler/AuthLogoutSuccessHandler.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.global.handler; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.security.core.Authentication; +import org.springframework.security.web.authentication.logout.LogoutSuccessHandler; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class AuthLogoutSuccessHandler implements LogoutSuccessHandler { + + private final ObjectMapper objectMapper; + + @Override + public void onLogoutSuccess(HttpServletRequest request, HttpServletResponse response, + Authentication authentication) throws IOException { + + Map responseBody = new HashMap<>(); + responseBody.put("status", HttpStatus.OK.value()); + responseBody.put("message", "로그아웃이 성공적으로 처리되었습니다."); + + response.setStatus(HttpStatus.OK.value()); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding("UTF-8"); + + objectMapper.writeValue(response.getWriter(), responseBody); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/handler/OAuth2LoginSuccessHandler.java b/src/main/java/life/mosu/mosuserver/global/handler/OAuth2LoginSuccessHandler.java index 4c88aded..2c4449ba 100644 --- a/src/main/java/life/mosu/mosuserver/global/handler/OAuth2LoginSuccessHandler.java +++ b/src/main/java/life/mosu/mosuserver/global/handler/OAuth2LoginSuccessHandler.java @@ -1,26 +1,35 @@ package life.mosu.mosuserver.global.handler; +import static life.mosu.mosuserver.global.resolver.AuthorizationRequestRedirectResolver.REDIRECT_PARAM_KEY; + +import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; import java.io.IOException; -import life.mosu.mosuserver.application.auth.AccessTokenService; +import java.nio.charset.StandardCharsets; +import java.util.HashMap; +import java.util.Map; +import life.mosu.mosuserver.application.auth.provider.AuthTokenManager; import life.mosu.mosuserver.application.oauth.OAuthUser; +import life.mosu.mosuserver.global.util.CookieBuilderUtil; +import life.mosu.mosuserver.presentation.auth.dto.LoginResponse; +import life.mosu.mosuserver.presentation.auth.dto.Token; import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; import org.springframework.security.core.Authentication; import org.springframework.security.web.authentication.AuthenticationSuccessHandler; import org.springframework.stereotype.Component; import org.springframework.web.util.UriComponentsBuilder; +import org.springframework.web.util.UriUtils; -@Slf4j @Component @RequiredArgsConstructor public class OAuth2LoginSuccessHandler implements AuthenticationSuccessHandler { - private final AccessTokenService accessTokenService; - @Value("${target.url}") - private String targetUrl; + private static final String STATE_PARAM_KEY = "state"; + private final AuthTokenManager authTokenManager; + private final ObjectMapper objectMapper; @Override public void onAuthenticationSuccess( @@ -28,17 +37,44 @@ public void onAuthenticationSuccess( final HttpServletResponse response, final Authentication authentication ) throws IOException { + final String state = request.getParameter(STATE_PARAM_KEY); + final Map stateParams = parseState(state); + final String redirect = stateParams.getOrDefault(REDIRECT_PARAM_KEY, "/"); + final OAuthUser oAuthUser = (OAuthUser) authentication.getPrincipal(); + Token token = authTokenManager.generateAuthToken(oAuthUser.getUser()); + + final ResponseCookie accessTokenCookie = CookieBuilderUtil.createDevelopResponseCookie( + "accessToken", + token.accessToken(), + token.accessTokenExpireTime() + ); - final String accessToken = accessTokenService.generateAccessToken(oAuthUser.getUser()); + final ResponseCookie refreshTokenCookie = CookieBuilderUtil.createDevelopResponseCookie( + "refreshToken", + token.refreshToken(), + token.refreshTokenExpireTime() + ); - final String redirectUrlWithToken = UriComponentsBuilder.fromUriString(targetUrl) - .queryParam("token", accessToken) + response.addHeader(HttpHeaders.SET_COOKIE, accessTokenCookie.toString()); + response.addHeader(HttpHeaders.SET_COOKIE, refreshTokenCookie.toString()); + LoginResponse loginResponse = LoginResponse.from(oAuthUser); + String jsonResponse = UriUtils.encode(objectMapper.writeValueAsString(loginResponse), + StandardCharsets.UTF_8); + + final String redirectWithAccessToken = UriComponentsBuilder.fromUriString(redirect) + .queryParam("data", jsonResponse) .build() .toUriString(); - log.info("로그인 성공. 리다이렉트 URL: {}", redirectUrlWithToken); + response.sendRedirect(redirectWithAccessToken); + } - response.sendRedirect(redirectUrlWithToken); + private Map parseState(final String state) { + final Map params = new HashMap<>(); + UriComponentsBuilder.fromUriString("?" + state).build() + .getQueryParams() + .forEach((key, value) -> params.put(key, value.getFirst())); + return params; } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/handler/ReissueHandler.java b/src/main/java/life/mosu/mosuserver/global/handler/ReissueHandler.java new file mode 100644 index 00000000..4c7ed885 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/handler/ReissueHandler.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.global.handler; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import life.mosu.mosuserver.presentation.auth.dto.Token; + +public interface ReissueHandler { + + void onReissueSuccess(HttpServletRequest request, HttpServletResponse response, + Token token) throws IOException; +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/handler/TokenReissueHandler.java b/src/main/java/life/mosu/mosuserver/global/handler/TokenReissueHandler.java new file mode 100644 index 00000000..5ba7303f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/handler/TokenReissueHandler.java @@ -0,0 +1,49 @@ +package life.mosu.mosuserver.global.handler; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; +import java.util.stream.Stream; +import life.mosu.mosuserver.global.util.CookieBuilderUtil; +import life.mosu.mosuserver.presentation.auth.dto.Token; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +class TokenReissueHandler implements ReissueHandler { + + private final ObjectMapper objectMapper; + + @Override + public void onReissueSuccess(final HttpServletRequest request, + final HttpServletResponse response, final Token newToken) throws IOException { + Stream.of( + CookieBuilderUtil.createDevelopCookie( + CookieBuilderUtil.ACCESS_TOKEN_COOKIE_NAME, + newToken.accessToken(), + newToken.accessTokenExpireTime() + ), + CookieBuilderUtil.createDevelopCookie( + CookieBuilderUtil.REFRESH_TOKEN_COOKIE_NAME, + newToken.refreshToken(), + newToken.refreshTokenExpireTime() + ) + ).forEach(response::addCookie); + + Map responseBody = new HashMap<>(); + responseBody.put("status", HttpStatus.OK.value()); + responseBody.put("message", "reissue를 성공했습니다."); + + response.setStatus(HttpStatus.OK.value()); + response.setContentType(MediaType.APPLICATION_JSON_VALUE); + response.setCharacterEncoding("UTF-8"); + + objectMapper.writeValue(response.getWriter(), responseBody); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/initializer/DatabaseInitializer.java b/src/main/java/life/mosu/mosuserver/global/initializer/DatabaseInitializer.java new file mode 100644 index 00000000..9dae13f2 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/initializer/DatabaseInitializer.java @@ -0,0 +1,360 @@ +package life.mosu.mosuserver.global.initializer; + +import jakarta.annotation.PostConstruct; +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Random; +import java.util.Set; +import java.util.UUID; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepository; +import life.mosu.mosuserver.domain.event.entity.DurationJpaVO; +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +import life.mosu.mosuserver.domain.event.repository.EventJpaRepository; +import life.mosu.mosuserver.domain.exam.entity.AddressJpaVO; +import life.mosu.mosuserver.domain.exam.entity.Area; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaRepository; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; +import life.mosu.mosuserver.domain.examapplication.repository.ExamApplicationJpaRepository; +import life.mosu.mosuserver.domain.examapplication.repository.ExamSubjectJpaRepository; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiry.repository.InquiryJpaRepository; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerJpaEntity; +import life.mosu.mosuserver.domain.inquiryAnswer.repository.InquiryAnswerJpaRepository; +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; +import life.mosu.mosuserver.domain.notice.repository.NoticeJpaRepository; +import life.mosu.mosuserver.domain.payment.entity.PaymentAmountVO; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; +import life.mosu.mosuserver.domain.payment.entity.PaymentStatus; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepository; +import life.mosu.mosuserver.domain.profile.entity.Education; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.profile.entity.Grade; +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.SchoolInfoJpaVO; +import life.mosu.mosuserver.domain.profile.repository.ProfileJpaRepository; +import life.mosu.mosuserver.domain.recommendation.RecommendationJpaEntity; +import life.mosu.mosuserver.domain.recommendation.RecommendationJpaRepository; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.entity.RefundStatus; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepository; +import life.mosu.mosuserver.domain.user.entity.AuthProvider; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class DatabaseInitializer { + + private static final int BASE_EXAM_FEE = 49_000; + private static final int LUNCH_PRICE = 9_000; + + private final UserJpaRepository userRepository; + private final ProfileJpaRepository profileRepository; + private final ExamJpaRepository examRepository; + private final ApplicationJpaRepository applicationRepository; + private final ExamApplicationJpaRepository examApplicationRepository; + private final ExamSubjectJpaRepository examSubjectRepository; + private final PaymentJpaRepository paymentRepository; + private final NoticeJpaRepository noticeRepository; + private final InquiryJpaRepository inquiryRepository; + private final InquiryAnswerJpaRepository inquiryAnswerRepository; + private final RefundJpaRepository refundRepository; + private final EventJpaRepository eventRepository; + private final PasswordEncoder passwordEncoder; + private final RecommendationJpaRepository recommendationRepository; + + @PostConstruct + public void init() { + if (userRepository.count() > 0 || examRepository.count() > 0) { + log.info("이미 더미 데이터가 존재하여 초기화를 건너뜁니다."); + return; + } + + log.info("데이터 초기화 시작 🚀"); + Random random = new Random(); + + List users = createUsersAndProfiles(random); + List exams = createExams(); + createApplicationsAndPayments(users, exams, random); + createBoardItems(users, random); + createRefunds(); + createRecommendations(); + + log.info("✅ 데이터 초기화 완료"); + } + + private List createUsersAndProfiles(Random random) { + List users = new ArrayList<>(); + + for (int i = 1; i <= 10; i++) { + UserJpaEntity user = UserJpaEntity.builder() + .loginId("userid" + i) + .password(passwordEncoder.encode("Password!" + i)) + .gender(i % 2 == 0 ? Gender.MALE : Gender.FEMALE) + .name("모수학생" + i) + .phoneNumber("010-9161-2960") + .birth(LocalDate.of(2005 + i % 3, (i % 12) + 1, (i % 28) + 1)) + .userRole(i == 1 ? UserRole.ROLE_ADMIN : UserRole.ROLE_USER) + .agreedToTermsOfService(true) + .agreedToPrivacyPolicy(true) + .agreedToMarketing(random.nextBoolean()) + .provider(AuthProvider.MOSU) + .build(); + userRepository.save(user); + users.add(user); + + ProfileJpaEntity profile = ProfileJpaEntity.builder() + .userId(user.getId()) + .userName(user.getName()) + .gender(user.getGender()) + .birth(user.getBirth()) + .phoneNumber(user.getPhoneNumber()) + .email("user" + i + "@mosu.life") + .education(Education.ENROLLED) + .schoolInfo(new SchoolInfoJpaVO("모수고등학교", "서울시 모수구 123", "12345")) + .grade(Grade.values()[random.nextInt(Grade.values().length)]) + .build(); + profileRepository.save(profile); + } + + createAdditionalUsers(); + + return users; + } + + private void createAdditionalUsers() { + for (int i = 11; i <= 12; i++) { + UserJpaEntity user = UserJpaEntity.builder() + .loginId("userid" + i) + .password(passwordEncoder.encode("Password!" + i)) + .gender(i % 2 == 0 ? Gender.MALE : Gender.FEMALE) + .name("홍길동") + .phoneNumber("010-5048-6201") + .birth(LocalDate.of(2005 + i % 3, (i % 12) + 1, (i % 28) + 1)) + .userRole(UserRole.ROLE_USER) + .agreedToTermsOfService(true) + .agreedToPrivacyPolicy(true) + .agreedToMarketing(true) + .provider(AuthProvider.MOSU) + .build(); + userRepository.save(user); + + ProfileJpaEntity profile = ProfileJpaEntity.builder() + .userId(user.getId()) + .userName(user.getName()) + .gender(user.getGender()) + .birth(user.getBirth()) + .phoneNumber(user.getPhoneNumber()) + .email("user" + i + "@mosu.life") + .education(Education.ENROLLED) + .schoolInfo(new SchoolInfoJpaVO("모수고등학교", "서울시 모수구 123", "12345")) + .grade(Grade.HIGH_1) + .build(); + profileRepository.save(profile); + } + } + + private List createExams() { + List exams = List.of( + createExam("대치중학교", Area.DAECHI, "06234", "강남구 대치동 987", + LocalDate.of(2025, 10, 19), 532), + + createExam("목운중학교", Area.MOKDONG, "07995", "양천구 목동서로 369", + LocalDate.of(2025, 10, 26), 896), + + createExam("신서중학교", Area.MOKDONG, "08018", "양천구 신정로 250", + LocalDate.of(2025, 11, 2), 896), + + createExam("개원중학교", Area.DAECHI, "06327", "강남구 개포로 619", + LocalDate.of(2025, 10, 26), 840), + createExam("개원중학교", Area.DAECHI, "06327", "강남구 개포로 619", + LocalDate.of(2025, 11, 2), 840), + + createExam("문래중학교", Area.MOKDONG, "07291", "영등포구 문래로 195", + LocalDate.of(2025, 10, 19), 558), + + createExam("온곡중학교", Area.NOWON, "01673", "노원구 덕릉로 70길 99", + LocalDate.of(2025, 10, 19), 448), + createExam("온곡중학교", Area.NOWON, "01673", "노원구 덕릉로 70길 99", + LocalDate.of(2025, 11, 2), 448), + + createExam("노변중학교", Area.DAEGU, "42677", "대구광역시 달서구 장기로 76", + LocalDate.of(2025, 10, 19), 392), + createExam("노변중학교", Area.DAEGU, "42677", "대구광역시 달서구 장기로 76", + LocalDate.of(2025, 11, 2), 392) + ); + + return examRepository.saveAll(exams); + } + + private ExamJpaEntity createExam(String name, Area area, String zipcode, String street, + LocalDate date, int cap) { + return ExamJpaEntity.builder() + .schoolName(name) + .area(area) + .address(new AddressJpaVO(zipcode, "서울특별시", street)) + .examDate(date) + .capacity(cap) + .deadlineTime(date.atTime(23, 59, 59).minusDays(7)) + .lunchName("고정 도시락") + .lunchPrice(LUNCH_PRICE) + .build(); + } + + private void createApplicationsAndPayments(List users, List exams, + Random random) { + int counter = 0; + + for (UserJpaEntity user : users) { + ApplicationJpaEntity application = applicationRepository.save( + ApplicationJpaEntity.builder() + .userId(user.getId()) + .parentPhoneNumber("010-9876-" + String.format("%04d", user.getId())) + .agreedToNotices(true) + .agreedToRefundPolicy(true) + .build() + ); + + Collections.shuffle(exams); + int applyCount = random.nextInt(3) + 1; + List applied = new ArrayList<>(); + int lunchCount = 0; + + for (int i = 0; i < applyCount; i++) { + ExamJpaEntity exam = exams.get(i); + boolean lunch = random.nextBoolean(); + if (lunch) { + lunchCount++; + } + + ExamApplicationJpaEntity examApp = examApplicationRepository.save( + ExamApplicationJpaEntity.create( + application.getId(), + user.getId(), + exam.getId(), + lunch + ) + ); + applied.add(examApp); + } + + for (ExamApplicationJpaEntity app : applied) { + Set subjects = new HashSet<>(); + while (subjects.size() < (random.nextBoolean() ? 2 : 1)) { + subjects.add(Subject.values()[random.nextInt(Subject.values().length)]); + } + subjects.forEach(subject -> examSubjectRepository.save( + new ExamSubjectJpaEntity(app.getId(), subject))); + } + + int baseTotal = switch (applyCount) { + case 1 -> 49_000; + case 2 -> 89_000; + case 3 -> 129_000; + default -> applyCount * BASE_EXAM_FEE; + }; + int total = baseTotal + (lunchCount * LUNCH_PRICE); + + for (ExamApplicationJpaEntity app : applied) { + paymentRepository.save(PaymentJpaEntity.of( + app.getId(), + application.getId(), + "pkey-" + UUID.randomUUID(), + "order-" + UUID.randomUUID().toString().substring(0, 12), + PaymentStatus.DONE, + PaymentAmountVO.of(total, total, total, 0, 0), + PaymentMethod.CARD + )); + counter++; + } + } + } + + private void createBoardItems(List users, Random random) { + UserJpaEntity admin = users.stream().filter(u -> u.getUserRole() == UserRole.ROLE_ADMIN) + .findFirst().orElse(users.get(0)); + + for (int i = 1; i <= 100; i++) { + noticeRepository.save(NoticeJpaEntity.builder() + .title("공지사항 " + i) + .content("제 " + i + "회 모의고사 공지") + .userId(admin.getId()) + .author(admin.getName()) + .build()); + + InquiryJpaEntity inquiry = inquiryRepository.save(InquiryJpaEntity.builder() + .title("문의합니다 " + i) + .content("내용입니다 " + i) + .userId(admin.getId()) + .author(admin.getName()) + .build()); + + if (random.nextBoolean()) { + inquiryAnswerRepository.save(InquiryAnswerJpaEntity.builder() + .title("Re: 문의합니다 " + i) + .content("답변드립니다.") + .inquiryId(inquiry.getId()) + .userId(admin.getId()) + .build()); + inquiry.updateStatusToComplete(); + inquiryRepository.save(inquiry); + } + + eventRepository.save(EventJpaEntity.builder() + .title("이벤트 " + i) + .duration(new DurationJpaVO(LocalDate.now().plusDays(i), + LocalDate.now().plusDays(i + 5))) + .eventLink("https://mosu.life/event/" + i) + .build()); + } + } + + private void createRefunds() { + List all = examApplicationRepository.findAll(); + for (ExamApplicationJpaEntity app : all) { + if (Math.random() < 0.3) { + refundRepository.save(RefundJpaEntity.of( + app.getId(), + "tranaction-key", + "단순 변심", + RefundStatus.DONE, + 49000, + 49000 + )); + } + } + } + + private void createRecommendations() { + recommendationRepository.saveAll(List.of( + RecommendationJpaEntity.builder() + .userId(1L) + .name("홍길동") + .phoneNumber("010-1234-5678") + .bank("신한") + .accountNumber("110-123-456789") + .build(), + RecommendationJpaEntity.builder() + .userId(2L) + .name("김철수") + .phoneNumber("010-9876-5432") + .bank("국민") + .accountNumber("123-456-789012") + .build() + )); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/initializer/UserAndProfileInitializer.java b/src/main/java/life/mosu/mosuserver/global/initializer/UserAndProfileInitializer.java deleted file mode 100644 index 1aef8164..00000000 --- a/src/main/java/life/mosu/mosuserver/global/initializer/UserAndProfileInitializer.java +++ /dev/null @@ -1,94 +0,0 @@ -package life.mosu.mosuserver.global.initializer; - -import static life.mosu.mosuserver.domain.user.UserRole.ROLE_ADMIN; -import static life.mosu.mosuserver.domain.user.UserRole.ROLE_USER; - -import jakarta.annotation.PostConstruct; -import java.time.LocalDate; -import java.util.ArrayList; -import java.util.List; -import java.util.Random; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.profile.Grade; -import life.mosu.mosuserver.domain.profile.ProfileJpaEntity; -import life.mosu.mosuserver.domain.profile.ProfileJpaRepository; -import life.mosu.mosuserver.domain.profile.SchoolInfoJpaVO; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import life.mosu.mosuserver.domain.user.UserJpaRepository; -import life.mosu.mosuserver.domain.user.UserRole; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.security.crypto.password.PasswordEncoder; -import org.springframework.stereotype.Component; - -@Slf4j -@Component -@RequiredArgsConstructor -public class UserAndProfileInitializer { - - private final UserJpaRepository userRepository; - private final ProfileJpaRepository profileRepository; - private final PasswordEncoder passwordEncoder; - - @PostConstruct - public void init() { - if (userRepository.count() > 0 || profileRepository.count() > 0) { - log.info("이미 더미 데이터가 존재하여 초기화를 건너뜝니다."); - return; - } - - List createdUsers = new ArrayList<>(); - Random random = new Random(); - - for (int i = 1; i <= 10; i++) { - String loginId = "user" + i; - String name = (i % 2 == 0) ? "김철수" + i : "이영희" + i; - Gender gender = (i % 2 == 0) ? Gender.MALE : Gender.FEMALE; - LocalDate birth = LocalDate.of(1990 + (i % 5), (i % 12) + 1, (i % 28) + 1); - String customerKey = "CK-" + i + "-" + System.currentTimeMillis(); - boolean agreedToMarketing = random.nextBoolean(); - UserRole userRole = (i == 1) ? ROLE_ADMIN : ROLE_USER; - - UserJpaEntity user = UserJpaEntity.builder() - .loginId(loginId) - .password(passwordEncoder.encode("password" + i + "!")) - .gender(gender) - .name(name) - .birth(birth) - .customerKey(customerKey) - .agreedToTermsOfService(true) - .agreedToPrivacyPolicy(true) - .agreedToMarketing(agreedToMarketing) - .userRole(userRole) - .build(); - - createdUsers.add(userRepository.save(user)); - - String phoneNumber = - "010-" + String.format("%04d", i) + "-" + String.format("%04d", i + 1000); - String email = "user" + i + "@example.com"; - Education education = Education.values()[random.nextInt(Education.values().length)]; - Grade grade = Grade.values()[random.nextInt(Grade.values().length)]; - SchoolInfoJpaVO schoolInfo = new SchoolInfoJpaVO(("모수대학교" + (i % 3 + 1)), "123-23", - "서울시 모수구 모수동"); - String recommenderPhoneNumber = (i % 3 == 0) ? "010-1234-5678" : null; - - ProfileJpaEntity profile = ProfileJpaEntity.builder() - .userId(user.getId()) - .userName(user.getName()) - .gender(user.getGender()) - .birth(user.getBirth()) - .phoneNumber(phoneNumber) - .email(email) - .education(education) - .schoolInfo(schoolInfo) - .grade(grade) - .build(); - - profile.registerRecommenderPhoneNumber(recommenderPhoneNumber); - - profileRepository.save(profile); - } - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/processor/StepProcessor.java b/src/main/java/life/mosu/mosuserver/global/processor/StepProcessor.java new file mode 100644 index 00000000..be6af7b5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/processor/StepProcessor.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.global.processor; + +public interface StepProcessor { + + RES process(REQ request); +} diff --git a/src/main/java/life/mosu/mosuserver/global/resolver/CursorArgumentResolver.java b/src/main/java/life/mosu/mosuserver/global/resolver/CursorArgumentResolver.java new file mode 100644 index 00000000..e0b77e65 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/resolver/CursorArgumentResolver.java @@ -0,0 +1,38 @@ +package life.mosu.mosuserver.global.resolver; + +import com.fasterxml.jackson.databind.ObjectMapper; +import life.mosu.mosuserver.global.annotation.CursorParam; +import life.mosu.mosuserver.global.support.Cursor; +import lombok.RequiredArgsConstructor; +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +@Component +@RequiredArgsConstructor +public class CursorArgumentResolver implements HandlerMethodArgumentResolver { + + private final ObjectMapper objectMapper; + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(CursorParam.class) && + parameter.getParameterType().equals(Cursor.class); + } + + @Override + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { + + String cursorJson = webRequest.getParameter("id"); + + if (cursorJson == null || cursorJson.isBlank()) { + return Cursor.empty(); + } + + return objectMapper.readValue(cursorJson, Cursor.class); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/resolver/PhoneNumberArgumentResolver.java b/src/main/java/life/mosu/mosuserver/global/resolver/PhoneNumberArgumentResolver.java new file mode 100644 index 00000000..08887c9c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/resolver/PhoneNumberArgumentResolver.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.global.resolver; + +import life.mosu.mosuserver.global.annotation.PhoneNumber; +import life.mosu.mosuserver.global.filter.KmcAuthenticationToken; +import lombok.extern.slf4j.Slf4j; +import org.springframework.core.MethodParameter; +import org.springframework.core.io.support.SpringFactoriesLoader.ArgumentResolver; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +@Slf4j +@Component +public class PhoneNumberArgumentResolver implements HandlerMethodArgumentResolver { + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(PhoneNumber.class) + && parameter.getParameterType().equals(String.class); + } + + @Override + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + if (authentication instanceof KmcAuthenticationToken kmcAuth) { + log.info("phone resolver 작동: {}", kmcAuth.getPhoneNumber()); + return kmcAuth.getPhoneNumber(); + } + throw new IllegalStateException("KmcAuthenticationToken not found in SecurityContext"); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/resolver/TokenResolver.java b/src/main/java/life/mosu/mosuserver/global/resolver/TokenResolver.java new file mode 100644 index 00000000..cfb25f2b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/resolver/TokenResolver.java @@ -0,0 +1,34 @@ +package life.mosu.mosuserver.global.resolver; + +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import life.mosu.mosuserver.global.cookie.TokenCookies; +import org.springframework.stereotype.Component; + +@Component +public class TokenResolver { + + public TokenCookies resolveTokens(final HttpServletRequest request) { + String accessToken = null; + String refreshToken = null; + + final Cookie[] cookies = request.getCookies(); + if (cookies == null) { + return new TokenCookies(null, null); + } + + for (final Cookie cookie : cookies) { + if (TokenCookies.ACCESS_TOKEN_NAME.equals(cookie.getName())) { + accessToken = cookie.getValue(); + } else if (TokenCookies.REFRESH_TOKEN_NAME.equals(cookie.getName())) { + refreshToken = cookie.getValue(); + } + + if (accessToken != null && refreshToken != null) { + break; + } + } + + return new TokenCookies(accessToken, refreshToken); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/resolver/UserIdArgumentResolver.java b/src/main/java/life/mosu/mosuserver/global/resolver/UserIdArgumentResolver.java index aaecdf61..83dccfba 100644 --- a/src/main/java/life/mosu/mosuserver/global/resolver/UserIdArgumentResolver.java +++ b/src/main/java/life/mosu/mosuserver/global/resolver/UserIdArgumentResolver.java @@ -1,11 +1,11 @@ package life.mosu.mosuserver.global.resolver; -import life.mosu.mosuserver.application.auth.AccessTokenService; import life.mosu.mosuserver.application.auth.PrincipalDetails; import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springframework.core.MethodParameter; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -15,12 +15,11 @@ import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.method.support.ModelAndViewContainer; +@Slf4j @Component @RequiredArgsConstructor public class UserIdArgumentResolver implements HandlerMethodArgumentResolver { - private final AccessTokenService accessTokenService; - @Override public boolean supportsParameter(final MethodParameter parameter) { return parameter.hasParameterAnnotation(UserId.class) && parameter.getParameterType() @@ -39,7 +38,6 @@ public Object resolveArgument(final MethodParameter parameter, } PrincipalDetails principal = (PrincipalDetails) authentication.getPrincipal(); - return principal.getId(); } } diff --git a/src/main/java/life/mosu/mosuserver/global/runner/ApplicationSchoolPreWarmRunner.java b/src/main/java/life/mosu/mosuserver/global/runner/ApplicationSchoolPreWarmRunner.java deleted file mode 100644 index 2f01d66f..00000000 --- a/src/main/java/life/mosu/mosuserver/global/runner/ApplicationSchoolPreWarmRunner.java +++ /dev/null @@ -1,19 +0,0 @@ -package life.mosu.mosuserver.global.runner; - -import life.mosu.mosuserver.application.school.SchoolQuotaCacheManager; -import lombok.RequiredArgsConstructor; -import org.springframework.boot.context.event.ApplicationReadyEvent; -import org.springframework.context.event.EventListener; -import org.springframework.stereotype.Component; - -@RequiredArgsConstructor -@Component -public class ApplicationSchoolPreWarmRunner { - - private final SchoolQuotaCacheManager schoolQuotaCacheManager; - - @EventListener(ApplicationReadyEvent.class) - public void preloadSchoolData() { - schoolQuotaCacheManager.preloadSchoolData(); - } -} diff --git a/src/main/java/life/mosu/mosuserver/global/scheduler/RollbackLogProcessor.java b/src/main/java/life/mosu/mosuserver/global/scheduler/RollbackLogProcessor.java new file mode 100644 index 00000000..f4d49cc1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/scheduler/RollbackLogProcessor.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.global.scheduler; + +import java.util.List; + +public interface RollbackLogProcessor { + + /** + * 어떤 도메인의 로그인지 구분용 이름 + */ + String getType(); + + /** + * 처리 가능한 실패 로그 조회 + */ + List findFailedLogs(); + + /** + * 후속 처리 (ex. 상태 복구, 알림, 정산 취소 등) + */ + void process(T rollbackLog); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/scheduler/RollbackLogScheduler.java b/src/main/java/life/mosu/mosuserver/global/scheduler/RollbackLogScheduler.java new file mode 100644 index 00000000..52534658 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/scheduler/RollbackLogScheduler.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.global.scheduler; + +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class RollbackLogScheduler { + + private final List> processors; + + @Scheduled(fixedDelay = 10_000) + public void processAllRollbackLogs() { + for (RollbackLogProcessor processor : processors) { + processLogs(processor); + } + } + + private void processLogs(RollbackLogProcessor processor) { + List logs = processor.findFailedLogs(); + for (T log : logs) { + processor.process(log); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/support/Cursor.java b/src/main/java/life/mosu/mosuserver/global/support/Cursor.java new file mode 100644 index 00000000..81e188d5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/support/Cursor.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.global.support; + +import com.fasterxml.jackson.annotation.JsonCreator; +import com.fasterxml.jackson.annotation.JsonProperty; +import lombok.EqualsAndHashCode; +import lombok.Getter; + +@Getter +@EqualsAndHashCode +public class Cursor { + + private final Long id; + + @JsonCreator + public Cursor(@JsonProperty("id") final Long id) { + this.id = id; + } + + public static Cursor empty() { + return new Cursor(null); + } + + public static Cursor of(final Long id) { + return new Cursor(id); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/global/support/CursorResponse.java b/src/main/java/life/mosu/mosuserver/global/support/CursorResponse.java new file mode 100644 index 00000000..6bdc481d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/support/CursorResponse.java @@ -0,0 +1,65 @@ +package life.mosu.mosuserver.global.support; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.Builder; +import lombok.Getter; +import org.springframework.data.domain.Slice; + +@Getter +@Schema(description = "커서 기반 응답") +public class CursorResponse { + + @Schema(description = "응답 본문 목록") + private final List content; + + @Schema(description = "페이지 정보") + private final SliceInfo sliceInfo; + + private CursorResponse(final List content, final SliceInfo sliceInfo) { + this.content = content; + this.sliceInfo = sliceInfo; + } + + public static CursorResponse of(final Slice slice, final Long cursor) { + SliceInfo pageInfo = SliceInfo.builder() + .numberOfElements(slice.getNumberOfElements()) + .last(slice.isLast()) + .nextCursor(cursor) + .build(); + return new CursorResponse<>(slice.getContent(), pageInfo); + } + + public static CursorResponse of( + final List content, + final boolean last, + final int numberOfElements, + final Long nextCursor + ) { + SliceInfo pageInfo = SliceInfo.builder() + .numberOfElements(numberOfElements) + .last(last) + .nextCursor(nextCursor) + .build(); + return new CursorResponse<>(content, pageInfo); + } + + @Schema(description = "커서 페이지네이션 정보") + public record SliceInfo( + + @Schema(description = "현재 응답 목록의 개수", example = "10") + int numberOfElements, + + @Schema(description = "마지막 페이지 여부", example = "false") + boolean last, + + @Schema(description = "다음 커서 ID", example = "123") + Long nextCursor + + ) { + + @Builder + public SliceInfo { + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/support/DomainArchiver.java b/src/main/java/life/mosu/mosuserver/global/support/DomainArchiver.java new file mode 100644 index 00000000..db8fe1d8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/support/DomainArchiver.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.global.support; + +public interface DomainArchiver { + + void archive(); + + String getName(); +} diff --git a/src/main/java/life/mosu/mosuserver/global/support/LogCleanup.java b/src/main/java/life/mosu/mosuserver/global/support/LogCleanup.java new file mode 100644 index 00000000..704cd3c3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/support/LogCleanup.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.global.support; + +import java.time.LocalDateTime; + +public interface LogCleanup { + + /** + * 지정된 기준 날짜보다 오래된 로그 데이터를 삭제한다. + * + * @param before 기준 날짜 + * @return 삭제된 로그 개수 + */ + int deleteLogsBefore(LocalDateTime before); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/support/NumberGenerator.java b/src/main/java/life/mosu/mosuserver/global/support/NumberGenerator.java new file mode 100644 index 00000000..b64c2740 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/support/NumberGenerator.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.global.support; + +public interface NumberGenerator { + + String generate(); +} diff --git a/src/main/java/life/mosu/mosuserver/global/support/SyncService.java b/src/main/java/life/mosu/mosuserver/global/support/SyncService.java new file mode 100644 index 00000000..36635fe8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/support/SyncService.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.global.support; + +public interface SyncService { + + void sync(T target); + + void rollbackQuota(T target); + +} diff --git a/src/main/java/life/mosu/mosuserver/global/tx/DefaultTxEventPublisher.java b/src/main/java/life/mosu/mosuserver/global/tx/DefaultTxEventPublisher.java new file mode 100644 index 00000000..6886b8d6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/tx/DefaultTxEventPublisher.java @@ -0,0 +1,18 @@ +package life.mosu.mosuserver.global.tx; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class DefaultTxEventPublisher implements TxEventPublisher { + + private final ApplicationEventPublisher publisher; + + @Override + public ApplicationEventPublisher publisher() { + return publisher; + } + +} diff --git a/src/main/java/life/mosu/mosuserver/global/tx/TxEvent.java b/src/main/java/life/mosu/mosuserver/global/tx/TxEvent.java new file mode 100644 index 00000000..8b5c73e5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/tx/TxEvent.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.global.tx; + +import lombok.Getter; + +@Getter +public abstract class TxEvent { + + private final boolean success; + private final T context; + + protected TxEvent(boolean success, T context) { + this.success = success; + this.context = context; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/tx/TxEventFactory.java b/src/main/java/life/mosu/mosuserver/global/tx/TxEventFactory.java new file mode 100644 index 00000000..ba57c80e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/tx/TxEventFactory.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.global.tx; + +public interface TxEventFactory { + + TxEvent create(T context); +} diff --git a/src/main/java/life/mosu/mosuserver/global/tx/TxEventPublisher.java b/src/main/java/life/mosu/mosuserver/global/tx/TxEventPublisher.java new file mode 100644 index 00000000..9dfa3a7c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/tx/TxEventPublisher.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.global.tx; + +import org.springframework.context.ApplicationEventPublisher; + +public interface TxEventPublisher { + + ApplicationEventPublisher publisher(); + + default > void publish(T event) { + publisher().publishEvent(event); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/tx/TxFailureHandler.java b/src/main/java/life/mosu/mosuserver/global/tx/TxFailureHandler.java new file mode 100644 index 00000000..1c3b0d99 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/tx/TxFailureHandler.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.global.tx; + +public interface TxFailureHandler { + + void handle(E event); +} diff --git a/src/main/java/life/mosu/mosuserver/global/util/CookieBuilderUtil.java b/src/main/java/life/mosu/mosuserver/global/util/CookieBuilderUtil.java new file mode 100644 index 00000000..2502b155 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/util/CookieBuilderUtil.java @@ -0,0 +1,169 @@ +package life.mosu.mosuserver.global.util; + +import jakarta.servlet.http.Cookie; +import lombok.experimental.UtilityClass; +import org.springframework.http.ResponseCookie; + +/** + * MOSU 표준 쿠키 MOSU 인증 인가에 사용되는 쿠키를 생성하는 유틸리티 클래스입니다. 각 배포 환경(local, develop, production)에 맞는 쿠키를 + * 생성하는 메서드를 제공합니다. + * + * @author Jihun Yu and Team Mosu + * @version 1.0 + */ +@UtilityClass +public class CookieBuilderUtil { + + public static final String ACCESS_TOKEN_COOKIE_NAME = "accessToken"; + public static final String REFRESH_TOKEN_COOKIE_NAME = "refreshToken"; + + /** + * [로컬 환경용] ResponseCookie 객체를 생성합니다. (Secure=false, SameSite=Lax) + * + * @param name 쿠키의 이름 (예: "accessToken") + * @param value 쿠키에 저장될 값 (예: JWT 토큰 문자열) + * @param maxAge 쿠키의 만료 시간 (단위: 초). 0으로 설정 시 즉시 삭제됩니다. + * @return ResponseCookie 객체 + */ + public static ResponseCookie createLocalResponseCookie(String name, String value, Long maxAge) { + return createBaseResponseCookieBuilder(name, value, maxAge) + .build(); + } + + /** + * [로컬 환경용] jakarta.servlet.Cookie 객체를 생성합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return jakarta.servlet.Cookie 객체 + */ + public static Cookie createLocalCookie(String name, String value, Long maxAge) { + return createBaseServletCookie(name, value, maxAge); + } + + /** + * [로컬 환경용] "Set-Cookie" 헤더 형식의 문자열을 생성합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return "Set-Cookie" 헤더 형식의 문자열 + */ + public static String createLocalCookieString(String name, String value, Long maxAge) { + return createLocalResponseCookie(name, value, maxAge).toString(); + } + + /** + * [개발 환경용] 크로스-도메인 ResponseCookie 객체를 생성합니다. (Secure=true, SameSite=None) + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return ResponseCookie 객체 + */ + public static ResponseCookie createDevelopResponseCookie(String name, String value, + Long maxAge) { + return createBaseResponseCookieBuilder(name, value, maxAge) + .secure(true) + .domain(".mosuedu.com") + .sameSite("None") + .build(); + } + + /** + * [개발 환경용] 크로스-도메인 jakarta.servlet.Cookie 객체를 생성합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return jakarta.servlet.Cookie 객체 + */ + public static Cookie createDevelopCookie(String name, String value, Long maxAge) { + Cookie cookie = createBaseServletCookie(name, value, maxAge); + cookie.setSecure(true); + cookie.setDomain(".mosuedu.com"); + return cookie; + } + + /** + * [개발 환경용] 크로스-도메인 "Set-Cookie" 헤더 형식의 문자열을 생성합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return "Set-Cookie" 헤더 형식의 문자열 + */ + public static String createDevelopCookieString(String name, String value, Long maxAge) { + return createDevelopResponseCookie(name, value, maxAge).toString(); + } + + /** + * [운영 환경용] ResponseCookie 객체를 생성합니다. + * TODO: 운영 배포 시, 최종 도메인 및 SameSite 정책을 확정해야 합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return ResponseCookie 객체 + */ + public static ResponseCookie createProductionResponseCookie(String name, String value, + Long maxAge) { + return createBaseResponseCookieBuilder(name, value, maxAge) + .secure(true) + .domain(".mosuedu.com") // TODO: 운영 도메인으로 변경 + .sameSite("None") // TODO: 운영 정책에 맞게 Strict 또는 Lax로 변경 고려 + .build(); + } + + /** + * [운영 환경용] jakarta.servlet.Cookie 객체를 생성합니다. + * TODO: 운영 배포 시, 최종 도메인 및 SameSite 정책을 확정해야 합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return jakarta.servlet.Cookie 객체 + */ + public static Cookie createProductionCookie(String name, String value, Long maxAge) { + Cookie cookie = createBaseServletCookie(name, value, maxAge); + cookie.setSecure(true); + cookie.setDomain("api.mosuedu.com"); // TODO: 운영 도메인으로 변경 + return cookie; + } + + /** + * [운영 환경용] "Set-Cookie" 헤더 형식의 문자열을 생성합니다. + * TODO: 운영 배포 시, 최종 도메인 및 SameSite 정책을 확정해야 합니다. + * + * @param name 쿠키의 이름 + * @param value 쿠키에 저장될 값 + * @param maxAge 쿠키의 만료 시간 (단위: 초) + * @return "Set-Cookie" 헤더 형식의 문자열 + */ + public static String createProductionCookieString(String name, String value, Long maxAge) { + return createProductionResponseCookie(name, value, maxAge).toString(); + } + + /** + * ResponseCookie의 기반이 되는 공통 속성을 설정하는 빌더를 생성합니다. + */ + private static ResponseCookie.ResponseCookieBuilder createBaseResponseCookieBuilder(String name, + String value, Long maxAge) { + return ResponseCookie.from(name, value) + .path("/") + .maxAge(maxAge) + .httpOnly(true); + } + + /** + * jakarta.servlet.Cookie의 기반이 되는 공통 속성을 설정하여 객체를 직접 생성합니다. + */ + private static Cookie createBaseServletCookie(String name, String value, Long maxAge) { + Cookie cookie = new Cookie(name, value); + cookie.setPath("/"); + cookie.setMaxAge(maxAge.intValue()); + cookie.setHttpOnly(true); + return cookie; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/util/EncodeUtil.java b/src/main/java/life/mosu/mosuserver/global/util/EncodeUtil.java index 59c8963b..f52df4f8 100644 --- a/src/main/java/life/mosu/mosuserver/global/util/EncodeUtil.java +++ b/src/main/java/life/mosu/mosuserver/global/util/EncodeUtil.java @@ -1,9 +1,63 @@ package life.mosu.mosuserver.global.util; +import java.net.URLDecoder; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import lombok.experimental.UtilityClass; import org.springframework.security.crypto.password.PasswordEncoder; +@UtilityClass public class EncodeUtil { + public static String passwordEncode(final PasswordEncoder encoder, final String password) { return encoder.encode(password); } + + /** + * Java에서 encodeURIComponent와 동일하게 동작 + */ + public static String encodeURIComponent(String value) { + try { + return URLEncoder.encode(value, StandardCharsets.UTF_8) + .replace("+", "%20") + .replace("%21", "!") + .replace("%27", "'") + .replace("%28", "(") + .replace("%29", ")") + .replace("%7E", "~"); + } catch (Exception e) { + return value; + } + } + + /** + * Java에서 encodeURI와 동일하게 동작 encodeURIComponent보다 덜 엄격 → URI에서 예약된 문자(: / ; ? @ & = + $ , #)는 + * 그대로 둠 + */ + public static String encodeURI(String value) { + return encodeURIComponent(value) + .replace("%3A", ":") + .replace("%2F", "/") + .replace("%3B", ";") + .replace("%3F", "?") + .replace("%40", "@") + .replace("%26", "&") + .replace("%3D", "=") + .replace("%2B", "+") + .replace("%24", "$") + .replace("%2C", ",") + .replace("%23", "#"); + } + + /** + * Java에서 decodeURIComponent와 동일하게 동작 + */ + public static String decodeURIComponent(String value) { + try { + return URLDecoder.decode(value, StandardCharsets.UTF_8); + } catch (Exception e) { + return value; + } + } + } diff --git a/src/main/java/life/mosu/mosuserver/global/util/IpUtil.java b/src/main/java/life/mosu/mosuserver/global/util/IpUtil.java new file mode 100644 index 00000000..7a62b56c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/util/IpUtil.java @@ -0,0 +1,48 @@ +package life.mosu.mosuserver.global.util; + +import jakarta.servlet.http.HttpServletRequest; +import java.net.InetAddress; +import java.net.UnknownHostException; +import lombok.experimental.UtilityClass; + +@UtilityClass +public class IpUtil { + + public static String getClientIp(HttpServletRequest request) throws UnknownHostException { + String ip = request.getHeader("X-Forwarded-For"); + + if (ip != null && ip.contains(",")) { + ip = ip.split(",")[0].trim(); + } + + if (isInvalidIp(ip)) { + ip = request.getHeader("Proxy-Client-IP"); + } + if (isInvalidIp(ip)) { + ip = request.getHeader("WL-Proxy-Client-IP"); + } + if (isInvalidIp(ip)) { + ip = request.getHeader("HTTP_CLIENT_IP"); + } + if (isInvalidIp(ip)) { + ip = request.getHeader("HTTP_X_FORWARDED_FOR"); + } + if (isInvalidIp(ip)) { + ip = request.getHeader("X-Real-IP"); + } + if (isInvalidIp(ip)) { + ip = request.getRemoteAddr(); + } + + if ("127.0.0.1".equals(ip) || "0:0:0:0:0:0:0:1".equals(ip)) { + InetAddress inetAddress = InetAddress.getLocalHost(); + ip = inetAddress.getHostName() + "/" + inetAddress.getHostAddress(); + } + + return ip; + } + + private static boolean isInvalidIp(String ip) { + return ip == null || ip.length() == 0 || "unknown".equalsIgnoreCase(ip); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/global/util/KeyGeneratorUtil.java b/src/main/java/life/mosu/mosuserver/global/util/KeyGeneratorUtil.java new file mode 100644 index 00000000..9bcebb1d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/util/KeyGeneratorUtil.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.global.util; + +import java.util.UUID; +import lombok.experimental.UtilityClass; + +@UtilityClass +public class KeyGeneratorUtil { + + public static String generateUUIDCustomerKey() { + return UUID.randomUUID().toString(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/util/PhoneNumberUtil.java b/src/main/java/life/mosu/mosuserver/global/util/PhoneNumberUtil.java new file mode 100644 index 00000000..3a3146eb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/global/util/PhoneNumberUtil.java @@ -0,0 +1,18 @@ +package life.mosu.mosuserver.global.util; + +import lombok.experimental.UtilityClass; + +@UtilityClass +public class PhoneNumberUtil { + + public static String formatPhoneNumberWithHyphen(String phoneNumber) { + if (phoneNumber == null || phoneNumber.length() != 11) { + throw new IllegalArgumentException("Invalid phone number format"); + } + + return String.format("%s-%s-%s", + phoneNumber.substring(0, 3), + phoneNumber.substring(3, 7), + phoneNumber.substring(7)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelFile.java b/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelFile.java index 871765ed..7df32a7c 100644 --- a/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelFile.java +++ b/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelFile.java @@ -21,11 +21,11 @@ public class SimpleExcelFile { private SXSSFWorkbook wb; private Sheet sheet; - private SimpleExcelMetadata excelMetaData; + private SimpleExcelMetadata excelMetaData; public SimpleExcelFile(List data, Class type) { this.wb = new SXSSFWorkbook(); - this.excelMetaData = new SimpleExcelMetadata(type); + this.excelMetaData = new SimpleExcelMetadata(type); renderExcel(data); } @@ -92,6 +92,6 @@ private void renderCellValue(Cell cell, Object cellValue) { public void write(OutputStream stream) throws IOException { wb.write(stream); wb.close(); - stream.close(); +// stream.close(); } } diff --git a/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelMetadata.java b/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelMetadata.java index 6596d0d0..ceadcf53 100644 --- a/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelMetadata.java +++ b/src/main/java/life/mosu/mosuserver/global/util/excel/SimpleExcelMetadata.java @@ -6,9 +6,11 @@ import java.util.Map; import java.util.stream.Collectors; import life.mosu.mosuserver.global.annotation.ExcelColumn; +import lombok.Getter; public class SimpleExcelMetadata { + @Getter private final List dataFieldNames; private final Map excelHeaderNames; @@ -17,10 +19,6 @@ public SimpleExcelMetadata(Class type) { this.excelHeaderNames = extractHeaderNames(type); } - public List getDataFieldNames() { - return dataFieldNames; - } - public String getExcelHeaderName(String fieldName) { return excelHeaderNames.getOrDefault(fieldName, fieldName); } diff --git a/src/main/java/life/mosu/mosuserver/infra/config/ArchivingOrchestratorCronConfig.java b/src/main/java/life/mosu/mosuserver/infra/config/ArchivingOrchestratorCronConfig.java new file mode 100644 index 00000000..d20eaff2 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/config/ArchivingOrchestratorCronConfig.java @@ -0,0 +1,76 @@ +package life.mosu.mosuserver.infra.config; + +import life.mosu.mosuserver.infra.cron.ArchivingOrchestratorJob; +import life.mosu.mosuserver.infra.cron.LogCleanupJob; +import life.mosu.mosuserver.infra.cron.di.AutowiringSpringBeanJobFactory; +import lombok.RequiredArgsConstructor; +import org.quartz.CronScheduleBuilder; +import org.quartz.JobBuilder; +import org.quartz.JobDetail; +import org.quartz.Trigger; +import org.quartz.TriggerBuilder; +import org.springframework.beans.factory.config.AutowireCapableBeanFactory; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.quartz.SchedulerFactoryBean; + +@Configuration +@RequiredArgsConstructor +public class ArchivingOrchestratorCronConfig { + + private final AutowireCapableBeanFactory beanFactory; + + @Bean + public JobDetail starvationCleanUpJobDetail() { + return JobBuilder.newJob(ArchivingOrchestratorJob.class) + .withIdentity("starvationCleanupJob") + .storeDurably() + .build(); + } + + @Bean + public Trigger starvationCleanupTrigger(JobDetail starvationCleanUpJobDetail) { + return TriggerBuilder.newTrigger() + .forJob(starvationCleanUpJobDetail) + .withIdentity("starvationCleanupTrigger") + .withSchedule(CronScheduleBuilder.cronSchedule("0 0/30 2-5 * * ?")) +// .withSchedule(CronScheduleBuilder.cronSchedule("0/10 * * * * ?")) + .build(); + } + + @Bean + public JobDetail logCleanupJobDetail() { + return JobBuilder.newJob(LogCleanupJob.class) + .withIdentity("logCleanupJob") + .storeDurably() + .build(); + } + + @Bean + public Trigger logCleanupTrigger(JobDetail logCleanupJobDetail) { + return TriggerBuilder.newTrigger() + .forJob(logCleanupJobDetail) + .withIdentity("logCleanupTrigger") + .withSchedule(CronScheduleBuilder.cronSchedule("0 0 3 1 1/3 ?")) // 매 3개월마다 1일 03시 + .build(); + } + + @Bean + public AutowiringSpringBeanJobFactory springBeanJobFactory() { + return new AutowiringSpringBeanJobFactory(beanFactory); + } + + @Bean + public SchedulerFactoryBean schedulerFactoryBean( + Trigger starvationCleanupTrigger, + Trigger logCleanupTrigger, + JobDetail starvationCleanUpJobDetail, + JobDetail logCleanupJobDetail + ) { + SchedulerFactoryBean factory = new SchedulerFactoryBean(); + factory.setJobFactory(springBeanJobFactory()); + factory.setJobDetails(starvationCleanUpJobDetail, logCleanupJobDetail); + factory.setTriggers(starvationCleanupTrigger, logCleanupTrigger); + return factory; + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/config/MailConfig.java b/src/main/java/life/mosu/mosuserver/infra/config/MailConfig.java new file mode 100644 index 00000000..c68a6126 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/config/MailConfig.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.infra.config; + +import java.util.Properties; +import life.mosu.mosuserver.infra.notify.property.MailProperties; +import life.mosu.mosuserver.infra.notify.property.MailProperties.MailSmtp; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.JavaMailSenderImpl; + +@Configuration +@RequiredArgsConstructor +public class MailConfig { + + private final MailProperties properties; + + @Bean + public JavaMailSender javaMailSender() { + JavaMailSenderImpl sender = new JavaMailSenderImpl(); + sender.setHost(properties.getHost()); + sender.setUsername(properties.getUsername()); + sender.setPassword(properties.getPassword()); + sender.setPort(properties.getPort()); + sender.setDefaultEncoding("UTF-8"); + + MailSmtp smtpProperties = properties.getProperties().getSmtp(); + Properties props = sender.getJavaMailProperties(); + props.put("mail.smtp.auth", smtpProperties.isAuth()); + props.put("mail.smtp.debug", smtpProperties.isDebug()); + props.put("mail.smtp.connectiontimeout", smtpProperties.getConnectiontimeout()); + props.put("mail.smtp.starttls.enable", smtpProperties.getStarttls().isEnable()); + + return sender; + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/config/SwaggerConfig.java b/src/main/java/life/mosu/mosuserver/infra/config/SwaggerConfig.java index 5ab77fdb..543abcd5 100644 --- a/src/main/java/life/mosu/mosuserver/infra/config/SwaggerConfig.java +++ b/src/main/java/life/mosu/mosuserver/infra/config/SwaggerConfig.java @@ -2,17 +2,46 @@ import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import java.util.List; +import org.springframework.boot.actuate.endpoint.web.annotation.WebEndpoint; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @Configuration public class SwaggerConfig { + private final List servers = List.of( + new Server().url("https://api.mosuedu.com/api/v1") + .description("MOSU SERVER"), + new Server().url("http://localhost:8080/api/v1") + .description("Local Development Server"), + new Server().url("http://192.168.35.174:8080/api/v1") + .description("Custom Development Server") + ); @Bean - public OpenAPI customOpenAPI() { + public SecurityScheme securityScheme(){ + return new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .in(SecurityScheme.In.HEADER) + .name("Authorization"); + } + @Bean + public SecurityRequirement securityRequirement() { + return new SecurityRequirement().addList("BearerAuth"); + } + @Bean + public OpenAPI customOpenAPI(SecurityScheme securityScheme,SecurityRequirement securityRequirement) { + return new OpenAPI() - .info(new Info() - .title("MOSU API 문서") - .version("1.0.0") - ); + .info(new Info() + .title("MOSU API 문서") + .version("1.0.0") + ).servers(servers) + .addSecurityItem(securityRequirement) + .schemaRequirement("BearerAuth", securityScheme); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/config/TossPaymentConfig.java b/src/main/java/life/mosu/mosuserver/infra/config/TossPaymentConfig.java index 91a28289..8cc8f955 100644 --- a/src/main/java/life/mosu/mosuserver/infra/config/TossPaymentConfig.java +++ b/src/main/java/life/mosu/mosuserver/infra/config/TossPaymentConfig.java @@ -3,7 +3,7 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.List; -import life.mosu.mosuserver.infra.payment.TossPaymentErrorHandler; +import life.mosu.mosuserver.infra.toss.TossPaymentErrorHandler; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -14,11 +14,12 @@ @Configuration public class TossPaymentConfig { + @Value("${toss.secret-key}") private String secretKey; @Bean - public RestOperations tossPaymentRestTemplate(TossPaymentErrorHandler tossPaymentErrorHandler){ + public RestOperations tossPaymentRestTemplate(TossPaymentErrorHandler tossPaymentErrorHandler) { RestTemplate restTemplate = new RestTemplate(); String encoded = Base64.getEncoder() diff --git a/src/main/java/life/mosu/mosuserver/infra/cron/ArchivingOrchestratorJob.java b/src/main/java/life/mosu/mosuserver/infra/cron/ArchivingOrchestratorJob.java new file mode 100644 index 00000000..8ec20eee --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/cron/ArchivingOrchestratorJob.java @@ -0,0 +1,66 @@ +package life.mosu.mosuserver.infra.cron; + +import jakarta.annotation.PreDestroy; +import java.util.List; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; +import life.mosu.mosuserver.global.support.DomainArchiver; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.quartz.JobExecutionException; +import org.springframework.stereotype.Component; + + +@Component +@RequiredArgsConstructor +@Slf4j +public class ArchivingOrchestratorJob implements Job { + + private static final int corePoolSize = 2; + private final List domainArchivers; + private final ScheduledExecutorService executor = Executors.newScheduledThreadPool( + corePoolSize, + runnable -> { + Thread t = new Thread(runnable, "archiving-orchestrator"); + t.setDaemon(true); + return t; + }); + + @Override + public void execute(JobExecutionContext ctx) throws JobExecutionException { + if (domainArchivers == null || domainArchivers.isEmpty()) { + log.info("No domain archivers configured, skipping execution"); + return; + } + + for (int i = 0; i < domainArchivers.size(); ++i) { + DomainArchiver archiver = domainArchivers.get(i); + long delayMinutes = i * 10L; + log.info("Scheduling {} to run in {} minutes", archiver.getName(), delayMinutes); + executor.schedule(() -> { + try { + archiver.archive(); + log.debug("Archiving completed for {}", archiver.getName()); + } catch (Exception e) { + log.error("Archiving failed for {}", archiver.getName(), e); + } + }, delayMinutes, TimeUnit.SECONDS); // 10초 간격으로 시간차 줌 (Schedule 무시 될 때도 있음) + } + } + + @PreDestroy + public void shutdown() { + executor.shutdown(); + try { + if (!executor.awaitTermination(60, TimeUnit.SECONDS)) { + executor.shutdownNow(); + } + } catch (InterruptedException e) { + executor.shutdownNow(); + Thread.currentThread().interrupt(); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/cron/LogCleanupJob.java b/src/main/java/life/mosu/mosuserver/infra/cron/LogCleanupJob.java new file mode 100644 index 00000000..e8b50275 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/cron/LogCleanupJob.java @@ -0,0 +1,35 @@ +package life.mosu.mosuserver.infra.cron; + + +import java.time.LocalDateTime; +import java.util.List; +import life.mosu.mosuserver.global.support.LogCleanup; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.quartz.Job; +import org.quartz.JobExecutionContext; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class LogCleanupJob implements Job { + + //추가 분리 + private final List cleanups; + + @Override + public void execute(JobExecutionContext context) { + LocalDateTime threshold = LocalDateTime.now().minusMonths(3); + for (LogCleanup cleanup : cleanups) { + try { + int deleted = cleanup.deleteLogsBefore(threshold); + log.info("[LogCleanupJob] Deleted total {} logs older than {}", deleted, threshold); + } catch (Exception e) { + log.error("[LogCleanupJob] Error during log cleanup: {}", + cleanup.getClass().getSimpleName(), e); + } + } + + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/cron/di/AutowiringSpringBeanJobFactory.java b/src/main/java/life/mosu/mosuserver/infra/cron/di/AutowiringSpringBeanJobFactory.java new file mode 100644 index 00000000..643b3045 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/cron/di/AutowiringSpringBeanJobFactory.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.infra.cron.di; + +import lombok.RequiredArgsConstructor; +import org.quartz.spi.TriggerFiredBundle; +import org.springframework.beans.factory.config.AutowireCapableBeanFactory; +import org.springframework.scheduling.quartz.SpringBeanJobFactory; + +@RequiredArgsConstructor +public class AutowiringSpringBeanJobFactory extends SpringBeanJobFactory { + + private final AutowireCapableBeanFactory beanFactory; + + @Override + protected Object createJobInstance(TriggerFiredBundle bundle) throws Exception { + Object jobInstance = super.createJobInstance(bundle); + beanFactory.autowireBean(jobInstance); // Spring DI 적용 + return jobInstance; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/KmcAuthController.java b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcAuthController.java new file mode 100644 index 00000000..89403a30 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcAuthController.java @@ -0,0 +1,48 @@ +package life.mosu.mosuserver.infra.kmc; + +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.infra.kmc.dto.KmcCertRequest; +import life.mosu.mosuserver.infra.kmc.dto.KmcCertResponse; +import life.mosu.mosuserver.infra.kmc.dto.KmcResultCallbackRequest; +import life.mosu.mosuserver.infra.kmc.dto.KmcResultCallbackResponse; +import life.mosu.mosuserver.infra.kmc.dto.KmcUserInfo; +import life.mosu.mosuserver.infra.kmc.dto.KmcVerificationRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/kmc") +@RequiredArgsConstructor +public class KmcAuthController { + + private final KmcService kmcService; + + @PostMapping("/confirm") + public ResponseEntity> handleKmcResult( + @RequestBody KmcCertRequest request + ) { + KmcCertResponse response = kmcService.createCertRequest(request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "성공", response)); + } + + @PostMapping("/decrypt") + public ResponseEntity> tokenDecrypt( + @RequestBody KmcResultCallbackRequest request + ) { + KmcResultCallbackResponse response = kmcService.tokenDecrypt(request.apiToken()); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "성공", response)); + } + + @PostMapping("/verification") + public ResponseEntity> decryptKmcInitData( + @RequestBody KmcVerificationRequest request + ) { + KmcUserInfo response = kmcService.processVerificationResult(request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "성공", response)); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/KmcCryptoManager.java b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcCryptoManager.java new file mode 100644 index 00000000..73cb2a90 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcCryptoManager.java @@ -0,0 +1,62 @@ +package life.mosu.mosuserver.infra.kmc; + +import com.icert.comm.secu.IcertSecuManager; +import java.text.SimpleDateFormat; +import java.util.Date; +import life.mosu.mosuserver.infra.kmc.dto.KmcCertRequest; +import life.mosu.mosuserver.infra.kmc.property.KmcProperties; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class KmcCryptoManager { + + private static final String EXTEND_VAR = "0000000000000000"; + private static final String DELIMITER = "/"; + private final KmcProperties kmcProperties; + private final IcertSecuManager secuManager; + + public String encryptRequestData(KmcCertRequest request, String certNum) { + String currentDate = new SimpleDateFormat("yyyyMMddHHmmss").format(new Date()); + String plusInfo = request.plusInfo(); + String rawData = String.join( + DELIMITER, + kmcProperties.getCpId(), + kmcProperties.getUrlCode(), + certNum, + currentDate, + "M", + "", "", "", "", "", "", + plusInfo, EXTEND_VAR + ); + log.info("Raw tr_cert data for encryption: {}", rawData); + + String enc_tr_cert_1 = secuManager.getEnc(rawData, ""); + String hmacMsg = secuManager.getMsg(enc_tr_cert_1); + return secuManager.getEnc(enc_tr_cert_1 + DELIMITER + hmacMsg + DELIMITER + EXTEND_VAR, ""); + } + + public String decryptResponseData(String recCert) { + try { + String firstDecrypted = decrypt(recCert); + int firstIdx = firstDecrypted.indexOf(DELIMITER); + String encPara = firstDecrypted.substring(0, firstIdx); + String receivedHmac = firstDecrypted.substring(firstIdx + 1, + firstDecrypted.lastIndexOf(DELIMITER)); + String generatedHmac = secuManager.getMsg(encPara); + if (!generatedHmac.equals(receivedHmac)) { + throw new SecurityException("KMC 데이터의 위변조가 의심됩니다."); + } + return decrypt(encPara); + } catch (Exception e) { + throw new RuntimeException("KMC 인증 결과를 처리하는 중 오류가 발생했습니다.", e); + } + } + + public String decrypt(String encryptedData) { + return secuManager.getDec(encryptedData, ""); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/KmcDataMapper.java b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcDataMapper.java new file mode 100644 index 00000000..1cf3ef75 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcDataMapper.java @@ -0,0 +1,62 @@ +package life.mosu.mosuserver.infra.kmc; + +import static life.mosu.mosuserver.global.util.EncodeUtil.decodeURIComponent; + +import com.fasterxml.jackson.databind.ObjectMapper; +import life.mosu.mosuserver.application.auth.provider.OneTimeTokenProvider; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.kmc.dto.KmcPlusInfo; +import life.mosu.mosuserver.infra.kmc.dto.KmcUserInfo; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class KmcDataMapper { + + private static final String DELIMITER = "/"; + private static final int MIN_FIELD_COUNT = 18; + private static final int CERT_NUM_INDEX = 0; + private static final int PHONE_NO_INDEX = 3; + private static final int BIRTH_INDEX = 5; + private static final int GENDER_INDEX = 6; + private static final int NAME_INDEX = 8; + private static final int RESULT_SUCCESS_INDEX = 9; // 성공여부 + private static final int PLUS_INFO_INDEX = 16; + private final OneTimeTokenProvider tokenProvider; + private final ObjectMapper objectMapper; + + /** + * 복호화된 KMC 최종 데이터 문자열을 KmcUserInfo DTO로 변환합니다. + */ + public KmcUserInfo mapToUserInfo(String finalDecryptedData) { + String[] tokens = finalDecryptedData.split(DELIMITER, -1); + if (tokens.length < MIN_FIELD_COUNT) { + throw new CustomRuntimeException(ErrorCode.INVALID_TOKEN); + } + + if (!tokens[RESULT_SUCCESS_INDEX].equals("Y")) { + throw new CustomRuntimeException(ErrorCode.VERIFICATION_FAILED); + } + + String name = tokens[NAME_INDEX]; + String birth = tokens[BIRTH_INDEX]; + String phoneNo = tokens[PHONE_NO_INDEX]; + String gender = tokens[GENDER_INDEX]; + String token = tokenProvider.generateOneTimeToken(tokens[CERT_NUM_INDEX], phoneNo); + + String encodedPlusInfo = tokens[PLUS_INFO_INDEX]; + + KmcPlusInfo plusInfo = KmcPlusInfo.parse(decodeURIComponent(encodedPlusInfo), objectMapper); + + return KmcUserInfo.of( + name, + birth, + phoneNo, + gender, + token, + plusInfo + ); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/KmcService.java b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcService.java new file mode 100644 index 00000000..29197d3d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/KmcService.java @@ -0,0 +1,82 @@ +package life.mosu.mosuserver.infra.kmc; + +import java.util.Objects; +import java.util.UUID; +import life.mosu.mosuserver.application.auth.kmc.KmcEventTxService; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.repository.UserJpaRepository; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.kmc.dto.KmcCertRequest; +import life.mosu.mosuserver.infra.kmc.dto.KmcCertResponse; +import life.mosu.mosuserver.infra.kmc.dto.KmcResultCallbackResponse; +import life.mosu.mosuserver.infra.kmc.dto.KmcUserInfo; +import life.mosu.mosuserver.infra.kmc.dto.KmcVerificationRequest; +import life.mosu.mosuserver.infra.kmc.property.KmcProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class KmcService { + + private final KmcEventTxService eventTxService; + private final KmcProperties kmcProperties; + private final KmcCryptoManager kmcCryptoManager; + private final KmcDataMapper kmcDataMapper; + private final UserJpaRepository userJpaRepository; + + /** + * KMC 본인인증 요청 데이터를 생성합니다. + */ + public KmcCertResponse createCertRequest(KmcCertRequest request) { + String certNum = UUID.randomUUID().toString().replace("-", ""); + try { + + String encryptedTrCert = kmcCryptoManager.encryptRequestData(request, certNum); + + eventTxService.publishIssueEvent(certNum, kmcProperties.getExpireTime()); + + return KmcCertResponse.from(encryptedTrCert); + } catch (Exception ex) { + eventTxService.publishFailureEvent(certNum); + throw new RuntimeException("KMC 인증 요청 생성에 실패했습니다.", ex); + } + } + + /** + * 수신된 최종 암호화 데이터(recCert)를 처리하여 사용자 정보를 반환합니다. + */ + public KmcUserInfo processVerificationResult(KmcVerificationRequest request) { + + String finalDecryptedData = kmcCryptoManager.decryptResponseData(request.apiRecCert()); + + KmcUserInfo userInfo = kmcDataMapper.mapToUserInfo(finalDecryptedData); + + if (Objects.equals(userInfo.plusInfo().redirect(), "password")) { + validateUser(userInfo); + } + + return userInfo; + } + + /** + * KMC Api Token을 복호화하는 메소드 (CryptoManager에 위임) + */ + public KmcResultCallbackResponse tokenDecrypt(String encryptedToken) { + String decryptedToken = kmcCryptoManager.decrypt(encryptedToken); + return new KmcResultCallbackResponse(decryptedToken); + } + + private void validateUser(KmcUserInfo userInfo) { + UserJpaEntity user = userJpaRepository.findByLoginId(userInfo.plusInfo().loginId()) + .orElseThrow(() -> new CustomRuntimeException(ErrorCode.USER_NOT_FOUND)); + + if (!Objects.equals( + user.getPhoneNumber().replace("-", ""), + userInfo.phoneNumber() + )) { + throw new CustomRuntimeException(ErrorCode.USER_INFO_INVALID); + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcApiRequest.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcApiRequest.java new file mode 100644 index 00000000..bf68ba83 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcApiRequest.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +public record KmcApiRequest( + String apiToken, + String apiDate +) {} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcCertRequest.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcCertRequest.java new file mode 100644 index 00000000..4b68c022 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcCertRequest.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +import static life.mosu.mosuserver.global.util.EncodeUtil.encodeURIComponent; + +/** + * KMC 인증 요청 DTO + *

+ * KMC 인증 요청에 필요한 추가 정보를 담는 DTO입니다. + *

+ * + * @param plusInfo 추가 정보 {redirect, loginId, serviceTerm} + */ +public record KmcCertRequest( + String plusInfo +) { + public static KmcCertRequest of(String plusInfo) { + return new KmcCertRequest(encodeURIComponent(plusInfo)); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcCertResponse.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcCertResponse.java new file mode 100644 index 00000000..8b0f63bb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcCertResponse.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +public record KmcCertResponse( + String tr_cert +) { + + public static KmcCertResponse from(String trCert) { + return new KmcCertResponse(trCert); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcPlusInfo.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcPlusInfo.java new file mode 100644 index 00000000..9b9b7a31 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcPlusInfo.java @@ -0,0 +1,20 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +import com.fasterxml.jackson.databind.ObjectMapper; +import lombok.extern.slf4j.Slf4j; + +@Slf4j +public record KmcPlusInfo( + String redirect, + String loginId, + String serviceTerm +) { + public static KmcPlusInfo parse(String json, ObjectMapper objectMapper) { + try { + return objectMapper.readValue(json, KmcPlusInfo.class); + } catch (Exception e) { + log.error("Failed to parse KmcPlusInfo from JSON: {}", json, e); + throw new RuntimeException("Failed to parse KmcPlusInfo", e); + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcResultCallbackRequest.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcResultCallbackRequest.java new file mode 100644 index 00000000..8bb5a7ab --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcResultCallbackRequest.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +public record KmcResultCallbackRequest( + String apiToken +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcResultCallbackResponse.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcResultCallbackResponse.java new file mode 100644 index 00000000..1625264a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcResultCallbackResponse.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +public record KmcResultCallbackResponse( + String token +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcUserInfo.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcUserInfo.java new file mode 100644 index 00000000..3ea9f595 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcUserInfo.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import java.util.Objects; + +@JsonSerialize(using = KmcUserInfoSerializer.class) +public record KmcUserInfo( + String name, + String birth, + String phoneNumber, + String gender, + String token, + KmcPlusInfo plusInfo +) { + public static KmcUserInfo of( + String name, + String birth, + String phoneNumber, + String gender, + String token, + KmcPlusInfo plusInfo + ) { + return new KmcUserInfo( + name, + birth, + phoneNumber, + parseGender(gender), + token, + plusInfo + ); + } + + private static String parseGender(String gender) { + return Objects.equals(gender, "0") ? "남자" : "여자"; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcUserInfoSerializer.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcUserInfoSerializer.java new file mode 100644 index 00000000..90905ab5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcUserInfoSerializer.java @@ -0,0 +1,43 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.ser.std.StdSerializer; + +import java.io.IOException; +import org.springframework.boot.jackson.JsonComponent; + +@JsonComponent +public class KmcUserInfoSerializer extends StdSerializer { + + public KmcUserInfoSerializer() { + this(null); + } + + public KmcUserInfoSerializer(Class t) { + super(t); + } + + @Override + public void serialize(KmcUserInfo value, JsonGenerator gen, SerializerProvider provider) throws IOException { + gen.writeStartObject(); + + gen.writeStringField("redirect", value.plusInfo().redirect()); + gen.writeStringField("token", value.token()); + + switch (value.plusInfo().redirect()) { + case "signup" -> { + gen.writeStringField("serviceTerm", value.plusInfo().serviceTerm()); + gen.writeStringField("name", value.name()); + gen.writeStringField("birth", value.birth()); + gen.writeStringField("phoneNumber", value.phoneNumber()); + gen.writeStringField("gender", value.gender()); + } + case "password" -> {} + default -> { + } + } + + gen.writeEndObject(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcVerificationRequest.java b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcVerificationRequest.java new file mode 100644 index 00000000..7f7f3060 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/dto/KmcVerificationRequest.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.infra.kmc.dto; + +public record KmcVerificationRequest( + String resultCode, + String apiRecCert, + String apiCertNum +) {} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/legacy/KmcMvcController.java b/src/main/java/life/mosu/mosuserver/infra/kmc/legacy/KmcMvcController.java new file mode 100644 index 00000000..17404255 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/legacy/KmcMvcController.java @@ -0,0 +1,79 @@ +package life.mosu.mosuserver.infra.kmc.legacy; + +import static life.mosu.mosuserver.global.util.EncodeUtil.decodeURIComponent; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import life.mosu.mosuserver.infra.kmc.KmcService; +import life.mosu.mosuserver.infra.kmc.dto.KmcCertRequest; +import life.mosu.mosuserver.infra.kmc.dto.KmcPlusInfo; +import life.mosu.mosuserver.infra.kmc.dto.KmcUserInfo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Controller; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Slf4j +@Controller +@RequestMapping("/kmc") // URL 경로를 /kmc로 통일 +@RequiredArgsConstructor +public class KmcMvcController { + + private final LegacyService legacyService; + private final KmcService kmcService; + private final ObjectMapper objectMapper; + + /** + * 인증 요청 페이지를 렌더링하고, KMC로 보낼 암호화 데이터를 생성 + */ + @GetMapping("/req") + public String getKmcPage(Model model) { + // 서비스 로직을 통해 암호화된 tr_cert 생성 + + KmcCertRequest request = KmcCertRequest.of("{\"redirect\":\"password\",\"loginId\":\"userid1\",\"serviceTerm\":\"null\"}"); + String decodePlusInfo = decodeURIComponent(request.plusInfo()); + + log.info("복호화 성공!:" + decodePlusInfo); + try { + KmcPlusInfo plusInfo = objectMapper.readValue(decodePlusInfo, KmcPlusInfo.class); + log.info("파싱 성공: {}", plusInfo); + } catch (JsonProcessingException e) { + log.error("JSON 파싱 실패", e); + } + + + String cert = kmcService.createCertRequest(request).tr_cert(); + + model.addAttribute("tr_cert", cert); + model.addAttribute("tr_url", "http://localhost:8080/api/v1/kmc/tr-url"); + model.addAttribute("tr_ver", "V2"); + + return "step2"; // step2.jsp 렌더링 + } + + /** + * KMC가 tr_url로 리디렉션할 때 호출되는 콜백 메소드 + */ + @PostMapping("/tr-url") + public String handleKmcResult( + @RequestParam("apiToken") String apiToken, + @RequestParam("certNum") String apiCertNum, + Model model + ) { + log.info("KMC 콜백 수신 성공! apiToken:{}, apiCertNum:{}", apiToken, apiCertNum); + + try { + // 토큰 검증 및 사용자 정보 조회 로직 + KmcUserInfo userInfo = legacyService.validateTokenAndGetResult(apiToken, apiCertNum); + model.addAttribute("userInfo", userInfo); + return "success"; // 성공 시 보여줄 JSP 페이지 + } catch (Exception e) { + model.addAttribute("errorMessage", e.getMessage()); + return "error"; // 실패 시 보여줄 JSP 페이지 + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/legacy/LegacyService.java b/src/main/java/life/mosu/mosuserver/infra/kmc/legacy/LegacyService.java new file mode 100644 index 00000000..6f951bf0 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/legacy/LegacyService.java @@ -0,0 +1,73 @@ +package life.mosu.mosuserver.infra.kmc.legacy; + +import com.icert.comm.secu.IcertSecuManager; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import life.mosu.mosuserver.infra.kmc.KmcService; +import life.mosu.mosuserver.infra.kmc.dto.KmcApiRequest; +import life.mosu.mosuserver.infra.kmc.dto.KmcUserInfo; +import life.mosu.mosuserver.infra.kmc.dto.KmcVerificationRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Service; +import org.springframework.web.reactive.function.client.WebClient; + +@Slf4j +@Service +@RequiredArgsConstructor +public class LegacyService { + + private final IcertSecuManager seed; + private final KmcService kmcService; + private final WebClient webClient = WebClient.builder() + .baseUrl("https://www.kmcert.com/kmcis/api") + .build(); + + /** + * KMC 콜백 수신 후, 토큰을 검증하고 최종 사용자 정보를 복호화하여 반환하는 통합 메소드 + * @param encryptedApiToken KMC로부터 받은 암호화된 API 토큰 + * @param apiCertNum KMC로부터 받은 요청 번호 (현재 로직에서는 사용되지 않음) + * @return 복호화된 사용자 정보가 담긴 DTO + */ + public KmcUserInfo validateTokenAndGetResult(String encryptedApiToken, String apiCertNum) { + log.info("[KMCIS] 토큰 검증 및 결과 복호화를 시작합니다. certNum: {}", apiCertNum); + + // 1. KMC 토큰 검증 API 호출 + KmcVerificationRequest apiResponse = callTokenValidationApi(encryptedApiToken); + + // 2. API 응답 코드 확인 + if (!"APR01".equals(apiResponse.resultCode())) { + log.error("❌ KMC 토큰 검증 실패. 응답 코드: {}", apiResponse.resultCode()); + throw new RuntimeException("KMC 본인인증에 실패했습니다. (오류코드: " + apiResponse.resultCode() + ")"); + } + log.info("✅ 토큰 검증 성공 (APR01). 최종 데이터 복호화를 진행합니다."); + + // 3. 최종 데이터(rec_cert) 복호화 + return kmcService.processVerificationResult(apiResponse); + } + + /** + * KMC 토큰 검증 API를 호출하는 내부 메소드 + */ + public KmcVerificationRequest callTokenValidationApi(String encryptedApiToken) { + + String apiToken = seed.getDec(encryptedApiToken, ""); + String apiDate = DateTimeFormatter.ofPattern("yyyyMMddHHmmss").format(LocalDateTime.now()); + KmcApiRequest requestPayload = new KmcApiRequest(apiToken, apiDate); + + log.info("apiToken: {}, apiDate: {}", requestPayload.apiToken(), requestPayload.apiDate()); + try { + return webClient.post() + .uri("/kmcisToken_api.jsp") + .contentType(MediaType.APPLICATION_JSON) + .bodyValue(requestPayload) + .retrieve() + .bodyToMono(KmcVerificationRequest.class) + .block(); + } catch (Exception e) { + log.error("❌ 토큰 검증 API 호출 중 예외 발생", e); + throw new RuntimeException("KMC 서버와 통신 중 오류가 발생했습니다.", e); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/kmc/property/KmcProperties.java b/src/main/java/life/mosu/mosuserver/infra/kmc/property/KmcProperties.java new file mode 100644 index 00000000..8199e2c1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/kmc/property/KmcProperties.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.infra.kmc.property; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "kmc") +public class KmcProperties { + + private String cpId; + private String urlCode; + private Long expireTime; +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/DiscordNotifier.java b/src/main/java/life/mosu/mosuserver/infra/notify/DiscordNotifier.java new file mode 100644 index 00000000..8decec77 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/DiscordNotifier.java @@ -0,0 +1,45 @@ +package life.mosu.mosuserver.infra.notify; + +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.discord.DiscordExceptionNotifyEventRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.publisher.Mono; + +/** + * 에러 발생 시 디스코드로 알림을 전송하는 컴포넌트 + */ +@Slf4j +@Component +@RequiredArgsConstructor +public class DiscordNotifier implements NotifyClientAdapter { + + private final WebClient webClient; + + @Value("${discord.base-url}") + private String DISCORD_WEBHOOK_URL; + + @Override + public void send(DiscordExceptionNotifyEventRequest request) { + String message = request.getMessage(); + + webClient.post() + .uri(DISCORD_WEBHOOK_URL) + .contentType(MediaType.APPLICATION_JSON) + .bodyValue(Map.of("content", message)) + .retrieve() + .bodyToMono(Void.class) + .doOnSuccess(response -> log.info("알림톡 에러 디스코드 응답: {}", response)) + .doOnError(error -> log.error("알림톡 에러 디스코드 전송 실패", error)) + .onErrorResume(e -> { + log.debug("디스코드 전송 중 오류 발생"); + return Mono.empty(); + }) + .doOnTerminate(() -> log.info("알림톡 에러 디스코드 전송 완료")) + .subscribe(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/LunaSoftNotifier.java b/src/main/java/life/mosu/mosuserver/infra/notify/LunaSoftNotifier.java new file mode 100644 index 00000000..2f27f3eb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/LunaSoftNotifier.java @@ -0,0 +1,60 @@ +package life.mosu.mosuserver.infra.notify; + + +import com.fasterxml.jackson.annotation.JsonProperty; +import java.util.List; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventRequest; +import life.mosu.mosuserver.infra.notify.property.NotifyProperties; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; +import org.springframework.web.reactive.function.client.WebClient; +import reactor.core.scheduler.Schedulers; + +@Component +@RequiredArgsConstructor +@Slf4j +public class LunaSoftNotifier implements NotifyClientAdapter { + + private final WebClient webClient; + private final NotifyProperties properties; + + @Override + public void send(LunaNotifyEventRequest request) { + LunaNotifyRequest lunaRequest = createLunaNotifyRequest(request); + + webClient.post() + .uri(properties.getApi().getBaseUrl()) + .bodyValue(lunaRequest) + .retrieve() + .bodyToMono(String.class) + .publishOn(Schedulers.boundedElastic()) + .doOnSuccess(response -> log.info("알림톡 응답: {}", response)) + .doOnError(error -> log.error("알림톡 전송 실패", error)) + .doOnTerminate(() -> log.info("알림톡 전송 완료: {}", request)) + .subscribe(); + } + + private LunaNotifyRequest createLunaNotifyRequest(LunaNotifyEventRequest request) { + return LunaNotifyRequest.of( + properties.getUserId(), + properties.getApiKey(), + request.templateId(), + request.messages() + ); + } + + private record LunaNotifyRequest( + @JsonProperty("userId") String userId, + @JsonProperty("api_key") String apiKey, + @JsonProperty("template_id") Integer templateId, + @JsonProperty("messages") List> messages + ) { + + static LunaNotifyRequest of(String userId, String apiKey, Integer templateId, + List> messages) { + return new LunaNotifyRequest(userId, apiKey, templateId, messages); + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/MailNotifier.java b/src/main/java/life/mosu/mosuserver/infra/notify/MailNotifier.java new file mode 100644 index 00000000..2a9bd2ea --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/MailNotifier.java @@ -0,0 +1,63 @@ +package life.mosu.mosuserver.infra.notify; + +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import life.mosu.mosuserver.infra.notify.dto.mail.MailRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.retry.annotation.Backoff; +import org.springframework.retry.annotation.Retryable; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Component; +import org.thymeleaf.context.Context; +import org.thymeleaf.spring6.SpringTemplateEngine; + +@Component +@RequiredArgsConstructor +@Slf4j +public class MailNotifier implements NotifyClientAdapter { + + private final JavaMailSender javaMailSender; + private final SpringTemplateEngine templateEngine; + @Value("${spring.mail.username}") + private String senderEmail; + + @Override + @Async + public void send(T request) { + try { + Context context = request.toContext(); + String subject = request.getSubject(); + String templatePath = request.getTemplatePath(); + sendToSelfWithRetry(context, subject, templatePath); + } catch (Exception e) { + log.error("메일 전송 실패: {}", e.getMessage(), e); + // TODO: discord 추가 + } + } + + @Retryable( + maxAttempts = 3, + backoff = @Backoff(delay = 5000) + ) + public void sendToSelfWithRetry( + Context context, + String subject, + String templatePath + ) throws MessagingException { + + String html = templateEngine.process(templatePath, context); + MimeMessage message = javaMailSender.createMimeMessage(); + MimeMessageHelper helper = new MimeMessageHelper(message, true, "UTF-8"); + + helper.setFrom(senderEmail); + helper.setTo(senderEmail); + helper.setSubject(subject); + helper.setText(html, true); + + javaMailSender.send(message); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/NotifyClientAdapter.java b/src/main/java/life/mosu/mosuserver/infra/notify/NotifyClientAdapter.java new file mode 100644 index 00000000..93081b83 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/NotifyClientAdapter.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.infra.notify; + +public interface NotifyClientAdapter { + + void send(R request); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/annotation/NotifyStrategyMapping.java b/src/main/java/life/mosu/mosuserver/infra/notify/annotation/NotifyStrategyMapping.java new file mode 100644 index 00000000..f2189a62 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/annotation/NotifyStrategyMapping.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.infra.notify.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus; + +@Target(ElementType.TYPE) +@Retention(RetentionPolicy.RUNTIME) +public @interface NotifyStrategyMapping { + + LunaNotificationStatus[] value(); // 여러 상태 매핑 허용 +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/component/NotifySender.java b/src/main/java/life/mosu/mosuserver/infra/notify/component/NotifySender.java new file mode 100644 index 00000000..d9b743dd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/component/NotifySender.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.infra.notify.component; + +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; + +public interface NotifySender { + + void send(String targetPhoneNumber, LunaNotificationEvent event, T referObject); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/component/luna/LunaNotifySender.java b/src/main/java/life/mosu/mosuserver/infra/notify/component/luna/LunaNotifySender.java new file mode 100644 index 00000000..e8447a18 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/component/luna/LunaNotifySender.java @@ -0,0 +1,60 @@ +package life.mosu.mosuserver.infra.notify.component.luna; + +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.INQUIRY_ANSWER_SUCCESS; +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.SIGN_UP_SUCCESS; + +import life.mosu.mosuserver.infra.notify.NotifyClientAdapter; +import life.mosu.mosuserver.infra.notify.annotation.NotifyStrategyMapping; +import life.mosu.mosuserver.infra.notify.component.NotifySender; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventRequest; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventSuccessMessageDto; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyTemplateCode; +import life.mosu.mosuserver.infra.notify.support.NotifyTemplateGenerator; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@NotifyStrategyMapping({ + SIGN_UP_SUCCESS, + INQUIRY_ANSWER_SUCCESS +}) +@RequiredArgsConstructor +public class LunaNotifySender implements NotifySender { + + private final NotifyTemplateGenerator template; + private final NotifyClientAdapter notifier; + + /** + * @param targetPhoneNumber target 휴대폰 번호 + * @param event event 티켓 + * @param dto variable + */ + @Override + public void send(String targetPhoneNumber, LunaNotificationEvent event, T dto) { + LunaNotifyTemplateCode templateCode = event.status().getTemplateCode(); + + String alimTalkContent = template.getProcessedMessage(templateCode, + dto); + + LunaNotificationButtonUrls btnUrls = dto.getNotificationButtonUrls(); + + LunaNotifyEventSuccessMessageDto eventMessage = LunaNotifyEventSuccessMessageDto.create( + 1, + targetPhoneNumber, + alimTalkContent, + btnUrls + ); + + LunaNotifyEventRequest request = template.getNotifyEventSuccessTemplate( + templateCode.getId(), + eventMessage + ); + + notifier.send(request); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/component/luna/LunaNotifyWithSmsFallbackSender.java b/src/main/java/life/mosu/mosuserver/infra/notify/component/luna/LunaNotifyWithSmsFallbackSender.java new file mode 100644 index 00000000..aac54d13 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/component/luna/LunaNotifyWithSmsFallbackSender.java @@ -0,0 +1,72 @@ +package life.mosu.mosuserver.infra.notify.component.luna; + +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.APPLICATION_SUCCESS; +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.EXAM_1DAY_BEFORE_REMINDER_INFO; +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.EXAM_1WEEK_BEFORE_REMINDER_INFO; +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.EXAM_3DAY_BEFORE_REMINDER_INFO; +import static life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus.REFUND_SUCCESS; + +import life.mosu.mosuserver.infra.notify.NotifyClientAdapter; +import life.mosu.mosuserver.infra.notify.annotation.NotifyStrategyMapping; +import life.mosu.mosuserver.infra.notify.component.NotifySender; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationButtonUrls; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventRequest; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventSuccessMessageDto; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyTemplateCode; +import life.mosu.mosuserver.infra.notify.support.NotifyTemplateGenerator; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Component +@NotifyStrategyMapping({ + APPLICATION_SUCCESS, + REFUND_SUCCESS, + EXAM_1DAY_BEFORE_REMINDER_INFO, + EXAM_3DAY_BEFORE_REMINDER_INFO, + EXAM_1WEEK_BEFORE_REMINDER_INFO +}) +@RequiredArgsConstructor +@Slf4j +public class LunaNotifyWithSmsFallbackSender implements + NotifySender { + + private final NotifyTemplateGenerator template; + private final NotifyClientAdapter notifier; + + /** + * @param targetPhoneNumber target 휴대폰 번호 + * @param event event 티켓 + * @param dto variable + */ + @Override + public void send(String targetPhoneNumber, LunaNotificationEvent event, T dto) { + LunaNotifyTemplateCode templateCode = event.status().getTemplateCode(); + log.info("templateCode : {}", templateCode); + + String alimTalkContent = template.getProcessedMessage(templateCode, + dto); + + LunaNotificationButtonUrls btnUrls = dto.getNotificationButtonUrls(); + + String smsContent = template.getProcessedMessage(templateCode.getSmsCode(), + dto); + + LunaNotifyEventSuccessMessageDto eventMessage = LunaNotifyEventSuccessMessageDto.createWithSmsFallback( + 1, + targetPhoneNumber, + alimTalkContent, + smsContent, + btnUrls + ); + + LunaNotifyEventRequest request = template.getNotifyEventSuccessTemplate( + templateCode.getId(), + eventMessage + ); + + notifier.send(request); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/constant/MailSubjectFormat.java b/src/main/java/life/mosu/mosuserver/infra/notify/constant/MailSubjectFormat.java new file mode 100644 index 00000000..24dd4ed6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/constant/MailSubjectFormat.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.infra.notify.constant; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class MailSubjectFormat { + + public static final String DEPOSIT_SUCCESS = "[모수제휴-가상계좌] %s 님 입금 완료"; +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/constant/MailTemplatePath.java b/src/main/java/life/mosu/mosuserver/infra/notify/constant/MailTemplatePath.java new file mode 100644 index 00000000..1ce340b4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/constant/MailTemplatePath.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.infra.notify.constant; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class MailTemplatePath { + + public static final String DEPOSIT_COMPLETE = "mail/deposit-complete.html"; +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/constant/NotifyRedirectUrlConstants.java b/src/main/java/life/mosu/mosuserver/infra/notify/constant/NotifyRedirectUrlConstants.java new file mode 100644 index 00000000..01f97cbe --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/constant/NotifyRedirectUrlConstants.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.infra.notify.constant; + +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class NotifyRedirectUrlConstants { + + public static final String HOME_PAGE = "https://www.mosuedu.com/"; + public static final String MY_PAGE = "https://www.mosuedu.com/mypage"; + public static final String WARNING_PAGE = "https://www.mosuedu.com/warning"; + public static final String INQUIRY_PAGE = "https://www.mosuedu.com/notice/faq"; +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/discord/DiscordExceptionNotifyEventRequest.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/discord/DiscordExceptionNotifyEventRequest.java new file mode 100644 index 00000000..fae6e139 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/discord/DiscordExceptionNotifyEventRequest.java @@ -0,0 +1,23 @@ +package life.mosu.mosuserver.infra.notify.dto.discord; + +public record DiscordExceptionNotifyEventRequest( + String exceptionCause, + String exceptionMessage, + String meta +) { + + public static DiscordExceptionNotifyEventRequest of( + String exceptionCause, + String exceptionMessage, + String meta + ) { + return new DiscordExceptionNotifyEventRequest(exceptionCause, exceptionMessage, meta); + } + + public String getMessage() { + return "❌ **알림 전송 실패**\n" + + String.format("- ⚠️ exception Cause : `%s`\n", exceptionCause) + + String.format("- 📨 exception Message: `%s`\n", exceptionMessage) + + String.format("- 📋 meta: `%s`", meta); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationButtonUrls.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationButtonUrls.java new file mode 100644 index 00000000..0bf4b806 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationButtonUrls.java @@ -0,0 +1,50 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +public record LunaNotificationButtonUrls(List btnUrls) { + + public LunaNotificationButtonUrls { + btnUrls = btnUrls == null ? List.of() : List.copyOf(btnUrls); + } + + public static LunaNotificationButtonUrls of(NotificationButtonUrl... btns) { + return new LunaNotificationButtonUrls(List.of(btns)); + } + + public static LunaNotificationButtonUrls of(List btnList) { + return new LunaNotificationButtonUrls(btnList); + } + + public static LunaNotificationButtonUrls empty() { + return new LunaNotificationButtonUrls(List.of()); + } + + public List> toMapList() { + return btnUrls.stream().map(NotificationButtonUrl::toMap).collect(Collectors.toList()); + } + + public record NotificationButtonUrl(String urlPc, String urlMobile) { + + public static NotificationButtonUrl of(String urlPc, String urlMobile) { + return new NotificationButtonUrl(urlPc, urlMobile); + } + + public static NotificationButtonUrl empty() { + return new NotificationButtonUrl(null, null); + } + + + public Map toMap() { + if (urlPc == null || urlMobile == null) { + return Map.of(); + } + return Map.of( + "url_pc", urlPc, + "url_mobile", urlMobile + ); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationEvent.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationEvent.java new file mode 100644 index 00000000..47022b22 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationEvent.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; + +public record LunaNotificationEvent( + LunaNotificationStatus status, + Long userId, + Long targetId +) { + + public static LunaNotificationEvent create(LunaNotificationStatus status, Long userId) { + if (!LunaNotificationStatus.SIGN_UP_SUCCESS.equals(status)) { + throw new CustomRuntimeException(ErrorCode.INVALID_NOTIFICATION_STATUS); + } + return new LunaNotificationEvent(status, userId, null); + } + + public static LunaNotificationEvent create(LunaNotificationStatus status, Long userId, + Long targetId) { + return new LunaNotificationEvent(status, userId, targetId); + } + + @Override + public String toString() { + return "NotificationEvent{" + + "status=" + status + + ", userId=" + userId + + ", targetId=" + targetId + + '}'; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationStatus.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationStatus.java new file mode 100644 index 00000000..927495c4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationStatus.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import lombok.Getter; + +@Getter +public enum LunaNotificationStatus { + + // 성공 알림 + SIGN_UP_SUCCESS("회원 가입 완료", LunaNotifyTemplateCode.SIGN_UP), + APPLICATION_SUCCESS("신청 완료", LunaNotifyTemplateCode.APPLICATION), + REFUND_SUCCESS("환불 완료", LunaNotifyTemplateCode.REFUND), + INQUIRY_ANSWER_SUCCESS("문의 답변 완료", LunaNotifyTemplateCode.INQUIRY_ANSWER), + + // 정보성 알림 (리마인더) + EXAM_1WEEK_BEFORE_REMINDER_INFO("시험 1주일 전 리마인드 알림", LunaNotifyTemplateCode.EXAM_1WEEK_BEFORE), + EXAM_3DAY_BEFORE_REMINDER_INFO("시험 3일 전 리마인드 알림", LunaNotifyTemplateCode.EXAM_3DAY_BEFORE), + EXAM_1DAY_BEFORE_REMINDER_INFO("시험 하루 전 리마인드 알림", LunaNotifyTemplateCode.EXAM_1DAY_BEFORE); + + private final String message; + private final LunaNotifyTemplateCode templateCode; + private final NotificationSendStatus sendStatus; + + LunaNotificationStatus(String message, LunaNotifyTemplateCode templateCode) { + this(message, templateCode, NotificationSendStatus.SUCCESS); + } + + LunaNotificationStatus(String message, LunaNotifyTemplateCode templateCode, + NotificationSendStatus sendStatus) { + this.message = message; + this.templateCode = templateCode; + this.sendStatus = sendStatus; + } + + public enum NotificationSendStatus { + SUCCESS, FAILURE, INFO + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationVariable.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationVariable.java new file mode 100644 index 00000000..8ef1c44b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotificationVariable.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import java.util.Map; + +public interface LunaNotificationVariable { + + LunaNotificationButtonUrls getNotificationButtonUrls(); + + Map toMap(); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventRemindMessageDto.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventRemindMessageDto.java new file mode 100644 index 00000000..d6df5d33 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventRemindMessageDto.java @@ -0,0 +1,46 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import java.time.LocalDateTime; +import java.util.HashMap; +import java.util.Map; + +public record LunaNotifyEventRemindMessageDto( + Integer no, + String telNum, + LocalDateTime reserveTime, + String msgContent, + String smsContent, + LunaNotificationButtonUrls btnUrls +) { + + public static LunaNotifyEventRemindMessageDto create( + Integer no, + String telNum, + LocalDateTime reserveTime, + String msgContent, + String smsContent, + LunaNotificationButtonUrls btnUrls + ) { + return new LunaNotifyEventRemindMessageDto( + no, + telNum, + reserveTime, + msgContent, + smsContent, + btnUrls + ); + } + + public Map toMap() { + Map map = new HashMap<>(); + map.put("no", no); + map.put("tel_num", telNum); + map.put("reserve_time", reserveTime); + map.put("msg_content", msgContent); + map.put("sms_content", smsContent); + map.put("use_sms", "1"); + map.put("btn_url", btnUrls.toMapList()); + return map; + } + +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventRequest.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventRequest.java new file mode 100644 index 00000000..f467e872 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventRequest.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import java.util.List; +import java.util.Map; + +public record LunaNotifyEventRequest( + Integer templateId, + List> messages +) { + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventSuccessMessageDto.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventSuccessMessageDto.java new file mode 100644 index 00000000..32c9da15 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyEventSuccessMessageDto.java @@ -0,0 +1,54 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import java.util.HashMap; +import java.util.Map; + +public record LunaNotifyEventSuccessMessageDto( + Integer no, + String telNum, + String msgContent, + String smsContent, + String useSms, + LunaNotificationButtonUrls btnUrls +) { + + public static LunaNotifyEventSuccessMessageDto create( + Integer no, + String telNum, + String msgContent, + LunaNotificationButtonUrls btnUrls + ) { + return new LunaNotifyEventSuccessMessageDto( + no, telNum, msgContent, "", "0", btnUrls + ); + } + + public static LunaNotifyEventSuccessMessageDto createWithSmsFallback( + Integer no, + String telNum, + String msgContent, + String smsContent, + LunaNotificationButtonUrls btnUrls + ) { + return new LunaNotifyEventSuccessMessageDto( + no, telNum, msgContent, smsContent, "1", btnUrls + ); + } + + //TODO: customKey + public Map toMap() { + Map map = new HashMap<>(); + map.put("no", no); + map.put("tel_num", telNum); + map.put("custom_key", ""); + map.put("msg_content", msgContent); + map.put("sms_content", smsContent); + map.put("use_sms", useSms); + map.put("btn_url", btnUrls.toMapList()); + + System.out.println("map" + map); + return map; + + + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyTemplateCode.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyTemplateCode.java new file mode 100644 index 00000000..6e1e8654 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/luna/LunaNotifyTemplateCode.java @@ -0,0 +1,43 @@ +package life.mosu.mosuserver.infra.notify.dto.luna; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@Getter +public enum LunaNotifyTemplateCode { + APPLICATION( + 50044, + "notify.exam.application.complete.alimtalk", + "notify.exam.application.complete.sms" + ), + EXAM_1DAY_BEFORE( + 50047, + "notify.exam.oneday.reminder.alimtalk", + "notify.exam.oneday.reminder.sms"), + EXAM_1WEEK_BEFORE( + 50045, + "notify.exam.oneweek.reminder.alimtalk", + "notify.exam.oneweek.reminder.sms"), + EXAM_3DAY_BEFORE( + 50046, + "notify.exam.threeday.reminder.alimtalk", + "notify.exam.threeday.reminder.sms"), + INQUIRY_ANSWER( + 50049, + "notify.inquiry.answered.alimtalk", + ""), + REFUND( + 50050, + "notify.refund.complete.alimtalk", + "notify.refund.complete.sms"), + SIGN_UP( + 50048, + "notify.signup.complete.alimtalk", + ""); + + + private final Integer id; + private final String code; + private final String smsCode; +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/mail/DepositSuccessMailRequest.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/mail/DepositSuccessMailRequest.java new file mode 100644 index 00000000..f97c40e0 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/mail/DepositSuccessMailRequest.java @@ -0,0 +1,57 @@ +package life.mosu.mosuserver.infra.notify.dto.mail; + +import java.util.Map; +import life.mosu.mosuserver.infra.notify.constant.MailSubjectFormat; +import life.mosu.mosuserver.infra.notify.constant.MailTemplatePath; +import org.thymeleaf.context.Context; + +public record DepositSuccessMailRequest( + String orderId, + String accountNumber, + String bankName, + String customerName, + String timestamp +) implements MailRequest { + + public static DepositSuccessMailRequest of( + String orderId, + String accountNumber, + String bankName, + String customerName, + String timestamp) { + return new DepositSuccessMailRequest( + orderId, + accountNumber, + bankName, + customerName, + timestamp + ); + } + + @Override + public Context toContext() { + Context context = new Context(); + context.setVariables(toMap()); + return context; + } + + @Override + public String getSubject() { + return String.format(MailSubjectFormat.DEPOSIT_SUCCESS, this.customerName); + } + + @Override + public String getTemplatePath() { + return MailTemplatePath.DEPOSIT_COMPLETE; + } + + private Map toMap() { + return Map.of( + "orderId", orderId, + "accountNumber", accountNumber, + "bankName", bankName, + "customerName", customerName, + "timestamp", timestamp + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/dto/mail/MailRequest.java b/src/main/java/life/mosu/mosuserver/infra/notify/dto/mail/MailRequest.java new file mode 100644 index 00000000..df337257 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/dto/mail/MailRequest.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.infra.notify.dto.mail; + +import org.thymeleaf.context.Context; + +public interface MailRequest { + + Context toContext(); + + String getSubject(); + + String getTemplatePath(); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/property/MailProperties.java b/src/main/java/life/mosu/mosuserver/infra/notify/property/MailProperties.java new file mode 100644 index 00000000..400b77b3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/property/MailProperties.java @@ -0,0 +1,54 @@ +package life.mosu.mosuserver.infra.notify.property; + +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; +import org.springframework.validation.annotation.Validated; + +@Component +@Getter +@Setter +@ConfigurationProperties(prefix = "spring.mail") +@Validated +public class MailProperties { + + @NotNull + private String host; + + @NotNull + private String username; + + @NotNull + private String password; + + private int port = 587; + + private SmtpProperties properties = new SmtpProperties(); + + @Getter + @Setter + public static class SmtpProperties { + + private MailSmtp smtp = new MailSmtp(); + } + + @Getter + @Setter + public static class MailSmtp { + + private boolean auth = true; + private boolean debug = false; + private int connectiontimeout = 5000; + private StartTls starttls = new StartTls(); + } + + @Getter + @Setter + public static class StartTls { + + private boolean enable = true; + } +} + diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/property/NotifyProperties.java b/src/main/java/life/mosu/mosuserver/infra/notify/property/NotifyProperties.java new file mode 100644 index 00000000..b6d007fb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/property/NotifyProperties.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.infra.notify.property; + +import lombok.Data; +import org.springframework.boot.context.properties.ConfigurationProperties; +import org.springframework.stereotype.Component; + +@Data +@Component +@ConfigurationProperties(prefix = "alimtalk") +public class NotifyProperties { + + private Api api = new Api(); + private String userId; + private String apiKey; + + @Data + public static class Api { + + private String baseUrl; + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/resolver/NotifySenderResolver.java b/src/main/java/life/mosu/mosuserver/infra/notify/resolver/NotifySenderResolver.java new file mode 100644 index 00000000..d73414cf --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/resolver/NotifySenderResolver.java @@ -0,0 +1,43 @@ +package life.mosu.mosuserver.infra.notify.resolver; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.annotation.NotifyStrategyMapping; +import life.mosu.mosuserver.infra.notify.component.NotifySender; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationStatus; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; +import org.springframework.stereotype.Component; + +@Component +public class NotifySenderResolver { + + private final Map> senderMap = new HashMap<>(); + + public NotifySenderResolver(List> senders) { + for (NotifySender sender : senders) { + NotifyStrategyMapping mapping = sender.getClass() + .getAnnotation(NotifyStrategyMapping.class); + if (mapping == null) { + throw new IllegalStateException("NotifySender에 @NotifyStrategyMapping 없음"); + } + + for (LunaNotificationStatus status : mapping.value()) { + if (senderMap.containsKey(status)) { + throw new IllegalStateException("중복된 NotifyStatus: " + status); + } + senderMap.put(status, sender); + } + } + } + + @SuppressWarnings("unchecked") + public NotifySender resolve( + LunaNotificationStatus status) { + NotifySender sender = senderMap.get(status); + if (sender == null) { + throw new IllegalArgumentException("전략이 등록되지 않은 상태: " + status); + } + return (NotifySender) sender; + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/support/NotifyEventPublisher.java b/src/main/java/life/mosu/mosuserver/infra/notify/support/NotifyEventPublisher.java new file mode 100644 index 00000000..6d35f346 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/support/NotifyEventPublisher.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.infra.notify.support; + +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.context.ApplicationEventPublisher; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class NotifyEventPublisher { + + private final ApplicationEventPublisher publisher; + + public void notify(LunaNotificationEvent event) { + publisher.publishEvent(event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/notify/support/NotifyTemplateGenerator.java b/src/main/java/life/mosu/mosuserver/infra/notify/support/NotifyTemplateGenerator.java new file mode 100644 index 00000000..b06fe6dd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/notify/support/NotifyTemplateGenerator.java @@ -0,0 +1,55 @@ +package life.mosu.mosuserver.infra.notify.support; + +import java.util.List; +import java.util.Locale; +import java.util.Map; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationVariable; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventRequest; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyEventSuccessMessageDto; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotifyTemplateCode; +import lombok.RequiredArgsConstructor; +import org.apache.commons.lang3.StringUtils; +import org.springframework.context.MessageSource; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class NotifyTemplateGenerator { + + private final MessageSource messageSource; + + public String getProcessedMessage( + LunaNotifyTemplateCode templateCode, + T variables) { + if (variables == null) { + return messageSource.getMessage(templateCode.getCode(), null, Locale.KOREA); + } + Map data = variables.toMap(); + String message = messageSource.getMessage(templateCode.getCode(), null, Locale.KOREA); + for (Map.Entry entry : data.entrySet()) { + message = StringUtils.replace(message, "#{" + entry.getKey() + "}", entry.getValue()); + } + return message; + } + + public String getProcessedMessage(String templateCode, + T variables) { + Map data = variables.toMap(); + String message = messageSource.getMessage(templateCode, null, Locale.KOREA); + for (Map.Entry entry : data.entrySet()) { + message = StringUtils.replace(message, "#{" + entry.getKey() + "}", entry.getValue()); + } + return message; + } + + public LunaNotifyEventRequest getNotifyEventSuccessTemplate( + Integer templateId, + LunaNotifyEventSuccessMessageDto message + ) { + + return new LunaNotifyEventRequest( + templateId, + List.of(message.toMap()) + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/payment/TossPaymentErrorHandler.java b/src/main/java/life/mosu/mosuserver/infra/payment/TossPaymentErrorHandler.java deleted file mode 100644 index a08ead58..00000000 --- a/src/main/java/life/mosu/mosuserver/infra/payment/TossPaymentErrorHandler.java +++ /dev/null @@ -1,50 +0,0 @@ -package life.mosu.mosuserver.infra.payment; - -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; -import java.io.IOException; -import java.net.URI; -import java.nio.charset.StandardCharsets; -import life.mosu.mosuserver.infra.payment.dto.TossPaymentErrorResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpMethod; -import org.springframework.http.HttpStatus; -import org.springframework.http.client.ClientHttpResponse; -import org.springframework.stereotype.Component; -import org.springframework.web.client.ResponseErrorHandler; - -@Component -@RequiredArgsConstructor -public class TossPaymentErrorHandler implements ResponseErrorHandler { - private final ObjectMapper objectMapper; - - @Override - public boolean hasError(ClientHttpResponse response) throws IOException { - return response.getStatusCode().is4xxClientError() - || response.getStatusCode().is5xxServerError(); - } - - @Override - public void handleError(URI url, HttpMethod method, ClientHttpResponse response) - throws IOException { - - String body = new String(response.getBody().readAllBytes(), StandardCharsets.UTF_8); - HttpStatus status; - - try { - status = HttpStatus.valueOf(response.getStatusCode().value()); - } catch (IllegalArgumentException e) { - status = HttpStatus.INTERNAL_SERVER_ERROR; - } - - try { - TossPaymentErrorResponse error = objectMapper.readValue(body, TossPaymentErrorResponse.class); - - throw new RuntimeException(); - - } catch (JsonProcessingException e) { - throw new RuntimeException(); - } - } - -} diff --git a/src/main/java/life/mosu/mosuserver/infra/payment/dto/CancelTossPaymentResponse.java b/src/main/java/life/mosu/mosuserver/infra/payment/dto/CancelTossPaymentResponse.java deleted file mode 100644 index 75a3e589..00000000 --- a/src/main/java/life/mosu/mosuserver/infra/payment/dto/CancelTossPaymentResponse.java +++ /dev/null @@ -1,5 +0,0 @@ -package life.mosu.mosuserver.infra.payment.dto; - -public class CancelTossPaymentResponse { - -} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationFailureLogJpaRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationFailureLogJpaRepositoryImpl.java new file mode 100644 index 00000000..443ae60a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationFailureLogJpaRepositoryImpl.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.sql.Timestamp; +import java.time.Instant; +import java.util.List; +import life.mosu.mosuserver.domain.application.entity.ApplicationFailureLogJpaEntity; +import life.mosu.mosuserver.domain.application.repository.ApplicationFailureLogJpaRepositoryCustom; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class ApplicationFailureLogJpaRepositoryImpl implements + ApplicationFailureLogJpaRepositoryCustom { + + private final JdbcTemplate jdbcTemplate; + + @Override + public void saveAllUsingBatch( + List entities) { + String sql = """ + INSERT INTO application_failure_log + (application_id, user_id, reason, snapshot, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, ?) + """; + + jdbcTemplate.batchUpdate(sql, entities, 1000, (ps, entity) -> { + ps.setLong(1, entity.getApplicationId()); + ps.setLong(2, entity.getUserId()); + ps.setString(3, entity.getReason()); + ps.setString(4, entity.getSnapshot()); + ps.setTimestamp(5, Timestamp.from(Instant.now())); + ps.setTimestamp(6, Timestamp.from(Instant.now())); + }); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationJpaRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationJpaRepositoryImpl.java new file mode 100644 index 00000000..a8d484de --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationJpaRepositoryImpl.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.util.List; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.repository.ApplicationJpaRepositoryCustom; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +public class ApplicationJpaRepositoryImpl implements ApplicationJpaRepositoryCustom { + + private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; + + @Override + @Transactional + public void batchDeleteAllWithExamApplications(List entities) { + if (entities == null || entities.isEmpty()) { + return; + } + + List applicationIds = entities.stream() + .map(ApplicationJpaEntity::getId) + .toList(); + + String deleteExamApplicationSql = "DELETE FROM exam_application WHERE application_id IN (:applicationIds)"; + namedParameterJdbcTemplate.update(deleteExamApplicationSql, + new MapSqlParameterSource("applicationIds", applicationIds)); + + String deleteApplicationSql = "DELETE FROM application WHERE application_id IN (:applicationIds)"; + namedParameterJdbcTemplate.update(deleteApplicationSql, + new MapSqlParameterSource("applicationIds", applicationIds)); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/admin/ApplicationQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationQueryRepositoryImpl.java similarity index 56% rename from src/main/java/life/mosu/mosuserver/domain/admin/ApplicationQueryRepositoryImpl.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationQueryRepositoryImpl.java index 984f0add..d8d204e2 100644 --- a/src/main/java/life/mosu/mosuserver/domain/admin/ApplicationQueryRepositoryImpl.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ApplicationQueryRepositoryImpl.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.admin; +package life.mosu.mosuserver.infra.persistence.jpa; import com.querydsl.core.Tuple; import com.querydsl.core.types.Predicate; @@ -6,28 +6,26 @@ import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; -import java.time.Duration; import java.time.format.DateTimeFormatter; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import life.mosu.mosuserver.domain.application.Lunch; -import life.mosu.mosuserver.domain.application.QAdmissionTicketImageJpaEntity; -import life.mosu.mosuserver.domain.application.QApplicationJpaEntity; -import life.mosu.mosuserver.domain.application.Subject; -import life.mosu.mosuserver.domain.applicationschool.QApplicationSchoolJpaEntity; -import life.mosu.mosuserver.domain.payment.QPaymentJpaEntity; -import life.mosu.mosuserver.domain.profile.QProfileJpaEntity; -import life.mosu.mosuserver.domain.school.QSchoolJpaEntity; -import life.mosu.mosuserver.domain.user.QUserJpaEntity; -import life.mosu.mosuserver.infra.property.S3Properties; -import life.mosu.mosuserver.infra.storage.application.S3Service; +import life.mosu.mosuserver.domain.admin.repository.ApplicationQueryRepository; +import life.mosu.mosuserver.domain.application.entity.QApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.entity.QExamTicketImageJpaEntity; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.exam.entity.QExamJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.QExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.QExamSubjectJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.QPaymentJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.QProfileJpaEntity; +import life.mosu.mosuserver.domain.user.entity.QUserJpaEntity; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; import life.mosu.mosuserver.presentation.admin.dto.ApplicationExcelDto; import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; -import life.mosu.mosuserver.presentation.admin.dto.SchoolLunchResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.AdmissionTicketResponse; +import life.mosu.mosuserver.presentation.admin.dto.ExamTicketResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; @@ -42,16 +40,16 @@ public class ApplicationQueryRepositoryImpl implements ApplicationQueryRepositor DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss"); private final JPAQueryFactory queryFactory; - private final S3Properties s3Properties; private final S3Service s3Service; private final QProfileJpaEntity profile = QProfileJpaEntity.profileJpaEntity; private final QApplicationJpaEntity application = QApplicationJpaEntity.applicationJpaEntity; - private final QApplicationSchoolJpaEntity applicationSchool = QApplicationSchoolJpaEntity.applicationSchoolJpaEntity; private final QPaymentJpaEntity payment = QPaymentJpaEntity.paymentJpaEntity; - private final QAdmissionTicketImageJpaEntity admissionTicketImage = QAdmissionTicketImageJpaEntity.admissionTicketImageJpaEntity; private final QUserJpaEntity user = QUserJpaEntity.userJpaEntity; - private final QSchoolJpaEntity school = QSchoolJpaEntity.schoolJpaEntity; + private final QExamJpaEntity exam = QExamJpaEntity.examJpaEntity; + private final QExamApplicationJpaEntity examApplication = QExamApplicationJpaEntity.examApplicationJpaEntity; + private final QExamTicketImageJpaEntity examTicketImage = QExamTicketImageJpaEntity.examTicketImageJpaEntity; + private final QExamSubjectJpaEntity examSubject = QExamSubjectJpaEntity.examSubjectJpaEntity; @Override public Page searchAllApplications(ApplicationFilter filter, @@ -67,9 +65,9 @@ public Page searchAllApplications(ApplicationFilter fil List content = query.fetch().stream() .map(tuple -> { - Long appSchoolId = tuple.get(applicationSchool.id); + Long appSchoolId = tuple.get(examApplication.id); Set subjects = appSchoolId != null - ? findSubjectsByApplicationSchoolId(appSchoolId) + ? findSubjectsByExamApplicationId(appSchoolId) : new HashSet<>(); return mapToResponse(tuple, subjects); }) @@ -83,66 +81,48 @@ public List searchAllApplicationsForExcel() { JPAQuery query = baseQuery(); return query.fetch().stream() .map(tuple -> { - Long appSchoolId = tuple.get(applicationSchool.id); + Long appSchoolId = tuple.get(examApplication.id); Set subjects = appSchoolId != null - ? findSubjectsByApplicationSchoolId(appSchoolId) + ? findSubjectsByExamApplicationId(appSchoolId) : new HashSet<>(); return mapToExcel(tuple, subjects); }) .toList(); } - @Override - public List searchAllSchoolLunches() { - return queryFactory - .select( - school.schoolName, - applicationSchool.lunch.count() - ) - .from(applicationSchool) - .rightJoin(school).on(applicationSchool.schoolId.eq(school.id)) - .where(applicationSchool.lunch.ne(Lunch.NONE)) - .groupBy(school.id, school.schoolName) - .fetch() - .stream() - .map(t -> new SchoolLunchResponse( - t.get(school.schoolName), - t.get(applicationSchool.lunch.count()) - )) - .toList(); - } - - private JPAQuery baseQuery() { return queryFactory .select( - applicationSchool.id, + examApplication.id, payment.paymentKey, - applicationSchool.examinationNumber, + examApplication.examNumber, profile.userName, profile.gender, profile.birth, profile.phoneNumber, - application.guardianPhoneNumber, + application.parentPhoneNumber, + profile.recommenderPhoneNumber, profile.education, profile.schoolInfo.schoolName, profile.grade, - applicationSchool.lunch, - applicationSchool.schoolName, - applicationSchool.examDate, - admissionTicketImage.s3Key, - admissionTicketImage.fileName, + exam.schoolName, + exam.examDate, + examApplication.isLunchChecked, + exam.lunchName, + examTicketImage.s3Key, + examTicketImage.fileName, payment.paymentStatus, payment.paymentMethod, application.createdAt ) - .from(applicationSchool) - .leftJoin(application).on(applicationSchool.applicationId.eq(application.id)) - .leftJoin(payment).on(payment.applicationSchoolId.eq(applicationSchool.id)) + .from(examApplication) + .leftJoin(exam).on(examApplication.examId.eq(exam.id)) + .leftJoin(application).on(examApplication.applicationId.eq(application.id)) + .leftJoin(payment).on(payment.examApplicationId.eq(examApplication.id)) .leftJoin(user).on(application.userId.eq(user.id)) .leftJoin(profile).on(profile.userId.eq(user.id)) - .leftJoin(admissionTicketImage) - .on(admissionTicketImage.applicationId.eq(application.id)); + .leftJoin(examTicketImage) + .on(examTicketImage.applicationId.eq(application.id)); } private Predicate buildNameCondition(String name) { @@ -157,57 +137,57 @@ private Predicate buildPhoneCondition(String phone) { : profile.phoneNumber.contains(phone); } - private Set findSubjectsByApplicationSchoolId(Long applicationSchoolId) { + private Set findSubjectsByExamApplicationId(Long examApplicationId) { EnumPath subject = Expressions.enumPath(Subject.class, "subject"); return new HashSet<>( queryFactory - .select(subject) - .from(applicationSchool) - .join(applicationSchool.subjects, subject) - .where(applicationSchool.id.eq(applicationSchoolId)) + .select( + examSubject.subject + ) + .from(examSubject) + .where(examSubject.examApplicationId.eq(examApplicationId)) .fetch() ); } private ApplicationListResponse mapToResponse(Tuple tuple, Set subjects) { - Set subjectNames = subjects.stream() + List subjectNames = subjects.stream() .map(Subject::getSubjectName) - .collect(Collectors.toSet()); - - String lunchName = tuple.get(applicationSchool.lunch).getLunchName(); + .toList(); - String s3Key = tuple.get(admissionTicketImage.s3Key); + String s3Key = tuple.get(examTicketImage.s3Key); String url = getAdmissionTicketImageUrl(s3Key); - AdmissionTicketResponse admissionTicket = AdmissionTicketResponse.of( + ExamTicketResponse examTicketResponse = ExamTicketResponse.of( url, tuple.get(profile.userName), tuple.get(profile.birth), - tuple.get(applicationSchool.examinationNumber), + tuple.get(examApplication.examNumber), subjectNames, - tuple.get(applicationSchool.schoolName) + tuple.get(exam.schoolName) ); return new ApplicationListResponse( tuple.get(payment.paymentKey), - tuple.get(applicationSchool.examinationNumber), + tuple.get(examApplication.examNumber), tuple.get(profile.userName), - tuple.get(profile.gender), + tuple.get(profile.gender).getGenderName(), tuple.get(profile.birth), tuple.get(profile.phoneNumber), - tuple.get(application.guardianPhoneNumber), - tuple.get(profile.education), + tuple.get(application.parentPhoneNumber), + tuple.get(profile.education).getEducationName(), tuple.get(profile.schoolInfo.schoolName), - tuple.get(profile.grade), - lunchName, + tuple.get(profile.grade).getGradeName(), + tuple.get(examApplication.isLunchChecked), + tuple.get(exam.lunchName), subjectNames, - tuple.get(applicationSchool.schoolName), - tuple.get(applicationSchool.examDate), - tuple.get(admissionTicketImage.fileName), + tuple.get(exam.schoolName), + tuple.get(exam.examDate), + tuple.get(examTicketImage.fileName), tuple.get(payment.paymentStatus), tuple.get(payment.paymentMethod), tuple.get(application.createdAt), - admissionTicket + examTicketResponse ); } @@ -216,7 +196,7 @@ private ApplicationExcelDto mapToExcel(Tuple tuple, Set subjects) { .map(Subject::getSubjectName) .collect(Collectors.toSet()); - String lunchName = tuple.get(applicationSchool.lunch).getLunchName(); + String lunchName = tuple.get(exam.lunchName); String genderName = tuple.get(profile.gender).getGenderName(); String gradeName = tuple.get(profile.grade).getGradeName(); String educationName = tuple.get(profile.education).getEducationName(); @@ -225,20 +205,21 @@ private ApplicationExcelDto mapToExcel(Tuple tuple, Set subjects) { return new ApplicationExcelDto( tuple.get(payment.paymentKey), - tuple.get(applicationSchool.examinationNumber), + tuple.get(examApplication.examNumber), tuple.get(profile.userName), genderName, tuple.get(profile.birth), tuple.get(profile.phoneNumber), - tuple.get(application.guardianPhoneNumber), + tuple.get(application.parentPhoneNumber), + tuple.get(profile.recommenderPhoneNumber), educationName, tuple.get(profile.schoolInfo.schoolName), gradeName, lunchName, subjectNames, - tuple.get(applicationSchool.schoolName), - tuple.get(applicationSchool.examDate), - tuple.get(admissionTicketImage.fileName), + tuple.get(exam.schoolName), + tuple.get(exam.examDate), + tuple.get(examTicketImage.fileName), tuple.get(payment.paymentStatus), tuple.get(payment.paymentMethod), appliedAt @@ -249,9 +230,6 @@ private String getAdmissionTicketImageUrl(String s3Key) { if (s3Key == null || s3Key.isBlank()) { return null; } - return s3Service.getPreSignedUrl( - s3Key, - Duration.ofMinutes(s3Properties.getPresignedUrlExpirationMinutes()) - ); + return s3Service.getPreSignedUrl(s3Key); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/EventQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/EventQueryRepositoryImpl.java new file mode 100644 index 00000000..2db653a3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/EventQueryRepositoryImpl.java @@ -0,0 +1,44 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +import life.mosu.mosuserver.domain.event.entity.QEventJpaEntity; +import life.mosu.mosuserver.domain.event.repository.EventQueryRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class EventQueryRepositoryImpl implements EventQueryRepository { + + private static final int SIZE = 20; + + private final JPAQueryFactory queryFactory; + private final QEventJpaEntity event = QEventJpaEntity.eventJpaEntity; + + @Override + public Slice findAllByCursorId(Long cursorId) { + List events = fetchEvents(cursorId); + return toSlice(events); + } + + private List fetchEvents(Long cursorId) { + return queryFactory.selectFrom(event) + .where((cursorId == null || cursorId == -1) ? null : event.id.lt(cursorId)) + .orderBy(event.id.desc()) + .limit(SIZE + 1) + .fetch(); + } + + private Slice toSlice(List events) { + boolean hasNext = events.size() > SIZE; + List content = hasNext ? events.subList(0, SIZE) : events; + Pageable pageable = PageRequest.of(0, SIZE); + return new SliceImpl<>(content, pageable, hasNext); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ExamApplicationBulkRepository.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ExamApplicationBulkRepository.java new file mode 100644 index 00000000..7d03fe42 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/ExamApplicationBulkRepository.java @@ -0,0 +1,107 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.sql.Statement; +import java.sql.Timestamp; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.Set; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.dao.DataAccessException; +import org.springframework.jdbc.core.ConnectionCallback; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Slf4j +@Repository +@RequiredArgsConstructor +public class ExamApplicationBulkRepository { + + private static final String SQL_INSERT_EXAM_APPLICATION = """ + INSERT INTO exam_application + (created_at, updated_at, application_id, + user_id, exam_id, lunch_checked, exam_number) + VALUES (?, ?, ?, ?, ?, ?, ?) + """; + private static final String SQL_INSERT_EXAM_SUBJECT = """ + INSERT INTO exam_subject (exam_application_id, subject) VALUES (?, ?) + """; + private final JdbcTemplate jdbcTemplate; + + + @Transactional + public List saveAllExamApplicationsWithSubjects( + List entities, Set subjects) { + + List generatedIds = jdbcTemplate.execute((ConnectionCallback>) con -> { + try (PreparedStatement ps = con.prepareStatement( + SQL_INSERT_EXAM_APPLICATION, Statement.RETURN_GENERATED_KEYS)) { + for (ExamApplicationJpaEntity e : entities) { + ps.setTimestamp(1, Timestamp.valueOf(LocalDateTime.now())); + ps.setTimestamp(2, Timestamp.valueOf(LocalDateTime.now())); + ps.setLong(3, e.getApplicationId()); + ps.setLong(4, e.getUserId()); + ps.setLong(5, e.getExamId()); + ps.setBoolean(6, e.getIsLunchChecked()); + ps.setString(7, e.getExamNumber()); +// ps.setBoolean(8, e.getDeleted()); + ps.addBatch(); + + log.info( + "Saving ExamApplication - applicationId: {}, userId: {}, examId: {}, isLunchChecked: {}, examNumber: {}", + e.getApplicationId(), + e.getUserId(), + e.getExamId(), + e.getIsLunchChecked(), + e.getExamNumber() + ); + } + + ps.executeBatch(); + + List ids = new ArrayList<>(); + try (ResultSet rs = ps.getGeneratedKeys()) { + while (rs.next()) { + ids.add(rs.getLong(1)); + } + } + return ids; + + } catch (SQLException e) { + log.info("SQL Exception : {}", e); + throw new CustomRuntimeException(ErrorCode.EXAM_APPLICATION_MULTI_INSERT_ERROR); + + } + }); + + List subjectParams = new ArrayList<>(); + + for (int i = 0; i < entities.size(); i++) { + Long examApplicationId = generatedIds.get(i); + + for (Subject subj : subjects) { + subjectParams.add(new Object[]{examApplicationId, String.valueOf(subj)}); + } + } + + try { + if (!subjectParams.isEmpty()) { + jdbcTemplate.batchUpdate(SQL_INSERT_EXAM_SUBJECT, subjectParams); + } + } catch (DataAccessException e) { + throw new CustomRuntimeException(ErrorCode.EXAM_SUBJECT_MULTI_INSERT_ERROR); + } + + return generatedIds; + } + +} diff --git a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/InquiryJpaRepositoryImpl.java similarity index 64% rename from src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryQueryRepositoryImpl.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/jpa/InquiryJpaRepositoryImpl.java index c7f42387..2ac21f89 100644 --- a/src/main/java/life/mosu/mosuserver/domain/inquiry/InquiryQueryRepositoryImpl.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/InquiryJpaRepositoryImpl.java @@ -1,14 +1,20 @@ -package life.mosu.mosuserver.domain.inquiry; +package life.mosu.mosuserver.infra.persistence.jpa; + +import static life.mosu.mosuserver.domain.base.BaseTimeEntity.formatDate; import com.querydsl.core.Tuple; +import com.querydsl.core.types.Expression; import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.ComparableExpressionBase; import com.querydsl.jpa.impl.JPAQuery; import com.querydsl.jpa.impl.JPAQueryFactory; -import java.time.format.DateTimeFormatter; +import jakarta.persistence.EntityManager; import java.util.List; import java.util.Optional; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryStatus; +import life.mosu.mosuserver.domain.inquiry.entity.QInquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiry.repository.InquiryQueryRepository; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; @@ -18,11 +24,10 @@ @Repository @RequiredArgsConstructor -public class InquiryQueryRepositoryImpl implements InquiryQueryRepository { - - private static final DateTimeFormatter FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd"); +public class InquiryJpaRepositoryImpl implements InquiryQueryRepository { private final JPAQueryFactory queryFactory; + private final EntityManager entityManager; private final QInquiryJpaEntity inquiry = QInquiryJpaEntity.inquiryJpaEntity; @Override @@ -39,9 +44,8 @@ public Page searchInquiries( .offset(pageable.getOffset()) .limit(pageable.getPageSize()); - long total = getTotalCount(inquiry, status); + long total = getTotalCount(query, inquiry.count()); - // 결과 매핑 List content = query.fetch().stream() .map(this::mapToResponse) .toList(); @@ -49,6 +53,23 @@ public Page searchInquiries( return new PageImpl<>(content, pageable, total); } + @Override + public Page searchMyInquiry(Long userId, Pageable pageable) { + JPAQuery query = baseQuery(inquiry) + .where(inquiry.userId.eq(userId)); + + long total = getTotalCount(query, inquiry.count()); + + List content = query + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch().stream() + .map(this::mapToResponse) + .toList(); + + return new PageImpl<>(content, pageable, total); + } + private JPAQuery baseQuery(QInquiryJpaEntity inquiry) { return queryFactory @@ -79,27 +100,23 @@ private OrderSpecifier buildOrderByCondition(String sortField, boolean asc) { return asc ? expression.asc() : expression.desc(); } - private long getTotalCount(QInquiryJpaEntity inquiry, InquiryStatus status) { + private long getTotalCount(JPAQuery query, Expression countExpression) { return Optional.ofNullable( - queryFactory - .select(inquiry.count()) - .from(inquiry) - .where( - buildStatusCondition(inquiry, status) - ) + query.clone(entityManager) + .select(countExpression) .fetchOne() ).orElse(0L); } private InquiryResponse mapToResponse(Tuple tuple) { + InquiryStatus status = tuple.get(inquiry.status); return new InquiryResponse( tuple.get(inquiry.id), tuple.get(inquiry.title), tuple.get(inquiry.content), tuple.get(inquiry.author), - tuple.get(inquiry.status), - tuple.get(inquiry.createdAt) != null ? tuple.get(inquiry.createdAt) - .format(FORMATTER) - : null); + status != null ? status.getStatusName() : "N/A", + formatDate(tuple.get(inquiry.createdAt)) + ); } } diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/PaymentFailureLogJpaRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/PaymentFailureLogJpaRepositoryImpl.java new file mode 100644 index 00000000..1e3a7b4c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/PaymentFailureLogJpaRepositoryImpl.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.sql.Timestamp; +import java.time.Instant; +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentFailureLogJpaEntity; +import life.mosu.mosuserver.domain.payment.repository.PaymentFailureLogRepositoryCustom; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class PaymentFailureLogJpaRepositoryImpl implements PaymentFailureLogRepositoryCustom { + + private final JdbcTemplate jdbcTemplate; + + @Override + public void saveAllUsingBatch(List entities) { + String sql = """ + INSERT INTO payment_failure_log + (payment_id, exam_application_id, application_id, reason, snapshot, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, ?, ?) + """; + + jdbcTemplate.batchUpdate(sql, entities, 1000, (ps, entity) -> { + ps.setLong(1, entity.getPaymentId()); + ps.setLong(2, entity.getExamApplicationId()); + ps.setObject(3, entity.getApplicationId(), java.sql.Types.BIGINT); // <-- 핵심 수정 + ps.setString(4, entity.getReason()); + ps.setString(5, entity.getSnapshot()); + ps.setTimestamp(6, Timestamp.from(Instant.now())); + ps.setTimestamp(7, Timestamp.from(Instant.now())); + }); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/PaymentJpaRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/PaymentJpaRepositoryImpl.java new file mode 100644 index 00000000..34cf3801 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/PaymentJpaRepositoryImpl.java @@ -0,0 +1,31 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.payment.repository.PaymentJpaRepositoryCustom; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +public class PaymentJpaRepositoryImpl implements PaymentJpaRepositoryCustom { + + private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; + + @Override + @Transactional + public void batchDeleteAllWithExamApplications(List entities) { + if (entities == null || entities.isEmpty()) { + return; + } + List ids = entities.stream() + .map(PaymentJpaEntity::getId) + .toList(); + + String sql = "DELETE FROM payment WHERE id IN (:ids)"; + namedParameterJdbcTemplate.update(sql, new MapSqlParameterSource("ids", ids)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundFailureLogJpaRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundFailureLogJpaRepositoryImpl.java new file mode 100644 index 00000000..9a953d72 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundFailureLogJpaRepositoryImpl.java @@ -0,0 +1,33 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.sql.Timestamp; +import java.time.Instant; +import java.util.List; +import life.mosu.mosuserver.domain.refund.entity.RefundFailureLogJpaEntity; +import life.mosu.mosuserver.domain.refund.repository.RefundFailureLogJpaRepositoryCustom; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.JdbcTemplate; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class RefundFailureLogJpaRepositoryImpl implements RefundFailureLogJpaRepositoryCustom { + + private final JdbcTemplate jdbcTemplate; + + @Override + public void saveAllUsingBatch(List entities) { + String sql = """ + INSERT INTO refund_failure_log (refund_id, exam_application_id, reason, snapshot, created_at, updated_at) + VALUES (?, ?, ?, ?, ?, ?) + """; + jdbcTemplate.batchUpdate(sql, entities, 1000, (ps, entity) -> { + ps.setLong(1, entity.getRefundId()); + ps.setLong(2, entity.getExamApplicationId()); + ps.setString(3, entity.getReason()); + ps.setString(4, entity.getSnapshot()); + ps.setTimestamp(5, Timestamp.from(Instant.now())); + ps.setTimestamp(6, Timestamp.from(Instant.now())); + }); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundJpaRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundJpaRepositoryImpl.java new file mode 100644 index 00000000..e003fb39 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundJpaRepositoryImpl.java @@ -0,0 +1,31 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import java.util.List; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.repository.RefundJpaRepositoryCustom; +import lombok.RequiredArgsConstructor; +import org.springframework.jdbc.core.namedparam.MapSqlParameterSource; +import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate; +import org.springframework.stereotype.Repository; +import org.springframework.transaction.annotation.Transactional; + +@Repository +@RequiredArgsConstructor +public class RefundJpaRepositoryImpl implements RefundJpaRepositoryCustom { + + private final NamedParameterJdbcTemplate namedParameterJdbcTemplate; + + @Override + @Transactional + public void batchDeleteAllWithExamApplications(List entities) { + if (entities == null || entities.isEmpty()) { + return; + } + List refundIds = entities.stream() + .map(RefundJpaEntity::getId) + .toList(); + String deleteExamApplicationSql = "DELETE FROM refund WHERE refund_id IN (:refundIds)"; + namedParameterJdbcTemplate.update(deleteExamApplicationSql, + new MapSqlParameterSource("refundIds", refundIds)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundQueryRepositoryImpl.java new file mode 100644 index 00000000..b13834f8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/RefundQueryRepositoryImpl.java @@ -0,0 +1,110 @@ +package life.mosu.mosuserver.infra.persistence.jpa; + +import static life.mosu.mosuserver.domain.base.BaseTimeEntity.formatDate; + +import com.querydsl.core.Tuple; +import com.querydsl.jpa.impl.JPAQuery; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import life.mosu.mosuserver.domain.admin.repository.RefundQueryRepository; +import life.mosu.mosuserver.domain.application.entity.QApplicationJpaEntity; +import life.mosu.mosuserver.domain.examapplication.entity.QExamApplicationJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; +import life.mosu.mosuserver.domain.payment.entity.QPaymentJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.QProfileJpaEntity; +import life.mosu.mosuserver.domain.refund.entity.QRefundJpaEntity; +import life.mosu.mosuserver.presentation.admin.dto.RefundExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.RefundListResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; + +@Slf4j +@Repository +@RequiredArgsConstructor +public class RefundQueryRepositoryImpl implements RefundQueryRepository { + + private final JPAQueryFactory queryFactory; + + private final QRefundJpaEntity refund = QRefundJpaEntity.refundJpaEntity; + private final QExamApplicationJpaEntity examApplication = QExamApplicationJpaEntity.examApplicationJpaEntity; + private final QApplicationJpaEntity application = QApplicationJpaEntity.applicationJpaEntity; + private final QProfileJpaEntity profile = QProfileJpaEntity.profileJpaEntity; + private final QPaymentJpaEntity payment = QPaymentJpaEntity.paymentJpaEntity; + + @Override + public Page searchAllRefunds(Pageable pageable) { + long total = baseQuery().fetch().size(); + + List content = baseQuery() + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .fetch() + .stream() + .map(this::mapToResponse) + .toList(); + + return new PageImpl<>(content, pageable, total); + + } + + @Override + public List searchAllRefundsForExcel() { + JPAQuery query = baseQuery(); + return query.fetch().stream() + .map(tuple -> { + log.info("tuple log : {} ", tuple); + return mapToExcel(tuple); + }) + .toList(); + } + + private JPAQuery baseQuery() { + return queryFactory + .select( + refund.id, + refund.refundStatus, + payment.paymentKey, + profile.userName, + profile.phoneNumber, + refund.createdAt, + payment.paymentMethod, + refund.reason + ) + .from(refund) + .join(examApplication).on(refund.examApplicationId.eq(examApplication.id)) + .join(application).on(examApplication.applicationId.eq(application.id)) + .join(payment).on(examApplication.id.eq(payment.examApplicationId)) + .join(profile).on(profile.userId.eq(application.userId)); + } + + private RefundListResponse mapToResponse(Tuple tuple) { + PaymentMethod paymentMethod = tuple.get(payment.paymentMethod); + return new RefundListResponse( + tuple.get(refund.id), + tuple.get(refund.refundStatus), + tuple.get(payment.paymentKey), + tuple.get(profile.userName), + tuple.get(profile.phoneNumber), + formatDate(tuple.get(refund.createdAt)), + paymentMethod != null ? paymentMethod.getName() : "N/A", + tuple.get(refund.reason) + ); + } + + private RefundExcelDto mapToExcel(Tuple tuple) { + return new RefundExcelDto( + tuple.get(payment.paymentKey), + tuple.get(refund.refundStatus), + tuple.get(profile.userName), + tuple.get(profile.phoneNumber), + tuple.get(refund.createdAt.stringValue()), + tuple.get(payment.paymentMethod), + tuple.get(refund.reason) + ); + } + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/domain/admin/StudentQueryRepositoryImpl.java b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/StudentQueryRepositoryImpl.java similarity index 81% rename from src/main/java/life/mosu/mosuserver/domain/admin/StudentQueryRepositoryImpl.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/jpa/StudentQueryRepositoryImpl.java index c5dda81f..d6801e01 100644 --- a/src/main/java/life/mosu/mosuserver/domain/admin/StudentQueryRepositoryImpl.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/jpa/StudentQueryRepositoryImpl.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.domain.admin; +package life.mosu.mosuserver.infra.persistence.jpa; import com.querydsl.core.Tuple; import com.querydsl.core.types.Predicate; @@ -7,8 +7,12 @@ import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import java.util.Optional; -import life.mosu.mosuserver.domain.application.QApplicationJpaEntity; -import life.mosu.mosuserver.domain.profile.QProfileJpaEntity; +import life.mosu.mosuserver.domain.admin.repository.StudentQueryRepository; +import life.mosu.mosuserver.domain.application.entity.QApplicationJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.Education; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.profile.entity.Grade; +import life.mosu.mosuserver.domain.profile.entity.QProfileJpaEntity; import life.mosu.mosuserver.presentation.admin.dto.StudentExcelDto; import life.mosu.mosuserver.presentation.admin.dto.StudentFilter; import life.mosu.mosuserver.presentation.admin.dto.StudentListResponse; @@ -118,31 +122,39 @@ private long getTotalCount(QProfileJpaEntity profile, String name, String phone) } private StudentListResponse mapToResponse(Tuple tuple, QProfileJpaEntity profile) { + Education education = tuple.get(profile.education); + Gender gender = tuple.get(profile.gender); + Grade grade = tuple.get(profile.grade); + Long examCount = Optional.ofNullable(tuple.get(examCountExpr)) .orElse(0L); return new StudentListResponse( tuple.get(profile.userName), tuple.get(profile.birth) != null ? tuple.get(profile.birth).toString() : null, tuple.get(profile.phoneNumber), - tuple.get(profile.gender) != null ? tuple.get(profile.gender).name() : null, - tuple.get(profile.education), + gender != null ? gender.getGenderName() : null, + education != null ? education.getEducationName() : null, tuple.get(profile.schoolInfo.schoolName), - tuple.get(profile.grade), + grade != null ? grade.getGradeName() : null, examCount.intValue() ); } private StudentExcelDto mapToExcel(Tuple tuple, QProfileJpaEntity profile) { + Education education = tuple.get(profile.education); + Gender gender = tuple.get(profile.gender); + Grade grade = tuple.get(profile.grade); + Long examCount = Optional.ofNullable(tuple.get(examCountExpr)) .orElse(0L); return new StudentExcelDto( tuple.get(profile.userName), tuple.get(profile.birth) != null ? tuple.get(profile.birth).toString() : null, tuple.get(profile.phoneNumber), - tuple.get(profile.gender) != null ? tuple.get(profile.gender).name() : null, - tuple.get(profile.education), + gender != null ? gender.getGenderName() : null, + education != null ? education.getEducationName() : null, tuple.get(profile.schoolInfo.schoolName), - tuple.get(profile.grade), + grade != null ? grade.getGradeName() : null, examCount.intValue() ); } diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheEvictor.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheEvictor.java new file mode 100644 index 00000000..cdd0f10a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheEvictor.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.infra.persistence.redis; + +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheEvictor; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; + +@RequiredArgsConstructor +public class DefaultRedisCacheEvictor implements CacheEvictor { + protected final RedisTemplate redisTemplate; + + @Override + public void evict(String key) { + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheLoader.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheLoader.java new file mode 100644 index 00000000..ded17058 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheLoader.java @@ -0,0 +1,30 @@ + package life.mosu.mosuserver.infra.persistence.redis; + + import java.util.Map; + import life.mosu.mosuserver.infra.persistence.redis.operator.CacheLoader; + import lombok.RequiredArgsConstructor; + import org.springframework.data.redis.core.RedisTemplate; + import org.springframework.stereotype.Component; + + @Component + @RequiredArgsConstructor + public class DefaultRedisCacheLoader implements CacheLoader { + protected final RedisTemplate redisTemplate; + + @Override + public void loadAll(Map values) { + values.forEach(this::load); + } + + @Override + public void load(String key, T value) { + + redisTemplate.opsForValue().set(key, value); + } + + @Override + public boolean exists(String key) { + Boolean result = redisTemplate.hasKey(key); + return result != null && result; + } + } diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheReader.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheReader.java new file mode 100644 index 00000000..0ea5e394 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheReader.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.infra.persistence.redis; + +import java.util.Optional; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheReader; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class DefaultRedisCacheReader implements CacheReader { + protected final RedisTemplate redisTemplate; + + + @Override + public Optional read(String key) { + return Optional.ofNullable(redisTemplate.opsForValue().get(key)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheWriter.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheWriter.java new file mode 100644 index 00000000..04e1172c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/DefaultRedisCacheWriter.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.infra.persistence.redis; + +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheWriter; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class DefaultRedisCacheWriter implements CacheWriter { + protected final RedisTemplate redisTemplate; + + @Override + public void writeOrUpdate(String key, T value) { + redisTemplate.opsForValue().set(key, value); + } + + @Override + public void increase(String key) { + redisTemplate.opsForValue().increment(key, 1); + } + + @Override + public void decrease(String key) { + redisTemplate.opsForValue().decrement(key, 1); + } + + @Override + public void delete(String key) { + redisTemplate.delete(key); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/KeyValueCacheManager.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/KeyValueCacheManager.java new file mode 100644 index 00000000..68c03fb4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/KeyValueCacheManager.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.infra.persistence.redis; + +import java.util.Map; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheAtomicOperator; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheLoader; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheReader; +import life.mosu.mosuserver.infra.persistence.redis.operator.CacheWriter; +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +public abstract class KeyValueCacheManager { + + protected final CacheLoader cacheLoader; + protected final CacheWriter cacheWriter; + protected final CacheReader cacheReader; + protected final Map> cacheAtomicOperatorMap; +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheAtomicOperator.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheAtomicOperator.java new file mode 100644 index 00000000..c91b40ce --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheAtomicOperator.java @@ -0,0 +1,6 @@ +package life.mosu.mosuserver.infra.persistence.redis.operator; + +public interface CacheAtomicOperator { + String getName(); + String getActionName(); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheEvictor.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheEvictor.java new file mode 100644 index 00000000..c8f764fa --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheEvictor.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.infra.persistence.redis.operator; + +public interface CacheEvictor { + void evict(K key); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheLoader.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheLoader.java new file mode 100644 index 00000000..c28cf27f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheLoader.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.infra.persistence.redis.operator; + +import java.util.Map; + +public interface CacheLoader { + void loadAll(Map values); + + void load(K key, V value); + + boolean exists(K key); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheReader.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheReader.java new file mode 100644 index 00000000..603ac677 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheReader.java @@ -0,0 +1,7 @@ +package life.mosu.mosuserver.infra.persistence.redis.operator; + +import java.util.Optional; + +public interface CacheReader { + Optional read(K key); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheWriter.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheWriter.java new file mode 100644 index 00000000..1fceda0e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/CacheWriter.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.infra.persistence.redis.operator; + +public interface CacheWriter { + void writeOrUpdate(K key, V value); + void increase(K key); + void decrease(K key); + void delete(K key); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/VoidCacheAtomicOperator.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/VoidCacheAtomicOperator.java new file mode 100644 index 00000000..0aa0776d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/operator/VoidCacheAtomicOperator.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.infra.persistence.redis.operator; + +public interface VoidCacheAtomicOperator extends CacheAtomicOperator{ + void execute(K key); +} diff --git a/src/main/java/life/mosu/mosuserver/infra/persistence/redis/support/LuaScriptExecutor.java b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/support/LuaScriptExecutor.java new file mode 100644 index 00000000..384e05af --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/redis/support/LuaScriptExecutor.java @@ -0,0 +1,18 @@ +package life.mosu.mosuserver.infra.persistence.redis.support; + +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.script.DefaultRedisScript; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class LuaScriptExecutor { + + private final RedisTemplate redisTemplate; + + public Long execute(DefaultRedisScript script, List keys, List args) { + return redisTemplate.execute(script, keys, args); + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/application/AttachmentService.java b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/AttachmentService.java similarity index 75% rename from src/main/java/life/mosu/mosuserver/infra/storage/application/AttachmentService.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/s3/AttachmentService.java index c3fc106e..083b892b 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/application/AttachmentService.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/AttachmentService.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.infra.storage.application; +package life.mosu.mosuserver.infra.persistence.s3; import java.util.List; diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/FileUploadHelper.java b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/FileUploadHelper.java similarity index 87% rename from src/main/java/life/mosu/mosuserver/infra/storage/FileUploadHelper.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/s3/FileUploadHelper.java index 7683de41..4781a061 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/FileUploadHelper.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/FileUploadHelper.java @@ -1,10 +1,9 @@ -package life.mosu.mosuserver.infra.storage; +package life.mosu.mosuserver.infra.persistence.s3; import java.util.ArrayList; import java.util.List; import java.util.function.BiFunction; import java.util.function.Function; -import life.mosu.mosuserver.infra.storage.application.S3Service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.data.jpa.repository.JpaRepository; @@ -39,7 +38,7 @@ public void saveAttachments( req = r; String s3Key = getKey.apply(req); updateTag(s3Key); - E entity = toEntityMapper.apply(req, parentId); //DTO -> ToEntity + E entity = toEntityMapper.apply(req, parentId); entitiesToSave.add(entity); } } catch (Exception e) { diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/application/S3Service.java b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/S3Service.java similarity index 66% rename from src/main/java/life/mosu/mosuserver/infra/storage/application/S3Service.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/s3/S3Service.java index 12fa4fd9..823f978b 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/application/S3Service.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/S3Service.java @@ -1,26 +1,31 @@ -package life.mosu.mosuserver.infra.storage.application; +package life.mosu.mosuserver.infra.persistence.s3; +import java.io.IOException; +import java.net.URLEncoder; +import java.nio.charset.StandardCharsets; +import java.time.Duration; import java.util.List; -import life.mosu.mosuserver.infra.storage.domain.File; -import life.mosu.mosuserver.infra.storage.domain.Folder; -import life.mosu.mosuserver.infra.storage.presentation.dto.FileUploadResponse; +import java.util.UUID; +import life.mosu.mosuserver.domain.file.File; +import life.mosu.mosuserver.domain.file.Folder; +import life.mosu.mosuserver.infra.persistence.s3.property.S3Properties; +import life.mosu.mosuserver.presentation.file.dto.FileUploadResponse; import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; +import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.web.multipart.MultipartFile; import software.amazon.awssdk.core.sync.RequestBody; import software.amazon.awssdk.services.s3.S3Client; -import software.amazon.awssdk.services.s3.model.*; +import software.amazon.awssdk.services.s3.model.DeleteObjectRequest; +import software.amazon.awssdk.services.s3.model.GetObjectRequest; +import software.amazon.awssdk.services.s3.model.PutObjectRequest; +import software.amazon.awssdk.services.s3.model.PutObjectTaggingRequest; +import software.amazon.awssdk.services.s3.model.S3Exception; +import software.amazon.awssdk.services.s3.model.Tag; +import software.amazon.awssdk.services.s3.model.Tagging; import software.amazon.awssdk.services.s3.presigner.S3Presigner; import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest; -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.time.Duration; -import java.util.UUID; -import lombok.extern.slf4j.Slf4j; - @Slf4j @Service @RequiredArgsConstructor @@ -28,13 +33,7 @@ public class S3Service { private final S3Client s3Client; private final S3Presigner s3Presigner; - - @Value("${aws.s3.bucket-name}") - private String bucketName; - - @Value("${aws.s3.presigned-url-expiration-minutes}") - private int preSignedUrlExpirationMinutes; - + private final S3Properties s3Properties; public FileUploadResponse uploadFile(MultipartFile file, Folder folder) { String sanitizedName = sanitizeFileName(file.getOriginalFilename()); @@ -43,7 +42,7 @@ public FileUploadResponse uploadFile(MultipartFile file, Folder folder) { try { s3Client.putObject( PutObjectRequest.builder() - .bucket(bucketName) + .bucket(s3Properties.getBucketName()) .key(s3Key) .tagging("status=temp") .contentType(file.getContentType()) @@ -62,7 +61,7 @@ public FileUploadResponse uploadFile(MultipartFile file, Folder folder) { public void deleteFile(File file) { try { s3Client.deleteObject(DeleteObjectRequest.builder() - .bucket(bucketName) + .bucket(s3Properties.getBucketName()) .key(file.getS3Key()) .build()); } catch (S3Exception e) { @@ -72,12 +71,12 @@ public void deleteFile(File file) { public void updateFileTagToActive(String key) { PutObjectTaggingRequest tagReq = PutObjectTaggingRequest.builder() - .bucket(bucketName) - .key(key) - .tagging(Tagging.builder() - .tagSet(List.of(Tag.builder().key("status").value("active").build())) - .build()) - .build(); + .bucket(s3Properties.getBucketName()) + .key(key) + .tagging(Tagging.builder() + .tagSet(List.of(Tag.builder().key("status").value("active").build())) + .build()) + .build(); s3Client.putObjectTagging(tagReq); } @@ -85,22 +84,24 @@ public void updateFileTagToActive(String key) { public String getUrl(File file) { return file.isPublic() ? getPublicUrl(file.getS3Key()) - : getPreSignedUrl(file.getS3Key(), Duration.ofMinutes(preSignedUrlExpirationMinutes)); + : getPreSignedUrl(file.getS3Key()); } public String getPublicUrl(String s3Key) { - return String.format("https://%s.s3.amazonaws.com/%s", bucketName, s3Key); + return String.format("https://%s.s3.amazonaws.com/%s", s3Properties.getBucketName(), s3Key); } - public String getPreSignedUrl(String s3Key, Duration expireDuration) { + public String getPreSignedUrl(String s3Key) { GetObjectRequest getObjectRequest = GetObjectRequest.builder() - .bucket(bucketName) + .bucket(s3Properties.getBucketName()) .key(s3Key) .build(); - + Duration expirationDuration = Duration.ofMinutes( + s3Properties.getPreSignedUrlExpirationMinutes() + ); GetObjectPresignRequest preSignRequest = GetObjectPresignRequest.builder() .getObjectRequest(getObjectRequest) - .signatureDuration(expireDuration) + .signatureDuration(expirationDuration) .build(); return s3Presigner.presignGetObject(preSignRequest).url().toString(); diff --git a/src/main/java/life/mosu/mosuserver/infra/property/S3Properties.java b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/property/S3Properties.java similarity index 64% rename from src/main/java/life/mosu/mosuserver/infra/property/S3Properties.java rename to src/main/java/life/mosu/mosuserver/infra/persistence/s3/property/S3Properties.java index 40e5826c..a9de9735 100644 --- a/src/main/java/life/mosu/mosuserver/infra/property/S3Properties.java +++ b/src/main/java/life/mosu/mosuserver/infra/persistence/s3/property/S3Properties.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.infra.property; +package life.mosu.mosuserver.infra.persistence.s3.property; import jakarta.annotation.PostConstruct; import lombok.Data; @@ -12,10 +12,12 @@ @Slf4j public class S3Properties { - private int presignedUrlExpirationMinutes; + private String bucketName; + private int preSignedUrlExpirationMinutes; @PostConstruct public void init() { - log.info("S3 Properties Loaded. Expiration Time: {}", presignedUrlExpirationMinutes); + log.info("S3 Properties Loaded. buckName: {}", bucketName); + log.info("S3 Properties Loaded. Expiration Time: {}", preSignedUrlExpirationMinutes); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/domain/AdmissionTicketFileEntity.java b/src/main/java/life/mosu/mosuserver/infra/storage/domain/AdmissionTicketFileEntity.java deleted file mode 100644 index 3e25a3a3..00000000 --- a/src/main/java/life/mosu/mosuserver/infra/storage/domain/AdmissionTicketFileEntity.java +++ /dev/null @@ -1,27 +0,0 @@ -package life.mosu.mosuserver.infra.storage.domain; - -import jakarta.persistence.*; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@Table(name="admission_ticket_file") -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) -public class AdmissionTicketFileEntity extends File { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(name="user_id") - private Long userId; - - @Builder - public AdmissionTicketFileEntity(Long userId, String fileName, String s3Key, Visibility visibility) { - super(fileName, s3Key, visibility); - this.userId = userId; - } -} diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/domain/Visibility.java b/src/main/java/life/mosu/mosuserver/infra/storage/domain/Visibility.java deleted file mode 100644 index a6b1fba5..00000000 --- a/src/main/java/life/mosu/mosuserver/infra/storage/domain/Visibility.java +++ /dev/null @@ -1,5 +0,0 @@ -package life.mosu.mosuserver.infra.storage.domain; - -public enum Visibility { - PUBLIC, PRIVATE -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/payment/TossPaymentClient.java b/src/main/java/life/mosu/mosuserver/infra/toss/TossPaymentClient.java similarity index 83% rename from src/main/java/life/mosu/mosuserver/infra/payment/TossPaymentClient.java rename to src/main/java/life/mosu/mosuserver/infra/toss/TossPaymentClient.java index 5fbaf4ad..30c7a989 100644 --- a/src/main/java/life/mosu/mosuserver/infra/payment/TossPaymentClient.java +++ b/src/main/java/life/mosu/mosuserver/infra/toss/TossPaymentClient.java @@ -1,8 +1,8 @@ -package life.mosu.mosuserver.infra.payment; +package life.mosu.mosuserver.infra.toss; -import life.mosu.mosuserver.infra.payment.dto.CancelTossPaymentResponse; -import life.mosu.mosuserver.infra.payment.dto.ConfirmTossPaymentResponse; -import life.mosu.mosuserver.infra.payment.dto.TossPaymentPayload; +import life.mosu.mosuserver.infra.toss.dto.CancelTossPaymentResponse; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; +import life.mosu.mosuserver.infra.toss.dto.TossPaymentPayload; import life.mosu.mosuserver.presentation.payment.dto.CancelPaymentRequest; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; @@ -29,9 +29,10 @@ public TossPaymentClient( this.restTemplate = restTemplate; this.tossPaymentBaseUrl = tossPaymentBaseUrl; } + public ConfirmTossPaymentResponse confirmPayment(TossPaymentPayload request) { String uri = UriComponentsBuilder.fromUriString(tossPaymentBaseUrl) - .path("/confirm") + .pathSegment("payments", "confirm") .toUriString(); return postToToss( @@ -42,9 +43,10 @@ public ConfirmTossPaymentResponse confirmPayment(TossPaymentPayload request) { ); } - public CancelTossPaymentResponse cancelPayment(String paymentKey, CancelPaymentRequest request) { + public CancelTossPaymentResponse cancelPayment(String paymentKey, + CancelPaymentRequest request) { String uri = UriComponentsBuilder.fromUriString(tossPaymentBaseUrl) - .pathSegment(paymentKey, "cancel") + .pathSegment("payments", paymentKey, "cancel") .toUriString(); return postToToss( @@ -68,7 +70,7 @@ private R postToToss(String uri, T body, Class responseType, String lo return response.getBody(); } catch (HttpStatusCodeException ex) { log.error("{} failed: {}", logPrefix, ex.getResponseBodyAsString(), ex); - throw ex; // 혹은 throw new TossPaymentException(...) + throw ex; } } } diff --git a/src/main/java/life/mosu/mosuserver/infra/toss/TossPaymentErrorHandler.java b/src/main/java/life/mosu/mosuserver/infra/toss/TossPaymentErrorHandler.java new file mode 100644 index 00000000..e2e89e42 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/toss/TossPaymentErrorHandler.java @@ -0,0 +1,64 @@ +package life.mosu.mosuserver.infra.toss; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import java.io.IOException; +import java.net.URI; +import java.nio.charset.StandardCharsets; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.infra.toss.dto.TossPaymentErrorResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpMethod; +import org.springframework.http.HttpStatus; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.client.ResponseErrorHandler; + +@Slf4j +@Component +@RequiredArgsConstructor +public class TossPaymentErrorHandler implements ResponseErrorHandler { + + private final ObjectMapper objectMapper; + + @Override + public boolean hasError(ClientHttpResponse response) throws IOException { + return response.getStatusCode().is4xxClientError() + || response.getStatusCode().is5xxServerError(); + } + + @Override + public void handleError(URI url, HttpMethod method, ClientHttpResponse response) + throws IOException { + + String responseBody = new String(response.getBody().readAllBytes(), StandardCharsets.UTF_8); + HttpStatus status = (HttpStatus) response.getStatusCode(); + + if (status == null) { + status = HttpStatus.INTERNAL_SERVER_ERROR; + } + + log.error("Toss API Error: URI={} Method={} Status={} Body={}", url, method, status, + responseBody); + + try { + TossPaymentErrorResponse errorResponse = objectMapper.readValue(responseBody, + TossPaymentErrorResponse.class); + + throw new CustomRuntimeException( + ErrorCode.PAYMENT_API_ERROR, + String.format("Toss Error Code: %s, Message: %s", errorResponse.getCode(), + errorResponse.getMessage()) + ); + + } catch (JsonProcessingException e) { + throw new CustomRuntimeException( + ErrorCode.PAYMENT_API_ERROR, + "Failed to parse Toss error response: " + responseBody + ); + } + } +} + diff --git a/src/main/java/life/mosu/mosuserver/infra/toss/TossVirtualAccountClient.java b/src/main/java/life/mosu/mosuserver/infra/toss/TossVirtualAccountClient.java new file mode 100644 index 00000000..dcf13ca3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/toss/TossVirtualAccountClient.java @@ -0,0 +1,69 @@ +package life.mosu.mosuserver.infra.toss; + +import life.mosu.mosuserver.infra.toss.dto.CreateVirtualAccountResponse; +import life.mosu.mosuserver.infra.toss.dto.TossVirtualAccountPayload; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.HttpEntity; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpMethod; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Component; +import org.springframework.web.client.HttpStatusCodeException; +import org.springframework.web.client.RestOperations; +import org.springframework.web.util.UriComponentsBuilder; + +@Slf4j +@Component +public class TossVirtualAccountClient { + + private final String tossPaymentBaseUrl; + private final RestOperations restTemplate; + private final String secretKey; + + public TossVirtualAccountClient( + RestOperations restTemplate, + @Value("${toss.api.base-url:https://default.url.com}") String tossPaymentBaseUrl, + @Value("${toss.secret-key:123}") String secretKey + ) { + this.restTemplate = restTemplate; + this.tossPaymentBaseUrl = tossPaymentBaseUrl; + this.secretKey = secretKey; + } + + public CreateVirtualAccountResponse createVirtualAccount(TossVirtualAccountPayload request) { + String uri = UriComponentsBuilder.fromUriString(tossPaymentBaseUrl) + .path("/virtual-accounts") + .toUriString(); + + return postToToss( + uri, + request, + CreateVirtualAccountResponse.class, + "[TOSS_CREATE_VIRTUAL_ACCOUNT]" + ); + } + + private R postToToss(String uri, T body, Class responseType, String logPrefix) { + try { + HttpHeaders headers = new HttpHeaders(); + headers.setContentType(MediaType.APPLICATION_JSON); + headers.setBasicAuth(secretKey, ""); + + HttpEntity entity = new HttpEntity<>(body, headers); + + ResponseEntity response = restTemplate.exchange( + uri, + HttpMethod.POST, + entity, + responseType + ); + log.info("{} success: {}", logPrefix, response.getBody()); + return response.getBody(); + } catch (HttpStatusCodeException ex) { + log.error("{} failed: {}", logPrefix, ex.getResponseBodyAsString(), ex); + throw ex; + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/toss/dto/CancelTossPaymentResponse.java b/src/main/java/life/mosu/mosuserver/infra/toss/dto/CancelTossPaymentResponse.java new file mode 100644 index 00000000..aac18514 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/toss/dto/CancelTossPaymentResponse.java @@ -0,0 +1,63 @@ +package life.mosu.mosuserver.infra.toss.dto; + +import java.util.List; +import life.mosu.mosuserver.domain.refund.entity.RefundJpaEntity; +import life.mosu.mosuserver.domain.refund.entity.RefundStatus; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Getter +@NoArgsConstructor(access = AccessLevel.PRIVATE) +@AllArgsConstructor +@ToString +public class CancelTossPaymentResponse { + + private String lastTransactionKey; + private String status; + private List cancels; + + public RefundJpaEntity toEntity(Long examApplicationId) { + CancelInfo recentCancelInfo = filterRecentCancelInfo(); + return RefundJpaEntity.of( + examApplicationId, + recentCancelInfo.getTransactionKey(), + recentCancelInfo.getCancelReason(), + recentCancelInfo.parseRefundStatus(), + recentCancelInfo.getCancelAmount(), + recentCancelInfo.getRefundableAmount() + ); + } + + private CancelInfo filterRecentCancelInfo() { + return cancels.stream() + .filter(cancel -> cancel.getTransactionKey().equals(lastTransactionKey)) + .findFirst() + .orElseThrow( + () -> new IllegalArgumentException("해당 transactionKey를 가진 환불 정보가 없습니다.")); + } + + // 여기서 부분적인 분제가 발생했나? + @Getter + private static class CancelInfo { + + private String transactionKey; + private String cancelReason; + private String cancelStatus; + private Integer cancelAmount; + private Integer refundableAmount; + + public RefundStatus parseRefundStatus() { + if ("DONE".equals(cancelStatus) + || "CANCEL".equals(cancelStatus) + || "PARTIAL_CANCEL".equals(cancelStatus) + ) { + return RefundStatus.DONE; + } else { + return RefundStatus.ABORTED; + } + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/infra/payment/dto/ConfirmTossPaymentResponse.java b/src/main/java/life/mosu/mosuserver/infra/toss/dto/ConfirmTossPaymentResponse.java similarity index 74% rename from src/main/java/life/mosu/mosuserver/infra/payment/dto/ConfirmTossPaymentResponse.java rename to src/main/java/life/mosu/mosuserver/infra/toss/dto/ConfirmTossPaymentResponse.java index 93883486..afb327d8 100644 --- a/src/main/java/life/mosu/mosuserver/infra/payment/dto/ConfirmTossPaymentResponse.java +++ b/src/main/java/life/mosu/mosuserver/infra/toss/dto/ConfirmTossPaymentResponse.java @@ -1,9 +1,9 @@ -package life.mosu.mosuserver.infra.payment.dto; +package life.mosu.mosuserver.infra.toss.dto; -import life.mosu.mosuserver.domain.payment.PaymentAmountVO; -import life.mosu.mosuserver.domain.payment.PaymentJpaEntity; -import life.mosu.mosuserver.domain.payment.PaymentMethod; -import life.mosu.mosuserver.domain.payment.PaymentStatus; +import life.mosu.mosuserver.domain.payment.entity.PaymentAmountVO; +import life.mosu.mosuserver.domain.payment.entity.PaymentJpaEntity; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; +import life.mosu.mosuserver.domain.payment.entity.PaymentStatus; import lombok.AccessLevel; import lombok.AllArgsConstructor; import lombok.Getter; @@ -27,8 +27,9 @@ public class ConfirmTossPaymentResponse { private Integer taxFreeAmount; private String method; - public PaymentJpaEntity toEntity(Long applicationId) { + public PaymentJpaEntity toEntity(Long applicationId, Long examApplicationId) { return PaymentJpaEntity.of( + examApplicationId, applicationId, paymentKey, orderId, diff --git a/src/main/java/life/mosu/mosuserver/infra/toss/dto/CreateVirtualAccountResponse.java b/src/main/java/life/mosu/mosuserver/infra/toss/dto/CreateVirtualAccountResponse.java new file mode 100644 index 00000000..e4e03853 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/toss/dto/CreateVirtualAccountResponse.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.infra.toss.dto; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.Setter; + +@JsonIgnoreProperties(ignoreUnknown = true) // 응답에 예상치 못한 필드가 있어도 무시 +@Getter +@Setter +@NoArgsConstructor +public class CreateVirtualAccountResponse { + + private VirtualAccount virtualAccount; + + @JsonIgnoreProperties(ignoreUnknown = true) + @Getter + @Setter + @NoArgsConstructor + public static class VirtualAccount { + + private String accountNumber; + // 필요시 다른 필드 추가 가능 + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/payment/dto/TossPaymentErrorResponse.java b/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossPaymentErrorResponse.java similarity index 82% rename from src/main/java/life/mosu/mosuserver/infra/payment/dto/TossPaymentErrorResponse.java rename to src/main/java/life/mosu/mosuserver/infra/toss/dto/TossPaymentErrorResponse.java index ff7d0549..d757219f 100644 --- a/src/main/java/life/mosu/mosuserver/infra/payment/dto/TossPaymentErrorResponse.java +++ b/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossPaymentErrorResponse.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.infra.payment.dto; +package life.mosu.mosuserver.infra.toss.dto; import lombok.AllArgsConstructor; import lombok.Getter; @@ -8,6 +8,7 @@ @NoArgsConstructor @AllArgsConstructor public class TossPaymentErrorResponse { + private String code; private String message; } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/infra/payment/dto/TossPaymentPayload.java b/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossPaymentPayload.java similarity index 70% rename from src/main/java/life/mosu/mosuserver/infra/payment/dto/TossPaymentPayload.java rename to src/main/java/life/mosu/mosuserver/infra/toss/dto/TossPaymentPayload.java index 0eaf1ce4..29b2c60f 100644 --- a/src/main/java/life/mosu/mosuserver/infra/payment/dto/TossPaymentPayload.java +++ b/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossPaymentPayload.java @@ -1,4 +1,4 @@ -package life.mosu.mosuserver.infra.payment.dto; +package life.mosu.mosuserver.infra.toss.dto; public record TossPaymentPayload( String paymentKey, diff --git a/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossVirtualAccountPayload.java b/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossVirtualAccountPayload.java new file mode 100644 index 00000000..82eca896 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/infra/toss/dto/TossVirtualAccountPayload.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.infra.toss.dto; + +import life.mosu.mosuserver.domain.virtualaccount.BankCode; + +public record TossVirtualAccountPayload( + Integer amount, + String orderId, + String orderName, + String customerName, + String customerEmail, + String bank, + Integer validHours +) { + + public static TossVirtualAccountPayload ofPartnership( + String orderId, + String customerName, + String customerEmail, + BankCode code, + int amount + ) { + return new TossVirtualAccountPayload( + amount, + orderId, + "[모수] 모의 수능 플랫폼 제휴", + customerName, + customerEmail, + code.getSubCode(), + 48 + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminApplicationController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminApplicationController.java new file mode 100644 index 00000000..3eb2697c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminApplicationController.java @@ -0,0 +1,51 @@ +package life.mosu.mosuserver.presentation.admin; + +import jakarta.validation.Valid; +import java.util.List; +import life.mosu.mosuserver.application.admin.AdminApplicationService; +import life.mosu.mosuserver.global.annotation.ExcelDownload; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.dto.ApplicationExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; +import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/applications") +public class AdminApplicationController { + + private final AdminApplicationService adminApplicationService; + + @GetMapping() + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity>> getAll( + @Valid @ModelAttribute ApplicationFilter filter, + @PageableDefault(size = 10) Pageable pageable + ) { + Page result = adminApplicationService.getByFilterAndPage(filter, + pageable); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "신청 목록 조회 성공", result)); + } + + @GetMapping( + value = "/excel") + @ExcelDownload( + fileName = "신청 목록.xlsx", + dtoClass = ApplicationExcelDto.class + ) + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public List downloadApplicationInfo() { + return adminApplicationService.getExcelData(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminBannerController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminBannerController.java new file mode 100644 index 00000000..eb852b2f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminBannerController.java @@ -0,0 +1,63 @@ +package life.mosu.mosuserver.presentation.admin; + +import java.util.List; +import life.mosu.mosuserver.application.admin.AdminBannerService; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.dto.BannerInfoResponse; +import life.mosu.mosuserver.presentation.admin.dto.BannerRequest; +import life.mosu.mosuserver.presentation.admin.dto.BannerResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/banners") +public class AdminBannerController { + + private final AdminBannerService adminBannerService; + + @PostMapping + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> create( + @RequestBody BannerRequest request) { + adminBannerService.create(request); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "배너 등록 성공")); + } + + @GetMapping + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity>> getAll() { + List responses = adminBannerService.getAll(); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "배너 전체 조회 성공", responses)); + } + + @GetMapping("/{bannerId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> getByBannerId( + @PathVariable("bannerId") Long bannerId + ) { + BannerInfoResponse response = adminBannerService.getByBannerId(bannerId); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "배너 조회 성공", response)); + } + + @DeleteMapping("/{bannerId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> deleteByBannerId( + @PathVariable("bannerId") Long bannerId + ) { + adminBannerService.deleteByBannerId(bannerId); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.NO_CONTENT, "배너가 정상적으로 삭제 되었습니다.")); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminController.java deleted file mode 100644 index 307d44b5..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminController.java +++ /dev/null @@ -1,99 +0,0 @@ -package life.mosu.mosuserver.presentation.admin; - -import jakarta.servlet.http.HttpServletResponse; -import jakarta.validation.Valid; -import java.io.IOException; -import java.net.URLEncoder; -import java.nio.charset.StandardCharsets; -import java.util.List; -import life.mosu.mosuserver.application.admin.AdminService; -import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.global.util.excel.SimpleExcelFile; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationExcelDto; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; -import life.mosu.mosuserver.presentation.admin.dto.SchoolLunchResponse; -import life.mosu.mosuserver.presentation.admin.dto.StudentExcelDto; -import life.mosu.mosuserver.presentation.admin.dto.StudentFilter; -import life.mosu.mosuserver.presentation.admin.dto.StudentListResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.ModelAttribute; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequiredArgsConstructor -@RequestMapping("/admin") -public class AdminController implements AdminControllerDocs { - - private final AdminService adminService; - - @GetMapping("/students") -// @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") - public ResponseEntity>> getStudents( - @Valid @ModelAttribute StudentFilter filter, - Pageable pageable - ) { - Page result = adminService.getStudents(filter, pageable); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "학생 목록 조회 성공", result)); - } - - @GetMapping("/excel/students") -// @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") - public void downloadStudentInfo( - HttpServletResponse response) throws IOException { - String fileName = URLEncoder.encode("학생정보목록.xlsx", StandardCharsets.UTF_8) - .replaceAll("\\+", "%20"); - - response.setContentType( - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + fileName); - - List data = adminService.getStudentExcelData(); - SimpleExcelFile excelFile = new SimpleExcelFile<>(data, - StudentExcelDto.class); - - excelFile.write(response.getOutputStream()); - } - - @GetMapping("/lunches") -// @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") - public ResponseEntity>> getLunchCounts() { - List result = adminService.getLunchCounts(); - return ResponseEntity.ok( - ApiResponseWrapper.success(HttpStatus.OK, "학교별 도시락 신청 수 조회 성공", result)); - } - - @GetMapping("/applications") -// @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") - public ResponseEntity>> getApplications( - @Valid @ModelAttribute ApplicationFilter filter, - Pageable pageable - ) { - Page result = adminService.getApplications(filter, pageable); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "신청 목록 조회 성공", result)); - } - - @GetMapping("/excel/applications") -// @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") - public void downloadApplicationInfo(HttpServletResponse response) throws IOException { - String fileName = URLEncoder.encode("신청 목록.xlsx", StandardCharsets.UTF_8) - .replaceAll("\\+", "%20"); - - response.setContentType( - "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); - response.setHeader("Content-Disposition", "attachment; filename*=UTF-8''" + fileName); - - List data = adminService.getApplicationExcelData(); - SimpleExcelFile excelFile = new SimpleExcelFile<>(data, - ApplicationExcelDto.class); - - excelFile.write(response.getOutputStream()); - } - -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminControllerDocs.java deleted file mode 100644 index 9d513682..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminControllerDocs.java +++ /dev/null @@ -1,75 +0,0 @@ -package life.mosu.mosuserver.presentation.admin; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; -import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationFilter; -import life.mosu.mosuserver.presentation.admin.dto.ApplicationListResponse; -import life.mosu.mosuserver.presentation.admin.dto.SchoolLunchResponse; -import life.mosu.mosuserver.presentation.admin.dto.StudentFilter; -import life.mosu.mosuserver.presentation.admin.dto.StudentListResponse; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.http.ResponseEntity; - -@Tag(name = "Admin API", description = "관리자용 데이터 조회 및 엑셀 다운로드 API 명세") -public interface AdminControllerDocs { - - @Operation(summary = "학생 목록 조회", description = "필터 조건에 따른 학생 목록을 페이징하여 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "학생 목록 조회 성공", - content = @Content(schema = @Schema(implementation = StudentListResponse.class))) - }) - ResponseEntity>> getStudents( - @Parameter(description = "학생 목록 조회 필터") - StudentFilter filter, - - @Parameter(hidden = true) - Pageable pageable - ); - - @Operation(summary = "학생 정보 엑셀 다운로드", description = "전체 학생 정보를 엑셀 파일로 다운로드합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "엑셀 다운로드 성공 (응답은 바이너리)") - }) - void downloadStudentInfo( - @Parameter(hidden = true) HttpServletResponse response - ) throws IOException; - - @Operation(summary = "학교별 도시락 신청 수 조회", description = "학교별 도시락 신청 수를 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "도시락 신청 수 조회 성공", - content = @Content(schema = @Schema(implementation = SchoolLunchResponse.class))) - }) - ResponseEntity>> getLunchCounts(); - - @Operation(summary = "신청 목록 조회", description = "필터 조건에 따른 신청 목록을 페이징하여 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "신청 목록 조회 성공", - content = @Content(schema = @Schema(implementation = ApplicationListResponse.class))) - }) - ResponseEntity>> getApplications( - @Parameter(description = "신청 목록 조회 필터") - ApplicationFilter filter, - - @Parameter(hidden = true) - Pageable pageable - ); - - @Operation(summary = "신청 목록 엑셀 다운로드", description = "전체 신청 목록을 엑셀 파일로 다운로드합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "엑셀 다운로드 성공") - }) - void downloadApplicationInfo( - @Parameter(hidden = true) HttpServletResponse response - ) throws IOException; - -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminDashboardController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminDashboardController.java new file mode 100644 index 00000000..4ee6e698 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminDashboardController.java @@ -0,0 +1,28 @@ +package life.mosu.mosuserver.presentation.admin; + +import life.mosu.mosuserver.application.admin.AdminDashboardService; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.dto.DashBoardResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/dashboard") +public class AdminDashboardController { + + private final AdminDashboardService adminDashboardService; + + @GetMapping + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> getAll() { + DashBoardResponse response = adminDashboardService.getAll(); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "대시보드 정보 수 조회 성공", response)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminInquiryController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminInquiryController.java new file mode 100644 index 00000000..cb3b7623 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminInquiryController.java @@ -0,0 +1,77 @@ +package life.mosu.mosuserver.presentation.admin; + +import life.mosu.mosuserver.application.inquiry.InquiryAnswerService; +import life.mosu.mosuserver.application.inquiry.InquiryService; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryStatus; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.docs.AdminInquiryControllerDocs; +import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerRequest; +import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerUpdateRequest; +import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/inquiry") +public class AdminInquiryController implements AdminInquiryControllerDocs { + private final InquiryService inquiryService; + private final InquiryAnswerService inquiryAnswerService; + + @GetMapping("/list") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity>> getInquiryList( + @RequestParam(required = false) InquiryStatus status, + @RequestParam(required = false, defaultValue = "id") String sort, + @RequestParam(required = false, defaultValue = "true") boolean asc, + @PageableDefault(size = 10) Pageable pageable + ) { + Page inquiries = inquiryService.getInquiries(status, sort, asc, + pageable); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "질문 목록 조회 성공", inquiries)); + } + + + @PostMapping("/{postId}/answer") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> inquiryAnswer( + @PathVariable Long postId, + @RequestBody InquiryAnswerRequest request + ) { + inquiryAnswerService.createInquiryAnswer(postId, request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "답변 등록 성공")); + } + + @PutMapping("/{postId}/answer") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> updateInquiryAnswer( + @PathVariable Long postId, + @RequestBody InquiryAnswerUpdateRequest request + ) { + inquiryAnswerService.updateInquiryAnswer(postId, request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "답변 수정 성공")); + } + + @DeleteMapping("/{postId}/answer") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> deleteInquiryAnswer( + @PathVariable Long postId) { + inquiryAnswerService.deleteInquiryAnswer(postId); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "답변 삭제 성공")); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminRecommendationController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminRecommendationController.java new file mode 100644 index 00000000..b7f344bd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminRecommendationController.java @@ -0,0 +1,30 @@ +package life.mosu.mosuserver.presentation.admin; + +import java.util.List; +import life.mosu.mosuserver.application.admin.AdminRecommendationService; +import life.mosu.mosuserver.global.annotation.ExcelDownload; +import life.mosu.mosuserver.presentation.admin.dto.RecommendationExcelDto; +import lombok.RequiredArgsConstructor; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/recommendation") +public class AdminRecommendationController { + + private final AdminRecommendationService adminRecommendationService; + + @GetMapping( + value = "/excel") + @ExcelDownload( + fileName = "추천인 목록.xlsx", + dtoClass = RecommendationExcelDto.class + ) + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public List downloadApplicationInfo() { + return adminRecommendationService.getExcelData(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminRefundController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminRefundController.java new file mode 100644 index 00000000..45efaea4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminRefundController.java @@ -0,0 +1,46 @@ +package life.mosu.mosuserver.presentation.admin; + +import java.util.List; +import life.mosu.mosuserver.application.admin.AdminRefundService; +import life.mosu.mosuserver.global.annotation.ExcelDownload; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.dto.RefundExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.RefundListResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/refunds") +public class AdminRefundController { + + private final AdminRefundService adminRefundService; + + @GetMapping + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity>> getAll( + @PageableDefault(size = 15) Pageable pageable + ) { + Page responses = adminRefundService.getByPage(pageable); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "환불 신청 수 조회 성공", responses)); + } + + @GetMapping(value = "/excel", produces = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet") + @ExcelDownload( + fileName = "환불 목록.xlsx", + dtoClass = RefundExcelDto.class + ) + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public List downloadRefundInfo() { + return adminRefundService.getExcelData(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/AdminStudentController.java b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminStudentController.java new file mode 100644 index 00000000..8a87eefa --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/AdminStudentController.java @@ -0,0 +1,49 @@ +package life.mosu.mosuserver.presentation.admin; + +import jakarta.validation.Valid; +import java.util.List; +import life.mosu.mosuserver.application.admin.AdminStudentService; +import life.mosu.mosuserver.global.annotation.ExcelDownload; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.dto.StudentExcelDto; +import life.mosu.mosuserver.presentation.admin.dto.StudentFilter; +import life.mosu.mosuserver.presentation.admin.dto.StudentListResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.web.PageableDefault; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.ModelAttribute; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/admin/students") +public class AdminStudentController { + + private final AdminStudentService adminStudentService; + + @GetMapping() + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity>> getAll( + @Valid @ModelAttribute StudentFilter filter, + @PageableDefault(size = 10) Pageable pageable + ) { + Page result = adminStudentService.getByFilterAndPage(filter, pageable); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "학생 목록 조회 성공", result)); + } + + @GetMapping("/excel") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @ExcelDownload( + fileName = "학생 목록.xlsx", + dtoClass = StudentExcelDto.class + ) + public List downloadStudentInfo() { + return adminStudentService.getExcelData(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/annotation/RefreshTokenHeader.java b/src/main/java/life/mosu/mosuserver/presentation/admin/annotation/RefreshTokenHeader.java new file mode 100644 index 00000000..542dd354 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/annotation/RefreshTokenHeader.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.presentation.admin.annotation; + +import java.lang.annotation.Documented; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +@Documented +public @interface RefreshTokenHeader { +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/docs/AdminInquiryControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/admin/docs/AdminInquiryControllerDocs.java new file mode 100644 index 00000000..2985ca47 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/docs/AdminInquiryControllerDocs.java @@ -0,0 +1,70 @@ +package life.mosu.mosuserver.presentation.admin.docs; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryStatus; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerRequest; +import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerUpdateRequest; +import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; + +@Tag(name = "Admin Inquiry API", description = "1:1 문의 관련 API 명세") +public interface AdminInquiryControllerDocs { + @Operation(summary = "문의 목록 조회", description = "조건에 맞는 문의 목록을 페이징하여 조회합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "질문 목록 조회 성공", + content = @Content(schema = @Schema(implementation = Page.class))) + }) + ResponseEntity>> getInquiryList( + @Parameter(name = "status", description = "문의 상태 (PENDING, COMPLETED)", in = ParameterIn.QUERY) + @RequestParam(required = false) InquiryStatus status, + @Parameter(name = "sort", description = "정렬 기준 필드", in = ParameterIn.QUERY) + @RequestParam(required = false, defaultValue = "id") String sort, + @Parameter(name = "asc", description = "오름차순 정렬 여부", in = ParameterIn.QUERY) + @RequestParam(required = false, defaultValue = "true") boolean asc, + @Parameter(hidden = true) Pageable pageable + ); + + @Operation(summary = "문의 답변 등록 (관리자용)", description = "특정 문의에 대한 답변을 등록합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "답변 등록 성공") + }) + ResponseEntity> inquiryAnswer( + @Parameter(name = "postId", description = "답변을 등록할 문의의 ID", in = ParameterIn.PATH) + @PathVariable Long postId, + @Parameter(description = "답변 내용") + @RequestBody InquiryAnswerRequest request + ); + + @Operation(summary = "문의 답변 수정 (관리자용)", description = "특정 문의에 대한 답변을 수정합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "답변 수정 성공") + }) + ResponseEntity> updateInquiryAnswer( + @Parameter(name = "postId", description = "답변을 수정할 문의의 ID", in = ParameterIn.PATH) + @PathVariable Long postId, + @Parameter(description = "수정할 답변 내용") + @RequestBody InquiryAnswerUpdateRequest request + ); + + @Operation(summary = "문의 답변 삭제 (관리자용)", description = "특정 문의에 대한 답변을 삭제합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "답변 삭제 성공") + }) + ResponseEntity> deleteInquiryAnswer( + @Parameter(name = "postId", description = "답변을 삭제할 문의의 ID", in = ParameterIn.PATH) + @PathVariable Long postId + ); +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationExcelDto.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationExcelDto.java index e2315f67..6c15a106 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationExcelDto.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationExcelDto.java @@ -3,86 +3,30 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.util.Set; -import life.mosu.mosuserver.domain.payment.PaymentMethod; -import life.mosu.mosuserver.domain.payment.PaymentStatus; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; +import life.mosu.mosuserver.domain.payment.entity.PaymentStatus; import life.mosu.mosuserver.global.annotation.ExcelColumn; -import lombok.AllArgsConstructor; -import lombok.Getter; @Schema(description = "신청 엑셀 데이터 DTO") -@AllArgsConstructor -@Getter -public class ApplicationExcelDto { +public record ApplicationExcelDto( + @Schema(description = "결제 번호", example = "PAY-20250710-0001") @ExcelColumn(headerName = "결제 번호") String paymentNumber, + @Schema(description = "수험 번호", example = "2025-00001") @ExcelColumn(headerName = "수험 번호") String examinationNumber, + @Schema(description = "수험자 이름", example = "홍길동") @ExcelColumn(headerName = "이름") String name, + @Schema(description = "성별", example = "남자") @ExcelColumn(headerName = "성별") String gender, + @Schema(description = "생년월일", example = "2005-05-10") @ExcelColumn(headerName = "생년월일") LocalDate birth, + @Schema(description = "전화번호", example = "01012345678") @ExcelColumn(headerName = "전화번호") String phoneNumber, + @Schema(description = "보호자 전화번호", example = "01098765432") @ExcelColumn(headerName = "보호자 전화번호") String parentPhoneNumber, + @Schema(description = "보호자 전화번호", example = "01098765432") @ExcelColumn(headerName = "추천자 전화번호") String recommenderPhoneNumber, + @Schema(description = "학력", example = "고등학교 재학") @ExcelColumn(headerName = "학력") String educationLevel, + @Schema(description = "학교명", example = "서울고등학교") @ExcelColumn(headerName = "학교명") String schoolName, + @Schema(description = "학년", example = "3학년") @ExcelColumn(headerName = "학년") String grade, + @Schema(description = "도시락 신청 여부", example = "신청함") @ExcelColumn(headerName = "도시락") String lunch, + @Schema(description = "응시 과목 목록", example = "[\"국어\", \"수학\"]") @ExcelColumn(headerName = "응시 과목") Set subjects, + @Schema(description = "시험 학교", example = "서울고등학교") @ExcelColumn(headerName = "시험 학교") String examSchoolName, + @Schema(description = "시험 일자", example = "2025-08-10") @ExcelColumn(headerName = "시험 일자") LocalDate examDate, + @Schema(description = "수험표 이미지 URL", example = "https://s3.amazonaws.com/bucket/admission/2025-00001.jpg") @ExcelColumn(headerName = "수험표 사진") String admissionTicketImage, + @Schema(description = "결제 상태", example = "COMPLETED") @ExcelColumn(headerName = "결제 상태") PaymentStatus paymentStatus, + @Schema(description = "결제 방법", example = "CARD") @ExcelColumn(headerName = "결제 방법") PaymentMethod paymentMethod, + @Schema(description = "신청 일시", example = "2025-07-10 15:30:00") @ExcelColumn(headerName = "신청 일시") String applicationDate) { - @Schema(description = "결제 번호", example = "PAY-20250710-0001") - @ExcelColumn(headerName = "결제 번호") - private final String paymentNumber; - - @Schema(description = "수험 번호", example = "2025-00001") - @ExcelColumn(headerName = "수험 번호") - private final String examinationNumber; - - @Schema(description = "수험자 이름", example = "홍길동") - @ExcelColumn(headerName = "이름") - private final String name; - - @Schema(description = "성별", example = "남자") - @ExcelColumn(headerName = "성별") - private final String gender; - - @Schema(description = "생년월일", example = "2005-05-10") - @ExcelColumn(headerName = "생년월일") - private final LocalDate birth; - - @Schema(description = "전화번호", example = "01012345678") - @ExcelColumn(headerName = "전화번호") - private final String phoneNumber; - - @Schema(description = "보호자 전화번호", example = "01098765432") - @ExcelColumn(headerName = "보호자 전화번호") - private final String guardianPhoneNumber; - - @Schema(description = "학력", example = "고등학교 재학") - @ExcelColumn(headerName = "학력") - private final String educationLevel; - - @Schema(description = "학교명", example = "서울고등학교") - @ExcelColumn(headerName = "학교명") - private final String schoolName; - - @Schema(description = "학년", example = "3학년") - @ExcelColumn(headerName = "학년") - private final String grade; - - @Schema(description = "도시락 신청 여부", example = "신청함") - @ExcelColumn(headerName = "도시락") - private final String lunch; - - @Schema(description = "응시 과목 목록", example = "[\"국어\", \"수학\"]") - @ExcelColumn(headerName = "응시 과목") - private final Set subjects; - - @Schema(description = "시험 학교", example = "서울고등학교") - @ExcelColumn(headerName = "시험 학교") - private final String examSchoolName; - - @Schema(description = "시험 일자", example = "2025-08-10") - @ExcelColumn(headerName = "시험 일자") - private final LocalDate examDate; - - @Schema(description = "수험표 이미지 URL", example = "https://s3.amazonaws.com/bucket/admission/2025-00001.jpg") - @ExcelColumn(headerName = "수험표 사진") - private final String admissionTicketImage; - - @Schema(description = "결제 상태", example = "COMPLETED") - @ExcelColumn(headerName = "결제 상태") - private final PaymentStatus paymentStatus; - - @Schema(description = "결제 방법", example = "CARD") - @ExcelColumn(headerName = "결제 방법") - private final PaymentMethod paymentMethod; - - @Schema(description = "신청 일시", example = "2025-07-10 15:30:00") - @ExcelColumn(headerName = "신청 일시") - private final String applicationDate; } diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationFilter.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationFilter.java index cd1b68d6..296829d6 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationFilter.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationFilter.java @@ -2,7 +2,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; -import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; @Schema(description = "신청 목록 필터 DTO") public record ApplicationFilter( @@ -10,8 +9,7 @@ public record ApplicationFilter( @Schema(description = "이름 필터", example = "홍길동") String name, - @Schema(description = "전화번호 필터", example = "01012345678") - @PhoneNumberPattern + @Schema(description = "전화번호 필터", example = "010-1234-5678") String phone, @Schema(description = "신청 일자 필터", example = "2025-07-10") diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationListResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationListResponse.java index 99f4a04c..2e24ea12 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationListResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ApplicationListResponse.java @@ -3,13 +3,9 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; import java.time.LocalDateTime; -import java.util.Set; -import life.mosu.mosuserver.domain.payment.PaymentMethod; -import life.mosu.mosuserver.domain.payment.PaymentStatus; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.profile.Grade; -import life.mosu.mosuserver.presentation.applicationschool.dto.AdmissionTicketResponse; +import java.util.List; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; +import life.mosu.mosuserver.domain.payment.entity.PaymentStatus; @Schema(description = "관리자 신청 목록 응답 DTO") public record ApplicationListResponse( @@ -23,8 +19,8 @@ public record ApplicationListResponse( @Schema(description = "수험자 이름", example = "홍길동") String name, - @Schema(description = "성별", example = "MALE") - Gender gender, + @Schema(description = "성별", example = "남성") + String gender, @Schema(description = "생년월일", example = "2005-05-10") LocalDate birth, @@ -33,22 +29,25 @@ public record ApplicationListResponse( String phoneNumber, @Schema(description = "보호자 전화번호", example = "010-9876-5432") - String guardianPhoneNumber, + String parentPhoneNumber, - @Schema(description = "학력 (예: ENROLLED, GRADUATED)", example = "GRADUATED") - Education educationLevel, + @Schema(description = "학력 (예: 재학생, 졸업생)", example = "재학생") + String educationLevel, @Schema(description = "학교명", example = "대치중학교") String schoolName, - @Schema(description = "학년", example = "HIGH_3") - Grade grade, + @Schema(description = "학년", example = "고등학교 1학년") + String grade, - @Schema(description = "도시락 신청 여부", example = "NONE") - String lunch, + @Schema(description = "도시락 신청 여부", example = "true, false") + Boolean lunch, + + @Schema(description = "도시락 이름", example = "불고기 도시락") + String lunchName, @Schema(description = "응시 과목 목록", example = "[\"생활과 윤리\", \"정치와 법\"]") - Set subjects, + List subjects, @Schema(description = "시험 학교 이름", example = "서울고등학교") String examSchoolName, @@ -69,7 +68,7 @@ public record ApplicationListResponse( LocalDateTime applicationDate, @Schema(description = "수험표 응답 정보") - AdmissionTicketResponse admissionTicket + ExamTicketResponse examTicket ) { diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerInfoResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerInfoResponse.java new file mode 100644 index 00000000..56e01321 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerInfoResponse.java @@ -0,0 +1,35 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; + +public record BannerInfoResponse( + String title, + LocalDateTime deadLine, + String link, + AttachmentResponse attachment + +) { + + public static BannerInfoResponse of( + String title, + LocalDateTime deadLine, + String link, + AttachmentResponse attachment + ) { + return new BannerInfoResponse(title, deadLine, link, attachment); + } + + + public record AttachmentResponse( + @Schema(description = "파일 이름", example = "image.png") + String fileName, + @Schema(description = "파일 URL", example = "https://example.com/image.png") + String url) { + + public static AttachmentResponse of(String fileName, String url) { + return new AttachmentResponse(fileName, url); + } + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerRequest.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerRequest.java new file mode 100644 index 00000000..1abb7a7d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerRequest.java @@ -0,0 +1,26 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.banner.BannerJpaEntity; +import life.mosu.mosuserver.domain.file.Visibility; +import life.mosu.mosuserver.presentation.common.FileRequest; + +public record BannerRequest( + String title, + LocalDateTime deadLine, + String link, + FileRequest file +) { + + //배너 등록할 때 fileRequest 가 없을 때는 어떤 식으로 하면 되는지 + public BannerJpaEntity toEntity() { + return BannerJpaEntity.builder() + .fileName(file != null ? file.fileName() : null) + .s3Key(file != null ? file.s3Key() : null) + .visibility(Visibility.PUBLIC) + .title(title) + .deadline(deadLine) + .link(link) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerResponse.java new file mode 100644 index 00000000..8b2d3fb7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/BannerResponse.java @@ -0,0 +1,18 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.banner.BannerJpaEntity; + +public record BannerResponse( + Long id, + String title, + String createdAt, + LocalDateTime deadLine +) { + + public static BannerResponse of(BannerJpaEntity banner) { + return new BannerResponse(banner.getId(), banner.getTitle(), banner.getCreatedAt(), + banner.getDeadline()); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/DashBoardResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/DashBoardResponse.java new file mode 100644 index 00000000..0b63f660 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/DashBoardResponse.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +public record DashBoardResponse( + Long applicationCounts, + Long refundCounts, + Long userCounts +) { + + public static DashBoardResponse of(Long applicationCounts, Long refundCounts, Long userCounts) { + return new DashBoardResponse(applicationCounts, refundCounts, userCounts); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/AdmissionTicketResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ExamTicketResponse.java similarity index 50% rename from src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/AdmissionTicketResponse.java rename to src/main/java/life/mosu/mosuserver/presentation/admin/dto/ExamTicketResponse.java index aee32c89..cc2f4e18 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/AdmissionTicketResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/ExamTicketResponse.java @@ -1,14 +1,12 @@ -package life.mosu.mosuserver.presentation.applicationschool.dto; +package life.mosu.mosuserver.presentation.admin.dto; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; -import java.util.Set; - -@Schema(description = "수험표 응답 DTO") -public record AdmissionTicketResponse( +import java.util.List; +public record ExamTicketResponse( @Schema(description = "수험표 이미지 URL", example = "https://s3.amazonaws.com/bucket/admission/2025-00001.jpg") - String admissionTicketImageUrl, + String examTicketImageUrl, @Schema(description = "응시자 이름", example = "홍길동") String userName, @@ -17,31 +15,47 @@ public record AdmissionTicketResponse( LocalDate birth, @Schema(description = "수험 번호", example = "20250001") - String examinationNumber, + String examNumber, @Schema(description = "응시 과목 목록", example = "[\"생명과학\", \"지구과학\"]") - Set subjects, + List subjects, @Schema(description = "응시 학교명", example = "대치중학교") String schoolName - ) { - public static AdmissionTicketResponse of( - String admissionTicketImageUrl, + public static ExamTicketResponse of( + String examTicketImageUrl, String userName, LocalDate birth, - String examinationNumber, - Set subjects, + String examNumber, + List subjects, String schoolName ) { - return new AdmissionTicketResponse( - admissionTicketImageUrl, + return new ExamTicketResponse( + examTicketImageUrl, + userName, + birth, + examNumber, + subjects, + schoolName + ); + } + + public static ExamTicketResponse ofWithoutExamTicket( + String userName, + LocalDate birth, + String examNumber, + List subjects, + String schoolName) { + + return new ExamTicketResponse( + null, userName, birth, - examinationNumber, + examNumber, subjects, schoolName ); } -} +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/LunchNameAndCountResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/LunchNameAndCountResponse.java new file mode 100644 index 00000000..f70562ed --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/LunchNameAndCountResponse.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +public record LunchNameAndCountResponse( + String lunchName, + Long count +) { + + public static LunchNameAndCountResponse of(String lunchName, Long count) { + return new LunchNameAndCountResponse(lunchName, count); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RecommendationExcelDto.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RecommendationExcelDto.java new file mode 100644 index 00000000..9cd9e401 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RecommendationExcelDto.java @@ -0,0 +1,56 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import life.mosu.mosuserver.domain.admin.projection.RecommendationDetailsProjection; +import life.mosu.mosuserver.global.annotation.ExcelColumn; + +@Schema(description = "추천 엑셀 데이터 DTO") +public record RecommendationExcelDto( + @Schema(description = "추천자 이름", example = "김철수") + @ExcelColumn(headerName = "추천자 이름") + String recommenderName, + + @Schema(description = "추천자 전화번호", example = "010-1234-5678") + @ExcelColumn(headerName = "추천자 전화번호") + String recommenderPhoneNumber, + + @Schema(description = "성별", example = "남자") + @ExcelColumn(headerName = "성별") + String gender, + + @Schema(description = "생년월일", example = "1990-04-15") + @ExcelColumn(headerName = "생년월일") + LocalDate birth, + + @Schema(description = "피추천자 이름", example = "이영희") + @ExcelColumn(headerName = "피추천자 이름") + String recommendeeName, + + @Schema(description = "피추천자 전화번호", example = "010-9876-5432") + @ExcelColumn(headerName = "피추천자 전화번호") + String recommendeePhoneNumber, + + @Schema(description = "피추천자 은행명", example = "신한은행") + @ExcelColumn(headerName = "피추천자 은행명") + String recommendeeBank, + + @Schema(description = "피추천자 계좌번호", example = "110123456789") + @ExcelColumn(headerName = "피추천자 계좌번호") + String recommendeeAccountNumber +) { + + public static RecommendationExcelDto of(RecommendationDetailsProjection projection) { + return new RecommendationExcelDto( + projection.recommenderName(), + projection.recommenderPhoneNumber(), + projection.gender().getGenderName(), + projection.birth(), + projection.recommendeeName(), + projection.recommendeePhoneNumber(), + projection.recommendeeBank(), + projection.recommendeeAccountNumber() + ); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RefundExcelDto.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RefundExcelDto.java new file mode 100644 index 00000000..4eb60bcc --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RefundExcelDto.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.presentation.admin.dto; + + +import io.swagger.v3.oas.annotations.media.Schema; +import life.mosu.mosuserver.domain.payment.entity.PaymentMethod; +import life.mosu.mosuserver.domain.refund.entity.RefundStatus; +import life.mosu.mosuserver.global.annotation.ExcelColumn; + +@Schema(description = "환불 엑셀 다운로드 DTO") +public record RefundExcelDto( + @Schema(description = "결제 번호", example = "dkfnsd-sdkjfsf") @ExcelColumn(headerName = "결제 번호") String paymentKey, + @Schema(description = "환불 상태", example = "완료") @ExcelColumn(headerName = "환불 상태") RefundStatus refundStatus, + @Schema(description = "이름", example = "홍길동") @ExcelColumn(headerName = "이름") String name, + @Schema(description = "전화번호", example = "010-1234-5678") @ExcelColumn(headerName = "전화번호") String phoneNumber, + @Schema(description = "환불 일시", example = "2025-07-24 15:00:00") @ExcelColumn(headerName = "환불 일시") String refundedAt, + @Schema(description = "결제 방법", example = "카드") @ExcelColumn(headerName = "결제 방법") PaymentMethod paymentMethod, + @Schema(description = "환불 사유", example = "단순 변심") @ExcelColumn(headerName = "환불 사유") String refundReason) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RefundListResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RefundListResponse.java new file mode 100644 index 00000000..4d6873ca --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/RefundListResponse.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.presentation.admin.dto; + +import life.mosu.mosuserver.domain.refund.entity.RefundStatus; + +public record RefundListResponse( + Long refundId, + RefundStatus refundStatus, + String paymentKey, + String name, + String phone, + String refundedAt, + String paymentMethod, + String reason + +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/SchoolLunchResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/SchoolLunchResponse.java index ffa9e854..1d9d34b2 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/SchoolLunchResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/SchoolLunchResponse.java @@ -13,4 +13,8 @@ public record SchoolLunchResponse( ) { + public static SchoolLunchResponse of(String schoolName, + Long count) { + return new SchoolLunchResponse(schoolName, count); + } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentExcelDto.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentExcelDto.java index 79d76ae9..8a19fae0 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentExcelDto.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentExcelDto.java @@ -1,8 +1,6 @@ package life.mosu.mosuserver.presentation.admin.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Grade; import life.mosu.mosuserver.global.annotation.ExcelColumn; import lombok.AllArgsConstructor; import lombok.Getter; @@ -30,7 +28,7 @@ public class StudentExcelDto { @Schema(description = "학력", example = "HIGH_SCHOOL") @ExcelColumn(headerName = "학력") - private final Education educationLevel; + private final String educationLevel; @Schema(description = "학교명", example = "서울고등학교") @ExcelColumn(headerName = "학교명") @@ -38,7 +36,7 @@ public class StudentExcelDto { @Schema(description = "학년", example = "THIRD") @ExcelColumn(headerName = "학년") - private final Grade grade; + private final String grade; @Schema(description = "시험 응시 횟수", example = "2") @ExcelColumn(headerName = "시험 응시 횟수") diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentFilter.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentFilter.java index 9bab8d28..cc932ee4 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentFilter.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentFilter.java @@ -1,7 +1,6 @@ package life.mosu.mosuserver.presentation.admin.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; @Schema(description = "학생 목록 필터 DTO") public record StudentFilter( @@ -10,10 +9,9 @@ public record StudentFilter( String name, @Schema(description = "전화번호 필터", example = "01012345678") - @PhoneNumberPattern String phone, - @Schema(description = "정렬 순서 (desc 또는 asc)", example = "desc", defaultValue = "desc") + @Schema(description = "정렬 순서 (개발중)", example = "desc", defaultValue = "desc") String order ) { diff --git a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentListResponse.java b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentListResponse.java index c1afba9a..3dd6bb93 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentListResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/admin/dto/StudentListResponse.java @@ -1,8 +1,6 @@ package life.mosu.mosuserver.presentation.admin.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Grade; @Schema(description = "학생 목록 응답 DTO") public record StudentListResponse( @@ -20,13 +18,13 @@ public record StudentListResponse( String gender, @Schema(description = "학력", example = "ENROLLED") - Education educationLevel, + String educationLevel, @Schema(description = "학교명", example = "서울고등학교") String schoolName, - @Schema(description = "학년", example = "HIGH_1") - Grade grade, + @Schema(description = "학년", example = "고등학교 1학년") + String grade, @Schema(description = "시험 응시 횟수", example = "2") int examCount diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationController.java b/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationController.java index 78366b41..3bf89b45 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationController.java @@ -1,11 +1,15 @@ package life.mosu.mosuserver.presentation.application; import jakarta.validation.Valid; +import java.net.URI; import java.util.List; import life.mosu.mosuserver.application.application.ApplicationService; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.application.dto.ApplicationGuestRequest; import life.mosu.mosuserver.presentation.application.dto.ApplicationRequest; import life.mosu.mosuserver.presentation.application.dto.ApplicationResponse; +import life.mosu.mosuserver.presentation.application.dto.CreateApplicationResponse; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -15,36 +19,59 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.util.UriComponentsBuilder; @Slf4j @RestController -@RequestMapping("/application") +@RequestMapping("/applications") @RequiredArgsConstructor public class ApplicationController implements ApplicationControllerDocs { private final ApplicationService applicationService; - //신청 + @PostMapping("/guest") + public ResponseEntity> applyAsGuest( + @Valid @RequestBody ApplicationGuestRequest request, + UriComponentsBuilder uriComponentsBuilder) { + CreateApplicationResponse response = applicationService.applyByGuest(request); + + URI location = uriComponentsBuilder + .path("/applications/guest") + .queryParam("userId", response.applicationId()) + .build() + .toUri(); + + return ResponseEntity.created(location) + .body(ApiResponseWrapper.success(HttpStatus.OK, "신청 성공", response)); + } + @PostMapping @PreAuthorize("isAuthenticated() and hasRole('USER')") - public ResponseEntity> apply( - @RequestParam Long userId, - @Valid @RequestBody ApplicationRequest request - ) { - ApplicationResponse response = applicationService.apply(userId, request); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "신청 성공", response)); + public ResponseEntity> apply( + @UserId final Long userId, + @Valid @RequestBody ApplicationRequest request, + UriComponentsBuilder uriComponentsBuilder) { + CreateApplicationResponse response = applicationService.apply(userId, request); + + URI location = uriComponentsBuilder + .path("/applications") + .queryParam("userId", response.applicationId()) + .build() + .toUri(); + + return ResponseEntity.created(location) + .body(ApiResponseWrapper.success(HttpStatus.OK, "신청 성공", response)); } //전체 신청 내역 조회 @GetMapping + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity>> getApplications( - @RequestParam Long userId + @UserId final Long userId ) { List responses = applicationService.getApplications(userId); return ResponseEntity.ok( ApiResponseWrapper.success(HttpStatus.OK, "신청 내역 조회 성공", responses)); } - } diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationControllerDocs.java index 6ccae120..ca00ea39 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationControllerDocs.java +++ b/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationControllerDocs.java @@ -10,12 +10,14 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import java.util.List; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; import life.mosu.mosuserver.presentation.application.dto.ApplicationRequest; import life.mosu.mosuserver.presentation.application.dto.ApplicationResponse; +import life.mosu.mosuserver.presentation.application.dto.CreateApplicationResponse; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.util.UriComponentsBuilder; @Tag(name = "Application API", description = "신청 관련 API 명세") public interface ApplicationControllerDocs { @@ -24,12 +26,13 @@ public interface ApplicationControllerDocs { @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "신청 성공") }) - ResponseEntity> apply( + ResponseEntity> apply( @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @RequestParam Long userId, + @UserId Long userId, @Parameter(description = "신청 요청 정보", required = true) - @Valid @RequestBody ApplicationRequest request + @Valid @RequestBody ApplicationRequest request, + UriComponentsBuilder uriComponentsBuilder ); @Operation(summary = "전체 신청 내역 조회", description = "사용자의 전체 신청 내역을 조회합니다.") @@ -39,6 +42,6 @@ ResponseEntity> apply( }) ResponseEntity>> getApplications( @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @RequestParam Long userId + @UserId Long userId ); } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationEventListener.java b/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationEventListener.java new file mode 100644 index 00000000..4129d9d5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/application/ApplicationEventListener.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.presentation.application; + +import life.mosu.mosuserver.application.application.ApplicationEventService; +import life.mosu.mosuserver.global.annotation.ReactiveEventListener; +import life.mosu.mosuserver.presentation.application.dto.event.ApplicationStatusChangeEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ApplicationEventListener { + + private final ApplicationEventService applicationEventService; + + @ReactiveEventListener + public void onApplicationStatusChange(ApplicationStatusChangeEvent event) { + applicationEventService.changeStatus( + event.applicationId(), + event.newStatus() + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationGuestRequest.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationGuestRequest.java new file mode 100644 index 00000000..15d66de9 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationGuestRequest.java @@ -0,0 +1,94 @@ +package life.mosu.mosuserver.presentation.application.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import jakarta.validation.constraints.NotNull; +import java.security.SecureRandom; +import java.time.LocalDate; +import java.util.Set; +import java.util.UUID; +import java.util.stream.Collectors; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.user.entity.AuthProvider; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.common.FileRequest; + +public record ApplicationGuestRequest( + @NotNull + String orgName, + @NotNull + String gender, + @NotNull + String userName, + @JsonFormat(pattern = "yyyy-MM-dd") + LocalDate birth, + @PhoneNumberPattern + String phoneNumber, + @NotNull + ExamApplicationRequest examApplication, + Set subjects, + FileRequest admissionTicket +) { + + public UserJpaEntity toUserJpaEntity() { + String uniqueId = generateUniqueId(orgName); + String randomPassword = generateRandomPassword(10); + + return UserJpaEntity.builder() + .loginId(uniqueId) + .password(randomPassword) + .name(userName) + .birth(birth) + .phoneNumber(phoneNumber) + .gender(validGender()) + .userRole(UserRole.ROLE_USER) + .provider(AuthProvider.MOSU) + .agreedToMarketing(true) + .agreedToPrivacyPolicy(true) + .agreedToTermsOfService(true) + .build(); + } + + public ApplicationJpaEntity toApplicationJpaEntity(Long userId) { + return ApplicationJpaEntity.builder() + .userId(userId) + .agreedToNotices(true) + .agreedToRefundPolicy(true) + .build(); + } + + public Set getSubjects() { + Set subjectSet = subjects.stream() + .map(Subject::getSubject) + .collect(Collectors.toSet()); + + if (subjectSet.size() != 2) { + throw new CustomRuntimeException(ErrorCode.WRONG_SUBJECT_COUNT); + } + + return subjectSet; + } + + private Gender validGender() { + return Gender.fromName(gender); + } + + private String generateUniqueId(String orgName) { + return orgName + "-" + UUID.randomUUID().toString().substring(0, 8); + } + + private String generateRandomPassword(int length) { + String chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; + SecureRandom random = new SecureRandom(); + StringBuilder sb = new StringBuilder(); + for (int i = 0; i < length; i++) { + sb.append(chars.charAt(random.nextInt(chars.length()))); + } + return sb.toString(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationRequest.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationRequest.java index 877cecb3..5a168cfc 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationRequest.java @@ -2,10 +2,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; +import java.util.List; import java.util.Set; -import life.mosu.mosuserver.domain.application.ApplicationJpaEntity; +import java.util.stream.Collectors; +import life.mosu.mosuserver.domain.application.entity.ApplicationJpaEntity; +import life.mosu.mosuserver.domain.application.entity.Subject; import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.presentation.common.FileRequest; @Schema(description = "시험 신청 요청 DTO") public record ApplicationRequest( @@ -15,24 +20,38 @@ public record ApplicationRequest( @Schema(description = "보호자 전화번호 (전화번호 형식은 010-XXXX-XXXX 이어야 합니다.)", example = "010-1234-5678") @PhoneNumberPattern - String guardianPhoneNumber, + String parentPhoneNumber, - @Schema(description = "신청 학교 목록", required = true) + @Schema(description = "시험 신청 Id 목록", required = true) @NotNull - Set schools, + List examApplication, @Schema(description = "약관 동의 정보", required = true) @NotNull - AgreementRequest agreementRequest + AgreementRequest agreement, + @Schema(description = "응시 과목 목록 (예: PHYSICS_1)", example = "[\"PHYSICS_1\", \"ETHICS_AND_IDEOLOGY\"]") + Set subjects ) { - public ApplicationJpaEntity toEntity(Long userId) { + public ApplicationJpaEntity toApplicationJpaEntity(Long userId) { return ApplicationJpaEntity.builder() .userId(userId) - .guardianPhoneNumber(guardianPhoneNumber) - .agreedToNotices(agreementRequest().agreedToNotices()) - .agreedToRefundPolicy(agreementRequest().agreedToRefundPolicy()) + .parentPhoneNumber(parentPhoneNumber) + .agreedToNotices(agreement().agreedToNotices()) + .agreedToRefundPolicy(agreement().agreedToRefundPolicy()) .build(); } + + public Set getSubjects() { + Set subjectSet = subjects.stream() + .map(Subject::getSubject) + .collect(Collectors.toSet()); + + if (subjectSet.size() != 2) { + throw new CustomRuntimeException(ErrorCode.WRONG_SUBJECT_COUNT); + } + + return subjectSet; + } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationResponse.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationResponse.java index a02d87a2..9575eff4 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationResponse.java @@ -2,7 +2,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaEntity; @Schema(description = "신청 응답 DTO") public record ApplicationResponse( @@ -10,19 +9,11 @@ public record ApplicationResponse( @Schema(description = "신청 ID", example = "1") Long applicationId, - @Schema(description = "신청 학교 목록") - List schools - + @Schema(description = "시험 목록") + List exams ) { - public static ApplicationResponse of( - Long applicationId, - List schoolEntities - ) { - List schoolResponses = schoolEntities.stream() - .map(ApplicationSchoolResponse::from) - .toList(); - - return new ApplicationResponse(applicationId, schoolResponses); + public static ApplicationResponse of(Long applicationId, List exams) { + return new ApplicationResponse(applicationId, exams); } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationSchoolRequest.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationSchoolRequest.java deleted file mode 100644 index fe93bf4f..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationSchoolRequest.java +++ /dev/null @@ -1,80 +0,0 @@ -package life.mosu.mosuserver.presentation.application.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDate; -import java.util.Set; -import java.util.stream.Collectors; -import life.mosu.mosuserver.domain.application.Lunch; -import life.mosu.mosuserver.domain.application.Subject; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaEntity; -import life.mosu.mosuserver.domain.school.Area; -import life.mosu.mosuserver.domain.school.SchoolJpaEntity; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; - -@Schema(description = "신청 학교 요청 DTO") -public record ApplicationSchoolRequest( - - @Schema(description = "학교 이름", example = "대치중학교") - @NotBlank(message = "학교 이름은 필수입니다.") - String schoolName, - - @Schema(description = "지역 코드 (예: DAECHI, NOWON, MOKDONG)", example = "DAECHI") - String area, - - @Schema(description = "시험 날짜", example = "2025-08-10") - @NotNull(message = "시험 날짜는 필수입니다.") - LocalDate examDate, - - @Schema(description = "도시락 여부 (NONE 또는 OPTION1)", example = "NONE") - @NotBlank(message = "점심 여부는 필수입니다.") - String lunch, - - @Schema(description = "응시 과목 목록 (예: PHYSICS_1)", example = "[\"PHYSICS_1\", \"ETHICS_AND_IDEOLOGY\"]") - Set subjects - -) { - - public ApplicationSchoolJpaEntity toEntity(Long userId, Long applicationId, - SchoolJpaEntity school) { - return ApplicationSchoolJpaEntity.builder() - .userId(userId) - .applicationId(applicationId) - .schoolId(school.getId()) - .schoolName(school.getSchoolName()) - .area(school.getArea()) - .address(school.getAddress()) - .examDate(examDate) - .lunch(validatedLunch(lunch)) - .subjects(validatedSubjects(subjects)) - .build(); - } - - private Set validatedSubjects(Set subjects) { - try { - return subjects.stream() - .map(Subject::valueOf) - .collect(Collectors.toSet()); - } catch (IllegalArgumentException e) { - throw new CustomRuntimeException(ErrorCode.WRONG_SUBJECT_TYPE); - } - } - - private Lunch validatedLunch(String lunch) { - try { - return Lunch.valueOf(lunch.toUpperCase()); - } catch (IllegalArgumentException e) { - throw new CustomRuntimeException(ErrorCode.WRONG_LUNCH_TYPE); - } - } - - public Area validatedArea(String area) { - try { - return Area.valueOf(area.toUpperCase()); - } catch (IllegalArgumentException e) { - throw new CustomRuntimeException(ErrorCode.WRONG_AREA_TYPE); - } - } -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationSchoolResponse.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationSchoolResponse.java deleted file mode 100644 index 5db7f835..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ApplicationSchoolResponse.java +++ /dev/null @@ -1,54 +0,0 @@ -package life.mosu.mosuserver.presentation.application.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import java.time.LocalDate; -import java.util.Set; -import java.util.stream.Collectors; -import life.mosu.mosuserver.domain.application.Subject; -import life.mosu.mosuserver.domain.applicationschool.ApplicationSchoolJpaEntity; - -@Schema(description = "신청 학교 응답 DTO") -public record ApplicationSchoolResponse( - - @Schema(description = "신청 학교 ID", example = "1") - Long applicationSchoolId, - - @Schema(description = "지역 이름", example = "대치") - String area, - - @Schema(description = "시험 날짜", example = "2025-08-10") - LocalDate examDate, - - @Schema(description = "학교 이름", example = "대치중학교") - String schoolName, - - @Schema(description = "도시락 신청 여부", example = "신청 안 함") - String lunch, - - @Schema(description = "수험 번호", example = "20250001") - String examinationNumber, - - @Schema(description = "신청 과목 목록", example = "[\"생활과 윤리\", \"정치와 법\"]") - Set subjects - -) { - - public static ApplicationSchoolResponse from(ApplicationSchoolJpaEntity applicationSchool) { - String areaName = applicationSchool.getArea().getAreaName(); - String lunchName = applicationSchool.getLunch().getLunchName(); - - Set subjectNames = applicationSchool.getSubjects().stream() - .map(Subject::getSubjectName) - .collect(Collectors.toSet()); - - return new ApplicationSchoolResponse( - applicationSchool.getId(), - areaName, - applicationSchool.getExamDate(), - applicationSchool.getSchoolName(), - lunchName, - applicationSchool.getExaminationNumber(), - subjectNames - ); - } -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/CreateApplicationResponse.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/CreateApplicationResponse.java new file mode 100644 index 00000000..45ea7c73 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/CreateApplicationResponse.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.presentation.application.dto; + +public record CreateApplicationResponse( + Long applicationId +) { + + public static CreateApplicationResponse of( + Long applicationId) { + return new CreateApplicationResponse( + applicationId); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ExamApplicationRequest.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ExamApplicationRequest.java new file mode 100644 index 00000000..25910415 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ExamApplicationRequest.java @@ -0,0 +1,13 @@ +package life.mosu.mosuserver.presentation.application.dto; + +import life.mosu.mosuserver.application.examapplication.dto.RegisterExamApplicationEvent.TargetExam; + +public record ExamApplicationRequest( + Long examId, + Boolean isLunchChecked +) { + + public TargetExam toTargetExam() { + return new TargetExam(examId, isLunchChecked); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/ExamApplicationResponse.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ExamApplicationResponse.java new file mode 100644 index 00000000..aa2f741a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/ExamApplicationResponse.java @@ -0,0 +1,38 @@ +package life.mosu.mosuserver.presentation.application.dto; + +import java.time.LocalDate; +import java.util.Set; + +public record ExamApplicationResponse( + Long examApplicationId, + String createdAt, + String status, + Integer totalAmount, + String schoolName, + LocalDate examDate, + Set subjects, + String lunchName +) { + + public static ExamApplicationResponse of( + Long examApplicationId, + String createdAt, + String status, + Integer totalAmount, + String schoolName, + LocalDate examDate, + Set subjects, + String lunchName + ) { + return new ExamApplicationResponse( + examApplicationId, + createdAt, + status, + totalAmount, + schoolName, + examDate, + subjects, + lunchName + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/event/ApplicationStatusChangeEvent.java b/src/main/java/life/mosu/mosuserver/presentation/application/dto/event/ApplicationStatusChangeEvent.java new file mode 100644 index 00000000..7dbe05b8 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/application/dto/event/ApplicationStatusChangeEvent.java @@ -0,0 +1,17 @@ +package life.mosu.mosuserver.presentation.application.dto.event; + +import life.mosu.mosuserver.domain.application.entity.ApplicationStatus; + +public record ApplicationStatusChangeEvent( + Long applicationId, + ApplicationStatus newStatus +) { + + public static ApplicationStatusChangeEvent ofApproved(Long applicationId) { + return new ApplicationStatusChangeEvent(applicationId, ApplicationStatus.APPROVED); + } + + public static ApplicationStatusChangeEvent ofAbort(Long applicationId) { + return new ApplicationStatusChangeEvent(applicationId, ApplicationStatus.ABORT); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/ApplicationSchoolController.java b/src/main/java/life/mosu/mosuserver/presentation/applicationschool/ApplicationSchoolController.java deleted file mode 100644 index e4ce51d9..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/ApplicationSchoolController.java +++ /dev/null @@ -1,73 +0,0 @@ -package life.mosu.mosuserver.presentation.applicationschool; - -import life.mosu.mosuserver.application.applicationschool.ApplicationSchoolService; -import life.mosu.mosuserver.global.annotation.UserId; -import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.application.dto.ApplicationSchoolResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.AdmissionTicketResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.RefundRequest; -import life.mosu.mosuserver.presentation.applicationschool.dto.SubjectUpdateRequest; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PutMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; - -@Slf4j -@RestController -@RequestMapping("/applicationschool") -@RequiredArgsConstructor -public class ApplicationSchoolController implements ApplicationSchoolControllerDocs { - - private final ApplicationSchoolService applicationSchoolService; - - @DeleteMapping("/{applicationSchoolId}/cancel") - public ResponseEntity> cancelApplicationSchool( - @PathVariable("applicationSchoolId") Long applicationSchoolId, - @RequestParam Long userId, - @RequestBody RefundRequest request - ) { - applicationSchoolService.cancelApplicationSchool(applicationSchoolId, request); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "신청 학교 취소 및 환불 처리 완료")); - } - - @PutMapping("/{applicationSchoolId}/subjects") - public ResponseEntity> updateSubjects( - @PathVariable("applicationSchoolId") Long applicationSchoolId, - @RequestParam Long userId, - @RequestBody SubjectUpdateRequest request - ) { - ApplicationSchoolResponse response = applicationSchoolService.updateSubjects( - applicationSchoolId, request); - return ResponseEntity.ok( - ApiResponseWrapper.success(HttpStatus.OK, "신청 과목 수정 성공", response)); - } - - @GetMapping("/{applicationSchoolId}") - public ResponseEntity> getDetail( - @UserId Long userId, - @PathVariable("applicationSchoolId") Long applicationSchoolId - ) { - ApplicationSchoolResponse response = applicationSchoolService.getApplicationSchool( - applicationSchoolId); - return ResponseEntity.ok( - ApiResponseWrapper.success(HttpStatus.OK, "신청 상세 조회 성공", response)); - } - - @GetMapping("/{applicationSchoolId}/admissionticket") - public ResponseEntity> getAdmissionTicket( - @UserId Long userId, - @PathVariable("applicationSchoolId") Long applicationSchoolId - ) { - AdmissionTicketResponse response = applicationSchoolService.getAdmissionTicket(userId, - applicationSchoolId); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "수험표 조회 성공", response)); - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/ApplicationSchoolControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/applicationschool/ApplicationSchoolControllerDocs.java deleted file mode 100644 index 24fb8481..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/ApplicationSchoolControllerDocs.java +++ /dev/null @@ -1,80 +0,0 @@ -package life.mosu.mosuserver.presentation.applicationschool; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.application.dto.ApplicationSchoolResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.AdmissionTicketResponse; -import life.mosu.mosuserver.presentation.applicationschool.dto.RefundRequest; -import life.mosu.mosuserver.presentation.applicationschool.dto.SubjectUpdateRequest; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; - -@Tag(name = "Application School API", description = "개별 신청 학교 관련 API 명세") -public interface ApplicationSchoolControllerDocs { - - @Operation(summary = "신청 학교 취소", description = "사용자가 신청한 학교를 취소 요청합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "취소 및 환불 처리 성공") - }) - ResponseEntity> cancelApplicationSchool( - @Parameter(name = "applicationSchoolId", description = "신청 학교 ID", in = ParameterIn.PATH) - @PathVariable Long applicationSchoolId, - - @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @PathVariable Long userId, - - @Parameter(description = "환불 요청 정보", required = true) - @RequestBody @Valid RefundRequest request - ); - - @Operation(summary = "신청 과목 수정", description = "신청한 학교에 대해 과목 목록을 수정합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "과목 수정 성공", - content = @Content(schema = @Schema(implementation = ApplicationSchoolResponse.class))) - }) - ResponseEntity> updateSubjects( - @Parameter(name = "applicationSchoolId", description = "신청 학교 ID", in = ParameterIn.PATH) - @PathVariable Long applicationSchoolId, - - @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @PathVariable Long userId, - - @Parameter(description = "수정할 과목 목록", required = true) - @RequestBody @Valid SubjectUpdateRequest request - ); - - @Operation(summary = "신청 상세 조회", description = "신청한 학교의 상세 정보를 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "상세 조회 성공", - content = @Content(schema = @Schema(implementation = ApplicationSchoolResponse.class))) - }) - ResponseEntity> getDetail( - @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @PathVariable Long userId, - - @Parameter(name = "applicationSchoolId", description = "신청 학교 ID", in = ParameterIn.PATH) - @PathVariable Long applicationSchoolId - ); - - @Operation(summary = "수험표 조회", description = "신청한 학교에 대한 수험표를 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "수험표 조회 성공", - content = @Content(schema = @Schema(implementation = AdmissionTicketResponse.class))) - }) - ResponseEntity> getAdmissionTicket( - @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @PathVariable Long userId, - - @Parameter(name = "applicationSchoolId", description = "신청 학교 ID", in = ParameterIn.PATH) - @PathVariable Long applicationSchoolId - ); -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/RefundRequest.java b/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/RefundRequest.java deleted file mode 100644 index fc28bdb3..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/RefundRequest.java +++ /dev/null @@ -1,29 +0,0 @@ -package life.mosu.mosuserver.presentation.applicationschool.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import java.time.LocalDateTime; -import life.mosu.mosuserver.domain.refund.RefundJpaEntity; - -@Schema(description = "환불 요청 DTO") -public record RefundRequest( - - @Schema(description = "환불 사유", example = "개인 사정으로 인해 응시가 어려움") - String reason, - - @Schema(description = "환불 정책 동의 여부", example = "true") - Boolean refundAgreed, - - @Schema(description = "환불 동의 시각 (ISO 8601 형식)", example = "2025-07-10T15:30:00") - LocalDateTime agreedAt - -) { - - public RefundJpaEntity toEntity(Long applicationSchoolId) { - return RefundJpaEntity.builder() - .applicationSchoolId(applicationSchoolId) - .reason(reason) - .refundAgreed(refundAgreed) - .agreedAt(agreedAt) - .build(); - } -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/SubjectUpdateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/SubjectUpdateRequest.java deleted file mode 100644 index c6be5eb8..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/applicationschool/dto/SubjectUpdateRequest.java +++ /dev/null @@ -1,19 +0,0 @@ -package life.mosu.mosuserver.presentation.applicationschool.dto; - -import io.swagger.v3.oas.annotations.media.Schema; -import java.util.Set; -import life.mosu.mosuserver.domain.application.Subject; - -@Schema(description = "과목 수정 요청 DTO") -public record SubjectUpdateRequest( - - @Schema( - description = "과목 목록 (Subject Enum 값들)", - example = "[\"LIFE_AND_ETHICS\", \"ETHICS_AND_IDEOLOGY\"]", - required = true - ) - Set subjects - -) { - -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/AuthController.java b/src/main/java/life/mosu/mosuserver/presentation/auth/AuthController.java index 83fe3a8b..08030dd0 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/AuthController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/AuthController.java @@ -1,16 +1,16 @@ package life.mosu.mosuserver.presentation.auth; -import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import life.mosu.mosuserver.application.auth.AuthService; -import life.mosu.mosuserver.application.auth.AuthTokenManager; import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.global.util.CookieBuilderUtil; +import life.mosu.mosuserver.presentation.auth.dto.LoginCommandResponse; import life.mosu.mosuserver.presentation.auth.dto.LoginRequest; +import life.mosu.mosuserver.presentation.auth.dto.LoginResponse; import life.mosu.mosuserver.presentation.auth.dto.Token; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -23,7 +23,6 @@ public class AuthController implements AuthControllerDocs { private final AuthService authService; - private final AuthTokenManager authTokenManager; /** * 로그인 @@ -32,35 +31,30 @@ public class AuthController implements AuthControllerDocs { * @return 로그인 한 회원의 Access Token과 Refresh Token */ @PostMapping("/login") - public ResponseEntity> login( + public ResponseEntity> login( @RequestBody @Valid final LoginRequest request) { - final Token token = authService.login(request); + final LoginCommandResponse command = authService.login(request); - final ResponseCookie cookie = ResponseCookie.from("accessToken", token.accessToken()) - .httpOnly(true) - .secure(true) - .path("/") - .maxAge(authTokenManager.getAccessTokenExpireTime()) - .build(); - - return ResponseEntity.status(HttpStatus.CREATED) - .header(HttpHeaders.SET_COOKIE, cookie.toString()) - .body(ApiResponseWrapper.success(HttpStatus.CREATED, token)); + return ResponseEntity.ok() + .headers(applyTokenHeader(command.token())) + .body(ApiResponseWrapper.success(HttpStatus.OK, + LoginResponse.from(command.isProfileRegistered(), command.user()) + )); } - /** - * Access Token과 Refresh Token 재발급 - * - * @param servletRequest HttpServletRequest - * @return 재발급 된 Access Token과 Refresh Token - */ - @PostMapping("/reissue") - public ResponseEntity> reissueAccessToken( - final HttpServletRequest servletRequest) { - final Token token = authService.reissueAccessToken(servletRequest); - final String authorization = token.grantType() + " " + token.accessToken(); - return ResponseEntity.status(HttpStatus.CREATED) - .header(HttpHeaders.AUTHORIZATION, authorization) - .body(ApiResponseWrapper.success(HttpStatus.CREATED, token)); + private HttpHeaders applyTokenHeader(Token token) { + HttpHeaders headers = new HttpHeaders(); + + headers.add(HttpHeaders.SET_COOKIE, CookieBuilderUtil.createDevelopCookieString( + CookieBuilderUtil.ACCESS_TOKEN_COOKIE_NAME, + token.accessToken(), + token.accessTokenExpireTime() + )); + headers.add(HttpHeaders.SET_COOKIE, CookieBuilderUtil.createDevelopCookieString( + CookieBuilderUtil.REFRESH_TOKEN_COOKIE_NAME, + token.refreshToken(), + token.refreshTokenExpireTime() + )); + return headers; } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/AuthControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/auth/AuthControllerDocs.java index 112722d5..93409174 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/AuthControllerDocs.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/AuthControllerDocs.java @@ -2,22 +2,17 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.servlet.http.HttpServletRequest; import jakarta.validation.Valid; import life.mosu.mosuserver.global.util.ApiResponseWrapper; import life.mosu.mosuserver.presentation.auth.dto.LoginRequest; -import life.mosu.mosuserver.presentation.auth.dto.Token; +import life.mosu.mosuserver.presentation.auth.dto.LoginResponse; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; @Tag(description = "인증 API", name = "Auth API") public interface AuthControllerDocs { - @Operation(description = "로그인 API 지금은 쿠키와 response 둘다 반환하는데 곧 쿠키로만 작동하게 할 것 입니다.", summary = "사용자가 로그인합니다.") - public ResponseEntity> login( + @Operation(description = "로그인 API 지금은 쿠키와 response 둘다 반환하는데 곧 쿠키로만 작동하게 할 것 입니다. <프론트하고 변경하려고 Response 이렇게 만들었는데 나중에 같이 맞춥시다!>", summary = "사용자가 로그인합니다.") + public ResponseEntity> login( @RequestBody @Valid final LoginRequest request); - - @Operation(description = "수정될 예정 입니다.") - public ResponseEntity> reissueAccessToken( - final HttpServletRequest servletRequest); } diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/MasterController.java b/src/main/java/life/mosu/mosuserver/presentation/auth/MasterController.java new file mode 100644 index 00000000..66e3a5a1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/MasterController.java @@ -0,0 +1,77 @@ +package life.mosu.mosuserver.presentation.auth; + +import jakarta.validation.Valid; +import java.util.UUID; +import life.mosu.mosuserver.application.auth.SignUpService; +import life.mosu.mosuserver.application.auth.kmc.KmcEventTxService; +import life.mosu.mosuserver.application.auth.provider.OneTimeTokenProvider; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.global.util.CookieBuilderUtil; +import life.mosu.mosuserver.infra.kmc.property.KmcProperties; +import life.mosu.mosuserver.presentation.auth.dto.SignUpAccountRequest; +import life.mosu.mosuserver.presentation.auth.dto.Token; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +public class MasterController { + + private final static String ACCESS_TOKEN_COOKIE_NAME = "accessToken"; + private final static String REFRESH_TOKEN_COOKIE_NAME = "refreshToken"; + + private final SignUpService signUpService; + private final KmcProperties kmcProperties; + private final KmcEventTxService eventTxService; + private final OneTimeTokenProvider tokenProvider; + + @PostMapping("/master") + public ResponseEntity> masterSignUp( + @RequestBody @Valid SignUpAccountRequest request + ) { + Token token = signUpService.signUp(request); + + return ResponseEntity.status(HttpStatus.CREATED) + .headers(applyTokenHeader(token)) + .body(ApiResponseWrapper.success(HttpStatus.CREATED, "회원가입 성공")); + } + +// @GetMapping("/master/kmc") +// public ResponseEntity> kmcSignUp( +// ) { +// final String certNum = UUID.randomUUID().toString().replace("-", ""); +// String token = tokenProvider.generateOneTimeToken(certNum,); +// try { +// eventTxService.publishIssueEvent(certNum, kmcProperties.getExpireTime()); +// +// +// } catch (Exception ex) { +// eventTxService.publishFailureEvent(certNum); +// throw new RuntimeException("KMC 인증 요청 생성에 실패했습니다.", ex); +// } +// +// return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "프로필 등록 성공", token)); +// } + + private HttpHeaders applyTokenHeader(Token token) { + HttpHeaders headers = new HttpHeaders(); + + headers.add(HttpHeaders.SET_COOKIE, CookieBuilderUtil.createLocalCookieString( + ACCESS_TOKEN_COOKIE_NAME, + token.accessToken(), + token.accessTokenExpireTime() + )); + headers.add(HttpHeaders.SET_COOKIE, CookieBuilderUtil.createLocalCookieString( + REFRESH_TOKEN_COOKIE_NAME, + token.refreshToken(), + token.refreshTokenExpireTime() + )); + return headers; + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpController.java b/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpController.java index d3a8bf5f..dbb723f2 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpController.java @@ -3,8 +3,11 @@ import jakarta.validation.Valid; import life.mosu.mosuserver.application.auth.SignUpService; import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.auth.dto.SignUpRequest; +import life.mosu.mosuserver.global.util.CookieBuilderUtil; +import life.mosu.mosuserver.presentation.auth.dto.SignUpAccountRequest; +import life.mosu.mosuserver.presentation.auth.dto.Token; import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; @@ -26,12 +29,29 @@ public class SignUpController implements SignUpControllerDocs { */ @PostMapping public ResponseEntity> signUp( - @RequestBody @Valid final SignUpRequest request + @RequestBody @Valid SignUpAccountRequest request ) { - signUpService.signUp(request); + Token token = signUpService.signUp(request); - return ResponseEntity - .status(HttpStatus.CREATED) + return ResponseEntity.status(HttpStatus.CREATED) + .headers(applyTokenHeader(token)) .body(ApiResponseWrapper.success(HttpStatus.CREATED, "회원가입 성공")); } + + private HttpHeaders applyTokenHeader(Token token) { + HttpHeaders headers = new HttpHeaders( + + ); + headers.add(HttpHeaders.SET_COOKIE, CookieBuilderUtil.createDevelopCookieString( + CookieBuilderUtil.ACCESS_TOKEN_COOKIE_NAME, + token.accessToken(), + token.accessTokenExpireTime() + )); + headers.add(HttpHeaders.SET_COOKIE, CookieBuilderUtil.createDevelopCookieString( + CookieBuilderUtil.REFRESH_TOKEN_COOKIE_NAME, + token.refreshToken(), + token.refreshTokenExpireTime() + )); + return headers; + } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpControllerDocs.java index d63a8f44..81bc8875 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpControllerDocs.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/SignUpControllerDocs.java @@ -4,16 +4,16 @@ import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.auth.dto.SignUpRequest; +import life.mosu.mosuserver.presentation.auth.dto.SignUpAccountRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; @Tag(description = "회원가입 API", name = "Sign Up API") public interface SignUpControllerDocs { - @Operation(summary = "회원 가입", description = "사용자가 새로운 계정을 생성합니다.") + @Operation(summary = "회원 가입", description = "step 1, step 2를 모두 받는 회원 가입 API입니다.") public ResponseEntity> signUp( - @RequestBody @Valid final SignUpRequest request + @RequestBody @Valid final SignUpAccountRequest request ); } diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginCommandResponse.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginCommandResponse.java new file mode 100644 index 00000000..6b33a1a3 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginCommandResponse.java @@ -0,0 +1,15 @@ +package life.mosu.mosuserver.presentation.auth.dto; + +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; + +public record LoginCommandResponse( + Token token, + Boolean isProfileRegistered, + UserJpaEntity user +) { + + public static LoginCommandResponse of(final Token token, final Boolean isProfileRegistered, + final UserJpaEntity user) { + return new LoginCommandResponse(token, isProfileRegistered, user); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginRequest.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginRequest.java index 8e0a00c7..03c94231 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginRequest.java @@ -1,10 +1,14 @@ package life.mosu.mosuserver.presentation.auth.dto; -import jakarta.validation.constraints.NotNull; +import io.swagger.v3.oas.annotations.media.Schema; +import life.mosu.mosuserver.global.annotation.LoginIdPattern; import life.mosu.mosuserver.global.annotation.PasswordPattern; public record LoginRequest( - @NotNull String id, - @PasswordPattern @NotNull String password + @Schema(description = "아이디는 6~12자의 영문, 숫자, 특수문자(-, _)만 사용 가능합니다.", example = "user123") + @LoginIdPattern String id, + @Schema(description = "비밀번호는 8~20자의 영문, 숫자, 특수문자(!@#$%^&*)만 사용 가능합니다.", example = "Password123!") + @PasswordPattern String password ) { + } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginResponse.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginResponse.java new file mode 100644 index 00000000..972c0cfb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginResponse.java @@ -0,0 +1,23 @@ +package life.mosu.mosuserver.presentation.auth.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonInclude.Include; +import life.mosu.mosuserver.application.oauth.OAuthUser; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; + +public record LoginResponse( + Boolean isProfileRegistered, + @JsonInclude(Include.NON_NULL) LoginUserResponse userInfo +) { + + public static LoginResponse from(final OAuthUser user) { + return from(user.getIsProfileRegistered(), user.getUser()); + } + + public static LoginResponse from(Boolean isProfileRegistered, final UserJpaEntity user) { + if (Boolean.TRUE.equals(isProfileRegistered)) { + return new LoginResponse(true, null); + } + return new LoginResponse(false, LoginUserResponse.from(user)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginUserResponse.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginUserResponse.java new file mode 100644 index 00000000..f43a7aa1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/LoginUserResponse.java @@ -0,0 +1,30 @@ +package life.mosu.mosuserver.presentation.auth.dto; + +import java.time.LocalDate; +import java.util.Optional; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; + +public record LoginUserResponse( + String gender, + String name, + LocalDate birth, + String phoneNumber +) { + + public static LoginUserResponse from(UserJpaEntity user) { + return Optional.ofNullable(user) + .map(userEntity -> { + String gender = Optional.ofNullable(userEntity.getGender()) + .map(Enum::name) + .orElse(null); + + return new LoginUserResponse( + gender, + userEntity.getName(), + userEntity.getBirth(), + userEntity.getPhoneNumber() + ); + }) + .orElse(null); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpAccountRequest.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpAccountRequest.java new file mode 100644 index 00000000..4df6b88c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpAccountRequest.java @@ -0,0 +1,66 @@ +package life.mosu.mosuserver.presentation.auth.dto; + +import static life.mosu.mosuserver.global.util.EncodeUtil.passwordEncode; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDate; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.user.entity.AuthProvider; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import life.mosu.mosuserver.global.annotation.LoginIdPattern; +import life.mosu.mosuserver.global.annotation.PasswordPattern; +import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; +import org.springframework.security.crypto.password.PasswordEncoder; + +public record SignUpAccountRequest( + @Schema( + description = "로그인 ID는 6~12자의 영문, 숫자, 특수문자(-, _)만 사용 가능합니다.", + example = "mosu12370" + ) + @LoginIdPattern + String id, + + @Schema( + description = "비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.", + example = "Mosu!1234" + ) + @PasswordPattern String password, + + @Schema(description = "사용자 이름", example = "홍길동", required = true) + @NotBlank(message = "이름은 필수입니다.") + String userName, + + @Schema(description = "생년월일 (yyyy-MM-dd 형식)", example = "2005-05-10", required = true) + @JsonFormat(pattern = "yyyy-MM-dd") + @NotNull(message = "생년월일은 필수입니다.") + LocalDate birth, + + @Schema(description = "성별 (MALE 또는 FEMALE)", example = "MALE", required = true) + @NotBlank(message = "성별은 필수입니다.") + String gender, + + @Schema(description = "휴대폰 번호", example = "010-1234-5678", required = true) + @NotBlank(message = "휴대폰 번호는 필수입니다.") + @PhoneNumberPattern + String phoneNumber, + + SignUpServiceTermRequest serviceTermRequest +) { + + public UserJpaEntity toAuthEntity(PasswordEncoder passwordEncoder) { + return UserJpaEntity.builder() + .loginId(id) + .password(passwordEncode(passwordEncoder, password)) + .agreedToTermsOfService(true) + .agreedToPrivacyPolicy(true) + .agreedToMarketing(serviceTermRequest.agreedToMarketing()) + .gender(Gender.PENDING) + .provider(AuthProvider.MOSU) + .userRole(UserRole.ROLE_PENDING) + .build(); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpRequest.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpRequest.java index 4cdf0348..e6909f06 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpRequest.java @@ -1,38 +1,17 @@ package life.mosu.mosuserver.presentation.auth.dto; -import static life.mosu.mosuserver.global.util.EncodeUtil.passwordEncode; - import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.user.UserJpaEntity; -import life.mosu.mosuserver.domain.user.UserRole; -import life.mosu.mosuserver.global.annotation.PasswordPattern; -import org.springframework.security.crypto.password.PasswordEncoder; +import life.mosu.mosuserver.presentation.profile.dto.SignUpProfileRequest; public record SignUpRequest( @Schema( - description = "로그인 ID", - example = "mosu12370" + description = "회원 가입 단계 1: 계정 정보" ) - @NotNull String id, + SignUpAccountRequest signUpAccountStep, @Schema( - description = "비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.", - example = "Mosu!1234" + description = "회원 가입 단계 2: 프로필 정보" ) - @PasswordPattern @NotNull String password, - SignUpServiceTermRequest serviceTermRequest + SignUpProfileRequest signUpProfileStep ) { - public UserJpaEntity toAuthEntity(PasswordEncoder passwordEncoder) { - return UserJpaEntity.builder() - .loginId(id) - .password(passwordEncode(passwordEncoder, password)) - .agreedToTermsOfService(serviceTermRequest.agreedToTermsOfService()) - .agreedToPrivacyPolicy(serviceTermRequest.agreedToPrivacyPolicy()) - .agreedToMarketing(serviceTermRequest.agreedToMarketing()) - .gender(Gender.PENDING) - .userRole(UserRole.ROLE_PENDING) - .build(); - } -} \ No newline at end of file +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpResponse.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpResponse.java new file mode 100644 index 00000000..bc554ab6 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/SignUpResponse.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.presentation.auth.dto; + +public record SignUpResponse( + Token token +) { + + public static SignUpResponse from(Token token) { + return new SignUpResponse(token); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/Token.java b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/Token.java index 5e39e392..21a2db4e 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/auth/dto/Token.java +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/dto/Token.java @@ -3,14 +3,20 @@ public record Token( String grantType, String accessToken, - String refreshToken + String refreshToken, + Long accessTokenExpireTime, + Long refreshTokenExpireTime ) { public static Token of( String grantType, String accessToken, - String refreshToken + String refreshToken, + Long accessTokenExpireTime, + Long refreshTokenExpireTime + ) { - return new Token(grantType, accessToken, refreshToken); + return new Token(grantType, accessToken, refreshToken, accessTokenExpireTime, + refreshTokenExpireTime); } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/auth/resolver/RefreshTokenHeaderArgumentResolver.java b/src/main/java/life/mosu/mosuserver/presentation/auth/resolver/RefreshTokenHeaderArgumentResolver.java new file mode 100644 index 00000000..052a10f7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/auth/resolver/RefreshTokenHeaderArgumentResolver.java @@ -0,0 +1,32 @@ +package life.mosu.mosuserver.presentation.auth.resolver; + +import jakarta.servlet.http.HttpServletRequest; +import life.mosu.mosuserver.presentation.admin.annotation.RefreshTokenHeader; +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +@Component +public class RefreshTokenHeaderArgumentResolver implements HandlerMethodArgumentResolver { + + private static final String HEADER_NAME = "Refresh-Token"; + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(RefreshTokenHeader.class) + && parameter.getParameterType().equals(String.class); + } + + @Override + public Object resolveArgument(MethodParameter parameter, + ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) { + + HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); + return request.getHeader(HEADER_NAME); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/common/AddressResponse.java b/src/main/java/life/mosu/mosuserver/presentation/common/AddressResponse.java index 13086583..953524da 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/common/AddressResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/common/AddressResponse.java @@ -1,6 +1,6 @@ package life.mosu.mosuserver.presentation.common; -import life.mosu.mosuserver.domain.school.AddressJpaVO; +import life.mosu.mosuserver.domain.exam.entity.AddressJpaVO; public record AddressResponse( String zipcode, diff --git a/src/main/java/life/mosu/mosuserver/global/util/FileRequest.java b/src/main/java/life/mosu/mosuserver/presentation/common/FileRequest.java similarity index 53% rename from src/main/java/life/mosu/mosuserver/global/util/FileRequest.java rename to src/main/java/life/mosu/mosuserver/presentation/common/FileRequest.java index ca867139..8b23ebbb 100644 --- a/src/main/java/life/mosu/mosuserver/global/util/FileRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/common/FileRequest.java @@ -1,12 +1,11 @@ -package life.mosu.mosuserver.global.util; +package life.mosu.mosuserver.presentation.common; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.application.AdmissionTicketImageJpaEntity; -import life.mosu.mosuserver.domain.faq.FaqAttachmentJpaEntity; -import life.mosu.mosuserver.domain.inquiry.InquiryAttachmentJpaEntity; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerAttachmentEntity; -import life.mosu.mosuserver.domain.notice.NoticeAttachmentJpaEntity; -import life.mosu.mosuserver.infra.storage.domain.Visibility; +import life.mosu.mosuserver.domain.application.entity.ExamTicketImageJpaEntity; +import life.mosu.mosuserver.domain.file.Visibility; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryAttachmentJpaEntity; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerAttachmentEntity; +import life.mosu.mosuserver.domain.notice.entity.NoticeAttachmentJpaEntity; @Schema(description = "파일 요청 DTO (S3 파일 정보)") @@ -14,23 +13,22 @@ public record FileRequest( @Schema(description = "파일 이름", example = "example.jpg") String fileName, - + @Schema(description = "S3 키", example = "비공개 이미지를 처리하기 위한 키") String s3Key ) { - public FaqAttachmentJpaEntity toFaqAttachmentEntity(String fileName, String s3Key, Long faqId) { - return FaqAttachmentJpaEntity.builder() + public InquiryAttachmentJpaEntity toInquiryAttachmentEntity(Long inquiryId) { + return InquiryAttachmentJpaEntity.builder() .fileName(fileName) .s3Key(s3Key) - .visibility(Visibility.PUBLIC) - .faqId(faqId) + .visibility(Visibility.PRIVATE) + .inquiryId(inquiryId) .build(); } - - public NoticeAttachmentJpaEntity toNoticeAttachmentEntity(String fileName, String s3Key, - Long noticeId) { + + public NoticeAttachmentJpaEntity toNoticeAttachmentEntity(Long noticeId) { return NoticeAttachmentJpaEntity.builder() .fileName(fileName) .s3Key(s3Key) @@ -39,20 +37,8 @@ public NoticeAttachmentJpaEntity toNoticeAttachmentEntity(String fileName, Strin .build(); } - public InquiryAttachmentJpaEntity toInquiryAttachmentEntity(String fileName, String s3Key, - Long inquiryId) { - return InquiryAttachmentJpaEntity.builder() - .fileName(fileName) - .s3Key(s3Key) - .visibility(Visibility.PRIVATE) - .inquiryId(inquiryId) - .build(); - } - - - public AdmissionTicketImageJpaEntity toAdmissionTicketImageEntity(String fileName, String s3Key, - Long applicationId) { - return AdmissionTicketImageJpaEntity.builder() + public ExamTicketImageJpaEntity toExamTicketImageEntity(Long applicationId) { + return ExamTicketImageJpaEntity.builder() .fileName(fileName) .s3Key(s3Key) .visibility(Visibility.PRIVATE) @@ -60,9 +46,7 @@ public AdmissionTicketImageJpaEntity toAdmissionTicketImageEntity(String fileNam .build(); } - public InquiryAnswerAttachmentEntity toInquiryAnswerAttachmentEntity(String fileName, - String s3Key, - Long inquiryAnswerId) { + public InquiryAnswerAttachmentEntity toInquiryAnswerAttachmentEntity(Long inquiryAnswerId) { return InquiryAnswerAttachmentEntity.builder() .fileName(fileName) .s3Key(s3Key) @@ -70,4 +54,13 @@ public InquiryAnswerAttachmentEntity toInquiryAnswerAttachmentEntity(String file .inquiryAnswerId(inquiryAnswerId) .build(); } + +// public EventAttachmentJpaEntity toEventAttachmentEntity(Long eventId) { +// return EventAttachmentJpaEntity.builder() +// .fileName(fileName) +// .s3Key(s3Key) +// .visibility(Visibility.PUBLIC) +// .eventId(eventId) +// .build(); +// } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/event/EventController.java b/src/main/java/life/mosu/mosuserver/presentation/event/EventController.java new file mode 100644 index 00000000..679cdd00 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/event/EventController.java @@ -0,0 +1,73 @@ +package life.mosu.mosuserver.presentation.event; + +import jakarta.validation.Valid; +import life.mosu.mosuserver.application.event.EventService; +import life.mosu.mosuserver.global.annotation.CursorParam; +import life.mosu.mosuserver.global.support.Cursor; +import life.mosu.mosuserver.global.support.CursorResponse; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.event.dto.EventRequest; +import life.mosu.mosuserver.presentation.event.dto.EventResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/event") +public class EventController implements EventControllerDocs { + + private final EventService eventService; + + @PostMapping + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> createEvent( + @Valid @RequestBody EventRequest request) { + eventService.createEvent(request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.CREATED, "이벤트 등록 성공")); + } + + @GetMapping("/list") + public ResponseEntity>> getEvents( + @CursorParam Cursor cursor + ) { + CursorResponse responses = eventService.getEvents(cursor.getId()); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "이벤트 조회 성공", responses)); + } + + @GetMapping("/{eventId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> getEventDetail( + @PathVariable Long eventId) { + EventResponse event = eventService.getEventDetail(eventId); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "이벤트 상세 조회 성공", event)); + } + + @PutMapping("/{eventId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> updateEvent( + @PathVariable Long eventId, + @Valid @RequestBody EventRequest request + ) { + eventService.update(request, eventId); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "이벤트 수정 성공")); + } + + @DeleteMapping("/{eventId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> deleteEvent(@PathVariable Long eventId) { + eventService.deleteEvent(eventId); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "이벤트 삭제 성공")); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/event/EventControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/event/EventControllerDocs.java new file mode 100644 index 00000000..c5a1737c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/event/EventControllerDocs.java @@ -0,0 +1,122 @@ +package life.mosu.mosuserver.presentation.event; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.enums.ParameterIn; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import life.mosu.mosuserver.global.support.Cursor; +import life.mosu.mosuserver.global.support.CursorResponse; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.event.dto.EventRequest; +import life.mosu.mosuserver.presentation.event.dto.EventResponse; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; + +@Tag(name = "Event API", description = "이벤트 관련 API 명세") +public interface EventControllerDocs { + + @Operation(summary = "이벤트 등록", description = "관리자가 새로운 이벤트를 등록합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "201", description = "이벤트 등록 성공") + }) + ResponseEntity> createEvent( + @Parameter(description = "이벤트 생성 요청") @Valid @RequestBody EventRequest request + ); + + @Operation( + summary = "이벤트 목록 조회", + description = """ + 커서 기반으로 이벤트 목록을 조회합니다. + + - `id` 쿼리 파라미터는 커서 역할을 합니다. + - `id = -1` 로 요청 시 최신 이벤트부터 조회됩니다. + - 이후 응답의 `sliceInfo.nextCursor` 값을 다음 요청의 `id`로 넘기면 다음 페이지를 이어 조회할 수 있습니다. + """ + ) + @ApiResponses(value = { + @ApiResponse( + responseCode = "200", + description = "이벤트 목록 조회 성공", + content = @Content( + mediaType = "application/json", + schema = @Schema( + title = "ApiResponseWrapper>", + description = "커서 기반 이벤트 목록 응답", + type = "object", + example = """ + { + "code": 200, + "message": "이벤트 조회 성공", + "data": { + "content": [ + { + "eventId": 1, + "title": "여름방학 이벤트", + "endDate": "2025-07-31", + "eventLink": "https://mosu.life/event/summer", + "attachment": { + "fileName": "event-banner.png", + "url": "https://s3...", + "s3Key": "event/2025/banner.png" + } + } + ], + "sliceInfo": { + "numberOfElements": 10, + "last": false, + "nextCursor": 123 + } + } + } + """ + ) + ) + ) + }) + ResponseEntity>> getEvents( + @Parameter( + name = "id", + description = "커서 ID (최신순 시작 시 -1 입력)", + in = ParameterIn.QUERY, + required = true, + example = "-1" + ) + @Schema(hidden = true) Cursor cursor + ); + + @Operation(summary = "이벤트 상세 조회", description = "특정 이벤트의 상세 정보를 조회합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "이벤트 상세 조회 성공", + content = @Content(schema = @Schema(implementation = EventResponse.class))) + }) + ResponseEntity> getEventDetail( + @Parameter(name = "eventId", description = "조회할 이벤트의 ID", in = ParameterIn.PATH) + @PathVariable Long eventId + ); + + @Operation(summary = "이벤트 수정", description = "관리자가 특정 이벤트 정보를 수정합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "이벤트 수정 성공") + }) + ResponseEntity> updateEvent( + @Parameter(name = "eventId", description = "수정할 이벤트의 ID", in = ParameterIn.PATH) + @PathVariable Long eventId, + @Parameter(description = "이벤트 수정 요청") + @Valid @RequestBody EventRequest request + ); + + @Operation(summary = "이벤트 삭제", description = "관리자가 특정 이벤트를 삭제합니다.") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "이벤트 삭제 성공") + }) + ResponseEntity> deleteEvent( + @Parameter(name = "eventId", description = "삭제할 이벤트의 ID", in = ParameterIn.PATH) + @PathVariable Long eventId + ); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/event/dto/DurationRequest.java b/src/main/java/life/mosu/mosuserver/presentation/event/dto/DurationRequest.java new file mode 100644 index 00000000..91120477 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/event/dto/DurationRequest.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.presentation.event.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import life.mosu.mosuserver.domain.event.entity.DurationJpaVO; + +@Schema(description = "이벤트 기간 요청 DTO") +public record DurationRequest( + + @Schema(description = "이벤트 시작일", example = "2025-07-01") + LocalDate startDate, + + @Schema(description = "이벤트 종료일", example = "2025-07-31") + LocalDate endDate + +) { + + public DurationJpaVO toDurationJpaVO() { + return new DurationJpaVO(startDate, endDate); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/event/dto/EventRequest.java b/src/main/java/life/mosu/mosuserver/presentation/event/dto/EventRequest.java new file mode 100644 index 00000000..2c3af3f9 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/event/dto/EventRequest.java @@ -0,0 +1,43 @@ +package life.mosu.mosuserver.presentation.event.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import java.util.List; +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; +import life.mosu.mosuserver.domain.file.Visibility; +import life.mosu.mosuserver.presentation.common.FileRequest; + +@Schema(description = "이벤트 등록/수정 요청 DTO") +public record EventRequest( + + @NotBlank + @Schema(description = "이벤트 제목", example = "여름방학 이벤트") + String title, + + @Schema(description = "이벤트 링크 URL", example = "https://mosu.life/event/summer") + String eventLink, + + @Schema(description = "이벤트 기간") + DurationRequest duration, + + @Schema(description = "이벤트 첨부파일 (선택)") + FileRequest attachment + +) { + + public List optionalAttachment() { + FileRequest parsedAttachment = this.attachment; + return parsedAttachment == null ? List.of() : List.of(parsedAttachment); + } + + public EventJpaEntity toEntity() { + return EventJpaEntity.builder() + .title(title) + .eventLink(eventLink) + .duration(duration.toDurationJpaVO()) + .fileName(attachment().fileName()) + .s3Key(attachment().s3Key()) + .visibility(Visibility.PUBLIC) + .build(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/event/dto/EventResponse.java b/src/main/java/life/mosu/mosuserver/presentation/event/dto/EventResponse.java new file mode 100644 index 00000000..d346a04f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/event/dto/EventResponse.java @@ -0,0 +1,56 @@ +package life.mosu.mosuserver.presentation.event.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import life.mosu.mosuserver.domain.event.entity.EventJpaEntity; + +@Schema(description = "이벤트 응답 DTO") +public record EventResponse( + + @Schema(description = "이벤트 ID", example = "1") + Long eventId, + + @Schema(description = "이벤트 제목", example = "여름방학 이벤트") + String title, + + @Schema(description = "이벤트 종료일", example = "2025-07-31") + LocalDate endDate, + + @Schema(description = "이벤트 링크 URL", example = "https://mosu.life/event/summer") + String eventLink, + + @Schema(description = "이벤트 첨부파일 정보") + AttachmentResponse attachment + +) { + + public static EventResponse of(EventJpaEntity event, String eventUrl) { + AttachmentResponse attachment = new AttachmentResponse( + event.getFileName(), + eventUrl, + event.getS3Key() + ); + + return new EventResponse( + event.getId(), + event.getTitle(), + event.getDuration().getEndDate(), + event.getEventLink(), + attachment + ); + } + + @Schema(description = "이벤트 첨부파일 DTO") + public record AttachmentResponse( + @Schema(description = "파일명", example = "event-banner.png") + String fileName, + + @Schema(description = "파일 접근 URL", example = "https://your-bucket.s3.amazonaws.com/event/2025/banner.png") + String url, + + @Schema(description = "S3 키", example = "event/2025/banner.png") + String s3Key + ) { + + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/ExamController.java b/src/main/java/life/mosu/mosuserver/presentation/exam/ExamController.java new file mode 100644 index 00000000..25469fe1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/ExamController.java @@ -0,0 +1,82 @@ +package life.mosu.mosuserver.presentation.exam; + +import java.util.List; +import life.mosu.mosuserver.application.exam.ExamService; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.exam.dto.ExamRequest; +import life.mosu.mosuserver.presentation.exam.dto.ExamResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PatchMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/exams") +@RequiredArgsConstructor +public class ExamController { + + private final ExamService examService; + + @PostMapping + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> register( + @RequestBody ExamRequest request + ) { + examService.register(request); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.CREATED, "시험 등록 성공")); + } + + @GetMapping("/all") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity>> getExams() { + List response = examService.getExams(); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "전체 시험 정보 조회 성공", response)); + } + + @GetMapping + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity>> getByArea( + @RequestParam String areaName + ) { + List response = examService.getByArea(areaName); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "지역별 시험 조회 성공", response)); + } + + @GetMapping("/areas") + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity>> getDistinctAreas() { + List response = examService.getDistinctAreas(); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "시험 지역 조회 성공", response)); + } + + @DeleteMapping("/{examId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> delete(@PathVariable Long examId) { + examService.delete(examId); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "시험장 삭제 성공")); + + } + + @PatchMapping("/{examId}") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + public ResponseEntity> close(@PathVariable Long examId) { + examService.close(examId); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "시험장 마감 성공")); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/ExamQuotaEventListener.java b/src/main/java/life/mosu/mosuserver/presentation/exam/ExamQuotaEventListener.java new file mode 100644 index 00000000..d39b8f2b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/ExamQuotaEventListener.java @@ -0,0 +1,18 @@ +package life.mosu.mosuserver.presentation.exam; + +import life.mosu.mosuserver.application.exam.ExamQuotaService; +import life.mosu.mosuserver.global.annotation.ReactiveEventListener; +import life.mosu.mosuserver.presentation.exam.dto.event.ExamQuotaEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ExamQuotaEventListener { + private final ExamQuotaService examQuotaService; + + @ReactiveEventListener + public void handleExamQuotaEvent(ExamQuotaEvent event) { + examQuotaService.handleExamQuotaEvent(event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/application/dto/AddressRequest.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/AddressRequest.java similarity index 85% rename from src/main/java/life/mosu/mosuserver/presentation/application/dto/AddressRequest.java rename to src/main/java/life/mosu/mosuserver/presentation/exam/dto/AddressRequest.java index cd5304b7..1b485058 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/application/dto/AddressRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/AddressRequest.java @@ -1,7 +1,7 @@ -package life.mosu.mosuserver.presentation.application.dto; +package life.mosu.mosuserver.presentation.exam.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.school.AddressJpaVO; +import life.mosu.mosuserver.domain.exam.entity.AddressJpaVO; @Schema(description = "주소 요청 DTO") public record AddressRequest( diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamLunchRequest.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamLunchRequest.java new file mode 100644 index 00000000..809d0c8c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamLunchRequest.java @@ -0,0 +1,9 @@ +package life.mosu.mosuserver.presentation.exam.dto; + + +public record ExamLunchRequest( + String name, + Integer price +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamRequest.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamRequest.java new file mode 100644 index 00000000..2c793688 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamRequest.java @@ -0,0 +1,40 @@ +package life.mosu.mosuserver.presentation.exam.dto; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.exam.entity.AddressJpaVO; +import life.mosu.mosuserver.domain.exam.entity.Area; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; + +public record ExamRequest( + String schoolName, + String areaName, + AddressRequest address, + LocalDate examDate, + Integer capacity, + LocalDateTime deadlineTime, + LunchRequest lunch +) { + + public ExamJpaEntity toEntity() { + AddressJpaVO parsedAddress = address.toValueObject(); + return ExamJpaEntity.builder() + .schoolName(schoolName) + .area(parseArea(areaName)) + .address(parsedAddress) + .examDate(examDate) + .capacity(capacity) + .deadlineTime(deadlineTime) + .lunchName(lunch.name()) + .lunchPrice(lunch.price()) + .build(); + } + + private Area parseArea(String areaName) { + try { + return Area.from(areaName); + } catch (Exception e) { + throw new RuntimeException(e); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamResponse.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamResponse.java new file mode 100644 index 00000000..5837afbf --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/ExamResponse.java @@ -0,0 +1,65 @@ +package life.mosu.mosuserver.presentation.exam.dto; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.exam.entity.ExamJpaEntity; +import life.mosu.mosuserver.presentation.common.AddressResponse; + +public record ExamResponse( + Long id, + String schoolName, + AddressResponse address, + String area, + Long currentQuota, + Integer maxQuota, + LocalDateTime deadlineTime, + LocalDate examDate, + LunchResponse lunch +) { + + public static ExamResponse of(ExamJpaEntity exam, Long currentQuota) { + AddressResponse address = AddressResponse.from(exam.getAddress()); + LunchResponse lunch = LunchResponse.of(exam.getLunchName(), exam.getLunchPrice()); + + return new ExamResponse( + exam.getId(), + exam.getSchoolName(), + address, + exam.getArea().getAreaName(), + currentQuota, + exam.getCapacity(), + exam.getDeadlineTime(), + exam.getExamDate(), + lunch + ); + } +// +// public static List fromList(List foundExams) { +// return foundExams.stream() +// .map(ExamResponse::from) +// .toList(); +// } + +// public static ExamResponse from(ExamWithLunchProjection exam) { +// AddressResponse address = AddressResponse.from(exam.address()); +// List lunchInfos = lunches.stream().map( +// lunch -> LunchInfo.of(lunch.getName(), lunch.getPrice()) +// ).toList(); +// return new ExamResponse( +// exam.examId(), +// exam.schoolName(), +// address, +// exam.area(), +// exam.capacity(), +// exam.deadLineTime(), +// exam.examDate() +// e +// ); +// } + +// public static List fromList(List foundExams) { +// return foundExams.stream() +// .map(ExamResponse::from) +// .toList(); +// } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/LunchRequest.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/LunchRequest.java new file mode 100644 index 00000000..b43c96ec --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/LunchRequest.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.presentation.exam.dto; + +public record LunchRequest( + String name, + Integer price +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/LunchResponse.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/LunchResponse.java new file mode 100644 index 00000000..97b83330 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/LunchResponse.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.presentation.exam.dto; + +public record LunchResponse( + String name, + Integer price +) { + + public static LunchResponse of(String name, Integer price) { + return new LunchResponse(name, price); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ApplicationEventStatus.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ApplicationEventStatus.java new file mode 100644 index 00000000..98a9f4fe --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ApplicationEventStatus.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.presentation.exam.dto.event; + +public enum ApplicationEventStatus implements ExamQuotaStatus { + INCREASE, CREATE, DECREASE, DELETE +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaEvent.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaEvent.java new file mode 100644 index 00000000..5039e315 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaEvent.java @@ -0,0 +1,23 @@ +package life.mosu.mosuserver.presentation.exam.dto.event; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor(staticName = "ofSingleCommand") +public class ExamQuotaEvent { + private final ExamQuotaEventType type; + private final Long examId; + private final Long value; + private final Enum status; + + public ExamQuotaEvent(ExamQuotaEventType type, Long examId, Long value) { + this.type = type; + this.examId = examId; + this.value = value; + this.status = null; + } + public static ExamQuotaEvent ofMultipleCommand(ExamQuotaEventType type, Long examId, Long value) { + return new ExamQuotaEvent(type, examId, value); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaEventType.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaEventType.java new file mode 100644 index 00000000..8e1213f4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaEventType.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.presentation.exam.dto.event; + +import java.util.Set; + +public enum ExamQuotaEventType { + // Single Commands + CURRENT_APPLICATION(Set.of(ApplicationEventStatus.INCREASE, ApplicationEventStatus.CREATE, + ApplicationEventStatus.DELETE)), + MAX_CAPACITY( + Set.of(MaxCapacityStatus.CREATE, MaxCapacityStatus.UPDATE, MaxCapacityStatus.DELETE)), + + // Multiple Commands + LOAD(Set.of()), + DELETE_ALL(Set.of()); + private final Set validStatuses; + + ExamQuotaEventType(Set statuses) { + this.validStatuses = statuses; + } + + public boolean isValidStatus(ExamQuotaStatus status) { + return validStatuses.contains(status); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaStatus.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaStatus.java new file mode 100644 index 00000000..b73f8e58 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/ExamQuotaStatus.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.presentation.exam.dto.event; + +public interface ExamQuotaStatus { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/MaxCapacityStatus.java b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/MaxCapacityStatus.java new file mode 100644 index 00000000..c006e65d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/exam/dto/event/MaxCapacityStatus.java @@ -0,0 +1,5 @@ +package life.mosu.mosuserver.presentation.exam.dto.event; + +public enum MaxCapacityStatus implements ExamQuotaStatus { + CREATE, UPDATE, DELETE +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/examapplication/ExamApplicationController.java b/src/main/java/life/mosu/mosuserver/presentation/examapplication/ExamApplicationController.java new file mode 100644 index 00000000..549945de --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/examapplication/ExamApplicationController.java @@ -0,0 +1,87 @@ +package life.mosu.mosuserver.presentation.examapplication; + +import life.mosu.mosuserver.application.examapplication.ExamApplicationService; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.admin.dto.ExamTicketResponse; +import life.mosu.mosuserver.presentation.examapplication.dto.ExamApplicationInfoResponse; +import life.mosu.mosuserver.presentation.examapplication.dto.UpdateSubjectRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/exam-application") +@RequiredArgsConstructor +public class ExamApplicationController { + + private final ExamApplicationService examApplicationService; + + @GetMapping("{examApplicationId}") + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity> getApplication( + @UserId Long userId, + @PathVariable("examApplicationId") Long examApplicationId, + @RequestParam("applicationId") Long applicationId + ) { + + if (applicationId == null) { + throw new CustomRuntimeException(ErrorCode.WRONG_APPLICATION_ID_TYPE); + } + + ExamApplicationInfoResponse response = examApplicationService.getApplication( + userId, + examApplicationId, + applicationId); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "신청 정보 조회를 완료하였습니다.", response)); + } + + @PutMapping("{examApplicationId}/subjects") + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity> updateSubjects( + @UserId Long userId, + @PathVariable("examApplicationId") Long examApplicationId, + @RequestBody UpdateSubjectRequest request + ) { + examApplicationService.updateSubjects(userId, + examApplicationId, request); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "과목 수정을 완료했습니다.")); + } + + @GetMapping("{examApplicationId}/exam-ticket") + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity> getExamTicket( + @UserId Long userId, + @PathVariable("examApplicationId") Long examApplicationId + ) { + ExamTicketResponse response = examApplicationService.getExamTicket(userId, + examApplicationId); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "수험표 발급을 완료했습니다.", response)); + } + + @Deprecated + @DeleteMapping("{examApplicationId}") + public ResponseEntity> deleteExamApplication( + @UserId Long userId, + @PathVariable("examApplicationId") Long examApplicationId + ) { + examApplicationService.deleteExamApplication(userId, examApplicationId); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "신청 정보 정상적으로 삭제되었습니다.")); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/ExamApplicationInfoResponse.java b/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/ExamApplicationInfoResponse.java new file mode 100644 index 00000000..6600cac1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/ExamApplicationInfoResponse.java @@ -0,0 +1,45 @@ +package life.mosu.mosuserver.presentation.examapplication.dto; + +import java.time.LocalDate; +import java.util.Set; +import life.mosu.mosuserver.presentation.common.AddressResponse; + +public record ExamApplicationInfoResponse( + Long examApplicationId, + String paymentKey, + LocalDate examDate, + String schoolName, + AddressResponse address, + Set subjects, + String lunchName, + Integer paymentAmount, + Integer discountAmount, + String paymentMethod +) { + + public static ExamApplicationInfoResponse of( + Long examApplicationId, + String paymentKey, + LocalDate examDate, + String schoolName, + AddressResponse address, + Set subjects, + String lunchName, + Integer paymentAmount, + Integer discountAmount, + String paymentMethod + ) { + return new ExamApplicationInfoResponse( + examApplicationId, + paymentKey, + examDate, + schoolName, + address, + subjects, + lunchName, + paymentAmount, + discountAmount, + paymentMethod + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/ExamApplicationWithStatus.java b/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/ExamApplicationWithStatus.java new file mode 100644 index 00000000..b39899fd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/ExamApplicationWithStatus.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.presentation.examapplication.dto; + +import life.mosu.mosuserver.domain.examapplication.entity.ExamApplicationJpaEntity; + +public record ExamApplicationWithStatus( + ExamApplicationJpaEntity examApplication, + String status +) { } diff --git a/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/UpdateSubjectRequest.java b/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/UpdateSubjectRequest.java new file mode 100644 index 00000000..e14f60c4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/examapplication/dto/UpdateSubjectRequest.java @@ -0,0 +1,42 @@ +package life.mosu.mosuserver.presentation.examapplication.dto; + +import java.util.List; +import java.util.Set; +import java.util.stream.Collectors; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.examapplication.entity.ExamSubjectJpaEntity; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; + +public record UpdateSubjectRequest( + List subjects +) { + + private Set validatedSubjects() { + Set subjectSet; + try { + subjectSet = subjects.stream() + .map(Subject::getSubject) + .collect(Collectors.toSet()); + } catch (IllegalArgumentException e) { + throw new CustomRuntimeException(ErrorCode.WRONG_SUBJECT_TYPE); + } + + if (subjectSet.size() != 2) { + throw new CustomRuntimeException(ErrorCode.WRONG_SUBJECT_COUNT); + } + return subjectSet; + } + + public List toEntityList(Long examApplicationId) { + return validatedSubjects().stream() + .map(subject -> toEntity(examApplicationId, subject)) + .toList(); + } + + private ExamSubjectJpaEntity toEntity(Long examApplicationId, Subject subject) { + return ExamSubjectJpaEntity.create(examApplicationId, subject); + } + + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/faq/FaqController.java b/src/main/java/life/mosu/mosuserver/presentation/faq/FaqController.java index f3804aad..460cdf4d 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/faq/FaqController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/faq/FaqController.java @@ -3,6 +3,7 @@ import jakarta.validation.Valid; import java.util.List; import life.mosu.mosuserver.application.faq.FaqService; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; import life.mosu.mosuserver.presentation.faq.dto.FaqCreateRequest; import life.mosu.mosuserver.presentation.faq.dto.FaqResponse; @@ -10,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -24,16 +26,16 @@ @RestController @RequiredArgsConstructor @RequestMapping("/faq") -public class FaqController implements FaqControllerDocs { +public class FaqController { private final FaqService faqService; - //TODO: 관리자 권한 체크 추가 @PostMapping - // @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") public ResponseEntity> createFaq( + @UserId Long userId, @Valid @RequestBody FaqCreateRequest request) { - faqService.createFaq(request); + faqService.createFaq(userId, request); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.CREATED, "게시글 등록 성공")); } @@ -42,7 +44,7 @@ public ResponseEntity>> getFaqs( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size ) { - List responses = faqService.getFaqWithAttachments(page, size); + List responses = faqService.getFaqs(page, size); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "게시글 조회 성공", responses)); } @@ -54,7 +56,7 @@ public ResponseEntity> getFaqDetail( } @PutMapping("/{faqId}") - // @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") public ResponseEntity> updateFaq( @PathVariable Long faqId, @Valid @RequestBody FaqUpdateRequest request @@ -63,9 +65,8 @@ public ResponseEntity> updateFaq( return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "게시글 수정 성공")); } - //TODO: 관리자 권한 체크 추가 @DeleteMapping("/{faqId}") - // @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") public ResponseEntity> deleteFaq(@PathVariable Long faqId) { faqService.deleteFaq(faqId); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "게시글 삭제 성공")); diff --git a/src/main/java/life/mosu/mosuserver/presentation/faq/FaqControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/faq/FaqControllerDocs.java deleted file mode 100644 index 9547bab5..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/faq/FaqControllerDocs.java +++ /dev/null @@ -1,80 +0,0 @@ -package life.mosu.mosuserver.presentation.faq; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.Parameter; -import io.swagger.v3.oas.annotations.enums.ParameterIn; -import io.swagger.v3.oas.annotations.media.ArraySchema; -import io.swagger.v3.oas.annotations.media.Content; -import io.swagger.v3.oas.annotations.media.Schema; -import io.swagger.v3.oas.annotations.responses.ApiResponse; -import io.swagger.v3.oas.annotations.responses.ApiResponses; -import io.swagger.v3.oas.annotations.tags.Tag; -import jakarta.validation.Valid; -import java.util.List; -import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.faq.dto.FaqCreateRequest; -import life.mosu.mosuserver.presentation.faq.dto.FaqResponse; -import life.mosu.mosuserver.presentation.faq.dto.FaqUpdateRequest; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; - -@Tag(name = "Faq API", description = "FAQ 관련 API 명세") -public interface FaqControllerDocs { - - @Operation(summary = "FAQ 등록", description = "관리자가 새로운 FAQ를 등록합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "201", description = "FAQ 등록 성공") - }) - ResponseEntity> createFaq( - @Parameter(description = "FAQ 등록 요청 데이터") @RequestBody @Valid FaqCreateRequest request - ); - - @Operation(summary = "FAQ 목록 조회", description = "전체 FAQ 목록을 페이징하여 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "FAQ 목록 조회 성공", - content = @Content(mediaType = "application/json", - array = @ArraySchema(schema = @Schema(implementation = FaqResponse.class)) - ) - ) - - }) - ResponseEntity>> getFaqs( - @Parameter(name = "page", description = "페이지 번호", in = ParameterIn.QUERY) - @RequestParam(defaultValue = "0") int page, - - @Parameter(name = "size", description = "페이지 크기", in = ParameterIn.QUERY) - @RequestParam(defaultValue = "10") int size - ); - - @Operation(summary = "FAQ 상세 조회", description = "FAQ ID를 기반으로 상세 내용을 조회합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "FAQ 상세 조회 성공") - }) - ResponseEntity> getFaqDetail( - @Parameter(name = "faqId", description = "FAQ ID", in = ParameterIn.PATH) - @PathVariable Long faqId - ); - - @Operation(summary = "FAQ 삭제", description = "FAQ ID를 기반으로 게시글을 삭제합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "FAQ 삭제 성공") - }) - ResponseEntity> deleteFaq( - @Parameter(name = "faqId", description = "삭제할 FAQ ID", in = ParameterIn.PATH) - @PathVariable Long faqId - ); - - @Operation(summary = "FAQ 수정", description = "기존 FAQ 내용을 수정합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "FAQ 수정 성공") - }) - ResponseEntity> updateFaq( - @Parameter(name = "faqId", description = "수정할 FAQ ID", in = ParameterIn.PATH) - @PathVariable Long faqId, - - @Parameter(description = "FAQ 수정 요청 데이터") - @RequestBody @Valid FaqUpdateRequest request - ); -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqCreateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqCreateRequest.java index 6ccb1395..b20cb8e9 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqCreateRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqCreateRequest.java @@ -2,9 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import java.util.List; import life.mosu.mosuserver.domain.faq.FaqJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; public record FaqCreateRequest( @@ -15,17 +13,10 @@ public record FaqCreateRequest( @NotNull String answer, @Schema(description = "작성자 이름", example = "관리자") - @NotNull String author, - - @Schema(description = "작성자 ID (추후 토큰에서 추출 예정)", example = "1") - Long userId, - - @Schema(description = "첨부파일 리스트") - List attachments - + @NotNull String author ) { - public FaqJpaEntity toEntity() { + public FaqJpaEntity toEntity(Long userId) { return FaqJpaEntity.builder() .question(question) .answer(answer) diff --git a/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqResponse.java b/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqResponse.java index d7d89a46..6f788012 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqResponse.java @@ -1,32 +1,22 @@ package life.mosu.mosuserver.presentation.faq.dto; import io.swagger.v3.oas.annotations.media.Schema; -import java.util.List; import life.mosu.mosuserver.domain.faq.FaqJpaEntity; public record FaqResponse( @Schema(description = "FAQ ID") Long id, @Schema(description = "질문") String question, @Schema(description = "답변") String answer, - @Schema(description = "작성 일자 (yyyy-MM-dd)") String createdAt, - @Schema(description = "첨부파일 리스트") List attachments + @Schema(description = "작성 일자 (yyyy-MM-dd)") String createdAt ) { - public static FaqResponse of(FaqJpaEntity faq, List attachments) { + public static FaqResponse of(FaqJpaEntity faq) { return new FaqResponse( faq.getId(), faq.getQuestion(), faq.getAnswer(), - faq.getCreatedAt().substring(0, 10), // 일자만 반환 - attachments + faq.getCreatedAt().substring(0, 10) // 일자만 반환 ); } - public record AttachmentResponse( - @Schema(description = "파일명") String fileName, - @Schema(description = "파일 URL") String url, - @Schema(description = "S3 키") String s3Key - ) { - - } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqUpdateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqUpdateRequest.java index 18e1a010..f8bdbf9c 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqUpdateRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/faq/dto/FaqUpdateRequest.java @@ -2,8 +2,6 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; -import java.util.List; -import life.mosu.mosuserver.global.util.FileRequest; public record FaqUpdateRequest( @@ -14,10 +12,7 @@ public record FaqUpdateRequest( @NotNull String answer, @Schema(description = "작성자 이름", example = "관리자") - @NotNull String author, - - @Schema(description = "첨부파일 리스트") - List attachments + @NotNull String author ) { diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/presentation/S3Controller.java b/src/main/java/life/mosu/mosuserver/presentation/file/FileController.java similarity index 66% rename from src/main/java/life/mosu/mosuserver/infra/storage/presentation/S3Controller.java rename to src/main/java/life/mosu/mosuserver/presentation/file/FileController.java index 4d6900c0..ee255d8b 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/presentation/S3Controller.java +++ b/src/main/java/life/mosu/mosuserver/presentation/file/FileController.java @@ -1,14 +1,14 @@ -package life.mosu.mosuserver.infra.storage.presentation; +package life.mosu.mosuserver.presentation.file; -import jakarta.validation.constraints.NotNull; +import life.mosu.mosuserver.domain.file.Folder; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.infra.storage.application.S3Service; -import life.mosu.mosuserver.infra.storage.domain.Folder; -import life.mosu.mosuserver.infra.storage.presentation.dto.FileUploadResponse; +import life.mosu.mosuserver.infra.persistence.s3.S3Service; +import life.mosu.mosuserver.presentation.file.dto.FileUploadResponse; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; @@ -18,14 +18,16 @@ @RestController @RequiredArgsConstructor @RequestMapping("/s3") -public class S3Controller { +public class FileController { + private final S3Service s3Service; @PostMapping - public ApiResponseWrapper uploadFile( - @RequestParam("file") MultipartFile file, - @RequestParam(defaultValue = "temp") String folderName - ) { + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ApiResponseWrapper upload( + @RequestParam("file") MultipartFile file, + @RequestParam(defaultValue = "temp") String folderName + ) { if (file.isEmpty()) { throw new CustomRuntimeException(ErrorCode.FILE_UPLOAD_FAILED, "업로드할 파일이 비어 있습니다."); diff --git a/src/main/java/life/mosu/mosuserver/infra/storage/presentation/dto/FileUploadResponse.java b/src/main/java/life/mosu/mosuserver/presentation/file/dto/FileUploadResponse.java similarity index 64% rename from src/main/java/life/mosu/mosuserver/infra/storage/presentation/dto/FileUploadResponse.java rename to src/main/java/life/mosu/mosuserver/presentation/file/dto/FileUploadResponse.java index 5faab71c..0c18e612 100644 --- a/src/main/java/life/mosu/mosuserver/infra/storage/presentation/dto/FileUploadResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/file/dto/FileUploadResponse.java @@ -1,9 +1,10 @@ -package life.mosu.mosuserver.infra.storage.presentation.dto; +package life.mosu.mosuserver.presentation.file.dto; public record FileUploadResponse( - String fileName, - String s3Key + String fileName, + String s3Key ) { + public static FileUploadResponse of(String fileName, String s3Key) { return new FileUploadResponse(fileName, s3Key); } diff --git a/src/main/java/life/mosu/mosuserver/presentation/form/FormController.java b/src/main/java/life/mosu/mosuserver/presentation/form/FormController.java new file mode 100644 index 00000000..11ddbbc9 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/form/FormController.java @@ -0,0 +1,48 @@ +package life.mosu.mosuserver.presentation.form; + +import jakarta.validation.Valid; +import life.mosu.mosuserver.application.form.FormService; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.form.dto.FormListResponse; +import life.mosu.mosuserver.presentation.form.dto.FormResponse; +import life.mosu.mosuserver.presentation.form.dto.RegisterFormRequest; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/form") +public class FormController implements FormControllerDocs { + + private final FormService formService; + + @PostMapping + public ResponseEntity> registerForm( + @Valid @RequestBody RegisterFormRequest request) { + formService.registerForm(request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.CREATED, "Form 등록 성공")); + } + + @GetMapping("/{formId}") + public ResponseEntity> getForms( + @PathVariable Long formId + ) { + FormResponse response = formService.getFormId(formId); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "Form 조회 성공", response)); + } + + @GetMapping + public ResponseEntity> getAllForms() { + FormListResponse responses = formService.getAllForms(); + + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "FormList 조회 성공", responses)); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/form/FormControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/form/FormControllerDocs.java new file mode 100644 index 00000000..aaa75345 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/form/FormControllerDocs.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.presentation.form; + +import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.Valid; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.form.dto.FormListResponse; +import life.mosu.mosuserver.presentation.form.dto.FormResponse; +import life.mosu.mosuserver.presentation.form.dto.RegisterFormRequest; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RequestBody; + +public interface FormControllerDocs { + + @Operation(summary = "Form 등록", description = "새로운 Form을 등록합니다. 권한은 아직 아무것도 없는데 추가될 수 있습니다") + public ResponseEntity> registerForm( + @Valid @RequestBody RegisterFormRequest request); + + @Operation(summary = "Form 단건 조회", description = "특정 Form ID에 해당하는 Form 정보를 조회합니다. 권한은 아직 아무것도 없는데 추가될 수 있습니다") + public ResponseEntity> getForms( + @PathVariable Long formId); + + @Operation(summary = "모든 Form 조회", description = "등록된 모든 Form 정보를 조회합니다. 권한은 아직 아무것도 없는데 추가될 수 있습니다") + public ResponseEntity> getAllForms(); +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/form/dto/FormListResponse.java b/src/main/java/life/mosu/mosuserver/presentation/form/dto/FormListResponse.java new file mode 100644 index 00000000..ce70d5f5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/form/dto/FormListResponse.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.presentation.form.dto; + +import java.util.List; + +public record FormListResponse( + List forms +) { + + public static FormListResponse of(List forms) { + return new FormListResponse(forms); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/form/dto/FormResponse.java b/src/main/java/life/mosu/mosuserver/presentation/form/dto/FormResponse.java new file mode 100644 index 00000000..5757ae3a --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/form/dto/FormResponse.java @@ -0,0 +1,38 @@ +package life.mosu.mosuserver.presentation.form.dto; + +import java.time.LocalDate; +import life.mosu.mosuserver.domain.form.FormJpaEntity; + +public record FormResponse( + String orgName, + String password, + String userName, + String gender, + LocalDate birth, + String phoneNumber, + String subject, + String subject2, + Boolean lunch, + String area, + String schoolName, + LocalDate examDate +) { + + public static FormResponse from(FormJpaEntity form) { + return new FormResponse( + form.getOrgName(), + form.getPassword(), + form.getUserName(), + form.getGender() != null ? form.getGender().name() : null, + form.getBirth(), + form.getPhoneNumber(), + form.getSubject() != null ? form.getSubject().name() : null, + form.getSubject2() != null ? form.getSubject2().name() : null, + form.isLunch(), + form.getArea() != null ? form.getArea().name() : null, + form.getSchoolName(), + form.getExamDate() + ); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/form/dto/RegisterFormRequest.java b/src/main/java/life/mosu/mosuserver/presentation/form/dto/RegisterFormRequest.java new file mode 100644 index 00000000..ced2303b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/form/dto/RegisterFormRequest.java @@ -0,0 +1,59 @@ +package life.mosu.mosuserver.presentation.form.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDate; +import life.mosu.mosuserver.domain.application.entity.Subject; +import life.mosu.mosuserver.domain.exam.entity.Area; +import life.mosu.mosuserver.domain.form.FormJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.presentation.common.FileRequest; + +public record RegisterFormRequest( + @Schema(description = "시험 기간", example = "2025-07-29") + @NotNull LocalDate examDate, + @Schema(description = "기관명", example = "모수학원") + @NotNull String orgName, + @Schema(description = "비밀번호", example = "1234") + @NotNull String password, + @Schema(description = "신청 대표자 이름", example = "김모수") + @NotNull String userName, + @Schema(description = "성별", example = "MALE") + @NotNull String gender, + @Schema(description = "생년월일", example = "2000-01-01") + @NotNull LocalDate birth, + @Schema(description = "전화번호", example = "010-1234-5678") + @NotNull String phoneNumber, + @Schema(description = "주요 과목", example = "생활과 윤리") + @NotNull String subject, + @Schema(description = "보조 과목", example = "화학Ⅱ") + @NotNull String subject2, + @Schema(description = "점심 제공 여부", example = "true") + @NotNull Boolean lunch, + @Schema(description = "지역", example = "대구") + @NotNull String area, + @Schema(description = "학교명", example = "대치중학교") + @NotNull String schoolName, + @Schema(description = "수험표 파일 정보", implementation = FileRequest.class) + FileRequest admissionTicket +) { + + public FormJpaEntity toEntity() { + return FormJpaEntity.builder() + .orgName(orgName) + .password(password) + .userName(userName) + .gender(Gender.valueOf(gender)) + .birth(birth) + .phoneNumber(phoneNumber) + .subject(Subject.getSubject(subject)) + .subject2(Subject.getSubject(subject2)) + .lunch(lunch) + .examDate(examDate) + .area(Area.from(area)) + .schoolName(schoolName) + .fileName(admissionTicket().fileName()) + .s3Key(admissionTicket().s3Key()) + .build(); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryController.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryController.java index 64ea4450..a34c0d74 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryController.java @@ -1,12 +1,10 @@ package life.mosu.mosuserver.presentation.inquiry; import jakarta.validation.Valid; -import life.mosu.mosuserver.application.inquiry.InquiryAnswerService; +import life.mosu.mosuserver.application.auth.PrincipalDetails; import life.mosu.mosuserver.application.inquiry.InquiryService; -import life.mosu.mosuserver.domain.inquiry.InquiryStatus; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerRequest; -import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerUpdateRequest; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryCreateRequest; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; @@ -16,14 +14,14 @@ import org.springframework.data.web.PageableDefault; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -32,64 +30,45 @@ public class InquiryController implements InquiryControllerDocs { private final InquiryService inquiryService; - private final InquiryAnswerService inquiryAnswerService; - + @PostMapping + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity> create( + @AuthenticationPrincipal PrincipalDetails principalDetails, @RequestBody @Valid InquiryCreateRequest request) { - inquiryService.createInquiry(request); + inquiryService.createInquiry(principalDetails.user(), request); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.CREATED, "질문 등록 성공")); } - @GetMapping("/list") - public ResponseEntity>> getInquiryList( - @RequestParam(required = false) InquiryStatus status, - @RequestParam(required = false, defaultValue = "id") String sort, - @RequestParam(required = false, defaultValue = "true") boolean asc, + @GetMapping("/my") + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity>> getMyInquiries( + @UserId Long userId, @PageableDefault(size = 10) Pageable pageable ) { - Page inquiries = inquiryService.getInquiries(status, sort, asc, - pageable); - return ResponseEntity.ok( - ApiResponseWrapper.success(HttpStatus.OK, "질문 목록 조회 성공", inquiries)); + Page inquiries = inquiryService.getMyInquiry(userId, pageable); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "내 질문 목록 조회 성공", inquiries)); } @GetMapping("/{postId}") + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity> getInquiryDetail( + @AuthenticationPrincipal PrincipalDetails principalDetails, @PathVariable Long postId) { - InquiryDetailResponse inquiry = inquiryService.getInquiryDetail(postId); + InquiryDetailResponse inquiry = inquiryService.getInquiryDetail(principalDetails.user(), postId); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "질문 상세 조회 성공", inquiry)); } @DeleteMapping("/{postId}") - public ResponseEntity> deleteInquiry(@PathVariable Long postId) { - inquiryService.deleteInquiry(postId); + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity> deleteInquiry( + @AuthenticationPrincipal PrincipalDetails principalDetails, + @PathVariable Long postId + ) { + inquiryService.deleteInquiry(principalDetails.user(), postId); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "질문 삭제 성공")); } - @PostMapping("/{postId}/answer") - public ResponseEntity> inquiryAnswer( - @PathVariable Long postId, - @RequestBody InquiryAnswerRequest request) { - inquiryAnswerService.createInquiryAnswer(postId, request); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "답변 등록 성공")); - } - - @PutMapping("/{postId}/answer") - public ResponseEntity> updateInquiryAnswer( - @PathVariable Long postId, - @RequestBody InquiryAnswerUpdateRequest request) { - inquiryAnswerService.updateInquiryAnswer(postId, request); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "답변 수정 성공")); - } - - @DeleteMapping("/{postId}/answer") - public ResponseEntity> deleteInquiryAnswer(@PathVariable Long postId) { - inquiryAnswerService.deleteInquiryAnswer(postId); - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "답변 삭제 성공")); - } - - -} +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryControllerDocs.java index f210c89b..e592404c 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryControllerDocs.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/InquiryControllerDocs.java @@ -9,10 +9,8 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import life.mosu.mosuserver.domain.inquiry.InquiryStatus; +import life.mosu.mosuserver.application.auth.PrincipalDetails; import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerRequest; -import life.mosu.mosuserver.presentation.inquiry.dto.InquiryAnswerUpdateRequest; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryCreateRequest; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryDetailResponse; import life.mosu.mosuserver.presentation.inquiry.dto.InquiryResponse; @@ -21,7 +19,6 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; @Tag(name = "Inquiry API", description = "1:1 문의 관련 API 명세") public interface InquiryControllerDocs { @@ -31,22 +28,18 @@ public interface InquiryControllerDocs { @ApiResponse(responseCode = "201", description = "질문 등록 성공") }) ResponseEntity> create( + PrincipalDetails principalDetails, @Parameter(description = "문의 생성에 필요한 정보") @RequestBody @Valid InquiryCreateRequest request ); - @Operation(summary = "1:1 문의 목록 조회", description = "조건에 맞는 1:1 문의 목록을 페이징하여 조회합니다.") + @Operation(summary = "내 문의글 조회", description = "사용자가 작성한 1:1 문의 목록을 조회합니다.") @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "질문 목록 조회 성공", + @ApiResponse(responseCode = "200", description = "내 문의글 목록 조회 성공", content = @Content(schema = @Schema(implementation = Page.class))) }) - ResponseEntity>> getInquiryList( - @Parameter(name = "status", description = "문의 상태 (PENDING, COMPLETED)", in = ParameterIn.QUERY) - @RequestParam(required = false) InquiryStatus status, - @Parameter(name = "sort", description = "정렬 기준 필드", in = ParameterIn.QUERY) - @RequestParam(required = false, defaultValue = "id") String sort, - @Parameter(name = "asc", description = "오름차순 정렬 여부", in = ParameterIn.QUERY) - @RequestParam(required = false, defaultValue = "true") boolean asc, - @Parameter(hidden = true) Pageable pageable + ResponseEntity>> getMyInquiries( + @Parameter(description = "사용자 ID", required = true) Long userId, + @Parameter(description = "페이지 정보") Pageable pageable ); @Operation(summary = "1:1 문의 상세 조회", description = "특정 1:1 문의의 상세 내용을 조회합니다.") @@ -54,6 +47,7 @@ ResponseEntity>> getInquiryList( @ApiResponse(responseCode = "200", description = "질문 상세 조회 성공") }) ResponseEntity> getInquiryDetail( + @Parameter(hidden = true) PrincipalDetails principalDetails, @Parameter(name = "postId", description = "조회할 문의의 ID", in = ParameterIn.PATH) @PathVariable Long postId ); @@ -63,38 +57,8 @@ ResponseEntity> getInquiryDetail( @ApiResponse(responseCode = "200", description = "질문 삭제 성공") }) ResponseEntity> deleteInquiry( + @Parameter(hidden = true) PrincipalDetails principalDetails, @Parameter(name = "postId", description = "삭제할 문의의 ID", in = ParameterIn.PATH) @PathVariable Long postId ); - - @Operation(summary = "문의 답변 등록 (관리자용)", description = "특정 문의에 대한 답변을 등록합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "답변 등록 성공") - }) - ResponseEntity> inquiryAnswer( - @Parameter(name = "postId", description = "답변을 등록할 문의의 ID", in = ParameterIn.PATH) - @PathVariable Long postId, - @Parameter(description = "답변 내용") - @RequestBody InquiryAnswerRequest request - ); - - @Operation(summary = "문의 답변 수정 (관리자용)", description = "특정 문의에 대한 답변을 수정합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "답변 수정 성공") - }) - ResponseEntity> updateInquiryAnswer( - @Parameter(name = "postId", description = "답변을 수정할 문의의 ID", in = ParameterIn.PATH) - @PathVariable Long postId, - @Parameter(description = "수정할 답변 내용") - @RequestBody InquiryAnswerUpdateRequest request - ); - - @Operation(summary = "문의 답변 삭제 (관리자용)", description = "특정 문의에 대한 답변을 삭제합니다.") - @ApiResponses(value = { - @ApiResponse(responseCode = "200", description = "답변 삭제 성공") - }) - ResponseEntity> deleteInquiryAnswer( - @Parameter(name = "postId", description = "답변을 삭제할 문의의 ID", in = ParameterIn.PATH) - @PathVariable Long postId - ); -} +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerRequest.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerRequest.java index 4ff39c7e..01d5d075 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerRequest.java @@ -3,8 +3,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.util.List; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerJpaEntity; +import life.mosu.mosuserver.presentation.common.FileRequest; public record InquiryAnswerRequest( @Schema(description = "문의 제목", example = "서비스 이용 관련 질문입니다.") diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerUpdateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerUpdateRequest.java index 4adeba6e..208762e6 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerUpdateRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryAnswerUpdateRequest.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.presentation.common.FileRequest; public record InquiryAnswerUpdateRequest( @Schema(description = "문의 제목", example = "서비스 이용 관련 질문입니다.") diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryCreateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryCreateRequest.java index e0f71569..265383b2 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryCreateRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryCreateRequest.java @@ -3,27 +3,24 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.util.List; -import life.mosu.mosuserver.domain.inquiry.InquiryJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.presentation.common.FileRequest; public record InquiryCreateRequest( @Schema(description = "문의 제목", example = "서비스 이용 관련 질문입니다.") @NotNull String title, @Schema(description = "문의 내용", example = "포인트는 어떻게 사용하나요?") @NotNull String content, - @Schema(description = "작성자 ID 추후 토큰에서 추출하도록 변경 예정입니다.", example = "12") - Long userId, - @Schema(description = "작성자", example = "홍길동") - String author, List attachments ) { - public InquiryJpaEntity toEntity() { + public InquiryJpaEntity toEntity(UserJpaEntity user) { return InquiryJpaEntity.builder() .title(title) .content(content) - .userId(userId) - .author(author) + .userId(user.getId()) + .author(user.getName()) .build(); } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryDetailResponse.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryDetailResponse.java index d58dd6e3..a939b4d9 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryDetailResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryDetailResponse.java @@ -2,9 +2,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; -import life.mosu.mosuserver.domain.inquiry.InquiryJpaEntity; -import life.mosu.mosuserver.domain.inquiry.InquiryStatus; -import life.mosu.mosuserver.domain.inquiryAnswer.InquiryAnswerJpaEntity; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; +import life.mosu.mosuserver.domain.inquiryAnswer.entity.InquiryAnswerJpaEntity; @Schema(description = "1:1 문의 응답 DTO") public record InquiryDetailResponse( @@ -16,9 +15,9 @@ public record InquiryDetailResponse( String content, @Schema(description = "작성자", example = "홍길동") String author, - @Schema(description = "문의 상태 (WAITING: 답변 대기, COMPLETED: 답변 완료)", example = "WAITING") - InquiryStatus status, - @Schema(description = "문의 등록일", example = "2025-07-10T10:00:00") + @Schema(description = "문의 상태 (미응답, 완료)", example = "완료") + String status, + @Schema(description = "문의 등록일", example = "2025-07-10") String createdAt, List attachments, @@ -36,7 +35,7 @@ public static InquiryDetailResponse of( inquiry.getTitle(), inquiry.getContent(), inquiry.getAuthor(), - inquiry.getStatus(), + inquiry.getStatus().getStatusName(), inquiry.getCreatedAt(), attachments, answer diff --git a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryResponse.java b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryResponse.java index 8f58bc28..33332506 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/inquiry/dto/InquiryResponse.java @@ -1,8 +1,7 @@ package life.mosu.mosuserver.presentation.inquiry.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.inquiry.InquiryJpaEntity; -import life.mosu.mosuserver.domain.inquiry.InquiryStatus; +import life.mosu.mosuserver.domain.inquiry.entity.InquiryJpaEntity; @Schema(description = "1:1 문의 응답 DTO") public record InquiryResponse( @@ -18,8 +17,8 @@ public record InquiryResponse( @Schema(description = "작성자", example = "홍길동") String author, - @Schema(description = "문의 상태 (PENDING: 답변 대기, COMPLETED: 답변 완료)", example = "PENDING") - InquiryStatus status, + @Schema(description = "문의 상태 (PENDING: 미응답, COMPLETED: 완료)", example = "미응답") + String status, @Schema(description = "문의 등록일", example = "2025-07-10") String createdAt @@ -31,7 +30,7 @@ public static InquiryResponse of(InquiryJpaEntity inquiry) { inquiry.getTitle(), inquiry.getContent(), inquiry.getAuthor(), - inquiry.getStatus(), + inquiry.getStatus().getStatusName(), inquiry.getCreatedAt() ); } diff --git a/src/main/java/life/mosu/mosuserver/presentation/notice/NoticeController.java b/src/main/java/life/mosu/mosuserver/presentation/notice/NoticeController.java index b9d51c95..a9207073 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/notice/NoticeController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/notice/NoticeController.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -28,9 +29,8 @@ public class NoticeController implements NoticeControllerDocs { private final NoticeService noticeService; - // TODO: 관리자 권한 체크 추가 @PostMapping - // @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") public ResponseEntity> createNotice( @Valid @RequestBody NoticeCreateRequest request) { noticeService.createNotice(request); @@ -42,7 +42,7 @@ public ResponseEntity>> getNotices( @RequestParam(defaultValue = "0") int page, @RequestParam(defaultValue = "10") int size ) { - List notices = noticeService.getNoticeWithAttachments(page, size); + List notices = noticeService.getNotices(page, size); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "게시글 조회 성공", notices)); } @@ -53,17 +53,15 @@ public ResponseEntity> getNoticeDetail( return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "게시글 상세 조회 성공", notice)); } - // TODO: 관리자 권한 체크 추가 @DeleteMapping("/{noticeId}") - // @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") public ResponseEntity> deleteNotice(@PathVariable Long noticeId) { noticeService.deleteNotice(noticeId); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "게시글 삭제 성공")); } - // TODO: 관리자 권한 체크 추가 @PutMapping("/{noticeId}") - // @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") + @PreAuthorize("isAuthenticated() and hasRole('ADMIN')") public ResponseEntity> updateNotice( @PathVariable Long noticeId, @Valid @RequestBody NoticeUpdateRequest request diff --git a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeCreateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeCreateRequest.java index 459c4bf6..49ec21dc 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeCreateRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeCreateRequest.java @@ -3,8 +3,8 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.util.List; -import life.mosu.mosuserver.domain.notice.NoticeJpaEntity; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; +import life.mosu.mosuserver.presentation.common.FileRequest; public record NoticeCreateRequest( diff --git a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeDetailResponse.java b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeDetailResponse.java index ad7458c9..f5351cbe 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeDetailResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeDetailResponse.java @@ -2,7 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.util.List; -import life.mosu.mosuserver.domain.notice.NoticeJpaEntity; +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; public record NoticeDetailResponse( diff --git a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeResponse.java b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeResponse.java index 59e2e92f..965a5989 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeResponse.java @@ -1,8 +1,7 @@ package life.mosu.mosuserver.presentation.notice.dto; import io.swagger.v3.oas.annotations.media.Schema; -import java.util.List; -import life.mosu.mosuserver.domain.notice.NoticeJpaEntity; +import life.mosu.mosuserver.domain.notice.entity.NoticeJpaEntity; public record NoticeResponse( @@ -19,31 +18,31 @@ public record NoticeResponse( String author, @Schema(description = "작성일시 (yyyy-MM-dd)", example = "2025-07-08") - String createdAt, + String createdAt - @Schema(description = "첨부파일 목록") - List attachments +// @Schema(description = "첨부파일 목록") +// List attachments ) { - public static NoticeResponse of(NoticeJpaEntity notice, List attachments) { + public static NoticeResponse of(NoticeJpaEntity notice) { return new NoticeResponse( notice.getId(), notice.getTitle(), notice.getContent(), notice.getAuthor(), - notice.getCreatedAt(), - attachments + notice.getCreatedAt() +// attachments ); } - public record AttachmentResponse( - - @Schema(description = "파일 이름", example = "service_guide.pdf") - String fileName, - - @Schema(description = "S3 Presigned URL", example = "https://bucket.s3.amazonaws.com/.../service_guide.pdf") - String url - ) { - - } +// public record AttachmentResponse( +// +// @Schema(description = "파일 이름", example = "service_guide.pdf") +// String fileName, +// +// @Schema(description = "S3 Presigned URL", example = "https://bucket.s3.amazonaws.com/.../service_guide.pdf") +// String url +// ) { +// +// } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeUpdateRequest.java b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeUpdateRequest.java index c459cca3..1e1959f7 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeUpdateRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/notice/dto/NoticeUpdateRequest.java @@ -3,7 +3,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import java.util.List; -import life.mosu.mosuserver.global.util.FileRequest; +import life.mosu.mosuserver.presentation.common.FileRequest; public record NoticeUpdateRequest( diff --git a/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyController.java b/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyController.java new file mode 100644 index 00000000..6a370a5f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyController.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.presentation.notify; + +import life.mosu.mosuserver.application.notify.NotifyWebhookService; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/notify") +@RequiredArgsConstructor + +public class NotifyController { + + private final NotifyWebhookService notifyWebhookService; + + @PostMapping("/callback") + public void processWebhook(@RequestBody NotifyWebhookRequest request) { + notifyWebhookService.process(request); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyEventListener.java b/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyEventListener.java new file mode 100644 index 00000000..a1f19322 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyEventListener.java @@ -0,0 +1,22 @@ +package life.mosu.mosuserver.presentation.notify; + +import life.mosu.mosuserver.application.notify.NotifyService; +import life.mosu.mosuserver.global.annotation.ReactiveEventListener; +import life.mosu.mosuserver.infra.notify.dto.luna.LunaNotificationEvent; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class NotifyEventListener { + + private final NotifyService notifyService; + + @ReactiveEventListener + public void notify(LunaNotificationEvent event) { + notifyService.notify(event); + log.info("Notify event: {}", event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyWebhookRequest.java b/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyWebhookRequest.java new file mode 100644 index 00000000..321b6601 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/notify/NotifyWebhookRequest.java @@ -0,0 +1,27 @@ +package life.mosu.mosuserver.presentation.notify; + +import life.mosu.mosuserver.domain.notify.entity.NotifyJpaEntity; +import life.mosu.mosuserver.domain.notify.entity.NotifyType; + +public record NotifyWebhookRequest( + String custom_key, + String type, + String result_code +) { + + public NotifyJpaEntity toEntity() { + return NotifyJpaEntity.builder() + .customKey(custom_key) + .type(validType()) + .resultCode(result_code) + .build(); + } + + private NotifyType validType() { + try { + return NotifyType.from(result_code); + } catch (Exception e) { + throw new RuntimeException(); + } + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/oauth/AccessTokenFilter.java b/src/main/java/life/mosu/mosuserver/presentation/oauth/AccessTokenFilter.java deleted file mode 100644 index 4fba5227..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/oauth/AccessTokenFilter.java +++ /dev/null @@ -1,64 +0,0 @@ -package life.mosu.mosuserver.presentation.oauth; - -import static org.springframework.http.HttpHeaders.AUTHORIZATION; - -import jakarta.servlet.FilterChain; -import jakarta.servlet.ServletException; -import jakarta.servlet.http.HttpServletRequest; -import jakarta.servlet.http.HttpServletResponse; -import java.io.IOException; -import life.mosu.mosuserver.application.auth.AccessTokenService; -import lombok.RequiredArgsConstructor; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.security.core.Authentication; -import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.stereotype.Component; -import org.springframework.util.ObjectUtils; -import org.springframework.web.filter.OncePerRequestFilter; - -@Component -@RequiredArgsConstructor -public class AccessTokenFilter extends OncePerRequestFilter { - - private static final String TOKEN_PREFIX = "Bearer "; - private final AccessTokenService accessTokenService; - - @Value("${endpoints.reissue}") - private String reissueEndpoint; - - @Override - protected void doFilterInternal( - final HttpServletRequest request, - final HttpServletResponse response, - final FilterChain filterChain - ) throws ServletException, IOException { - if (request.getRequestURI().equals(reissueEndpoint)) { - filterChain.doFilter(request, response); - return; - } - - if (request.getRequestURI().startsWith("/api/v1/oauth2")) { - filterChain.doFilter(request, response); - return; - } - - final String accessToken = resolveToken(request); - if (accessToken != null) { - setAuthentication(accessToken); - } - filterChain.doFilter(request, response); - } - - private void setAuthentication(final String accessToken) { - final Authentication authentication = accessTokenService.getAuthentication(accessToken); - SecurityContextHolder.getContext().setAuthentication(authentication); - } - - private String resolveToken(final HttpServletRequest request) { - final String token = request.getHeader(AUTHORIZATION); - if (ObjectUtils.isEmpty(token) || !token.startsWith(TOKEN_PREFIX)) { - return null; - } - return token.substring(TOKEN_PREFIX.length()); - } -} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/oauth/TokenService.java b/src/main/java/life/mosu/mosuserver/presentation/oauth/TokenService.java new file mode 100644 index 00000000..6659de35 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/oauth/TokenService.java @@ -0,0 +1,44 @@ +package life.mosu.mosuserver.presentation.oauth; + +import life.mosu.mosuserver.application.auth.provider.OneTimeTokenProvider; +import life.mosu.mosuserver.domain.auth.signup.Token; +import life.mosu.mosuserver.domain.auth.signup.TokenRepository; +import life.mosu.mosuserver.global.exception.AuthenticationException; +import life.mosu.mosuserver.global.exception.CustomRuntimeException; +import life.mosu.mosuserver.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Slf4j +@Service +@RequiredArgsConstructor +public class TokenService { + + private final OneTimeTokenProvider oneTimeTokenProvider; + private final TokenRepository repository; + + /** + * 회원가입 토큰을 검증하고, 유효하면 SignUpToken 객체를 반환합니다. + * + * @param requestToken 검증할 토큰 + * @throws AuthenticationException 토큰이 유효하지 않을 경우 + */ + public void validateToken(final String requestToken) throws CustomRuntimeException { + + Token token = oneTimeTokenProvider.getToken(requestToken); + + if (token == null) { + throw new CustomRuntimeException(ErrorCode.INVALID_SIGN_UP_TOKEN); + } + + log.info("signUp {}", token.expiration()); + + //TODO: 운영 단계시 레디스 삭제하도록 변경 + //repository.deleteByCertNum(token.certNum()); + } + + public String getPhoneNumber(final String requestToken) throws CustomRuntimeException { + return oneTimeTokenProvider.getPhoneNumber(requestToken); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/payment/PaymentWidgetController.java b/src/main/java/life/mosu/mosuserver/presentation/payment/PaymentWidgetController.java index 5fb50b48..69f34047 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/payment/PaymentWidgetController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/payment/PaymentWidgetController.java @@ -1,15 +1,16 @@ package life.mosu.mosuserver.presentation.payment; import jakarta.validation.Valid; -import life.mosu.mosuserver.application.payment.PaymentService; +import life.mosu.mosuserver.application.payment.PaymentConfirmService; +import life.mosu.mosuserver.application.payment.PaymentPrepareService; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.payment.dto.CancelPaymentRequest; import life.mosu.mosuserver.presentation.payment.dto.PaymentPrepareResponse; import life.mosu.mosuserver.presentation.payment.dto.PaymentRequest; import life.mosu.mosuserver.presentation.payment.dto.PreparePaymentRequest; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; -import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -20,14 +21,26 @@ @RequiredArgsConstructor public class PaymentWidgetController { - private final PaymentService paymentService; + private final PaymentPrepareService prepareService; + private final PaymentConfirmService confirmService; - //TODO: 신청서 필요함. + /** + * 결제 준비 요청 + *

+ * 결제 준비 요청은 결제 시작을 위한 준비 단계로, 결제 금액과 주문 ID를 생성합니다. + * 이 단계에서는 실제 결제가 이루어지지 않으며, 결제 승인 요청을 위한 정보를 반환합니다. + * + * @param userId 사용자 ID + * @param request 결제 준비 요청 정보 + * @return 결제 준비 응답 + */ @PostMapping("/prepare") + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ApiResponseWrapper prepare( + @UserId Long userId, @Valid @RequestBody PreparePaymentRequest request ) { - PaymentPrepareResponse response = paymentService.prepare(request); + PaymentPrepareResponse response = prepareService.prepare(request.applicationId()); return ApiResponseWrapper.success(HttpStatus.OK, "결제 시작", response); } @@ -38,17 +51,12 @@ public ApiResponseWrapper prepare( * @return */ @PostMapping("/confirm") - public ApiResponseWrapper confirm(@RequestBody PaymentRequest request) { - paymentService.confirm(request); - return ApiResponseWrapper.success(HttpStatus.CREATED, "결제 승인 성공"); - } - - @PostMapping("/{paymentId}/cancel") - public ApiResponseWrapper cancel( - @PathVariable String paymentId, - @RequestBody CancelPaymentRequest request + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ApiResponseWrapper confirm( + @UserId Long userId, + @RequestBody PaymentRequest request ) { - paymentService.cancel(paymentId, request); - return ApiResponseWrapper.success(HttpStatus.OK, "결제 취소 성공"); + confirmService.confirm(userId, request); + return ApiResponseWrapper.success(HttpStatus.CREATED, "결제 승인 성공"); } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/payment/dto/CancelPaymentRequest.java b/src/main/java/life/mosu/mosuserver/presentation/payment/dto/CancelPaymentRequest.java index 48332094..c2a0c0e9 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/payment/dto/CancelPaymentRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/payment/dto/CancelPaymentRequest.java @@ -3,5 +3,6 @@ import jakarta.validation.constraints.NotNull; public record CancelPaymentRequest( - @NotNull String cancelReason -) {} \ No newline at end of file + @NotNull String cancelReason, + @NotNull Integer cancelAmount +){} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PaymentRequest.java b/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PaymentRequest.java index 08c744f5..e333886d 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PaymentRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PaymentRequest.java @@ -1,11 +1,10 @@ package life.mosu.mosuserver.presentation.payment.dto; import jakarta.validation.constraints.NotNull; -import java.util.List; -import life.mosu.mosuserver.infra.payment.dto.TossPaymentPayload; +import life.mosu.mosuserver.infra.toss.dto.TossPaymentPayload; public record PaymentRequest( - @NotNull List applicationSchoolIds, + @NotNull Long applicationId, @NotNull String paymentKey, @NotNull String orderId, @NotNull Integer amount @@ -14,8 +13,4 @@ public record PaymentRequest( public TossPaymentPayload toPayload() { return new TossPaymentPayload(paymentKey, orderId, amount); } - - public int applicantSize() { - return applicationSchoolIds.size(); - } } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PreparePaymentRequest.java b/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PreparePaymentRequest.java index 1a956cca..e3ca9aac 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PreparePaymentRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/payment/dto/PreparePaymentRequest.java @@ -1,26 +1,7 @@ package life.mosu.mosuserver.presentation.payment.dto; -import jakarta.validation.Valid; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.NotNull; -import java.util.List; - public record PreparePaymentRequest( - @NotEmpty(message = "결제 항목은 비어 있을 수 없습니다.") - List<@Valid Item> items + Long applicationId ) { - public int getSize() { - return items.size(); - } - - public record Item( - @NotNull(message = "applicationSchoolId는 필수입니다.") - Long applicationSchoolId, - - @NotNull(message = "name은 필수입니다.") - String name - ) { - - } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java b/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java index af762ffe..f2264d3c 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileController.java @@ -6,7 +6,7 @@ import life.mosu.mosuserver.global.util.ApiResponseWrapper; import life.mosu.mosuserver.presentation.profile.dto.EditProfileRequest; import life.mosu.mosuserver.presentation.profile.dto.ProfileDetailResponse; -import life.mosu.mosuserver.presentation.profile.dto.ProfileRequest; +import life.mosu.mosuserver.presentation.profile.dto.SignUpProfileRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpStatus; @@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @Slf4j @@ -30,17 +29,17 @@ public class ProfileController implements ProfileControllerDocs { @PostMapping public ResponseEntity> create( - @RequestParam Long userId, - @Valid @RequestBody ProfileRequest request + @UserId Long userId, + @Valid @RequestBody SignUpProfileRequest request ) { profileService.registerProfile(userId, request); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.CREATED, "프로필 등록 성공")); } @PutMapping - @PreAuthorize("isAuthenticated()") + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity> update( - @RequestParam Long userId, + @UserId Long userId, @Valid @RequestBody EditProfileRequest request ) { profileService.editProfile(userId, request); @@ -48,10 +47,11 @@ public ResponseEntity> update( } @GetMapping + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity> getProfile( - @UserId Long userId) { + @UserId Long userId + ) { ProfileDetailResponse response = profileService.getProfile(userId); return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "프로필 조회 성공", response)); } - -} +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileControllerDocs.java index 0072a7e9..887449e6 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileControllerDocs.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/ProfileControllerDocs.java @@ -9,13 +9,13 @@ import io.swagger.v3.oas.annotations.responses.ApiResponses; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; import life.mosu.mosuserver.presentation.profile.dto.EditProfileRequest; import life.mosu.mosuserver.presentation.profile.dto.ProfileDetailResponse; -import life.mosu.mosuserver.presentation.profile.dto.ProfileRequest; +import life.mosu.mosuserver.presentation.profile.dto.SignUpProfileRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; @Tag(name = "Profile API - 본인 인증 관련 로직 추가될 예정입니다.", description = "사용자 프로필 관련 API 명세") public interface ProfileControllerDocs { @@ -25,11 +25,8 @@ public interface ProfileControllerDocs { @ApiResponse(responseCode = "201", description = "프로필 등록 성공") }) ResponseEntity> create( - @Parameter(name = "userId", description = "사용자 ID", in = ParameterIn.QUERY) - @RequestParam Long userId, - - @Parameter(description = "프로필 등록 요청 정보", required = true) - @Valid @RequestBody ProfileRequest request + @UserId final Long userId, + @Valid @RequestBody SignUpProfileRequest request ); @Operation(summary = "프로필 수정", description = "회원이 자신의 프로필을 수정합니다.") @@ -37,8 +34,7 @@ ResponseEntity> create( @ApiResponse(responseCode = "200", description = "프로필 수정 성공") }) ResponseEntity> update( - @Parameter(name = "userId", description = "회원 ID", in = ParameterIn.QUERY) - @RequestParam Long userId, + @UserId final Long userId, @Parameter(description = "프로필 수정 요청 정보", required = true) @Valid @RequestBody EditProfileRequest request @@ -51,6 +47,6 @@ ResponseEntity> update( }) ResponseEntity> getProfile( @Parameter(name = "userId", description = "회원 ID", in = ParameterIn.QUERY) - @RequestParam Long userId + @UserId Long userId ); } \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/RecommenderController.java b/src/main/java/life/mosu/mosuserver/presentation/profile/RecommenderController.java index 0c327ed1..66c68bd7 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/RecommenderController.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/RecommenderController.java @@ -2,16 +2,17 @@ import jakarta.validation.Valid; import life.mosu.mosuserver.application.profile.RecommenderService; +import life.mosu.mosuserver.global.annotation.UserId; import life.mosu.mosuserver.global.util.ApiResponseWrapper; import life.mosu.mosuserver.presentation.profile.dto.RecommenderRegistrationRequest; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; @RestController @@ -23,8 +24,9 @@ public class RecommenderController implements RecommenderControllerDocs { @Override @PostMapping + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity> register( - @RequestParam Long userId, + @UserId Long userId, @Valid @RequestBody RecommenderRegistrationRequest request) { recommenderService.registerRecommender(userId, request); return ResponseEntity.status(HttpStatus.CREATED) @@ -33,8 +35,9 @@ public ResponseEntity> register( @Override @GetMapping("/verify") + @PreAuthorize("isAuthenticated() and hasRole('USER')") public ResponseEntity> verify( - @RequestParam Long userId) { + @UserId Long userId) { Boolean isRegistered = recommenderService.verifyRecommender(userId); if (isRegistered) { diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/EditProfileRequest.java b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/EditProfileRequest.java index 6cf8e0d3..40f439b6 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/EditProfileRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/EditProfileRequest.java @@ -1,36 +1,11 @@ package life.mosu.mosuserver.presentation.profile.dto; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import java.time.LocalDate; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.profile.Grade; -import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; -import life.mosu.mosuserver.global.exception.CustomRuntimeException; -import life.mosu.mosuserver.global.exception.ErrorCode; +import life.mosu.mosuserver.domain.profile.entity.Education; +import life.mosu.mosuserver.domain.profile.entity.Grade; @Schema(description = "프로필 수정 요청 DTO") public record EditProfileRequest( - - @Schema(description = "사용자 이름", example = "홍길동", required = true) - @NotBlank(message = "이름은 필수입니다.") - String userName, - - @Schema(description = "생년월일", example = "2005-05-10", required = true) - @NotNull(message = "생년월일은 필수입니다.") - LocalDate birth, - - @Schema(description = "성별 (MALE 또는 FEMALE)", example = "MALE", required = true) - @NotBlank(message = "성별은 필수입니다.") - String gender, - - @Schema(description = "휴대폰 번호", example = "01012345678", required = true) - @NotBlank(message = "휴대폰 번호는 필수입니다.") - @PhoneNumberPattern - String phoneNumber, - @Schema(description = "이메일 주소", example = "hong@example.com") String email, @@ -42,14 +17,6 @@ public record EditProfileRequest( @Schema(description = "학년 (Enum: FIRST, SECOND, THIRD 등)", example = "SECOND") Grade grade - ) { - public Gender validatedGender() { - try { - return Gender.valueOf(gender.toUpperCase()); - } catch (IllegalArgumentException | NullPointerException e) { - throw new CustomRuntimeException(ErrorCode.INVALID_GENDER); - } - } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileDetailResponse.java b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileDetailResponse.java index c21fb599..2248e375 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileDetailResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileDetailResponse.java @@ -2,10 +2,7 @@ import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.profile.Grade; -import life.mosu.mosuserver.domain.profile.ProfileJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; @Schema(description = "프로필 상세 응답 DTO") public record ProfileDetailResponse( @@ -19,8 +16,8 @@ public record ProfileDetailResponse( @Schema(description = "생년월일", example = "2005-05-10") LocalDate birth, - @Schema(description = "성별", example = "MALE") - Gender gender, + @Schema(description = "성별", example = "남성") + String gender, @Schema(description = "휴대폰 번호", example = "010-1234-5678") String phoneNumber, @@ -29,13 +26,13 @@ public record ProfileDetailResponse( String email, @Schema(description = "학력 (예: ENROLLED, GRADUATED)", example = "ENROLLED") - Education education, + String education, @Schema(description = "학교 정보") SchoolInfoResponse schoolInfo, @Schema(description = "학년", example = "HIGH_1") - Grade grade + String grade ) { @@ -44,12 +41,12 @@ public static ProfileDetailResponse from(ProfileJpaEntity profile) { profile.getId(), profile.getUserName(), profile.getBirth(), - profile.getGender(), + profile.getGender().getGenderName(), profile.getPhoneNumber(), profile.getEmail(), - profile.getEducation(), + profile.getEducation().getEducationName(), SchoolInfoResponse.from(profile.getSchoolInfo()), - profile.getGrade() + profile.getGrade() == null ? null : profile.getGrade().getGradeName() ); } } diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoRequest.java b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoRequest.java index ab41e0b3..93dd48e1 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoRequest.java @@ -1,7 +1,7 @@ package life.mosu.mosuserver.presentation.profile.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.profile.SchoolInfoJpaVO; +import life.mosu.mosuserver.domain.profile.entity.SchoolInfoJpaVO; @Schema(description = "학교 정보 요청 DTO") public record SchoolInfoRequest( diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoResponse.java b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoResponse.java index 1df6f2ef..adbe482d 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoResponse.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SchoolInfoResponse.java @@ -1,7 +1,7 @@ package life.mosu.mosuserver.presentation.profile.dto; import io.swagger.v3.oas.annotations.media.Schema; -import life.mosu.mosuserver.domain.profile.SchoolInfoJpaVO; +import life.mosu.mosuserver.domain.profile.entity.SchoolInfoJpaVO; @Schema(description = "학교 정보 응답 DTO") public record SchoolInfoResponse( diff --git a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileRequest.java b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SignUpProfileRequest.java similarity index 90% rename from src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileRequest.java rename to src/main/java/life/mosu/mosuserver/presentation/profile/dto/SignUpProfileRequest.java index e63cdf6b..3c8f4999 100644 --- a/src/main/java/life/mosu/mosuserver/presentation/profile/dto/ProfileRequest.java +++ b/src/main/java/life/mosu/mosuserver/presentation/profile/dto/SignUpProfileRequest.java @@ -5,16 +5,16 @@ import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.LocalDate; -import life.mosu.mosuserver.domain.profile.Education; -import life.mosu.mosuserver.domain.profile.Gender; -import life.mosu.mosuserver.domain.profile.Grade; -import life.mosu.mosuserver.domain.profile.ProfileJpaEntity; +import life.mosu.mosuserver.domain.profile.entity.Education; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.profile.entity.Grade; +import life.mosu.mosuserver.domain.profile.entity.ProfileJpaEntity; import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; import life.mosu.mosuserver.global.exception.CustomRuntimeException; import life.mosu.mosuserver.global.exception.ErrorCode; @Schema(description = "프로필 등록 요청 DTO") -public record ProfileRequest( +public record SignUpProfileRequest( @Schema(description = "사용자 이름", example = "홍길동", required = true) @NotBlank(message = "이름은 필수입니다.") diff --git a/src/main/java/life/mosu/mosuserver/presentation/recommendation/RecommendationController.java b/src/main/java/life/mosu/mosuserver/presentation/recommendation/RecommendationController.java new file mode 100644 index 00000000..483da9ce --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/recommendation/RecommendationController.java @@ -0,0 +1,36 @@ +package life.mosu.mosuserver.presentation.recommendation; + +import jakarta.validation.Valid; +import life.mosu.mosuserver.application.recommendation.RecommendationService; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.recommendation.dto.RecommendationRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequiredArgsConstructor +@RequestMapping("/recommendations") +public class RecommendationController { + + private final RecommendationService recommendationService; + + @PostMapping + @PreAuthorize("isAuthenticated() and hasRole('USER')") + public ResponseEntity> create( + @UserId Long userId, + @Valid @RequestBody RecommendationRequest request + ) { + recommendationService.create(userId, request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.CREATED, "추천 등록 성공")); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/recommendation/dto/RecommendationRequest.java b/src/main/java/life/mosu/mosuserver/presentation/recommendation/dto/RecommendationRequest.java new file mode 100644 index 00000000..aceb9692 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/recommendation/dto/RecommendationRequest.java @@ -0,0 +1,24 @@ +package life.mosu.mosuserver.presentation.recommendation.dto; + +import jakarta.validation.constraints.NotBlank; +import life.mosu.mosuserver.domain.recommendation.RecommendationJpaEntity; +import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; + +public record RecommendationRequest( + @NotBlank String name, + @PhoneNumberPattern String phoneNumber, + @NotBlank String bank, + @NotBlank String accountNumber +) { + + public RecommendationJpaEntity toEntity(Long userId) { + return RecommendationJpaEntity.builder() + .userId(userId) + .name(name) + .phoneNumber(phoneNumber) + .bank(bank) + .accountNumber(accountNumber) + .build(); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/refund/RefundController.java b/src/main/java/life/mosu/mosuserver/presentation/refund/RefundController.java new file mode 100644 index 00000000..85688606 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/refund/RefundController.java @@ -0,0 +1,37 @@ +package life.mosu.mosuserver.presentation.refund; + +import life.mosu.mosuserver.application.refund.RefundService; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.refund.dto.MergedRefundRequest; +import life.mosu.mosuserver.presentation.refund.dto.RefundRequest; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/refunds") +@RequiredArgsConstructor +@Slf4j +public class RefundController { + + private final RefundService refundService; + + @PostMapping("/{paymentKey}") + @PreAuthorize("isAuthenticated() and hasRole('USER')") + ResponseEntity> process( + @UserId Long userId, + @PathVariable String paymentKey, + @RequestBody RefundRequest refundRequest) { + MergedRefundRequest request = MergedRefundRequest.of(paymentKey, refundRequest); + refundService.doProcess(userId, request); + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "결제 취소 성공")); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/refund/annotation/MergedRefund.java b/src/main/java/life/mosu/mosuserver/presentation/refund/annotation/MergedRefund.java new file mode 100644 index 00000000..76642c54 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/refund/annotation/MergedRefund.java @@ -0,0 +1,12 @@ +package life.mosu.mosuserver.presentation.refund.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface MergedRefund { + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/refund/dto/MergedRefundRequest.java b/src/main/java/life/mosu/mosuserver/presentation/refund/dto/MergedRefundRequest.java new file mode 100644 index 00000000..8abc207d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/refund/dto/MergedRefundRequest.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.presentation.refund.dto; + +public record MergedRefundRequest( + String paymentKey, + RefundRequest details +) { + + public static MergedRefundRequest of(String paymentKey, RefundRequest refundRequest) { + return new MergedRefundRequest(paymentKey, refundRequest); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/refund/dto/RefundRequest.java b/src/main/java/life/mosu/mosuserver/presentation/refund/dto/RefundRequest.java new file mode 100644 index 00000000..c171c604 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/refund/dto/RefundRequest.java @@ -0,0 +1,8 @@ +package life.mosu.mosuserver.presentation.refund.dto; + +public record RefundRequest( + Long examApplicationId, + String refundReason +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/refund/resolver/RefundRequestArgumentResolver.java b/src/main/java/life/mosu/mosuserver/presentation/refund/resolver/RefundRequestArgumentResolver.java new file mode 100644 index 00000000..5e8b67dd --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/refund/resolver/RefundRequestArgumentResolver.java @@ -0,0 +1,58 @@ +package life.mosu.mosuserver.presentation.refund.resolver; + +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletRequest; +import java.util.Map; +import java.util.stream.Collectors; +import life.mosu.mosuserver.presentation.refund.annotation.MergedRefund; +import life.mosu.mosuserver.presentation.refund.dto.MergedRefundRequest; +import life.mosu.mosuserver.presentation.refund.dto.RefundRequest; +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; +import org.springframework.web.reactive.HandlerMapping; + +@Component +public class RefundRequestArgumentResolver implements HandlerMethodArgumentResolver { + + private final ObjectMapper objectMapper; + + public RefundRequestArgumentResolver(ObjectMapper objectMapper) { + this.objectMapper = objectMapper; + } + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.hasParameterAnnotation(MergedRefund.class) + && parameter.getParameterType().equals(MergedRefundRequest.class); + } + + @Override + public Object resolveArgument(MethodParameter parameter, + ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, + WebDataBinderFactory binderFactory) throws Exception { + + HttpServletRequest servletRequest = webRequest.getNativeRequest(HttpServletRequest.class); + + String body = servletRequest.getReader().lines() + .collect(Collectors.joining(System.lineSeparator())); + + RefundRequest refundRequest = objectMapper.readValue(body, RefundRequest.class); + + String paymentKey = extractPathVariable(webRequest, "paymentKey"); + + return MergedRefundRequest.of(paymentKey, refundRequest); + } + + private String extractPathVariable(NativeWebRequest webRequest, String name) { + HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); + Map uriTemplateVars = (Map) request.getAttribute( + HandlerMapping.URI_TEMPLATE_VARIABLES_ATTRIBUTE); + return uriTemplateVars.get(name); + } +} + diff --git a/src/main/java/life/mosu/mosuserver/presentation/school/SchoolController.java b/src/main/java/life/mosu/mosuserver/presentation/school/SchoolController.java deleted file mode 100644 index d3f9c5ca..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/school/SchoolController.java +++ /dev/null @@ -1,28 +0,0 @@ -package life.mosu.mosuserver.presentation.school; - -import java.util.List; -import life.mosu.mosuserver.application.school.SchoolService; -import life.mosu.mosuserver.global.util.ApiResponseWrapper; -import life.mosu.mosuserver.presentation.school.dto.SchoolResponse; -import lombok.RequiredArgsConstructor; -import org.springframework.http.HttpStatus; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -@RequestMapping("/school") -@RequiredArgsConstructor -public class SchoolController { - - private final SchoolService schoolService; - - @GetMapping - public ResponseEntity>> getSchools() { - - List schools = schoolService.getSchools(); - - return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "학교 조회 성공", schools)); - } -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/school/dto/SchoolResponse.java b/src/main/java/life/mosu/mosuserver/presentation/school/dto/SchoolResponse.java deleted file mode 100644 index 118ba95b..00000000 --- a/src/main/java/life/mosu/mosuserver/presentation/school/dto/SchoolResponse.java +++ /dev/null @@ -1,26 +0,0 @@ -package life.mosu.mosuserver.presentation.school.dto; - -import java.time.LocalDate; -import life.mosu.mosuserver.domain.school.SchoolJpaEntity; -import life.mosu.mosuserver.presentation.common.AddressResponse; - -public record SchoolResponse( - Long id, - String schoolName, - String area, - AddressResponse address, - LocalDate examDate, - Long capacity -) { - - public static SchoolResponse from(SchoolJpaEntity school) { - return new SchoolResponse( - school.getId(), - school.getSchoolName(), - school.getArea().name(), - AddressResponse.from(school.getAddress()), - school.getExamDate(), - school.getCapacity() - ); - } -} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/MyUserController.java b/src/main/java/life/mosu/mosuserver/presentation/user/MyUserController.java new file mode 100644 index 00000000..8603788b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/MyUserController.java @@ -0,0 +1,63 @@ +package life.mosu.mosuserver.presentation.user; + +import jakarta.validation.Valid; +import life.mosu.mosuserver.application.user.MyUserService; +import life.mosu.mosuserver.global.annotation.PhoneNumber; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.filter.KmcAuthenticationToken; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.user.dto.request.ChangePasswordRequest; +import life.mosu.mosuserver.presentation.user.dto.request.FindLoginIdRequest; +import life.mosu.mosuserver.presentation.user.dto.request.FindPasswordRequest; +import life.mosu.mosuserver.presentation.user.dto.response.ChangePasswordResponse; +import life.mosu.mosuserver.presentation.user.dto.response.FindLoginIdResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequestMapping("/user/me") +@RequiredArgsConstructor +public class MyUserController implements MyUserControllerDocs { + + private final MyUserService myUserService; + + @PostMapping("/find-id") + public ResponseEntity> findLoginId( + @RequestBody @Valid FindLoginIdRequest request + ) { + FindLoginIdResponse response = myUserService.findLoginId(request); + + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "아이디 찾기 요청 성공", response)); + } + + @PostMapping("/find-password") + public ResponseEntity> findPassword( + @UserId final Long userId, + @RequestBody @Valid FindPasswordRequest request + ) { + myUserService.findPassword(userId, request); + + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "비밀번호 찾기 요청 성공")); + } + + @PostMapping("/password") + public ResponseEntity> changePassword( + @PhoneNumber final String phoneNumber, + @RequestBody @Valid ChangePasswordRequest request + ) { + + ChangePasswordResponse response = myUserService.changePassword(request, phoneNumber); + + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "비밀번호 변경 성공", response)); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/MyUserControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/user/MyUserControllerDocs.java new file mode 100644 index 00000000..603fc52c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/MyUserControllerDocs.java @@ -0,0 +1,28 @@ +package life.mosu.mosuserver.presentation.user; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import life.mosu.mosuserver.global.annotation.PhoneNumber; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.user.dto.request.ChangePasswordRequest; +import life.mosu.mosuserver.presentation.user.dto.request.FindPasswordRequest; +import life.mosu.mosuserver.presentation.user.dto.response.ChangePasswordResponse; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestBody; + +@Tag(name = "My User", description = "내 계정 관련 API") +public interface MyUserControllerDocs { + + @Operation(summary = "비밀번호 찾기", description = "사용자의 비밀번호를 찾기 위한 API입니다. (반환값으로 전화번호 본인인증 후 valificationCode 필드 추가 예정)") + public ResponseEntity> findPassword( + @UserId final Long userId, + @RequestBody FindPasswordRequest request + ); + + @Operation(summary = "비밀번호 변경", description = "현재 로그인한 사용자의 비밀번호를 변경합니다. 새 비밀번호와 새 비밀번호 확인이 일치해야 합니다.(입력값으로 valificationCode 필드 추가 예정)") + public ResponseEntity> changePassword( + @PhoneNumber final String phoneNumber, + @RequestBody ChangePasswordRequest request + ); +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/UserController.java b/src/main/java/life/mosu/mosuserver/presentation/user/UserController.java new file mode 100644 index 00000000..79feb948 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/UserController.java @@ -0,0 +1,57 @@ +package life.mosu.mosuserver.presentation.user; + +import life.mosu.mosuserver.application.user.UserService; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.user.dto.request.IsLoginIdAvailableResponse; +import life.mosu.mosuserver.presentation.user.dto.response.CustomerKeyResponse; +import life.mosu.mosuserver.presentation.user.dto.response.UserInfoResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/user") +@RequiredArgsConstructor +public class UserController implements UserControllerDocs { + + private final UserService userService; + + @GetMapping("/info") + @PreAuthorize("isAuthenticated() and hasRole('PENDING')") + public ResponseEntity> getUserInfo( + @UserId Long userId + ) { + UserInfoResponse response = userService.getUserInfo(userId); + + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "User 정보 조회 성공", response)); + } + + @GetMapping("/customer-key") + public ResponseEntity> getCustomerKey( + @UserId final Long userId + ) { + String customerKey = userService.getCustomerKey(userId); + + return ResponseEntity.ok(ApiResponseWrapper.success(HttpStatus.OK, "CustomerKey 조회 성공", + CustomerKeyResponse.from(customerKey))); + } + + @GetMapping("/check-id") + public ResponseEntity> isLoginIdAvailable( + @RequestParam String loginId + ) { + Boolean isLoginIdAvailable = userService.isLoginIdAvailable(loginId); + + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "User Login ID 등록 가능 여부 조회 성공", + IsLoginIdAvailableResponse.from(isLoginIdAvailable))); + } + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/UserControllerDocs.java b/src/main/java/life/mosu/mosuserver/presentation/user/UserControllerDocs.java new file mode 100644 index 00000000..a7263050 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/UserControllerDocs.java @@ -0,0 +1,42 @@ +package life.mosu.mosuserver.presentation.user; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import life.mosu.mosuserver.global.annotation.UserId; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.user.dto.request.IsLoginIdAvailableResponse; +import life.mosu.mosuserver.presentation.user.dto.response.CustomerKeyResponse; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.RequestParam; + +@Tag(name = "User", description = "사용자 관련 API") +public interface UserControllerDocs { + + @Operation(summary = "고객 키 조회", description = "사용자 ID를 이용해 결제에 사용될 고객 키(Customer Key)를 조회합니다.") + @Parameter(name = "userId", description = "조회할 사용자의 고유 ID", required = true, example = "1") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "고객 키 조회 성공", + content = @Content(schema = @Schema(implementation = CustomerKeyResponse.class))), + @ApiResponse(responseCode = "404", description = "사용자를 찾을 수 없음"), + @ApiResponse(responseCode = "500", description = "서버 내부 오류") + }) + public ResponseEntity> getCustomerKey( + @UserId final Long userId + ); + + @Operation(summary = "로그인 ID 중복 확인", description = "회원가입 시 사용할 로그인 ID의 중복 여부를 확인합니다.") + @Parameter(name = "loginId", description = "중복 확인할 로그인 ID", required = true, example = "mosu123") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "ID 사용 가능 여부 조회 성공 (true: 사용 가능, false: 중복)"), + @ApiResponse(responseCode = "400", description = "잘못된 요청"), + @ApiResponse(responseCode = "500", description = "서버 내부 오류") + }) + public ResponseEntity> isLoginIdAvailable( + @RequestParam String loginId + ); +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java new file mode 100644 index 00000000..a3ac59b7 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/ChangePasswordRequest.java @@ -0,0 +1,16 @@ +package life.mosu.mosuserver.presentation.user.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import life.mosu.mosuserver.global.annotation.PasswordPattern; + +public record ChangePasswordRequest( + @Schema( + description = "새로운 비밀번호는 8~20자의 영문 대/소문자, 숫자, 특수문자를 모두 포함해야 합니다.", + example = "Mosu!1234" + ) + @PasswordPattern + String newPassword + +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/FindLoginIdRequest.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/FindLoginIdRequest.java new file mode 100644 index 00000000..3ff2fe68 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/FindLoginIdRequest.java @@ -0,0 +1,11 @@ +package life.mosu.mosuserver.presentation.user.dto.request; + +import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; + +public record FindLoginIdRequest( + String name, + @PhoneNumberPattern + String phoneNumber +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/FindPasswordRequest.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/FindPasswordRequest.java new file mode 100644 index 00000000..95f97940 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/FindPasswordRequest.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.presentation.user.dto.request; + +import life.mosu.mosuserver.global.annotation.LoginIdPattern; +import life.mosu.mosuserver.global.annotation.PhoneNumberPattern; + +public record FindPasswordRequest( + String name, + @LoginIdPattern + String loginId, + @PhoneNumberPattern + String phoneNumber +) { + +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/IsLoginIdAvailableResponse.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/IsLoginIdAvailableResponse.java new file mode 100644 index 00000000..81854a7f --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/request/IsLoginIdAvailableResponse.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.presentation.user.dto.request; + +public record IsLoginIdAvailableResponse( + Boolean isLoginIdAvailable +) { + + public static IsLoginIdAvailableResponse from(Boolean isLoginIdAvailable) { + return new IsLoginIdAvailableResponse(isLoginIdAvailable); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/ChangePasswordResponse.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/ChangePasswordResponse.java new file mode 100644 index 00000000..2593fcc4 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/ChangePasswordResponse.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.presentation.user.dto.response; + +public record ChangePasswordResponse( + Boolean isSuccess +) { + + public static ChangePasswordResponse from(Boolean isSuccess) { + return new ChangePasswordResponse(isSuccess); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/CustomerKeyResponse.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/CustomerKeyResponse.java new file mode 100644 index 00000000..68faf0b5 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/CustomerKeyResponse.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.presentation.user.dto.response; + +public record CustomerKeyResponse( + String customerKey +) { + + public static CustomerKeyResponse from(String customerKey) { + return new CustomerKeyResponse(customerKey); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/FindLoginIdResponse.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/FindLoginIdResponse.java new file mode 100644 index 00000000..ef0e1462 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/FindLoginIdResponse.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.presentation.user.dto.response; + +public record FindLoginIdResponse( + String loginId +) { + + public static FindLoginIdResponse from(String loginId) { + return new FindLoginIdResponse(loginId); + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/UserInfoResponse.java b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/UserInfoResponse.java new file mode 100644 index 00000000..eb4ed891 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/user/dto/response/UserInfoResponse.java @@ -0,0 +1,21 @@ +package life.mosu.mosuserver.presentation.user.dto.response; + +import java.time.LocalDate; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; + +public record UserInfoResponse( + String name, + LocalDate birth, + String phoneNumber, + String gender +) { + + public static UserInfoResponse from(UserJpaEntity user) { + return new UserInfoResponse( + user.getName(), + user.getBirth(), + user.getPhoneNumber(), + user.getGender() != null ? user.getGender().name() : null + ); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/VirtualAccountCallbackListener.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/VirtualAccountCallbackListener.java new file mode 100644 index 00000000..0664b15e --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/VirtualAccountCallbackListener.java @@ -0,0 +1,25 @@ +package life.mosu.mosuserver.presentation.virtualaccount; + +import life.mosu.mosuserver.application.virtualaccount.VirtualAccountCallbackService; +import life.mosu.mosuserver.global.annotation.ReactiveEventListener; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositFailureEvent; +import life.mosu.mosuserver.presentation.virtualaccount.dto.event.DepositSuccessEvent; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class VirtualAccountCallbackListener { + + private final VirtualAccountCallbackService virtualAccountCallbackService; + + @ReactiveEventListener + public void handleDepositSuccessEvent(DepositSuccessEvent event) { + virtualAccountCallbackService.handleDepositSuccessEvent(event); + } + + @ReactiveEventListener + public void handleDepositFailureEvent(DepositFailureEvent event) { + virtualAccountCallbackService.handleDepositFailureEvent(event); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/VirtualAccountController.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/VirtualAccountController.java new file mode 100644 index 00000000..12f342e1 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/VirtualAccountController.java @@ -0,0 +1,44 @@ +package life.mosu.mosuserver.presentation.virtualaccount; + +import life.mosu.mosuserver.application.virtualaccount.VirtualAccountService; +import life.mosu.mosuserver.global.util.ApiResponseWrapper; +import life.mosu.mosuserver.presentation.virtualaccount.dto.CreateVirtualAccountRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.DepositEventRequest; +import life.mosu.mosuserver.presentation.virtualaccount.dto.VirtualAccountResponse; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RestController +@RequestMapping("/virtual-account") +@RequiredArgsConstructor +public class VirtualAccountController { + + private final VirtualAccountService virtualAccountService; + + @PostMapping() + public ResponseEntity> create( + @RequestBody CreateVirtualAccountRequest request + ) { + + VirtualAccountResponse response = virtualAccountService.create(request); + + return ResponseEntity.status(HttpStatus.CREATED).body( + ApiResponseWrapper.success(HttpStatus.CREATED, "가상 계좌 생성을 성공했습니다.", response)); + } + + @PostMapping("/callback") + public ResponseEntity> onWebhook( + @RequestBody DepositEventRequest request) { + log.info("Received deposit event: {}", request); + virtualAccountService.onDepositEvent(request); + return ResponseEntity.ok( + ApiResponseWrapper.success(HttpStatus.OK, "가상 계좌 입금 이벤트를 성공적으로 처리했습니다.")); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/CreateVirtualAccountRequest.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/CreateVirtualAccountRequest.java new file mode 100644 index 00000000..1f28d2d2 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/CreateVirtualAccountRequest.java @@ -0,0 +1,10 @@ +package life.mosu.mosuserver.presentation.virtualaccount.dto; + +public record CreateVirtualAccountRequest( + Long applicationId, + String alias, + String customerName, + String customerEmail +) { + +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/DepositEventRequest.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/DepositEventRequest.java new file mode 100644 index 00000000..1a4fd71c --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/DepositEventRequest.java @@ -0,0 +1,23 @@ +package life.mosu.mosuserver.presentation.virtualaccount.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import java.time.LocalDateTime; +import life.mosu.mosuserver.domain.virtualaccount.DepositStatus; + +public record DepositEventRequest( + @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS") + LocalDateTime createdAt, + String secret, + String orderId, + String status, + String transactionKey +) { + + public DepositStatus validStatus() { + try { + return DepositStatus.valueOf(status.toUpperCase()); + } catch (Exception ex) { + return DepositStatus.CANCELED; + } + } +} \ No newline at end of file diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/VirtualAccountResponse.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/VirtualAccountResponse.java new file mode 100644 index 00000000..f0a46a7b --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/VirtualAccountResponse.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.presentation.virtualaccount.dto; + +public record VirtualAccountResponse( + String bankNameKor, + String accountNumber +) { + + public static VirtualAccountResponse of( + String bankNameKor, + String accountNumber + ) { + return new VirtualAccountResponse(bankNameKor, accountNumber); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositEvent.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositEvent.java new file mode 100644 index 00000000..958e609d --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositEvent.java @@ -0,0 +1,19 @@ +package life.mosu.mosuserver.presentation.virtualaccount.dto.event; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import lombok.AllArgsConstructor; +import lombok.Data; + +@AllArgsConstructor +@Data +public class DepositEvent { + + String orderId; + String secret; + LocalDateTime createdAt; + + public String getFormattedCreatedAt() { + return createdAt.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositFailureEvent.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositFailureEvent.java new file mode 100644 index 00000000..8167cbeb --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositFailureEvent.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.presentation.virtualaccount.dto.event; + +import java.time.LocalDateTime; + +public class DepositFailureEvent extends DepositEvent { + + public DepositFailureEvent(String orderId, String secret, LocalDateTime createdAt) { + super(orderId, secret, createdAt); + } + + public static DepositFailureEvent of(String orderId, String secret, LocalDateTime createdAt) { + return new DepositFailureEvent(orderId, secret, createdAt); + } +} diff --git a/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositSuccessEvent.java b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositSuccessEvent.java new file mode 100644 index 00000000..c270fa55 --- /dev/null +++ b/src/main/java/life/mosu/mosuserver/presentation/virtualaccount/dto/event/DepositSuccessEvent.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.presentation.virtualaccount.dto.event; + +import java.time.LocalDateTime; + +public class DepositSuccessEvent extends DepositEvent { + + public DepositSuccessEvent(String orderId, String secret, LocalDateTime createdAt) { + super(orderId, secret, createdAt); + } + + public static DepositSuccessEvent of(String orderId, String secret, LocalDateTime createdAt) { + return new DepositSuccessEvent(orderId, secret, createdAt); + } +} diff --git a/src/main/resources/.DS_Store b/src/main/resources/.DS_Store new file mode 100644 index 00000000..99fbb9b4 Binary files /dev/null and b/src/main/resources/.DS_Store differ diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a48b3e63..0deb7721 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -10,6 +10,16 @@ server: include-stacktrace: never spring: + mail: + host: ${MAIL_HOST} + port: ${MAIL_PORT} + username: ${MAIL_USERNAME} + password: ${MAIL_PASSWORD} + properties: + mail.smtp.debug: true + mail.smtp.connectiontimeout: 1000 + mail.starttls.enable: true + mail.smtp.auth: true config: import: - optional:file:.env[.properties] @@ -20,6 +30,10 @@ spring: username: ${DB_USERNAME} password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver + hikari: + maximum-pool-size: 15 + minimum-idle: 15 + servlet: multipart: max-file-size: ${MAX_FILE_SIZE} @@ -28,7 +42,8 @@ spring: open-in-view: false show-sql: true hibernate: - ddl-auto: create-drop + ddl-auto: update + properties: hibernate: show_sql: true @@ -42,6 +57,20 @@ spring: redis: host: ${REDIS_HOST} port: ${VELKEY_PORT} + lettuce: + pool: + enabled: true + max-active: 32 + max-idle: 8 + min-idle: 4 + max-wait: 1000 + messages: + basename: messages + encoding: UTF-8 + mvc: + view: + prefix: /WEB-INF/views/ + suffix: .jsp management: endpoints: @@ -55,14 +84,29 @@ aws: region: ${AWS_REGION} access-key: ${AWS_ACCESS_KEY} secret-key: ${AWS_SECRET_KEY} - presigned-url-expiration-minutes: ${S3_PRESIGNED_URL_EXPIRATION_MINUTES} + pre-signed-url-expiration-minutes: ${S3_PRESIGNED_URL_EXPIRATION_MINUTES} logging: file: path: ./logs name: app.log + level: + root: INFO + toss: - secret-key: test_sk_kYG57Eba3GYBMGeobgbLrpWDOxmA + secret-key: ${TOSS_SECRET_KEY} api: - base-url: https://api.tosspayments.com/v1/payments + base-url: https://api.tosspayments.com/v1 + +alimtalk: + user-id: ${ALIMTALK_USER_ID} + api-key: ${ALIMTALK_API_KEY} + api: + base-url: ${ALIMTALK_URL} + +kakao: + channel-id: ${KAKAO_CHANNEL_ID} + +discord: + base-url: ${DISCORD_URL} \ No newline at end of file diff --git a/src/main/resources/db/.DS_Store b/src/main/resources/db/.DS_Store new file mode 100644 index 00000000..d6405f7c Binary files /dev/null and b/src/main/resources/db/.DS_Store differ diff --git a/src/main/resources/logback-spring.xml b/src/main/resources/logback-spring.xml index 56087a89..ff165fb1 100644 --- a/src/main/resources/logback-spring.xml +++ b/src/main/resources/logback-spring.xml @@ -4,24 +4,39 @@ + - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n UTF-8 + + DEBUG + + ${LOG_FILE} - %d{yyyy-MM-dd HH:mm:ss.SSS} %-5level %logger{36} - %msg%n + %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n UTF-8 + + INFO + - + + - \ No newline at end of file + + + + + + + diff --git a/src/main/resources/messages_ko.properties b/src/main/resources/messages_ko.properties new file mode 100644 index 00000000..84f4aca7 --- /dev/null +++ b/src/main/resources/messages_ko.properties @@ -0,0 +1,145 @@ +notify.exam.application.complete.alimtalk=\ +[\uBAA8\uC218] \uBAA8\uC758\uC218\uB2A5 \uC2E0\uCCAD\uC774 \uC644\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4!\n\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC751\uC2DC\uC77C\uC790: #{examDate}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\ +\u25A0 \uB3C4\uC2DC\uB77D: #{lunch}\n\n\ +\uC2E0\uCCAD\uB0B4\uC5ED\uC740 \uB9C8\uC774\uD398\uC774\uC9C0\uC5D0\uC11C \uD655\uC778 \uAC00\uB2A5\uD569\uB2C8\uB2E4.\n\n\ +\uC2DC\uD5D8 1\uC8FC\uC77C \uC804,\uC2DC\uD5D8 \uAD00\uB828 \uC720\uC758\uC0AC\uD56D\uACFC \uC218\uD5D8\uD45C \uC548\uB0B4 \uB9AC\uB9C8\uC778\uB4DC \uC54C\uB9BC\uC774 \uBC1C\uC1A1\uB420 \uC608\uC815\uC785\uB2C8\uB2E4. +notify.exam.application.complete.sms=\ +[\uBAA8\uC218] \uBAA8\uC758\uC218\uB2A5 \uC2E0\uCCAD\uC774 \uC644\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4!\n\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC751\uC2DC\uC77C\uC790: #{examDate}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\ +\u25A0 \uB3C4\uC2DC\uB77D: #{lunch}\n\n\ +\uC2E0\uCCAD\uB0B4\uC5ED\uC740 \uB9C8\uC774\uD398\uC774\uC9C0\uC5D0\uC11C \uD655\uC778 \uAC00\uB2A5\uD569\uB2C8\uB2E4.\n\ +\uB9C8\uC774\uD398\uC774\uC9C0 \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/mypage\n\n\ +\uC2DC\uD5D8 1\uC8FC\uC77C \uC804,\uC2DC\uD5D8 \uAD00\uB828 \uC720\uC758\uC0AC\uD56D\uACFC \uC218\uD5D8\uD45C \uC548\uB0B4 \uB9AC\uB9C8\uC778\uB4DC \uC54C\uB9BC\uC774 \uBC1C\uC1A1\uB420 \uC608\uC815\uC785\uB2C8\uB2E4.\n\ +\uC720\uC758\uC0AC\uD56D \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/warning +notify.exam.oneweek.reminder.alimtalk=\ +[\uBAA8\uC218] \uBAA8\uC758\uC218\uB2A5\uC774 1\uC8FC\uC77C \uC55E\uC73C\uB85C \uB2E4\uAC00\uC654\uC2B5\uB2C8\uB2E4!\n\n\ +\u25A0 \uC2DC\uD5D8\uC77C\uC790: #{examDate}\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\n\ +*\uC2DC\uD5D8 \uC804 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8*\n\ + - \uC624\uC804 08:00\uAE4C\uC9C0 \uC785\uC2E4 \uC644\uB8CC (\uC9C0\uAC01 \uC2DC \uBCC4\uB3C4\uB85C \uB9C8\uB828\uB41C \uB300\uAE30\uC2E4\uC5D0\uC11C \uB300\uAE30\uD6C4 \uC785\uC7A5 \uAC00\uB2A5)\n\ + - \uC218\uD5D8\uD45C\uC640 \uC2E0\uBD84\uC99D \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uD45C\uC9C0\uC5D0 \uC218\uD5D8\uBC88\uD638\uC640 \uC774\uB984 \uAE30\uC7AC\n\ + - \uB3C4\uC2DC\uB77D \uC2E0\uCCAD\uC790\uB294 \uD604\uC7A5 \uB3C4\uC2DC\uB77D \uC81C\uACF5\n\ + - \uAC10\uB3C5\uAD00 \uC9C0\uC2DC \uBBF8\uC774\uD589 \uC2DC \uD1F4\uC2E4 \uC870\uCE58 \uAC00\uB2A5\n\n\ +*\uC804\uCCB4 \uC720\uC758\uC0AC\uD56D \uAF2D \uC77D\uC5B4\uBCF4\uAE30* +notify.exam.oneweek.reminder.sms=\ +[\uBAA8\uC218] \uBAA8\uC758\uC218\uB2A5\uC774 1\uC8FC\uC77C \uC55E\uC73C\uB85C \uB2E4\uAC00\uC654\uC2B5\uB2C8\uB2E4!\n\n\ +\u25A0 \uC2DC\uD5D8\uC77C\uC790: #{examDate}\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\n\ +*\uC2DC\uD5D8 \uC804 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8*\n\ + - \uC624\uC804 08:00\uAE4C\uC9C0 \uC785\uC2E4 \uC644\uB8CC (\uC9C0\uAC01 \uC2DC \uBCC4\uB3C4\uB85C \uB9C8\uB828\uB41C \uB300\uAE30\uC2E4\uC5D0\uC11C \uB300\uAE30 \uD6C4 \uC785\uC7A5 \uAC00\uB2A5)\n\ + - \uC218\uD5D8\uD45C\uC640 \uC2E0\uBD84\uC99D \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uD45C\uC9C0\uC5D0 \uC218\uD5D8\uBC88\uD638\uC640 \uC774\uB984 \uAE30\uC7AC\n\ + - \uB3C4\uC2DC\uB77D \uC2E0\uCCAD\uC790\uB294 \uD604\uC7A5 \uB3C4\uC2DC\uB77D \uC81C\uACF5\n\ + - \uAC10\uB3C5\uAD00 \uC9C0\uC2DC \uBBF8\uC774\uD589 \uC2DC \uD1F4\uC2E4 \uC870\uCE58 \uAC00\uB2A5\n\n\ +*\uC804\uCCB4 \uC720\uC758\uC0AC\uD56D \uAF2D \uC77D\uC5B4\uBCF4\uAE30*\n\ +\uC720\uC758\uC0AC\uD56D \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/warning +notify.exam.threeday.reminder.alimtalk=\ +[\uBAA8\uC218] \uBAA8\uC758\uC218\uB2A5 \uC751\uC2DC\uC77C 3\uC77C \uC804 \uC785\uB2C8\uB2E4!\n\n\ +\u25A0 \uC2DC\uD5D8\uC77C\uC790: #{examDate}\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC218\uD5D8\uBC88\uD638: #{examNumber}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\n\ +*\uC2DC\uD5D8 \uC804 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8*\n\ + - \uC624\uC804 08:00\uAE4C\uC9C0 \uC785\uC2E4 \uC644\uB8CC (\uC9C0\uAC01 \uC2DC \uBCC4\uB3C4\uB85C \uB9C8\uB828\uB41C \uB300\uAE30\uC2E4\uC5D0\uC11C \uB300\uAE30\uD6C4 \uC785\uC7A5 \uAC00\uB2A5)\n\ + - \uC218\uD5D8\uD45C\uC640 \uC2E0\uBD84\uC99D \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uD45C\uC9C0\uC5D0 \uC218\uD5D8\uBC88\uD638\uC640 \uC774\uB984 \uAE30\uC7AC\n\ + - \uB3C4\uC2DC\uB77D \uC2E0\uCCAD\uC790\uB294 \uD604\uC7A5 \uB3C4\uC2DC\uB77D \uC81C\uACF5\n\ + - \uAC10\uB3C5\uAD00 \uC9C0\uC2DC \uBBF8\uC774\uD589 \uC2DC \uD1F4\uC2E4 \uC870\uCE58 \uAC00\uB2A5\n\n\ +*\uC804\uCCB4 \uC720\uC758\uC0AC\uD56D \uAF2D \uC77D\uC5B4\uBCF4\uAE30*\n\n\ +*\uC218\uD5D8\uD45C\uAC00 \uBC1C\uAE09\uB418\uC5C8\uC2B5\uB2C8\uB2E4.*\n\ + - \uB9C8\uC774\uD398\uC774\uC9C0 > \uC2E0\uCCAD\uB0B4\uC5ED > \uC218\uD5D8\uD45C \uCD9C\uB825\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. +notify.exam.threeday.reminder.sms=\ +[\uBAA8\uC218] \uBAA8\uC758\uC218\uB2A5 \uC751\uC2DC\uC77C 3\uC77C \uC804 \uC785\uB2C8\uB2E4!\n\n\ +\u25A0 \uC2DC\uD5D8\uC77C\uC790: #{examDate}\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC218\uD5D8\uBC88\uD638: #{examNumber}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\n\ +*\uC2DC\uD5D8 \uC804 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8*\n\ + - \uC624\uC804 08:00\uAE4C\uC9C0 \uC785\uC2E4 \uC644\uB8CC (\uC9C0\uAC01 \uC2DC \uBCC4\uB3C4\uB85C \uB9C8\uB828\uB41C \uB300\uAE30\uC2E4\uC5D0\uC11C \uB300\uAE30\uD6C4 \uC785\uC7A5 \uAC00\uB2A5)\n\ + - \uC218\uD5D8\uD45C\uC640 \uC2E0\uBD84\uC99D \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uD45C\uC9C0\uC5D0 \uC218\uD5D8\uBC88\uD638\uC640 \uC774\uB984 \uAE30\uC7AC\n\ + - \uB3C4\uC2DC\uB77D \uC2E0\uCCAD\uC790\uB294 \uD604\uC7A5 \uB3C4\uC2DC\uB77D \uC81C\uACF5\n\ + - \uAC10\uB3C5\uAD00 \uC9C0\uC2DC \uBBF8\uC774\uD589 \uC2DC \uD1F4\uC2E4 \uC870\uCE58 \uAC00\uB2A5\n\n\ +*\uC804\uCCB4 \uC720\uC758\uC0AC\uD56D \uAF2D \uC77D\uC5B4\uBCF4\uAE30*\n\ +\uC720\uC758\uC0AC\uD56D \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/warning\n\n\ +*\uC218\uD5D8\uD45C\uAC00 \uBC1C\uAE09\uB418\uC5C8\uC2B5\uB2C8\uB2E4.*\n\ + - \uB9C8\uC774\uD398\uC774\uC9C0 > \uC2E0\uCCAD\uB0B4\uC5ED > \uC218\uD5D8\uD45C \uCD9C\uB825\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n\ +\uB9C8\uC774\uD398\uC774\uC9C0 \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/mypage +notify.exam.oneday.reminder.alimtalk=\ +[\uBAA8\uC218] \uB0B4\uC77C\uC740 \uBAA8\uC758\uC218\uB2A5 \uC751\uC2DC\uC77C \uC785\uB2C8\uB2E4!\n\n\ +\u25A0 \uC2DC\uD5D8\uC77C\uC790: #{examDate}\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC218\uD5D8\uBC88\uD638: #{examNumber}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\n\ +*\uC2DC\uD5D8 \uC804 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8*\n\ + - \uC624\uC804 08:00\uAE4C\uC9C0 \uC785\uC2E4 \uC644\uB8CC (\uC9C0\uAC01 \uC2DC \uBCC4\uB3C4\uB85C \uB9C8\uB828\uB41C \uB300\uAE30\uC2E4\uC5D0\uC11C \uB300\uAE30\uD6C4 \uC785\uC7A5 \uAC00\uB2A5)\n\ + - \uC218\uD5D8\uD45C\uC640 \uC2E0\uBD84\uC99D \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uD45C\uC9C0\uC5D0 \uC218\uD5D8\uBC88\uD638\uC640 \uC774\uB984 \uAE30\uC7AC\n\ + - \uB3C4\uC2DC\uB77D \uC2E0\uCCAD\uC790\uB294 \uD604\uC7A5 \uB3C4\uC2DC\uB77D \uC81C\uACF5\n\ + - \uAC10\uB3C5\uAD00 \uC9C0\uC2DC \uBBF8\uC774\uD589 \uC2DC \uD1F4\uC2E4 \uC870\uCE58 \uAC00\uB2A5\n\n\ +*\uC804\uCCB4 \uC720\uC758\uC0AC\uD56D \uAF2D \uC77D\uC5B4\uBCF4\uAE30*\n\n\ +*\uC218\uD5D8\uD45C\uAC00 \uBC1C\uAE09\uB418\uC5C8\uC2B5\uB2C8\uB2E4.*\n\ + - \uB9C8\uC774\uD398\uC774\uC9C0 > \uC2E0\uCCAD\uB0B4\uC5ED > \uC218\uD5D8\uD45C \uCD9C\uB825\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. +notify.exam.oneday.reminder.sms=\ +[\uBAA8\uC218] \uB0B4\uC77C\uC740 \uBAA8\uC758\uC218\uB2A5 \uC751\uC2DC\uC77C \uC785\uB2C8\uB2E4!\n\n\ +\u25A0 \uC2DC\uD5D8\uC77C\uC790: #{examDate}\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC218\uD5D8\uBC88\uD638: #{examNumber}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\n\ +*\uC2DC\uD5D8 \uC804 \uCCB4\uD06C\uB9AC\uC2A4\uD2B8*\n\ + - \uC624\uC804 08:00\uAE4C\uC9C0 \uC785\uC2E4 \uC644\uB8CC (\uC9C0\uAC01 \uC2DC \uBCC4\uB3C4\uB85C \uB9C8\uB828\uB41C \uB300\uAE30\uC2E4\uC5D0\uC11C \uB300\uAE30\uD6C4 \uC785\uC7A5 \uAC00\uB2A5)\n\ + - \uC218\uD5D8\uD45C\uC640 \uC2E0\uBD84\uC99D \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uC9C0\uCC38\n\ + - \uC751\uC2DC\uD560 \uBAA8\uC758\uACE0\uC0AC \uD45C\uC9C0\uC5D0 \uC218\uD5D8\uBC88\uD638\uC640 \uC774\uB984 \uAE30\uC7AC\n\ + - \uB3C4\uC2DC\uB77D \uC2E0\uCCAD\uC790\uB294 \uD604\uC7A5 \uB3C4\uC2DC\uB77D \uC81C\uACF5\n\ + - \uAC10\uB3C5\uAD00 \uC9C0\uC2DC \uBBF8\uC774\uD589 \uC2DC \uD1F4\uC2E4 \uC870\uCE58 \uAC00\uB2A5\n\n\ +*\uC804\uCCB4 \uC720\uC758\uC0AC\uD56D \uAF2D \uC77D\uC5B4\uBCF4\uAE30*\n\ +\uC720\uC758\uC0AC\uD56D \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/warning\n\n\ +*\uC218\uD5D8\uD45C\uAC00 \uBC1C\uAE09\uB418\uC5C8\uC2B5\uB2C8\uB2E4.*\n\ + - \uB9C8\uC774\uD398\uC774\uC9C0 > \uC2E0\uCCAD\uB0B4\uC5ED > \uC218\uD5D8\uD45C \uCD9C\uB825\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n\ +\uB9C8\uC774\uD398\uC774\uC9C0 \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/mypage +notify.signup.complete.alimtalk=\ +[\uBAA8\uC218] \uD68C\uC6D0\uAC00\uC785\uC774 \uC644\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\n\n\ +\uC9C0\uAE08\uBD80\uD130 \uBAA8\uC758\uC218\uB2A5 \uC2E0\uCCAD\uC744 \uC9C4\uD589\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n\ +\uC2E0\uCCAD\uB0B4\uC5ED\uC740 \uB9C8\uC774\uD398\uC774\uC9C0\uC5D0\uC11C \uD56D\uC2DC \uD655\uC778 \uAC00\uB2A5\uD569\uB2C8\uB2E4.\n\n\ +\uC9C0\uAE08 \uB2F9\uC7A5 \uBAA8\uC218\uC640 \uD568\uAED8 \uC218\uB2A5\uC744 \uBBF8\uB9AC \uACBD\uD5D8\uD574 \uBCF4\uC138\uC694! +notify.inquiry.answered.alimtalk=\ +[\uBAA8\uC218] \uBB38\uC758\uD558\uC2E0 \uB0B4\uC6A9\uC5D0 \uB2F5\uBCC0\uC774 \uB4F1\uB85D\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\n\n\ +\u25A0 \uC81C\uBAA9: #{inquiryTitle}\n\n\ +\uB2F5\uBCC0\uC740 [\uBB38\uC758\uD558\uAE30 > \uB0B4 \uBB38\uC758\uAE00 \uC870\uD68C]\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. +notify.refund.complete.alimtalk=\ +[\uBAA8\uC218] \uD658\uBD88\uC774 \uC644\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\n\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC751\uC2DC\uC77C\uC790: #{examDate}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\ +\u25A0 \uD658\uBD88\uAE08\uC561: #{refundAmount}\n\ +\u25A0 \uACB0\uC81C\uC218\uB2E8: #{paymentMethod}\n\ +\u25A0 \uCC98\uB9AC\uC0AC\uC720: #{reason}\n\n\ +\uC694\uCCAD\uD558\uC2E0 \uD658\uBD88\uC740 \uB0B4\uBD80 \uADDC\uC815\uC5D0 \uB530\uB77C \uCC98\uB9AC\uB418\uC5C8\uC73C\uBA70,\n\ +\uACB0\uC81C \uC218\uB2E8\uC744 \uD1B5\uD574 \uC601\uC5C5\uC77C \uAE30\uC900 3~7\uC77C \uC774\uB0B4 \uC785\uAE08\uB420 \uC608\uC815\uC785\uB2C8\uB2E4.\n\ +\uD658\uBD88\uB0B4\uC5ED \uBC0F \uC2E0\uCCAD\uC815\uBCF4\uB294 \uB9C8\uC774\uD398\uC774\uC9C0\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4. +notify.refund.complete.sms=\ +[\uBAA8\uC218] \uD658\uBD88\uC774 \uC644\uB8CC\uB418\uC5C8\uC2B5\uB2C8\uB2E4.\n\n\ +\u25A0 \uACB0\uC81C\uBC88\uD638: #{paymentKey}\n\ +\u25A0 \uC751\uC2DC\uC77C\uC790: #{examDate}\n\ +\u25A0 \uC2DC\uD5D8\uC7A5\uC18C: #{schoolName}\n\ +\u25A0 \uD658\uBD88\uAE08\uC561: #{refundAmount}\n\ +\u25A0 \uACB0\uC81C\uC218\uB2E8: #{paymentMethod}\n\ +\u25A0 \uCC98\uB9AC\uC0AC\uC720: #{reason}\n\n\ +\uC694\uCCAD\uD558\uC2E0 \uD658\uBD88\uC740 \uB0B4\uBD80 \uADDC\uC815\uC5D0 \uB530\uB77C \uCC98\uB9AC\uB418\uC5C8\uC73C\uBA70,\n\ +\uACB0\uC81C\uC218\uB2E8\uC744 \uD1B5\uD574 \uC601\uC5C5\uC77C \uAE30\uC900 3~7\uC77C \uC774\uB0B4 \uC785\uAE08\uB420 \uC608\uC815\uC785\uB2C8\uB2E4.\n\ +\uD658\uBD88\uB0B4\uC5ED \uBC0F \uC2E0\uCCAD\uC815\uBCF4\uB294 \uB9C8\uC774\uD398\uC774\uC9C0\uC5D0\uC11C \uD655\uC778\uD558\uC2E4 \uC218 \uC788\uC2B5\uB2C8\uB2E4.\n\ +\uB9C8\uC774\uD398\uC774\uC9C0 \uBC14\uB85C\uAC00\uAE30: https://www.mosuedu.com/mypage diff --git a/src/main/resources/scripts/decrement_exam_quota.lua b/src/main/resources/scripts/decrement_exam_quota.lua new file mode 100644 index 00000000..4775ceae --- /dev/null +++ b/src/main/resources/scripts/decrement_exam_quota.lua @@ -0,0 +1,8 @@ +local current = tonumber(redis.call('GET', KEYS[1])) +if current == nil then + return redis.error_reply("Current value is nil") +end +if current <= 0 then + return redis.error_reply("Current value is already zero or negative") +end +return redis.call('DECR', KEYS[1]) \ No newline at end of file diff --git a/src/main/resources/scripts/increment_exam_quota.lua b/src/main/resources/scripts/increment_exam_quota.lua new file mode 100644 index 00000000..3e81a24a --- /dev/null +++ b/src/main/resources/scripts/increment_exam_quota.lua @@ -0,0 +1,12 @@ +local current = tonumber(redis.call('GET', KEYS[1])) +local max_capacity = tonumber(redis.call('GET', KEYS[2])) + +if current == nil or max_capacity == nil then + return redis.error_reply("Current or Max Capacity is nil") +end + +if current >= max_capacity then + return redis.error_reply("Current value has reached the maximum capacity") +end + +return redis.call('INCR', KEYS[1]) diff --git a/src/main/resources/security-config.yml b/src/main/resources/security-config.yml index d2f63f40..f0a90b2c 100644 --- a/src/main/resources/security-config.yml +++ b/src/main/resources/security-config.yml @@ -10,7 +10,12 @@ spring: client-secret: ${KAKAO_CLIENT_SECRET} redirect-uri: ${KAKAO_REDIRECT_URI} scope: - - profile_nickname + - account_email + - name + - gender + - birthday + - birthyear + - phone_number client-name: kakao provider: kakao: @@ -34,8 +39,23 @@ jwt: refresh-token: expire-time: ${JWT_REFRESH_TOKEN_EXPIRE_TIME} -endpoints: - reissue: /api/v1/auth/reissue - target: - url: ${TARGET_URL} \ No newline at end of file + url: ${TARGET_URL} + +kmc: + cpid: ${KMC_CPID} + url-code: ${KMC_URLCODE} + +pbkdf2: + secret: ${PBKDF2_SECRET} + saltLength: ${PBKDF2_SALT_LENGTH} + iterations: ${PBKDF2_ITERATIONS} + +login: + max-attempt: 5 + lock-time-milli-seconds: 60000 # 5 minutes + +ratelimit: + enabled: false + max-requests-per-minute: 50 + time-window-ms: 60000 # 1 minute diff --git a/src/main/resources/templates/mail/deposit-complete.html b/src/main/resources/templates/mail/deposit-complete.html new file mode 100644 index 00000000..7efa7d72 --- /dev/null +++ b/src/main/resources/templates/mail/deposit-complete.html @@ -0,0 +1,22 @@ + + + + + 입금 완료 안내 + + +

+ 홍길동 고객의 입금이 확인되었습니다. +

+ +
    +
  • 은행명: 국민은행
    • +
  • 계좌번호: 123-456-7890
    • +
  • 주문번호: ORDER-1234
    • +
  • 입금일시: 2025-08-06 14:22:00
    • +
+ +

확인 후 필요한 후속 조치를 진행해주세요.

+

— 모수

+ + diff --git a/src/main/webapp/.DS_Store b/src/main/webapp/.DS_Store new file mode 100644 index 00000000..5bd32db0 Binary files /dev/null and b/src/main/webapp/.DS_Store differ diff --git a/src/main/webapp/WEB-INF/.DS_Store b/src/main/webapp/WEB-INF/.DS_Store new file mode 100644 index 00000000..5fa9d514 Binary files /dev/null and b/src/main/webapp/WEB-INF/.DS_Store differ diff --git a/src/main/webapp/WEB-INF/views/request.jsp b/src/main/webapp/WEB-INF/views/request.jsp new file mode 100644 index 00000000..402bd494 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/request.jsp @@ -0,0 +1,18 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + KMC 본인인증 요청 + + + +

KMC 본인인증 페이지로 이동 중입니다. 잠시만 기다려주세요...

+ +[cite_start] +
<%-- [cite: 134] --%> + [cite_start] <%-- [cite: 137] --%> + [cite_start] <%-- [cite: 137] --%> + [cite_start] <%-- 서비스 요청 버전 V2 [cite: 284] --%> +
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/result.jsp b/src/main/webapp/WEB-INF/views/result.jsp new file mode 100644 index 00000000..e2d139cd --- /dev/null +++ b/src/main/webapp/WEB-INF/views/result.jsp @@ -0,0 +1,58 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> + + + KMC 본인인증 결과 + + +

KMC 본인인증 결과

+ + +

인증 실패

+

오류: ${error}

+ + +

인증 성공

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
이름${result.name}
생년월일${result.birth}
성별${result.gender == '0' ? '남자' : '여자'}
휴대폰 번호${result.phoneNo}
통신사${result.phoneCorp}
연계정보 (CI)${result.ci}
중복가입확인정보 (DI)${result.di}
요청번호${result.certNum}
+ + +

결과 데이터가 없습니다.

+ + +
+[다시 테스트하기] + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/start.jsp b/src/main/webapp/WEB-INF/views/start.jsp new file mode 100644 index 00000000..ca46a723 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/start.jsp @@ -0,0 +1,93 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + KMC 본인인증 시작 + + + + + + +

KMC 본인인증 서비스 테스트

+ +
+ + + + <%-- KMC 개발 가이드에 따라 tr_add 등의 추가 파라미터가 필요하면 여기에 추가합니다. [cite: 77] --%> + <%-- --%> + +
+ +
+
+ +

버튼 클릭 시 KMC 본인인증 서비스 팝업이 뜨거나 페이지가 전환됩니다.

+

반드시 "암호화된_데이터"와 "결과받을_URL"을 실제 값으로 채워 넣어야 합니다.

+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/step1.jsp b/src/main/webapp/WEB-INF/views/step1.jsp new file mode 100644 index 00000000..b7542152 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/step1.jsp @@ -0,0 +1,140 @@ +<% + //************************************************************************ + // // + // üҽ ׽Ʈ , // + // // + // 񽺿 ״ ϴ մϴ. // + // // + //************************************************************************ +%> +<% + response.setHeader("Pragma", "no-cache"); // HTTP1.0 ij + response.setDateHeader("Expires", 0); // proxy ij + response.setHeader("Pragma", "no-store"); // HTTP1.1 ij + if (request.getProtocol().equals("HTTP/1.1")) { + response.setHeader("Cache-Control", "no-cache"); // HTTP1.1 ij + } +%> +<%@ page contentType="text/html;charset=ksc5601" %> +<%@ page import="java.util.*,java.text.SimpleDateFormat" %> +<% + //¥ + Calendar today = Calendar.getInstance(); + SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddHHmmss"); + String day = sdf.format(today.getTime()); + + java.security.SecureRandom ran = new java.security.SecureRandom(); // SecureRandom Ŭ + ran.setSeed(System.currentTimeMillis()); // õ尪 + + // 100000 ̻ 999999 6ڸ + int randomNum = ran.nextInt(900000) + 100000; + + //reqNum ִ 40byte + String reqNum = day + randomNum; +%> + + + ׽Ʈ + + + + + +
+


+ ׽Ʈ
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
ID +
URLڵ +
ûȣ
ûϽ
+ +
߰DATA
URL
+

+ +
+
+
+ Sampleȭ ׽Ʈ ϰ ִ ȭԴϴ.
+
+
+ + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/views/step2.jsp b/src/main/webapp/WEB-INF/views/step2.jsp new file mode 100644 index 00000000..fce5dd62 --- /dev/null +++ b/src/main/webapp/WEB-INF/views/step2.jsp @@ -0,0 +1,47 @@ +<%@ page contentType="text/html;charset=UTF-8" language="java" %> + + + KMC 본인인증 요청 + + + + +

아래 버튼을 눌러 본인인증을 진행해주세요.

+ +
+ + + + + <%-- 버튼 클릭 시 submitKmcForm() 스크립트가 실행됩니다. --%> + +
+ + diff --git a/src/test/java/life/mosu/mosuserver/FaqServiceTest.java b/src/test/java/life/mosu/mosuserver/FaqServiceTest.java index d26711fd..da7b50de 100644 --- a/src/test/java/life/mosu/mosuserver/FaqServiceTest.java +++ b/src/test/java/life/mosu/mosuserver/FaqServiceTest.java @@ -1,57 +1,57 @@ -package life.mosu.mosuserver; - -import static org.junit.jupiter.api.Assertions.assertEquals; -import static org.mockito.ArgumentMatchers.any; -import static org.mockito.Mockito.atLeastOnce; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.verify; -import static org.mockito.Mockito.when; - -import life.mosu.mosuserver.application.faq.FaqAttachmentService; -import life.mosu.mosuserver.application.faq.FaqService; -import life.mosu.mosuserver.domain.faq.FaqJpaEntity; -import life.mosu.mosuserver.domain.faq.FaqRepository; -import life.mosu.mosuserver.presentation.faq.dto.FaqCreateRequest; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.junit.jupiter.api.extension.ExtendWith; -import org.mockito.Mock; -import org.mockito.junit.jupiter.MockitoExtension; - -@ExtendWith(MockitoExtension.class) -public class FaqServiceTest { - - @Mock - private FaqRepository faqRepository; - @Mock - private FaqAttachmentService faqAttachmentService; - - private FaqService faqService; - - @BeforeEach - void setUp() { - - faqService = new FaqService( - faqRepository, - faqAttachmentService - ); - } - - @Test - void 파일등록_성공() { - // given - FaqCreateRequest request = mock(FaqCreateRequest.class); - FaqJpaEntity savedEntity = mock(FaqJpaEntity.class); - - when(faqRepository.save(any())).thenReturn(savedEntity); - when(request.toEntity()).thenReturn(savedEntity); - when(savedEntity.getId()).thenReturn(1L); - - // when - faqService.createFaq(request); - - // then - verify(faqRepository, atLeastOnce()).save(any()); - assertEquals(1L, savedEntity.getId()); - } -} +//package life.mosu.mosuserver; +// +//import static org.junit.jupiter.api.Assertions.assertEquals; +//import static org.mockito.ArgumentMatchers.any; +//import static org.mockito.Mockito.atLeastOnce; +//import static org.mockito.Mockito.mock; +//import static org.mockito.Mockito.verify; +//import static org.mockito.Mockito.when; +// +//import life.mosu.mosuserver.application.faq.FaqAttachmentService; +//import life.mosu.mosuserver.application.faq.FaqService; +//import life.mosu.mosuserver.domain.faq.FaqJpaEntity; +//import life.mosu.mosuserver.domain.faq.FaqJpaRepository; +//import life.mosu.mosuserver.presentation.faq.dto.FaqCreateRequest; +//import org.junit.jupiter.api.BeforeEach; +//import org.junit.jupiter.api.Test; +//import org.junit.jupiter.api.extension.ExtendWith; +//import org.mockito.Mock; +//import org.mockito.junit.jupiter.MockitoExtension; +// +//@ExtendWith(MockitoExtension.class) +//public class FaqServiceTest { +// +// @Mock +// private FaqJpaRepository faqJpaRepository; +// @Mock +// private FaqAttachmentService faqAttachmentService; +// +// private FaqService faqService; +// +// @BeforeEach +// void setUp() { +// +// faqService = new FaqService( +// faqJpaRepository, +// faqAttachmentService +// ); +// } +// +// @Test +// void 파일등록_성공() { +// // given +// FaqCreateRequest request = mock(FaqCreateRequest.class); +// FaqJpaEntity savedEntity = mock(FaqJpaEntity.class); +// +// when(faqJpaRepository.save(any())).thenReturn(savedEntity); +// when(request.toEntity()).thenReturn(savedEntity); +// when(savedEntity.getId()).thenReturn(1L); +// +// // when +// faqService.createFaq(request); +// +// // then +// verify(faqJpaRepository, atLeastOnce()).save(any()); +// assertEquals(1L, savedEntity.getId()); +// } +//} diff --git a/src/test/java/life/mosu/mosuserver/MosuServerApplicationTests.java b/src/test/java/life/mosu/mosuserver/MosuServerApplicationTests.java index c76f43fc..eddd9918 100644 --- a/src/test/java/life/mosu/mosuserver/MosuServerApplicationTests.java +++ b/src/test/java/life/mosu/mosuserver/MosuServerApplicationTests.java @@ -1,8 +1,12 @@ package life.mosu.mosuserver; +import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; @SpringBootTest class MosuServerApplicationTests { + @Test + void test() { + } } diff --git a/src/test/java/life/mosu/mosuserver/discount/FixedQuantityDiscountCalculatorTest.java b/src/test/java/life/mosu/mosuserver/discount/FixedQuantityDiscountCalculatorTest.java index b448b94f..1f5fc0d6 100644 --- a/src/test/java/life/mosu/mosuserver/discount/FixedQuantityDiscountCalculatorTest.java +++ b/src/test/java/life/mosu/mosuserver/discount/FixedQuantityDiscountCalculatorTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import life.mosu.mosuserver.domain.discount.FixedQuantityDiscountCalculator; +import life.mosu.mosuserver.domain.discount.service.FixedQuantityDiscountCalculator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -16,6 +16,11 @@ void setUp() { calculator = new FixedQuantityDiscountCalculator(); } + @Test + void 할인률_역산() { + assertEquals(18_000, calculator.getAppliedDiscountAmount(129_000)); + } + @Test void 지원되는_회차에_대한_총_결제금액_계산() { assertEquals(49_000, calculator.calculateDiscount(1)); diff --git a/src/test/java/life/mosu/mosuserver/discount/QuantityPercentageDiscountCalculatorTest.java b/src/test/java/life/mosu/mosuserver/discount/QuantityPercentageDiscountCalculatorTest.java index e9688990..3fa0776a 100644 --- a/src/test/java/life/mosu/mosuserver/discount/QuantityPercentageDiscountCalculatorTest.java +++ b/src/test/java/life/mosu/mosuserver/discount/QuantityPercentageDiscountCalculatorTest.java @@ -3,7 +3,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertThrows; -import life.mosu.mosuserver.domain.discount.QuantityPercentageDiscountCalculator; +import life.mosu.mosuserver.domain.discount.service.QuantityPercentageDiscountCalculator; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; diff --git a/src/test/java/life/mosu/mosuserver/domain/user/service/UserEncoderServiceTest.java b/src/test/java/life/mosu/mosuserver/domain/user/service/UserEncoderServiceTest.java new file mode 100644 index 00000000..30db0a88 --- /dev/null +++ b/src/test/java/life/mosu/mosuserver/domain/user/service/UserEncoderServiceTest.java @@ -0,0 +1,19 @@ +//package life.mosu.mosuserver.domain.user.service; +// +//import static org.junit.jupiter.api.Assertions.*; +// +//import lombok.RequiredArgsConstructor; +//import org.junit.jupiter.api.Test; +//import org.springframework.beans.factory.annotation.Autowired; +// +//@RequiredArgsConstructor(onConstructor_ = @Autowired) +//class UserEncoderServiceTest { +// +// +// private UserEncoderService userEncoderService; +// +// @Test +// void e() { +// userEncoderService.e("awef"); +// } +//} \ No newline at end of file diff --git a/src/test/java/life/mosu/mosuserver/global/fixture/UserTestFixture.java b/src/test/java/life/mosu/mosuserver/global/fixture/UserTestFixture.java new file mode 100644 index 00000000..9055ca9d --- /dev/null +++ b/src/test/java/life/mosu/mosuserver/global/fixture/UserTestFixture.java @@ -0,0 +1,48 @@ +package life.mosu.mosuserver.global.fixture; + +import java.time.LocalDate; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.user.entity.AuthProvider; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; + +public class UserTestFixture { + + public static String USER_ID = "userid1"; + public static String USER_PASSWORD = "Password!1"; + public static String USER_NAME = "김모수"; + public static String USER_PHONE_NUMBER = "010-9161-2960"; + public static LocalDate USER_BIRTH = LocalDate.of(2005, 12, 1); + + public static UserJpaEntity mosu_user() { + return UserJpaEntity.builder() + .loginId(USER_ID) + .password(USER_PASSWORD) + .gender(Gender.FEMALE) + .name(USER_NAME) + .phoneNumber(USER_PHONE_NUMBER) + .birth(LocalDate.of(2005, 12, 1)) + .userRole(UserRole.ROLE_USER) + .agreedToTermsOfService(true) + .agreedToPrivacyPolicy(true) + .agreedToMarketing(true) + .provider(AuthProvider.MOSU) + .build(); + } + + public static UserJpaEntity kakao_user() { + return UserJpaEntity.builder() + .loginId(USER_ID) + .password(USER_PASSWORD) + .gender(Gender.FEMALE) + .name(USER_NAME) + .phoneNumber(USER_PHONE_NUMBER) + .birth(LocalDate.of(2005, 12, 1)) + .userRole(UserRole.ROLE_USER) + .agreedToTermsOfService(true) + .agreedToPrivacyPolicy(true) + .agreedToMarketing(true) + .provider(AuthProvider.KAKAO) + .build(); + } +} diff --git a/src/test/java/life/mosu/mosuserver/infra/kmc/KmcServiceTest.java b/src/test/java/life/mosu/mosuserver/infra/kmc/KmcServiceTest.java new file mode 100644 index 00000000..3a50bde2 --- /dev/null +++ b/src/test/java/life/mosu/mosuserver/infra/kmc/KmcServiceTest.java @@ -0,0 +1,14 @@ +package life.mosu.mosuserver.infra.kmc; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class KmcServiceTest { + + @Test + @DisplayName("KMC 본인인증 요청 데이터 생성 테스트") + void encryptTrCert() { + Assertions.assertEquals(1, 1); + } +} \ No newline at end of file diff --git a/src/test/java/life/mosu/mosuserver/payment/TossPaymentClientTest.java b/src/test/java/life/mosu/mosuserver/payment/TossPaymentClientTest.java index f13bc35b..aa9d176e 100644 --- a/src/test/java/life/mosu/mosuserver/payment/TossPaymentClientTest.java +++ b/src/test/java/life/mosu/mosuserver/payment/TossPaymentClientTest.java @@ -3,9 +3,9 @@ import static org.junit.jupiter.api.Assertions.assertAll; import static org.junit.jupiter.api.Assertions.assertNotNull; -import life.mosu.mosuserver.infra.payment.TossPaymentClient; -import life.mosu.mosuserver.infra.payment.dto.ConfirmTossPaymentResponse; -import life.mosu.mosuserver.infra.payment.dto.TossPaymentPayload; +import life.mosu.mosuserver.infra.toss.TossPaymentClient; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; +import life.mosu.mosuserver.infra.toss.dto.TossPaymentPayload; import life.mosu.mosuserver.payment.stub.ConfirmFakeRestOperationsStub; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.BeforeAll; diff --git a/src/test/java/life/mosu/mosuserver/payment/stub/CancelFakeRestOperationsStub.java b/src/test/java/life/mosu/mosuserver/payment/stub/CancelFakeRestOperationsStub.java index 6a6344eb..8a01bd27 100644 --- a/src/test/java/life/mosu/mosuserver/payment/stub/CancelFakeRestOperationsStub.java +++ b/src/test/java/life/mosu/mosuserver/payment/stub/CancelFakeRestOperationsStub.java @@ -1,13 +1,14 @@ package life.mosu.mosuserver.payment.stub; -import life.mosu.mosuserver.infra.payment.dto.ConfirmTossPaymentResponse; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; public class CancelFakeRestOperationsStub extends BaseFakeRestOperationsStub { + private final ConfirmTossPaymentResponse confirmResponse; public CancelFakeRestOperationsStub(ConfirmTossPaymentResponse confirmResponse) { diff --git a/src/test/java/life/mosu/mosuserver/payment/stub/ConfirmFakeRestOperationsStub.java b/src/test/java/life/mosu/mosuserver/payment/stub/ConfirmFakeRestOperationsStub.java index 1f3fed9c..2937be2e 100644 --- a/src/test/java/life/mosu/mosuserver/payment/stub/ConfirmFakeRestOperationsStub.java +++ b/src/test/java/life/mosu/mosuserver/payment/stub/ConfirmFakeRestOperationsStub.java @@ -1,11 +1,12 @@ package life.mosu.mosuserver.payment.stub; -import life.mosu.mosuserver.infra.payment.dto.ConfirmTossPaymentResponse; +import life.mosu.mosuserver.infra.toss.dto.ConfirmTossPaymentResponse; import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.ResponseEntity; public class ConfirmFakeRestOperationsStub extends BaseFakeRestOperationsStub { + private final ConfirmTossPaymentResponse response; public ConfirmFakeRestOperationsStub(ConfirmTossPaymentResponse response) { @@ -20,7 +21,8 @@ public ResponseEntity exchange(String url, Object... uriVariables) { if (!url.contains("/confirm")) { - throw new IllegalArgumentException("ConfirmFakeRestOperations can only handle /confirm"); + throw new IllegalArgumentException( + "ConfirmFakeRestOperations can only handle /confirm"); } return ResponseEntity.ok(responseType.cast(response)); } diff --git a/src/test/java/life/mosu/mosuserver/presentation/auth/dto/LoginResponseTest.java b/src/test/java/life/mosu/mosuserver/presentation/auth/dto/LoginResponseTest.java new file mode 100644 index 00000000..20a38723 --- /dev/null +++ b/src/test/java/life/mosu/mosuserver/presentation/auth/dto/LoginResponseTest.java @@ -0,0 +1,141 @@ +package life.mosu.mosuserver.presentation.auth.dto; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertTrue; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; +import java.time.LocalDate; +import life.mosu.mosuserver.application.oauth.OAuthUser; +import life.mosu.mosuserver.domain.profile.entity.Gender; +import life.mosu.mosuserver.domain.user.entity.AuthProvider; +import life.mosu.mosuserver.domain.user.entity.UserJpaEntity; +import life.mosu.mosuserver.domain.user.entity.UserRole; +import lombok.extern.slf4j.Slf4j; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; + +@Slf4j +@DisplayName("로그인 응답 객체 테스트") +class LoginResponseTest { + + private ObjectMapper objectMapper; + + private UserJpaEntity 모수_사용자; + private UserJpaEntity 카카오_사용자_정보; + + @BeforeEach + void setUp() { + 모수_사용자 = UserJpaEntity.builder() + .loginId("test@example.com") + .name("김모수") + .birth(LocalDate.now()) + .gender(Gender.MALE) + .phoneNumber("010-1234-5678") + .provider(AuthProvider.MOSU) + .userRole(UserRole.ROLE_USER) + .build(); + + 카카오_사용자_정보 = UserJpaEntity.builder() + .loginId("test2@example.com") + .name("이카카") + .birth(LocalDate.EPOCH) + .gender(Gender.FEMALE) + .phoneNumber("010-1234-5678") + .provider(AuthProvider.KAKAO) + .userRole(UserRole.ROLE_USER) + .build(); + + objectMapper = new ObjectMapper() + .registerModule(new JavaTimeModule()) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + } + + @Nested + @DisplayName("카카오_로그인_응답_테스트") + class 카카오_로그인_응답_테스트 { + + @Test + @DisplayName("프로필이 등록된 OAuthUser의 경우 isProfileRegistered가 true이고 oauthUser는 null이다") + void 카카오_로그인_사용자가_기존의_회원인_경우() throws JsonProcessingException { + // given + OAuthUser 카카오_사용자 = new OAuthUser( + 카카오_사용자_정보, + null, + null, + true + ); + + // when + LoginResponse response = LoginResponse.from(카카오_사용자); + + // then + assertTrue(response.isProfileRegistered()); + assertNull(response.userInfo()); + + String jsonResponse = objectMapper.writeValueAsString(response); + log.info("카카오_로그인_사용자가_기존의_회원인_경우_응답 JSON : {}", jsonResponse); + } + + @Test + @DisplayName("프로필이 등록되지 않은 OAuthUser의 경우 isProfileRegistered가 false이고 oauthUser 정보가 있다") + void 카카오_로그인_사용자가_기존의_회원이_아닌_경우() throws JsonProcessingException { + // given + OAuthUser 카카오_사용자 = new OAuthUser( + 카카오_사용자_정보, + null, + null, + false + ); + + // when + LoginResponse response = LoginResponse.from(카카오_사용자); + + // then + assertFalse(response.isProfileRegistered()); + assertNotNull(response.userInfo()); + + String jsonResponse = objectMapper.writeValueAsString(response); + log.info("카카오_로그인_사용자가_기존의_회원이_아닌_경우_응답 JSON : {}", jsonResponse); + } + } + + @Nested + @DisplayName("모수_로그인_응답_테스트") + class 모수_로그인_응답_테스트 { + + @Test + @DisplayName("isProfileRegistered가 true인 경우 oauthUser는 null이다") + void 모수_로그인_사용자가_기존의_회원인_경우() throws JsonProcessingException { + // when + LoginResponse response = LoginResponse.from(true, 모수_사용자); + + // then + assertTrue(response.isProfileRegistered()); + assertNull(response.userInfo()); + + String jsonResponse = objectMapper.writeValueAsString(response); + log.info("모수_로그인_사용자가_기존의_회원인_경우_응답 : {}", jsonResponse); + } + + @Test + @DisplayName("isProfileRegistered가 false인 경우 oauthUser 정보가 있다") + void 모수_로그인_사용자가_기존의_회원이_아닌_경우() throws JsonProcessingException { + // when + LoginResponse response = LoginResponse.from(false, 모수_사용자); + + // then + assertFalse(response.isProfileRegistered()); + assertNotNull(response.userInfo()); + + String jsonResponse = objectMapper.writeValueAsString(response); + log.info("모수_로그인_사용자가_기존의_회원이_아닌_경우_응답 : {}", jsonResponse); + } + } +} \ No newline at end of file diff --git a/src/test/resources/application.yml b/src/test/resources/application.yml new file mode 100644 index 00000000..00c6d488 --- /dev/null +++ b/src/test/resources/application.yml @@ -0,0 +1,92 @@ +server: + port: ${SPRING_PORT} + servlet: + context-path: ${BASE_PATH} + session: + cookie: + same-site: none + secure: false + error: + include-stacktrace: never + +spring: + flyway: + enabled: false + config: + import: + - test-security-config.yml + datasource: + url: jdbc:tc:mysql:8.4.4:///; + driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver + hikari: + maximum-pool-size: 15 + minimum-idle: 15 + + servlet: + multipart: + max-file-size: ${MAX_FILE_SIZE} + max-request-size: ${MAX_REQUEST_SIZE} + jpa: + open-in-view: false + show-sql: true + hibernate: + ddl-auto: create-drop + properties: + hibernate: + show_sql: true + format_sql: true + highlight_sql: true + use_sql_comments: true + jdbc: + time_zone: Asia/Seoul + dialect: org.hibernate.dialect.MySQLDialect + data: + redis: + host: ${REDIS_HOST} + port: ${VELKEY_PORT} + messages: + basename: messages + encoding: UTF-8 + mvc: + view: + prefix: /WEB-INF/views/ + suffix: .jsp + +management: + endpoints: + web: + exposure: + include: "*" + +aws: + s3: + bucket-name: ${AWS_BUCKET_NAME} + region: ${AWS_REGION} + access-key: ${AWS_ACCESS_KEY} + secret-key: ${AWS_SECRET_KEY} + presigned-url-expiration-minutes: ${S3_PRESIGNED_URL_EXPIRATION_MINUTES} + +logging: + file: + path: ./logs + name: app.log + level: + org: + type: + descriptor: + sql: + BasicBinder: TRACE + +toss: + secret-key: test_sk_kYG57Eba3GYBMGeobgbLrpWDOxmA + api: + base-url: https://api.tosspayments.com/v1/payments + +alimtalk: + user-id: ${ALIMTALK_USER_ID} + api-key: ${ALIMTALK_API_KEY} + api: + base-url: ${ALIMTALK_URL} + +kakao: + channel-id: ${KAKAO_CHANNEL_ID} \ No newline at end of file diff --git a/src/test/resources/security-config.yml b/src/test/resources/security-config.yml new file mode 100644 index 00000000..e63df47e --- /dev/null +++ b/src/test/resources/security-config.yml @@ -0,0 +1,46 @@ +spring: + security: + oauth2: + client: + registration: + kakao: + client-authentication-method: client_secret_post + authorization-grant-type: authorization_code + client-id: ${KAKAO_CLIENT_ID} + client-secret: ${KAKAO_CLIENT_SECRET} + redirect-uri: ${KAKAO_REDIRECT_URI} + scope: + - profile_nickname + client-name: kakao + provider: + kakao: + authorization-uri: https://kauth.kakao.com/oauth/authorize + token-uri: https://kauth.kakao.com/oauth/token + user-info-uri: https://kapi.kakao.com/v2/user/me + user-name-attribute: id + +server: + servlet: + session: + cookie: + http-only: true + secure: true + same-site: None + +jwt: + secret: ${JWT_SECRET} + access-token: + expire-time: ${JWT_ACCESS_TOKEN_EXPIRE_TIME} + refresh-token: + expire-time: ${JWT_REFRESH_TOKEN_EXPIRE_TIME} + +endpoints: + reissue: /api/v1/auth/reissue + +target: + url: ${TARGET_URL} + +kmc: + cpid: ${KMC_CPID} + url-code: ${KMC_URLCODE} + expire-time: ${KMC_EXPIRE_TIME} \ No newline at end of file diff --git a/src/test/resources/test-security-config.yml b/src/test/resources/test-security-config.yml new file mode 100644 index 00000000..c4b20a37 --- /dev/null +++ b/src/test/resources/test-security-config.yml @@ -0,0 +1,90 @@ +server: + port: ${SPRING_PORT} + servlet: + context-path: ${BASE_PATH} + session: + cookie: + same-site: none + secure: false + error: + include-stacktrace: never + +spring: + config: + import: + - security-config.yml + datasource: + url: jdbc:tc:mysql:9.0.0:///; + driver-class-name: org.testcontainers.jdbc.ContainerDatabaseDriver + hikari: + maximum-pool-size: 15 + minimum-idle: 15 + + servlet: + multipart: + max-file-size: ${MAX_FILE_SIZE} + max-request-size: ${MAX_REQUEST_SIZE} + jpa: + open-in-view: false + show-sql: true + hibernate: + ddl-auto: create-drop + properties: + hibernate: + show_sql: true + format_sql: true + highlight_sql: true + use_sql_comments: true + jdbc: + time_zone: Asia/Seoul + dialect: org.hibernate.dialect.MySQLDialect + data: + redis: + host: ${REDIS_HOST} + port: ${VELKEY_PORT} + messages: + basename: messages + encoding: UTF-8 + mvc: + view: + prefix: /WEB-INF/views/ + suffix: .jsp + +management: + endpoints: + web: + exposure: + include: "*" + +aws: + s3: + bucket-name: ${AWS_BUCKET_NAME} + region: ${AWS_REGION} + access-key: ${AWS_ACCESS_KEY} + secret-key: ${AWS_SECRET_KEY} + presigned-url-expiration-minutes: ${S3_PRESIGNED_URL_EXPIRATION_MINUTES} + +logging: + file: + path: ./logs + name: app.log + level: + org: + type: + descriptor: + sql: + BasicBinder: TRACE + +toss: + secret-key: test_sk_kYG57Eba3GYBMGeobgbLrpWDOxmA + api: + base-url: https://api.tosspayments.com/v1/payments + +alimtalk: + user-id: ${ALIMTALK_USER_ID} + api-key: ${ALIMTALK_API_KEY} + api: + base-url: ${ALIMTALK_URL} + +kakao: + channel-id: ${KAKAO_CHANNEL_ID} \ No newline at end of file