diff --git a/.gitignore b/.gitignore index 524f096..8993b9a 100644 --- a/.gitignore +++ b/.gitignore @@ -19,6 +19,14 @@ *.tar.gz *.rar +# Gradle +.gradle/ +build/ + +# IntelliJ +.idea/ +*.iml + # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* replay_pid* diff --git a/kaka/.gitattributes b/kaka/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/kaka/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/kaka/HELP.md b/kaka/HELP.md new file mode 100644 index 0000000..9035108 --- /dev/null +++ b/kaka/HELP.md @@ -0,0 +1,28 @@ +# Getting Started + +### Reference Documentation + +For further reference, please consider the following sections: + +* [Official Gradle documentation](https://docs.gradle.org) +* [Spring Boot Gradle Plugin Reference Guide](https://docs.spring.io/spring-boot/4.0.5/gradle-plugin) +* [Create an OCI image](https://docs.spring.io/spring-boot/4.0.5/gradle-plugin/packaging-oci-image.html) +* [Spring Data JPA](https://docs.spring.io/spring-boot/4.0.5/reference/data/sql.html#data.sql.jpa-and-spring-data) +* [Spring Web](https://docs.spring.io/spring-boot/4.0.5/reference/web/servlet.html) + +### Guides + +The following guides illustrate how to use some features concretely: + +* [Accessing Data with JPA](https://spring.io/guides/gs/accessing-data-jpa/) +* [Accessing data with MySQL](https://spring.io/guides/gs/accessing-data-mysql/) +* [Building a RESTful Web Service](https://spring.io/guides/gs/rest-service/) +* [Serving Web Content with Spring MVC](https://spring.io/guides/gs/serving-web-content/) +* [Building REST services with Spring](https://spring.io/guides/tutorials/rest/) + +### Additional Links + +These additional references should also help you: + +* [Gradle Build Scans – insights for your project's build](https://scans.gradle.com#gradle) + diff --git a/kaka/build.gradle b/kaka/build.gradle new file mode 100644 index 0000000..6111458 --- /dev/null +++ b/kaka/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '4.0.5' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.umc' +version = '0.0.1-SNAPSHOT' +description = 'umc10th' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-webmvc' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-data-jpa-test' + testImplementation 'org.springframework.boot:spring-boot-starter-webmvc-test' + testCompileOnly 'org.projectlombok:lombok' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + testAnnotationProcessor 'org.projectlombok:lombok' + + // Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.1' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-api:3.0.1' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/kaka/gradle/wrapper/gradle-wrapper.properties b/kaka/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c61a118 --- /dev/null +++ b/kaka/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/kaka/gradlew b/kaka/gradlew new file mode 100644 index 0000000..739907d --- /dev/null +++ b/kaka/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015 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/2d6327017519d23b96af35865dc997fcb544fb40/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 + + + +# 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" ) + + 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" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# 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/kaka/gradlew.bat b/kaka/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/kaka/gradlew.bat @@ -0,0 +1,93 @@ +@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 + + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +: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/kaka/settings.gradle b/kaka/settings.gradle new file mode 100644 index 0000000..67a1b8e --- /dev/null +++ b/kaka/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'umc10th' diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java b/kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java new file mode 100644 index 0000000..fe3f905 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/Umc10thApplication.java @@ -0,0 +1,13 @@ +package com.umc.umc10th.kaka; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Umc10thApplication { + + public static void main(String[] args) { + SpringApplication.run(Umc10thApplication.class, args); + } + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java b/kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java new file mode 100644 index 0000000..3cd4ec5 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/config/SwaggerConfig.java @@ -0,0 +1,36 @@ +package com.umc.umc10th.kaka.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI swagger() { + Info info = new Info().title("UMC10th").description("10기 Swagger").version("0.0.1"); + + // JWT 토큰 헤더 방식 + String securityScheme = "JWT TOKEN"; + SecurityRequirement securityRequirement = new SecurityRequirement().addList(securityScheme); + + Components components = new Components() + .addSecuritySchemes(securityScheme, new SecurityScheme() + .name(securityScheme) + .type(SecurityScheme.Type.HTTP) + .scheme("Bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .info(info) + .addServersItem(new Server().url("/")) + .addSecurityItem(securityRequirement) + .components(components); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java new file mode 100644 index 0000000..9420e2a --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/controller/HomeController.java @@ -0,0 +1,36 @@ +package com.umc.umc10th.kaka.domain.home.controller; + +import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; +import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; +import com.umc.umc10th.kaka.domain.home.exception.code.HomeSuccessCode; +import com.umc.umc10th.kaka.domain.home.service.HomeService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/home") +public class HomeController { + + private final HomeService homeService; + + @GetMapping("/v1/missions") + public ApiResponse getRegionMissions( + @RequestParam Long locationId, + @RequestParam(defaultValue = "0") int page, + @RequestParam(defaultValue = "10") int size + ) { + BaseSuccessCode code = HomeSuccessCode.OK; + return ApiResponse.onSuccess(code, homeService.getRegionMissions(locationId, page, size)); + } + + @GetMapping("/v1/mydata") + public ApiResponse getMyData( + @RequestHeader("Authorization") String token + ) { + BaseSuccessCode code = HomeSuccessCode.OK; + return ApiResponse.onSuccess(code, homeService.getMyData(token)); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java new file mode 100644 index 0000000..558f890 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/converter/HomeConverter.java @@ -0,0 +1,44 @@ +package com.umc.umc10th.kaka.domain.home.converter; + +import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; +import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; + +import java.util.List; +import java.util.stream.Collectors; + +public class HomeConverter { + + public static HomeRegionMissionResDTO.MissionList toRegionMissionList(Mission mission) { + return new HomeRegionMissionResDTO.MissionList( + mission.getId(), + mission.getStore().getName(), + mission.getPoint(), + mission.getConditional() + ); + } + + public static HomeRegionMissionResDTO.MissionPage toRegionMissionPage( + List missions, int page, int size, boolean hasNext + ) { + return new HomeRegionMissionResDTO.MissionPage( + missions.stream() + .map(HomeConverter::toRegionMissionList) + .collect(Collectors.toList()), + page, + size, + hasNext + ); + } + + public static HomeMyDataResDTO.MyDataRes toMyData(Member member) { + return new HomeMyDataResDTO.MyDataRes( + member.getName(), + member.getEmail(), + member.getPhoneNumber(), + member.getPhoneNumberStatus(), + member.getPoint() + ); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java new file mode 100644 index 0000000..ec27762 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataReqDTO.java @@ -0,0 +1,9 @@ +package com.umc.umc10th.kaka.domain.home.dto; + + +public class HomeMyDataReqDTO { + public record MyDataReq( + String token + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java new file mode 100644 index 0000000..feb9171 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeMyDataResDTO.java @@ -0,0 +1,14 @@ +package com.umc.umc10th.kaka.domain.home.dto; + + +public class HomeMyDataResDTO { + + public record MyDataRes( + String nickname, + String email, + String phoneNumber, + Integer phoneNumberStatus, + Integer userPoint + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java new file mode 100644 index 0000000..4be7a20 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionReqDTO.java @@ -0,0 +1,9 @@ +package com.umc.umc10th.kaka.domain.home.dto; + +public class HomeRegionMissionReqDTO { + + public record RegionMissionReq( + String token + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java new file mode 100644 index 0000000..9e93e0a --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/dto/HomeRegionMissionResDTO.java @@ -0,0 +1,22 @@ +package com.umc.umc10th.kaka.domain.home.dto; + +import java.util.List; + +public class HomeRegionMissionResDTO { + + public record MissionList( + Long missionId, + String marketName, + Integer point, + String content + ) { + } + + public record MissionPage( + List content, + int page, + int size, + boolean hasNext + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java new file mode 100644 index 0000000..07de20c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/HomeException.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.home.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; + +public class HomeException extends ProjectException { + public HomeException(BaseErrorCode errorCode) { + super(errorCode); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java new file mode 100644 index 0000000..8d49b76 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeErrorCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.home.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum HomeErrorCode implements BaseErrorCode { + HOME_NOT_FOUND(HttpStatus.NOT_FOUND, "HOME404_1", "홈 데이터를 찾을 수 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; + +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java new file mode 100644 index 0000000..7bcd4aa --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/exception/code/HomeSuccessCode.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.domain.home.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum HomeSuccessCode implements BaseSuccessCode { + OK(HttpStatus.OK, "HOME200_1", "성공"); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java new file mode 100644 index 0000000..747f238 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/repository/HomeRepository.java @@ -0,0 +1,4 @@ +package com.umc.umc10th.kaka.domain.home.repository; + +public class HomeRepository { +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java new file mode 100644 index 0000000..59a22f3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/home/service/HomeService.java @@ -0,0 +1,47 @@ +package com.umc.umc10th.kaka.domain.home.service; + +import com.umc.umc10th.kaka.domain.home.converter.HomeConverter; +import com.umc.umc10th.kaka.domain.home.dto.HomeMyDataResDTO; +import com.umc.umc10th.kaka.domain.home.dto.HomeRegionMissionResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.exception.MemberException; +import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; +import com.umc.umc10th.kaka.domain.member.repository.MemberRepository; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class HomeService { + + private final MissionRepository missionRepository; + private final MemberRepository memberRepository; + + // 해당 지역 미션 목록 조회 + public HomeRegionMissionResDTO.MissionPage getRegionMissions( + Long locationId, int page, int size + ) { + Pageable pageable = PageRequest.of(page, size); + Slice missionSlice = missionRepository.findByLocationId(locationId, pageable); + + return HomeConverter.toRegionMissionPage( + missionSlice.getContent(), + page, + size, + missionSlice.hasNext() + ); + } + + // 마이데이터 조회 + public HomeMyDataResDTO.MyDataRes getMyData(String token) { + Long memberId = Long.parseLong(token); // 임시 (나중에 JWT) + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + return HomeConverter.toMyData(member); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java new file mode 100644 index 0000000..0faf1a1 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/controller/MemberController.java @@ -0,0 +1,71 @@ +package com.umc.umc10th.kaka.domain.member.controller; + +import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; +import com.umc.umc10th.kaka.domain.member.exception.code.MemberSuccessCode; +import com.umc.umc10th.kaka.domain.member.service.MemberService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth") +public class MemberController { + + private final MemberService memberService; + + @GetMapping("/test") + public String test() { + return "test"; + } + + @PostMapping("/query-paramter") + public String exception( + @RequestParam String queryParameter + ) { + return memberService.singleParameter(queryParameter); + } + + @PostMapping("/request-body") + public MemberResDTO.RequestBody requestBody( + @RequestBody MemberResDTO.RequestBody dto + ) { + return memberService.requestBody(dto); + } + + @PostMapping("/{pathVariable}") + public String pathVariable( + @PathVariable String pathVariable + ) { + return memberService.singleParameter(pathVariable); + } + + @PostMapping("/header") + public String header( + @RequestHeader("test") String test + ) { + return memberService.singleParameter(test); + } + + //마이페이지 + @GetMapping("/v1/users/me") + public ApiResponse getIngo( + @RequestParam Long id + ) { + BaseSuccessCode code = MemberSuccessCode.OK; + return ApiResponse.onSuccess(code, memberService.getInfo(id)); + } + + @PostMapping("/v1/signup") + public ApiResponse getSignUp( + @RequestBody @Valid SignUpReqDTO.SignUpReqBody dto + ) { + BaseSuccessCode code = MemberSuccessCode.OK; + return ApiResponse.onSuccess(code, memberService.getSignUp(dto)); + } + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java new file mode 100644 index 0000000..89197e1 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/converter/MemberConverter.java @@ -0,0 +1,53 @@ +package com.umc.umc10th.kaka.domain.member.converter; + +import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.enums.Gender; +import com.umc.umc10th.kaka.domain.mission.enums.Address; + +import java.time.LocalDate; + +public class MemberConverter { + + public static MemberResDTO.RequestBody toRequestBody( + String stringTest, + Long longTest + ) { + return new MemberResDTO.RequestBody(stringTest, longTest); + } + + public static MemberResDTO.GetInfo toGetInfo( + Member member + ) { + return new MemberResDTO.GetInfo( + member.getName(), + member.getProfileUrl(), + member.getEmail(), + member.getPhoneNumber(), + member.getPoint() + ); + } + + // 회원가입 + public static SignUpResDTO.SignUpResBody toSignUp(Member member) { + return new SignUpResDTO.SignUpResBody( + member.getId(), + member.getToken() + ); + } + + public static Member toMember(SignUpReqDTO.SignUpReqBody dto) { + return Member.builder() + .name(dto.name()) + .email(dto.email()) + .password(dto.password()) + .phoneNumber(dto.phoneNumber()) + .agreedId(dto.agreedId()) + .gender(Gender.valueOf(dto.gender())) + .birth(LocalDate.parse(dto.birth())) + .address(Address.valueOf(dto.address())) + .build(); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java new file mode 100644 index 0000000..16967c3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberReqDTO.java @@ -0,0 +1,13 @@ +package com.umc.umc10th.kaka.domain.member.dto; + + +public class MemberReqDTO { + + public record RequestBody(String stringTest, String longTest) { + } + + public record GetInfo(Long id) { + } +} + + diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java new file mode 100644 index 0000000..caa6522 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/MemberResDTO.java @@ -0,0 +1,20 @@ +package com.umc.umc10th.kaka.domain.member.dto; + + +public class MemberResDTO { + + public record RequestBody( + String stringTest, + Long longTest + ) { + } + + public record GetInfo( + String name, + String profileUrl, + String email, + String phoneNumber, + Integer point + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java new file mode 100644 index 0000000..033db62 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpReqDTO.java @@ -0,0 +1,43 @@ +package com.umc.umc10th.kaka.domain.member.dto; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; + +public class SignUpReqDTO { + + public record SignUpReqBody( + @NotBlank(message = "이름은 필수입니다.") + String name, + + @NotBlank(message = "이메일은 필수입니다.") + @Email(message = "이메일 형식이 올바르지 않습니다.") + String email, + + @NotBlank(message = "비밀번호는 필수입니다.") + String password, + + @NotBlank(message = "전화번호는 필수입니다.") + String phoneNumber, + + @NotBlank(message = "성별은 필수입니다.") + @Pattern(regexp = "MALE|FEMALE", message = "성별은 MALE 또는 FEMALE이어야 합니다.") + String gender, + + @NotBlank(message = "생년월일은 필수입니다.") + @Pattern(regexp = "\\d{4}-\\d{2}-\\d{2}", message = "생년월일은 YYYY-MM-DD 형식이어야 합니다.") + String birth, + + @NotBlank(message = "지역은 필수입니다.") + @Pattern( + regexp = "SEOUL|INCHEON|BUSAN|DAEGU|DAEJEON|GWANGJU|ULSAN|GANGNAM|SEOCHO|MAPO|HONGDAE|JONGNO|YONGSAN|SEONGDONG|SONGPA|YEONGDEUNGPO", + message = "유효하지 않은 지역입니다." + ) + String address, + + @NotNull(message = "약관 동의 ID는 필수입니다.") + Integer agreedId + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java new file mode 100644 index 0000000..3cb2caa --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/dto/SignUpResDTO.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.member.dto; + +public class SignUpResDTO { + + public record SignUpResBody( + Long id, + String refreshToken + ) { + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java new file mode 100644 index 0000000..9d89e0e --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Food.java @@ -0,0 +1,30 @@ +package com.umc.umc10th.kaka.domain.member.entity; + +import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberFood; +import com.umc.umc10th.kaka.domain.member.enums.FoodName; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "food") +public class Food { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name") + @Enumerated(EnumType.STRING) + private FoodName name; + + @OneToMany(mappedBy = "food") + private List memberFoodList = new ArrayList<>(); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java new file mode 100644 index 0000000..50acf75 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Member.java @@ -0,0 +1,84 @@ +package com.umc.umc10th.kaka.domain.member.entity; + +import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberFood; +import com.umc.umc10th.kaka.domain.member.entity.mapping.MemberTerm; +import com.umc.umc10th.kaka.domain.member.enums.Gender; +import com.umc.umc10th.kaka.domain.member.enums.SocialType; +import com.umc.umc10th.kaka.domain.mission.enums.Address; +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "member") +public class Member extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.SEQUENCE) + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "gender", nullable = false) + @Enumerated(EnumType.STRING) + private Gender gender; + + @Column(name = "birth", nullable = false) + private LocalDate birth; + + @Column(name = "address", nullable = false) + @Enumerated(EnumType.STRING) + private Address address; + + @Column(name = "detail_address", nullable = false) + private String detailAddress; + + @Column(name = "social_uid") + private String socialUid; + + @Column(name = "social_type") + @Enumerated(EnumType.STRING) + private SocialType socialType; + + @Column(name = "email") + private String email; + + @Column(name = "profile_url") + private String profileUrl; + + @Column(name = "point") + private Integer point; + + @Column(name = "phone_number") + private String phoneNumber; + + @Column(name = "password") + private String password; + + @Column(name = "agree_id") + private Integer agreedId; + + @Column(name = "token") + private String token; + + @Column(name = "phone_number_status") + private Integer phoneNumberStatus; + + @OneToMany(mappedBy = "member") + private List memberFoodList = new ArrayList<>(); + + @OneToMany(mappedBy = "member") + private List memberTermList = new ArrayList<>(); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java new file mode 100644 index 0000000..89f5c0f --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/Term.java @@ -0,0 +1,23 @@ +package com.umc.umc10th.kaka.domain.member.entity; + +import com.umc.umc10th.kaka.domain.member.enums.TermName; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "term") +public class Term { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "name") + @Enumerated(EnumType.STRING) + private TermName name; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java new file mode 100644 index 0000000..5a409fd --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,30 @@ +package com.umc.umc10th.kaka.domain.member.entity.mapping; + +import com.umc.umc10th.kaka.domain.member.entity.Food; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "member_food") +public class MemberFood { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food food; + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java new file mode 100644 index 0000000..28e9a5c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/entity/mapping/MemberTerm.java @@ -0,0 +1,28 @@ +package com.umc.umc10th.kaka.domain.member.entity.mapping; + +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.entity.Term; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +@AllArgsConstructor +@Table(name = "member_term") +public class MemberTerm { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "term_id") + private Term term; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java new file mode 100644 index 0000000..e2e371c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/FoodName.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum FoodName { + NONE, + KOREAN, + JAPANESE, + CHINESE, + Italian + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java new file mode 100644 index 0000000..c778722 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/Gender.java @@ -0,0 +1,5 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum Gender { + MALE, FEMALE +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java new file mode 100644 index 0000000..84577a1 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/SocialType.java @@ -0,0 +1,5 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum SocialType { + KAKAO, GOOGLE, EMAIL, NAVER +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/TermName.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/TermName.java new file mode 100644 index 0000000..aa71e47 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/enums/TermName.java @@ -0,0 +1,9 @@ +package com.umc.umc10th.kaka.domain.member.enums; + +public enum TermName { + AGE, + SERVICE, + PRIVACY, + LOCATION, + MARKETING +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java new file mode 100644 index 0000000..9a81e65 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/MemberException.java @@ -0,0 +1,14 @@ +package com.umc.umc10th.kaka.domain.member.exception; + +import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; +import lombok.Getter; + +@Getter +public class MemberException extends RuntimeException { + private final MemberErrorCode errorCode; + + public MemberException(MemberErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java new file mode 100644 index 0000000..7c030f8 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberErrorCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.member.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum MemberErrorCode implements BaseErrorCode { // implements 필수! + + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404_1", "해당 사용자를 찾을 수 없습니다."); + + private final HttpStatus status; // status로! + private final String code; + private final String message; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java new file mode 100644 index 0000000..8dccd01 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/exception/code/MemberSuccessCode.java @@ -0,0 +1,20 @@ +package com.umc.umc10th.kaka.domain.member.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberSuccessCode implements BaseSuccessCode { + + OK(HttpStatus.OK, + "COMMON200_1", + "성종적으로 요청을 처리했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..8180dbb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/repository/MemberRepository.java @@ -0,0 +1,8 @@ +package com.umc.umc10th.kaka.domain.member.repository; + +import com.umc.umc10th.kaka.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { + void deleteByName(String name); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java new file mode 100644 index 0000000..246e1e6 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/member/service/MemberService.java @@ -0,0 +1,67 @@ +package com.umc.umc10th.kaka.domain.member.service; + +import com.umc.umc10th.kaka.domain.member.converter.MemberConverter; +import com.umc.umc10th.kaka.domain.member.dto.MemberResDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpReqDTO; +import com.umc.umc10th.kaka.domain.member.dto.SignUpResDTO; +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.member.exception.MemberException; +import com.umc.umc10th.kaka.domain.member.exception.code.MemberErrorCode; +import com.umc.umc10th.kaka.domain.member.repository.MemberRepository; +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + + public MemberResDTO.GetInfo getInfo(Long memberId) { + Member member = memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + return MemberConverter.toGetInfo(member); + } + + @Transactional // 나중에 DB 연결 + public SignUpResDTO.SignUpResBody getSignUp( + SignUpReqDTO.SignUpReqBody dto + ) { + Member member = MemberConverter.toMember(dto); + memberRepository.save(member); + return MemberConverter.toSignUp(member); + } + + public String singleParameter( + String singleParameter + ) { + return singleParameter; + } + + public MemberResDTO.RequestBody requestBody( + MemberResDTO.RequestBody dto + ) { + return MemberConverter.toRequestBody(dto.stringTest(), dto.longTest()); + } + + + @Transactional + public String createUser( + + ) { + Member member = Member.builder() + .name("test") + .build(); + memberRepository.save(member); + return "OK"; + } + + @Transactional + public String deleteUser( + + ) { + memberRepository.deleteByName("test"); + return "OK"; + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java new file mode 100644 index 0000000..1557240 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/controller/MissionController.java @@ -0,0 +1,58 @@ +package com.umc.umc10th.kaka.domain.mission.controller; + +import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; +import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; +import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; +import com.umc.umc10th.kaka.domain.mission.service.MissionService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1") +public class MissionController { + + private final MissionService missionService; + + // 가계 미션 생성 + @PostMapping("/stores/{storeId}/missions") + public ApiResponse createMission( + @PathVariable Long storeId, + @RequestBody MissionReqDTO.CreateMission dto + ) { + BaseSuccessCode code = MissionSuccessCode.CREATED; + return ApiResponse.onSuccess(code, missionService.createMission(storeId, dto)); + } + + // 가게 내 미션들 조회 + @GetMapping("/stores/{storeId}/missions") + public ApiResponse> getMissions( + @PathVariable Long storeId, + @RequestParam Integer pageSize, + @RequestParam String cursor, + @RequestParam String query + ) { + BaseSuccessCode code = MissionSuccessCode.OK; + return ApiResponse.onSuccess(code, missionService.getMissions(storeId, pageSize, cursor, query)); + } + + @PostMapping("/completed") + public ApiResponse completeMission( + @RequestBody MissionReqDTO.CompleteMissionReq dto + ) { + BaseSuccessCode code = MissionSuccessCode.OK; + return ApiResponse.onSuccess(code, missionService.completeMission(dto)); + } + + // 내가 진행중인 미션 조회 + @PostMapping("/missions/my") + public ApiResponse getMyMissions( + @RequestBody @Valid MissionReqDTO.GetMyMissionsReq req + ) { + BaseSuccessCode code = MissionSuccessCode.OK; + return ApiResponse.onSuccess(code, missionService.getMyMissions(req)); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java new file mode 100644 index 0000000..13a4313 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/converter/MissionConverter.java @@ -0,0 +1,100 @@ +package com.umc.umc10th.kaka.domain.mission.converter; + +import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; +import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import org.springframework.data.domain.Slice; +import java.util.List; + + +public class MissionConverter { + + public static MissionResDTO.MyMissionList toMyMissionList(MemberMission memberMission) { + Mission mission = memberMission.getMission(); + return new MissionResDTO.MyMissionList( + mission.getId(), + mission.getStore().getName(), + mission.getPoint(), + memberMission.getStatus() + ); + } + + public static MissionResDTO.MyMissionPage toMyMissionPage( + Slice slice, int page, int size + ) { + return new MissionResDTO.MyMissionPage( + slice.getContent().stream() + .map(MissionConverter::toMyMissionList) + .toList(), + page, + size, + slice.hasNext() + ); + } + + public static MissionResDTO.CompleteMissionRes toCompleteMission(Mission mission, String message) { + return new MissionResDTO.CompleteMissionRes( + mission.getId(), + message + ); + } + + public static MemberMission toMemberMission(Mission mission) { + return MemberMission.builder() + .mission(mission) + .status(MissionStatus.COMPLETE) + .build(); + } + + public static MissionResDTO.StoreMissionList toStoreMissionList(Mission mission) { + return new MissionResDTO.StoreMissionList( + mission.getId(), + mission.getPoint(), + mission.getConditional() + ); + } + + // 가게 미션 생성 + public static Mission toMission( + Store store, + MissionReqDTO.CreateMission dto + ) { + return Mission.builder() + .store(store) + .conditional(dto.conditional()) + .point(dto.point()) + .deadline(dto.deadline().atStartOfDay()) + .build(); + } + + // 가게 내 미션들 조회 + public static MissionResDTO.GetMissionRes toGetMission( + Mission mission + ) { + return MissionResDTO.GetMissionRes.builder() + .conditional(mission.getConditional()) + .point(mission.getPoint()) + .missionId(mission.getId()) + .build(); + } + + // 페이지네이션 틀 생성 + public static MissionResDTO.Pagination toPagination( + List data, + Boolean hasNext, + String nextCursor, + Integer pageSize + + ) { + return MissionResDTO.Pagination.builder() + .data(data) + .hasNext(hasNext) + .nextCursor(nextCursor) + .pageSize(pageSize) + .build(); + } + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java new file mode 100644 index 0000000..bb7917e --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionReqDTO.java @@ -0,0 +1,44 @@ +package com.umc.umc10th.kaka.domain.mission.dto; + +import jakarta.validation.constraints.*; + +import java.time.LocalDate; + +public class MissionReqDTO { + + public record CompleteMissionReq( + @NotNull(message = "미션 ID는 필수입니다.") + Long missionId + ) { + } + + public record CreateMission( + + @NotNull(message = "마감일은 필수입니다.") + @Future(message = "마감일은 오늘 이후여야 합니다.") + LocalDate deadline, + + @NotNull(message = "포인트는 필수입니다.") + @Min(value = 1, message = "포인트는 최소 1 이상이어야 합니다.") + @Max(value = 100000, message = "포인트는 최대 100,000 이하여야 합니다.") + Integer point, + + @NotBlank(message = "미션 조건은 필수입니다.") + @Size(max = 255, message = "미션 조건은 255자 이하여야 합니다.") + String conditional + ) { } + + // 사용자 ID 받는 dto + public record GetMyMissionsReq( + @NotNull(message = "사용자 ID는 필수입니다.") + Long memberId, + + @NotNull(message = "페이지 번호는 필수입니다.") + @Min(value = 0, message = "페이지 번호는 0 이상이어야 합니다.") + Integer page, + + @NotNull(message = "페이지 사이즈는 필수입니다.") + @Min(value = 1, message = "페이지 사이즈는 1 이상이어야 합니다.") + Integer size + ) {} +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java new file mode 100644 index 0000000..cb6c989 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/dto/MissionResDTO.java @@ -0,0 +1,72 @@ +package com.umc.umc10th.kaka.domain.mission.dto; + +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import lombok.Builder; + +import java.util.List; + +public class MissionResDTO { + + public record MissionList( + Long missionId, + String marketName, + Integer point, + MissionStatus status + ) { + } + + public record MissionPage( + List content, + int page, + int size, + boolean hasNext + ) { + } + + public record CompleteMissionRes( + Long missionId, + String message + ) { + } + + @Builder + public record GetMissionRes( + Long missionId, + Integer point, + String conditional + + ) { + } + + @Builder + public record Pagination( + List data, + Boolean hasNext, + String nextCursor, + Integer pageSize + ) { + } + + // 가게 미션 조회용 추가 + public record StoreMissionList( + Long missionId, + Integer point, + String conditional + ) { + } + + // 진행중 미션 응답 DTO 추가 + public record MyMissionList( + Long missionId, + String storeName, + Integer point, + MissionStatus status + ) {} + + public record MyMissionPage( + List content, + int page, + int size, + boolean hasNext + ) {} +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java new file mode 100644 index 0000000..405d89c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/Mission.java @@ -0,0 +1,38 @@ +package com.umc.umc10th.kaka.domain.mission.entity; + +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "mission") +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "deadline", nullable = false) + private LocalDateTime deadline; + + @Column(name = "conditional", nullable = false) + private String conditional; + + @Column(name = "point", nullable = false) + private Integer point; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private Store store; + +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java new file mode 100644 index 0000000..d3df698 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/entity/mapping/MemberMission.java @@ -0,0 +1,35 @@ +package com.umc.umc10th.kaka.domain.mission.entity.mapping; + +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "user_mission") +public class MemberMission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(name = "user_mission_status", nullable = false) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id", nullable = false) + private Mission mission; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java new file mode 100644 index 0000000..4775e8c --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/Address.java @@ -0,0 +1,24 @@ +package com.umc.umc10th.kaka.domain.mission.enums; + +public enum Address { + + // 특별시/광역시 + SEOUL, // 서울 + INCHEON, // 인천 + BUSAN, // 부산 + DAEGU, // 대구 + DAEJEON, // 대전 + GWANGJU, // 광주 + ULSAN, // 울산 + + // 서울 주요 구(연습이여서 서울만 추가함.) + GANGNAM, // 강남구 + SEOCHO, // 서초구 + MAPO, // 마포구 + HONGDAE, // 홍대 (마포구) + JONGNO, // 종로구 + YONGSAN, // 용산구 + SEONGDONG, // 성동구 + SONGPA, // 송파구 + YEONGDEUNGPO // 영등포구 +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java new file mode 100644 index 0000000..f241b04 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/enums/MissionStatus.java @@ -0,0 +1,7 @@ +package com.umc.umc10th.kaka.domain.mission.enums; + +public enum MissionStatus { + IDLE, + CHALLENGING, + COMPLETE +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..557e341 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/MissionException.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.mission.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; + +public class MissionException extends ProjectException { + public MissionException(BaseErrorCode errorCode) { // BaseErrorCode 받음! + super(errorCode); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..5fb780a --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,18 @@ +package com.umc.umc10th.kaka.domain.mission.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION404_1", "미션을 찾을 수 없습니다."), + QUERY_NOT_VALID(HttpStatus.BAD_REQUEST, "MISSION400_1", "유효하지 않은 정렬 기준입니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} + diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java new file mode 100644 index 0000000..c587113 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,21 @@ +package com.umc.umc10th.kaka.domain.mission.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum MissionSuccessCode implements BaseSuccessCode { + + CREATED(HttpStatus.OK, "MISSION200_1", + "성공적으로 미션을 생성했습니다."), + OK(HttpStatus.OK, + "MISSION200_1", + "성공적으로 미션을 조회했습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java new file mode 100644 index 0000000..0743cac --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MemberMissionRepository.java @@ -0,0 +1,26 @@ +package com.umc.umc10th.kaka.domain.mission.repository; + +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface MemberMissionRepository extends JpaRepository { + + @Query("SELECT mm FROM MemberMission mm " + + "JOIN FETCH mm.mission m " + + "JOIN FETCH m.store s " + + "WHERE mm.member.id = :memberId " + + "AND mm.status IN :statuses " + + "ORDER BY mm.id DESC") + Slice findByMemberIdAndStatusIn( + @Param("memberId") Long memberId, + @Param("statuses") List statuses, + Pageable pageable + ); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java new file mode 100644 index 0000000..202a1f9 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/repository/MissionRepository.java @@ -0,0 +1,35 @@ +package com.umc.umc10th.kaka.domain.mission.repository; + +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface MissionRepository extends JpaRepository { + + //현재 선택 지역 -> 도전 가능한 미션 목록 + @Query("SELECT m FROM Mission m " + + "JOIN FETCH m.store s " + + "JOIN FETCH s.location l " + + "WHERE l.id = :locationId " + + "ORDER BY m.id DESC") + Slice findByLocationId( + @Param("locationId") Long locationId, + Pageable pageable + ); + + Page findAllByStore_Id(Long storeId, Pageable pageable); + + // 커서 있을 때 + Slice findMissionsByStore_IdAndIdLessThanOrderByIdDesc( + Long storeId, Long idCursor, Pageable pageable + ); + + // 커서 없을 때 + Slice findMissionsByStore_IdOrderByIdDesc( + Long storeId, Pageable pageable + ); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java new file mode 100644 index 0000000..b7b846d --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/mission/service/MissionService.java @@ -0,0 +1,124 @@ +package com.umc.umc10th.kaka.domain.mission.service; + +import com.umc.umc10th.kaka.domain.mission.converter.MissionConverter; +import com.umc.umc10th.kaka.domain.mission.dto.MissionReqDTO; +import com.umc.umc10th.kaka.domain.mission.dto.MissionResDTO; +import com.umc.umc10th.kaka.domain.mission.entity.Mission; +import com.umc.umc10th.kaka.domain.mission.entity.mapping.MemberMission; +import com.umc.umc10th.kaka.domain.mission.enums.MissionStatus; +import com.umc.umc10th.kaka.domain.mission.exception.MissionException; +import com.umc.umc10th.kaka.domain.mission.exception.code.MissionErrorCode; +import com.umc.umc10th.kaka.domain.mission.exception.code.MissionSuccessCode; +import com.umc.umc10th.kaka.domain.mission.repository.MemberMissionRepository; +import com.umc.umc10th.kaka.domain.mission.repository.MissionRepository; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.domain.store.exception.StoreException; +import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; +import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +public class MissionService { + + private final MissionRepository missionRepository; + private final MemberMissionRepository memberMissionRepository; + + private final StoreRepository storeRepository; + + // 가게 미션 생성 + @Transactional + public Void createMission( + Long storeId, + MissionReqDTO.CreateMission dto + ) { + // 가게 찾기 + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); + + // 미션 생성 + Mission mission = MissionConverter.toMission(store, dto); + + // 미션 DB 저장 + missionRepository.save(mission); + return null; + } + + + // 가게 내 미션 목록 조회 + public MissionResDTO.Pagination getMissions( + Long storeId, + Integer pageSize, + String cursor, + String query + ) { + PageRequest pageRequest = PageRequest.of(0, pageSize); + + long idCursor; + Slice missionList; + String nextCursor = "-1"; + + + if (!cursor.equals("-1")) { + String[] cursorSplit = cursor.split(":"); + if (!query.equalsIgnoreCase("id")) { + throw new MissionException(MissionErrorCode.QUERY_NOT_VALID); + } + idCursor = Long.parseLong(cursorSplit[1]); + missionList = missionRepository + .findMissionsByStore_IdAndIdLessThanOrderByIdDesc(storeId, idCursor, pageRequest); + } else { + missionList = missionRepository + .findMissionsByStore_IdOrderByIdDesc(storeId, pageRequest); + } + + if (!missionList.getContent().isEmpty()) { + nextCursor = missionList.getContent().getLast().getId() + ":" + + missionList.getContent().getLast().getId(); + } + + return MissionConverter.toPagination( + missionList.map(MissionConverter::toGetMission).toList(), + missionList.hasNext(), + nextCursor, + missionList.getSize() + ); + } + + // 미션 완료 + @Transactional + public MissionResDTO.CompleteMissionRes completeMission( + MissionReqDTO.CompleteMissionReq dto + ) { + Mission mission = missionRepository.findById(dto.missionId()) + .orElseThrow(() -> new MissionException(MissionErrorCode.MISSION_NOT_FOUND)); + + memberMissionRepository.save(MissionConverter.toMemberMission(mission)); // ✅ 저장 추가 + + return MissionConverter.toCompleteMission( + mission, + MissionSuccessCode.OK.getMessage() + ); + } + + // 내가 진행중인 미션 조회 + public MissionResDTO.MyMissionPage getMyMissions(MissionReqDTO.GetMyMissionsReq req) { + List statuses = List.of( + MissionStatus.CHALLENGING, + MissionStatus.COMPLETE + ); + + Pageable pageable = PageRequest.of(req.page(), req.size()); + Slice result = memberMissionRepository + .findByMemberIdAndStatusIn(req.memberId(), statuses, pageable); + + return MissionConverter.toMyMissionPage(result, req.page(), req.size()); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java new file mode 100644 index 0000000..e075e65 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/controller/ReviewController.java @@ -0,0 +1,38 @@ +package com.umc.umc10th.kaka.domain.review.controller; // ← 세미콜론! + +import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; +import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; +import com.umc.umc10th.kaka.domain.review.exception.code.ReviewSuccessCode; +import com.umc.umc10th.kaka.domain.review.service.ReviewService; +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + + +@RestController +@RequiredArgsConstructor +@RequestMapping("/review") +public class ReviewController { + + private final ReviewService reviewService; + + @PostMapping("/v1/create/{marketId}") + public ApiResponse getCreateReview( + @PathVariable Long marketId, + @RequestBody ReviewReqDTO.CreateReviewReq dto + ) { + BaseSuccessCode code = ReviewSuccessCode.OK; + return ApiResponse.onSuccess(code, reviewService.createReview(marketId, dto)); + } + + // 내가 작성한 리뷰 조회 + @PostMapping("/reviews/my") + public ApiResponse getMyReviews( + @RequestBody @Valid ReviewReqDTO.GetMyReviewsReq req + ) { + BaseSuccessCode code = ReviewSuccessCode.OK; + return ApiResponse.onSuccess(code, reviewService.getMyReviews(req)); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java new file mode 100644 index 0000000..c3da2f5 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/converter/ReviewConverter.java @@ -0,0 +1,54 @@ +package com.umc.umc10th.kaka.domain.review.converter; + +import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; +import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; +import com.umc.umc10th.kaka.domain.review.entity.Review; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import org.springframework.data.domain.Slice; + +public class ReviewConverter { + + public static Review toReview(Store store, ReviewReqDTO.CreateReviewReq dto) { + return Review.builder() + .store(store) + .stars(dto.stars()) + .content(dto.content()) + .build(); + } + + public static ReviewResDTO.CreateReviewRes toCreateReview(Review review) { + return new ReviewResDTO.CreateReviewRes( + review.getId(), + review.getStars(), + review.getContent(), + review.getReply() != null ? review.getReply().getContent() : null, + review.getCreatedAt().toString() + ); + } + + public static ReviewResDTO.ReviewItem toReviewItem(Review review) { + return ReviewResDTO.ReviewItem.builder() + .reviewId(review.getId()) + .memberName(review.getMember().getName()) + .stars(review.getStars()) + .content(review.getContent()) + .replyContent(review.getReply() != null ? review.getReply().getContent() : null) + .createdAt(review.getCreatedAt().toString()) + .build(); + } + + public static ReviewResDTO.ReviewPage toReviewPage( + Slice slice, + String nextCursor, + Integer pageSize + ) { + return ReviewResDTO.ReviewPage.builder() + .content(slice.getContent().stream() + .map(ReviewConverter::toReviewItem) + .toList()) + .nextCursor(nextCursor) + .pageSize(pageSize) + .hasNext(slice.hasNext()) + .build(); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java new file mode 100644 index 0000000..014930e --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewReqDTO.java @@ -0,0 +1,34 @@ +package com.umc.umc10th.kaka.domain.review.dto; + +import com.umc.umc10th.kaka.global.validation.annotation.ValidStars; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public class ReviewReqDTO { + + public record CreateReviewReq( + + @ValidStars(message = "별점은 0.5 단위로 0.5~5.0 사이여야 합니다.") + Float stars, + + @NotBlank(message = "리뷰 내용은 필수입니다.") + @Size(min = 30, max = 300, message = "리뷰 내용은 30자 이상 300자 이하여야 합니다.") + String content + ) { + } + + // 내가 작성한 리뷰 조회 요청 + public record GetMyReviewsReq( + @NotNull(message = "사용자 ID는 필수입니다.") + Long memberId, + + @NotNull(message = "페이지 사이즈는 필수입니다.") + Integer pageSize, + + String cursor, + + @NotNull(message = "정렬 기준은 필수입니다.") + String query + ) {} +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java new file mode 100644 index 0000000..3283961 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/dto/ReviewResDTO.java @@ -0,0 +1,36 @@ +package com.umc.umc10th.kaka.domain.review.dto; + + +import lombok.Builder; + +import java.util.List; + +public class ReviewResDTO { + + public record CreateReviewRes( + Long reviewId, + Float stars, + String content, + String replyContent, + String createdAt + ) { + } + + @Builder + public record ReviewItem( + Long reviewId, + String memberName, + Float stars, + String content, + String replyContent, + String createdAt + ) {} + + @Builder + public record ReviewPage( + List content, + String nextCursor, + Integer pageSize, + Boolean hasNext + ) {} +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java new file mode 100644 index 0000000..3f26657 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Reply.java @@ -0,0 +1,24 @@ +package com.umc.umc10th.kaka.domain.review.entity; + +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "reply") +public class Reply extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "content", nullable = false, columnDefinition = "TEXT") + private String content; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java new file mode 100644 index 0000000..2b48fe0 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/entity/Review.java @@ -0,0 +1,42 @@ +package com.umc.umc10th.kaka.domain.review.entity; + +import com.umc.umc10th.kaka.domain.member.entity.Member; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.global.apiPayLoad.common.BaseEntity; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "review") +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "reply_id") + private Reply reply; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private Store store; + + @Column(name = "stars") + private Float stars; + + @Column(name = "content") + private String content; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java new file mode 100644 index 0000000..a78d799 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/ReviewException.java @@ -0,0 +1,12 @@ +package com.umc.umc10th.kaka.domain.review.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; +import lombok.Getter; + +@Getter +public class ReviewException extends ProjectException { + public ReviewException(BaseErrorCode errorCode) { + super(errorCode); + } +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java new file mode 100644 index 0000000..0be2a78 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewErrorCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.review.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ReviewErrorCode implements BaseErrorCode { + REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404_1", "리뷰를 찾을 수 없습니다."), + QUERY_NOT_VALID(HttpStatus.BAD_REQUEST, "REVIEW400_1", "유효하지 않은 정렬 기준입니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java new file mode 100644 index 0000000..50df417 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/exception/code/ReviewSuccessCode.java @@ -0,0 +1,17 @@ +package com.umc.umc10th.kaka.domain.review.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ReviewSuccessCode implements BaseSuccessCode { + OK(HttpStatus.OK, "REVIEW200_1", "성공"), + CREATED(HttpStatus.CREATED, "REVIEW201_1", "리뷰 생성에 성공했습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java new file mode 100644 index 0000000..0dc89b1 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/repository/ReviewRepository.java @@ -0,0 +1,68 @@ +package com.umc.umc10th.kaka.domain.review.repository; + +import com.umc.umc10th.kaka.domain.review.entity.Review; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Slice; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface ReviewRepository extends JpaRepository { + + // ID 순 커서 기반 + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "AND r.id < :cursor " + + "ORDER BY r.id DESC") + Slice findByMemberIdAndIdLessThan( + @Param("memberId") Long memberId, + @Param("cursor") Long cursor, + Pageable pageable + ); + + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "ORDER BY r.id DESC") + Slice findByMemberIdOrderById( + @Param("memberId") Long memberId, + Pageable pageable + ); + + // 별점 순 커서 기반 + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "AND r.stars < :cursor " + + "ORDER BY r.stars DESC") + Slice findByMemberIdAndStarsLessThan( + @Param("memberId") Long memberId, + @Param("cursor") Float cursor, + Pageable pageable + ); + + @Query("SELECT r FROM Review r " + + "JOIN FETCH r.member m " + + "LEFT JOIN FETCH r.reply rp " + + "WHERE r.member.id = :memberId " + + "ORDER BY r.stars DESC") + Slice findByMemberIdOrderByStars( + @Param("memberId") Long memberId, + Pageable pageable + ); + + @Query("SELECT r FROM Review r WHERE r.member.id = :memberId " + + "AND (r.stars < :stars OR (r.stars = :stars AND r.id < :id)) " + + "ORDER BY r.stars DESC, r.id DESC") + Slice findByMemberIdAndStarsLessThanOrStarsAndIdLessThan( + @Param("memberId") Long memberId, + @Param("stars") float stars, + @Param("stars") float starsEq, // 같은 별점일 때 id로 비교 + @Param("id") long id, + Pageable pageable + ); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java new file mode 100644 index 0000000..46bb79a --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/review/service/ReviewService.java @@ -0,0 +1,77 @@ +package com.umc.umc10th.kaka.domain.review.service; + +import com.umc.umc10th.kaka.domain.review.converter.ReviewConverter; +import com.umc.umc10th.kaka.domain.review.dto.ReviewReqDTO; +import com.umc.umc10th.kaka.domain.review.dto.ReviewResDTO; +import com.umc.umc10th.kaka.domain.review.entity.Review; +import com.umc.umc10th.kaka.domain.review.exception.ReviewException; +import com.umc.umc10th.kaka.domain.review.exception.code.ReviewErrorCode; +import com.umc.umc10th.kaka.domain.review.repository.ReviewRepository; +import com.umc.umc10th.kaka.domain.store.entity.Store; +import com.umc.umc10th.kaka.domain.store.exception.StoreException; +import com.umc.umc10th.kaka.domain.store.exception.code.StoreErrorCode; +import com.umc.umc10th.kaka.domain.store.repository.StoreRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReviewService { + + private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; + + @Transactional + public ReviewResDTO.CreateReviewRes createReview( + Long storeId, + ReviewReqDTO.CreateReviewReq dto + ) { + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new StoreException(StoreErrorCode.STORE_NOT_FOUND)); + Review review = ReviewConverter.toReview(store, dto); + reviewRepository.save(review); + return ReviewConverter.toCreateReview(review); + } + + public ReviewResDTO.ReviewPage getMyReviews(ReviewReqDTO.GetMyReviewsReq req) { + PageRequest pageRequest = PageRequest.of(0, req.pageSize()); + + Slice reviews; + String nextCursor; + + boolean isFirst = req.cursor().equals("-1"); + + switch (req.query().toLowerCase()) { + case "id" -> { + reviews = isFirst + ? reviewRepository.findByMemberIdOrderById(req.memberId(), pageRequest) + : reviewRepository.findByMemberIdAndIdLessThan( + req.memberId(), Long.parseLong(req.cursor()), pageRequest); + nextCursor = reviews.hasNext() + ? String.valueOf(reviews.getContent().getLast().getId()) + : null; + } + case "stars" -> { + if (isFirst) { + reviews = reviewRepository.findByMemberIdOrderByStars(req.memberId(), pageRequest); + } else { + String[] parts = req.cursor().split(":"); + float starsCursor = Float.parseFloat(parts[0]); + long idCursor = Long.parseLong(parts[1]); + reviews = reviewRepository.findByMemberIdAndStarsLessThanOrStarsAndIdLessThan( + req.memberId(), starsCursor, starsCursor, idCursor, pageRequest); + } + nextCursor = reviews.hasNext() + ? reviews.getContent().getLast().getStars() + ":" + + reviews.getContent().getLast().getId() + : null; + } + default -> throw new ReviewException(ReviewErrorCode.QUERY_NOT_VALID); + } + + return ReviewConverter.toReviewPage(reviews, nextCursor, req.pageSize()); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java new file mode 100644 index 0000000..43df251 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Location.java @@ -0,0 +1,26 @@ +package com.umc.umc10th.kaka.domain.store.entity; + +import com.umc.umc10th.kaka.domain.mission.enums.Address; +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "location") +public class Location { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "location_id") + private Long id; + + @Column(name = "name", nullable = false) + @Enumerated(EnumType.STRING) + private Address address; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java new file mode 100644 index 0000000..06a0da3 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/entity/Store.java @@ -0,0 +1,34 @@ +package com.umc.umc10th.kaka.domain.store.entity; + +import jakarta.persistence.*; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@Builder +@AllArgsConstructor +@NoArgsConstructor +@Table(name = "store") +public class Store { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + @Column(name = "name", nullable = false) + private String name; + + @Column(name = "manager_number", nullable = false) + private Long managerNumber; + + @Column(name = "detail_address", nullable = false) + private String detailAddress; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "location_id", nullable = false) + private Location location; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java new file mode 100644 index 0000000..6237653 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/StoreException.java @@ -0,0 +1,10 @@ +package com.umc.umc10th.kaka.domain.store.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; + +public class StoreException extends ProjectException { + public StoreException(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java new file mode 100644 index 0000000..a14dfb2 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/exception/code/StoreErrorCode.java @@ -0,0 +1,19 @@ +package com.umc.umc10th.kaka.domain.store.exception.code; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum StoreErrorCode implements BaseErrorCode { + + STORE_NOT_FOUND(HttpStatus.NOT_FOUND, + "STORE404_1", + "해당 가게가 존재하지 않습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/repository/StoreRepository.java b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/repository/StoreRepository.java new file mode 100644 index 0000000..10514c6 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/domain/store/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.umc.umc10th.kaka.domain.store.repository; + +import com.umc.umc10th.kaka.domain.store.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} \ No newline at end of file diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java new file mode 100644 index 0000000..49c7471 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/ApiResponse.java @@ -0,0 +1,34 @@ +package com.umc.umc10th.kaka.global.apiPayLoad; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + @JsonProperty("code") + private final String code; + + @JsonProperty("message") + private final String message; + + @JsonProperty("result") + private T result; + + public static ApiResponse onFailure(BaseErrorCode code, T result) { + return new ApiResponse<>(false, code.getCode(), code.getMessage(), result); + } + + public static ApiResponse onSuccess(BaseSuccessCode code, T result) { + return new ApiResponse<>(true, code.getCode(), code.getMessage(), result); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java new file mode 100644 index 0000000..7544b66 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseErrorCode.java @@ -0,0 +1,11 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + HttpStatus getStatus(); + + String getCode(); + + String getMessage(); +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java new file mode 100644 index 0000000..ebf11cb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/BaseSuccessCode.java @@ -0,0 +1,13 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + HttpStatus getStatus(); + + String getCode(); + + String getMessage(); +} + + diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java new file mode 100644 index 0000000..136ab82 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralErrorCode.java @@ -0,0 +1,30 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum GeneralErrorCode implements BaseErrorCode { + + BAD_REQUEST(HttpStatus.BAD_REQUEST, + "COMMON400_1", + "잘못된 요청입니다." + ), + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, + "COMMMON401_1", + "인증되지 않은 사용자입니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, + "COMMMON403_1", + "권한이 없습니다."), + NOT_FOUND(HttpStatus.NOT_FOUND, + "COMMMON404_1", + "요청한 페이지를 찾을 수 없습니다."), + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, + "COMMON500_1", + "서버 에러가 발생했습니다."); + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java new file mode 100644 index 0000000..db34fba --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/code/GeneralSuccessCode.java @@ -0,0 +1,19 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.code; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum GeneralSuccessCode implements BaseSuccessCode { + + OK(HttpStatus.OK, + "COMMON200_1", + "성종적으로 요청을 처리했습니다."), + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java new file mode 100644 index 0000000..2933478 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/common/BaseEntity.java @@ -0,0 +1,28 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + @Column(name = "created_at", nullable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(name = "updated_at", nullable = false) + private LocalDateTime updateAt; + + @Column(name = "deleted_at") + private LocalDateTime deleatedAt; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java new file mode 100644 index 0000000..edf96c9 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/exception/ProjectException.java @@ -0,0 +1,11 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.exception; + +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import lombok.Getter; +import lombok.RequiredArgsConstructor; + +@Getter +@RequiredArgsConstructor +public class ProjectException extends RuntimeException { + private final BaseErrorCode errorCode; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java new file mode 100644 index 0000000..fe49e17 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/apiPayLoad/handler/GeneralExceptionAdvice.java @@ -0,0 +1,49 @@ +package com.umc.umc10th.kaka.global.apiPayLoad.handler; + +import com.umc.umc10th.kaka.global.apiPayLoad.ApiResponse; +import com.umc.umc10th.kaka.global.apiPayLoad.code.BaseErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.code.GeneralErrorCode; +import com.umc.umc10th.kaka.global.apiPayLoad.exception.ProjectException; +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 java.util.HashMap; +import java.util.Map; + +@RestControllerAdvice +public class GeneralExceptionAdvice { + + @ExceptionHandler(ProjectException.class) + public ResponseEntity> handlerMemberException( + ProjectException e + ) { + BaseErrorCode errorCode = e.getErrorCode(); + return ResponseEntity.status(errorCode.getStatus()) + .body(ApiResponse.onFailure(errorCode, null)); + } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity>> handleMethodArgumentNotValidException( + MethodArgumentNotValidException e + ) { + Map errors = new HashMap<>(); + e.getBindingResult().getFieldErrors().forEach(error -> + errors.put(error.getField(), error.getDefaultMessage()) + ); + + BaseErrorCode code = GeneralErrorCode.BAD_REQUEST; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, errors)); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity> handleException( + Exception ex + ) { + BaseErrorCode code = GeneralErrorCode.INTERNAL_SERVER_ERROR; + return ResponseEntity.status(code.getStatus()) + .body(ApiResponse.onFailure(code, ex.getMessage())); + } +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java new file mode 100644 index 0000000..88896cb --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/annotation/ValidStars.java @@ -0,0 +1,19 @@ +package com.umc.umc10th.kaka.global.validation.annotation; + +import com.umc.umc10th.kaka.global.validation.validator.ValidStarsValidator; +import jakarta.validation.Constraint; +import jakarta.validation.Payload; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = ValidStarsValidator.class) +@Target({ElementType.FIELD}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidStars { + String message() default "별점은 0.5 단위로 0.5 ~ 5.0 사이여야 합니다."; + + Class[] groups() default {}; + + Class[] payload() default {}; +} diff --git a/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java new file mode 100644 index 0000000..a1d4432 --- /dev/null +++ b/kaka/src/main/java/com/umc/umc10th/kaka/global/validation/validator/ValidStarsValidator.java @@ -0,0 +1,16 @@ +package com.umc.umc10th.kaka.global.validation.validator; + +import com.umc.umc10th.kaka.global.validation.annotation.ValidStars; +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; + +public class ValidStarsValidator implements ConstraintValidator { + + @Override + public boolean isValid(Float value, ConstraintValidatorContext context) { + if (value == null) return false; + if (value < 0.5f || value > 5.0f) return false; + // 0.5 단위 체크 + return (value * 10) % 5 == 0; + } +} \ No newline at end of file diff --git a/kaka/src/main/resources/application.yml b/kaka/src/main/resources/application.yml new file mode 100644 index 0000000..f7681ea --- /dev/null +++ b/kaka/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + application: + name: "umc10th" # "umc10th" + + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver # MySQL JDBC ???? ??? ?? + url: ${DB_URL} # jdbc:mysql://localhost:3306/{???????} + username: ${DB_USER} # MySQL ?? ?? + password: ${DB_PW} # MySQL ???? + + jpa: + database: mysql # ??? ?????? ?? ?? (MySQL) + database-platform: org.hibernate.dialect.MySQLDialect # Hibernate?? ??? MySQL ??(dialect) ?? + show-sql: true # ??? SQL ??? ??? ???? ?? ?? + hibernate: + ddl-auto: update # ?????? ?? ? ?????? ???? ??? ?? + properties: + hibernate: + format_sql: true # ???? SQL ??? ?? ?? ??? \ No newline at end of file diff --git a/kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java b/kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java new file mode 100644 index 0000000..785e1ab --- /dev/null +++ b/kaka/src/test/java/com/umc/umc10th/Umc10thApplicationTests.java @@ -0,0 +1,13 @@ +package com.umc.umc10th; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Umc10thApplicationTests { + + @Test + void contextLoads() { + } + +}