From 1893c22fc2bfa890837434a99cca1d0c313f7a81 Mon Sep 17 00:00:00 2001 From: devchanki Date: Sat, 20 Jul 2024 19:28:07 +0900 Subject: [PATCH 1/7] =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 37 +++ build.gradle | 40 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 249 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 1 + .../java/com/chanki/form/FormApplication.java | 13 + src/main/resources/application.properties | 1 + .../com/chanki/form/FormApplicationTests.java | 13 + 10 files changed, 453 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/chanki/form/FormApplication.java create mode 100644 src/main/resources/application.properties create mode 100644 src/test/java/com/chanki/form/FormApplicationTests.java 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/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c z&{(nX_ht=QbJ%DzAya}!&uNu!4V0xI)QE$SY__m)SAKcN0P(&JcoK*Lxr@P zY&P=}&B3*UWNlc|&$Oh{BEqwK2+N2U$4WB7Fd|aIal`FGANUa9E-O)!gV`((ZGCc$ zBJA|FFrlg~9OBp#f7aHodCe{6= zay$6vN~zj1ddMZ9gQ4p32(7wD?(dE>KA2;SOzXRmPBiBc6g`eOsy+pVcHu=;Yd8@{ zSGgXf@%sKKQz~;!J;|2fC@emm#^_rnO0esEn^QxXgJYd`#FPWOUU5b;9eMAF zZhfiZb|gk8aJIw*YLp4!*(=3l8Cp{(%p?ho22*vN9+5NLV0TTazNY$B5L6UKUrd$n zjbX%#m7&F#U?QNOBXkiiWB*_tk+H?N3`vg;1F-I+83{M2!8<^nydGr5XX}tC!10&e z7D36bLaB56WrjL&HiiMVtpff|K%|*{t*ltt^5ood{FOG0<>k&1h95qPio)2`eL${YAGIx(b4VN*~nKn6E~SIQUuRH zQ+5zP6jfnP$S0iJ@~t!Ai3o`X7biohli;E zT#yXyl{bojG@-TGZzpdVDXhbmF%F9+-^YSIv|MT1l3j zrxOFq>gd2%U}?6}8mIj?M zc077Zc9fq(-)4+gXv?Az26IO6eV`RAJz8e3)SC7~>%rlzDwySVx*q$ygTR5kW2ds- z!HBgcq0KON9*8Ff$X0wOq$`T7ml(@TF)VeoF}x1OttjuVHn3~sHrMB++}f7f9H%@f z=|kP_?#+fve@{0MlbkC9tyvQ_R?lRdRJ@$qcB(8*jyMyeME5ns6ypVI1Xm*Zr{DuS zZ!1)rQfa89c~;l~VkCiHI|PCBd`S*2RLNQM8!g9L6?n`^evQNEwfO@&JJRme+uopQX0%Jo zgd5G&#&{nX{o?TQwQvF1<^Cg3?2co;_06=~Hcb6~4XWpNFL!WU{+CK;>gH%|BLOh7@!hsa(>pNDAmpcuVO-?;Bic17R}^|6@8DahH)G z!EmhsfunLL|3b=M0MeK2vqZ|OqUqS8npxwge$w-4pFVXFq$_EKrZY?BuP@Az@(k`L z`ViQBSk`y+YwRT;&W| z2e3UfkCo^uTA4}Qmmtqs+nk#gNr2W4 zTH%hhErhB)pkXR{B!q5P3-OM+M;qu~f>}IjtF%>w{~K-0*jPVLl?Chz&zIdxp}bjx zStp&Iufr58FTQ36AHU)0+CmvaOpKF;W@sMTFpJ`j;3d)J_$tNQI^c<^1o<49Z(~K> z;EZTBaVT%14(bFw2ob@?JLQ2@(1pCdg3S%E4*dJ}dA*v}_a4_P(a`cHnBFJxNobAv zf&Zl-Yt*lhn-wjZsq<9v-IsXxAxMZ58C@e0!rzhJ+D@9^3~?~yllY^s$?&oNwyH!#~6x4gUrfxplCvK#!f z$viuszW>MFEcFL?>ux*((!L$;R?xc*myjRIjgnQX79@UPD$6Dz0jutM@7h_pq z0Zr)#O<^y_K6jfY^X%A-ip>P%3saX{!v;fxT-*0C_j4=UMH+Xth(XVkVGiiKE#f)q z%Jp=JT)uy{&}Iq2E*xr4YsJ5>w^=#-mRZ4vPXpI6q~1aFwi+lQcimO45V-JXP;>(Q zo={U`{=_JF`EQj87Wf}{Qy35s8r1*9Mxg({CvOt}?Vh9d&(}iI-quvs-rm~P;eRA@ zG5?1HO}puruc@S{YNAF3vmUc2B4!k*yi))<5BQmvd3tr}cIs#9)*AX>t`=~{f#Uz0 z0&Nk!7sSZwJe}=)-R^$0{yeS!V`Dh7w{w5rZ9ir!Z7Cd7dwZcK;BT#V0bzTt>;@Cl z#|#A!-IL6CZ@eHH!CG>OO8!%G8&8t4)Ro@}USB*k>oEUo0LsljsJ-%5Mo^MJF2I8- z#v7a5VdJ-Cd%(a+y6QwTmi+?f8Nxtm{g-+WGL>t;s#epv7ug>inqimZCVm!uT5Pf6 ziEgQt7^%xJf#!aPWbuC_3Nxfb&CFbQy!(8ANpkWLI4oSnH?Q3f?0k1t$3d+lkQs{~(>06l&v|MpcFsyAv zin6N!-;pggosR*vV=DO(#+}4ps|5$`udE%Kdmp?G7B#y%H`R|i8skKOd9Xzx8xgR$>Zo2R2Ytktq^w#ul4uicxW#{ zFjG_RNlBroV_n;a7U(KIpcp*{M~e~@>Q#Av90Jc5v%0c>egEdY4v3%|K1XvB{O_8G zkTWLC>OZKf;XguMH2-Pw{BKbFzaY;4v2seZV0>^7Q~d4O=AwaPhP3h|!hw5aqOtT@ z!SNz}$of**Bl3TK209@F=Tn1+mgZa8yh(Png%Zd6Mt}^NSjy)etQrF zme*llAW=N_8R*O~d2!apJnF%(JcN??=`$qs3Y+~xs>L9x`0^NIn!8mMRFA_tg`etw z3k{9JAjnl@ygIiJcNHTy02GMAvBVqEss&t2<2mnw!; zU`J)0>lWiqVqo|ex7!+@0i>B~BSU1A_0w#Ee+2pJx0BFiZ7RDHEvE*ptc9md(B{&+ zKE>TM)+Pd>HEmdJao7U@S>nL(qq*A)#eLOuIfAS@j`_sK0UEY6OAJJ-kOrHG zjHx`g!9j*_jRcJ%>CE9K2MVf?BUZKFHY?EpV6ai7sET-tqk=nDFh-(65rhjtlKEY% z@G&cQ<5BKatfdA1FKuB=i>CCC5(|9TMW%K~GbA4}80I5%B}(gck#Wlq@$nO3%@QP_ z8nvPkJFa|znk>V92cA!K1rKtr)skHEJD;k8P|R8RkCq1Rh^&}Evwa4BUJz2f!2=MH zo4j8Y$YL2313}H~F7@J7mh>u%556Hw0VUOz-Un@ZASCL)y8}4XXS`t1AC*^>PLwIc zUQok5PFS=*#)Z!3JZN&eZ6ZDP^-c@StY*t20JhCnbMxXf=LK#;`4KHEqMZ-Ly9KsS zI2VUJGY&PmdbM+iT)zek)#Qc#_i4uH43 z@T5SZBrhNCiK~~esjsO9!qBpaWK<`>!-`b71Y5ReXQ4AJU~T2Njri1CEp5oKw;Lnm)-Y@Z3sEY}XIgSy%xo=uek(kAAH5MsV$V3uTUsoTzxp_rF=tx zV07vlJNKtJhCu`b}*#m&5LV4TAE&%KtHViDAdv#c^x`J7bg z&N;#I2GkF@SIGht6p-V}`!F_~lCXjl1BdTLIjD2hH$J^YFN`7f{Q?OHPFEM$65^!u zNwkelo*5+$ZT|oQ%o%;rBX$+?xhvjb)SHgNHE_yP%wYkkvXHS{Bf$OiKJ5d1gI0j< zF6N}Aq=(WDo(J{e-uOecxPD>XZ@|u-tgTR<972`q8;&ZD!cep^@B5CaqFz|oU!iFj zU0;6fQX&~15E53EW&w1s9gQQ~Zk16X%6 zjG`j0yq}4deX2?Tr(03kg>C(!7a|b9qFI?jcE^Y>-VhudI@&LI6Qa}WQ>4H_!UVyF z((cm&!3gmq@;BD#5P~0;_2qgZhtJS|>WdtjY=q zLnHH~Fm!cxw|Z?Vw8*~?I$g#9j&uvgm7vPr#&iZgPP~v~BI4jOv;*OQ?jYJtzO<^y z7-#C={r7CO810!^s(MT!@@Vz_SVU)7VBi(e1%1rvS!?PTa}Uv`J!EP3s6Y!xUgM^8 z4f!fq<3Wer_#;u!5ECZ|^c1{|q_lh3m^9|nsMR1#Qm|?4Yp5~|er2?W^7~cl;_r4WSme_o68J9p03~Hc%X#VcX!xAu%1`R!dfGJCp zV*&m47>s^%Ib0~-2f$6oSgn3jg8m%UA;ArcdcRyM5;}|r;)?a^D*lel5C`V5G=c~k zy*w_&BfySOxE!(~PI$*dwG><+-%KT5p?whOUMA*k<9*gi#T{h3DAxzAPxN&Xws8o9Cp*`PA5>d9*Z-ynV# z9yY*1WR^D8|C%I@vo+d8r^pjJ$>eo|j>XiLWvTWLl(^;JHCsoPgem6PvegHb-OTf| zvTgsHSa;BkbG=(NgPO|CZu9gUCGr$8*EoH2_Z#^BnxF0yM~t`|9ws_xZ8X8iZYqh! zAh;HXJ)3P&)Q0(&F>!LN0g#bdbis-cQxyGn9Qgh`q+~49Fqd2epikEUw9caM%V6WgP)532RMRW}8gNS%V%Hx7apSz}tn@bQy!<=lbhmAH=FsMD?leawbnP5BWM0 z5{)@EEIYMu5;u)!+HQWhQ;D3_Cm_NADNeb-f56}<{41aYq8p4=93d=-=q0Yx#knGYfXVt z+kMxlus}t2T5FEyCN~!}90O_X@@PQpuy;kuGz@bWft%diBTx?d)_xWd_-(!LmVrh**oKg!1CNF&LX4{*j|) zIvjCR0I2UUuuEXh<9}oT_zT#jOrJAHNLFT~Ilh9hGJPI1<5`C-WA{tUYlyMeoy!+U zhA#=p!u1R7DNg9u4|QfED-2TuKI}>p#2P9--z;Bbf4Op*;Q9LCbO&aL2i<0O$ByoI z!9;Ght733FC>Pz>$_mw(F`zU?`m@>gE`9_p*=7o=7av`-&ifU(^)UU`Kg3Kw`h9-1 z6`e6+im=|m2v`pN(2dE%%n8YyQz;#3Q-|x`91z?gj68cMrHl}C25|6(_dIGk*8cA3 zRHB|Nwv{@sP4W+YZM)VKI>RlB`n=Oj~Rzx~M+Khz$N$45rLn6k1nvvD^&HtsMA4`s=MmuOJID@$s8Ph4E zAmSV^+s-z8cfv~Yd(40Sh4JG#F~aB>WFoX7ykaOr3JaJ&Lb49=B8Vk-SQT9%7TYhv z?-Pprt{|=Y5ZQ1?od|A<_IJU93|l4oAfBm?3-wk{O<8ea+`}u%(kub(LFo2zFtd?4 zwpN|2mBNywv+d^y_8#<$r>*5+$wRTCygFLcrwT(qc^n&@9r+}Kd_u@Ithz(6Qb4}A zWo_HdBj#V$VE#l6pD0a=NfB0l^6W^g`vm^sta>Tly?$E&{F?TTX~DsKF~poFfmN%2 z4x`Dc{u{Lkqz&y!33;X}weD}&;7p>xiI&ZUb1H9iD25a(gI|`|;G^NwJPv=1S5e)j z;U;`?n}jnY6rA{V^ zxTd{bK)Gi^odL3l989DQlN+Zs39Xe&otGeY(b5>rlIqfc7Ap4}EC?j<{M=hlH{1+d zw|c}}yx88_xQr`{98Z!d^FNH77=u(p-L{W6RvIn40f-BldeF-YD>p6#)(Qzf)lfZj z?3wAMtPPp>vMehkT`3gToPd%|D8~4`5WK{`#+}{L{jRUMt zrFz+O$C7y8$M&E4@+p+oV5c%uYzbqd2Y%SSgYy#xh4G3hQv>V*BnuKQhBa#=oZB~w{azUB+q%bRe_R^ z>fHBilnRTUfaJ201czL8^~Ix#+qOHSO)A|xWLqOxB$dT2W~)e-r9;bm=;p;RjYahB z*1hegN(VKK+ztr~h1}YP@6cfj{e#|sS`;3tJhIJK=tVJ-*h-5y9n*&cYCSdg#EHE# zSIx=r#qOaLJoVVf6v;(okg6?*L_55atl^W(gm^yjR?$GplNP>BZsBYEf_>wM0Lc;T zhf&gpzOWNxS>m+mN92N0{;4uw`P+9^*|-1~$uXpggj4- z^SFc4`uzj2OwdEVT@}Q`(^EcQ_5(ZtXTql*yGzdS&vrS_w>~~ra|Nb5abwf}Y!uq6R5f&6g2ge~2p(%c< z@O)cz%%rr4*cRJ5f`n@lvHNk@lE1a*96Kw6lJ~B-XfJW%?&-y?;E&?1AacU@`N`!O z6}V>8^%RZ7SQnZ-z$(jsX`amu*5Fj8g!3RTRwK^`2_QHe;_2y_n|6gSaGyPmI#kA0sYV<_qOZc#-2BO%hX)f$s-Z3xlI!ub z^;3ru11DA`4heAu%}HIXo&ctujzE2!6DIGE{?Zs>2}J+p&C$rc7gJC35gxhflorvsb%sGOxpuWhF)dL_&7&Z99=5M0b~Qa;Mo!j&Ti_kXW!86N%n= zSC@6Lw>UQ__F&+&Rzv?gscwAz8IP!n63>SP)^62(HK98nGjLY2*e^OwOq`3O|C92? z;TVhZ2SK%9AGW4ZavTB9?)mUbOoF`V7S=XM;#3EUpR+^oHtdV!GK^nXzCu>tpR|89 zdD{fnvCaN^^LL%amZ^}-E+214g&^56rpdc@yv0b<3}Ys?)f|fXN4oHf$six)-@<;W&&_kj z-B}M5U*1sb4)77aR=@%I?|Wkn-QJVuA96an25;~!gq(g1@O-5VGo7y&E_srxL6ZfS z*R%$gR}dyONgju*D&?geiSj7SZ@ftyA|}(*Y4KbvU!YLsi1EDQQCnb+-cM=K1io78o!v*);o<XwjaQH%)uIP&Zm?)Nfbfn;jIr z)d#!$gOe3QHp}2NBak@yYv3m(CPKkwI|{;d=gi552u?xj9ObCU^DJFQp4t4e1tPzM zvsRIGZ6VF+{6PvqsplMZWhz10YwS={?`~O0Ec$`-!klNUYtzWA^f9m7tkEzCy<_nS z=&<(awFeZvt51>@o_~>PLs05CY)$;}Oo$VDO)?l-{CS1Co=nxjqben*O1BR>#9`0^ zkwk^k-wcLCLGh|XLjdWv0_Hg54B&OzCE^3NCP}~OajK-LuRW53CkV~Su0U>zN%yQP zH8UH#W5P3-!ToO-2k&)}nFe`t+mdqCxxAHgcifup^gKpMObbox9LFK;LP3}0dP-UW z?Zo*^nrQ6*$FtZ(>kLCc2LY*|{!dUn$^RW~m9leoF|@Jy|M5p-G~j%+P0_#orRKf8 zvuu5<*XO!B?1E}-*SY~MOa$6c%2cM+xa8}_8x*aVn~57v&W(0mqN1W`5a7*VN{SUH zXz98DDyCnX2EPl-`Lesf`=AQT%YSDb`$%;(jUTrNen$NPJrlpPDP}prI>Ml!r6bCT;mjsg@X^#&<}CGf0JtR{Ecwd&)2zuhr#nqdgHj+g2n}GK9CHuwO zk>oZxy{vcOL)$8-}L^iVfJHAGfwN$prHjYV0ju}8%jWquw>}_W6j~m<}Jf!G?~r5&Rx)!9JNX!ts#SGe2HzobV5); zpj@&`cNcO&q+%*<%D7za|?m5qlmFK$=MJ_iv{aRs+BGVrs)98BlN^nMr{V_fcl_;jkzRju+c-y?gqBC_@J0dFLq-D9@VN&-`R9U;nv$Hg?>$oe4N&Ht$V_(JR3TG^! zzJsbQbi zFE6-{#9{G{+Z}ww!ycl*7rRdmU#_&|DqPfX3CR1I{Kk;bHwF6jh0opI`UV2W{*|nn zf_Y@%wW6APb&9RrbEN=PQRBEpM(N1w`81s=(xQj6 z-eO0k9=Al|>Ej|Mw&G`%q8e$2xVz1v4DXAi8G};R$y)ww638Y=9y$ZYFDM$}vzusg zUf+~BPX>(SjA|tgaFZr_e0{)+z9i6G#lgt=F_n$d=beAt0Sa0a7>z-?vcjl3e+W}+ z1&9=|vC=$co}-Zh*%3588G?v&U7%N1Qf-wNWJ)(v`iO5KHSkC5&g7CrKu8V}uQGcfcz zmBz#Lbqwqy#Z~UzHgOQ;Q-rPxrRNvl(&u6ts4~0=KkeS;zqURz%!-ERppmd%0v>iRlEf+H$yl{_8TMJzo0 z>n)`On|7=WQdsqhXI?#V{>+~}qt-cQbokEbgwV3QvSP7&hK4R{Z{aGHVS3;+h{|Hz z6$Js}_AJr383c_+6sNR|$qu6dqHXQTc6?(XWPCVZv=)D#6_;D_8P-=zOGEN5&?~8S zl5jQ?NL$c%O)*bOohdNwGIKM#jSAC?BVY={@A#c9GmX0=T(0G}xs`-%f3r=m6-cpK z!%waekyAvm9C3%>sixdZj+I(wQlbB4wv9xKI*T13DYG^T%}zZYJ|0$Oj^YtY+d$V$ zAVudSc-)FMl|54n=N{BnZTM|!>=bhaja?o7s+v1*U$!v!qQ%`T-6fBvmdPbVmro&d zk07TOp*KuxRUSTLRrBj{mjsnF8`d}rMViY8j`jo~Hp$fkv9F_g(jUo#Arp;Xw0M$~ zRIN!B22~$kx;QYmOkos@%|5k)!QypDMVe}1M9tZfkpXKGOxvKXB!=lo`p?|R1l=tA zp(1}c6T3Fwj_CPJwVsYtgeRKg?9?}%oRq0F+r+kdB=bFUdVDRPa;E~~>2$w}>O>v=?|e>#(-Lyx?nbg=ckJ#5U6;RT zNvHhXk$P}m9wSvFyU3}=7!y?Y z=fg$PbV8d7g25&-jOcs{%}wTDKm>!Vk);&rr;O1nvO0VrU&Q?TtYVU=ir`te8SLlS zKSNmV=+vF|ATGg`4$N1uS|n??f}C_4Sz!f|4Ly8#yTW-FBfvS48Tef|-46C(wEO_%pPhUC5$-~Y?!0vFZ^Gu`x=m7X99_?C-`|h zfmMM&Y@zdfitA@KPw4Mc(YHcY1)3*1xvW9V-r4n-9ZuBpFcf{yz+SR{ zo$ZSU_|fgwF~aakGr(9Be`~A|3)B=9`$M-TWKipq-NqRDRQc}ABo*s_5kV%doIX7LRLRau_gd@Rd_aLFXGSU+U?uAqh z8qusWWcvgQ&wu{|sRXmv?sl=xc<$6AR$+cl& zFNh5q1~kffG{3lDUdvEZu5c(aAG~+64FxdlfwY^*;JSS|m~CJusvi-!$XR`6@XtY2 znDHSz7}_Bx7zGq-^5{stTRy|I@N=>*y$zz>m^}^{d&~h;0kYiq8<^Wq7Dz0w31ShO^~LUfW6rfitR0(=3;Uue`Y%y@ex#eKPOW zO~V?)M#AeHB2kovn1v=n^D?2{2jhIQd9t|_Q+c|ZFaWt+r&#yrOu-!4pXAJuxM+Cx z*H&>eZ0v8Y`t}8{TV6smOj=__gFC=eah)mZt9gwz>>W$!>b3O;Rm^Ig*POZP8Rl0f zT~o=Nu1J|lO>}xX&#P58%Yl z83`HRs5#32Qm9mdCrMlV|NKNC+Z~ z9OB8xk5HJ>gBLi+m@(pvpw)1(OaVJKs*$Ou#@Knd#bk+V@y;YXT?)4eP9E5{J%KGtYinNYJUH9PU3A}66c>Xn zZ{Bn0<;8$WCOAL$^NqTjwM?5d=RHgw3!72WRo0c;+houoUA@HWLZM;^U$&sycWrFd zE7ekt9;kb0`lps{>R(}YnXlyGY}5pPd9zBpgXeJTY_jwaJGSJQC#-KJqmh-;ad&F- z-Y)E>!&`Rz!HtCz>%yOJ|v(u7P*I$jqEY3}(Z-orn4 zlI?CYKNl`6I){#2P1h)y(6?i;^z`N3bxTV%wNvQW+eu|x=kbj~s8rhCR*0H=iGkSj zk23lr9kr|p7#qKL=UjgO`@UnvzU)`&fI>1Qs7ubq{@+lK{hH* zvl6eSb9%yngRn^T<;jG1SVa)eA>T^XX=yUS@NCKpk?ovCW1D@!=@kn;l_BrG;hOTC z6K&H{<8K#dI(A+zw-MWxS+~{g$tI7|SfP$EYKxA}LlVO^sT#Oby^grkdZ^^lA}uEF zBSj$weBJG{+Bh@Yffzsw=HyChS(dtLE3i*}Zj@~!_T-Ay7z=B)+*~3|?w`Zd)Co2t zC&4DyB!o&YgSw+fJn6`sn$e)29`kUwAc+1MND7YjV%lO;H2}fNy>hD#=gT ze+-aFNpyKIoXY~Vq-}OWPBe?Rfu^{ps8>Xy%42r@RV#*QV~P83jdlFNgkPN=T|Kt7 zV*M`Rh*30&AWlb$;ae130e@}Tqi3zx2^JQHpM>j$6x`#{mu%tZlwx9Gj@Hc92IuY* zarmT|*d0E~vt6<+r?W^UW0&#U&)8B6+1+;k^2|FWBRP9?C4Rk)HAh&=AS8FS|NQaZ z2j!iZ)nbEyg4ZTp-zHwVlfLC~tXIrv(xrP8PAtR{*c;T24ycA-;auWsya-!kF~CWZ zw_uZ|%urXgUbc@x=L=_g@QJ@m#5beS@6W195Hn7>_}z@Xt{DIEA`A&V82bc^#!q8$ zFh?z_Vn|ozJ;NPd^5uu(9tspo8t%&-U9Ckay-s@DnM*R5rtu|4)~e)`z0P-sy?)kc zs_k&J@0&0!q4~%cKL)2l;N*T&0;mqX5T{Qy60%JtKTQZ-xb%KOcgqwJmb%MOOKk7N zgq})R_6**{8A|6H?fO+2`#QU)p$Ei2&nbj6TpLSIT^D$|`TcSeh+)}VMb}LmvZ{O| ze*1IdCt3+yhdYVxcM)Q_V0bIXLgr6~%JS<<&dxIgfL=Vnx4YHuU@I34JXA|+$_S3~ zy~X#gO_X!cSs^XM{yzDGNM>?v(+sF#<0;AH^YrE8smx<36bUsHbN#y57K8WEu(`qHvQ6cAZPo=J5C(lSmUCZ57Rj6cx!e^rfaI5%w}unz}4 zoX=nt)FVNV%QDJH`o!u9olLD4O5fl)xp+#RloZlaA92o3x4->?rB4`gS$;WO{R;Z3>cG3IgFX2EA?PK^M}@%1%A;?f6}s&CV$cIyEr#q5;yHdNZ9h{| z-=dX+a5elJoDo?Eq&Og!nN6A)5yYpnGEp}?=!C-V)(*~z-+?kY1Q7qs#Rsy%hu_60rdbB+QQNr?S1 z?;xtjUv|*E3}HmuNyB9aFL5H~3Ho0UsmuMZELp1a#CA1g`P{-mT?BchuLEtK}!QZ=3AWakRu~?f9V~3F;TV`5%9Pcs_$gq&CcU}r8gOO zC2&SWPsSG{&o-LIGTBqp6SLQZPvYKp$$7L4WRRZ0BR$Kf0I0SCFkqveCp@f)o8W)! z$%7D1R`&j7W9Q9CGus_)b%+B#J2G;l*FLz#s$hw{BHS~WNLODV#(!u_2Pe&tMsq={ zdm7>_WecWF#D=?eMjLj=-_z`aHMZ=3_-&E8;ibPmM}61i6J3is*=dKf%HC>=xbj4$ zS|Q-hWQ8T5mWde6h@;mS+?k=89?1FU<%qH9B(l&O>k|u_aD|DY*@~(`_pb|B#rJ&g zR0(~(68fpUPz6TdS@4JT5MOPrqDh5_H(eX1$P2SQrkvN8sTxwV>l0)Qq z0pzTuvtEAKRDkKGhhv^jk%|HQ1DdF%5oKq5BS>szk-CIke{%js?~%@$uaN3^Uz6Wf z_iyx{bZ(;9y4X&>LPV=L=d+A}7I4GkK0c1Xts{rrW1Q7apHf-))`BgC^0^F(>At1* za@e7{lq%yAkn*NH8Q1{@{lKhRg*^TfGvv!Sn*ed*x@6>M%aaqySxR|oNadYt1mpUZ z6H(rupHYf&Z z29$5g#|0MX#aR6TZ$@eGxxABRKakDYtD%5BmKp;HbG_ZbT+=81E&=XRk6m_3t9PvD zr5Cqy(v?gHcYvYvXkNH@S#Po~q(_7MOuCAB8G$a9BC##gw^5mW16cML=T=ERL7wsk zzNEayTG?mtB=x*wc@ifBCJ|irFVMOvH)AFRW8WE~U()QT=HBCe@s$dA9O!@`zAAT) zaOZ7l6vyR+Nk_OOF!ZlZmjoImKh)dxFbbR~z(cMhfeX1l7S_`;h|v3gI}n9$sSQ>+3@AFAy9=B_y$)q;Wdl|C-X|VV3w8 z2S#>|5dGA8^9%Bu&fhmVRrTX>Z7{~3V&0UpJNEl0=N32euvDGCJ>#6dUSi&PxFW*s zS`}TB>?}H(T2lxBJ!V#2taV;q%zd6fOr=SGHpoSG*4PDaiG0pdb5`jelVipkEk%FV zThLc@Hc_AL1#D&T4D=w@UezYNJ%0=f3iVRuVL5H?eeZM}4W*bomebEU@e2d`M<~uW zf#Bugwf`VezG|^Qbt6R_=U0}|=k;mIIakz99*>FrsQR{0aQRP6ko?5<7bkDN8evZ& zB@_KqQG?ErKL=1*ZM9_5?Pq%lcS4uLSzN(Mr5=t6xHLS~Ym`UgM@D&VNu8e?_=nSFtF$u@hpPSmI4Vo_t&v?>$~K4y(O~Rb*(MFy_igM7 z*~yYUyR6yQgzWnWMUgDov!!g=lInM+=lOmOk4L`O?{i&qxy&D*_qorRbDwj6?)!ef z#JLd7F6Z2I$S0iYI={rZNk*<{HtIl^mx=h>Cim*04K4+Z4IJtd*-)%6XV2(MCscPiw_a+y*?BKbTS@BZ3AUao^%Zi#PhoY9Vib4N>SE%4>=Jco0v zH_Miey{E;FkdlZSq)e<{`+S3W=*ttvD#hB8w=|2aV*D=yOV}(&p%0LbEWH$&@$X3x~CiF-?ejQ*N+-M zc8zT@3iwkdRT2t(XS`d7`tJQAjRmKAhiw{WOqpuvFp`i@Q@!KMhwKgsA}%@sw8Xo5Y=F zhRJZg)O4uqNWj?V&&vth*H#je6T}}p_<>!Dr#89q@uSjWv~JuW(>FqoJ5^ho0%K?E z9?x_Q;kmcsQ@5=}z@tdljMSt9-Z3xn$k)kEjK|qXS>EfuDmu(Z8|(W?gY6-l z@R_#M8=vxKMAoi&PwnaIYw2COJM@atcgfr=zK1bvjW?9B`-+Voe$Q+H$j!1$Tjn+* z&LY<%)L@;zhnJlB^Og6I&BOR-m?{IW;tyYC%FZ!&Z>kGjHJ6cqM-F z&19n+e1=9AH1VrVeHrIzqlC`w9=*zfmrerF?JMzO&|Mmv;!4DKc(sp+jy^Dx?(8>1 zH&yS_4yL7m&GWX~mdfgH*AB4{CKo;+egw=PrvkTaoBU+P-4u?E|&!c z)DKc;>$$B6u*Zr1SjUh2)FeuWLWHl5TH(UHWkf zLs>7px!c5n;rbe^lO@qlYLzlDVp(z?6rPZel=YB)Uv&n!2{+Mb$-vQl=xKw( zve&>xYx+jW_NJh!FV||r?;hdP*jOXYcLCp>DOtJ?2S^)DkM{{Eb zS$!L$e_o0(^}n3tA1R3-$SNvgBq;DOEo}fNc|tB%%#g4RA3{|euq)p+xd3I8^4E&m zFrD%}nvG^HUAIKe9_{tXB;tl|G<%>yk6R;8L2)KUJw4yHJXUOPM>(-+jxq4R;z8H#>rnJy*)8N+$wA$^F zN+H*3t)eFEgxLw+Nw3};4WV$qj&_D`%ADV2%r zJCPCo%{=z7;`F98(us5JnT(G@sKTZ^;2FVitXyLe-S5(hV&Ium+1pIUB(CZ#h|g)u zSLJJ<@HgrDiA-}V_6B^x1>c9B6%~847JkQ!^KLZ2skm;q*edo;UA)~?SghG8;QbHh z_6M;ouo_1rq9=x$<`Y@EA{C%6-pEV}B(1#sDoe_e1s3^Y>n#1Sw;N|}8D|s|VPd+g z-_$QhCz`vLxxrVMx3ape1xu3*wjx=yKSlM~nFgkNWb4?DDr*!?U)L_VeffF<+!j|b zZ$Wn2$TDv3C3V@BHpSgv3JUif8%hk%OsGZ=OxH@8&4`bbf$`aAMchl^qN>Eyu3JH} z9-S!x8-s4fE=lad%Pkp8hAs~u?|uRnL48O|;*DEU! zuS0{cpk%1E0nc__2%;apFsTm0bKtd&A0~S3Cj^?72-*Owk3V!ZG*PswDfS~}2<8le z5+W^`Y(&R)yVF*tU_s!XMcJS`;(Tr`J0%>p=Z&InR%D3@KEzzI+-2)HK zuoNZ&o=wUC&+*?ofPb0a(E6(<2Amd6%uSu_^-<1?hsxs~0K5^f(LsGqgEF^+0_H=uNk9S0bb!|O8d?m5gQjUKevPaO+*VfSn^2892K~%crWM8+6 z25@V?Y@J<9w%@NXh-2!}SK_(X)O4AM1-WTg>sj1{lj5@=q&dxE^9xng1_z9w9DK>| z6Iybcd0e zyi;Ew!KBRIfGPGytQ6}z}MeXCfLY0?9%RiyagSp_D1?N&c{ zyo>VbJ4Gy`@Fv+5cKgUgs~na$>BV{*em7PU3%lloy_aEovR+J7TfQKh8BJXyL6|P8un-Jnq(ghd!_HEOh$zlv2$~y3krgeH;9zC}V3f`uDtW(%mT#944DQa~^8ZI+zAUu4U(j0YcDfKR$bK#gvn_{JZ>|gZ5+)u?T$w7Q%F^;!Wk?G z(le7r!ufT*cxS}PR6hIVtXa)i`d$-_1KkyBU>qmgz-=T};uxx&sKgv48akIWQ89F{ z0XiY?WM^~;|T8zBOr zs#zuOONzH?svv*jokd5SK8wG>+yMC)LYL|vLqm^PMHcT=`}V$=nIRHe2?h)8WQa6O zPAU}d`1y(>kZiP~Gr=mtJLMu`i<2CspL|q2DqAgAD^7*$xzM`PU4^ga`ilE134XBQ z99P(LhHU@7qvl9Yzg$M`+dlS=x^(m-_3t|h>S}E0bcFMn=C|KamQ)=w2^e)35p`zY zRV8X?d;s^>Cof2SPR&nP3E+-LCkS0J$H!eh8~k0qo$}00b=7!H_I2O+Ro@3O$nPdm ztmbOO^B+IHzQ5w>@@@J4cKw5&^_w6s!s=H%&byAbUtczPQ7}wfTqxxtQNfn*u73Qw zGuWsrky_ajPx-5`R<)6xHf>C(oqGf_Fw|-U*GfS?xLML$kv;h_pZ@Kk$y0X(S+K80 z6^|z)*`5VUkawg}=z`S;VhZhxyDfrE0$(PMurAxl~<>lfZa>JZ288ULK7D` zl9|#L^JL}Y$j*j`0-K6kH#?bRmg#5L3iB4Z)%iF@SqT+Lp|{i`m%R-|ZE94Np7Pa5 zCqC^V3}B(FR340pmF*qaa}M}+h6}mqE~7Sh!9bDv9YRT|>vBNAqv09zXHMlcuhKD| zcjjA(b*XCIwJ33?CB!+;{)vX@9xns_b-VO{i0y?}{!sdXj1GM8+$#v>W7nw;+O_9B z_{4L;C6ol?(?W0<6taGEn1^uG=?Q3i29sE`RfYCaV$3DKc_;?HsL?D_fSYg}SuO5U zOB_f4^vZ_x%o`5|C@9C5+o=mFy@au{s)sKw!UgC&L35aH(sgDxRE2De%(%OT=VUdN ziVLEmdOvJ&5*tCMKRyXctCwQu_RH%;m*$YK&m;jtbdH#Ak~13T1^f89tn`A%QEHWs~jnY~E}p_Z$XC z=?YXLCkzVSK+Id`xZYTegb@W8_baLt-Fq`Tv|=)JPbFsKRm)4UW;yT+J`<)%#ue9DPOkje)YF2fsCilK9MIIK>p*`fkoD5nGfmLwt)!KOT+> zOFq*VZktDDyM3P5UOg`~XL#cbzC}eL%qMB=Q5$d89MKuN#$6|4gx_Jt0Gfn8w&q}%lq4QU%6#jT*MRT% zrLz~C8FYKHawn-EQWN1B75O&quS+Z81(zN)G>~vN8VwC+e+y(`>HcxC{MrJ;H1Z4k zZWuv$w_F0-Ub%MVcpIc){4PGL^I7M{>;hS?;eH!;gmcOE66z3;Z1Phqo(t zVP(Hg6q#0gIKgsg7L7WE!{Y#1nI(45tx2{$34dDd#!Z0NIyrm)HOn5W#7;f4pQci# zDW!FI(g4e668kI9{2+mLwB+=#9bfqgX%!B34V-$wwSN(_cm*^{y0jQtv*4}eO^sOV z*9xoNvX)c9isB}Tgx&ZRjp3kwhTVK?r9;n!x>^XYT z@Q^7zp{rkIs{2mUSE^2!Gf6$6;j~&4=-0cSJJDizZp6LTe8b45;{AKM%v99}{{FfC zz709%u0mC=1KXTo(=TqmZQ;c?$M3z(!xah>aywrj40sc2y3rKFw4jCq+Y+u=CH@_V zxz|qeTwa>+<|H%8Dz5u>ZI5MmjTFwXS-Fv!TDd*`>3{krWoNVx$<133`(ftS?ZPyY z&4@ah^3^i`vL$BZa>O|Nt?ucewzsF)0zX3qmM^|waXr=T0pfIb0*$AwU=?Ipl|1Y; z*Pk6{C-p4MY;j@IJ|DW>QHZQJcp;Z~?8(Q+Kk3^0qJ}SCk^*n4W zu9ZFwLHUx-$6xvaQ)SUQcYd6fF8&x)V`1bIuX@>{mE$b|Yd(qomn3;bPwnDUc0F=; zh*6_((%bqAYQWQ~odER?h>1mkL4kpb3s7`0m@rDKGU*oyF)$j~Ffd4fXV$?`f~rHf zB%Y)@5SXZvfwm10RY5X?TEo)PK_`L6qgBp=#>fO49$D zDq8Ozj0q6213tV5Qq=;fZ0$|KroY{Dz=l@lU^J)?Ko@ti20TRplXzphBi>XGx4bou zEWrkNjz0t5j!_ke{g5I#PUlEU$Km8g8TE|XK=MkU@PT4T><2OVamoK;wJ}3X0L$vX zgd7gNa359*nc)R-0!`2X@FOTB`+oETOPc=ubp5R)VQgY+5BTZZJ2?9QwnO=dnulIUF3gFn;BODC2)65)HeVd%t86sL7Rv^Y+nbn+&l z6BAJY(ETvwI)Ts$aiE8rht4KD*qNyE{8{x6R|%akbTBzw;2+6Echkt+W+`u^XX z_z&x%n '} + 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/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 0000000..d86c01c --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=form 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() { + } + +} From ab96dd4cd0c7d47693d50c325e545250462226fe Mon Sep 17 00:00:00 2001 From: Gichan Kim <31515116+devchanki@users.noreply.github.com> Date: Sun, 21 Jul 2024 16:25:48 +0900 Subject: [PATCH 2/7] Create requirements.md MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 간단한 요구 사항 및 개발 전 구현해야 할 생각 정리 --- docs/requirements.md | 48 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 docs/requirements.md diff --git a/docs/requirements.md b/docs/requirements.md new file mode 100644 index 0000000..6ad84e5 --- /dev/null +++ b/docs/requirements.md @@ -0,0 +1,48 @@ +**구글 설문** +### 설문 +설문의 이름과 설문에 대한 간단한 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 +} +``` + +설문조사 생성 +- 설문조사 생성 시 설문 받을 항목의 형태에 따른 밸리데이션(형태에 따른 하위 항목에 대한 유효성, 선택리스트의 경우 해당 리스트가 포함 되었는지?), 기타 칼럼 길이에 대한 밸리데이션 정도 필요할 것. + +설문조사 수정 +- 설문조사 이름, 설명, 설문 받을 항목 +- 설문조사의 이름, 설명 등에 대한 버저닝은 미 진행 예정 +- 생성시와 같은 조건의 밸리데이션 +- 수정 API 발생할 때 마다, 수정된 모든 항목을 검사하여 변경 여부를 체크하기가 어려울 것으로 생각. + - 먼저 업데이트 시 매번 항목에 대한 버저닝을 업데이트 한 항목을 추가로 생성. + - 상기 로직은 단 한 개의 항목의 하위 항목이 변경 되어도 모든 항목에 대한 내용이 추가 복제되어 신규 버전으로 추가되는 것으로, 추후 결과 값을 통계 내거나 데이터를 추가 할 시 데이터의 수의 추가 + +설문조사 응답 제출 +- 항목 밸리데이션 + +설문조사 응답 조회 +- 설문조사 식별자 필요(설문 ID? 정도로 생각) From 3e62ed870244978635590414a1439b056496acfb Mon Sep 17 00:00:00 2001 From: devchanki Date: Sun, 21 Jul 2024 21:13:39 +0900 Subject: [PATCH 3/7] =?UTF-8?q?=ED=8F=BC=20=EC=83=9D=EC=84=B1=20API=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/chanki/form/domain/forms/Form.java | 41 ++++++++++++ .../chanki/form/domain/forms/FormItem.java | 61 +++++++++++++++++ .../chanki/form/domain/forms/FormItemId.java | 25 +++++++ .../form/domain/forms/FormItemOption.java | 55 ++++++++++++++++ .../form/domain/forms/FormItemOptionId.java | 28 ++++++++ .../forms/FormItemOptionRepository.java | 7 ++ .../form/domain/forms/FormItemRepository.java | 7 ++ .../form/domain/forms/FormItemType.java | 6 ++ .../form/domain/forms/FormRepository.java | 10 +++ .../form/web/controller/FormController.java | 23 +++++++ .../form/web/dto/FormCreateRequestDto.java | 34 ++++++++++ .../chanki/form/web/service/FormService.java | 66 +++++++++++++++++++ src/main/resources/application.properties | 2 + 13 files changed, 365 insertions(+) create mode 100644 src/main/java/com/chanki/form/domain/forms/Form.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItem.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemId.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemOption.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemOptionRepository.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemRepository.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemType.java create mode 100644 src/main/java/com/chanki/form/domain/forms/FormRepository.java create mode 100644 src/main/java/com/chanki/form/web/controller/FormController.java create mode 100644 src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java create mode 100644 src/main/java/com/chanki/form/web/service/FormService.java diff --git a/src/main/java/com/chanki/form/domain/forms/Form.java b/src/main/java/com/chanki/form/domain/forms/Form.java new file mode 100644 index 0000000..ed19986 --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/Form.java @@ -0,0 +1,41 @@ +package com.chanki.form.domain.forms; + +import java.util.List; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +@Entity +@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; + + @Transient + private List formItems; + + @Builder + public Form(String title, String description, List formItems) { + this.title = title; + this.description = description; + this.formItems = formItems; + } +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItem.java b/src/main/java/com/chanki/form/domain/forms/FormItem.java new file mode 100644 index 0000000..01a9ab0 --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItem.java @@ -0,0 +1,61 @@ +package com.chanki.form.domain.forms; + +import java.util.List; + +import jakarta.persistence.Column; +import jakarta.persistence.EmbeddedId; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import jakarta.persistence.IdClass; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.MapsId; +import jakarta.persistence.Table; +import jakarta.persistence.Transient; +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") + @JoinColumn(name = "form_id") + private long formId; + + @Id + private long version; + + @Id + private long sequence; + + @Column(length = 500) + private String description; + + private boolean required; + + @Enumerated(EnumType.STRING) + private FormItemType type; + + @Transient + private List formItemOptions; + + @Builder + public FormItem(long formId, long version, long sequence, String description, FormItemType type, List formItemOptions) { + this.formId = formId; + this.version = version; + this.sequence = sequence; + this.description = description; + this.type = type; + this.formItemOptions = formItemOptions; + } + +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemId.java b/src/main/java/com/chanki/form/domain/forms/FormItemId.java new file mode 100644 index 0000000..a3fdd05 --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItemId.java @@ -0,0 +1,25 @@ +package com.chanki.form.domain.forms; + +import java.io.Serializable; + +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@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/domain/forms/FormItemOption.java b/src/main/java/com/chanki/form/domain/forms/FormItemOption.java new file mode 100644 index 0000000..3cc8926 --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItemOption.java @@ -0,0 +1,55 @@ +package com.chanki.form.domain.forms; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +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 +@IdClass(FormItemOptionId.class) +@Table(name = "form_item_option") +@Entity +public class FormItemOption { + @Id + @Column(name = "form_id") + @JoinColumn(name = "form_id") + private long formId; + + @Id + private long version; + + @Id + private long sequence; + + @Id + @Column(name="option_sequence") + private long optionSequence; + + @Column(length = 500) + private String description; + + + @Enumerated(EnumType.STRING) + private FormItemType type; + + + @Builder + public FormItemOption(long formId, long version, long sequence, long optionSequence, String description, FormItemType type) { + this.formId = formId; + this.version = version; + this.sequence = sequence; + this.optionSequence = optionSequence; + this.description = description; + this.type = type; + } +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java b/src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java new file mode 100644 index 0000000..812f1f1 --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java @@ -0,0 +1,28 @@ +package com.chanki.form.domain.forms; + +import jakarta.persistence.Column; +import jakarta.persistence.Id; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@EqualsAndHashCode(onlyExplicitlyIncluded = true) +@NoArgsConstructor +public class FormItemOptionId { + @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/domain/forms/FormItemOptionRepository.java b/src/main/java/com/chanki/form/domain/forms/FormItemOptionRepository.java new file mode 100644 index 0000000..597b29d --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItemOptionRepository.java @@ -0,0 +1,7 @@ +package com.chanki.form.domain.forms; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FormItemOptionRepository extends JpaRepository { + +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemRepository.java b/src/main/java/com/chanki/form/domain/forms/FormItemRepository.java new file mode 100644 index 0000000..a4c10bd --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItemRepository.java @@ -0,0 +1,7 @@ +package com.chanki.form.domain.forms; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FormItemRepository extends JpaRepository { + +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemType.java b/src/main/java/com/chanki/form/domain/forms/FormItemType.java new file mode 100644 index 0000000..65699ba --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormItemType.java @@ -0,0 +1,6 @@ +package com.chanki.form.domain.forms; + +// 단답형, 장문형, 단일선택리스트, 다중선택리스트 +public enum FormItemType { + TEXT, LONGTEXT, RADIO, CHECKBOX +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormRepository.java b/src/main/java/com/chanki/form/domain/forms/FormRepository.java new file mode 100644 index 0000000..187ae3d --- /dev/null +++ b/src/main/java/com/chanki/form/domain/forms/FormRepository.java @@ -0,0 +1,10 @@ +package com.chanki.form.domain.forms; + +import org.springframework.data.jpa.repository.JpaRepository; + +import jakarta.persistence.EntityManager; + + +public interface FormRepository extends JpaRepository { + +} 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..ec7225e --- /dev/null +++ b/src/main/java/com/chanki/form/web/controller/FormController.java @@ -0,0 +1,23 @@ +package com.chanki.form.web.controller; + +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +import com.chanki.form.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); + } +} \ No newline at end of file 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..5cac76b --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java @@ -0,0 +1,34 @@ +package com.chanki.form.web.dto; + +import java.util.List; + +import com.chanki.form.domain.forms.FormItem; +import com.chanki.form.domain.forms.Form; + +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; + +@Getter +@NoArgsConstructor +@ToString +public class FormCreateRequestDto { + private String title; + private String description; + private List formItems; + + @Builder + public FormCreateRequestDto(String title, String description, List formItems) { + this.title = title; + this.description = description; + this.formItems = formItems; + } + + public Form toEntity() { + return Form.builder() + .title(title) + .description(description) + .build(); + } +} 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..ce22aa5 --- /dev/null +++ b/src/main/java/com/chanki/form/web/service/FormService.java @@ -0,0 +1,66 @@ +package com.chanki.form.web.service; + +import java.util.ArrayList; +import java.util.List; +import java.util.concurrent.atomic.AtomicInteger; +import java.util.stream.Collectors; + +import org.springframework.stereotype.Service; + +import com.chanki.form.domain.forms.Form; +import com.chanki.form.domain.forms.FormItem; +import com.chanki.form.domain.forms.FormItemOption; +import com.chanki.form.domain.forms.FormItemOptionRepository; +import com.chanki.form.domain.forms.FormItemRepository; +import com.chanki.form.domain.forms.FormRepository; +import com.chanki.form.web.dto.FormCreateRequestDto; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; + +// ## TODO 식별관계로 만들어, 뭔가 복잡한거 같은데.. +// ## TODO 비식별관계로 변경해야 하는지... + +@RequiredArgsConstructor +@Service +public class FormService { + private final FormRepository formRepository; + private final FormItemRepository formItemRepository; + private final FormItemOptionRepository formItemOptionRepository; + + public List getListWithSetParentItemInfo(FormItem formItem, List formItemOptions) { + long formId = formItem.getFormId(); + long version = formItem.getVersion(); + long sequence = formItem.getSequence(); + + // ## TODO 없을 시 예외처리 했지만, 해당 로직 먼저 validation 로직 처리 할 수 있게 처리 + if(formItemOptions == null) return new ArrayList<>(); + + // ## TODO Setter 를 사용시 어디서 값이 변경되는지 알기 어려울거 같아 안 쓰면서 개발중인데, 이게 맞는건지 모르겠다. + AtomicInteger index = new AtomicInteger(); + return formItemOptions.stream() + .map(option -> FormItemOption.builder().formId(formId).version(version).sequence(sequence).optionSequence(index.getAndIncrement()).description(option.getDescription()).build()).collect(Collectors.toList()); + } + + + @Transactional + public Form createForm(FormCreateRequestDto formCreateRequestDto) { + System.out.println(formCreateRequestDto); + Form form = Form.builder() + .description(formCreateRequestDto.getDescription()) + .title(formCreateRequestDto.getTitle()).build(); + + Form insertedForm = formRepository.save(form); + List formItems = formCreateRequestDto.getFormItems(); + + // ## TODO 수정 - 다른 방식 조사 / 수정 + for(int i = 0; i < formItems.size(); i++) { + FormItem formItem = formItems.get(i); + FormItem inserted = formItemRepository.save(FormItem.builder().formId(insertedForm.getFormID()).version(1L).sequence(i + 1).description(formItem.getDescription()).type(formItem.getType()).build()); + List formItemOptions = this.getListWithSetParentItemInfo(inserted, formItem.getFormItemOptions()); + formItemOptionRepository.saveAll(formItemOptions); + } + + return insertedForm; + } +} diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index d86c01c..0337845 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1 +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 From bb3fc64001edd5131afd1f37fc84e528393066d5 Mon Sep 17 00:00:00 2001 From: devchanki Date: Mon, 22 Jul 2024 08:54:06 +0900 Subject: [PATCH 4/7] =?UTF-8?q?=EC=95=88=EC=93=B0=EB=8A=94=20=EC=B9=BC?= =?UTF-8?q?=EB=9F=BC=20=EC=A0=9C=EA=B1=B0,=20=EC=97=94=ED=8B=B0=ED=8B=B0?= =?UTF-8?q?=20=EB=82=B4=EC=97=90=20=EC=97=B0=EA=B2=B0=EA=B4=80=EA=B3=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chanki/form/domain/forms/Form.java | 12 ++++++++++-- .../com/chanki/form/domain/forms/FormItem.java | 17 ++++++++++++----- .../form/domain/forms/FormItemOption.java | 8 ++------ .../form/domain/forms/FormRepository.java | 4 ++-- .../form/web/controller/FormController.java | 7 +++++++ .../chanki/form/web/service/FormService.java | 15 ++++++++++++--- 6 files changed, 45 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/chanki/form/domain/forms/Form.java b/src/main/java/com/chanki/form/domain/forms/Form.java index ed19986..b9140dd 100644 --- a/src/main/java/com/chanki/form/domain/forms/Form.java +++ b/src/main/java/com/chanki/form/domain/forms/Form.java @@ -2,17 +2,24 @@ import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +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 jakarta.persistence.Transient; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.ToString; +@ToString @Getter @NoArgsConstructor @Entity @@ -29,7 +36,8 @@ public class Form { @Column(length = 500, nullable = false) private String description; - @Transient + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name="form_id", referencedColumnName = "form_id") private List formItems; @Builder diff --git a/src/main/java/com/chanki/form/domain/forms/FormItem.java b/src/main/java/com/chanki/form/domain/forms/FormItem.java index 01a9ab0..a7d309e 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormItem.java +++ b/src/main/java/com/chanki/form/domain/forms/FormItem.java @@ -2,18 +2,20 @@ import java.util.List; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +import jakarta.persistence.CascadeType; import jakarta.persistence.Column; -import jakarta.persistence.EmbeddedId; 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.ManyToOne; -import jakarta.persistence.MapsId; +import jakarta.persistence.JoinColumns; +import jakarta.persistence.OneToMany; import jakarta.persistence.Table; -import jakarta.persistence.Transient; import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @@ -45,7 +47,12 @@ public class FormItem { @Enumerated(EnumType.STRING) private FormItemType type; - @Transient + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumns({ + @JoinColumn(name = "form_id", referencedColumnName = "form_id"), + @JoinColumn(name = "version", referencedColumnName = "version"), + @JoinColumn(name = "sequence", referencedColumnName = "sequence") + }) private List formItemOptions; @Builder diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemOption.java b/src/main/java/com/chanki/form/domain/forms/FormItemOption.java index 3cc8926..008880c 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormItemOption.java +++ b/src/main/java/com/chanki/form/domain/forms/FormItemOption.java @@ -26,9 +26,11 @@ public class FormItemOption { private long formId; @Id + @JoinColumn(name = "version") private long version; @Id + @JoinColumn(name = "sequence") private long sequence; @Id @@ -38,11 +40,6 @@ public class FormItemOption { @Column(length = 500) private String description; - - @Enumerated(EnumType.STRING) - private FormItemType type; - - @Builder public FormItemOption(long formId, long version, long sequence, long optionSequence, String description, FormItemType type) { this.formId = formId; @@ -50,6 +47,5 @@ public FormItemOption(long formId, long version, long sequence, long optionSeque this.sequence = sequence; this.optionSequence = optionSequence; this.description = description; - this.type = type; } } diff --git a/src/main/java/com/chanki/form/domain/forms/FormRepository.java b/src/main/java/com/chanki/form/domain/forms/FormRepository.java index 187ae3d..22319ed 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormRepository.java +++ b/src/main/java/com/chanki/form/domain/forms/FormRepository.java @@ -1,8 +1,8 @@ package com.chanki.form.domain.forms; -import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; -import jakarta.persistence.EntityManager; +import org.springframework.data.jpa.repository.JpaRepository; public interface FormRepository extends JpaRepository { diff --git a/src/main/java/com/chanki/form/web/controller/FormController.java b/src/main/java/com/chanki/form/web/controller/FormController.java index ec7225e..5b398fc 100644 --- a/src/main/java/com/chanki/form/web/controller/FormController.java +++ b/src/main/java/com/chanki/form/web/controller/FormController.java @@ -1,5 +1,7 @@ package com.chanki.form.web.controller; +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.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -20,4 +22,9 @@ public class FormController { 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); + } } \ No newline at end of file diff --git a/src/main/java/com/chanki/form/web/service/FormService.java b/src/main/java/com/chanki/form/web/service/FormService.java index ce22aa5..7016929 100644 --- a/src/main/java/com/chanki/form/web/service/FormService.java +++ b/src/main/java/com/chanki/form/web/service/FormService.java @@ -2,7 +2,9 @@ import java.util.ArrayList; import java.util.List; +import java.util.Optional; import java.util.concurrent.atomic.AtomicInteger; +import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; import org.springframework.stereotype.Service; @@ -37,15 +39,14 @@ public List getListWithSetParentItemInfo(FormItem formItem, List if(formItemOptions == null) return new ArrayList<>(); // ## TODO Setter 를 사용시 어디서 값이 변경되는지 알기 어려울거 같아 안 쓰면서 개발중인데, 이게 맞는건지 모르겠다. - AtomicInteger index = new AtomicInteger(); + AtomicLong index = new AtomicLong(); return formItemOptions.stream() - .map(option -> FormItemOption.builder().formId(formId).version(version).sequence(sequence).optionSequence(index.getAndIncrement()).description(option.getDescription()).build()).collect(Collectors.toList()); + .map(option -> FormItemOption.builder().formId(formId).version(version).sequence(sequence).optionSequence(index.getAndIncrement() + 1).description(option.getDescription()).build()).collect(Collectors.toList()); } @Transactional public Form createForm(FormCreateRequestDto formCreateRequestDto) { - System.out.println(formCreateRequestDto); Form form = Form.builder() .description(formCreateRequestDto.getDescription()) .title(formCreateRequestDto.getTitle()).build(); @@ -63,4 +64,12 @@ public Form createForm(FormCreateRequestDto formCreateRequestDto) { return insertedForm; } + + // ##TODO 전체 FORM 형태 조회 테스트를 위한 Service(추후 제거) + @Transactional + public Form selectForm(long formId) { + Optional
form = formRepository.findById(formId); + Form form1 = form.get(); + return form1; + } } From c61776f090140f84d9febd2719cc4a3561f765a4 Mon Sep 17 00:00:00 2001 From: devchanki Date: Mon, 22 Jul 2024 23:29:27 +0900 Subject: [PATCH 5/7] =?UTF-8?q?=ED=95=84=EC=9A=94=EC=97=86=EB=8A=94=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=9C=EA=B1=B0,=20Code=20Formatting,?= =?UTF-8?q?=20DTO=20=ED=98=95=ED=83=9C=20=EB=A7=8C=EB=93=A4=EC=96=B4=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=8F=B4=EB=8D=94=20=EA=B5=AC=EC=A1=B0?= =?UTF-8?q?=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/requirements.md | 8 +- docs/retrospect.md | 17 +++ .../com/chanki/form/domain/forms/Form.java | 49 ------- .../chanki/form/domain/forms/FormItem.java | 68 --------- .../form/domain/forms/FormItemOption.java | 51 ------- .../form/domain/forms/FormItemOptionId.java | 28 ---- .../form/domain/forms/FormItemRepository.java | 7 - .../form/web/controller/FormController.java | 33 +++-- .../chanki/form/web/domain/forms/Form.java | 48 ++++++ .../form/web/domain/forms/FormItem.java | 68 +++++++++ .../{ => web}/domain/forms/FormItemId.java | 29 ++-- .../form/web/domain/forms/FormItemOption.java | 51 +++++++ .../web/domain/forms/FormItemOptionId.java | 29 ++++ .../forms/FormItemOptionRepository.java | 2 +- .../web/domain/forms/FormItemRepository.java | 11 ++ .../{ => web}/domain/forms/FormItemType.java | 4 +- .../domain/forms/FormRepository.java | 5 +- .../form/web/dto/FormCreateRequestDto.java | 28 +--- .../form/web/dto/FormEditRequestDto.java | 17 +++ .../web/dto/FormItemCreateRequestDto.java | 21 +++ .../dto/FormItemOptionCreateRequestDto.java | 12 ++ .../chanki/form/web/service/FormService.java | 138 +++++++++++------- 22 files changed, 411 insertions(+), 313 deletions(-) create mode 100644 docs/retrospect.md delete mode 100644 src/main/java/com/chanki/form/domain/forms/Form.java delete mode 100644 src/main/java/com/chanki/form/domain/forms/FormItem.java delete mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemOption.java delete mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java delete mode 100644 src/main/java/com/chanki/form/domain/forms/FormItemRepository.java create mode 100644 src/main/java/com/chanki/form/web/domain/forms/Form.java create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormItem.java rename src/main/java/com/chanki/form/{ => web}/domain/forms/FormItemId.java (50%) create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java rename src/main/java/com/chanki/form/{ => web}/domain/forms/FormItemOptionRepository.java (79%) create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java rename src/main/java/com/chanki/form/{ => web}/domain/forms/FormItemType.java (56%) rename src/main/java/com/chanki/form/{ => web}/domain/forms/FormRepository.java (66%) create mode 100644 src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java create mode 100644 src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java create mode 100644 src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java diff --git a/docs/requirements.md b/docs/requirements.md index 6ad84e5..3c936ab 100644 --- a/docs/requirements.md +++ b/docs/requirements.md @@ -32,17 +32,21 @@ public enum FormItemType { 설문조사 생성 - 설문조사 생성 시 설문 받을 항목의 형태에 따른 밸리데이션(형태에 따른 하위 항목에 대한 유효성, 선택리스트의 경우 해당 리스트가 포함 되었는지?), 기타 칼럼 길이에 대한 밸리데이션 정도 필요할 것. +- 하위 항목에 대한 유효성 검사 + - 롱텍스트(500자 제한), 텍스트(500자 제한(?)), 단일,다중 선택지의 경우 선택지의 유무 체크 정도 진행. 설문조사 수정 - 설문조사 이름, 설명, 설문 받을 항목 -- 설문조사의 이름, 설명 등에 대한 버저닝은 미 진행 예정 +- 설문조사의 이름, 설명 등에 대한 버저닝은 미 진행 예정, 설문조사 이름, 설명등은 과거 기록이 사라짐. - 생성시와 같은 조건의 밸리데이션 - 수정 API 발생할 때 마다, 수정된 모든 항목을 검사하여 변경 여부를 체크하기가 어려울 것으로 생각. - 먼저 업데이트 시 매번 항목에 대한 버저닝을 업데이트 한 항목을 추가로 생성. - - 상기 로직은 단 한 개의 항목의 하위 항목이 변경 되어도 모든 항목에 대한 내용이 추가 복제되어 신규 버전으로 추가되는 것으로, 추후 결과 값을 통계 내거나 데이터를 추가 할 시 데이터의 수의 추가 + - 상기 로직은 단 한 개의 항목의 하위 항목이 변경 되어도 모든 항목에 대한 내용이 추가 복제되어 신규 버전으로 추가되는 것으로, 추후 결과 값을 통계 내거나 데이터를 추가 할 시 데이터의 수의 추가 설문조사 응답 제출 - 항목 밸리데이션 +- 응답 중 수정중인 사람은, 과거 버전과 현재 버전의 응답이 혼재. +- But 수정되었다고 기존 것이 안들어 가면 다 작성 한 설문값을 날리게 됨. 설문조사 응답 조회 - 설문조사 식별자 필요(설문 ID? 정도로 생각) diff --git a/docs/retrospect.md b/docs/retrospect.md new file mode 100644 index 0000000..8ad6865 --- /dev/null +++ b/docs/retrospect.md @@ -0,0 +1,17 @@ +## TODO +DTO Validation 라이브러리 찾아보기 + +DTO 내에서 모델을 가져다 쓰는 부분은 제거, 코드 재사용 성을 위해 DTO? 를 대신할 수 있는 방법을 찾아보자. + +이대로 가면 DTO가 수백개가 되겠다!! + +자바의 폴더 구조 Common Case 조사해보자 + +JPA학습. +Optional Keyword 확인 + +Response 형태를 data, status 형태로만 단순히 일치할 수 있게 수정해보자. + +기능 구현 후 개선 해보자! + +식별 관계가 JPA 랑 좀 안맞나? \ No newline at end of file diff --git a/src/main/java/com/chanki/form/domain/forms/Form.java b/src/main/java/com/chanki/form/domain/forms/Form.java deleted file mode 100644 index b9140dd..0000000 --- a/src/main/java/com/chanki/form/domain/forms/Form.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.chanki.form.domain.forms; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -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; - -@ToString -@Getter -@NoArgsConstructor -@Entity -@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; - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumn(name="form_id", referencedColumnName = "form_id") - private List formItems; - - @Builder - public Form(String title, String description, List formItems) { - this.title = title; - this.description = description; - this.formItems = formItems; - } -} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItem.java b/src/main/java/com/chanki/form/domain/forms/FormItem.java deleted file mode 100644 index a7d309e..0000000 --- a/src/main/java/com/chanki/form/domain/forms/FormItem.java +++ /dev/null @@ -1,68 +0,0 @@ -package com.chanki.form.domain.forms; - -import java.util.List; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -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") - @JoinColumn(name = "form_id") - private long formId; - - @Id - private long version; - - @Id - private long sequence; - - @Column(length = 500) - private String description; - - private boolean required; - - @Enumerated(EnumType.STRING) - private FormItemType type; - - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumns({ - @JoinColumn(name = "form_id", referencedColumnName = "form_id"), - @JoinColumn(name = "version", referencedColumnName = "version"), - @JoinColumn(name = "sequence", referencedColumnName = "sequence") - }) - private List formItemOptions; - - @Builder - public FormItem(long formId, long version, long sequence, String description, FormItemType type, List formItemOptions) { - this.formId = formId; - this.version = version; - this.sequence = sequence; - this.description = description; - this.type = type; - this.formItemOptions = formItemOptions; - } - -} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemOption.java b/src/main/java/com/chanki/form/domain/forms/FormItemOption.java deleted file mode 100644 index 008880c..0000000 --- a/src/main/java/com/chanki/form/domain/forms/FormItemOption.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.chanki.form.domain.forms; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -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 -@IdClass(FormItemOptionId.class) -@Table(name = "form_item_option") -@Entity -public class FormItemOption { - @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="option_sequence") - private long optionSequence; - - @Column(length = 500) - private String description; - - @Builder - public FormItemOption(long formId, long version, long sequence, long optionSequence, String description, FormItemType type) { - this.formId = formId; - this.version = version; - this.sequence = sequence; - this.optionSequence = optionSequence; - this.description = description; - } -} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java b/src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java deleted file mode 100644 index 812f1f1..0000000 --- a/src/main/java/com/chanki/form/domain/forms/FormItemOptionId.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.chanki.form.domain.forms; - -import jakarta.persistence.Column; -import jakarta.persistence.Id; -import lombok.EqualsAndHashCode; -import lombok.NoArgsConstructor; - -@EqualsAndHashCode(onlyExplicitlyIncluded = true) -@NoArgsConstructor -public class FormItemOptionId { - @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/domain/forms/FormItemRepository.java b/src/main/java/com/chanki/form/domain/forms/FormItemRepository.java deleted file mode 100644 index a4c10bd..0000000 --- a/src/main/java/com/chanki/form/domain/forms/FormItemRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.chanki.form.domain.forms; - -import org.springframework.data.jpa.repository.JpaRepository; - -public interface FormItemRepository extends JpaRepository { - -} diff --git a/src/main/java/com/chanki/form/web/controller/FormController.java b/src/main/java/com/chanki/form/web/controller/FormController.java index 5b398fc..3d3fdd2 100644 --- a/src/main/java/com/chanki/form/web/controller/FormController.java +++ b/src/main/java/com/chanki/form/web/controller/FormController.java @@ -1,12 +1,14 @@ package com.chanki.form.web.controller; +import com.chanki.form.web.dto.FormEditRequestDto; 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.domain.forms.Form; +import com.chanki.form.web.domain.forms.Form; import com.chanki.form.web.dto.FormCreateRequestDto; import com.chanki.form.web.service.FormService; @@ -15,16 +17,21 @@ @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); - } + + 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); + } } \ 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..c09474d --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/Form.java @@ -0,0 +1,48 @@ +package com.chanki.form.web.domain.forms; + +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; + +@ToString +@Getter +@NoArgsConstructor +@Entity +@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; + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumn(name = "form_id", referencedColumnName = "form_id") + private List formItems; + + @Builder + public Form(String title, String description, List formItems) { + this.title = title; + this.description = description; + this.formItems = formItems; + } +} 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..abecb5e --- /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 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") + @JoinColumn(name = "form_id") + private long formId; + + @Id + private long version; + + @Id + private long sequence; + + @Column(length = 500) + private String description; + + private boolean required; + + @Enumerated(EnumType.STRING) + private FormItemType type; + + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) + @JoinColumns({ + @JoinColumn(name = "form_id", referencedColumnName = "form_id"), + @JoinColumn(name = "version", referencedColumnName = "version"), + @JoinColumn(name = "sequence", referencedColumnName = "sequence") + }) + private List formItemOptions; + + @Builder + public FormItem(long formId, long version, long sequence, String description, FormItemType type, + List formItemOptions) { + this.formId = formId; + this.version = version; + this.sequence = sequence; + this.description = description; + this.type = type; + this.formItemOptions = formItemOptions; + } + +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemId.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java similarity index 50% rename from src/main/java/com/chanki/form/domain/forms/FormItemId.java rename to src/main/java/com/chanki/form/web/domain/forms/FormItemId.java index a3fdd05..f7aef52 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormItemId.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java @@ -1,4 +1,4 @@ -package com.chanki.form.domain.forms; +package com.chanki.form.web.domain.forms; import java.io.Serializable; @@ -6,20 +6,23 @@ import jakarta.persistence.Id; import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; +import lombok.ToString; +@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; + + @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..4828aac --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java @@ -0,0 +1,51 @@ +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 +@IdClass(FormItemOptionId.class) +@Table(name = "form_item_option") +@Entity +public class FormItemOption { + + @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 = "option_sequence") + private long optionSequence; + + @Column(length = 500) + private String description; + + @Builder + public FormItemOption(long formId, long version, long sequence, long optionSequence, + String description, FormItemType type) { + this.formId = formId; + this.version = version; + this.sequence = sequence; + 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..2fb802b --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java @@ -0,0 +1,29 @@ +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 FormItemOptionId { + + @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/domain/forms/FormItemOptionRepository.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionRepository.java similarity index 79% rename from src/main/java/com/chanki/form/domain/forms/FormItemOptionRepository.java rename to src/main/java/com/chanki/form/web/domain/forms/FormItemOptionRepository.java index 597b29d..0cb3c39 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormItemOptionRepository.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionRepository.java @@ -1,4 +1,4 @@ -package com.chanki.form.domain.forms; +package com.chanki.form.web.domain.forms; import org.springframework.data.jpa.repository.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..862d03b --- /dev/null +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java @@ -0,0 +1,11 @@ +package com.chanki.form.web.domain.forms; + +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); +} diff --git a/src/main/java/com/chanki/form/domain/forms/FormItemType.java b/src/main/java/com/chanki/form/web/domain/forms/FormItemType.java similarity index 56% rename from src/main/java/com/chanki/form/domain/forms/FormItemType.java rename to src/main/java/com/chanki/form/web/domain/forms/FormItemType.java index 65699ba..1bf1eb8 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormItemType.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemType.java @@ -1,6 +1,6 @@ -package com.chanki.form.domain.forms; +package com.chanki.form.web.domain.forms; // 단답형, 장문형, 단일선택리스트, 다중선택리스트 public enum FormItemType { - TEXT, LONGTEXT, RADIO, CHECKBOX + TEXT, LONGTEXT, RADIO, CHECKBOX } diff --git a/src/main/java/com/chanki/form/domain/forms/FormRepository.java b/src/main/java/com/chanki/form/web/domain/forms/FormRepository.java similarity index 66% rename from src/main/java/com/chanki/form/domain/forms/FormRepository.java rename to src/main/java/com/chanki/form/web/domain/forms/FormRepository.java index 22319ed..a0d224f 100644 --- a/src/main/java/com/chanki/form/domain/forms/FormRepository.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormRepository.java @@ -1,10 +1,7 @@ -package com.chanki.form.domain.forms; - -import java.util.Optional; +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/dto/FormCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java index 5cac76b..5ca375c 100644 --- a/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java @@ -2,33 +2,17 @@ import java.util.List; -import com.chanki.form.domain.forms.FormItem; -import com.chanki.form.domain.forms.Form; +import com.chanki.form.web.domain.forms.FormItem; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.ToString; @Getter @NoArgsConstructor -@ToString public class FormCreateRequestDto { - private String title; - private String description; - private List formItems; - - @Builder - public FormCreateRequestDto(String title, String description, List formItems) { - this.title = title; - this.description = description; - this.formItems = formItems; - } - - public Form toEntity() { - return Form.builder() - .title(title) - .description(description) - .build(); - } + + private String title; + private String description; + private List formItems; + } 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..b5d1f7b --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java @@ -0,0 +1,17 @@ +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..92a4d52 --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java @@ -0,0 +1,21 @@ +package com.chanki.form.web.dto; + +import com.chanki.form.web.domain.forms.FormItemType; +import jakarta.persistence.Column; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.Id; +import java.util.List; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class FormItemCreateRequestDto { + + private long sequence; + private String description; + private boolean required; + private FormItemType type; + private List formItemOptions; +} 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..ee17656 --- /dev/null +++ b/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java @@ -0,0 +1,12 @@ +package com.chanki.form.web.dto; + +import jakarta.persistence.Column; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor +public class FormItemOptionCreateRequestDto { + + private String description; +} diff --git a/src/main/java/com/chanki/form/web/service/FormService.java b/src/main/java/com/chanki/form/web/service/FormService.java index 7016929..b6867dd 100644 --- a/src/main/java/com/chanki/form/web/service/FormService.java +++ b/src/main/java/com/chanki/form/web/service/FormService.java @@ -1,22 +1,25 @@ package com.chanki.form.web.service; +import com.chanki.form.web.dto.FormEditRequestDto; +import com.chanki.form.web.dto.FormItemCreateRequestDto; +import com.chanki.form.web.dto.FormItemOptionCreateRequestDto; import java.util.ArrayList; import java.util.List; import java.util.Optional; -import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; import java.util.stream.Collectors; import org.springframework.stereotype.Service; -import com.chanki.form.domain.forms.Form; -import com.chanki.form.domain.forms.FormItem; -import com.chanki.form.domain.forms.FormItemOption; -import com.chanki.form.domain.forms.FormItemOptionRepository; -import com.chanki.form.domain.forms.FormItemRepository; -import com.chanki.form.domain.forms.FormRepository; +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.dto.FormCreateRequestDto; +import jakarta.persistence.EntityNotFoundException; import jakarta.transaction.Transactional; import lombok.RequiredArgsConstructor; @@ -26,50 +29,79 @@ @RequiredArgsConstructor @Service public class FormService { - private final FormRepository formRepository; - private final FormItemRepository formItemRepository; - private final FormItemOptionRepository formItemOptionRepository; - - public List getListWithSetParentItemInfo(FormItem formItem, List formItemOptions) { - long formId = formItem.getFormId(); - long version = formItem.getVersion(); - long sequence = formItem.getSequence(); - - // ## TODO 없을 시 예외처리 했지만, 해당 로직 먼저 validation 로직 처리 할 수 있게 처리 - if(formItemOptions == null) return new ArrayList<>(); - - // ## TODO Setter 를 사용시 어디서 값이 변경되는지 알기 어려울거 같아 안 쓰면서 개발중인데, 이게 맞는건지 모르겠다. - AtomicLong index = new AtomicLong(); - return formItemOptions.stream() - .map(option -> FormItemOption.builder().formId(formId).version(version).sequence(sequence).optionSequence(index.getAndIncrement() + 1).description(option.getDescription()).build()).collect(Collectors.toList()); - } - - - @Transactional - public Form createForm(FormCreateRequestDto formCreateRequestDto) { - Form form = Form.builder() - .description(formCreateRequestDto.getDescription()) - .title(formCreateRequestDto.getTitle()).build(); - - Form insertedForm = formRepository.save(form); - List formItems = formCreateRequestDto.getFormItems(); - - // ## TODO 수정 - 다른 방식 조사 / 수정 - for(int i = 0; i < formItems.size(); i++) { - FormItem formItem = formItems.get(i); - FormItem inserted = formItemRepository.save(FormItem.builder().formId(insertedForm.getFormID()).version(1L).sequence(i + 1).description(formItem.getDescription()).type(formItem.getType()).build()); - List formItemOptions = this.getListWithSetParentItemInfo(inserted, formItem.getFormItemOptions()); - formItemOptionRepository.saveAll(formItemOptions); - } - - return insertedForm; - } - - // ##TODO 전체 FORM 형태 조회 테스트를 위한 Service(추후 제거) - @Transactional - public Form selectForm(long formId) { - Optional form = formRepository.findById(formId); - Form form1 = form.get(); - return form1; - } + + private final FormRepository formRepository; + private final FormItemRepository formItemRepository; + private final FormItemOptionRepository formItemOptionRepository; + + public List getListWithSetParentItemInfo(FormItem formItem, + List formItemOptions) { + long formId = formItem.getFormId(); + long version = formItem.getVersion(); + long sequence = formItem.getSequence(); + + // ## TODO 없을 시 예외처리 했지만, 해당 로직 먼저 validation 로직 처리 할 수 있게 처리 + if (formItemOptions == null) { + return new ArrayList<>(); + } + + AtomicLong index = new AtomicLong(); + return formItemOptions.stream() + .map(option -> FormItemOption.builder().formId(formId).version(version).sequence(sequence) + .optionSequence(index.getAndIncrement() + 1).description(option.getDescription()) + .build()).collect(Collectors.toList()); + } + + @Transactional + public Form createForm(FormCreateRequestDto formCreateRequestDto) { + Form form = Form.builder() + .description(formCreateRequestDto.getDescription()) + .title(formCreateRequestDto.getTitle()).build(); + + Form insertedForm = formRepository.save(form); + List formItems = formCreateRequestDto.getFormItems(); + + for (int i = 0; i < formItems.size(); i++) { + FormItemCreateRequestDto formItem = formItems.get(i); + FormItem inserted = formItemRepository.save( + FormItem.builder().formId(insertedForm.getFormID()).version(1L).sequence(i + 1) + .description(formItem.getDescription()).type(formItem.getType()).build()); + List formItemOptions = this.getListWithSetParentItemInfo(inserted, + formItem.getFormItemOptions()); + formItemOptionRepository.saveAll(formItemOptions); + } + + return insertedForm; + } + + @Transactional + public long editForm(FormEditRequestDto formEditRequestDto) { + Form form = formRepository.findById(formEditRequestDto.getFormId()) + .orElseThrow(() -> new IllegalArgumentException("NO_FORM")); + + // ## TODO 폼 수정 시 설명과 제목 업데이트 해줘야 함. + long nextVersion = formItemRepository.findNextVersion(form.getFormID()); + + List formItems = formEditRequestDto.getFormItems(); + + // ## TODO 수정 - 다른 방식 조사 / 수정 + for (int i = 0; i < formItems.size(); i++) { + FormItemCreateRequestDto formItem = formItems.get(i); + FormItem inserted = formItemRepository.save( + FormItem.builder().formId(formEditRequestDto.getFormId()).version(nextVersion) + .sequence(i + 1).description(formItem.getDescription()).type(formItem.getType()) + .build()); + List formItemOptions = this.getListWithSetParentItemInfo(inserted, + formItem.getFormItemOptions()); + formItemOptionRepository.saveAll(formItemOptions); + } + + return form.getFormID(); + } + + // ##TODO 전체 FORM 형태 조회 테스트를 위한 Service(추후 제거) + public Form selectForm(long formId) { + Optional form = formRepository.findById(formId); + return form.get(); + } } From c234cc3f6a01bd46285c82cd1859bb4b372d6d6d Mon Sep 17 00:00:00 2001 From: devchanki Date: Tue, 23 Jul 2024 23:51:19 +0900 Subject: [PATCH 6/7] =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EB=B6=80=EB=B6=84=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EA=B0=9C=EC=84=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../form/web/domain/forms/FormItem.java | 4 +- .../form/web/dto/FormCreateRequestDto.java | 14 ++++ .../form/web/dto/FormEditRequestDto.java | 1 - .../web/dto/FormItemCreateRequestDto.java | 28 +++++-- .../dto/FormItemOptionCreateRequestDto.java | 14 ++++ .../chanki/form/web/dto/FormSubmitDto.java | 0 .../chanki/form/web/service/FormService.java | 73 +++++++------------ 7 files changed, 78 insertions(+), 56 deletions(-) create mode 100644 src/main/java/com/chanki/form/web/dto/FormSubmitDto.java 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 index abecb5e..5501a1b 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/FormItem.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItem.java @@ -55,11 +55,11 @@ public class FormItem { private List formItemOptions; @Builder - public FormItem(long formId, long version, long sequence, String description, FormItemType type, - List formItemOptions) { + public FormItem(long formId, long version, long sequence, boolean required, String description, FormItemType type, List formItemOptions) { this.formId = formId; this.version = version; this.sequence = sequence; + this.required = required; this.description = description; this.type = type; this.formItemOptions = formItemOptions; diff --git a/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java index 5ca375c..eb92337 100644 --- a/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java @@ -1,5 +1,6 @@ package com.chanki.form.web.dto; +import com.chanki.form.web.domain.forms.Form; import java.util.List; import com.chanki.form.web.domain.forms.FormItem; @@ -15,4 +16,17 @@ public class FormCreateRequestDto { private String description; private List formItems; + public List getFormItemList(long formId, long version, long sequence) { + return this.formItems + .stream() + .map(formItem -> formItem.toEntity(formId, version, sequence)) + .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 index b5d1f7b..16a0dcb 100644 --- a/src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormEditRequestDto.java @@ -9,7 +9,6 @@ @NoArgsConstructor @ToString public class FormEditRequestDto { - private long formId; private String title; private String description; diff --git a/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java index 92a4d52..767161e 100644 --- a/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java @@ -1,11 +1,12 @@ 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.FormItemType; -import jakarta.persistence.Column; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import jakarta.persistence.Id; +import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import java.util.concurrent.atomic.AtomicLong; import lombok.Getter; import lombok.NoArgsConstructor; @@ -13,9 +14,26 @@ @NoArgsConstructor public class FormItemCreateRequestDto { - private long sequence; private String description; private boolean required; private FormItemType type; private List formItemOptions; + + public FormItem toEntity(long formId, long version, long sequence) { + AtomicLong atomicLong = new AtomicLong(); + + List formItemOptions = Optional.ofNullable(this.formItemOptions).orElseGet(ArrayList::new).stream() + .map(option -> option.toEntity(formId, version, sequence, atomicLong.incrementAndGet())) + .toList(); + + return FormItem.builder() + .formId(formId) + .version(version) + .sequence(sequence) + .description(this.description) + .type(this.type) + .formItemOptions(formItemOptions) + .required(this.required) + .build(); + } } diff --git a/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java index ee17656..d0fa39f 100644 --- a/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java @@ -1,6 +1,9 @@ package com.chanki.form.web.dto; +import com.chanki.form.web.domain.forms.FormItemOption; import jakarta.persistence.Column; +import java.util.List; +import java.util.concurrent.atomic.AtomicLong; import lombok.Getter; import lombok.NoArgsConstructor; @@ -9,4 +12,15 @@ public class FormItemOptionCreateRequestDto { private String description; + + public FormItemOption toEntity(long formId, long version, long sequence, long optionSequence) { + return FormItemOption.builder() + .formId(formId) + .version(version) + .sequence(sequence) + .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..e69de29 diff --git a/src/main/java/com/chanki/form/web/service/FormService.java b/src/main/java/com/chanki/form/web/service/FormService.java index b6867dd..8685aed 100644 --- a/src/main/java/com/chanki/form/web/service/FormService.java +++ b/src/main/java/com/chanki/form/web/service/FormService.java @@ -1,16 +1,5 @@ package com.chanki.form.web.service; -import com.chanki.form.web.dto.FormEditRequestDto; -import com.chanki.form.web.dto.FormItemCreateRequestDto; -import com.chanki.form.web.dto.FormItemOptionCreateRequestDto; -import java.util.ArrayList; -import java.util.List; -import java.util.Optional; -import java.util.concurrent.atomic.AtomicLong; -import java.util.stream.Collectors; - -import org.springframework.stereotype.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; @@ -18,10 +7,14 @@ import com.chanki.form.web.domain.forms.FormItemRepository; import com.chanki.form.web.domain.forms.FormRepository; import com.chanki.form.web.dto.FormCreateRequestDto; - -import jakarta.persistence.EntityNotFoundException; +import com.chanki.form.web.dto.FormEditRequestDto; 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 비식별관계로 변경해야 하는지... @@ -35,7 +28,7 @@ public class FormService { private final FormItemOptionRepository formItemOptionRepository; public List getListWithSetParentItemInfo(FormItem formItem, - List formItemOptions) { + List formItemOptions) { long formId = formItem.getFormId(); long version = formItem.getVersion(); long sequence = formItem.getSequence(); @@ -47,53 +40,37 @@ public List getListWithSetParentItemInfo(FormItem formItem, AtomicLong index = new AtomicLong(); return formItemOptions.stream() - .map(option -> FormItemOption.builder().formId(formId).version(version).sequence(sequence) - .optionSequence(index.getAndIncrement() + 1).description(option.getDescription()) - .build()).collect(Collectors.toList()); + .map(option -> FormItemOption.builder() + .formId(formId) + .version(version) + .sequence(sequence) + .optionSequence(index.getAndIncrement() + 1) + .description(option.getDescription()) + .build()) + .toList(); } @Transactional public Form createForm(FormCreateRequestDto formCreateRequestDto) { - Form form = Form.builder() - .description(formCreateRequestDto.getDescription()) - .title(formCreateRequestDto.getTitle()).build(); - - Form insertedForm = formRepository.save(form); - List formItems = formCreateRequestDto.getFormItems(); + Form form = formRepository.save(formCreateRequestDto.toEntity()); - for (int i = 0; i < formItems.size(); i++) { - FormItemCreateRequestDto formItem = formItems.get(i); - FormItem inserted = formItemRepository.save( - FormItem.builder().formId(insertedForm.getFormID()).version(1L).sequence(i + 1) - .description(formItem.getDescription()).type(formItem.getType()).build()); - List formItemOptions = this.getListWithSetParentItemInfo(inserted, - formItem.getFormItemOptions()); - formItemOptionRepository.saveAll(formItemOptions); + for (int i = 0; i < formCreateRequestDto.getFormItems().size(); i++) { + FormItem formItem = formCreateRequestDto.getFormItems().get(i).toEntity(form.getFormID(), 1L, i + 1); + formItemRepository.save(formItem); } - return insertedForm; + return form; } @Transactional public long editForm(FormEditRequestDto formEditRequestDto) { Form form = formRepository.findById(formEditRequestDto.getFormId()) - .orElseThrow(() -> new IllegalArgumentException("NO_FORM")); - - // ## TODO 폼 수정 시 설명과 제목 업데이트 해줘야 함. - long nextVersion = formItemRepository.findNextVersion(form.getFormID()); - - List formItems = formEditRequestDto.getFormItems(); + .orElseThrow(() -> new IllegalArgumentException("Form does not exist")); + long getNextSequence = formItemRepository.findNextVersion(form.getFormID()); - // ## TODO 수정 - 다른 방식 조사 / 수정 - for (int i = 0; i < formItems.size(); i++) { - FormItemCreateRequestDto formItem = formItems.get(i); - FormItem inserted = formItemRepository.save( - FormItem.builder().formId(formEditRequestDto.getFormId()).version(nextVersion) - .sequence(i + 1).description(formItem.getDescription()).type(formItem.getType()) - .build()); - List formItemOptions = this.getListWithSetParentItemInfo(inserted, - formItem.getFormItemOptions()); - formItemOptionRepository.saveAll(formItemOptions); + 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(); From 211cf473ccabaa6523373e15c032562fd239730e Mon Sep 17 00:00:00 2001 From: devchanki Date: Sat, 27 Jul 2024 14:55:51 +0900 Subject: [PATCH 7/7] =?UTF-8?q?=EB=AF=B8=EC=99=84=EC=84=B1=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docs/retrospect.md | 16 ++++- .../form/web/controller/FormController.java | 6 ++ .../chanki/form/web/domain/forms/Form.java | 13 ++-- .../chanki/form/web/domain/forms/FormId.java | 15 ++++ .../form/web/domain/forms/FormItem.java | 22 +++--- .../form/web/domain/forms/FormItemId.java | 1 - .../form/web/domain/forms/FormItemOption.java | 22 +++--- .../web/domain/forms/FormItemOptionId.java | 3 +- .../web/domain/forms/FormItemRepository.java | 14 ++++ .../form/web/domain/forms/FormSubmit.java | 49 +++++++++++++ .../form/web/domain/forms/FormSubmitId.java | 34 +++++++++ .../domain/forms/FormSubmitRepository.java | 7 ++ .../form/web/dto/FormCreateRequestDto.java | 20 +++++- .../web/dto/FormItemCreateRequestDto.java | 23 +++--- .../dto/FormItemOptionCreateRequestDto.java | 11 ++- .../chanki/form/web/dto/FormSubmitDto.java | 48 +++++++++++++ .../chanki/form/web/service/FormService.java | 72 ++++++++++--------- 17 files changed, 294 insertions(+), 82 deletions(-) create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormId.java create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormSubmit.java create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormSubmitId.java create mode 100644 src/main/java/com/chanki/form/web/domain/forms/FormSubmitRepository.java diff --git a/docs/retrospect.md b/docs/retrospect.md index 8ad6865..acb008a 100644 --- a/docs/retrospect.md +++ b/docs/retrospect.md @@ -14,4 +14,18 @@ Response 형태를 data, status 형태로만 단순히 일치할 수 있게 수 기능 구현 후 개선 해보자! -식별 관계가 JPA 랑 좀 안맞나? \ No newline at end of file +식별 관계가 JPA 랑 좀 안맞나? + +ONE TO MANY 단방향 매핑의 단점 조사 +- 엔티티가 관리하는 외래키가 다른 테이블에 있음 +- 불필요한 업데이트 발생(맨 처음 작성한 코드에서도 업데이트 문이 여러번 나가는 것을 확인람) + +OnetoMany로 변경 후, formId 가 중복된다는 에러가 발생 + +엔티티 내에 부모 테이블이 생기면서 생기는 문제로 보임 + +객체간의 관계는 예로, 사람이 주문을 한다고 생각하는게 아닌 주문이 사람에 의해 만들어진다고 생각. + +식별관계로 만드니 응답의 경우, 필요없는 칼럼이 하나 더 생겼음 + +DTO Spring Valid. \ No newline at end of file diff --git a/src/main/java/com/chanki/form/web/controller/FormController.java b/src/main/java/com/chanki/form/web/controller/FormController.java index 3d3fdd2..7352781 100644 --- a/src/main/java/com/chanki/form/web/controller/FormController.java +++ b/src/main/java/com/chanki/form/web/controller/FormController.java @@ -1,6 +1,7 @@ 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; @@ -34,4 +35,9 @@ public Form save(@PathVariable("formId") long formId) { 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 index c09474d..c6e3d99 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/Form.java +++ b/src/main/java/com/chanki/form/web/domain/forms/Form.java @@ -1,5 +1,6 @@ package com.chanki.form.web.domain.forms; +import jakarta.persistence.IdClass; import java.util.List; import jakarta.persistence.CascadeType; @@ -16,18 +17,21 @@ 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; + private Long formId; @Column(length = 100, nullable = false) private String title; @@ -35,14 +39,9 @@ public class Form { @Column(length = 500, nullable = false) private String description; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumn(name = "form_id", referencedColumnName = "form_id") - private List formItems; - @Builder - public Form(String title, String description, List formItems) { + public Form(String title, String description) { this.title = title; this.description = description; - this.formItems = formItems; } } 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 index 5501a1b..29e4c30 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/FormItem.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItem.java @@ -1,5 +1,8 @@ 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; @@ -29,7 +32,6 @@ public class FormItem { @Id @Column(name = "form_id") - @JoinColumn(name = "form_id") private long formId; @Id @@ -38,6 +40,11 @@ public class FormItem { @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; @@ -46,23 +53,16 @@ public class FormItem { @Enumerated(EnumType.STRING) private FormItemType type; - @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.LAZY) - @JoinColumns({ - @JoinColumn(name = "form_id", referencedColumnName = "form_id"), - @JoinColumn(name = "version", referencedColumnName = "version"), - @JoinColumn(name = "sequence", referencedColumnName = "sequence") - }) - private List formItemOptions; @Builder - public FormItem(long formId, long version, long sequence, boolean required, String description, FormItemType type, List formItemOptions) { - this.formId = formId; + 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; - this.formItemOptions = formItemOptions; } } 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 index f7aef52..9b68f12 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemId.java @@ -8,7 +8,6 @@ import lombok.NoArgsConstructor; import lombok.ToString; -@ToString @EqualsAndHashCode(onlyExplicitlyIncluded = true) @NoArgsConstructor public class FormItemId implements Serializable { 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 index 4828aac..a8e3f8f 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOption.java @@ -1,10 +1,15 @@ 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; @@ -21,16 +26,20 @@ public class FormItemOption { @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; + @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") @@ -40,11 +49,8 @@ public class FormItemOption { private String description; @Builder - public FormItemOption(long formId, long version, long sequence, long optionSequence, - String description, FormItemType type) { - this.formId = formId; - this.version = version; - this.sequence = sequence; + 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 index 2fb802b..e4df22c 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemOptionId.java @@ -2,12 +2,13 @@ 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 { +public class FormItemOptionId implements Serializable { @EqualsAndHashCode.Include @Id 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 index 862d03b..b8cc5a1 100644 --- a/src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java +++ b/src/main/java/com/chanki/form/web/domain/forms/FormItemRepository.java @@ -1,5 +1,6 @@ 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; @@ -8,4 +9,17 @@ 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/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 index eb92337..f27b79a 100644 --- a/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormCreateRequestDto.java @@ -1,10 +1,15 @@ 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; @@ -16,13 +21,24 @@ public class FormCreateRequestDto { private String description; private List formItems; - public List getFormItemList(long formId, long version, long sequence) { + 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() - .map(formItem -> formItem.toEntity(formId, version, sequence)) + .flatMap(_formItem -> _formItem.getFormItemOptionList(formItem)) .toList(); } + public Form toEntity() { return Form.builder() .title(this.title) diff --git a/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java index 767161e..9b7383c 100644 --- a/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormItemCreateRequestDto.java @@ -1,5 +1,6 @@ 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; @@ -7,6 +8,7 @@ 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; @@ -19,21 +21,22 @@ public class FormItemCreateRequestDto { private FormItemType type; private List formItemOptions; - public FormItem toEntity(long formId, long version, long sequence) { - AtomicLong atomicLong = new AtomicLong(); - - List formItemOptions = Optional.ofNullable(this.formItemOptions).orElseGet(ArrayList::new).stream() - .map(option -> option.toEntity(formId, version, sequence, atomicLong.incrementAndGet())) - .toList(); - + public FormItem toEntity(Form form, long version, long sequence) { return FormItem.builder() - .formId(formId) + .form(form) .version(version) .sequence(sequence) .description(this.description) - .type(this.type) - .formItemOptions(formItemOptions) .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 index d0fa39f..df7cfa3 100644 --- a/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java +++ b/src/main/java/com/chanki/form/web/dto/FormItemOptionCreateRequestDto.java @@ -1,9 +1,9 @@ package com.chanki.form.web.dto; +import com.chanki.form.web.domain.forms.FormItem; import com.chanki.form.web.domain.forms.FormItemOption; -import jakarta.persistence.Column; import java.util.List; -import java.util.concurrent.atomic.AtomicLong; +import java.util.stream.Stream; import lombok.Getter; import lombok.NoArgsConstructor; @@ -13,11 +13,10 @@ public class FormItemOptionCreateRequestDto { private String description; - public FormItemOption toEntity(long formId, long version, long sequence, long optionSequence) { + + public FormItemOption toEntity(FormItem formItem, long optionSequence) { return FormItemOption.builder() - .formId(formId) - .version(version) - .sequence(sequence) + .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 index e69de29..93532ae 100644 --- a/src/main/java/com/chanki/form/web/dto/FormSubmitDto.java +++ 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 index 8685aed..4ab0326 100644 --- a/src/main/java/com/chanki/form/web/service/FormService.java +++ b/src/main/java/com/chanki/form/web/service/FormService.java @@ -6,8 +6,11 @@ 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; @@ -26,54 +29,53 @@ public class FormService { private final FormRepository formRepository; private final FormItemRepository formItemRepository; private final FormItemOptionRepository formItemOptionRepository; + private final FormSubmitRepository formSubmitRepository; - public List getListWithSetParentItemInfo(FormItem formItem, - List formItemOptions) { - long formId = formItem.getFormId(); - long version = formItem.getVersion(); - long sequence = formItem.getSequence(); - - // ## TODO 없을 시 예외처리 했지만, 해당 로직 먼저 validation 로직 처리 할 수 있게 처리 - if (formItemOptions == null) { - return new ArrayList<>(); - } - - AtomicLong index = new AtomicLong(); - return formItemOptions.stream() - .map(option -> FormItemOption.builder() - .formId(formId) - .version(version) - .sequence(sequence) - .optionSequence(index.getAndIncrement() + 1) - .description(option.getDescription()) - .build()) - .toList(); - } - +// 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 (int i = 0; i < formCreateRequestDto.getFormItems().size(); i++) { - FormItem formItem = formCreateRequestDto.getFormItems().get(i).toEntity(form.getFormID(), 1L, i + 1); - formItemRepository.save(formItem); + 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()); +// 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; + } - for (int i = 0; i < formEditRequestDto.getFormItems().size(); i++) { - FormItem formItem = formEditRequestDto.getFormItems().get(i).toEntity(form.getFormID(), getNextSequence, i + 1); - formItemRepository.save(formItem); - } + @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")); - return form.getFormID(); + long currentVersion = formItemRepository.findLatestVersion(formId); + List formItems = formItemRepository.findLatestVersionFormItemList(formId); + List formSubmits = formSubmitRepository.saveAll(answerList); + return form.getFormId(); } // ##TODO 전체 FORM 형태 조회 테스트를 위한 Service(추후 제거)