From 2c1e0c04229c4723dcd0865a2e985f96e683d328 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Sun, 30 Jul 2023 18:41:38 +0900 Subject: [PATCH 01/10] =?UTF-8?q?=EB=AF=B8=EC=85=98=201=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 39 +++ build.gradle | 35 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 63375 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 248 ++++++++++++++++++ gradlew.bat | 92 +++++++ settings.gradle | 1 + .../SpringJpaMissionApplication.java | 13 + .../customer/domain/Customer.java | 29 ++ .../customer/domain/CustomerRepository.java | 8 + .../springjpamission/gobal/BaseEntity.java | 16 ++ .../springjpamission/order/domain/Order.java | 5 + .../SpringJpaMissionApplicationTests.java | 13 + .../domain/CustomerRepositoryTest.java | 86 ++++++ 14 files changed, 592 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/example/springjpamission/SpringJpaMissionApplication.java create mode 100644 src/main/java/com/example/springjpamission/customer/domain/Customer.java create mode 100644 src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java create mode 100644 src/main/java/com/example/springjpamission/gobal/BaseEntity.java create mode 100644 src/main/java/com/example/springjpamission/order/domain/Order.java create mode 100644 src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java create mode 100644 src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..649136dfb --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +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/ + +*.yml diff --git a/build.gradle b/build.gradle new file mode 100644 index 000000000..e50692ba2 --- /dev/null +++ b/build.gradle @@ -0,0 +1,35 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.1.2' + id 'io.spring.dependency-management' version '1.1.2' +} + +group = 'com.example' +version = '0.0.1-SNAPSHOT' + +java { + sourceCompatibility = '17' +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..033e24c4cdf41af1ab109bc7f253b2b887023340 GIT binary patch literal 63375 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≫L+crb^Bz zc+Nw%zgpZ6>!A3%lau!Pw6`Y#WPVBtAfKSsqwYDWQK-~ zz(mx=nJ6-8t`YXB{6gaZ%G}Dmn&o500Y}2Rd?e&@=hBEmB1C=$OMBfxX__2c2O4K2#(0ksclP$SHp*8jq-1&(<6(#=6&H`Nlc2RVC4->r6U}sTY<1? zn@tv7XwUs-c>Lcmrm5AE0jHI5={WgHIow6cX=UK)>602(=arbuAPZ37;{HTJSIO%9EL`Et5%J7$u_NaC(55x zH^qX^H}*RPDx)^c46x>js=%&?y?=iFs^#_rUl@*MgLD92E5y4B7#EDe9yyn*f-|pQ zi>(!bIg6zY5fLSn@;$*sN|D2A{}we*7+2(4&EhUV%Qqo5=uuN^xt_hll7=`*mJq6s zCWUB|s$)AuS&=)T&_$w>QXHqCWB&ndQ$y4-9fezybZb0bYD^zeuZ>WZF{rc>c4s`` zgKdppTB|o>L1I1hAbnW%H%EkFt%yWC|0~+o7mIyFCTyb?@*Ho)eu(x`PuO8pLikN> z6YeI`V?AUWD(~3=8>}a6nZTu~#QCK(H0+4!ql3yS`>JX;j4+YkeG$ZTm33~PLa3L} zksw7@%e-mBM*cGfz$tS4LC^SYVdBLsR}nAprwg8h2~+Cv*W0%izK+WPVK}^SsL5R_ zpA}~G?VNhJhqx2he2;2$>7>DUB$wN9_-adL@TqVLe=*F8Vsw-yho@#mTD6*2WAr6B zjtLUh`E(;#p0-&$FVw(r$hn+5^Z~9J0}k;j$jL1;?2GN9s?}LASm?*Rvo@?E+(}F& z+=&M-n`5EIz%%F^e)nnWjkQUdG|W^~O|YeY4Fz}>qH2juEere}vN$oJN~9_Th^&b{ z%IBbET*E8%C@jLTxV~h#mxoRrJCF{!CJOghjuKOyl_!Jr?@4Upo7u>fTGtfm|CH2v z&9F+>;6aFbYXLj3{yZ~Yn1J2%!)A3~j2$`jOy{XavW@t)g}}KUVjCWG0OUc7aBc=2 zR3^u=dT47=5SmT{K1aGaVZkOx|24T-J0O$b9dfB25J|7yb6frwS6wZ1^y%EWOm}S< zc1SdYhfsdLG*FB-;!QLV3D!d~hnXTGVQVck9x%=B(Kk8c3y%f0nR95_TbY;l=obSl zEE@fp0|8Q$b3(+DXh?d0FEloGhO0#11CLQT5qtEckBLe-VN-I>9ys}PVK0r;0!jIG zH_q$;a`3Xv9P_V2ekV1SMzd#SKo<1~Dq2?M{(V;AwhH_2x@mN$=|=cG0<3o^j_0OF z7|WJ-f2G=7sA4NVGU2X5`o*D2T7(MbmZ2(oipooE{R?9!{WxX!%ofhsrPAxoIk!Kr z>I$a{Zq=%KaLrDCIL^gmA3z{2z%Wkr)b$QHcNUA^QwydWMJmxymO0QS22?mo%4(Md zgME(zE}ub--3*wGjV`3eBMCQG-@Gel1NKZDGuqobN|mAt0{@ZC9goI|BSmGBTUZ(`Xt z^e2LiMg?6E?G*yw(~K8lO(c4)RY7UWxrXzW^iCg-P41dUiE(i+gDmmAoB?XOB}+Ln z_}rApiR$sqNaT4frw69Wh4W?v(27IlK$Toy<1o)GeF+sGzYVeJ`F)3`&2WDi^_v67 zg;@ehwl3=t+}(DJtOYO!s`jHyo-}t@X|U*9^sIfaZfh;YLqEFmZ^E;$_XK}%eq;>0 zl?+}*kh)5jGA}3daJ*v1knbW0GusR1+_xD`MFPZc3qqYMXd>6*5?%O5pC7UVs!E-` zuMHc6igdeFQ`plm+3HhP)+3I&?5bt|V8;#1epCsKnz0%7m9AyBmz06r90n~9o;K30 z=fo|*`Qq%dG#23bVV9Jar*zRcV~6fat9_w;x-quAwv@BkX0{9e@y0NB(>l3#>82H6 z^US2<`=M@6zX=Pz>kb8Yt4wmeEo%TZ=?h+KP2e3U9?^Nm+OTx5+mVGDvgFee%}~~M zK+uHmj44TVs}!A}0W-A92LWE%2=wIma(>jYx;eVB*%a>^WqC7IVN9{o?iw{e4c=CG zC#i=cRJZ#v3 zF^9V+7u?W=xCY%2dvV_0dCP%5)SH*Xm|c#rXhwEl*^{Ar{NVoK*H6f5qCSy`+|85e zjGaKqB)p7zKNKI)iWe6A9qkl=rTjs@W1Crh(3G57qdT0w2ig^{*xerzm&U>YY{+fZbkQ#;^<$JniUifmAuEd^_M(&?sTrd(a*cD! zF*;`m80MrZ^> zaF{}rDhEFLeH#`~rM`o903FLO?qw#_Wyb5}13|0agjSTVkSI6Uls)xAFZifu@N~PM zQ%o?$k)jbY0u|45WTLAirUg3Zi1E&=G#LnSa89F3t3>R?RPcmkF}EL-R!OF_r1ZN` z?x-uHH+4FEy>KrOD-$KHg3$-Xl{Cf0;UD4*@eb~G{CK-DXe3xpEEls?SCj^p z$Uix(-j|9f^{z0iUKXcZQen}*`Vhqq$T?^)Ab2i|joV;V-qw5reCqbh(8N)c%!aB< zVs+l#_)*qH_iSZ_32E~}>=wUO$G_~k0h@ch`a6Wa zsk;<)^y=)cPpHt@%~bwLBy;>TNrTf50BAHUOtt#9JRq1ro{w80^sm-~fT>a$QC;<| zZIN%&Uq>8`Js_E((_1sewXz3VlX|-n8XCfScO`eL|H&2|BPZhDn}UAf_6s}|!XpmUr90v|nCutzMjb9|&}#Y7fj_)$alC zM~~D6!dYxhQof{R;-Vp>XCh1AL@d-+)KOI&5uKupy8PryjMhTpCZnSIQ9^Aq+7=Mb zCYCRvm4;H=Q8nZWkiWdGspC_Wvggg|7N`iED~Eap)Th$~wsxc(>(KI>{i#-~Dd8iQ zzonqc9DW1w4a*}k`;rxykUk+~N)|*I?@0901R`xy zN{20p@Ls<%`1G1Bx87Vm6Z#CA`QR(x@t8Wc?tpaunyV^A*-9K9@P>hAWW9Ev)E$gb z<(t?Te6GcJX2&0% z403pe>e)>m-^qlJU^kYIH)AutgOnq!J>FoMXhA-aEx-((7|(*snUyxa+5$wx8FNxS zKuVAVWArlK#kDzEM zqR?&aXIdyvxq~wF?iYPho*(h?k zD(SBpRDZ}z$A})*Qh!9&pZZRyNixD!8)B5{SK$PkVET(yd<8kImQ3ILe%jhx8Ga-1 zE}^k+Eo^?c4Y-t2_qXiVwW6i9o2qosBDj%DRPNT*UXI0=D9q{jB*22t4HHcd$T&Xi zT=Vte*Gz2E^qg%b7ev04Z&(;=I4IUtVJkg<`N6i7tjUn-lPE(Y4HPyJKcSjFnEzCH zPO(w%LmJ_=D~}PyfA91H4gCaf-qur3_KK}}>#9A}c5w@N;-#cHph=x}^mQ3`oo`Y$ope#)H9(kQK zGyt<7eNPuSAs$S%O>2ElZ{qtDIHJ!_THqTwcc-xfv<@1>IJ;YTv@!g-zDKBKAH<

Zet1e^8c}8fE97XH}+lF{qbF<`Y%dU|I!~Y`ZrVfKX82i z)(%!Tcf~eE^%2_`{WBPGPU@1NB5SCXe1sAI<4&n1IwO{&S$ThWn37heGOSW%nW7*L zxh0WK!E7zh%6yF-7%~l@I~b`2=*$;RYbi(I#zp$gL_d39U4A)KuB( zcS0bt48&%G_I~( zL(}w&2NA6#$=|g)J+-?ehHflD^lr77ngdz=dszFI;?~ZxeJv=gsm?4$$6#V==H{fa zqO!EkT>1-OQSJoX)cN}XsB;shvrHRwTH(I2^Ah4|rizn!V7T7fLh~Z<`Q+?zEMVxh z$=-x^RR*PlhkV_8mshTvs+zmZWY&Jk{9LX0Nx|+NAEq-^+Rh|ZlinVZ=e8=`WQt;e@= zPU}^1cG*O;G7l{Y#nl znp`y%CO_SC7gk0i0gY&phM04Y)~vU0!3$V$2T+h(1ZS+cCgc zaC?3M;B48^faGo>h~--#FNFauH?0BJJ6_nG5qOlr>k~%DCSJaOfl%KWHusw>tGrTxAhlEVDxc8R2C-)LCt&$Rt9IKor=ml7jirX@?WW+M z^I{b}MD5r$s>^^sN@&g`cXD~S_u09xo;{;noKZatIuzqd zW1e7oTl9>g8opPBT(p+&fo0F#!c{NFYYpIZ6u8hOB{F#{nP)@})X20$3iJtG$cO zJ$Oxl_qH{sL5d?=D$2M4C3Ajc;GN0(B-HVT;@pJ-LvIrN%|SY?t}g!J>ufQrR%hoY z!nr$tq~N%)9}^tEip93XW=MQ1@XovSvn`PTqXeT9@_7hGv4%LK1M**Q%UKi|(v@1_ zKGe*@+1%Y4v&`;5vUL`C&{tc+_7HFs7*OtjY8@Gg`C4O&#An{0xOvgNSehTHS~_1V z=daxCMzI5b_ydM5$z zZl`a{mM}i@x;=QyaqJY&{Q^R*^1Yzq!dHH~UwCCga+Us~2wk59ArIYtSw9}tEmjbo z5!JA=`=HP*Ae~Z4Pf7sC^A3@Wfa0Ax!8@H_&?WVe*)9B2y!8#nBrP!t1fqhI9jNMd zM_5I)M5z6Ss5t*f$Eh{aH&HBeh310Q~tRl3wCEcZ>WCEq%3tnoHE)eD=)XFQ7NVG5kM zaUtbnq2LQomJSWK)>Zz1GBCIHL#2E>T8INWuN4O$fFOKe$L|msB3yTUlXES68nXRX zP6n*zB+kXqqkpQ3OaMc9GqepmV?Ny!T)R@DLd`|p5ToEvBn(~aZ%+0q&vK1)w4v0* zgW44F2ixZj0!oB~^3k|vni)wBh$F|xQN>~jNf-wFstgiAgB!=lWzM&7&&OYS=C{ce zRJw|)PDQ@3koZfm`RQ$^_hEN$GuTIwoTQIDb?W&wEo@c75$dW(ER6q)qhF`{#7UTuPH&)w`F!w z0EKs}=33m}_(cIkA2rBWvApydi0HSOgc>6tu&+hmRSB%)s`v_NujJNhKLS3r6hv~- z)Hm@?PU{zd0Tga)cJWb2_!!9p3sP%Z zAFT|jy;k>4X)E>4fh^6=SxV5w6oo`mus&nWo*gJL zZH{SR!x)V)y=Qc7WEv-xLR zhD4OcBwjW5r+}pays`o)i$rcJb2MHLGPmeOmt5XJDg@(O3PCbxdDn{6qqb09X44T zh6I|s=lM6Nr#cGaA5-eq*T=LQ6SlRq*`~`b+dVi5^>el1p;#si6}kK}>w;1 z6B1dz{q_;PY{>DBQ+v@1pfXTd5a*^H9U*;qdj@XBF}MoSSQxVXeUpEM5Z0909&8$pRfR|B(t0ox&xl8{8mUNd#(zWONW{oycv$VjP1>q;jU@ z@+8E~fjz*I54OFFaQ{A5jn1w>r;l!NRlI(8q3*%&+tM?lov_G3wB`<}bQ>1=&xUht zmti5VZzV1Cx006Yzt|%Vwid>QPX8Nfa8|sue7^un@C+!3h!?-YK>lSfNIHh|0kL8v zbv_BklQ4HOqje|@Fyxn%IvL$N&?m(KN;%`I$N|muStjSsgG;gP4Smgz$2u(mG;DXP zf~uQ z212x^l6!MW>V@ORUGSFLAAjz3i5zO$=UmD_zhIk2OXUz^LkDLWjla*PW?l;`LLos> z7FBvCr)#)XBByDm(=n%{D>BcUq>0GOV9`i-(ZSI;RH1rdrAJ--f0uuAQ4odl z_^$^U_)0BBJwl@6R#&ZtJN+@a(4~@oYF)yG+G#3=)ll8O#Zv3SjV#zSXTW3h9kqn* z@AHL=vf~KMas}6{+u=}QFumr-!c=(BFP_dwvrdehzTyqco)m@xRc=6b#Dy+KD*-Bq zK=y*1VAPJ;d(b?$2cz{CUeG(0`k9_BIuUki@iRS5lp3=1#g)A5??1@|p=LOE|FNd; z-?5MLKd-5>yQ7n__5W^3C!_`hP(o%_E3BKEmo1h=H(7;{6$XRRW6{u+=oQX<((xAJ zNRY`Egtn#B1EBGHLy^eM5y}Jy0h!GAGhb7gZJoZI-9WuSRw)GVQAAcKd4Qm)pH`^3 zq6EIM}Q zxZGx%aLnNP1an=;o8p9+U^>_Bi`e23E^X|}MB&IkS+R``plrRzTE%ncmfvEW#AHJ~ znmJ`x&ez6eT21aLnoI`%pYYj zzQ?f^ob&Il;>6Fe>HPhAtTZa*B*!;;foxS%NGYmg!#X%)RBFe-acahHs3nkV61(E= zhekiPp1d@ACtA=cntbjuv+r-Zd`+lwKFdqZuYba_ey`&H<Psu;Tzwt;-LQxvv<_D5;ik7 zwETZe`+voUhk%$s2-7Rqfl`Ti_{(fydI(DAHKr<66;rYa6p8AD+NEc@Fd@%m`tiK% z=Mebzrtp=*Q%a}2UdK4J&5#tCN5PX>W=(9rUEXZ8yjRu+7)mFpKh{6;n%!bI(qA9kfyOtstGtOl zX!@*O0fly*L4k##fsm&V0j9Lj<_vu1)i?!#xTB7@2H&)$Kzt@r(GH=xRZlIimTDd_o(%9xO388LwC#;vQ?7OvRU_s< zDS@6@g}VnvQ+tn(C#sx0`J^T4WvFxYI17;uPs-Ub{R`J-NTdtBGl+Q>e81Z3#tDUr ztnVc*p{o|RNnMYts4pdw=P!uJkF@8~h)oV4dXu5F7-j0AW|=mt!QhP&ZV!!82*c7t zuOm>B*2gFtq;A8ynZ~Ms?!gEi5<{R_8tRN%aGM!saR4LJQ|?9w>Ff_61(+|ol_vL4 z-+N>fushRbkB4(e{{SQ}>6@m}s1L!-#20N&h%srA=L50?W9skMF9NGfQ5wU*+0<@> zLww8%f+E0Rc81H3e_5^DB@Dn~TWYk}3tqhO{7GDY;K7b*WIJ-tXnYM@z4rn(LGi?z z8%$wivs)fC#FiJh?(SbH-1bgdmHw&--rn7zBWe1xAhDdv#IRB@DGy}}zS%M0(F_3_ zLb-pWsdJ@xXE;=tpRAw?yj(Gz=i$;bsh&o2XN%24b6+?_gJDBeY zws3PE2u!#Cec>aFMk#ECxDlAs;|M7@LT8)Y4(`M}N6IQ{0YtcA*8e42!n^>`0$LFU zUCq2IR2(L`f++=85M;}~*E($nE&j;p{l%xchiTau*tB9bI= zn~Ygd@<+9DrXxoGPq}@vI1Q3iEfKRleuy*)_$+hg?+GOgf1r?d@Or42|s|D>XMa;ebr1uiTNUq@heusd6%WwJqyCCv!L*qou9l!B22H$bQ z)<)IA>Yo77S;|`fqBk!_PhLJEQb0wd1Z|`pCF;hol!34iQYtqu3K=$QxLW7(HFx~v>`vVRr zyqk^B4~!3F8t8Q_D|GLRrAbbQDf??D&Jd|mgw*t1YCd)CM2$76#Cqj1bD*vADwavp zS<`n@gLU4pwCqNPsIfHKl{5}gu9t-o+O< z??!fMqMrt$s}02pdBbOScUrc1T*{*-ideR6(1q4@oC6mxg8v8Y^h^^hfx6| z|Mld6Ax1CuSlmSJmHwdOix?$8emihK#&8&}u8m!#T1+c5u!H)>QW<7&R$eih)xkov zHvvEIJHbkt+2KQ<-bMR;2SYX?8SI=_<-J!GD5@P2FJ}K z5u82YFotCJF(dUeJFRX_3u8%iIYbRS??A?;iVO?84c}4Du9&jG<#urlZ_Unrcg8dR z!5I3%9F*`qwk#joKG_Q%5_xpU7|jm4h0+l$p;g%Tr>i74#3QnMXdz|1l2MQN$yw|5 zThMw15BxjWf2{KM)XtZ+e#N)ihlkxPe=5ymT9>@Ym%_LF}o z1XhCP`3E1A{iVoHA#|O|&5=w;=j*Qf`;{mBAK3={y-YS$`!0UmtrvzHBfR*s{z<0m zW>4C=%N98hZlUhwAl1X`rR)oL0&A`gv5X79??p_==g*n4$$8o5g9V<)F^u7v0Vv^n z1sp8{W@g6eWv2;A31Rhf5j?KJhITYfXWZsl^`7z`CFtnFrHUWiD?$pwU6|PQjs|7RA0o9ARk^9$f`u3&C|#Z3iYdh<0R`l2`)6+ z6tiDj@xO;Q5PDTYSxsx6n>bj+$JK8IPJ=U5#dIOS-zwyK?+t^V`zChdW|jpZuReE_ z)e~ywgFe!0q|jzsBn&(H*N`%AKpR@qM^|@qFai0};6mG_TvXjJ`;qZ{lGDZHScZk( z>pO+%icp)SaPJUwtIPo1BvGyP8E@~w2y}=^PnFJ$iHod^JH%j1>nXl<3f!nY9K$e` zq-?XYl)K`u*cVXM=`ym{N?z=dHQNR23M8uA-(vsA$6(xn+#B-yY!CB2@`Uz({}}w+ z0sni*39>rMC!Ay|1B@;al%T&xE(wCf+`3w>N)*LxZZZYi{5sqiVWgbNd>W*X?V}C- zjQ4F7e_uCUOHbtewQkq?m$*#@ZvWbu{4i$`aeKM8tc^ zL5!GL8gX}c+qNUtUIcps1S)%Gsx*MQLlQeoZz2y2OQb(A73Jc3`LmlQf0N{RTt;wa`6h|ljX1V7UugML=W5-STDbeWTiEMjPQ$({hn_s&NDXzs6?PLySp$?L`0ilH3vCUO{JS0Dp`z;Ry$6}R@1NdY7rxccbm$+;ApSe=2q!0 z()3$vYN0S$Cs)#-OBs{_2uFf}L4h$;7^2w20=l%5r9ui&pTEgg4U!FoCqyA6r2 zC5s72l}i*9y|KTjDE5gVlYe4I2gGZD)e`Py2gq7cK4at{bT~DSbQQ4Z4sl)kqXbbr zqvXtSqMrDdT2qt-%-HMoqeFEMsv~u)-NJ%Z*ipSJUm$)EJ+we|4*-Mi900K{K|e0; z1_j{X5)a%$+vM7;3j>skgrji92K1*Ip{SfM)=ob^E374JaF!C(cZ$R_E>Wv+?Iy9M z?@`#XDy#=z%3d9&)M=F8Xq5Zif%ldIT#wrlw(D_qOKo4wD(fyDHM5(wm1%7hy6euJ z%Edg!>Egs;ZC6%ktLFtyN0VvxN?*4C=*tOEw`{KQvS7;c514!FP98Nf#d#)+Y-wsl zP3N^-Pnk*{o(3~m=3DX$b76Clu=jMf9E?c^cbUk_h;zMF&EiVz*4I(rFoaHK7#5h0 zW7CQx+xhp}Ev+jw;SQ6P$QHINCxeF8_VX=F3&BWUd(|PVViKJl@-sYiUp@xLS2NuF z8W3JgUSQ&lUp@2E(7MG`sh4X!LQFa6;lInWqx}f#Q z4xhgK1%}b(Z*rZn=W{wBOe7YQ@1l|jQ|9ELiXx+}aZ(>{c7Ltv4d>PJf7f+qjRU8i%XZZFJkj&6D^s;!>`u%OwLa*V5Js9Y$b-mc!t@{C415$K38iVu zP7!{3Ff%i_e!^LzJWhBgQo=j5k<<($$b&%%Xm_f8RFC_(97&nk83KOy@I4k?(k<(6 zthO$3yl&0x!Pz#!79bv^?^85K5e7uS$ zJ33yka2VzOGUhQXeD{;?%?NTYmN3{b0|AMtr(@bCx+c=F)&_>PXgAG}4gwi>g82n> zL3DlhdL|*^WTmn;XPo62HhH-e*XIPSTF_h{#u=NY8$BUW=5@PD{P5n~g5XDg?Fzvb_u ziK&CJqod4srfY2T?+4x@)g9%3%*(Q2%YdCA3yM{s=+QD0&IM`8k8N&-6%iIL3kon> z0>p3BUe!lrz&_ZX2FiP%MeuQY-xVV%K?=bGPOM&XM0XRd7or< zy}jn_eEzuQ>t2fM9ict#ZNxD7HUycsq76IavfoNl$G1|t*qpUSX;YgpmJrr_8yOJ2 z(AwL;Ugi{gJ29@!G-mD82Z)46T`E+s86Qw|YSPO*OoooraA!8x_jQXYq5vUw!5f_x zubF$}lHjIWxFar8)tTg8z-FEz)a=xa`xL~^)jIdezZsg4%ePL$^`VN#c!c6`NHQ9QU zkC^<0f|Ksp45+YoX!Sv>+57q}Rwk*2)f{j8`d8Ctz^S~me>RSakEvxUa^Pd~qe#fb zN7rnAQc4u$*Y9p~li!Itp#iU=*D4>dvJ{Z~}kqAOBcL8ln3YjR{Sp!O`s=5yM zWRNP#;2K#+?I&?ZSLu)^z-|*$C}=0yi7&~vZE$s``IE^PY|dj^HcWI$9ZRm>3w(u` z-1%;;MJbzHFNd^!Ob!^PLO-xhhj@XrI81Y)x4@FdsI( za`o4Gy(`T$P?PB?s>o+eIOtuirMykbuAi65Y_UN1(?jTCy@J8Px`%;bcNmPm#Fr!= z5V!YViFJ!FBfEq>nJFk0^RAV1(7w+X`HRgP;nJHJdMa!}&vvduCMoslwHTes_I76|h>;(-9lbfGnt zoZomakOt759AuTX4b$)G8TzJ&m*BV8!vMs9#=e0tWa z%)84R=3?tfh72~=Rc;fXwj+x z+25xapYK@2@;}6)@8IL+F6iuJ_B{&A-0=U=U6WMbY>~ykVFp$XkH)f**b>TE5)shN z39E2L@JPCSl!?pkvFeh@6dCv9oE}|{GbbVM!XIgByN#md&tXy@>QscU0#z!I&X4;d z&B&ZA4lbrHJ!x4lCN4KC-)u#gT^cE{Xnhu`0RXVKn|j$vz8m}v^%*cQ{(h%FW8_8a zFM{$PirSI8@#*xg2T){A+EKX(eTC66Fb})w{vg%Vw)hvV-$tttI^V5wvU?a{(G}{G z@ob7Urk1@hDN&C$N!Nio9YrkiUC{5qA`KH*7CriaB;2~2Od>2l=WytBRl#~j`EYsj}jqK2xD*3 ztEUiPZzEJC??#Tj^?f)=sRXOJ_>5aO(|V#Yqro05p6)F$j5*wYr1zz|T4qz$0K(5! zr`6Pqd+)%a9Xq3aNKrY9843)O56F%=j_Yy_;|w8l&RU1+B4;pP*O_}X8!qD?IMiyT zLXBOOPg<*BZtT4LJ7DfyghK|_*mMP7a1>zS{8>?}#_XXaLoUBAz(Wi>$Q!L;oQ&cL z6O|T6%Dxq3E35$0g5areq9$2+R(911!Z9=wRPq-pju7DnN9LAfOu3%&onnfx^Px5( zT2^sU>Y)88F5#ATiVoS$jzC-M`vY8!{8#9O#3c&{7J1lo-rcNK7rlF0Zt*AKE(WN* z*o?Tv?Sdz<1v6gfCok8MG6Pzecx9?C zrQG5j^2{V556Hj=xTiU-seOCr2ni@b<&!j>GyHbv!&uBbHjH-U5Ai-UuXx0lcz$D7%=! z&zXD#Jqzro@R=hy8bv>D_CaOdqo6)vFjZldma5D+R;-)y1NGOFYqEr?h zd_mTwQ@K2veZTxh1aaV4F;YnaWA~|<8$p}-eFHashbWW6Dzj=3L=j-C5Ta`w-=QTw zA*k9!Ua~-?eC{Jc)xa;PzkUJ#$NfGJOfbiV^1au;`_Y8|{eJ(~W9pP9q?gLl5E6|e{xkT@s|Ac;yk01+twk_3nuk|lRu{7-zOjLAGe!)j?g+@-;wC_=NPIhk(W zfEpQrdRy z^Q$YBs%>$=So>PAMkrm%yc28YPi%&%=c!<}a=)sVCM51j+x#<2wz?2l&UGHhOv-iu z64x*^E1$55$wZou`E=qjP1MYz0xErcpMiNYM4+Qnb+V4MbM;*7vM_Yp^uXUuf`}-* z_2CnbQ);j5;Rz?7q)@cGmwE^P>4_u9;K|BFlOz_|c^1n~%>!uO#nA?5o4A>XLO{X2 z=8M%*n=IdnXQ}^+`DXRKM;3juVrXdgv79;E=ovQa^?d7wuw~nbu%%lsjUugE8HJ9zvZIM^nWvjLc-HKc2 zbj{paA}ub~4N4Vw5oY{wyop9SqPbWRq=i@Tbce`r?6e`?`iOoOF;~pRyJlKcIJf~G z)=BF$B>YF9>qV#dK^Ie#{0X(QPnOuu((_-u?(mxB7c9;LSS-DYJ8Wm4gz1&DPQ8;0 z=Wao(zb1RHXjwbu_Zv<=9njK28sS}WssjOL!3-E5>d17Lfnq0V$+IU84N z-4i$~!$V-%Ik;`Z3MOqYZdiZ^3nqqzIjLE+zpfQC+LlomQu-uNCStj%MsH(hsimN# z%l4vpJBs_2t7C)x@6*-k_2v0FOk<1nIRO3F{E?2DnS}w> z#%9Oa{`RB5FL5pKLkg59#x~)&I7GzfhiVC@LVFSmxZuiRUPVW*&2ToCGST0K`kRK) z02#c8W{o)w1|*YmjGSUO?`}ukX*rHIqGtFH#!5d1Jd}&%4Kc~Vz`S7_M;wtM|6PgI zNb-Dy-GI%dr3G3J?_yBX#NevuYzZgzZ!vN>$-aWOGXqX!3qzCIOzvA5PLC6GLIo|8 zQP^c)?NS29hPmk5WEP>cHV!6>u-2rR!tit#F6`_;%4{q^6){_CHGhvAs=1X8Fok+l zt&mk>{4ARXVvE-{^tCO?inl{)o}8(48az1o=+Y^r*AIe%0|{D_5_e>nUu`S%zR6|1 zu0$ov7c`pQEKr0sIIdm7hm{4K_s0V%M-_Mh;^A0*=$V9G1&lzvN9(98PEo=Zh$`Vj zXh?fZ;9$d!6sJRSjTkOhb7@jgSV^2MOgU^s2Z|w*e*@;4h?A8?;v8JaLPCoKP_1l- z=Jp0PYDf(d2Z`;O7mb6(_X_~z0O2yq?H`^c=h|8%gfywg#}wIyv&_uW{-e8e)YmGR zI0NNSDoJWa%0ztGzkwl>IYW*DesPRY?oH+ow^(>(47XUm^F`fAa0B~ja-ae$e>4-A z64lb_;|W0ppKI+ zxu2VLZzv4?Mr~mi?WlS-1L4a^5k+qb5#C)ktAYGUE1H?Vbg9qsRDHAvwJUN=w~AuT zUXYioFg2Dx-W)}w9VdFK#vpjoSc!WcvRZ_;TgHu;LSY*i7K_>Px{%C4-IL?6q?Qa_ zL7l=EEo|@X&$gX;fYP02qJF~LN9?E-OL2G(Fo4hW)G{`qnW zTIuc+-1VJvKgph0jAc(LzM);Pg$MPln?U|ek{_5nNJHfm-Y#ec+n#Yf_e>XfbLbN)eqHEDr0#?<;TskL5-0JGv|Ut{=$Xk8hlwbaMXdcI3GL zY-hykR{zX9liy$Z2F3!z346uu%9@-y6Gda`X2*ixlD_P@<}K?AoV?(%lM%* z(xNk=|A()443aGj)-~IDf3J+UA2p2lh6ei^pG*HL#SiThnIr5WZDXebI)F7X zGmP-3bH$i$+(IwqgbM7h%G5oJ@4{Z~qZ#Zs*k7eXJIqg;@0kAGV|b=F#hZs)2BYu1 zr8sj#Zd+Iu^G}|@-dR5S*U-;DqzkX3V0@q-k8&VHW?h0b0?tJ-Atqmg^J8iF7DP6k z)W{g?5~F*$5x?6W)3YKcrNu8%%(DglnzMx5rsU{#AD+WPpRBf``*<8F-x75D$$13U zcaNXYC0|;r&(F@!+E=%+;bFKwKAB$?6R%E_QG5Yn5xX#h+zeI-=mdXD5+D+lEuM`M ze+*G!zX^xbnA?~LnPI=D2`825Ax8rM()i*{G0gcV5MATV?<7mh+HDA7-f6nc@95st zzC_si${|&=$MUj@nLxl_HwEXb2PDH+V?vg zA^DJ%dn069O9TNK-jV}cQKh|$L4&Uh`?(z$}#d+{X zm&=KTJ$+KvLZv-1GaHJm{>v=zXW%NSDr8$0kSQx(DQ)6S?%sWSHUazXSEg_g3agt2@0nyD?A?B%9NYr(~CYX^&U#B4XwCg{%YMYo%e68HVJ7`9KR`mE*Wl7&5t71*R3F>*&hVIaZXaI;2a$?;{Ew{e3Hr1* zbf$&Fyhnrq7^hNC+0#%}n^U2{ma&eS)7cWH$bA@)m59rXlh96piJu@lcKl<>+!1#s zW#6L5Ov%lS(?d66-(n`A%UuiIqs|J|Ulq0RYq-m&RR0>wfA1?<34tI?MBI#a8lY{m z{F2m|A@=`DpZpwdIH#4)9$#H3zr4kn2OX!UE=r8FEUFAwq6VB?DJ8h59z$GXud$#+ zjneIq8uSi&rnG0IR8}UEn5OcZC?@-;$&Ry9hG{-1ta`8aAcOe1|82R7EH`$Qd3sf* zbrOk@G%H7R`j;hOosRVIP_2_-TuyB@rdj?(+k-qQwnhV3niH+CMl>ELX(;X3VzZVJ ztRais0C^L*lmaE(nmhvep+peCqr!#|F?iVagZcL>NKvMS_=*Yl%*OASDl3(mMOY9! z=_J$@nWpA-@><43m4olSQV8(PwhsO@+7#qs@0*1fDj70^UfQ(ORV0N?H{ceLX4<43 zEn)3CGoF&b{t2hbIz;Og+$+WiGf+x5mdWASEWIA*HQ9K9a?-Pf9f1gO6LanVTls)t z^f6_SD|>2Kx8mdQuiJwc_SmZOZP|wD7(_ti#0u=io|w~gq*Odv>@8JBblRCzMKK_4 zM-uO0Ud9>VD>J;zZzueo#+jbS7k#?W%`AF1@ZPI&q%}beZ|ThISf-ly)}HsCS~b^g zktgqOZ@~}1h&x50UQD~!xsW-$K~whDQNntLW=$oZDClUJeSr2$r3}94Wk1>co3beS zoY-7t{rGv|6T?5PNkY zj*XjF()ybvnVz5=BFnLO=+1*jG>E7F%&vm6up*QgyNcJJPD|pHoZ!H6?o3Eig0>-! zt^i-H@bJ;^!$6ZSH}@quF#RO)j>7A5kq4e+7gK=@g;POXcGV28Zv$jybL1J`g@wC# z_DW1ck}3+n@h2LFQhwVfaV@D+-kff4celZC0;0ef?pA#*PPd8Kk8sO1wza&BHQFblVU8P1=-qScHff^^fR zycH!hlHQs7iejITpc4UaBxzqTJ}Z#^lk{W(cr`qtW~Ap;HvuUf#MxgEG?tEU+B?G% znub0I(s@XvI(lva}$Z7<}Qg=rWd5n)}rX{nb+Aw;}?l9LZI-`N-*hts=c6XgjfJs ztp>-686v6ug{glEZ}K=jVG|N1WSWrU*&ue|4Q|O@;s0#L5P*U%Vx;)w7S0ZmLuvwA z@zs2Kut)n1K7qaywO#TbBR`Q~%mdr`V)D`|gN0!07C1!r3{+!PYf9*;h?;dE@#z(k z;o`g~<>P|Sy$ldHTUR3v=_X0Iw6F>3GllrFXVW?gU0q6|ocjd!glA)#f0G7i20ly>qxRljgfO2)RVpvmg#BSrN)GbGsrIb}9 z1t+r;Q>?MGLk#LI5*vR*C8?McB|=AoAjuDk&Pn`KQo z`!|mi{Cz@BGJ!TwMUUTkKXKNtS#OVNxfFI_Gfq3Kpw0`2AsJv9PZPq9x?~kNNR9BR zw#2jp%;FJNoOzW>tE#zskPICp>XSs?|B0E%DaJH)rtLA}$Y>?P+vEOvr#8=pylh zch;H3J`RE1{97O+1(1msdshZx$it^VfM$`-Gw>%NN`K|Tr$0}U`J?EBgR%bg=;et0 z_en)!x`~3so^V9-jffh3G*8Iy6sUq=uFq%=OkYvHaL~#3jHtr4sGM?&uY&U8N1G}QTMdqBM)#oLTLdKYOdOY%{5#Tgy$7QA! zWQmP!Wny$3YEm#Lt8TA^CUlTa{Cpp=x<{9W$A9fyKD0ApHfl__Dz4!HVVt(kseNzV z5Fb`|7Mo>YDTJ>g;7_MOpRi?kl>n(ydAf7~`Y6wBVEaxqK;l;}6x8(SD7}Tdhe2SR zncsdn&`eI}u}@^~_9(0^r!^wuKTKbs-MYjXy#-_#?F=@T*vUG@p4X+l^SgwF>TM}d zr2Ree{TP5x@ZtVcWd3++o|1`BCFK(ja-QP?zj6=ZOq)xf$CfSv{v;jCcNt4{r8f+m zz#dP|-~weHla%rsyYhB_&LHkwuj83RuCO0p;wyXsxW5o6{)zFAC~2%&NL? z=mA}szjHKsVSSnH#hM|C%;r0D$7)T`HQ1K5vZGOyUbgXjxD%4xbs$DAEz)-;iO?3& zXcyU*Z8zm?pP}w&9ot_5I;x#jIn^Joi5jBDOBP1)+p@G1U)pL6;SIO>Nhw?9St2UN zMedM(m(T6bNcPPD`%|9dvXAB&IS=W4?*7-tqldqALH=*UapL!4`2TM_{`W&pm*{?| z0DcsaTdGA%RN={Ikvaa&6p=Ux5ycM){F1OgOh(^Yk-T}a5zHH|=%Jk)S^vv9dY~`x zG+!=lsDjp!D}7o94RSQ-o_g#^CnBJlJ@?saH&+j0P+o=eKqrIApyR7ttQu*0 z1f;xPyH2--)F9uP2#Mw}OQhOFqXF#)W#BAxGP8?an<=JBiokg;21gKG_G8X!&Hv;7 zP9Vpzm#@;^-lf=6POs>UrGm-F>-! zm;3qp!Uw?VuXW~*Fw@LC)M%cvbe9!F(Oa^Y6~mb=8%$lg=?a0KcGtC$5y?`L5}*-j z7KcU8WT>2PpKx<58`m((l9^aYa3uP{PMb)nvu zgt;ia9=ZofxkrW7TfSrQf4(2juZRBgcE1m;WF{v1Fbm}zqsK^>sj=yN(x}v9#_{+C zR4r7abT2cS%Wz$RVt!wp;9U7FEW&>T>YAjpIm6ZSM4Q<{Gy+aN`Vb2_#Q5g@62uR_>II@eiHaay+JU$J=#>DY9jX*2A=&y8G%b zIY6gcJ@q)uWU^mSK$Q}?#Arq;HfChnkAOZ6^002J>fjPyPGz^D5p}o;h2VLNTI{HGg!obo3K!*I~a7)p-2Z3hCV_hnY?|6i`29b zoszLpkmch$mJeupLbt4_u-<3k;VivU+ww)a^ekoIRj4IW4S z{z%4_dfc&HAtm(o`d{CZ^AAIE5XCMvwQSlkzx3cLi?`4q8;iFTzuBAddTSWjfcZp* zn{@Am!pl&fv#k|kj86e$2%NK1G4kU=E~z9L^`@%2<%Dx%1TKk_hb-K>tq8A9bCDfW z@;Dc3KqLafkhN6414^46Hl8Tcv1+$q_sYjj%oHz)bsoGLEY1)ia5p=#eii(5AM|TW zA8=;pt?+U~>`|J(B85BKE0cB4n> zWrgZ)Rbu}^A=_oz65LfebZ(1xMjcj_g~eeoj74-Ex@v-q9`Q{J;M!mITVEfk6cn!u zn;Mj8C&3^8Kn%<`Di^~Y%Z$0pb`Q3TA}$TiOnRd`P1XM=>5)JN9tyf4O_z}-cN|i> zwpp9g`n%~CEa!;)nW@WUkF&<|wcWqfL35A}<`YRxV~$IpHnPQs2?+Fg3)wOHqqAA* zPv<6F6s)c^o%@YqS%P{tB%(Lxm`hsKv-Hb}MM3=U|HFgh8R-|-K(3m(eU$L@sg=uW zB$vAK`@>E`iM_rSo;Cr*?&wss@UXi19B9*0m3t3q^<)>L%4j(F85Ql$i^;{3UIP0c z*BFId*_mb>SC)d#(WM1%I}YiKoleKqQswkdhRt9%_dAnDaKM4IEJ|QK&BnQ@D;i-ame%MR5XbAfE0K1pcxt z{B5_&OhL2cx9@Sso@u2T56tE0KC`f4IXd_R3ymMZ%-!e^d}v`J?XC{nv1mAbaNJX| zXau+s`-`vAuf+&yi2bsd5%xdqyi&9o;h&fcO+W|XsKRFOD+pQw-p^pnwwYGu=hF7& z{cZj$O5I)4B1-dEuG*tU7wgYxNEhqAxH?p4Y1Naiu8Lt>FD%AxJ811`W5bveUp%*e z9H+S}!nLI;j$<*Dn~I*_H`zM^j;!rYf!Xf#X;UJW<0gic?y>NoFw}lBB6f#rl%t?k zm~}eCw{NR_%aosL*t$bmlf$u|U2hJ*_rTcTwgoi_N=wDhpimYnf5j!bj0lQ*Go`F& z6Wg+xRv55a(|?sCjOIshTEgM}2`dN-yV>)Wf$J58>lNVhjRagGZw?U9#2p!B5C3~Nc%S>p`H4PK z7vX@|Uo^*F4GXiFnMf4gwHB;Uk8X4TaLX4A>B&L?mw4&`XBnLCBrK2FYJLrA{*))0 z$*~X?2^Q0KS?Yp##T#ohH1B)y4P+rR7Ut^7(kCwS8QqgjP!aJ89dbv^XBbLhTO|=A z|3FNkH1{2Nh*j{p-58N=KA#6ZS}Ir&QWV0CU)a~{P%yhd-!ehF&~gkMh&Slo9gAT+ zM_&3ms;1Um8Uy0S|0r{{8xCB&Tg{@xotF!nU=YOpug~QlZRKR{DHGDuk(l{)d$1VD zj)3zgPeP%wb@6%$zYbD;Uhvy4(D|u{Q_R=fC+9z#sJ|I<$&j$|kkJiY?AY$ik9_|% z?Z;gOQG5I%{2{-*)Bk|Tia8n>TbrmjnK+8u*_cS%*;%>R|K|?urtIdgTM{&}Yn1;| zk`xq*Bn5HP5a`ANv`B$IKaqA4e-XC`sRn3Z{h!hN0=?x(kTP+fE1}-<3eL+QDFXN- z1JmcDt0|7lZN8sh^=$e;P*8;^33pN>?S7C0BqS)ow4{6ODm~%3018M6P^b~(Gos!k z2AYScAdQf36C)D`w&p}V89Lh1s88Dw@zd27Rv0iE7k#|U4jWDqoUP;-He5cd4V7Ql)4S+t>u9W;R-8#aee-Ct1{fPD+jv&zV(L&k z)!65@R->DB?K6Aml57?psj5r;%w9Vc3?zzGs&kTA>J9CmtMp^Wm#1a@cCG!L46h-j z8ZUL4#HSfW;2DHyGD|cXHNARk*{ql-J2W`9DMxzI0V*($9{tr|O3c;^)V4jwp^RvW z2wzIi`B8cYISb;V5lK}@xtm3NB;88)Kn}2fCH(WRH1l@3XaO7{R*Lc7{ZN1m+#&diI7_qzE z?BS+v<)xVMwt{IJ4yS2Q4(77II<>kqm$Jc3yWL42^gG6^Idg+y3)q$-(m2>E49-fV zyvsCzJ5EM4hyz1r#cOh5vgrzNGCBS}(Bupe`v6z{e z)cP*a8VCbRuhPp%BUwIRvj-$`3vrbp;V3wmAUt{?F z0OO?Mw`AS?y@>w%(pBO=0lohnxFWx`>Hs}V$j{XI2?}BtlvIl7!ZMZukDF7 z^6Rq2H*36KHxJ1xWm5uTy@%7;N0+|<>Up>MmxKhb;WbH1+=S94nOS-qN(IKDIw-yr zi`Ll^h%+%k`Yw?o3Z|ObJWtfO|AvPOc96m5AIw;4;USG|6jQKr#QP}+BLy*5%pnG2 zyN@VMHkD`(66oJ!GvsiA`UP;0kTmUST4|P>jTRfbf&Wii8~a`wMwVZoJ@waA{(t(V zwoc9l*4F>YUM8!aE1{?%{P4IM=;NUF|8YkmG0^Y_jTJtKClDV3D3~P7NSm7BO^r7& zWn!YrNc-ryEvhN$$!P%l$Y_P$s8E>cdAe3=@!Igo^0diL6`y}enr`+mQD;RC?w zb8}gXT!aC`%rdxx2_!`Qps&&w4i0F95>;6;NQ-ys;?j#Gt~HXzG^6j=Pv{3l1x{0( z4~&GNUEbH=9_^f@%o&BADqxb54EAq=8rKA~4~A!iDp9%eFHeA1L!Bb8Lz#kF(p#)X zn`CglEJ(+tr=h4bIIHlLkxP>exGw~{Oe3@L^zA)|Vx~2yNuPKtF^cV6X^5lw8hU*b zK-w6x4l&YWVB%0SmN{O|!`Sh6H45!7}oYPOc+a#a|n3f%G@eO)N>W!C|!FNXV3taFdpEK*A1TFGcRK zV$>xN%??ii7jx5D69O>W6O`$M)iQU7o!TPG*+>v6{TWI@p)Yg$;8+WyE9DVBMB=vnONSQ6k1v z;u&C4wZ_C`J-M0MV&MpOHuVWbq)2LZGR0&@A!4fZwTM^i;GaN?xA%0)q*g(F0PIB( zwGrCC#}vtILC_irDXI5{vuVO-(`&lf2Q4MvmXuU8G0+oVvzZp0Y)zf}Co0D+mUEZz zgwR+5y!d(V>s1} zji+mrd_6KG;$@Le2Ic&am6O+Rk1+QS?urB4$FQNyg2%9t%!*S5Ts{8j*&(H1+W;0~ z$frd%jJjlV;>bXD7!a-&!n52H^6Yp}2h3&v=}xyi>EXXZDtOIq@@&ljEJG{D`7Bjr zaibxip6B6Mf3t#-*Tn7p z96yx1Qv-&r3)4vg`)V~f8>>1_?E4&$bR~uR;$Nz=@U(-vyap|Jx zZ;6Ed+b#GXN+gN@ICTHx{=c@J|97TIPWs(_kjEIwZFHfc!rl8Ep-ZALBEZEr3^R-( z7ER1YXOgZ)&_=`WeHfWsWyzzF&a;AwTqzg~m1lOEJ0Su=C2<{pjK;{d#;E zr2~LgXN?ol2ua5Y*1)`(be0tpiFpKbRG+IK(`N?mIgdd9&e6vxzqxzaa`e7zKa3D_ zHi+c1`|720|dn(z4Qos^e7sn(PU%NYLv$&!|4kEse%DK;YAD06@XO3!EpKpz!^*?(?-Ip zC_Zlb(-_as+-D?0Ag9`|4?)bN)5o(J=&udAY|YgV(YuK9k=E>0z`$dSaL(wmxd!1f zME&3wwv@#{dgeMlZ4}GL!I`VZxtdQY$lmauCN_|mGXqEEj@i~du$|>5UvLjsbq!{; z@jEf;21iC1jFEmIPE^4gykHQzCMLj=2Ek4&FvlpqTlS(0YT%*W<>XgH$4ww`D`aihBGkPM(&EG};Cl&wzg8!jL z`rkqPzvH(0Kd{2n=?Bt8aAU&0IyiA+V-qnXVId^qG!SWZ7%_f&i!D{R#7Jo$%tICxY%j)ebORE>3H_c|to}c#HX;HAC?~B;2mmQrMp2;8T zmzde!k7BYg^Z1r|DUvSD3@{6S<1kndb%Qt%GA# z+sB2&F5L`R&fLRdAlpU_pVsJsYDEz{^ zKGaAz#%W+MPGT+D$+xowMY0=ipM)0p?zym&Aoi)qL(pO_weO(k?s|ELHl^W zviJiFUXRL&?`;3_;mvc02A@sbsW9}#{anvGafZ#ST;}za?XS3}ZG3B4m(SW{>w}Fh z)T5Yi*``Tstmi9SHXmuWSND@cj}qtY!`tuD29Dpu+-D3$h<5FY>jE>YJvqBmhw?oll`x7Ono(}R~P zle_eBwYy0Rr7kmf_SEt_gn4)AO-r`}^Z5Y%Rm8)K-?X>rvDL+QT?#)QwDsQ2c$tc* z&#hbgkL6}GnBDH;+lREM6MGIskRa@r>5Iq(ll2IepuhW86w@14=E{6$cz*cBDQ)CT>}v-DLM-v8)xaPBnmGBKM63RgDGqh!<*j90tSE4|G^+r@#-7g2 zs8KE8eZPZhQuN>wBU%8CmkE9LH1%O;-*ty0&K~01>F3XB>6sAm*m3535)9T&Fz}A4 zwGjZYVea@Fesd=Rv?ROE#q=}yfvQEP8*4zoEw4@^Qvw54utUfaR1T6gLmq?c9sON> z>Np6|0hdP_VURy81;`8{ZYS)EpU9-3;huFq)N3r{yP1ZBCHH7=b?Ig6OFK~%!GwtQ z3`RLKe8O&%^V`x=J4%^Oqg4ZN9rW`UQN^rslcr_Utzd-@u-Sm{rphS-y}{k41)Y4E zfzu}IC=J0JmRCV6a3E38nWl1G495grsDDc^H0Fn%^E0FZ=CSHB4iG<6jW1dY`2gUr zF>nB!y@2%rouAUe9m0VQIg$KtA~k^(f{C*Af_tOl=>vz>$>7qh+fPrSD0YVUnTt)? z;@1E0a*#AT{?oUs#bol@SPm0U5g<`AEF^=b-~&4Er)MsNnPsLb^;fL2kwp|$dwiE3 zNc5VDOQ%Q8j*d5vY##)PGXx51s8`0}2_X9u&r(k?s7|AgtW0LYbtlh!KJ;C9QZuz< zq>??uxAI1YP|JpN$+{X=97Cdu^mkwlB={`aUp+Uyu1P139=t%pSVKo7ZGi_v(0z>l zHLGxV%0w&#xvev)KCQ{7GC$nc3H?1VOsYGgjTK;Px(;o0`lerxB<+EJX9G9f8b+)VJdm(Ia)xjD&5ZL45Np?9 zB%oU;z05XN7zt{Q!#R~gcV^5~Y^gn+Lbad7C{UDX2Nznj8e{)TLH|zEc|{a#idm@z z6(zon+{a>FopmQsCXIs*4-dLGgTc)iOhO3r=l?imNUR-pWl!ktO0r_a0Nqo@bu8MzyjSq9zkqPe*`Sxz75rZ zr9X%(=PVqCRB=zfX+_u&*k4#s1k4OV11YgkCrlr6V;vz<{99HKC@qQ+H8xv5)sc63 z69;U4O&{fb5(fN``jJH#3=GHsV56@{d@7`VhA$K^;GU+R-V%%cnmjYs?>c5^6Ugv} zn<}L&i;2`zzW@(kxf$$gVH@7nh}2%G%ciQ_B?r{13?Q@=Q+6msQGtnyY%Gkjeor?g z7F*tMqLdhcq+LCCo^D;CtOACCBhXgK-M&w{*dcUdmtv@XFTofmmpcWKtCn^`#?oZC zUOm52 z7sK$hR|Vh6y&pfIUK&!`8HH*>12$nWA)Ynp+XwOj=jNLD z{QA4gezbe>wiP?`jJO;c&EId;=2u80s_r97;TX!6@*(<%WL+^bmxheMB3pKx0OpH^ zPs}knV+jpJ4TaD@r^V`mTsjf`7!z^H}eHQ#Rp z72(>Dm#QO!ZYR*O@yHic`3*T^t7jc=d`Jz6Lk@Y-bL%cOp_~=#xzIJl?`{Qu;$uC~NkePE+7wSW_FM`&V{gFN zl;lq@;FtAsl!h;tnOvj z#gYx!q$5MdZ0Jxjy=t*q)HFeeyI-vgaGdh1QNhqGRy8qS)|6S0QK7Gj9R?Co{Knh> za>xkQZ0}bBx!9@EUxRBYGm25^G}&j-`0VWX04E|J!kJ8^WoZ(jbhU_twFwWIH32fv zi=pg~(b#ajW=`)Vikwwe39lpML?|sY$?*6*kYBxku_<=#$gfTqQ_F!9F0=OkHnzBo zEwR!H_h|MNjuG$Tj6zaaouO}HYWCF8vN4C%EX-%Iu%ho;q$G#ErnafhXR*4J2Rp5* zhsi0;wlSwE*inVFO>{(8?N~82zijpt+9Y_-^>xnE%T*zk9gi|j7b@s<5{|qEquUD( zS;-%RySZOCOEh*>!kvbsQ265* z>X8*_Wy&~FB@aDHz%glyiAujXq-|2kDUjFTn9Rafsl+XNyFP%PG|l&ZGWBcEXxy=9 zeDn2PIoVuL$gX0RgVK1O$x3%pOzS7x^U5Pi;mtT)%cY;&e&M7GLM}zP+IPbqLt=^5 z7qLfri8myf;~2psc@^cA6mG&{C%e_(M$$!wC^5p^T1QzrS%I?(U{qcd+oJJkQxe10 zON{Q*?iz%F4MbEsoEc+x3E?&2wVR^v3|Q0lDaMvgS7mNjI{2w! z9|~=!83T%GW*iaChSS!`Xd^beFp9N4%K+k*j#jFumk}U?=WKL_kJAltxnxp~+lZzT zp@&&kSPTg3oSGos`rVBhK0|4NdHM_hnKuw1#0JV{gi_dKDJLB+ix~~HpU9%jD)@YY zOK)L7kgbLyN2%Dx#fuY}8swh4ACk7%BpP-n5(RhDq{gEHP*Fo4IviX{C49|B5h~SC zFr`=0)=h2^F5UpCAgt?R5u{6VvpUf#*nC zCQ`$!|C;L2lpjlG?(>T$(_$O3_YNNbPT~(?!j3aD8k=yu^ogw4bkjvgF|3BOq(hB& zG;^cPXmcUP$ox8zElCJ-zMbK9q^8{rri#8Cek5Ydr0YT-KTh@J z6^AcB9ejew8BY5kzZUZX(7Po==eW<(;uV~E7(BY5c0^xr`cuRwn)47bN?zOb!0?cw z#v}R$z66&m#+AHfo@(^V2#S~bhoUkkTArg+6w>JzZ52r96^({1W!?>4$h0l|-jDfj z>7(<+%67#(A|4hZ3>Y;hd&S?}F;`Vtqz|pK&B>NJ=Faci;gkf-+GmfQR8^zo_vul2 zB!)kfu4Dq_g)8TBBo52*sB6F`qa&JCR=_A$QWgX_K}fZm{Cb2#1q`^S3+WaS>sS#@ z-4k*G=#?z6d_e7JJ+Z8^(t0tNdL{K5F;2nfQbXgld}a(X)Gr;WojOy`^?es~AClT$ z5^lD{WJek0!p-QEH5E7n6DKQ0%_ZBZ=|jfV_MM{VmL8y-Wd|>OmeemP=C@xI@@M~1 zW2S*im@Rc=O>V886_UJ@oh1!2H$Ku&U*Hh_oxd{32)vf1$cRiepv28ricM;}#p!+k zaK{z1I=9Y%3m4|Pj*BD*Fn5Vh?O@oD^1UcjyeNh0fbhh~V6xb#4njlGW8OehUe!MnoR(wn#nsoyL1m!Rov)Nv4~&JEVl7L z#^qYdTpNI#u`N0UbVMiDmD>g2VQcG3>4D6gErgddZnSQTs){BExxRJRB?bIxTdZa z;!S8FHJPPiIDQ*FAUiWSYnjILFjDvxvSC zk z=j4Kx@Pg~&2Z?cmMDa;)#xVeorJrxDBqy{+`kG+ZPQqC@#ku-c3ucU+69$#q_*se` z-H#PFW^>-C0>++|6r=<$Z8)ZFaK=ZjwsNYXqRpl9G|yme@Eld5B-*I69Nx_TResHi z!5nm+>6zaJYQO#%D{~o-oOJ;q`fa5}l!8G*U-E$OM&7@dqciBCWtd}|SrDXz$TB($&m*=Epuolu2k`KUwO7maP3P0ok zmF57lSh0Ba@&sO1iZ5^+3s8{B8t|M;Pg&O+{tZJCiLWd6H@{b~9{CLF9s3Kn zt5)Rs9ejne?o{%f>B$Dl%X7fd~KY)I|(pxUeHj;gNsK6;ZR>`ciu;GxvhDUt!+31Knss2U(%ts8K z18)8;<2ax9RG?!|Lwdt^i5L^&O788roKmVAB)=EdK~HqR2Q=)H_VW}xY=95MP_Ov< zPEz3%DRK}+(aUBwsr83H8>`H^v~|A_t}0vPmRwKPt1{|qOY|PZu}j9+{ZhF&-H_TB zU9xWLpNTc`enI|)h9jQeqf5RfGLFk_vfX`40iMpd%KZF!lKbZTdBw$<^G6nuS+$fT zrbK)xo&;buPJcpOZ=x>n+bRXVFDs(23Xr=rDE&!)pVXZ;;A07NXGl_0m`{Z)DQIu$ zFDvY4xu-ifTe_$|n2B83eI;KUg6pVbw+N!nyLj~wnRi{4mNy{WDV)G1!6$y=+x6U{ z%4_9=Q^L!x_gAYp?J3+u5hA5cO8aHeI=6AC8^S{mzhqCBvBLYEutUC(X0>hKg|AvN zvkmJCQNA45_KjW{aEcyrBppcO6G0zTy%v1&@~+2!n?kA9?>0>AjFN|JdCnHQ8$hEU zw#mwGifHppLP?89LMb(Y3Li9iCPx7W%ek}2FgD2YSzjsR4Xj<=zN{Yo@7s7(k%mP4 znT2p&4EQ@q_chd-E z78uvD*C@oba`U3W2Iw`M#`5C8jOHv8^Li<|j^SI>>>`77Dp71Vtz=J?4Zck4SdRbd zfF}C_>Y(#)r@y!Q0`tMlG#b9>5`fAI$B&tWJfbGlYW$J4V+-s=HH!`+;1XeL@USdx zR0$G&&XBf9lQtkH5)p=U!8J!1{oc4E!N-~Abxl6E;;=3-hMYZ+44?u}zabmCE)yB?*_w91m$n1Yskp&@ z;kxeJX-#ioX^{elyLu~gzx|_KxLpX62MF%Axq3$!Z_P`pBWR?zP8OI`PV~6Aa0Oi0 zv_Ot1m&plf-ZF{e(z(Ms3*S5q$e|j;gOwGrmWsCHfLi(h8y?gc$(2H{884C1FvHQQ12tX=qFUsK~zM!W=K>;zaRsu4Xmcc@8nSs!vK+{ z?}bq}-m&p5jRSam67n>yG9ez=I^|J1O;Np8s=P~9MXYLxD+cFQK7PhG=bkjo{Naae zjp3NWWrlFWDb3Z5D07Q|WjZ=wOQ=aKA%en=O@hL$QCKpIXNZE=InFk|Fhq-&H!6&X z*MVy8=hL7Aw&pQjHrFf27C%3B<>FX{@fOLNhUoxL4*@nY}&M3G*T-p67a zo}~_&yGOB)#vbU|Q3FA8S^X)c-yBlmN(_%}`7Ha3uWFe?>9f=3hlO{^gv~$p`v?vk z_P*r43|(S{%ihs;)YH|jAMpP=-Ms7Ne75_YZZiL3CHVjSU`X1|?Ehh&gA=Xn7W7d@ zf8bM9Y>lG!`PWFDDA9G;x*{1Eh^55u66*9D+-4^dYZ{xXP@?sQLVrY%(azM;C^4FuN7CQ%$!3sr1JL=!Be& zuOZL^bLp$Qo2rL=WDzQIls%s!Go z{s}Q0b#+#8bKga|01t%^9Z=wEsevvXM_{$dCR97ed3@1kX)mtSS!JN^rtqKOj}p~> zfpCI@DX*DqcB6ZnBcl~}sGO~1s$AtfkX6fy3N8*ebvZc*KBW;dA=)?#BE&}-or74i zZUt5;{FBPnkZD8YUXDsx&2LvSziAlec3oc>&Lf1Doc3g?H9{OO_$M4B0qTat0UsWP zTlxUeQ3B;oJ%en4n?zQB6*Fb#wH7`$SQN5GI|=DnJKiYm{?-?#-H;#sIjz7kQ4&VW zN9d1(1$_W~S=<%qDD!mwRytas=eqX^iW}YSx3;wJ#)Xp_`Qk1DFiXac$-3;jQbCif zLA-T_s~5yP@Q@W>pXKl^gipQ>gp@HlBB>WDVpW199;V%?N1`U$ovLE;NI2?|_q2~5 zlg>xT9NADWkv5-*FjS~nP^7$k!N2z?dr!)&l0+4xDK7=-6Rkd$+_^`{bVx!5LgC#N z-dv-k@OlYCEvBfcr1*RsNwcV?QT0bm(q-IyJJ$hm2~mq{6zIn!D20k5)fe(+iM6DJ ze-w_*F|c%@)HREgpRrl@W5;_J5vB4c?UW8~%o0)(A4`%-yNk1(H z5CGuzH(uHQ`&j+IRmTOKoJ?#Ct$+1grR|IitpDGt!~ZdqSJ?cOtw-R=EQ+q4UvclH zdX=xlK-fhQKoKCPBoFAZ*(~11O6-tXo>i0w!T$u{lg!#itEUX3V{$S*naW!C@%rll zS{L(1t%xz(*B`{1NL!*aMc<~fE=g;gXi&Gb$HpD!P)8?JzfN;4F&wv(5HH<=c>>)n z({271)xREH89=C(5YKL{mmJJ_d>qHz;;gTvTlgM*vz9@YTTYZ#%_2A zS0G-t9oMQEpvfv(UjfQ8T$vAHi)zOj3>D*{xSRiu3acc=7cvLyD?_ZObdu$5@b*!y zaZ#u?7uF}SrHVQa=sTOhGW{6WUlq#RhPPm^GsRH#qlX8{Kq-i~98l;eq>KdCnWyKl zUu&UWBqu#Tt9jQ97U4}3)&(p2-eCLznXMEm!>i^EMpeVzPg%p;?@O;dJBQQY(vV;d z3v+-3oTPC!2LTUAx^S2t{v;S_h(EZ^0_dS5g^F*m{TEIy^Qal~%mu3h7*o`jWOH}i ztv8M)3X3a*+ry_KkYXYE4dB0?M|t}#Tp+(}6CQ zBbq;xhoHj}b@j-@koDB#XcCY~>_x&Y;i%MH|3tF^X2h{36UCVfQ-;oEA+4ZkJ`^Qi zQf^8}6eFO$Z+Dj-F1wkG##tTx>FjR2oOXFmbKFj6K3+=kePQ<4d7%z5R5cOB;zO6| zm9^m#U4lcA;7t&*=q|a-!`!)}SgYXT#i8hnxtx@kaoBF$QAS-hT7N5kH^l zB^i+})V>L;9_0Qqf-dyF%ky8Mp-dp#%!Nls3vCt}q3QLM3M-(Zs1k}1bqQ9PVU)U` ztE=?;^6=x}_VD%N@${>qhpkU*)AuUBu_cqYiY&@;O$HV*z@~#Tzh?#=CK`=KwBv+o zh%zu%0xPKYtyC)DaQ zpDW}*86g%>BH3IcWMq`g$j()0kWE(qkIL8A&A0mf&+BzxpKF}=`#jG% z&*wa!&pGFLs5_b#QTZE4Bp+})qzyPQ7B4Z7Y*&?0PSX&|FIR;WBP1|coF9ZeP*$9w z!6aJ_3%Sh=HY3FAt8V144|yfu}IAyYHr1OYKIZ51F>_uY^%N#!k~eU53at-_E-Gh?ahmM5y* z+BTIbeH;%v1}Cjo{8d%UeSMWg(nphxEU`sL< zQR~LrTq>Da(FqSP2%&^1ZL#DTo5Sbl9;&57tQ-@U&I#lj)aNSkcfEJwQD!33?anVU z?pw2q7WtMvfji493`rSFnyp7{w87cW`ak=UEYlk5PCB1K6UDVKXyozOChH4yHh~Q< zv>yvKw6WLfi!PZUx60JZcTNM7jo{ww9b8Q+S7C3WA5&llSwdwh$=Q(*(f3ofqcz=nwOmOy z(J!K=*wNoRU*${{Mbwapi9pTB(&VVKefqd-qrUb9*Eyr2E@oZ9Cgf}Mc;QP<0D)R4 zz=!*^VIG4T*7Xl=sJxrWv9hW^eJ%qYp5(d0?E6LZzJ}=7E+1{?GQA;z+!^VBD81}O z0kJ^dKy&WMw+1+aGVYY-v@i28@Gm+sX5=@U%F=Z?W)oar}2~Rc&F|+3A)n-U2GF10+QdxDb^iA@7eL$c7yhBtL z>lABrh^qy9XZ${E1}Ss5!N4;ig0-pUh6@|RPCHOWvgG{|l}2enRgJftsN%D|ck0YO zuAQd2aMPSyGuJ~jm)aY=+p~mGudw4erwE%P^)5f<*$$2C-4^I=e8-}7##ZQ!8!Tep z+Z_!}CAI~sry$|XK$ktXaxP*x<_ijCPp`2=6sNLZU<@9Sz-rz7^BCE9yh0jV4(I!Z zxmA4d;>B-!vD}Xp*&*N%`b^e&R;D97WS}{~{O-EtXeZNfdf51tw!WR6Noo4hjHPv5 z?heYYRSBPjMc}tFEU^|U8a1CxxK%)WTcn9P%`wR^I$QSeMn6=w>Z9OoVvcrl`zYlZ z2y`mAu0bV(Scc>G_EmIo_4 zm*~h`mxYZC&+U>C5G1FZH5L^U>Cq-9UDRQa35jz&NBj*0{uJKfZs5=Fn@&)Xh6aX(H3w9m9BGLePqVotxTeSPh5-mc7$# z-80t6yB0$Nx<54ohdO*QL7m_(&+#*=eoNiYDB4rE4Cag@qfyZS};Fx;Vf1;oync2k z9v#-w?d6R& zOI`CCS_d=tf3|?g3Z}b6-_Rdg3y~enQhmgkni0Cvf9m6%Ft8r;NC5|b%t&?lkl*4{ z8Ui^;Ds^gq6ti(1xB7y_$zA!i-M~#!!tl$ErTR>P~>T=Yky)8(uvPbvLmB=UfoD zrfl}8<1OQrm?8#j1!?s*T>AoectQl&m!o&*^JcIW`_&bk3tN}k^0rjl=HL$z*uIYt z?7l?^Dqr?q1210Sp$xoAy!&{2^{^Anl460 zI&7urrc&|Y{rjv04VOl{y7c82N6xzg5ueYmQ(q(zC3w_C#x*~%yf5j7MI{W`tsoxzA*PrmK)cTskU| zf2C}Bq$>S$-1JgIh0aW@LxI|-8(OGuD#^M01ghh}&#ObO>tZgSw_LW`zdf&IN$YO# z)|X_9m#JwLW5pErZB3ScggKcNzxA9(hyKkK9I#pR&79&*+SV_eu={00{HF=Bb+AEe znaSof+r1jZ!EL5XgqXWkckaFSSyEk}o!%p8XsD}O>borZ6x%X2b&q!s&1-O(>`kZ$ zB2l^5Cx9xQx9)PXN1xPM)@+LxACH_iZ8zGc(>wnFS_O|@hKsxpMjXOzLEa7OvSlM&&G9ioQw9~RsD4F zK7Q+_&|Q6{eZ^8Rx@pKL`le6kH+(fLc{=V&{b%I5=n}VHV4)X_2Y!pYxgC8wU)yP! zPF3t$?(jsC>Ge=&{kmPGUEETpaw(QTAl)m#{qR3_aq9!wK%6XHfV4C>Y^>Z|%ns7j z{Ja?^IA{+@;kR#IjHxkar%3$eJT4?xNBKUVmoO z`A8Zo-{~_;vcikZ(p}EZzU4kO6WPqkMyE{VvS?;44Z@lj zz^fKX9UL!8Wc(9VgI?P4*zpis8dzl};I>yr1>dtXU=FTAlx}Eht4-*7RACL^AflGh zyZb1hTf(~CkMo%#Q%NMgM9tE2D+)joqbtHYA89Ql1nqVTt+MxZ^*FRd&n5YlIi!8m z>$Ysd!l{+C)y;Wa(ZV-=<+NZKV;v4mt}v2m>`v$-$3b;GsLxf= zd~f(rmfpl``{0aVwN7y!>eGyJFP`L+TxHjHTOS{K^$L2`@6(Rli`{EFwpH@R%eZ6g zwf7rc43Yk!=k;{ z-Rn%~B3amGr}}SxfE$vS8FIPL=Qt57$|R#sSoFgdNUT?fYOYjPl%ZBFpi=jq=DWby7Zxm@y;B<89!9= zbgEH*Uy)~iq5kJLX$+ps$kV`#6jW#|9BGz^`ivNeid(wVbk4jl)VBpW&~;eXNi{#` zwx?{DXR~*sqQcFhY0XCfQ4-*2aN1BGX>$_swtKEqnd>j6vcZ!#0)pXRi?<{!P?tGw z2x_`RD$W)qD{?z}VDPt?+)8*rqLWFIPQ(9-VbBdf{7ff?w9CZ{sIi_gnuC$I0(+P8 zms9XB%}VQ>>pve##}jog6+cD?v~n4Pa9Vmc zg#K$|+`adO=B7`uj35Y}6EZ z{dY`x@w8;R-7zrsr1O_~Jvl*|o-x%jF=Rr1C}GXP^|IYN`1sqmG-oI@R#%X66c#5W z$$tQB)sqwiVm;Y^`Dw3mo|firP{*HsOQJre5%Dm^H@we0FN88VWJ0dja?_U38z73f zrCV!b3qNP0kM#%9T!W5`ynGcg%BL28FW1J-J1_S`BJGCaReQ!am(2%qZ3lLgzq|ns z!!fF@`0=*z)J2BwZ*hO|Yu^cI_nF$9l-Pb3jE7=P8gZ#!xiuZ7-cSa`gb`6mxGTgg z-DLdID?M!Z%+hHB#{?&0$GFRpf+_}q<_wbzX6K?w;%6szz1RbySDSr2r^h_qi$khs zXdZ9A0!_Bf)TR2-^-K~q`FQ!#1x(U4VbV%AA@Ei{%cA(EwC{XfjRi?`&9rav5;Q5% zO1`Rn@OA_ZB@N*mC#)?d3P!}Eh;=NgpIKsy{(yr`hv=aouwt@r&P&}Z3DNWo9ro30 zX52~(aTV$*HHlgB66-4GQru!_AZ|)V*I5X=WG)`N@U&D>e@@C#V@JwEL*L`7#$yes z62C^5%Qniaow2$3HrAc7U{qzpb&FA*xLI1JSWR@`RF=JCcvTI)%dH7;sWInt9JLu# z|Ao|Q?K)cDg_JKsym=joo5gR80wtv01N`um1nQ@Ms0Y*bVzxL34} zo?gizp?`=Y{*W>^Hy2%Jl)y?A+&7s1UVHFixuIy~sawXjcDCL`129cK7|ZQS0u;A} zTJC#WNmqkIrnHpAhHVcM(U^vJA~dl@jf_bs*3?i+=&vuC?Aiy_pcB~=1syDni4 zw+FLuz>F773u#$;NUQ9WDtUPY@+rA3WBhQdKFKOyzkA(URa7;4tW>3jQIfi8v0h3g zJC_HVDXS#>DWb|&se7FHnr=q&l#xg9o02}}u=b-R>@sw={Z zHF*?t2FmhqZ=|qa>x=A!*$S+0T zhO*D*M?NTf-eX`eO)9TIQu{7Dm77Acnj4b1jI9@c*ZL8wL%8kLEhd$KM8=Y!fbN@9 zC7B5#y>JM1n5M)!&im==EgHs2j+xCZG~+~QWCi?s!QyFo2kqx{%jE2n3^N*Ayz6Lp zhg5g^3# z+5FoJ@$u@9WJgPKpUWEd4}4AK9TJKU8W%ms!d0p%OIOX+bY+55zl!vIaz$XFI9Ep+ z;bL_}7PDI2Y`Ng*XY(65 zh0%`@Lve%fc;)N4_g12bNrt6gH=N#OHtxO`$lpWlw=Z6MF+E@;>GkZ#lAZTn`aHwf z&I1|aV#b_VHMIgBN*RzU9i@Z@m}0i>o?({&%fpEfaOpFeaJ7V37;m0?kzd}}Lk@9$ zL}8TEo7WZAcRi%zFZxkr6<0k#X-;lTD`Oc~cDb@olwgWCewvk{GJ}hCXbF!AdiLpd z|Cck$ZTKI?Ack{34Lva7+k=H8K2HTZiurox6F+>dy+@R9T^awxj590D$|kXUg+Ygc z(f)jlRwN(4z$#%PnOVc;#Fv{nAi{#UcXPNcmP#5O{zh_*`=q^JCeia{sN4zHjk2*y zqUVh{Ya{j>SPmP^i#Qfcq_MTqo8g52Fi^F zKBc$$HVI!xFx*4Y9l+nt)$AoZORD}%5I10oI3kx`-N30QueiwIw#0VV2E*Fb-nKW% z=+r^hos`Y-7~{cA1FVbK$_=~*z53+Q8KGjg;>ztg((H12%QTf4OYU8y)C}h5yo#$% z&Q$`vMM*g?ZcatAn2j!hFv8KuN(dw)T*}sF#THDHxo8xC^?vJ zc`U6bVo~hOr6I!8*GTZ<^D~;unKjK=!IR|GB4E>Mcvt*2GK);93jIDd<(nNjHO z4Hi@2^%Uyx=^Z~5eZ!5rO5%4H|eFoNjD#+Kcu%_57zZb4Z@Ak#X6txD^{U3wBl^r+W- zLorkK;uc;NgTj7dGxHQS+@T*T>Q*j4^Ll$ejQqWrwcHyG9y%Mk%m8nBVG5hvSaYm5 zJN^#-Q46kZG)@T8n2^QCjxIwxUVi%s>EY`E?#@_(A~njFrTiDq;8v|W-1jT|ROlNI zU$h|YoD4PVTE^&NC6_m{EAFBVqsM`P*`-AcDGWQygURzM32Xeq2xng~XQsYeTZ5v$ zQLaa2M_Iplw}4eL6fLPu`6`PYcVMysO>`{8CB~glD=TX7?JZcHfHNmykBM?QD)#D) zGp>R*<^D?WhFQKRc^}22l6F=D2RPrxaX2ZF!b1X0XF*d4%=!sbNcS1q2WOUE(7e4$ z^L8f;F)__d3>&KQFE8%$I4h^y5FYBfB&fWzn71_OSrPe-DHV{O#Q;GP z+Tw!J?eVjX19RKH?*hKQWQt8r7B#lYX8xoSHFGCW-*DSQ4EM4M3Mw%gkSYNK18@(e zfzMF}WWaCyS@1y%-~Xg0ry~tkQkUmKuI5lGAua{{vn22V!2T()AU5FpKh@Nv)s^Js zv~@VuUG;=CnLmQR{PeUBQf2;lAV!vG>^Z0N zL88rrjL-*J!43;7C=w9xhcw`yjRKq7o4L9=0SmR9PA-nX12@#h(iIu-0N_xm2OV)( zU_raT0y>$wm^oMi2|U3N;OhF9uy}`<-xVka#DV*l{O0yHzi9vUxa1Qtpi$buR*8cU zd4~lS1pT$L^!0=6qUKOpM+XPsy{f7W#1bjrEwaeN!Ik9(zySIT^pEHvHgJUneFN4) zk=k|$55(g8slmS|@+*4fr2urd3LwjIIZA**g+%l(SZNn4HwQ}y6o`vw>2&mR1X+&q zDa1Af0B;4rAMZMOlHbAqK|R_xuwJ7ANARtFE({-P2o{tJJR<>2KVp)ZK-M;)ejx zd*E~Mka<{OL7%CAhk4n|1qg?97-I!l0rOinjVi#arbgg4bi5;nY5oFL`UWtPk5&L#grSxv zE3!}=1px!ZTLT90aYc^s`~{VojjJml&<`@e41dFP+XU6D0AOkbn2rlI3>^LcqauG& zc$m3Z{!u8LvUrm^fT{qX5yD9{?r(CCiUdck%!T`KIZd2oQJz1joB&M(Teg_>;yS<2-5>BWfSPpG`Rt{!j6>kqMAvl^zk0JUEfy$HVJMkxP-GkwZuxL62me2#pj_5*ZIU zP~#C^OZLfl$HO)v;~~c&JHivn|1I9H5y_CDkt0JLLGKm(4*KLVhJ2jh2#vJuM6`b& zE==-lvME^Oj022xF&IV*? '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && 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=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=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +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 000000000..93e3f59f1 --- /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. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +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 000000000..5cea63d0d --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'spring-jpa-mission' diff --git a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java new file mode 100644 index 000000000..b6e696ec8 --- /dev/null +++ b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java @@ -0,0 +1,13 @@ +package com.example.springjpamission; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class SpringJpaMissionApplication { + + public static void main(String[] args) { + SpringApplication.run(SpringJpaMissionApplication.class, args); + } + +} diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java new file mode 100644 index 000000000..2621f10a5 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -0,0 +1,29 @@ +package com.example.springjpamission.customer.domain; + +import com.example.springjpamission.gobal.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.Getter; +import lombok.Setter; + + +@Entity +@Getter +@Setter +public class Customer extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + @Column(nullable = false, length = 30) + private String firstName; + + @Column(nullable = false, length = 30) + private String lastName; + + +} diff --git a/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java b/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java new file mode 100644 index 000000000..10520882d --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java @@ -0,0 +1,8 @@ +package com.example.springjpamission.customer.domain; + + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface CustomerRepository extends JpaRepository { + +} diff --git a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java new file mode 100644 index 000000000..0f8ab8926 --- /dev/null +++ b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java @@ -0,0 +1,16 @@ +package com.example.springjpamission.gobal; + +import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@MappedSuperclass +public class BaseEntity { + + private LocalDateTime createdAt; + + private LocalDateTime updatedAt; +} diff --git a/src/main/java/com/example/springjpamission/order/domain/Order.java b/src/main/java/com/example/springjpamission/order/domain/Order.java new file mode 100644 index 000000000..de092ce9c --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/Order.java @@ -0,0 +1,5 @@ +package com.example.springjpamission.order.domain; + +public class Order { + +} diff --git a/src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java b/src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java new file mode 100644 index 000000000..4f74e7ee2 --- /dev/null +++ b/src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java @@ -0,0 +1,13 @@ +package com.example.springjpamission; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class SpringJpaMissionApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java new file mode 100644 index 000000000..4ba6db7e2 --- /dev/null +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java @@ -0,0 +1,86 @@ +package com.example.springjpamission.customer.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.transaction.annotation.Transactional; + +@SpringBootTest +@Transactional +class CustomerRepositoryTest { + + static final String FIRST_NAME = "김"; + static final String LAST_NAME = "별"; + + @Autowired + CustomerRepository customerRepository; + + private Customer testCustomer; + + @BeforeEach + void setUp() { + Customer customer = new Customer(); + customer.setFirstName(FIRST_NAME); + customer.setLastName(LAST_NAME); + + testCustomer = customerRepository.save(customer); + } + + @Test + void create() { + //given + Customer customer = new Customer(); + customer.setFirstName("윤"); + customer.setLastName("영운"); + + //when + Customer save = customerRepository.save(customer); + + //then + assertThat(save.getLastName()).isEqualTo("영운"); + } + + @Test + void findById() { + //when + Customer savedCustomer = customerRepository.findById(testCustomer.getId()) + .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); + + //then + assertThat(savedCustomer.getFirstName()).isEqualTo(FIRST_NAME); + assertThat(savedCustomer.getLastName()).isEqualTo(LAST_NAME); + } + + @Test + void deleteById(){ + //given + Customer savedCustomer = customerRepository.findById(testCustomer.getId()) + .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); + Long savedId = savedCustomer.getId(); + + //when + customerRepository.deleteById(savedId); + + //then + assertThat(customerRepository.findAll().size()).isEqualTo(0); + } + + @Test + void update(){ + //given + Customer savedCustomer = customerRepository.findById(testCustomer.getId()) + .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); + + //when + savedCustomer.setFirstName("윤"); + savedCustomer.setLastName("영운"); + + //then + Customer updatedCustomer = customerRepository.findById(savedCustomer.getId()) + .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); + assertThat(updatedCustomer.getFirstName()).isEqualTo("윤"); + } +} From 84b8d450e06abde43f5d7585e2d87596258f76c2 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Sun, 30 Jul 2023 20:35:48 +0900 Subject: [PATCH 02/10] =?UTF-8?q?=EB=AF=B8=EC=85=98=202=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C=20:=20=EC=98=81=EC=86=8D=EC=84=B1=20=EC=BB=A8?= =?UTF-8?q?=ED=85=8D=EC=8A=A4=ED=8A=B8=20=EC=83=9D=EB=AA=85=EC=A3=BC?= =?UTF-8?q?=EA=B8=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DataSourceConfig.java | 75 +++++++++++++ .../customer/domain/Customer.java | 1 + .../customer/domain/VoucherConverter.java | 8 ++ .../PersistenceContextTest.java | 103 ++++++++++++++++++ 4 files changed, 187 insertions(+) create mode 100644 src/main/java/com/example/springjpamission/config/DataSourceConfig.java create mode 100644 src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java create mode 100644 src/test/java/com/example/springjpamission/PersistenceContextTest.java diff --git a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java new file mode 100644 index 000000000..5bc47d11b --- /dev/null +++ b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java @@ -0,0 +1,75 @@ +package com.example.springjpamission.config; + +import java.util.Properties; +import javax.sql.DataSource; +import org.springframework.boot.autoconfigure.orm.jpa.JpaProperties; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.jdbc.datasource.DriverManagerDataSource; +import org.springframework.orm.jpa.JpaTransactionManager; +import org.springframework.orm.jpa.JpaVendorAdapter; +import org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean; +import org.springframework.orm.jpa.vendor.AbstractJpaVendorAdapter; +import org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter; +import org.springframework.transaction.PlatformTransactionManager; + +@Configuration +public class DataSourceConfig { + @Bean + public DataSource dataSource() { + DriverManagerDataSource dataSource = new DriverManagerDataSource(); + dataSource.setDriverClassName("org.h2.Driver"); + dataSource.setUrl("jdbc:h2:tcp://localhost/~/test"); + dataSource.setUsername("sa"); + dataSource.setPassword(""); + + return dataSource; + } + + /** + * @JpaVendorAdapter : JPA는 여러 구현체가 존재하기 때문에 구현체별 설정을 지원하기 위한 클래스이다. + * Hibernate를 사용하기 때문에 HibernateJpaVendorAdapter를 사용한다. + * @param jpaProperties + * @return + */ + @Bean + public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { + AbstractJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); + adapter.setShowSql(jpaProperties.isShowSql()); + adapter.setDatabasePlatform(jpaProperties.getDatabasePlatform()); + adapter.setGenerateDdl(jpaProperties.isGenerateDdl()); + return adapter; + } + + /** + * @LocalContainerEntityManagerFactoryBean : + * EntityManagerFactoryBean을 Spring에서 사용하기 위한 클래스 + * @param dataSource + * @param jpaVendorAdapter + * @param jpaProperties + * @return + */ + @Bean + public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, + JpaProperties jpaProperties) { + LocalContainerEntityManagerFactoryBean em + = new LocalContainerEntityManagerFactoryBean(); + em.setDataSource(dataSource); + em.setPackagesToScan("com.example"); + em.setJpaVendorAdapter(jpaVendorAdapter); + + Properties properties = new Properties(); + properties.putAll(jpaProperties.getProperties()); + em.setJpaProperties(properties); + + return em; + } + + @Bean + public PlatformTransactionManager transactionManager(LocalContainerEntityManagerFactoryBean entityManagerFactory) { + JpaTransactionManager transactionManager = new JpaTransactionManager(); + transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); + + return transactionManager; + } +} diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 2621f10a5..1b238804a 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -15,6 +15,7 @@ @Setter public class Customer extends BaseEntity { + //@GeneratedValue(strategy = GenerationType.IDENTITY) @Id @GeneratedValue(strategy = GenerationType.AUTO) private Long id; diff --git a/src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java b/src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java new file mode 100644 index 000000000..b404aba08 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java @@ -0,0 +1,8 @@ +package com.example.springjpamission.customer.domain; + +import org.springframework.stereotype.Component; + +@Component +public class VoucherConverter { + +} diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java new file mode 100644 index 000000000..94313acea --- /dev/null +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -0,0 +1,103 @@ +package com.example.springjpamission; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +import com.example.springjpamission.customer.domain.Customer; +import com.example.springjpamission.customer.domain.CustomerRepository; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import java.util.Arrays; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.context.ApplicationContext; +import org.springframework.test.context.ActiveProfiles; + +@ActiveProfiles("test") +//@SpringBootTest +@DataJpaTest +public class PersistenceContextTest { + + @Autowired + EntityManagerFactory entityManagerFactory; + + @Test + void save() { + EntityManager em = entityManagerFactory.createEntityManager(); + EntityTransaction transaction = em.getTransaction(); + + transaction.begin(); + Customer customer = new Customer(); + customer.setFirstName("윤"); + customer.setLastName("영운"); + + em.persist(customer); + + transaction.commit(); + em.clear(); + + Customer findCustomer = em.find(Customer.class, customer.getId()); + + assertThat(findCustomer.getId()).isEqualTo(customer.getId()); + } + + @Test + void update() { + EntityManager em = entityManagerFactory.createEntityManager(); + EntityTransaction transaction = em.getTransaction(); + + transaction.begin(); + Customer customer = new Customer(); + customer.setFirstName("윤"); + customer.setLastName("영운"); + + em.persist(customer); + + transaction.commit(); + + transaction.begin(); + + Customer findCustomer = em.find(Customer.class, customer.getId()); + findCustomer.setLastName("별"); + findCustomer.setFirstName("김"); + + em.persist(findCustomer); + + transaction.commit(); + + em.clear(); + Customer updatedCustomer = em.find(Customer.class, findCustomer.getId()); + + assertThat(updatedCustomer.getFirstName()).isEqualTo("김"); + assertThat(updatedCustomer.getLastName()).isEqualTo("별"); + } + + @Test + void delete() { + EntityManager em = entityManagerFactory.createEntityManager(); + EntityTransaction transaction = em.getTransaction(); + + transaction.begin(); + Customer customer = new Customer(); + customer.setFirstName("윤"); + customer.setLastName("영운"); + + em.persist(customer); + + transaction.commit(); + Customer findCustomer = em.find(Customer.class, customer.getId()); + + transaction.begin(); + + em.remove(findCustomer); + + transaction.commit(); + + Customer deletedCustomer = em.find(Customer.class, findCustomer.getId()); + + assertThat(deletedCustomer).isNull(); + + } +} From 569a540bb5f87fb428836352a4ea5aaeee16955e Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Mon, 31 Jul 2023 01:27:14 +0900 Subject: [PATCH 03/10] =?UTF-8?q?=EB=AF=B8=EC=85=98=203=20=EC=99=84?= =?UTF-8?q?=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/domain/Customer.java | 7 +- .../springjpamission/gobal/BaseEntity.java | 11 ++ .../springjpamission/order/domain/Car.java | 14 +++ .../springjpamission/order/domain/Food.java | 14 +++ .../springjpamission/order/domain/Item.java | 32 +++++ .../springjpamission/order/domain/Order.java | 45 ++++++- .../order/domain/OrderItem.java | 51 ++++++++ .../order/domain/OrderRepository.java | 7 ++ .../domain/CustomerRepositoryTest.java | 8 +- .../customer/domain/OrderRepositoryTest.java | 84 +++++++++++++ .../customer/domain/RelationMappingTest.java | 113 ++++++++++++++++++ 11 files changed, 380 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/example/springjpamission/order/domain/Car.java create mode 100644 src/main/java/com/example/springjpamission/order/domain/Food.java create mode 100644 src/main/java/com/example/springjpamission/order/domain/Item.java create mode 100644 src/main/java/com/example/springjpamission/order/domain/OrderItem.java create mode 100644 src/main/java/com/example/springjpamission/order/domain/OrderRepository.java create mode 100644 src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java create mode 100644 src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 1b238804a..430eb36ce 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -1,11 +1,15 @@ package com.example.springjpamission.customer.domain; import com.example.springjpamission.gobal.BaseEntity; +import com.example.springjpamission.order.domain.Order; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.OneToMany; +import java.util.ArrayList; +import java.util.List; import lombok.Getter; import lombok.Setter; @@ -26,5 +30,6 @@ public class Customer extends BaseEntity { @Column(nullable = false, length = 30) private String lastName; - + @OneToMany(mappedBy = "customer") + private List orders = new ArrayList<>(); } diff --git a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java index 0f8ab8926..f3d652486 100644 --- a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java +++ b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java @@ -1,16 +1,27 @@ package com.example.springjpamission.gobal; +import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import org.springframework.format.annotation.DateTimeFormat; @Getter @Setter @MappedSuperclass +@EntityListeners(value = {AuditingEntityListener.class}) public class BaseEntity { + @CreatedDate + @DateTimeFormat(pattern = "yyyy-MM-dd/HH:mm:ss") private LocalDateTime createdAt; + @LastModifiedDate + @DateTimeFormat(pattern = "yyyy-MM-dd/HH:mm:ss") private LocalDateTime updatedAt; + } diff --git a/src/main/java/com/example/springjpamission/order/domain/Car.java b/src/main/java/com/example/springjpamission/order/domain/Car.java new file mode 100644 index 000000000..b6bb6f583 --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/Car.java @@ -0,0 +1,14 @@ +package com.example.springjpamission.order.domain; + +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@DiscriminatorValue("CAR") +public class Car extends Item{ + private int power; +} diff --git a/src/main/java/com/example/springjpamission/order/domain/Food.java b/src/main/java/com/example/springjpamission/order/domain/Food.java new file mode 100644 index 000000000..20a99db4e --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/Food.java @@ -0,0 +1,14 @@ +package com.example.springjpamission.order.domain; + +import jakarta.persistence.DiscriminatorValue; +import jakarta.persistence.Entity; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Entity +@DiscriminatorValue("FOOD") +public class Food extends Item{ + private String chef; +} diff --git a/src/main/java/com/example/springjpamission/order/domain/Item.java b/src/main/java/com/example/springjpamission/order/domain/Item.java new file mode 100644 index 000000000..206816ff1 --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/Item.java @@ -0,0 +1,32 @@ +package com.example.springjpamission.order.domain; + +import com.example.springjpamission.gobal.BaseEntity; +import jakarta.persistence.DiscriminatorColumn; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Inheritance; +import jakarta.persistence.InheritanceType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import lombok.Getter; +import lombok.Setter; + +@Getter +@Setter +@Inheritance(strategy = InheritanceType.SINGLE_TABLE) +@DiscriminatorColumn(name = "DTYPE") +@Entity +public abstract class Item extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + private int price; + private int stockQuantity; + + @ManyToOne + @JoinColumn(name = "order_item_id", referencedColumnName = "id") + private OrderItem orderItem; +} diff --git a/src/main/java/com/example/springjpamission/order/domain/Order.java b/src/main/java/com/example/springjpamission/order/domain/Order.java index de092ce9c..4cdc6f2e9 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Order.java +++ b/src/main/java/com/example/springjpamission/order/domain/Order.java @@ -1,5 +1,48 @@ package com.example.springjpamission.order.domain; -public class Order { +import com.example.springjpamission.customer.domain.Customer; +import com.example.springjpamission.gobal.BaseEntity; +import jakarta.persistence.CascadeType; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; +import jakarta.persistence.Table; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import lombok.Getter; +import lombok.Setter; +@Entity +@Table(name = "orders") +@Getter +@Setter +public class Order extends BaseEntity { + @Id + private String id; + + private String memo; + + @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @JoinColumn(name = "customer_id", referencedColumnName = "id") + private Customer customer; + + @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + private List orderItems = new ArrayList<>(); + + public void setCustomer(Customer customer){ + if (Objects.nonNull(this.customer)){ + this.customer.getOrders().remove(this); + } + + this.customer = customer; + customer.getOrders().add(this); + } + + public void addOrderItem(OrderItem orderItem){ + orderItem.setOrder(this); + } } diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java new file mode 100644 index 000000000..68e47091c --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -0,0 +1,51 @@ +package com.example.springjpamission.order.domain; + +import com.example.springjpamission.gobal.BaseEntity; +import jakarta.persistence.CascadeType; +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.ManyToOne; +import jakarta.persistence.OneToMany; +import java.util.ArrayList; +import java.util.List; +import java.util.Objects; +import lombok.Getter; +import lombok.Setter; + +@Entity +@Getter +@Setter +public class OrderItem extends BaseEntity { + @Id + @GeneratedValue(strategy = GenerationType.AUTO) + private Long id; + + private int price; + private int quantity; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "order_id", referencedColumnName = "id") + private Order order; + + @OneToMany(mappedBy = "orderItem", cascade = CascadeType.ALL) + private List items = new ArrayList<>(); + + + public void setOrder(Order order){ // 방금 아까 봤던 오더 + if (Objects.nonNull(this.order)){ + this.order.getOrderItems().remove(this); + } + + this.order = order; + order.getOrderItems().add(this); + } + + public void addItem(Item item){ + this.items.add(item); + item.setOrderItem(this); + } +} diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderRepository.java b/src/main/java/com/example/springjpamission/order/domain/OrderRepository.java new file mode 100644 index 000000000..b0ec5e493 --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/OrderRepository.java @@ -0,0 +1,7 @@ +package com.example.springjpamission.order.domain; + +import org.springframework.data.jpa.repository.JpaRepository; + +public interface OrderRepository extends JpaRepository { + +} diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java index 4ba6db7e2..5ecefd1de 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java @@ -5,11 +5,11 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.transaction.annotation.Transactional; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.test.context.ActiveProfiles; -@SpringBootTest -@Transactional +@ActiveProfiles("test") +@DataJpaTest class CustomerRepositoryTest { static final String FIRST_NAME = "김"; diff --git a/src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java b/src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java new file mode 100644 index 000000000..53208f284 --- /dev/null +++ b/src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java @@ -0,0 +1,84 @@ +package com.example.springjpamission.customer.domain; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +import com.example.springjpamission.order.domain.Car; +import com.example.springjpamission.order.domain.Order; +import com.example.springjpamission.order.domain.OrderItem; +import com.example.springjpamission.order.domain.OrderRepository; +import java.util.UUID; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.test.context.ActiveProfiles; + +@ActiveProfiles("test") +@DataJpaTest +public class OrderRepositoryTest { + + @Autowired + OrderRepository orderRepository; + + private Order testOrder; + private String uuid; + + @BeforeEach + void setUp() { + uuid = UUID.randomUUID().toString(); + + Order order = new Order(); + order.setMemo("---"); + order.setId(uuid); + + testOrder = orderRepository.save(order); + } + + @Test + void customerMappingTest() { + Customer customer = new Customer(); + customer.setFirstName("별"); + customer.setLastName("김"); + + testOrder.setCustomer(customer); + + Order updatedOrder = orderRepository.save(testOrder); + + assertThat(updatedOrder.getCustomer().getFirstName()).isEqualTo("별"); + } + + @Test + void orderItemMappingTest() { + OrderItem orderItem = new OrderItem(); + orderItem.setPrice(1000); + orderItem.setQuantity(10); + + testOrder.addOrderItem(orderItem); + + Order updatedOrder = orderRepository.save(testOrder); + + assertThat(updatedOrder.getOrderItems().get(0).getPrice()).isEqualTo(1000); + } + + @Test + void itemMappingTest() { + OrderItem orderItem = new OrderItem(); + orderItem.setPrice(1000); + orderItem.setQuantity(10); + + Car item = new Car(); + item.setPrice(1000); + item.setPower(200); + item.setStockQuantity(100); + + orderItem.addItem(item); + + testOrder.addOrderItem(orderItem); + + Order updatedOrder = orderRepository.save(testOrder); + + assertThat(updatedOrder.getOrderItems().get(0).getItems().get(0).getPrice()).isEqualTo( + 1000); + } + +} diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java new file mode 100644 index 000000000..0b82eb8d8 --- /dev/null +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -0,0 +1,113 @@ +package com.example.springjpamission.customer.domain; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.example.springjpamission.order.domain.Car; +import com.example.springjpamission.order.domain.Item; +import com.example.springjpamission.order.domain.Order; +import com.example.springjpamission.order.domain.OrderItem; +import jakarta.persistence.EntityManager; +import jakarta.persistence.EntityManagerFactory; +import jakarta.persistence.EntityTransaction; +import java.util.List; +import java.util.UUID; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; +import org.springframework.test.context.ActiveProfiles; + +@ActiveProfiles("test") +@DataJpaTest +public class RelationMappingTest { + + @Autowired + EntityManagerFactory entityManagerFactory; + + + @Test + void order_customer_mappingTest(){ + //given + EntityManager em = entityManagerFactory.createEntityManager(); + EntityTransaction transaction = em.getTransaction(); + + //when + transaction.begin(); + + String uuid = UUID.randomUUID().toString(); + Order order = new Order(); + order.setMemo("---"); + order.setId(uuid); + + Customer customer = new Customer(); + customer.setFirstName("영운"); + customer.setLastName("윤"); + + order.setCustomer(customer); + em.persist(order); + transaction.commit(); + em.clear(); + Order findOrder = em.find(Order.class, order.getId()); + + //then + assertThat(findOrder.getCustomer().getFirstName()).isEqualTo("영운"); + assertThat(findOrder.getCustomer().getLastName()).isEqualTo("윤"); + } + + @Test + void order_orderItem_mappingTest() { + //given + EntityManager em = entityManagerFactory.createEntityManager(); + EntityTransaction transaction = em.getTransaction(); + + //when + transaction.begin(); + String uuid = UUID.randomUUID().toString(); + Order order = new Order(); + order.setMemo("---"); + order.setId(uuid); + + OrderItem orderItem = new OrderItem(); + orderItem.setPrice(1000); + orderItem.setQuantity(10); + order.addOrderItem(orderItem); + + em.persist(order); + transaction.commit(); + em.clear(); + Order updatedOrder = em.find(Order.class, uuid); + + //then + assertThat(updatedOrder.getOrderItems().get(0).getPrice()).isEqualTo(1000); + assertThat(updatedOrder.getOrderItems().get(0).getQuantity()).isEqualTo(10); + } + + @Test + void orderItem_item_mappingTest(){ + //given + EntityManager em = entityManagerFactory.createEntityManager(); + EntityTransaction transaction = em.getTransaction(); + + //when + transaction.begin(); + + OrderItem orderItem = new OrderItem(); + orderItem.setPrice(1000); + orderItem.setQuantity(10); + + Car item = new Car(); + item.setPrice(1000); + item.setPower(200); + item.setStockQuantity(100); + + orderItem.addItem(item); + + em.persist(orderItem); + transaction.commit(); + + OrderItem updatedOrderItem = em.find(OrderItem.class, orderItem.getId()); + Car item1 = (Car)updatedOrderItem.getItems().get(0); + + // then + assertThat(item1.getPower()).isEqualTo(200); + } +} From 014cfe18c466de89416d884d2a60dc054f727808 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Mon, 31 Jul 2023 01:50:51 +0900 Subject: [PATCH 04/10] =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=A0=95=EB=A0=AC?= =?UTF-8?q?=20=EB=B0=8F=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/domain/Customer.java | 3 +- .../customer/domain/CustomerRepository.java | 1 - .../customer/domain/VoucherConverter.java | 8 -- .../PersistenceContextTest.java | 5 -- .../customer/domain/OrderRepositoryTest.java | 84 ------------------- .../customer/domain/RelationMappingTest.java | 4 +- 6 files changed, 2 insertions(+), 103 deletions(-) delete mode 100644 src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java delete mode 100644 src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 430eb36ce..7fcc6bb8a 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -13,13 +13,11 @@ import lombok.Getter; import lombok.Setter; - @Entity @Getter @Setter public class Customer extends BaseEntity { - //@GeneratedValue(strategy = GenerationType.IDENTITY) @Id @GeneratedValue(strategy = GenerationType.AUTO) private Long id; @@ -32,4 +30,5 @@ public class Customer extends BaseEntity { @OneToMany(mappedBy = "customer") private List orders = new ArrayList<>(); + } diff --git a/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java b/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java index 10520882d..238b5e1ae 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java +++ b/src/main/java/com/example/springjpamission/customer/domain/CustomerRepository.java @@ -1,6 +1,5 @@ package com.example.springjpamission.customer.domain; - import org.springframework.data.jpa.repository.JpaRepository; public interface CustomerRepository extends JpaRepository { diff --git a/src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java b/src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java deleted file mode 100644 index b404aba08..000000000 --- a/src/main/java/com/example/springjpamission/customer/domain/VoucherConverter.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.example.springjpamission.customer.domain; - -import org.springframework.stereotype.Component; - -@Component -public class VoucherConverter { - -} diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java index 94313acea..cd4d0da92 100644 --- a/src/test/java/com/example/springjpamission/PersistenceContextTest.java +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -3,20 +3,15 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import com.example.springjpamission.customer.domain.Customer; -import com.example.springjpamission.customer.domain.CustomerRepository; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; -import java.util.Arrays; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationContext; import org.springframework.test.context.ActiveProfiles; @ActiveProfiles("test") -//@SpringBootTest @DataJpaTest public class PersistenceContextTest { diff --git a/src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java b/src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java deleted file mode 100644 index 53208f284..000000000 --- a/src/test/java/com/example/springjpamission/customer/domain/OrderRepositoryTest.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.example.springjpamission.customer.domain; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; - -import com.example.springjpamission.order.domain.Car; -import com.example.springjpamission.order.domain.Order; -import com.example.springjpamission.order.domain.OrderItem; -import com.example.springjpamission.order.domain.OrderRepository; -import java.util.UUID; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.test.context.ActiveProfiles; - -@ActiveProfiles("test") -@DataJpaTest -public class OrderRepositoryTest { - - @Autowired - OrderRepository orderRepository; - - private Order testOrder; - private String uuid; - - @BeforeEach - void setUp() { - uuid = UUID.randomUUID().toString(); - - Order order = new Order(); - order.setMemo("---"); - order.setId(uuid); - - testOrder = orderRepository.save(order); - } - - @Test - void customerMappingTest() { - Customer customer = new Customer(); - customer.setFirstName("별"); - customer.setLastName("김"); - - testOrder.setCustomer(customer); - - Order updatedOrder = orderRepository.save(testOrder); - - assertThat(updatedOrder.getCustomer().getFirstName()).isEqualTo("별"); - } - - @Test - void orderItemMappingTest() { - OrderItem orderItem = new OrderItem(); - orderItem.setPrice(1000); - orderItem.setQuantity(10); - - testOrder.addOrderItem(orderItem); - - Order updatedOrder = orderRepository.save(testOrder); - - assertThat(updatedOrder.getOrderItems().get(0).getPrice()).isEqualTo(1000); - } - - @Test - void itemMappingTest() { - OrderItem orderItem = new OrderItem(); - orderItem.setPrice(1000); - orderItem.setQuantity(10); - - Car item = new Car(); - item.setPrice(1000); - item.setPower(200); - item.setStockQuantity(100); - - orderItem.addItem(item); - - testOrder.addOrderItem(orderItem); - - Order updatedOrder = orderRepository.save(testOrder); - - assertThat(updatedOrder.getOrderItems().get(0).getItems().get(0).getPrice()).isEqualTo( - 1000); - } - -} diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 0b82eb8d8..9b224a532 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -3,13 +3,11 @@ import static org.assertj.core.api.Assertions.assertThat; import com.example.springjpamission.order.domain.Car; -import com.example.springjpamission.order.domain.Item; import com.example.springjpamission.order.domain.Order; import com.example.springjpamission.order.domain.OrderItem; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; -import java.util.List; import java.util.UUID; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -23,7 +21,6 @@ public class RelationMappingTest { @Autowired EntityManagerFactory entityManagerFactory; - @Test void order_customer_mappingTest(){ //given @@ -110,4 +107,5 @@ void orderItem_item_mappingTest(){ // then assertThat(item1.getPower()).isEqualTo(200); } + } From ad133cdfdf57adec8f3ca9f2f7544a0ec2202884 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Mon, 31 Jul 2023 19:01:15 +0900 Subject: [PATCH 05/10] =?UTF-8?q?=20=ED=94=BC=EC=96=B4=EB=A6=AC=EB=B7=B0?= =?UTF-8?q?=20=EB=B0=98=EC=98=81=20-=20OrderItem=20ManyToOne=20Item=20?= =?UTF-8?q?=EB=8B=A8=EB=B0=A9=ED=96=A5=20-=20Service=20=EB=A0=88=EC=9D=B4?= =?UTF-8?q?=EC=96=B4=20=EC=B6=94=EA=B0=80=20-=20BaseEntity=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 2 + .../SpringJpaMissionApplication.java | 1 + .../customer/domain/Customer.java | 20 ++++++---- .../customer/domain/Name.java | 26 ++++++++++++ .../customer/service/CustomerService.java | 18 +++++++++ .../springjpamission/gobal/BaseEntity.java | 28 ++++++++----- .../springjpamission/order/domain/Item.java | 9 +---- .../order/domain/OrderItem.java | 11 ++--- .../PersistenceContextTest.java | 40 ++++++++++--------- .../domain/CustomerRepositoryTest.java | 26 ++++++------ .../customer/domain/RelationMappingTest.java | 11 +++-- 11 files changed, 127 insertions(+), 65 deletions(-) create mode 100644 src/main/java/com/example/springjpamission/customer/domain/Name.java create mode 100644 src/main/java/com/example/springjpamission/customer/service/CustomerService.java diff --git a/build.gradle b/build.gradle index e50692ba2..b4404448c 100644 --- a/build.gradle +++ b/build.gradle @@ -28,6 +28,8 @@ dependencies { runtimeOnly 'com.h2database:h2' annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' + + implementation 'org.springframework.boot:spring-boot-starter-validation' } tasks.named('test') { diff --git a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java index b6e696ec8..4d3bcf3c5 100644 --- a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java +++ b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java @@ -2,6 +2,7 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication public class SpringJpaMissionApplication { diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 7fcc6bb8a..ee2af4af2 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -2,14 +2,18 @@ import com.example.springjpamission.gobal.BaseEntity; import com.example.springjpamission.order.domain.Order; -import jakarta.persistence.Column; +import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import java.util.ArrayList; import java.util.List; +import javax.print.attribute.standard.MediaSize.NA; +import lombok.Builder; import lombok.Getter; import lombok.Setter; @@ -19,16 +23,18 @@ public class Customer extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false, length = 30) - private String firstName; - - @Column(nullable = false, length = 30) - private String lastName; + @Embedded + private Name name; @OneToMany(mappedBy = "customer") private List orders = new ArrayList<>(); + public Customer(Long id, Name name, List orders){ + this.id= id; + this.name = name; + this.orders = orders; + } } diff --git a/src/main/java/com/example/springjpamission/customer/domain/Name.java b/src/main/java/com/example/springjpamission/customer/domain/Name.java new file mode 100644 index 000000000..05b1233fa --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/domain/Name.java @@ -0,0 +1,26 @@ +package com.example.springjpamission.customer.domain; + +import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.Size; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@NoArgsConstructor +@EqualsAndHashCode +@Getter +@Embeddable +public class Name { + + @Size(min = 1, max = 50) + private String firstName; + + @Size(min = 1, max = 50) + private String lastName; + + public Name(String firstName, String lastName) { + this.firstName = firstName; + this.lastName = lastName; + } + +} diff --git a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java new file mode 100644 index 000000000..f1bcda17b --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java @@ -0,0 +1,18 @@ +package com.example.springjpamission.customer.service; + +import com.example.springjpamission.customer.domain.CustomerRepository; +import org.springframework.transaction.annotation.Transactional; + +@Transactional(readOnly = true) +public class CustomerService { + private final CustomerRepository customerRepository; + + public CustomerService (CustomerRepository customerRepository){ + this.customerRepository = customerRepository; + } + + @Transactional + public SaveCustomerRespone save(SaveCustomerRequest saveCustomerRequest){ + customerRepository. + } +} diff --git a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java index f3d652486..546ea3432 100644 --- a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java +++ b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java @@ -1,27 +1,35 @@ package com.example.springjpamission.gobal; +import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; +import jakarta.persistence.PrePersist; +import jakarta.persistence.PreUpdate; import java.time.LocalDateTime; import lombok.Getter; import lombok.Setter; -import org.springframework.data.annotation.CreatedDate; -import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import org.springframework.format.annotation.DateTimeFormat; @Getter @Setter @MappedSuperclass -@EntityListeners(value = {AuditingEntityListener.class}) public class BaseEntity { - @CreatedDate - @DateTimeFormat(pattern = "yyyy-MM-dd/HH:mm:ss") - private LocalDateTime createdAt; + @Column(name = "CREATED_AT", updatable = false, nullable = false) + private LocalDateTime createAt; - @LastModifiedDate - @DateTimeFormat(pattern = "yyyy-MM-dd/HH:mm:ss") - private LocalDateTime updatedAt; + @Column(name = "LAST_UPDATED_AT", nullable = false) + private LocalDateTime lastUpdatedAt; + + @PrePersist + public void prePersist(){ + LocalDateTime now = LocalDateTime.now(); + createAt = now; + lastUpdatedAt = now; + } + @PreUpdate + public void preUpdate() { + lastUpdatedAt = LocalDateTime.now(); + } } diff --git a/src/main/java/com/example/springjpamission/order/domain/Item.java b/src/main/java/com/example/springjpamission/order/domain/Item.java index 206816ff1..07caddb18 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Item.java +++ b/src/main/java/com/example/springjpamission/order/domain/Item.java @@ -8,8 +8,6 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; import lombok.Getter; import lombok.Setter; @@ -19,14 +17,11 @@ @DiscriminatorColumn(name = "DTYPE") @Entity public abstract class Item extends BaseEntity { + @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private int price; private int stockQuantity; - @ManyToOne - @JoinColumn(name = "order_item_id", referencedColumnName = "id") - private OrderItem orderItem; } diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java index 68e47091c..215ff0973 100644 --- a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -31,9 +31,9 @@ public class OrderItem extends BaseEntity { @JoinColumn(name = "order_id", referencedColumnName = "id") private Order order; - @OneToMany(mappedBy = "orderItem", cascade = CascadeType.ALL) - private List items = new ArrayList<>(); - + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "item_id", referencedColumnName = "id") + private Item items ; public void setOrder(Order order){ // 방금 아까 봤던 오더 if (Objects.nonNull(this.order)){ @@ -44,8 +44,5 @@ public void setOrder(Order order){ // 방금 아까 봤던 오더 order.getOrderItems().add(this); } - public void addItem(Item item){ - this.items.add(item); - item.setOrderItem(this); - } } + diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java index cd4d0da92..116c4fcb9 100644 --- a/src/test/java/com/example/springjpamission/PersistenceContextTest.java +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -3,9 +3,11 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import com.example.springjpamission.customer.domain.Customer; +import com.example.springjpamission.customer.domain.Name; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; @@ -19,80 +21,82 @@ public class PersistenceContextTest { EntityManagerFactory entityManagerFactory; @Test + @DisplayName("고객의 정보를 저장한 후 영속성 컨텍스트를 초기화한 후 저장소에서 정보를 가져왔을 때 같은 primary key로 저장되었는지 확인한다.") void save() { + //given EntityManager em = entityManagerFactory.createEntityManager(); EntityTransaction transaction = em.getTransaction(); + //when transaction.begin(); Customer customer = new Customer(); - customer.setFirstName("윤"); - customer.setLastName("영운"); + customer.setName(new Name("영운","윤")); em.persist(customer); transaction.commit(); em.clear(); + //then Customer findCustomer = em.find(Customer.class, customer.getId()); - assertThat(findCustomer.getId()).isEqualTo(customer.getId()); } @Test + @DisplayName("고객의 정보를 저장소에 저장한 후 이를 수정할 때 의도한 이름으로 수정되었는지 확인한다.") void update() { + //given EntityManager em = entityManagerFactory.createEntityManager(); EntityTransaction transaction = em.getTransaction(); transaction.begin(); Customer customer = new Customer(); - customer.setFirstName("윤"); - customer.setLastName("영운"); - + customer.setName(new Name("영운","윤")); em.persist(customer); transaction.commit(); + //when transaction.begin(); - Customer findCustomer = em.find(Customer.class, customer.getId()); - findCustomer.setLastName("별"); - findCustomer.setFirstName("김"); - + Name newName = new Name("별","김"); + findCustomer.setName(newName); em.persist(findCustomer); transaction.commit(); + //then em.clear(); Customer updatedCustomer = em.find(Customer.class, findCustomer.getId()); - assertThat(updatedCustomer.getFirstName()).isEqualTo("김"); - assertThat(updatedCustomer.getLastName()).isEqualTo("별"); + assertThat(updatedCustomer.getName()).isEqualTo(newName); } @Test + @DisplayName("하나의 정보를 저장소에 저장한 후 이를 삭제했을 때 저장소의 크기가 null인지 확인하다.") void delete() { + //given EntityManager em = entityManagerFactory.createEntityManager(); EntityTransaction transaction = em.getTransaction(); transaction.begin(); Customer customer = new Customer(); - customer.setFirstName("윤"); - customer.setLastName("영운"); + customer.setName(new Name("영운", "윤")); em.persist(customer); - transaction.commit(); - Customer findCustomer = em.find(Customer.class, customer.getId()); + em.clear(); + //when transaction.begin(); + Customer findCustomer = em.find(Customer.class, customer.getId()); em.remove(findCustomer); transaction.commit(); + //then Customer deletedCustomer = em.find(Customer.class, findCustomer.getId()); - assertThat(deletedCustomer).isNull(); - } } diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java index 5ecefd1de..3f5e298ed 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java @@ -3,6 +3,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; @@ -12,8 +13,8 @@ @DataJpaTest class CustomerRepositoryTest { - static final String FIRST_NAME = "김"; - static final String LAST_NAME = "별"; + static final String FIRST_NAME = "별"; + static final String LAST_NAME = "김"; @Autowired CustomerRepository customerRepository; @@ -23,38 +24,39 @@ class CustomerRepositoryTest { @BeforeEach void setUp() { Customer customer = new Customer(); - customer.setFirstName(FIRST_NAME); - customer.setLastName(LAST_NAME); + customer.setName(new Name(FIRST_NAME,LAST_NAME)); testCustomer = customerRepository.save(customer); } @Test + @DisplayName("저장한 고객의 정보 중 last name이 의도한 이름으로 저장되었는지 확인한다.") void create() { //given Customer customer = new Customer(); - customer.setFirstName("윤"); - customer.setLastName("영운"); + customer.setName(new Name("영운", "윤")); //when Customer save = customerRepository.save(customer); //then - assertThat(save.getLastName()).isEqualTo("영운"); + assertThat(save.getName().getLastName()).isEqualTo("윤"); } @Test + @DisplayName("저장한 고객의 정보를 primary key 찾았을 때 올바른 정보로 저장되었는지 확인한다.") void findById() { //when Customer savedCustomer = customerRepository.findById(testCustomer.getId()) .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); //then - assertThat(savedCustomer.getFirstName()).isEqualTo(FIRST_NAME); - assertThat(savedCustomer.getLastName()).isEqualTo(LAST_NAME); + assertThat(savedCustomer.getName().getFirstName()).isEqualTo(FIRST_NAME); + assertThat(savedCustomer.getName().getLastName()).isEqualTo(LAST_NAME); } @Test + @DisplayName("저장한 고객의 정보를 primary key로 찾은 후 삭제하였을 때 제대로 삭제되었는지 사이즈를 확인한다.") void deleteById(){ //given Customer savedCustomer = customerRepository.findById(testCustomer.getId()) @@ -69,18 +71,18 @@ void deleteById(){ } @Test + @DisplayName("저장한 고객의 정보를 수정하였을 때 수정된 정보로 저장되었는지 확인한다.") void update(){ //given Customer savedCustomer = customerRepository.findById(testCustomer.getId()) .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); //when - savedCustomer.setFirstName("윤"); - savedCustomer.setLastName("영운"); + savedCustomer.setName(new Name("영운","윤")); //then Customer updatedCustomer = customerRepository.findById(savedCustomer.getId()) .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); - assertThat(updatedCustomer.getFirstName()).isEqualTo("윤"); + assertThat(updatedCustomer.getName().getFirstName()).isEqualTo("영운"); } } diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 9b224a532..455c985b5 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -9,6 +9,7 @@ import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; import java.util.UUID; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; @@ -22,6 +23,7 @@ public class RelationMappingTest { EntityManagerFactory entityManagerFactory; @Test + @DisplayName("order에 setCustomer 이후 매핑이 잘 되어있는지 확인한다.") void order_customer_mappingTest(){ //given EntityManager em = entityManagerFactory.createEntityManager(); @@ -36,8 +38,8 @@ void order_customer_mappingTest(){ order.setId(uuid); Customer customer = new Customer(); - customer.setFirstName("영운"); - customer.setLastName("윤"); + Name name = new Name("영운", "윤"); + customer.setName(name); order.setCustomer(customer); em.persist(order); @@ -46,11 +48,11 @@ void order_customer_mappingTest(){ Order findOrder = em.find(Order.class, order.getId()); //then - assertThat(findOrder.getCustomer().getFirstName()).isEqualTo("영운"); - assertThat(findOrder.getCustomer().getLastName()).isEqualTo("윤"); + assertThat(findOrder.getCustomer().getName()).isEqualTo(name); } @Test + @DisplayName("order에 setOrderItem 이후 매핑이 잘 되어있는지 확인한다.") void order_orderItem_mappingTest() { //given EntityManager em = entityManagerFactory.createEntityManager(); @@ -79,6 +81,7 @@ void order_orderItem_mappingTest() { } @Test + @DisplayName("orderItem에 setItem 이후 매핑이 잘 되어있는지 확인한다.") void orderItem_item_mappingTest(){ //given EntityManager em = entityManagerFactory.createEntityManager(); From 4e34981cd7ccfdcebd7ed2ceea0e0764ebb2a01d Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Mon, 31 Jul 2023 21:05:03 +0900 Subject: [PATCH 06/10] =?UTF-8?q?=ED=94=BC=EC=96=B4=20=EB=A6=AC=EB=B7=B0?= =?UTF-8?q?=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DataSourceConfig.java | 15 ++-- .../customer/domain/Customer.java | 20 ++++- .../customer/service/CustomerService.java | 37 +++++++- .../customer/service/dto/CustomerRespone.java | 11 +++ .../service/dto/CustomerRespones.java | 16 ++++ .../service/dto/SaveCustomerRequest.java | 6 ++ .../service/dto/UpdateCustomerRequest.java | 7 ++ .../springjpamission/gobal/BaseEntity.java | 20 +++-- .../springjpamission/order/domain/Car.java | 17 +++- .../springjpamission/order/domain/Food.java | 17 +++- .../springjpamission/order/domain/Item.java | 11 ++- .../springjpamission/order/domain/Order.java | 27 ++++-- .../order/domain/OrderItem.java | 30 ++++--- .../PersistenceContextTest.java | 41 ++------- .../domain/CustomerRepositoryTest.java | 88 ------------------- .../customer/domain/CustomerServiceTest.java | 79 +++++++++++++++++ .../customer/domain/RelationMappingTest.java | 39 ++++---- 17 files changed, 294 insertions(+), 187 deletions(-) create mode 100644 src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java create mode 100644 src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java create mode 100644 src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java create mode 100644 src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java delete mode 100644 src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java create mode 100644 src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java diff --git a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java index 5bc47d11b..fd3d5c486 100644 --- a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java +++ b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java @@ -15,6 +15,7 @@ @Configuration public class DataSourceConfig { + @Bean public DataSource dataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); @@ -27,10 +28,10 @@ public DataSource dataSource() { } /** - * @JpaVendorAdapter : JPA는 여러 구현체가 존재하기 때문에 구현체별 설정을 지원하기 위한 클래스이다. - * Hibernate를 사용하기 때문에 HibernateJpaVendorAdapter를 사용한다. * @param jpaProperties * @return + * @JpaVendorAdapter : JPA는 여러 구현체가 존재하기 때문에 구현체별 설정을 지원하기 위한 클래스이다. Hibernate를 사용하기 때문에 + * HibernateJpaVendorAdapter를 사용한다. */ @Bean public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { @@ -42,15 +43,15 @@ public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { } /** - * @LocalContainerEntityManagerFactoryBean : - * EntityManagerFactoryBean을 Spring에서 사용하기 위한 클래스 * @param dataSource * @param jpaVendorAdapter * @param jpaProperties * @return + * @LocalContainerEntityManagerFactoryBean : EntityManagerFactoryBean을 Spring에서 사용하기 위한 클래스 */ @Bean - public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, + public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, + JpaVendorAdapter jpaVendorAdapter, JpaProperties jpaProperties) { LocalContainerEntityManagerFactoryBean em = new LocalContainerEntityManagerFactoryBean(); @@ -66,10 +67,12 @@ public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource da } @Bean - public PlatformTransactionManager transactionManager(LocalContainerEntityManagerFactoryBean entityManagerFactory) { + public PlatformTransactionManager transactionManager( + LocalContainerEntityManagerFactoryBean entityManagerFactory) { JpaTransactionManager transactionManager = new JpaTransactionManager(); transactionManager.setEntityManagerFactory(entityManagerFactory.getObject()); return transactionManager; } + } diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index ee2af4af2..5fa0c1893 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -2,6 +2,7 @@ import com.example.springjpamission.gobal.BaseEntity; import com.example.springjpamission.order.domain.Order; +import com.example.springjpamission.order.domain.OrderItem; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -13,13 +14,15 @@ import java.util.ArrayList; import java.util.List; import javax.print.attribute.standard.MediaSize.NA; +import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Entity @Getter -@Setter +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Customer extends BaseEntity { @Id @@ -32,9 +35,18 @@ public class Customer extends BaseEntity { @OneToMany(mappedBy = "customer") private List orders = new ArrayList<>(); - public Customer(Long id, Name name, List orders){ - this.id= id; + @Builder + public Customer( Name name) { this.name = name; - this.orders = orders; } + + public void changeName(Name name) { + this.name = name; + } + + public void addOrder(Order order) { + this.orders.add(order); + order.setCustomer(this); + } + } diff --git a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java index f1bcda17b..8fb2dc8c4 100644 --- a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java +++ b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java @@ -1,18 +1,49 @@ package com.example.springjpamission.customer.service; +import com.example.springjpamission.customer.domain.Customer; import com.example.springjpamission.customer.domain.CustomerRepository; +import com.example.springjpamission.customer.domain.Name; +import com.example.springjpamission.customer.service.dto.CustomerRespones; +import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; +import com.example.springjpamission.customer.service.dto.CustomerRespone; +import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; +import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +@Service @Transactional(readOnly = true) public class CustomerService { + private final CustomerRepository customerRepository; - public CustomerService (CustomerRepository customerRepository){ + public CustomerService(CustomerRepository customerRepository) { this.customerRepository = customerRepository; } @Transactional - public SaveCustomerRespone save(SaveCustomerRequest saveCustomerRequest){ - customerRepository. + public CustomerRespone saveCustomer(SaveCustomerRequest saveCustomerRequest) { + Customer customer = new Customer( + new Name(saveCustomerRequest.firstName(), saveCustomerRequest.lastName())); + return new CustomerRespone(customerRepository.save(customer)); + } + + @Transactional + public CustomerRespone updateCustomer(UpdateCustomerRequest updateCustomerRequest) { + Customer findCustomer = customerRepository.findById(updateCustomerRequest.id()) + .orElseThrow(() -> new RuntimeException("해당 customer는 존재하지 않습니다.")); + + findCustomer.changeName( + new Name(updateCustomerRequest.firstName(), updateCustomerRequest.lastName())); + return new CustomerRespone(findCustomer); } + + public CustomerRespones findAll() { + return CustomerRespones.of(customerRepository.findAll()); + } + + @Transactional + public void deletById(Long id) { + customerRepository.deleteById(id); + } + } diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java new file mode 100644 index 000000000..05025ab34 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java @@ -0,0 +1,11 @@ +package com.example.springjpamission.customer.service.dto; + +import com.example.springjpamission.customer.domain.Customer; + +public record CustomerRespone(Long id, String firstName, String lastName) { + + public CustomerRespone(Customer customer) { + this(customer.getId(), customer.getName().getFirstName(), customer.getName().getLastName()); + } + +} diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java new file mode 100644 index 000000000..4591fc187 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java @@ -0,0 +1,16 @@ +package com.example.springjpamission.customer.service.dto; + +import com.example.springjpamission.customer.domain.Customer; + +import java.util.List; +import java.util.stream.Collectors; + +public record CustomerRespones(List customerRespones) { + + public static CustomerRespones of(List customers) { + List responses = customers.stream().map(CustomerRespone::new) + .collect(Collectors.toList()); + return new CustomerRespones(responses); + } + +} diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java b/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java new file mode 100644 index 000000000..4746e38c7 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java @@ -0,0 +1,6 @@ +package com.example.springjpamission.customer.service.dto; + +public record SaveCustomerRequest(String firstName, + String lastName) { + +} diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java b/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java new file mode 100644 index 000000000..ba5e9d8b8 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java @@ -0,0 +1,7 @@ +package com.example.springjpamission.customer.service.dto; + +public record UpdateCustomerRequest(Long id, + String firstName, + String lastName) { + +} diff --git a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java index 546ea3432..ccadc4e27 100644 --- a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java +++ b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java @@ -6,6 +6,7 @@ import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import lombok.Getter; import lombok.Setter; import org.springframework.data.jpa.domain.support.AuditingEntityListener; @@ -15,21 +16,24 @@ @MappedSuperclass public class BaseEntity { - @Column(name = "CREATED_AT", updatable = false, nullable = false) - private LocalDateTime createAt; + @Column(name = "created_at", updatable = false, nullable = false) + private String createAt; - @Column(name = "LAST_UPDATED_AT", nullable = false) - private LocalDateTime lastUpdatedAt; + @Column(name = "last_updated_at", nullable = false) + private String lastUpdatedAt; @PrePersist - public void prePersist(){ + public void prePersist() { LocalDateTime now = LocalDateTime.now(); - createAt = now; - lastUpdatedAt = now; + createAt = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + lastUpdatedAt = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); } + @PreUpdate public void preUpdate() { - lastUpdatedAt = LocalDateTime.now(); + lastUpdatedAt = LocalDateTime.now() + .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + } } diff --git a/src/main/java/com/example/springjpamission/order/domain/Car.java b/src/main/java/com/example/springjpamission/order/domain/Car.java index b6bb6f583..dc8a03cce 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Car.java +++ b/src/main/java/com/example/springjpamission/order/domain/Car.java @@ -2,13 +2,26 @@ import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; +import lombok.AccessLevel; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter -@Setter @Entity @DiscriminatorValue("CAR") -public class Car extends Item{ +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Car extends Item { + private int power; + + public Car(int power) { + this.power = power; + } + + public Car(int price, int stockQuantity, int power) { + super(price, stockQuantity); + this.power = power; + } + } diff --git a/src/main/java/com/example/springjpamission/order/domain/Food.java b/src/main/java/com/example/springjpamission/order/domain/Food.java index 20a99db4e..d6858b547 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Food.java +++ b/src/main/java/com/example/springjpamission/order/domain/Food.java @@ -2,13 +2,26 @@ import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; +import lombok.AccessLevel; import lombok.Getter; +import lombok.NoArgsConstructor; import lombok.Setter; @Getter -@Setter @Entity @DiscriminatorValue("FOOD") -public class Food extends Item{ +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Food extends Item { + private String chef; + + public Food(String chef) { + this.chef = chef; + } + + public Food(int price, int stockQuantity, String chef) { + super(price, stockQuantity); + this.chef = chef; + } + } diff --git a/src/main/java/com/example/springjpamission/order/domain/Item.java b/src/main/java/com/example/springjpamission/order/domain/Item.java index 07caddb18..9ea1e147c 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Item.java +++ b/src/main/java/com/example/springjpamission/order/domain/Item.java @@ -8,13 +8,15 @@ import jakarta.persistence.Id; import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; +import lombok.AccessLevel; +import lombok.Builder; import lombok.Getter; -import lombok.Setter; +import lombok.NoArgsConstructor; @Getter -@Setter @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorColumn(name = "DTYPE") +@NoArgsConstructor(access = AccessLevel.PROTECTED) @Entity public abstract class Item extends BaseEntity { @@ -24,4 +26,9 @@ public abstract class Item extends BaseEntity { private int price; private int stockQuantity; + public Item(int price, int stockQuantity) { + this.price = price; + this.stockQuantity = stockQuantity; + } + } diff --git a/src/main/java/com/example/springjpamission/order/domain/Order.java b/src/main/java/com/example/springjpamission/order/domain/Order.java index 4cdc6f2e9..27f18d688 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Order.java +++ b/src/main/java/com/example/springjpamission/order/domain/Order.java @@ -13,18 +13,23 @@ import java.util.ArrayList; import java.util.List; import java.util.Objects; +import lombok.AccessLevel; +import lombok.Builder; import lombok.Getter; -import lombok.Setter; +import lombok.NoArgsConstructor; + @Entity @Table(name = "orders") @Getter -@Setter +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Order extends BaseEntity { + @Id private String id; - private String memo; + private int price; + private int quantity; @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) @JoinColumn(name = "customer_id", referencedColumnName = "id") @@ -33,8 +38,17 @@ public class Order extends BaseEntity { @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) private List orderItems = new ArrayList<>(); - public void setCustomer(Customer customer){ - if (Objects.nonNull(this.customer)){ + @Builder + public Order(String id, String memo, int price, int quantity, Customer customer) { + this.id = id; + this.memo = memo; + this.price = price; + this.quantity = quantity; + this.customer = customer; + } + + public void setCustomer(Customer customer) { + if (Objects.nonNull(this.customer)) { this.customer.getOrders().remove(this); } @@ -42,7 +56,8 @@ public void setCustomer(Customer customer){ customer.getOrders().add(this); } - public void addOrderItem(OrderItem orderItem){ + public void addOrderItem(OrderItem orderItem) { orderItem.setOrder(this); } + } diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java index 215ff0973..9b2ac5ead 100644 --- a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -9,21 +9,20 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import java.util.ArrayList; -import java.util.List; import java.util.Objects; +import lombok.AccessLevel; +import lombok.Builder; import lombok.Getter; -import lombok.Setter; +import lombok.NoArgsConstructor; @Entity @Getter -@Setter +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class OrderItem extends BaseEntity { + @Id @GeneratedValue(strategy = GenerationType.AUTO) private Long id; - private int price; private int quantity; @@ -33,10 +32,18 @@ public class OrderItem extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "item_id", referencedColumnName = "id") - private Item items ; + private Item item; + + @Builder + public OrderItem( int price, int quantity, Order order, Item items) { + this.price = price; + this.quantity = quantity; + this.order = order; + this.item = items; + } - public void setOrder(Order order){ // 방금 아까 봤던 오더 - if (Objects.nonNull(this.order)){ + public void setOrder(Order order) { // 방금 아까 봤던 오더 + if (Objects.nonNull(this.order)) { this.order.getOrderItems().remove(this); } @@ -44,5 +51,8 @@ public void setOrder(Order order){ // 방금 아까 봤던 오더 order.getOrderItems().add(this); } -} + public void setItem(Item item) { // 방금 아까 봤던 오더 + this.item = item; + } +} diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java index 116c4fcb9..2d45f9a30 100644 --- a/src/test/java/com/example/springjpamission/PersistenceContextTest.java +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -29,8 +29,9 @@ void save() { //when transaction.begin(); - Customer customer = new Customer(); - customer.setName(new Name("영운","윤")); + Name name = new Name("영운", "윤"); + Customer customer = Customer.builder(). + name(name).build(); em.persist(customer); @@ -50,8 +51,9 @@ void update() { EntityTransaction transaction = em.getTransaction(); transaction.begin(); - Customer customer = new Customer(); - customer.setName(new Name("영운","윤")); + Name name = new Name("영운", "윤"); + Customer customer = Customer.builder(). + name(name).build(); em.persist(customer); transaction.commit(); @@ -59,8 +61,8 @@ void update() { //when transaction.begin(); Customer findCustomer = em.find(Customer.class, customer.getId()); - Name newName = new Name("별","김"); - findCustomer.setName(newName); + Name newName = new Name("별", "김"); + findCustomer.changeName(newName); em.persist(findCustomer); transaction.commit(); @@ -72,31 +74,4 @@ void update() { assertThat(updatedCustomer.getName()).isEqualTo(newName); } - @Test - @DisplayName("하나의 정보를 저장소에 저장한 후 이를 삭제했을 때 저장소의 크기가 null인지 확인하다.") - void delete() { - //given - EntityManager em = entityManagerFactory.createEntityManager(); - EntityTransaction transaction = em.getTransaction(); - - transaction.begin(); - Customer customer = new Customer(); - customer.setName(new Name("영운", "윤")); - - em.persist(customer); - transaction.commit(); - em.clear(); - - //when - transaction.begin(); - Customer findCustomer = em.find(Customer.class, customer.getId()); - - em.remove(findCustomer); - - transaction.commit(); - - //then - Customer deletedCustomer = em.find(Customer.class, findCustomer.getId()); - assertThat(deletedCustomer).isNull(); - } } diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java deleted file mode 100644 index 3f5e298ed..000000000 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerRepositoryTest.java +++ /dev/null @@ -1,88 +0,0 @@ -package com.example.springjpamission.customer.domain; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.test.context.ActiveProfiles; - -@ActiveProfiles("test") -@DataJpaTest -class CustomerRepositoryTest { - - static final String FIRST_NAME = "별"; - static final String LAST_NAME = "김"; - - @Autowired - CustomerRepository customerRepository; - - private Customer testCustomer; - - @BeforeEach - void setUp() { - Customer customer = new Customer(); - customer.setName(new Name(FIRST_NAME,LAST_NAME)); - - testCustomer = customerRepository.save(customer); - } - - @Test - @DisplayName("저장한 고객의 정보 중 last name이 의도한 이름으로 저장되었는지 확인한다.") - void create() { - //given - Customer customer = new Customer(); - customer.setName(new Name("영운", "윤")); - - //when - Customer save = customerRepository.save(customer); - - //then - assertThat(save.getName().getLastName()).isEqualTo("윤"); - } - - @Test - @DisplayName("저장한 고객의 정보를 primary key 찾았을 때 올바른 정보로 저장되었는지 확인한다.") - void findById() { - //when - Customer savedCustomer = customerRepository.findById(testCustomer.getId()) - .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); - - //then - assertThat(savedCustomer.getName().getFirstName()).isEqualTo(FIRST_NAME); - assertThat(savedCustomer.getName().getLastName()).isEqualTo(LAST_NAME); - } - - @Test - @DisplayName("저장한 고객의 정보를 primary key로 찾은 후 삭제하였을 때 제대로 삭제되었는지 사이즈를 확인한다.") - void deleteById(){ - //given - Customer savedCustomer = customerRepository.findById(testCustomer.getId()) - .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); - Long savedId = savedCustomer.getId(); - - //when - customerRepository.deleteById(savedId); - - //then - assertThat(customerRepository.findAll().size()).isEqualTo(0); - } - - @Test - @DisplayName("저장한 고객의 정보를 수정하였을 때 수정된 정보로 저장되었는지 확인한다.") - void update(){ - //given - Customer savedCustomer = customerRepository.findById(testCustomer.getId()) - .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); - - //when - savedCustomer.setName(new Name("영운","윤")); - - //then - Customer updatedCustomer = customerRepository.findById(savedCustomer.getId()) - .orElseThrow(() -> new RuntimeException("존재하지 않는 회원 입니다.")); - assertThat(updatedCustomer.getName().getFirstName()).isEqualTo("영운"); - } -} diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java new file mode 100644 index 000000000..cc78fd5a4 --- /dev/null +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java @@ -0,0 +1,79 @@ +package com.example.springjpamission.customer.domain; + +import com.example.springjpamission.customer.service.CustomerService; +import com.example.springjpamission.customer.service.dto.CustomerRespone; +import com.example.springjpamission.customer.service.dto.CustomerRespones; +import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; +import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import static org.assertj.core.api.Assertions.assertThat; + +@ActiveProfiles("test") +@SpringBootTest +class CustomerServiceTest { + + @Autowired + CustomerService customerService; + @Autowired + CustomerRepository customerRepository; + + Long setUpCustomerId; + + @BeforeEach + void setUp(){ + Customer customer = new Customer(new Name("영운", "윤")); + setUpCustomerId = customer.getId(); + customerRepository.save(customer); + } + + @Test + void saveCustomer() { + //given + SaveCustomerRequest saveCustomerRequest = new SaveCustomerRequest("별", "김"); + + //when + CustomerRespone customerRespone = customerService.saveCustomer(saveCustomerRequest); + + //then + assertThat(customerRespone.firstName()).isEqualTo("별"); + assertThat(customerRespone.lastName()).isEqualTo("김"); + } + + @Test + void updateCustomer() { + //given + UpdateCustomerRequest updateCustomerRequest = new UpdateCustomerRequest(setUpCustomerId, "별", "김"); + + //when + CustomerRespone customerRespone = customerService.updateCustomer(updateCustomerRequest); + + //then + assertThat(customerRespone.firstName()).isEqualTo("별"); + assertThat(customerRespone.lastName()).isEqualTo("김"); + } + + @Test + void findAll() { + //when + CustomerRespones findCustomers = customerService.findAll(); + + //then + assertThat(findCustomers.customerRespones().size()).isEqualTo(1); + } + + @Test + void deletById() { + //when + customerService.deletById(setUpCustomerId); + + //then + List findCustomers = customerRepository.findAll(); + assertThat(findCustomers.size()).isEqualTo(0); + } +} diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 455c985b5..0e4b0baf0 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -8,6 +8,8 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; +import java.util.ArrayList; +import java.util.List; import java.util.UUID; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -23,7 +25,7 @@ public class RelationMappingTest { EntityManagerFactory entityManagerFactory; @Test - @DisplayName("order에 setCustomer 이후 매핑이 잘 되어있는지 확인한다.") + @DisplayName("Order와 Cosuntemr가 매핑이 잘 되어있는지 확인한다.") void order_customer_mappingTest(){ //given EntityManager em = entityManagerFactory.createEntityManager(); @@ -33,13 +35,12 @@ void order_customer_mappingTest(){ transaction.begin(); String uuid = UUID.randomUUID().toString(); - Order order = new Order(); - order.setMemo("---"); - order.setId(uuid); + Order order = Order.builder() + .id(uuid).memo("---").build(); - Customer customer = new Customer(); Name name = new Name("영운", "윤"); - customer.setName(name); + Customer customer = Customer.builder(). + name(name).build(); order.setCustomer(customer); em.persist(order); @@ -52,7 +53,7 @@ void order_customer_mappingTest(){ } @Test - @DisplayName("order에 setOrderItem 이후 매핑이 잘 되어있는지 확인한다.") + @DisplayName("Order와 OrderItem 매핑이 잘 되어있는지 확인한다.") void order_orderItem_mappingTest() { //given EntityManager em = entityManagerFactory.createEntityManager(); @@ -61,13 +62,10 @@ void order_orderItem_mappingTest() { //when transaction.begin(); String uuid = UUID.randomUUID().toString(); - Order order = new Order(); - order.setMemo("---"); - order.setId(uuid); + Order order = Order.builder() + .id(uuid).memo("---").build(); - OrderItem orderItem = new OrderItem(); - orderItem.setPrice(1000); - orderItem.setQuantity(10); + OrderItem orderItem = OrderItem.builder().price(1000).quantity(10).build(); order.addOrderItem(orderItem); em.persist(order); @@ -81,7 +79,7 @@ void order_orderItem_mappingTest() { } @Test - @DisplayName("orderItem에 setItem 이후 매핑이 잘 되어있는지 확인한다.") + @DisplayName("orderItemr과 Item매핑이 잘 되어있는지 확인한다.") void orderItem_item_mappingTest(){ //given EntityManager em = entityManagerFactory.createEntityManager(); @@ -90,22 +88,17 @@ void orderItem_item_mappingTest(){ //when transaction.begin(); - OrderItem orderItem = new OrderItem(); - orderItem.setPrice(1000); - orderItem.setQuantity(10); + OrderItem orderItem = OrderItem.builder().price(1000).quantity(10).build(); - Car item = new Car(); - item.setPrice(1000); - item.setPower(200); - item.setStockQuantity(100); + Car item = new Car(2000,100,100); - orderItem.addItem(item); + orderItem.setItem(item); em.persist(orderItem); transaction.commit(); OrderItem updatedOrderItem = em.find(OrderItem.class, orderItem.getId()); - Car item1 = (Car)updatedOrderItem.getItems().get(0); + Car item1 = (Car)updatedOrderItem.getItem(); // then assertThat(item1.getPower()).isEqualTo(200); From 419f90436610d9aab7be3243ef187ca8d7b5cdc4 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Thu, 3 Aug 2023 02:08:09 +0900 Subject: [PATCH 07/10] =?UTF-8?q?=EB=A9=98=ED=86=A0=20=EB=A6=AC=EB=B7=B0?= =?UTF-8?q?=20=EB=B0=98=EC=98=81=20-=20IDENTITY=20=EC=A0=84=EB=9E=B5=20-?= =?UTF-8?q?=20=EB=B6=88=ED=95=84=EC=9A=94=ED=95=9C=20@Transatoinal=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringJpaMissionApplication.java | 1 - .../config/DataSourceConfig.java | 1 + .../customer/domain/Customer.java | 12 ---- .../customer/service/CustomerService.java | 21 +++--- .../service/dto/CustomerRespones.java | 16 ----- ...omerRespone.java => CustomerResponse.java} | 4 +- .../service/dto/CustomerResponses.java | 16 +++++ .../service/dto/SaveCustomerRequest.java | 4 +- .../service/dto/UpdateCustomerRequest.java | 4 +- .../springjpamission/gobal/BaseEntity.java | 5 -- .../springjpamission/order/domain/Car.java | 1 - .../springjpamission/order/domain/Food.java | 1 - .../springjpamission/order/domain/Item.java | 1 - .../springjpamission/order/domain/Order.java | 8 ++- .../order/domain/OrderItem.java | 10 ++- .../PersistenceContextTest.java | 6 +- .../customer/domain/CustomerServiceTest.java | 65 ++++++++++--------- .../customer/domain/RelationMappingTest.java | 39 +++++------ 18 files changed, 95 insertions(+), 120 deletions(-) delete mode 100644 src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java rename src/main/java/com/example/springjpamission/customer/service/dto/{CustomerRespone.java => CustomerResponse.java} (65%) create mode 100644 src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java diff --git a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java index 4d3bcf3c5..b6e696ec8 100644 --- a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java +++ b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java @@ -2,7 +2,6 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @SpringBootApplication public class SpringJpaMissionApplication { diff --git a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java index fd3d5c486..b8760ac55 100644 --- a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java +++ b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java @@ -76,3 +76,4 @@ public PlatformTransactionManager transactionManager( } } + diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 5fa0c1893..72e13c663 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -2,23 +2,17 @@ import com.example.springjpamission.gobal.BaseEntity; import com.example.springjpamission.order.domain.Order; -import com.example.springjpamission.order.domain.OrderItem; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.OneToMany; -import jakarta.persistence.PrePersist; -import jakarta.persistence.PreUpdate; import java.util.ArrayList; import java.util.List; -import javax.print.attribute.standard.MediaSize.NA; import lombok.AccessLevel; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; @Entity @Getter @@ -35,7 +29,6 @@ public class Customer extends BaseEntity { @OneToMany(mappedBy = "customer") private List orders = new ArrayList<>(); - @Builder public Customer( Name name) { this.name = name; } @@ -44,9 +37,4 @@ public void changeName(Name name) { this.name = name; } - public void addOrder(Order order) { - this.orders.add(order); - order.setCustomer(this); - } - } diff --git a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java index 8fb2dc8c4..42a649973 100644 --- a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java +++ b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java @@ -3,15 +3,15 @@ import com.example.springjpamission.customer.domain.Customer; import com.example.springjpamission.customer.domain.CustomerRepository; import com.example.springjpamission.customer.domain.Name; -import com.example.springjpamission.customer.service.dto.CustomerRespones; +import com.example.springjpamission.customer.service.dto.CustomerResponses; import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; -import com.example.springjpamission.customer.service.dto.CustomerRespone; +import com.example.springjpamission.customer.service.dto.CustomerResponse; import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @Service -@Transactional(readOnly = true) public class CustomerService { private final CustomerRepository customerRepository; @@ -21,28 +21,29 @@ public CustomerService(CustomerRepository customerRepository) { } @Transactional - public CustomerRespone saveCustomer(SaveCustomerRequest saveCustomerRequest) { + public CustomerResponse saveCustomer(SaveCustomerRequest saveCustomerRequest) { Customer customer = new Customer( new Name(saveCustomerRequest.firstName(), saveCustomerRequest.lastName())); - return new CustomerRespone(customerRepository.save(customer)); + return new CustomerResponse(customerRepository.save(customer)); } @Transactional - public CustomerRespone updateCustomer(UpdateCustomerRequest updateCustomerRequest) { + public CustomerResponse updateCustomer(UpdateCustomerRequest updateCustomerRequest) { Customer findCustomer = customerRepository.findById(updateCustomerRequest.id()) .orElseThrow(() -> new RuntimeException("해당 customer는 존재하지 않습니다.")); findCustomer.changeName( new Name(updateCustomerRequest.firstName(), updateCustomerRequest.lastName())); - return new CustomerRespone(findCustomer); + return new CustomerResponse(findCustomer); } - public CustomerRespones findAll() { - return CustomerRespones.of(customerRepository.findAll()); + @Transactional + public CustomerResponses findAll() { + return CustomerResponses.of(customerRepository.findAll()); } @Transactional - public void deletById(Long id) { + public void deleteById(Long id) { customerRepository.deleteById(id); } diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java deleted file mode 100644 index 4591fc187..000000000 --- a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespones.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.example.springjpamission.customer.service.dto; - -import com.example.springjpamission.customer.domain.Customer; - -import java.util.List; -import java.util.stream.Collectors; - -public record CustomerRespones(List customerRespones) { - - public static CustomerRespones of(List customers) { - List responses = customers.stream().map(CustomerRespone::new) - .collect(Collectors.toList()); - return new CustomerRespones(responses); - } - -} diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java similarity index 65% rename from src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java rename to src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java index 05025ab34..a087e2134 100644 --- a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerRespone.java +++ b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java @@ -2,9 +2,9 @@ import com.example.springjpamission.customer.domain.Customer; -public record CustomerRespone(Long id, String firstName, String lastName) { +public record CustomerResponse(Long id, String firstName, String lastName) { - public CustomerRespone(Customer customer) { + public CustomerResponse(Customer customer) { this(customer.getId(), customer.getName().getFirstName(), customer.getName().getLastName()); } diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java new file mode 100644 index 000000000..29818ccf0 --- /dev/null +++ b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java @@ -0,0 +1,16 @@ +package com.example.springjpamission.customer.service.dto; + +import com.example.springjpamission.customer.domain.Customer; + +import java.util.List; +import java.util.stream.Collectors; + +public record CustomerResponses(List customerResponses) { + + public static CustomerResponses of(List customers) { + List responses = customers.stream().map(CustomerResponse::new) + .collect(Collectors.toList()); + return new CustomerResponses(responses); + } + +} diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java b/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java index 4746e38c7..42b5f0ba1 100644 --- a/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java +++ b/src/main/java/com/example/springjpamission/customer/service/dto/SaveCustomerRequest.java @@ -1,6 +1,4 @@ package com.example.springjpamission.customer.service.dto; public record SaveCustomerRequest(String firstName, - String lastName) { - -} + String lastName) { } diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java b/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java index ba5e9d8b8..19a4414b3 100644 --- a/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java +++ b/src/main/java/com/example/springjpamission/customer/service/dto/UpdateCustomerRequest.java @@ -2,6 +2,4 @@ public record UpdateCustomerRequest(Long id, String firstName, - String lastName) { - -} + String lastName) { } diff --git a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java index ccadc4e27..1e787f364 100644 --- a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java +++ b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java @@ -1,18 +1,14 @@ package com.example.springjpamission.gobal; import jakarta.persistence.Column; -import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; import jakarta.persistence.PrePersist; import jakarta.persistence.PreUpdate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; import lombok.Getter; -import lombok.Setter; -import org.springframework.data.jpa.domain.support.AuditingEntityListener; @Getter -@Setter @MappedSuperclass public class BaseEntity { @@ -33,7 +29,6 @@ public void prePersist() { public void preUpdate() { lastUpdatedAt = LocalDateTime.now() .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - } } diff --git a/src/main/java/com/example/springjpamission/order/domain/Car.java b/src/main/java/com/example/springjpamission/order/domain/Car.java index dc8a03cce..fbee8c4d6 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Car.java +++ b/src/main/java/com/example/springjpamission/order/domain/Car.java @@ -5,7 +5,6 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @Entity diff --git a/src/main/java/com/example/springjpamission/order/domain/Food.java b/src/main/java/com/example/springjpamission/order/domain/Food.java index d6858b547..da5df6a10 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Food.java +++ b/src/main/java/com/example/springjpamission/order/domain/Food.java @@ -5,7 +5,6 @@ import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; -import lombok.Setter; @Getter @Entity diff --git a/src/main/java/com/example/springjpamission/order/domain/Item.java b/src/main/java/com/example/springjpamission/order/domain/Item.java index 9ea1e147c..a456bf09c 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Item.java +++ b/src/main/java/com/example/springjpamission/order/domain/Item.java @@ -9,7 +9,6 @@ import jakarta.persistence.Inheritance; import jakarta.persistence.InheritanceType; import lombok.AccessLevel; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/com/example/springjpamission/order/domain/Order.java b/src/main/java/com/example/springjpamission/order/domain/Order.java index 27f18d688..bcebe7934 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Order.java +++ b/src/main/java/com/example/springjpamission/order/domain/Order.java @@ -14,11 +14,9 @@ import java.util.List; import java.util.Objects; import lombok.AccessLevel; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; - @Entity @Table(name = "orders") @Getter @@ -38,7 +36,11 @@ public class Order extends BaseEntity { @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) private List orderItems = new ArrayList<>(); - @Builder + public Order(String id, String memo) { + this.id = id; + this.memo = memo; + } + public Order(String id, String memo, int price, int quantity, Customer customer) { this.id = id; this.memo = memo; diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java index 9b2ac5ead..ecb5004ac 100644 --- a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -1,7 +1,6 @@ package com.example.springjpamission.order.domain; import com.example.springjpamission.gobal.BaseEntity; -import jakarta.persistence.CascadeType; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; @@ -9,14 +8,15 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.Objects; import lombok.AccessLevel; -import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; @Entity @Getter +@Table(name = "order_items") @NoArgsConstructor(access = AccessLevel.PROTECTED) public class OrderItem extends BaseEntity { @@ -34,7 +34,11 @@ public class OrderItem extends BaseEntity { @JoinColumn(name = "item_id", referencedColumnName = "id") private Item item; - @Builder + public OrderItem( int price, int quantity) { + this.price = price; + this.quantity = quantity; + } + public OrderItem( int price, int quantity, Order order, Item items) { this.price = price; this.quantity = quantity; diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java index 2d45f9a30..278b1ee81 100644 --- a/src/test/java/com/example/springjpamission/PersistenceContextTest.java +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -30,8 +30,7 @@ void save() { //when transaction.begin(); Name name = new Name("영운", "윤"); - Customer customer = Customer.builder(). - name(name).build(); + Customer customer = new Customer(name); em.persist(customer); @@ -52,8 +51,7 @@ void update() { transaction.begin(); Name name = new Name("영운", "윤"); - Customer customer = Customer.builder(). - name(name).build(); + Customer customer = new Customer(name); em.persist(customer); transaction.commit(); diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java index cc78fd5a4..76162aacf 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java @@ -1,8 +1,8 @@ package com.example.springjpamission.customer.domain; import com.example.springjpamission.customer.service.CustomerService; -import com.example.springjpamission.customer.service.dto.CustomerRespone; -import com.example.springjpamission.customer.service.dto.CustomerRespones; +import com.example.springjpamission.customer.service.dto.CustomerResponse; +import com.example.springjpamission.customer.service.dto.CustomerResponses; import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; import org.junit.jupiter.api.BeforeEach; @@ -10,40 +10,42 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; -import org.springframework.transaction.annotation.Transactional; import java.util.List; +import org.springframework.transaction.annotation.Transactional; + + import static org.assertj.core.api.Assertions.assertThat; @ActiveProfiles("test") -@SpringBootTest +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) class CustomerServiceTest { @Autowired CustomerService customerService; + @Autowired CustomerRepository customerRepository; - Long setUpCustomerId; @BeforeEach void setUp(){ Customer customer = new Customer(new Name("영운", "윤")); - setUpCustomerId = customer.getId(); customerRepository.save(customer); + setUpCustomerId = customer.getId(); } - @Test - void saveCustomer() { - //given - SaveCustomerRequest saveCustomerRequest = new SaveCustomerRequest("별", "김"); - - //when - CustomerRespone customerRespone = customerService.saveCustomer(saveCustomerRequest); - - //then - assertThat(customerRespone.firstName()).isEqualTo("별"); - assertThat(customerRespone.lastName()).isEqualTo("김"); - } +// @Test +// void saveCustomer() { +// //given +// SaveCustomerRequest saveCustomerRequest = new SaveCustomerRequest("별", "김"); +// +// //when +// CustomerResponse customerResponse = customerService.saveCustomer(saveCustomerRequest); +// +// //then +// assertThat(customerResponse.firstName()).isEqualTo("별"); +// assertThat(customerResponse.lastName()).isEqualTo("김"); +// } @Test void updateCustomer() { @@ -51,29 +53,30 @@ void updateCustomer() { UpdateCustomerRequest updateCustomerRequest = new UpdateCustomerRequest(setUpCustomerId, "별", "김"); //when - CustomerRespone customerRespone = customerService.updateCustomer(updateCustomerRequest); + CustomerResponse customerResponse = customerService.updateCustomer(updateCustomerRequest); //then - assertThat(customerRespone.firstName()).isEqualTo("별"); - assertThat(customerRespone.lastName()).isEqualTo("김"); + assertThat(customerResponse.firstName()).isEqualTo("별"); + assertThat(customerResponse.lastName()).isEqualTo("김"); } - @Test - void findAll() { - //when - CustomerRespones findCustomers = customerService.findAll(); - - //then - assertThat(findCustomers.customerRespones().size()).isEqualTo(1); - } +// @Test +// void findAll() { +// //when +// CustomerResponses findCustomers = customerService.findAll(); +// +// //then +// assertThat(findCustomers.customerResponses().size()).isEqualTo(1); +// } @Test - void deletById() { + void deleteById() { //when - customerService.deletById(setUpCustomerId); + customerService.deleteById(setUpCustomerId); //then List findCustomers = customerRepository.findAll(); assertThat(findCustomers.size()).isEqualTo(0); } + } diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 0e4b0baf0..1cf4fc7bc 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -8,8 +8,6 @@ import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; -import java.util.ArrayList; -import java.util.List; import java.util.UUID; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -35,20 +33,18 @@ void order_customer_mappingTest(){ transaction.begin(); String uuid = UUID.randomUUID().toString(); - Order order = Order.builder() - .id(uuid).memo("---").build(); + Order order = new Order (uuid, "---"); Name name = new Name("영운", "윤"); - Customer customer = Customer.builder(). - name(name).build(); + Customer customer = new Customer(name); order.setCustomer(customer); em.persist(order); transaction.commit(); em.clear(); - Order findOrder = em.find(Order.class, order.getId()); //then + Order findOrder = em.find(Order.class, order.getId()); assertThat(findOrder.getCustomer().getName()).isEqualTo(name); } @@ -62,46 +58,41 @@ void order_orderItem_mappingTest() { //when transaction.begin(); String uuid = UUID.randomUUID().toString(); - Order order = Order.builder() - .id(uuid).memo("---").build(); + Order order = new Order(uuid , "---"); - OrderItem orderItem = OrderItem.builder().price(1000).quantity(10).build(); + OrderItem orderItem = new OrderItem( 1000 , 10); order.addOrderItem(orderItem); em.persist(order); transaction.commit(); em.clear(); - Order updatedOrder = em.find(Order.class, uuid); //then + Order updatedOrder = em.find(Order.class, uuid); assertThat(updatedOrder.getOrderItems().get(0).getPrice()).isEqualTo(1000); assertThat(updatedOrder.getOrderItems().get(0).getQuantity()).isEqualTo(10); } @Test - @DisplayName("orderItemr과 Item매핑이 잘 되어있는지 확인한다.") - void orderItem_item_mappingTest(){ + @DisplayName("orderItem과 item 매핑이 잘 되어있는지 확인한다.") + void orderItem_item_mappingTest() { //given EntityManager em = entityManagerFactory.createEntityManager(); EntityTransaction transaction = em.getTransaction(); //when transaction.begin(); + OrderItem orderItem = new OrderItem(100, 1); - OrderItem orderItem = OrderItem.builder().price(1000).quantity(10).build(); - - Car item = new Car(2000,100,100); - - orderItem.setItem(item); + Car car = new Car(100, 5, 1); + orderItem.setItem(car); em.persist(orderItem); transaction.commit(); - OrderItem updatedOrderItem = em.find(OrderItem.class, orderItem.getId()); - Car item1 = (Car)updatedOrderItem.getItem(); - - // then - assertThat(item1.getPower()).isEqualTo(200); + //then + OrderItem findOrderItem = em.find(OrderItem.class, orderItem.getId()); + assertThat(findOrderItem.getItem().getPrice()).isEqualTo(100); + assertThat(findOrderItem.getItem().getStockQuantity()).isEqualTo(5); } - } From 9b92e8679ac3f9694ed2f9903c73d9fc8f7f85e3 Mon Sep 17 00:00:00 2001 From: young970 Date: Thu, 3 Aug 2023 13:30:59 +0900 Subject: [PATCH 08/10] =?UTF-8?q?fix:=20CustomerServiceTest=20deleteById?= =?UTF-8?q?=20=EA=B2=80=EC=A6=9D=20=EC=8B=A4=ED=8C=A8=20=EB=94=94=EB=B2=84?= =?UTF-8?q?=EA=B9=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../customer/domain/Customer.java | 3 - .../customer/service/CustomerService.java | 1 - .../springjpamission/order/domain/Order.java | 9 +-- .../order/domain/OrderItem.java | 22 +++--- .../PersistenceContextTest.java | 2 +- .../SpringJpaMissionApplicationTests.java | 13 ---- .../customer/domain/CustomerServiceTest.java | 50 +++++++------ .../customer/domain/RelationMappingTest.java | 70 ++++--------------- 8 files changed, 52 insertions(+), 118 deletions(-) delete mode 100644 src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 72e13c663..a371a8d64 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -26,9 +26,6 @@ public class Customer extends BaseEntity { @Embedded private Name name; - @OneToMany(mappedBy = "customer") - private List orders = new ArrayList<>(); - public Customer( Name name) { this.name = name; } diff --git a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java index 42a649973..5a29a0563 100644 --- a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java +++ b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java @@ -8,7 +8,6 @@ import com.example.springjpamission.customer.service.dto.CustomerResponse; import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @Service diff --git a/src/main/java/com/example/springjpamission/order/domain/Order.java b/src/main/java/com/example/springjpamission/order/domain/Order.java index bcebe7934..8ff6b1d05 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Order.java +++ b/src/main/java/com/example/springjpamission/order/domain/Order.java @@ -12,7 +12,7 @@ import jakarta.persistence.Table; import java.util.ArrayList; import java.util.List; -import java.util.Objects; + import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -49,13 +49,8 @@ public Order(String id, String memo, int price, int quantity, Customer customer) this.customer = customer; } - public void setCustomer(Customer customer) { - if (Objects.nonNull(this.customer)) { - this.customer.getOrders().remove(this); - } - + public void changeCustomer(Customer customer) { this.customer = customer; - customer.getOrders().add(this); } public void addOrderItem(OrderItem orderItem) { diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java index ecb5004ac..ef3c9cb44 100644 --- a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -1,14 +1,8 @@ package com.example.springjpamission.order.domain; import com.example.springjpamission.gobal.BaseEntity; -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.ManyToOne; -import jakarta.persistence.Table; +import jakarta.persistence.*; + import java.util.Objects; import lombok.AccessLevel; import lombok.Getter; @@ -26,18 +20,18 @@ public class OrderItem extends BaseEntity { private int price; private int quantity; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne @JoinColumn(name = "order_id", referencedColumnName = "id") private Order order; - @ManyToOne(fetch = FetchType.LAZY) + @ManyToOne(cascade = CascadeType.ALL) @JoinColumn(name = "item_id", referencedColumnName = "id") private Item item; - public OrderItem( int price, int quantity) { - this.price = price; - this.quantity = quantity; - } +// public OrderItem( int price, int quantity) { +// this.price = price; +// this.quantity = quantity; +// } public OrderItem( int price, int quantity, Order order, Item items) { this.price = price; diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java index 278b1ee81..bafa62a30 100644 --- a/src/test/java/com/example/springjpamission/PersistenceContextTest.java +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -15,7 +15,7 @@ @ActiveProfiles("test") @DataJpaTest -public class PersistenceContextTest { +class PersistenceContextTest { @Autowired EntityManagerFactory entityManagerFactory; diff --git a/src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java b/src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java deleted file mode 100644 index 4f74e7ee2..000000000 --- a/src/test/java/com/example/springjpamission/SpringJpaMissionApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.springjpamission; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class SpringJpaMissionApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java index 76162aacf..c1afd8a5c 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java @@ -8,6 +8,7 @@ import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import java.util.List; @@ -18,6 +19,7 @@ @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) +@Transactional class CustomerServiceTest { @Autowired @@ -34,18 +36,19 @@ void setUp(){ setUpCustomerId = customer.getId(); } -// @Test -// void saveCustomer() { -// //given -// SaveCustomerRequest saveCustomerRequest = new SaveCustomerRequest("별", "김"); -// -// //when -// CustomerResponse customerResponse = customerService.saveCustomer(saveCustomerRequest); -// -// //then -// assertThat(customerResponse.firstName()).isEqualTo("별"); -// assertThat(customerResponse.lastName()).isEqualTo("김"); -// } + @Test + void saveCustomer() { + //given + SaveCustomerRequest saveCustomerRequest = new SaveCustomerRequest("별", "김"); + + //when + CustomerResponse customerResponse = customerService.saveCustomer(saveCustomerRequest); + + //then + Customer findCustomer = customerRepository.findById(customerResponse.id()).get(); + assertThat(findCustomer.getName().getFirstName()).isEqualTo("별"); + assertThat(findCustomer.getName().getLastName()).isEqualTo("김"); + } @Test void updateCustomer() { @@ -53,21 +56,22 @@ void updateCustomer() { UpdateCustomerRequest updateCustomerRequest = new UpdateCustomerRequest(setUpCustomerId, "별", "김"); //when - CustomerResponse customerResponse = customerService.updateCustomer(updateCustomerRequest); + customerService.updateCustomer(updateCustomerRequest); //then - assertThat(customerResponse.firstName()).isEqualTo("별"); - assertThat(customerResponse.lastName()).isEqualTo("김"); + Customer findCustomer = customerRepository.findById(setUpCustomerId).get(); + assertThat(findCustomer.getName().getFirstName()).isEqualTo("별"); + assertThat(findCustomer.getName().getLastName()).isEqualTo("김"); } -// @Test -// void findAll() { -// //when -// CustomerResponses findCustomers = customerService.findAll(); -// -// //then -// assertThat(findCustomers.customerResponses().size()).isEqualTo(1); -// } + @Test + void findAll() { + //when + CustomerResponses findCustomers = customerService.findAll(); + + //then + assertThat(findCustomers.customerResponses().size()).isEqualTo(1); + } @Test void deleteById() { diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 1cf4fc7bc..9a8bbeebe 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -3,6 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import com.example.springjpamission.order.domain.Car; +import com.example.springjpamission.order.domain.Item; import com.example.springjpamission.order.domain.Order; import com.example.springjpamission.order.domain.OrderItem; import jakarta.persistence.EntityManager; @@ -17,50 +18,26 @@ @ActiveProfiles("test") @DataJpaTest -public class RelationMappingTest { +class RelationMappingTest { @Autowired EntityManagerFactory entityManagerFactory; @Test - @DisplayName("Order와 Cosuntemr가 매핑이 잘 되어있는지 확인한다.") - void order_customer_mappingTest(){ + @DisplayName("order, order_item, item간 매핑이 잘 되어있는지 확인한다.") + void order_orderItem_item_mappingTest() { //given EntityManager em = entityManagerFactory.createEntityManager(); EntityTransaction transaction = em.getTransaction(); + Customer customer = new Customer(new Name("별", "김")); //when transaction.begin(); - String uuid = UUID.randomUUID().toString(); - Order order = new Order (uuid, "---"); - - Name name = new Name("영운", "윤"); - Customer customer = new Customer(name); - - order.setCustomer(customer); - em.persist(order); - transaction.commit(); - em.clear(); - - //then - Order findOrder = em.find(Order.class, order.getId()); - assertThat(findOrder.getCustomer().getName()).isEqualTo(name); - } - - @Test - @DisplayName("Order와 OrderItem 매핑이 잘 되어있는지 확인한다.") - void order_orderItem_mappingTest() { - //given - EntityManager em = entityManagerFactory.createEntityManager(); - EntityTransaction transaction = em.getTransaction(); - - //when - transaction.begin(); - String uuid = UUID.randomUUID().toString(); - Order order = new Order(uuid , "---"); - - OrderItem orderItem = new OrderItem( 1000 , 10); + String id = UUID.randomUUID().toString(); + Order order = new Order(id, "----", 1000, 1, customer); + Car car = new Car(1000, 1, 500); + OrderItem orderItem = new OrderItem(1000, 1, order, car); order.addOrderItem(orderItem); em.persist(order); @@ -68,31 +45,12 @@ void order_orderItem_mappingTest() { em.clear(); //then - Order updatedOrder = em.find(Order.class, uuid); + Order updatedOrder = em.find(Order.class, id); + OrderItem updatedOrderItem = em.find(OrderItem.class, orderItem.getId()); + Car item = (Car) updatedOrderItem.getItem(); + assertThat(updatedOrder.getOrderItems().get(0).getPrice()).isEqualTo(1000); - assertThat(updatedOrder.getOrderItems().get(0).getQuantity()).isEqualTo(10); + assertThat(item.getPower()).isEqualTo(500); } - @Test - @DisplayName("orderItem과 item 매핑이 잘 되어있는지 확인한다.") - void orderItem_item_mappingTest() { - //given - EntityManager em = entityManagerFactory.createEntityManager(); - EntityTransaction transaction = em.getTransaction(); - - //when - transaction.begin(); - OrderItem orderItem = new OrderItem(100, 1); - - Car car = new Car(100, 5, 1); - orderItem.setItem(car); - - em.persist(orderItem); - transaction.commit(); - - //then - OrderItem findOrderItem = em.find(OrderItem.class, orderItem.getId()); - assertThat(findOrderItem.getItem().getPrice()).isEqualTo(100); - assertThat(findOrderItem.getItem().getStockQuantity()).isEqualTo(5); - } } From 0e0da7a38d7b09a2c257fdb8cb501df38390e3c0 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Thu, 3 Aug 2023 21:02:08 +0900 Subject: [PATCH 09/10] =?UTF-8?q?style=20:=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=A0=95=EB=A0=AC=20=EB=B0=8F=20=EA=B0=9C=ED=96=89=20=EC=A0=95?= =?UTF-8?q?=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../SpringJpaMissionApplication.java | 6 +++--- .../springjpamission/config/DataSourceConfig.java | 14 -------------- .../springjpamission/customer/domain/Customer.java | 6 +----- .../springjpamission/order/domain/OrderItem.java | 7 +------ .../customer/domain/CustomerServiceTest.java | 11 ++++++++--- .../customer/domain/RelationMappingTest.java | 1 - 6 files changed, 13 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java index b6e696ec8..0f3403f32 100644 --- a/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java +++ b/src/main/java/com/example/springjpamission/SpringJpaMissionApplication.java @@ -6,8 +6,8 @@ @SpringBootApplication public class SpringJpaMissionApplication { - public static void main(String[] args) { - SpringApplication.run(SpringJpaMissionApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(SpringJpaMissionApplication.class, args); + } } diff --git a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java index b8760ac55..767fa8afc 100644 --- a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java +++ b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java @@ -27,12 +27,6 @@ public DataSource dataSource() { return dataSource; } - /** - * @param jpaProperties - * @return - * @JpaVendorAdapter : JPA는 여러 구현체가 존재하기 때문에 구현체별 설정을 지원하기 위한 클래스이다. Hibernate를 사용하기 때문에 - * HibernateJpaVendorAdapter를 사용한다. - */ @Bean public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { AbstractJpaVendorAdapter adapter = new HibernateJpaVendorAdapter(); @@ -42,13 +36,6 @@ public JpaVendorAdapter jpaVendorAdapter(JpaProperties jpaProperties) { return adapter; } - /** - * @param dataSource - * @param jpaVendorAdapter - * @param jpaProperties - * @return - * @LocalContainerEntityManagerFactoryBean : EntityManagerFactoryBean을 Spring에서 사용하기 위한 클래스 - */ @Bean public LocalContainerEntityManagerFactoryBean entityManagerFactory(DataSource dataSource, JpaVendorAdapter jpaVendorAdapter, @@ -76,4 +63,3 @@ public PlatformTransactionManager transactionManager( } } - diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index a371a8d64..10f8d691b 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -1,15 +1,11 @@ package com.example.springjpamission.customer.domain; import com.example.springjpamission.gobal.BaseEntity; -import com.example.springjpamission.order.domain.Order; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.OneToMany; -import java.util.ArrayList; -import java.util.List; import lombok.AccessLevel; import lombok.Getter; import lombok.NoArgsConstructor; @@ -26,7 +22,7 @@ public class Customer extends BaseEntity { @Embedded private Name name; - public Customer( Name name) { + public Customer(Name name) { this.name = name; } diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java index ef3c9cb44..3ab04ce09 100644 --- a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -28,12 +28,7 @@ public class OrderItem extends BaseEntity { @JoinColumn(name = "item_id", referencedColumnName = "id") private Item item; -// public OrderItem( int price, int quantity) { -// this.price = price; -// this.quantity = quantity; -// } - - public OrderItem( int price, int quantity, Order order, Item items) { + public OrderItem(int price, int quantity, Order order, Item items) { this.price = price; this.quantity = quantity; this.order = order; diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java index c1afd8a5c..8dea86454 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java @@ -6,9 +6,9 @@ import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import java.util.List; @@ -30,13 +30,14 @@ class CustomerServiceTest { Long setUpCustomerId; @BeforeEach - void setUp(){ + void setUp() { Customer customer = new Customer(new Name("영운", "윤")); customerRepository.save(customer); setUpCustomerId = customer.getId(); } @Test + @DisplayName("customer를 저장 후 조회하여 이름을 확인한다.") void saveCustomer() { //given SaveCustomerRequest saveCustomerRequest = new SaveCustomerRequest("별", "김"); @@ -51,9 +52,11 @@ void saveCustomer() { } @Test + @DisplayName("setUp()에서 넣은 데이터를 업데이트 했을 때 올바른 이름으로 업데이트 되었는지 확인한다.") void updateCustomer() { //given - UpdateCustomerRequest updateCustomerRequest = new UpdateCustomerRequest(setUpCustomerId, "별", "김"); + UpdateCustomerRequest updateCustomerRequest = new UpdateCustomerRequest(setUpCustomerId, + "별", "김"); //when customerService.updateCustomer(updateCustomerRequest); @@ -65,6 +68,7 @@ void updateCustomer() { } @Test + @DisplayName("전체 데이터 조회시 setUp()에 넣은 데이터를 조회하여 사이즈가 1이 된다.") void findAll() { //when CustomerResponses findCustomers = customerService.findAll(); @@ -74,6 +78,7 @@ void findAll() { } @Test + @DisplayName("고객 아이디로 삭제되어 저장소 사이즈가 0이 된다.") void deleteById() { //when customerService.deleteById(setUpCustomerId); diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 9a8bbeebe..78b634f12 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -3,7 +3,6 @@ import static org.assertj.core.api.Assertions.assertThat; import com.example.springjpamission.order.domain.Car; -import com.example.springjpamission.order.domain.Item; import com.example.springjpamission.order.domain.Order; import com.example.springjpamission.order.domain.OrderItem; import jakarta.persistence.EntityManager; From f9a0e9fbf6a4ae419daee9bf29277d6b11de4091 Mon Sep 17 00:00:00 2001 From: byeolhaha Date: Sat, 12 Aug 2023 00:08:17 +0900 Subject: [PATCH 10/10] =?UTF-8?q?=E8=82=84=EB=B6=BE=EB=B1=B6=20=E9=8D=AE?= =?UTF-8?q?=EA=BE=A9=EC=91=80=20=E8=AB=9B=EC=84=8F=EC=81=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/DataSourceConfig.java | 13 +++-- .../customer/domain/Customer.java | 36 +++++++++---- .../customer/domain/Name.java | 45 +++++++++++++--- .../customer/service/CustomerService.java | 21 ++++---- .../service/dto/CustomerResponse.java | 6 ++- .../service/dto/CustomerResponses.java | 8 +-- .../springjpamission/gobal/BaseEntity.java | 18 ++++--- .../springjpamission/order/domain/Car.java | 28 ++++++---- .../springjpamission/order/domain/Food.java | 22 ++++---- .../springjpamission/order/domain/Item.java | 28 +++++----- .../springjpamission/order/domain/Order.java | 51 +++++++++---------- .../order/domain/OrderItem.java | 44 ++++++++++------ .../springjpamission/order/domain/Price.java | 23 +++++++++ .../PersistenceContextTest.java | 2 + .../customer/domain/CustomerServiceTest.java | 21 +++++++- .../customer/domain/RelationMappingTest.java | 20 ++++---- 16 files changed, 254 insertions(+), 132 deletions(-) create mode 100644 src/main/java/com/example/springjpamission/order/domain/Price.java diff --git a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java index 767fa8afc..99c103a8d 100644 --- a/src/main/java/com/example/springjpamission/config/DataSourceConfig.java +++ b/src/main/java/com/example/springjpamission/config/DataSourceConfig.java @@ -16,13 +16,18 @@ @Configuration public class DataSourceConfig { + private static final String DRIVER = "org.h2.Driver"; + private static final String DB_URL = "jdbc:h2:tcp://localhost/~/test"; + private static final String USER = "sa"; + private static final String PASSWORD= ""; + @Bean public DataSource dataSource() { DriverManagerDataSource dataSource = new DriverManagerDataSource(); - dataSource.setDriverClassName("org.h2.Driver"); - dataSource.setUrl("jdbc:h2:tcp://localhost/~/test"); - dataSource.setUsername("sa"); - dataSource.setPassword(""); + dataSource.setDriverClassName(DRIVER); + dataSource.setUrl(DB_URL); + dataSource.setUsername(USER); + dataSource.setPassword(PASSWORD); return dataSource; } diff --git a/src/main/java/com/example/springjpamission/customer/domain/Customer.java b/src/main/java/com/example/springjpamission/customer/domain/Customer.java index 10f8d691b..778e1a83b 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Customer.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Customer.java @@ -1,27 +1,31 @@ package com.example.springjpamission.customer.domain; import com.example.springjpamission.gobal.BaseEntity; -import jakarta.persistence.Embedded; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; +import com.example.springjpamission.order.domain.Order; +import jakarta.persistence.*; +import jakarta.validation.Valid; +import java.util.ArrayList; +import java.util.List; + +@Table(name = "customers") @Entity -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Customer extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + @Valid @Embedded + @Column(nullable = false) private Name name; + @OneToMany(mappedBy = "customer") + private List orders = new ArrayList<>(); + + protected Customer() { } + public Customer(Name name) { this.name = name; } @@ -30,4 +34,16 @@ public void changeName(Name name) { this.name = name; } + public Long getId() { + return id; + } + + public Name getName() { + return name; + } + + public List getOrders() { + return orders; + } + } diff --git a/src/main/java/com/example/springjpamission/customer/domain/Name.java b/src/main/java/com/example/springjpamission/customer/domain/Name.java index 05b1233fa..789dab6cc 100644 --- a/src/main/java/com/example/springjpamission/customer/domain/Name.java +++ b/src/main/java/com/example/springjpamission/customer/domain/Name.java @@ -1,26 +1,55 @@ package com.example.springjpamission.customer.domain; +import jakarta.persistence.Column; import jakarta.persistence.Embeddable; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; -import lombok.EqualsAndHashCode; -import lombok.Getter; -import lombok.NoArgsConstructor; -@NoArgsConstructor -@EqualsAndHashCode -@Getter +import java.util.Objects; + @Embeddable public class Name { - @Size(min = 1, max = 50) private String firstName; - @Size(min = 1, max = 50) private String lastName; + protected Name() { } + public Name(String firstName, String lastName) { + validateName(firstName,lastName ); this.firstName = firstName; this.lastName = lastName; } + private void validateName(String firstName, String lastName) { + if (firstName == null || firstName.isBlank()) { + throw new IllegalArgumentException(); + } + if (lastName == null || lastName.isBlank()) { + throw new IllegalArgumentException(); + } + } + + public String getFirstName() { + return firstName; + } + + public String getLastName() { + return lastName; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Name name = (Name) o; + return Objects.equals(firstName, name.firstName) && Objects.equals(lastName, name.lastName); + } + + @Override + public int hashCode() { + return Objects.hash(firstName, lastName); + } + } diff --git a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java index 5a29a0563..8c034639c 100644 --- a/src/main/java/com/example/springjpamission/customer/service/CustomerService.java +++ b/src/main/java/com/example/springjpamission/customer/service/CustomerService.java @@ -7,9 +7,12 @@ import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; import com.example.springjpamission.customer.service.dto.CustomerResponse; import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; +import jakarta.persistence.EntityNotFoundException; +import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +@Transactional @Service public class CustomerService { @@ -19,30 +22,30 @@ public CustomerService(CustomerRepository customerRepository) { this.customerRepository = customerRepository; } - @Transactional public CustomerResponse saveCustomer(SaveCustomerRequest saveCustomerRequest) { Customer customer = new Customer( new Name(saveCustomerRequest.firstName(), saveCustomerRequest.lastName())); - return new CustomerResponse(customerRepository.save(customer)); + return CustomerResponse.of(customerRepository.save(customer)); } - @Transactional public CustomerResponse updateCustomer(UpdateCustomerRequest updateCustomerRequest) { Customer findCustomer = customerRepository.findById(updateCustomerRequest.id()) - .orElseThrow(() -> new RuntimeException("해당 customer는 존재하지 않습니다.")); + .orElseThrow(() -> new EntityNotFoundException("해당 customer는 존재하지 않습니다.")); findCustomer.changeName( new Name(updateCustomerRequest.firstName(), updateCustomerRequest.lastName())); - return new CustomerResponse(findCustomer); + return CustomerResponse.of(findCustomer); } - @Transactional - public CustomerResponses findAll() { - return CustomerResponses.of(customerRepository.findAll()); + @Transactional(readOnly = true) + public CustomerResponses findAll(Pageable pageable) { + return CustomerResponses.of(customerRepository.findAll(pageable)); } - @Transactional public void deleteById(Long id) { + customerRepository.findById(id) + .orElseThrow(()->new EntityNotFoundException("해당 customer는 존재하지 않습니다.")); + customerRepository.deleteById(id); } diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java index a087e2134..830b3c7ea 100644 --- a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java +++ b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponse.java @@ -4,8 +4,10 @@ public record CustomerResponse(Long id, String firstName, String lastName) { - public CustomerResponse(Customer customer) { - this(customer.getId(), customer.getName().getFirstName(), customer.getName().getLastName()); + public static CustomerResponse of(Customer customer) { + return new CustomerResponse(customer.getId(), + customer.getName().getFirstName(), + customer.getName().getLastName()); } } diff --git a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java index 29818ccf0..a4dbd05eb 100644 --- a/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java +++ b/src/main/java/com/example/springjpamission/customer/service/dto/CustomerResponses.java @@ -1,15 +1,17 @@ package com.example.springjpamission.customer.service.dto; import com.example.springjpamission.customer.domain.Customer; +import org.springframework.data.domain.Slice; import java.util.List; import java.util.stream.Collectors; public record CustomerResponses(List customerResponses) { - public static CustomerResponses of(List customers) { - List responses = customers.stream().map(CustomerResponse::new) - .collect(Collectors.toList()); + public static CustomerResponses of(Slice customers) { + List responses = customers.stream() + .map(CustomerResponse::of) + .collect(Collectors.toList()); return new CustomerResponses(responses); } diff --git a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java index 1e787f364..451963665 100644 --- a/src/main/java/com/example/springjpamission/gobal/BaseEntity.java +++ b/src/main/java/com/example/springjpamission/gobal/BaseEntity.java @@ -6,29 +6,31 @@ import jakarta.persistence.PreUpdate; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -import lombok.Getter; -@Getter @MappedSuperclass -public class BaseEntity { +public abstract class BaseEntity { - @Column(name = "created_at", updatable = false, nullable = false) + private static final String DATE_FORMAT = "yyyy-MM-dd HH:mm:ss"; + + @Column(updatable = false, nullable = false) private String createAt; - @Column(name = "last_updated_at", nullable = false) + @Column(nullable = false) private String lastUpdatedAt; + protected BaseEntity() { } + @PrePersist public void prePersist() { LocalDateTime now = LocalDateTime.now(); - createAt = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); - lastUpdatedAt = now.format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + createAt = now.format(DateTimeFormatter.ofPattern(DATE_FORMAT)); + lastUpdatedAt = now.format(DateTimeFormatter.ofPattern(DATE_FORMAT)); } @PreUpdate public void preUpdate() { lastUpdatedAt = LocalDateTime.now() - .format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")); + .format(DateTimeFormatter.ofPattern(DATE_FORMAT)); } } diff --git a/src/main/java/com/example/springjpamission/order/domain/Car.java b/src/main/java/com/example/springjpamission/order/domain/Car.java index fbee8c4d6..3aaec5950 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Car.java +++ b/src/main/java/com/example/springjpamission/order/domain/Car.java @@ -1,26 +1,34 @@ package com.example.springjpamission.order.domain; +import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -@Getter -@Entity @DiscriminatorValue("CAR") -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity public class Car extends Item { + private static final int ZERO = 0; + + @Column private int power; - public Car(int power) { - this.power = power; - } + protected Car() { } - public Car(int price, int stockQuantity, int power) { + public Car(Price price, int stockQuantity, int power) { super(price, stockQuantity); + validatePower(power); this.power = power; } + private void validatePower(int power) { + if(power < ZERO) { + throw new IllegalArgumentException(); + } + } + + public int getPower() { + return power; + } + } diff --git a/src/main/java/com/example/springjpamission/order/domain/Food.java b/src/main/java/com/example/springjpamission/order/domain/Food.java index da5df6a10..a1ee9dc80 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Food.java +++ b/src/main/java/com/example/springjpamission/order/domain/Food.java @@ -1,26 +1,28 @@ package com.example.springjpamission.order.domain; +import jakarta.persistence.Column; import jakarta.persistence.DiscriminatorValue; import jakarta.persistence.Entity; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -@Getter -@Entity @DiscriminatorValue("FOOD") -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity public class Food extends Item { + @Column private String chef; - public Food(String chef) { - this.chef = chef; - } + protected Food() { } - public Food(int price, int stockQuantity, String chef) { + public Food(Price price, int stockQuantity, String chef) { super(price, stockQuantity); + validateChef(chef); this.chef = chef; } + private void validateChef(String chef) { + if (chef == null || chef.isBlank()) { + throw new IllegalArgumentException(); + } + } + } diff --git a/src/main/java/com/example/springjpamission/order/domain/Item.java b/src/main/java/com/example/springjpamission/order/domain/Item.java index a456bf09c..8dc15b35b 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Item.java +++ b/src/main/java/com/example/springjpamission/order/domain/Item.java @@ -1,31 +1,29 @@ package com.example.springjpamission.order.domain; import com.example.springjpamission.gobal.BaseEntity; -import jakarta.persistence.DiscriminatorColumn; -import jakarta.persistence.Entity; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.Inheritance; -import jakarta.persistence.InheritanceType; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter +import jakarta.persistence.*; + + @Inheritance(strategy = InheritanceType.SINGLE_TABLE) @DiscriminatorColumn(name = "DTYPE") -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Table(name = "items") @Entity public abstract class Item extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private int price; + + @Embedded + @Column(nullable = false) + private Price price; + + @Column(nullable = false) private int stockQuantity; - public Item(int price, int stockQuantity) { + protected Item() {} + + public Item(Price price, int stockQuantity) { this.price = price; this.stockQuantity = stockQuantity; } diff --git a/src/main/java/com/example/springjpamission/order/domain/Order.java b/src/main/java/com/example/springjpamission/order/domain/Order.java index 8ff6b1d05..19d526434 100644 --- a/src/main/java/com/example/springjpamission/order/domain/Order.java +++ b/src/main/java/com/example/springjpamission/order/domain/Order.java @@ -2,59 +2,56 @@ import com.example.springjpamission.customer.domain.Customer; import com.example.springjpamission.gobal.BaseEntity; -import jakarta.persistence.CascadeType; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; -import jakarta.persistence.ManyToOne; -import jakarta.persistence.OneToMany; -import jakarta.persistence.Table; +import jakarta.persistence.*; + import java.util.ArrayList; import java.util.List; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity @Table(name = "orders") -@Getter -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity public class Order extends BaseEntity { @Id - private String id; + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) private String memo; - private int price; - private int quantity; - @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL) + @Embedded + @Column(nullable = false) + private Price price; + + + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "customer_id", referencedColumnName = "id") private Customer customer; - @OneToMany(mappedBy = "order", cascade = CascadeType.ALL, orphanRemoval = true) + @OneToMany(mappedBy = "order", orphanRemoval = true) private List orderItems = new ArrayList<>(); - public Order(String id, String memo) { - this.id = id; + protected Order() { } + + public Order(String memo) { this.memo = memo; } - public Order(String id, String memo, int price, int quantity, Customer customer) { - this.id = id; + public Order(String memo, Price price, Customer customer) { this.memo = memo; this.price = price; - this.quantity = quantity; this.customer = customer; } public void changeCustomer(Customer customer) { this.customer = customer; + customer.getOrders().add(this); } - public void addOrderItem(OrderItem orderItem) { - orderItem.setOrder(this); + public Customer getCustomer() { + return customer; } + public List getOrderItems() { + return orderItems; + } } diff --git a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java index 3ab04ce09..ed14824ef 100644 --- a/src/main/java/com/example/springjpamission/order/domain/OrderItem.java +++ b/src/main/java/com/example/springjpamission/order/domain/OrderItem.java @@ -4,38 +4,52 @@ import jakarta.persistence.*; import java.util.Objects; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; -@Entity -@Getter @Table(name = "order_items") -@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Entity public class OrderItem extends BaseEntity { @Id - @GeneratedValue(strategy = GenerationType.AUTO) + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - private int price; - private int quantity; - @ManyToOne + @Embedded + @Column(nullable = false) + private Price price; + + @ManyToOne(cascade = CascadeType.PERSIST) @JoinColumn(name = "order_id", referencedColumnName = "id") private Order order; - @ManyToOne(cascade = CascadeType.ALL) + @ManyToOne @JoinColumn(name = "item_id", referencedColumnName = "id") private Item item; - public OrderItem(int price, int quantity, Order order, Item items) { + protected OrderItem() {} + + public OrderItem(Price price, Order order, Item items) { this.price = price; - this.quantity = quantity; this.order = order; this.item = items; } - public void setOrder(Order order) { // 방금 아까 봤던 오더 + public Long getId() { + return id; + } + + public Price getPrice() { + return price; + } + + public Order getOrder() { + return order; + } + + public Item getItem() { + return item; + } + + public void changeOrder(Order order) { if (Objects.nonNull(this.order)) { this.order.getOrderItems().remove(this); } @@ -44,7 +58,7 @@ public void setOrder(Order order) { // 방금 아까 봤던 오더 order.getOrderItems().add(this); } - public void setItem(Item item) { // 방금 아까 봤던 오더 + public void changeItem(Item item) { // 방금 아까 봤던 오더 this.item = item; } diff --git a/src/main/java/com/example/springjpamission/order/domain/Price.java b/src/main/java/com/example/springjpamission/order/domain/Price.java new file mode 100644 index 000000000..bea2b57eb --- /dev/null +++ b/src/main/java/com/example/springjpamission/order/domain/Price.java @@ -0,0 +1,23 @@ +package com.example.springjpamission.order.domain; + +import jakarta.persistence.Embeddable; + +@Embeddable +public class Price{ + + private int cost; + + protected Price() { } + + public Price(int cost) { + if (cost < 0) { + throw new IllegalArgumentException("가격 : " + cost); + } + this.cost = cost; + } + + public int getCost(){ + return cost; + } + +} diff --git a/src/test/java/com/example/springjpamission/PersistenceContextTest.java b/src/test/java/com/example/springjpamission/PersistenceContextTest.java index bafa62a30..365998c9c 100644 --- a/src/test/java/com/example/springjpamission/PersistenceContextTest.java +++ b/src/test/java/com/example/springjpamission/PersistenceContextTest.java @@ -40,6 +40,8 @@ void save() { //then Customer findCustomer = em.find(Customer.class, customer.getId()); assertThat(findCustomer.getId()).isEqualTo(customer.getId()); + assertThat(findCustomer.getName().getFirstName()).isEqualTo("영운"); + assertThat(findCustomer.getName().getLastName()).isEqualTo("윤"); } @Test diff --git a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java index 8dea86454..05f85853a 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/CustomerServiceTest.java @@ -5,17 +5,22 @@ import com.example.springjpamission.customer.service.dto.CustomerResponses; import com.example.springjpamission.customer.service.dto.SaveCustomerRequest; import com.example.springjpamission.customer.service.dto.UpdateCustomerRequest; +import jakarta.persistence.EntityNotFoundException; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.domain.PageRequest; import org.springframework.test.context.ActiveProfiles; + import java.util.List; -import org.springframework.transaction.annotation.Transactional; +import java.util.Random; +import org.springframework.transaction.annotation.Transactional; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.catchException; @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.NONE) @@ -27,6 +32,7 @@ class CustomerServiceTest { @Autowired CustomerRepository customerRepository; + Long setUpCustomerId; @BeforeEach @@ -71,7 +77,8 @@ void updateCustomer() { @DisplayName("전체 데이터 조회시 setUp()에 넣은 데이터를 조회하여 사이즈가 1이 된다.") void findAll() { //when - CustomerResponses findCustomers = customerService.findAll(); + PageRequest pageSize = PageRequest.of(0, 10); + CustomerResponses findCustomers = customerService.findAll(pageSize); //then assertThat(findCustomers.customerResponses().size()).isEqualTo(1); @@ -88,4 +95,14 @@ void deleteById() { assertThat(findCustomers.size()).isEqualTo(0); } + @Test + @DisplayName("존재하지 않는 고객 아이디로 삭제 요청시 EntityNotFoundException가 발생한다.") + void deleteByNotExistId() { + //when + Exception exception = catchException(() -> customerService.deleteById(new Random().nextLong())); + + //then + assertThat(exception).isInstanceOf(EntityNotFoundException.class); + } + } diff --git a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java index 78b634f12..7aa911dc7 100644 --- a/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java +++ b/src/test/java/com/example/springjpamission/customer/domain/RelationMappingTest.java @@ -5,10 +5,11 @@ import com.example.springjpamission.order.domain.Car; import com.example.springjpamission.order.domain.Order; import com.example.springjpamission.order.domain.OrderItem; +import com.example.springjpamission.order.domain.Price; import jakarta.persistence.EntityManager; import jakarta.persistence.EntityManagerFactory; import jakarta.persistence.EntityTransaction; -import java.util.UUID; + import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -30,25 +31,26 @@ void order_orderItem_item_mappingTest() { EntityTransaction transaction = em.getTransaction(); Customer customer = new Customer(new Name("별", "김")); + Order order = new Order("test memo", new Price(1000), customer); + Car car = new Car(new Price(1000), 1, 500); + OrderItem orderItem = new OrderItem(new Price(1000), order, car); + //when transaction.begin(); - String id = UUID.randomUUID().toString(); - Order order = new Order(id, "----", 1000, 1, customer); - Car car = new Car(1000, 1, 500); - OrderItem orderItem = new OrderItem(1000, 1, order, car); - order.addOrderItem(orderItem); + em.persist(customer); + em.persist(car); + em.persist(orderItem); - em.persist(order); transaction.commit(); em.clear(); //then - Order updatedOrder = em.find(Order.class, id); + Order updatedOrder = em.find(Order.class, orderItem.getId()); OrderItem updatedOrderItem = em.find(OrderItem.class, orderItem.getId()); Car item = (Car) updatedOrderItem.getItem(); - assertThat(updatedOrder.getOrderItems().get(0).getPrice()).isEqualTo(1000); + assertThat(updatedOrder.getOrderItems().get(0).getPrice().getCost()).isEqualTo(1000); assertThat(item.getPower()).isEqualTo(500); }