diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a6d5bb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +src/main/resources/application.yml +src/main/resources/application.properties \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..ac400e3 --- /dev/null +++ b/build.gradle @@ -0,0 +1,44 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '4.0.6' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +description = 'umc10th2' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:3.0.2' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'org.springframework.security:spring-security-test' + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'io.jsonwebtoken:jjwt-api:0.12.3' + implementation 'io.jsonwebtoken:jjwt-impl:0.12.3' + implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3' + implementation 'org.springframework.boot:spring-boot-configuration-processor' +} + +tasks.named('test') { + useJUnitPlatform() +} \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..d997cfc Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..c61a118 --- /dev/null +++ b/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/gradlew b/gradlew new file mode 100644 index 0000000..739907d --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..c4bdd3a --- /dev/null +++ b/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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..21b7aba --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'umc10th2' diff --git a/src/main/java/com/example/umc10th2/Umc10th2Application.java b/src/main/java/com/example/umc10th2/Umc10th2Application.java new file mode 100644 index 0000000..299e8fc --- /dev/null +++ b/src/main/java/com/example/umc10th2/Umc10th2Application.java @@ -0,0 +1,14 @@ +package com.example.umc10th2; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class Umc10th2Application { + + public static void main(String[] args) { + SpringApplication.run(Umc10th2Application.class, args); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/member/controller/MemberController.java b/src/main/java/com/example/umc10th2/domain/member/controller/MemberController.java new file mode 100644 index 0000000..08fac4e --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/controller/MemberController.java @@ -0,0 +1,48 @@ +package com.example.umc10th2.domain.member.controller; + +import com.example.umc10th2.domain.member.dto.MemberReqDTO; +import com.example.umc10th2.domain.member.dto.MemberResDTO; +import com.example.umc10th2.domain.member.service.MemberService; +import com.example.umc10th2.global.response.ApiResponse; +import com.example.umc10th2.global.security.AuthMember; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.security.SecurityRequirement; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "Member", description = "회원 관련 API") +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/members") +public class MemberController { + + private final MemberService memberService; + + // ✅ Public - 회원가입 + @Operation(summary = "회원가입 (Public)") + @PostMapping("/signup") + public ApiResponse signup( + @RequestBody @Valid MemberReqDTO.SignupRequest request) { + return ApiResponse.success(memberService.signup(request)); + } + + // ✅ Public - 로그인 (JWT 발급) + @Operation(summary = "로그인 (Public) - JWT 토큰 발급") + @PostMapping("/login") + public ApiResponse login( + @RequestBody @Valid MemberReqDTO.LoginRequest request) { + return ApiResponse.success(memberService.login(request)); + } + + // ✅ Private - 마이페이지 (@AuthenticationPrincipal로 토큰에서 사용자 추출) + @Operation(summary = "마이페이지 (Private) - JWT 토큰 필요", + security = @SecurityRequirement(name = "bearerAuth")) + @GetMapping("/my") + public ApiResponse getMyPage( + @AuthenticationPrincipal AuthMember authMember) { + return ApiResponse.success(memberService.getMyPage(authMember)); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/member/converter/MemberConverter.java b/src/main/java/com/example/umc10th2/domain/member/converter/MemberConverter.java new file mode 100644 index 0000000..ed32d07 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/converter/MemberConverter.java @@ -0,0 +1,49 @@ +package com.example.umc10th2.domain.member.converter; + +import com.example.umc10th2.domain.member.dto.MemberReqDTO; +import com.example.umc10th2.domain.member.dto.MemberResDTO; +import com.example.umc10th2.domain.member.entity.Member; + +public class MemberConverter { + + public static Member toMember(MemberReqDTO.SignupRequest request, String encodedPassword) { + return Member.builder() + .name(request.getName()) + .email(request.getEmail()) + .password(encodedPassword) + .phoneNum(request.getPhoneNum()) + .gender(request.getGender()) + .birthDate(request.getBirthDate()) + .address(request.getAddress()) + .build(); + } + + public static MemberResDTO.SignupResponse toSignupResponse(Member member) { + return MemberResDTO.SignupResponse.builder() + .memberId(member.getId()) + .name(member.getName()) + .email(member.getEmail()) + .build(); + } + + // ✅ 로그인 응답 변환 (JWT 토큰 포함) + public static MemberResDTO.LoginResponse toLoginResponse(String accessToken) { + return MemberResDTO.LoginResponse.builder() + .accessToken(accessToken) + .tokenType("Bearer") + .build(); + } + + // ✅ 마이페이지 응답 변환 + public static MemberResDTO.MyPageResponse toMyPageResponse(Member member) { + return MemberResDTO.MyPageResponse.builder() + .memberId(member.getId()) + .name(member.getName()) + .email(member.getEmail()) + .phoneNum(member.getPhoneNum()) + .address(member.getAddress()) + .birthDate(member.getBirthDate()) + .point(member.getPoint()) + .build(); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/member/dto/MemberReqDTO.java b/src/main/java/com/example/umc10th2/domain/member/dto/MemberReqDTO.java new file mode 100644 index 0000000..783447c --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/dto/MemberReqDTO.java @@ -0,0 +1,75 @@ +package com.example.umc10th2.domain.member.dto; + +import com.example.umc10th2.domain.member.enums.Gender; +import com.example.umc10th2.domain.mission.enums.MemberMissionStatus; +import jakarta.validation.constraints.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.List; + +public class MemberReqDTO { + + @Getter + @NoArgsConstructor + public static class SignupRequest { + + @NotBlank(message = "이름은 필수입니다.") + @Size(max = 20, message = "이름은 20자 이하여야 합니다.") + private String name; + + @NotBlank(message = "이메일은 필수입니다.") + @Email(message = "올바른 이메일 형식이 아닙니다.") + private String email; + + @NotBlank(message = "비밀번호는 필수입니다.") + @Size(min = 8, message = "비밀번호는 8자 이상이어야 합니다.") + private String password; + + @NotBlank(message = "전화번호는 필수입니다.") + @Pattern(regexp = "^010-\\d{4}-\\d{4}$", + message = "전화번호 형식이 올바르지 않습니다. (예: 010-1234-5678)") + private String phoneNum; + + @NotNull(message = "성별은 필수입니다.") + private Gender gender; + + @NotNull(message = "생년월일은 필수입니다.") + @Past(message = "생년월일은 과거여야 합니다.") + private LocalDate birthDate; + + @NotBlank(message = "주소는 필수입니다.") + private String address; + + private List foodCategoryIds; + private List termIds; + } + + // ✅ 로그인 요청 DTO + @Getter + @NoArgsConstructor + public static class LoginRequest { + + @NotBlank(message = "이메일은 필수입니다.") + @Email(message = "올바른 이메일 형식이 아닙니다.") + private String email; + + @NotBlank(message = "비밀번호는 필수입니다.") + private String password; + } + + @Getter + @NoArgsConstructor + public static class MyMissionRequest { + + @NotNull(message = "회원 ID는 필수입니다.") + private Long memberId; + + @NotNull(message = "미션 상태는 필수입니다.") + private MemberMissionStatus status; + + @Min(value = 0, message = "페이지는 0 이상이어야 합니다.") + private int page = 0; + } +} diff --git a/src/main/java/com/example/umc10th2/domain/member/dto/MemberResDTO.java b/src/main/java/com/example/umc10th2/domain/member/dto/MemberResDTO.java new file mode 100644 index 0000000..d00fe9a --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/dto/MemberResDTO.java @@ -0,0 +1,42 @@ +package com.example.umc10th2.domain.member.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDate; + +public class MemberResDTO { + + @Getter + @Builder + @AllArgsConstructor + public static class SignupResponse { + private Long memberId; + private String name; + private String email; + } + + // ✅ 로그인 응답 - JWT 토큰 반환 + @Getter + @Builder + @AllArgsConstructor + public static class LoginResponse { + private String accessToken; + private String tokenType; + } + + // ✅ 마이페이지 응답 + @Getter + @Builder + @AllArgsConstructor + public static class MyPageResponse { + private Long memberId; + private String name; + private String email; + private String phoneNum; + private String address; + private LocalDate birthDate; + private Integer point; + } +} diff --git a/src/main/java/com/example/umc10th2/domain/member/entity/Food.java b/src/main/java/com/example/umc10th2/domain/member/entity/Food.java new file mode 100644 index 0000000..c910e89 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/entity/Food.java @@ -0,0 +1,29 @@ +package com.example.umc10th2.domain.member.entity; + +import com.example.umc10th2.domain.member.entity.mapping.MemberFood; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "food") +public class Food extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @OneToMany(mappedBy = "food", cascade = CascadeType.REMOVE) + @Builder.Default + private List memberFoodList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc10th2/domain/member/entity/Member.java b/src/main/java/com/example/umc10th2/domain/member/entity/Member.java new file mode 100644 index 0000000..50a8935 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/entity/Member.java @@ -0,0 +1,72 @@ +package com.example.umc10th2.domain.member.entity; + +import com.example.umc10th2.domain.member.entity.mapping.MemberFood; +import com.example.umc10th2.domain.member.entity.mapping.MemberTerm; +import com.example.umc10th2.domain.mission.entity.mapping.MemberMission; +import com.example.umc10th2.domain.member.enums.Gender; +import com.example.umc10th2.domain.member.enums.MemberStatus; +import com.example.umc10th2.domain.member.enums.SocialType; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "member") +public class Member extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @Column(nullable = false, unique = true, length = 50) + private String email; + + @Column(nullable = false) + private String password; + + @Column(nullable = false, length = 20) + private String phoneNum; + + @Enumerated(EnumType.STRING) + @Builder.Default + private Gender gender = Gender.NONE; + + @Column(nullable = false) + private LocalDate birthDate; + + @Column(nullable = false, length = 100) + private String address; + + @Enumerated(EnumType.STRING) + @Builder.Default + private MemberStatus status = MemberStatus.ACTIVE; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + @Builder.Default + private Integer point = 0; + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + @Builder.Default + private List memberFoodList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + @Builder.Default + private List memberTermList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.REMOVE) + @Builder.Default + private List memberMissionList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc10th2/domain/member/entity/Term.java b/src/main/java/com/example/umc10th2/domain/member/entity/Term.java new file mode 100644 index 0000000..e2bbefc --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/entity/Term.java @@ -0,0 +1,32 @@ +package com.example.umc10th2.domain.member.entity; + +import com.example.umc10th2.domain.member.entity.mapping.MemberTerm; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "term") +public class Term extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String title; + + @Column(nullable = false) + private Boolean optional; + + @OneToMany(mappedBy = "term", cascade = CascadeType.REMOVE) + @Builder.Default + private List memberTermList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc10th2/domain/member/entity/mapping/MemberFood.java b/src/main/java/com/example/umc10th2/domain/member/entity/mapping/MemberFood.java new file mode 100644 index 0000000..bbcd2a4 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/entity/mapping/MemberFood.java @@ -0,0 +1,28 @@ +package com.example.umc10th2.domain.member.entity.mapping; + +import com.example.umc10th2.domain.member.entity.Food; +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "member_food") +public class MemberFood extends BaseEntity { + + @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/src/main/java/com/example/umc10th2/domain/member/entity/mapping/MemberTerm.java b/src/main/java/com/example/umc10th2/domain/member/entity/mapping/MemberTerm.java new file mode 100644 index 0000000..d727ce4 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/entity/mapping/MemberTerm.java @@ -0,0 +1,31 @@ +package com.example.umc10th2.domain.member.entity.mapping; + +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.member.entity.Term; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "member_term") +public class MemberTerm extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Boolean agreed; + + @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/src/main/java/com/example/umc10th2/domain/member/enums/Gender.java b/src/main/java/com/example/umc10th2/domain/member/enums/Gender.java new file mode 100644 index 0000000..ea518cb --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/enums/Gender.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.member.enums; + +public enum Gender { + MALE, FEMALE, NONE +} diff --git a/src/main/java/com/example/umc10th2/domain/member/enums/MemberStatus.java b/src/main/java/com/example/umc10th2/domain/member/enums/MemberStatus.java new file mode 100644 index 0000000..b1fbb79 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/enums/MemberStatus.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.member.enums; + +public enum MemberStatus { + ACTIVE, INACTIVE, BANNED +} diff --git a/src/main/java/com/example/umc10th2/domain/member/enums/SocialType.java b/src/main/java/com/example/umc10th2/domain/member/enums/SocialType.java new file mode 100644 index 0000000..5b6a122 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/enums/SocialType.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.member.enums; + +public enum SocialType { + KAKAO, NAVER, GOOGLE, APPLE +} diff --git a/src/main/java/com/example/umc10th2/domain/member/enums/Term.java b/src/main/java/com/example/umc10th2/domain/member/enums/Term.java new file mode 100644 index 0000000..5f193bb --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/enums/Term.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.member.enums; + +public enum Term { + AGREED, DISAGREED +} diff --git a/src/main/java/com/example/umc10th2/domain/member/exception/MemberException.java b/src/main/java/com/example/umc10th2/domain/member/exception/MemberException.java new file mode 100644 index 0000000..d76315b --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/exception/MemberException.java @@ -0,0 +1,10 @@ +package com.example.umc10th2.domain.member.exception; + +import com.example.umc10th2.domain.member.exception.code.MemberErrorCode; +import com.example.umc10th2.global.exception.GeneralException; + +public class MemberException extends GeneralException { + public MemberException(MemberErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/member/exception/code/MemberErrorCode.java b/src/main/java/com/example/umc10th2/domain/member/exception/code/MemberErrorCode.java new file mode 100644 index 0000000..8faa46d --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/exception/code/MemberErrorCode.java @@ -0,0 +1,18 @@ +package com.example.umc10th2.domain.member.exception.code; + +import com.example.umc10th2.global.exception.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MemberErrorCode implements BaseErrorCode { + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "MEMBER404", "존재하지 않는 회원입니다."), + DUPLICATE_EMAIL(HttpStatus.CONFLICT, "MEMBER409", "이미 사용 중인 이메일입니다."), + INVALID_PASSWORD(HttpStatus.UNAUTHORIZED, "MEMBER401", "비밀번호가 올바르지 않습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/domain/member/exception/code/MemberSuccessCode.java b/src/main/java/com/example/umc10th2/domain/member/exception/code/MemberSuccessCode.java new file mode 100644 index 0000000..c56c9b9 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/exception/code/MemberSuccessCode.java @@ -0,0 +1,13 @@ +package com.example.umc10th2.domain.member.exception.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MemberSuccessCode { + SIGNUP_SUCCESS("MEMBER201", "회원가입에 성공하였습니다."); + + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/domain/member/repository/MemberRepository.java b/src/main/java/com/example/umc10th2/domain/member/repository/MemberRepository.java new file mode 100644 index 0000000..8c1a9e7 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/repository/MemberRepository.java @@ -0,0 +1,11 @@ +package com.example.umc10th2.domain.member.repository; + +import com.example.umc10th2.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + Optional findByEmailAndDeletedAtIsNull(String email); + boolean existsByEmail(String email); +} diff --git a/src/main/java/com/example/umc10th2/domain/member/service/MemberService.java b/src/main/java/com/example/umc10th2/domain/member/service/MemberService.java new file mode 100644 index 0000000..0563956 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/member/service/MemberService.java @@ -0,0 +1,59 @@ +package com.example.umc10th2.domain.member.service; + +import com.example.umc10th2.domain.member.converter.MemberConverter; +import com.example.umc10th2.domain.member.dto.MemberReqDTO; +import com.example.umc10th2.domain.member.dto.MemberResDTO; +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.member.exception.MemberException; +import com.example.umc10th2.domain.member.exception.code.MemberErrorCode; +import com.example.umc10th2.domain.member.repository.MemberRepository; +import com.example.umc10th2.global.security.AuthMember; +import com.example.umc10th2.global.security.JwtUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MemberService { + + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + private final JwtUtil jwtUtil; + + // ✅ 회원가입 + @Transactional + public MemberResDTO.SignupResponse signup(MemberReqDTO.SignupRequest request) { + if (memberRepository.existsByEmail(request.getEmail())) { + throw new MemberException(MemberErrorCode.DUPLICATE_EMAIL); + } + String encodedPassword = passwordEncoder.encode(request.getPassword()); + Member member = MemberConverter.toMember(request, encodedPassword); + return MemberConverter.toSignupResponse(memberRepository.save(member)); + } + + // ✅ 로그인 - 비밀번호 검증 후 JWT 발급 + public MemberResDTO.LoginResponse login(MemberReqDTO.LoginRequest request) { + Member member = memberRepository.findByEmailAndDeletedAtIsNull(request.getEmail()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + if (!passwordEncoder.matches(request.getPassword(), member.getPassword())) { + throw new MemberException(MemberErrorCode.INVALID_PASSWORD); + } + + String accessToken = jwtUtil.createAccessToken(new AuthMember(member)); + return MemberConverter.toLoginResponse(accessToken); + } + + // ✅ 마이페이지 - 토큰에서 추출한 AuthMember로 조회 + public MemberResDTO.MyPageResponse getMyPage(AuthMember authMember) { + return MemberConverter.toMyPageResponse(authMember.getMember()); + } + + public Member getMember(Long memberId) { + return memberRepository.findById(memberId) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/controller/MissionController.java b/src/main/java/com/example/umc10th2/domain/mission/controller/MissionController.java new file mode 100644 index 0000000..efc21d1 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/controller/MissionController.java @@ -0,0 +1,27 @@ +package com.example.umc10th2.domain.mission.controller; + +import com.example.umc10th2.domain.mission.dto.MissionReqDTO; +import com.example.umc10th2.domain.mission.dto.MissionResDTO; +import com.example.umc10th2.domain.mission.service.MissionService; +import com.example.umc10th2.global.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/missions") +public class MissionController { + + private final MissionService missionService; + + // ✅ 내가 진행중인 미션 조회 (오프셋 페이징, memberId는 Request Body에서) + @Operation(summary = "내 미션 목록 조회 (오프셋 페이지네이션)", + description = "CHALLENGING / COMPLETE 상태로 필터링 가능. memberId는 Request Body로 전달.") + @PostMapping("/my") + public ApiResponse getMyMissions( + @RequestBody @Valid MissionReqDTO.MyMissionRequest request) { + return ApiResponse.success(missionService.getMyMissions(request)); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/converter/MissionConverter.java b/src/main/java/com/example/umc10th2/domain/mission/converter/MissionConverter.java new file mode 100644 index 0000000..3a795e3 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/converter/MissionConverter.java @@ -0,0 +1,38 @@ +package com.example.umc10th2.domain.mission.converter; + +import com.example.umc10th2.domain.mission.dto.MissionResDTO; +import com.example.umc10th2.domain.mission.entity.mapping.MemberMission; +import org.springframework.data.domain.Page; + +import java.util.List; +import java.util.stream.Collectors; + +public class MissionConverter { + + public static MissionResDTO.MyMissionResponse toMyMissionResponse(MemberMission mm) { + return MissionResDTO.MyMissionResponse.builder() + .memberMissionId(mm.getId()) + .missionId(mm.getMission().getId()) + .storeName(mm.getMission().getStore().getName()) + .missionSpec(mm.getMission().getMissionSpec()) + .point(mm.getMission().getPoint()) + .deadline(mm.getMission().getDeadline()) + .status(mm.getStatus().name()) + .build(); + } + + public static MissionResDTO.MyMissionPageResponse toMyMissionPageResponse(Page page) { + List list = page.getContent().stream() + .map(MissionConverter::toMyMissionResponse) + .collect(Collectors.toList()); + + return MissionResDTO.MyMissionPageResponse.builder() + .missions(list) + .currentPage(page.getNumber()) + .totalPages(page.getTotalPages()) + .totalElements(page.getTotalElements()) + .isFirst(page.isFirst()) + .isLast(page.isLast()) + .build(); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/dto/MissionReqDTO.java b/src/main/java/com/example/umc10th2/domain/mission/dto/MissionReqDTO.java new file mode 100644 index 0000000..ebde505 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/dto/MissionReqDTO.java @@ -0,0 +1,25 @@ +package com.example.umc10th2.domain.mission.dto; + +import com.example.umc10th2.domain.mission.enums.MemberMissionStatus; +import jakarta.validation.constraints.Min; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class MissionReqDTO { + + // ✅ 내가 진행중인 미션 조회 요청 + @Getter + @NoArgsConstructor + public static class MyMissionRequest { + + @NotNull(message = "회원 ID는 필수입니다.") + private Long memberId; + + @NotNull(message = "미션 상태는 필수입니다.") + private MemberMissionStatus status; + + @Min(value = 0, message = "페이지는 0 이상이어야 합니다.") + private int page = 0; + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/dto/MissionResDTO.java b/src/main/java/com/example/umc10th2/domain/mission/dto/MissionResDTO.java new file mode 100644 index 0000000..d16a78f --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/dto/MissionResDTO.java @@ -0,0 +1,36 @@ +package com.example.umc10th2.domain.mission.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; +import java.util.List; + +public class MissionResDTO { + + @Getter + @Builder + @AllArgsConstructor + public static class MyMissionResponse { + private Long memberMissionId; + private Long missionId; + private String storeName; + private String missionSpec; + private Integer point; + private LocalDateTime deadline; + private String status; + } + + @Getter + @Builder + @AllArgsConstructor + public static class MyMissionPageResponse { + private List missions; + private int currentPage; + private int totalPages; + private long totalElements; + private boolean isFirst; + private boolean isLast; + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/entity/Location.java b/src/main/java/com/example/umc10th2/domain/mission/entity/Location.java new file mode 100644 index 0000000..6d9a330 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/entity/Location.java @@ -0,0 +1,31 @@ +package com.example.umc10th2.domain.mission.entity; + +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "location") +public class Location extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String city; + + @Column(nullable = false, length = 50) + private String district; + + @OneToMany(mappedBy = "location") + @Builder.Default + private List storeList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/entity/Mission.java b/src/main/java/com/example/umc10th2/domain/mission/entity/Mission.java new file mode 100644 index 0000000..71684ff --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/entity/Mission.java @@ -0,0 +1,45 @@ +package com.example.umc10th2.domain.mission.entity; + +import com.example.umc10th2.domain.mission.entity.mapping.MemberMission; +import com.example.umc10th2.domain.mission.enums.MissionStatus; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "mission") +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String missionSpec; + + @Column(nullable = false) + private LocalDateTime deadline; + + @Column(nullable = false) + private Integer point; + + @Enumerated(EnumType.STRING) + @Builder.Default + private MissionStatus status = MissionStatus.AVAILABLE; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.REMOVE) + @Builder.Default + private List memberMissionList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/entity/Store.java b/src/main/java/com/example/umc10th2/domain/mission/entity/Store.java new file mode 100644 index 0000000..564326d --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/entity/Store.java @@ -0,0 +1,46 @@ +package com.example.umc10th2.domain.mission.entity; + +import com.example.umc10th2.domain.review.entity.Review; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "store") +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String name; + + @Column(nullable = false, length = 20) + private String managerNumber; + + @Column(nullable = false) + private String detailAddress; + + @Builder.Default + private Float score = 0.0f; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "location_id") + private Location location; + + @OneToMany(mappedBy = "store", cascade = CascadeType.REMOVE) + @Builder.Default + private List missionList = new ArrayList<>(); + + @OneToMany(mappedBy = "store", cascade = CascadeType.REMOVE) + @Builder.Default + private List reviewList = new ArrayList<>(); +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/entity/mapping/MemberMission.java b/src/main/java/com/example/umc10th2/domain/mission/entity/mapping/MemberMission.java new file mode 100644 index 0000000..c8099ae --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/entity/mapping/MemberMission.java @@ -0,0 +1,38 @@ +package com.example.umc10th2.domain.mission.entity.mapping; + +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.mission.entity.Mission; +import com.example.umc10th2.domain.mission.enums.MemberMissionStatus; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "member_mission") +public class MemberMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Builder.Default + private MemberMissionStatus status = MemberMissionStatus.CHALLENGING; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; + + // 미션 완료 처리 메서드 + public void complete() { + this.status = MemberMissionStatus.COMPLETE; + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/enums/Address.java b/src/main/java/com/example/umc10th2/domain/mission/enums/Address.java new file mode 100644 index 0000000..0dc78d6 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/enums/Address.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.mission.enums; + +public enum Address { + SEOUL, BUSAN, DAEGU, INCHEON, GWANGJU, DAEJEON, ULSAN +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/enums/MemberMissionStatus.java b/src/main/java/com/example/umc10th2/domain/mission/enums/MemberMissionStatus.java new file mode 100644 index 0000000..2a094f4 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/enums/MemberMissionStatus.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.mission.enums; + +public enum MemberMissionStatus { + CHALLENGING, COMPLETE +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/enums/MissionStatus.java b/src/main/java/com/example/umc10th2/domain/mission/enums/MissionStatus.java new file mode 100644 index 0000000..b85fc21 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package com.example.umc10th2.domain.mission.enums; + +public enum MissionStatus { + AVAILABLE, CHALLENGING, COMPLETE +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/exception/MissionException.java b/src/main/java/com/example/umc10th2/domain/mission/exception/MissionException.java new file mode 100644 index 0000000..5f30d5c --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/exception/MissionException.java @@ -0,0 +1,10 @@ +package com.example.umc10th2.domain.mission.exception; + +import com.example.umc10th2.domain.mission.exception.code.MissionErrorCode; +import com.example.umc10th2.global.exception.GeneralException; + +public class MissionException extends GeneralException { + public MissionException(MissionErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/exception/code/MissionErrorCode.java b/src/main/java/com/example/umc10th2/domain/mission/exception/code/MissionErrorCode.java new file mode 100644 index 0000000..16d546b --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/exception/code/MissionErrorCode.java @@ -0,0 +1,17 @@ +package com.example.umc10th2.domain.mission.exception.code; + +import com.example.umc10th2.global.exception.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MissionErrorCode implements BaseErrorCode { + MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION404", "존재하지 않는 미션입니다."), + MISSION_ALREADY_CHALLENGING(HttpStatus.CONFLICT, "MISSION409", "이미 도전 중인 미션입니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/exception/code/MissionSuccessCode.java b/src/main/java/com/example/umc10th2/domain/mission/exception/code/MissionSuccessCode.java new file mode 100644 index 0000000..971bb06 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/exception/code/MissionSuccessCode.java @@ -0,0 +1,13 @@ +package com.example.umc10th2.domain.mission.exception.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MissionSuccessCode { + MISSION_FOUND("MISSION200", "미션 조회에 성공하였습니다."); + + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/repository/MemberMissionRepository.java b/src/main/java/com/example/umc10th2/domain/mission/repository/MemberMissionRepository.java new file mode 100644 index 0000000..1c3c9ab --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/repository/MemberMissionRepository.java @@ -0,0 +1,25 @@ +package com.example.umc10th2.domain.mission.repository; + +import com.example.umc10th2.domain.mission.entity.mapping.MemberMission; +import com.example.umc10th2.domain.mission.enums.MemberMissionStatus; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +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 = :status") + Page findByMemberIdAndStatus( + @Param("memberId") Long memberId, + @Param("status") MemberMissionStatus status, + Pageable pageable + ); + + boolean existsByMemberIdAndMissionId(Long memberId, Long missionId); +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/repository/MissionRepository.java b/src/main/java/com/example/umc10th2/domain/mission/repository/MissionRepository.java new file mode 100644 index 0000000..4434fc7 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/repository/MissionRepository.java @@ -0,0 +1,23 @@ +package com.example.umc10th2.domain.mission.repository; + +import com.example.umc10th2.domain.mission.entity.Mission; +import com.example.umc10th2.domain.mission.enums.MissionStatus; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +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 AND m.status = :status") + Page findAvailableMissionsByLocation( + @Param("locationId") Long locationId, + @Param("status") MissionStatus status, + Pageable pageable + ); +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/repository/StoreRepository.java b/src/main/java/com/example/umc10th2/domain/mission/repository/StoreRepository.java new file mode 100644 index 0000000..87c199e --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.example.umc10th2.domain.mission.repository; + +import com.example.umc10th2.domain.mission.entity.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} diff --git a/src/main/java/com/example/umc10th2/domain/mission/service/MissionService.java b/src/main/java/com/example/umc10th2/domain/mission/service/MissionService.java new file mode 100644 index 0000000..4548cde --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/mission/service/MissionService.java @@ -0,0 +1,39 @@ +package com.example.umc10th2.domain.mission.service; + +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.member.exception.MemberException; +import com.example.umc10th2.domain.member.exception.code.MemberErrorCode; +import com.example.umc10th2.domain.member.repository.MemberRepository; +import com.example.umc10th2.domain.mission.dto.MissionReqDTO; +import com.example.umc10th2.domain.mission.dto.MissionResDTO; +import com.example.umc10th2.domain.mission.entity.mapping.MemberMission; +import com.example.umc10th2.domain.mission.enums.MemberMissionStatus; +import com.example.umc10th2.domain.mission.repository.MemberMissionRepository; +import com.example.umc10th2.domain.mission.converter.MissionConverter; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MissionService { + + private final MemberMissionRepository memberMissionRepository; + private final MemberRepository memberRepository; + + // ✅ 내가 진행중인 미션 조회 (오프셋 기반 페이지네이션) + public MissionResDTO.MyMissionPageResponse getMyMissions(MissionReqDTO.MyMissionRequest request) { + // 회원 존재 여부 확인 + memberRepository.findById(request.getMemberId()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + PageRequest pageable = PageRequest.of(request.getPage(), 10); + Page page = memberMissionRepository.findByMemberIdAndStatus( + request.getMemberId(), request.getStatus(), pageable); + + return MissionConverter.toMyMissionPageResponse(page); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/review/controller/ReviewController.java b/src/main/java/com/example/umc10th2/domain/review/controller/ReviewController.java new file mode 100644 index 0000000..5661044 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/controller/ReviewController.java @@ -0,0 +1,45 @@ +package com.example.umc10th2.domain.review.controller; + +import com.example.umc10th2.domain.review.dto.ReviewReqDTO; +import com.example.umc10th2.domain.review.dto.ReviewResDTO; +import com.example.umc10th2.domain.review.service.ReviewService; +import com.example.umc10th2.global.response.ApiResponse; +import io.swagger.v3.oas.annotations.Operation; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/reviews") +public class ReviewController { + + private final ReviewService reviewService; + + // ✅ 리뷰 작성 (@Valid 검증 포함) + @Operation(summary = "리뷰 작성", description = "별점 1~5, 내용 200자 이하 검증") + @PostMapping + public ApiResponse createReview( + @RequestBody @Valid ReviewReqDTO.CreateReviewRequest request) { + reviewService.createReview(request); + return ApiResponse.success(null); + } + + // ✅ 내가 작성한 리뷰 조회 (커서 기반 - ID순) + @Operation(summary = "내 리뷰 조회 - ID순 (커서 기반)", + description = "lastId=0으로 첫 조회. 응답의 nextCursorId를 다음 요청 lastId로 사용.") + @PostMapping("/my/by-id") + public ApiResponse getMyReviewsById( + @RequestBody @Valid ReviewReqDTO.MyReviewRequest request) { + return ApiResponse.success(reviewService.getMyReviewsById(request)); + } + + // ✅ 내가 작성한 리뷰 조회 (커서 기반 - 별점순) + @Operation(summary = "내 리뷰 조회 - 별점순 (커서 기반)", + description = "첫 조회 시 lastScore=5.0, lastId=0. 응답의 nextCursorScore/nextCursorId를 다음 요청에 사용.") + @PostMapping("/my/by-score") + public ApiResponse getMyReviewsByScore( + @RequestBody @Valid ReviewReqDTO.MyReviewRequest request) { + return ApiResponse.success(reviewService.getMyReviewsByScore(request)); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/review/converter/ReviewConverter.java b/src/main/java/com/example/umc10th2/domain/review/converter/ReviewConverter.java new file mode 100644 index 0000000..7607903 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/converter/ReviewConverter.java @@ -0,0 +1,40 @@ +package com.example.umc10th2.domain.review.converter; + +import com.example.umc10th2.domain.review.dto.ReviewResDTO; +import com.example.umc10th2.domain.review.entity.Review; + +import java.util.List; +import java.util.stream.Collectors; + +public class ReviewConverter { + + public static ReviewResDTO.ReviewResponse toReviewResponse(Review review) { + return ReviewResDTO.ReviewResponse.builder() + .reviewId(review.getId()) + .storeName(review.getStore().getName()) + .body(review.getBody()) + .score(review.getScore()) + .createdAt(review.getCreatedAt()) + .build(); + } + + public static ReviewResDTO.MyReviewCursorResponse toCursorResponse( + List reviews, int size, String sortBy) { + + boolean hasNext = reviews.size() > size; + // size+1개 조회 후 hasNext 판단, 실제 응답은 size개만 + List result = hasNext ? reviews.subList(0, size) : reviews; + + Long nextCursorId = result.isEmpty() ? null : result.get(result.size() - 1).getId(); + Float nextCursorScore = result.isEmpty() ? null : result.get(result.size() - 1).getScore(); + + return ReviewResDTO.MyReviewCursorResponse.builder() + .reviews(result.stream() + .map(ReviewConverter::toReviewResponse) + .collect(Collectors.toList())) + .nextCursorId(nextCursorId) + .nextCursorScore("score".equals(sortBy) ? nextCursorScore : null) + .hasNext(hasNext) + .build(); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/review/dto/ReviewReqDTO.java b/src/main/java/com/example/umc10th2/domain/review/dto/ReviewReqDTO.java new file mode 100644 index 0000000..7bcdf45 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/dto/ReviewReqDTO.java @@ -0,0 +1,50 @@ +package com.example.umc10th2.domain.review.dto; + +import jakarta.validation.constraints.*; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class ReviewReqDTO { + + // ✅ 리뷰 작성 요청 (검증 어노테이션 포함) + @Getter + @NoArgsConstructor + public static class CreateReviewRequest { + + @NotNull(message = "회원 ID는 필수입니다.") + private Long memberId; + + @NotNull(message = "가게 ID는 필수입니다.") + private Long storeId; + + @NotBlank(message = "리뷰 내용은 필수입니다.") + @Size(max = 200, message = "리뷰 내용은 200자 이하여야 합니다.") + private String body; + + @NotNull(message = "별점은 필수입니다.") + @Min(value = 1, message = "별점은 최소 1점입니다.") + @Max(value = 5, message = "별점은 최대 5점입니다.") + private Float score; + } + + // ✅ 내 리뷰 조회 요청 (커서 기반) + @Getter + @NoArgsConstructor + public static class MyReviewRequest { + + @NotNull(message = "회원 ID는 필수입니다.") + private Long memberId; + + // 정렬 기준: "id" or "score" + @NotBlank(message = "정렬 기준은 필수입니다.") + private String sortBy = "id"; + + // 커서값 (첫 조회 시 0 / null) + private Long lastId = 0L; + private Float lastScore = Float.MAX_VALUE; + + @Min(value = 1, message = "조회 개수는 1 이상이어야 합니다.") + @Max(value = 50, message = "조회 개수는 50 이하여야 합니다.") + private int size = 10; + } +} diff --git a/src/main/java/com/example/umc10th2/domain/review/dto/ReviewResDTO.java b/src/main/java/com/example/umc10th2/domain/review/dto/ReviewResDTO.java new file mode 100644 index 0000000..dfeb57f --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/dto/ReviewResDTO.java @@ -0,0 +1,33 @@ +package com.example.umc10th2.domain.review.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; + +import java.time.LocalDateTime; +import java.util.List; + +public class ReviewResDTO { + + @Getter + @Builder + @AllArgsConstructor + public static class ReviewResponse { + private Long reviewId; + private String storeName; + private String body; + private Float score; + private LocalDateTime createdAt; + } + + // ✅ 커서 기반 페이지네이션 응답 + @Getter + @Builder + @AllArgsConstructor + public static class MyReviewCursorResponse { + private List reviews; + private Long nextCursorId; // 다음 요청 시 lastId로 사용 + private Float nextCursorScore; // 다음 요청 시 lastScore로 사용 (별점 정렬 시) + private boolean hasNext; // 다음 페이지 존재 여부 + } +} diff --git a/src/main/java/com/example/umc10th2/domain/review/entity/Reply.java b/src/main/java/com/example/umc10th2/domain/review/entity/Reply.java new file mode 100644 index 0000000..6aebaf9 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/entity/Reply.java @@ -0,0 +1,25 @@ +package com.example.umc10th2.domain.review.entity; + +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "reply") +public class Reply extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 200) + private String body; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} diff --git a/src/main/java/com/example/umc10th2/domain/review/entity/Review.java b/src/main/java/com/example/umc10th2/domain/review/entity/Review.java new file mode 100644 index 0000000..71c36c8 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/entity/Review.java @@ -0,0 +1,34 @@ +package com.example.umc10th2.domain.review.entity; + +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.mission.entity.Store; +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "review") +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 200) + private String body; + + @Column(nullable = false) + private Float score; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; +} diff --git a/src/main/java/com/example/umc10th2/domain/review/entity/ReviewPhoto.java b/src/main/java/com/example/umc10th2/domain/review/entity/ReviewPhoto.java new file mode 100644 index 0000000..31f02ac --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/entity/ReviewPhoto.java @@ -0,0 +1,25 @@ +package com.example.umc10th2.domain.review.entity; + +import com.example.umc10th2.global.common.BaseEntity; +import jakarta.persistence.*; +import lombok.*; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@Table(name = "review_photo") +public class ReviewPhoto extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String photoUrl; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} diff --git a/src/main/java/com/example/umc10th2/domain/review/exception/ReviewException.java b/src/main/java/com/example/umc10th2/domain/review/exception/ReviewException.java new file mode 100644 index 0000000..6dc6f8a --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/exception/ReviewException.java @@ -0,0 +1,10 @@ +package com.example.umc10th2.domain.review.exception; + +import com.example.umc10th2.domain.review.exception.code.ReviewErrorCode; +import com.example.umc10th2.global.exception.GeneralException; + +public class ReviewException extends GeneralException { + public ReviewException(ReviewErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/com/example/umc10th2/domain/review/exception/code/ReviewErrorCode.java b/src/main/java/com/example/umc10th2/domain/review/exception/code/ReviewErrorCode.java new file mode 100644 index 0000000..010dd3c --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/exception/code/ReviewErrorCode.java @@ -0,0 +1,17 @@ +package com.example.umc10th2.domain.review.exception.code; + +import com.example.umc10th2.global.exception.BaseErrorCode; +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ReviewErrorCode implements BaseErrorCode { + REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW404", "존재하지 않는 리뷰입니다."), + STORE_NOT_FOUND(HttpStatus.NOT_FOUND, "STORE404", "존재하지 않는 가게입니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/domain/review/exception/code/ReviewSuccessCode.java b/src/main/java/com/example/umc10th2/domain/review/exception/code/ReviewSuccessCode.java new file mode 100644 index 0000000..eec1baa --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/exception/code/ReviewSuccessCode.java @@ -0,0 +1,14 @@ +package com.example.umc10th2.domain.review.exception.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ReviewSuccessCode { + REVIEW_CREATED("REVIEW201", "리뷰가 작성되었습니다."), + REVIEW_FOUND("REVIEW200", "리뷰 조회에 성공하였습니다."); + + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/domain/review/repository/ReviewRepository.java b/src/main/java/com/example/umc10th2/domain/review/repository/ReviewRepository.java new file mode 100644 index 0000000..efd4d83 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/repository/ReviewRepository.java @@ -0,0 +1,33 @@ +package com.example.umc10th2.domain.review.repository; + +import com.example.umc10th2.domain.review.entity.Review; +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 ReviewRepository extends JpaRepository { + + // ✅ 커서 기반 - ID 순 (lastId보다 큰 ID의 리뷰, limit개) + @Query("SELECT r FROM Review r " + + "WHERE r.member.id = :memberId AND r.id > :lastId " + + "ORDER BY r.id ASC") + List findByMemberIdOrderById( + @Param("memberId") Long memberId, + @Param("lastId") Long lastId, + org.springframework.data.domain.Pageable pageable + ); + + // ✅ 커서 기반 - 별점 순 (lastScore보다 낮거나, 같으면 lastId보다 큰 ID) + @Query("SELECT r FROM Review r " + + "WHERE r.member.id = :memberId " + + "AND (r.score < :lastScore OR (r.score = :lastScore AND r.id > :lastId)) " + + "ORDER BY r.score DESC, r.id ASC") + List findByMemberIdOrderByScore( + @Param("memberId") Long memberId, + @Param("lastScore") Float lastScore, + @Param("lastId") Long lastId, + org.springframework.data.domain.Pageable pageable + ); +} diff --git a/src/main/java/com/example/umc10th2/domain/review/service/ReviewService.java b/src/main/java/com/example/umc10th2/domain/review/service/ReviewService.java new file mode 100644 index 0000000..b3ed2a1 --- /dev/null +++ b/src/main/java/com/example/umc10th2/domain/review/service/ReviewService.java @@ -0,0 +1,74 @@ +package com.example.umc10th2.domain.review.service; + +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.member.exception.MemberException; +import com.example.umc10th2.domain.member.exception.code.MemberErrorCode; +import com.example.umc10th2.domain.member.repository.MemberRepository; +import com.example.umc10th2.domain.mission.entity.Store; +import com.example.umc10th2.domain.mission.repository.StoreRepository; +import com.example.umc10th2.domain.review.converter.ReviewConverter; +import com.example.umc10th2.domain.review.dto.ReviewReqDTO; +import com.example.umc10th2.domain.review.dto.ReviewResDTO; +import com.example.umc10th2.domain.review.entity.Review; +import com.example.umc10th2.domain.review.exception.ReviewException; +import com.example.umc10th2.domain.review.exception.code.ReviewErrorCode; +import com.example.umc10th2.domain.review.repository.ReviewRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.List; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class ReviewService { + + private final ReviewRepository reviewRepository; + private final MemberRepository memberRepository; + private final StoreRepository storeRepository; + + // ✅ 리뷰 작성 + @Transactional + public void createReview(ReviewReqDTO.CreateReviewRequest request) { + Member member = memberRepository.findById(request.getMemberId()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + Store store = storeRepository.findById(request.getStoreId()) + .orElseThrow(() -> new ReviewException(ReviewErrorCode.STORE_NOT_FOUND)); + + Review review = Review.builder() + .body(request.getBody()) + .score(request.getScore()) + .member(member) + .store(store) + .build(); + + reviewRepository.save(review); + } + + // ✅ 내가 작성한 리뷰 조회 (커서 기반 - ID순) + public ReviewResDTO.MyReviewCursorResponse getMyReviewsById(ReviewReqDTO.MyReviewRequest request) { + memberRepository.findById(request.getMemberId()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + // size+1개 조회해서 hasNext 판단 + PageRequest pageable = PageRequest.of(0, request.getSize() + 1); + List reviews = reviewRepository.findByMemberIdOrderById( + request.getMemberId(), request.getLastId(), pageable); + + return ReviewConverter.toCursorResponse(reviews, request.getSize(), "id"); + } + + // ✅ 내가 작성한 리뷰 조회 (커서 기반 - 별점순) + public ReviewResDTO.MyReviewCursorResponse getMyReviewsByScore(ReviewReqDTO.MyReviewRequest request) { + memberRepository.findById(request.getMemberId()) + .orElseThrow(() -> new MemberException(MemberErrorCode.MEMBER_NOT_FOUND)); + + PageRequest pageable = PageRequest.of(0, request.getSize() + 1); + List reviews = reviewRepository.findByMemberIdOrderByScore( + request.getMemberId(), request.getLastScore(), request.getLastId(), pageable); + + return ReviewConverter.toCursorResponse(reviews, request.getSize(), "score"); + } +} diff --git a/src/main/java/com/example/umc10th2/global/common/BaseEntity.java b/src/main/java/com/example/umc10th2/global/common/BaseEntity.java new file mode 100644 index 0000000..78dfbb4 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/common/BaseEntity.java @@ -0,0 +1,26 @@ +package com.example.umc10th2.global.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; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseEntity { + + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; + + private LocalDateTime deletedAt; +} diff --git a/src/main/java/com/example/umc10th2/global/config/SecurityConfig.java b/src/main/java/com/example/umc10th2/global/config/SecurityConfig.java new file mode 100644 index 0000000..c5895ea --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/config/SecurityConfig.java @@ -0,0 +1,69 @@ +package com.example.umc10th2.global.config; + +import com.example.umc10th2.global.security.CustomAccessDenied; +import com.example.umc10th2.global.security.CustomEntryPoint; +import com.example.umc10th2.global.security.CustomUserDetailsService; +import com.example.umc10th2.global.security.JwtAuthFilter; +import com.example.umc10th2.global.security.JwtUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +@EnableWebSecurity +@Configuration +@RequiredArgsConstructor +public class SecurityConfig { + + private final CustomEntryPoint customEntryPoint; + private final CustomAccessDenied customAccessDenied; + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + + private final String[] allowUris = { + "/swagger-ui/**", + "/swagger-resources/**", + "/v3/api-docs/**", + "/api/v1/members/signup", + "/api/v1/members/login", + "/login.html" + }; + + @Bean + public JwtAuthFilter jwtAuthFilter() { + return new JwtAuthFilter(jwtUtil, customUserDetailsService); + } + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + // JWT는 Stateless + .sessionManagement(session -> + session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)) + .authorizeHttpRequests(requests -> requests + .requestMatchers(allowUris).permitAll() + .anyRequest().authenticated() + ) + // JWT 필터를 UsernamePasswordAuthenticationFilter 앞에 삽입 + .addFilterBefore(jwtAuthFilter(), UsernamePasswordAuthenticationFilter.class) + .exceptionHandling(ex -> ex + .authenticationEntryPoint(customEntryPoint) + .accessDeniedHandler(customAccessDenied) + ); + + return http.build(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/example/umc10th2/global/config/SwaggerConfig.java b/src/main/java/com/example/umc10th2/global/config/SwaggerConfig.java new file mode 100644 index 0000000..ec5d8eb --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/config/SwaggerConfig.java @@ -0,0 +1,28 @@ +package com.example.umc10th2.global.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.SecurityScheme; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .info(new Info() + .title("UMC 10th Spring Boot API") + .version("v1.0") + .description("UMC 10th 스터디 Spring Boot 프로젝트 API 문서")) + .components(new Components() + .addSecuritySchemes("bearerAuth", + new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .name("bearerAuth"))); + } +} diff --git a/src/main/java/com/example/umc10th2/global/exception/BaseErrorCode.java b/src/main/java/com/example/umc10th2/global/exception/BaseErrorCode.java new file mode 100644 index 0000000..30c2601 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/exception/BaseErrorCode.java @@ -0,0 +1,9 @@ +package com.example.umc10th2.global.exception; + +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + String getCode(); + String getMessage(); + HttpStatus getStatus(); +} diff --git a/src/main/java/com/example/umc10th2/global/exception/GeneralErrorCode.java b/src/main/java/com/example/umc10th2/global/exception/GeneralErrorCode.java new file mode 100644 index 0000000..aca64c4 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/exception/GeneralErrorCode.java @@ -0,0 +1,16 @@ +package com.example.umc10th2.global.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum GeneralErrorCode implements BaseErrorCode { + UNAUTHORIZED(HttpStatus.UNAUTHORIZED, "AUTH401", "로그인이 필요합니다."), + FORBIDDEN(HttpStatus.FORBIDDEN, "AUTH403", "접근 권한이 없습니다."); + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/src/main/java/com/example/umc10th2/global/exception/GeneralException.java b/src/main/java/com/example/umc10th2/global/exception/GeneralException.java new file mode 100644 index 0000000..a2f86a7 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/exception/GeneralException.java @@ -0,0 +1,14 @@ +package com.example.umc10th2.global.exception; + +import lombok.Getter; + +@Getter +public class GeneralException extends RuntimeException { + + private final BaseErrorCode errorCode; + + public GeneralException(BaseErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} diff --git a/src/main/java/com/example/umc10th2/global/exception/GlobalExceptionHandler.java b/src/main/java/com/example/umc10th2/global/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..ae7a092 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/exception/GlobalExceptionHandler.java @@ -0,0 +1,39 @@ +package com.example.umc10th2.global.exception; + +import com.example.umc10th2.global.response.ApiResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +import java.util.stream.Collectors; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ApiResponse handleValidationException(MethodArgumentNotValidException e) { + String message = e.getBindingResult().getFieldErrors().stream() + .map(FieldError::getDefaultMessage) + .collect(Collectors.joining(", ")); + return ApiResponse.fail("COMMON400", message); + } + + @ExceptionHandler(GeneralException.class) + public ResponseEntity> handleGeneralException(GeneralException e) { + BaseErrorCode errorCode = e.getErrorCode(); + return ResponseEntity + .status(errorCode.getStatus()) + .body(ApiResponse.onFailure(errorCode, null)); + } + + @ExceptionHandler(Exception.class) + @ResponseStatus(HttpStatus.INTERNAL_SERVER_ERROR) + public ApiResponse handleException(Exception e) { + return ApiResponse.fail("COMMON500", e.getMessage()); + } +} diff --git a/src/main/java/com/example/umc10th2/global/response/ApiResponse.java b/src/main/java/com/example/umc10th2/global/response/ApiResponse.java new file mode 100644 index 0000000..25a38eb --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/response/ApiResponse.java @@ -0,0 +1,32 @@ +package com.example.umc10th2.global.response; + +import com.example.umc10th2.global.exception.BaseErrorCode; +import lombok.Getter; + +@Getter +public class ApiResponse { + + private final boolean isSuccess; + private final String code; + private final String message; + private final T result; + + private ApiResponse(boolean isSuccess, String code, String message, T result) { + this.isSuccess = isSuccess; + this.code = code; + this.message = message; + this.result = result; + } + + public static ApiResponse success(T result) { + return new ApiResponse<>(true, "COMMON200", "성공", result); + } + + public static ApiResponse fail(String code, String message) { + return new ApiResponse<>(false, code, message, null); + } + + public static ApiResponse onFailure(BaseErrorCode errorCode, T data) { + return new ApiResponse<>(false, errorCode.getCode(), errorCode.getMessage(), data); + } +} diff --git a/src/main/java/com/example/umc10th2/global/security/AuthMember.java b/src/main/java/com/example/umc10th2/global/security/AuthMember.java new file mode 100644 index 0000000..7bf5788 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/AuthMember.java @@ -0,0 +1,40 @@ +package com.example.umc10th2.global.security; + +import com.example.umc10th2.domain.member.entity.Member; +import lombok.Getter; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@Getter +public class AuthMember implements UserDetails { + + private final Member member; + + public AuthMember(Member member) { + this.member = member; + } + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority("ROLE_USER")); + } + + @Override + public String getPassword() { + return member.getPassword(); + } + + @Override + public String getUsername() { + return member.getEmail(); + } + + @Override public boolean isAccountNonExpired() { return true; } + @Override public boolean isAccountNonLocked() { return true; } + @Override public boolean isCredentialsNonExpired() { return true; } + @Override public boolean isEnabled() { return true; } +} diff --git a/src/main/java/com/example/umc10th2/global/security/CustomAccessDenied.java b/src/main/java/com/example/umc10th2/global/security/CustomAccessDenied.java new file mode 100644 index 0000000..19707fe --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/CustomAccessDenied.java @@ -0,0 +1,23 @@ +package com.example.umc10th2.global.security; + +import com.example.umc10th2.global.exception.GeneralErrorCode; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.access.AccessDeniedException; +import org.springframework.security.web.access.AccessDeniedHandler; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +public class CustomAccessDenied implements AccessDeniedHandler { + + @Override + public void handle( + HttpServletRequest request, + HttpServletResponse response, + AccessDeniedException accessDeniedException + ) throws IOException { + SecurityResponseUtil.writeErrorResponse(response, GeneralErrorCode.FORBIDDEN); + } +} diff --git a/src/main/java/com/example/umc10th2/global/security/CustomEntryPoint.java b/src/main/java/com/example/umc10th2/global/security/CustomEntryPoint.java new file mode 100644 index 0000000..dcbd622 --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/CustomEntryPoint.java @@ -0,0 +1,23 @@ +package com.example.umc10th2.global.security; + +import com.example.umc10th2.global.exception.GeneralErrorCode; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.web.AuthenticationEntryPoint; +import org.springframework.stereotype.Component; + +import java.io.IOException; + +@Component +public class CustomEntryPoint implements AuthenticationEntryPoint { + + @Override + public void commence( + HttpServletRequest request, + HttpServletResponse response, + AuthenticationException authException + ) throws IOException { + SecurityResponseUtil.writeErrorResponse(response, GeneralErrorCode.UNAUTHORIZED); + } +} diff --git a/src/main/java/com/example/umc10th2/global/security/CustomUserDetailsService.java b/src/main/java/com/example/umc10th2/global/security/CustomUserDetailsService.java new file mode 100644 index 0000000..6de741e --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/CustomUserDetailsService.java @@ -0,0 +1,24 @@ +package com.example.umc10th2.global.security; + +import com.example.umc10th2.domain.member.entity.Member; +import com.example.umc10th2.domain.member.repository.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberRepository memberRepository; + + @Override + public UserDetails loadUserByUsername(String email) throws UsernameNotFoundException { + Member member = memberRepository.findByEmailAndDeletedAtIsNull(email) + .orElseThrow(() -> new UsernameNotFoundException( + "해당 이메일로 가입된 회원이 없습니다: " + email)); + return new AuthMember(member); + } +} diff --git a/src/main/java/com/example/umc10th2/global/security/JwtAuthFilter.java b/src/main/java/com/example/umc10th2/global/security/JwtAuthFilter.java new file mode 100644 index 0000000..d21ae2c --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/JwtAuthFilter.java @@ -0,0 +1,61 @@ +package com.example.umc10th2.global.security; + +import com.example.umc10th2.global.exception.GeneralErrorCode; +import com.example.umc10th2.global.response.ApiResponse; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.NonNull; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; + +@RequiredArgsConstructor +public class JwtAuthFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + private final CustomUserDetailsService customUserDetailsService; + + @Override + protected void doFilterInternal( + @NonNull HttpServletRequest request, + @NonNull HttpServletResponse response, + @NonNull FilterChain filterChain + ) throws ServletException, IOException { + try { + String token = request.getHeader("Authorization"); + + if (token == null || !token.startsWith("Bearer ")) { + filterChain.doFilter(request, response); + return; + } + + token = token.replace("Bearer ", ""); + + if (jwtUtil.isValid(token)) { + String email = jwtUtil.getEmail(token); + UserDetails user = customUserDetailsService.loadUserByUsername(email); + Authentication auth = new UsernamePasswordAuthenticationToken( + user, null, user.getAuthorities() + ); + SecurityContextHolder.getContext().setAuthentication(auth); + } + + filterChain.doFilter(request, response); + + } catch (Exception e) { + ObjectMapper mapper = new ObjectMapper(); + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(GeneralErrorCode.UNAUTHORIZED.getStatus().value()); + mapper.writeValue(response.getOutputStream(), + ApiResponse.onFailure(GeneralErrorCode.UNAUTHORIZED, null)); + } + } +} diff --git a/src/main/java/com/example/umc10th2/global/security/JwtUtil.java b/src/main/java/com/example/umc10th2/global/security/JwtUtil.java new file mode 100644 index 0000000..b3614ba --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/JwtUtil.java @@ -0,0 +1,70 @@ +package com.example.umc10th2.global.security; + +import io.jsonwebtoken.*; +import io.jsonwebtoken.security.Keys; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import java.nio.charset.StandardCharsets; +import java.time.Duration; +import java.time.Instant; +import java.util.Date; +import java.util.stream.Collectors; + +@Component +public class JwtUtil { + + private final SecretKey secretKey; + private final Duration accessExpiration; + + public JwtUtil( + @Value("${jwt.token.secretKey}") String secret, + @Value("${jwt.token.expiration.access}") Long accessExpiration + ) { + this.secretKey = Keys.hmacShaKeyFor(secret.getBytes(StandardCharsets.UTF_8)); + this.accessExpiration = Duration.ofMillis(accessExpiration); + } + + public String createAccessToken(AuthMember member) { + Instant now = Instant.now(); + String authorities = member.getAuthorities().stream() + .map(GrantedAuthority::getAuthority) + .collect(Collectors.joining(",")); + + return Jwts.builder() + .subject(member.getUsername()) + .claim("role", authorities) + .claim("email", member.getUsername()) + .issuedAt(Date.from(now)) + .expiration(Date.from(now.plus(accessExpiration))) + .signWith(secretKey) + .compact(); + } + + public String getEmail(String token) { + try { + return getClaims(token).getPayload().getSubject(); + } catch (JwtException e) { + return null; + } + } + + public boolean isValid(String token) { + try { + getClaims(token); + return true; + } catch (JwtException e) { + return false; + } + } + + private Jws getClaims(String token) throws JwtException { + return Jwts.parser() + .verifyWith(secretKey) + .clockSkewSeconds(60) + .build() + .parseSignedClaims(token); + } +} diff --git a/src/main/java/com/example/umc10th2/global/security/SecurityResponseUtil.java b/src/main/java/com/example/umc10th2/global/security/SecurityResponseUtil.java new file mode 100644 index 0000000..110ed0d --- /dev/null +++ b/src/main/java/com/example/umc10th2/global/security/SecurityResponseUtil.java @@ -0,0 +1,23 @@ +package com.example.umc10th2.global.security; + +import com.example.umc10th2.global.exception.BaseErrorCode; +import com.example.umc10th2.global.response.ApiResponse; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.http.HttpServletResponse; + +import java.io.IOException; + +public class SecurityResponseUtil { + + private static final ObjectMapper objectMapper = new ObjectMapper(); + + public static void writeErrorResponse( + HttpServletResponse response, + BaseErrorCode errorCode + ) throws IOException { + response.setContentType("application/json;charset=UTF-8"); + response.setStatus(errorCode.getStatus().value()); + ApiResponse errorResponse = ApiResponse.onFailure(errorCode, null); + objectMapper.writeValue(response.getOutputStream(), errorResponse); + } +} diff --git a/src/main/resources/static/login.html b/src/main/resources/static/login.html new file mode 100644 index 0000000..856d601 --- /dev/null +++ b/src/main/resources/static/login.html @@ -0,0 +1,21 @@ + + + + + 로그인 + + +

로그인

+
+
+ + +
+
+ + +
+ +
+ + \ No newline at end of file diff --git a/src/test/java/com/example/umc10th2/Umc10th2ApplicationTests.java b/src/test/java/com/example/umc10th2/Umc10th2ApplicationTests.java new file mode 100644 index 0000000..b1ad01a --- /dev/null +++ b/src/test/java/com/example/umc10th2/Umc10th2ApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.umc10th2; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Umc10th2ApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/test.http b/src/test/test.http new file mode 100644 index 0000000..e69de29