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..ce759a5 --- /dev/null +++ b/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com.chanki' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + developmentOnly 'org.springframework.boot:spring-boot-devtools' + runtimeOnly 'com.h2database:h2' + 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/docs/requirements.md b/docs/requirements.md new file mode 100644 index 0000000..3c936ab --- /dev/null +++ b/docs/requirements.md @@ -0,0 +1,52 @@ +**구글 설문** +### 설문 +설문의 이름과 설문에 대한 간단한 Description 존재 +![Pasted image 20240721155115](https://github.com/user-attachments/assets/f93ee602-16b7-4fc4-8c39-ab7772fa8587) + + +제목, 소개, 생성일 정도의 데이터만 관리 예정. + +### 설문 받을 항목 +설문 항목은 무한대로 늘어날 수 있으며, 필수 / 선택의 경우에 대한 선택 가능 +설문 항목의 경우 질문 내용이 있고, 여러가지 타입의 질문에 대한 답변 내용을 생성 가능함. + +![Pasted image 20240721155125](https://github.com/user-attachments/assets/d99c45b5-4d09-4439-8815-60f3444de1d2) + + +### 요구사항 + +설문의 경우, 설문조사 생성, 수정, 응답 제출, 응답 조회의 기능이 있어야 한다. +설문은 [설문조사 이름, 설문조사 설명, 설문 받을 항목] 세가지 항목을 포함 +설문 받을 항목은 [항목 이름, 항목 설명, 항목 입력 형태, 항목 필수 여부] 네가지 항목 필요. +항목 입력 형태 [단답형, 장문형, 단일 선택 리스트, 다중 선택 리스트] 로 이루어짐 + +항목 입력 형태 +- 하기 네 가지 타입으로 정의. +- 단답형(TEXT), 장문형(LONGTEXT), 단일 선택 리스트(RADIO), 다중선택리스트(CHECKBOX) + +``` Java +public enum FormItemType { + TEXT, LONGTEXT, RADIO, CHECKBOX +} +``` + +설문조사 생성 +- 설문조사 생성 시 설문 받을 항목의 형태에 따른 밸리데이션(형태에 따른 하위 항목에 대한 유효성, 선택리스트의 경우 해당 리스트가 포함 되었는지?), 기타 칼럼 길이에 대한 밸리데이션 정도 필요할 것. +- 하위 항목에 대한 유효성 검사 + - 롱텍스트(500자 제한), 텍스트(500자 제한(?)), 단일,다중 선택지의 경우 선택지의 유무 체크 정도 진행. + +설문조사 수정 +- 설문조사 이름, 설명, 설문 받을 항목 +- 설문조사의 이름, 설명 등에 대한 버저닝은 미 진행 예정, 설문조사 이름, 설명등은 과거 기록이 사라짐. +- 생성시와 같은 조건의 밸리데이션 +- 수정 API 발생할 때 마다, 수정된 모든 항목을 검사하여 변경 여부를 체크하기가 어려울 것으로 생각. + - 먼저 업데이트 시 매번 항목에 대한 버저닝을 업데이트 한 항목을 추가로 생성. + - 상기 로직은 단 한 개의 항목의 하위 항목이 변경 되어도 모든 항목에 대한 내용이 추가 복제되어 신규 버전으로 추가되는 것으로, 추후 결과 값을 통계 내거나 데이터를 추가 할 시 데이터의 수의 추가 + +설문조사 응답 제출 +- 항목 밸리데이션 +- 응답 중 수정중인 사람은, 과거 버전과 현재 버전의 응답이 혼재. +- But 수정되었다고 기존 것이 안들어 가면 다 작성 한 설문값을 날리게 됨. + +설문조사 응답 조회 +- 설문조사 식별자 필요(설문 ID? 정도로 생각) diff --git a/docs/retrospect.md b/docs/retrospect.md new file mode 100644 index 0000000..acb008a --- /dev/null +++ b/docs/retrospect.md @@ -0,0 +1,31 @@ +## TODO +DTO Validation 라이브러리 찾아보기 + +DTO 내에서 모델을 가져다 쓰는 부분은 제거, 코드 재사용 성을 위해 DTO? 를 대신할 수 있는 방법을 찾아보자. + +이대로 가면 DTO가 수백개가 되겠다!! + +자바의 폴더 구조 Common Case 조사해보자 + +JPA학습. +Optional Keyword 확인 + +Response 형태를 data, status 형태로만 단순히 일치할 수 있게 수정해보자. + +기능 구현 후 개선 해보자! + +식별 관계가 JPA 랑 좀 안맞나? + +ONE TO MANY 단방향 매핑의 단점 조사 +- 엔티티가 관리하는 외래키가 다른 테이블에 있음 +- 불필요한 업데이트 발생(맨 처음 작성한 코드에서도 업데이트 문이 여러번 나가는 것을 확인람) + +OnetoMany로 변경 후, formId 가 중복된다는 에러가 발생 + +엔티티 내에 부모 테이블이 생기면서 생기는 문제로 보임 + +객체간의 관계는 예로, 사람이 주문을 한다고 생각하는게 아닌 주문이 사람에 의해 만들어진다고 생각. + +식별관계로 만드니 응답의 경우, 필요없는 칼럼이 하나 더 생겼음 + +DTO Spring Valid. \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..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..a441313 --- /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.8-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..b740cf1 --- /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/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 "${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..757feaa --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'form' diff --git a/src/main/java/com/chanki/form/FormApplication.java b/src/main/java/com/chanki/form/FormApplication.java new file mode 100644 index 0000000..d24fa2c --- /dev/null +++ b/src/main/java/com/chanki/form/FormApplication.java @@ -0,0 +1,13 @@ +package com.chanki.form; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class FormApplication { + + public static void main(String[] args) { + SpringApplication.run(FormApplication.class, args); + } + +} diff --git a/src/main/java/com/chanki/form/web/controller/FormController.java b/src/main/java/com/chanki/form/web/controller/FormController.java new file mode 100644 index 0000000..7352781 --- /dev/null +++ b/src/main/java/com/chanki/form/web/controller/FormController.java @@ -0,0 +1,43 @@ +package com.chanki.form.web.controller; + +import com.chanki.form.web.dto.FormEditRequestDto; +import com.chanki.form.web.dto.FormSubmitDto; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.chanki.form.web.domain.forms.Form; +import com.chanki.form.web.dto.FormCreateRequestDto; +import com.chanki.form.web.service.FormService; + +import lombok.RequiredArgsConstructor; + +@RequiredArgsConstructor +@RestController +public class FormController { + + private final FormService formService; + + @PostMapping("/api/create") + public Form save(@RequestBody FormCreateRequestDto formCreateRequestDto) { + return formService.createForm(formCreateRequestDto); + } + + @GetMapping("/api/form/{formId}") + public Form save(@PathVariable("formId") long formId) { + return formService.selectForm(formId); + } + + @PutMapping("/api/form") + public long edit(@RequestBody FormEditRequestDto formEditRequestDto) { + return formService.editForm(formEditRequestDto); + } + + @PostMapping("/api/form/{formId}") + public long submit(@PathVariable("formId") long formId, @RequestBody FormSubmitDto formSubmitDto) { + return formService.submitForm(formId, formSubmitDto); + } +} \ No newline at end of file diff --git a/src/main/java/com/chanki/form/web/domain/forms/Form.java b/src/main/java/com/chanki/form/web/domain/forms/Form.java new file mode 100644 index 0000000..c6e3d99 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/Form.java @@ -0,0 +1,47 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.IdClass; +import java.util.List; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import org.hibernate.annotations.Formula; +import org.hibernate.annotations.JoinFormula; + +@ToString +@Getter +@NoArgsConstructor +@Entity +@IdClass(FormId.class) +@Table(name = "form") +public class Form { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "form_id") + private Long formId; + + @Column(length = 100, nullable = false) + private String title; + + @Column(length = 500, nullable = false) + private String description; + + @Builder + public Form(String title, String description) { + this.title = title; + this.description = description; + } +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormId.java b/src/main/java/com/chanki/form/web/domain/forms/FormId.java new file mode 100644 index 0000000..b130289 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormId.java @@ -0,0 +1,15 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(onlyExplicitlyIncluded = true) +@NoArgsConstructor +public class FormId { + @EqualsAndHashCode.Include + @Id + @Column(name = "form_id") + private long formId; +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItem.java b/src/main/java/com/chanki/form/web/domain/forms/FormItem.java new file mode 100644 index 0000000..29e4c30 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItem.java @@ -0,0 +1,68 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.Embeddable; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.ManyToOne; +import java.util.List; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@ToString +@Getter +@NoArgsConstructor +@IdClass(FormItemId.class) +@Table(name = "form_item") +@Entity +public class FormItem { + + @Id + @Column(name = "form_id") + private long formId; + + @Id + private long version; + + @Id + private long sequence; + + @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "form_id", referencedColumnName = "form_id") + private Form form; + + + @Column(length = 500) + private String description; + + private boolean required; + + @Enumerated(EnumType.STRING) + private FormItemType type; + + + @Builder + public FormItem(Form form, long version, long sequence, boolean required, String description, + FormItemType type) { + this.form = form; + this.version = version; + this.sequence = sequence; + this.required = required; + this.description = description; + this.type = type; + } + +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java new file mode 100644 index 0000000..9b68f12 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java @@ -0,0 +1,27 @@ +package com.chanki.form.web.domain.forms; + +import java.io.Serializable; + +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@EqualsAndHashCode(onlyExplicitlyIncluded = true) +@NoArgsConstructor +public class FormItemId implements Serializable { + + @EqualsAndHashCode.Include + @Id + @Column(name = "form_id") + private long formId; + + @EqualsAndHashCode.Include + @Id + private long version; + + @EqualsAndHashCode.Include + @Id + private long sequence; +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java new file mode 100644 index 0000000..a8e3f8f --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java @@ -0,0 +1,57 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@ToString +@Getter +@NoArgsConstructor +@IdClass(FormItemOptionId.class) +@Table(name = "form_item_option") +@Entity +public class FormItemOption { + + @Id + @Column(name = "form_id") + private long formId; + + @Id + private long version; + + @Id + private long sequence; + @ManyToOne(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumns({ + @JoinColumn(name = "form_id", referencedColumnName = "form_id", insertable = false, updatable = false), + @JoinColumn(name = "version", referencedColumnName = "version", insertable = false, updatable = false), + @JoinColumn(name = "sequence", referencedColumnName = "sequence", insertable = false, updatable = false) + }) + private FormItem formItem; + + @Id + @Column(name = "option_sequence") + private long optionSequence; + + @Column(length = 500) + private String description; + + @Builder + public FormItemOption(FormItem formItem, long optionSequence, String description) { + this.formItem = formItem; + this.optionSequence = optionSequence; + this.description = description; + } +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java new file mode 100644 index 0000000..e4df22c --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java @@ -0,0 +1,30 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import java.io.Serializable; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(onlyExplicitlyIncluded = true) +@NoArgsConstructor +public class FormItemOptionId implements Serializable { + + @EqualsAndHashCode.Include + @Id + @Column(name = "form_id") + private long formId; + + @EqualsAndHashCode.Include + @Id + private long version; + + @EqualsAndHashCode.Include + @Id + private long sequence; + + @EqualsAndHashCode.Include + @Id + @Column(name = "option_sequence") + private long optionSequence; +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionRepository.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionRepository.java new file mode 100644 index 0000000..0cb3c39 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionRepository.java @@ -0,0 +1,7 @@ +package com.chanki.form.web.domain.forms; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FormItemOptionRepository extends JpaRepository { + +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java new file mode 100644 index 0000000..b8cc5a1 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java @@ -0,0 +1,25 @@ +package com.chanki.form.web.domain.forms; + +import java.util.List; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface FormItemRepository extends JpaRepository { + + @Query("SELECT MAX(fi.version) + 1 AS version FROM FormItem fi WHERE fi.formId =:formId GROUP BY fi.formId") + long findNextVersion(@Param("formId") long formId); + + @Query("SELECT MAX(fi.version) AS version FROM FormItem fi WHERE fi.formId =:formId GROUP BY fi.formId") + long findLatestVersion(@Param("formId") long formId); + + @Query(""" + SELECT fi + FROM FormItem fi + LEFT OUTER JOIN FormItem fi2 + ON fi.formId = fi2.formId + AND fi.version < fi2.version + WHERE fi.formId =:formId + AND fi2.formId IS NULL""" ) + List findLatestVersionFormItemList(@Param("formId") long formId); +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormItemType.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemType.java new file mode 100644 index 0000000..1bf1eb8 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemType.java @@ -0,0 +1,6 @@ +package com.chanki.form.web.domain.forms; + +// 단답형, 장문형, 단일선택리스트, 다중선택리스트 +public enum FormItemType { + TEXT, LONGTEXT, RADIO, CHECKBOX +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormRepository.java b/src/main/java/com/chanki/form/web/domain/forms/FormRepository.java new file mode 100644 index 0000000..a0d224f --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormRepository.java @@ -0,0 +1,7 @@ +package com.chanki.form.web.domain.forms; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FormRepository extends JpaRepository { + +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormSubmit.java b/src/main/java/com/chanki/form/web/domain/forms/FormSubmit.java new file mode 100644 index 0000000..866dd93 --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormSubmit.java @@ -0,0 +1,49 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.Table; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@ToString +@Getter +@NoArgsConstructor +@Entity +@IdClass(FormSubmit.class) +@Table(name = "form_submit_list") +public class FormSubmit { + @Id + @Column(name = "form_id") + @JoinColumn(name = "form_id") + private long formId; + + @Id + @JoinColumn(name = "version") + private long version; + + @Id + @JoinColumn(name = "sequence") + private long sequence; + + @Id + @Column(name = "answer_sequence") + private long answerSequence; + + @Column(name = "answer") + private String answer; + + @Builder + public FormSubmit(long formId, long version, long sequence, long answerSequence, String answer) { + this.formId = formId; + this.version = version; + this.sequence = sequence; + this.answerSequence = answerSequence; + this.answer = answer; + } +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormSubmitId.java b/src/main/java/com/chanki/form/web/domain/forms/FormSubmitId.java new file mode 100644 index 0000000..d3f533a --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormSubmitId.java @@ -0,0 +1,34 @@ +package com.chanki.form.web.domain.forms; + +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(onlyExplicitlyIncluded = true) +@NoArgsConstructor +public class FormSubmitId { + + @EqualsAndHashCode.Include + @Id + @Column(name = "form_id") + private long formId; + + @EqualsAndHashCode.Include + @Id + private long version; + + @EqualsAndHashCode.Include + @Id + private long sequence; + + @EqualsAndHashCode.Include + @Id + @Column(name = "option_sequence") + private long optionSequence; + + @EqualsAndHashCode.Include + @Id + @Column(name = "answer_sequence") + private long answerSequence; +} diff --git a/src/main/java/com/chanki/form/web/domain/forms/FormSubmitRepository.java b/src/main/java/com/chanki/form/web/domain/forms/FormSubmitRepository.java new file mode 100644 index 0000000..e4d9e5d --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormSubmitRepository.java @@ -0,0 +1,7 @@ +package com.chanki.form.web.domain.forms; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FormSubmitRepository extends JpaRepository { + +} diff --git a/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java new file mode 100644 index 0000000..f27b79a --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java @@ -0,0 +1,48 @@ +package com.chanki.form.web.dto; + +import com.chanki.form.web.domain.forms.Form; +import com.chanki.form.web.domain.forms.FormItemOption; +import java.util.ArrayList; +import java.util.List; + +import com.chanki.form.web.domain.forms.FormItem; + +import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Stream; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class FormCreateRequestDto { + + private String title; + private String description; + private List formItems; + + public List getFormItemList(Form form) { + AtomicLong atomicLong = new AtomicLong(); + + return this.formItems + .stream() + .map(formItem -> formItem.toEntity(form, 1, atomicLong.incrementAndGet())) + .toList(); + } + + public List getFormItemOptionList(FormItem formItem) { + + return this.formItems + .stream() + .flatMap(_formItem -> _formItem.getFormItemOptionList(formItem)) + .toList(); + } + + + public Form toEntity() { + return Form.builder() + .title(this.title) + .description(this.description) + .build(); + } +} diff --git a/src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java new file mode 100644 index 0000000..16a0dcb --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java @@ -0,0 +1,16 @@ +package com.chanki.form.web.dto; + +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Getter +@NoArgsConstructor +@ToString +public class FormEditRequestDto { + private long formId; + private String title; + private String description; + private List formItems; +} diff --git a/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java new file mode 100644 index 0000000..9b7383c --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java @@ -0,0 +1,42 @@ +package com.chanki.form.web.dto; + +import com.chanki.form.web.domain.forms.Form; +import com.chanki.form.web.domain.forms.FormItem; +import com.chanki.form.web.domain.forms.FormItemOption; +import com.chanki.form.web.domain.forms.FormItemType; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Stream; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class FormItemCreateRequestDto { + + private String description; + private boolean required; + private FormItemType type; + private List formItemOptions; + + public FormItem toEntity(Form form, long version, long sequence) { + return FormItem.builder() + .form(form) + .version(version) + .sequence(sequence) + .description(this.description) + .required(this.required) + .type(type) + .build(); + } + + public Stream getFormItemOptionList(FormItem formItem) { + AtomicLong atomicLong = new AtomicLong(); + + return this.formItemOptions + .stream() + .map(formItemOption-> formItemOption.toEntity(formItem, atomicLong.incrementAndGet())); + } +} diff --git a/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java new file mode 100644 index 0000000..df7cfa3 --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java @@ -0,0 +1,25 @@ +package com.chanki.form.web.dto; + +import com.chanki.form.web.domain.forms.FormItem; +import com.chanki.form.web.domain.forms.FormItemOption; +import java.util.List; +import java.util.stream.Stream; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class FormItemOptionCreateRequestDto { + + private String description; + + + public FormItemOption toEntity(FormItem formItem, long optionSequence) { + return FormItemOption.builder() + .formItem(formItem) + .optionSequence(optionSequence) + .description(this.description) + .build(); + } + +} diff --git a/src/main/java/com/chanki/form/web/dto/FormSubmitDto.java b/src/main/java/com/chanki/form/web/dto/FormSubmitDto.java new file mode 100644 index 0000000..93532ae --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormSubmitDto.java @@ -0,0 +1,48 @@ +package com.chanki.form.web.dto; + +import com.chanki.form.web.domain.forms.FormItem; +import com.chanki.form.web.domain.forms.FormItemOption; +import com.chanki.form.web.domain.forms.FormSubmit; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class FormSubmitDto { + + @Getter + public static class FormAnswer { + + private long version; + private long sequence; + private String answer; + + @Builder + public FormSubmit toEntity(long formId, long answerSequence) { + return FormSubmit.builder() + .formId(formId) + .version(this.version) + .sequence(this.sequence) + .answerSequence(answerSequence) + .answer(this.answer) + .build(); + } + } + + public List answerList; + + public List getFormSubmitEntityList(long formId) { + AtomicLong atomicLong = new AtomicLong(); + + return Optional.ofNullable(this.answerList).orElseGet(ArrayList::new).stream() + .map(option -> option.toEntity(formId, atomicLong.incrementAndGet())) + .toList(); + } + + +} diff --git a/src/main/java/com/chanki/form/web/service/FormService.java b/src/main/java/com/chanki/form/web/service/FormService.java new file mode 100644 index 0000000..4ab0326 --- /dev/null +++ b/src/main/java/com/chanki/form/web/service/FormService.java @@ -0,0 +1,86 @@ +package com.chanki.form.web.service; + +import com.chanki.form.web.domain.forms.Form; +import com.chanki.form.web.domain.forms.FormItem; +import com.chanki.form.web.domain.forms.FormItemOption; +import com.chanki.form.web.domain.forms.FormItemOptionRepository; +import com.chanki.form.web.domain.forms.FormItemRepository; +import com.chanki.form.web.domain.forms.FormRepository; +import com.chanki.form.web.domain.forms.FormSubmit; +import com.chanki.form.web.domain.forms.FormSubmitRepository; +import com.chanki.form.web.dto.FormCreateRequestDto; +import com.chanki.form.web.dto.FormEditRequestDto; +import com.chanki.form.web.dto.FormSubmitDto; +import jakarta.transaction.Transactional; +import java.util.ArrayList; +import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +// ## TODO 식별관계로 만들어, 뭔가 복잡한거 같은데.. +// ## TODO 비식별관계로 변경해야 하는지... + +@RequiredArgsConstructor +@Service +public class FormService { + + private final FormRepository formRepository; + private final FormItemRepository formItemRepository; + private final FormItemOptionRepository formItemOptionRepository; + private final FormSubmitRepository formSubmitRepository; + +// public boolean isValidSubmitForm(List formSubmits, List formItems) { +// if(formSubmits.size() != formItems.size()) return false; +// for(int i = 0; i < formSubmits.size(); i++) { +// FormSubmit formSubmit = formSubmits.get(i); +// FormItem = formItems. +// } +// } + @Transactional + public Form createForm(FormCreateRequestDto formCreateRequestDto) { + Form form = formRepository.save(formCreateRequestDto.toEntity()); + List formItems = formCreateRequestDto.getFormItemList(form); + + for(FormItem _formItem: formItems) { + FormItem formItem = formItemRepository.save(_formItem); + List formItemOptions = formCreateRequestDto.getFormItemOptionList(formItem); + formItemOptionRepository.saveAll(formItemOptions); + } + return form; + } + + @Transactional + public long editForm(FormEditRequestDto formEditRequestDto) { +// Form form = formRepository.findById(formEditRequestDto.getFormId()) +// .orElseThrow(() -> new IllegalArgumentException("Form does not exist")); +// long getNextSequence = formItemRepository.findNextVersion(form.getFormId()); +// +// for (int i = 0; i < formEditRequestDto.getFormItems().size(); i++) { +// FormItem formItem = formEditRequestDto.getFormItems().get(i).toEntity(form.getFormId(), getNextSequence, i + 1); +// formItemRepository.save(formItem); +// } +// +// return form.getFormId(); + return 1; + } + + @Transactional + public long submitForm(long formId, FormSubmitDto formSubmitDto) { + List answerList = formSubmitDto.getFormSubmitEntityList(formId); + Form form = formRepository.findById(formId) + .orElseThrow(() -> new IllegalArgumentException("Form does not exist")); + + long currentVersion = formItemRepository.findLatestVersion(formId); + List formItems = formItemRepository.findLatestVersionFormItemList(formId); + List formSubmits = formSubmitRepository.saveAll(answerList); + return form.getFormId(); + } + + // ##TODO 전체 FORM 형태 조회 테스트를 위한 Service(추후 제거) + public Form selectForm(long formId) { + Optional
form = formRepository.findById(formId); + return form.get(); + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..0337845 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1,3 @@ +spring.application.name=form +spring.jpa.properties.hibernate.show_sql=true +spring.datasource.url=jdbc:h2:mem:testdb \ No newline at end of file diff --git a/src/test/java/com/chanki/form/FormApplicationTests.java b/src/test/java/com/chanki/form/FormApplicationTests.java new file mode 100644 index 0000000..d9ef4c1 --- /dev/null +++ b/src/test/java/com/chanki/form/FormApplicationTests.java @@ -0,0 +1,13 @@ +package com.chanki.form; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class FormApplicationTests { + + @Test + void contextLoads() { + } + +}