diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/.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/build.gradle b/build.gradle new file mode 100644 index 0000000..9478dfc --- /dev/null +++ b/build.gradle @@ -0,0 +1,33 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.2.4' + id 'io.spring.dependency-management' version '1.1.4' +} + +group = 'com.jiyunio' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.0.2' + runtimeOnly 'com.mysql:mysql-connector-j' + implementation 'org.mariadb.jdbc:mariadb-java-client:2.7.11' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e644113 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..b82aa23 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..1aa94a4 --- /dev/null +++ b/gradlew @@ -0,0 +1,249 @@ +#!/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. +# + +############################################################################## +# +# 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/subprojects/plugins/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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..25da30d --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,92 @@ +@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 + +@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/settings.gradle b/settings.gradle new file mode 100644 index 0000000..59357f0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'todolist' diff --git a/src/main/java/com/jiyunio/todolist/ResponseDTO.java b/src/main/java/com/jiyunio/todolist/ResponseDTO.java new file mode 100644 index 0000000..67b9c90 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/ResponseDTO.java @@ -0,0 +1,20 @@ +package com.jiyunio.todolist; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ResponseDTO { + Long id; + String userId; + String msg; + + @Builder + ResponseDTO(Long id, String userId, String msg) { + this.id = id; + this.userId = userId; + this.msg = msg; + } +} diff --git a/src/main/java/com/jiyunio/todolist/TodolistApplication.java b/src/main/java/com/jiyunio/todolist/TodolistApplication.java new file mode 100644 index 0000000..f0f56c6 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/TodolistApplication.java @@ -0,0 +1,13 @@ +package com.jiyunio.todolist; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class TodolistApplication { + + public static void main(String[] args) { + SpringApplication.run(TodolistApplication.class, args); + } + +} diff --git a/src/main/java/com/jiyunio/todolist/category/Category.java b/src/main/java/com/jiyunio/todolist/category/Category.java new file mode 100644 index 0000000..a2ae2ed --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/category/Category.java @@ -0,0 +1,34 @@ +package com.jiyunio.todolist.category; + +import com.jiyunio.todolist.member.Member; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity +public class Category { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "categoryId") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "memberId") + private Member member; + + private String category; + + @Builder + protected Category(Member member, String category) { + this.member = member; + this.category = category; + } + + protected void updateCategory(String category) { + this.category = category; + } +} diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryController.java b/src/main/java/com/jiyunio/todolist/category/CategoryController.java new file mode 100644 index 0000000..16988ea --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/category/CategoryController.java @@ -0,0 +1,50 @@ +package com.jiyunio.todolist.category; + +import com.jiyunio.todolist.ResponseDTO; +import jakarta.validation.Valid; +import jakarta.validation.constraints.NotBlank; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class CategoryController { + private final CategoryService categoryService; + + @PostMapping("/category{memberId}") + public ResponseEntity createCategory(@PathVariable Long memberId, @Validated @RequestParam @NotBlank String categoryName) { + categoryService.createCategory(memberId, categoryName); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("카테고리 생성 성공") + .build(); + return new ResponseEntity<>(responseDTO, HttpStatus.CREATED); + } + + @GetMapping("/category/{memberId}") + public List getCategory(@PathVariable Long memberId) { + return categoryService.getCategory(memberId); + } + + @PutMapping("/category/{categoryId}") + public ResponseEntity updateCategory(@PathVariable Long categoryId, @RequestParam @NotBlank String categoryName) { + categoryService.updateCategory(categoryId, categoryName); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("카테고리 수정 성공") + .build(); + return ResponseEntity.ok(responseDTO); + } + + @DeleteMapping("/category/{categoryId}") + public ResponseEntity deleteCategory(@PathVariable Long categoryId) { + categoryService.deleteCategory(categoryId); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("카테고리 삭제 성공") + .build(); + return new ResponseEntity<>(responseDTO, HttpStatus.NO_CONTENT); + } +} diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryRepository.java b/src/main/java/com/jiyunio/todolist/category/CategoryRepository.java new file mode 100644 index 0000000..d024058 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/category/CategoryRepository.java @@ -0,0 +1,12 @@ +package com.jiyunio.todolist.category; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface CategoryRepository extends JpaRepository { + Optional findById(Long todoId); + + List findByMemberId(Long memberId); +} diff --git a/src/main/java/com/jiyunio/todolist/category/CategoryService.java b/src/main/java/com/jiyunio/todolist/category/CategoryService.java new file mode 100644 index 0000000..298eff4 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/category/CategoryService.java @@ -0,0 +1,52 @@ +package com.jiyunio.todolist.category; + +import com.jiyunio.todolist.customError.CustomException; +import com.jiyunio.todolist.customError.ErrorCode; +import com.jiyunio.todolist.member.Member; +import com.jiyunio.todolist.member.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class CategoryService { + private final CategoryRepository categoryRepository; + private final MemberRepository memberRepository; + + public void createCategory(Long memberId, String categoryName) { + Member member = memberRepository.findById(memberId).orElseThrow( + // 회원 존재 안함 + () -> new CustomException(HttpStatus.NOT_FOUND, ErrorCode.NOT_EXIST_MEMBER) + ); + Category category = Category.builder() + .member(member) + .category(categoryName) + .build(); + categoryRepository.save(category); + } + + public List getCategory(Long memberId) { + List categories = categoryRepository.findByMemberId(memberId); + List getCategoryDTO = new ArrayList<>(); + + for (Category category : categories) { + getCategoryDTO.add(GetCategoryDTO.builder() + .category(category.getCategory()).build()); + } + return getCategoryDTO; + } + + public void updateCategory(Long categoryId, String categoryName) { + Category category = categoryRepository.findById(categoryId).get(); + category.updateCategory(categoryName); + categoryRepository.save(category); + } + + public void deleteCategory(Long categoryId) { + categoryRepository.deleteById(categoryId); + } +} diff --git a/src/main/java/com/jiyunio/todolist/category/GetCategoryDTO.java b/src/main/java/com/jiyunio/todolist/category/GetCategoryDTO.java new file mode 100644 index 0000000..dcc3f89 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/category/GetCategoryDTO.java @@ -0,0 +1,17 @@ +package com.jiyunio.todolist.category; + +import com.jiyunio.todolist.member.Member; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class GetCategoryDTO { + private String category; + + @Builder + protected GetCategoryDTO(String category) { + this.category = category; + } +} diff --git a/src/main/java/com/jiyunio/todolist/config/SwaggerConfig.java b/src/main/java/com/jiyunio/todolist/config/SwaggerConfig.java new file mode 100644 index 0000000..6799912 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/config/SwaggerConfig.java @@ -0,0 +1,24 @@ +package com.jiyunio.todolist.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .components(new Components()) + .info(apiInfo()); + } + + private Info apiInfo() { + return new Info() + .title("Swagger Test") + .description("Swagger UI Test") + .version("1.0.0"); + } +} diff --git a/src/main/java/com/jiyunio/todolist/customError/CustomException.java b/src/main/java/com/jiyunio/todolist/customError/CustomException.java new file mode 100644 index 0000000..3fca9a7 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/customError/CustomException.java @@ -0,0 +1,15 @@ +package com.jiyunio.todolist.customError; + +import lombok.*; +import org.springframework.http.HttpStatus; + +@Getter +public class CustomException extends RuntimeException { + private final HttpStatus httpStatus; + private final ErrorCode errorCode; + + public CustomException(HttpStatus httpStatus, ErrorCode errorCode){ + this.httpStatus = httpStatus; + this.errorCode = errorCode; + } +} diff --git a/src/main/java/com/jiyunio/todolist/customError/CustomExceptionHandler.java b/src/main/java/com/jiyunio/todolist/customError/CustomExceptionHandler.java new file mode 100644 index 0000000..3d91aa3 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/customError/CustomExceptionHandler.java @@ -0,0 +1,13 @@ +package com.jiyunio.todolist.customError; + +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class CustomExceptionHandler { + @ExceptionHandler(CustomException.class) + protected ResponseEntity handleCustomException(CustomException e){ + return ErrorDTO.toResponseEntity(e); + } +} diff --git a/src/main/java/com/jiyunio/todolist/customError/ErrorCode.java b/src/main/java/com/jiyunio/todolist/customError/ErrorCode.java new file mode 100644 index 0000000..b9c86ce --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/customError/ErrorCode.java @@ -0,0 +1,27 @@ +package com.jiyunio.todolist.customError; + +import lombok.Getter; + +@Getter +public enum ErrorCode { + // 400 Bad Request + NOT_SAME_CONFIRM_PASSWORD("400_Bad_Request", "비밀번호 확인이 맞지 않습니다."), + WRONG_USERID_PASSWORD("400_Bad_Request", "아이디 및 비밀번호가 맞지 않습니다."), + + // 404 Not Found + NOT_EXIST_MEMBER("404_Not_Found", "회원이 존재하지 않습니다."), + NOT_EXIST_TODO("404_Not_Found", "TODO가 존재하지 않습니다."), + + // 409 Conflict 중복된 값 + EXIST_USERID("409_Conflict", "이미 존재하는 아이디입니다."), + EXIST_EMAIL("409_Conflict", "이미 존재하는 이메일입니다."); + + private final String code; + private final String message; + + ErrorCode(String code, String message) { + this.code = code; + this.message = message; + } + +} diff --git a/src/main/java/com/jiyunio/todolist/customError/ErrorDTO.java b/src/main/java/com/jiyunio/todolist/customError/ErrorDTO.java new file mode 100644 index 0000000..b10365d --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/customError/ErrorDTO.java @@ -0,0 +1,23 @@ +package com.jiyunio.todolist.customError; +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; +import org.springframework.http.ResponseEntity; + +@Getter +@Setter +@Builder +public class ErrorDTO { + String code; + String msg; + + public static ResponseEntity toResponseEntity(CustomException e) { + ErrorCode error = e.getErrorCode(); + return ResponseEntity + .status(e.getHttpStatus()) + .body(ErrorDTO.builder() + .code(error.getCode()) + .msg(error.getMessage()) + .build()); + } +} diff --git a/src/main/java/com/jiyunio/todolist/member/Member.java b/src/main/java/com/jiyunio/todolist/member/Member.java new file mode 100644 index 0000000..0f70ee2 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/Member.java @@ -0,0 +1,34 @@ +package com.jiyunio.todolist.member; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity +public class Member { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "memberId") + private Long id; + + private String userId; + + private String userPw; + + private String userEmail; + + @Builder + protected Member(String userId, String userPw, String userEmail) { + this.userId = userId; + this.userPw = userPw; + this.userEmail = userEmail; + } + + protected void updateUserPw(String userPw) { + this.userPw = userPw; + } +} diff --git a/src/main/java/com/jiyunio/todolist/member/MemberController.java b/src/main/java/com/jiyunio/todolist/member/MemberController.java new file mode 100644 index 0000000..09a48b8 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/MemberController.java @@ -0,0 +1,85 @@ +package com.jiyunio.todolist.member; + +import com.jiyunio.todolist.ResponseDTO; +import com.jiyunio.todolist.member.dto.ChangeUserPwDTO; +import com.jiyunio.todolist.member.dto.SignInDTO; +import com.jiyunio.todolist.member.dto.SignUpDTO; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequiredArgsConstructor +public class MemberController { + private final MemberService memberService; + + @PostMapping("/signUp") + public ResponseEntity signUp(@Valid @RequestBody SignUpDTO signUpDto, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + List responseDTOList = returnBindingResult(bindingResult); + return new ResponseEntity<>(responseDTOList, HttpStatus.BAD_REQUEST); + } + + ResponseDTO responseDTO = ResponseDTO.builder() + .userId(memberService.signUp(signUpDto)) // 화면에 "ㅇㅇ님 환영합니다" 글씨 원함 + .msg("회원가입 성공") + .build(); + return new ResponseEntity<>(responseDTO, HttpStatus.CREATED); + } + + @PostMapping("/signIn") + public ResponseEntity signIn(@Valid @RequestBody SignInDTO signInDto, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + List responseDTOList = returnBindingResult(bindingResult); + return new ResponseEntity<>(responseDTOList, HttpStatus.BAD_REQUEST); + } + + ResponseDTO responseDTO = ResponseDTO.builder() + .userId(memberService.signIn(signInDto)) // 로그인하면 회원 페이지에 ㅇㅇ님 원함 + .msg("로그인 성공") + .build(); + return ResponseEntity.ok(responseDTO); + } + + @PutMapping("/{id}/update") + public ResponseEntity updateUserPw(@PathVariable Long id, @Valid @RequestBody ChangeUserPwDTO changeUserPwDto, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + List responseDTOList = returnBindingResult(bindingResult); + return new ResponseEntity<>(responseDTOList, HttpStatus.BAD_REQUEST); + } + + memberService.updateUserPw(id, changeUserPwDto); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("비밀번호 변경 성공") + .build(); + return ResponseEntity.ok(responseDTO); + } + + @DeleteMapping("/{id}/delete") + public ResponseEntity deleteMember(@PathVariable Long id, @RequestParam String userPw) { + memberService.deleteMember(id, userPw); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("회원 탈퇴 성공") + .build(); + return new ResponseEntity<>(responseDTO, HttpStatus.NO_CONTENT); + } + + public List returnBindingResult(BindingResult bindingResult) { + List list = bindingResult.getFieldErrors(); + List responseDTOList = new ArrayList<>(); + for (FieldError error : list) { + ResponseDTO responseDTO = ResponseDTO.builder() + .msg(error.getDefaultMessage()) + .build(); + responseDTOList.add(responseDTO); + } + return responseDTOList; + } +} diff --git a/src/main/java/com/jiyunio/todolist/member/MemberRepository.java b/src/main/java/com/jiyunio/todolist/member/MemberRepository.java new file mode 100644 index 0000000..c9128b4 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/MemberRepository.java @@ -0,0 +1,15 @@ +package com.jiyunio.todolist.member; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + Optional findById(Long id); + + Optional findByUserId(String userId); + + boolean existsByUserId(String userId); + + boolean existsByUserEmail(String userEmail); +} diff --git a/src/main/java/com/jiyunio/todolist/member/MemberService.java b/src/main/java/com/jiyunio/todolist/member/MemberService.java new file mode 100644 index 0000000..fc61f2f --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/MemberService.java @@ -0,0 +1,80 @@ +package com.jiyunio.todolist.member; + +import com.jiyunio.todolist.customError.CustomException; +import com.jiyunio.todolist.customError.ErrorCode; +import com.jiyunio.todolist.member.dto.ChangeUserPwDTO; +import com.jiyunio.todolist.member.dto.SignInDTO; +import com.jiyunio.todolist.member.dto.SignUpDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; + + public String signUp(SignUpDTO signUpDto) { + if (memberRepository.existsByUserEmail(signUpDto.getUserEmail())) { + // 이미 존재하는 이메일 + throw new CustomException(HttpStatus.BAD_REQUEST, ErrorCode.EXIST_EMAIL); + } + + if (memberRepository.existsByUserId(signUpDto.getUserId())) { + // 이미 존재하는 아이디 + throw new CustomException(HttpStatus.BAD_REQUEST, ErrorCode.EXIST_USERID); + } + + if (signUpDto.getUserPw().equals(signUpDto.getConfirmUserPw())) { + // 회원가입 성공 + Member member = Member.builder() + .userId(signUpDto.getUserId()) + .userPw(signUpDto.getUserPw()) + .userEmail(signUpDto.getUserEmail()) + .build(); + memberRepository.save(member); + return member.getUserId(); + } + // 비밀번호 불일치 + throw new CustomException(HttpStatus.BAD_REQUEST, ErrorCode.NOT_SAME_CONFIRM_PASSWORD); + } + + public String signIn(SignInDTO signInDto) { + if (memberRepository.existsByUserId(signInDto.getUserId())) { + Member member = memberRepository.findByUserId(signInDto.getUserId()).get(); + if (member.getUserPw().equals(signInDto.getUserPw())) { + // 로그인 성공 + return member.getUserId(); + } + // 회원의 비밀번호와 불일치 + throw new CustomException(HttpStatus.NOT_FOUND, ErrorCode.WRONG_USERID_PASSWORD); + } + // 아이디 없음 + throw new CustomException(HttpStatus.NOT_FOUND, ErrorCode.WRONG_USERID_PASSWORD); + } + + public void updateUserPw(Long id, ChangeUserPwDTO changeUserPwDto) { + Member member = memberRepository.findById(id).get(); + if (member.getUserPw().equals(changeUserPwDto.getUserPw())) { // 회원 비밀번호 확인 + if (changeUserPwDto.getChangePw().equals(changeUserPwDto.getConfirmChangePw())) { + // 비밀번호 업데이트 성공 + member.updateUserPw(changeUserPwDto.getChangePw()); + memberRepository.save(member); + } + // 변경 비밀번호 불일치 + throw new CustomException(HttpStatus.BAD_REQUEST, ErrorCode.NOT_SAME_CONFIRM_PASSWORD); + } + // 회원의 비밀번호와 불일치 + throw new CustomException(HttpStatus.NOT_FOUND, ErrorCode.WRONG_USERID_PASSWORD); + } + + public void deleteMember(Long id, String userPw) { + Member member = memberRepository.findById(id).get(); + if (member.getUserPw().equals(userPw)) { + // 회원 탈퇴 성공 + memberRepository.deleteById(id); + } + // 비밀번호 불일치 + throw new CustomException(HttpStatus.NOT_FOUND, ErrorCode.WRONG_USERID_PASSWORD); + } +} diff --git a/src/main/java/com/jiyunio/todolist/member/dto/ChangeUserPwDTO.java b/src/main/java/com/jiyunio/todolist/member/dto/ChangeUserPwDTO.java new file mode 100644 index 0000000..5e9f53b --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/dto/ChangeUserPwDTO.java @@ -0,0 +1,18 @@ +package com.jiyunio.todolist.member.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class ChangeUserPwDTO { + @NotBlank(message = "비밀번호를 입력하세요.") + private String userPw; + + @NotBlank(message = "변경 비밀번호를 입력하세요.") + private String changePw; + + @NotBlank(message = "확인 비밀번호를 입력하세요.") + private String confirmChangePw; +} diff --git a/src/main/java/com/jiyunio/todolist/member/dto/SignInDTO.java b/src/main/java/com/jiyunio/todolist/member/dto/SignInDTO.java new file mode 100644 index 0000000..8830ebd --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/dto/SignInDTO.java @@ -0,0 +1,15 @@ +package com.jiyunio.todolist.member.dto; + +import jakarta.validation.constraints.NotBlank; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SignInDTO { + @NotBlank(message = "아이디를 입력하세요.") + private String userId; + + @NotBlank(message = "비밀번호를 입력하세요.") + private String userPw; +} diff --git a/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java b/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java new file mode 100644 index 0000000..280b1e1 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/member/dto/SignUpDTO.java @@ -0,0 +1,26 @@ +package com.jiyunio.todolist.member.dto; + +import jakarta.validation.constraints.Email; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Pattern; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +public class SignUpDTO { + @NotBlank(message = "아이디를 입력하세요.") + @Pattern(regexp = "(?=.*[a-zA-Z])(?=\\S+$).{5,10}", message = "아이디 : 5~10자") + private String userId; + + @NotBlank(message = "비밀번호를 입력하세요.") + @Pattern(regexp = "(?=.*[0-9])(?=.*[a-zA-Z])(?=.*\\W)(?=\\S+$).{8,16}", message = "비밀번호: 8~16자의 영문 대/소문자, 숫자, 특수문자를 사용하십쇼.") + private String userPw; + + @NotBlank(message = "이메일를 입력하세요.") + @Email(message = "이메일 형식이 맞지 않습니다.") + private String userEmail; + + @NotBlank(message = "확인 비밀번호를 입력하세요.") + private String confirmUserPw; +} diff --git a/src/main/java/com/jiyunio/todolist/todo/Todo.java b/src/main/java/com/jiyunio/todolist/todo/Todo.java new file mode 100644 index 0000000..8adc6dc --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/Todo.java @@ -0,0 +1,54 @@ +package com.jiyunio.todolist.todo; + +import com.jiyunio.todolist.member.Member; +import com.jiyunio.todolist.todo.dto.UpdateTodoDTO; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDate; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity +public class Todo { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "todoId") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "memberId") + private Member member; + + @Lob // 길이 제한 X + private String content; + + private Boolean checked; + + private String category; + + private LocalDate writeDate; + + private LocalDate setDate; + + @Builder + protected Todo(Member member, String content, Boolean checked, String category, LocalDate writeDate, LocalDate setDate) { + this.member = member; + this.content = content; + this.checked = checked; + this.category = category; + this.writeDate = writeDate; + this.setDate = setDate; + } + + protected void updateTodo(UpdateTodoDTO updateTodoDto) { + this.content = updateTodoDto.getContent(); + this.checked = updateTodoDto.getChecked(); + this.writeDate = updateTodoDto.getWriteDate(); + this.setDate = updateTodoDto.getSetDate(); + this.category = updateTodoDto.getCategory(); + } +} diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoController.java b/src/main/java/com/jiyunio/todolist/todo/TodoController.java new file mode 100644 index 0000000..bb468db --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/TodoController.java @@ -0,0 +1,76 @@ +package com.jiyunio.todolist.todo; + +import com.jiyunio.todolist.ResponseDTO; +import com.jiyunio.todolist.todo.dto.CreateTodoDTO; +import com.jiyunio.todolist.todo.dto.GetTodoDTO; +import com.jiyunio.todolist.todo.dto.UpdateTodoDTO; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.BindingResult; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.annotation.*; + +import java.util.ArrayList; +import java.util.List; + +@RestController +@RequestMapping("/todo") +@RequiredArgsConstructor +public class TodoController { + private final TodoService todoService; + + @PostMapping("/{memberId}") + public ResponseEntity createTodo(@PathVariable Long memberId, @Valid @RequestBody CreateTodoDTO createTodo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + List responseDTOList = returnBindingResult(bindingResult); + return new ResponseEntity<>(responseDTOList, HttpStatus.BAD_REQUEST); + } + todoService.createTodo(memberId, createTodo); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("Todo 생성 완료") + .build(); + return new ResponseEntity<>(responseDTO, HttpStatus.CREATED); + } + + @GetMapping("/{memberId}") + public List getTodo(@PathVariable Long memberId) { + return todoService.getTodo(memberId); + } + + @PutMapping("/{todoId}") + public ResponseEntity updateTodo(@PathVariable Long todoId, @Valid @RequestBody UpdateTodoDTO updateTodo, BindingResult bindingResult) { + if (bindingResult.hasErrors()) { + List responseDTOList = returnBindingResult(bindingResult); + return new ResponseEntity<>(responseDTOList, HttpStatus.BAD_REQUEST); + } + + todoService.updateTodo(todoId, updateTodo); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("Todo 수정 완료") + .build(); + return ResponseEntity.ok(responseDTO); + } + + @DeleteMapping("/{todoId}") + public ResponseEntity deleteTodo(@PathVariable Long todoId) { + todoService.deleteTodo(todoId); + ResponseDTO responseDTO = ResponseDTO.builder() + .msg("Todo 삭제 완료") + .build(); + return new ResponseEntity<>(responseDTO, HttpStatus.NO_CONTENT); + } + + public List returnBindingResult(BindingResult bindingResult) { + List list = bindingResult.getFieldErrors(); + List responseDTOList = new ArrayList<>(); + for (FieldError error : list) { + ResponseDTO responseDTO = ResponseDTO.builder() + .msg(error.getDefaultMessage()) + .build(); + responseDTOList.add(responseDTO); + } + return responseDTOList; + } +} diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoRepository.java b/src/main/java/com/jiyunio/todolist/todo/TodoRepository.java new file mode 100644 index 0000000..7c5c3c1 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/TodoRepository.java @@ -0,0 +1,12 @@ +package com.jiyunio.todolist.todo; + +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.List; +import java.util.Optional; + +public interface TodoRepository extends JpaRepository { + List findByMemberId(Long memberId); + + Optional findById(Long todoId); +} diff --git a/src/main/java/com/jiyunio/todolist/todo/TodoService.java b/src/main/java/com/jiyunio/todolist/todo/TodoService.java new file mode 100644 index 0000000..f735eb8 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/TodoService.java @@ -0,0 +1,66 @@ +package com.jiyunio.todolist.todo; + +import com.jiyunio.todolist.customError.CustomException; +import com.jiyunio.todolist.customError.ErrorCode; +import com.jiyunio.todolist.member.Member; +import com.jiyunio.todolist.member.MemberRepository; +import com.jiyunio.todolist.todo.dto.CreateTodoDTO; +import com.jiyunio.todolist.todo.dto.GetTodoDTO; +import com.jiyunio.todolist.todo.dto.UpdateTodoDTO; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; +import java.util.List; + +@Service +@RequiredArgsConstructor +public class TodoService { + private final MemberRepository memberRepository; + private final TodoRepository todoRepository; + + public void createTodo(Long memberId, CreateTodoDTO createTodo) { + Member member = memberRepository.findById(memberId).orElseThrow( + // 회원 존재 안함 + () -> new CustomException(HttpStatus.NOT_FOUND, ErrorCode.NOT_EXIST_MEMBER) + ); + + Todo todo = Todo.builder() + .member(member) + .content(createTodo.getContent()) + .category(createTodo.getCategory()) + .writeDate(createTodo.getWriteDate()) + .setDate(createTodo.getSetDate()) + .checked(false) + .build(); + todoRepository.save(todo); + } + + public List getTodo(Long memberId) { + List todoList = todoRepository.findByMemberId(memberId); + List getTodoList = new ArrayList<>(); + + for (Todo todo : todoList) { + getTodoList.add(GetTodoDTO.builder() + .content(todo.getContent()) + .category(todo.getCategory()) + .writeDate(todo.getWriteDate()) + .setDate(todo.getSetDate()) + .checked(todo.getChecked()) + .build()); + } + return getTodoList; + } + + public void updateTodo(Long todoId, UpdateTodoDTO updateTodo) { + Todo todo = todoRepository.findById(todoId).get(); + todo.updateTodo(updateTodo); + todoRepository.save(todo); + } + + public boolean deleteTodo(Long todoId) { + todoRepository.deleteById(todoId); + return true; + } +} diff --git a/src/main/java/com/jiyunio/todolist/todo/dto/CreateTodoDTO.java b/src/main/java/com/jiyunio/todolist/todo/dto/CreateTodoDTO.java new file mode 100644 index 0000000..310cd50 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/dto/CreateTodoDTO.java @@ -0,0 +1,24 @@ +package com.jiyunio.todolist.todo.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +public class CreateTodoDTO { + @NotBlank(message = "todo를 작성해주세요.") + private String content; + + @NotBlank + private String category; + + @NotNull(message = "작성 일자를 선택해주세요.") + private LocalDate writeDate; + + @NotNull(message = "설정 일자를 선택해주세요.") + private LocalDate setDate; +} diff --git a/src/main/java/com/jiyunio/todolist/todo/dto/GetTodoDTO.java b/src/main/java/com/jiyunio/todolist/todo/dto/GetTodoDTO.java new file mode 100644 index 0000000..04e9197 --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/dto/GetTodoDTO.java @@ -0,0 +1,30 @@ +package com.jiyunio.todolist.todo.dto; + +import lombok.Builder; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +public class GetTodoDTO { + private String content; + + private Boolean checked; + + private String category; + + private LocalDate writeDate; + + private LocalDate setDate; + + @Builder + protected GetTodoDTO(String content, Boolean checked, String category, LocalDate writeDate, LocalDate setDate) { + this.content = content; + this.checked = checked; + this.category = category; + this.writeDate = writeDate; + this.setDate = setDate; + } +} diff --git a/src/main/java/com/jiyunio/todolist/todo/dto/UpdateTodoDTO.java b/src/main/java/com/jiyunio/todolist/todo/dto/UpdateTodoDTO.java new file mode 100644 index 0000000..66e54ac --- /dev/null +++ b/src/main/java/com/jiyunio/todolist/todo/dto/UpdateTodoDTO.java @@ -0,0 +1,27 @@ +package com.jiyunio.todolist.todo.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import lombok.Setter; + +import java.time.LocalDate; + +@Getter +@Setter +public class UpdateTodoDTO { + @NotBlank(message = "todo를 작성해주세요.") + private String content; + + @NotNull + private Boolean checked; + + @NotBlank + private String category; + + @NotNull(message = "작성 일자를 선택해주세요.") + private LocalDate writeDate; + + @NotNull(message = "설정 일자를 선택해주세요.") + private LocalDate setDate; +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..87c8db5 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,24 @@ +spring.application.name=todolist + +#MYSQL +spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver +spring.datasource.username=jiyun +spring.datasource.url=na2ru2.me:5151 +spring.datasource.password=test1234 + +#JPA +spring.jpa.hibernate.ddl-auto=create +spring.jpa.show-sql=true +spring.jpa.open-in-view=false +spring.jpa.database-platform=org.hibernate.dialect.MySQL5InnoDBDialect + +#SERVER +server.port=5151 + +#SWAGGER +springdoc.default-consumes-media-type=application/json;charset=UTF-8 +springdoc.default-produces-media-type=application/json;charset=UTF-8 +springdoc.swagger-ui.path=/swagger-ui.html +springdoc.swagger-ui.disable-swagger-default-url=true +springdoc.swagger-ui.display-request-duration=true +springdoc.swagger-ui.operations-sorter=alpha \ No newline at end of file diff --git a/src/test/java/com/jiyunio/todolist/TodolistApplicationTests.java b/src/test/java/com/jiyunio/todolist/TodolistApplicationTests.java new file mode 100644 index 0000000..a7544d4 --- /dev/null +++ b/src/test/java/com/jiyunio/todolist/TodolistApplicationTests.java @@ -0,0 +1,13 @@ +package com.jiyunio.todolist; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class TodolistApplicationTests { + + @Test + void contextLoads() { + } + +}