diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000..9170e46 Binary files /dev/null and b/.DS_Store differ diff --git a/week4/.gitattributes b/week4/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/week4/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/week4/.gitignore b/week4/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/week4/.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/week4/build.gradle b/week4/build.gradle new file mode 100644 index 0000000..4cb46db --- /dev/null +++ b/week4/build.gradle @@ -0,0 +1,48 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.6' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' +description = 'Demo project for Spring Boot' + +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' + + // QueryDSL : OpenFeign + implementation "io.github.openfeign.querydsl:querydsl-jpa:7.0" + implementation "io.github.openfeign.querydsl:querydsl-core:7.0" + annotationProcessor "io.github.openfeign.querydsl:querydsl-apt:7.0:jpa" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + + runtimeOnly 'com.h2database:h2' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/week4/gradle/wrapper/gradle-wrapper.jar b/week4/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..1b33c55 Binary files /dev/null and b/week4/gradle/wrapper/gradle-wrapper.jar differ diff --git a/week4/gradle/wrapper/gradle-wrapper.properties b/week4/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..d4081da --- /dev/null +++ b/week4/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/week4/gradlew b/week4/gradlew new file mode 100755 index 0000000..23d15a9 --- /dev/null +++ b/week4/gradlew @@ -0,0 +1,251 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/week4/gradlew.bat b/week4/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/week4/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= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/week4/settings.gradle b/week4/settings.gradle new file mode 100644 index 0000000..8600cd7 --- /dev/null +++ b/week4/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'week4' diff --git a/week4/src/main/java/com/example/week4/Week4Application.java b/week4/src/main/java/com/example/week4/Week4Application.java new file mode 100644 index 0000000..a33a56b --- /dev/null +++ b/week4/src/main/java/com/example/week4/Week4Application.java @@ -0,0 +1,13 @@ +package com.example.week4; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Week4Application { + + public static void main(String[] args) { + SpringApplication.run(Week4Application.class, args); + } + +} diff --git a/week4/src/main/java/com/example/week4/apiPayload/ApiResponse.java b/week4/src/main/java/com/example/week4/apiPayload/ApiResponse.java new file mode 100644 index 0000000..bb267cf --- /dev/null +++ b/week4/src/main/java/com/example/week4/apiPayload/ApiResponse.java @@ -0,0 +1,30 @@ +package com.example.week4.apiPayload; + +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import com.example.week4.apiPayload.code.BaseSuccessCode; +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) +public class ApiResponse { + + @JsonProperty("isSuccess") + private final Boolean isSuccess; + + @JsonProperty("code") + private final String code; + + @JsonProperty("message") + private final String message; + + @JsonProperty("result") + private T result; + + // 성공한 경우 (result 포함) + public static ApiResponse onSuccess(BaseSuccessCode code, T result) { + return new ApiResponse<>(false, code.getCode(), code.getMessage(), result); + } +} diff --git a/week4/src/main/java/com/example/week4/apiPayload/code/BaseSuccessCode.java b/week4/src/main/java/com/example/week4/apiPayload/code/BaseSuccessCode.java new file mode 100644 index 0000000..f526ffb --- /dev/null +++ b/week4/src/main/java/com/example/week4/apiPayload/code/BaseSuccessCode.java @@ -0,0 +1,9 @@ +package com.example.week4.apiPayload.code; + +import org.springframework.http.HttpStatus; + +public interface BaseSuccessCode { + HttpStatus getStatus(); + String getCode(); + String getMessage(); +} diff --git a/week4/src/main/java/com/example/week4/apiPayload/code/GeneralSuccessCode.java b/week4/src/main/java/com/example/week4/apiPayload/code/GeneralSuccessCode.java new file mode 100644 index 0000000..4444008 --- /dev/null +++ b/week4/src/main/java/com/example/week4/apiPayload/code/GeneralSuccessCode.java @@ -0,0 +1,20 @@ +package com.example.week4.apiPayload.code; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum GeneralSuccessCode implements BaseSuccessCode { + // ====================== 200 OK ====================== + GET_SUCCESS(HttpStatus.OK, "COMMON20001", "데이터를 성공적으로 조회했습니다."), + REVIEW_CREATED(HttpStatus.CREATED, "REVIEW2001", "리뷰가 성공적으로 등록되었습니다."), + OK(HttpStatus.OK, "COMMON200", "요청에 성공하였습니다."), + MISSION_CHALLENGED(HttpStatus.CREATED, "MISSION2001", "미션 도전에 성공하였습니다.") + ; + + private final HttpStatus status; + private final String code; + private final String message; +} diff --git a/week4/src/main/java/com/example/week4/controller/MissionController.java b/week4/src/main/java/com/example/week4/controller/MissionController.java new file mode 100644 index 0000000..a7d6e24 --- /dev/null +++ b/week4/src/main/java/com/example/week4/controller/MissionController.java @@ -0,0 +1,29 @@ +package com.example.week4.controller; + +import com.example.week4.apiPayload.ApiResponse; +import com.example.week4.apiPayload.code.GeneralSuccessCode; +import com.example.week4.domain.UserMission; +import com.example.week4.service.MissionCommandService; +import com.example.week4.web.dto.MissionRequestDTO; +import com.example.week4.web.dto.MissionResponseDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/missions") +public class MissionController { + + private final MissionCommandService missionCommandService; + + @PostMapping("/challenge") + public ApiResponse challengeMission( + @RequestBody MissionRequestDTO.ChallengeMissionDto request + ) { + UserMission userMission = missionCommandService.challengeMission(request); + return ApiResponse.onSuccess(GeneralSuccessCode.MISSION_CHALLENGED, MissionResponseDTO.ChallengeMissionResultDto.from(userMission)); + } +} diff --git a/week4/src/main/java/com/example/week4/controller/ReviewController.java b/week4/src/main/java/com/example/week4/controller/ReviewController.java new file mode 100644 index 0000000..700572d --- /dev/null +++ b/week4/src/main/java/com/example/week4/controller/ReviewController.java @@ -0,0 +1,43 @@ +package com.example.week4.controller; + +import com.example.week4.apiPayload.ApiResponse; +import com.example.week4.apiPayload.code.GeneralSuccessCode; +import com.example.week4.domain.Review; +import com.example.week4.repository.ReviewRepository; +import com.example.week4.service.ReviewCommandService; +import com.example.week4.web.dto.ReviewRequestDTO; +import com.example.week4.web.dto.ReviewResponseDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/v1/stores") +public class ReviewController { + + private final ReviewRepository reviewRepository; + private final ReviewCommandService reviewCommandService; + + @PostMapping("/{storeId}/reviews") + public ApiResponse createReview( + @PathVariable Long storeId, + @RequestBody ReviewRequestDTO.CreateReviewDto request + ) { + Review review = reviewCommandService.createReview(storeId, request); + return ApiResponse.onSuccess(GeneralSuccessCode.REVIEW_CREATED, ReviewResponseDTO.CreateReviewResultDto.from(review)); + } + + @GetMapping("/{storeId}/reviews") + public ApiResponse> getStoreReviews( + @PathVariable Long storeId, + @RequestParam(required = false) List starRating, + Pageable pageable + ) { + List reviewPage = reviewRepository.findReviewsByStoreAndFilter(storeId, starRating, pageable); + + return ApiResponse.onSuccess(GeneralSuccessCode.GET_SUCCESS, reviewPage); + } +} \ No newline at end of file diff --git a/week4/src/main/java/com/example/week4/domain/Comment.java b/week4/src/main/java/com/example/week4/domain/Comment.java new file mode 100644 index 0000000..83ab531 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/Comment.java @@ -0,0 +1,37 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.Date; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Comment { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String content; + + private Date date; + + @ManyToOne + @JoinColumn(name = "review_id") + private Review review; + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + +} diff --git a/week4/src/main/java/com/example/week4/domain/Food.java b/week4/src/main/java/com/example/week4/domain/Food.java new file mode 100644 index 0000000..f0e67e3 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/Food.java @@ -0,0 +1,28 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Food { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String name; + + @OneToMany(mappedBy = "food") + private List prefferedFoods = new ArrayList<>(); + +} diff --git a/week4/src/main/java/com/example/week4/domain/Inquery.java b/week4/src/main/java/com/example/week4/domain/Inquery.java new file mode 100644 index 0000000..dd55829 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/Inquery.java @@ -0,0 +1,36 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.Date; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Inquery { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String name; + + private Date date; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; +} diff --git a/week4/src/main/java/com/example/week4/domain/Mission.java b/week4/src/main/java/com/example/week4/domain/Mission.java new file mode 100644 index 0000000..85adef0 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/Mission.java @@ -0,0 +1,44 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Getter +@lombok.Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private Integer accomplished_amount; + + private Integer accumulation_point; + + private Date deadline; + + @ManyToOne + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission") + @lombok.Builder.Default + private List userMissions = new ArrayList<>(); + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; +} diff --git a/week4/src/main/java/com/example/week4/domain/PrefferedFood.java b/week4/src/main/java/com/example/week4/domain/PrefferedFood.java new file mode 100644 index 0000000..a90e79e --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/PrefferedFood.java @@ -0,0 +1,43 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +@IdClass(PrefferedFood.PrefferedFoodId.class) +public class PrefferedFood { + + @Id + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @Id + @ManyToOne + @JoinColumn(name = "food_id") + private Food food; + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + + // getters and setters + + public static class PrefferedFoodId implements Serializable { + private Long user; + private Long food; + + // equals and hashCode + } +} diff --git a/week4/src/main/java/com/example/week4/domain/Review.java b/week4/src/main/java/com/example/week4/domain/Review.java new file mode 100644 index 0000000..22b3817 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/Review.java @@ -0,0 +1,50 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Getter +@lombok.Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private Integer star; + + private Date date; + + @Column(columnDefinition = "TEXT") + private String content; + + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @ManyToOne + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "review") + @lombok.Builder.Default + private List comments = new ArrayList<>(); + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + +} diff --git a/week4/src/main/java/com/example/week4/domain/Store.java b/week4/src/main/java/com/example/week4/domain/Store.java new file mode 100644 index 0000000..7f347e0 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/Store.java @@ -0,0 +1,49 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String name; + + @Column(columnDefinition = "TEXT") + private String address; + + private Date start_time; + + private Date end_time; + + @Column(columnDefinition = "TEXT") + private String category; + + @OneToMany(mappedBy = "store") + private List reviews = new ArrayList<>(); + + @OneToMany(mappedBy = "store") + private List missions = new ArrayList<>(); + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + +} diff --git a/week4/src/main/java/com/example/week4/domain/User.java b/week4/src/main/java/com/example/week4/domain/User.java new file mode 100644 index 0000000..fe8ed70 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/User.java @@ -0,0 +1,60 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +@Table(name = "users") +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(columnDefinition = "TEXT") + private String email; + + @Enumerated(EnumType.STRING) + private Gender gender; + + private Date birth_day; + + @Column(columnDefinition = "TEXT") + private String address; + + private Integer point; + + @OneToMany(mappedBy = "user") + private List reviews = new ArrayList<>(); + + @OneToMany(mappedBy = "user") + private List inqueries = new ArrayList<>(); + + @OneToMany(mappedBy = "user") + private List prefferedFoods = new ArrayList<>(); + + @OneToMany(mappedBy = "user") + private List userMissions = new ArrayList<>(); + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + +} + +enum Gender { + MALE, FEMALE +} diff --git a/week4/src/main/java/com/example/week4/domain/UserMission.java b/week4/src/main/java/com/example/week4/domain/UserMission.java new file mode 100644 index 0000000..e8c1ee2 --- /dev/null +++ b/week4/src/main/java/com/example/week4/domain/UserMission.java @@ -0,0 +1,44 @@ +package com.example.week4.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.io.Serializable; +import java.time.LocalDateTime; + +@Entity +@Getter +@lombok.Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +@IdClass(UserMission.UserMissionId.class) +public class UserMission { + + private Boolean is_complete; + + @Id + @ManyToOne + @JoinColumn(name = "mission_id") + private Mission mission; + + @Id + @ManyToOne + @JoinColumn(name = "user_id") + private User user; + + @Column(nullable = false, updatable = false) + private LocalDateTime createdAt; + + @Column(nullable = false) + private LocalDateTime updatedAt; + + public static class UserMissionId implements Serializable { + private Long mission; + private Long user; + + // equals and hashCode + } +} diff --git a/week4/src/main/java/com/example/week4/repository/MissionRepository.java b/week4/src/main/java/com/example/week4/repository/MissionRepository.java new file mode 100644 index 0000000..b1adda2 --- /dev/null +++ b/week4/src/main/java/com/example/week4/repository/MissionRepository.java @@ -0,0 +1,7 @@ +package com.example.week4.repository; + +import com.example.week4.domain.Mission; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MissionRepository extends JpaRepository { +} diff --git a/week4/src/main/java/com/example/week4/repository/ReviewRepository.java b/week4/src/main/java/com/example/week4/repository/ReviewRepository.java new file mode 100644 index 0000000..daf81fc --- /dev/null +++ b/week4/src/main/java/com/example/week4/repository/ReviewRepository.java @@ -0,0 +1,60 @@ +package com.example.week4.repository; + +import com.example.week4.domain.Review; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Repository; + +import java.util.List; + +import static com.example.week4.domain.QReview.review; + +@Repository +@RequiredArgsConstructor +public class ReviewRepository { + + private final EntityManager entityManager; + + public Review save(Review review) { + if (review.getId() == null) { + entityManager.persist(review); + return review; + } else { + return entityManager.merge(review); + } + } + + public List findReviewsByStoreAndFilter(Long storeId, List stars, Pageable pageable) { + JPAQueryFactory queryFactory = new JPAQueryFactory(entityManager); + + // 1. 컨텐츠 조회 (페이징 적용) + List content = queryFactory + .selectFrom(review) + .where( + storeIdEq(storeId), + starRatingIn(stars) + ) + .offset(pageable.getOffset()) + .limit(pageable.getPageSize()) + .orderBy(review.createdAt.desc()) + .fetch(); + + return content; + } + + // 가게 ID 조건 + private BooleanExpression storeIdEq(Long storeId) { + return storeId != null ? review.store.id.eq(storeId) : null; + } + + // 별점 필터링 + private BooleanExpression starRatingIn(List stars) { + if (stars == null || stars.isEmpty()) { + return null; + } + return review.star.floor().intValue().in(stars); + } +} \ No newline at end of file diff --git a/week4/src/main/java/com/example/week4/repository/StoreRepository.java b/week4/src/main/java/com/example/week4/repository/StoreRepository.java new file mode 100644 index 0000000..717b1e7 --- /dev/null +++ b/week4/src/main/java/com/example/week4/repository/StoreRepository.java @@ -0,0 +1,7 @@ +package com.example.week4.repository; + +import com.example.week4.domain.Store; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface StoreRepository extends JpaRepository { +} diff --git a/week4/src/main/java/com/example/week4/repository/UserMissionRepository.java b/week4/src/main/java/com/example/week4/repository/UserMissionRepository.java new file mode 100644 index 0000000..eeb16a7 --- /dev/null +++ b/week4/src/main/java/com/example/week4/repository/UserMissionRepository.java @@ -0,0 +1,7 @@ +package com.example.week4.repository; + +import com.example.week4.domain.UserMission; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserMissionRepository extends JpaRepository { +} diff --git a/week4/src/main/java/com/example/week4/repository/UserRepository.java b/week4/src/main/java/com/example/week4/repository/UserRepository.java new file mode 100644 index 0000000..96f73c5 --- /dev/null +++ b/week4/src/main/java/com/example/week4/repository/UserRepository.java @@ -0,0 +1,7 @@ +package com.example.week4.repository; + +import com.example.week4.domain.User; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface UserRepository extends JpaRepository { +} diff --git a/week4/src/main/java/com/example/week4/service/MissionCommandService.java b/week4/src/main/java/com/example/week4/service/MissionCommandService.java new file mode 100644 index 0000000..3e2706d --- /dev/null +++ b/week4/src/main/java/com/example/week4/service/MissionCommandService.java @@ -0,0 +1,8 @@ +package com.example.week4.service; + +import com.example.week4.domain.UserMission; +import com.example.week4.web.dto.MissionRequestDTO; + +public interface MissionCommandService { + UserMission challengeMission(MissionRequestDTO.ChallengeMissionDto request); +} diff --git a/week4/src/main/java/com/example/week4/service/MissionCommandServiceImpl.java b/week4/src/main/java/com/example/week4/service/MissionCommandServiceImpl.java new file mode 100644 index 0000000..07bf47a --- /dev/null +++ b/week4/src/main/java/com/example/week4/service/MissionCommandServiceImpl.java @@ -0,0 +1,40 @@ +package com.example.week4.service; + +import com.example.week4.domain.Mission; +import com.example.week4.domain.User; +import com.example.week4.domain.UserMission; +import com.example.week4.repository.MissionRepository; +import com.example.week4.repository.UserMissionRepository; +import com.example.week4.repository.UserRepository; +import com.example.week4.web.dto.MissionRequestDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class MissionCommandServiceImpl implements MissionCommandService { + + private final MissionRepository missionRepository; + private final UserRepository userRepository; + private final UserMissionRepository userMissionRepository; + + @Override + @Transactional + public UserMission challengeMission(MissionRequestDTO.ChallengeMissionDto request) { + User user = userRepository.findById(request.getUserId()) + .orElseThrow(() -> new RuntimeException("User not found")); + + Mission mission = missionRepository.findById(request.getMissionId()) + .orElseThrow(() -> new RuntimeException("Mission not found")); + + UserMission userMission = UserMission.builder() + .user(user) + .mission(mission) + .is_complete(false) + .build(); + + return userMissionRepository.save(userMission); + } +} diff --git a/week4/src/main/java/com/example/week4/service/ReviewCommandService.java b/week4/src/main/java/com/example/week4/service/ReviewCommandService.java new file mode 100644 index 0000000..7e034ee --- /dev/null +++ b/week4/src/main/java/com/example/week4/service/ReviewCommandService.java @@ -0,0 +1,8 @@ +package com.example.week4.service; + +import com.example.week4.domain.Review; +import com.example.week4.web.dto.ReviewRequestDTO; + +public interface ReviewCommandService { + Review createReview(Long storeId, ReviewRequestDTO.CreateReviewDto request); +} diff --git a/week4/src/main/java/com/example/week4/service/ReviewCommandServiceImpl.java b/week4/src/main/java/com/example/week4/service/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..1e0dc4c --- /dev/null +++ b/week4/src/main/java/com/example/week4/service/ReviewCommandServiceImpl.java @@ -0,0 +1,39 @@ +package com.example.week4.service; + +import com.example.week4.domain.Review; +import com.example.week4.domain.Store; +import com.example.week4.domain.User; +import com.example.week4.repository.ReviewRepository; +import com.example.week4.repository.StoreRepository; +import com.example.week4.repository.UserRepository; +import com.example.week4.web.dto.ReviewRequestDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class ReviewCommandServiceImpl implements ReviewCommandService { + + private final ReviewRepository reviewRepository; + private final UserRepository userRepository; + private final StoreRepository storeRepository; + + @Override + @Transactional + public Review createReview(Long storeId, ReviewRequestDTO.CreateReviewDto request) { + + Store store = storeRepository.findById(storeId).orElseThrow(() -> new RuntimeException("Store not found")); + User user = userRepository.findById(request.getUserId()).orElseThrow(() -> new RuntimeException("User not found")); + + Review review = Review.builder() + .user(user) + .store(store) + .content(request.getContent()) + .star(request.getStar()) + .build(); + + return reviewRepository.save(review); + } +} diff --git a/week4/src/main/java/com/example/week4/web/dto/MissionRequestDTO.java b/week4/src/main/java/com/example/week4/web/dto/MissionRequestDTO.java new file mode 100644 index 0000000..3f82fff --- /dev/null +++ b/week4/src/main/java/com/example/week4/web/dto/MissionRequestDTO.java @@ -0,0 +1,12 @@ +package com.example.week4.web.dto; + +import lombok.Getter; + +public class MissionRequestDTO { + + @Getter + public static class ChallengeMissionDto { + private Long userId; + private Long missionId; + } +} diff --git a/week4/src/main/java/com/example/week4/web/dto/MissionResponseDTO.java b/week4/src/main/java/com/example/week4/web/dto/MissionResponseDTO.java new file mode 100644 index 0000000..9146ac0 --- /dev/null +++ b/week4/src/main/java/com/example/week4/web/dto/MissionResponseDTO.java @@ -0,0 +1,29 @@ +package com.example.week4.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class MissionResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ChallengeMissionResultDto { + private Long missionId; + private Long userId; // 혹은 userMissionId가 있으면 좋지만 복합키라 일단 userId 반환 + private LocalDateTime createdAt; + + public static ChallengeMissionResultDto from(com.example.week4.domain.UserMission userMission) { + return ChallengeMissionResultDto.builder() + .missionId(userMission.getMission().getId()) + .userId(userMission.getUser().getId()) + .createdAt(java.time.LocalDateTime.now()) + .build(); + } + } +} diff --git a/week4/src/main/java/com/example/week4/web/dto/ReviewRequestDTO.java b/week4/src/main/java/com/example/week4/web/dto/ReviewRequestDTO.java new file mode 100644 index 0000000..6c2ebe3 --- /dev/null +++ b/week4/src/main/java/com/example/week4/web/dto/ReviewRequestDTO.java @@ -0,0 +1,13 @@ +package com.example.week4.web.dto; + +import lombok.Getter; + +public class ReviewRequestDTO { + + @Getter + public static class CreateReviewDto { + private Long userId; + private String content; + private Integer star; + } +} \ No newline at end of file diff --git a/week4/src/main/java/com/example/week4/web/dto/ReviewResponseDTO.java b/week4/src/main/java/com/example/week4/web/dto/ReviewResponseDTO.java new file mode 100644 index 0000000..fd5df88 --- /dev/null +++ b/week4/src/main/java/com/example/week4/web/dto/ReviewResponseDTO.java @@ -0,0 +1,27 @@ +package com.example.week4.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class ReviewResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class CreateReviewResultDto { + private Long reviewId; + private LocalDateTime createdAt; + + public static CreateReviewResultDto from(com.example.week4.domain.Review review) { + return CreateReviewResultDto.builder() + .reviewId(review.getId()) + .createdAt(java.time.LocalDateTime.now()) + .build(); + } + } +} diff --git a/week4/src/main/resources/application.properties b/week4/src/main/resources/application.properties new file mode 100644 index 0000000..5cb4f4c --- /dev/null +++ b/week4/src/main/resources/application.properties @@ -0,0 +1,11 @@ +spring.application.name=week4 + +spring.h2.console.enabled=true + +spring.datasource.url=jdbc:h2:mem:testdb + +spring.datasource.driverClassName=org.h2.Driver + +spring.datasource.username=sa + +spring.datasource.password=password diff --git a/week4/src/test/java/com/example/week4/Week4ApplicationTests.java b/week4/src/test/java/com/example/week4/Week4ApplicationTests.java new file mode 100644 index 0000000..ce05ae4 --- /dev/null +++ b/week4/src/test/java/com/example/week4/Week4ApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.week4; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class Week4ApplicationTests { + + @Test + void contextLoads() { + } + +}