diff --git a/wis/week5/study/.gitattributes b/wis/week5/study/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/wis/week5/study/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/wis/week5/study/.gitignore b/wis/week5/study/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/wis/week5/study/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/wis/week5/study/build.gradle b/wis/week5/study/build.gradle new file mode 100644 index 0000000..179c9ba --- /dev/null +++ b/wis/week5/study/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/wis/week5/study/gradle/wrapper/gradle-wrapper.jar b/wis/week5/study/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/wis/week5/study/gradle/wrapper/gradle-wrapper.jar differ diff --git a/wis/week5/study/gradle/wrapper/gradle-wrapper.properties b/wis/week5/study/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/wis/week5/study/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/wis/week5/study/gradlew b/wis/week5/study/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/wis/week5/study/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/wis/week5/study/gradlew.bat b/wis/week5/study/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/wis/week5/study/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/wis/week5/study/settings.gradle b/wis/week5/study/settings.gradle new file mode 100644 index 0000000..77d056d --- /dev/null +++ b/wis/week5/study/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'study' diff --git a/wis/week5/study/src/main/java/umc/study/StudyApplication.java b/wis/week5/study/src/main/java/umc/study/StudyApplication.java new file mode 100644 index 0000000..1b8a9c1 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/StudyApplication.java @@ -0,0 +1,15 @@ +package umc.study; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableScheduling; + +@SpringBootApplication +@EnableScheduling +public class StudyApplication { + + public static void main(String[] args) { + SpringApplication.run(StudyApplication.class, args); + } + +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/Agreement.java b/wis/week5/study/src/main/java/umc/study/domain/Agreement.java new file mode 100644 index 0000000..a98a6f6 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/Agreement.java @@ -0,0 +1,33 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.mapping.UserAgree; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Agreement extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Boolean optional; + + @OneToMany(mappedBy = "agreement", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); +} \ No newline at end of file diff --git a/wis/week5/study/src/main/java/umc/study/domain/Food.java b/wis/week5/study/src/main/java/umc/study/domain/Food.java new file mode 100644 index 0000000..c4f79e9 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/Food.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Food extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String foodCategory; +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/Mission.java b/wis/week5/study/src/main/java/umc/study/domain/Mission.java new file mode 100644 index 0000000..ff090bb --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/Mission.java @@ -0,0 +1,46 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Integer point; + + @Column(name = "due_date") + private LocalDate dueDate; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15)") + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/Region.java b/wis/week5/study/src/main/java/umc/study/domain/Region.java new file mode 100644 index 0000000..6f63188 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/Region.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String name; +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/Review.java b/wis/week5/study/src/main/java/umc/study/domain/Review.java new file mode 100644 index 0000000..2c53c79 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/Review.java @@ -0,0 +1,37 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Float star; + + @Column(columnDefinition = "TEXT") + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "review", cascade = CascadeType.ALL) + private List reviewImageList = new ArrayList<>(); +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/ReviewImage.java b/wis/week5/study/src/main/java/umc/study/domain/ReviewImage.java new file mode 100644 index 0000000..12fbef9 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/ReviewImage.java @@ -0,0 +1,25 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class ReviewImage extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String url; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} + diff --git a/wis/week5/study/src/main/java/umc/study/domain/Store.java b/wis/week5/study/src/main/java/umc/study/domain/Store.java new file mode 100644 index 0000000..6bf64c2 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/Store.java @@ -0,0 +1,27 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @Column(nullable = false, length = 255) + private String address; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/User.java b/wis/week5/study/src/main/java/umc/study/domain/User.java new file mode 100644 index 0000000..2780d25 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/User.java @@ -0,0 +1,72 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.*; +import umc.study.domain.mapping.UserAgree; +import umc.study.domain.mapping.UserMission; +import umc.study.domain.mapping.UserPrefer; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String email; + + @Column(nullable = false, length = 10) + private String name; + + @Column(nullable = false, length = 10) + @Enumerated(EnumType.STRING) + private Gender gender; + + private LocalDate birthday; + + @Column(nullable = false, length = 255) + private String address; + + private LocalDate lastLogin; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'ACTIVE'") + private UserStatus status; + + private LocalDate inactiveDate; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + private Integer point; + + @Column(nullable = false, length = 20) + private String phone; + + @Column(nullable = false) + private boolean phoneVerified; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userPreferList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); + +} \ No newline at end of file diff --git a/wis/week5/study/src/main/java/umc/study/domain/common/BaseEntity.java b/wis/week5/study/src/main/java/umc/study/domain/common/BaseEntity.java new file mode 100644 index 0000000..150e36d --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/common/BaseEntity.java @@ -0,0 +1,21 @@ +package umc.study.domain.common; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/enums/Gender.java b/wis/week5/study/src/main/java/umc/study/domain/enums/Gender.java new file mode 100644 index 0000000..ee212a8 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum Gender { + MALE, FEMALE +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/enums/MissionStatus.java b/wis/week5/study/src/main/java/umc/study/domain/enums/MissionStatus.java new file mode 100644 index 0000000..a8f345f --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum MissionStatus { + CHALLENGING, COMPLETE +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/enums/SocialType.java b/wis/week5/study/src/main/java/umc/study/domain/enums/SocialType.java new file mode 100644 index 0000000..34c7e6c --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/enums/SocialType.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum SocialType { + KAKAO, GOOGLE, NAVER, APPLE +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/enums/UserStatus.java b/wis/week5/study/src/main/java/umc/study/domain/enums/UserStatus.java new file mode 100644 index 0000000..4cd6db8 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/enums/UserStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum UserStatus { + ACTIVE, INACTIVE +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/mapping/UserAgree.java b/wis/week5/study/src/main/java/umc/study/domain/mapping/UserAgree.java new file mode 100644 index 0000000..d9a1217 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/mapping/UserAgree.java @@ -0,0 +1,31 @@ +package umc.study.domain.mapping; + + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.User; +import umc.study.domain.Agreement; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserAgree extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private boolean agree; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "agreement_id") + private Agreement agreement; +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/mapping/UserMission.java b/wis/week5/study/src/main/java/umc/study/domain/mapping/UserMission.java new file mode 100644 index 0000000..6175707 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/mapping/UserMission.java @@ -0,0 +1,34 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Long verificationCode; + + @Enumerated(EnumType.STRING) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/wis/week5/study/src/main/java/umc/study/domain/mapping/UserPrefer.java b/wis/week5/study/src/main/java/umc/study/domain/mapping/UserPrefer.java new file mode 100644 index 0000000..23a8921 --- /dev/null +++ b/wis/week5/study/src/main/java/umc/study/domain/mapping/UserPrefer.java @@ -0,0 +1,28 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Food; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserPrefer extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food foodCategory; + +} diff --git a/wis/week5/study/src/main/resources/application.yml b/wis/week5/study/src/main/resources/application.yml new file mode 100644 index 0000000..c9bcc55 --- /dev/null +++ b/wis/week5/study/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/study + username: root + password: mirae1107 + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 \ No newline at end of file diff --git a/wis/week5/study/src/test/java/umc/study/StudyApplicationTests.java b/wis/week5/study/src/test/java/umc/study/StudyApplicationTests.java new file mode 100644 index 0000000..89717bd --- /dev/null +++ b/wis/week5/study/src/test/java/umc/study/StudyApplicationTests.java @@ -0,0 +1,13 @@ +package umc.study; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class StudyApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/wis/week7/study/.gitattributes b/wis/week7/study/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/wis/week7/study/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/wis/week7/study/.gitignore b/wis/week7/study/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/wis/week7/study/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/wis/week7/study/build.gradle b/wis/week7/study/build.gradle new file mode 100644 index 0000000..aa73779 --- /dev/null +++ b/wis/week7/study/build.gradle @@ -0,0 +1,60 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + implementation 'org.springframework.boot:spring-boot-starter-validation' +} + +tasks.named('test') { + //useJUnitPlatform() +} + +// QueryDSL 설정 +def querydslDir = "$buildDir/generated/querydsl" + +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +tasks.withType(JavaCompile) { + options.generatedSourceOutputDirectory = file(querydslDir) +} + +clean { + delete file(querydslDir) +} diff --git a/wis/week7/study/gradle/wrapper/gradle-wrapper.jar b/wis/week7/study/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/wis/week7/study/gradle/wrapper/gradle-wrapper.jar differ diff --git a/wis/week7/study/gradle/wrapper/gradle-wrapper.properties b/wis/week7/study/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/wis/week7/study/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/wis/week7/study/gradlew b/wis/week7/study/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/wis/week7/study/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/wis/week7/study/gradlew.bat b/wis/week7/study/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/wis/week7/study/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/wis/week7/study/settings.gradle b/wis/week7/study/settings.gradle new file mode 100644 index 0000000..77d056d --- /dev/null +++ b/wis/week7/study/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'study' diff --git a/wis/week7/study/src/main/java/umc/study/Config/QueryDSLConfig.java b/wis/week7/study/src/main/java/umc/study/Config/QueryDSLConfig.java new file mode 100644 index 0000000..0eb0ecf --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/Config/QueryDSLConfig.java @@ -0,0 +1,18 @@ +package umc.study.Config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class QueryDSLConfig { + private final EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory(){ + return new JPAQueryFactory(entityManager); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/StudyApplication.java b/wis/week7/study/src/main/java/umc/study/StudyApplication.java new file mode 100644 index 0000000..ca5af85 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/StudyApplication.java @@ -0,0 +1,37 @@ +package umc.study; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import umc.study.service.StoreService.StoreQueryService; + +@SpringBootApplication +@EnableJpaAuditing +public class StudyApplication { + + public static void main(String[] args) { + SpringApplication.run(StudyApplication.class, args); + } + + @Bean + public CommandLineRunner run(ApplicationContext context) { + return args -> { + StoreQueryService storeService = context.getBean(StoreQueryService.class); + + // 파라미터 값 설정 + String name = "요아정"; + String address = "대치동"; + + // 쿼리 메서드 호출 및 쿼리 문자열과 파라미터 출력 + System.out.println("Executing findStoresByNameAndAddress with parameters:"); + System.out.println("Name: " + name); + System.out.println("Address: " + address); + + storeService.findStoresByNameAndAddress(name, address) + .forEach(System.out::println); + }; + } +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/ApiResponse.java b/wis/week7/study/src/main/java/umc/study/apiPayload/ApiResponse.java new file mode 100644 index 0000000..5db2eac --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/ApiResponse.java @@ -0,0 +1,39 @@ +package umc.study.apiPayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.study.apiPayload.code.BaseCode; +import umc.study.apiPayload.code.status.SuccessStatus; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + private final String code; + private final String message; + @JsonInclude(JsonInclude.Include.NON_NULL) + private T result; + + + // 성공한 경우 응답 생성 + + public static ApiResponse onSuccess(T result){ + return new ApiResponse<>(true, SuccessStatus._OK.getCode() , SuccessStatus._OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result){ + return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result); + } + + + // 실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data){ + return new ApiResponse<>(false, code, message, data); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/code/BaseCode.java b/wis/week7/study/src/main/java/umc/study/apiPayload/code/BaseCode.java new file mode 100644 index 0000000..3c3dd87 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/code/BaseCode.java @@ -0,0 +1,8 @@ +package umc.study.apiPayload.code; + +public interface BaseCode { + + ReasonDTO getReason(); + + ReasonDTO getReasonHttpStatus(); +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java b/wis/week7/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..89b4fb8 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,8 @@ +package umc.study.apiPayload.code; + +public interface BaseErrorCode { + + ErrorReasonDTO getReason(); + + ErrorReasonDTO getReasonHttpStatus(); +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java b/wis/week7/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java new file mode 100644 index 0000000..f529728 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java @@ -0,0 +1,18 @@ +package umc.study.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ErrorReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java b/wis/week7/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java new file mode 100644 index 0000000..05764b3 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java @@ -0,0 +1,18 @@ +package umc.study.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java b/wis/week7/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java new file mode 100644 index 0000000..070dfb4 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java @@ -0,0 +1,54 @@ +package umc.study.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + // 가장 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON400","잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON401","인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + + + // 멤버 관려 에러 + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 없습니다."), + NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수 입니다."), + + // 예시,,, + ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."), + + // For test + TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"); + + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .build(); + } + + @Override + public ErrorReasonDTO getReasonHttpStatus() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java b/wis/week7/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java new file mode 100644 index 0000000..3eb4812 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java @@ -0,0 +1,39 @@ +package umc.study.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.study.apiPayload.code.BaseCode; +import umc.study.apiPayload.code.ReasonDTO; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + + // 일반적인 응답 + _OK(HttpStatus.OK, "COMMON200", "성공입니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .build(); + } + + @Override + public ReasonDTO getReasonHttpStatus() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java b/wis/week7/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java new file mode 100644 index 0000000..f90cf8c --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java @@ -0,0 +1,119 @@ +package umc.study.apiPayload.exception; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import umc.study.apiPayload.ApiResponse; +import umc.study.apiPayload.code.ErrorReasonDTO; +import umc.study.apiPayload.code.status.ErrorStatus; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class ExceptionAdvice extends ResponseEntityExceptionHandler { + + + @ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = e.getConstraintViolations().stream() + .map(constraintViolation -> constraintViolation.getMessage()) + .findFirst() + .orElseThrow(() -> new RuntimeException("ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request); + } + + @Override + public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors().stream() + .forEach(fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge(fieldName, errorMessage, (existingErrorMessage, newErrorMessage) -> existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors); + } + + @ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + e.printStackTrace(); + + return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); + } + + @ExceptionHandler(value = GeneralException.class) + public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); + } + + private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, + HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); +// e.printStackTrace(); + + WebRequest webRequest = new ServletWebRequest(request); + return super.handleExceptionInternal( + e, + body, + headers, + reason.getHttpStatus(), + webRequest + ); + } + + private ResponseEntity handleExceptionInternalFalse(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, HttpStatus status, WebRequest request, String errorPoint) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorPoint); + return super.handleExceptionInternal( + e, + body, + headers, + status, + request + ); + } + + private ResponseEntity handleExceptionInternalArgs(Exception e, HttpHeaders headers, ErrorStatus errorCommonStatus, + WebRequest request, Map errorArgs) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorArgs); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } + + private ResponseEntity handleExceptionInternalConstraint(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, WebRequest request) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java b/wis/week7/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..e9a456e --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java @@ -0,0 +1,21 @@ +package umc.study.apiPayload.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus(){ + return this.code.getReasonHttpStatus(); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java b/wis/week7/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java new file mode 100644 index 0000000..5ca4a8f --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java @@ -0,0 +1,11 @@ +package umc.study.apiPayload.exception.handler; + +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.exception.GeneralException; + +public class TempHandler extends GeneralException { + + public TempHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/converter/TempConverter.java b/wis/week7/study/src/main/java/umc/study/converter/TempConverter.java new file mode 100644 index 0000000..7654c4d --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/converter/TempConverter.java @@ -0,0 +1,18 @@ +package umc.study.converter; + +import umc.study.web.dto.TempResponse; + +public class TempConverter { + + public static TempResponse.TempTestDTO toTempTestDTO(){ + return TempResponse.TempTestDTO.builder() + .testString("This is Test!") + .build(); + } + + public static TempResponse.TempExceptionDTO toTempExceptionDTO(Integer flag){ + return TempResponse.TempExceptionDTO.builder() + .flag(flag) + .build(); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/Agreement.java b/wis/week7/study/src/main/java/umc/study/domain/Agreement.java new file mode 100644 index 0000000..a98a6f6 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/Agreement.java @@ -0,0 +1,33 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.mapping.UserAgree; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Agreement extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Boolean optional; + + @OneToMany(mappedBy = "agreement", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); +} \ No newline at end of file diff --git a/wis/week7/study/src/main/java/umc/study/domain/Food.java b/wis/week7/study/src/main/java/umc/study/domain/Food.java new file mode 100644 index 0000000..c4f79e9 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/Food.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Food extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String foodCategory; +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/Mission.java b/wis/week7/study/src/main/java/umc/study/domain/Mission.java new file mode 100644 index 0000000..ff090bb --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/Mission.java @@ -0,0 +1,46 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Integer point; + + @Column(name = "due_date") + private LocalDate dueDate; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15)") + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/Region.java b/wis/week7/study/src/main/java/umc/study/domain/Region.java new file mode 100644 index 0000000..6f63188 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/Region.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String name; +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/Review.java b/wis/week7/study/src/main/java/umc/study/domain/Review.java new file mode 100644 index 0000000..2c53c79 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/Review.java @@ -0,0 +1,37 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Float star; + + @Column(columnDefinition = "TEXT") + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "review", cascade = CascadeType.ALL) + private List reviewImageList = new ArrayList<>(); +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/ReviewImage.java b/wis/week7/study/src/main/java/umc/study/domain/ReviewImage.java new file mode 100644 index 0000000..12fbef9 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/ReviewImage.java @@ -0,0 +1,25 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class ReviewImage extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String url; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} + diff --git a/wis/week7/study/src/main/java/umc/study/domain/Store.java b/wis/week7/study/src/main/java/umc/study/domain/Store.java new file mode 100644 index 0000000..95f1a3e --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/Store.java @@ -0,0 +1,48 @@ +package umc.study.domain; + +import lombok.*; +import umc.study.domain.common.BaseEntity; +import jakarta.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@ToString +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @Column(nullable = false, length = 255) + private String address; + + private Float score; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List missionList = new ArrayList<>(); + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + +@Override + public String toString() { + return "Store{" + + "id=" + id + + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", region=" + (region != null ? region.getName() : "N/A") + // region의 이름 출력 + '}'; + } +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/User.java b/wis/week7/study/src/main/java/umc/study/domain/User.java new file mode 100644 index 0000000..2780d25 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/User.java @@ -0,0 +1,72 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.*; +import umc.study.domain.mapping.UserAgree; +import umc.study.domain.mapping.UserMission; +import umc.study.domain.mapping.UserPrefer; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String email; + + @Column(nullable = false, length = 10) + private String name; + + @Column(nullable = false, length = 10) + @Enumerated(EnumType.STRING) + private Gender gender; + + private LocalDate birthday; + + @Column(nullable = false, length = 255) + private String address; + + private LocalDate lastLogin; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'ACTIVE'") + private UserStatus status; + + private LocalDate inactiveDate; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + private Integer point; + + @Column(nullable = false, length = 20) + private String phone; + + @Column(nullable = false) + private boolean phoneVerified; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userPreferList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); + +} \ No newline at end of file diff --git a/wis/week7/study/src/main/java/umc/study/domain/common/BaseEntity.java b/wis/week7/study/src/main/java/umc/study/domain/common/BaseEntity.java new file mode 100644 index 0000000..150e36d --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/common/BaseEntity.java @@ -0,0 +1,21 @@ +package umc.study.domain.common; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/enums/Gender.java b/wis/week7/study/src/main/java/umc/study/domain/enums/Gender.java new file mode 100644 index 0000000..ee212a8 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum Gender { + MALE, FEMALE +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/enums/MissionStatus.java b/wis/week7/study/src/main/java/umc/study/domain/enums/MissionStatus.java new file mode 100644 index 0000000..a8f345f --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum MissionStatus { + CHALLENGING, COMPLETE +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/enums/SocialType.java b/wis/week7/study/src/main/java/umc/study/domain/enums/SocialType.java new file mode 100644 index 0000000..34c7e6c --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/enums/SocialType.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum SocialType { + KAKAO, GOOGLE, NAVER, APPLE +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/enums/UserStatus.java b/wis/week7/study/src/main/java/umc/study/domain/enums/UserStatus.java new file mode 100644 index 0000000..4cd6db8 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/enums/UserStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum UserStatus { + ACTIVE, INACTIVE +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/mapping/UserAgree.java b/wis/week7/study/src/main/java/umc/study/domain/mapping/UserAgree.java new file mode 100644 index 0000000..d9a1217 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/mapping/UserAgree.java @@ -0,0 +1,31 @@ +package umc.study.domain.mapping; + + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.User; +import umc.study.domain.Agreement; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserAgree extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private boolean agree; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "agreement_id") + private Agreement agreement; +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/mapping/UserMission.java b/wis/week7/study/src/main/java/umc/study/domain/mapping/UserMission.java new file mode 100644 index 0000000..6175707 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/mapping/UserMission.java @@ -0,0 +1,34 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Long verificationCode; + + @Enumerated(EnumType.STRING) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/wis/week7/study/src/main/java/umc/study/domain/mapping/UserPrefer.java b/wis/week7/study/src/main/java/umc/study/domain/mapping/UserPrefer.java new file mode 100644 index 0000000..23a8921 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/domain/mapping/UserPrefer.java @@ -0,0 +1,28 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Food; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserPrefer extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food foodCategory; + +} diff --git a/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java b/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java new file mode 100644 index 0000000..c2c070c --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java @@ -0,0 +1,7 @@ +package umc.study.repository.StoreRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Store; + +public interface StoreRepository extends JpaRepository, StoreRepositoryCustom { +} \ No newline at end of file diff --git a/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java b/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java new file mode 100644 index 0000000..384bfd9 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java @@ -0,0 +1,10 @@ +package umc.study.repository.StoreRepository; + +import umc.study.domain.Store; + +import java.util.List; + + +public interface StoreRepositoryCustom { + List dynamicQueryWithBooleanBuilder(String name, String address); +} diff --git a/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java b/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java new file mode 100644 index 0000000..4cc162e --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java @@ -0,0 +1,35 @@ +package umc.study.repository.StoreRepository; + +import com.querydsl.core.BooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import umc.study.domain.QStore; +import umc.study.domain.Store; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class StoreRepositoryImpl implements StoreRepositoryCustom{ + private final JPAQueryFactory jpaQueryFactory; + private final QStore store = QStore.store; + + @Override + public List dynamicQueryWithBooleanBuilder(String name, String address) { + BooleanBuilder predicate = new BooleanBuilder(); + + if (name != null) { + predicate.and(store.name.eq(name)); + } + + if (address != null) { + predicate.and(store.address.eq(address)); + } + + return jpaQueryFactory + .selectFrom(store) + .where(predicate) + .fetch(); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java b/wis/week7/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java new file mode 100644 index 0000000..2d1a5d8 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java @@ -0,0 +1,12 @@ +package umc.study.service.StoreService; + +import umc.study.domain.Store; + +import java.util.List; +import java.util.Optional; + +public interface StoreQueryService { + + Optional findStore(Long id); + List findStoresByNameAndAddress(String name, String address); +} diff --git a/wis/week7/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java b/wis/week7/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java new file mode 100644 index 0000000..f7bde03 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java @@ -0,0 +1,32 @@ +package umc.study.service.StoreService; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import umc.study.domain.Store; +import umc.study.repository.StoreRepository.StoreRepository; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class StoreQueryServiceImpl implements StoreQueryService{ + + private final StoreRepository storeRepository; + + @Override + public Optional findStore(Long id) { + return storeRepository.findById(id); + } + + @Override + public List findStoresByNameAndAddress(String name, String address) { + List filteredStores = storeRepository.dynamicQueryWithBooleanBuilder(name, address); + + filteredStores.forEach(store -> System.out.println("Store: " + store)); + + return filteredStores; + } +} diff --git a/wis/week7/study/src/main/java/umc/study/service/TempService/TempCommandService.java b/wis/week7/study/src/main/java/umc/study/service/TempService/TempCommandService.java new file mode 100644 index 0000000..c21d1aa --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/service/TempService/TempCommandService.java @@ -0,0 +1,4 @@ +package umc.study.service.TempService; + +public interface TempCommandService { +} diff --git a/wis/week7/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java b/wis/week7/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java new file mode 100644 index 0000000..e752aab --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java @@ -0,0 +1,14 @@ +package umc.study.service.TempService; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class TempCommandServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag) { + + } +} diff --git a/wis/week7/study/src/main/java/umc/study/service/TempService/TempQueryService.java b/wis/week7/study/src/main/java/umc/study/service/TempService/TempQueryService.java new file mode 100644 index 0000000..53687d0 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/service/TempService/TempQueryService.java @@ -0,0 +1,6 @@ +package umc.study.service.TempService; + +public interface TempQueryService { + + void CheckFlag(Integer flag); +} diff --git a/wis/week7/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java b/wis/week7/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java new file mode 100644 index 0000000..9c810fa --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java @@ -0,0 +1,19 @@ +package umc.study.service.TempService; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.apiPayload.exception.handler.TempHandler; + +@Service +@RequiredArgsConstructor +@Primary +public class TempQueryServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag) { + if (flag == 1) + throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); + } +} diff --git a/wis/week7/study/src/main/java/umc/study/web/controller/TempRestController.java b/wis/week7/study/src/main/java/umc/study/web/controller/TempRestController.java new file mode 100644 index 0000000..7b2daf1 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/web/controller/TempRestController.java @@ -0,0 +1,32 @@ +package umc.study.web.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.TempConverter; +import umc.study.service.TempService.TempQueryService; +import umc.study.web.dto.TempResponse; + +@RestController +@RequestMapping("/temp") +@RequiredArgsConstructor +public class TempRestController { + + private final TempQueryService tempQueryService; + + @GetMapping("/test") + public ApiResponse testAPI(){ + + return ApiResponse.onSuccess(TempConverter.toTempTestDTO()); + } + + @GetMapping("/exception") + public ApiResponse exceptionAPI(@RequestParam Integer flag){ + tempQueryService.CheckFlag(flag); + return ApiResponse.onSuccess(TempConverter.toTempExceptionDTO(flag)); + } +} \ No newline at end of file diff --git a/wis/week7/study/src/main/java/umc/study/web/dto/TempRequest.java b/wis/week7/study/src/main/java/umc/study/web/dto/TempRequest.java new file mode 100644 index 0000000..ae31723 --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/web/dto/TempRequest.java @@ -0,0 +1,4 @@ +package umc.study.web.dto; + +public class TempRequest { +} diff --git a/wis/week7/study/src/main/java/umc/study/web/dto/TempResponse.java b/wis/week7/study/src/main/java/umc/study/web/dto/TempResponse.java new file mode 100644 index 0000000..2ee4b9c --- /dev/null +++ b/wis/week7/study/src/main/java/umc/study/web/dto/TempResponse.java @@ -0,0 +1,25 @@ +package umc.study.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class TempResponse { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempTestDTO{ + String testString; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempExceptionDTO{ + Integer flag; + } +} diff --git a/wis/week7/study/src/main/resources/application.yml b/wis/week7/study/src/main/resources/application.yml new file mode 100644 index 0000000..c9bcc55 --- /dev/null +++ b/wis/week7/study/src/main/resources/application.yml @@ -0,0 +1,19 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/study + username: root + password: mirae1107 + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 \ No newline at end of file diff --git a/wis/week7/study/src/test/java/umc/study/StudyApplicationTests.java b/wis/week7/study/src/test/java/umc/study/StudyApplicationTests.java new file mode 100644 index 0000000..89717bd --- /dev/null +++ b/wis/week7/study/src/test/java/umc/study/StudyApplicationTests.java @@ -0,0 +1,13 @@ +package umc.study; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class StudyApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/wis/week8/study/.gitattributes b/wis/week8/study/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/wis/week8/study/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/wis/week8/study/.gitignore b/wis/week8/study/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/wis/week8/study/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/wis/week8/study/build.gradle b/wis/week8/study/build.gradle new file mode 100644 index 0000000..0370090 --- /dev/null +++ b/wis/week8/study/build.gradle @@ -0,0 +1,62 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + implementation 'org.springframework.boot:spring-boot-starter-validation' + + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' +} + +tasks.named('test') { + //useJUnitPlatform() +} + +// QueryDSL 설정 +def querydslDir = "$buildDir/generated/querydsl" + +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +tasks.withType(JavaCompile) { + options.generatedSourceOutputDirectory = file(querydslDir) +} + +clean { + delete file(querydslDir) +} diff --git a/wis/week8/study/gradle/wrapper/gradle-wrapper.jar b/wis/week8/study/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/wis/week8/study/gradle/wrapper/gradle-wrapper.jar differ diff --git a/wis/week8/study/gradle/wrapper/gradle-wrapper.properties b/wis/week8/study/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/wis/week8/study/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/wis/week8/study/gradlew b/wis/week8/study/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/wis/week8/study/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/wis/week8/study/gradlew.bat b/wis/week8/study/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/wis/week8/study/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/wis/week8/study/settings.gradle b/wis/week8/study/settings.gradle new file mode 100644 index 0000000..77d056d --- /dev/null +++ b/wis/week8/study/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'study' diff --git a/wis/week8/study/src/main/java/umc/study/Config/QueryDSLConfig.java b/wis/week8/study/src/main/java/umc/study/Config/QueryDSLConfig.java new file mode 100644 index 0000000..0eb0ecf --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/Config/QueryDSLConfig.java @@ -0,0 +1,18 @@ +package umc.study.Config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class QueryDSLConfig { + private final EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory(){ + return new JPAQueryFactory(entityManager); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/Config/SwaggerConfig.java b/wis/week8/study/src/main/java/umc/study/Config/SwaggerConfig.java new file mode 100644 index 0000000..ac919d3 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/Config/SwaggerConfig.java @@ -0,0 +1,40 @@ +package umc.study.Config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI UMCstudyAPI() { + Info info = new Info() + .title("UMC Server WorkBook API") + .description("UMC Server WorkBook API 명세서") + .version("1.0.0"); + + String jwtSchemeName = "JWT TOKEN"; + // API 요청헤더에 인증정보 포함 + SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtSchemeName); + // SecuritySchemes 등록 + Components components = new Components() + .addSecuritySchemes(jwtSchemeName, new SecurityScheme() + .name(jwtSchemeName) + .type(SecurityScheme.Type.HTTP) // HTTP 방식 + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url("/")) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } + +} diff --git a/wis/week8/study/src/main/java/umc/study/StudyApplication.java b/wis/week8/study/src/main/java/umc/study/StudyApplication.java new file mode 100644 index 0000000..ca5af85 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/StudyApplication.java @@ -0,0 +1,37 @@ +package umc.study; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import umc.study.service.StoreService.StoreQueryService; + +@SpringBootApplication +@EnableJpaAuditing +public class StudyApplication { + + public static void main(String[] args) { + SpringApplication.run(StudyApplication.class, args); + } + + @Bean + public CommandLineRunner run(ApplicationContext context) { + return args -> { + StoreQueryService storeService = context.getBean(StoreQueryService.class); + + // 파라미터 값 설정 + String name = "요아정"; + String address = "대치동"; + + // 쿼리 메서드 호출 및 쿼리 문자열과 파라미터 출력 + System.out.println("Executing findStoresByNameAndAddress with parameters:"); + System.out.println("Name: " + name); + System.out.println("Address: " + address); + + storeService.findStoresByNameAndAddress(name, address) + .forEach(System.out::println); + }; + } +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/ApiResponse.java b/wis/week8/study/src/main/java/umc/study/apiPayload/ApiResponse.java new file mode 100644 index 0000000..5db2eac --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/ApiResponse.java @@ -0,0 +1,39 @@ +package umc.study.apiPayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.study.apiPayload.code.BaseCode; +import umc.study.apiPayload.code.status.SuccessStatus; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + private final String code; + private final String message; + @JsonInclude(JsonInclude.Include.NON_NULL) + private T result; + + + // 성공한 경우 응답 생성 + + public static ApiResponse onSuccess(T result){ + return new ApiResponse<>(true, SuccessStatus._OK.getCode() , SuccessStatus._OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result){ + return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result); + } + + + // 실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data){ + return new ApiResponse<>(false, code, message, data); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/code/BaseCode.java b/wis/week8/study/src/main/java/umc/study/apiPayload/code/BaseCode.java new file mode 100644 index 0000000..3c3dd87 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/code/BaseCode.java @@ -0,0 +1,8 @@ +package umc.study.apiPayload.code; + +public interface BaseCode { + + ReasonDTO getReason(); + + ReasonDTO getReasonHttpStatus(); +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java b/wis/week8/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..89b4fb8 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,8 @@ +package umc.study.apiPayload.code; + +public interface BaseErrorCode { + + ErrorReasonDTO getReason(); + + ErrorReasonDTO getReasonHttpStatus(); +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java b/wis/week8/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java new file mode 100644 index 0000000..f529728 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java @@ -0,0 +1,18 @@ +package umc.study.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ErrorReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java b/wis/week8/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java new file mode 100644 index 0000000..05764b3 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java @@ -0,0 +1,18 @@ +package umc.study.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java b/wis/week8/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java new file mode 100644 index 0000000..e090234 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java @@ -0,0 +1,56 @@ +package umc.study.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + // 가장 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON400","잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON401","인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + + + // 멤버 관려 에러 + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 없습니다."), + NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수 입니다."), + + // 예시,,, + ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."), + + // For test + TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"), + + // FoodCategory 관련 에러 + FOOD_CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "FOOD4001", "해당 음식 카테고리를 찾을 수 없습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .build(); + } + + @Override + public ErrorReasonDTO getReasonHttpStatus() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java b/wis/week8/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java new file mode 100644 index 0000000..3eb4812 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java @@ -0,0 +1,39 @@ +package umc.study.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.study.apiPayload.code.BaseCode; +import umc.study.apiPayload.code.ReasonDTO; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + + // 일반적인 응답 + _OK(HttpStatus.OK, "COMMON200", "성공입니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .build(); + } + + @Override + public ReasonDTO getReasonHttpStatus() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java new file mode 100644 index 0000000..f90cf8c --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java @@ -0,0 +1,119 @@ +package umc.study.apiPayload.exception; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import umc.study.apiPayload.ApiResponse; +import umc.study.apiPayload.code.ErrorReasonDTO; +import umc.study.apiPayload.code.status.ErrorStatus; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class ExceptionAdvice extends ResponseEntityExceptionHandler { + + + @ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = e.getConstraintViolations().stream() + .map(constraintViolation -> constraintViolation.getMessage()) + .findFirst() + .orElseThrow(() -> new RuntimeException("ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request); + } + + @Override + public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors().stream() + .forEach(fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge(fieldName, errorMessage, (existingErrorMessage, newErrorMessage) -> existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors); + } + + @ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + e.printStackTrace(); + + return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); + } + + @ExceptionHandler(value = GeneralException.class) + public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); + } + + private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, + HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); +// e.printStackTrace(); + + WebRequest webRequest = new ServletWebRequest(request); + return super.handleExceptionInternal( + e, + body, + headers, + reason.getHttpStatus(), + webRequest + ); + } + + private ResponseEntity handleExceptionInternalFalse(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, HttpStatus status, WebRequest request, String errorPoint) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorPoint); + return super.handleExceptionInternal( + e, + body, + headers, + status, + request + ); + } + + private ResponseEntity handleExceptionInternalArgs(Exception e, HttpHeaders headers, ErrorStatus errorCommonStatus, + WebRequest request, Map errorArgs) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorArgs); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } + + private ResponseEntity handleExceptionInternalConstraint(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, WebRequest request) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..e9a456e --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java @@ -0,0 +1,21 @@ +package umc.study.apiPayload.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus(){ + return this.code.getReasonHttpStatus(); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/exception/handler/FoodCategoryHandler.java b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/handler/FoodCategoryHandler.java new file mode 100644 index 0000000..2cd4b44 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/handler/FoodCategoryHandler.java @@ -0,0 +1,12 @@ +package umc.study.apiPayload.exception.handler; + +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.exception.GeneralException; + +public class FoodCategoryHandler extends GeneralException { + public FoodCategoryHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} + + diff --git a/wis/week8/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java new file mode 100644 index 0000000..5ca4a8f --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java @@ -0,0 +1,11 @@ +package umc.study.apiPayload.exception.handler; + +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.exception.GeneralException; + +public class TempHandler extends GeneralException { + + public TempHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/converter/MissionConverter.java b/wis/week8/study/src/main/java/umc/study/converter/MissionConverter.java new file mode 100644 index 0000000..7ff8a6b --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/converter/MissionConverter.java @@ -0,0 +1,48 @@ +package umc.study.converter; + +import umc.study.domain.Mission; +import umc.study.domain.Store; +import umc.study.domain.enums.MissionStatus; +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +public class MissionConverter { + + public static MissionStatus getMissionStatus(int status) { + MissionStatus missionStatus = null; + + switch (status) { + case 1: + missionStatus = MissionStatus.CHALLENGING; + break; + case 2: + missionStatus = MissionStatus.COMPLETE; + break; + default: + throw new IllegalArgumentException("Invalid Mission Status"); + } + + return missionStatus; + } + + public static Mission toEntity(MissionRequestDTO request, Store store) { + return Mission.builder() + .title(request.getTitle()) + .description(request.getDescription()) + .point(request.getPoint()) + .dueDate(request.getDueDate()) + .store(store) + .build(); + } + + public static MissionResponseDTO toResponseDTO(Mission mission) { + return MissionResponseDTO.builder() + .id(mission.getId()) + .title(mission.getTitle()) + .description(mission.getDescription()) + .point(mission.getPoint()) + .storeName(mission.getStore().getName()) + .build(); + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/converter/ReviewConverter.java b/wis/week8/study/src/main/java/umc/study/converter/ReviewConverter.java new file mode 100644 index 0000000..3699b34 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/converter/ReviewConverter.java @@ -0,0 +1,30 @@ +package umc.study.converter; + +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.domain.User; +import umc.study.web.dto.ReviewRequestDTO; +import umc.study.web.dto.ReviewResponseDTO; + +public class ReviewConverter { + + public static Review toEntity(ReviewRequestDTO request, Store store, User user) { + return Review.builder() + .content(request.getContent()) + .star(request.getStar()) + .store(store) + .user(user) + .build(); + } + + public static ReviewResponseDTO toResponseDTO(Review review) { + return ReviewResponseDTO.builder() + .id(review.getId()) + .content(review.getContent()) + .star(review.getStar()) + .storeName(review.getStore().getName()) + .userName(review.getUser().getName()) + .build(); + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/converter/StoreConverter.java b/wis/week8/study/src/main/java/umc/study/converter/StoreConverter.java new file mode 100644 index 0000000..c5ea5d9 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/converter/StoreConverter.java @@ -0,0 +1,26 @@ +package umc.study.converter; + +import umc.study.domain.Region; +import umc.study.domain.Store; +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; + +public class StoreConverter { + + public static Store toEntity(StoreRequestDTO request, Region region) { + return Store.builder() + .name(request.getName()) + .address(request.getAddress()) + .region(region) + .build(); + } + + public static StoreResponseDTO toResponseDTO(Store store) { + return StoreResponseDTO.builder() + .id(store.getId()) + .name(store.getName()) + .regionName(store.getRegion().getName()) + .build(); + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/converter/TempConverter.java b/wis/week8/study/src/main/java/umc/study/converter/TempConverter.java new file mode 100644 index 0000000..7654c4d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/converter/TempConverter.java @@ -0,0 +1,18 @@ +package umc.study.converter; + +import umc.study.web.dto.TempResponse; + +public class TempConverter { + + public static TempResponse.TempTestDTO toTempTestDTO(){ + return TempResponse.TempTestDTO.builder() + .testString("This is Test!") + .build(); + } + + public static TempResponse.TempExceptionDTO toTempExceptionDTO(Integer flag){ + return TempResponse.TempExceptionDTO.builder() + .flag(flag) + .build(); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/converter/UserConverter.java b/wis/week8/study/src/main/java/umc/study/converter/UserConverter.java new file mode 100644 index 0000000..c7c54f4 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/converter/UserConverter.java @@ -0,0 +1,45 @@ +package umc.study.converter; + +import umc.study.domain.User; +import umc.study.domain.enums.Gender; +import umc.study.web.dto.UserRequestDTO; +import umc.study.web.dto.UserResponseDTO; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +public class UserConverter { + public static UserResponseDTO.JoinResultDTO toJoinResultDTO(User user){ + return UserResponseDTO.JoinResultDTO.builder() + .userId(user.getId()) + .createdAt(LocalDateTime.now()) + .build(); + } + + public static User toUser(UserRequestDTO.JoinDto request){ + + Gender gender = null; + + switch (request.getGender()){ + case 1: + gender = Gender.MALE; + break; + case 2: + gender = Gender.FEMALE; + break; + case 3: + gender = Gender.NONE; + break; + } + + return User.builder() + .address(request.getAddress()) + //.specAddress(request.getSpecAddress()) + .gender(gender) + .email(request.getEmail()) + .name(request.getName()) + .userPreferList(new ArrayList<>()) + .build(); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/converter/UserPreferConverter.java b/wis/week8/study/src/main/java/umc/study/converter/UserPreferConverter.java new file mode 100644 index 0000000..3a06c25 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/converter/UserPreferConverter.java @@ -0,0 +1,20 @@ +package umc.study.converter; + +import umc.study.domain.Food; +import umc.study.domain.mapping.UserPrefer; + +import java.util.List; +import java.util.stream.Collectors; + +public class UserPreferConverter { + + public static List toUserPreferList(List foodCategoryList){ + + return foodCategoryList.stream() + .map(foodCategory -> + UserPrefer.builder() + .foodCategory(foodCategory) + .build() + ).collect(Collectors.toList()); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/Agreement.java b/wis/week8/study/src/main/java/umc/study/domain/Agreement.java new file mode 100644 index 0000000..a98a6f6 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/Agreement.java @@ -0,0 +1,33 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.mapping.UserAgree; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Agreement extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Boolean optional; + + @OneToMany(mappedBy = "agreement", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/domain/Food.java b/wis/week8/study/src/main/java/umc/study/domain/Food.java new file mode 100644 index 0000000..c4f79e9 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/Food.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Food extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String foodCategory; +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/Mission.java b/wis/week8/study/src/main/java/umc/study/domain/Mission.java new file mode 100644 index 0000000..ff090bb --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/Mission.java @@ -0,0 +1,46 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Integer point; + + @Column(name = "due_date") + private LocalDate dueDate; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15)") + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/Region.java b/wis/week8/study/src/main/java/umc/study/domain/Region.java new file mode 100644 index 0000000..6f63188 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/Region.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String name; +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/Review.java b/wis/week8/study/src/main/java/umc/study/domain/Review.java new file mode 100644 index 0000000..2c53c79 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/Review.java @@ -0,0 +1,37 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Float star; + + @Column(columnDefinition = "TEXT") + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "review", cascade = CascadeType.ALL) + private List reviewImageList = new ArrayList<>(); +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/ReviewImage.java b/wis/week8/study/src/main/java/umc/study/domain/ReviewImage.java new file mode 100644 index 0000000..12fbef9 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/ReviewImage.java @@ -0,0 +1,25 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class ReviewImage extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String url; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} + diff --git a/wis/week8/study/src/main/java/umc/study/domain/Store.java b/wis/week8/study/src/main/java/umc/study/domain/Store.java new file mode 100644 index 0000000..95f1a3e --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/Store.java @@ -0,0 +1,48 @@ +package umc.study.domain; + +import lombok.*; +import umc.study.domain.common.BaseEntity; +import jakarta.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@ToString +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @Column(nullable = false, length = 255) + private String address; + + private Float score; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List missionList = new ArrayList<>(); + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + +@Override + public String toString() { + return "Store{" + + "id=" + id + + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", region=" + (region != null ? region.getName() : "N/A") + // region의 이름 출력 + '}'; + } +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/User.java b/wis/week8/study/src/main/java/umc/study/domain/User.java new file mode 100644 index 0000000..c1dee2b --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/User.java @@ -0,0 +1,76 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.*; +import umc.study.domain.mapping.UserAgree; +import umc.study.domain.mapping.UserMission; +import umc.study.domain.mapping.UserPrefer; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@DynamicUpdate +@DynamicInsert +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String email; + + @Column(nullable = false, length = 10) + private String name; + + @Column(nullable = false, length = 10) + @Enumerated(EnumType.STRING) + private Gender gender; + + private LocalDate birthday; + + @Column(nullable = false, length = 255) + private String address; + + private LocalDate lastLogin; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'ACTIVE'") + private UserStatus status; + + private LocalDate inactiveDate; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + private Integer point; + + //@Column(nullable = true, length = 20) + private String phone; + + //@Column(nullable = true) + private boolean phoneVerified; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userPreferList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); + +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/domain/common/BaseEntity.java b/wis/week8/study/src/main/java/umc/study/domain/common/BaseEntity.java new file mode 100644 index 0000000..150e36d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/common/BaseEntity.java @@ -0,0 +1,21 @@ +package umc.study.domain.common; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/enums/Gender.java b/wis/week8/study/src/main/java/umc/study/domain/enums/Gender.java new file mode 100644 index 0000000..40532b2 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum Gender { + MALE, NONE, FEMALE +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/enums/MissionStatus.java b/wis/week8/study/src/main/java/umc/study/domain/enums/MissionStatus.java new file mode 100644 index 0000000..a8f345f --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum MissionStatus { + CHALLENGING, COMPLETE +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/enums/SocialType.java b/wis/week8/study/src/main/java/umc/study/domain/enums/SocialType.java new file mode 100644 index 0000000..34c7e6c --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/enums/SocialType.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum SocialType { + KAKAO, GOOGLE, NAVER, APPLE +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/enums/UserStatus.java b/wis/week8/study/src/main/java/umc/study/domain/enums/UserStatus.java new file mode 100644 index 0000000..4cd6db8 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/enums/UserStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum UserStatus { + ACTIVE, INACTIVE +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/mapping/UserAgree.java b/wis/week8/study/src/main/java/umc/study/domain/mapping/UserAgree.java new file mode 100644 index 0000000..d9a1217 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/mapping/UserAgree.java @@ -0,0 +1,31 @@ +package umc.study.domain.mapping; + + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.User; +import umc.study.domain.Agreement; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserAgree extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private boolean agree; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "agreement_id") + private Agreement agreement; +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/mapping/UserMission.java b/wis/week8/study/src/main/java/umc/study/domain/mapping/UserMission.java new file mode 100644 index 0000000..6175707 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/mapping/UserMission.java @@ -0,0 +1,34 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Long verificationCode; + + @Enumerated(EnumType.STRING) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/wis/week8/study/src/main/java/umc/study/domain/mapping/UserPrefer.java b/wis/week8/study/src/main/java/umc/study/domain/mapping/UserPrefer.java new file mode 100644 index 0000000..c943261 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/domain/mapping/UserPrefer.java @@ -0,0 +1,39 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Food; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; + +@Entity +@Setter +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserPrefer extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food foodCategory; + + public void setUser(User user){ + if(this.user != null) + user.getUserPreferList().remove(this); + this.user = user; + user.getUserPreferList().add(this); + } + + public void setFood(Food foodCategory){ + this.foodCategory = foodCategory; + } +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/repository/FoodCategoryRepository/FoodCategoryRepository.java b/wis/week8/study/src/main/java/umc/study/repository/FoodCategoryRepository/FoodCategoryRepository.java new file mode 100644 index 0000000..d22e6e8 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/FoodCategoryRepository/FoodCategoryRepository.java @@ -0,0 +1,8 @@ +package umc.study.repository.FoodCategoryRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Food; + +public interface FoodCategoryRepository extends JpaRepository { + +} diff --git a/wis/week8/study/src/main/java/umc/study/repository/MissionRepository/MissionRepository.java b/wis/week8/study/src/main/java/umc/study/repository/MissionRepository/MissionRepository.java new file mode 100644 index 0000000..22907ae --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/MissionRepository/MissionRepository.java @@ -0,0 +1,7 @@ +package umc.study.repository.MissionRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Mission; + +public interface MissionRepository extends JpaRepository { +} diff --git a/wis/week8/study/src/main/java/umc/study/repository/RegionRepository/RegionRepository.java b/wis/week8/study/src/main/java/umc/study/repository/RegionRepository/RegionRepository.java new file mode 100644 index 0000000..468a939 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/RegionRepository/RegionRepository.java @@ -0,0 +1,8 @@ +package umc.study.repository.RegionRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Region; + +public interface RegionRepository extends JpaRepository { +} + diff --git a/wis/week8/study/src/main/java/umc/study/repository/ReveiwRepository/ReviewRepository.java b/wis/week8/study/src/main/java/umc/study/repository/ReveiwRepository/ReviewRepository.java new file mode 100644 index 0000000..d28385d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/ReveiwRepository/ReviewRepository.java @@ -0,0 +1,8 @@ +package umc.study.repository.ReveiwRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Review; + +public interface ReviewRepository extends JpaRepository { +} + diff --git a/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java b/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java new file mode 100644 index 0000000..c2c070c --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java @@ -0,0 +1,7 @@ +package umc.study.repository.StoreRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Store; + +public interface StoreRepository extends JpaRepository, StoreRepositoryCustom { +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java b/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java new file mode 100644 index 0000000..384bfd9 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java @@ -0,0 +1,10 @@ +package umc.study.repository.StoreRepository; + +import umc.study.domain.Store; + +import java.util.List; + + +public interface StoreRepositoryCustom { + List dynamicQueryWithBooleanBuilder(String name, String address); +} diff --git a/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java b/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java new file mode 100644 index 0000000..4cc162e --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java @@ -0,0 +1,35 @@ +package umc.study.repository.StoreRepository; + +import com.querydsl.core.BooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import umc.study.domain.QStore; +import umc.study.domain.Store; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class StoreRepositoryImpl implements StoreRepositoryCustom{ + private final JPAQueryFactory jpaQueryFactory; + private final QStore store = QStore.store; + + @Override + public List dynamicQueryWithBooleanBuilder(String name, String address) { + BooleanBuilder predicate = new BooleanBuilder(); + + if (name != null) { + predicate.and(store.name.eq(name)); + } + + if (address != null) { + predicate.and(store.address.eq(address)); + } + + return jpaQueryFactory + .selectFrom(store) + .where(predicate) + .fetch(); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/repository/UserMissionRepository/UserMissionRepository.java b/wis/week8/study/src/main/java/umc/study/repository/UserMissionRepository/UserMissionRepository.java new file mode 100644 index 0000000..db646ce --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/UserMissionRepository/UserMissionRepository.java @@ -0,0 +1,9 @@ +package umc.study.repository.UserMissionRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; + +public interface UserMissionRepository extends JpaRepository { + boolean existsByMissionIdAndStatus(Long missionId, MissionStatus status); +} diff --git a/wis/week8/study/src/main/java/umc/study/repository/UserRepository/UserRepository.java b/wis/week8/study/src/main/java/umc/study/repository/UserRepository/UserRepository.java new file mode 100644 index 0000000..399a5aa --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/repository/UserRepository/UserRepository.java @@ -0,0 +1,7 @@ +package umc.study.repository.UserRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.User; + +public interface UserRepository extends JpaRepository { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionCommandService.java b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionCommandService.java new file mode 100644 index 0000000..c66eb9c --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionCommandService.java @@ -0,0 +1,8 @@ +package umc.study.service.MissionService; + +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +public interface MissionCommandService { + MissionResponseDTO addMission(Long storeId, MissionRequestDTO request); +} diff --git a/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionCommandServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionCommandServiceImpl.java new file mode 100644 index 0000000..8cfb800 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionCommandServiceImpl.java @@ -0,0 +1,51 @@ +package umc.study.service.MissionService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.converter.MissionConverter; +import umc.study.domain.Mission; +import umc.study.domain.Store; +import umc.study.domain.enums.MissionStatus; +import umc.study.repository.MissionRepository.MissionRepository; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +@Service +@RequiredArgsConstructor +public class MissionCommandServiceImpl implements MissionCommandService { + + private final MissionRepository missionRepository; + private final StoreRepository storeRepository; + + @Override + @Transactional + public MissionResponseDTO addMission(Long storeId, MissionRequestDTO request) { + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new RuntimeException("Store not found")); // Replace with custom exception + + MissionStatus missionStatus = MissionConverter.getMissionStatus(request.getStatus()); + + Mission mission = Mission.builder() + .title(request.getTitle()) + .description(request.getDescription()) + .point(request.getPoint()) + .dueDate(request.getDueDate()) + .store(store) + .status(missionStatus) + .build(); + + mission = missionRepository.save(mission); + + return MissionResponseDTO.builder() + .id(mission.getId()) + .title(mission.getTitle()) + .description(mission.getDescription()) + .point(mission.getPoint()) + .storeName(store.getName()) + .build(); + } + +} + diff --git a/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionQueryService.java b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionQueryService.java new file mode 100644 index 0000000..ff79003 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionQueryService.java @@ -0,0 +1,4 @@ +package umc.study.service.MissionService; + +public interface MissionQueryService { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionQueryServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionQueryServiceImpl.java new file mode 100644 index 0000000..79f5f9e --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/MissionService/MissionQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.study.service.MissionService; + +public class MissionQueryServiceImpl { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewCommandService.java b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewCommandService.java new file mode 100644 index 0000000..67a103c --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewCommandService.java @@ -0,0 +1,7 @@ +package umc.study.service.ReviewService; + +import umc.study.web.dto.ReviewRequestDTO; + +public interface ReviewCommandService { + void addReview(ReviewRequestDTO request); +} diff --git a/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewCommandServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..d596168 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewCommandServiceImpl.java @@ -0,0 +1,33 @@ +package umc.study.service.ReviewService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.repository.ReveiwRepository.ReviewRepository; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.web.dto.ReviewRequestDTO; + +@Service +@RequiredArgsConstructor +public class ReviewCommandServiceImpl implements ReviewCommandService { + + private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; + + @Override + @Transactional + public void addReview(ReviewRequestDTO request) { + Store store = storeRepository.findById(request.getStoreId()) + .orElseThrow(() -> new RuntimeException("Store not found.")); // 추가적인 검증 필요 없음 (Validator에서 처리) + + Review review = Review.builder() + .content(request.getContent()) + .star(request.getStar()) + .store(store) + .build(); + + reviewRepository.save(review); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewQueryService.java b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewQueryService.java new file mode 100644 index 0000000..c1a5080 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewQueryService.java @@ -0,0 +1,4 @@ +package umc.study.service.ReviewService; + +public interface ReviewQueryService { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewQueryServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewQueryServiceImpl.java new file mode 100644 index 0000000..356858a --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/ReviewService/ReviewQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.study.service.ReviewService; + +public class ReviewQueryServiceImpl { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreCommandService.java b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreCommandService.java new file mode 100644 index 0000000..8f3f0b6 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreCommandService.java @@ -0,0 +1,9 @@ +package umc.study.service.StoreService; + +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; + +public interface StoreCommandService { + StoreResponseDTO addStore(StoreRequestDTO request); +} + diff --git a/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreCommandServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreCommandServiceImpl.java new file mode 100644 index 0000000..71dfff6 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreCommandServiceImpl.java @@ -0,0 +1,40 @@ +package umc.study.service.StoreService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.domain.Region; +import umc.study.domain.Store; +import umc.study.repository.RegionRepository.RegionRepository; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; + +@Service +@RequiredArgsConstructor +public class StoreCommandServiceImpl implements StoreCommandService { + + private final StoreRepository storeRepository; + private final RegionRepository regionRepository; + + @Override + @Transactional + public StoreResponseDTO addStore(StoreRequestDTO request) { + Region region = regionRepository.findById(request.getRegionId()) + .orElseThrow(() -> new RuntimeException("Region not found")); // Replace with custom exception + Store store = Store.builder() + .name(request.getName()) + .address(request.getAddress()) + .region(region) + .build(); + store = storeRepository.save(store); + + return StoreResponseDTO.builder() + .id(store.getId()) + .name(store.getName()) + .address(store.getAddress()) + .regionName(region.getName()) + .build(); + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java new file mode 100644 index 0000000..2d1a5d8 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java @@ -0,0 +1,12 @@ +package umc.study.service.StoreService; + +import umc.study.domain.Store; + +import java.util.List; +import java.util.Optional; + +public interface StoreQueryService { + + Optional findStore(Long id); + List findStoresByNameAndAddress(String name, String address); +} diff --git a/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java new file mode 100644 index 0000000..f7bde03 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java @@ -0,0 +1,32 @@ +package umc.study.service.StoreService; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import umc.study.domain.Store; +import umc.study.repository.StoreRepository.StoreRepository; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class StoreQueryServiceImpl implements StoreQueryService{ + + private final StoreRepository storeRepository; + + @Override + public Optional findStore(Long id) { + return storeRepository.findById(id); + } + + @Override + public List findStoresByNameAndAddress(String name, String address) { + List filteredStores = storeRepository.dynamicQueryWithBooleanBuilder(name, address); + + filteredStores.forEach(store -> System.out.println("Store: " + store)); + + return filteredStores; + } +} diff --git a/wis/week8/study/src/main/java/umc/study/service/TempService/TempCommandService.java b/wis/week8/study/src/main/java/umc/study/service/TempService/TempCommandService.java new file mode 100644 index 0000000..c21d1aa --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/TempService/TempCommandService.java @@ -0,0 +1,4 @@ +package umc.study.service.TempService; + +public interface TempCommandService { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java new file mode 100644 index 0000000..bf56051 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java @@ -0,0 +1,16 @@ +package umc.study.service.TempService; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class TempCommandServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag) { + + } +} + + diff --git a/wis/week8/study/src/main/java/umc/study/service/TempService/TempQueryService.java b/wis/week8/study/src/main/java/umc/study/service/TempService/TempQueryService.java new file mode 100644 index 0000000..53687d0 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/TempService/TempQueryService.java @@ -0,0 +1,6 @@ +package umc.study.service.TempService; + +public interface TempQueryService { + + void CheckFlag(Integer flag); +} diff --git a/wis/week8/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java new file mode 100644 index 0000000..9c810fa --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java @@ -0,0 +1,19 @@ +package umc.study.service.TempService; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.apiPayload.exception.handler.TempHandler; + +@Service +@RequiredArgsConstructor +@Primary +public class TempQueryServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag) { + if (flag == 1) + throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandService.java b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandService.java new file mode 100644 index 0000000..bad1c5d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandService.java @@ -0,0 +1,9 @@ +package umc.study.service.UserMissionService; + +import umc.study.web.dto.MissionChallengeRequestDTO; +import umc.study.web.dto.MissionChallengeResponseDTO; + +public interface UserMissionCommandService { + MissionChallengeResponseDTO challengeMission(MissionChallengeRequestDTO request); +} + diff --git a/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandServiceImpl.java new file mode 100644 index 0000000..7adaa22 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandServiceImpl.java @@ -0,0 +1,54 @@ +package umc.study.service.UserMissionService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; +import umc.study.repository.MissionRepository.MissionRepository; +import umc.study.repository.UserMissionRepository.UserMissionRepository; +import umc.study.repository.UserRepository.UserRepository; +import umc.study.web.dto.MissionChallengeRequestDTO; +import umc.study.web.dto.MissionChallengeResponseDTO; + +@Service +@RequiredArgsConstructor +public class UserMissionCommandServiceImpl implements UserMissionCommandService { + + private final UserRepository userRepository; + private final MissionRepository missionRepository; + private final UserMissionRepository userMissionRepository; + + @Override + @Transactional + public MissionChallengeResponseDTO challengeMission(MissionChallengeRequestDTO request) { + + User user = userRepository.findById(request.getUserId()) + .orElseThrow(() -> new RuntimeException("User not found")); // Custom exception recommended + + Mission mission = missionRepository.findById(request.getMissionId()) + .orElseThrow(() -> new RuntimeException("Mission not found")); // Custom exception recommended + + UserMission userMission = UserMission.builder() + .user(user) + .mission(mission) + .status(MissionStatus.CHALLENGING) + .verificationCode(generateVerificationCode()) + .build(); + + userMissionRepository.save(userMission); + + return MissionChallengeResponseDTO.builder() + .userId(user.getId()) + .missionId(mission.getId()) + .status(MissionStatus.CHALLENGING.name()) + .build(); + } + + private Long generateVerificationCode() { + return (long) (Math.random() * 1_000_000); // Random 6-digit verification code + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryService.java b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryService.java new file mode 100644 index 0000000..6eaef28 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryService.java @@ -0,0 +1,4 @@ +package umc.study.service.UserMissionService; + +public interface UserMissionQueryService { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryServiceImpl.java new file mode 100644 index 0000000..4f07d95 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.study.service.UserMissionService; + +public class UserMissionQueryServiceImpl { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/UserService/UserCommandService.java b/wis/week8/study/src/main/java/umc/study/service/UserService/UserCommandService.java new file mode 100644 index 0000000..a440a98 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserService/UserCommandService.java @@ -0,0 +1,8 @@ +package umc.study.service.UserService; + +import umc.study.domain.User; +import umc.study.web.dto.UserRequestDTO; + +public interface UserCommandService { + User joinUser(UserRequestDTO.JoinDto request); +} diff --git a/wis/week8/study/src/main/java/umc/study/service/UserService/UserCommandServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/UserService/UserCommandServiceImpl.java new file mode 100644 index 0000000..0b8dac2 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserService/UserCommandServiceImpl.java @@ -0,0 +1,45 @@ +package umc.study.service.UserService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.apiPayload.exception.handler.FoodCategoryHandler; +import umc.study.converter.UserConverter; +import umc.study.converter.UserPreferConverter; +import umc.study.domain.Food; +import umc.study.domain.User; +import umc.study.domain.mapping.UserPrefer; +import umc.study.repository.FoodCategoryRepository.FoodCategoryRepository; +import umc.study.repository.UserRepository.UserRepository; +import umc.study.web.dto.UserRequestDTO; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class UserCommandServiceImpl implements UserCommandService{ + + private final UserRepository userRepository; + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + @Transactional + public User joinUser(UserRequestDTO.JoinDto request) { + + User newUser = UserConverter.toUser(request); + List foodCategoryList = request.getPreferCategory().stream() + .map(category -> { + return foodCategoryRepository.findById(Long.valueOf(category)).orElseThrow(() -> new FoodCategoryHandler(ErrorStatus.FOOD_CATEGORY_NOT_FOUND)); + }).collect(Collectors.toList()); + + List userPreferList = UserPreferConverter.toUserPreferList(foodCategoryList); + + userPreferList.forEach(userPrefer -> {userPrefer.setUser(newUser);}); + + return userRepository.save(newUser); + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/service/UserService/UserQueryService.java b/wis/week8/study/src/main/java/umc/study/service/UserService/UserQueryService.java new file mode 100644 index 0000000..ad41fac --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserService/UserQueryService.java @@ -0,0 +1,4 @@ +package umc.study.service.UserService; + +public interface UserQueryService { +} diff --git a/wis/week8/study/src/main/java/umc/study/service/UserService/UserQueryServiceImpl.java b/wis/week8/study/src/main/java/umc/study/service/UserService/UserQueryServiceImpl.java new file mode 100644 index 0000000..ab8492d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/service/UserService/UserQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.study.service.UserService; + +public class UserQueryServiceImpl { +} diff --git a/wis/week8/study/src/main/java/umc/study/validation/annotation/ExistCategories.java b/wis/week8/study/src/main/java/umc/study/validation/annotation/ExistCategories.java new file mode 100644 index 0000000..3a77665 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/validation/annotation/ExistCategories.java @@ -0,0 +1,18 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.CategoriesExistValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CategoriesExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistCategories { + + String message() default "해당하는 카테고리가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/wis/week8/study/src/main/java/umc/study/validation/annotation/MissionAlreadyChallenging.java b/wis/week8/study/src/main/java/umc/study/validation/annotation/MissionAlreadyChallenging.java new file mode 100644 index 0000000..8cb7105 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/validation/annotation/MissionAlreadyChallenging.java @@ -0,0 +1,18 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.MissionAlreadyChallengingValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = MissionAlreadyChallengingValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface MissionAlreadyChallenging { + + String message() default "The mission is already being challenged."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/wis/week8/study/src/main/java/umc/study/validation/annotation/ValidStore.java b/wis/week8/study/src/main/java/umc/study/validation/annotation/ValidStore.java new file mode 100644 index 0000000..3c15c9d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/validation/annotation/ValidStore.java @@ -0,0 +1,17 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.StoreExistValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = StoreExistValidator.class) +@Target({ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidStore { + String message() default "해당 가게가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/wis/week8/study/src/main/java/umc/study/validation/validator/CategoriesExistValidator.java b/wis/week8/study/src/main/java/umc/study/validation/validator/CategoriesExistValidator.java new file mode 100644 index 0000000..4e4f60f --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/validation/validator/CategoriesExistValidator.java @@ -0,0 +1,37 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.repository.FoodCategoryRepository.FoodCategoryRepository; +import umc.study.validation.annotation.ExistCategories; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class CategoriesExistValidator implements ConstraintValidator> { + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + public void initialize(ExistCategories constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> foodCategoryRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.FOOD_CATEGORY_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/validation/validator/MissionAlreadyChallengingValidator.java b/wis/week8/study/src/main/java/umc/study/validation/validator/MissionAlreadyChallengingValidator.java new file mode 100644 index 0000000..50d8483 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/validation/validator/MissionAlreadyChallengingValidator.java @@ -0,0 +1,43 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.study.domain.enums.MissionStatus; +import umc.study.repository.UserMissionRepository.UserMissionRepository; +import umc.study.validation.annotation.MissionAlreadyChallenging; + +@Component +@RequiredArgsConstructor +public class MissionAlreadyChallengingValidator implements ConstraintValidator { + + private final UserMissionRepository userMissionRepository; + + @Override + public boolean isValid(Long missionId, ConstraintValidatorContext context) { + if (missionId == null) { + return true; // null 값은 유효성 검사 대상이 아님 + } + + try { + // Enum MissionStatus 사용 + boolean isAlreadyChallenging = userMissionRepository.existsByMissionIdAndStatus(missionId, MissionStatus.CHALLENGING); + + if (isAlreadyChallenging) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate("The mission is already being challenged.") + .addConstraintViolation(); + } + + return !isAlreadyChallenging; + + } catch (Exception e) { + e.printStackTrace(); + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate("Unexpected error during validation: " + e.getMessage()) + .addConstraintViolation(); + return false; + } + } +} diff --git a/wis/week8/study/src/main/java/umc/study/validation/validator/StoreExistValidator.java b/wis/week8/study/src/main/java/umc/study/validation/validator/StoreExistValidator.java new file mode 100644 index 0000000..efe7e94 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/validation/validator/StoreExistValidator.java @@ -0,0 +1,24 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.validation.annotation.ValidStore; + +@Component +@RequiredArgsConstructor +public class StoreExistValidator implements ConstraintValidator { + + private final StoreRepository storeRepository; + + @Override + public boolean isValid(Long storeId, ConstraintValidatorContext context) { + if (storeId == null) { + return false; // storeId가 null이면 검증 실패 + } + return storeRepository.existsById(storeId); // storeId가 존재하면 true, 없으면 false + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/controller/MissionChallengeController.java b/wis/week8/study/src/main/java/umc/study/web/controller/MissionChallengeController.java new file mode 100644 index 0000000..b2b3d43 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/controller/MissionChallengeController.java @@ -0,0 +1,24 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import umc.study.service.UserMissionService.UserMissionCommandService; +import umc.study.web.dto.MissionChallengeRequestDTO; +import umc.study.web.dto.MissionChallengeResponseDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/missions/challenge") +public class MissionChallengeController { + + private final UserMissionCommandService userMissionCommandService; + + @PostMapping + public ResponseEntity challengeMission( + @Valid @RequestBody MissionChallengeRequestDTO request) { + MissionChallengeResponseDTO response = userMissionCommandService.challengeMission(request); + return ResponseEntity.ok(response); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/web/controller/MissionController.java b/wis/week8/study/src/main/java/umc/study/web/controller/MissionController.java new file mode 100644 index 0000000..2d6ac95 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/controller/MissionController.java @@ -0,0 +1,27 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import umc.study.service.MissionService.MissionCommandService; +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +@RestController +@RequestMapping("/stores/{storeId}/missions") +@RequiredArgsConstructor +public class MissionController { + + private final MissionCommandService missionCommandService; + + @PostMapping + public ResponseEntity addMission( + @PathVariable Long storeId, + @RequestBody @Valid MissionRequestDTO request) { + MissionResponseDTO mission = missionCommandService.addMission(storeId, request); + return ResponseEntity.status(HttpStatus.CREATED).body(mission); + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/controller/ReviewController.java b/wis/week8/study/src/main/java/umc/study/web/controller/ReviewController.java new file mode 100644 index 0000000..1acce88 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/controller/ReviewController.java @@ -0,0 +1,22 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import umc.study.service.ReviewService.ReviewCommandService; +import umc.study.web.dto.ReviewRequestDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/reviews") +public class ReviewController { + + private final ReviewCommandService reviewCommandService; + + @PostMapping + public ResponseEntity addReview(@Valid @RequestBody ReviewRequestDTO request) { + reviewCommandService.addReview(request); + return ResponseEntity.ok("리뷰가 성공적으로 추가되었습니다."); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/web/controller/StoreController.java b/wis/week8/study/src/main/java/umc/study/web/controller/StoreController.java new file mode 100644 index 0000000..4656cb9 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/controller/StoreController.java @@ -0,0 +1,33 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.UserConverter; +import umc.study.domain.User; +import umc.study.service.StoreService.StoreCommandService; +import umc.study.service.UserService.UserCommandService; +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; +import umc.study.web.dto.UserRequestDTO; +import umc.study.web.dto.UserResponseDTO; + +@RestController +@RequestMapping("/stores") +@RequiredArgsConstructor +public class StoreController { + + private final StoreCommandService storeCommandService; + + @PostMapping("/") + public ResponseEntity addStore(@RequestBody @Valid StoreRequestDTO request) { + StoreResponseDTO store = storeCommandService.addStore(request); + return ResponseEntity.status(HttpStatus.CREATED).body(store); + } +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/web/controller/TempRestController.java b/wis/week8/study/src/main/java/umc/study/web/controller/TempRestController.java new file mode 100644 index 0000000..7b2daf1 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/controller/TempRestController.java @@ -0,0 +1,32 @@ +package umc.study.web.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.TempConverter; +import umc.study.service.TempService.TempQueryService; +import umc.study.web.dto.TempResponse; + +@RestController +@RequestMapping("/temp") +@RequiredArgsConstructor +public class TempRestController { + + private final TempQueryService tempQueryService; + + @GetMapping("/test") + public ApiResponse testAPI(){ + + return ApiResponse.onSuccess(TempConverter.toTempTestDTO()); + } + + @GetMapping("/exception") + public ApiResponse exceptionAPI(@RequestParam Integer flag){ + tempQueryService.CheckFlag(flag); + return ApiResponse.onSuccess(TempConverter.toTempExceptionDTO(flag)); + } +} \ No newline at end of file diff --git a/wis/week8/study/src/main/java/umc/study/web/controller/UserRestController.java b/wis/week8/study/src/main/java/umc/study/web/controller/UserRestController.java new file mode 100644 index 0000000..09ff7c5 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/controller/UserRestController.java @@ -0,0 +1,31 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.UserConverter; +import umc.study.domain.User; +import umc.study.service.UserService.UserCommandService; +import umc.study.web.dto.UserRequestDTO; +import umc.study.web.dto.UserResponseDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/users") +@Slf4j +public class UserRestController { + + private final UserCommandService userCommandService; + + @PostMapping("/") + public ApiResponse join(@RequestBody @Valid UserRequestDTO.JoinDto request){ + log.info("실행"); + User user = userCommandService.joinUser(request); + return ApiResponse.onSuccess(UserConverter.toJoinResultDTO(user)); + } +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/MissionChallengeRequestDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/MissionChallengeRequestDTO.java new file mode 100644 index 0000000..b01c98f --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/MissionChallengeRequestDTO.java @@ -0,0 +1,18 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import umc.study.validation.annotation.MissionAlreadyChallenging; + +@Getter +@Setter +public class MissionChallengeRequestDTO { + + @NotNull(message = "Mission ID is required.") + @MissionAlreadyChallenging + private Long missionId; + + @NotNull(message = "User ID is required.") + private Long userId; +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/MissionChallengeResponseDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/MissionChallengeResponseDTO.java new file mode 100644 index 0000000..9212419 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/MissionChallengeResponseDTO.java @@ -0,0 +1,12 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MissionChallengeResponseDTO { + private Long userId; + private Long missionId; + private String status; +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/MissionRequestDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/MissionRequestDTO.java new file mode 100644 index 0000000..b790338 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/MissionRequestDTO.java @@ -0,0 +1,28 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + + +@Getter +public class MissionRequestDTO { + @NotBlank + private String title; + + @NotBlank + private String description; + + @NotNull + private Integer point; + + @NotNull + private LocalDate dueDate; + + @NotNull + private Integer status; // 1: CHALLENGING, 2: COMPLETE +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/MissionResponseDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/MissionResponseDTO.java new file mode 100644 index 0000000..94cd8ff --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/MissionResponseDTO.java @@ -0,0 +1,14 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MissionResponseDTO { + private Long id; + private String title; + private String description; + private Integer point; + private String storeName; +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/ReviewRequestDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/ReviewRequestDTO.java new file mode 100644 index 0000000..7c79ead --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/ReviewRequestDTO.java @@ -0,0 +1,29 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import umc.study.validation.annotation.ValidStore; + +@Getter +@Setter +public class ReviewRequestDTO { + + @NotNull(message = "Store ID cannot be null.") + @ValidStore // 가게 존재 여부 검증 + private Long storeId; + + @NotBlank(message = "Review content cannot be empty.") + private String content; + + @NotNull(message = "Star rating is required.") + + @DecimalMin(value = "0.0", inclusive = false) + + @DecimalMax(value = "5.0", inclusive = true) + + private Float star; +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/ReviewResponseDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/ReviewResponseDTO.java new file mode 100644 index 0000000..c09b5fd --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/ReviewResponseDTO.java @@ -0,0 +1,15 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ReviewResponseDTO { + private Long id; + private String content; + private Float star; + private String storeName; + private String userName; +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/StoreRequestDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/StoreRequestDTO.java new file mode 100644 index 0000000..60e5f3d --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/StoreRequestDTO.java @@ -0,0 +1,18 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; + +@Getter +public class StoreRequestDTO { + @NotBlank + private String name; + + @NotBlank + private String address; + + @NotNull + private Long regionId; +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/StoreResponseDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/StoreResponseDTO.java new file mode 100644 index 0000000..5df6e6b --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/StoreResponseDTO.java @@ -0,0 +1,14 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class StoreResponseDTO { + private Long id; + private String name; + private String address; + private String regionName; +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/TempRequest.java b/wis/week8/study/src/main/java/umc/study/web/dto/TempRequest.java new file mode 100644 index 0000000..ae31723 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/TempRequest.java @@ -0,0 +1,4 @@ +package umc.study.web.dto; + +public class TempRequest { +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/TempResponse.java b/wis/week8/study/src/main/java/umc/study/web/dto/TempResponse.java new file mode 100644 index 0000000..2ee4b9c --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/TempResponse.java @@ -0,0 +1,25 @@ +package umc.study.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class TempResponse { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempTestDTO{ + String testString; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempExceptionDTO{ + Integer flag; + } +} diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/UserRequestDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/UserRequestDTO.java new file mode 100644 index 0000000..5b796d3 --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/UserRequestDTO.java @@ -0,0 +1,32 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import umc.study.validation.annotation.ExistCategories; + +import java.util.List; + +public class UserRequestDTO { + @Getter + public static class JoinDto{ + @NotBlank + String name; + @NotBlank + String email; + @NotNull + Integer gender; + @NotNull + Integer birthYear; + @NotNull + Integer birthMonth; + @NotNull + Integer birthDay; + @Size(min = 5, max = 12) + String address; + @Size(min = 5, max = 12) + List preferCategory; + } +} + diff --git a/wis/week8/study/src/main/java/umc/study/web/dto/UserResponseDTO.java b/wis/week8/study/src/main/java/umc/study/web/dto/UserResponseDTO.java new file mode 100644 index 0000000..bdaa02b --- /dev/null +++ b/wis/week8/study/src/main/java/umc/study/web/dto/UserResponseDTO.java @@ -0,0 +1,19 @@ +package umc.study.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class UserResponseDTO { + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class JoinResultDTO{ + Long userId; + LocalDateTime createdAt; + } +} diff --git a/wis/week8/study/src/main/resources/application.yml b/wis/week8/study/src/main/resources/application.yml new file mode 100644 index 0000000..54acddf --- /dev/null +++ b/wis/week8/study/src/main/resources/application.yml @@ -0,0 +1,22 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/study + username: root + password: mirae1107 + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 +logging: + level: + root: INFO \ No newline at end of file diff --git a/wis/week8/study/src/test/java/umc/study/StudyApplicationTests.java b/wis/week8/study/src/test/java/umc/study/StudyApplicationTests.java new file mode 100644 index 0000000..89717bd --- /dev/null +++ b/wis/week8/study/src/test/java/umc/study/StudyApplicationTests.java @@ -0,0 +1,13 @@ +package umc.study; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class StudyApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/wis/week9/study/.gitattributes b/wis/week9/study/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/wis/week9/study/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/wis/week9/study/.gitignore b/wis/week9/study/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/wis/week9/study/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/wis/week9/study/build.gradle b/wis/week9/study/build.gradle new file mode 100644 index 0000000..0370090 --- /dev/null +++ b/wis/week9/study/build.gradle @@ -0,0 +1,62 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + implementation 'org.springframework.boot:spring-boot-starter-validation' + + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' +} + +tasks.named('test') { + //useJUnitPlatform() +} + +// QueryDSL 설정 +def querydslDir = "$buildDir/generated/querydsl" + +sourceSets { + main.java.srcDirs += [ querydslDir ] +} + +tasks.withType(JavaCompile) { + options.generatedSourceOutputDirectory = file(querydslDir) +} + +clean { + delete file(querydslDir) +} diff --git a/wis/week9/study/gradle/wrapper/gradle-wrapper.jar b/wis/week9/study/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..a4b76b9 Binary files /dev/null and b/wis/week9/study/gradle/wrapper/gradle-wrapper.jar differ diff --git a/wis/week9/study/gradle/wrapper/gradle-wrapper.properties b/wis/week9/study/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/wis/week9/study/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/wis/week9/study/gradlew b/wis/week9/study/gradlew new file mode 100755 index 0000000..f5feea6 --- /dev/null +++ b/wis/week9/study/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/wis/week9/study/gradlew.bat b/wis/week9/study/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/wis/week9/study/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/wis/week9/study/settings.gradle b/wis/week9/study/settings.gradle new file mode 100644 index 0000000..77d056d --- /dev/null +++ b/wis/week9/study/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'study' diff --git a/wis/week9/study/src/main/java/umc/study/Config/QueryDSLConfig.java b/wis/week9/study/src/main/java/umc/study/Config/QueryDSLConfig.java new file mode 100644 index 0000000..0eb0ecf --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/Config/QueryDSLConfig.java @@ -0,0 +1,18 @@ +package umc.study.Config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class QueryDSLConfig { + private final EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory(){ + return new JPAQueryFactory(entityManager); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/Config/SwaggerConfig.java b/wis/week9/study/src/main/java/umc/study/Config/SwaggerConfig.java new file mode 100644 index 0000000..ac919d3 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/Config/SwaggerConfig.java @@ -0,0 +1,40 @@ +package umc.study.Config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI UMCstudyAPI() { + Info info = new Info() + .title("UMC Server WorkBook API") + .description("UMC Server WorkBook API 명세서") + .version("1.0.0"); + + String jwtSchemeName = "JWT TOKEN"; + // API 요청헤더에 인증정보 포함 + SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtSchemeName); + // SecuritySchemes 등록 + Components components = new Components() + .addSecuritySchemes(jwtSchemeName, new SecurityScheme() + .name(jwtSchemeName) + .type(SecurityScheme.Type.HTTP) // HTTP 방식 + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url("/")) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } + +} diff --git a/wis/week9/study/src/main/java/umc/study/StudyApplication.java b/wis/week9/study/src/main/java/umc/study/StudyApplication.java new file mode 100644 index 0000000..ca5af85 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/StudyApplication.java @@ -0,0 +1,37 @@ +package umc.study; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import umc.study.service.StoreService.StoreQueryService; + +@SpringBootApplication +@EnableJpaAuditing +public class StudyApplication { + + public static void main(String[] args) { + SpringApplication.run(StudyApplication.class, args); + } + + @Bean + public CommandLineRunner run(ApplicationContext context) { + return args -> { + StoreQueryService storeService = context.getBean(StoreQueryService.class); + + // 파라미터 값 설정 + String name = "요아정"; + String address = "대치동"; + + // 쿼리 메서드 호출 및 쿼리 문자열과 파라미터 출력 + System.out.println("Executing findStoresByNameAndAddress with parameters:"); + System.out.println("Name: " + name); + System.out.println("Address: " + address); + + storeService.findStoresByNameAndAddress(name, address) + .forEach(System.out::println); + }; + } +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/ApiResponse.java b/wis/week9/study/src/main/java/umc/study/apiPayload/ApiResponse.java new file mode 100644 index 0000000..5db2eac --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/ApiResponse.java @@ -0,0 +1,39 @@ +package umc.study.apiPayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.study.apiPayload.code.BaseCode; +import umc.study.apiPayload.code.status.SuccessStatus; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + private final String code; + private final String message; + @JsonInclude(JsonInclude.Include.NON_NULL) + private T result; + + + // 성공한 경우 응답 생성 + + public static ApiResponse onSuccess(T result){ + return new ApiResponse<>(true, SuccessStatus._OK.getCode() , SuccessStatus._OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result){ + return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result); + } + + + // 실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data){ + return new ApiResponse<>(false, code, message, data); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/code/BaseCode.java b/wis/week9/study/src/main/java/umc/study/apiPayload/code/BaseCode.java new file mode 100644 index 0000000..3c3dd87 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/code/BaseCode.java @@ -0,0 +1,8 @@ +package umc.study.apiPayload.code; + +public interface BaseCode { + + ReasonDTO getReason(); + + ReasonDTO getReasonHttpStatus(); +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java b/wis/week9/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java new file mode 100644 index 0000000..89b4fb8 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/code/BaseErrorCode.java @@ -0,0 +1,8 @@ +package umc.study.apiPayload.code; + +public interface BaseErrorCode { + + ErrorReasonDTO getReason(); + + ErrorReasonDTO getReasonHttpStatus(); +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java b/wis/week9/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java new file mode 100644 index 0000000..f529728 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/code/ErrorReasonDTO.java @@ -0,0 +1,18 @@ +package umc.study.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ErrorReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java b/wis/week9/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java new file mode 100644 index 0000000..05764b3 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/code/ReasonDTO.java @@ -0,0 +1,18 @@ +package umc.study.apiPayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java b/wis/week9/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java new file mode 100644 index 0000000..a307cfd --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/code/status/ErrorStatus.java @@ -0,0 +1,62 @@ +package umc.study.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + // 가장 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON400","잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON401","인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + + + // 멤버 관려 에러 + USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "USER4001", "사용자가 없습니다."), + NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "USER4002", "닉네임은 필수 입니다."), + + // 예시,,, + ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."), + + // For test + TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"), + + // FoodCategory 관련 에러 + FOOD_CATEGORY_NOT_FOUND(HttpStatus.NOT_FOUND, "FOOD4001", "해당 음식 카테고리를 찾을 수 없습니다."), + + // 페이징 관련 에러 + INVALID_PAGE_REQUEST(HttpStatus.BAD_REQUEST, "PAGING4001", "페이지 번호는 1 이상의 정수여야 합니다."), + + // 미션 관련 에러 + ONGOING_MISSION_NOT_FOUND(HttpStatus.NOT_FOUND, "MISSION4002", "진행 중인 미션을 찾을 수 없습니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .build(); + } + + @Override + public ErrorReasonDTO getReasonHttpStatus() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java b/wis/week9/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java new file mode 100644 index 0000000..3eb4812 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/code/status/SuccessStatus.java @@ -0,0 +1,39 @@ +package umc.study.apiPayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.study.apiPayload.code.BaseCode; +import umc.study.apiPayload.code.ReasonDTO; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + + // 일반적인 응답 + _OK(HttpStatus.OK, "COMMON200", "성공입니다."); + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .build(); + } + + @Override + public ReasonDTO getReasonHttpStatus() { + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build() + ; + } +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java new file mode 100644 index 0000000..f90cf8c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/ExceptionAdvice.java @@ -0,0 +1,119 @@ +package umc.study.apiPayload.exception; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import umc.study.apiPayload.ApiResponse; +import umc.study.apiPayload.code.ErrorReasonDTO; +import umc.study.apiPayload.code.status.ErrorStatus; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class ExceptionAdvice extends ResponseEntityExceptionHandler { + + + @ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = e.getConstraintViolations().stream() + .map(constraintViolation -> constraintViolation.getMessage()) + .findFirst() + .orElseThrow(() -> new RuntimeException("ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request); + } + + @Override + public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors().stream() + .forEach(fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge(fieldName, errorMessage, (existingErrorMessage, newErrorMessage) -> existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors); + } + + @ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + e.printStackTrace(); + + return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); + } + + @ExceptionHandler(value = GeneralException.class) + public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); + } + + private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, + HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); +// e.printStackTrace(); + + WebRequest webRequest = new ServletWebRequest(request); + return super.handleExceptionInternal( + e, + body, + headers, + reason.getHttpStatus(), + webRequest + ); + } + + private ResponseEntity handleExceptionInternalFalse(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, HttpStatus status, WebRequest request, String errorPoint) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorPoint); + return super.handleExceptionInternal( + e, + body, + headers, + status, + request + ); + } + + private ResponseEntity handleExceptionInternalArgs(Exception e, HttpHeaders headers, ErrorStatus errorCommonStatus, + WebRequest request, Map errorArgs) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorArgs); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } + + private ResponseEntity handleExceptionInternalConstraint(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, WebRequest request) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java new file mode 100644 index 0000000..8dc47ed --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/GeneralException.java @@ -0,0 +1,21 @@ +package umc.study.apiPayload.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private final BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus() { + return this.code.getReasonHttpStatus(); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/exception/handler/FoodCategoryHandler.java b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/handler/FoodCategoryHandler.java new file mode 100644 index 0000000..2cd4b44 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/handler/FoodCategoryHandler.java @@ -0,0 +1,12 @@ +package umc.study.apiPayload.exception.handler; + +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.exception.GeneralException; + +public class FoodCategoryHandler extends GeneralException { + public FoodCategoryHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} + + diff --git a/wis/week9/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java new file mode 100644 index 0000000..5ca4a8f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/apiPayload/exception/handler/TempHandler.java @@ -0,0 +1,11 @@ +package umc.study.apiPayload.exception.handler; + +import umc.study.apiPayload.code.BaseErrorCode; +import umc.study.apiPayload.exception.GeneralException; + +public class TempHandler extends GeneralException { + + public TempHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/converter/MissionConverter.java b/wis/week9/study/src/main/java/umc/study/converter/MissionConverter.java new file mode 100644 index 0000000..7ff8a6b --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/converter/MissionConverter.java @@ -0,0 +1,48 @@ +package umc.study.converter; + +import umc.study.domain.Mission; +import umc.study.domain.Store; +import umc.study.domain.enums.MissionStatus; +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +public class MissionConverter { + + public static MissionStatus getMissionStatus(int status) { + MissionStatus missionStatus = null; + + switch (status) { + case 1: + missionStatus = MissionStatus.CHALLENGING; + break; + case 2: + missionStatus = MissionStatus.COMPLETE; + break; + default: + throw new IllegalArgumentException("Invalid Mission Status"); + } + + return missionStatus; + } + + public static Mission toEntity(MissionRequestDTO request, Store store) { + return Mission.builder() + .title(request.getTitle()) + .description(request.getDescription()) + .point(request.getPoint()) + .dueDate(request.getDueDate()) + .store(store) + .build(); + } + + public static MissionResponseDTO toResponseDTO(Mission mission) { + return MissionResponseDTO.builder() + .id(mission.getId()) + .title(mission.getTitle()) + .description(mission.getDescription()) + .point(mission.getPoint()) + .storeName(mission.getStore().getName()) + .build(); + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/converter/ReviewConverter.java b/wis/week9/study/src/main/java/umc/study/converter/ReviewConverter.java new file mode 100644 index 0000000..3699b34 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/converter/ReviewConverter.java @@ -0,0 +1,30 @@ +package umc.study.converter; + +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.domain.User; +import umc.study.web.dto.ReviewRequestDTO; +import umc.study.web.dto.ReviewResponseDTO; + +public class ReviewConverter { + + public static Review toEntity(ReviewRequestDTO request, Store store, User user) { + return Review.builder() + .content(request.getContent()) + .star(request.getStar()) + .store(store) + .user(user) + .build(); + } + + public static ReviewResponseDTO toResponseDTO(Review review) { + return ReviewResponseDTO.builder() + .id(review.getId()) + .content(review.getContent()) + .star(review.getStar()) + .storeName(review.getStore().getName()) + .userName(review.getUser().getName()) + .build(); + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/converter/StoreConverter.java b/wis/week9/study/src/main/java/umc/study/converter/StoreConverter.java new file mode 100644 index 0000000..db1b171 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/converter/StoreConverter.java @@ -0,0 +1,81 @@ +package umc.study.converter; + +import org.springframework.data.domain.Page; +import umc.study.domain.Mission; +import umc.study.domain.Region; +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; + +import java.util.List; +import java.util.stream.Collectors; + +public class StoreConverter { + + public static Store toEntity(StoreRequestDTO request, Region region) { + return Store.builder() + .name(request.getName()) + .address(request.getAddress()) + .region(region) + .build(); + } + + public static StoreResponseDTO toResponseDTO(Store store) { + return StoreResponseDTO.builder() + .id(store.getId()) + .name(store.getName()) + .regionName(store.getRegion().getName()) + .build(); + } + + public static StoreResponseDTO.ReviewPreViewDTO reviewPreViewDTO(Review review){ + return StoreResponseDTO.ReviewPreViewDTO.builder() + .ownerNickname(review.getUser().getName()) + .score(review.getStar()) + .createdAt(review.getCreatedAt().toLocalDate()) + .body(review.getContent()) + .build(); + } + public static StoreResponseDTO.ReviewPreViewListDTO reviewPreViewListDTO(Page reviewList){ + + List reviewPreViewDTOList = reviewList.stream() + .map(StoreConverter::reviewPreViewDTO).collect(Collectors.toList()); + + return StoreResponseDTO.ReviewPreViewListDTO.builder() + .isLast(reviewList.isLast()) + .isFirst(reviewList.isFirst()) + .totalPage(reviewList.getTotalPages()) + .totalElements(reviewList.getTotalElements()) + .listSize(reviewPreViewDTOList.size()) + .reviewList(reviewPreViewDTOList) + .build(); + } + + public static StoreResponseDTO.MissionPreViewDTO missionPreViewDTO(Mission mission) { + return StoreResponseDTO.MissionPreViewDTO.builder() + .missionId(mission.getId()) + .title(mission.getTitle()) + .description(mission.getDescription()) + .point(mission.getPoint()) + .dueDate(mission.getDueDate()) + .status(mission.getStatus().name()) + .createdAt(mission.getCreatedAt().toLocalDate()) + .build(); + } + + public static StoreResponseDTO.MissionListDTO missionPreViewListDTO(Page missionList) { + List missionPreViewDTOList = missionList.stream() + .map(StoreConverter::missionPreViewDTO).collect(Collectors.toList()); + + return StoreResponseDTO.MissionListDTO.builder() + .isLast(missionList.isLast()) + .isFirst(missionList.isFirst()) + .totalPage(missionList.getTotalPages()) + .totalElements(missionList.getTotalElements()) + .listSize(missionPreViewDTOList.size()) + .missions(missionPreViewDTOList) + .build(); + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/converter/TempConverter.java b/wis/week9/study/src/main/java/umc/study/converter/TempConverter.java new file mode 100644 index 0000000..7654c4d --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/converter/TempConverter.java @@ -0,0 +1,18 @@ +package umc.study.converter; + +import umc.study.web.dto.TempResponse; + +public class TempConverter { + + public static TempResponse.TempTestDTO toTempTestDTO(){ + return TempResponse.TempTestDTO.builder() + .testString("This is Test!") + .build(); + } + + public static TempResponse.TempExceptionDTO toTempExceptionDTO(Integer flag){ + return TempResponse.TempExceptionDTO.builder() + .flag(flag) + .build(); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/converter/UserConverter.java b/wis/week9/study/src/main/java/umc/study/converter/UserConverter.java new file mode 100644 index 0000000..7ed647d --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/converter/UserConverter.java @@ -0,0 +1,100 @@ +package umc.study.converter; + +import org.springframework.data.domain.Page; +import umc.study.domain.Mission; +import umc.study.domain.Review; +import umc.study.domain.User; +import umc.study.domain.enums.Gender; +import umc.study.web.dto.StoreResponseDTO; +import umc.study.web.dto.UserRequestDTO; +import umc.study.web.dto.UserResponseDTO; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; + +public class UserConverter { + public static UserResponseDTO.JoinResultDTO toJoinResultDTO(User user){ + return UserResponseDTO.JoinResultDTO.builder() + .userId(user.getId()) + .createdAt(LocalDateTime.now()) + .build(); + } + + public static User toUser(UserRequestDTO.JoinDto request){ + + Gender gender = null; + + switch (request.getGender()){ + case 1: + gender = Gender.MALE; + break; + case 2: + gender = Gender.FEMALE; + break; + case 3: + gender = Gender.NONE; + break; + } + + return User.builder() + .address(request.getAddress()) + //.specAddress(request.getSpecAddress()) + .gender(gender) + .email(request.getEmail()) + .name(request.getName()) + .userPreferList(new ArrayList<>()) + .build(); + } + + public static UserResponseDTO.ReviewPreViewDTO reviewPreViewDTO(Review review){ + return UserResponseDTO.ReviewPreViewDTO.builder() + .ownerNickname(review.getUser().getName()) + .score(review.getStar()) + .createdAt(review.getCreatedAt().toLocalDate()) + .body(review.getContent()) + .build(); + } + public static UserResponseDTO.ReviewPreViewListDTO reviewPreViewListDTO(Page reviewList){ + + List reviewPreViewDTOList = reviewList.stream() + .map(UserConverter::reviewPreViewDTO).collect(Collectors.toList()); + + return UserResponseDTO.ReviewPreViewListDTO.builder() + .isLast(reviewList.isLast()) + .isFirst(reviewList.isFirst()) + .totalPage(reviewList.getTotalPages()) + .totalElements(reviewList.getTotalElements()) + .listSize(reviewPreViewDTOList.size()) + .reviewList(reviewPreViewDTOList) + .build(); + } + + public static UserResponseDTO.MissionPreViewDTO missionPreViewDTO(Mission mission) { + return UserResponseDTO.MissionPreViewDTO.builder() + .missionId(mission.getId()) + .title(mission.getTitle()) + .description(mission.getDescription()) + .point(mission.getPoint()) + .dueDate(mission.getDueDate()) + .status(mission.getStatus().name()) + .createdAt(mission.getCreatedAt().toLocalDate()) + .build(); + } + + public static UserResponseDTO.MissionListDTO missionPreViewListDTO(Page missionList) { + List missionPreViewDTOList = missionList.stream() + .map(UserConverter::missionPreViewDTO).collect(Collectors.toList()); + + return UserResponseDTO.MissionListDTO.builder() + .isLast(missionList.isLast()) + .isFirst(missionList.isFirst()) + .totalPage(missionList.getTotalPages()) + .totalElements(missionList.getTotalElements()) + .listSize(missionPreViewDTOList.size()) + .missions(missionPreViewDTOList) + .build(); + } + +} diff --git a/wis/week9/study/src/main/java/umc/study/converter/UserPreferConverter.java b/wis/week9/study/src/main/java/umc/study/converter/UserPreferConverter.java new file mode 100644 index 0000000..3a06c25 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/converter/UserPreferConverter.java @@ -0,0 +1,20 @@ +package umc.study.converter; + +import umc.study.domain.Food; +import umc.study.domain.mapping.UserPrefer; + +import java.util.List; +import java.util.stream.Collectors; + +public class UserPreferConverter { + + public static List toUserPreferList(List foodCategoryList){ + + return foodCategoryList.stream() + .map(foodCategory -> + UserPrefer.builder() + .foodCategory(foodCategory) + .build() + ).collect(Collectors.toList()); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/Agreement.java b/wis/week9/study/src/main/java/umc/study/domain/Agreement.java new file mode 100644 index 0000000..a98a6f6 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/Agreement.java @@ -0,0 +1,33 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.mapping.UserAgree; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Agreement extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Boolean optional; + + @OneToMany(mappedBy = "agreement", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/domain/Food.java b/wis/week9/study/src/main/java/umc/study/domain/Food.java new file mode 100644 index 0000000..c4f79e9 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/Food.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Food extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String foodCategory; +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/Mission.java b/wis/week9/study/src/main/java/umc/study/domain/Mission.java new file mode 100644 index 0000000..76dd9f0 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/Mission.java @@ -0,0 +1,46 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String description; + + @Column(nullable = false) + private Integer point; + + @Column(name = "due_date") + private LocalDate dueDate; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15)") + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id", nullable = false) + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/Region.java b/wis/week9/study/src/main/java/umc/study/domain/Region.java new file mode 100644 index 0000000..6f63188 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/Region.java @@ -0,0 +1,20 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 45) + private String name; +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/Review.java b/wis/week9/study/src/main/java/umc/study/domain/Review.java new file mode 100644 index 0000000..2c53c79 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/Review.java @@ -0,0 +1,37 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Float star; + + @Column(columnDefinition = "TEXT") + private String content; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "review", cascade = CascadeType.ALL) + private List reviewImageList = new ArrayList<>(); +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/ReviewImage.java b/wis/week9/study/src/main/java/umc/study/domain/ReviewImage.java new file mode 100644 index 0000000..12fbef9 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/ReviewImage.java @@ -0,0 +1,25 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class ReviewImage extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String url; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id") + private Review review; +} + diff --git a/wis/week9/study/src/main/java/umc/study/domain/Store.java b/wis/week9/study/src/main/java/umc/study/domain/Store.java new file mode 100644 index 0000000..95f1a3e --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/Store.java @@ -0,0 +1,48 @@ +package umc.study.domain; + +import lombok.*; +import umc.study.domain.common.BaseEntity; +import jakarta.persistence.*; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@ToString +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @Column(nullable = false, length = 255) + private String address; + + private Float score; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List missionList = new ArrayList<>(); + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + +@Override + public String toString() { + return "Store{" + + "id=" + id + + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", region=" + (region != null ? region.getName() : "N/A") + // region의 이름 출력 + '}'; + } +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/User.java b/wis/week9/study/src/main/java/umc/study/domain/User.java new file mode 100644 index 0000000..197864e --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/User.java @@ -0,0 +1,76 @@ +package umc.study.domain; + +import jakarta.persistence.*; +import lombok.*; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.*; +import umc.study.domain.mapping.UserAgree; +import umc.study.domain.mapping.UserMission; +import umc.study.domain.mapping.UserPrefer; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@DynamicUpdate +@DynamicInsert +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String email; + + @Column(nullable = false, length = 10) + private String name; + + @Column(nullable = false, length = 10) + @Enumerated(EnumType.STRING) + private Gender gender; + + private LocalDate birthday; + + @Column(nullable = false, length = 255) + private String address; + + private LocalDate lastLogin; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'ACTIVE'") + private UserStatus status; + + private LocalDate inactiveDate; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + private Integer point; + + //@Column(nullable = false, length = 20) + private String phone; + + //@Column(nullable = false) + private boolean phoneVerified; + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userAgreeList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userPreferList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "user", cascade = CascadeType.ALL) + private List userMissionList = new ArrayList<>(); + +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/domain/common/BaseEntity.java b/wis/week9/study/src/main/java/umc/study/domain/common/BaseEntity.java new file mode 100644 index 0000000..150e36d --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/common/BaseEntity.java @@ -0,0 +1,21 @@ +package umc.study.domain.common; + +import jakarta.persistence.*; +import lombok.*; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime updatedAt; +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/enums/Gender.java b/wis/week9/study/src/main/java/umc/study/domain/enums/Gender.java new file mode 100644 index 0000000..40532b2 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum Gender { + MALE, NONE, FEMALE +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/enums/MissionStatus.java b/wis/week9/study/src/main/java/umc/study/domain/enums/MissionStatus.java new file mode 100644 index 0000000..a8f345f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum MissionStatus { + CHALLENGING, COMPLETE +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/enums/SocialType.java b/wis/week9/study/src/main/java/umc/study/domain/enums/SocialType.java new file mode 100644 index 0000000..34c7e6c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/enums/SocialType.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum SocialType { + KAKAO, GOOGLE, NAVER, APPLE +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/enums/UserStatus.java b/wis/week9/study/src/main/java/umc/study/domain/enums/UserStatus.java new file mode 100644 index 0000000..4cd6db8 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/enums/UserStatus.java @@ -0,0 +1,5 @@ +package umc.study.domain.enums; + +public enum UserStatus { + ACTIVE, INACTIVE +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/mapping/UserAgree.java b/wis/week9/study/src/main/java/umc/study/domain/mapping/UserAgree.java new file mode 100644 index 0000000..d9a1217 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/mapping/UserAgree.java @@ -0,0 +1,31 @@ +package umc.study.domain.mapping; + + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.User; +import umc.study.domain.Agreement; +import umc.study.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserAgree extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private boolean agree; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "agreement_id") + private Agreement agreement; +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/mapping/UserMission.java b/wis/week9/study/src/main/java/umc/study/domain/mapping/UserMission.java new file mode 100644 index 0000000..162e05b --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/mapping/UserMission.java @@ -0,0 +1,35 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; +import umc.study.domain.enums.MissionStatus; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private Long verificationCode; + + @Setter + @Enumerated(EnumType.STRING) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/wis/week9/study/src/main/java/umc/study/domain/mapping/UserPrefer.java b/wis/week9/study/src/main/java/umc/study/domain/mapping/UserPrefer.java new file mode 100644 index 0000000..c943261 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/domain/mapping/UserPrefer.java @@ -0,0 +1,39 @@ +package umc.study.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.study.domain.Food; +import umc.study.domain.User; +import umc.study.domain.common.BaseEntity; + +@Entity +@Setter +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class UserPrefer extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_id") + private Food foodCategory; + + public void setUser(User user){ + if(this.user != null) + user.getUserPreferList().remove(this); + this.user = user; + user.getUserPreferList().add(this); + } + + public void setFood(Food foodCategory){ + this.foodCategory = foodCategory; + } +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/repository/FoodCategoryRepository/FoodCategoryRepository.java b/wis/week9/study/src/main/java/umc/study/repository/FoodCategoryRepository/FoodCategoryRepository.java new file mode 100644 index 0000000..d22e6e8 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/FoodCategoryRepository/FoodCategoryRepository.java @@ -0,0 +1,8 @@ +package umc.study.repository.FoodCategoryRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Food; + +public interface FoodCategoryRepository extends JpaRepository { + +} diff --git a/wis/week9/study/src/main/java/umc/study/repository/MissionRepository/MissionRepository.java b/wis/week9/study/src/main/java/umc/study/repository/MissionRepository/MissionRepository.java new file mode 100644 index 0000000..90b1f97 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/MissionRepository/MissionRepository.java @@ -0,0 +1,11 @@ +package umc.study.repository.MissionRepository; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Mission; +import umc.study.domain.Store; + +public interface MissionRepository extends JpaRepository { + Page findAllByStore(Store store, PageRequest pageRequest); +} diff --git a/wis/week9/study/src/main/java/umc/study/repository/RegionRepository/RegionRepository.java b/wis/week9/study/src/main/java/umc/study/repository/RegionRepository/RegionRepository.java new file mode 100644 index 0000000..468a939 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/RegionRepository/RegionRepository.java @@ -0,0 +1,8 @@ +package umc.study.repository.RegionRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Region; + +public interface RegionRepository extends JpaRepository { +} + diff --git a/wis/week9/study/src/main/java/umc/study/repository/ReveiwRepository/ReviewRepository.java b/wis/week9/study/src/main/java/umc/study/repository/ReveiwRepository/ReviewRepository.java new file mode 100644 index 0000000..a919f01 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/ReveiwRepository/ReviewRepository.java @@ -0,0 +1,14 @@ +package umc.study.repository.ReveiwRepository; + +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.domain.User; + +public interface ReviewRepository extends JpaRepository { + + Page findAllByStore(Store store, PageRequest pageRequest); + Page findAllByUser(User user, PageRequest pageRequest); +} diff --git a/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java b/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java new file mode 100644 index 0000000..c2c070c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepository.java @@ -0,0 +1,7 @@ +package umc.study.repository.StoreRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.Store; + +public interface StoreRepository extends JpaRepository, StoreRepositoryCustom { +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java b/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java new file mode 100644 index 0000000..384bfd9 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryCustom.java @@ -0,0 +1,10 @@ +package umc.study.repository.StoreRepository; + +import umc.study.domain.Store; + +import java.util.List; + + +public interface StoreRepositoryCustom { + List dynamicQueryWithBooleanBuilder(String name, String address); +} diff --git a/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java b/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java new file mode 100644 index 0000000..4cc162e --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/StoreRepository/StoreRepositoryImpl.java @@ -0,0 +1,35 @@ +package umc.study.repository.StoreRepository; + +import com.querydsl.core.BooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import umc.study.domain.QStore; +import umc.study.domain.Store; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class StoreRepositoryImpl implements StoreRepositoryCustom{ + private final JPAQueryFactory jpaQueryFactory; + private final QStore store = QStore.store; + + @Override + public List dynamicQueryWithBooleanBuilder(String name, String address) { + BooleanBuilder predicate = new BooleanBuilder(); + + if (name != null) { + predicate.and(store.name.eq(name)); + } + + if (address != null) { + predicate.and(store.address.eq(address)); + } + + return jpaQueryFactory + .selectFrom(store) + .where(predicate) + .fetch(); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/repository/UserMissionRepository/UserMissionRepository.java b/wis/week9/study/src/main/java/umc/study/repository/UserMissionRepository/UserMissionRepository.java new file mode 100644 index 0000000..b9f8af2 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/UserMissionRepository/UserMissionRepository.java @@ -0,0 +1,30 @@ +package umc.study.repository.UserMissionRepository; + +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; +import umc.study.domain.User; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; + +import java.util.Optional; + +public interface UserMissionRepository extends JpaRepository { + boolean existsByMissionIdAndStatus(Long missionId, MissionStatus status); + + @Query("SELECT um FROM UserMission um WHERE um.user = :user AND um.status = :status") + Page findAllByUser( + @Param("user") User user, + @Param("status") MissionStatus status, + Pageable pageable + ); + + @Query("SELECT um FROM UserMission um WHERE um.user = :user AND um.mission.id = :missionId AND um.status = :status") + Optional findByUserAndMissionIdAndStatus( + @Param("user") User user, + @Param("missionId") Long missionId, + @Param("status") MissionStatus status + ); +} diff --git a/wis/week9/study/src/main/java/umc/study/repository/UserRepository/UserRepository.java b/wis/week9/study/src/main/java/umc/study/repository/UserRepository/UserRepository.java new file mode 100644 index 0000000..399a5aa --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/repository/UserRepository/UserRepository.java @@ -0,0 +1,7 @@ +package umc.study.repository.UserRepository; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.study.domain.User; + +public interface UserRepository extends JpaRepository { +} diff --git a/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionCommandService.java b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionCommandService.java new file mode 100644 index 0000000..c66eb9c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionCommandService.java @@ -0,0 +1,8 @@ +package umc.study.service.MissionService; + +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +public interface MissionCommandService { + MissionResponseDTO addMission(Long storeId, MissionRequestDTO request); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionCommandServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionCommandServiceImpl.java new file mode 100644 index 0000000..b8bc640 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionCommandServiceImpl.java @@ -0,0 +1,55 @@ +package umc.study.service.MissionService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.converter.MissionConverter; +import umc.study.domain.Mission; +import umc.study.domain.Store; +import umc.study.domain.enums.MissionStatus; +import umc.study.repository.MissionRepository.MissionRepository; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +import java.time.LocalDate; + +@Service +@RequiredArgsConstructor +public class MissionCommandServiceImpl implements MissionCommandService { + + private final MissionRepository missionRepository; + private final StoreRepository storeRepository; + + @Override + @Transactional + public MissionResponseDTO addMission(Long storeId, MissionRequestDTO request) { + Store store = storeRepository.findById(storeId) + .orElseThrow(() -> new RuntimeException("Store not found")); // Replace with custom exception + + MissionStatus missionStatus = request.getDueDate().isAfter(LocalDate.now()) + ? MissionStatus.CHALLENGING + : MissionStatus.COMPLETE; + + Mission mission = Mission.builder() + .title(request.getTitle()) + .description(request.getDescription()) + .point(request.getPoint()) + .dueDate(request.getDueDate()) + .store(store) + .status(missionStatus) + .build(); + + mission = missionRepository.save(mission); + + return MissionResponseDTO.builder() + .id(mission.getId()) + .title(mission.getTitle()) + .description(mission.getDescription()) + .point(mission.getPoint()) + .storeName(store.getName()) + .build(); + } + +} + diff --git a/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionQueryService.java b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionQueryService.java new file mode 100644 index 0000000..ff79003 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionQueryService.java @@ -0,0 +1,4 @@ +package umc.study.service.MissionService; + +public interface MissionQueryService { +} diff --git a/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionQueryServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionQueryServiceImpl.java new file mode 100644 index 0000000..79f5f9e --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/MissionService/MissionQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.study.service.MissionService; + +public class MissionQueryServiceImpl { +} diff --git a/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewCommandService.java b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewCommandService.java new file mode 100644 index 0000000..67a103c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewCommandService.java @@ -0,0 +1,7 @@ +package umc.study.service.ReviewService; + +import umc.study.web.dto.ReviewRequestDTO; + +public interface ReviewCommandService { + void addReview(ReviewRequestDTO request); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewCommandServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..d596168 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewCommandServiceImpl.java @@ -0,0 +1,33 @@ +package umc.study.service.ReviewService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.repository.ReveiwRepository.ReviewRepository; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.web.dto.ReviewRequestDTO; + +@Service +@RequiredArgsConstructor +public class ReviewCommandServiceImpl implements ReviewCommandService { + + private final ReviewRepository reviewRepository; + private final StoreRepository storeRepository; + + @Override + @Transactional + public void addReview(ReviewRequestDTO request) { + Store store = storeRepository.findById(request.getStoreId()) + .orElseThrow(() -> new RuntimeException("Store not found.")); // 추가적인 검증 필요 없음 (Validator에서 처리) + + Review review = Review.builder() + .content(request.getContent()) + .star(request.getStar()) + .store(store) + .build(); + + reviewRepository.save(review); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewQueryService.java b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewQueryService.java new file mode 100644 index 0000000..c1a5080 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewQueryService.java @@ -0,0 +1,4 @@ +package umc.study.service.ReviewService; + +public interface ReviewQueryService { +} diff --git a/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewQueryServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewQueryServiceImpl.java new file mode 100644 index 0000000..356858a --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/ReviewService/ReviewQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.study.service.ReviewService; + +public class ReviewQueryServiceImpl { +} diff --git a/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreCommandService.java b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreCommandService.java new file mode 100644 index 0000000..8f3f0b6 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreCommandService.java @@ -0,0 +1,9 @@ +package umc.study.service.StoreService; + +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; + +public interface StoreCommandService { + StoreResponseDTO addStore(StoreRequestDTO request); +} + diff --git a/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreCommandServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreCommandServiceImpl.java new file mode 100644 index 0000000..71dfff6 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreCommandServiceImpl.java @@ -0,0 +1,40 @@ +package umc.study.service.StoreService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.domain.Region; +import umc.study.domain.Store; +import umc.study.repository.RegionRepository.RegionRepository; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; + +@Service +@RequiredArgsConstructor +public class StoreCommandServiceImpl implements StoreCommandService { + + private final StoreRepository storeRepository; + private final RegionRepository regionRepository; + + @Override + @Transactional + public StoreResponseDTO addStore(StoreRequestDTO request) { + Region region = regionRepository.findById(request.getRegionId()) + .orElseThrow(() -> new RuntimeException("Region not found")); // Replace with custom exception + Store store = Store.builder() + .name(request.getName()) + .address(request.getAddress()) + .region(region) + .build(); + store = storeRepository.save(store); + + return StoreResponseDTO.builder() + .id(store.getId()) + .name(store.getName()) + .address(store.getAddress()) + .regionName(region.getName()) + .build(); + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java new file mode 100644 index 0000000..54b9d2c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreQueryService.java @@ -0,0 +1,19 @@ +package umc.study.service.StoreService; + +import org.springframework.data.domain.Page; +import umc.study.domain.Mission; +import umc.study.domain.Review; +import umc.study.domain.Store; + +import java.util.List; +import java.util.Optional; + +public interface StoreQueryService { + + Optional findStore(Long id); + List findStoresByNameAndAddress(String name, String address); + + Page getReviewList(Long StoreId, Integer page); + + Page getMissionList(Long StoreId, Integer page); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java new file mode 100644 index 0000000..a7dfd4f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/StoreService/StoreQueryServiceImpl.java @@ -0,0 +1,60 @@ +package umc.study.service.StoreService; + +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; +import umc.study.domain.Mission; +import umc.study.domain.Review; +import umc.study.domain.Store; +import umc.study.repository.MissionRepository.MissionRepository; +import umc.study.repository.ReveiwRepository.ReviewRepository; +import umc.study.repository.StoreRepository.StoreRepository; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class StoreQueryServiceImpl implements StoreQueryService { + + private final StoreRepository storeRepository; + + private final ReviewRepository reviewRepository; + + private final MissionRepository missionRepository; + + @Override + public Optional findStore(Long id) { + return storeRepository.findById(id); + } + + @Override + public List findStoresByNameAndAddress(String name, String address) { + List filteredStores = storeRepository.dynamicQueryWithBooleanBuilder(name, address); + + filteredStores.forEach(store -> System.out.println("Store: " + store)); + + return filteredStores; + } + + @Override + public Page getReviewList(Long StoreId, Integer page) { + + Store store = storeRepository.findById(StoreId).get(); + + Page StorePage = reviewRepository.findAllByStore(store, PageRequest.of(page, 10)); + return StorePage; + } + + @Override + public Page getMissionList(Long StoreId, Integer page) { + + Store store = storeRepository.findById(StoreId).get(); + + Page StorePage = missionRepository.findAllByStore(store, PageRequest.of(page, 10)); + return StorePage; + } +} diff --git a/wis/week9/study/src/main/java/umc/study/service/TempService/TempCommandService.java b/wis/week9/study/src/main/java/umc/study/service/TempService/TempCommandService.java new file mode 100644 index 0000000..c21d1aa --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/TempService/TempCommandService.java @@ -0,0 +1,4 @@ +package umc.study.service.TempService; + +public interface TempCommandService { +} diff --git a/wis/week9/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java new file mode 100644 index 0000000..bf56051 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/TempService/TempCommandServiceImpl.java @@ -0,0 +1,16 @@ +package umc.study.service.TempService; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class TempCommandServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag) { + + } +} + + diff --git a/wis/week9/study/src/main/java/umc/study/service/TempService/TempQueryService.java b/wis/week9/study/src/main/java/umc/study/service/TempService/TempQueryService.java new file mode 100644 index 0000000..53687d0 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/TempService/TempQueryService.java @@ -0,0 +1,6 @@ +package umc.study.service.TempService; + +public interface TempQueryService { + + void CheckFlag(Integer flag); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java new file mode 100644 index 0000000..9c810fa --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/TempService/TempQueryServiceImpl.java @@ -0,0 +1,19 @@ +package umc.study.service.TempService; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Service; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.apiPayload.exception.handler.TempHandler; + +@Service +@RequiredArgsConstructor +@Primary +public class TempQueryServiceImpl implements TempQueryService{ + + @Override + public void CheckFlag(Integer flag) { + if (flag == 1) + throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandService.java b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandService.java new file mode 100644 index 0000000..bad1c5d --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandService.java @@ -0,0 +1,9 @@ +package umc.study.service.UserMissionService; + +import umc.study.web.dto.MissionChallengeRequestDTO; +import umc.study.web.dto.MissionChallengeResponseDTO; + +public interface UserMissionCommandService { + MissionChallengeResponseDTO challengeMission(MissionChallengeRequestDTO request); +} + diff --git a/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandServiceImpl.java new file mode 100644 index 0000000..7adaa22 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionCommandServiceImpl.java @@ -0,0 +1,54 @@ +package umc.study.service.UserMissionService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; +import umc.study.repository.MissionRepository.MissionRepository; +import umc.study.repository.UserMissionRepository.UserMissionRepository; +import umc.study.repository.UserRepository.UserRepository; +import umc.study.web.dto.MissionChallengeRequestDTO; +import umc.study.web.dto.MissionChallengeResponseDTO; + +@Service +@RequiredArgsConstructor +public class UserMissionCommandServiceImpl implements UserMissionCommandService { + + private final UserRepository userRepository; + private final MissionRepository missionRepository; + private final UserMissionRepository userMissionRepository; + + @Override + @Transactional + public MissionChallengeResponseDTO challengeMission(MissionChallengeRequestDTO request) { + + User user = userRepository.findById(request.getUserId()) + .orElseThrow(() -> new RuntimeException("User not found")); // Custom exception recommended + + Mission mission = missionRepository.findById(request.getMissionId()) + .orElseThrow(() -> new RuntimeException("Mission not found")); // Custom exception recommended + + UserMission userMission = UserMission.builder() + .user(user) + .mission(mission) + .status(MissionStatus.CHALLENGING) + .verificationCode(generateVerificationCode()) + .build(); + + userMissionRepository.save(userMission); + + return MissionChallengeResponseDTO.builder() + .userId(user.getId()) + .missionId(mission.getId()) + .status(MissionStatus.CHALLENGING.name()) + .build(); + } + + private Long generateVerificationCode() { + return (long) (Math.random() * 1_000_000); // Random 6-digit verification code + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryService.java b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryService.java new file mode 100644 index 0000000..084eded --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryService.java @@ -0,0 +1,12 @@ +package umc.study.service.UserMissionService; + +import org.springframework.data.domain.Page; +import umc.study.domain.Mission; +import umc.study.domain.enums.MissionStatus; +import umc.study.web.dto.MissionCompleteRequestDTO; + +public interface UserMissionQueryService { + Page getMissionList(Long userId, MissionStatus status, Integer page); + + void completeMission(MissionCompleteRequestDTO requestDTO); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryServiceImpl.java new file mode 100644 index 0000000..ad7777c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserMissionService/UserMissionQueryServiceImpl.java @@ -0,0 +1,63 @@ +package umc.study.service.UserMissionService; + +import lombok.RequiredArgsConstructor; +import lombok.Setter; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import umc.study.apiPayload.exception.GeneralException; +import umc.study.domain.Mission; +import umc.study.domain.User; +import umc.study.domain.enums.MissionStatus; +import umc.study.domain.mapping.UserMission; +import umc.study.repository.UserMissionRepository.UserMissionRepository; +import umc.study.repository.UserRepository.UserRepository; +import umc.study.web.dto.MissionCompleteRequestDTO; + +import umc.study.apiPayload.code.status.ErrorStatus; + + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +@Setter +public class UserMissionQueryServiceImpl implements UserMissionQueryService{ + private final UserMissionRepository userMissionRepository; + private final UserRepository userRepository; + + // 유저가 진행중인 미션 조회 + @Override + public Page getMissionList(Long userId, MissionStatus status, Integer page) { + // 유저 객체 조회 + User user = userRepository.findById(userId) + .orElseThrow(() -> new RuntimeException("User not found")); + + Page userMissions = userMissionRepository.findAllByUser( + user, status, PageRequest.of(page, 10) + ); + + // UserMission에서 Mission 객체를 추출하여 반환 + return userMissions.map(UserMission::getMission); + } + + // 진행중인 미션 완료로 바꾸기 + @Override + @Transactional + public void completeMission(MissionCompleteRequestDTO requestDTO) { + // 1. 유저 확인 + User user = userRepository.findById(requestDTO.getUserId()) + .orElseThrow(() -> new GeneralException(ErrorStatus.USER_NOT_FOUND)); + + // 2. 진행 중 상태의 미션 조회 + UserMission userMission = userMissionRepository.findByUserAndMissionIdAndStatus( + user, requestDTO.getMissionId(), MissionStatus.CHALLENGING + ).orElseThrow(() -> new GeneralException(ErrorStatus.ONGOING_MISSION_NOT_FOUND)); + + // 3. 상태를 완료로 변경 + userMission.setStatus(MissionStatus.COMPLETE); + + // 4. 변경사항 저장 + userMissionRepository.save(userMission); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/service/UserService/UserCommandService.java b/wis/week9/study/src/main/java/umc/study/service/UserService/UserCommandService.java new file mode 100644 index 0000000..a440a98 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserService/UserCommandService.java @@ -0,0 +1,8 @@ +package umc.study.service.UserService; + +import umc.study.domain.User; +import umc.study.web.dto.UserRequestDTO; + +public interface UserCommandService { + User joinUser(UserRequestDTO.JoinDto request); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/UserService/UserCommandServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/UserService/UserCommandServiceImpl.java new file mode 100644 index 0000000..0b8dac2 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserService/UserCommandServiceImpl.java @@ -0,0 +1,45 @@ +package umc.study.service.UserService; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.apiPayload.exception.handler.FoodCategoryHandler; +import umc.study.converter.UserConverter; +import umc.study.converter.UserPreferConverter; +import umc.study.domain.Food; +import umc.study.domain.User; +import umc.study.domain.mapping.UserPrefer; +import umc.study.repository.FoodCategoryRepository.FoodCategoryRepository; +import umc.study.repository.UserRepository.UserRepository; +import umc.study.web.dto.UserRequestDTO; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class UserCommandServiceImpl implements UserCommandService{ + + private final UserRepository userRepository; + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + @Transactional + public User joinUser(UserRequestDTO.JoinDto request) { + + User newUser = UserConverter.toUser(request); + List foodCategoryList = request.getPreferCategory().stream() + .map(category -> { + return foodCategoryRepository.findById(Long.valueOf(category)).orElseThrow(() -> new FoodCategoryHandler(ErrorStatus.FOOD_CATEGORY_NOT_FOUND)); + }).collect(Collectors.toList()); + + List userPreferList = UserPreferConverter.toUserPreferList(foodCategoryList); + + userPreferList.forEach(userPrefer -> {userPrefer.setUser(newUser);}); + + return userRepository.save(newUser); + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/service/UserService/UserQueryService.java b/wis/week9/study/src/main/java/umc/study/service/UserService/UserQueryService.java new file mode 100644 index 0000000..edce37b --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserService/UserQueryService.java @@ -0,0 +1,10 @@ +package umc.study.service.UserService; + +import org.springframework.data.domain.Page; +import umc.study.domain.Mission; +import umc.study.domain.Review; + +public interface UserQueryService { + + Page getReviewList(Long UserId, Integer page); +} diff --git a/wis/week9/study/src/main/java/umc/study/service/UserService/UserQueryServiceImpl.java b/wis/week9/study/src/main/java/umc/study/service/UserService/UserQueryServiceImpl.java new file mode 100644 index 0000000..0074572 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/service/UserService/UserQueryServiceImpl.java @@ -0,0 +1,29 @@ +package umc.study.service.UserService; + +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; +import umc.study.domain.Review; +import umc.study.domain.User; +import umc.study.repository.ReveiwRepository.ReviewRepository; +import umc.study.repository.UserRepository.UserRepository; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class UserQueryServiceImpl implements UserQueryService{ + private final UserRepository userRepository; + private final ReviewRepository reviewRepository; + + @Override + public Page getReviewList(Long UserId, Integer page) { + + User user = userRepository.findById(UserId).get(); + + Page UserPage = reviewRepository.findAllByUser(user, PageRequest.of(page, 10)); + return UserPage; + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/validation/annotation/CheckPage.java b/wis/week9/study/src/main/java/umc/study/validation/annotation/CheckPage.java new file mode 100644 index 0000000..e89e183 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/annotation/CheckPage.java @@ -0,0 +1,18 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.PageValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = PageValidator.class) +@Target({ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckPage { + String message() default "페이지 번호는 1 이상의 정수여야 합니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} + diff --git a/wis/week9/study/src/main/java/umc/study/validation/annotation/ExistCategories.java b/wis/week9/study/src/main/java/umc/study/validation/annotation/ExistCategories.java new file mode 100644 index 0000000..3a77665 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/annotation/ExistCategories.java @@ -0,0 +1,18 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.CategoriesExistValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = CategoriesExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistCategories { + + String message() default "해당하는 카테고리가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/wis/week9/study/src/main/java/umc/study/validation/annotation/MissionAlreadyChallenging.java b/wis/week9/study/src/main/java/umc/study/validation/annotation/MissionAlreadyChallenging.java new file mode 100644 index 0000000..8cb7105 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/annotation/MissionAlreadyChallenging.java @@ -0,0 +1,18 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.MissionAlreadyChallengingValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = MissionAlreadyChallengingValidator.class) +@Target({ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface MissionAlreadyChallenging { + + String message() default "The mission is already being challenged."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/wis/week9/study/src/main/java/umc/study/validation/annotation/ValidStore.java b/wis/week9/study/src/main/java/umc/study/validation/annotation/ValidStore.java new file mode 100644 index 0000000..3c15c9d --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/annotation/ValidStore.java @@ -0,0 +1,17 @@ +package umc.study.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.study.validation.validator.StoreExistValidator; + +import java.lang.annotation.*; + +@Documented +@Constraint(validatedBy = StoreExistValidator.class) +@Target({ElementType.FIELD, ElementType.PARAMETER}) +@Retention(RetentionPolicy.RUNTIME) +public @interface ValidStore { + String message() default "해당 가게가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/wis/week9/study/src/main/java/umc/study/validation/validator/CategoriesExistValidator.java b/wis/week9/study/src/main/java/umc/study/validation/validator/CategoriesExistValidator.java new file mode 100644 index 0000000..4e4f60f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/validator/CategoriesExistValidator.java @@ -0,0 +1,37 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.repository.FoodCategoryRepository.FoodCategoryRepository; +import umc.study.validation.annotation.ExistCategories; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class CategoriesExistValidator implements ConstraintValidator> { + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + public void initialize(ExistCategories constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> foodCategoryRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.FOOD_CATEGORY_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/validation/validator/MissionAlreadyChallengingValidator.java b/wis/week9/study/src/main/java/umc/study/validation/validator/MissionAlreadyChallengingValidator.java new file mode 100644 index 0000000..50d8483 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/validator/MissionAlreadyChallengingValidator.java @@ -0,0 +1,43 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.study.domain.enums.MissionStatus; +import umc.study.repository.UserMissionRepository.UserMissionRepository; +import umc.study.validation.annotation.MissionAlreadyChallenging; + +@Component +@RequiredArgsConstructor +public class MissionAlreadyChallengingValidator implements ConstraintValidator { + + private final UserMissionRepository userMissionRepository; + + @Override + public boolean isValid(Long missionId, ConstraintValidatorContext context) { + if (missionId == null) { + return true; // null 값은 유효성 검사 대상이 아님 + } + + try { + // Enum MissionStatus 사용 + boolean isAlreadyChallenging = userMissionRepository.existsByMissionIdAndStatus(missionId, MissionStatus.CHALLENGING); + + if (isAlreadyChallenging) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate("The mission is already being challenged.") + .addConstraintViolation(); + } + + return !isAlreadyChallenging; + + } catch (Exception e) { + e.printStackTrace(); + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate("Unexpected error during validation: " + e.getMessage()) + .addConstraintViolation(); + return false; + } + } +} diff --git a/wis/week9/study/src/main/java/umc/study/validation/validator/PageValidator.java b/wis/week9/study/src/main/java/umc/study/validation/validator/PageValidator.java new file mode 100644 index 0000000..fd38a6f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/validator/PageValidator.java @@ -0,0 +1,25 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.springframework.stereotype.Component; +import umc.study.apiPayload.code.status.ErrorStatus; +import umc.study.validation.annotation.CheckPage; + +// PageValidator.java +@Component +public class PageValidator implements ConstraintValidator { + + @Override + public boolean isValid(Integer value, ConstraintValidatorContext context) { + if (value == null || value < 1) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.INVALID_PAGE_REQUEST.name()) + .addConstraintViolation(); + return false; + } + return true; + } +} + + diff --git a/wis/week9/study/src/main/java/umc/study/validation/validator/StoreExistValidator.java b/wis/week9/study/src/main/java/umc/study/validation/validator/StoreExistValidator.java new file mode 100644 index 0000000..efe7e94 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/validation/validator/StoreExistValidator.java @@ -0,0 +1,24 @@ +package umc.study.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.study.repository.StoreRepository.StoreRepository; +import umc.study.validation.annotation.ValidStore; + +@Component +@RequiredArgsConstructor +public class StoreExistValidator implements ConstraintValidator { + + private final StoreRepository storeRepository; + + @Override + public boolean isValid(Long storeId, ConstraintValidatorContext context) { + if (storeId == null) { + return false; // storeId가 null이면 검증 실패 + } + return storeRepository.existsById(storeId); // storeId가 존재하면 true, 없으면 false + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/MissionChallengeController.java b/wis/week9/study/src/main/java/umc/study/web/controller/MissionChallengeController.java new file mode 100644 index 0000000..2f792e6 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/MissionChallengeController.java @@ -0,0 +1,42 @@ +package umc.study.web.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import umc.study.apiPayload.ApiResponse; +import umc.study.service.UserMissionService.UserMissionCommandService; +import umc.study.service.UserMissionService.UserMissionQueryService; +import umc.study.web.dto.MissionChallengeRequestDTO; +import umc.study.web.dto.MissionChallengeResponseDTO; +import umc.study.web.dto.MissionCompleteRequestDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/missions") +public class MissionChallengeController { + + private final UserMissionCommandService userMissionCommandService; + private final UserMissionQueryService userMissionQueryService; + + @PostMapping("/challenge") + public ResponseEntity challengeMission( + @Valid @RequestBody MissionChallengeRequestDTO request) { + MissionChallengeResponseDTO response = userMissionCommandService.challengeMission(request); + return ResponseEntity.ok(response); + } + + @PatchMapping("/complete") + @Operation(summary = "진행 중인 미션 완료로 변경 API", description = "진행 중인 미션을 완료로 변경합니다.") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "200", description = "미션 상태 변경 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "404", description = "유저 또는 미션을 찾을 수 없음"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "400", description = "요청이 유효하지 않음") + }) + public ApiResponse completeMission(@Valid @RequestBody MissionCompleteRequestDTO requestDTO) { + userMissionQueryService.completeMission(requestDTO); + return ApiResponse.onSuccess("Mission successfully completed."); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/MissionController.java b/wis/week9/study/src/main/java/umc/study/web/controller/MissionController.java new file mode 100644 index 0000000..2d6ac95 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/MissionController.java @@ -0,0 +1,27 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import umc.study.service.MissionService.MissionCommandService; +import umc.study.web.dto.MissionRequestDTO; +import umc.study.web.dto.MissionResponseDTO; + +@RestController +@RequestMapping("/stores/{storeId}/missions") +@RequiredArgsConstructor +public class MissionController { + + private final MissionCommandService missionCommandService; + + @PostMapping + public ResponseEntity addMission( + @PathVariable Long storeId, + @RequestBody @Valid MissionRequestDTO request) { + MissionResponseDTO mission = missionCommandService.addMission(storeId, request); + return ResponseEntity.status(HttpStatus.CREATED).body(mission); + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/ReviewController.java b/wis/week9/study/src/main/java/umc/study/web/controller/ReviewController.java new file mode 100644 index 0000000..1acce88 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/ReviewController.java @@ -0,0 +1,22 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import umc.study.service.ReviewService.ReviewCommandService; +import umc.study.web.dto.ReviewRequestDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/reviews") +public class ReviewController { + + private final ReviewCommandService reviewCommandService; + + @PostMapping + public ResponseEntity addReview(@Valid @RequestBody ReviewRequestDTO request) { + reviewCommandService.addReview(request); + return ResponseEntity.ok("리뷰가 성공적으로 추가되었습니다."); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/StoreController.java b/wis/week9/study/src/main/java/umc/study/web/controller/StoreController.java new file mode 100644 index 0000000..4656cb9 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/StoreController.java @@ -0,0 +1,33 @@ +package umc.study.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.UserConverter; +import umc.study.domain.User; +import umc.study.service.StoreService.StoreCommandService; +import umc.study.service.UserService.UserCommandService; +import umc.study.web.dto.StoreRequestDTO; +import umc.study.web.dto.StoreResponseDTO; +import umc.study.web.dto.UserRequestDTO; +import umc.study.web.dto.UserResponseDTO; + +@RestController +@RequestMapping("/stores") +@RequiredArgsConstructor +public class StoreController { + + private final StoreCommandService storeCommandService; + + @PostMapping("/") + public ResponseEntity addStore(@RequestBody @Valid StoreRequestDTO request) { + StoreResponseDTO store = storeCommandService.addStore(request); + return ResponseEntity.status(HttpStatus.CREATED).body(store); + } +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/StoreRestController.java b/wis/week9/study/src/main/java/umc/study/web/controller/StoreRestController.java new file mode 100644 index 0000000..b149340 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/StoreRestController.java @@ -0,0 +1,71 @@ +package umc.study.web.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.StoreConverter; +import umc.study.domain.Mission; +import umc.study.domain.Review; +import umc.study.service.StoreService.StoreQueryService; +import umc.study.validation.annotation.CheckPage; +import umc.study.validation.annotation.ValidStore; +import umc.study.web.dto.StoreResponseDTO; + +@RestController +@RequiredArgsConstructor +@Validated +@RequestMapping("/stores") +public class StoreRestController { + private final StoreQueryService storeQueryService; + + @GetMapping("/{storeId}/reviews") + @Operation(summary = "특정 가게의 리뷰 목록 조회 API",description = "특정 가게의 리뷰들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "storeId", description = "가게의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호 (1부터 시작)") + }) + public ApiResponse getReviewList( + @ValidStore @PathVariable(name = "storeId") Long storeId, + @CheckPage @RequestParam(name = "page") Integer page + ){ + Page reviewList = storeQueryService.getReviewList(storeId, page - 1); + + return ApiResponse.onSuccess(StoreConverter.reviewPreViewListDTO(reviewList)); + } + + + @GetMapping("/{storeId}/missions") + @Operation(summary = "특정 가게의 미션 목록 조회 API", description = "특정 가게의 미션들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!", content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료", content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함", content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "storeId", description = "가게의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호 (1부터 시작)") + }) + public ApiResponse getMissionList( + @ValidStore @PathVariable(name = "storeId") Long storeId, + @CheckPage @RequestParam(name = "page") Integer page + ) { + Page missionList = storeQueryService.getMissionList(storeId, page - 1); + + return ApiResponse.onSuccess(StoreConverter.missionPreViewListDTO(missionList)); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/TempRestController.java b/wis/week9/study/src/main/java/umc/study/web/controller/TempRestController.java new file mode 100644 index 0000000..7b2daf1 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/TempRestController.java @@ -0,0 +1,32 @@ +package umc.study.web.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.TempConverter; +import umc.study.service.TempService.TempQueryService; +import umc.study.web.dto.TempResponse; + +@RestController +@RequestMapping("/temp") +@RequiredArgsConstructor +public class TempRestController { + + private final TempQueryService tempQueryService; + + @GetMapping("/test") + public ApiResponse testAPI(){ + + return ApiResponse.onSuccess(TempConverter.toTempTestDTO()); + } + + @GetMapping("/exception") + public ApiResponse exceptionAPI(@RequestParam Integer flag){ + tempQueryService.CheckFlag(flag); + return ApiResponse.onSuccess(TempConverter.toTempExceptionDTO(flag)); + } +} \ No newline at end of file diff --git a/wis/week9/study/src/main/java/umc/study/web/controller/UserRestController.java b/wis/week9/study/src/main/java/umc/study/web/controller/UserRestController.java new file mode 100644 index 0000000..b21e1a6 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/controller/UserRestController.java @@ -0,0 +1,87 @@ +package umc.study.web.controller; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Page; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import umc.study.apiPayload.ApiResponse; +import umc.study.converter.UserConverter; +import umc.study.domain.Mission; +import umc.study.domain.Review; +import umc.study.domain.User; +import umc.study.domain.enums.MissionStatus; +import umc.study.service.UserMissionService.UserMissionQueryService; +import umc.study.service.UserService.UserCommandService; +import umc.study.service.UserService.UserQueryService; +import umc.study.validation.annotation.CheckPage; +import umc.study.web.dto.UserRequestDTO; +import umc.study.web.dto.UserResponseDTO; + +@RestController +@RequiredArgsConstructor +@Validated +@RequestMapping("/users") +@Slf4j +public class UserRestController { + + private final UserCommandService userCommandService; + private final UserQueryService userQueryService; + private final UserMissionQueryService userMissionQueryService; + + @PostMapping("/") + public ApiResponse join(@RequestBody @Valid UserRequestDTO.JoinDto request){ + log.info("실행"); + User user = userCommandService.joinUser(request); + return ApiResponse.onSuccess(UserConverter.toJoinResultDTO(user)); + } + + @GetMapping("/{userId}/reviews") + @Operation(summary = "특정 유저의 리뷰 목록 조회 API",description = "특정 유저의 리뷰들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "userId", description = "유저의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호 (1부터 시작)") + }) + public ApiResponse getReviewList( + @PathVariable(name = "userId") Long userId, + @CheckPage @RequestParam(name = "page") Integer page + ){ + Page reviewList = userQueryService.getReviewList(userId, page - 1); + + return ApiResponse.onSuccess(UserConverter.reviewPreViewListDTO(reviewList)); + } + + @GetMapping("/{userId}/missions") + @Operation(summary = "특정 유저의 진행중 미션 목록 조회 API", description = "특정 유저의 진행중인 미션들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200", description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!", content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료", content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함", content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "userId", description = "유저의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호 (1부터 시작)") + }) + public ApiResponse getMissionList( + @PathVariable(name = "userId") Long userId, + @CheckPage @RequestParam(name = "page") Integer page, + @RequestParam(name = "status", defaultValue = "CHALLENGING") MissionStatus status + ) { + Page missionList = userMissionQueryService.getMissionList(userId, status, page - 1); + return ApiResponse.onSuccess(UserConverter.missionPreViewListDTO(missionList)); + } +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/MissionChallengeRequestDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/MissionChallengeRequestDTO.java new file mode 100644 index 0000000..b01c98f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/MissionChallengeRequestDTO.java @@ -0,0 +1,18 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import umc.study.validation.annotation.MissionAlreadyChallenging; + +@Getter +@Setter +public class MissionChallengeRequestDTO { + + @NotNull(message = "Mission ID is required.") + @MissionAlreadyChallenging + private Long missionId; + + @NotNull(message = "User ID is required.") + private Long userId; +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/MissionChallengeResponseDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/MissionChallengeResponseDTO.java new file mode 100644 index 0000000..9212419 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/MissionChallengeResponseDTO.java @@ -0,0 +1,12 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MissionChallengeResponseDTO { + private Long userId; + private Long missionId; + private String status; +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/MissionCompleteRequestDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/MissionCompleteRequestDTO.java new file mode 100644 index 0000000..855996b --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/MissionCompleteRequestDTO.java @@ -0,0 +1,18 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class MissionCompleteRequestDTO { + + @NotNull(message = "Mission ID is required.") + private Long missionId; + + @NotNull(message = "User ID is required.") + private Long userId; +} + + diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/MissionCompleteResponseDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/MissionCompleteResponseDTO.java new file mode 100644 index 0000000..5fc700f --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/MissionCompleteResponseDTO.java @@ -0,0 +1,12 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MissionCompleteResponseDTO { + private Long userId; + private Long missionId; + private String status; +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/MissionRequestDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/MissionRequestDTO.java new file mode 100644 index 0000000..4539d26 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/MissionRequestDTO.java @@ -0,0 +1,28 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + + +@Getter +public class MissionRequestDTO { + @NotBlank(message = "Title cannot be blank") + private String title; + + @NotBlank(message = "Description cannot be blank") + private String description; + + @NotNull(message = "Point value is required") + private Integer point; + + @NotNull(message = "Due date is required") + private LocalDate dueDate; + +// @NotNull(message = "Store ID is required") +// private Long storeId; +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/MissionResponseDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/MissionResponseDTO.java new file mode 100644 index 0000000..94cd8ff --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/MissionResponseDTO.java @@ -0,0 +1,14 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class MissionResponseDTO { + private Long id; + private String title; + private String description; + private Integer point; + private String storeName; +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/ReviewRequestDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/ReviewRequestDTO.java new file mode 100644 index 0000000..7c79ead --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/ReviewRequestDTO.java @@ -0,0 +1,29 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.DecimalMax; +import jakarta.validation.constraints.DecimalMin; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; +import umc.study.validation.annotation.ValidStore; + +@Getter +@Setter +public class ReviewRequestDTO { + + @NotNull(message = "Store ID cannot be null.") + @ValidStore // 가게 존재 여부 검증 + private Long storeId; + + @NotBlank(message = "Review content cannot be empty.") + private String content; + + @NotNull(message = "Star rating is required.") + + @DecimalMin(value = "0.0", inclusive = false) + + @DecimalMax(value = "5.0", inclusive = true) + + private Float star; +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/ReviewResponseDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/ReviewResponseDTO.java new file mode 100644 index 0000000..c09b5fd --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/ReviewResponseDTO.java @@ -0,0 +1,15 @@ +package umc.study.web.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class ReviewResponseDTO { + private Long id; + private String content; + private Float star; + private String storeName; + private String userName; +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/StoreRequestDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/StoreRequestDTO.java new file mode 100644 index 0000000..60e5f3d --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/StoreRequestDTO.java @@ -0,0 +1,18 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; + +@Getter +public class StoreRequestDTO { + @NotBlank + private String name; + + @NotBlank + private String address; + + @NotNull + private Long regionId; +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/StoreResponseDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/StoreResponseDTO.java new file mode 100644 index 0000000..66a2f1c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/StoreResponseDTO.java @@ -0,0 +1,71 @@ +package umc.study.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.util.List; + +@Getter +@Builder +public class StoreResponseDTO { + private Long id; + private String name; + private String address; + private String regionName; + + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewListDTO { + List reviewList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewDTO { + String ownerNickname; + Float score; + String body; + LocalDate createdAt; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionListDTO { + List missions; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionPreViewDTO { + Long missionId; + String title; + String description; + Integer point; + LocalDate dueDate; + String status; + LocalDate createdAt; + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/TempRequest.java b/wis/week9/study/src/main/java/umc/study/web/dto/TempRequest.java new file mode 100644 index 0000000..ae31723 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/TempRequest.java @@ -0,0 +1,4 @@ +package umc.study.web.dto; + +public class TempRequest { +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/TempResponse.java b/wis/week9/study/src/main/java/umc/study/web/dto/TempResponse.java new file mode 100644 index 0000000..2ee4b9c --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/TempResponse.java @@ -0,0 +1,25 @@ +package umc.study.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class TempResponse { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempTestDTO{ + String testString; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempExceptionDTO{ + Integer flag; + } +} diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/UserRequestDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/UserRequestDTO.java new file mode 100644 index 0000000..5b796d3 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/UserRequestDTO.java @@ -0,0 +1,32 @@ +package umc.study.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import umc.study.validation.annotation.ExistCategories; + +import java.util.List; + +public class UserRequestDTO { + @Getter + public static class JoinDto{ + @NotBlank + String name; + @NotBlank + String email; + @NotNull + Integer gender; + @NotNull + Integer birthYear; + @NotNull + Integer birthMonth; + @NotNull + Integer birthDay; + @Size(min = 5, max = 12) + String address; + @Size(min = 5, max = 12) + List preferCategory; + } +} + diff --git a/wis/week9/study/src/main/java/umc/study/web/dto/UserResponseDTO.java b/wis/week9/study/src/main/java/umc/study/web/dto/UserResponseDTO.java new file mode 100644 index 0000000..5f00d94 --- /dev/null +++ b/wis/week9/study/src/main/java/umc/study/web/dto/UserResponseDTO.java @@ -0,0 +1,72 @@ +package umc.study.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; + +public class UserResponseDTO { + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class JoinResultDTO{ + Long userId; + LocalDateTime createdAt; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewListDTO { + List reviewList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewDTO { + String ownerNickname; + Float score; + String body; + LocalDate createdAt; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionListDTO { + List missions; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MissionPreViewDTO { + Long missionId; + String title; + String description; + Integer point; + LocalDate dueDate; + String status; + LocalDate createdAt; + } +} diff --git a/wis/week9/study/src/main/resources/application.yml b/wis/week9/study/src/main/resources/application.yml new file mode 100644 index 0000000..54acddf --- /dev/null +++ b/wis/week9/study/src/main/resources/application.yml @@ -0,0 +1,22 @@ +spring: + datasource: + url: jdbc:mysql://localhost:3306/study + username: root + password: mirae1107 + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update + default_batch_fetch_size: 1000 +logging: + level: + root: INFO \ No newline at end of file diff --git a/wis/week9/study/src/test/java/umc/study/StudyApplicationTests.java b/wis/week9/study/src/test/java/umc/study/StudyApplicationTests.java new file mode 100644 index 0000000..89717bd --- /dev/null +++ b/wis/week9/study/src/test/java/umc/study/StudyApplicationTests.java @@ -0,0 +1,13 @@ +package umc.study; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class StudyApplicationTests { + + @Test + void contextLoads() { + } + +}