From e36a1b937532125c4ce56aca4721abe6a3541536 Mon Sep 17 00:00:00 2001 From: kmj02dev Date: Sat, 17 May 2025 16:27:04 +0900 Subject: [PATCH 1/8] Update ci-cd-recruitment-service.yml --- .github/workflows/ci-cd-recruitment-service.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-cd-recruitment-service.yml b/.github/workflows/ci-cd-recruitment-service.yml index 2e77bc6..2df04dd 100644 --- a/.github/workflows/ci-cd-recruitment-service.yml +++ b/.github/workflows/ci-cd-recruitment-service.yml @@ -10,12 +10,12 @@ env: SERVICE_NAME: recruitment-service # 예: order-service DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest EC2_HOST: ${{ secrets.EC2_HOST }} - EC2_SSH_USER: ec2-user + EC2_SSH_USER: kmj02dev PRIVATE_KEY: ${{ secrets.EC2_SSH_PRIVATE_KEY }} TIMEZONE: Asia/Seoul DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - PROJECT_PATH: /home/ec2-user/delivery-system/recruitment-service # 예: /home/ec2-user/delivery-system/order-service + PROJECT_PATH: /home/kmj02dev/delivery-system/recruitment-service # 예: /home/ec2-user/delivery-system/order-service jobs: build-and-push: From ad697d8806174adb6bc9b9160d7bae6bf52b1a25 Mon Sep 17 00:00:00 2001 From: kimdongeun Date: Thu, 22 May 2025 13:10:08 +0900 Subject: [PATCH 2/8] =?UTF-8?q?=EB=AA=A8=EC=A7=91=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- recruitment-service/.gitattributes | 3 + .../.github/workflows/ci-cd-order-service.yml | 71 +++++ .../workflows/ci-cd-payment-service.yml | 71 +++++ .../workflows/ci-cd-recruitment-service.yml | 71 +++++ .../.github/workflows/ci-cd-store-service.yml | 71 +++++ .../.github/workflows/ci-cd-user-service.yml | 71 +++++ recruitment-service/.gitignore | 37 +++ recruitment-service/build.gradle | 39 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43705 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + recruitment-service/gradlew | 251 ++++++++++++++++++ recruitment-service/gradlew.bat | 94 +++++++ recruitment-service/settings.gradle | 1 + .../recruitment/RecruitmentApplication.java | 13 + .../RecruitmentControllerTest.java | 13 + .../controller/RecruitmentController.java | 210 +++++++++++++++ .../controller/StoreController.java | 26 ++ .../controller/UserController.java | 26 ++ .../recruitment/dto/RecruitmentDetailDto.java | 21 ++ .../dto/RecruitmentRequestDto.java | 15 ++ .../recruitment/entity/Recruitment.java | 32 +++ .../entity/RecruitmentParticipant.java | 30 +++ .../com/example/recruitment/entity/Store.java | 18 ++ .../com/example/recruitment/entity/User.java | 17 ++ .../RecruitmentParticipantRepository.java | 21 ++ .../repository/RecruitmentRepository.java | 14 + .../repository/StoreRepository.java | 7 + .../repository/UserRepository.java | 7 + .../src/main/resources/application.properties | 9 + .../RecruitmentApplicationTests.java | 13 + 30 files changed, 1279 insertions(+) create mode 100644 recruitment-service/.gitattributes create mode 100644 recruitment-service/.github/workflows/ci-cd-order-service.yml create mode 100644 recruitment-service/.github/workflows/ci-cd-payment-service.yml create mode 100644 recruitment-service/.github/workflows/ci-cd-recruitment-service.yml create mode 100644 recruitment-service/.github/workflows/ci-cd-store-service.yml create mode 100644 recruitment-service/.github/workflows/ci-cd-user-service.yml create mode 100644 recruitment-service/.gitignore create mode 100644 recruitment-service/build.gradle create mode 100644 recruitment-service/gradle/wrapper/gradle-wrapper.jar create mode 100644 recruitment-service/gradle/wrapper/gradle-wrapper.properties create mode 100644 recruitment-service/gradlew create mode 100644 recruitment-service/gradlew.bat create mode 100644 recruitment-service/settings.gradle create mode 100644 recruitment-service/src/main/java/com/example/recruitment/RecruitmentApplication.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/RecruitmentControllerTest.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentDetailDto.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/Store.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/User.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentRepository.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/repository/StoreRepository.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/repository/UserRepository.java create mode 100644 recruitment-service/src/main/resources/application.properties create mode 100644 recruitment-service/src/test/java/com/example/recruitment/RecruitmentApplicationTests.java diff --git a/recruitment-service/.gitattributes b/recruitment-service/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/recruitment-service/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/recruitment-service/.github/workflows/ci-cd-order-service.yml b/recruitment-service/.github/workflows/ci-cd-order-service.yml new file mode 100644 index 0000000..35f0b82 --- /dev/null +++ b/recruitment-service/.github/workflows/ci-cd-order-service.yml @@ -0,0 +1,71 @@ +name: CI/CD for Spring Boot + MySQL with Docker Compose + +on: + push: + branches: [ "main", "order-service/main" ] + pull_request: + branches: [ "main", "order-service/main" ] + +env: + SERVICE_NAME: order-service # 예: order-service + DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_SSH_USER: ec2-user + PRIVATE_KEY: ${{ secrets.EC2_SSH_PRIVATE_KEY }} + TIMEZONE: Asia/Seoul + DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + PROJECT_PATH: /home/ec2-user/delivery-system/order-service # 예: /home/ec2-user/delivery-system/order-service + +jobs: + build-and-push: + runs-on: ubuntu-latest + environment: order-service + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ${{ env.SERVICE_NAME }}/gradlew + + - name: Build Spring Boot Application + working-directory: ${{ env.SERVICE_NAME }} + run: ./gradlew build + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_TOKEN }} + + - name: Build Docker Image + run: docker build -t ${{ env.DOCKER_IMAGE }} ./${{ env.SERVICE_NAME }} + + - name: Push Docker Image + run: docker push ${{ env.DOCKER_IMAGE }} + + deploy-to-ec2: + runs-on: ubuntu-latest + if: github.event_name == 'push' + needs: build-and-push + environment: order-service + + steps: + - name: Deploy to EC2 via SSH + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ env.EC2_HOST }} + username: ${{ env.EC2_SSH_USER }} + key: ${{ env.PRIVATE_KEY }} + script: | + cd ${{ env.PROJECT_PATH }} + sudo docker compose pull + sudo docker compose down + sudo docker compose up -d diff --git a/recruitment-service/.github/workflows/ci-cd-payment-service.yml b/recruitment-service/.github/workflows/ci-cd-payment-service.yml new file mode 100644 index 0000000..77e98a4 --- /dev/null +++ b/recruitment-service/.github/workflows/ci-cd-payment-service.yml @@ -0,0 +1,71 @@ +name: CI/CD for Spring Boot + MySQL with Docker Compose + +on: + push: + branches: [ "main", "payment-service/main" ] + pull_request: + branches: [ "main", "payment-service/main" ] + +env: + SERVICE_NAME: payment-service # 예: order-service + DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_SSH_USER: ec2-user + PRIVATE_KEY: ${{ secrets.EC2_SSH_PRIVATE_KEY }} + TIMEZONE: Asia/Seoul + DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + PROJECT_PATH: /home/ec2-user/delivery-system/payment-service # 예: /home/ec2-user/delivery-system/order-service + +jobs: + build-and-push: + runs-on: ubuntu-latest + environment: payment-service + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ${{ env.SERVICE_NAME }}/gradlew + + - name: Build Spring Boot Application + working-directory: ${{ env.SERVICE_NAME }} + run: ./gradlew build + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_TOKEN }} + + - name: Build Docker Image + run: docker build -t ${{ env.DOCKER_IMAGE }} ./${{ env.SERVICE_NAME }} + + - name: Push Docker Image + run: docker push ${{ env.DOCKER_IMAGE }} + + deploy-to-ec2: + runs-on: ubuntu-latest + if: github.event_name == 'push' + needs: build-and-push + environment: payment-service + + steps: + - name: Deploy to EC2 via SSH + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ env.EC2_HOST }} + username: ${{ env.EC2_SSH_USER }} + key: ${{ env.PRIVATE_KEY }} + script: | + cd ${{ env.PROJECT_PATH }} + sudo docker compose pull + sudo docker compose down + sudo docker compose up -d diff --git a/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml b/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml new file mode 100644 index 0000000..2e77bc6 --- /dev/null +++ b/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml @@ -0,0 +1,71 @@ +name: CI/CD for Spring Boot + MySQL with Docker Compose + +on: + push: + branches: [ "main", "recruitment-service/main" ] + pull_request: + branches: [ "main", "recruitment-service/main" ] + +env: + SERVICE_NAME: recruitment-service # 예: order-service + DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_SSH_USER: ec2-user + PRIVATE_KEY: ${{ secrets.EC2_SSH_PRIVATE_KEY }} + TIMEZONE: Asia/Seoul + DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + PROJECT_PATH: /home/ec2-user/delivery-system/recruitment-service # 예: /home/ec2-user/delivery-system/order-service + +jobs: + build-and-push: + runs-on: ubuntu-latest + environment: recruitment-service + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ${{ env.SERVICE_NAME }}/gradlew + + - name: Build Spring Boot Application + working-directory: ${{ env.SERVICE_NAME }} + run: ./gradlew build + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_TOKEN }} + + - name: Build Docker Image + run: docker build -t ${{ env.DOCKER_IMAGE }} ./${{ env.SERVICE_NAME }} + + - name: Push Docker Image + run: docker push ${{ env.DOCKER_IMAGE }} + + deploy-to-ec2: + runs-on: ubuntu-latest + if: github.event_name == 'push' + needs: build-and-push + environment: recruitment-service + + steps: + - name: Deploy to EC2 via SSH + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ env.EC2_HOST }} + username: ${{ env.EC2_SSH_USER }} + key: ${{ env.PRIVATE_KEY }} + script: | + cd ${{ env.PROJECT_PATH }} + sudo docker compose pull + sudo docker compose down + sudo docker compose up -d diff --git a/recruitment-service/.github/workflows/ci-cd-store-service.yml b/recruitment-service/.github/workflows/ci-cd-store-service.yml new file mode 100644 index 0000000..2c192b9 --- /dev/null +++ b/recruitment-service/.github/workflows/ci-cd-store-service.yml @@ -0,0 +1,71 @@ +name: CI/CD for Spring Boot + MySQL with Docker Compose + +on: + push: + branches: [ "main", "store-service/main" ] + pull_request: + branches: [ "main", "store-service/main" ] + +env: + SERVICE_NAME: store-service # 예: order-service + DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_SSH_USER: ec2-user + PRIVATE_KEY: ${{ secrets.EC2_SSH_PRIVATE_KEY }} + TIMEZONE: Asia/Seoul + DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + PROJECT_PATH: /home/ec2-user/delivery-system/store-service # 예: /home/ec2-user/delivery-system/order-service + +jobs: + build-and-push: + runs-on: ubuntu-latest + environment: store-service + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ${{ env.SERVICE_NAME }}/gradlew + + - name: Build Spring Boot Application + working-directory: ${{ env.SERVICE_NAME }} + run: ./gradlew build + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_TOKEN }} + + - name: Build Docker Image + run: docker build -t ${{ env.DOCKER_IMAGE }} ./${{ env.SERVICE_NAME }} + + - name: Push Docker Image + run: docker push ${{ env.DOCKER_IMAGE }} + + deploy-to-ec2: + runs-on: ubuntu-latest + if: github.event_name == 'push' + needs: build-and-push + environment: store-service + + steps: + - name: Deploy to EC2 via SSH + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ env.EC2_HOST }} + username: ${{ env.EC2_SSH_USER }} + key: ${{ env.PRIVATE_KEY }} + script: | + cd ${{ env.PROJECT_PATH }} + sudo docker compose pull + sudo docker compose down + sudo docker compose up -d diff --git a/recruitment-service/.github/workflows/ci-cd-user-service.yml b/recruitment-service/.github/workflows/ci-cd-user-service.yml new file mode 100644 index 0000000..48c2839 --- /dev/null +++ b/recruitment-service/.github/workflows/ci-cd-user-service.yml @@ -0,0 +1,71 @@ +name: CI/CD for Spring Boot + MySQL with Docker Compose + +on: + push: + branches: [ "main", "user-service/main" ] + pull_request: + branches: [ "main", "user-service/main" ] + +env: + SERVICE_NAME: user-service # 예: order-service + DOCKER_IMAGE: ${{ secrets.DOCKERHUB_USERNAME }}/${{ vars.DOCKER_IMAGE_NAME }}:latest + EC2_HOST: ${{ secrets.EC2_HOST }} + EC2_SSH_USER: ec2-user + PRIVATE_KEY: ${{ secrets.EC2_SSH_PRIVATE_KEY }} + TIMEZONE: Asia/Seoul + DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} + DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} + PROJECT_PATH: /home/ec2-user/delivery-system/user-service # 예: /home/ec2-user/delivery-system/order-service + +jobs: + build-and-push: + runs-on: ubuntu-latest + environment: user-service + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 21 + uses: actions/setup-java@v4 + with: + java-version: '21' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ${{ env.SERVICE_NAME }}/gradlew + + - name: Build Spring Boot Application + working-directory: ${{ env.SERVICE_NAME }} + run: ./gradlew build + + - name: Log in to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKER_USERNAME }} + password: ${{ env.DOCKER_TOKEN }} + + - name: Build Docker Image + run: docker build -t ${{ env.DOCKER_IMAGE }} ./${{ env.SERVICE_NAME }} + + - name: Push Docker Image + run: docker push ${{ env.DOCKER_IMAGE }} + + deploy-to-ec2: + runs-on: ubuntu-latest + if: github.event_name == 'push' + needs: build-and-push + environment: user-service + + steps: + - name: Deploy to EC2 via SSH + uses: appleboy/ssh-action@v0.1.6 + with: + host: ${{ env.EC2_HOST }} + username: ${{ env.EC2_SSH_USER }} + key: ${{ env.PRIVATE_KEY }} + script: | + cd ${{ env.PROJECT_PATH }} + sudo docker compose pull + sudo docker compose down + sudo docker compose up -d diff --git a/recruitment-service/.gitignore b/recruitment-service/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/recruitment-service/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/recruitment-service/build.gradle b/recruitment-service/build.gradle new file mode 100644 index 0000000..15a5b89 --- /dev/null +++ b/recruitment-service/build.gradle @@ -0,0 +1,39 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.5' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/recruitment-service/gradle/wrapper/gradle-wrapper.jar b/recruitment-service/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..9bbc975c742b298b441bfb90dbc124400a3751b9 GIT binary patch literal 43705 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 DHx0+F literal 0 HcmV?d00001 diff --git a/recruitment-service/gradle/wrapper/gradle-wrapper.properties b/recruitment-service/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..37f853b --- /dev/null +++ b/recruitment-service/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/recruitment-service/gradlew b/recruitment-service/gradlew new file mode 100644 index 0000000..faf9300 --- /dev/null +++ b/recruitment-service/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/recruitment-service/gradlew.bat b/recruitment-service/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/recruitment-service/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/recruitment-service/settings.gradle b/recruitment-service/settings.gradle new file mode 100644 index 0000000..ea4147d --- /dev/null +++ b/recruitment-service/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'recruitment' diff --git a/recruitment-service/src/main/java/com/example/recruitment/RecruitmentApplication.java b/recruitment-service/src/main/java/com/example/recruitment/RecruitmentApplication.java new file mode 100644 index 0000000..88d3cf6 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/RecruitmentApplication.java @@ -0,0 +1,13 @@ +package com.example.recruitment; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class RecruitmentApplication { + + public static void main(String[] args) { + SpringApplication.run(RecruitmentApplication.class, args); + } + +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/RecruitmentControllerTest.java b/recruitment-service/src/main/java/com/example/recruitment/RecruitmentControllerTest.java new file mode 100644 index 0000000..4ec5f43 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/RecruitmentControllerTest.java @@ -0,0 +1,13 @@ +package com.example.recruitment; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class RecruitmentControllerTest { + + @GetMapping("/") + public String hello() { + return "서버 정상 작동 중!"; + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java new file mode 100644 index 0000000..39caaeb --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java @@ -0,0 +1,210 @@ +package com.example.recruitment.controller; + +import com.example.recruitment.dto.RecruitmentDetailDto; +import com.example.recruitment.dto.RecruitmentRequestDto; +import com.example.recruitment.entity.Recruitment; +import com.example.recruitment.entity.RecruitmentParticipant; +import com.example.recruitment.entity.Store; +import com.example.recruitment.entity.User; +import com.example.recruitment.repository.RecruitmentParticipantRepository; +import com.example.recruitment.repository.RecruitmentRepository; +import com.example.recruitment.repository.StoreRepository; +import com.example.recruitment.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.time.LocalDateTime; +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/recruitments") +public class RecruitmentController { + + private final RecruitmentRepository recruitmentRepository; + private final UserRepository userRepository; + private final StoreRepository storeRepository; + private final RecruitmentParticipantRepository participantRepository; + + // 모집글 생성 + @PostMapping + public Recruitment createRecruitment(@RequestBody RecruitmentRequestDto dto) { + User user = userRepository.findById(dto.getUserId()).orElseThrow(); + Store store = storeRepository.findById(dto.getStoreId()).orElseThrow(); + + Recruitment recruitment = new Recruitment(); + recruitment.setUser(user); + recruitment.setStore(store); + recruitment.setTitle(dto.getTitle()); + recruitment.setDescription(dto.getDescription()); + recruitment.setDeadlineTime(dto.getDeadlineTime()); + recruitment.setStatus("RECRUITING"); + + return recruitmentRepository.save(recruitment); + } + + // 모집글 전체 조회 + @GetMapping + public List getAll() { + return recruitmentRepository.findAll(); + } + + // 상태별 조회 (ex. /api/recruitments?status=RECRUITING) + @GetMapping(params = "status") + public List getByStatus(@RequestParam String status) { + return recruitmentRepository.findByStatus(status); + } + + @GetMapping("/{recruitmentId}") +public ResponseEntity getRecruitmentDetail(@PathVariable Long recruitmentId) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + + // 참여자 목록 조회 + List participantEntities = + participantRepository.findByRecruitmentId(recruitmentId); + + List participants = participantEntities.stream() + .map(RecruitmentParticipant::getUser) + .toList(); + + // DTO 구성 + RecruitmentDetailDto dto = new RecruitmentDetailDto(); + dto.setId(recruitment.getId()); + dto.setTitle(recruitment.getTitle()); + dto.setDescription(recruitment.getDescription()); + dto.setStatus(recruitment.getStatus()); + dto.setDeadlineTime(recruitment.getDeadlineTime()); + dto.setUser(recruitment.getUser()); + dto.setStore(recruitment.getStore()); + dto.setParticipants(participants); + + return ResponseEntity.ok(dto); +} + + @GetMapping("/user/{userId}/created-recruitments") +public List getRecruitmentsCreatedByUser(@PathVariable Long userId) { + return recruitmentRepository.findByUserId(userId); +} + +// 특정 유저가 참여한 모집글 조회 + @GetMapping("/user/{userId}/joined-recruitments") +public List getRecruitmentsJoinedByUser(@PathVariable Long userId) { + List participantList = participantRepository.findByUserId(userId); + return participantList.stream() + .map(RecruitmentParticipant::getRecruitment) + .toList(); +} + + + + + // 모집글 참여 + @PostMapping("/{recruitmentId}/join") + public ResponseEntity joinRecruitment(@PathVariable Long recruitmentId, @RequestParam Long userId) { + User user = userRepository.findById(userId).orElseThrow(); + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + + boolean alreadyJoined = participantRepository + .findByUserIdAndRecruitmentId(userId, recruitmentId) + .isPresent(); + + if (alreadyJoined) { + return ResponseEntity.badRequest().body("이미 참여한 모집입니다."); + } + + RecruitmentParticipant participant = new RecruitmentParticipant(); + participant.setUser(user); + participant.setRecruitment(recruitment); + participant.setJoinedAt(LocalDateTime.now()); + + participantRepository.save(participant); + return ResponseEntity.ok("모집글 참여 완료"); + } + + // 모집 상태 업데이트 (CONFIRMED 또는 FAILED) + @PatchMapping("/{recruitmentId}/status") + public ResponseEntity updateRecruitmentStatus(@PathVariable Long recruitmentId) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + LocalDateTime now = LocalDateTime.now(); + + long participantCount = participantRepository.countByRecruitmentId(recruitmentId); + + if (now.isAfter(recruitment.getDeadlineTime())) { + if (participantCount >= 3) { + recruitment.setStatus("CONFIRMED"); + } else { + recruitment.setStatus("FAILED"); + } + recruitmentRepository.save(recruitment); + return ResponseEntity.ok("상태가 " + recruitment.getStatus() + "로 변경되었습니다."); + } else { + return ResponseEntity.ok("아직 마감 시간이 지나지 않았습니다."); + } + } + + // 주문 수락 상태로 변경 (ACCEPTED) + @PatchMapping("/{recruitmentId}/accept") + public ResponseEntity acceptRecruitment(@PathVariable Long recruitmentId) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + + if (!"CONFIRMED".equals(recruitment.getStatus())) { + return ResponseEntity.badRequest().body("주문 수락은 CONFIRMED 상태에서만 가능합니다."); + } + + recruitment.setStatus("ACCEPTED"); + recruitmentRepository.save(recruitment); + + return ResponseEntity.ok("상태가 ACCEPTED로 변경되었습니다."); + } + + // 배달 완료 상태로 변경 (DELIVERED) + @PatchMapping("/{recruitmentId}/deliver") + public ResponseEntity completeDelivery(@PathVariable Long recruitmentId) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + + if (!"ACCEPTED".equals(recruitment.getStatus())) { + return ResponseEntity.badRequest().body("배달 완료는 ACCEPTED 상태에서만 가능합니다."); + } + + recruitment.setStatus("DELIVERED"); + recruitmentRepository.save(recruitment); + + return ResponseEntity.ok("상태가 DELIVERED로 변경되었습니다."); + } +// 모집글 삭제 + @DeleteMapping("/{recruitmentId}") +public ResponseEntity deleteRecruitment(@PathVariable Long recruitmentId) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + + recruitmentRepository.delete(recruitment); + return ResponseEntity.ok("모집글이 삭제되었습니다."); +} + +// 모집글 수정 +@PutMapping("/{recruitmentId}") +public ResponseEntity updateRecruitment(@PathVariable Long recruitmentId, + @RequestBody RecruitmentRequestDto dto) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + + // (선택) 본인 작성한 글인지 확인 + if (!recruitment.getUser().getId().equals(dto.getUserId())) { + return ResponseEntity.status(403).body("작성자만 수정할 수 있습니다."); + } + + // 수정할 항목들 업데이트 + recruitment.setTitle(dto.getTitle()); + recruitment.setDescription(dto.getDescription()); + recruitment.setDeadlineTime(dto.getDeadlineTime()); + + // (선택) 가게 변경도 허용 + if (dto.getStoreId() != null) { + Store store = storeRepository.findById(dto.getStoreId()).orElseThrow(); + recruitment.setStore(store); + } + + recruitmentRepository.save(recruitment); + return ResponseEntity.ok("모집글이 수정되었습니다."); +} + +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java new file mode 100644 index 0000000..8c2fcb8 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java @@ -0,0 +1,26 @@ +package com.example.recruitment.controller; + +import com.example.recruitment.entity.Store; +import com.example.recruitment.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/stores") +public class StoreController { + + private final StoreRepository storeRepository; + + @PostMapping + public Store createStore(@RequestBody Store store) { + return storeRepository.save(store); + } + + @GetMapping + public List getAllStores() { + return storeRepository.findAll(); + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java new file mode 100644 index 0000000..39c8f66 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java @@ -0,0 +1,26 @@ +package com.example.recruitment.controller; + +import com.example.recruitment.entity.User; +import com.example.recruitment.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/users") +public class UserController { + + private final UserRepository userRepository; + + @PostMapping + public User createUser(@RequestBody User user) { + return userRepository.save(user); + } + + @GetMapping + public List getAllUsers() { + return userRepository.findAll(); + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentDetailDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentDetailDto.java new file mode 100644 index 0000000..258a3d3 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentDetailDto.java @@ -0,0 +1,21 @@ +package com.example.recruitment.dto; + +import com.example.recruitment.entity.Store; +import com.example.recruitment.entity.User; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDateTime; +import java.util.List; + +@Getter @Setter +public class RecruitmentDetailDto { + private Long id; + private String title; + private String description; + private String status; + private LocalDateTime deadlineTime; + private User user; + private Store store; + private List participants; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java new file mode 100644 index 0000000..cc10358 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java @@ -0,0 +1,15 @@ +package com.example.recruitment.dto; + +import java.time.LocalDateTime; + +import lombok.Getter; +import lombok.Setter; + +@Getter @Setter +public class RecruitmentRequestDto { + private Long userId; + private Long storeId; + private String title; + private String description; + private LocalDateTime deadlineTime; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java b/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java new file mode 100644 index 0000000..3bf93ef --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java @@ -0,0 +1,32 @@ +package com.example.recruitment.entity; + +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDateTime; +import java.util.List; + +@Entity +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +public class Recruitment { + + @Id @GeneratedValue + private Long id; + + @ManyToOne + private User user; + + @ManyToOne + private Store store; + + @OneToMany(mappedBy = "recruitment", cascade = CascadeType.ALL, orphanRemoval = true) + private List participants; + + + private String title; + private String description; + private String status; // RECRUITING, CONFIRMED 등 + private LocalDateTime deadlineTime; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java b/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java new file mode 100644 index 0000000..36be138 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java @@ -0,0 +1,30 @@ +package com.example.recruitment.entity; + +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDateTime; + +@Entity +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +public class RecruitmentParticipant { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + + @ManyToOne + @JoinColumn(name = "user_id", nullable = false) + private User user; + + @ManyToOne + @JoinColumn(name = "recruitment_id", nullable = false) + private Recruitment recruitment; + + @Column(name = "joined_at", nullable = false) + private LocalDateTime joinedAt; +} + diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/Store.java b/recruitment-service/src/main/java/com/example/recruitment/entity/Store.java new file mode 100644 index 0000000..0764630 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/Store.java @@ -0,0 +1,18 @@ +package com.example.recruitment.entity; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +public class Store { + + @Id @GeneratedValue + private Long id; + + private String name; + private String category; + private String location; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/User.java b/recruitment-service/src/main/java/com/example/recruitment/entity/User.java new file mode 100644 index 0000000..b04e733 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/User.java @@ -0,0 +1,17 @@ +package com.example.recruitment.entity; + +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +public class User { + + @Id @GeneratedValue + private Long id; + + private String name; + private String email; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java new file mode 100644 index 0000000..f468437 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java @@ -0,0 +1,21 @@ +package com.example.recruitment.repository; + +import com.example.recruitment.entity.RecruitmentParticipant; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface RecruitmentParticipantRepository extends JpaRepository { + // 특정 유저가 특정 모집글에 이미 참여했는지 확인 + Optional findByUserIdAndRecruitmentId(Long userId, Long recruitmentId); + + // 특정 모집글에 참여한 인원 수 카운트 + long countByRecruitmentId(Long recruitmentId); + + List findByRecruitmentId(Long recruitmentId); + List findByUserId(Long userId); + + + +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentRepository.java new file mode 100644 index 0000000..e26be0d --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentRepository.java @@ -0,0 +1,14 @@ +package com.example.recruitment.repository; + +import com.example.recruitment.entity.Recruitment; + +import java.util.List; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RecruitmentRepository extends JpaRepository { + List findByStatus(String status); + List findByUserId(Long userId); + + +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/StoreRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/StoreRepository.java new file mode 100644 index 0000000..3fd1e99 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.example.recruitment.repository; + +import com.example.recruitment.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/UserRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/UserRepository.java new file mode 100644 index 0000000..f25ccd9 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/repository/UserRepository.java @@ -0,0 +1,7 @@ +package com.example.recruitment.repository; + +import com.example.recruitment.entity.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { +} diff --git a/recruitment-service/src/main/resources/application.properties b/recruitment-service/src/main/resources/application.properties new file mode 100644 index 0000000..68e1557 --- /dev/null +++ b/recruitment-service/src/main/resources/application.properties @@ -0,0 +1,9 @@ +spring.application.name=recruitment +spring.datasource.url=jdbc:mysql://localhost:3306/recruitment_db?serverTimezone=Asia/Seoul +spring.datasource.username=root +spring.datasource.password=040320 +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver + +spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.properties.hibernate.format_sql=true diff --git a/recruitment-service/src/test/java/com/example/recruitment/RecruitmentApplicationTests.java b/recruitment-service/src/test/java/com/example/recruitment/RecruitmentApplicationTests.java new file mode 100644 index 0000000..de54f7d --- /dev/null +++ b/recruitment-service/src/test/java/com/example/recruitment/RecruitmentApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.recruitment; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class RecruitmentApplicationTests { + + @Test + void contextLoads() { + } + +} From 2ce1c715df05bef762e099e17cd20bf5266ee729 Mon Sep 17 00:00:00 2001 From: kmj02dev Date: Thu, 22 May 2025 14:11:29 +0900 Subject: [PATCH 3/8] Update ci-cd-recruitment-service.yml --- .../.github/workflows/ci-cd-recruitment-service.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml b/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml index 2e77bc6..c457072 100644 --- a/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml +++ b/recruitment-service/.github/workflows/ci-cd-recruitment-service.yml @@ -15,7 +15,8 @@ env: TIMEZONE: Asia/Seoul DOCKER_USERNAME: ${{ secrets.DOCKERHUB_USERNAME }} DOCKER_TOKEN: ${{ secrets.DOCKERHUB_TOKEN }} - PROJECT_PATH: /home/ec2-user/delivery-system/recruitment-service # 예: /home/ec2-user/delivery-system/order-service + PROJECT_PATH: /home/kmj02dev/delivery-system/recruitment-service # 예: /home/ec2-user/delivery-system/order-service + APPLICATION: ${{ secrets.APPLICATION }} jobs: build-and-push: @@ -31,7 +32,12 @@ jobs: with: java-version: '21' distribution: 'temurin' - + + - name: Set up application.properties + run : | + mkdir -p "${{ env.SERVICE_NAME }}"/src/main/resources + echo "${{ env.APPLICATION }}" > "${{ env.SERVICE_NAME }}/src/main/resources/application.properties" + - name: Grant execute permission for gradlew run: chmod +x ${{ env.SERVICE_NAME }}/gradlew From 1b33836d07cd5176a368183f3499d274b010bc02 Mon Sep 17 00:00:00 2001 From: kimdongeun Date: Thu, 22 May 2025 14:21:27 +0900 Subject: [PATCH 4/8] =?UTF-8?q?chore:=20=EC=A2=85=EC=86=8D=EC=84=B1=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- recruitment-service/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/recruitment-service/build.gradle b/recruitment-service/build.gradle index 15a5b89..5173eb9 100644 --- a/recruitment-service/build.gradle +++ b/recruitment-service/build.gradle @@ -24,6 +24,7 @@ repositories { } dependencies { + testImplementation 'com.h2database:h2' implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' compileOnly 'org.projectlombok:lombok' From afef84f87001179f5b19f98f21bfa6c745708513 Mon Sep 17 00:00:00 2001 From: kimdongeun Date: Fri, 23 May 2025 15:59:30 +0900 Subject: [PATCH 5/8] =?UTF-8?q?feat:=20=EA=B3=B5=ED=86=B5=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EA=B5=AC=EC=A1=B0(ApiResponse)=20=EB=B0=8F=20?= =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EC=9D=BC=EA=B4=80?= =?UTF-8?q?=ED=99=94=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- recruitment-service/build.gradle | 1 + recruitment-service/gradlew | 2 +- .../recruitment/common/ApiResponse.java | 32 ++++++++++++ .../recruitment/common/FieldErrorDetail.java | 11 +++++ .../controller/RecruitmentController.java | 6 ++- .../controller/StoreController.java | 4 +- .../controller/UserController.java | 4 +- .../dto/RecruitmentRequestDto.java | 36 ++++++++++++++ .../exception/CustomException.java | 17 +++++++ .../recruitment/exception/ErrorCode.java | 18 +++++++ .../exception/GlobalExceptionHandler.java | 49 +++++++++++++++++++ 11 files changed, 175 insertions(+), 5 deletions(-) create mode 100644 recruitment-service/src/main/java/com/example/recruitment/common/ApiResponse.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/common/FieldErrorDetail.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/exception/CustomException.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/exception/ErrorCode.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java diff --git a/recruitment-service/build.gradle b/recruitment-service/build.gradle index 5173eb9..fc713c2 100644 --- a/recruitment-service/build.gradle +++ b/recruitment-service/build.gradle @@ -27,6 +27,7 @@ dependencies { testImplementation 'com.h2database:h2' 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' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.mysql:mysql-connector-j' diff --git a/recruitment-service/gradlew b/recruitment-service/gradlew index faf9300..58fb3e1 100644 --- a/recruitment-service/gradlew +++ b/recruitment-service/gradlew @@ -179,7 +179,7 @@ if "$cygwin" || "$msys" ; then # Now convert the arguments - kludge to limit ourselves to /bin/sh for arg do if - case $arg in #( + case $arg in #( -*) false ;; # don't mess with options #( /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath [ -e "$t" ] ;; #( diff --git a/recruitment-service/src/main/java/com/example/recruitment/common/ApiResponse.java b/recruitment-service/src/main/java/com/example/recruitment/common/ApiResponse.java new file mode 100644 index 0000000..e4938a4 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/common/ApiResponse.java @@ -0,0 +1,32 @@ +package com.example.recruitment.common; + +import com.fasterxml.jackson.annotation.JsonIgnore; +import org.springframework.http.HttpStatus; + +import java.util.List; + +public record ApiResponse( + @JsonIgnore HttpStatus httpStatus, + boolean isSuccess, + int code, + String message, + T data, + List errors +) { + public static ApiResponse ok(T data, String message) { + return new ApiResponse<>(HttpStatus.OK, true, 1000, message, data, null); + } + + public static ApiResponse created(T data, String message) { + return new ApiResponse<>(HttpStatus.CREATED, true, 1001, message, data, null); + } + + public static ApiResponse fail(int code, String message, HttpStatus status) { + return new ApiResponse<>(status, false, code, message, null, null); + } + + public static ApiResponse validationFail(List errors) { + return new ApiResponse<>(HttpStatus.BAD_REQUEST, false, 2001, "입력 값 유효성 검사 실패", null, errors); + } +} + diff --git a/recruitment-service/src/main/java/com/example/recruitment/common/FieldErrorDetail.java b/recruitment-service/src/main/java/com/example/recruitment/common/FieldErrorDetail.java new file mode 100644 index 0000000..cbc295d --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/common/FieldErrorDetail.java @@ -0,0 +1,11 @@ +package com.example.recruitment.common; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public class FieldErrorDetail { + private String field; + private String reason; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java index 39caaeb..f595bc3 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java @@ -10,6 +10,8 @@ import com.example.recruitment.repository.RecruitmentRepository; import com.example.recruitment.repository.StoreRepository; import com.example.recruitment.repository.UserRepository; + +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -29,7 +31,7 @@ public class RecruitmentController { // 모집글 생성 @PostMapping - public Recruitment createRecruitment(@RequestBody RecruitmentRequestDto dto) { + public Recruitment createRecruitment(@Valid @RequestBody RecruitmentRequestDto dto) { User user = userRepository.findById(dto.getUserId()).orElseThrow(); Store store = storeRepository.findById(dto.getStoreId()).orElseThrow(); @@ -184,7 +186,7 @@ public ResponseEntity deleteRecruitment(@PathVariable Long recruitmentId) { // 모집글 수정 @PutMapping("/{recruitmentId}") public ResponseEntity updateRecruitment(@PathVariable Long recruitmentId, - @RequestBody RecruitmentRequestDto dto) { + @Valid @RequestBody RecruitmentRequestDto dto) { Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); // (선택) 본인 작성한 글인지 확인 diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java index 8c2fcb8..64f35a4 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/StoreController.java @@ -2,6 +2,8 @@ import com.example.recruitment.entity.Store; import com.example.recruitment.repository.StoreRepository; + +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -15,7 +17,7 @@ public class StoreController { private final StoreRepository storeRepository; @PostMapping - public Store createStore(@RequestBody Store store) { + public Store createStore(@Valid @RequestBody Store store) { return storeRepository.save(store); } diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java index 39c8f66..f34c042 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/UserController.java @@ -2,6 +2,8 @@ import com.example.recruitment.entity.User; import com.example.recruitment.repository.UserRepository; + +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; @@ -15,7 +17,7 @@ public class UserController { private final UserRepository userRepository; @PostMapping - public User createUser(@RequestBody User user) { + public User createUser(@Valid @RequestBody User user) { return userRepository.save(user); } diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java index cc10358..d2e5f2e 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java @@ -1,5 +1,40 @@ package com.example.recruitment.dto; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +import java.time.LocalDateTime; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class RecruitmentRequestDto { + + @NotNull(message = "userId는 필수입니다.") + private Long userId; + + @NotNull(message = "storeId는 필수입니다.") + private Long storeId; + + @NotBlank(message = "제목은 비어 있을 수 없습니다.") + private String title; + + @Size(min = 10, message = "설명은 최소 10자 이상이어야 합니다.") + private String description; + + @NotNull(message = "마감 시간은 필수입니다.") + private LocalDateTime deadlineTime; +} + + + +//원래 dto 코드 +/* + * package com.example.recruitment.dto; + import java.time.LocalDateTime; import lombok.Getter; @@ -13,3 +48,4 @@ public class RecruitmentRequestDto { private String description; private LocalDateTime deadlineTime; } + */ diff --git a/recruitment-service/src/main/java/com/example/recruitment/exception/CustomException.java b/recruitment-service/src/main/java/com/example/recruitment/exception/CustomException.java new file mode 100644 index 0000000..da26b09 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/exception/CustomException.java @@ -0,0 +1,17 @@ +package com.example.recruitment.exception; + +import lombok.Getter; + +@Getter +public class CustomException extends RuntimeException { + private final ErrorCode errorCode; + + public CustomException(ErrorCode errorCode) { + this.errorCode = errorCode; + } + + @Override + public String getMessage() { + return errorCode.getMessage(); + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/exception/ErrorCode.java b/recruitment-service/src/main/java/com/example/recruitment/exception/ErrorCode.java new file mode 100644 index 0000000..a88f6f7 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/exception/ErrorCode.java @@ -0,0 +1,18 @@ +package com.example.recruitment.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ErrorCode { + BAD_REQUEST(2000, HttpStatus.BAD_REQUEST, "잘못된 요청입니다."), + NOT_FOUND(2007, HttpStatus.NOT_FOUND, "리소스를 찾을 수 없습니다."), + FORBIDDEN(2006, HttpStatus.FORBIDDEN, "권한이 없습니다."), + INTERNAL_ERROR(3000, HttpStatus.INTERNAL_SERVER_ERROR, "서버 내부 오류입니다."); + + private final int code; + private final HttpStatus status; + private final String message; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java b/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..2b29798 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java @@ -0,0 +1,49 @@ +package com.example.recruitment.exception; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import com.example.recruitment.common.ApiResponse; +import com.example.recruitment.common.FieldErrorDetail; + +import java.util.List; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(CustomException.class) + public ResponseEntity> handleCustomException(CustomException e) { + ErrorCode ec = e.getErrorCode(); + return ResponseEntity + .status(ec.getStatus()) + .body(ApiResponse.fail(ec.getCode(), ec.getMessage(), ec.getStatus())); + } + + //유효성 검사 실패 + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity> handleValidationException(MethodArgumentNotValidException e) { + List errorList = e.getBindingResult().getFieldErrors() + .stream() + .map(error -> new FieldErrorDetail(error.getField(), error.getDefaultMessage())) + .toList(); + + return ResponseEntity + .badRequest() + .body(ApiResponse.validationFail(errorList)); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity> handleGeneralException(Exception e) { + return ResponseEntity + .status(ErrorCode.INTERNAL_ERROR.getStatus()) + .body(ApiResponse.fail( + ErrorCode.INTERNAL_ERROR.getCode(), + ErrorCode.INTERNAL_ERROR.getMessage(), + ErrorCode.INTERNAL_ERROR.getStatus() + )); + } +} + + From d20dc23c8dd7b6da658fb313d640b86959797c40 Mon Sep 17 00:00:00 2001 From: kimdongeun Date: Fri, 30 May 2025 23:09:01 +0900 Subject: [PATCH 6/8] =?UTF-8?q?feat:=20Swagger=20UI=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20=EB=B0=8F=20recruitment=20API=20=EB=AC=B8=EC=84=9C=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- recruitment-service/build.gradle | 5 ++-- .../controller/SwaggerTestController.java | 14 +++++++++ .../dto/RecruitmentRequestDto.java | 22 ++------------ .../example/recruitment/entity/MenuItem.java | 14 +++++++++ .../com/example/recruitment/entity/Order.java | 29 +++++++++++++++++++ .../recruitment/entity/Recruitment.java | 7 ++++- .../exception/GlobalExceptionHandler.java | 21 +++++++++----- .../repository/OrderRepository.java | 7 +++++ .../service/RecruitmentService.java | 0 9 files changed, 89 insertions(+), 30 deletions(-) create mode 100644 recruitment-service/src/main/java/com/example/recruitment/controller/SwaggerTestController.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/Order.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java diff --git a/recruitment-service/build.gradle b/recruitment-service/build.gradle index fc713c2..176a78b 100644 --- a/recruitment-service/build.gradle +++ b/recruitment-service/build.gradle @@ -1,7 +1,7 @@ plugins { id 'java' - id 'org.springframework.boot' version '3.4.5' - id 'io.spring.dependency-management' version '1.1.7' + id 'org.springframework.boot' version '3.1.5' + id 'io.spring.dependency-management' version '1.1.3' } group = 'com.example' @@ -28,6 +28,7 @@ dependencies { 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' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' compileOnly 'org.projectlombok:lombok' developmentOnly 'org.springframework.boot:spring-boot-devtools' runtimeOnly 'com.mysql:mysql-connector-j' diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/SwaggerTestController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/SwaggerTestController.java new file mode 100644 index 0000000..ec9233a --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/SwaggerTestController.java @@ -0,0 +1,14 @@ +package com.example.recruitment.controller; + +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/swagger-test") +public class SwaggerTestController { + @GetMapping + public String test() { + return "Swagger works!"; + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java index d2e5f2e..036e21d 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java @@ -27,25 +27,7 @@ public class RecruitmentRequestDto { @NotNull(message = "마감 시간은 필수입니다.") private LocalDateTime deadlineTime; -} - - - -//원래 dto 코드 -/* - * package com.example.recruitment.dto; -import java.time.LocalDateTime; - -import lombok.Getter; -import lombok.Setter; - -@Getter @Setter -public class RecruitmentRequestDto { - private Long userId; - private Long storeId; - private String title; - private String description; - private LocalDateTime deadlineTime; + @NotBlank(message = "카테고리는 비어 있을 수 없습니다.") + private String category; } - */ diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java b/recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java new file mode 100644 index 0000000..44fdf94 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java @@ -0,0 +1,14 @@ +package com.example.recruitment.entity; + +import jakarta.persistence.Embeddable; +import lombok.*; + +@Embeddable +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +public class MenuItem { + + private String name; + private int price; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/Order.java b/recruitment-service/src/main/java/com/example/recruitment/entity/Order.java new file mode 100644 index 0000000..446f71f --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/Order.java @@ -0,0 +1,29 @@ +package com.example.recruitment.entity; + +import jakarta.persistence.*; +import lombok.*; + +import java.util.List; + +@Entity +@Table(name = "orders") +@Getter @Setter +@NoArgsConstructor +@AllArgsConstructor +public class Order { + + @Id @GeneratedValue + private Long id; + + @ManyToOne + private Recruitment recruitment; // 어떤 모집글에 대한 주문인지 + + @ManyToOne + private User user; // 누가 주문했는지 + + @ElementCollection + @CollectionTable(name = "order_menu_items", joinColumns = @JoinColumn(name = "order_id")) + private List menuItems; // 메뉴 리스트 (내장 객체로 구성) + + private int totalPrice; // 총 가격 +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java b/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java index 3bf93ef..65a5b6c 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java @@ -24,9 +24,14 @@ public class Recruitment { @OneToMany(mappedBy = "recruitment", cascade = CascadeType.ALL, orphanRemoval = true) private List participants; - private String title; private String description; + private String status; // RECRUITING, CONFIRMED 등 + private LocalDateTime deadlineTime; + + //카테고리 추가가 + @Column(nullable = false) + private String category; } diff --git a/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java b/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java index 2b29798..3bdab04 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java +++ b/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java @@ -1,13 +1,13 @@ package com.example.recruitment.exception; +import com.example.recruitment.common.ApiResponse; +import com.example.recruitment.common.FieldErrorDetail; +import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -import com.example.recruitment.common.ApiResponse; -import com.example.recruitment.common.FieldErrorDetail; - import java.util.List; @RestControllerAdvice @@ -21,7 +21,7 @@ public ResponseEntity> handleCustomException(CustomException .body(ApiResponse.fail(ec.getCode(), ec.getMessage(), ec.getStatus())); } - //유효성 검사 실패 + // 유효성 검사 실패 @ExceptionHandler(MethodArgumentNotValidException.class) public ResponseEntity> handleValidationException(MethodArgumentNotValidException e) { List errorList = e.getBindingResult().getFieldErrors() @@ -34,8 +34,17 @@ public ResponseEntity> handleValidationException(MethodArgum .body(ApiResponse.validationFail(errorList)); } + // 그 외 모든 예외 처리 @ExceptionHandler(Exception.class) - public ResponseEntity> handleGeneralException(Exception e) { + public ResponseEntity> handleGeneralException(Exception e, HttpServletRequest request) throws Exception { + String path = request.getRequestURI(); + + if (path != null && (path.contains("/v3/api-docs") || path.contains("/swagger"))) { + throw e; // Swagger 요청은 예외 처리하지 않고 Spring에게 맡김 +} + + + return ResponseEntity .status(ErrorCode.INTERNAL_ERROR.getStatus()) .body(ApiResponse.fail( @@ -45,5 +54,3 @@ public ResponseEntity> handleGeneralException(Exception e) { )); } } - - diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java new file mode 100644 index 0000000..0cd236e --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java @@ -0,0 +1,7 @@ +package com.example.recruitment.repository; + +import com.example.recruitment.entity.Order; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface OrderRepository extends JpaRepository { +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java b/recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java new file mode 100644 index 0000000..e69de29 From 523526438e80d34da033f1a2fd223be3aca01111 Mon Sep 17 00:00:00 2001 From: kimdongeun Date: Sat, 31 May 2025 01:35:54 +0900 Subject: [PATCH 7/8] =?UTF-8?q?feat:=20=EB=AA=A8=EC=A7=91=EA=B8=80=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=8F=20=EC=B0=B8=EC=97=AC=20=EC=8B=9C?= =?UTF-8?q?=20=EC=A3=BC=EB=AC=B8=20=EC=83=9D=EC=84=B1=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/RecruitmentController.java | 194 +++++++----------- .../dto/RecruitmentRequestDto.java | 21 +- .../dto/order/OrderRequestDto.java | 32 +++ .../dto/order/OrderResponseDto.java | 10 + .../example/recruitment/entity/MenuItem.java | 14 -- .../com/example/recruitment/entity/Order.java | 29 --- .../recruitment/entity/Recruitment.java | 12 ++ .../entity/RecruitmentParticipant.java | 3 + .../exception/GlobalExceptionHandler.java | 4 +- .../repository/OrderRepository.java | 7 - .../RecruitmentParticipantRepository.java | 13 +- .../recruitment/service/OrderClient.java | 42 ++++ .../service/RecruitmentService.java | 92 +++++++++ .../src/main/resources/application.properties | 3 + 14 files changed, 296 insertions(+), 180 deletions(-) create mode 100644 recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderRequestDto.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderResponseDto.java delete mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java delete mode 100644 recruitment-service/src/main/java/com/example/recruitment/entity/Order.java delete mode 100644 recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java create mode 100644 recruitment-service/src/main/java/com/example/recruitment/service/OrderClient.java diff --git a/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java b/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java index f595bc3..9e15016 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java +++ b/recruitment-service/src/main/java/com/example/recruitment/controller/RecruitmentController.java @@ -2,15 +2,13 @@ import com.example.recruitment.dto.RecruitmentDetailDto; import com.example.recruitment.dto.RecruitmentRequestDto; +import com.example.recruitment.dto.order.OrderRequestDto; import com.example.recruitment.entity.Recruitment; import com.example.recruitment.entity.RecruitmentParticipant; -import com.example.recruitment.entity.Store; import com.example.recruitment.entity.User; import com.example.recruitment.repository.RecruitmentParticipantRepository; import com.example.recruitment.repository.RecruitmentRepository; -import com.example.recruitment.repository.StoreRepository; -import com.example.recruitment.repository.UserRepository; - +import com.example.recruitment.service.RecruitmentService; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; @@ -21,29 +19,27 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/recruitments") +@RequestMapping("/api/v1/recruitments") public class RecruitmentController { + private final RecruitmentService recruitmentService; private final RecruitmentRepository recruitmentRepository; - private final UserRepository userRepository; - private final StoreRepository storeRepository; private final RecruitmentParticipantRepository participantRepository; - // 모집글 생성 + //모집글 생성 (Order 서버에 주문 생성 포함) @PostMapping - public Recruitment createRecruitment(@Valid @RequestBody RecruitmentRequestDto dto) { - User user = userRepository.findById(dto.getUserId()).orElseThrow(); - Store store = storeRepository.findById(dto.getStoreId()).orElseThrow(); - - Recruitment recruitment = new Recruitment(); - recruitment.setUser(user); - recruitment.setStore(store); - recruitment.setTitle(dto.getTitle()); - recruitment.setDescription(dto.getDescription()); - recruitment.setDeadlineTime(dto.getDeadlineTime()); - recruitment.setStatus("RECRUITING"); + public ResponseEntity createRecruitment(@Valid @RequestBody RecruitmentRequestDto dto) { + recruitmentService.createRecruitment(dto); + return ResponseEntity.ok("모집글 생성 완료"); + } - return recruitmentRepository.save(recruitment); + //모집글 참여 (Order 서버에 주문 생성 포함) + @PostMapping("/{recruitmentId}/join") + public ResponseEntity joinRecruitment(@PathVariable Long recruitmentId, + @RequestParam Long userId, + @RequestBody OrderRequestDto orderRequestDto) { + recruitmentService.joinRecruitment(recruitmentId, userId, orderRequestDto); + return ResponseEntity.ok("모집글 참여 완료"); } // 모집글 전체 조회 @@ -52,84 +48,56 @@ public List getAll() { return recruitmentRepository.findAll(); } - // 상태별 조회 (ex. /api/recruitments?status=RECRUITING) + // 상태별 조회 @GetMapping(params = "status") public List getByStatus(@RequestParam String status) { return recruitmentRepository.findByStatus(status); } + // 모집글 상세 조회 @GetMapping("/{recruitmentId}") -public ResponseEntity getRecruitmentDetail(@PathVariable Long recruitmentId) { - Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); - - // 참여자 목록 조회 - List participantEntities = - participantRepository.findByRecruitmentId(recruitmentId); - - List participants = participantEntities.stream() - .map(RecruitmentParticipant::getUser) - .toList(); - - // DTO 구성 - RecruitmentDetailDto dto = new RecruitmentDetailDto(); - dto.setId(recruitment.getId()); - dto.setTitle(recruitment.getTitle()); - dto.setDescription(recruitment.getDescription()); - dto.setStatus(recruitment.getStatus()); - dto.setDeadlineTime(recruitment.getDeadlineTime()); - dto.setUser(recruitment.getUser()); - dto.setStore(recruitment.getStore()); - dto.setParticipants(participants); - - return ResponseEntity.ok(dto); -} - - @GetMapping("/user/{userId}/created-recruitments") -public List getRecruitmentsCreatedByUser(@PathVariable Long userId) { - return recruitmentRepository.findByUserId(userId); -} - -// 특정 유저가 참여한 모집글 조회 - @GetMapping("/user/{userId}/joined-recruitments") -public List getRecruitmentsJoinedByUser(@PathVariable Long userId) { - List participantList = participantRepository.findByUserId(userId); - return participantList.stream() - .map(RecruitmentParticipant::getRecruitment) - .toList(); -} - - - - - // 모집글 참여 - @PostMapping("/{recruitmentId}/join") - public ResponseEntity joinRecruitment(@PathVariable Long recruitmentId, @RequestParam Long userId) { - User user = userRepository.findById(userId).orElseThrow(); + public ResponseEntity getRecruitmentDetail(@PathVariable Long recruitmentId) { Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); - boolean alreadyJoined = participantRepository - .findByUserIdAndRecruitmentId(userId, recruitmentId) - .isPresent(); - - if (alreadyJoined) { - return ResponseEntity.badRequest().body("이미 참여한 모집입니다."); - } + List participants = + participantRepository.findByRecruitmentId(recruitmentId); + List participantUsers = participants.stream() + .map(RecruitmentParticipant::getUser) + .toList(); + + RecruitmentDetailDto dto = new RecruitmentDetailDto(); + dto.setId(recruitment.getId()); + dto.setTitle(recruitment.getTitle()); + dto.setDescription(recruitment.getDescription()); + dto.setStatus(recruitment.getStatus()); + dto.setDeadlineTime(recruitment.getDeadlineTime()); + dto.setUser(recruitment.getUser()); + dto.setStore(recruitment.getStore()); + dto.setParticipants(participantUsers); + + return ResponseEntity.ok(dto); + } - RecruitmentParticipant participant = new RecruitmentParticipant(); - participant.setUser(user); - participant.setRecruitment(recruitment); - participant.setJoinedAt(LocalDateTime.now()); + // 유저가 만든 모집글 + @GetMapping("/user/{userId}/created-recruitments") + public List getRecruitmentsCreatedByUser(@PathVariable Long userId) { + return recruitmentRepository.findByUserId(userId); + } - participantRepository.save(participant); - return ResponseEntity.ok("모집글 참여 완료"); + // 유저가 참여한 모집글 + @GetMapping("/user/{userId}/joined-recruitments") + public List getRecruitmentsJoinedByUser(@PathVariable Long userId) { + List participantList = participantRepository.findByUserId(userId); + return participantList.stream() + .map(RecruitmentParticipant::getRecruitment) + .toList(); } - // 모집 상태 업데이트 (CONFIRMED 또는 FAILED) + // 모집 상태 업데이트 @PatchMapping("/{recruitmentId}/status") public ResponseEntity updateRecruitmentStatus(@PathVariable Long recruitmentId) { Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); LocalDateTime now = LocalDateTime.now(); - long participantCount = participantRepository.countByRecruitmentId(recruitmentId); if (now.isAfter(recruitment.getDeadlineTime())) { @@ -145,68 +113,56 @@ public ResponseEntity updateRecruitmentStatus(@PathVariable Long recruitmentI } } - // 주문 수락 상태로 변경 (ACCEPTED) + // 주문 수락 상태 변경 @PatchMapping("/{recruitmentId}/accept") public ResponseEntity acceptRecruitment(@PathVariable Long recruitmentId) { Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); - if (!"CONFIRMED".equals(recruitment.getStatus())) { return ResponseEntity.badRequest().body("주문 수락은 CONFIRMED 상태에서만 가능합니다."); } - recruitment.setStatus("ACCEPTED"); recruitmentRepository.save(recruitment); - return ResponseEntity.ok("상태가 ACCEPTED로 변경되었습니다."); } - // 배달 완료 상태로 변경 (DELIVERED) + // 배달 완료 상태 변경 @PatchMapping("/{recruitmentId}/deliver") public ResponseEntity completeDelivery(@PathVariable Long recruitmentId) { Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); - if (!"ACCEPTED".equals(recruitment.getStatus())) { return ResponseEntity.badRequest().body("배달 완료는 ACCEPTED 상태에서만 가능합니다."); } - recruitment.setStatus("DELIVERED"); recruitmentRepository.save(recruitment); - return ResponseEntity.ok("상태가 DELIVERED로 변경되었습니다."); } -// 모집글 삭제 - @DeleteMapping("/{recruitmentId}") -public ResponseEntity deleteRecruitment(@PathVariable Long recruitmentId) { - Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); - - recruitmentRepository.delete(recruitment); - return ResponseEntity.ok("모집글이 삭제되었습니다."); -} - -// 모집글 수정 -@PutMapping("/{recruitmentId}") -public ResponseEntity updateRecruitment(@PathVariable Long recruitmentId, - @Valid @RequestBody RecruitmentRequestDto dto) { - Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); - // (선택) 본인 작성한 글인지 확인 - if (!recruitment.getUser().getId().equals(dto.getUserId())) { - return ResponseEntity.status(403).body("작성자만 수정할 수 있습니다."); + // 모집글 삭제 + @DeleteMapping("/{recruitmentId}") + public ResponseEntity deleteRecruitment(@PathVariable Long recruitmentId) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + recruitmentRepository.delete(recruitment); + return ResponseEntity.ok("모집글이 삭제되었습니다."); } - // 수정할 항목들 업데이트 - recruitment.setTitle(dto.getTitle()); - recruitment.setDescription(dto.getDescription()); - recruitment.setDeadlineTime(dto.getDeadlineTime()); + // 모집글 수정 + @PutMapping("/{recruitmentId}") + public ResponseEntity updateRecruitment(@PathVariable Long recruitmentId, + @Valid @RequestBody RecruitmentRequestDto dto) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId).orElseThrow(); + if (!recruitment.getUser().getId().equals(dto.getUserId())) { + return ResponseEntity.status(403).body("작성자만 수정할 수 있습니다."); + } - // (선택) 가게 변경도 허용 - if (dto.getStoreId() != null) { - Store store = storeRepository.findById(dto.getStoreId()).orElseThrow(); - recruitment.setStore(store); - } + recruitment.setTitle(dto.getTitle()); + recruitment.setDescription(dto.getDescription()); + recruitment.setDeadlineTime(dto.getDeadlineTime()); - recruitmentRepository.save(recruitment); - return ResponseEntity.ok("모집글이 수정되었습니다."); -} + if (dto.getStoreId() != null) { + recruitment.setStore(recruitment.getStore()); + } + recruitmentRepository.save(recruitment); + return ResponseEntity.ok("모집글이 수정되었습니다."); + } } diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java index 036e21d..a97aa2c 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/RecruitmentRequestDto.java @@ -1,13 +1,14 @@ package com.example.recruitment.dto; +import com.example.recruitment.dto.order.OrderRequestDto; +import lombok.Getter; +import lombok.Setter; + import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; - import java.time.LocalDateTime; - -import lombok.Getter; -import lombok.Setter; +import java.util.List; @Getter @Setter @@ -30,4 +31,16 @@ public class RecruitmentRequestDto { @NotBlank(message = "카테고리는 비어 있을 수 없습니다.") private String category; + + // 주문용 메뉴 정보 + private List menus; + + //OrderRequestDto 변환 메서드 + public OrderRequestDto toOrderRequestDto() { + OrderRequestDto dto = new OrderRequestDto(); + dto.setUserId(this.userId); + dto.setStoreId(this.storeId); + dto.setMenus(this.menus); + return dto; + } } diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderRequestDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderRequestDto.java new file mode 100644 index 0000000..c948a2f --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderRequestDto.java @@ -0,0 +1,32 @@ +package com.example.recruitment.dto.order; + +import java.util.List; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter + +public class OrderRequestDto { + private Long groupId; + private Long userId; + private Long storeId; + private List menus; + + @Getter @Setter + public static class MenuDto { + private Long menuId; + private String menuName; + private int basePrice; + private int count; + private List options; + } + + @Getter @Setter + public static class OptionDto { + private Long optionId; + private String optionName; + private int price; + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderResponseDto.java b/recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderResponseDto.java new file mode 100644 index 0000000..c5e64b9 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/dto/order/OrderResponseDto.java @@ -0,0 +1,10 @@ +package com.example.recruitment.dto.order; + +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class OrderResponseDto { + private Long orderId; +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java b/recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java deleted file mode 100644 index 44fdf94..0000000 --- a/recruitment-service/src/main/java/com/example/recruitment/entity/MenuItem.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.example.recruitment.entity; - -import jakarta.persistence.Embeddable; -import lombok.*; - -@Embeddable -@Getter @Setter -@NoArgsConstructor -@AllArgsConstructor -public class MenuItem { - - private String name; - private int price; -} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/Order.java b/recruitment-service/src/main/java/com/example/recruitment/entity/Order.java deleted file mode 100644 index 446f71f..0000000 --- a/recruitment-service/src/main/java/com/example/recruitment/entity/Order.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.example.recruitment.entity; - -import jakarta.persistence.*; -import lombok.*; - -import java.util.List; - -@Entity -@Table(name = "orders") -@Getter @Setter -@NoArgsConstructor -@AllArgsConstructor -public class Order { - - @Id @GeneratedValue - private Long id; - - @ManyToOne - private Recruitment recruitment; // 어떤 모집글에 대한 주문인지 - - @ManyToOne - private User user; // 누가 주문했는지 - - @ElementCollection - @CollectionTable(name = "order_menu_items", joinColumns = @JoinColumn(name = "order_id")) - private List menuItems; // 메뉴 리스트 (내장 객체로 구성) - - private int totalPrice; // 총 가격 -} diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java b/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java index 65a5b6c..6c1b1ff 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/Recruitment.java @@ -4,6 +4,7 @@ import lombok.*; import java.time.LocalDateTime; +import java.util.ArrayList; import java.util.List; @Entity @@ -34,4 +35,15 @@ public class Recruitment { //카테고리 추가가 @Column(nullable = false) private String category; + + @Column(name = "order_id") + private Long orderId; + + @ElementCollection + private List orderIds = new ArrayList<>(); + + public void addOrderId(Long orderId) { + this.orderIds.add(orderId); +} + } diff --git a/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java b/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java index 36be138..23b03cd 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java +++ b/recruitment-service/src/main/java/com/example/recruitment/entity/RecruitmentParticipant.java @@ -26,5 +26,8 @@ public class RecruitmentParticipant { @Column(name = "joined_at", nullable = false) private LocalDateTime joinedAt; + + @Column(name = "order_id") + private Long orderId; } diff --git a/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java b/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java index 3bdab04..dd5a88a 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java +++ b/recruitment-service/src/main/java/com/example/recruitment/exception/GlobalExceptionHandler.java @@ -40,11 +40,9 @@ public ResponseEntity> handleGeneralException(Exception e, H String path = request.getRequestURI(); if (path != null && (path.contains("/v3/api-docs") || path.contains("/swagger"))) { - throw e; // Swagger 요청은 예외 처리하지 않고 Spring에게 맡김 + throw e; // Swagger 요청은 예외 처리하지 않고 Spring에게 맡김 } - - return ResponseEntity .status(ErrorCode.INTERNAL_ERROR.getStatus()) .body(ApiResponse.fail( diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java deleted file mode 100644 index 0cd236e..0000000 --- a/recruitment-service/src/main/java/com/example/recruitment/repository/OrderRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.example.recruitment.repository; - -import com.example.recruitment.entity.Order; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface OrderRepository extends JpaRepository { -} diff --git a/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java b/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java index f468437..0e371bf 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java +++ b/recruitment-service/src/main/java/com/example/recruitment/repository/RecruitmentParticipantRepository.java @@ -1,21 +1,26 @@ package com.example.recruitment.repository; +import com.example.recruitment.entity.Recruitment; import com.example.recruitment.entity.RecruitmentParticipant; +import com.example.recruitment.entity.User; + import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; import java.util.Optional; public interface RecruitmentParticipantRepository extends JpaRepository { - // 특정 유저가 특정 모집글에 이미 참여했는지 확인 + + // 특정 유저가 특정 모집글에 이미 참여했는지 확인 Optional findByUserIdAndRecruitmentId(Long userId, Long recruitmentId); - // 특정 모집글에 참여한 인원 수 카운트 + // 특정 모집글에 참여한 인원 수 카운트 long countByRecruitmentId(Long recruitmentId); List findByRecruitmentId(Long recruitmentId); - List findByUserId(Long userId); - + List findByUserId(Long userId); + //참여 여부 확인 메서드 + boolean existsByRecruitmentAndUser(Recruitment recruitment, User user); } diff --git a/recruitment-service/src/main/java/com/example/recruitment/service/OrderClient.java b/recruitment-service/src/main/java/com/example/recruitment/service/OrderClient.java new file mode 100644 index 0000000..b1259a3 --- /dev/null +++ b/recruitment-service/src/main/java/com/example/recruitment/service/OrderClient.java @@ -0,0 +1,42 @@ +package com.example.recruitment.service; + +import com.example.recruitment.dto.order.OrderRequestDto; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.ResponseEntity; +import org.springframework.stereotype.Service; +import org.springframework.web.client.RestTemplate; + +import java.util.Map; + +@Service +public class OrderClient { + + private final RestTemplate restTemplate = new RestTemplate(); + + @Value("${order.server.url}") + private String serverUrl; + + @Value("${order.server.path}") + private String path; + + public Long createOrder(OrderRequestDto requestDto) { + String fullUrl = serverUrl + path; + + ResponseEntity response = restTemplate.postForEntity(fullUrl, requestDto, Map.class); + + if (response.getStatusCode().is2xxSuccessful()) { + Map responseBody = response.getBody(); + + if (responseBody != null && responseBody.containsKey("data")) { + Map data = (Map) responseBody.get("data"); + + if (data != null && data.containsKey("orderId")) { + return Long.valueOf(data.get("orderId").toString()); + } + } + throw new RuntimeException("응답에 orderId 없음"); + } + + throw new RuntimeException("주문 생성 실패: " + response.getStatusCode()); + } +} diff --git a/recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java b/recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java index e69de29..7b96fc9 100644 --- a/recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java +++ b/recruitment-service/src/main/java/com/example/recruitment/service/RecruitmentService.java @@ -0,0 +1,92 @@ +package com.example.recruitment.service; + +import com.example.recruitment.dto.RecruitmentRequestDto; +import com.example.recruitment.dto.order.OrderRequestDto; +import com.example.recruitment.entity.Recruitment; +import com.example.recruitment.entity.RecruitmentParticipant; +import com.example.recruitment.entity.Store; +import com.example.recruitment.entity.User; +import com.example.recruitment.repository.RecruitmentParticipantRepository; +import com.example.recruitment.repository.RecruitmentRepository; +import com.example.recruitment.repository.StoreRepository; +import com.example.recruitment.repository.UserRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class RecruitmentService { + + private final RecruitmentRepository recruitmentRepository; + private final UserRepository userRepository; + private final StoreRepository storeRepository; + private final RecruitmentParticipantRepository participantRepository; + private final OrderClient orderClient; // 주문 서버와 통신할 client + + /** + * 모집글 생성 시: + * - 사용자 및 가게 조회 + * - 모집글 저장 + * - 주문 서버에 주문 생성 요청 + * - 생성된 orderId를 모집글에 저장 + */ + @Transactional + public void createRecruitment(RecruitmentRequestDto dto) { + User user = userRepository.findById(dto.getUserId()) + .orElseThrow(() -> new RuntimeException("사용자 없음")); + Store store = storeRepository.findById(dto.getStoreId()) + .orElseThrow(() -> new RuntimeException("가게 없음")); + + Recruitment recruitment = new Recruitment(); + recruitment.setUser(user); + recruitment.setStore(store); + recruitment.setTitle(dto.getTitle()); + recruitment.setDescription(dto.getDescription()); + recruitment.setDeadlineTime(dto.getDeadlineTime()); + recruitment.setStatus("RECRUITING"); + recruitment.setCategory(dto.getCategory()); + recruitmentRepository.save(recruitment); + + // 주문 서버에 주문 생성 요청 + OrderRequestDto orderDto = dto.toOrderRequestDto(); + orderDto.setGroupId(recruitment.getId()); + Long orderId = orderClient.createOrder(orderDto); + + // orderId를 모집글에 저장 + recruitment.setOrderId(orderId); + recruitmentRepository.save(recruitment); + } + + /** + * 모집글 참여 시: + * - 사용자 및 모집글 조회 + * - 중복 참여 여부 확인 + * - 주문 서버에 주문 생성 요청 + * - 생성된 orderId를 RecruitmentParticipant에 저장 + */ + @Transactional + public void joinRecruitment(Long recruitmentId, Long userId, OrderRequestDto orderDto) { + Recruitment recruitment = recruitmentRepository.findById(recruitmentId) + .orElseThrow(() -> new RuntimeException("모집 없음")); + User user = userRepository.findById(userId) + .orElseThrow(() -> new RuntimeException("사용자 없음")); + + boolean alreadyJoined = participantRepository.existsByRecruitmentAndUser(recruitment, user); + if (alreadyJoined) { + throw new RuntimeException("이미 참여한 모집입니다."); + } + + // 주문 서버에 주문 생성 요청 + orderDto.setGroupId(recruitmentId); + orderDto.setUserId(userId); + Long orderId = orderClient.createOrder(orderDto); + + // 참여자 등록 + 주문 ID 저장 + RecruitmentParticipant participant = new RecruitmentParticipant(); + participant.setRecruitment(recruitment); + participant.setUser(user); + participant.setOrderId(orderId); + participantRepository.save(participant); + } +} diff --git a/recruitment-service/src/main/resources/application.properties b/recruitment-service/src/main/resources/application.properties index 68e1557..3a429be 100644 --- a/recruitment-service/src/main/resources/application.properties +++ b/recruitment-service/src/main/resources/application.properties @@ -7,3 +7,6 @@ spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.jpa.hibernate.ddl-auto=update spring.jpa.show-sql=true spring.jpa.properties.hibernate.format_sql=true + +order.server.url=http://54.66.149.225:8100 +order.server.path=/api/v1/orders From 6765a497c92b2e221eb769725a632230821d5bd5 Mon Sep 17 00:00:00 2001 From: kimdongeun Date: Sat, 31 May 2025 01:53:27 +0900 Subject: [PATCH 8/8] Trigger PR button refresh