From 8be040566e455c185ce3574513010fbb633314e8 Mon Sep 17 00:00:00 2001 From: jhan0121 Date: Sun, 21 Dec 2025 20:38:47 +0900 Subject: [PATCH 01/16] =?UTF-8?q?init:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B4=88=EA=B8=B0=20=EC=84=A4=EC=A0=95=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 3 + build.gradle | 39 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43764 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 251 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../recyclestudy/RecyclestudyApplication.java | 13 + src/main/resources/application.yaml | 3 + .../RecyclestudyApplicationTests.java | 13 + 10 files changed, 424 insertions(+) create mode 100644 .gitattributes 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/recyclestudy/RecyclestudyApplication.java create mode 100644 src/main/resources/application.yaml create mode 100644 src/test/java/com/recyclestudy/RecyclestudyApplicationTests.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e4b08da --- /dev/null +++ b/build.gradle @@ -0,0 +1,39 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.5.9' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.recyclestudy' +version = '0.0.1-SNAPSHOT' +description = 'Periodic Review Assistant' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846 GIT binary patch literal 43764 zcma&OWmKeVvL#I6?i3D%6z=Zs?ofE*?rw#G$eqJB ziT4y8-Y@s9rkH0Tz>ll(^xkcTl)CY?rS&9VNd66Yc)g^6)JcWaY(5$5gt z8gr3SBXUTN;~cBgz&})qX%#!Fxom2Yau_`&8)+6aSN7YY+pS410rRUU*>J}qL0TnJ zRxt*7QeUqTh8j)Q&iavh<}L+$Jqz))<`IfKussVk%%Ah-Ti?Eo0hQH!rK%K=#EAw0 zwq@@~XNUXRnv8$;zv<6rCRJ6fPD^hfrh;0K?n z=p!u^3xOgWZ%f3+?+>H)9+w^$Tn1e;?UpVMJb!!;f)`6f&4|8mr+g)^@x>_rvnL0< zvD0Hu_N>$(Li7|Jgu0mRh&MV+<}`~Wi*+avM01E)Jtg=)-vViQKax!GeDc!xv$^mL z{#OVBA$U{(Zr8~Xm|cP@odkHC*1R8z6hcLY#N@3E-A8XEvpt066+3t9L_6Zg6j@9Q zj$$%~yO-OS6PUVrM2s)(T4#6=JpI_@Uz+!6=GdyVU?`!F=d;8#ZB@(5g7$A0(`eqY z8_i@3w$0*es5mrSjhW*qzrl!_LQWs4?VfLmo1Sd@Ztt53+etwzAT^8ow_*7Jp`Y|l z*UgSEwvxq+FYO!O*aLf-PinZYne7Ib6ny3u>MjQz=((r3NTEeU4=-i0LBq3H-VJH< z^>1RE3_JwrclUn9vb7HcGUaFRA0QHcnE;6)hnkp%lY1UII#WPAv?-;c?YH}LWB8Nl z{sx-@Z;QxWh9fX8SxLZk8;kMFlGD3Jc^QZVL4nO)1I$zQwvwM&_!kW+LMf&lApv#< zur|EyC|U@5OQuph$TC_ZU`{!vJp`13e9alaR0Dbn5ikLFH7>eIz4QbV|C=%7)F=qo z_>M&5N)d)7G(A%c>}UCrW!Ql_6_A{?R7&CL`;!KOb3 z8Z=$YkV-IF;c7zs{3-WDEFJzuakFbd*4LWd<_kBE8~BFcv}js_2OowRNzWCtCQ6&k z{&~Me92$m*@e0ANcWKuz)?YjB*VoSTx??-3Cc0l2U!X^;Bv@m87eKHukAljrD54R+ zE;@_w4NPe1>3`i5Qy*3^E9x#VB6?}v=~qIprrrd5|DFkg;v5ixo0IsBmik8=Y;zv2 z%Bcf%NE$a44bk^`i4VwDLTbX=q@j9;JWT9JncQ!+Y%2&HHk@1~*L8-{ZpY?(-a9J-1~<1ltr9i~D9`P{XTIFWA6IG8c4;6bFw*lzU-{+?b&%OcIoCiw00n>A1ra zFPE$y@>ebbZlf(sN_iWBzQKDV zmmaLX#zK!@ZdvCANfwV}9@2O&w)!5gSgQzHdk2Q`jG6KD7S+1R5&F)j6QTD^=hq&7 zHUW+r^da^%V(h(wonR(j?BOiC!;y=%nJvz?*aW&5E87qq;2z`EI(f zBJNNSMFF9U{sR-af5{IY&AtoGcoG)Iq-S^v{7+t0>7N(KRoPj;+2N5;9o_nxIGjJ@ z7bYQK)bX)vEhy~VL%N6g^NE@D5VtV+Q8U2%{ji_=6+i^G%xeskEhH>Sqr194PJ$fB zu1y^){?9Vkg(FY2h)3ZHrw0Z<@;(gd_dtF#6y_;Iwi{yX$?asr?0N0_B*CifEi7<6 zq`?OdQjCYbhVcg+7MSgIM|pJRu~`g?g3x?Tl+V}#$It`iD1j+!x+!;wS0+2e>#g?Z z*EA^k7W{jO1r^K~cD#5pamp+o@8&yw6;%b|uiT?{Wa=4+9<}aXWUuL#ZwN1a;lQod zW{pxWCYGXdEq9qAmvAB904}?97=re$>!I%wxPV#|f#@A*Y=qa%zHlDv^yWbR03%V0 zprLP+b(#fBqxI%FiF*-n8HtH6$8f(P6!H3V^ysgd8de-N(@|K!A< z^qP}jp(RaM9kQ(^K(U8O84?D)aU(g?1S8iWwe)gqpHCaFlJxb*ilr{KTnu4_@5{K- z)n=CCeCrPHO0WHz)dDtkbZfUfVBd?53}K>C5*-wC4hpDN8cGk3lu-ypq+EYpb_2H; z%vP4@&+c2p;thaTs$dc^1CDGlPG@A;yGR5@$UEqk6p58qpw#7lc<+W(WR;(vr(D>W z#(K$vE#uBkT=*q&uaZwzz=P5mjiee6>!lV?c}QIX%ZdkO1dHg>Fa#xcGT6~}1*2m9 zkc7l3ItD6Ie~o_aFjI$Ri=C!8uF4!Ky7iG9QTrxVbsQroi|r)SAon#*B*{}TB-?=@ z8~jJs;_R2iDd!$+n$%X6FO&PYS{YhDAS+U2o4su9x~1+U3z7YN5o0qUK&|g^klZ6X zj_vrM5SUTnz5`*}Hyts9ADwLu#x_L=nv$Z0`HqN`Zo=V>OQI)fh01n~*a%01%cx%0 z4LTFVjmW+ipVQv5rYcn3;d2o4qunWUY!p+?s~X~(ost@WR@r@EuDOSs8*MT4fiP>! zkfo^!PWJJ1MHgKS2D_hc?Bs?isSDO61>ebl$U*9*QY(b=i&rp3@3GV@z>KzcZOxip z^dzA~44;R~cnhWz7s$$v?_8y-k!DZys}Q?4IkSyR!)C0j$(Gm|t#e3|QAOFaV2}36 z?dPNY;@I=FaCwylc_;~kXlZsk$_eLkNb~TIl8QQ`mmH&$*zwwR8zHU*sId)rxHu*K z;yZWa8UmCwju%aSNLwD5fBl^b0Ux1%q8YR*uG`53Mi<`5uA^Dc6Ync)J3N7;zQ*75)hf%a@{$H+%S?SGT)ks60)?6j$ zspl|4Ad6@%-r1t*$tT(en!gIXTUDcsj?28ZEzz)dH)SV3bZ+pjMaW0oc~rOPZP@g! zb9E+ndeVO_Ib9c_>{)`01^`ZS198 z)(t=+{Azi11$eu%aU7jbwuQrO`vLOixuh~%4z@mKr_Oc;F%Uq01fA)^W&y+g16e?rkLhTxV!EqC%2}sx_1u7IBq|}Be&7WI z4I<;1-9tJsI&pQIhj>FPkQV9{(m!wYYV@i5h?A0#BN2wqlEwNDIq06|^2oYVa7<~h zI_OLan0Do*4R5P=a3H9`s5*>xU}_PSztg`+2mv)|3nIy=5#Z$%+@tZnr> zLcTI!Mxa`PY7%{;KW~!=;*t)R_sl<^b>eNO@w#fEt(tPMg_jpJpW$q_DoUlkY|uo> z0-1{ouA#;t%spf*7VjkK&$QrvwUERKt^Sdo)5@?qAP)>}Y!h4(JQ!7{wIdkA+|)bv z&8hBwoX4v|+fie}iTslaBX^i*TjwO}f{V)8*!dMmRPi%XAWc8<_IqK1jUsApk)+~R zNFTCD-h>M5Y{qTQ&0#j@I@tmXGj%rzhTW5%Bkh&sSc=$Fv;M@1y!zvYG5P2(2|(&W zlcbR1{--rJ&s!rB{G-sX5^PaM@3EqWVz_y9cwLR9xMig&9gq(voeI)W&{d6j1jh&< zARXi&APWE1FQWh7eoZjuP z;vdgX>zep^{{2%hem;e*gDJhK1Hj12nBLIJoL<=0+8SVEBx7!4Ea+hBY;A1gBwvY<)tj~T=H`^?3>zeWWm|LAwo*S4Z%bDVUe z6r)CH1H!(>OH#MXFJ2V(U(qxD{4Px2`8qfFLG+=a;B^~Te_Z!r3RO%Oc#ZAHKQxV5 zRYXxZ9T2A%NVJIu5Pu7!Mj>t%YDO$T@M=RR(~mi%sv(YXVl`yMLD;+WZ{vG9(@P#e zMo}ZiK^7^h6TV%cG+;jhJ0s>h&VERs=tuZz^Tlu~%d{ZHtq6hX$V9h)Bw|jVCMudd zwZ5l7In8NT)qEPGF$VSKg&fb0%R2RnUnqa){)V(X(s0U zkCdVZe6wy{+_WhZh3qLp245Y2RR$@g-!9PjJ&4~0cFSHMUn=>dapv)hy}|y91ZWTV zCh=z*!S3_?`$&-eZ6xIXUq8RGl9oK0BJw*TdU6A`LJqX9eS3X@F)g$jLkBWFscPhR zpCv8#KeAc^y>>Y$k^=r|K(DTC}T$0#jQBOwB#@`P6~*IuW_8JxCG}J4va{ zsZzt}tt+cv7=l&CEuVtjD6G2~_Meh%p4RGuY?hSt?(sreO_F}8r7Kp$qQdvCdZnDQ zxzc*qchE*E2=WK)^oRNa>Ttj`fpvF-JZ5tu5>X1xw)J@1!IqWjq)ESBG?J|ez`-Tc zi5a}GZx|w-h%5lNDE_3ho0hEXMoaofo#Z;$8|2;EDF&*L+e$u}K=u?pb;dv$SXeQM zD-~7P0i_`Wk$#YP$=hw3UVU+=^@Kuy$>6?~gIXx636jh{PHly_a2xNYe1l60`|y!7 z(u%;ILuW0DDJ)2%y`Zc~hOALnj1~txJtcdD#o4BCT68+8gZe`=^te6H_egxY#nZH&P*)hgYaoJ^qtmpeea`35Fw)cy!w@c#v6E29co8&D9CTCl%^GV|X;SpneSXzV~LXyRn-@K0Df z{tK-nDWA!q38M1~`xUIt_(MO^R(yNY#9@es9RQbY@Ia*xHhD&=k^T+ zJi@j2I|WcgW=PuAc>hs`(&CvgjL2a9Rx zCbZyUpi8NWUOi@S%t+Su4|r&UoU|ze9SVe7p@f1GBkrjkkq)T}X%Qo1g!SQ{O{P?m z-OfGyyWta+UCXH+-+(D^%kw#A1-U;?9129at7MeCCzC{DNgO zeSqsV>W^NIfTO~4({c}KUiuoH8A*J!Cb0*sp*w-Bg@YfBIPZFH!M}C=S=S7PLLcIG zs7K77g~W)~^|+mx9onzMm0qh(f~OsDTzVmRtz=aZTllgR zGUn~_5hw_k&rll<4G=G+`^Xlnw;jNYDJz@bE?|r866F2hA9v0-8=JO3g}IHB#b`hy zA42a0>{0L7CcabSD+F7?pGbS1KMvT{@1_@k!_+Ki|5~EMGt7T%u=79F)8xEiL5!EJ zzuxQ`NBliCoJMJdwu|);zRCD<5Sf?Y>U$trQ-;xj6!s5&w=9E7)%pZ+1Nh&8nCCwM zv5>Ket%I?cxr3vVva`YeR?dGxbG@pi{H#8@kFEf0Jq6~K4>kt26*bxv=P&jyE#e$| zDJB_~imk^-z|o!2njF2hL*|7sHCnzluhJjwLQGDmC)Y9 zr9ZN`s)uCd^XDvn)VirMgW~qfn1~SaN^7vcX#K1G`==UGaDVVx$0BQnubhX|{e z^i0}>k-;BP#Szk{cFjO{2x~LjK{^Upqd&<+03_iMLp0$!6_$@TbX>8U-f*-w-ew1?`CtD_0y_Lo|PfKi52p?`5$Jzx0E8`M0 zNIb?#!K$mM4X%`Ry_yhG5k@*+n4||2!~*+&pYLh~{`~o(W|o64^NrjP?-1Lgu?iK^ zTX6u3?#$?R?N!{599vg>G8RGHw)Hx&=|g4599y}mXNpM{EPKKXB&+m?==R3GsIq?G zL5fH={=zawB(sMlDBJ+{dgb)Vx3pu>L=mDV0{r1Qs{0Pn%TpopH{m(By4;{FBvi{I z$}x!Iw~MJOL~&)p93SDIfP3x%ROjg}X{Sme#hiJ&Yk&a;iR}V|n%PriZBY8SX2*;6 z4hdb^&h;Xz%)BDACY5AUsV!($lib4>11UmcgXKWpzRL8r2Srl*9Y(1uBQsY&hO&uv znDNff0tpHlLISam?o(lOp#CmFdH<6HmA0{UwfU#Y{8M+7od8b8|B|7ZYR9f<#+V|ZSaCQvI$~es~g(Pv{2&m_rKSB2QQ zMvT}$?Ll>V+!9Xh5^iy3?UG;dF-zh~RL#++roOCsW^cZ&({6q|?Jt6`?S8=16Y{oH zp50I7r1AC1(#{b`Aq5cw>ypNggHKM9vBx!W$eYIzD!4KbLsZGr2o8>g<@inmS3*>J zx8oG((8f!ei|M@JZB`p7+n<Q}?>h249<`7xJ?u}_n;Gq(&km#1ULN87CeTO~FY zS_Ty}0TgQhV zOh3T7{{x&LSYGQfKR1PDIkP!WnfC1$l+fs@Di+d4O=eVKeF~2fq#1<8hEvpwuqcaH z4A8u~r^gnY3u6}zj*RHjk{AHhrrDqaj?|6GaVJbV%o-nATw}ASFr!f`Oz|u_QPkR# z0mDudY1dZRlk@TyQ?%Eti=$_WNFtLpSx9=S^be{wXINp%MU?a`F66LNU<c;0&ngifmP9i;bj6&hdGMW^Kf8e6ZDXbQD&$QAAMo;OQ)G zW(qlHh;}!ZP)JKEjm$VZjTs@hk&4{?@+NADuYrr!R^cJzU{kGc1yB?;7mIyAWwhbeA_l_lw-iDVi7wcFurf5 z#Uw)A@a9fOf{D}AWE%<`s1L_AwpZ?F!Vac$LYkp<#A!!`XKaDC{A%)~K#5z6>Hv@V zBEqF(D5?@6r3Pwj$^krpPDCjB+UOszqUS;b2n>&iAFcw<*im2(b3|5u6SK!n9Sg4I z0KLcwA6{Mq?p%t>aW0W!PQ>iUeYvNjdKYqII!CE7SsS&Rj)eIw-K4jtI?II+0IdGq z2WT|L3RL?;GtGgt1LWfI4Ka`9dbZXc$TMJ~8#Juv@K^1RJN@yzdLS8$AJ(>g!U9`# zx}qr7JWlU+&m)VG*Se;rGisutS%!6yybi%B`bv|9rjS(xOUIvbNz5qtvC$_JYY+c& za*3*2$RUH8p%pSq>48xR)4qsp!Q7BEiJ*`^>^6INRbC@>+2q9?x(h0bpc>GaNFi$K zPH$6!#(~{8@0QZk=)QnM#I=bDx5vTvjm$f4K}%*s+((H2>tUTf==$wqyoI`oxI7>C z&>5fe)Yg)SmT)eA(|j@JYR1M%KixxC-Eceknf-;N=jJTwKvk#@|J^&5H0c+%KxHUI z6dQbwwVx3p?X<_VRVb2fStH?HH zFR@Mp=qX%#L3XL)+$PXKV|o|#DpHAoqvj6uQKe@M-mnhCSou7Dj4YuO6^*V`m)1lf z;)@e%1!Qg$10w8uEmz{ENb$^%u}B;J7sDd zump}onoD#!l=agcBR)iG!3AF0-63%@`K9G(CzKrm$VJ{v7^O9Ps7Zej|3m= zVXlR&yW6=Y%mD30G@|tf=yC7-#L!16Q=dq&@beWgaIL40k0n% z)QHrp2Jck#evLMM1RGt3WvQ936ZC9vEje0nFMfvmOHVI+&okB_K|l-;|4vW;qk>n~ z+|kk8#`K?x`q>`(f6A${wfw9Cx(^)~tX7<#TpxR#zYG2P+FY~mG{tnEkv~d6oUQA+ z&hNTL=~Y@rF`v-RZlts$nb$3(OL1&@Y11hhL9+zUb6)SP!;CD)^GUtUpCHBE`j1te zAGud@miCVFLk$fjsrcpjsadP__yj9iEZUW{Ll7PPi<$R;m1o!&Xdl~R_v0;oDX2z^!&8}zNGA}iYG|k zmehMd1%?R)u6R#<)B)1oe9TgYH5-CqUT8N7K-A-dm3hbm_W21p%8)H{O)xUlBVb+iUR}-v5dFaCyfSd zC6Bd7=N4A@+Bna=!-l|*_(nWGDpoyU>nH=}IOrLfS+-d40&(Wo*dDB9nQiA2Tse$R z;uq{`X7LLzP)%Y9aHa4YQ%H?htkWd3Owv&UYbr5NUDAH^<l@Z0Cx%`N+B*i!!1u>D8%;Qt1$ zE5O0{-`9gdDxZ!`0m}ywH!;c{oBfL-(BH<&SQ~smbcobU!j49O^f4&IIYh~f+hK*M zZwTp%{ZSAhMFj1qFaOA+3)p^gnXH^=)`NTYgTu!CLpEV2NF=~-`(}7p^Eof=@VUbd z_9U|8qF7Rueg&$qpSSkN%%%DpbV?8E8ivu@ensI0toJ7Eas^jyFReQ1JeY9plb^{m z&eQO)qPLZQ6O;FTr*aJq=$cMN)QlQO@G&%z?BKUs1&I^`lq>=QLODwa`(mFGC`0H< zOlc*|N?B5&!U6BuJvkL?s1&nsi$*5cCv7^j_*l&$-sBmRS85UIrE--7eD8Gr3^+o? zqG-Yl4S&E;>H>k^a0GdUI(|n1`ws@)1%sq2XBdK`mqrNq_b4N{#VpouCXLzNvjoFv zo9wMQ6l0+FT+?%N(ka*;%m~(?338bu32v26!{r)|w8J`EL|t$}TA4q_FJRX5 zCPa{hc_I(7TGE#@rO-(!$1H3N-C0{R$J=yPCXCtGk{4>=*B56JdXU9cQVwB`6~cQZ zf^qK21x_d>X%dT!!)CJQ3mlHA@ z{Prkgfs6=Tz%63$6Zr8CO0Ak3A)Cv#@BVKr&aiKG7RYxY$Yx>Bj#3gJk*~Ps-jc1l z;4nltQwwT4@Z)}Pb!3xM?+EW0qEKA)sqzw~!C6wd^{03-9aGf3Jmt=}w-*!yXupLf z;)>-7uvWN4Unn8b4kfIza-X=x*e4n5pU`HtgpFFd))s$C@#d>aUl3helLom+RYb&g zI7A9GXLRZPl}iQS*d$Azxg-VgcUr*lpLnbPKUV{QI|bsG{8bLG<%CF( zMoS4pRDtLVYOWG^@ox^h8xL~afW_9DcE#^1eEC1SVSb1BfDi^@g?#f6e%v~Aw>@w- zIY0k+2lGWNV|aA*e#`U3=+oBDmGeInfcL)>*!w|*;mWiKNG6wP6AW4-4imN!W)!hE zA02~S1*@Q`fD*+qX@f3!2yJX&6FsEfPditB%TWo3=HA;T3o2IrjS@9SSxv%{{7&4_ zdS#r4OU41~GYMiib#z#O;zohNbhJknrPPZS6sN$%HB=jUnlCO_w5Gw5EeE@KV>soy z2EZ?Y|4RQDDjt5y!WBlZ(8M)|HP<0YyG|D%RqD+K#e7-##o3IZxS^wQ5{Kbzb6h(i z#(wZ|^ei>8`%ta*!2tJzwMv+IFHLF`zTU8E^Mu!R*45_=ccqI};Zbyxw@U%a#2}%f zF>q?SrUa_a4H9l+uW8JHh2Oob>NyUwG=QH~-^ZebU*R@67DcXdz2{HVB4#@edz?B< z5!rQH3O0>A&ylROO%G^fimV*LX7>!%re{_Sm6N>S{+GW1LCnGImHRoF@csnFzn@P0 zM=jld0z%oz;j=>c7mMwzq$B^2mae7NiG}%>(wtmsDXkWk{?BeMpTrIt3Mizq?vRsf zi_WjNp+61uV(%gEU-Vf0;>~vcDhe(dzWdaf#4mH3o^v{0EWhj?E?$5v02sV@xL0l4 zX0_IMFtQ44PfWBbPYN#}qxa%=J%dlR{O!KyZvk^g5s?sTNycWYPJ^FK(nl3k?z-5t z39#hKrdO7V(@!TU)LAPY&ngnZ1MzLEeEiZznn7e-jLCy8LO zu^7_#z*%I-BjS#Pg-;zKWWqX-+Ly$T!4`vTe5ZOV0j?TJVA*2?*=82^GVlZIuH%9s zXiV&(T(QGHHah=s&7e|6y?g+XxZGmK55`wGV>@1U)Th&=JTgJq>4mI&Av2C z)w+kRoj_dA!;SfTfkgMPO>7Dw6&1*Hi1q?54Yng`JO&q->^CX21^PrU^JU#CJ_qhV zSG>afB%>2fx<~g8p=P8Yzxqc}s@>>{g7}F!;lCXvF#RV)^fyYb_)iKVCz1xEq=fJ| z0a7DMCK*FuP=NM*5h;*D`R4y$6cpW-E&-i{v`x=Jbk_xSn@2T3q!3HoAOB`@5Vg6) z{PW|@9o!e;v1jZ2{=Uw6S6o{g82x6g=k!)cFSC*oemHaVjg?VpEmtUuD2_J^A~$4* z3O7HsbA6wxw{TP5Kk)(Vm?gKo+_}11vbo{Tp_5x79P~#F)ahQXT)tSH5;;14?s)On zel1J>1x>+7;g1Iz2FRpnYz;sD0wG9Q!vuzE9yKi3@4a9Nh1!GGN?hA)!mZEnnHh&i zf?#ZEN2sFbf~kV;>K3UNj1&vFhc^sxgj8FCL4v>EOYL?2uuT`0eDH}R zmtUJMxVrV5H{L53hu3#qaWLUa#5zY?f5ozIn|PkMWNP%n zWB5!B0LZB0kLw$k39=!akkE9Q>F4j+q434jB4VmslQ;$ zKiO#FZ`p|dKS716jpcvR{QJkSNfDVhr2%~eHrW;fU45>>snr*S8Vik-5eN5k*c2Mp zyxvX&_cFbB6lODXznHHT|rsURe2!swomtrqc~w5 zymTM8!w`1{04CBprR!_F{5LB+2_SOuZN{b*!J~1ZiPpP-M;);!ce!rOPDLtgR@Ie1 zPreuqm4!H)hYePcW1WZ0Fyaqe%l}F~Orr)~+;mkS&pOhP5Ebb`cnUt!X_QhP4_4p( z8YKQCDKGIy>?WIFm3-}Br2-N`T&FOi?t)$hjphB9wOhBXU#Hb+zm&We_-O)s(wc`2 z8?VsvU;J>Ju7n}uUb3s1yPx_F*|FlAi=Ge=-kN?1;`~6szP%$3B0|8Sqp%ebM)F8v zADFrbeT0cgE>M0DMV@_Ze*GHM>q}wWMzt|GYC%}r{OXRG3Ij&<+nx9;4jE${Fj_r* z`{z1AW_6Myd)i6e0E-h&m{{CvzH=Xg!&(bLYgRMO_YVd8JU7W+7MuGWNE=4@OvP9+ zxi^vqS@5%+#gf*Z@RVyU9N1sO-(rY$24LGsg1>w>s6ST^@)|D9>cT50maXLUD{Fzf zt~tp{OSTEKg3ZSQyQQ5r51){%=?xlZ54*t1;Ow)zLe3i?8tD8YyY^k%M)e`V*r+vL zPqUf&m)U+zxps+NprxMHF{QSxv}>lE{JZETNk1&F+R~bp{_T$dbXL2UGnB|hgh*p4h$clt#6;NO~>zuyY@C-MD@)JCc5XrYOt`wW7! z_ti2hhZBMJNbn0O-uTxl_b6Hm313^fG@e;RrhIUK9@# z+DHGv_Ow$%S8D%RB}`doJjJy*aOa5mGHVHz0e0>>O_%+^56?IkA5eN+L1BVCp4~m=1eeL zb;#G!#^5G%6Mw}r1KnaKsLvJB%HZL)!3OxT{k$Yo-XrJ?|7{s4!H+S2o?N|^Z z)+?IE9H7h~Vxn5hTis^3wHYuOU84+bWd)cUKuHapq=&}WV#OxHpLab`NpwHm8LmOo zjri+!k;7j_?FP##CpM+pOVx*0wExEex z@`#)K<-ZrGyArK;a%Km`^+We|eT+#MygHOT6lXBmz`8|lyZOwL1+b+?Z$0OhMEp3R z&J=iRERpv~TC=p2-BYLC*?4 zxvPs9V@g=JT0>zky5Poj=fW_M!c)Xxz1<=&_ZcL=LMZJqlnO1P^xwGGW*Z+yTBvbV z-IFe6;(k1@$1;tS>{%pXZ_7w+i?N4A2=TXnGf=YhePg8bH8M|Lk-->+w8Y+FjZ;L=wSGwxfA`gqSn)f(XNuSm>6Y z@|#e-)I(PQ^G@N`%|_DZSb4_pkaEF0!-nqY+t#pyA>{9^*I-zw4SYA1_z2Bs$XGUZbGA;VeMo%CezHK0lO={L%G)dI-+8w?r9iexdoB{?l zbJ}C?huIhWXBVs7oo{!$lOTlvCLZ_KN1N+XJGuG$rh<^eUQIqcI7^pmqhBSaOKNRq zrx~w^?9C?*&rNwP_SPYmo;J-#!G|{`$JZK7DxsM3N^8iR4vvn>E4MU&Oe1DKJvLc~ zCT>KLZ1;t@My zRj_2hI^61T&LIz)S!+AQIV23n1>ng+LUvzv;xu!4;wpqb#EZz;F)BLUzT;8UA1x*6vJ zicB!3Mj03s*kGV{g`fpC?V^s(=JG-k1EMHbkdP4P*1^8p_TqO|;!Zr%GuP$8KLxuf z=pv*H;kzd;P|2`JmBt~h6|GxdU~@weK5O=X&5~w$HpfO}@l-T7@vTCxVOwCkoPQv8 z@aV_)I5HQtfs7^X=C03zYmH4m0S!V@JINm6#(JmZRHBD?T!m^DdiZJrhKpBcur2u1 zf9e4%k$$vcFopK5!CC`;ww(CKL~}mlxK_Pv!cOsFgVkNIghA2Au@)t6;Y3*2gK=5d z?|@1a)-(sQ%uFOmJ7v2iG&l&m^u&^6DJM#XzCrF%r>{2XKyxLD2rgWBD;i(!e4InDQBDg==^z;AzT2z~OmV0!?Z z0S9pX$+E;w3WN;v&NYT=+G8hf=6w0E1$0AOr61}eOvE8W1jX%>&Mjo7&!ulawgzLH zbcb+IF(s^3aj12WSi#pzIpijJJzkP?JzRawnxmNDSUR#7!29vHULCE<3Aa#be}ie~d|!V+ z%l~s9Odo$G&fH!t!+`rUT0T9DulF!Yq&BfQWFZV1L9D($r4H(}Gnf6k3^wa7g5|Ws zj7%d`!3(0bb55yhC6@Q{?H|2os{_F%o=;-h{@Yyyn*V7?{s%Grvpe!H^kl6tF4Zf5 z{Jv1~yZ*iIWL_9C*8pBMQArfJJ0d9Df6Kl#wa}7Xa#Ef_5B7=X}DzbQXVPfCwTO@9+@;A^Ti6il_C>g?A-GFwA0#U;t4;wOm-4oS})h z5&on>NAu67O?YCQr%7XIzY%LS4bha9*e*4bU4{lGCUmO2UQ2U)QOqClLo61Kx~3dI zmV3*(P6F_Tr-oP%x!0kTnnT?Ep5j;_IQ^pTRp=e8dmJtI4YgWd0}+b2=ATkOhgpXe z;jmw+FBLE}UIs4!&HflFr4)vMFOJ19W4f2^W(=2)F%TAL)+=F>IE$=e=@j-*bFLSg z)wf|uFQu+!=N-UzSef62u0-C8Zc7 zo6@F)c+nZA{H|+~7i$DCU0pL{0Ye|fKLuV^w!0Y^tT$isu%i1Iw&N|tX3kwFKJN(M zXS`k9js66o$r)x?TWL}Kxl`wUDUpwFx(w4Yk%49;$sgVvT~n8AgfG~HUcDt1TRo^s zdla@6heJB@JV z!vK;BUMznhzGK6PVtj0)GB=zTv6)Q9Yt@l#fv7>wKovLobMV-+(8)NJmyF8R zcB|_K7=FJGGn^X@JdFaat0uhKjp3>k#^&xE_}6NYNG?kgTp>2Iu?ElUjt4~E-?`Du z?mDCS9wbuS%fU?5BU@Ijx>1HG*N?gIP+<~xE4u=>H`8o((cS5M6@_OK%jSjFHirQK zN9@~NXFx*jS{<|bgSpC|SAnA@I)+GB=2W|JJChLI_mx+-J(mSJ!b)uUom6nH0#2^(L@JBlV#t zLl?j54s`Y3vE^c_3^Hl0TGu*tw_n?@HyO@ZrENxA+^!)OvUX28gDSF*xFtQzM$A+O zCG=n#6~r|3zt=8%GuG} z<#VCZ%2?3Q(Ad#Y7GMJ~{U3>E{5e@z6+rgZLX{Cxk^p-7dip^d29;2N1_mm4QkASo z-L`GWWPCq$uCo;X_BmGIpJFBlhl<8~EG{vOD1o|X$aB9KPhWO_cKiU*$HWEgtf=fn zsO%9bp~D2c@?*K9jVN@_vhR03>M_8h!_~%aN!Cnr?s-!;U3SVfmhRwk11A^8Ns`@KeE}+ zN$H}a1U6E;*j5&~Og!xHdfK5M<~xka)x-0N)K_&e7AjMz`toDzasH+^1bZlC!n()crk9kg@$(Y{wdKvbuUd04N^8}t1iOgsKF zGa%%XWx@WoVaNC1!|&{5ZbkopFre-Lu(LCE5HWZBoE#W@er9W<>R=^oYxBvypN#x3 zq#LC8&q)GFP=5^-bpHj?LW=)-g+3_)Ylps!3^YQ{9~O9&K)xgy zMkCWaApU-MI~e^cV{Je75Qr7eF%&_H)BvfyKL=gIA>;OSq(y z052BFz3E(Prg~09>|_Z@!qj}@;8yxnw+#Ej0?Rk<y}4ghbD569B{9hSFr*^ygZ zr6j7P#gtZh6tMk6?4V$*Jgz+#&ug;yOr>=qdI#9U&^am2qoh4Jy}H2%a|#Fs{E(5r z%!ijh;VuGA6)W)cJZx+;9Bp1LMUzN~x_8lQ#D3+sL{be-Jyeo@@dv7XguJ&S5vrH` z>QxOMWn7N-T!D@1(@4>ZlL^y5>m#0!HKovs12GRav4z!>p(1~xok8+_{| z#Ae4{9#NLh#Vj2&JuIn5$d6t@__`o}umFo(n0QxUtd2GKCyE+erwXY?`cm*h&^9*8 zJ+8x6fRZI-e$CRygofIQN^dWysCxgkyr{(_oBwwSRxZora1(%(aC!5BTtj^+YuevI zx?)H#(xlALUp6QJ!=l9N__$cxBZ5p&7;qD3PsXRFVd<({Kh+mShFWJNpy`N@ab7?9 zv5=klvCJ4bx|-pvOO2-+G)6O?$&)ncA#Urze2rlBfp#htudhx-NeRnJ@u%^_bfw4o z4|{b8SkPV3b>Wera1W(+N@p9H>dc6{cnkh-sgr?e%(YkWvK+0YXVwk0=d`)}*47*B z5JGkEdVix!w7-<%r0JF~`ZMMPe;f0EQHuYHxya`puazyph*ZSb1mJAt^k4549BfS; zK7~T&lRb=W{s&t`DJ$B}s-eH1&&-wEOH1KWsKn0a(ZI+G!v&W4A*cl>qAvUv6pbUR z#(f#EKV8~hk&8oayBz4vaswc(?qw1vn`yC zZQDl2PCB-&Uu@g9ZQHhO+v(W0bNig{-k0;;`+wM@#@J)8r?qOYs#&vUna8ILxN7S{ zp1s41KnR8miQJtJtOr|+qk}wrLt+N*z#5o`TmD1)E&QD(Vh&pjZJ_J*0!8dy_ z>^=@v=J)C`x&gjqAYu`}t^S=DFCtc0MkBU2zf|69?xW`Ck~(6zLD)gSE{7n~6w8j_ zoH&~$ED2k5-yRa0!r8fMRy z;QjBYUaUnpd}mf%iVFPR%Dg9!d>g`01m~>2s))`W|5!kc+_&Y>wD@@C9%>-lE`WB0 zOIf%FVD^cj#2hCkFgi-fgzIfOi+ya)MZK@IZhHT5FVEaSbv-oDDs0W)pA0&^nM0TW zmgJmd7b1R7b0a`UwWJYZXp4AJPteYLH>@M|xZFKwm!t3D3&q~av?i)WvAKHE{RqpD{{%OhYkK?47}+}` zrR2(Iv9bhVa;cDzJ%6ntcSbx7v7J@Y4x&+eWSKZ*eR7_=CVIUSB$^lfYe@g+p|LD{ zPSpQmxx@b$%d!05|H}WzBT4_cq?@~dvy<7s&QWtieJ9)hd4)$SZz}#H2UTi$CkFWW|I)v_-NjuH!VypONC=1`A=rm_jfzQ8Fu~1r8i{q-+S_j$ z#u^t&Xnfi5tZtl@^!fUJhx@~Cg0*vXMK}D{>|$#T*+mj(J_@c{jXBF|rm4-8%Z2o! z2z0o(4%8KljCm^>6HDK!{jI7p+RAPcty_~GZ~R_+=+UzZ0qzOwD=;YeZt*?3%UGdr z`c|BPE;yUbnyARUl&XWSNJ<+uRt%!xPF&K;(l$^JcA_CMH6)FZt{>6ah$|(9$2fc~ z=CD00uHM{qv;{Zk9FR0~u|3|Eiqv9?z2#^GqylT5>6JNZwKqKBzzQpKU2_pmtD;CT zi%Ktau!Y2Tldfu&b0UgmF(SSBID)15*r08eoUe#bT_K-G4VecJL2Pa=6D1K6({zj6 za(2Z{r!FY5W^y{qZ}08+h9f>EKd&PN90f}Sc0ejf%kB4+f#T8Q1=Pj=~#pi$U zp#5rMR%W25>k?<$;$x72pkLibu1N|jX4cWjD3q^Pk3js!uK6h7!dlvw24crL|MZs_ zb%Y%?Fyp0bY0HkG^XyS76Ts*|Giw{31LR~+WU5NejqfPr73Rp!xQ1mLgq@mdWncLy z%8}|nzS4P&`^;zAR-&nm5f;D-%yNQPwq4N7&yULM8bkttkD)hVU>h>t47`{8?n2&4 zjEfL}UEagLUYwdx0sB2QXGeRmL?sZ%J!XM`$@ODc2!y|2#7hys=b$LrGbvvjx`Iqi z&RDDm3YBrlKhl`O@%%&rhLWZ*ABFz2nHu7k~3@e4)kO3%$=?GEFUcCF=6-1n!x^vmu+Ai*amgXH+Rknl6U>#9w;A} zn2xanZSDu`4%%x}+~FG{Wbi1jo@wqBc5(5Xl~d0KW(^Iu(U3>WB@-(&vn_PJt9{1`e9Iic@+{VPc`vP776L*viP{wYB2Iff8hB%E3|o zGMOu)tJX!`qJ}ZPzq7>=`*9TmETN7xwU;^AmFZ-ckZjV5B2T09pYliaqGFY|X#E-8 z20b>y?(r-Fn5*WZ-GsK}4WM>@TTqsxvSYWL6>18q8Q`~JO1{vLND2wg@58OaU!EvT z1|o+f1mVXz2EKAbL!Q=QWQKDZpV|jznuJ}@-)1&cdo z^&~b4Mx{*1gurlH;Vhk5g_cM&6LOHS2 zRkLfO#HabR1JD4Vc2t828dCUG#DL}f5QDSBg?o)IYYi@_xVwR2w_ntlpAW0NWk$F1 z$If?*lP&Ka1oWfl!)1c3fl`g*lMW3JOn#)R1+tfwrs`aiFUgz3;XIJ>{QFxLCkK30 zNS-)#DON3yb!7LBHQJ$)4y%TN82DC2-9tOIqzhZ27@WY^<6}vXCWcR5iN{LN8{0u9 zNXayqD=G|e?O^*ms*4P?G%o@J1tN9_76e}E#66mr89%W_&w4n66~R;X_vWD(oArwj z4CpY`)_mH2FvDuxgT+akffhX0b_slJJ*?Jn3O3~moqu2Fs1oL*>7m=oVek2bnprnW zixkaIFU%+3XhNA@@9hyhFwqsH2bM|`P?G>i<-gy>NflhrN{$9?LZ1ynSE_Mj0rADF zhOz4FnK}wpLmQuV zgO4_Oz9GBu_NN>cPLA=`SP^$gxAnj;WjJnBi%Q1zg`*^cG;Q)#3Gv@c^j6L{arv>- zAW%8WrSAVY1sj$=umcAf#ZgC8UGZGoamK}hR7j6}i8#np8ruUlvgQ$j+AQglFsQQq zOjyHf22pxh9+h#n$21&$h?2uq0>C9P?P=Juw0|;oE~c$H{#RGfa>| zj)Iv&uOnaf@foiBJ}_;zyPHcZt1U~nOcNB{)og8Btv+;f@PIT*xz$x!G?u0Di$lo7 zOugtQ$Wx|C($fyJTZE1JvR~i7LP{ zbdIwqYghQAJi9p}V&$=*2Azev$6K@pyblphgpv8^9bN!?V}{BkC!o#bl&AP!3DAjM zmWFsvn2fKWCfjcAQmE+=c3Y7j@#7|{;;0f~PIodmq*;W9Fiak|gil6$w3%b_Pr6K_ zJEG@&!J%DgBZJDCMn^7mk`JV0&l07Bt`1ymM|;a)MOWz*bh2#d{i?SDe9IcHs7 zjCrnyQ*Y5GzIt}>`bD91o#~5H?4_nckAgotN{2%!?wsSl|LVmJht$uhGa+HiH>;av z8c?mcMYM7;mvWr6noUR{)gE!=i7cZUY7e;HXa221KkRoc2UB>s$Y(k%NzTSEr>W(u z<(4mcc)4rB_&bPzX*1?*ra%VF}P1nwiP5cykJ&W{!OTlz&Td0pOkVp+wc z@k=-Hg=()hNg=Q!Ub%`BONH{ z_=ZFgetj@)NvppAK2>8r!KAgi>#%*7;O-o9MOOfQjV-n@BX6;Xw;I`%HBkk20v`qoVd0)}L6_49y1IhR z_OS}+eto}OPVRn*?UHC{eGyFU7JkPz!+gX4P>?h3QOwGS63fv4D1*no^6PveUeE5% zlehjv_3_^j^C({a2&RSoVlOn71D8WwMu9@Nb@=E_>1R*ve3`#TF(NA0?d9IR_tm=P zOP-x;gS*vtyE1Cm zG0L?2nRUFj#aLr-R1fX*$sXhad)~xdA*=hF3zPZhha<2O$Ps+F07w*3#MTe?)T8|A!P!v+a|ot{|^$q(TX`35O{WI0RbU zCj?hgOv=Z)xV?F`@HKI11IKtT^ocP78cqHU!YS@cHI@{fPD?YXL)?sD~9thOAv4JM|K8OlQhPXgnevF=F7GKD2#sZW*d za}ma31wLm81IZxX(W#A9mBvLZr|PoLnP>S4BhpK8{YV_}C|p<)4#yO{#ISbco92^3 zv&kCE(q9Wi;9%7>>PQ!zSkM%qqqLZW7O`VXvcj;WcJ`2~v?ZTYB@$Q&^CTfvy?1r^ z;Cdi+PTtmQwHX_7Kz?r#1>D zS5lWU(Mw_$B&`ZPmqxpIvK<~fbXq?x20k1~9az-Q!uR78mCgRj*eQ>zh3c$W}>^+w^dIr-u{@s30J=)1zF8?Wn|H`GS<=>Om|DjzC{}Jt?{!fSJe*@$H zg>wFnlT)k#T?LslW zu$^7Uy~$SQ21cE?3Ijl+bLfuH^U5P^$@~*UY#|_`uvAIe(+wD2eF}z_y!pvomuVO; zS^9fbdv)pcm-B@CW|Upm<7s|0+$@@<&*>$a{aW+oJ%f+VMO<#wa)7n|JL5egEgoBv zl$BY(NQjE0#*nv=!kMnp&{2Le#30b)Ql2e!VkPLK*+{jv77H7)xG7&=aPHL7LK9ER z5lfHxBI5O{-3S?GU4X6$yVk>lFn;ApnwZybdC-GAvaznGW-lScIls-P?Km2mF>%B2 zkcrXTk+__hj-3f48U%|jX9*|Ps41U_cd>2QW81Lz9}%`mTDIhE)jYI$q$ma7Y-`>% z8=u+Oftgcj%~TU}3nP8&h7k+}$D-CCgS~wtWvM|UU77r^pUw3YCV80Ou*+bH0!mf0 zxzUq4ed6y>oYFz7+l18PGGzhB^pqSt)si=9M>~0(Bx9*5r~W7sa#w+_1TSj3Jn9mW zMuG9BxN=}4645Cpa#SVKjFst;9UUY@O<|wpnZk$kE+to^4!?0@?Cwr3(>!NjYbu?x z1!U-?0_O?k!NdM^-rIQ8p)%?M+2xkhltt*|l=%z2WFJhme7*2xD~@zk#`dQR$6Lmd zb3LOD4fdt$Cq>?1<%&Y^wTWX=eHQ49Xl_lFUA(YQYHGHhd}@!VpYHHm=(1-O=yfK#kKe|2Xc*9}?BDFN zD7FJM-AjVi)T~OG)hpSWqH>vlb41V#^G2B_EvYlWhDB{Z;Q9-0)ja(O+By`31=biA zG&Fs#5!%_mHi|E4Nm$;vVQ!*>=_F;ZC=1DTPB#CICS5fL2T3XmzyHu?bI;m7D4@#; ztr~;dGYwb?m^VebuULtS4lkC_7>KCS)F@)0OdxZIFZp@FM_pHnJes8YOvwB|++#G( z&dm*OP^cz95Wi15vh`Q+yB>R{8zqEhz5of>Po$9LNE{xS<)lg2*roP*sQ}3r3t<}; zPbDl{lk{pox~2(XY5=qg0z!W-x^PJ`VVtz$git7?)!h>`91&&hESZy1KCJ2nS^yMH z!=Q$eTyRi68rKxdDsdt+%J_&lapa{ds^HV9Ngp^YDvtq&-Xp}60B_w@Ma>_1TTC;^ zpbe!#gH}#fFLkNo#|`jcn?5LeUYto%==XBk6Ik0kc4$6Z+L3x^4=M6OI1=z5u#M%0 z0E`kevJEpJjvvN>+g`?gtnbo$@p4VumliZV3Z%CfXXB&wPS^5C+7of2tyVkMwNWBiTE2 z8CdPu3i{*vR-I(NY5syRR}I1TJOV@DJy-Xmvxn^IInF>Tx2e)eE9jVSz69$6T`M9-&om!T+I znia!ZWJRB28o_srWlAxtz4VVft8)cYloIoVF=pL zugnk@vFLXQ_^7;%hn9x;Vq?lzg7%CQR^c#S)Oc-8d=q_!2ZVH764V z!wDKSgP}BrVV6SfCLZnYe-7f;igDs9t+K*rbMAKsp9L$Kh<6Z;e7;xxced zn=FGY<}CUz31a2G}$Q(`_r~75PzM4l_({Hg&b@d8&jC}B?2<+ed`f#qMEWi z`gm!STV9E4sLaQX+sp5Nu9*;9g12naf5?=P9p@H@f}dxYprH+3ju)uDFt^V{G0APn zS;16Dk{*fm6&BCg#2vo?7cbkkI4R`S9SSEJ=#KBk3rl69SxnCnS#{*$!^T9UUmO#&XXKjHKBqLdt^3yVvu8yn|{ zZ#%1CP)8t-PAz(+_g?xyq;C2<9<5Yy<~C74Iw(y>uUL$+$mp(DRcCWbCKiGCZw@?_ zdomfp+C5xt;j5L@VfhF*xvZdXwA5pcdsG>G<8II-|1dhAgzS&KArcb0BD4ZZ#WfiEY{hkCq5%z9@f|!EwTm;UEjKJsUo696V>h zy##eXYX}GUu%t{Gql8vVZKkNhQeQ4C%n|RmxL4ee5$cgwlU+?V7a?(jI#&3wid+Kz5+x^G!bb#$q>QpR#BZ}Xo5UW^ zD&I`;?(a}Oys7-`I^|AkN?{XLZNa{@27Dv^s4pGowuyhHuXc zuctKG2x0{WCvg_sGN^n9myJ}&FXyGmUQnW7fR$=bj$AHR88-q$D!*8MNB{YvTTEyS zn22f@WMdvg5~o_2wkjItJN@?mDZ9UUlat2zCh(zVE=dGi$rjXF7&}*sxac^%HFD`Y zTM5D3u5x**{bW!68DL1A!s&$2XG@ytB~dX-?BF9U@XZABO`a|LM1X3HWCllgl0+uL z04S*PX$%|^WAq%jkzp~%9HyYIF{Ym?k)j3nMwPZ=hlCg9!G+t>tf0o|J2%t1 ztC+`((dUplgm3`+0JN~}&FRRJ3?l*>Y&TfjS>!ShS`*MwO{WIbAZR#<%M|4c4^dY8 z{Rh;-!qhY=dz5JthbWoovLY~jNaw>%tS4gHVlt5epV8ekXm#==Po$)}mh^u*cE>q7*kvX&gq)(AHoItMYH6^s6f(deNw%}1=7O~bTHSj1rm2|Cq+3M z93djjdomWCTCYu!3Slx2bZVy#CWDozNedIHbqa|otsUl+ut?>a;}OqPfQA05Yim_2 zs@^BjPoFHOYNc6VbNaR5QZfSMh2S*`BGwcHMM(1@w{-4jVqE8Eu0Bi%d!E*^Rj?cR z7qgxkINXZR)K^=fh{pc0DCKtrydVbVILI>@Y0!Jm>x-xM!gu%dehm?cC6ok_msDVA*J#{75%4IZt}X|tIVPReZS#aCvuHkZxc zHVMtUhT(wp09+w9j9eRqz~LtuSNi2rQx_QgQ(}jBt7NqyT&ma61ldD(s9x%@q~PQl zp6N*?=N$BtvjQ_xIT{+vhb1>{pM0Arde0!X-y))A4znDrVx8yrP3B1(7bKPE5jR@5 zwpzwT4cu~_qUG#zYMZ_!2Tkl9zP>M%cy>9Y(@&VoB84#%>amTAH{(hL4cDYt!^{8L z645F>BWO6QaFJ-{C-i|-d%j7#&7)$X7pv#%9J6da#9FB5KyDhkA+~)G0^87!^}AP>XaCSScr;kL;Z%RSPD2CgoJ;gpYT5&6NUK$86$T?jRH=w8nI9Z534O?5fk{kd z`(-t$8W|#$3>xoMfXvV^-A(Q~$8SKDE^!T;J+rQXP71XZ(kCCbP%bAQ1|%$%Ov9_a zyC`QP3uPvFoBqr_+$HenHklqyIr>PU_Fk5$2C+0eYy^~7U&(!B&&P2%7#mBUhM!z> z_B$Ko?{Pf6?)gpYs~N*y%-3!1>o-4;@1Zz9VQHh)j5U1aL-Hyu@1d?X;jtDBNk*vMXPn@ z+u@wxHN*{uHR!*g*4Xo&w;5A+=Pf9w#PeZ^x@UD?iQ&${K2c}UQgLRik-rKM#Y5rdDphdcNTF~cCX&9ViRP}`>L)QA4zNXeG)KXFzSDa6 zd^St;inY6J_i=5mcGTx4_^Ys`M3l%Q==f>{8S1LEHn{y(kbxn5g1ezt4CELqy)~TV6{;VW>O9?5^ ztcoxHRa0jQY7>wwHWcxA-BCwzsP>63Kt&3fy*n#Cha687CQurXaRQnf5wc9o8v7Rw zNwGr2fac;Wr-Ldehn7tF^(-gPJwPt@VR1f;AmKgxN&YPL;j=0^xKM{!wuU|^mh3NE zy35quf}MeL!PU;|{OW_x$TBothLylT-J>_x6p}B_jW1L>k)ps6n%7Rh z96mPkJIM0QFNYUM2H}YF5bs%@Chs6#pEnloQhEl?J-)es!(SoJpEPoMTdgA14-#mC zghayD-DJWtUu`TD8?4mR)w5E`^EHbsz2EjH5aQLYRcF{l7_Q5?CEEvzDo(zjh|BKg z3aJl_n#j&eFHsUw4~lxqnr!6NL*se)6H=A+T1e3xUJGQrd}oSPwSy5+$tt{2t5J5@(lFxl43amsARG74iyNC}uuS zd2$=(r6RdamdGx^eatX@F2D8?U23tDpR+Os?0Gq2&^dF+$9wiWf?=mDWfjo4LfRwL zI#SRV9iSz>XCSgEj!cW&9H-njJopYiYuq|2w<5R2!nZ27DyvU4UDrHpoNQZiGPkp@ z1$h4H46Zn~eqdj$pWrv;*t!rTYTfZ1_bdkZmVVIRC21YeU$iS-*XMNK`#p8Z_DJx| zk3Jssf^XP7v0X?MWFO{rACltn$^~q(M9rMYoVxG$15N;nP)A98k^m3CJx8>6}NrUd@wp-E#$Q0uUDQT5GoiK_R{ z<{`g;8s>UFLpbga#DAf%qbfi`WN1J@6IA~R!YBT}qp%V-j!ybkR{uY0X|x)gmzE0J z&)=eHPjBxJvrZSOmt|)hC+kIMI;qgOnuL3mbNR0g^<%|>9x7>{}>a2qYSZAGPt4it?8 zNcLc!Gy0>$jaU?}ZWxK78hbhzE+etM`67*-*x4DN>1_&{@5t7_c*n(qz>&K{Y?10s zXsw2&nQev#SUSd|D8w7ZD2>E<%g^; zV{yE_O}gq?Q|zL|jdqB^zcx7vo(^})QW?QKacx$yR zhG|XH|8$vDZNIfuxr-sYFR{^csEI*IM#_gd;9*C+SysUFejP0{{z7@P?1+&_o6=7V|EJLQun^XEMS)w(=@eMi5&bbH*a0f;iC~2J74V2DZIlLUHD&>mlug5+v z6xBN~8-ovZylyH&gG#ptYsNlT?-tzOh%V#Y33zlsJ{AIju`CjIgf$@gr8}JugRq^c zAVQ3;&uGaVlVw}SUSWnTkH_6DISN&k2QLMBe9YU=sA+WiX@z)FoSYX`^k@B!j;ZeC zf&**P?HQG6Rk98hZ*ozn6iS-dG}V>jQhb3?4NJB*2F?6N7Nd;EOOo;xR7acylLaLy z9)^lykX39d@8@I~iEVar4jmjjLWhR0d=EB@%I;FZM$rykBNN~jf>#WbH4U{MqhhF6 zU??@fSO~4EbU4MaeQ_UXQcFyO*Rae|VAPLYMJEU`Q_Q_%s2*>$#S^)&7er+&`9L=1 z4q4ao07Z2Vsa%(nP!kJ590YmvrWg+YrgXYs_lv&B5EcoD`%uL79WyYA$0>>qi6ov7 z%`ia~J^_l{p39EY zv>>b}Qs8vxsu&WcXEt8B#FD%L%ZpcVtY!rqVTHe;$p9rbb5O{^rFMB>auLn-^;s+-&P1#h~mf~YLg$8M9 zZ4#87;e-Y6x6QO<{McUzhy(%*6| z)`D~A(TJ$>+0H+mct(jfgL4x%^oC^T#u(bL)`E2tBI#V1kSikAWmOOYrO~#-cc_8! zCe|@1&mN2{*ceeiBldHCdrURk4>V}79_*TVP3aCyV*5n@jiNbOm+~EQ_}1#->_tI@ zqXv+jj2#8xJtW508rzFrYcJxoek@iW6SR@1%a%Bux&;>25%`j3UI`0DaUr7l79`B1 zqqUARhW1^h6=)6?;@v>xrZNM;t}{yY3P@|L}ey@gG( z9r{}WoYN(9TW&dE2dEJIXkyHA4&pU6ki=rx&l2{DLGbVmg4%3Dlfvn!GB>EVaY_%3+Df{fBiqJV>~Xf8A0aqUjgpa} zoF8YXO&^_x*Ej}nw-$-F@(ddB>%RWoPUj?p8U{t0=n>gAI83y<9Ce@Q#3&(soJ{64 z37@Vij1}5fmzAuIUnXX`EYe;!H-yTVTmhAy;y8VZeB#vD{vw9~P#DiFiKQ|kWwGFZ z=jK;JX*A;Jr{#x?n8XUOLS;C%f|zj-7vXtlf_DtP7bpurBeX%Hjwr z4lI-2TdFpzkjgiv!8Vfv`=SP+s=^i3+N~1ELNWUbH|ytVu>EyPN_3(4TM^QE1swRo zoV7Y_g)a>28+hZG0e7g%@2^s>pzR4^fzR-El}ARTmtu!zjZLuX%>#OoU3}|rFjJg} zQ2TmaygxJ#sbHVyiA5KE+yH0LREWr%^C*yR|@gM$nK2P zo}M}PV0v))uJh&33N>#aU376@ZH79u(Yw`EQ2hM3SJs9f99+cO6_pNW$j$L-CtAfe zYfM)ccwD!P%LiBk!eCD?fHCGvgMQ%Q2oT_gmf?OY=A>&PaZQOq4eT=lwbaf}33LCH zFD|)lu{K7$8n9gX#w4~URjZxWm@wlH%oL#G|I~Fb-v^0L0TWu+`B+ZG!yII)w05DU z>GO?n(TN+B=>HdxVDSlIH76pta$_LhbBg;eZ`M7OGcqt||qi zogS72W1IN%=)5JCyOHWoFP7pOFK0L*OAh=i%&VW&4^LF@R;+K)t^S!96?}^+5QBIs zjJNTCh)?)4k^H^g1&jc>gysM`y^8Rm3qsvkr$9AeWwYpa$b22=yAd1t<*{ zaowSEFP+{y?Ob}8&cwfqoy4Pb9IA~VnM3u!trIK$&&0Op#Ql4j>(EW?UNUv#*iH1$ z^j>+W{afcd`{e&`-A{g}{JnIzYib)!T56IT@YEs{4|`sMpW3c8@UCoIJv`XsAw!XC z34|Il$LpW}CIHFC5e*)}00I5{%OL*WZRGzC0?_}-9{#ue?-ug^ zLE|uv-~6xnSs_2_&CN9{9vyc!Xgtn36_g^wI0C4s0s^;8+p?|mm;Odt3`2ZjwtK;l zfd6j)*Fr#53>C6Y8(N5?$H0ma;BCF3HCjUs7rpb2Kf*x3Xcj#O8mvs#&33i+McX zQpBxD8!O{5Y8D&0*QjD=Yhl9%M0)&_vk}bmN_Ud^BPN;H=U^bn&(csl-pkA+GyY0Z zKV7sU_4n;}uR78ouo8O%g*V;79KY?3d>k6%gpcmQsKk&@Vkw9yna_3asGt`0Hmj59 z%0yiF*`jXhByBI9QsD=+>big5{)BGe&+U2gAARGe3ID)xrid~QN_{I>k}@tzL!Md_ z&=7>TWciblF@EMC3t4-WX{?!m!G6$M$1S?NzF*2KHMP3Go4=#ZHkeIv{eEd;s-yD# z_jU^Ba06TZqvV|Yd;Z_sN%$X=!T+&?#p+OQIHS%!LO`Hx0q_Y0MyGYFNoM{W;&@0@ zLM^!X4KhdtsET5G<0+|q0oqVXMW~-7LW9Bg}=E$YtNh1#1D^6Mz(V9?2g~I1( zoz9Cz=8Hw98zVLwC2AQvp@pBeKyidn6Xu0-1SY1((^Hu*-!HxFUPs)yJ+i`^BC>PC zjwd0mygOVK#d2pRC9LxqGc6;Ui>f{YW9Bvb>33bp^NcnZoH~w9(lM5@JiIlfa-6|k ziy31UoMN%fvQfhi8^T+=yrP{QEyb-jK~>$A4SZT-N56NYEbpvO&yUme&pWKs3^94D zH{oXnUTb3T@H+RgzML*lejx`WAyw*?K7B-I(VJx($2!NXYm%3`=F~TbLv3H<{>D?A zJo-FDYdSA-(Y%;4KUP2SpHKAIcv9-ld(UEJE7=TKp|Gryn;72?0LHqAN^fk6%8PCW z{g_-t)G5uCIf0I`*F0ZNl)Z>))MaLMpXgqWgj-y;R+@A+AzDjsTqw2Mo9ULKA3c70 z!7SOkMtZb+MStH>9MnvNV0G;pwSW9HgP+`tg}e{ij0H6Zt5zJ7iw`hEnvye!XbA@!~#%vIkzowCOvq5I5@$3wtc*w2R$7!$*?}vg4;eDyJ_1=ixJuEp3pUS27W?qq(P^8$_lU!mRChT}ctvZz4p!X^ zOSp|JOAi~f?UkwH#9k{0smZ7-#=lK6X3OFEMl7%)WIcHb=#ZN$L=aD`#DZKOG4p4r zwlQ~XDZ`R-RbF&hZZhu3(67kggsM-F4Y_tI^PH8PMJRcs7NS9ogF+?bZB*fcpJ z=LTM4W=N9yepVvTj&Hu~0?*vR1HgtEvf8w%Q;U0^`2@e8{SwgX5d(cQ|1(!|i$km! zvY03MK}j`sff;*-%mN~ST>xU$6Bu?*Hm%l@0dk;j@%>}jsgDcQ)Hn*UfuThz9(ww_ zasV`rSrp_^bp-0sx>i35FzJwA!d6cZ5#5#nr@GcPEjNnFHIrtUYm1^Z$;{d&{hQV9 z6EfFHaIS}46p^5I-D_EcwwzUUuO}mqRh&T7r9sfw`)G^Q%oHxEs~+XoM?8e*{-&!7 z7$m$lg9t9KP9282eke608^Q2E%H-xm|oJ8=*SyEo} z@&;TQ3K)jgspgKHyGiKVMCz>xmC=H5Fy3!=TP)-R3|&1S-B)!6q50wfLHKM@7Bq6E z44CY%G;GY>tC`~yh!qv~YdXw! zSkquvYNs6k1r7>Eza?Vkkxo6XRS$W7EzL&A`o>=$HXgBp{L(i^$}t`NcnAxzbH8Ht z2!;`bhKIh`f1hIFcI5bHI=ueKdzmB9)!z$s-BT4ItyY|NaA_+o=jO%MU5as9 zc2)aLP>N%u>wlaXTK!p)r?+~)L+0eCGb5{8WIk7K52$nufnQ+m8YF+GQc&{^(zh-$ z#wyWV*Zh@d!b(WwXqvfhQX)^aoHTBkc;4ossV3&Ut*k>AI|m+{#kh4B!`3*<)EJVj zwrxK>99v^k4&Y&`Awm>|exo}NvewV%E+@vOc>5>%H#BK9uaE2$vje zWYM5fKuOTtn96B_2~~!xJPIcXF>E_;yO8AwpJ4)V`Hht#wbO3Ung~@c%%=FX4)q+9 z99#>VC2!4l`~0WHs9FI$Nz+abUq# zz`Of97})Su=^rGp2S$)7N3rQCj#0%2YO<R&p>$<#lgXcUj=4H_{oAYiT3 z44*xDn-$wEzRw7#@6aD)EGO$0{!C5Z^7#yl1o;k0PhN=aVUQu~eTQ^Xy{z8Ow6tk83 z4{5xe%(hx)%nD&|e*6sTWH`4W&U!Jae#U4TnICheJmsw{l|CH?UA{a6?2GNgpZLyzU2UlFu1ZVwlALmh_DOs03J^Cjh1im`E3?9&zvNmg(MuMw&0^Lu$(#CJ*q6DjlKsY-RMJ^8yIY|{SQZ*9~CH|u9L z`R78^r=EbbR*_>5?-)I+$6i}G)%mN(`!X72KaV(MNUP7Nv3MS9S|Pe!%N2AeOt5zG zVJ;jI4HZ$W->Ai_4X+`9c(~m=@ek*m`ZQbv3ryI-AD#AH=`x$~WeW~M{Js57(K7(v ze5`};LG|%C_tmd>bkufMWmAo&B+DT9ZV~h(4jg0>^aeAqL`PEUzJJtI8W1M!bQWpv zvN(d}E1@nlYa!L!!A*RN!(Q3F%J?5PvQ0udu?q-T)j3JKV~NL>KRb~w-lWc685uS6 z=S#aR&B8Sc8>cGJ!!--?kwsJTUUm`Jk?7`H z7PrO~xgBrSW2_tTlCq1LH8*!o?pj?qxy8}(=r_;G18POrFh#;buWR0qU24+XUaVZ0 z?(sXcr@-YqvkCmHr{U2oPogHL{r#3r49TeR<{SJX1pcUqyWPrkYz^X8#QW~?F)R5i z>p^!i<;qM8Nf{-fd6!_&V*e_9qP6q(s<--&1Ttj01j0w>bXY7y1W*%Auu&p|XSOH=)V7Bd4fUKh&T1)@cvqhuD-d=?w}O zjI%i(f|thk0Go*!d7D%0^ztBfE*V=(ZIN84f5HU}T9?ulmEYzT5usi=DeuI*d|;M~ zp_=Cx^!4k#=m_qSPBr5EK~E?3J{dWWPH&oCcNepYVqL?nh4D5ynfWip$m*YlZ8r^Z zuFEUL-nW!3qjRCLIWPT0x)FDL7>Yt7@8dA?R2kF@WE>ysMY+)lTsgNM#3VbXVGL}F z1O(>q>2a+_`6r5Xv$NZAnp=Kgnr3)cL(^=8ypEeOf3q8(HGe@7Tt59;yFl||w|mnO zHDxg2G3z8=(6wjj9kbcEY@Z0iOd7Gq5GiPS5% z*sF1J<#daxDV2Z8H>wxOF<;yKzMeTaSOp_|XkS9Sfn6Mpe9UBi1cSTieGG5$O;ZLIIJ60Y>SN4vC?=yE_CWlo(EEE$e4j?z&^FM%kNmRtlbEL^dPPgvs9sbK5fGw*r@ z+!EU@u$T8!nZh?Fdf_qk$VuHk^yVw`h`_#KoS*N%epIIOfQUy_&V}VWDGp3tplMbf z5Se1sJUC$7N0F1-9jdV2mmGK{-}fu|Nv;12jDy0<-kf^AmkDnu6j~TPWOgy1MT68|D z=4=50jVbUKdKaQgD`eWGr3I&^<6uhkjz$YwItY8%Yp9{z4-{6g{73<_b*@XJ4Nm3-3z z?BW3{aY_ccRjb@W1)i5nLg|7BnWS!B`_Uo9CWaE`Ij327QH?i)9A}4Ug4wmxVVa^b z-4+m%-wwOl7cKH7+=x&nrCrbEC)Q$fpg&V83#uEH;C=GNMz`ps@^RxK%T*8%OPnC` z{WO~J%nxYJ`x|N%?&i7?;{_8t^jM&=50HlaOQj8fS}_`moH$c;vI<|cruPFnpT8yU zS%rPOCUSd5Zdb(zwk`hqwTQn)*&n)uYsP*F_(~xEWq}C= zv30kFmZFwJZ@ELVX3?$dXQh|icO7UrL*_5G=I^xXjImz`ZPp>?g#tf(ej~KaIU0algsG!IS09;>?MvqGg#c{i+}qY|{P8W~O%#>|gFd z<1dr$-oxyRGN17yZo1OwLnzwYs0|;IS_nymNB0IlSzPQ%-r`?T=;_XQ^~&#}b|AB} zkNbN5uB?-sUB-T5QLlg%Uk3)uHB;>VIzGe9_J9 zaeISkQm!v(9d(0ML^b9fR^sfHFlH?7Mvddt37OuR{|O0{uv)(&-6<87W4 zyO>s!=cPgP3O&7xxU5DlIPw_o3O>6o6Qb?JWs3qw#p3sBc3g$?Dx zi(6D+DYgV;GrUis-CL%Qe{nvZnwaVXmbhH(|GFh|Q)k=1uvA$I@1DXI7bKlQ@8D6P zS?(*?><>)G49q0wr;NajpxP4W2G)kHl6^=Z>hrNEI4Mwd_$O6$1dXF;Q#hE(-eeW6 zz03GJF%Wl?HO=_ztv5*zRlcU~{+{k%#N59mgm~eK>P!QZ6E?#Cu^2)+K8m@ySvZ*5 z|HDT}BkF@3!l(0%75G=1u2hETXEj!^1Z$!)!lyGXlWD!_vqGE$Z)#cUVBqlORW>0^ zDjyVTxwKHKG|0}j-`;!R-p>}qQfBl(?($7pP<+Y8QE#M8SCDq~k<+>Q^Zf@cT_WdX3~BSe z+|KK|7OL5Hm5(NFP~j>Ct3*$wi0n0!xl=(C61`q&cec@mFlH(sy%+RH<=s)8aAPN`SfJdkAQjdv82G5iRdv8 zh{9wHUZaniSEpslXl^_ODh}mypC?b*9FzLjb~H@3DFSe;D(A-K3t3eOTB(m~I6C;(-lKAvit(70k`%@+O*Ztdz;}|_TS~B?Tpmi=QKC^m_ z2YpEaT3iiz*;T~ap1yiA)a`dKMwu`^UhIUeltNQ1Yjo=q@bI@&3zH?rVUg=IxLy-ni zyxDu%-Fr{H6owTjZU2O5>nDb=q&Jz_TjeSq%!2m40x&U6w~GQ({quPL73IsJS;f`$ zsuhioqCBj(gJ>2hoo)Gou7(WP*pX)f=Y=!=k!&1K?EYY%jJ~X&DnK{^saPQK<1BJ z_A`_{%ZozcB(3w$z^To^6d|XuT@=X~wtW!+{4ID@N{AB~J6AL5vuY>JwvWCNFKsKh zd}@>q@_WV#QZ&UJ0#?X(pXR!oyXOEG3rqzHbCzGLONDb042i$})fM@XF)uSP(DHUc z^&{|$*xe{cs?Gp8=B%RY3L7#$ve$?TWh>MZdxF1zH1v}1z+$Ov#G7?%D)bBCyDe*% zSeKSpETC2V1){II>@UwJi>4uBN+iAx+82E~gb|Cr&8E^i&)A!uv-g?jzH99wU}8+# z$nh>yvb;TwZmS@7LrvuCu_d0-WxFNI&C7%sWuTL%YU!l|I1{|->=dlOeHOCtUO#zkS3ESO8LHV4hTdQL5EdV zuWD33fFPH}HPrW^s$Qn1Xgp&AT6<-He{{4%eIu3rN=iK|9mURdKXfB&Q?qGok%!cs ze53UP{Z!TO-Y@q2;;k2avA3`lm4OoN4@S*k=UA)7H;qZ`d8`XaYFCv?Ba+uGW@r5v z&&{nf(24WSBOhc7!qF^@0cz;XcUynNaj6w2349;s!K{KVqs5yS{ z7VubS`2OzT^5#1~6Tt^RTvt9-J|D2F>y~>2;jeF>g`hx5l%B3H=aLExQihuYngzlnBTYOTHJQMzl>kwqN5JYs)Ej zblA@ntkUS~xi+}y6|(81helS}Q~&VB37qyV|S3Y=><^1wh%msQM?fz z<58MX(=|PSUKCF#)dbhR%D&xgCD?$aR0qen+wpp6 zst}vX18!Be96TD??j1HsHTUx(a&@F?=gT`Q$oJFFyrh^;zgz!(NlAHGn0cJy@us=w zNhC#l5G;H}+>49Nsh12=ZPO2r*2OBQe5kpb&1?*PIBFitK8}FUfb~S-#hKfF0o#&d z#3aPkB$9scYku&kA6{0xHnBV#&Wei5J>5T-XX-gUXEPo+9b7WL=*XESc(3BshL`aj zXp}QIp*40}oWJt*l043e8_5;H5PI5c)U&IEw5dF(4zjX0y_lk9 zAp@!mK>WUqHo)-jop=DoK>&no>kAD=^qIE7qis&_*4~ z6q^EF$D@R~3_xseCG>Ikb6Gfofb$g|75PPyyZN&tiRxqovo_k zO|HA|sgy#B<32gyU9x^&)H$1jvw@qp+1b(eGAb)O%O!&pyX@^nQd^9BQ4{(F8<}|A zhF&)xusQhtoXOOhic=8#Xtt5&slLia3c*a?dIeczyTbC#>FTfiLST57nc3@Y#v_Eg#VUv zT8cKH#f3=1PNj!Oroz_MAR*pow%Y0*6YCYmUy^7`^r|j23Q~^*TW#cU7CHf0eAD_0 zEWEVddxFgQ7=!nEBQ|ibaScslvhuUk^*%b#QUNrEB{3PG@uTxNwW}Bs4$nS9wc(~O zG7Iq>aMsYkcr!9#A;HNsJrwTDYkK8ikdj{M;N$sN6BqJ<8~z>T20{J8Z2rRUuH7~3 z=tgS`AgxbBOMg87UT4Lwge`*Y=01Dvk>)^{Iu+n6fuVX4%}>?3czOGR$0 zpp*wp>bsFFSV`V;r_m+TZns$ZprIi`OUMhe^cLE$2O+pP3nP!YB$ry}2THx2QJs3< za1;>d-AggCarrQ>&Z!d@;mW+!q6eXhb&`GbzUDSxpl8AJ#Cm#tuc)_xh(2NV=5XMs zrf_ozRYO$NkC=pKFX5OH8v1>0i9Z$ec`~Mf+_jQ68spn(CJwclDhEEkH2Qw;${J$clv__nUjn5jA0wCLEnu1j;v!0vB>Ri6m9`;R{JMS%^)4FC zU0Z44+u$I$w=Bj|iu4DT5h~sS`C*zbmX?@-crY}E+hy>}2~C0Nn(EKk@5^qO4@l@! z6O0lr%tzGC`D^)8xU3FnMZVm0kX1sBWhaQyzVoXFWwr%Ny?=2M{5s#5i7fTu3gEkG zc{(Pr$v=;`Y#&`y*J}#M9ux>0?xu!`$9cUKm#Bdd_&S#LPTS?ZPV6zN6>W6JTS~-LfjL{mB=b(KMk3 z2HjBSlJeyUVqDd=Mt!=hpYsvby2GL&3~zm;0{^nZJq+4vb?5HH4wufvr}IX42sHeK zm@x?HN$8TsTavXs)tLDFJtY9b)y~Tl@7z4^I8oUQq4JckH@~CVQ;FoK(+e0XAM>1O z(ei}h?)JQp>)d=6ng-BZF1Z5hsAKW@mXq+hU?r8I(*%`tnIIOXw7V6ZK(T9RFJJe@ zZS!aC+p)Gf2Ujc=a6hx4!A1Th%YH!Lb^xpI!Eu` zmJO{9rw){B1Ql18d%F%da+Tbu1()?o(zT7StYqK6_w`e+fjXq5L^y(0 z09QA6H4oFj59c2wR~{~>jUoDzDdKz}5#onYPJRwa`SUO)Pd4)?(ENBaFVLJr6Kvz= zhTtXqbx09C1z~~iZt;g^9_2nCZ{};-b4dQJbv8HsWHXPVg^@(*!@xycp#R?a|L!+` zY5w))JWV`Gls(=}shH0#r*;~>_+-P5Qc978+QUd>J%`fyn{*TsiG-dWMiJXNgwBaT zJ=wgYFt+1ACW)XwtNx)Q9tA2LPoB&DkL16P)ERWQlY4%Y`-5aM9mZ{eKPUgI!~J3Z zkMd5A_p&v?V-o-6TUa8BndiX?ooviev(DKw=*bBVOW|=zps9=Yl|-R5@yJe*BPzN}a0mUsLn{4LfjB_oxpv(mwq# zSY*%E{iB)sNvWfzg-B!R!|+x(Q|b@>{-~cFvdDHA{F2sFGA5QGiIWy#3?P2JIpPKg6ncI^)dvqe`_|N=8 '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH="\\\"\\\"" + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..db3a6ac --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH= + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..d284d11 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'recyclestudy' diff --git a/src/main/java/com/recyclestudy/RecyclestudyApplication.java b/src/main/java/com/recyclestudy/RecyclestudyApplication.java new file mode 100644 index 0000000..6bb7dbb --- /dev/null +++ b/src/main/java/com/recyclestudy/RecyclestudyApplication.java @@ -0,0 +1,13 @@ +package com.recyclestudy; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class RecyclestudyApplication { + + public static void main(String[] args) { + SpringApplication.run(RecyclestudyApplication.class, args); + } + +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml new file mode 100644 index 0000000..a74f9d0 --- /dev/null +++ b/src/main/resources/application.yaml @@ -0,0 +1,3 @@ +spring: + application: + name: recyclestudy diff --git a/src/test/java/com/recyclestudy/RecyclestudyApplicationTests.java b/src/test/java/com/recyclestudy/RecyclestudyApplicationTests.java new file mode 100644 index 0000000..1a01c7e --- /dev/null +++ b/src/test/java/com/recyclestudy/RecyclestudyApplicationTests.java @@ -0,0 +1,13 @@ +package com.recyclestudy; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class RecyclestudyApplicationTests { + + @Test + void contextLoads() { + } + +} From 7dd27a5aa47acf947aec3c05df127a0c47e4e14f Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Wed, 24 Dec 2025 13:44:08 +0900 Subject: [PATCH 02/16] =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=20=EB=A9=80=ED=8B=B0=20=EB=94=94=EB=B0=94=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=20=EC=9D=B8=EC=A6=9D=20=EB=B0=8F=20=EA=B4=80=EB=A6=AC?= =?UTF-8?q?=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * build: JPA 의존성 추가 * feat: BaseEntity 추가 * feat: NullValidator 추가 * feat: docker compose 파일 추가 * feat: Email 추가 * feat: DeviceIdentifier 추가 * test: BaseEntity equals 검증 테스트 추가 * feat: Member 추가 * feat: Device 추가 * style: 불필요한 개행 제거 * feat: DeviceIdentifier 추가 * feat: email에 toString 추가 * feat: Device 정적 팩터리 메서드 구조 수정 - isActive 추가 * feat: RecyclestudyApplication에 비동기 설정 추가 * feat: 이메일 전송 기능을 위한 의존성 추가 * feat: 전역 예외 처리용 ControllerAdvice 추가 * feat: EmailService 추가 * feat: IdentifierCreator 추가 * feat: 멤버 저장 기능 추가 - 멤버 저장 - 디바이스 id 발급 * feat: 멤버의 디바이스 전체 조회 기능 추가 * feat: 디바이스 이메일 인증 메일 발송 기능 추가 * feat: 이메일 인증 기능 추가 * test: MemberServiceTest 불필요한 검증 로직 제거 * feat: GlobalControllerAdvice 예외 처리 로직 추가 * test: MemberControllerTest 추가 * test: DeviceControllerTest 추가 * chore: DeviceControllerTest 패키지 위치 수정 * refactor: Member 이메일 유니크 제약 조건 설정 * refactor: Device 내 Member에 JoinColumn 추가 * refactor: Device identifier 유니크 제약 조건 설정 * refactor: DeviceController 패키지 위치 수정 및 파라미터명 변경 * feat: ActivationExpiredDateTime 추가 * refactor: EmailService 구조 개선 - 로그 추가 - 메서드 분리 * feat: Member 이메일 검증 기능 추가 * feat: Device 소유 검증 기능 추가 * feat: GlobalControllerAdvice 내 DeviceActivationExpiredException 처리 추가 * refactor: 이메일 인증 제한 시간 로직 추가 --- build.gradle | 40 +-- docker-compose.yaml | 16 ++ .../recyclestudy/RecyclestudyApplication.java | 8 +- .../com/recyclestudy/common/BaseEntity.java | 57 ++++ .../recyclestudy/common/NullValidator.java | 35 +++ .../common/config/TimeConfig.java | 14 + .../com/recyclestudy/email/EmailService.java | 64 +++++ .../exception/BadRequestException.java | 7 + .../DeviceActivationExpiredException.java | 7 + .../exception/EmailSendException.java | 12 + .../exception/GlobalControllerAdvice.java | 47 ++++ .../exception/NotFoundException.java | 7 + .../exception/UnauthorizedException.java | 7 + .../exception/dto/ErrorResponse.java | 8 + .../member/controller/DeviceController.java | 27 ++ .../member/controller/MemberController.java | 51 ++++ .../controller/request/MemberSaveRequest.java | 10 + .../response/MemberFindResponse.java | 19 ++ .../response/MemberSaveResponse.java | 10 + .../domain/ActivationExpiredDateTime.java | 45 ++++ .../recyclestudy/member/domain/Device.java | 68 +++++ .../member/domain/DeviceIdentifier.java | 39 +++ .../com/recyclestudy/member/domain/Email.java | 45 ++++ .../member/domain/IdentifierCreator.java | 13 + .../recyclestudy/member/domain/Member.java | 42 +++ .../member/repository/DeviceRepository.java | 23 ++ .../member/repository/MemberRepository.java | 13 + .../member/service/MemberService.java | 98 +++++++ .../member/service/input/MemberFindInput.java | 13 + .../member/service/input/MemberSaveInput.java | 11 + .../service/output/MemberFindOutput.java | 19 ++ .../service/output/MemberSaveOutput.java | 12 + src/main/resources/application.yaml | 33 +++ src/main/resources/templates/auth_email.html | 14 + .../resources/templates/auth_success.html | 53 ++++ .../recyclestudy/common/BaseEntityTest.java | 101 ++++++++ .../controller/DeviceControllerTest.java | 95 +++++++ .../controller/MemberControllerTest.java | 187 ++++++++++++++ .../member/domain/DeviceIdentifierTest.java | 33 +++ .../member/domain/DeviceTest.java | 140 ++++++++++ .../recyclestudy/member/domain/EmailTest.java | 75 ++++++ .../member/domain/MemberTest.java | 61 +++++ .../member/service/MemberServiceTest.java | 244 ++++++++++++++++++ 43 files changed, 1902 insertions(+), 21 deletions(-) create mode 100644 docker-compose.yaml create mode 100644 src/main/java/com/recyclestudy/common/BaseEntity.java create mode 100644 src/main/java/com/recyclestudy/common/NullValidator.java create mode 100644 src/main/java/com/recyclestudy/common/config/TimeConfig.java create mode 100644 src/main/java/com/recyclestudy/email/EmailService.java create mode 100644 src/main/java/com/recyclestudy/exception/BadRequestException.java create mode 100644 src/main/java/com/recyclestudy/exception/DeviceActivationExpiredException.java create mode 100644 src/main/java/com/recyclestudy/exception/EmailSendException.java create mode 100644 src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java create mode 100644 src/main/java/com/recyclestudy/exception/NotFoundException.java create mode 100644 src/main/java/com/recyclestudy/exception/UnauthorizedException.java create mode 100644 src/main/java/com/recyclestudy/exception/dto/ErrorResponse.java create mode 100644 src/main/java/com/recyclestudy/member/controller/DeviceController.java create mode 100644 src/main/java/com/recyclestudy/member/controller/MemberController.java create mode 100644 src/main/java/com/recyclestudy/member/controller/request/MemberSaveRequest.java create mode 100644 src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java create mode 100644 src/main/java/com/recyclestudy/member/controller/response/MemberSaveResponse.java create mode 100644 src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java create mode 100644 src/main/java/com/recyclestudy/member/domain/Device.java create mode 100644 src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java create mode 100644 src/main/java/com/recyclestudy/member/domain/Email.java create mode 100644 src/main/java/com/recyclestudy/member/domain/IdentifierCreator.java create mode 100644 src/main/java/com/recyclestudy/member/domain/Member.java create mode 100644 src/main/java/com/recyclestudy/member/repository/DeviceRepository.java create mode 100644 src/main/java/com/recyclestudy/member/repository/MemberRepository.java create mode 100644 src/main/java/com/recyclestudy/member/service/MemberService.java create mode 100644 src/main/java/com/recyclestudy/member/service/input/MemberFindInput.java create mode 100644 src/main/java/com/recyclestudy/member/service/input/MemberSaveInput.java create mode 100644 src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java create mode 100644 src/main/java/com/recyclestudy/member/service/output/MemberSaveOutput.java create mode 100644 src/main/resources/templates/auth_email.html create mode 100644 src/main/resources/templates/auth_success.html create mode 100644 src/test/java/com/recyclestudy/common/BaseEntityTest.java create mode 100644 src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java create mode 100644 src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java create mode 100644 src/test/java/com/recyclestudy/member/domain/DeviceIdentifierTest.java create mode 100644 src/test/java/com/recyclestudy/member/domain/DeviceTest.java create mode 100644 src/test/java/com/recyclestudy/member/domain/EmailTest.java create mode 100644 src/test/java/com/recyclestudy/member/domain/MemberTest.java create mode 100644 src/test/java/com/recyclestudy/member/service/MemberServiceTest.java diff --git a/build.gradle b/build.gradle index e4b08da..119c878 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.5.9' - id 'io.spring.dependency-management' version '1.1.7' + id 'java' + id 'org.springframework.boot' version '3.5.9' + id 'io.spring.dependency-management' version '1.1.7' } group = 'com.recyclestudy' @@ -9,31 +9,35 @@ version = '0.0.1-SNAPSHOT' description = 'Periodic Review Assistant' java { - toolchain { - languageVersion = JavaLanguageVersion.of(21) - } + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } } configurations { - compileOnly { - extendsFrom annotationProcessor - } + compileOnly { + extendsFrom annotationProcessor + } } repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-web' - compileOnly 'org.projectlombok:lombok' - runtimeOnly 'com.h2database:h2' - runtimeOnly 'com.mysql:mysql-connector-j' - annotationProcessor 'org.projectlombok:lombok' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-mail' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + runtimeOnly 'com.mysql:mysql-connector-j' + compileOnly 'org.projectlombok:lombok' + annotationProcessor 'org.projectlombok:lombok' + + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'io.rest-assured:rest-assured' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } diff --git a/docker-compose.yaml b/docker-compose.yaml new file mode 100644 index 0000000..1c7ecf2 --- /dev/null +++ b/docker-compose.yaml @@ -0,0 +1,16 @@ +services: + mysql: + image: mysql:8.4 + volumes: + - mysql_volume:/var/lib/mysql + restart: unless-stopped + ports: + - "33306:3306" + environment: + - MYSQL_ROOT_PASSWORD=${DB_ROOT_PASSWORD} + - MYSQL_DATABASE=${DB_DATABASE} + - MYSQL_USER=${DB_USERNAME} + - MYSQL_PASSWORD=${DB_PASSWORD} + +volumes: + mysql_volume: diff --git a/src/main/java/com/recyclestudy/RecyclestudyApplication.java b/src/main/java/com/recyclestudy/RecyclestudyApplication.java index 6bb7dbb..a95c1cd 100644 --- a/src/main/java/com/recyclestudy/RecyclestudyApplication.java +++ b/src/main/java/com/recyclestudy/RecyclestudyApplication.java @@ -2,12 +2,14 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.scheduling.annotation.EnableAsync; +@EnableAsync @SpringBootApplication public class RecyclestudyApplication { - public static void main(String[] args) { - SpringApplication.run(RecyclestudyApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(RecyclestudyApplication.class, args); + } } diff --git a/src/main/java/com/recyclestudy/common/BaseEntity.java b/src/main/java/com/recyclestudy/common/BaseEntity.java new file mode 100644 index 0000000..82e243a --- /dev/null +++ b/src/main/java/com/recyclestudy/common/BaseEntity.java @@ -0,0 +1,57 @@ +package com.recyclestudy.common; + +import jakarta.persistence.Column; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; +import java.util.Objects; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.hibernate.Hibernate; +import org.hibernate.annotations.CreationTimestamp; +import org.hibernate.annotations.UpdateTimestamp; + +@MappedSuperclass +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +public abstract class BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + protected Long id; + + @Column(name = "created_at", nullable = false) + @CreationTimestamp + protected LocalDateTime createdAt; + + @Column(name = "modified_at") + @UpdateTimestamp + protected LocalDateTime modifiedAt; + + @Override + public final boolean equals(final Object o) { + if (this == o) { + return true; + } + if (o == null) { + return false; + } + + if (Hibernate.getClass(this) != Hibernate.getClass(o)) { + return false; + } + final BaseEntity that = (BaseEntity) o; + return id != null && id.equals(that.id); + } + + @Override + public int hashCode() { + if (id == null) { + throw new IllegalStateException("hashCode() called on entity without ID"); + } + return Objects.hash(id); + } +} diff --git a/src/main/java/com/recyclestudy/common/NullValidator.java b/src/main/java/com/recyclestudy/common/NullValidator.java new file mode 100644 index 0000000..e914489 --- /dev/null +++ b/src/main/java/com/recyclestudy/common/NullValidator.java @@ -0,0 +1,35 @@ +package com.recyclestudy.common; + +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public final class NullValidator { + + public static ValidatorBuilder builder() { + return new ValidatorBuilder(); + } + + public static class ValidatorBuilder { + + private final List elements = new ArrayList<>(); + + public ValidatorBuilder add(final String name, final Object target) { + this.elements.add(new ValidationElement(name, target)); + return this; + } + + public void validate() { + for (final ValidationElement element : this.elements) { + if (element.target() == null) { + throw new IllegalArgumentException("null이 될 수 없습니다: %s".formatted(element.name)); + } + } + } + + private record ValidationElement(String name, Object target) { + } + } +} diff --git a/src/main/java/com/recyclestudy/common/config/TimeConfig.java b/src/main/java/com/recyclestudy/common/config/TimeConfig.java new file mode 100644 index 0000000..a7b112f --- /dev/null +++ b/src/main/java/com/recyclestudy/common/config/TimeConfig.java @@ -0,0 +1,14 @@ +package com.recyclestudy.common.config; + +import java.time.Clock; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class TimeConfig { + + @Bean + public Clock clock() { + return Clock.systemDefaultZone(); + } +} diff --git a/src/main/java/com/recyclestudy/email/EmailService.java b/src/main/java/com/recyclestudy/email/EmailService.java new file mode 100644 index 0000000..93e5e76 --- /dev/null +++ b/src/main/java/com/recyclestudy/email/EmailService.java @@ -0,0 +1,64 @@ +package com.recyclestudy.email; + +import com.recyclestudy.exception.EmailSendException; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.thymeleaf.TemplateEngine; +import org.thymeleaf.context.Context; + +@Slf4j +@Service +@RequiredArgsConstructor +public class EmailService { + + private final JavaMailSender javaMailSender; + private final TemplateEngine templateEngine; + + @Value("${auth.base-url}") + private String baseUrl; + + @Async + public void sendDeviceAuthMail(String email, String deviceId) { + try { + final String authUrl = createAuthUrl(email, deviceId); + final String message = createMessage(authUrl); + + sendMail(email, "[Recycle Study] 디바이스 인증을 완료해주세요.", message); + + log.info("인증 메일 발송 성공: {}", email); + + } catch (Exception e) { + log.error("메일 전송 실패. email={}, deviceId={}", email, deviceId, e); + + throw new EmailSendException("메일 전송 중 오류가 발생했습니다.", e); + } + } + + private String createAuthUrl(String email, String deviceId) { + return String.format("%s/api/v1/device/auth?email=%s&identifier=%s", baseUrl, email, deviceId); + } + + private String createMessage(String authUrl) { + final Context context = new Context(); + context.setVariable("authUrl", authUrl); + return templateEngine.process("auth_email", context); + } + + private void sendMail(String to, String subject, String content) throws MessagingException { + final MimeMessage mimeMessage = javaMailSender.createMimeMessage(); + final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, false, "UTF-8"); + + helper.setTo(to); + helper.setSubject(subject); + helper.setText(content, true); + + javaMailSender.send(mimeMessage); + } +} diff --git a/src/main/java/com/recyclestudy/exception/BadRequestException.java b/src/main/java/com/recyclestudy/exception/BadRequestException.java new file mode 100644 index 0000000..078aa4c --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/BadRequestException.java @@ -0,0 +1,7 @@ +package com.recyclestudy.exception; + +public class BadRequestException extends RuntimeException { + public BadRequestException(String message) { + super(message); + } +} diff --git a/src/main/java/com/recyclestudy/exception/DeviceActivationExpiredException.java b/src/main/java/com/recyclestudy/exception/DeviceActivationExpiredException.java new file mode 100644 index 0000000..4c9a37c --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/DeviceActivationExpiredException.java @@ -0,0 +1,7 @@ +package com.recyclestudy.exception; + +public class DeviceActivationExpiredException extends UnauthorizedException { + public DeviceActivationExpiredException(String message) { + super(message); + } +} diff --git a/src/main/java/com/recyclestudy/exception/EmailSendException.java b/src/main/java/com/recyclestudy/exception/EmailSendException.java new file mode 100644 index 0000000..07ccbe3 --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/EmailSendException.java @@ -0,0 +1,12 @@ +package com.recyclestudy.exception; + +public class EmailSendException extends RuntimeException { + + public EmailSendException(final String message) { + super(message); + } + + public EmailSendException(String message, final Exception e) { + super(message); + } +} diff --git a/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java b/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java new file mode 100644 index 0000000..9c622cb --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java @@ -0,0 +1,47 @@ +package com.recyclestudy.exception; + +import com.recyclestudy.exception.dto.ErrorResponse; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalControllerAdvice { + + @ExceptionHandler(NotFoundException.class) + public ResponseEntity handleNotFound(final NotFoundException e) { + final ErrorResponse response = ErrorResponse.from(e.getMessage()); + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response); + } + + @ExceptionHandler(BadRequestException.class) + public ResponseEntity handleBadRequest(final BadRequestException e) { + final ErrorResponse response = ErrorResponse.from(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); + } + + @ExceptionHandler(DeviceActivationExpiredException.class) + public ResponseEntity handleDeviceActivationExpired(final DeviceActivationExpiredException e) { + final ErrorResponse response = ErrorResponse.from(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); + } + + @ExceptionHandler(UnauthorizedException.class) + public ResponseEntity handleUnauthorized(final UnauthorizedException e) { + final ErrorResponse response = ErrorResponse.from(e.getMessage()); + return ResponseEntity.status(HttpStatus.UNAUTHORIZED).body(response); + } + + @ExceptionHandler(IllegalArgumentException.class) + public ResponseEntity handleIllegalArgument(final IllegalArgumentException e) { + final ErrorResponse response = ErrorResponse.from(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); + } + + @ExceptionHandler(Exception.class) + public ResponseEntity handleException(final Exception e) { + final ErrorResponse response = ErrorResponse.from("예기치 못한 에러가 발생했습니다"); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response); + } +} diff --git a/src/main/java/com/recyclestudy/exception/NotFoundException.java b/src/main/java/com/recyclestudy/exception/NotFoundException.java new file mode 100644 index 0000000..68b5478 --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/NotFoundException.java @@ -0,0 +1,7 @@ +package com.recyclestudy.exception; + +public class NotFoundException extends RuntimeException { + public NotFoundException(String message) { + super(message); + } +} diff --git a/src/main/java/com/recyclestudy/exception/UnauthorizedException.java b/src/main/java/com/recyclestudy/exception/UnauthorizedException.java new file mode 100644 index 0000000..9833d50 --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/UnauthorizedException.java @@ -0,0 +1,7 @@ +package com.recyclestudy.exception; + +public class UnauthorizedException extends RuntimeException { + public UnauthorizedException(String message) { + super(message); + } +} diff --git a/src/main/java/com/recyclestudy/exception/dto/ErrorResponse.java b/src/main/java/com/recyclestudy/exception/dto/ErrorResponse.java new file mode 100644 index 0000000..f3d3efa --- /dev/null +++ b/src/main/java/com/recyclestudy/exception/dto/ErrorResponse.java @@ -0,0 +1,8 @@ +package com.recyclestudy.exception.dto; + +public record ErrorResponse(String message) { + + public static ErrorResponse from(final String message) { + return new ErrorResponse(message); + } +} diff --git a/src/main/java/com/recyclestudy/member/controller/DeviceController.java b/src/main/java/com/recyclestudy/member/controller/DeviceController.java new file mode 100644 index 0000000..0323821 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/controller/DeviceController.java @@ -0,0 +1,27 @@ +package com.recyclestudy.member.controller; + +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.service.MemberService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; + +@Controller +@RequestMapping("/api/v1/device") +@RequiredArgsConstructor +public class DeviceController { + + private final MemberService memberService; + + @GetMapping("/auth") + public String authenticateDevice( + @RequestParam("email") String email, + @RequestParam("identifier") String deviceIdentifier + ) { + memberService.authenticateDevice(Email.from(email), DeviceIdentifier.from(deviceIdentifier)); + return "auth_success"; + } +} diff --git a/src/main/java/com/recyclestudy/member/controller/MemberController.java b/src/main/java/com/recyclestudy/member/controller/MemberController.java new file mode 100644 index 0000000..fa195d6 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/controller/MemberController.java @@ -0,0 +1,51 @@ +package com.recyclestudy.member.controller; + +import com.recyclestudy.email.EmailService; +import com.recyclestudy.member.controller.request.MemberSaveRequest; +import com.recyclestudy.member.controller.response.MemberFindResponse; +import com.recyclestudy.member.controller.response.MemberSaveResponse; +import com.recyclestudy.member.service.MemberService; +import com.recyclestudy.member.service.input.MemberFindInput; +import com.recyclestudy.member.service.input.MemberSaveInput; +import com.recyclestudy.member.service.output.MemberFindOutput; +import com.recyclestudy.member.service.output.MemberSaveOutput; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/members") +@RequiredArgsConstructor +public class MemberController { + + private final MemberService memberService; + private final EmailService emailService; + + @PostMapping + public ResponseEntity saveMember(@RequestBody final MemberSaveRequest request) { + final MemberSaveInput input = request.toInput(); + final MemberSaveOutput output = memberService.saveDevice(input); + + emailService.sendDeviceAuthMail(output.email().getValue(), output.identifier().getValue()); + + final MemberSaveResponse response = MemberSaveResponse.from(output); + return ResponseEntity.status(HttpStatus.CREATED).body(response); + } + + @GetMapping + public ResponseEntity findAllMemberDevices( + @RequestParam(name = "email") final String email, + @RequestParam(name = "identifier") final String identifier + ) { + final MemberFindInput input = MemberFindInput.from(email, identifier); + final MemberFindOutput output = memberService.findAllMemberDevices(input); + final MemberFindResponse response = MemberFindResponse.from(output); + return ResponseEntity.ok(response); + } +} diff --git a/src/main/java/com/recyclestudy/member/controller/request/MemberSaveRequest.java b/src/main/java/com/recyclestudy/member/controller/request/MemberSaveRequest.java new file mode 100644 index 0000000..ee02bfc --- /dev/null +++ b/src/main/java/com/recyclestudy/member/controller/request/MemberSaveRequest.java @@ -0,0 +1,10 @@ +package com.recyclestudy.member.controller.request; + +import com.recyclestudy.member.service.input.MemberSaveInput; + +public record MemberSaveRequest(String email) { + + public MemberSaveInput toInput() { + return MemberSaveInput.from(this.email); + } +} diff --git a/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java b/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java new file mode 100644 index 0000000..d69d7c0 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java @@ -0,0 +1,19 @@ +package com.recyclestudy.member.controller.response; + +import com.recyclestudy.member.service.output.MemberFindOutput; +import java.time.LocalDateTime; +import java.util.List; + +public record MemberFindResponse(List devices) { + + public static MemberFindResponse from(final MemberFindOutput output) { + final List memberFindElements = output.elements().stream() + .map(outputElement -> new MemberFindElement(outputElement.email().getValue(), + outputElement.createdAt())) + .toList(); + return new MemberFindResponse(memberFindElements); + } + + private record MemberFindElement(String email, LocalDateTime createdAt) { + } +} diff --git a/src/main/java/com/recyclestudy/member/controller/response/MemberSaveResponse.java b/src/main/java/com/recyclestudy/member/controller/response/MemberSaveResponse.java new file mode 100644 index 0000000..7d7645f --- /dev/null +++ b/src/main/java/com/recyclestudy/member/controller/response/MemberSaveResponse.java @@ -0,0 +1,10 @@ +package com.recyclestudy.member.controller.response; + +import com.recyclestudy.member.service.output.MemberSaveOutput; + +public record MemberSaveResponse(String email, String identifier) { + + public static MemberSaveResponse from(final MemberSaveOutput output) { + return new MemberSaveResponse(output.email().getValue(), output.identifier().getValue()); + } +} diff --git a/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java b/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java new file mode 100644 index 0000000..72bc023 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java @@ -0,0 +1,45 @@ +package com.recyclestudy.member.domain; + +import com.recyclestudy.common.NullValidator; +import com.recyclestudy.exception.DeviceActivationExpiredException; +import jakarta.persistence.Embeddable; +import java.time.Duration; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.FieldNameConstants; + +@Embeddable +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +@ToString +@EqualsAndHashCode +public class ActivationExpiredDateTime { + + private static final Duration EXPIRE_TIME_RATE = Duration.ofMinutes(5); + + public static ActivationExpiredDateTime create(final LocalDateTime currentTime) { + validateNotNull(currentTime); + return new ActivationExpiredDateTime(currentTime.plusMinutes(EXPIRE_TIME_RATE.toMinutes())); + } + + private static void validateNotNull(final LocalDateTime currentTime) { + NullValidator.builder() + .add(Fields.value, currentTime) + .validate(); + } + + private LocalDateTime value; + + public void checkExpired(final LocalDateTime currentTime) { + if (currentTime.isAfter(value)) { + throw new DeviceActivationExpiredException("인증 유효 시간이 만료되었습니다."); + } + } +} diff --git a/src/main/java/com/recyclestudy/member/domain/Device.java b/src/main/java/com/recyclestudy/member/domain/Device.java new file mode 100644 index 0000000..4e0560d --- /dev/null +++ b/src/main/java/com/recyclestudy/member/domain/Device.java @@ -0,0 +1,68 @@ +package com.recyclestudy.member.domain; + +import com.recyclestudy.common.BaseEntity; +import com.recyclestudy.common.NullValidator; +import com.recyclestudy.exception.BadRequestException; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.FieldNameConstants; + +@Entity +@Table(name = "device") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +public class Device extends BaseEntity { + + public static Device withoutId( + final Member member, + final DeviceIdentifier deviceIdentifier, + final boolean isActive, + final ActivationExpiredDateTime activationExpiresAt + ) { + NullValidator.builder() + .add(Fields.member, member) + .add(Fields.identifier, deviceIdentifier) + .add(Fields.activationExpiresAt, activationExpiresAt) + .validate(); + return new Device(member, deviceIdentifier, isActive, activationExpiresAt); + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @Embedded + @AttributeOverride(name = "value", column = @Column(name = "identifier", nullable = false, unique = true)) + private DeviceIdentifier identifier; + + @Column(name = "is_active", nullable = false) + private boolean isActive; + + @Embedded + @AttributeOverride(name = "value", column = @Column(name = "activation_expires_at", nullable = false)) + private ActivationExpiredDateTime activationExpiresAt; + + public void activate(final LocalDateTime currentTime) { + activationExpiresAt.checkExpired(currentTime); + this.isActive = true; + } + + public void verifyOwner(final Email email) { + if (!member.hasEmail(email)) { + throw new BadRequestException("디바이스 소유자가 아닙니다."); + } + } +} diff --git a/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java b/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java new file mode 100644 index 0000000..d031160 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java @@ -0,0 +1,39 @@ +package com.recyclestudy.member.domain; + +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.Embeddable; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.FieldNameConstants; + +@Embeddable +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +@ToString +@EqualsAndHashCode +public class DeviceIdentifier { + + public static DeviceIdentifier from(final String value) { + validateNotNull(value); + return new DeviceIdentifier(value); + } + + public static DeviceIdentifier create() { + final String value = IdentifierCreator.create(); + return new DeviceIdentifier(value); + } + + private static void validateNotNull(final String value) { + NullValidator.builder() + .add(Fields.value, value) + .validate(); + } + + private String value; +} diff --git a/src/main/java/com/recyclestudy/member/domain/Email.java b/src/main/java/com/recyclestudy/member/domain/Email.java new file mode 100644 index 0000000..c5fd3cd --- /dev/null +++ b/src/main/java/com/recyclestudy/member/domain/Email.java @@ -0,0 +1,45 @@ +package com.recyclestudy.member.domain; + +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.Embeddable; +import java.util.regex.Pattern; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.FieldNameConstants; + +@Embeddable +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +@ToString +@EqualsAndHashCode +public class Email { + + private static final String EMAIL_FORMAT = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$"; + private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_FORMAT); + + public static Email from(final String value) { + validateNotNull(value); + validateEmailFormat(value); + return new Email(value); + } + + private static void validateNotNull(final String value) { + NullValidator.builder() + .add(Fields.value, value) + .validate(); + } + + private static void validateEmailFormat(final String emailValue) { + if (!EMAIL_PATTERN.matcher(emailValue).matches()) { + throw new IllegalArgumentException("유효하지 않은 이메일 형식입니다."); + } + } + + private String value; +} diff --git a/src/main/java/com/recyclestudy/member/domain/IdentifierCreator.java b/src/main/java/com/recyclestudy/member/domain/IdentifierCreator.java new file mode 100644 index 0000000..6208c80 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/domain/IdentifierCreator.java @@ -0,0 +1,13 @@ +package com.recyclestudy.member.domain; + +import java.util.UUID; +import lombok.AccessLevel; +import lombok.NoArgsConstructor; + +@NoArgsConstructor(access = AccessLevel.PRIVATE) +public class IdentifierCreator { + + public static String create() { + return UUID.randomUUID().toString(); + } +} diff --git a/src/main/java/com/recyclestudy/member/domain/Member.java b/src/main/java/com/recyclestudy/member/domain/Member.java new file mode 100644 index 0000000..9dee912 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/domain/Member.java @@ -0,0 +1,42 @@ +package com.recyclestudy.member.domain; + +import com.recyclestudy.common.BaseEntity; +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.FieldNameConstants; + +@Entity +@Table(name = "member") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +public class Member extends BaseEntity { + + public static Member withoutId(final Email email) { + validateNotNull(email); + return new Member(email); + } + + private static void validateNotNull(final Email email) { + NullValidator.builder() + .add(Fields.email, email) + .validate(); + } + + @Embedded + @AttributeOverride(name = "value", column = @Column(name = "email", nullable = false, unique = true)) + private Email email; + + public boolean hasEmail(final Email email) { + return this.email.equals(email); + } +} diff --git a/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java b/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java new file mode 100644 index 0000000..2fc7223 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java @@ -0,0 +1,23 @@ +package com.recyclestudy.member.repository; + +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +public interface DeviceRepository extends JpaRepository { + + @Query(""" + SELECT d + FROM Device d + JOIN FETCH d.member m + WHERE m.email = :email + """) + List findAllByMemberEmail(@Param("email") Email email); + + Optional findByIdentifier(DeviceIdentifier deviceIdentifier); +} diff --git a/src/main/java/com/recyclestudy/member/repository/MemberRepository.java b/src/main/java/com/recyclestudy/member/repository/MemberRepository.java new file mode 100644 index 0000000..5531bd4 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/repository/MemberRepository.java @@ -0,0 +1,13 @@ +package com.recyclestudy.member.repository; + +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.domain.Member; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { + + Optional findByEmail(Email email); + + boolean existsByEmail(Email email); +} diff --git a/src/main/java/com/recyclestudy/member/service/MemberService.java b/src/main/java/com/recyclestudy/member/service/MemberService.java new file mode 100644 index 0000000..61eef86 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/service/MemberService.java @@ -0,0 +1,98 @@ +package com.recyclestudy.member.service; + +import com.recyclestudy.exception.BadRequestException; +import com.recyclestudy.exception.NotFoundException; +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.member.domain.ActivationExpiredDateTime; +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.domain.Member; +import com.recyclestudy.member.repository.DeviceRepository; +import com.recyclestudy.member.repository.MemberRepository; +import com.recyclestudy.member.service.input.MemberFindInput; +import com.recyclestudy.member.service.input.MemberSaveInput; +import com.recyclestudy.member.service.output.MemberFindOutput; +import com.recyclestudy.member.service.output.MemberSaveOutput; +import java.time.Clock; +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberRepository memberRepository; + private final DeviceRepository deviceRepository; + private final Clock clock; + + @Transactional + public MemberSaveOutput saveDevice(final MemberSaveInput input) { + final Member member = saveNewMember(input.email()); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.create(); + + final ActivationExpiredDateTime activationExpiredDateTime + = ActivationExpiredDateTime.create(LocalDateTime.now(clock)); + + final Device notSavedDevice = Device.withoutId(member, deviceIdentifier, false, activationExpiredDateTime); + final Device device = deviceRepository.save(notSavedDevice); + + return MemberSaveOutput.from(device); + } + + @Transactional(readOnly = true) + public MemberFindOutput findAllMemberDevices(final MemberFindInput input) { + checkExistedMember(input.email()); + checkActiveDevice(input.deviceIdentifier()); + + final List devices = deviceRepository.findAllByMemberEmail(input.email()); + return MemberFindOutput.from(devices); + } + + @Transactional + public void authenticateDevice(final Email email, final DeviceIdentifier deviceIdentifier) { + checkExistedMember(email); + + final Device device = deviceRepository.findByIdentifier(deviceIdentifier) + .orElseThrow(() -> new NotFoundException("존재하지 않는 디바이스 아이디입니다: %s" + .formatted(deviceIdentifier.getValue()))); + + if (device.isActive()) { + throw new BadRequestException("이미 인증되었습니다"); + } + + device.verifyOwner(email); + device.activate(LocalDateTime.now(clock)); + } + + private Member saveNewMember(final Email email) { + final Optional memberOptional = memberRepository.findByEmail(email); + + if (memberOptional.isPresent()) { + return memberOptional.get(); + } + + final Member notSavedMember = Member.withoutId(email); + return memberRepository.save(notSavedMember); + } + + private void checkExistedMember(final Email email) { + if (!memberRepository.existsByEmail(email)) { + throw new NotFoundException("존재하지 않는 멤버입니다: %s".formatted(email.getValue())); + } + } + + private void checkActiveDevice(final DeviceIdentifier deviceIdentifier) { + final Device device = deviceRepository.findByIdentifier(deviceIdentifier) + .orElseThrow(() -> new NotFoundException("존재하지 않는 디바이스 아이디입니다: %s" + .formatted(deviceIdentifier.getValue()))); + + if (!device.isActive()) { + throw new UnauthorizedException("인증되지 않은 디바이스입니다"); + } + } +} diff --git a/src/main/java/com/recyclestudy/member/service/input/MemberFindInput.java b/src/main/java/com/recyclestudy/member/service/input/MemberFindInput.java new file mode 100644 index 0000000..321e28b --- /dev/null +++ b/src/main/java/com/recyclestudy/member/service/input/MemberFindInput.java @@ -0,0 +1,13 @@ +package com.recyclestudy.member.service.input; + +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; + +public record MemberFindInput(Email email, DeviceIdentifier deviceIdentifier) { + + public static MemberFindInput from(final String emailValue, final String identifier) { + final Email email = Email.from(emailValue); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from(identifier); + return new MemberFindInput(email, deviceIdentifier); + } +} diff --git a/src/main/java/com/recyclestudy/member/service/input/MemberSaveInput.java b/src/main/java/com/recyclestudy/member/service/input/MemberSaveInput.java new file mode 100644 index 0000000..156c0a6 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/service/input/MemberSaveInput.java @@ -0,0 +1,11 @@ +package com.recyclestudy.member.service.input; + +import com.recyclestudy.member.domain.Email; + +public record MemberSaveInput(Email email) { + + public static MemberSaveInput from(final String email) { + final Email value = Email.from(email); + return new MemberSaveInput(value); + } +} diff --git a/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java b/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java new file mode 100644 index 0000000..f172d9e --- /dev/null +++ b/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java @@ -0,0 +1,19 @@ +package com.recyclestudy.member.service.output; + +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.Email; +import java.time.LocalDateTime; +import java.util.List; + +public record MemberFindOutput(List elements) { + + public static MemberFindOutput from(final List devices) { + final List memberFindElements = devices.stream() + .map(device -> new MemberFindElement(device.getMember().getEmail(), device.getCreatedAt())) + .toList(); + return new MemberFindOutput(memberFindElements); + } + + public record MemberFindElement(Email email, LocalDateTime createdAt) { + } +} diff --git a/src/main/java/com/recyclestudy/member/service/output/MemberSaveOutput.java b/src/main/java/com/recyclestudy/member/service/output/MemberSaveOutput.java new file mode 100644 index 0000000..09ce054 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/service/output/MemberSaveOutput.java @@ -0,0 +1,12 @@ +package com.recyclestudy.member.service.output; + +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; + +public record MemberSaveOutput(Email email, DeviceIdentifier identifier) { + + public static MemberSaveOutput from(final Device device) { + return new MemberSaveOutput(device.getMember().getEmail(), device.getIdentifier()); + } +} diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index a74f9d0..8ab3eb6 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -1,3 +1,36 @@ spring: application: name: recyclestudy + + config: + import: + - optional:file:.env[.properties] + + datasource: + url: ${DB_URL} + username: ${DB_USERNAME} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + + jpa: + hibernate: + ddl-auto: create + + properties: + hibernate: + format_sql: true + open-in-view: false + + mail: + host: smtp.gmail.com + port: 587 + username: ${GMAIL_USERNAME} + password: ${GMAIL_PASSWORD} + properties: + mail: + smtp: + starttls: + enable: true + auth: true +auth: + base-url: ${BASE_URL} diff --git a/src/main/resources/templates/auth_email.html b/src/main/resources/templates/auth_email.html new file mode 100644 index 0000000..fe01306 --- /dev/null +++ b/src/main/resources/templates/auth_email.html @@ -0,0 +1,14 @@ + + + + 이메일 인증 + + +

안녕하세요! 이메일 인증을 완료해주세요.

+

아래 버튼을 클릭하여 디바이스 인증을 완료하세요.

+ + 인증하기 + + + diff --git a/src/main/resources/templates/auth_success.html b/src/main/resources/templates/auth_success.html new file mode 100644 index 0000000..9019729 --- /dev/null +++ b/src/main/resources/templates/auth_success.html @@ -0,0 +1,53 @@ + + + + + + 이메일 인증 완료 + + + +
+

🎉 디바이스 인증이 성공적으로 완료되었습니다! 🎉

+

이제 새로운 디바이스에서 서비스를 안전하게 이용하실 수 있습니다.

+

본 페이지는 잠시 후 자동으로 닫히거나, 애플리케이션으로 돌아가실 수 있습니다.

+
+ + diff --git a/src/test/java/com/recyclestudy/common/BaseEntityTest.java b/src/test/java/com/recyclestudy/common/BaseEntityTest.java new file mode 100644 index 0000000..83923be --- /dev/null +++ b/src/test/java/com/recyclestudy/common/BaseEntityTest.java @@ -0,0 +1,101 @@ +package com.recyclestudy.common; + +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.Member; +import java.lang.reflect.Field; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class BaseEntityTest { + + @Test + @DisplayName("서로 다른 타입이면 id가 같아도 동등하지 않다") + void fixedImplementation_differentTypes_sameId_shouldNotBeEqual() throws Exception { + // Given: Member와 Device 인스턴스를 생성하고, 둘 다 id=1로 설정 + final Member member = createMemberWithId(1L); + final Device device = createDeviceWithId(1L); + + // When + final boolean result = member.equals(device); + + // Then + assertThat(result).isFalse(); + assertThat(device.equals(member)).isFalse(); + } + + @Test + @DisplayName("같은 타입이고 같은 id면 동등하다") + void currentImplementation_sameType_sameId_shouldBeEqual() throws Exception { + // Given: 같은 타입의 인스턴스 2개, 같은 id + final Member member1 = createMemberWithId(1L); + final Member member2 = createMemberWithId(1L); + + // When & Then: 같은 타입이므로 동등해야 함 + assertThat(member1.equals(member2)).isTrue(); + } + + @Test + @DisplayName("같은 타입이지만 다른 id면 동등하지 않다") + void currentImplementation_sameType_differentId_shouldNotBeEqual() throws Exception { + // Given: 같은 타입의 인스턴스 2개, 다른 id + final Member member1 = createMemberWithId(1L); + final Member member2 = createMemberWithId(2L); + + // When & Then: id가 다르므로 동등하지 않아야 함 + assertThat(member1.equals(member2)).isFalse(); + } + + @Test + @DisplayName("동등한 객체는 같은 hashCode를 가져야 한다") + void hashCodeContract_equalObjects_sameHashCode() throws Exception { + // Given: 같은 타입, 같은 id + final Member member1 = createMemberWithId(1L); + final Member member2 = createMemberWithId(1L); + + // When: equals는 true + assertThat(member1.equals(member2)).isTrue(); + + // Then: hashCode도 같아야 함 (계약 준수) + assertThat(member1).hasSameHashCodeAs(member2); + } + + @Test + @DisplayName("id가 null인 엔티티의 hashCode() 호출 시 예외가 발생한다") + void hashCode_withNullId_throwsException() throws Exception { + // Given: id가 null인 엔티티 + final Member member = createMemberWithId(null); + + // When & Then + assertThatThrownBy(member::hashCode) + .isInstanceOf(IllegalStateException.class); + } + + private Member createMemberWithId(final Long id) throws Exception { + final var constructor = Member.class.getDeclaredConstructor(); + constructor.setAccessible(true); + final Member member = constructor.newInstance(); + if (id != null) { + setId(member, id); + } + return member; + } + + private Device createDeviceWithId(final Long id) throws Exception { + final var constructor = Device.class.getDeclaredConstructor(); + constructor.setAccessible(true); + final Device device = constructor.newInstance(); + if (id != null) { + setId(device, id); + } + return device; + } + + private void setId(final Object entity, final Long id) throws Exception { + final Field idField = entity.getClass().getSuperclass().getDeclaredField("id"); + idField.setAccessible(true); + idField.set(entity, id); + } +} diff --git a/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java b/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java new file mode 100644 index 0000000..3d682cc --- /dev/null +++ b/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java @@ -0,0 +1,95 @@ +package com.recyclestudy.member.controller; + +import com.recyclestudy.exception.BadRequestException; +import com.recyclestudy.exception.DeviceActivationExpiredException; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.service.MemberService; +import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.HttpStatus; +import org.springframework.test.context.bean.override.mockito.MockitoBean; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.equalTo; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doThrow; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class DeviceControllerTest { + + @LocalServerPort + private int port; + + @MockitoBean + private MemberService memberService; + + @BeforeEach + void setUp() { + RestAssured.port = port; + } + + @Test + @DisplayName("이미 인증된 디바이스 인증 시도 시 400 응답을 반환한다") + void authenticateDevice_AlreadyAuthenticated() { + // given + final String email = "test@test.com"; + final String identifier = "device-identifier"; + + doThrow(new BadRequestException("이미 인증되었습니다")) + .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); + + // when & then + given() + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("이미 인증되었습니다")); + } + + @Test + @DisplayName("인증 시 유효하지 않은 이메일 형식인 경우 400 응답을 반환한다") + void authenticateDevice_InvalidEmailFormat() { + // given + final String invalidEmail = "invalid-email"; + final String identifier = "device-identifier"; + + // when & then + given() + .param("email", invalidEmail) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("유효하지 않은 이메일 형식입니다.")); + } + + @Test + @DisplayName("인증 유효 시간이 만료된 경우 400 응답을 반환한다") + void authenticateDevice_Expired() { + // given + final String email = "test@test.com"; + final String identifier = "device-identifier"; + + doThrow(new DeviceActivationExpiredException("인증 유효 시간이 만료되었습니다.")) + .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); + + // when & then + given() + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("인증 유효 시간이 만료되었습니다.")); + } +} diff --git a/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java b/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java new file mode 100644 index 0000000..6138f4b --- /dev/null +++ b/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java @@ -0,0 +1,187 @@ +package com.recyclestudy.member.controller; + +import com.recyclestudy.email.EmailService; +import com.recyclestudy.exception.NotFoundException; +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.member.controller.request.MemberSaveRequest; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.service.MemberService; +import com.recyclestudy.member.service.output.MemberFindOutput; +import com.recyclestudy.member.service.output.MemberSaveOutput; +import io.restassured.RestAssured; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.hasSize; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.verify; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class MemberControllerTest { + + @LocalServerPort + private int port; + + @MockitoBean + private MemberService memberService; + + @MockitoBean + private EmailService emailService; + + @BeforeEach + void setUp() { + RestAssured.port = port; + } + + @Test + @DisplayName("이메일을 통해 새로운 디바이스를 저장한다") + void saveMember() { + // given + final String email = "test@test.com"; + final String identifier = "device-identifier"; + final MemberSaveRequest request = new MemberSaveRequest(email); + final MemberSaveOutput output = new MemberSaveOutput(Email.from(email), DeviceIdentifier.from(identifier)); + + given(memberService.saveDevice(any())).willReturn(output); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/members") + .then() + .statusCode(HttpStatus.CREATED.value()) + .body("email", equalTo(email)) + .body("identifier", equalTo(identifier)); + + verify(emailService).sendDeviceAuthMail(email, identifier); + } + + @Test + @DisplayName("멤버의 모든 디바이스 정보를 조회한다") + void findAllMemberDevices() { + // given + final String email = "test@test.com"; + final String identifier = "device-identifier"; + final MemberFindOutput output = MemberFindOutput.from(List.of()); + + given(memberService.findAllMemberDevices(any())).willReturn(output); + + // when & then + given() + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.OK.value()) + .body("devices", hasSize(0)); + } + + @Test + @DisplayName("존재하지 않는 멤버 조회 시 404 응답을 반환한다") + void findAllMemberDevices_NotFoundMember() { + // given + final String email = "notfound@test.com"; + final String identifier = "device-identifier"; + + given(memberService.findAllMemberDevices(any())) + .willThrow(new NotFoundException("존재하지 않는 멤버입니다")); + + // when & then + given() + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.NOT_FOUND.value()) + .body("message", equalTo("존재하지 않는 멤버입니다")); + } + + @Test + @DisplayName("인증되지 않은 디바이스로 조회 시 401 응답을 반환한다") + void findAllMemberDevices_UnauthorizedDevice() { + // given + final String email = "test@test.com"; + final String identifier = "unauthorized-id"; + + given(memberService.findAllMemberDevices(any())) + .willThrow(new UnauthorizedException("인증되지 않은 디바이스입니다")); + + // when & then + given() + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.UNAUTHORIZED.value()) + .body("message", equalTo("인증되지 않은 디바이스입니다")); + } + + @Test + @DisplayName("조회 시 유효하지 않은 이메일 형식인 경우 400 응답을 반환한다") + void findAllMemberDevices_InvalidEmailFormat() { + // given + final String invalidEmail = "invalid-email"; + final String identifier = "device-identifier"; + + // when & then + given() + .param("email", invalidEmail) + .param("identifier", identifier) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("유효하지 않은 이메일 형식입니다.")); + } + + @Test + @DisplayName("이메일이 누락된 경우 400 응답을 반환한다") + void saveMember_NullEmail() { + // given + final MemberSaveRequest request = new MemberSaveRequest(null); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/members") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("null이 될 수 없습니다: value")); + } + + @Test + @DisplayName("유효하지 않은 이메일 형식으로 요청 시 400 응답을 반환한다") + void saveMember_InvalidEmailFormat() { + // given + final String invalidEmail = "invalid-email"; + final MemberSaveRequest request = new MemberSaveRequest(invalidEmail); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/members") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("유효하지 않은 이메일 형식입니다.")); + } +} diff --git a/src/test/java/com/recyclestudy/member/domain/DeviceIdentifierTest.java b/src/test/java/com/recyclestudy/member/domain/DeviceIdentifierTest.java new file mode 100644 index 0000000..cdc5fbb --- /dev/null +++ b/src/test/java/com/recyclestudy/member/domain/DeviceIdentifierTest.java @@ -0,0 +1,33 @@ +package com.recyclestudy.member.domain; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class DeviceIdentifierTest { + + @Test + @DisplayName("from 메서드를 활용하여 DeviceIdentifier를 생성할 수 있다") + void from() { + // given + final String value = "test"; + + // when + final DeviceIdentifier actual = DeviceIdentifier.from(value); + + // then + assertThat(actual.getValue()).isEqualTo(value); + } + + @Test + @DisplayName("null 값으로 생성 시도 시, 예외를 발생한다") + void throwExceptionWhenNull() { + // given + // when + // then + assertThatThrownBy(() -> DeviceIdentifier.from(null)) + .isInstanceOf(IllegalArgumentException.class); + } +} diff --git a/src/test/java/com/recyclestudy/member/domain/DeviceTest.java b/src/test/java/com/recyclestudy/member/domain/DeviceTest.java new file mode 100644 index 0000000..c7447a4 --- /dev/null +++ b/src/test/java/com/recyclestudy/member/domain/DeviceTest.java @@ -0,0 +1,140 @@ +package com.recyclestudy.member.domain; + +import java.time.LocalDateTime; +import java.util.stream.Stream; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.SoftAssertions.assertSoftly; + +class DeviceTest { + + @Test + @DisplayName("withoutId 메서드를 통해 Device를 생성할 수 있다") + void withoutId() { + // given + final Email email = Email.from("test@test.com"); + final Member member = Member.withoutId(email); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("test"); + final ActivationExpiredDateTime activationExpiredDateTime = ActivationExpiredDateTime.create( + LocalDateTime.now()); + + // when + final Device actual = Device.withoutId(member, deviceIdentifier, false, activationExpiredDateTime); + + // then + assertSoftly(softAssertions -> { + softAssertions.assertThat(actual.getMember().getEmail()).isEqualTo(email); + softAssertions.assertThat(actual.getIdentifier()).isEqualTo(deviceIdentifier); + softAssertions.assertThat(actual.isActive()).isFalse(); + softAssertions.assertThat(actual.getActivationExpiresAt()).isEqualTo(activationExpiredDateTime); + }); + } + + @ParameterizedTest + @MethodSource("provideInvalidValue") + @DisplayName("null로 생성 시도 시, 예외를 던진다") + void throwExceptionWhenNull(final Member member, final DeviceIdentifier deviceIdentifier, + final ActivationExpiredDateTime activationExpiredDateTime) { + //given + //when + //then + assertThatThrownBy(() -> Device.withoutId(member, deviceIdentifier, false, activationExpiredDateTime)) + .isInstanceOf(IllegalArgumentException.class); + } + + private static Stream provideInvalidValue() { + final Email email = Email.from("test@test.com"); + final Member member = Member.withoutId(email); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("test"); + final ActivationExpiredDateTime activationExpiredDateTime = ActivationExpiredDateTime.create( + LocalDateTime.now()); + + return Stream.of( + Arguments.of(member, null, activationExpiredDateTime), + Arguments.of(null, deviceIdentifier, activationExpiredDateTime), + Arguments.of(member, deviceIdentifier, null), + Arguments.of(null, null, null) + ); + } + + @Test + @DisplayName("activate 메서드를 통해 Device를 활성화할 수 있다") + void activate() { + // given + final LocalDateTime now = LocalDateTime.now(); + final Device device = Device.withoutId( + Member.withoutId(Email.from("test@test.com")), + DeviceIdentifier.from("test"), + false, + ActivationExpiredDateTime.create(now) + ); + + // when + device.activate(now); + + // then + assertSoftly(softAssertions -> { + softAssertions.assertThat(device.isActive()).isTrue(); + }); + } + + @Test + @DisplayName("만료 시간이 지난 후 activate 메서드 호출 시, 예외를 던진다") + void activate_fail_expired() { + // given + final LocalDateTime now = LocalDateTime.now(); + final Device device = Device.withoutId( + Member.withoutId(Email.from("test@test.com")), + DeviceIdentifier.from("test"), + false, + ActivationExpiredDateTime.create(now) + ); + + // when & then + final LocalDateTime expiredTime = now.plusMinutes(6); + assertThatThrownBy(() -> device.activate(expiredTime)) + .isInstanceOf(RuntimeException.class); + } + + @Test + @DisplayName("verifyOwner 메서드를 통해 소유자를 검증할 수 있다") + void verifyOwner() { + // given + final Email email = Email.from("test@test.com"); + final Device device = Device.withoutId( + Member.withoutId(email), + DeviceIdentifier.from("test"), + false, + ActivationExpiredDateTime.create(LocalDateTime.now()) + ); + + // when & then + assertThatCode(() -> device.verifyOwner(email)) + .doesNotThrowAnyException(); + } + + @Test + @DisplayName("소유자가 아닌 이메일로 verifyOwner 메서드 호출 시, 예외를 던진다") + void verifyOwner_fail() { + // given + final Email email = Email.from("test@test.com"); + final Device device = Device.withoutId( + Member.withoutId(email), + DeviceIdentifier.from("test"), + false, + ActivationExpiredDateTime.create(LocalDateTime.now()) + ); + + // when & then + final Email otherEmail = Email.from("other@test.com"); + assertThatThrownBy(() -> device.verifyOwner(otherEmail)) + .isInstanceOf(RuntimeException.class) + .hasMessage("디바이스 소유자가 아닙니다."); + } +} diff --git a/src/test/java/com/recyclestudy/member/domain/EmailTest.java b/src/test/java/com/recyclestudy/member/domain/EmailTest.java new file mode 100644 index 0000000..0e6edf3 --- /dev/null +++ b/src/test/java/com/recyclestudy/member/domain/EmailTest.java @@ -0,0 +1,75 @@ +package com.recyclestudy.member.domain; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.NullAndEmptySource; +import org.junit.jupiter.params.provider.ValueSource; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class EmailTest { + + @Test + @DisplayName("from 메서드를 활용하여 Email을 생성할 수 있다") + void from() { + // given + final String value = "test@test.com"; + + // when + final Email actual = Email.from(value); + + // then + assertThat(actual.getValue()).isEqualTo(value); + } + + @ParameterizedTest + @NullAndEmptySource + @DisplayName("null 값으로 생성 시도 시, 예외를 발생한다") + void throwExceptionWhenNull(final String emptyValue) { + // given + // when + // then + assertThatThrownBy(() -> Email.from(emptyValue)) + .isInstanceOf(IllegalArgumentException.class); + } + + @ParameterizedTest + @ValueSource(strings = { + "valid@example.com", + "another.email@sub.domain.co.kr", + "test-user_name+tag@domain.net", + "12345@test.org" + }) + @DisplayName("올바른 형식인 값으로 생성 시도 시, Email을 생성할 수 있다") + void from_validEmail_createsEmail(final String validValue) { + // given + // when + final Email actual = Email.from(validValue); + + // then + assertThat(actual.getValue()).isEqualTo(validValue); + } + + @ParameterizedTest + @ValueSource(strings = { + "testtest.com", // '@' 없음 + "test@", // 도메인 없음 + "@test.com", // 로컬 파트 없음 + "test@test", // 최상위 도메인 없음 + "test@test.c", // 최상위 도메인 너무 짧음 + "test@test.commmmmmmm", // 최상위 도메인 너무 김 + "te st@test.com", // 로컬 파트에 공백 + "test@test com" // 도메인에 공백 + }) + @DisplayName("맞지 않는 형식인 값으로 생성 시도 시, 예외를 발생한다") + void throwExceptionWhenInvalidFormat(final String invalidValue) { + //given + //when + //then + assertThatThrownBy(() -> Email.from(invalidValue)) + .isInstanceOf(IllegalArgumentException.class) + .hasMessage("유효하지 않은 이메일 형식입니다."); + } +} diff --git a/src/test/java/com/recyclestudy/member/domain/MemberTest.java b/src/test/java/com/recyclestudy/member/domain/MemberTest.java new file mode 100644 index 0000000..2a03659 --- /dev/null +++ b/src/test/java/com/recyclestudy/member/domain/MemberTest.java @@ -0,0 +1,61 @@ +package com.recyclestudy.member.domain; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class MemberTest { + + @Test + @DisplayName("withoutId 메서드를 통해 Member를 생성할 수 있다") + void withoutId() { + // given + final Email email = Email.from("test@test.com"); + + // when + final Member actual = Member.withoutId(email); + + // then + assertThat(actual.getEmail()).isEqualTo(email); + } + + @Test + @DisplayName("null로 생성 시도 시, 예외를 던진다") + void throwExceptionWhenNull() { + //given + //when + //then + assertThatThrownBy(() -> Member.withoutId(null)) + .isInstanceOf(IllegalArgumentException.class); + } + + @Test + @DisplayName("hasEmail 메서드를 통해 이메일 일치 여부를 확인할 수 있다") + void hasEmail() { + // given + final Email email = Email.from("test@test.com"); + final Member member = Member.withoutId(email); + + // when + final boolean actual = member.hasEmail(email); + + // then + assertThat(actual).isTrue(); + } + + @Test + @DisplayName("이메일이 일치하지 않으면 false를 반환한다") + void hasEmail_fail() { + // given + final Email email = Email.from("test@test.com"); + final Member member = Member.withoutId(email); + + // when + final boolean actual = member.hasEmail(Email.from("other@test.com")); + + // then + assertThat(actual).isFalse(); + } +} diff --git a/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java b/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java new file mode 100644 index 0000000..dd4a367 --- /dev/null +++ b/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java @@ -0,0 +1,244 @@ +package com.recyclestudy.member.service; + +import com.recyclestudy.exception.BadRequestException; +import com.recyclestudy.exception.NotFoundException; +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.member.domain.ActivationExpiredDateTime; +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.domain.Member; +import com.recyclestudy.member.repository.DeviceRepository; +import com.recyclestudy.member.repository.MemberRepository; +import com.recyclestudy.member.service.input.MemberFindInput; +import com.recyclestudy.member.service.input.MemberSaveInput; +import com.recyclestudy.member.service.output.MemberFindOutput; +import com.recyclestudy.member.service.output.MemberSaveOutput; +import java.time.Clock; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.List; +import java.util.Optional; +import org.assertj.core.api.SoftAssertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.never; +import static org.mockito.Mockito.verify; + +@ExtendWith(MockitoExtension.class) +class MemberServiceTest { + + @Mock + MemberRepository memberRepository; + + @Mock + DeviceRepository deviceRepository; + + @Spy + Clock clock = Clock.fixed(Instant.parse("2025-01-01T00:00:00Z"), ZoneId.of("UTC")); + + @InjectMocks + MemberService memberService; + + LocalDateTime now; + + @BeforeEach + void setUp() { + now = LocalDateTime.now(clock); + } + + @Test + @DisplayName("저장되지 않은 이메일일 경우 멤버를 저장 후, 새로운 디바이스 id를 저장한다") + void saveDevice_newMember() { + // given + final MemberSaveInput input = MemberSaveInput.from("new@test.com"); + final Member newMember = Member.withoutId(input.email()); + final Device device = Device.withoutId(newMember, DeviceIdentifier.create(), false, + ActivationExpiredDateTime.create(now)); + + given(memberRepository.findByEmail(any(Email.class))).willReturn(Optional.empty()); + given(memberRepository.save(any(Member.class))).willReturn(newMember); + given(deviceRepository.save(any(Device.class))).willReturn(device); + + // when + final MemberSaveOutput actual = memberService.saveDevice(input); + + // then + assertThat(actual.email()).isEqualTo(input.email()); + verify(memberRepository).findByEmail(any(Email.class)); + verify(memberRepository).save(any(Member.class)); + verify(deviceRepository).save(any(Device.class)); + } + + @Test + @DisplayName("이미 저장된 이메일일 경우 기존 멤버로 새로운 디바이스 id를 저장한다") + void saveDevice_existedMember() { + // given + final MemberSaveInput input = MemberSaveInput.from("existed@test.com"); + final Member existedMember = Member.withoutId(input.email()); + final Device device = Device.withoutId(existedMember, DeviceIdentifier.create(), false, + ActivationExpiredDateTime.create(now)); + + given(memberRepository.findByEmail(any(Email.class))).willReturn(Optional.of(existedMember)); + given(deviceRepository.save(any(Device.class))).willReturn(device); + + // when + final MemberSaveOutput actual = memberService.saveDevice(input); + + // then + assertThat(actual.email()).isEqualTo(input.email()); + verify(memberRepository).findByEmail(any(Email.class)); + verify(memberRepository, never()).save(any(Member.class)); + verify(deviceRepository).save(any(Device.class)); + } + + @Test + @DisplayName("대상 이메일을 가진 멤버의 디바이스를 모두 조회한다") + void findAllMemberDevices() { + // given + final String email = "existed@test.com"; + final String identifier = "device-id"; + final MemberFindInput input = MemberFindInput.from(email, identifier); + final Member existedMember = Member.withoutId(input.email()); + final Device device = Device.withoutId(existedMember, input.deviceIdentifier(), true, + ActivationExpiredDateTime.create(now)); + + given(memberRepository.existsByEmail(any(Email.class))).willReturn(true); + given(deviceRepository.findByIdentifier(any(DeviceIdentifier.class))).willReturn(Optional.of(device)); + given(deviceRepository.findAllByMemberEmail(any(Email.class))).willReturn(List.of(device)); + + // when + final MemberFindOutput actual = memberService.findAllMemberDevices(input); + + // then + SoftAssertions.assertSoftly(softAssertions -> { + softAssertions.assertThat(actual.elements()).hasSize(1); + softAssertions.assertThat(actual.elements().getFirst().email()).isEqualTo(input.email()); + }); + } + + @Test + @DisplayName("대상 이메일을 가진 멤버의 디바이스가 없으면 빈 리스트를 리턴한다") + void findAllMemberDevices_notExistedDevice() { + // given + final String email = "existed@test.com"; + final String identifier = "device-id"; + final MemberFindInput input = MemberFindInput.from(email, identifier); + final Member existedMember = Member.withoutId(input.email()); + final Device device = Device.withoutId(existedMember, input.deviceIdentifier(), true, + ActivationExpiredDateTime.create(now)); + + given(memberRepository.existsByEmail(any(Email.class))).willReturn(true); + given(deviceRepository.findByIdentifier(any(DeviceIdentifier.class))).willReturn(Optional.of(device)); + given(deviceRepository.findAllByMemberEmail(any(Email.class))).willReturn(List.of()); + + // when + final MemberFindOutput actual = memberService.findAllMemberDevices(input); + + // then + assertThat(actual.elements()).isEmpty(); + } + + @Test + @DisplayName("대상 이메일을 가진 멤버가 존재하지 않을 경우 예외를 던진다") + void throwExceptionWhenNotExistedMemberByEmail() { + // given + final String notExistedEmailValue = "notExisted@test.com"; + final String identifier = "device-id"; + final MemberFindInput input = MemberFindInput.from(notExistedEmailValue, identifier); + + given(memberRepository.existsByEmail(any(Email.class))).willReturn(false); + + // when + // then + assertThatThrownBy(() -> memberService.findAllMemberDevices(input)) + .isInstanceOf(NotFoundException.class); + } + + @Test + @DisplayName("존재하지 않는 디바이스 아이디일 경우 예외를 던진다") + void throwExceptionWhenNotExistedDeviceByIdentifier() { + // given + final String email = "existed@test.com"; + final String identifier = "not-existed-device-id"; + final MemberFindInput input = MemberFindInput.from(email, identifier); + + given(memberRepository.existsByEmail(any(Email.class))).willReturn(true); + given(deviceRepository.findByIdentifier(any(DeviceIdentifier.class))).willReturn(Optional.empty()); + + // when + // then + assertThatThrownBy(() -> memberService.findAllMemberDevices(input)) + .isInstanceOf(NotFoundException.class); + } + + @Test + @DisplayName("활성화되지 않은 디바이스일 경우 예외를 던진다") + void throwExceptionWhenNotActiveDevice() { + // given + final String email = "existed@test.com"; + final String identifier = "inactive-device-id"; + final MemberFindInput input = MemberFindInput.from(email, identifier); + final Member existedMember = Member.withoutId(input.email()); + final Device inactiveDevice = Device.withoutId(existedMember, input.deviceIdentifier(), false, + ActivationExpiredDateTime.create(now)); + + given(memberRepository.existsByEmail(any(Email.class))).willReturn(true); + given(deviceRepository.findByIdentifier(any(DeviceIdentifier.class))).willReturn(Optional.of(inactiveDevice)); + + // when + // then + assertThatThrownBy(() -> memberService.findAllMemberDevices(input)) + .isInstanceOf(UnauthorizedException.class); + } + + @Test + @DisplayName("디바이스를 인증할 수 있다") + void authenticateDevice() { + // given + final Email email = Email.from("test@test.com"); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("test"); + final Member member = Member.withoutId(email); + final Device device = Device.withoutId(member, deviceIdentifier, false, ActivationExpiredDateTime.create(now)); + + given(memberRepository.existsByEmail(email)).willReturn(true); + given(deviceRepository.findByIdentifier(deviceIdentifier)).willReturn(Optional.of(device)); + + // when + memberService.authenticateDevice(email, deviceIdentifier); + + // then + assertThat(device.isActive()).isTrue(); + } + + @Test + @DisplayName("소유자가 아닌 이메일로 인증 시도 시 예외를 던진다") + void authenticateDevice_fail_owner() { + // given + final Email email = Email.from("test@test.com"); + final Email otherEmail = Email.from("other@test.com"); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("test"); + final Member member = Member.withoutId(email); + final Device device = Device.withoutId(member, deviceIdentifier, false, ActivationExpiredDateTime.create(now)); + + given(memberRepository.existsByEmail(otherEmail)).willReturn(true); + given(deviceRepository.findByIdentifier(deviceIdentifier)).willReturn(Optional.of(device)); + + // when & then + assertThatThrownBy(() -> memberService.authenticateDevice(otherEmail, deviceIdentifier)) + .isInstanceOf(BadRequestException.class) + .hasMessage("디바이스 소유자가 아닙니다."); + } +} From c1e87f8855befa4c34b75234d5deac4e06fc9486 Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Wed, 24 Dec 2025 15:16:04 +0900 Subject: [PATCH 03/16] =?UTF-8?q?jacoco=20=EA=B8=B0=EB=B0=98=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=BB=A4=EB=B2=84=EB=A6=AC=EC=A7=80=20CI?= =?UTF-8?q?=20=EA=B5=AC=EC=B6=95=20(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: jacoco 기반 테스트 커버리지 CI 스크립트 추자 * test: 테스트 환경 DB H2 사용하도록 변경 --- .github/workflows/test_coverage.yml | 65 +++++++++++++++++++++++++++++ build.gradle | 32 ++++++++++++++ src/test/resources/application.yaml | 27 ++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 .github/workflows/test_coverage.yml create mode 100644 src/test/resources/application.yaml diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml new file mode 100644 index 0000000..70916cc --- /dev/null +++ b/.github/workflows/test_coverage.yml @@ -0,0 +1,65 @@ +name: Test Coverage Validation + +on: + pull_request: + types: + [ opened, synchronize, reopened ] + +jobs: + Build-And-Test: + runs-on: ubuntu-latest + + steps: + - name: Github Repository 파일 불러오기 + uses: actions/checkout@v6 + with: + fetch-depth: 0 + + - name: Setup Docker + uses: docker/setup-buildx-action@v3 + + - name: JDK 버전 21 설치 + uses: actions/setup-java@v5 + with: + distribution: corretto + java-version: 21 + + - name: Gradle Wrapper 실행 권한 부여 + run: chmod +x ./gradlew + + - name: 전체 빌드 및 테스트 + run: ./gradlew --info test + + - name: JaCoCo 커버리지 리포트 생성 + id: jacoco_report + uses: madrapps/jacoco-report@v1.7.2 + with: + paths: ${{ github.workspace }}/build/reports/jacoco/test/jacocoTestReport.xml + token: ${{ secrets.GITHUB_TOKEN }} + min-coverage-overall: 70 + min-coverage-changed-files: 70 + title: "🧪 테스트 커버리지 리포트" + update-comment: true + + - name: Close PR, if build fail + if: ${{ failure() }} + uses: actions/github-script@v8 + with: + github-token: ${{ secrets.GITHUB_TOKEN }} + script: | + const pull_number = ${{ github.event.pull_request.number }} + const updated_title = `[VALIDATION FAIL] ${{ github.event.pull_request.title }}` + await github.rest.pulls.createReview({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: pull_number, + body: '빌드 또는 테스트 커버리지 검증에 실패했습니다.', + event: 'REQUEST_CHANGES' + }) + await github.rest.pulls.update({ + owner: context.repo.owner, + repo: context.repo.repo, + pull_number: pull_number, + title: updated_title, + state: 'closed' + }) diff --git a/build.gradle b/build.gradle index 119c878..1f0eec0 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,6 @@ plugins { id 'java' + id 'jacoco' id 'org.springframework.boot' version '3.5.9' id 'io.spring.dependency-management' version '1.1.7' } @@ -34,10 +35,41 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'com.h2database:h2' testImplementation 'io.rest-assured:rest-assured' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { useJUnitPlatform() + finalizedBy jacocoTestReport } + +jacoco { + toolVersion = "0.8.14" +} + +jacocoTestReport { + reports { + html.required = true + xml.required = true + csv.required = true + } + + afterEvaluate { + classDirectories.setFrom(files(classDirectories.files.collect { + fileTree(dir: it, exclude: [ + "**/*Application*", + "**/common/**", + "**/exception/**", + "**/request/**", + "**/response/**", + "**/input/**", + "**/output/**", + "**/dto/**" + ]) + })) + } + dependsOn test +} + diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml new file mode 100644 index 0000000..663411b --- /dev/null +++ b/src/test/resources/application.yaml @@ -0,0 +1,27 @@ +spring: + datasource: + url: jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;MODE=MySQL + driver-class-name: org.h2.Driver + username: sa + password: + + jpa: + hibernate: + ddl-auto: create-drop + properties: + hibernate: + format_sql: true + dialect: org.hibernate.dialect.H2Dialect + + mail: + host: localhost + port: 3025 + properties: + mail: + smtp: + auth: false + starttls: + enable: false + +auth: + base-url: http://localhost:8080 From 1b5f44d0e5051b41ea1ec9c5e0de7f57b3947b14 Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Wed, 24 Dec 2025 16:00:06 +0900 Subject: [PATCH 04/16] =?UTF-8?q?=EB=94=94=EB=B0=94=EC=9D=B4=EC=8A=A4=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?(#7)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 디바이스 삭제 기능 추가 * chore: final 키워드 누락 수정 * fix: 대상 디바이스를 제거하도록 기능 수정 --- .../member/controller/DeviceController.java | 15 +++++ .../request/DeviceDeleteRequest.java | 4 ++ .../member/repository/DeviceRepository.java | 2 + .../member/service/MemberService.java | 10 +++ .../service/input/DeviceDeleteInput.java | 16 +++++ .../controller/DeviceControllerTest.java | 62 +++++++++++++++++++ .../member/service/MemberServiceTest.java | 58 +++++++++++++++++ 7 files changed, 167 insertions(+) create mode 100644 src/main/java/com/recyclestudy/member/controller/request/DeviceDeleteRequest.java create mode 100644 src/main/java/com/recyclestudy/member/service/input/DeviceDeleteInput.java diff --git a/src/main/java/com/recyclestudy/member/controller/DeviceController.java b/src/main/java/com/recyclestudy/member/controller/DeviceController.java index 0323821..400b329 100644 --- a/src/main/java/com/recyclestudy/member/controller/DeviceController.java +++ b/src/main/java/com/recyclestudy/member/controller/DeviceController.java @@ -1,13 +1,19 @@ package com.recyclestudy.member.controller; +import com.recyclestudy.member.controller.request.DeviceDeleteRequest; import com.recyclestudy.member.domain.DeviceIdentifier; import com.recyclestudy.member.domain.Email; import com.recyclestudy.member.service.MemberService; +import com.recyclestudy.member.service.input.DeviceDeleteInput; import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.ResponseBody; @Controller @RequestMapping("/api/v1/device") @@ -24,4 +30,13 @@ public String authenticateDevice( memberService.authenticateDevice(Email.from(email), DeviceIdentifier.from(deviceIdentifier)); return "auth_success"; } + + @DeleteMapping + @ResponseBody + public ResponseEntity deleteDevice(@RequestBody final DeviceDeleteRequest request) { + final DeviceDeleteInput input = DeviceDeleteInput.from(request.email(), request.deviceIdentifier(), + request.targetDeviceIdentifier()); + memberService.deleteDevice(input); + return ResponseEntity.noContent().build(); + } } diff --git a/src/main/java/com/recyclestudy/member/controller/request/DeviceDeleteRequest.java b/src/main/java/com/recyclestudy/member/controller/request/DeviceDeleteRequest.java new file mode 100644 index 0000000..86bfa82 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/controller/request/DeviceDeleteRequest.java @@ -0,0 +1,4 @@ +package com.recyclestudy.member.controller.request; + +public record DeviceDeleteRequest(String email, String deviceIdentifier, String targetDeviceIdentifier) { +} diff --git a/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java b/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java index 2fc7223..74f49fd 100644 --- a/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java +++ b/src/main/java/com/recyclestudy/member/repository/DeviceRepository.java @@ -20,4 +20,6 @@ public interface DeviceRepository extends JpaRepository { List findAllByMemberEmail(@Param("email") Email email); Optional findByIdentifier(DeviceIdentifier deviceIdentifier); + + void deleteByIdentifier(DeviceIdentifier identifier); } diff --git a/src/main/java/com/recyclestudy/member/service/MemberService.java b/src/main/java/com/recyclestudy/member/service/MemberService.java index 61eef86..5ce4254 100644 --- a/src/main/java/com/recyclestudy/member/service/MemberService.java +++ b/src/main/java/com/recyclestudy/member/service/MemberService.java @@ -10,6 +10,7 @@ import com.recyclestudy.member.domain.Member; import com.recyclestudy.member.repository.DeviceRepository; import com.recyclestudy.member.repository.MemberRepository; +import com.recyclestudy.member.service.input.DeviceDeleteInput; import com.recyclestudy.member.service.input.MemberFindInput; import com.recyclestudy.member.service.input.MemberSaveInput; import com.recyclestudy.member.service.output.MemberFindOutput; @@ -69,6 +70,15 @@ public void authenticateDevice(final Email email, final DeviceIdentifier deviceI device.activate(LocalDateTime.now(clock)); } + @Transactional + public void deleteDevice(final DeviceDeleteInput input) { + final Device device = deviceRepository.findByIdentifier(input.deviceIdentifier()) + .orElseThrow(() -> new UnauthorizedException("유효하지 않은 디바이스 아이디입니다: %s" + .formatted(input.deviceIdentifier().getValue()))); + device.verifyOwner(input.email()); + deviceRepository.deleteByIdentifier(input.targetDeviceIdentifier()); + } + private Member saveNewMember(final Email email) { final Optional memberOptional = memberRepository.findByEmail(email); diff --git a/src/main/java/com/recyclestudy/member/service/input/DeviceDeleteInput.java b/src/main/java/com/recyclestudy/member/service/input/DeviceDeleteInput.java new file mode 100644 index 0000000..0c27aa7 --- /dev/null +++ b/src/main/java/com/recyclestudy/member/service/input/DeviceDeleteInput.java @@ -0,0 +1,16 @@ +package com.recyclestudy.member.service.input; + +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; + +public record DeviceDeleteInput(Email email, DeviceIdentifier deviceIdentifier, + DeviceIdentifier targetDeviceIdentifier) { + + public static DeviceDeleteInput from(final String emailValue, final String identifier, + final String targetIdentifier) { + final Email email = Email.from(emailValue); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from(identifier); + final DeviceIdentifier targetDeviceIdentifier = DeviceIdentifier.from(targetIdentifier); + return new DeviceDeleteInput(email, deviceIdentifier, targetDeviceIdentifier); + } +} diff --git a/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java b/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java index 3d682cc..dd03363 100644 --- a/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java +++ b/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java @@ -2,6 +2,8 @@ import com.recyclestudy.exception.BadRequestException; import com.recyclestudy.exception.DeviceActivationExpiredException; +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.member.controller.request.DeviceDeleteRequest; import com.recyclestudy.member.domain.DeviceIdentifier; import com.recyclestudy.member.domain.Email; import com.recyclestudy.member.service.MemberService; @@ -12,11 +14,13 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; import org.springframework.test.context.bean.override.mockito.MockitoBean; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @@ -92,4 +96,62 @@ void authenticateDevice_Expired() { .statusCode(HttpStatus.BAD_REQUEST.value()) .body("message", equalTo("인증 유효 시간이 만료되었습니다.")); } + + @Test + @DisplayName("디바이스 삭제 시 204 응답을 반환한다") + void deleteDevice() { + // given + final DeviceDeleteRequest request = new DeviceDeleteRequest("test@test.com", "device-id", "target-id"); + + doNothing().when(memberService).deleteDevice(any()); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .delete("/api/v1/device") + .then() + .statusCode(HttpStatus.NO_CONTENT.value()); + } + + @Test + @DisplayName("유효하지 않은 디바이스 아이디로 삭제 시 401 응답을 반환한다") + void deleteDevice_InvalidIdentifier() { + // given + final DeviceDeleteRequest request = new DeviceDeleteRequest("test@test.com", "not-existed", "target-id"); + + doThrow(new UnauthorizedException("유효하지 않은 디바이스 아이디입니다")) + .when(memberService).deleteDevice(any()); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .delete("/api/v1/device") + .then() + .statusCode(HttpStatus.UNAUTHORIZED.value()) + .body("message", equalTo("유효하지 않은 디바이스 아이디입니다")); + } + + @Test + @DisplayName("소유자가 아닌 디바이스 삭제 시 400 응답을 반환한다") + void deleteDevice_NotOwner() { + // given + final DeviceDeleteRequest request = new DeviceDeleteRequest("other@test.com", "device-id", "target-id"); + + doThrow(new BadRequestException("디바이스 소유자가 아닙니다.")) + .when(memberService).deleteDevice(any()); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .delete("/api/v1/device") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("디바이스 소유자가 아닙니다.")); + } } diff --git a/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java b/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java index dd4a367..a87c39e 100644 --- a/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java +++ b/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java @@ -10,6 +10,7 @@ import com.recyclestudy.member.domain.Member; import com.recyclestudy.member.repository.DeviceRepository; import com.recyclestudy.member.repository.MemberRepository; +import com.recyclestudy.member.service.input.DeviceDeleteInput; import com.recyclestudy.member.service.input.MemberFindInput; import com.recyclestudy.member.service.input.MemberSaveInput; import com.recyclestudy.member.service.output.MemberFindOutput; @@ -241,4 +242,61 @@ void authenticateDevice_fail_owner() { .isInstanceOf(BadRequestException.class) .hasMessage("디바이스 소유자가 아닙니다."); } + + @Test + @DisplayName("디바이스를 삭제할 수 있다") + void deleteDevice() { + // given + final Email email = Email.from("test@test.com"); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("test"); + final DeviceIdentifier targetDeviceIdentifier = DeviceIdentifier.from("target"); + final DeviceDeleteInput input = DeviceDeleteInput.from( + email.getValue(), deviceIdentifier.getValue(), targetDeviceIdentifier.getValue()); + final Member member = Member.withoutId(email); + final Device device = Device.withoutId(member, deviceIdentifier, true, ActivationExpiredDateTime.create(now)); + + given(deviceRepository.findByIdentifier(deviceIdentifier)).willReturn(Optional.of(device)); + + // when + memberService.deleteDevice(input); + + // then + verify(deviceRepository).deleteByIdentifier(targetDeviceIdentifier); + } + + @Test + @DisplayName("유효하지 않은 디바이스 아이디로 삭제 시도 시 예외를 던진다") + void deleteDevice_fail_invalidIdentifier() { + // given + final Email email = Email.from("test@test.com"); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("not-existed"); + final DeviceDeleteInput input = DeviceDeleteInput.from( + email.getValue(), deviceIdentifier.getValue(), "target"); + + given(deviceRepository.findByIdentifier(deviceIdentifier)).willReturn(Optional.empty()); + + // when & then + assertThatThrownBy(() -> memberService.deleteDevice(input)) + .isInstanceOf(UnauthorizedException.class); + } + + @Test + @DisplayName("소유자가 아닌 디바이스로 삭제 시도 시 예외를 던진다") + void deleteDevice_fail_owner() { + // given + final Email email = Email.from("test@test.com"); + final Email otherEmail = Email.from("other@test.com"); + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from("test"); + final DeviceDeleteInput input = DeviceDeleteInput.from( + otherEmail.getValue(), deviceIdentifier.getValue(), "target"); + final Member member = Member.withoutId(email); + final Device device = Device.withoutId(member, deviceIdentifier, true, ActivationExpiredDateTime.create(now)); + + given(deviceRepository.findByIdentifier(deviceIdentifier)).willReturn(Optional.of(device)); + + // when & then + assertThatThrownBy(() -> memberService.deleteDevice(input)) + .isInstanceOf(BadRequestException.class) + .hasMessage("디바이스 소유자가 아닙니다."); + } } From 5412e66de179b3d9f0bb1751796c26ac9b7519c6 Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Wed, 24 Dec 2025 16:13:13 +0900 Subject: [PATCH 05/16] =?UTF-8?q?=EB=93=B1=EB=A1=9D=ED=95=9C=20=EB=94=94?= =?UTF-8?q?=EB=B0=94=EC=9D=B4=EC=8A=A4=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=9D=91=EB=8B=B5=20=ED=98=95=EC=8B=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 등록한 디바이스 조회 기능 응답 형식 수정 * chore: 실행 sql 로그 출력 기능 활성화 --- .../controller/response/MemberFindResponse.java | 8 ++++---- .../recyclestudy/member/service/MemberService.java | 2 +- .../member/service/output/MemberFindOutput.java | 11 ++++++----- src/main/resources/application.yaml | 1 + .../member/controller/MemberControllerTest.java | 2 +- .../member/service/MemberServiceTest.java | 2 +- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java b/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java index d69d7c0..4845dce 100644 --- a/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java +++ b/src/main/java/com/recyclestudy/member/controller/response/MemberFindResponse.java @@ -4,16 +4,16 @@ import java.time.LocalDateTime; import java.util.List; -public record MemberFindResponse(List devices) { +public record MemberFindResponse(String email, List devices) { public static MemberFindResponse from(final MemberFindOutput output) { final List memberFindElements = output.elements().stream() - .map(outputElement -> new MemberFindElement(outputElement.email().getValue(), + .map(outputElement -> new MemberFindElement(outputElement.identifier().getValue(), outputElement.createdAt())) .toList(); - return new MemberFindResponse(memberFindElements); + return new MemberFindResponse(output.email().getValue(), memberFindElements); } - private record MemberFindElement(String email, LocalDateTime createdAt) { + private record MemberFindElement(String identifier, LocalDateTime createdAt) { } } diff --git a/src/main/java/com/recyclestudy/member/service/MemberService.java b/src/main/java/com/recyclestudy/member/service/MemberService.java index 5ce4254..1c1efc4 100644 --- a/src/main/java/com/recyclestudy/member/service/MemberService.java +++ b/src/main/java/com/recyclestudy/member/service/MemberService.java @@ -51,7 +51,7 @@ public MemberFindOutput findAllMemberDevices(final MemberFindInput input) { checkActiveDevice(input.deviceIdentifier()); final List devices = deviceRepository.findAllByMemberEmail(input.email()); - return MemberFindOutput.from(devices); + return MemberFindOutput.of(input.email(), devices); } @Transactional diff --git a/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java b/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java index f172d9e..9523629 100644 --- a/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java +++ b/src/main/java/com/recyclestudy/member/service/output/MemberFindOutput.java @@ -1,19 +1,20 @@ package com.recyclestudy.member.service.output; import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.DeviceIdentifier; import com.recyclestudy.member.domain.Email; import java.time.LocalDateTime; import java.util.List; -public record MemberFindOutput(List elements) { +public record MemberFindOutput(Email email, List elements) { - public static MemberFindOutput from(final List devices) { + public static MemberFindOutput of(final Email email, final List devices) { final List memberFindElements = devices.stream() - .map(device -> new MemberFindElement(device.getMember().getEmail(), device.getCreatedAt())) + .map(device -> new MemberFindElement(device.getIdentifier(), device.getCreatedAt())) .toList(); - return new MemberFindOutput(memberFindElements); + return new MemberFindOutput(email, memberFindElements); } - public record MemberFindElement(Email email, LocalDateTime createdAt) { + public record MemberFindElement(DeviceIdentifier identifier, LocalDateTime createdAt) { } } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 8ab3eb6..fed0876 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -19,6 +19,7 @@ spring: properties: hibernate: format_sql: true + show_sql: true open-in-view: false mail: diff --git a/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java b/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java index 6138f4b..8905867 100644 --- a/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java +++ b/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java @@ -75,7 +75,7 @@ void findAllMemberDevices() { // given final String email = "test@test.com"; final String identifier = "device-identifier"; - final MemberFindOutput output = MemberFindOutput.from(List.of()); + final MemberFindOutput output = MemberFindOutput.of(Email.from(email), List.of()); given(memberService.findAllMemberDevices(any())).willReturn(output); diff --git a/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java b/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java index a87c39e..52a519c 100644 --- a/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java +++ b/src/test/java/com/recyclestudy/member/service/MemberServiceTest.java @@ -126,7 +126,7 @@ void findAllMemberDevices() { // then SoftAssertions.assertSoftly(softAssertions -> { softAssertions.assertThat(actual.elements()).hasSize(1); - softAssertions.assertThat(actual.elements().getFirst().email()).isEqualTo(input.email()); + softAssertions.assertThat(actual.elements().getFirst().identifier()).isEqualTo(input.deviceIdentifier()); }); } From f6a58db92265fef7c59510a25ae1bdda7ef00679 Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Wed, 24 Dec 2025 17:38:38 +0900 Subject: [PATCH 06/16] =?UTF-8?q?=EB=B3=B5=EC=8A=B5=ED=95=A0=20URL=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?= =?UTF-8?q?(#10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 리뷰 대상 url 저장 기능 추가 * fix: ReviewService 트랜잭션 누락 수정 --- .../review/controller/ReviewController.java | 30 ++++ .../controller/request/ReviewSaveRequest.java | 10 ++ .../response/ReviewSaveResponse.java | 12 ++ .../review/domain/NotificationStatus.java | 8 ++ .../recyclestudy/review/domain/Review.java | 38 +++++ .../review/domain/ReviewCycle.java | 58 ++++++++ .../review/domain/ReviewCycleDuration.java | 34 +++++ .../recyclestudy/review/domain/ReviewURL.java | 34 +++++ .../repository/ReviewCycleRepository.java | 7 + .../review/repository/ReviewRepository.java | 7 + .../review/service/ReviewService.java | 58 ++++++++ .../review/service/input/ReviewSaveInput.java | 13 ++ .../service/output/ReviewSaveOutput.java | 12 ++ .../controller/ReviewControllerTest.java | 100 +++++++++++++ .../domain/ReviewCycleDurationTest.java | 52 +++++++ .../review/domain/ReviewCycleTest.java | 56 ++++++++ .../review/domain/ReviewTest.java | 32 +++++ .../review/domain/ReviewURLTest.java | 32 +++++ .../review/service/ReviewServiceTest.java | 132 ++++++++++++++++++ 19 files changed, 725 insertions(+) create mode 100644 src/main/java/com/recyclestudy/review/controller/ReviewController.java create mode 100644 src/main/java/com/recyclestudy/review/controller/request/ReviewSaveRequest.java create mode 100644 src/main/java/com/recyclestudy/review/controller/response/ReviewSaveResponse.java create mode 100644 src/main/java/com/recyclestudy/review/domain/NotificationStatus.java create mode 100644 src/main/java/com/recyclestudy/review/domain/Review.java create mode 100644 src/main/java/com/recyclestudy/review/domain/ReviewCycle.java create mode 100644 src/main/java/com/recyclestudy/review/domain/ReviewCycleDuration.java create mode 100644 src/main/java/com/recyclestudy/review/domain/ReviewURL.java create mode 100644 src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java create mode 100644 src/main/java/com/recyclestudy/review/repository/ReviewRepository.java create mode 100644 src/main/java/com/recyclestudy/review/service/ReviewService.java create mode 100644 src/main/java/com/recyclestudy/review/service/input/ReviewSaveInput.java create mode 100644 src/main/java/com/recyclestudy/review/service/output/ReviewSaveOutput.java create mode 100644 src/test/java/com/recyclestudy/review/controller/ReviewControllerTest.java create mode 100644 src/test/java/com/recyclestudy/review/domain/ReviewCycleDurationTest.java create mode 100644 src/test/java/com/recyclestudy/review/domain/ReviewCycleTest.java create mode 100644 src/test/java/com/recyclestudy/review/domain/ReviewTest.java create mode 100644 src/test/java/com/recyclestudy/review/domain/ReviewURLTest.java create mode 100644 src/test/java/com/recyclestudy/review/service/ReviewServiceTest.java diff --git a/src/main/java/com/recyclestudy/review/controller/ReviewController.java b/src/main/java/com/recyclestudy/review/controller/ReviewController.java new file mode 100644 index 0000000..bb4d5cd --- /dev/null +++ b/src/main/java/com/recyclestudy/review/controller/ReviewController.java @@ -0,0 +1,30 @@ +package com.recyclestudy.review.controller; + +import com.recyclestudy.review.controller.request.ReviewSaveRequest; +import com.recyclestudy.review.controller.response.ReviewSaveResponse; +import com.recyclestudy.review.service.ReviewService; +import com.recyclestudy.review.service.input.ReviewSaveInput; +import com.recyclestudy.review.service.output.ReviewSaveOutput; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/v1/reviews") +@RequiredArgsConstructor +public class ReviewController { + + private final ReviewService reviewService; + + @PostMapping + public ResponseEntity saveReview(@RequestBody ReviewSaveRequest request) { + final ReviewSaveInput input = request.toInput(); + final ReviewSaveOutput output = reviewService.saveReview(input); + ReviewSaveResponse response = ReviewSaveResponse.of(output.url(), output.scheduledAts()); + return ResponseEntity.status(HttpStatus.CREATED).body(response); + } +} diff --git a/src/main/java/com/recyclestudy/review/controller/request/ReviewSaveRequest.java b/src/main/java/com/recyclestudy/review/controller/request/ReviewSaveRequest.java new file mode 100644 index 0000000..5d20579 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/controller/request/ReviewSaveRequest.java @@ -0,0 +1,10 @@ +package com.recyclestudy.review.controller.request; + +import com.recyclestudy.review.service.input.ReviewSaveInput; + +public record ReviewSaveRequest(String identifier, String targetUrl) { + + public ReviewSaveInput toInput() { + return ReviewSaveInput.of(this.identifier, this.targetUrl); + } +} diff --git a/src/main/java/com/recyclestudy/review/controller/response/ReviewSaveResponse.java b/src/main/java/com/recyclestudy/review/controller/response/ReviewSaveResponse.java new file mode 100644 index 0000000..f46f791 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/controller/response/ReviewSaveResponse.java @@ -0,0 +1,12 @@ +package com.recyclestudy.review.controller.response; + +import com.recyclestudy.review.domain.ReviewURL; +import java.time.LocalDateTime; +import java.util.List; + +public record ReviewSaveResponse(String url, List scheduledAts) { + + public static ReviewSaveResponse of(ReviewURL url, List scheduledAts) { + return new ReviewSaveResponse(url.getValue(), scheduledAts); + } +} diff --git a/src/main/java/com/recyclestudy/review/domain/NotificationStatus.java b/src/main/java/com/recyclestudy/review/domain/NotificationStatus.java new file mode 100644 index 0000000..853a097 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/domain/NotificationStatus.java @@ -0,0 +1,8 @@ +package com.recyclestudy.review.domain; + +public enum NotificationStatus { + PENDING, + SENT, + FAILED, + ; +} diff --git a/src/main/java/com/recyclestudy/review/domain/Review.java b/src/main/java/com/recyclestudy/review/domain/Review.java new file mode 100644 index 0000000..3b37465 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/domain/Review.java @@ -0,0 +1,38 @@ +package com.recyclestudy.review.domain; + +import com.recyclestudy.common.BaseEntity; +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.AttributeOverride; +import jakarta.persistence.Column; +import jakarta.persistence.Embedded; +import jakarta.persistence.Entity; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.FieldNameConstants; + +@Entity +@Table(name = "review") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +public class Review extends BaseEntity { + + public static Review withoutId(final ReviewURL url) { + validateNotNull(url); + return new Review(url); + } + + private static void validateNotNull(final ReviewURL url) { + NullValidator.builder() + .add(Fields.url, url) + .validate(); + } + + @Embedded + @AttributeOverride(name = "value", column = @Column(name = "url", nullable = false, columnDefinition = "TEXT")) + private ReviewURL url; +} diff --git a/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java b/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java new file mode 100644 index 0000000..a56df10 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java @@ -0,0 +1,58 @@ +package com.recyclestudy.review.domain; + +import com.recyclestudy.common.BaseEntity; +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.FieldNameConstants; + +@Entity +@Table(name = "cycle") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +public class ReviewCycle extends BaseEntity { + + public static ReviewCycle withoutId( + final Review review, + final LocalDateTime scheduledAt, + final NotificationStatus status + ) { + validateNotNull(review, scheduledAt, status); + return new ReviewCycle(review, scheduledAt, status); + } + + private static void validateNotNull( + final Review review, + final LocalDateTime scheduledAt, + final NotificationStatus status + ) { + NullValidator.builder() + .add(Fields.review, review) + .add(Fields.scheduledAt, scheduledAt) + .add(Fields.status, status) + .validate(); + } + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id", nullable = false) + private Review review; + + private LocalDateTime scheduledAt; + + @Enumerated(value = EnumType.STRING) + @Column(name = "status", nullable = false) + private NotificationStatus status; +} diff --git a/src/main/java/com/recyclestudy/review/domain/ReviewCycleDuration.java b/src/main/java/com/recyclestudy/review/domain/ReviewCycleDuration.java new file mode 100644 index 0000000..a6ccba6 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/domain/ReviewCycleDuration.java @@ -0,0 +1,34 @@ +package com.recyclestudy.review.domain; + +import java.time.Duration; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.Arrays; +import java.util.List; + +public enum ReviewCycleDuration { + DAY(Duration.ofDays(1)), + WEEK(Duration.ofDays(7)), + MONTH(Duration.ofDays(30)), + QUARTER(Duration.ofDays(90)), + HALF_YEAR(Duration.ofDays(180)), + ; + + private final Duration duration; + + ReviewCycleDuration(final Duration duration) { + this.duration = duration; + } + + public static List calculate(final LocalDate target, final LocalTime time) { + return Arrays.stream(ReviewCycleDuration.values()) + .map(cycle -> target.plusDays(cycle.duration.toDays()) + .atTime(time)) + .toList(); + } + + public static List calculate(final LocalDate target) { + return calculate(target, LocalTime.of(8, 0)); + } +} diff --git a/src/main/java/com/recyclestudy/review/domain/ReviewURL.java b/src/main/java/com/recyclestudy/review/domain/ReviewURL.java new file mode 100644 index 0000000..c562f21 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/domain/ReviewURL.java @@ -0,0 +1,34 @@ +package com.recyclestudy.review.domain; + +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.Embeddable; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.ToString; +import lombok.experimental.FieldNameConstants; + +@Embeddable +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +@ToString +@EqualsAndHashCode +public class ReviewURL { + + private String value; + + public static ReviewURL from(final String value) { + validateNotNull(value); + return new ReviewURL(value); + } + + private static void validateNotNull(final String value) { + NullValidator.builder() + .add(Fields.value, value) + .validate(); + } +} diff --git a/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java b/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java new file mode 100644 index 0000000..8630fac --- /dev/null +++ b/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java @@ -0,0 +1,7 @@ +package com.recyclestudy.review.repository; + +import com.recyclestudy.review.domain.ReviewCycle; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReviewCycleRepository extends JpaRepository { +} diff --git a/src/main/java/com/recyclestudy/review/repository/ReviewRepository.java b/src/main/java/com/recyclestudy/review/repository/ReviewRepository.java new file mode 100644 index 0000000..ab7d889 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/repository/ReviewRepository.java @@ -0,0 +1,7 @@ +package com.recyclestudy.review.repository; + +import com.recyclestudy.review.domain.Review; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ReviewRepository extends JpaRepository { +} diff --git a/src/main/java/com/recyclestudy/review/service/ReviewService.java b/src/main/java/com/recyclestudy/review/service/ReviewService.java new file mode 100644 index 0000000..954a9da --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/ReviewService.java @@ -0,0 +1,58 @@ +package com.recyclestudy.review.service; + +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.repository.DeviceRepository; +import com.recyclestudy.review.domain.NotificationStatus; +import com.recyclestudy.review.domain.Review; +import com.recyclestudy.review.domain.ReviewCycle; +import com.recyclestudy.review.domain.ReviewCycleDuration; +import com.recyclestudy.review.repository.ReviewCycleRepository; +import com.recyclestudy.review.repository.ReviewRepository; +import com.recyclestudy.review.service.input.ReviewSaveInput; +import com.recyclestudy.review.service.output.ReviewSaveOutput; +import java.time.Clock; +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReviewService { + + private final ReviewRepository reviewRepository; + private final ReviewCycleRepository reviewCycleRepository; + private final DeviceRepository deviceRepository; + private final Clock clock; + + @Transactional + public ReviewSaveOutput saveReview(final ReviewSaveInput input) { + final Device device = deviceRepository.findByIdentifier(input.identifier()) + .orElseThrow(() -> new UnauthorizedException("유효하지 않은 디바이스입니다")); + checkValidDevice(device); + + final Review review = Review.withoutId(input.url()); + final Review savedReview = reviewRepository.save(review); + + final LocalDate current = LocalDate.now(clock); + final List scheduledAts = ReviewCycleDuration.calculate(current); + + final List reviewCycles = scheduledAts.stream() + .map(scheduledAt -> ReviewCycle.withoutId(savedReview, scheduledAt, NotificationStatus.PENDING)) + .toList(); + + final List savedScheduledAts = reviewCycleRepository.saveAll(reviewCycles) + .stream().map(ReviewCycle::getScheduledAt) + .toList(); + return ReviewSaveOutput.of(savedReview.getUrl(), savedScheduledAts); + } + + private static void checkValidDevice(final Device device) { + if (!device.isActive()) { + throw new UnauthorizedException("인증되지 않은 디바이스입니다"); + } + } +} diff --git a/src/main/java/com/recyclestudy/review/service/input/ReviewSaveInput.java b/src/main/java/com/recyclestudy/review/service/input/ReviewSaveInput.java new file mode 100644 index 0000000..4dff4b8 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/input/ReviewSaveInput.java @@ -0,0 +1,13 @@ +package com.recyclestudy.review.service.input; + +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.review.domain.ReviewURL; + +public record ReviewSaveInput(DeviceIdentifier identifier, ReviewURL url) { + + public static ReviewSaveInput of(final String identifier, final String url) { + final DeviceIdentifier deviceIdentifier = DeviceIdentifier.from(identifier); + final ReviewURL reviewURL = ReviewURL.from(url); + return new ReviewSaveInput(deviceIdentifier, reviewURL); + } +} diff --git a/src/main/java/com/recyclestudy/review/service/output/ReviewSaveOutput.java b/src/main/java/com/recyclestudy/review/service/output/ReviewSaveOutput.java new file mode 100644 index 0000000..2beaadc --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/output/ReviewSaveOutput.java @@ -0,0 +1,12 @@ +package com.recyclestudy.review.service.output; + +import com.recyclestudy.review.domain.ReviewURL; +import java.time.LocalDateTime; +import java.util.List; + +public record ReviewSaveOutput(ReviewURL url, List scheduledAts) { + + public static ReviewSaveOutput of(ReviewURL url, List scheduledAts) { + return new ReviewSaveOutput(url, scheduledAts); + } +} diff --git a/src/test/java/com/recyclestudy/review/controller/ReviewControllerTest.java b/src/test/java/com/recyclestudy/review/controller/ReviewControllerTest.java new file mode 100644 index 0000000..79c84fc --- /dev/null +++ b/src/test/java/com/recyclestudy/review/controller/ReviewControllerTest.java @@ -0,0 +1,100 @@ +package com.recyclestudy.review.controller; + +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.review.controller.request.ReviewSaveRequest; +import com.recyclestudy.review.domain.ReviewURL; +import com.recyclestudy.review.service.ReviewService; +import com.recyclestudy.review.service.output.ReviewSaveOutput; +import io.restassured.RestAssured; +import java.time.LocalDateTime; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.test.context.bean.override.mockito.MockitoBean; + +import static io.restassured.RestAssured.given; +import static org.hamcrest.Matchers.equalTo; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.BDDMockito.given; + +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +class ReviewControllerTest { + + @LocalServerPort + private int port; + + @MockitoBean + private ReviewService reviewService; + + @BeforeEach + void setUp() { + RestAssured.port = port; + } + + @Test + @DisplayName("리뷰를 저장하면 201 응답을 반환한다") + void saveReview() { + // given + final String identifier = "device-id"; + final String url = "https://test.com"; + final ReviewSaveRequest request = new ReviewSaveRequest(identifier, url); + final ReviewSaveOutput output = ReviewSaveOutput.of(ReviewURL.from(url), List.of(LocalDateTime.now())); + + given(reviewService.saveReview(any())).willReturn(output); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/reviews") + .then() + .statusCode(HttpStatus.CREATED.value()) + .body("url", equalTo(url)); + } + + @Test + @DisplayName("유효하지 않은 디바이스로 리뷰 저장 시 401 응답을 반환한다") + void saveReview_Unauthorized() { + // given + final ReviewSaveRequest request = new ReviewSaveRequest("invalid-id", "https://test.com"); + + given(reviewService.saveReview(any())) + .willThrow(new UnauthorizedException("유효하지 않은 디바이스입니다")); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/reviews") + .then() + .statusCode(HttpStatus.UNAUTHORIZED.value()) + .body("message", equalTo("유효하지 않은 디바이스입니다")); + } + + @Test + @DisplayName("인증되지 않은 디바이스로 리뷰 저장 시 401 응답을 반환한다") + void saveReview_InactiveDevice() { + // given + final ReviewSaveRequest request = new ReviewSaveRequest("inactive-id", "https://test.com"); + + given(reviewService.saveReview(any())) + .willThrow(new UnauthorizedException("인증되지 않은 디바이스입니다")); + + // when & then + given() + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .post("/api/v1/reviews") + .then() + .statusCode(HttpStatus.UNAUTHORIZED.value()) + .body("message", equalTo("인증되지 않은 디바이스입니다")); + } +} diff --git a/src/test/java/com/recyclestudy/review/domain/ReviewCycleDurationTest.java b/src/test/java/com/recyclestudy/review/domain/ReviewCycleDurationTest.java new file mode 100644 index 0000000..87f7be0 --- /dev/null +++ b/src/test/java/com/recyclestudy/review/domain/ReviewCycleDurationTest.java @@ -0,0 +1,52 @@ +package com.recyclestudy.review.domain; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class ReviewCycleDurationTest { + + @Test + @DisplayName("특정 날짜와 시간을 기준으로 5가지 주기를 계산할 수 있다") + void calculate_with_time() { + // given + final LocalDate target = LocalDate.of(2025, 1, 1); + final LocalTime time = LocalTime.of(10, 0); + + // when + final List actual = ReviewCycleDuration.calculate(target, time); + + // then + assertThat(actual).containsExactly( + LocalDateTime.of(2025, 1, 2, 10, 0), // DAY (1) + LocalDateTime.of(2025, 1, 8, 10, 0), // WEEK (7) + LocalDateTime.of(2025, 1, 31, 10, 0), // MONTH (30) + LocalDateTime.of(2025, 4, 1, 10, 0), // QUARTER (90) + LocalDateTime.of(2025, 6, 30, 10, 0) // HALF_YEAR (180) + ); + } + + @Test + @DisplayName("날짜만 주어졌을 때 기본 시간(08:00)으로 5가지 주기를 계산한다") + void calculate_without_time() { + // given + final LocalDate target = LocalDate.of(2025, 1, 1); + + // when + final List actual = ReviewCycleDuration.calculate(target); + + // then + assertThat(actual).containsExactly( + LocalDateTime.of(2025, 1, 2, 8, 0), + LocalDateTime.of(2025, 1, 8, 8, 0), + LocalDateTime.of(2025, 1, 31, 8, 0), + LocalDateTime.of(2025, 4, 1, 8, 0), + LocalDateTime.of(2025, 6, 30, 8, 0) + ); + } +} diff --git a/src/test/java/com/recyclestudy/review/domain/ReviewCycleTest.java b/src/test/java/com/recyclestudy/review/domain/ReviewCycleTest.java new file mode 100644 index 0000000..3225928 --- /dev/null +++ b/src/test/java/com/recyclestudy/review/domain/ReviewCycleTest.java @@ -0,0 +1,56 @@ +package com.recyclestudy.review.domain; + +import java.time.LocalDateTime; +import java.util.stream.Stream; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ReviewCycleTest { + + @Test + @DisplayName("ReviewCycle을 생성할 수 있다") + void withoutId() { + // given + final Review review = Review.withoutId(ReviewURL.from("https://test.com")); + final LocalDateTime scheduledAt = LocalDateTime.now(); + final NotificationStatus status = NotificationStatus.PENDING; + + // when + final ReviewCycle actual = ReviewCycle.withoutId(review, scheduledAt, status); + + // then + assertThat(actual.getReview()).isEqualTo(review); + assertThat(actual.getScheduledAt()).isEqualTo(scheduledAt); + assertThat(actual.getStatus()).isEqualTo(status); + } + + @ParameterizedTest + @MethodSource("provideInvalidValue") + @DisplayName("null로 생성 시도 시, 예외를 던진다") + void throwExceptionWhenNull(final Review review, final LocalDateTime scheduledAt, + final NotificationStatus status) { + // given + // when & then + assertThatThrownBy(() -> ReviewCycle.withoutId(review, scheduledAt, status)) + .isInstanceOf(IllegalArgumentException.class); + } + + private static Stream provideInvalidValue() { + final Review review = Review.withoutId(ReviewURL.from("https://test.com")); + final LocalDateTime scheduledAt = LocalDateTime.now(); + final NotificationStatus status = NotificationStatus.PENDING; + + return Stream.of( + Arguments.of(null, scheduledAt, status), + Arguments.of(review, null, status), + Arguments.of(review, scheduledAt, null), + Arguments.of(null, null, null) + ); + } +} diff --git a/src/test/java/com/recyclestudy/review/domain/ReviewTest.java b/src/test/java/com/recyclestudy/review/domain/ReviewTest.java new file mode 100644 index 0000000..16152d6 --- /dev/null +++ b/src/test/java/com/recyclestudy/review/domain/ReviewTest.java @@ -0,0 +1,32 @@ +package com.recyclestudy.review.domain; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ReviewTest { + + @Test + @DisplayName("Review를 생성할 수 있다") + void withoutId() { + // given + final ReviewURL url = ReviewURL.from("https://test.com"); + + // when + final Review actual = Review.withoutId(url); + + // then + assertThat(actual.getUrl()).isEqualTo(url); + } + + @Test + @DisplayName("null로 생성 시도 시, 예외를 던진다") + void throwExceptionWhenNull() { + // given + // when & then + assertThatThrownBy(() -> Review.withoutId(null)) + .isInstanceOf(IllegalArgumentException.class); + } +} diff --git a/src/test/java/com/recyclestudy/review/domain/ReviewURLTest.java b/src/test/java/com/recyclestudy/review/domain/ReviewURLTest.java new file mode 100644 index 0000000..cf19f5c --- /dev/null +++ b/src/test/java/com/recyclestudy/review/domain/ReviewURLTest.java @@ -0,0 +1,32 @@ +package com.recyclestudy.review.domain; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ReviewURLTest { + + @Test + @DisplayName("ReviewURL을 생성할 수 있다") + void from() { + // given + final String value = "https://test.com"; + + // when + final ReviewURL actual = ReviewURL.from(value); + + // then + assertThat(actual.getValue()).isEqualTo(value); + } + + @Test + @DisplayName("null로 생성 시도 시, 예외를 던진다") + void throwExceptionWhenNull() { + // given + // when & then + assertThatThrownBy(() -> ReviewURL.from(null)) + .isInstanceOf(IllegalArgumentException.class); + } +} diff --git a/src/test/java/com/recyclestudy/review/service/ReviewServiceTest.java b/src/test/java/com/recyclestudy/review/service/ReviewServiceTest.java new file mode 100644 index 0000000..fe78afd --- /dev/null +++ b/src/test/java/com/recyclestudy/review/service/ReviewServiceTest.java @@ -0,0 +1,132 @@ +package com.recyclestudy.review.service; + +import com.recyclestudy.exception.UnauthorizedException; +import com.recyclestudy.member.domain.ActivationExpiredDateTime; +import com.recyclestudy.member.domain.Device; +import com.recyclestudy.member.domain.DeviceIdentifier; +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.member.domain.Member; +import com.recyclestudy.member.repository.DeviceRepository; +import com.recyclestudy.review.domain.NotificationStatus; +import com.recyclestudy.review.domain.Review; +import com.recyclestudy.review.domain.ReviewCycle; +import com.recyclestudy.review.domain.ReviewURL; +import com.recyclestudy.review.repository.ReviewCycleRepository; +import com.recyclestudy.review.repository.ReviewRepository; +import com.recyclestudy.review.service.input.ReviewSaveInput; +import com.recyclestudy.review.service.output.ReviewSaveOutput; +import java.time.Clock; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; +import java.util.List; +import java.util.Optional; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.Spy; +import org.mockito.junit.jupiter.MockitoExtension; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyList; +import static org.mockito.BDDMockito.given; +import static org.mockito.Mockito.verify; + +@ExtendWith(MockitoExtension.class) +class ReviewServiceTest { + + @Mock + ReviewRepository reviewRepository; + + @Mock + ReviewCycleRepository reviewCycleRepository; + + @Mock + DeviceRepository deviceRepository; + + @Spy + Clock clock = Clock.fixed(Instant.parse("2025-01-01T00:00:00Z"), ZoneId.of("UTC")); + + @InjectMocks + ReviewService reviewService; + + LocalDateTime now; + + @BeforeEach + void setUp() { + now = LocalDateTime.now(clock); + } + + @Test + @DisplayName("리뷰와 리뷰 주기를 저장한다") + void saveReview() { + // given + final String identifier = "device-id"; + final String urlValue = "https://test.com"; + final ReviewSaveInput input = ReviewSaveInput.of(identifier, urlValue); + + final Device device = Device.withoutId( + Member.withoutId(Email.from("test@test.com")), + DeviceIdentifier.from(identifier), + true, + ActivationExpiredDateTime.create(now) + ); + + final Review review = Review.withoutId(ReviewURL.from(urlValue)); + final ReviewCycle cycle = ReviewCycle.withoutId(review, now.plusDays(1), NotificationStatus.PENDING); + + given(deviceRepository.findByIdentifier(any())).willReturn(Optional.of(device)); + given(reviewRepository.save(any(Review.class))).willReturn(review); + given(reviewCycleRepository.saveAll(anyList())).willReturn(List.of(cycle)); + + // when + final ReviewSaveOutput actual = reviewService.saveReview(input); + + // then + assertThat(actual.url()).isEqualTo(ReviewURL.from(urlValue)); + assertThat(actual.scheduledAts()).hasSize(1); + verify(deviceRepository).findByIdentifier(any()); + verify(reviewRepository).save(any(Review.class)); + verify(reviewCycleRepository).saveAll(anyList()); + } + + @Test + @DisplayName("존재하지 않는 디바이스 아이디일 경우 예외를 던진다") + void saveReview_fail_notFoundDevice() { + // given + final ReviewSaveInput input = ReviewSaveInput.of("not-found", "https://test.com"); + given(deviceRepository.findByIdentifier(any())).willReturn(Optional.empty()); + + // when & then + assertThatThrownBy(() -> reviewService.saveReview(input)) + .isInstanceOf(UnauthorizedException.class) + .hasMessage("유효하지 않은 디바이스입니다"); + } + + @Test + @DisplayName("활성화되지 않은 디바이스일 경우 예외를 던진다") + void saveReview_fail_inactiveDevice() { + // given + final String identifier = "inactive-device"; + final ReviewSaveInput input = ReviewSaveInput.of(identifier, "https://test.com"); + + final Device inactiveDevice = Device.withoutId( + Member.withoutId(Email.from("test@test.com")), + DeviceIdentifier.from(identifier), + false, + ActivationExpiredDateTime.create(now) + ); + + given(deviceRepository.findByIdentifier(any())).willReturn(Optional.of(inactiveDevice)); + + // when & then + assertThatThrownBy(() -> reviewService.saveReview(input)) + .isInstanceOf(UnauthorizedException.class) + .hasMessage("인증되지 않은 디바이스입니다"); + } +} From 0496449284aa16a1914ade5775032965e55638c1 Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Fri, 26 Dec 2025 23:53:34 +0900 Subject: [PATCH 07/16] =?UTF-8?q?swagger=20=EA=B8=B0=EB=B0=98=20API=20?= =?UTF-8?q?=EB=AC=B8=EC=84=9C=20=EC=9E=91=EC=84=B1=20(#12)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: swagger 기반 api 문서 기능 추가 * refactor: 불필요한 로그 출력 제거 * refactor: 누락된 타입 명시 로직 추가 --- .gitignore | 3 + build.gradle | 42 +- .../exception/GlobalControllerAdvice.java | 8 + .../controller/DeviceControllerTest.java | 412 +++++++++++++++++- .../controller/MemberControllerTest.java | 266 +++++++++-- .../recyclestudy/restdocs/APIBaseTest.java | 45 ++ 6 files changed, 732 insertions(+), 44 deletions(-) create mode 100644 src/test/java/com/recyclestudy/restdocs/APIBaseTest.java diff --git a/.gitignore b/.gitignore index 527cb86..bf2fc93 100644 --- a/.gitignore +++ b/.gitignore @@ -38,3 +38,6 @@ out/ ### .env ### .env + +# Generated Swagger UI +src/main/resources/static/docs/ diff --git a/build.gradle b/build.gradle index 1f0eec0..514c47d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,6 +3,8 @@ plugins { id 'jacoco' id 'org.springframework.boot' version '3.5.9' id 'io.spring.dependency-management' version '1.1.7' + id 'com.epages.restdocs-api-spec' version '0.19.4' + id 'org.hidetake.swagger.generator' version '2.19.2' } group = 'com.recyclestudy' @@ -35,9 +37,17 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' - testRuntimeOnly 'com.h2database:h2' testImplementation 'io.rest-assured:rest-assured' + testRuntimeOnly 'com.h2database:h2' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // api docs + testImplementation 'org.springframework.restdocs:spring-restdocs-restassured' + testImplementation 'org.springframework.restdocs:spring-restdocs-mockmvc' + testImplementation 'com.epages:restdocs-api-spec-restassured:0.19.4' + implementation 'com.epages:restdocs-api-spec-mockmvc:0.19.4' + + swaggerUI 'org.webjars:swagger-ui:5.30.3' } tasks.named('test') { @@ -73,3 +83,33 @@ jacocoTestReport { dependsOn test } +openapi3 { + servers = [ + { url = "http://localhost:8080" } + ] + title = "Recycle-Study Server API Document" + description = "응답 테스트 검증이 완료된 명세서입니다." + version = "0.0.1" + format = "yaml" +} + +swaggerSources { + sample { + setInputFile(file("${project.buildDir}/api-spec/openapi3.yaml")) + } +} + +tasks.withType(GenerateSwaggerUI).configureEach { + dependsOn 'openapi3' +} + +tasks.register('copySwaggerDocument', Copy) { + dependsOn generateSwaggerUI + + from file("build/swagger-ui-sample/") + into file("src/main/resources/static/docs") +} + +bootJar { + dependsOn copySwaggerDocument +} diff --git a/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java b/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java index 9c622cb..967b60b 100644 --- a/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java +++ b/src/main/java/com/recyclestudy/exception/GlobalControllerAdvice.java @@ -3,6 +3,7 @@ import com.recyclestudy.exception.dto.ErrorResponse; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MissingServletRequestParameterException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -39,6 +40,13 @@ public ResponseEntity handleIllegalArgument(final IllegalArgument return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); } + @ExceptionHandler(MissingServletRequestParameterException.class) + public ResponseEntity handleMissingServletRequestParameter( + final MissingServletRequestParameterException e) { + final ErrorResponse response = ErrorResponse.from(e.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(response); + } + @ExceptionHandler(Exception.class) public ResponseEntity handleException(final Exception e) { final ErrorResponse response = ErrorResponse.from("예기치 못한 에러가 발생했습니다"); diff --git a/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java b/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java index dd03363..e8f962b 100644 --- a/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java +++ b/src/test/java/com/recyclestudy/member/controller/DeviceControllerTest.java @@ -2,39 +2,81 @@ import com.recyclestudy.exception.BadRequestException; import com.recyclestudy.exception.DeviceActivationExpiredException; +import com.recyclestudy.exception.NotFoundException; import com.recyclestudy.exception.UnauthorizedException; import com.recyclestudy.member.controller.request.DeviceDeleteRequest; import com.recyclestudy.member.domain.DeviceIdentifier; import com.recyclestudy.member.domain.Email; import com.recyclestudy.member.service.MemberService; -import io.restassured.RestAssured; -import org.junit.jupiter.api.BeforeEach; +import com.recyclestudy.restdocs.APIBaseTest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.HttpHeaders; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; +import org.springframework.restdocs.payload.JsonFieldType; import org.springframework.test.context.bean.override.mockito.MockitoBean; +import static com.epages.restdocs.apispec.ResourceDocumentation.resource; +import static com.epages.restdocs.apispec.ResourceSnippetParameters.builder; +import static com.epages.restdocs.apispec.RestAssuredRestDocumentationWrapper.document; +import static com.epages.restdocs.apispec.Schema.schema; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doThrow; +import static org.springframework.restdocs.headers.HeaderDocumentation.headerWithName; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; +import static org.springframework.restdocs.request.RequestDocumentation.queryParameters; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -class DeviceControllerTest { - - @LocalServerPort - private int port; +class DeviceControllerTest extends APIBaseTest { @MockitoBean private MemberService memberService; - @BeforeEach - void setUp() { - RestAssured.port = port; + @Test + @DisplayName("디바이스 인증 성공 시 200 응답을 반환한다") + void authenticateDevice_Success() { + // given + final String email = "test@test.com"; + final String identifier = "device-identifier"; + + doNothing().when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + resource( + builder() + .tag("Device") + .summary("디바이스 인증") + .description("디바이스 인증 성공 시 인증 완료 안내 HTML 페이지를 반환합니다.") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseHeaders( + headerWithName(HttpHeaders.CONTENT_TYPE) + .description("text/html;charset=UTF-8") + ) + .responseSchema(schema("string")) + .build() + ), + queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + )) + .param("email", email) + .param("identifier", identifier) + .accept(MediaType.TEXT_HTML_VALUE) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.OK.value()) + .contentType(MediaType.TEXT_HTML_VALUE); } @Test @@ -48,7 +90,20 @@ void authenticateDevice_AlreadyAuthenticated() { .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("이미 인증된 디바이스 인증 시도 시 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .param("email", email) .param("identifier", identifier) .when() @@ -66,7 +121,20 @@ void authenticateDevice_InvalidEmailFormat() { final String identifier = "device-identifier"; // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("유효하지 않은 이메일 형식인 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .param("email", invalidEmail) .param("identifier", identifier) .when() @@ -87,7 +155,20 @@ void authenticateDevice_Expired() { .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("인증 유효 시간이 만료된 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .param("email", email) .param("identifier", identifier) .when() @@ -106,7 +187,19 @@ void deleteDevice() { doNothing().when(memberService).deleteDevice(any()); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 삭제") + .description("디바이스 삭제 시 204 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자"), + fieldWithPath("targetIdentifier").type(JsonFieldType.STRING) + .description("삭제할 디바이스 식별자") + ) + )) .contentType(MediaType.APPLICATION_JSON_VALUE) .body(request) .when() @@ -125,7 +218,22 @@ void deleteDevice_InvalidIdentifier() { .when(memberService).deleteDevice(any()); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 삭제") + .description("유효하지 않은 디바이스 아이디로 삭제 시 401 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자"), + fieldWithPath("targetIdentifier").type(JsonFieldType.STRING) + .description("삭제할 디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .contentType(MediaType.APPLICATION_JSON_VALUE) .body(request) .when() @@ -145,7 +253,22 @@ void deleteDevice_NotOwner() { .when(memberService).deleteDevice(any()); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 삭제") + .description("소유자가 아닌 디바이스 삭제 시 400 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자"), + fieldWithPath("targetIdentifier").type(JsonFieldType.STRING) + .description("삭제할 디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .contentType(MediaType.APPLICATION_JSON_VALUE) .body(request) .when() @@ -154,4 +277,257 @@ void deleteDevice_NotOwner() { .statusCode(HttpStatus.BAD_REQUEST.value()) .body("message", equalTo("디바이스 소유자가 아닙니다.")); } + + @Test + @DisplayName("존재하지 않는 멤버의 이메일로 인증 시도 시 404 응답을 반환한다") + void authenticateDevice_NotFoundMember() { + // given + final String email = "notfound@test.com"; + final String identifier = "device-identifier"; + + doThrow(new NotFoundException("존재하지 않는 멤버입니다")) + .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("존재하지 않는 멤버의 이메일로 인증 시도 시 404 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.NOT_FOUND.value()) + .body("message", equalTo("존재하지 않는 멤버입니다")); + } + + @Test + @DisplayName("존재하지 않는 디바이스 식별자로 인증 시도 시 404 응답을 반환한다") + void authenticateDevice_NotFoundDevice() { + // given + final String email = "test@test.com"; + final String identifier = "not-found-id"; + + doThrow(new NotFoundException("존재하지 않는 디바이스 아이디입니다")) + .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("존재하지 않는 디바이스 식별자로 인증 시도 시 404 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.NOT_FOUND.value()) + .body("message", equalTo("존재하지 않는 디바이스 아이디입니다")); + } + + @Test + @DisplayName("디바이스 소유자가 아닌 이메일로 인증 시도 시 400 응답을 반환한다") + void authenticateDevice_NotOwner() { + // given + final String email = "other@test.com"; + final String identifier = "device-identifier"; + + doThrow(new BadRequestException("디바이스 소유자가 아닙니다.")) + .when(memberService).authenticateDevice(any(Email.class), any(DeviceIdentifier.class)); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("디바이스 소유자가 아닌 이메일로 인증 시도 시 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("디바이스 소유자가 아닙니다.")); + } + + @Test + @DisplayName("인증 시 이메일 파라미터가 누락된 경우 400 응답을 반환한다") + void authenticateDevice_NullEmail() { + // given + final String identifier = "device-identifier"; + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("이메일 파라미터가 누락된 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .param("identifier", identifier) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()); + } + + @Test + @DisplayName("인증 시 디바이스 식별자 파라미터가 누락된 경우 400 응답을 반환한다") + void authenticateDevice_NullIdentifier() { + // given + final String email = "test@test.com"; + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 인증") + .description("디바이스 식별자 파라미터가 누락된 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .param("email", email) + .when() + .get("/api/v1/device/auth") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()); + } + + @Test + @DisplayName("삭제 요청 시 이메일이 누락된 경우 400 응답을 반환한다") + void deleteDevice_NullEmail() { + // given + final DeviceDeleteRequest request = new DeviceDeleteRequest(null, "device-id", "target-id"); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 삭제") + .description("삭제 요청 시 이메일이 누락된 경우 400 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자"), + fieldWithPath("targetIdentifier").type(JsonFieldType.STRING) + .description("삭제할 디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .delete("/api/v1/device") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("null이 될 수 없습니다: value")); + } + + @Test + @DisplayName("삭제 요청 시 디바이스 식별자가 누락된 경우 400 응답을 반환한다") + void deleteDevice_NullIdentifier() { + // given + final DeviceDeleteRequest request = new DeviceDeleteRequest("test@test.com", null, "target-id"); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 삭제") + .description("삭제 요청 시 디바이스 식별자가 누락된 경우 400 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자"), + fieldWithPath("targetIdentifier").type(JsonFieldType.STRING) + .description("삭제할 디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .delete("/api/v1/device") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("null이 될 수 없습니다: value")); + } + + @Test + @DisplayName("삭제 요청 시 삭제할 디바이스 식별자가 누락된 경우 400 응답을 반환한다") + void deleteDevice_NullTargetIdentifier() { + // given + final DeviceDeleteRequest request = new DeviceDeleteRequest("test@test.com", "device-id", null); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Device") + .summary("디바이스 삭제") + .description("삭제 요청 시 삭제할 디바이스 식별자가 누락된 경우 400 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자"), + fieldWithPath("targetIdentifier").type(JsonFieldType.STRING) + .description("삭제할 디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) + .contentType(MediaType.APPLICATION_JSON_VALUE) + .body(request) + .when() + .delete("/api/v1/device") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()) + .body("message", equalTo("null이 될 수 없습니다: value")); + } } diff --git a/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java b/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java index 8905867..e981bd7 100644 --- a/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java +++ b/src/test/java/com/recyclestudy/member/controller/MemberControllerTest.java @@ -9,29 +9,29 @@ import com.recyclestudy.member.service.MemberService; import com.recyclestudy.member.service.output.MemberFindOutput; import com.recyclestudy.member.service.output.MemberSaveOutput; -import io.restassured.RestAssured; +import com.recyclestudy.restdocs.APIBaseTest; +import java.time.LocalDateTime; import java.util.List; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.web.server.LocalServerPort; import org.springframework.http.HttpStatus; import org.springframework.http.MediaType; +import org.springframework.restdocs.payload.JsonFieldType; import org.springframework.test.context.bean.override.mockito.MockitoBean; +import static com.epages.restdocs.apispec.ResourceSnippetParameters.builder; +import static com.epages.restdocs.apispec.RestAssuredRestDocumentationWrapper.document; import static io.restassured.RestAssured.given; import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.hasSize; import static org.mockito.ArgumentMatchers.any; import static org.mockito.BDDMockito.given; import static org.mockito.Mockito.verify; +import static org.springframework.restdocs.payload.PayloadDocumentation.fieldWithPath; +import static org.springframework.restdocs.request.RequestDocumentation.parameterWithName; +import static org.springframework.restdocs.request.RequestDocumentation.queryParameters; -@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) -class MemberControllerTest { - - @LocalServerPort - private int port; +class MemberControllerTest extends APIBaseTest { @MockitoBean private MemberService memberService; @@ -39,11 +39,6 @@ class MemberControllerTest { @MockitoBean private EmailService emailService; - @BeforeEach - void setUp() { - RestAssured.port = port; - } - @Test @DisplayName("이메일을 통해 새로운 디바이스를 저장한다") void saveMember() { @@ -56,7 +51,20 @@ void saveMember() { given(memberService.saveDevice(any())).willReturn(output); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 저장") + .description("이메일을 통해 새로운 디바이스를 저장한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일") + ) + .responseFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("identifier").type(JsonFieldType.STRING).description("디바이스 식별자") + ) + )) .contentType(MediaType.APPLICATION_JSON_VALUE) .body(request) .when() @@ -74,20 +82,55 @@ void saveMember() { void findAllMemberDevices() { // given final String email = "test@test.com"; - final String identifier = "device-identifier"; - final MemberFindOutput output = MemberFindOutput.of(Email.from(email), List.of()); + final String queryIdentifier = "device-id-1"; + + final MemberFindOutput.MemberFindElement device1 = new MemberFindOutput.MemberFindElement( + DeviceIdentifier.from(queryIdentifier), + LocalDateTime.now().minusDays(1) + ); + final MemberFindOutput.MemberFindElement device2 = new MemberFindOutput.MemberFindElement( + DeviceIdentifier.from("device-id-2"), + LocalDateTime.now() + ); + + final MemberFindOutput output = new MemberFindOutput( + Email.from(email), + List.of(device1, device2) + ); given(memberService.findAllMemberDevices(any())).willReturn(output); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("멤버의 모든 디바이스 정보를 조회한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일"), + fieldWithPath("devices").type(JsonFieldType.ARRAY).description("디바이스 목록"), + fieldWithPath("devices[].identifier").type(JsonFieldType.STRING) + .description("디바이스 식별자 값"), + fieldWithPath("devices[].createdAt").type(JsonFieldType.STRING) + .description("디바이스 생성일") + ), + queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + )) .param("email", email) - .param("identifier", identifier) + .param("identifier", queryIdentifier) .when() .get("/api/v1/members") .then() .statusCode(HttpStatus.OK.value()) - .body("devices", hasSize(0)); + .body("devices", hasSize(2)); } @Test @@ -101,7 +144,24 @@ void findAllMemberDevices_NotFoundMember() { .willThrow(new NotFoundException("존재하지 않는 멤버입니다")); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("존재하지 않는 멤버 조회 시 404 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ), + queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + )) .param("email", email) .param("identifier", identifier) .when() @@ -122,7 +182,24 @@ void findAllMemberDevices_UnauthorizedDevice() { .willThrow(new UnauthorizedException("인증되지 않은 디바이스입니다")); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("인증되지 않은 디바이스로 조회 시 401 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ), + queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + )) .param("email", email) .param("identifier", identifier) .when() @@ -140,7 +217,24 @@ void findAllMemberDevices_InvalidEmailFormat() { final String identifier = "device-identifier"; // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("조회 시 유효하지 않은 이메일 형식인 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ), + queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + )) .param("email", invalidEmail) .param("identifier", identifier) .when() @@ -157,7 +251,19 @@ void saveMember_NullEmail() { final MemberSaveRequest request = new MemberSaveRequest(null); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 저장") + .description("이메일이 누락된 경우 400 응답을 반환한다") + .requestFields( + fieldWithPath("email").type(JsonFieldType.STRING).description("이메일").optional() + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .contentType(MediaType.APPLICATION_JSON_VALUE) .body(request) .when() @@ -175,7 +281,19 @@ void saveMember_InvalidEmailFormat() { final MemberSaveRequest request = new MemberSaveRequest(invalidEmail); // when & then - given() + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 저장") + .description("유효하지 않은 이메일 형식으로 요청 시 400 응답을 반환한다") + .requestFields( + fieldWithPath("email").description("이메일") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ) + )) .contentType(MediaType.APPLICATION_JSON_VALUE) .body(request) .when() @@ -184,4 +302,102 @@ void saveMember_InvalidEmailFormat() { .statusCode(HttpStatus.BAD_REQUEST.value()) .body("message", equalTo("유효하지 않은 이메일 형식입니다.")); } + + @Test + @DisplayName("존재하지 않는 디바이스 식별자로 조회 시 404 응답을 반환한다") + void findAllMemberDevices_NotFoundDevice() { + // given + final String email = "test@test.com"; + final String identifier = "not-found-id"; + + given(memberService.findAllMemberDevices(any())) + .willThrow(new NotFoundException("존재하지 않는 디바이스 아이디입니다")); + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("존재하지 않는 디바이스 식별자로 조회 시 404 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ), + queryParameters( + parameterWithName("email").description("이메일"), + parameterWithName("identifier").description("디바이스 식별자") + ) + )) + .param("email", email) + .param("identifier", identifier) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.NOT_FOUND.value()) + .body("message", equalTo("존재하지 않는 디바이스 아이디입니다")); + } + + @Test + @DisplayName("이메일 파라미터가 누락된 경우 400 응답을 반환한다") + void findAllMemberDevices_NullEmail() { + // given + final String identifier = "device-identifier"; + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("이메일 파라미터가 누락된 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("identifier").description("디바이스 식별자") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ), + queryParameters( + parameterWithName("identifier").description("디바이스 식별자") + ) + )) + .param("identifier", identifier) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()); + } + + @Test + @DisplayName("디바이스 식별자 파라미터가 누락된 경우 400 응답을 반환한다") + void findAllMemberDevices_NullIdentifier() { + // given + final String email = "test@test.com"; + + // when & then + given(this.spec) + .filter(document(DEFAULT_REST_DOC_PATH, + builder() + .tag("Member") + .summary("멤버 디바이스 조회") + .description("디바이스 식별자 파라미터가 누락된 경우 400 응답을 반환한다") + .queryParameters( + parameterWithName("email").description("이메일") + ) + .responseFields( + fieldWithPath("message").type(JsonFieldType.STRING).description("에러 메시지") + ), + queryParameters( + parameterWithName("email").description("이메일") + ) + )) + .param("email", email) + .when() + .get("/api/v1/members") + .then() + .statusCode(HttpStatus.BAD_REQUEST.value()); + } } diff --git a/src/test/java/com/recyclestudy/restdocs/APIBaseTest.java b/src/test/java/com/recyclestudy/restdocs/APIBaseTest.java new file mode 100644 index 0000000..bd241fd --- /dev/null +++ b/src/test/java/com/recyclestudy/restdocs/APIBaseTest.java @@ -0,0 +1,45 @@ +package com.recyclestudy.restdocs; + +import io.restassured.RestAssured; +import io.restassured.builder.RequestSpecBuilder; +import io.restassured.specification.RequestSpecification; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.extension.ExtendWith; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.restdocs.RestDocumentationContextProvider; +import org.springframework.restdocs.RestDocumentationExtension; + +import static org.springframework.restdocs.operation.preprocess.Preprocessors.modifyUris; +import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint; +import static org.springframework.restdocs.restassured.RestAssuredRestDocumentation.documentationConfiguration; + +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@ExtendWith(RestDocumentationExtension.class) +public abstract class APIBaseTest { + + protected static final String DEFAULT_REST_DOC_PATH = "{class_name}/{method_name}/"; + + protected RequestSpecification spec; + + @LocalServerPort + int port; + + @BeforeEach + void setUpRestDocs(RestDocumentationContextProvider provider) { + RestAssured.port = port; + + this.spec = new RequestSpecBuilder() + .setPort(port) + .addFilter(documentationConfiguration(provider) + .operationPreprocessors() + .withRequestDefaults( + modifyUris().scheme("http").host("localhost").port(8080), + prettyPrint() + ) + .withResponseDefaults(prettyPrint()) + ) + .build(); + } +} From 2c9c56a2d3eb53e2228d2c5477968d9fd1f05854 Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Sat, 27 Dec 2025 00:31:55 +0900 Subject: [PATCH 08/16] =?UTF-8?q?CI=20=EB=8C=80=EC=83=81=20branch=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/test_coverage.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/test_coverage.yml b/.github/workflows/test_coverage.yml index 70916cc..d7da34a 100644 --- a/.github/workflows/test_coverage.yml +++ b/.github/workflows/test_coverage.yml @@ -4,6 +4,8 @@ on: pull_request: types: [ opened, synchronize, reopened ] + branches: + - 'be/**' jobs: Build-And-Test: From afce778bc4a150062632570ae0f957771b96872f Mon Sep 17 00:00:00 2001 From: jhan0121 <56645802+jhan0121@users.noreply.github.com> Date: Tue, 30 Dec 2025 18:42:08 +0900 Subject: [PATCH 09/16] =?UTF-8?q?=EB=B3=B5=EC=8A=B5=20=EB=8C=80=EC=83=81?= =?UTF-8?q?=20URL=20=EC=9D=B4=EB=A9=94=EC=9D=BC=20=EC=A0=84=EC=86=A1=20?= =?UTF-8?q?=EC=8A=A4=EC=BC=80=EC=A4=84=EB=9F=AC=20=EA=B5=AC=ED=98=84=20(#1?= =?UTF-8?q?9)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: Review 엔티티에 Member 연관 관계 추가 * feat: 주기적 복습 이메일 전송 기능 추가 - 공통 이메일 전송 기능 별도 분리 리팩터링 진행 * test: ReviewCycleServiceTest 추가 * refactor: ReviewSendOutput collect 내 불변 리스트를 사용하도록 수정 * refactor: html 태그에 lang 추가 * feat: 이메일 전송 이력 관리 기능 추가 * style: 코드 구조 정리 * refactor: ReviewEmailSender 타임존 설정 추가 * test: 메일 발송 실패 처리 검증 추가 --- .../recyclestudy/RecyclestudyApplication.java | 2 + .../email/DeviceAuthEmailSender.java | 41 ++++ .../com/recyclestudy/email/EmailSender.java | 37 ++++ .../com/recyclestudy/email/EmailService.java | 64 ------ .../recyclestudy/email/ReviewEmailSender.java | 80 +++++++ .../member/controller/MemberController.java | 6 +- .../domain/ActivationExpiredDateTime.java | 4 +- .../recyclestudy/member/domain/Device.java | 28 +-- .../member/domain/DeviceIdentifier.java | 4 +- .../com/recyclestudy/member/domain/Email.java | 4 +- .../recyclestudy/member/domain/Member.java | 8 +- .../review/domain/NotificationHistory.java | 52 +++++ .../recyclestudy/review/domain/Review.java | 25 ++- .../review/domain/ReviewCycle.java | 38 +--- .../NotificationHistoryRepository.java | 7 + .../repository/ReviewCycleRepository.java | 4 + .../service/NotificationHistoryService.java | 30 +++ .../review/service/ReviewCycleService.java | 23 ++ .../review/service/ReviewService.java | 24 ++- .../review/service/input/ReviewSendInput.java | 12 ++ .../service/output/ReviewSendOutput.java | 46 ++++ src/main/resources/templates/auth_email.html | 6 +- .../resources/templates/auth_success.html | 2 +- .../resources/templates/review_email.html | 17 ++ .../RecyclestudyApplicationTests.java | 6 +- .../email/DeviceAuthEmailSenderTest.java | 80 +++++++ .../recyclestudy/email/EmailSenderTest.java | 67 ++++++ .../email/ReviewEmailSenderTest.java | 201 ++++++++++++++++++ .../controller/DeviceControllerTest.java | 45 ++-- .../controller/MemberControllerTest.java | 36 ++-- .../member/domain/DeviceTest.java | 39 ++-- .../member/service/MemberServiceTest.java | 9 +- .../recyclestudy/restdocs/APIBaseTest.java | 2 +- .../controller/ReviewControllerTest.java | 82 +++++-- .../domain/NotificationHistoryTest.java | 66 ++++++ .../review/domain/ReviewCycleTest.java | 47 ++-- .../review/domain/ReviewTest.java | 31 ++- .../review/domain/ReviewURLTest.java | 3 +- .../NotificationHistoryServiceTest.java | 85 ++++++++ .../service/ReviewCycleServiceTest.java | 149 +++++++++++++ .../review/service/ReviewServiceTest.java | 31 ++- 41 files changed, 1301 insertions(+), 242 deletions(-) create mode 100644 src/main/java/com/recyclestudy/email/DeviceAuthEmailSender.java create mode 100644 src/main/java/com/recyclestudy/email/EmailSender.java delete mode 100644 src/main/java/com/recyclestudy/email/EmailService.java create mode 100644 src/main/java/com/recyclestudy/email/ReviewEmailSender.java create mode 100644 src/main/java/com/recyclestudy/review/domain/NotificationHistory.java create mode 100644 src/main/java/com/recyclestudy/review/repository/NotificationHistoryRepository.java create mode 100644 src/main/java/com/recyclestudy/review/service/NotificationHistoryService.java create mode 100644 src/main/java/com/recyclestudy/review/service/ReviewCycleService.java create mode 100644 src/main/java/com/recyclestudy/review/service/input/ReviewSendInput.java create mode 100644 src/main/java/com/recyclestudy/review/service/output/ReviewSendOutput.java create mode 100644 src/main/resources/templates/review_email.html create mode 100644 src/test/java/com/recyclestudy/email/DeviceAuthEmailSenderTest.java create mode 100644 src/test/java/com/recyclestudy/email/EmailSenderTest.java create mode 100644 src/test/java/com/recyclestudy/email/ReviewEmailSenderTest.java create mode 100644 src/test/java/com/recyclestudy/review/domain/NotificationHistoryTest.java create mode 100644 src/test/java/com/recyclestudy/review/service/NotificationHistoryServiceTest.java create mode 100644 src/test/java/com/recyclestudy/review/service/ReviewCycleServiceTest.java diff --git a/src/main/java/com/recyclestudy/RecyclestudyApplication.java b/src/main/java/com/recyclestudy/RecyclestudyApplication.java index a95c1cd..89662b6 100644 --- a/src/main/java/com/recyclestudy/RecyclestudyApplication.java +++ b/src/main/java/com/recyclestudy/RecyclestudyApplication.java @@ -3,8 +3,10 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.scheduling.annotation.EnableAsync; +import org.springframework.scheduling.annotation.EnableScheduling; @EnableAsync +@EnableScheduling @SpringBootApplication public class RecyclestudyApplication { diff --git a/src/main/java/com/recyclestudy/email/DeviceAuthEmailSender.java b/src/main/java/com/recyclestudy/email/DeviceAuthEmailSender.java new file mode 100644 index 0000000..63d8507 --- /dev/null +++ b/src/main/java/com/recyclestudy/email/DeviceAuthEmailSender.java @@ -0,0 +1,41 @@ +package com.recyclestudy.email; + +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.scheduling.annotation.Async; +import org.springframework.stereotype.Service; +import org.thymeleaf.TemplateEngine; +import org.thymeleaf.context.Context; + +@Slf4j +@Service +@RequiredArgsConstructor +public class DeviceAuthEmailSender { + + private final EmailSender emailSender; + private final TemplateEngine templateEngine; + + @Value("${auth.base-url}") + private String baseUrl; + + @Async + public void sendDeviceAuthMail(final String email, final String deviceId) { + final String authUrl = createAuthUrl(email, deviceId); + final String message = createMessage(authUrl); + + emailSender.send(email, "[Recycle Study] 디바이스 인증을 완료해주세요.", message); + + log.info("인증 메일 발송 성공: {}", email); + } + + private String createAuthUrl(final String email, final String deviceId) { + return String.format("%s/api/v1/device/auth?email=%s&identifier=%s", baseUrl, email, deviceId); + } + + private String createMessage(final String authUrl) { + final Context context = new Context(); + context.setVariable("authUrl", authUrl); + return templateEngine.process("auth_email", context); + } +} diff --git a/src/main/java/com/recyclestudy/email/EmailSender.java b/src/main/java/com/recyclestudy/email/EmailSender.java new file mode 100644 index 0000000..c6e500a --- /dev/null +++ b/src/main/java/com/recyclestudy/email/EmailSender.java @@ -0,0 +1,37 @@ +package com.recyclestudy.email; + +import com.recyclestudy.exception.EmailSendException; +import jakarta.mail.MessagingException; +import jakarta.mail.internet.MimeMessage; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.mail.javamail.JavaMailSender; +import org.springframework.mail.javamail.MimeMessageHelper; +import org.springframework.stereotype.Component; + +@Slf4j +@Component +@RequiredArgsConstructor +public class EmailSender { + + private final JavaMailSender javaMailSender; + + public void send(final String targetEmail, final String subject, final String content) { + try { + final MimeMessage mimeMessage = javaMailSender.createMimeMessage(); + final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, false, "UTF-8"); + + helper.setTo(targetEmail); + helper.setSubject(subject); + helper.setText(content, true); + + javaMailSender.send(mimeMessage); + + log.info("메일 발송 성공: email={}", targetEmail); + + } catch (MessagingException e) { + log.error("메일 발송 실패: email={}", targetEmail, e); + throw new EmailSendException("메일 전송 중 오류가 발생했습니다.", e); + } + } +} diff --git a/src/main/java/com/recyclestudy/email/EmailService.java b/src/main/java/com/recyclestudy/email/EmailService.java deleted file mode 100644 index 93e5e76..0000000 --- a/src/main/java/com/recyclestudy/email/EmailService.java +++ /dev/null @@ -1,64 +0,0 @@ -package com.recyclestudy.email; - -import com.recyclestudy.exception.EmailSendException; -import jakarta.mail.MessagingException; -import jakarta.mail.internet.MimeMessage; -import lombok.RequiredArgsConstructor; -import lombok.extern.slf4j.Slf4j; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.mail.javamail.JavaMailSender; -import org.springframework.mail.javamail.MimeMessageHelper; -import org.springframework.scheduling.annotation.Async; -import org.springframework.stereotype.Service; -import org.thymeleaf.TemplateEngine; -import org.thymeleaf.context.Context; - -@Slf4j -@Service -@RequiredArgsConstructor -public class EmailService { - - private final JavaMailSender javaMailSender; - private final TemplateEngine templateEngine; - - @Value("${auth.base-url}") - private String baseUrl; - - @Async - public void sendDeviceAuthMail(String email, String deviceId) { - try { - final String authUrl = createAuthUrl(email, deviceId); - final String message = createMessage(authUrl); - - sendMail(email, "[Recycle Study] 디바이스 인증을 완료해주세요.", message); - - log.info("인증 메일 발송 성공: {}", email); - - } catch (Exception e) { - log.error("메일 전송 실패. email={}, deviceId={}", email, deviceId, e); - - throw new EmailSendException("메일 전송 중 오류가 발생했습니다.", e); - } - } - - private String createAuthUrl(String email, String deviceId) { - return String.format("%s/api/v1/device/auth?email=%s&identifier=%s", baseUrl, email, deviceId); - } - - private String createMessage(String authUrl) { - final Context context = new Context(); - context.setVariable("authUrl", authUrl); - return templateEngine.process("auth_email", context); - } - - private void sendMail(String to, String subject, String content) throws MessagingException { - final MimeMessage mimeMessage = javaMailSender.createMimeMessage(); - final MimeMessageHelper helper = new MimeMessageHelper(mimeMessage, false, "UTF-8"); - - helper.setTo(to); - helper.setSubject(subject); - helper.setText(content, true); - - javaMailSender.send(mimeMessage); - } -} diff --git a/src/main/java/com/recyclestudy/email/ReviewEmailSender.java b/src/main/java/com/recyclestudy/email/ReviewEmailSender.java new file mode 100644 index 0000000..3844cec --- /dev/null +++ b/src/main/java/com/recyclestudy/email/ReviewEmailSender.java @@ -0,0 +1,80 @@ +package com.recyclestudy.email; + +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.review.domain.NotificationStatus; +import com.recyclestudy.review.domain.ReviewURL; +import com.recyclestudy.review.service.NotificationHistoryService; +import com.recyclestudy.review.service.ReviewCycleService; +import com.recyclestudy.review.service.input.ReviewSendInput; +import com.recyclestudy.review.service.output.ReviewSendOutput; +import com.recyclestudy.review.service.output.ReviewSendOutput.ReviewSendElement; +import java.time.Clock; +import java.time.LocalDate; +import java.time.LocalTime; +import java.util.List; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Service; +import org.thymeleaf.TemplateEngine; +import org.thymeleaf.context.Context; + +@Service +@RequiredArgsConstructor +@Slf4j +public class ReviewEmailSender { + + private final EmailSender emailSender; + private final TemplateEngine templateEngine; + private final ReviewCycleService reviewCycleService; + private final NotificationHistoryService notificationHistoryService; + private final Clock clock; + + @Scheduled(cron = "0 0 8 * * *", zone = "Asia/Seoul") + public void sendReviewMail() { + + final LocalDate targetDate = LocalDate.now(clock); + final LocalTime targetTime = LocalTime.of(8, 0); + + final ReviewSendOutput targetReviewCycle = reviewCycleService.findTargetReviewCycle( + ReviewSendInput.from(targetDate, targetTime)); + + final List elements = targetReviewCycle.elements(); + log.info("복습 메일 발송 시작: 대상 {}명", elements.size()); + + int successCount = 0; + int failCount = 0; + + for (final ReviewSendElement element : elements) { + final String message = createMessage(element.targetUrls()); + final Email targetEmail = element.email(); + + final boolean success = sendToTargetEmail(targetEmail, message); + + if (success) { + notificationHistoryService.saveAll(element.reviewCycleIds(), NotificationStatus.SENT); + successCount++; + } else { + notificationHistoryService.saveAll(element.reviewCycleIds(), NotificationStatus.FAILED); + failCount++; + } + } + + log.info("복습 메일 발송 처리 완료: 성공 {}명, 실패 {}명", successCount, failCount); + } + + private boolean sendToTargetEmail(final Email targetEmail, final String message) { + try { + emailSender.send(targetEmail.getValue(), "[Recycle Study] 오늘의 복습 목록이 도착했습니다", message); + return true; + } catch (final Exception e) { + return false; + } + } + + private String createMessage(final List targetUrls) { + final Context context = new Context(); + context.setVariable("targetUrls", targetUrls); + return templateEngine.process("review_email", context); + } +} diff --git a/src/main/java/com/recyclestudy/member/controller/MemberController.java b/src/main/java/com/recyclestudy/member/controller/MemberController.java index fa195d6..0ab392c 100644 --- a/src/main/java/com/recyclestudy/member/controller/MemberController.java +++ b/src/main/java/com/recyclestudy/member/controller/MemberController.java @@ -1,6 +1,6 @@ package com.recyclestudy.member.controller; -import com.recyclestudy.email.EmailService; +import com.recyclestudy.email.DeviceAuthEmailSender; import com.recyclestudy.member.controller.request.MemberSaveRequest; import com.recyclestudy.member.controller.response.MemberFindResponse; import com.recyclestudy.member.controller.response.MemberSaveResponse; @@ -25,14 +25,14 @@ public class MemberController { private final MemberService memberService; - private final EmailService emailService; + private final DeviceAuthEmailSender deviceAuthEmailSender; @PostMapping public ResponseEntity saveMember(@RequestBody final MemberSaveRequest request) { final MemberSaveInput input = request.toInput(); final MemberSaveOutput output = memberService.saveDevice(input); - emailService.sendDeviceAuthMail(output.email().getValue(), output.identifier().getValue()); + deviceAuthEmailSender.sendDeviceAuthMail(output.email().getValue(), output.identifier().getValue()); final MemberSaveResponse response = MemberSaveResponse.from(output); return ResponseEntity.status(HttpStatus.CREATED).body(response); diff --git a/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java b/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java index 72bc023..08b1028 100644 --- a/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java +++ b/src/main/java/com/recyclestudy/member/domain/ActivationExpiredDateTime.java @@ -24,6 +24,8 @@ public class ActivationExpiredDateTime { private static final Duration EXPIRE_TIME_RATE = Duration.ofMinutes(5); + private LocalDateTime value; + public static ActivationExpiredDateTime create(final LocalDateTime currentTime) { validateNotNull(currentTime); return new ActivationExpiredDateTime(currentTime.plusMinutes(EXPIRE_TIME_RATE.toMinutes())); @@ -35,8 +37,6 @@ private static void validateNotNull(final LocalDateTime currentTime) { .validate(); } - private LocalDateTime value; - public void checkExpired(final LocalDateTime currentTime) { if (currentTime.isAfter(value)) { throw new DeviceActivationExpiredException("인증 유효 시간이 만료되었습니다."); diff --git a/src/main/java/com/recyclestudy/member/domain/Device.java b/src/main/java/com/recyclestudy/member/domain/Device.java index 4e0560d..6749bd5 100644 --- a/src/main/java/com/recyclestudy/member/domain/Device.java +++ b/src/main/java/com/recyclestudy/member/domain/Device.java @@ -26,20 +26,6 @@ @Getter public class Device extends BaseEntity { - public static Device withoutId( - final Member member, - final DeviceIdentifier deviceIdentifier, - final boolean isActive, - final ActivationExpiredDateTime activationExpiresAt - ) { - NullValidator.builder() - .add(Fields.member, member) - .add(Fields.identifier, deviceIdentifier) - .add(Fields.activationExpiresAt, activationExpiresAt) - .validate(); - return new Device(member, deviceIdentifier, isActive, activationExpiresAt); - } - @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "member_id", nullable = false) private Member member; @@ -55,6 +41,20 @@ public static Device withoutId( @AttributeOverride(name = "value", column = @Column(name = "activation_expires_at", nullable = false)) private ActivationExpiredDateTime activationExpiresAt; + public static Device withoutId( + final Member member, + final DeviceIdentifier deviceIdentifier, + final boolean isActive, + final ActivationExpiredDateTime activationExpiresAt + ) { + NullValidator.builder() + .add(Fields.member, member) + .add(Fields.identifier, deviceIdentifier) + .add(Fields.activationExpiresAt, activationExpiresAt) + .validate(); + return new Device(member, deviceIdentifier, isActive, activationExpiresAt); + } + public void activate(final LocalDateTime currentTime) { activationExpiresAt.checkExpired(currentTime); this.isActive = true; diff --git a/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java b/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java index d031160..8e6e488 100644 --- a/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java +++ b/src/main/java/com/recyclestudy/member/domain/DeviceIdentifier.java @@ -19,6 +19,8 @@ @EqualsAndHashCode public class DeviceIdentifier { + private String value; + public static DeviceIdentifier from(final String value) { validateNotNull(value); return new DeviceIdentifier(value); @@ -34,6 +36,4 @@ private static void validateNotNull(final String value) { .add(Fields.value, value) .validate(); } - - private String value; } diff --git a/src/main/java/com/recyclestudy/member/domain/Email.java b/src/main/java/com/recyclestudy/member/domain/Email.java index c5fd3cd..6c9dddb 100644 --- a/src/main/java/com/recyclestudy/member/domain/Email.java +++ b/src/main/java/com/recyclestudy/member/domain/Email.java @@ -23,6 +23,8 @@ public class Email { private static final String EMAIL_FORMAT = "^[a-zA-Z0-9_+&*-]+(?:\\.[a-zA-Z0-9_+&*-]+)*@(?:[a-zA-Z0-9-]+\\.)+[a-zA-Z]{2,7}$"; private static final Pattern EMAIL_PATTERN = Pattern.compile(EMAIL_FORMAT); + private String value; + public static Email from(final String value) { validateNotNull(value); validateEmailFormat(value); @@ -40,6 +42,4 @@ private static void validateEmailFormat(final String emailValue) { throw new IllegalArgumentException("유효하지 않은 이메일 형식입니다."); } } - - private String value; } diff --git a/src/main/java/com/recyclestudy/member/domain/Member.java b/src/main/java/com/recyclestudy/member/domain/Member.java index 9dee912..b994ca1 100644 --- a/src/main/java/com/recyclestudy/member/domain/Member.java +++ b/src/main/java/com/recyclestudy/member/domain/Member.java @@ -21,6 +21,10 @@ @Getter public class Member extends BaseEntity { + @Embedded + @AttributeOverride(name = "value", column = @Column(name = "email", nullable = false, unique = true)) + private Email email; + public static Member withoutId(final Email email) { validateNotNull(email); return new Member(email); @@ -32,10 +36,6 @@ private static void validateNotNull(final Email email) { .validate(); } - @Embedded - @AttributeOverride(name = "value", column = @Column(name = "email", nullable = false, unique = true)) - private Email email; - public boolean hasEmail(final Email email) { return this.email.equals(email); } diff --git a/src/main/java/com/recyclestudy/review/domain/NotificationHistory.java b/src/main/java/com/recyclestudy/review/domain/NotificationHistory.java new file mode 100644 index 0000000..500dc5d --- /dev/null +++ b/src/main/java/com/recyclestudy/review/domain/NotificationHistory.java @@ -0,0 +1,52 @@ +package com.recyclestudy.review.domain; + +import com.recyclestudy.common.BaseEntity; +import com.recyclestudy.common.NullValidator; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; +import lombok.AccessLevel; +import lombok.AllArgsConstructor; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.FieldNameConstants; + +@Entity +@Table(name = "notification_history") +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor(access = AccessLevel.PRIVATE) +@FieldNameConstants(level = AccessLevel.PRIVATE) +@Getter +public class NotificationHistory extends BaseEntity { + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_cycle_id", nullable = false) + private ReviewCycle reviewCycle; + + @Enumerated(value = EnumType.STRING) + @Column(name = "status", nullable = false) + private NotificationStatus status; + + public static NotificationHistory withoutId( + final ReviewCycle reviewCycle, + final NotificationStatus status + ) { + validateNotNull(reviewCycle, status); + return new NotificationHistory(reviewCycle, status); + } + + private static void validateNotNull( + final ReviewCycle reviewCycle, + final NotificationStatus status + ) { + NullValidator.builder() + .add(Fields.reviewCycle, reviewCycle) + .add(Fields.status, status) + .validate(); + } +} diff --git a/src/main/java/com/recyclestudy/review/domain/Review.java b/src/main/java/com/recyclestudy/review/domain/Review.java index 3b37465..a21b72c 100644 --- a/src/main/java/com/recyclestudy/review/domain/Review.java +++ b/src/main/java/com/recyclestudy/review/domain/Review.java @@ -2,10 +2,14 @@ import com.recyclestudy.common.BaseEntity; import com.recyclestudy.common.NullValidator; +import com.recyclestudy.member.domain.Member; import jakarta.persistence.AttributeOverride; import jakarta.persistence.Column; import jakarta.persistence.Embedded; import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; import jakarta.persistence.Table; import lombok.AccessLevel; import lombok.AllArgsConstructor; @@ -21,18 +25,23 @@ @Getter public class Review extends BaseEntity { - public static Review withoutId(final ReviewURL url) { - validateNotNull(url); - return new Review(url); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + @Embedded + @AttributeOverride(name = "value", column = @Column(name = "url", nullable = false, columnDefinition = "TEXT")) + private ReviewURL url; + + public static Review withoutId(final Member member, final ReviewURL url) { + validateNotNull(member, url); + return new Review(member, url); } - private static void validateNotNull(final ReviewURL url) { + private static void validateNotNull(final Member member, final ReviewURL url) { NullValidator.builder() + .add(Fields.member, member) .add(Fields.url, url) .validate(); } - - @Embedded - @AttributeOverride(name = "value", column = @Column(name = "url", nullable = false, columnDefinition = "TEXT")) - private ReviewURL url; } diff --git a/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java b/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java index a56df10..d4017b9 100644 --- a/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java +++ b/src/main/java/com/recyclestudy/review/domain/ReviewCycle.java @@ -2,10 +2,7 @@ import com.recyclestudy.common.BaseEntity; import com.recyclestudy.common.NullValidator; -import jakarta.persistence.Column; import jakarta.persistence.Entity; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; @@ -18,41 +15,28 @@ import lombok.experimental.FieldNameConstants; @Entity -@Table(name = "cycle") +@Table(name = "review_cycle") @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor(access = AccessLevel.PRIVATE) @FieldNameConstants(level = AccessLevel.PRIVATE) @Getter public class ReviewCycle extends BaseEntity { - public static ReviewCycle withoutId( - final Review review, - final LocalDateTime scheduledAt, - final NotificationStatus status - ) { - validateNotNull(review, scheduledAt, status); - return new ReviewCycle(review, scheduledAt, status); + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "review_id", nullable = false) + private Review review; + + private LocalDateTime scheduledAt; + + public static ReviewCycle withoutId(final Review review, final LocalDateTime scheduledAt) { + validateNotNull(review, scheduledAt); + return new ReviewCycle(review, scheduledAt); } - private static void validateNotNull( - final Review review, - final LocalDateTime scheduledAt, - final NotificationStatus status - ) { + private static void validateNotNull(final Review review, final LocalDateTime scheduledAt) { NullValidator.builder() .add(Fields.review, review) .add(Fields.scheduledAt, scheduledAt) - .add(Fields.status, status) .validate(); } - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "review_id", nullable = false) - private Review review; - - private LocalDateTime scheduledAt; - - @Enumerated(value = EnumType.STRING) - @Column(name = "status", nullable = false) - private NotificationStatus status; } diff --git a/src/main/java/com/recyclestudy/review/repository/NotificationHistoryRepository.java b/src/main/java/com/recyclestudy/review/repository/NotificationHistoryRepository.java new file mode 100644 index 0000000..fa496fd --- /dev/null +++ b/src/main/java/com/recyclestudy/review/repository/NotificationHistoryRepository.java @@ -0,0 +1,7 @@ +package com.recyclestudy.review.repository; + +import com.recyclestudy.review.domain.NotificationHistory; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface NotificationHistoryRepository extends JpaRepository { +} diff --git a/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java b/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java index 8630fac..3060ad0 100644 --- a/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java +++ b/src/main/java/com/recyclestudy/review/repository/ReviewCycleRepository.java @@ -1,7 +1,11 @@ package com.recyclestudy.review.repository; import com.recyclestudy.review.domain.ReviewCycle; +import java.time.LocalDateTime; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; public interface ReviewCycleRepository extends JpaRepository { + + List findAllByScheduledAt(LocalDateTime scheduledAt); } diff --git a/src/main/java/com/recyclestudy/review/service/NotificationHistoryService.java b/src/main/java/com/recyclestudy/review/service/NotificationHistoryService.java new file mode 100644 index 0000000..1e9e61a --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/NotificationHistoryService.java @@ -0,0 +1,30 @@ +package com.recyclestudy.review.service; + +import com.recyclestudy.review.domain.NotificationHistory; +import com.recyclestudy.review.domain.NotificationStatus; +import com.recyclestudy.review.domain.ReviewCycle; +import com.recyclestudy.review.repository.NotificationHistoryRepository; +import com.recyclestudy.review.repository.ReviewCycleRepository; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class NotificationHistoryService { + + private final NotificationHistoryRepository notificationHistoryRepository; + private final ReviewCycleRepository reviewCycleRepository; + + @Transactional + public void saveAll(final List reviewCycleIds, final NotificationStatus status) { + final List reviewCycles = reviewCycleRepository.findAllById(reviewCycleIds); + + final List histories = reviewCycles.stream() + .map(cycle -> NotificationHistory.withoutId(cycle, status)) + .toList(); + + notificationHistoryRepository.saveAll(histories); + } +} diff --git a/src/main/java/com/recyclestudy/review/service/ReviewCycleService.java b/src/main/java/com/recyclestudy/review/service/ReviewCycleService.java new file mode 100644 index 0000000..9dc708d --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/ReviewCycleService.java @@ -0,0 +1,23 @@ +package com.recyclestudy.review.service; + +import com.recyclestudy.review.domain.ReviewCycle; +import com.recyclestudy.review.repository.ReviewCycleRepository; +import com.recyclestudy.review.service.input.ReviewSendInput; +import com.recyclestudy.review.service.output.ReviewSendOutput; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@RequiredArgsConstructor +public class ReviewCycleService { + + private final ReviewCycleRepository reviewCycleRepository; + + @Transactional(readOnly = true) + public ReviewSendOutput findTargetReviewCycle(final ReviewSendInput input) { + final List targetCycle = reviewCycleRepository.findAllByScheduledAt(input.scheduledAt()); + return ReviewSendOutput.from(targetCycle); + } +} diff --git a/src/main/java/com/recyclestudy/review/service/ReviewService.java b/src/main/java/com/recyclestudy/review/service/ReviewService.java index 954a9da..19b174c 100644 --- a/src/main/java/com/recyclestudy/review/service/ReviewService.java +++ b/src/main/java/com/recyclestudy/review/service/ReviewService.java @@ -3,10 +3,12 @@ import com.recyclestudy.exception.UnauthorizedException; import com.recyclestudy.member.domain.Device; import com.recyclestudy.member.repository.DeviceRepository; +import com.recyclestudy.review.domain.NotificationHistory; import com.recyclestudy.review.domain.NotificationStatus; import com.recyclestudy.review.domain.Review; import com.recyclestudy.review.domain.ReviewCycle; import com.recyclestudy.review.domain.ReviewCycleDuration; +import com.recyclestudy.review.repository.NotificationHistoryRepository; import com.recyclestudy.review.repository.ReviewCycleRepository; import com.recyclestudy.review.repository.ReviewRepository; import com.recyclestudy.review.service.input.ReviewSaveInput; @@ -26,6 +28,7 @@ public class ReviewService { private final ReviewRepository reviewRepository; private final ReviewCycleRepository reviewCycleRepository; private final DeviceRepository deviceRepository; + private final NotificationHistoryRepository notificationHistoryRepository; private final Clock clock; @Transactional @@ -34,25 +37,36 @@ public ReviewSaveOutput saveReview(final ReviewSaveInput input) { .orElseThrow(() -> new UnauthorizedException("유효하지 않은 디바이스입니다")); checkValidDevice(device); - final Review review = Review.withoutId(input.url()); + final Review review = Review.withoutId(device.getMember(), input.url()); final Review savedReview = reviewRepository.save(review); final LocalDate current = LocalDate.now(clock); final List scheduledAts = ReviewCycleDuration.calculate(current); final List reviewCycles = scheduledAts.stream() - .map(scheduledAt -> ReviewCycle.withoutId(savedReview, scheduledAt, NotificationStatus.PENDING)) + .map(scheduledAt -> ReviewCycle.withoutId(savedReview, scheduledAt)) .toList(); - final List savedScheduledAts = reviewCycleRepository.saveAll(reviewCycles) - .stream().map(ReviewCycle::getScheduledAt) + final List savedReviewCycles = reviewCycleRepository.saveAll(reviewCycles); + final List savedScheduledAts = savedReviewCycles.stream() + .map(ReviewCycle::getScheduledAt) .toList(); + + savePendingNotificationHistory(savedReviewCycles); + return ReviewSaveOutput.of(savedReview.getUrl(), savedScheduledAts); } - private static void checkValidDevice(final Device device) { + private void checkValidDevice(final Device device) { if (!device.isActive()) { throw new UnauthorizedException("인증되지 않은 디바이스입니다"); } } + + private void savePendingNotificationHistory(final List savedReviewCycles) { + final List notificationHistories = savedReviewCycles.stream() + .map(reviewCycle -> NotificationHistory.withoutId(reviewCycle, NotificationStatus.PENDING)) + .toList(); + notificationHistoryRepository.saveAll(notificationHistories); + } } diff --git a/src/main/java/com/recyclestudy/review/service/input/ReviewSendInput.java b/src/main/java/com/recyclestudy/review/service/input/ReviewSendInput.java new file mode 100644 index 0000000..cee411c --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/input/ReviewSendInput.java @@ -0,0 +1,12 @@ +package com.recyclestudy.review.service.input; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.time.LocalTime; + +public record ReviewSendInput(LocalDateTime scheduledAt) { + + public static ReviewSendInput from(final LocalDate targetDate, final LocalTime targetTime) { + return new ReviewSendInput(LocalDateTime.of(targetDate, targetTime)); + } +} diff --git a/src/main/java/com/recyclestudy/review/service/output/ReviewSendOutput.java b/src/main/java/com/recyclestudy/review/service/output/ReviewSendOutput.java new file mode 100644 index 0000000..df9b0c1 --- /dev/null +++ b/src/main/java/com/recyclestudy/review/service/output/ReviewSendOutput.java @@ -0,0 +1,46 @@ +package com.recyclestudy.review.service.output; + +import com.recyclestudy.member.domain.Email; +import com.recyclestudy.review.domain.ReviewCycle; +import com.recyclestudy.review.domain.ReviewURL; +import java.util.List; +import java.util.stream.Collectors; + +public record ReviewSendOutput(List elements) { + + public static ReviewSendOutput from(final List reviewCycles) { + final List elements = reviewCycles.stream() + .collect(Collectors.groupingBy( + cycle -> cycle.getReview().getMember().getEmail(), + Collectors.toUnmodifiableList() + )) + .entrySet().stream() + .map(entry -> { + final List cycles = entry.getValue(); + final List cycleIds = cycles.stream() + .map(ReviewCycle::getId) + .toList(); + final List urls = cycles.stream() + .map(cycle -> cycle.getReview().getUrl()) + .toList(); + return ReviewSendElement.of(entry.getKey(), cycleIds, urls); + }) + .toList(); + + return new ReviewSendOutput(elements); + } + + public record ReviewSendElement( + Email email, + List reviewCycleIds, + List targetUrls + ) { + public static ReviewSendElement of( + final Email email, + final List reviewCycleIds, + final List targetUrls + ) { + return new ReviewSendElement(email, reviewCycleIds, targetUrls); + } + } +} diff --git a/src/main/resources/templates/auth_email.html b/src/main/resources/templates/auth_email.html index fe01306..5a2aa4d 100644 --- a/src/main/resources/templates/auth_email.html +++ b/src/main/resources/templates/auth_email.html @@ -1,13 +1,13 @@ - + 이메일 인증

안녕하세요! 이메일 인증을 완료해주세요.

아래 버튼을 클릭하여 디바이스 인증을 완료하세요.

- + 인증하기 diff --git a/src/main/resources/templates/auth_success.html b/src/main/resources/templates/auth_success.html index 9019729..65639fa 100644 --- a/src/main/resources/templates/auth_success.html +++ b/src/main/resources/templates/auth_success.html @@ -2,7 +2,7 @@ - + 이메일 인증 완료