From 7c0e6dae5112f837138ad676835a9b4a3d000b7f Mon Sep 17 00:00:00 2001 From: sshnote Date: Sat, 2 Nov 2024 00:00:08 +0900 Subject: [PATCH 1/9] week5 mission5 --- sanho/jpa-ex/.gitattributes | 3 + sanho/jpa-ex/.gitignore | 37 +++ sanho/jpa-ex/build.gradle | 40 +++ .../jpa-ex/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + sanho/jpa-ex/gradlew | 252 ++++++++++++++++++ sanho/jpa-ex/gradlew.bat | 94 +++++++ sanho/jpa-ex/settings.gradle | 1 + .../java/umc/jpa_ex/JpaExApplication.java | 15 ++ .../java/umc/jpa_ex/domain/FoodCategory.java | 27 ++ .../umc/jpa_ex/domain/MarketingAlarm.java | 29 ++ .../main/java/umc/jpa_ex/domain/Member.java | 69 +++++ .../main/java/umc/jpa_ex/domain/Mission.java | 40 +++ .../main/java/umc/jpa_ex/domain/Region.java | 26 ++ .../main/java/umc/jpa_ex/domain/Review.java | 35 +++ .../java/umc/jpa_ex/domain/ReviewAlarm.java | 29 ++ .../main/java/umc/jpa_ex/domain/Store.java | 64 +++++ .../main/java/umc/jpa_ex/domain/Terms.java | 32 +++ .../umc/jpa_ex/domain/common/BaseEntity.java | 25 ++ .../umc/jpa_ex/domain/embedded/Address.java | 22 ++ .../java/umc/jpa_ex/domain/enums/Gender.java | 5 + .../umc/jpa_ex/domain/enums/MemberStatus.java | 5 + .../jpa_ex/domain/enums/MissionStatus.java | 5 + .../umc/jpa_ex/domain/enums/StoreStatus.java | 5 + .../jpa_ex/domain/mapping/MemberAgree.java | 27 ++ .../jpa_ex/domain/mapping/MemberMission.java | 32 +++ .../jpa_ex/domain/mapping/SelectCategory.java | 27 ++ .../jpa-ex/src/main/resources/application.yml | 20 ++ .../umc/jpa_ex/JpaExApplicationTests.java | 13 + 29 files changed, 986 insertions(+) create mode 100644 sanho/jpa-ex/.gitattributes create mode 100644 sanho/jpa-ex/.gitignore create mode 100644 sanho/jpa-ex/build.gradle create mode 100644 sanho/jpa-ex/gradle/wrapper/gradle-wrapper.jar create mode 100644 sanho/jpa-ex/gradle/wrapper/gradle-wrapper.properties create mode 100644 sanho/jpa-ex/gradlew create mode 100644 sanho/jpa-ex/gradlew.bat create mode 100644 sanho/jpa-ex/settings.gradle create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/JpaExApplication.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/FoodCategory.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/MarketingAlarm.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Member.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Mission.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Region.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Review.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/ReviewAlarm.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Store.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Terms.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/common/BaseEntity.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/embedded/Address.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/Gender.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MemberStatus.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MissionStatus.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/StoreStatus.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberAgree.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberMission.java create mode 100644 sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/SelectCategory.java create mode 100644 sanho/jpa-ex/src/main/resources/application.yml create mode 100644 sanho/jpa-ex/src/test/java/umc/jpa_ex/JpaExApplicationTests.java diff --git a/sanho/jpa-ex/.gitattributes b/sanho/jpa-ex/.gitattributes new file mode 100644 index 0000000..8af972c --- /dev/null +++ b/sanho/jpa-ex/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/sanho/jpa-ex/.gitignore b/sanho/jpa-ex/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/sanho/jpa-ex/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/sanho/jpa-ex/build.gradle b/sanho/jpa-ex/build.gradle new file mode 100644 index 0000000..85c2a8b --- /dev/null +++ b/sanho/jpa-ex/build.gradle @@ -0,0 +1,40 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.5' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-thymeleaf' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + 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/sanho/jpa-ex/gradle/wrapper/gradle-wrapper.jar b/sanho/jpa-ex/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 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 yu?e%!_ptzGB|8GrCfu%p?(_ zQccdaaVK$5bz;*rnyK{_SQYM>;aES6Qs^lj9lEs6_J+%nIiuQC*fN;z8md>r_~Mfl zU%p5Dt_YT>gQqfr@`cR!$NWr~+`CZb%dn;WtzrAOI>P_JtsB76PYe*<%H(y>qx-`Kq!X_; z<{RpAqYhE=L1r*M)gNF3B8r(<%8mo*SR2hu zccLRZwGARt)Hlo1euqTyM>^!HK*!Q2P;4UYrysje@;(<|$&%vQekbn|0Ruu_Io(w4#%p6ld2Yp7tlA`Y$cciThP zKzNGIMPXX%&Ud0uQh!uQZz|FB`4KGD?3!ND?wQt6!n*f4EmCoJUh&b?;B{|lxs#F- z31~HQ`SF4x$&v00@(P+j1pAaj5!s`)b2RDBp*PB=2IB>oBF!*6vwr7Dp%zpAx*dPr zb@Zjq^XjN?O4QcZ*O+8>)|HlrR>oD*?WQl5ri3R#2?*W6iJ>>kH%KnnME&TT@ZzrHS$Q%LC?n|e>V+D+8D zYc4)QddFz7I8#}y#Wj6>4P%34dZH~OUDb?uP%-E zwjXM(?Sg~1!|wI(RVuxbu)-rH+O=igSho_pDCw(c6b=P zKk4ATlB?bj9+HHlh<_!&z0rx13K3ZrAR8W)!@Y}o`?a*JJsD+twZIv`W)@Y?Amu_u zz``@-e2X}27$i(2=9rvIu5uTUOVhzwu%mNazS|lZb&PT;XE2|B&W1>=B58#*!~D&) zfVmJGg8UdP*fx(>Cj^?yS^zH#o-$Q-*$SnK(ZVFkw+er=>N^7!)FtP3y~Xxnu^nzY zikgB>Nj0%;WOltWIob|}%lo?_C7<``a5hEkx&1ku$|)i>Rh6@3h*`slY=9U}(Ql_< zaNG*J8vb&@zpdhAvv`?{=zDedJ23TD&Zg__snRAH4eh~^oawdYi6A3w8<Ozh@Kw)#bdktM^GVb zrG08?0bG?|NG+w^&JvD*7LAbjED{_Zkc`3H!My>0u5Q}m!+6VokMLXxl`Mkd=g&Xx z-a>m*#G3SLlhbKB!)tnzfWOBV;u;ftU}S!NdD5+YtOjLg?X}dl>7m^gOpihrf1;PY zvll&>dIuUGs{Qnd- zwIR3oIrct8Va^Tm0t#(bJD7c$Z7DO9*7NnRZorrSm`b`cxz>OIC;jSE3DO8`hX955ui`s%||YQtt2 z5DNA&pG-V+4oI2s*x^>-$6J?p=I>C|9wZF8z;VjR??Icg?1w2v5Me+FgAeGGa8(3S z4vg*$>zC-WIVZtJ7}o9{D-7d>zCe|z#<9>CFve-OPAYsneTb^JH!Enaza#j}^mXy1 z+ULn^10+rWLF6j2>Ya@@Kq?26>AqK{A_| zQKb*~F1>sE*=d?A?W7N2j?L09_7n+HGi{VY;MoTGr_)G9)ot$p!-UY5zZ2Xtbm=t z@dpPSGwgH=QtIcEulQNI>S-#ifbnO5EWkI;$A|pxJd885oM+ zGZ0_0gDvG8q2xebj+fbCHYfAXuZStH2j~|d^sBAzo46(K8n59+T6rzBwK)^rfPT+B zyIFw)9YC-V^rhtK`!3jrhmW-sTmM+tPH+;nwjL#-SjQPUZ53L@A>y*rt(#M(qsiB2 zx6B)dI}6Wlsw%bJ8h|(lhkJVogQZA&n{?Vgs6gNSXzuZpEyu*xySy8ro07QZ7Vk1!3tJphN_5V7qOiyK8p z#@jcDD8nmtYi1^l8ml;AF<#IPK?!pqf9D4moYk>d99Im}Jtwj6c#+A;f)CQ*f-hZ< z=p_T86jog%!p)D&5g9taSwYi&eP z#JuEK%+NULWus;0w32-SYFku#i}d~+{Pkho&^{;RxzP&0!RCm3-9K6`>KZpnzS6?L z^H^V*s!8<>x8bomvD%rh>Zp3>Db%kyin;qtl+jAv8Oo~1g~mqGAC&Qi_wy|xEt2iz zWAJEfTV%cl2Cs<1L&DLRVVH05EDq`pH7Oh7sR`NNkL%wi}8n>IXcO40hp+J+sC!W?!krJf!GJNE8uj zg-y~Ns-<~D?yqbzVRB}G>0A^f0!^N7l=$m0OdZuqAOQqLc zX?AEGr1Ht+inZ-Qiwnl@Z0qukd__a!C*CKuGdy5#nD7VUBM^6OCpxCa2A(X;e0&V4 zM&WR8+wErQ7UIc6LY~Q9x%Sn*Tn>>P`^t&idaOEnOd(Ufw#>NoR^1QdhJ8s`h^|R_ zXX`c5*O~Xdvh%q;7L!_!ohf$NfEBmCde|#uVZvEo>OfEq%+Ns7&_f$OR9xsihRpBb z+cjk8LyDm@U{YN>+r46?nn{7Gh(;WhFw6GAxtcKD+YWV?uge>;+q#Xx4!GpRkVZYu zzsF}1)7$?%s9g9CH=Zs+B%M_)+~*j3L0&Q9u7!|+T`^O{xE6qvAP?XWv9_MrZKdo& z%IyU)$Q95AB4!#hT!_dA>4e@zjOBD*Y=XjtMm)V|+IXzjuM;(l+8aA5#Kaz_$rR6! zj>#&^DidYD$nUY(D$mH`9eb|dtV0b{S>H6FBfq>t5`;OxA4Nn{J(+XihF(stSche7$es&~N$epi&PDM_N`As;*9D^L==2Q7Z2zD+CiU(|+-kL*VG+&9!Yb3LgPy?A zm7Z&^qRG_JIxK7-FBzZI3Q<;{`DIxtc48k> zc|0dmX;Z=W$+)qE)~`yn6MdoJ4co;%!`ddy+FV538Y)j(vg}5*k(WK)KWZ3WaOG!8 z!syGn=s{H$odtpqFrT#JGM*utN7B((abXnpDM6w56nhw}OY}0TiTG1#f*VFZr+^-g zbP10`$LPq_;PvrA1XXlyx2uM^mrjTzX}w{yuLo-cOClE8MMk47T25G8M!9Z5ypOSV zAJUBGEg5L2fY)ZGJb^E34R2zJ?}Vf>{~gB!8=5Z) z9y$>5c)=;o0HeHHSuE4U)#vG&KF|I%-cF6f$~pdYJWk_dD}iOA>iA$O$+4%@>JU08 zS`ep)$XLPJ+n0_i@PkF#ri6T8?ZeAot$6JIYHm&P6EB=BiaNY|aA$W0I+nz*zkz_z zkEru!tj!QUffq%)8y0y`T&`fuus-1p>=^hnBiBqD^hXrPs`PY9tU3m0np~rISY09> z`P3s=-kt_cYcxWd{de@}TwSqg*xVhp;E9zCsnXo6z z?f&Sv^U7n4`xr=mXle94HzOdN!2kB~4=%)u&N!+2;z6UYKUDqi-s6AZ!haB;@&B`? z_TRX0%@suz^TRdCb?!vNJYPY8L_}&07uySH9%W^Tc&1pia6y1q#?*Drf}GjGbPjBS zbOPcUY#*$3sL2x4v_i*Y=N7E$mR}J%|GUI(>WEr+28+V z%v5{#e!UF*6~G&%;l*q*$V?&r$Pp^sE^i-0$+RH3ERUUdQ0>rAq2(2QAbG}$y{de( z>{qD~GGuOk559Y@%$?N^1ApVL_a704>8OD%8Y%8B;FCt%AoPu8*D1 zLB5X>b}Syz81pn;xnB}%0FnwazlWfUV)Z-~rZg6~b z6!9J$EcE&sEbzcy?CI~=boWA&eeIa%z(7SE^qgVLz??1Vbc1*aRvc%Mri)AJaAG!p z$X!_9Ds;Zz)f+;%s&dRcJt2==P{^j3bf0M=nJd&xwUGlUFn?H=2W(*2I2Gdu zv!gYCwM10aeus)`RIZSrCK=&oKaO_Ry~D1B5!y0R=%!i2*KfXGYX&gNv_u+n9wiR5 z*e$Zjju&ODRW3phN925%S(jL+bCHv6rZtc?!*`1TyYXT6%Ju=|X;6D@lq$8T zW{Y|e39ioPez(pBH%k)HzFITXHvnD6hw^lIoUMA;qAJ^CU?top1fo@s7xT13Fvn1H z6JWa-6+FJF#x>~+A;D~;VDs26>^oH0EI`IYT2iagy23?nyJ==i{g4%HrAf1-*v zK1)~@&(KkwR7TL}L(A@C_S0G;-GMDy=MJn2$FP5s<%wC)4jC5PXoxrQBFZ_k0P{{s@sz+gX`-!=T8rcB(=7vW}^K6oLWMmp(rwDh}b zwaGGd>yEy6fHv%jM$yJXo5oMAQ>c9j`**}F?MCry;T@47@r?&sKHgVe$MCqk#Z_3S z1GZI~nOEN*P~+UaFGnj{{Jo@16`(qVNtbU>O0Hf57-P>x8Jikp=`s8xWs^dAJ9lCQ z)GFm+=OV%AMVqVATtN@|vp61VVAHRn87}%PC^RAzJ%JngmZTasWBAWsoAqBU+8L8u z4A&Pe?fmTm0?mK-BL9t+{y7o(7jm+RpOhL9KnY#E&qu^}B6=K_dB}*VlSEiC9fn)+V=J;OnN)Ta5v66ic1rG+dGAJ1 z1%Zb_+!$=tQ~lxQrzv3x#CPb?CekEkA}0MYSgx$Jdd}q8+R=ma$|&1a#)TQ=l$1tQ z=tL9&_^vJ)Pk}EDO-va`UCT1m#Uty1{v^A3P~83_#v^ozH}6*9mIjIr;t3Uv%@VeW zGL6(CwCUp)Jq%G0bIG%?{_*Y#5IHf*5M@wPo6A{$Um++Co$wLC=J1aoG93&T7Ho}P z=mGEPP7GbvoG!uD$k(H3A$Z))+i{Hy?QHdk>3xSBXR0j!11O^mEe9RHmw!pvzv?Ua~2_l2Yh~_!s1qS`|0~0)YsbHSz8!mG)WiJE| z2f($6TQtt6L_f~ApQYQKSb=`053LgrQq7G@98#igV>y#i==-nEjQ!XNu9 z~;mE+gtj4IDDNQJ~JVk5Ux6&LCSFL!y=>79kE9=V}J7tD==Ga+IW zX)r7>VZ9dY=V&}DR))xUoV!u(Z|%3ciQi_2jl}3=$Agc(`RPb z8kEBpvY>1FGQ9W$n>Cq=DIpski};nE)`p3IUw1Oz0|wxll^)4dq3;CCY@RyJgFgc# zKouFh!`?Xuo{IMz^xi-h=StCis_M7yq$u) z?XHvw*HP0VgR+KR6wI)jEMX|ssqYvSf*_3W8zVTQzD?3>H!#>InzpSO)@SC8q*ii- z%%h}_#0{4JG;Jm`4zg};BPTGkYamx$Xo#O~lBirRY)q=5M45n{GCfV7h9qwyu1NxOMoP4)jjZMxmT|IQQh0U7C$EbnMN<3)Kk?fFHYq$d|ICu>KbY_hO zTZM+uKHe(cIZfEqyzyYSUBZa8;Fcut-GN!HSA9ius`ltNebF46ZX_BbZNU}}ZOm{M2&nANL9@0qvih15(|`S~z}m&h!u4x~(%MAO$jHRWNfuxWF#B)E&g3ghSQ9|> z(MFaLQj)NE0lowyjvg8z0#m6FIuKE9lDO~Glg}nSb7`~^&#(Lw{}GVOS>U)m8bF}x zVjbXljBm34Cs-yM6TVusr+3kYFjr28STT3g056y3cH5Tmge~ASxBj z%|yb>$eF;WgrcOZf569sDZOVwoo%8>XO>XQOX1OyN9I-SQgrm;U;+#3OI(zrWyow3 zk==|{lt2xrQ%FIXOTejR>;wv(Pb8u8}BUpx?yd(Abh6? zsoO3VYWkeLnF43&@*#MQ9-i-d0t*xN-UEyNKeyNMHw|A(k(_6QKO=nKMCxD(W(Yop zsRQ)QeL4X3Lxp^L%wzi2-WVSsf61dqliPUM7srDB?Wm6Lzn0&{*}|IsKQW;02(Y&| zaTKv|`U(pSzuvR6Rduu$wzK_W-Y-7>7s?G$)U}&uK;<>vU}^^ns@Z!p+9?St1s)dG zK%y6xkPyyS1$~&6v{kl?Md6gwM|>mt6Upm>oa8RLD^8T{0?HC!Z>;(Bob7el(DV6x zi`I)$&E&ngwFS@bi4^xFLAn`=fzTC;aimE^!cMI2n@Vo%Ae-ne`RF((&5y6xsjjAZ zVguVoQ?Z9uk$2ON;ersE%PU*xGO@T*;j1BO5#TuZKEf(mB7|g7pcEA=nYJ{s3vlbg zd4-DUlD{*6o%Gc^N!Nptgay>j6E5;3psI+C3Q!1ZIbeCubW%w4pq9)MSDyB{HLm|k zxv-{$$A*pS@csolri$Ge<4VZ}e~78JOL-EVyrbxKra^d{?|NnPp86!q>t<&IP07?Z z^>~IK^k#OEKgRH+LjllZXk7iA>2cfH6+(e&9ku5poo~6y{GC5>(bRK7hwjiurqAiZ zg*DmtgY}v83IjE&AbiWgMyFbaRUPZ{lYiz$U^&Zt2YjG<%m((&_JUbZcfJ22(>bi5 z!J?<7AySj0JZ&<-qXX;mcV!f~>G=sB0KnjWca4}vrtunD^1TrpfeS^4dvFr!65knK zZh`d;*VOkPs4*-9kL>$GP0`(M!j~B;#x?Ba~&s6CopvO86oM?-? zOw#dIRc;6A6T?B`Qp%^<U5 z19x(ywSH$_N+Io!6;e?`tWaM$`=Db!gzx|lQ${DG!zb1Zl&|{kX0y6xvO1o z220r<-oaS^^R2pEyY;=Qllqpmue|5yI~D|iI!IGt@iod{Opz@*ml^w2bNs)p`M(Io z|E;;m*Xpjd9l)4G#KaWfV(t8YUn@A;nK^#xgv=LtnArX|vWQVuw3}B${h+frU2>9^ z!l6)!Uo4`5k`<<;E(ido7M6lKTgWezNLq>U*=uz&s=cc$1%>VrAeOoUtA|T6gO4>UNqsdK=NF*8|~*sl&wI=x9-EGiq*aqV!(VVXA57 zw9*o6Ir8Lj1npUXvlevtn(_+^X5rzdR>#(}4YcB9O50q97%rW2me5_L=%ffYPUSRc z!vv?Kv>dH994Qi>U(a<0KF6NH5b16enCp+mw^Hb3Xs1^tThFpz!3QuN#}KBbww`(h z7GO)1olDqy6?T$()R7y%NYx*B0k_2IBiZ14&8|JPFxeMF{vW>HF-Vi3+ZOI=+qP}n zw(+!WcTd~4ZJX1!ZM&y!+uyt=&i!+~d(V%GjH;-NsEEv6nS1TERt|RHh!0>W4+4pp z1-*EzAM~i`+1f(VEHI8So`S`akPfPTfq*`l{Fz`hS%k#JS0cjT2mS0#QLGf=J?1`he3W*;m4)ce8*WFq1sdP=~$5RlH1EdWm|~dCvKOi4*I_96{^95p#B<(n!d?B z=o`0{t+&OMwKcxiBECznJcfH!fL(z3OvmxP#oWd48|mMjpE||zdiTBdWelj8&Qosv zZFp@&UgXuvJw5y=q6*28AtxZzo-UUpkRW%ne+Ylf!V-0+uQXBW=5S1o#6LXNtY5!I z%Rkz#(S8Pjz*P7bqB6L|M#Er{|QLae-Y{KA>`^} z@lPjeX>90X|34S-7}ZVXe{wEei1<{*e8T-Nbj8JmD4iwcE+Hg_zhkPVm#=@b$;)h6 z<<6y`nPa`f3I6`!28d@kdM{uJOgM%`EvlQ5B2bL)Sl=|y@YB3KeOzz=9cUW3clPAU z^sYc}xf9{4Oj?L5MOlYxR{+>w=vJjvbyO5}ptT(o6dR|ygO$)nVCvNGnq(6;bHlBd zl?w-|plD8spjDF03g5ip;W3Z z><0{BCq!Dw;h5~#1BuQilq*TwEu)qy50@+BE4bX28+7erX{BD4H)N+7U`AVEuREE8 z;X?~fyhF-x_sRfHIj~6f(+^@H)D=ngP;mwJjxhQUbUdzk8f94Ab%59-eRIq?ZKrwD z(BFI=)xrUlgu(b|hAysqK<}8bslmNNeD=#JW*}^~Nrswn^xw*nL@Tx!49bfJecV&KC2G4q5a!NSv)06A_5N3Y?veAz;Gv+@U3R% z)~UA8-0LvVE{}8LVDOHzp~2twReqf}ODIyXMM6=W>kL|OHcx9P%+aJGYi_Om)b!xe zF40Vntn0+VP>o<$AtP&JANjXBn7$}C@{+@3I@cqlwR2MdwGhVPxlTIcRVu@Ho-wO` z_~Or~IMG)A_`6-p)KPS@cT9mu9RGA>dVh5wY$NM9-^c@N=hcNaw4ITjm;iWSP^ZX| z)_XpaI61<+La+U&&%2a z0za$)-wZP@mwSELo#3!PGTt$uy0C(nTT@9NX*r3Ctw6J~7A(m#8fE)0RBd`TdKfAT zCf@$MAxjP`O(u9s@c0Fd@|}UQ6qp)O5Q5DPCeE6mSIh|Rj{$cAVIWsA=xPKVKxdhg zLzPZ`3CS+KIO;T}0Ip!fAUaNU>++ZJZRk@I(h<)RsJUhZ&Ru9*!4Ptn;gX^~4E8W^TSR&~3BAZc#HquXn)OW|TJ`CTahk+{qe`5+ixON^zA9IFd8)kc%*!AiLu z>`SFoZ5bW-%7}xZ>gpJcx_hpF$2l+533{gW{a7ce^B9sIdmLrI0)4yivZ^(Vh@-1q zFT!NQK$Iz^xu%|EOK=n>ug;(7J4OnS$;yWmq>A;hsD_0oAbLYhW^1Vdt9>;(JIYjf zdb+&f&D4@4AS?!*XpH>8egQvSVX`36jMd>$+RgI|pEg))^djhGSo&#lhS~9%NuWfX zDDH;3T*GzRT@5=7ibO>N-6_XPBYxno@mD_3I#rDD?iADxX`! zh*v8^i*JEMzyN#bGEBz7;UYXki*Xr(9xXax(_1qVW=Ml)kSuvK$coq2A(5ZGhs_pF z$*w}FbN6+QDseuB9=fdp_MTs)nQf!2SlROQ!gBJBCXD&@-VurqHj0wm@LWX-TDmS= z71M__vAok|@!qgi#H&H%Vg-((ZfxPAL8AI{x|VV!9)ZE}_l>iWk8UPTGHs*?u7RfP z5MC&=c6X;XlUzrz5q?(!eO@~* zoh2I*%J7dF!!_!vXoSIn5o|wj1#_>K*&CIn{qSaRc&iFVxt*^20ngCL;QonIS>I5^ zMw8HXm>W0PGd*}Ko)f|~dDd%;Wu_RWI_d;&2g6R3S63Uzjd7dn%Svu-OKpx*o|N>F zZg=-~qLb~VRLpv`k zWSdfHh@?dp=s_X`{yxOlxE$4iuyS;Z-x!*E6eqmEm*j2bE@=ZI0YZ5%Yj29!5+J$4h{s($nakA`xgbO8w zi=*r}PWz#lTL_DSAu1?f%-2OjD}NHXp4pXOsCW;DS@BC3h-q4_l`<))8WgzkdXg3! zs1WMt32kS2E#L0p_|x+x**TFV=gn`m9BWlzF{b%6j-odf4{7a4y4Uaef@YaeuPhU8 zHBvRqN^;$Jizy+ z=zW{E5<>2gp$pH{M@S*!sJVQU)b*J5*bX4h>5VJve#Q6ga}cQ&iL#=(u+KroWrxa%8&~p{WEUF0il=db;-$=A;&9M{Rq`ouZ5m%BHT6%st%saGsD6)fQgLN}x@d3q>FC;=f%O3Cyg=Ke@Gh`XW za@RajqOE9UB6eE=zhG%|dYS)IW)&y&Id2n7r)6p_)vlRP7NJL(x4UbhlcFXWT8?K=%s7;z?Vjts?y2+r|uk8Wt(DM*73^W%pAkZa1Jd zNoE)8FvQA>Z`eR5Z@Ig6kS5?0h;`Y&OL2D&xnnAUzQz{YSdh0k zB3exx%A2TyI)M*EM6htrxSlep!Kk(P(VP`$p0G~f$smld6W1r_Z+o?=IB@^weq>5VYsYZZR@` z&XJFxd5{|KPZmVOSxc@^%71C@;z}}WhbF9p!%yLj3j%YOlPL5s>7I3vj25 z@xmf=*z%Wb4;Va6SDk9cv|r*lhZ`(y_*M@>q;wrn)oQx%B(2A$9(74>;$zmQ!4fN; z>XurIk-7@wZys<+7XL@0Fhe-f%*=(weaQEdR9Eh6>Kl-EcI({qoZqyzziGwpg-GM#251sK_ z=3|kitS!j%;fpc@oWn65SEL73^N&t>Ix37xgs= zYG%eQDJc|rqHFia0!_sm7`@lvcv)gfy(+KXA@E{3t1DaZ$DijWAcA)E0@X?2ziJ{v z&KOYZ|DdkM{}t+@{@*6ge}m%xfjIxi%qh`=^2Rwz@w0cCvZ&Tc#UmCDbVwABrON^x zEBK43FO@weA8s7zggCOWhMvGGE`baZ62cC)VHyy!5Zbt%ieH+XN|OLbAFPZWyC6)p z4P3%8sq9HdS3=ih^0OOlqTPbKuzQ?lBEI{w^ReUO{V?@`ARsL|S*%yOS=Z%sF)>-y z(LAQdhgAcuF6LQjRYfdbD1g4o%tV4EiK&ElLB&^VZHbrV1K>tHTO{#XTo>)2UMm`2 z^t4s;vnMQgf-njU-RVBRw0P0-m#d-u`(kq7NL&2T)TjI_@iKuPAK-@oH(J8?%(e!0Ir$yG32@CGUPn5w4)+9@8c&pGx z+K3GKESI4*`tYlmMHt@br;jBWTei&(a=iYslc^c#RU3Q&sYp zSG){)V<(g7+8W!Wxeb5zJb4XE{I|&Y4UrFWr%LHkdQ;~XU zgy^dH-Z3lmY+0G~?DrC_S4@=>0oM8Isw%g(id10gWkoz2Q%7W$bFk@mIzTCcIB(K8 zc<5h&ZzCdT=9n-D>&a8vl+=ZF*`uTvQviG_bLde*k>{^)&0o*b05x$MO3gVLUx`xZ z43j+>!u?XV)Yp@MmG%Y`+COH2?nQcMrQ%k~6#O%PeD_WvFO~Kct za4XoCM_X!c5vhRkIdV=xUB3xI2NNStK*8_Zl!cFjOvp-AY=D;5{uXj}GV{LK1~IE2 z|KffUiBaStRr;10R~K2VVtf{TzM7FaPm;Y(zQjILn+tIPSrJh&EMf6evaBKIvi42-WYU9Vhj~3< zZSM-B;E`g_o8_XTM9IzEL=9Lb^SPhe(f(-`Yh=X6O7+6ALXnTcUFpI>ekl6v)ZQeNCg2 z^H|{SKXHU*%nBQ@I3It0m^h+6tvI@FS=MYS$ZpBaG7j#V@P2ZuYySbp@hA# ze(kc;P4i_-_UDP?%<6>%tTRih6VBgScKU^BV6Aoeg6Uh(W^#J^V$Xo^4#Ekp ztqQVK^g9gKMTHvV7nb64UU7p~!B?>Y0oFH5T7#BSW#YfSB@5PtE~#SCCg3p^o=NkMk$<8- z6PT*yIKGrvne7+y3}_!AC8NNeI?iTY(&nakN>>U-zT0wzZf-RuyZk^X9H-DT_*wk= z;&0}6LsGtfVa1q)CEUPlx#(ED@-?H<1_FrHU#z5^P3lEB|qsxEyn%FOpjx z3S?~gvoXy~L(Q{Jh6*i~=f%9kM1>RGjBzQh_SaIDfSU_9!<>*Pm>l)cJD@wlyxpBV z4Fmhc2q=R_wHCEK69<*wG%}mgD1=FHi4h!98B-*vMu4ZGW~%IrYSLGU{^TuseqVgV zLP<%wirIL`VLyJv9XG_p8w@Q4HzNt-o;U@Au{7%Ji;53!7V8Rv0^Lu^Vf*sL>R(;c zQG_ZuFl)Mh-xEIkGu}?_(HwkB2jS;HdPLSxVU&Jxy9*XRG~^HY(f0g8Q}iqnVmgjI zfd=``2&8GsycjR?M%(zMjn;tn9agcq;&rR!Hp z$B*gzHsQ~aXw8c|a(L^LW(|`yGc!qOnV(ZjU_Q-4z1&0;jG&vAKuNG=F|H?@m5^N@ zq{E!1n;)kNTJ>|Hb2ODt-7U~-MOIFo%9I)_@7fnX+eMMNh>)V$IXesJpBn|uo8f~#aOFytCT zf9&%MCLf8mp4kwHTcojWmM3LU=#|{3L>E}SKwOd?%{HogCZ_Z1BSA}P#O(%H$;z7XyJ^sjGX;j5 zrzp>|Ud;*&VAU3x#f{CKwY7Vc{%TKKqmB@oTHA9;>?!nvMA;8+Jh=cambHz#J18x~ zs!dF>$*AnsQ{{82r5Aw&^7eRCdvcgyxH?*DV5(I$qXh^zS>us*I66_MbL8y4d3ULj z{S(ipo+T3Ag!+5`NU2sc+@*m{_X|&p#O-SAqF&g_n7ObB82~$p%fXA5GLHMC+#qqL zdt`sJC&6C2)=juQ_!NeD>U8lDVpAOkW*khf7MCcs$A(wiIl#B9HM%~GtQ^}yBPjT@ z+E=|A!Z?A(rwzZ;T}o6pOVqHzTr*i;Wrc%&36kc@jXq~+w8kVrs;%=IFdACoLAcCAmhFNpbP8;s`zG|HC2Gv?I~w4ITy=g$`0qMQdkijLSOtX6xW%Z9Nw<;M- zMN`c7=$QxN00DiSjbVt9Mi6-pjv*j(_8PyV-il8Q-&TwBwH1gz1uoxs6~uU}PrgWB zIAE_I-a1EqlIaGQNbcp@iI8W1sm9fBBNOk(k&iLBe%MCo#?xI$%ZmGA?=)M9D=0t7 zc)Q0LnI)kCy{`jCGy9lYX%mUsDWwsY`;jE(;Us@gmWPqjmXL+Hu#^;k%eT>{nMtzj zsV`Iy6leTA8-PndszF;N^X@CJrTw5IIm!GPeu)H2#FQitR{1p;MasQVAG3*+=9FYK zw*k!HT(YQorfQj+1*mCV458(T5=fH`um$gS38hw(OqVMyunQ;rW5aPbF##A3fGH6h z@W)i9Uff?qz`YbK4c}JzQpuxuE3pcQO)%xBRZp{zJ^-*|oryTxJ-rR+MXJ)!f=+pp z10H|DdGd2exhi+hftcYbM0_}C0ZI-2vh+$fU1acsB-YXid7O|=9L!3e@$H*6?G*Zp z%qFB(sgl=FcC=E4CYGp4CN>=M8#5r!RU!u+FJVlH6=gI5xHVD&k;Ta*M28BsxfMV~ zLz+@6TxnfLhF@5=yQo^1&S}cmTN@m!7*c6z;}~*!hNBjuE>NLVl2EwN!F+)0$R1S! zR|lF%n!9fkZ@gPW|x|B={V6x3`=jS*$Pu0+5OWf?wnIy>Y1MbbGSncpKO0qE(qO=ts z!~@&!N`10S593pVQu4FzpOh!tvg}p%zCU(aV5=~K#bKi zHdJ1>tQSrhW%KOky;iW+O_n;`l9~omqM%sdxdLtI`TrJzN6BQz+7xOl*rM>xVI2~# z)7FJ^Dc{DC<%~VS?@WXzuOG$YPLC;>#vUJ^MmtbSL`_yXtNKa$Hk+l-c!aC7gn(Cg ze?YPYZ(2Jw{SF6MiO5(%_pTo7j@&DHNW`|lD`~{iH+_eSTS&OC*2WTT*a`?|9w1dh zh1nh@$a}T#WE5$7Od~NvSEU)T(W$p$s5fe^GpG+7fdJ9=enRT9$wEk+ZaB>G3$KQO zgq?-rZZnIv!p#>Ty~}c*Lb_jxJg$eGM*XwHUwuQ|o^}b3^T6Bxx{!?va8aC@-xK*H ztJBFvFfsSWu89%@b^l3-B~O!CXs)I6Y}y#0C0U0R0WG zybjroj$io0j}3%P7zADXOwHwafT#uu*zfM!oD$6aJx7+WL%t-@6^rD_a_M?S^>c;z zMK580bZXo1f*L$CuMeM4Mp!;P@}b~$cd(s5*q~FP+NHSq;nw3fbWyH)i2)-;gQl{S zZO!T}A}fC}vUdskGSq&{`oxt~0i?0xhr6I47_tBc`fqaSrMOzR4>0H^;A zF)hX1nfHs)%Zb-(YGX;=#2R6C{BG;k=?FfP?9{_uFLri~-~AJ;jw({4MU7e*d)?P@ zXX*GkNY9ItFjhwgAIWq7Y!ksbMzfqpG)IrqKx9q{zu%Mdl+{Dis#p9q`02pr1LG8R z@As?eG!>IoROgS!@J*to<27coFc1zpkh?w=)h9CbYe%^Q!Ui46Y*HO0mr% zEff-*$ndMNw}H2a5@BsGj5oFfd!T(F&0$<{GO!Qdd?McKkorh=5{EIjDTHU`So>8V zBA-fqVLb2;u7UhDV1xMI?y>fe3~4urv3%PX)lDw+HYa;HFkaLqi4c~VtCm&Ca+9C~ zge+67hp#R9`+Euq59WhHX&7~RlXn=--m8$iZ~~1C8cv^2(qO#X0?vl91gzUKBeR1J z^p4!!&7)3#@@X&2aF2-)1Ffcc^F8r|RtdL2X%HgN&XU-KH2SLCbpw?J5xJ*!F-ypZ zMG%AJ!Pr&}`LW?E!K~=(NJxuSVTRCGJ$2a*Ao=uUDSys!OFYu!Vs2IT;xQ6EubLIl z+?+nMGeQQhh~??0!s4iQ#gm3!BpMpnY?04kK375e((Uc7B3RMj;wE?BCoQGu=UlZt!EZ1Q*auI)dj3Jj{Ujgt zW5hd~-HWBLI_3HuO) zNrb^XzPsTIb=*a69wAAA3J6AAZZ1VsYbIG}a`=d6?PjM)3EPaDpW2YP$|GrBX{q*! z$KBHNif)OKMBCFP5>!1d=DK>8u+Upm-{hj5o|Wn$vh1&K!lVfDB&47lw$tJ?d5|=B z^(_9=(1T3Fte)z^>|3**n}mIX;mMN5v2F#l(q*CvU{Ga`@VMp#%rQkDBy7kYbmb-q z<5!4iuB#Q_lLZ8}h|hPODI^U6`gzLJre9u3k3c#%86IKI*^H-@I48Bi*@avYm4v!n0+v zWu{M{&F8#p9cx+gF0yTB_<2QUrjMPo9*7^-uP#~gGW~y3nfPAoV%amgr>PSyVAd@l)}8#X zR5zV6t*uKJZL}?NYvPVK6J0v4iVpwiN|>+t3aYiZSp;m0!(1`bHO}TEtWR1tY%BPB z(W!0DmXbZAsT$iC13p4f>u*ZAy@JoLAkJhzFf1#4;#1deO8#8d&89}en&z!W&A3++^1(;>0SB1*54d@y&9Pn;^IAf3GiXbfT`_>{R+Xv; zQvgL>+0#8-laO!j#-WB~(I>l0NCMt_;@Gp_f0#^c)t?&#Xh1-7RR0@zPyBz!U#0Av zT?}n({(p?p7!4S2ZBw)#KdCG)uPnZe+U|0{BW!m)9 zi_9$F?m<`2!`JNFv+w8MK_K)qJ^aO@7-Ig>cM4-r0bi=>?B_2mFNJ}aE3<+QCzRr*NA!QjHw# z`1OsvcoD0?%jq{*7b!l|L1+Tw0TTAM4XMq7*ntc-Ived>Sj_ZtS|uVdpfg1_I9knY z2{GM_j5sDC7(W&}#s{jqbybqJWyn?{PW*&cQIU|*v8YGOKKlGl@?c#TCnmnAkAzV- zmK={|1G90zz=YUvC}+fMqts0d4vgA%t6Jhjv?d;(Z}(Ep8fTZfHA9``fdUHkA+z3+ zhh{ohP%Bj?T~{i0sYCQ}uC#5BwN`skI7`|c%kqkyWIQ;!ysvA8H`b-t()n6>GJj6xlYDu~8qX{AFo$Cm3d|XFL=4uvc?Keb zzb0ZmMoXca6Mob>JqkNuoP>B2Z>D`Q(TvrG6m`j}-1rGP!g|qoL=$FVQYxJQjFn33lODt3Wb1j8VR zlR++vIT6^DtYxAv_hxupbLLN3e0%A%a+hWTKDV3!Fjr^cWJ{scsAdfhpI)`Bms^M6 zQG$waKgFr=c|p9Piug=fcJvZ1ThMnNhQvBAg-8~b1?6wL*WyqXhtj^g(Ke}mEfZVM zJuLNTUVh#WsE*a6uqiz`b#9ZYg3+2%=C(6AvZGc=u&<6??!slB1a9K)=VL zY9EL^mfyKnD zSJyYBc_>G;5RRnrNgzJz#Rkn3S1`mZgO`(r5;Hw6MveN(URf_XS-r58Cn80K)ArH4 z#Rrd~LG1W&@ttw85cjp8xV&>$b%nSXH_*W}7Ch2pg$$c0BdEo-HWRTZcxngIBJad> z;C>b{jIXjb_9Jis?NZJsdm^EG}e*pR&DAy0EaSGi3XWTa(>C%tz1n$u?5Fb z1qtl?;_yjYo)(gB^iQq?=jusF%kywm?CJP~zEHi0NbZ);$(H$w(Hy@{i>$wcVRD_X|w-~(0Z9BJyh zhNh;+eQ9BEIs;tPz%jSVnfCP!3L&9YtEP;svoj_bNzeGSQIAjd zBss@A;)R^WAu-37RQrM%{DfBNRx>v!G31Z}8-El9IOJlb_MSoMu2}GDYycNaf>uny z+8xykD-7ONCM!APry_Lw6-yT>5!tR}W;W`C)1>pxSs5o1z#j7%m=&=7O4hz+Lsqm` z*>{+xsabZPr&X=}G@obTb{nPTkccJX8w3CG7X+1+t{JcMabv~UNv+G?txRqXib~c^Mo}`q{$`;EBNJ;#F*{gvS12kV?AZ%O0SFB$^ zn+}!HbmEj}w{Vq(G)OGAzH}R~kS^;(-s&=ectz8vN!_)Yl$$U@HNTI-pV`LSj7Opu zTZ5zZ)-S_{GcEQPIQXLQ#oMS`HPu{`SQiAZ)m1at*Hy%3xma|>o`h%E%8BEbi9p0r zVjcsh<{NBKQ4eKlXU|}@XJ#@uQw*$4BxKn6#W~I4T<^f99~(=}a`&3(ur8R9t+|AQ zWkQx7l}wa48-jO@ft2h+7qn%SJtL%~890FG0s5g*kNbL3I&@brh&f6)TlM`K^(bhr zJWM6N6x3flOw$@|C@kPi7yP&SP?bzP-E|HSXQXG>7gk|R9BTj`e=4de9C6+H7H7n# z#GJeVs1mtHhLDmVO?LkYRQc`DVOJ_vdl8VUihO-j#t=0T3%Fc1f9F73ufJz*adn*p zc%&vi(4NqHu^R>sAT_0EDjVR8bc%wTz#$;%NU-kbDyL_dg0%TFafZwZ?5KZpcuaO54Z9hX zD$u>q!-9`U6-D`E#`W~fIfiIF5_m6{fvM)b1NG3xf4Auw;Go~Fu7cth#DlUn{@~yu z=B;RT*dp?bO}o%4x7k9v{r=Y@^YQ^UUm(Qmliw8brO^=NP+UOohLYiaEB3^DB56&V zK?4jV61B|1Uj_5fBKW;8LdwOFZKWp)g{B%7g1~DgO&N& z#lisxf?R~Z@?3E$Mms$$JK8oe@X`5m98V*aV6Ua}8Xs2#A!{x?IP|N(%nxsH?^c{& z@vY&R1QmQs83BW28qAmJfS7MYi=h(YK??@EhjL-t*5W!p z^gYX!Q6-vBqcv~ruw@oMaU&qp0Fb(dbVzm5xJN%0o_^@fWq$oa3X?9s%+b)x4w-q5Koe(@j6Ez7V@~NRFvd zfBH~)U5!ix3isg`6be__wBJp=1@yfsCMw1C@y+9WYD9_C%{Q~7^0AF2KFryfLlUP# zwrtJEcH)jm48!6tUcxiurAMaiD04C&tPe6DI0#aoqz#Bt0_7_*X*TsF7u*zv(iEfA z;$@?XVu~oX#1YXtceQL{dSneL&*nDug^OW$DSLF0M1Im|sSX8R26&)<0Fbh^*l6!5wfSu8MpMoh=2l z^^0Sr$UpZp*9oqa23fcCfm7`ya2<4wzJ`Axt7e4jJrRFVf?nY~2&tRL* zd;6_njcz01c>$IvN=?K}9ie%Z(BO@JG2J}fT#BJQ+f5LFSgup7i!xWRKw6)iITjZU z%l6hPZia>R!`aZjwCp}I zg)%20;}f+&@t;(%5;RHL>K_&7MH^S+7<|(SZH!u zznW|jz$uA`P9@ZWtJgv$EFp>)K&Gt+4C6#*khZQXS*S~6N%JDT$r`aJDs9|uXWdbg zBwho$phWx}x!qy8&}6y5Vr$G{yGSE*r$^r{}pw zVTZKvikRZ`J_IJrjc=X1uw?estdwm&bEahku&D04HD+0Bm~q#YGS6gp!KLf$A{%Qd z&&yX@Hp>~(wU{|(#U&Bf92+1i&Q*-S+=y=3pSZy$#8Uc$#7oiJUuO{cE6=tsPhwPe| zxQpK>`Dbka`V)$}e6_OXKLB%i76~4N*zA?X+PrhH<&)}prET;kel24kW%+9))G^JI zsq7L{P}^#QsZViX%KgxBvEugr>ZmFqe^oAg?{EI=&_O#e)F3V#rc z8$4}0Zr19qd3tE4#$3_f=Bbx9oV6VO!d3(R===i-7p=Vj`520w0D3W6lQfY48}!D* z&)lZMG;~er2qBoI2gsX+Ts-hnpS~NYRDtPd^FPzn!^&yxRy#CSz(b&E*tL|jIkq|l zf%>)7Dtu>jCf`-7R#*GhGn4FkYf;B$+9IxmqH|lf6$4irg{0ept__%)V*R_OK=T06 zyT_m-o@Kp6U{l5h>W1hGq*X#8*y@<;vsOFqEjTQXFEotR+{3}ODDnj;o0@!bB5x=N z394FojuGOtVKBlVRLtHp%EJv_G5q=AgF)SKyRN5=cGBjDWv4LDn$IL`*=~J7u&Dy5 zrMc83y+w^F&{?X(KOOAl-sWZDb{9X9#jrQtmrEXD?;h-}SYT7yM(X_6qksM=K_a;Z z3u0qT0TtaNvDER_8x*rxXw&C^|h{P1qxK|@pS7vdlZ#P z7PdB7MmC2}%sdzAxt>;WM1s0??`1983O4nFK|hVAbHcZ3x{PzytQLkCVk7hA!Lo` zEJH?4qw|}WH{dc4z%aB=0XqsFW?^p=X}4xnCJXK%c#ItOSjdSO`UXJyuc8bh^Cf}8 z@Ht|vXd^6{Fgai8*tmyRGmD_s_nv~r^Fy7j`Bu`6=G)5H$i7Q7lvQnmea&TGvJp9a|qOrUymZ$6G|Ly z#zOCg++$3iB$!6!>215A4!iryregKuUT344X)jQb3|9qY>c0LO{6Vby05n~VFzd?q zgGZv&FGlkiH*`fTurp>B8v&nSxNz)=5IF$=@rgND4d`!AaaX;_lK~)-U8la_Wa8i?NJC@BURO*sUW)E9oyv3RG^YGfN%BmxzjlT)bp*$<| zX3tt?EAy<&K+bhIuMs-g#=d1}N_?isY)6Ay$mDOKRh z4v1asEGWoAp=srraLW^h&_Uw|6O+r;wns=uwYm=JN4Q!quD8SQRSeEcGh|Eb5Jg8m zOT}u;N|x@aq)=&;wufCc^#)5U^VcZw;d_wwaoh9$p@Xrc{DD6GZUqZ ziC6OT^zSq@-lhbgR8B+e;7_Giv;DK5gn^$bs<6~SUadiosfewWDJu`XsBfOd1|p=q zE>m=zF}!lObA%ePey~gqU8S6h-^J2Y?>7)L2+%8kV}Gp=h`Xm_}rlm)SyUS=`=S7msKu zC|T!gPiI1rWGb1z$Md?0YJQ;%>uPLOXf1Z>N~`~JHJ!^@D5kSXQ4ugnFZ>^`zH8CAiZmp z6Ms|#2gcGsQ{{u7+Nb9sA?U>(0e$5V1|WVwY`Kn)rsnnZ4=1u=7u!4WexZD^IQ1Jk zfF#NLe>W$3m&C^ULjdw+5|)-BSHwpegdyt9NYC{3@QtMfd8GrIWDu`gd0nv-3LpGCh@wgBaG z176tikL!_NXM+Bv#7q^cyn9$XSeZR6#!B4JE@GVH zoobHZN_*RF#@_SVYKkQ_igme-Y5U}cV(hkR#k1c{bQNMji zU7aE`?dHyx=1`kOYZo_8U7?3-7vHOp`Qe%Z*i+FX!s?6huNp0iCEW-Z7E&jRWmUW_ z67j>)Ew!yq)hhG4o?^z}HWH-e=es#xJUhDRc4B51M4~E-l5VZ!&zQq`gWe`?}#b~7w1LH4Xa-UCT5LXkXQWheBa2YJYbyQ zl1pXR%b(KCXMO0OsXgl0P0Og<{(@&z1aokU-Pq`eQq*JYgt8xdFQ6S z6Z3IFSua8W&M#`~*L#r>Jfd6*BzJ?JFdBR#bDv$_0N!_5vnmo@!>vULcDm`MFU823 zpG9pqjqz^FE5zMDoGqhs5OMmC{Y3iVcl>F}5Rs24Y5B^mYQ;1T&ks@pIApHOdrzXF z-SdX}Hf{X;TaSxG_T$0~#RhqKISGKNK47}0*x&nRIPtmdwxc&QT3$8&!3fWu1eZ_P zJveQj^hJL#Sn!*4k`3}(d(aasl&7G0j0-*_2xtAnoX1@9+h zO#c>YQg60Z;o{Bi=3i7S`Ic+ZE>K{(u|#)9y}q*j8uKQ1^>+(BI}m%1v3$=4ojGBc zm+o1*!T&b}-lVvZqIUBc8V}QyFEgm#oyIuC{8WqUNV{Toz`oxhYpP!_p2oHHh5P@iB*NVo~2=GQm+8Yrkm2Xjc_VyHg1c0>+o~@>*Qzo zHVBJS>$$}$_4EniTI;b1WShX<5-p#TPB&!;lP!lBVBbLOOxh6FuYloD%m;n{r|;MU3!q4AVkua~fieeWu2 zQAQ$ue(IklX6+V;F1vCu-&V?I3d42FgWgsb_e^29ol}HYft?{SLf>DrmOp9o!t>I^ zY7fBCk+E8n_|apgM|-;^=#B?6RnFKlN`oR)`e$+;D=yO-(U^jV;rft^G_zl`n7qnM zL z*-Y4Phq+ZI1$j$F-f;`CD#|`-T~OM5Q>x}a>B~Gb3-+9i>Lfr|Ca6S^8g*{*?_5!x zH_N!SoRP=gX1?)q%>QTY!r77e2j9W(I!uAz{T`NdNmPBBUzi2{`XMB^zJGGwFWeA9 z{fk33#*9SO0)DjROug+(M)I-pKA!CX;IY(#gE!UxXVsa)X!UftIN98{pt#4MJHOhY zM$_l}-TJlxY?LS6Nuz1T<44m<4i^8k@D$zuCPrkmz@sdv+{ciyFJG2Zwy&%c7;atIeTdh!a(R^QXnu1Oq1b42*OQFWnyQ zWeQrdvP|w_idy53Wa<{QH^lFmEd+VlJkyiC>6B#s)F;w-{c;aKIm;Kp50HnA-o3lY z9B~F$gJ@yYE#g#X&3ADx&tO+P_@mnQTz9gv30_sTsaGXkfNYXY{$(>*PEN3QL>I!k zp)KibPhrfX3%Z$H6SY`rXGYS~143wZrG2;=FLj50+VM6soI~up_>fU(2Wl@{BRsMi zO%sL3x?2l1cXTF)k&moNsHfQrQ+wu(gBt{sk#CU=UhrvJIncy@tJX5klLjgMn>~h= zg|FR&;@eh|C7`>s_9c~0-{IAPV){l|Ts`i=)AW;d9&KPc3fMeoTS%8@V~D8*h;&(^>yjT84MM}=%#LS7shLAuuj(0VAYoozhWjq z4LEr?wUe2^WGwdTIgWBkDUJa>YP@5d9^Rs$kCXmMRxuF*YMVrn?0NFyPl}>`&dqZb z<5eqR=ZG3>n2{6v6BvJ`YBZeeTtB88TAY(x0a58EWyuf>+^|x8Qa6wA|1Nb_p|nA zWWa}|z8a)--Wj`LqyFk_a3gN2>5{Rl_wbW?#by7&i*^hRknK%jwIH6=dQ8*-_{*x0j^DUfMX0`|K@6C<|1cgZ~D(e5vBFFm;HTZF(!vT8=T$K+|F)x3kqzBV4-=p1V(lzi(s7jdu0>LD#N=$Lk#3HkG!a zIF<7>%B7sRNzJ66KrFV76J<2bdYhxll0y2^_rdG=I%AgW4~)1Nvz=$1UkE^J%BxLo z+lUci`UcU062os*=`-j4IfSQA{w@y|3}Vk?i;&SSdh8n+$iHA#%ERL{;EpXl6u&8@ zzg}?hkEOUOJt?ZL=pWZFJ19mI1@P=$U5*Im1e_8Z${JsM>Ov?nh8Z zP5QvI!{Jy@&BP48%P2{Jr_VgzW;P@7)M9n|lDT|Ep#}7C$&ud&6>C^5ZiwKIg2McPU(4jhM!BD@@L(Gd*Nu$ji(ljZ<{FIeW_1Mmf;76{LU z-ywN~=uNN)Xi6$<12A9y)K%X|(W0p|&>>4OXB?IiYr||WKDOJPxiSe01NSV-h24^L z_>m$;|C+q!Mj**-qQ$L-*++en(g|hw;M!^%_h-iDjFHLo-n3JpB;p?+o2;`*jpvJU zLY^lt)Un4joij^^)O(CKs@7E%*!w>!HA4Q?0}oBJ7Nr8NQ7QmY^4~jvf0-`%waOLn zdNjAPaC0_7c|RVhw)+71NWjRi!y>C+Bl;Z`NiL^zn2*0kmj5gyhCLCxts*cWCdRI| zjsd=sT5BVJc^$GxP~YF$-U{-?kW6r@^vHXB%{CqYzU@1>dzf#3SYedJG-Rm6^RB7s zGM5PR(yKPKR)>?~vpUIeTP7A1sc8-knnJk*9)3t^e%izbdm>Y=W{$wm(cy1RB-19i za#828DMBY+ps#7Y8^6t)=Ea@%Nkt)O6JCx|ybC;Ap}Z@Zw~*}3P>MZLPb4Enxz9Wf zssobT^(R@KuShj8>@!1M7tm|2%-pYYDxz-5`rCbaTCG5{;Uxm z*g=+H1X8{NUvFGzz~wXa%Eo};I;~`37*WrRU&K0dPSB$yk(Z*@K&+mFal^?c zurbqB-+|Kb5|sznT;?Pj!+kgFY1#Dr;_%A(GIQC{3ct|{*Bji%FNa6c-thbpBkA;U zURV!Dr&X{0J}iht#-Qp2=xzuh(fM>zRoiGrYl5ttw2#r34gC41CCOC31m~^UPTK@s z6;A@)7O7_%C)>bnAXerYuAHdE93>j2N}H${zEc6&SbZ|-fiG*-qtGuy-qDelH(|u$ zorf8_T6Zqe#Ub!+e3oSyrskt_HyW_^5lrWt#30l)tHk|j$@YyEkXUOV;6B51L;M@=NIWZXU;GrAa(LGxO%|im%7F<-6N;en0Cr zLH>l*y?pMwt`1*cH~LdBPFY_l;~`N!Clyfr;7w<^X;&(ZiVdF1S5e(+Q%60zgh)s4 zn2yj$+mE=miVERP(g8}G4<85^-5f@qxh2ec?n+$A_`?qN=iyT1?U@t?V6DM~BIlBB z>u~eXm-aE>R0sQy!-I4xtCNi!!qh?R1!kKf6BoH2GG{L4%PAz0{Sh6xpuyI%*~u)s z%rLuFl)uQUCBQAtMyN;%)zFMx4loh7uTfKeB2Xif`lN?2gq6NhWhfz0u5WP9J>=V2 zo{mLtSy&BA!mSzs&CrKWq^y40JF5a&GSXIi2= z{EYb59J4}VwikL4P=>+mc6{($FNE@e=VUwG+KV21;<@lrN`mnz5jYGASyvz7BOG_6(p^eTxD-4O#lROgon;R35=|nj#eHIfJBYPWG>H>`dHKCDZ3`R{-?HO0mE~(5_WYcFmp8sU?wr*UkAQiNDGc6T zA%}GOLXlOWqL?WwfHO8MB#8M8*~Y*gz;1rWWoVSXP&IbKxbQ8+s%4Jnt?kDsq7btI zCDr0PZ)b;B%!lu&CT#RJzm{l{2fq|BcY85`w~3LSK<><@(2EdzFLt9Y_`;WXL6x`0 zDoQ?=?I@Hbr;*VVll1Gmd8*%tiXggMK81a+T(5Gx6;eNb8=uYn z5BG-0g>pP21NPn>$ntBh>`*})Fl|38oC^9Qz>~MAazH%3Q~Qb!ALMf$srexgPZ2@&c~+hxRi1;}+)-06)!#Mq<6GhP z-Q?qmgo${aFBApb5p}$1OJKTClfi8%PpnczyVKkoHw7Ml9e7ikrF0d~UB}i3vizos zXW4DN$SiEV9{faLt5bHy2a>33K%7Td-n5C*N;f&ZqAg#2hIqEb(y<&f4u5BWJ>2^4 z414GosL=Aom#m&=x_v<0-fp1r%oVJ{T-(xnomNJ(Dryv zh?vj+%=II_nV+@NR+(!fZZVM&(W6{6%9cm+o+Z6}KqzLw{(>E86uA1`_K$HqINlb1 zKelh3-jr2I9V?ych`{hta9wQ2c9=MM`2cC{m6^MhlL2{DLv7C^j z$xXBCnDl_;l|bPGMX@*tV)B!c|4oZyftUlP*?$YU9C_eAsuVHJ58?)zpbr30P*C`T z7y#ao`uE-SOG(Pi+`$=e^mle~)pRrdwL5)N;o{gpW21of(QE#U6w%*C~`v-z0QqBML!!5EeYA5IQB0 z^l01c;L6E(iytN!LhL}wfwP7W9PNAkb+)Cst?qg#$n;z41O4&v+8-zPs+XNb-q zIeeBCh#ivnFLUCwfS;p{LC0O7tm+Sf9Jn)~b%uwP{%69;QC)Ok0t%*a5M+=;y8j=v z#!*pp$9@!x;UMIs4~hP#pnfVc!%-D<+wsG@R2+J&%73lK|2G!EQC)O05TCV=&3g)C!lT=czLpZ@Sa%TYuoE?v8T8`V;e$#Zf2_Nj6nvBgh1)2 GZ~q4|mN%#X literal 0 HcmV?d00001 diff --git a/sanho/jpa-ex/gradle/wrapper/gradle-wrapper.properties b/sanho/jpa-ex/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..df97d72 --- /dev/null +++ b/sanho/jpa-ex/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/sanho/jpa-ex/gradlew b/sanho/jpa-ex/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/sanho/jpa-ex/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$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=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/sanho/jpa-ex/gradlew.bat b/sanho/jpa-ex/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/sanho/jpa-ex/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=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/sanho/jpa-ex/settings.gradle b/sanho/jpa-ex/settings.gradle new file mode 100644 index 0000000..de60b54 --- /dev/null +++ b/sanho/jpa-ex/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'jpa-ex' diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/JpaExApplication.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/JpaExApplication.java new file mode 100644 index 0000000..cb1bc39 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/JpaExApplication.java @@ -0,0 +1,15 @@ +package umc.jpa_ex; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@SpringBootApplication +@EnableJpaAuditing +public class JpaExApplication { + + public static void main(String[] args) { + SpringApplication.run(JpaExApplication.class, args); + } + +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/FoodCategory.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/FoodCategory.java new file mode 100644 index 0000000..ee6b30c --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/FoodCategory.java @@ -0,0 +1,27 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; +import umc.jpa_ex.domain.mapping.SelectCategory; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class FoodCategory extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @OneToMany(mappedBy = "foodCategory", cascade = CascadeType.ALL) + private List selectCategoryList = new ArrayList<>(); +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/MarketingAlarm.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/MarketingAlarm.java new file mode 100644 index 0000000..6cfef28 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/MarketingAlarm.java @@ -0,0 +1,29 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MarketingAlarm extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private Boolean isConfirmed; // 미션 확인 여부 + + @Column(nullable = false, length = 30) + private String title; + + @Column(columnDefinition = "TEXT") + private String body; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Member.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Member.java new file mode 100644 index 0000000..07f9e0e --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Member.java @@ -0,0 +1,69 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; +import umc.jpa_ex.domain.embedded.Address; +import umc.jpa_ex.domain.enums.Gender; +import umc.jpa_ex.domain.enums.MemberStatus; +import umc.jpa_ex.domain.mapping.MemberAgree; +import umc.jpa_ex.domain.mapping.MemberMission; +import umc.jpa_ex.domain.mapping.SelectCategory; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Member extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 10) + private String name; + + @Column(nullable = false, length = 10) + private String nickname; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 10) + private Gender gender; + + private LocalDate birthdate; // date 타입이라 LocalDate + + @Embedded + private Address address; // 내장 타입 + + private int point; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 15) + private MemberStatus status; + + private LocalDateTime inactiveDate; // datetime 타입이므로 LocalDateTime + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) // CascadeType.ALL로 인해 persist(member) 하면 같이 persist 됨. + private List memberAgreeList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List selectCategoryList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List memberMissionList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List reviewAlarmList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List marketingAlarmList = new ArrayList<>(); +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Mission.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Mission.java new file mode 100644 index 0000000..f1fa46d --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Mission.java @@ -0,0 +1,40 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; +import umc.jpa_ex.domain.mapping.MemberMission; + +import java.time.LocalDate; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) // 데이터 삽입하면 자동 id를 넣어줌. 1,2,3,4,5에서 1 삭제 되어도 2,3,4,5 그대로 남아있음 + private Long id; + + private int reward; + + @Column(nullable = false, length = 30) + private String title; + + @Column(columnDefinition = "TEXT") + private String body; + + private LocalDateTime deadline; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) + private List memberMissionList = new ArrayList<>(); +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Region.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Region.java new file mode 100644 index 0000000..7f62f2f --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Region.java @@ -0,0 +1,26 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region extends BaseEntity{ + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @OneToMany(mappedBy = "region", cascade = CascadeType.ALL) + private List storeList = new ArrayList<>(); +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Review.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Review.java new file mode 100644 index 0000000..b2eff46 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Review.java @@ -0,0 +1,35 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private Double rating; // 리뷰 별점 + + private String content; // 리뷰 내용, String은 기본이 varchar(255) + + @Column(columnDefinition = "TEXT") + private String reviewPictureUrl; // 리뷰 사진 URL + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + +} + + diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/ReviewAlarm.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/ReviewAlarm.java new file mode 100644 index 0000000..f743b92 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/ReviewAlarm.java @@ -0,0 +1,29 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class ReviewAlarm extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private Boolean isConfirmed; // 미션 확인 여부 + + @Column(nullable = false, length = 30) + private String title; + + @Column(columnDefinition = "TEXT") + private String body; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Store.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Store.java new file mode 100644 index 0000000..167ade2 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Store.java @@ -0,0 +1,64 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; +import umc.jpa_ex.domain.embedded.Address; +import umc.jpa_ex.domain.enums.StoreStatus; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 10) + private String name; + + @Column(nullable = false, length = 20) + private String information; // 가게 정보 + + @Column(columnDefinition = "TEXT") + private String storePictureUrl; // 가게 사진 URL + + @Embedded + private Address address; + + @Column(nullable = false, length = 20) + private String foodCategory; // 가게 음식 카테고리 + + @Column(nullable = false, length = 20) + private String phoneNumber; + + private String description; // 가게 소개글 + + private Double rating; // 가게 별점 + + private int reviewCount; // 가게 리뷰 개수 + + private String operationHour; // 가게 운영 시간 + + private String closeDay; // 가게 휴무일 + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 15) + private StoreStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List missionList = new ArrayList<>(); +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Terms.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Terms.java new file mode 100644 index 0000000..9e4715c --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/Terms.java @@ -0,0 +1,32 @@ +package umc.jpa_ex.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.common.BaseEntity; +import umc.jpa_ex.domain.mapping.MemberAgree; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Terms extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String body; + + private Boolean optional; + + @OneToMany(mappedBy = "terms", cascade = CascadeType.ALL) + private List memberAgreeList = new ArrayList<>(); +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/common/BaseEntity.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/common/BaseEntity.java new file mode 100644 index 0000000..1eca2bc --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/common/BaseEntity.java @@ -0,0 +1,25 @@ +package umc.jpa_ex.domain.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + @Column(columnDefinition = "DATETIME(6)") + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(columnDefinition = "DATETIME(6)") + private LocalDateTime updatedAt; +} \ No newline at end of file diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/embedded/Address.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/embedded/Address.java new file mode 100644 index 0000000..40368c6 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/embedded/Address.java @@ -0,0 +1,22 @@ +package umc.jpa_ex.domain.embedded; + +import jakarta.persistence.Embeddable; +import lombok.Getter; + +@Embeddable // 어딘가 내장이 될 수 있다. +@Getter +public class Address { + + private String city; + private String street; + private String zipcode; + + protected Address() { + } + + public Address(String city, String street, String zipcode) { + this.city = city; + this.street = street; + this.zipcode = zipcode; + } +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/Gender.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/Gender.java new file mode 100644 index 0000000..dc474a1 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package umc.jpa_ex.domain.enums; + +public enum Gender { + MALE, FEMALE; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MemberStatus.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MemberStatus.java new file mode 100644 index 0000000..b91ec72 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MemberStatus.java @@ -0,0 +1,5 @@ +package umc.jpa_ex.domain.enums; + +public enum MemberStatus { + ACTIVE, INACTIVE; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MissionStatus.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MissionStatus.java new file mode 100644 index 0000000..5a13b74 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package umc.jpa_ex.domain.enums; + +public enum MissionStatus { + CHALLENGING, COMPLETE; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/StoreStatus.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/StoreStatus.java new file mode 100644 index 0000000..9e5d41b --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/enums/StoreStatus.java @@ -0,0 +1,5 @@ +package umc.jpa_ex.domain.enums; + +public enum StoreStatus { + OPEN, CLOSE; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberAgree.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberAgree.java new file mode 100644 index 0000000..585c03e --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberAgree.java @@ -0,0 +1,27 @@ +package umc.jpa_ex.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.Member; +import umc.jpa_ex.domain.Terms; +import umc.jpa_ex.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MemberAgree extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "terms_id") + private Terms terms; +} \ No newline at end of file diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberMission.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberMission.java new file mode 100644 index 0000000..bcc68ca --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/MemberMission.java @@ -0,0 +1,32 @@ +package umc.jpa_ex.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.Member; +import umc.jpa_ex.domain.Mission; +import umc.jpa_ex.domain.common.BaseEntity; +import umc.jpa_ex.domain.enums.MissionStatus; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MemberMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 20) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} diff --git a/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/SelectCategory.java b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/SelectCategory.java new file mode 100644 index 0000000..88dc788 --- /dev/null +++ b/sanho/jpa-ex/src/main/java/umc/jpa_ex/domain/mapping/SelectCategory.java @@ -0,0 +1,27 @@ +package umc.jpa_ex.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.jpa_ex.domain.FoodCategory; +import umc.jpa_ex.domain.Member; +import umc.jpa_ex.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class SelectCategory extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "food_category_id") + private FoodCategory foodCategory; +} diff --git a/sanho/jpa-ex/src/main/resources/application.yml b/sanho/jpa-ex/src/main/resources/application.yml new file mode 100644 index 0000000..99b2bcd --- /dev/null +++ b/sanho/jpa-ex/src/main/resources/application.yml @@ -0,0 +1,20 @@ +# local DB ?? +spring: + datasource: + url: jdbc:mysql://localhost:3306/jpa_ex + username: root + password: ssh159357! + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: create # ???? create, ???? update. (create? ?? ??? ?? ????? ?? ??? ?) + default_batch_fetch_size: 1000 \ No newline at end of file diff --git a/sanho/jpa-ex/src/test/java/umc/jpa_ex/JpaExApplicationTests.java b/sanho/jpa-ex/src/test/java/umc/jpa_ex/JpaExApplicationTests.java new file mode 100644 index 0000000..dcbd4fc --- /dev/null +++ b/sanho/jpa-ex/src/test/java/umc/jpa_ex/JpaExApplicationTests.java @@ -0,0 +1,13 @@ +package umc.jpa_ex; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class JpaExApplicationTests { + + @Test + void contextLoads() { + } + +} From 69dadbd5421990d5082cb8af778759c936fdccba Mon Sep 17 00:00:00 2001 From: sshnote Date: Sat, 2 Nov 2024 23:28:11 +0900 Subject: [PATCH 2/9] =?UTF-8?q?week6=20=EC=8B=A4=EC=8A=B5=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sanho/spring/.gitignore | 37 +++ sanho/spring/build.gradle | 79 ++++++ .../spring/gradle/wrapper/gradle-wrapper.jar | 0 .../gradle/wrapper/gradle-wrapper.properties | 7 + sanho/spring/gradlew | 248 ++++++++++++++++++ sanho/spring/gradlew.bat | 92 +++++++ sanho/spring/settings.gradle | 1 + .../umc/spring/domain/QFoodCategory.java | 47 ++++ .../generated/umc/spring/domain/QMember.java | 72 +++++ .../generated/umc/spring/domain/QMission.java | 67 +++++ .../generated/umc/spring/domain/QRegion.java | 50 ++++ .../generated/umc/spring/domain/QReview.java | 68 +++++ .../generated/umc/spring/domain/QStore.java | 67 +++++ .../generated/umc/spring/domain/QTerms.java | 54 ++++ .../umc/spring/domain/common/QBaseEntity.java | 39 +++ .../spring/domain/mapping/QMemberAgree.java | 62 +++++ .../spring/domain/mapping/QMemberMission.java | 64 +++++ .../spring/domain/mapping/QMemberPrefer.java | 62 +++++ .../src/main/java/umc/spring/Application.java | 37 +++ .../umc/spring/config/QueryDSLConfig.java | 19 ++ .../java/umc/spring/domain/FoodCategory.java | 22 ++ .../main/java/umc/spring/domain/Member.java | 82 ++++++ .../main/java/umc/spring/domain/Mission.java | 37 +++ .../main/java/umc/spring/domain/Region.java | 26 ++ .../main/java/umc/spring/domain/Review.java | 31 +++ .../main/java/umc/spring/domain/Store.java | 47 ++++ .../main/java/umc/spring/domain/Terms.java | 32 +++ .../umc/spring/domain/common/BaseEntity.java | 25 ++ .../java/umc/spring/domain/enums/Gender.java | 5 + .../umc/spring/domain/enums/MemberStatus.java | 5 + .../spring/domain/enums/MissionStatus.java | 5 + .../umc/spring/domain/enums/SocialType.java | 5 + .../spring/domain/mapping/MemberAgree.java | 27 ++ .../spring/domain/mapping/MemberMission.java | 32 +++ .../spring/domain/mapping/MemberPrefer.java | 28 ++ .../repository/store/StoreRepository.java | 7 + .../store/StoreRepositoryCustom.java | 9 + .../repository/store/StoreRepositoryImpl.java | 37 +++ .../service/store/StoreQueryService.java | 12 + .../service/store/StoreQueryServiceImpl.java | 32 +++ .../spring/src/main/resources/application.yml | 63 +++++ .../java/umc/spring/ApplicationTests.java | 13 + 42 files changed, 1754 insertions(+) create mode 100644 sanho/spring/.gitignore create mode 100644 sanho/spring/build.gradle create mode 100644 sanho/spring/gradle/wrapper/gradle-wrapper.jar create mode 100644 sanho/spring/gradle/wrapper/gradle-wrapper.properties create mode 100644 sanho/spring/gradlew create mode 100644 sanho/spring/gradlew.bat create mode 100644 sanho/spring/settings.gradle create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QMember.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QMission.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QRegion.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QReview.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QStore.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QTerms.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java create mode 100644 sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java create mode 100644 sanho/spring/src/main/java/umc/spring/Application.java create mode 100644 sanho/spring/src/main/java/umc/spring/config/QueryDSLConfig.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/FoodCategory.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/Member.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/Mission.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/Region.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/Review.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/Store.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/Terms.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/common/BaseEntity.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/enums/MemberStatus.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/enums/MissionStatus.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/enums/SocialType.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/mapping/MemberAgree.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java create mode 100644 sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/store/StoreRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryCustom.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java create mode 100644 sanho/spring/src/main/resources/application.yml create mode 100644 sanho/spring/src/test/java/umc/spring/ApplicationTests.java diff --git a/sanho/spring/.gitignore b/sanho/spring/.gitignore new file mode 100644 index 0000000..c2065bc --- /dev/null +++ b/sanho/spring/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/sanho/spring/build.gradle b/sanho/spring/build.gradle new file mode 100644 index 0000000..9ac62e3 --- /dev/null +++ b/sanho/spring/build.gradle @@ -0,0 +1,79 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.4' + id 'io.spring.dependency-management' version '1.1.6' +// id "com.ewerk.gradle.plugins.querydsl" version "1.0.10" // dependencies에 넣으면 안 써도 됨 +} + +group = 'umc' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(21) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-web' + + // queryDSL + implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' + annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" + annotationProcessor "jakarta.annotation:jakarta.annotation-api" + annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + //test 롬복 사용 + testCompileOnly 'org.projectlombok:lombok' + testAnnotationProcessor 'org.projectlombok:lombok' + + compileOnly 'org.projectlombok:lombok' + 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() +} + +// Querydsl 설정부 +// Clean 태스크 설정 +clean { + delete file('src/main/generated') +} + +//sourceSets { +// main { +// java { +// srcDirs = ['src/main/java', 'src/main/resources'] +// } +// } +//} + +//def generated = 'src/main/generated' +// +//querydsl { +// jpa = true +// querydslSourcesDir = generated +//} +//sourceSets { +// main.java.srcDir generated +//} +// +//compileQuerydsl{ +// options.annotationProcessorPath = configurations.querydsl // configurations.annotationProcessor +//} diff --git a/sanho/spring/gradle/wrapper/gradle-wrapper.jar b/sanho/spring/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..e69de29 diff --git a/sanho/spring/gradle/wrapper/gradle-wrapper.properties b/sanho/spring/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..a80b22c --- /dev/null +++ b/sanho/spring/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/sanho/spring/gradlew b/sanho/spring/gradlew new file mode 100644 index 0000000..fcb6fca --- /dev/null +++ b/sanho/spring/gradlew @@ -0,0 +1,248 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/sanho/spring/gradlew.bat b/sanho/spring/gradlew.bat new file mode 100644 index 0000000..6689b85 --- /dev/null +++ b/sanho/spring/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/sanho/spring/settings.gradle b/sanho/spring/settings.gradle new file mode 100644 index 0000000..ebf1ef8 --- /dev/null +++ b/sanho/spring/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'spring' diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java b/sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java new file mode 100644 index 0000000..3cb3321 --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java @@ -0,0 +1,47 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; + + +/** + * QFoodCategory is a Querydsl query type for FoodCategory + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QFoodCategory extends EntityPathBase { + + private static final long serialVersionUID = -811463128L; + + public static final QFoodCategory foodCategory = new QFoodCategory("foodCategory"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final StringPath name = createString("name"); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QFoodCategory(String variable) { + super(FoodCategory.class, forVariable(variable)); + } + + public QFoodCategory(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QFoodCategory(PathMetadata metadata) { + super(FoodCategory.class, metadata); + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QMember.java b/sanho/spring/src/main/generated/umc/spring/domain/QMember.java new file mode 100644 index 0000000..536f52d --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QMember.java @@ -0,0 +1,72 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QMember is a Querydsl query type for Member + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QMember extends EntityPathBase { + + private static final long serialVersionUID = 1366956614L; + + public static final QMember member = new QMember("member1"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + public final StringPath address = createString("address"); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final StringPath email = createString("email"); + + public final EnumPath gender = createEnum("gender", umc.spring.domain.enums.Gender.class); + + public final NumberPath id = createNumber("id", Long.class); + + public final DatePath inactiveDate = createDate("inactiveDate", java.time.LocalDate.class); + + public final ListPath memberAgreeList = this.createList("memberAgreeList", umc.spring.domain.mapping.MemberAgree.class, umc.spring.domain.mapping.QMemberAgree.class, PathInits.DIRECT2); + + public final ListPath memberMissionList = this.createList("memberMissionList", umc.spring.domain.mapping.MemberMission.class, umc.spring.domain.mapping.QMemberMission.class, PathInits.DIRECT2); + + public final ListPath memberPreferList = this.createList("memberPreferList", umc.spring.domain.mapping.MemberPrefer.class, umc.spring.domain.mapping.QMemberPrefer.class, PathInits.DIRECT2); + + public final StringPath name = createString("name"); + + public final NumberPath point = createNumber("point", Integer.class); + + public final ListPath reviewList = this.createList("reviewList", Review.class, QReview.class, PathInits.DIRECT2); + + public final EnumPath socialType = createEnum("socialType", umc.spring.domain.enums.SocialType.class); + + public final StringPath specAddress = createString("specAddress"); + + public final EnumPath status = createEnum("status", umc.spring.domain.enums.MemberStatus.class); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QMember(String variable) { + super(Member.class, forVariable(variable)); + } + + public QMember(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QMember(PathMetadata metadata) { + super(Member.class, metadata); + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QMission.java b/sanho/spring/src/main/generated/umc/spring/domain/QMission.java new file mode 100644 index 0000000..e8d8de0 --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QMission.java @@ -0,0 +1,67 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QMission is a Querydsl query type for Mission + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QMission extends EntityPathBase { + + private static final long serialVersionUID = -453449888L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QMission mission = new QMission("mission"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final DatePath deadline = createDate("deadline", java.time.LocalDate.class); + + public final NumberPath id = createNumber("id", Long.class); + + public final ListPath memberMissionList = this.createList("memberMissionList", umc.spring.domain.mapping.MemberMission.class, umc.spring.domain.mapping.QMemberMission.class, PathInits.DIRECT2); + + public final StringPath missionSpec = createString("missionSpec"); + + public final NumberPath reward = createNumber("reward", Integer.class); + + public final QStore store; + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QMission(String variable) { + this(Mission.class, forVariable(variable), INITS); + } + + public QMission(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QMission(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QMission(PathMetadata metadata, PathInits inits) { + this(Mission.class, metadata, inits); + } + + public QMission(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.store = inits.isInitialized("store") ? new QStore(forProperty("store"), inits.get("store")) : null; + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QRegion.java b/sanho/spring/src/main/generated/umc/spring/domain/QRegion.java new file mode 100644 index 0000000..d70fa68 --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QRegion.java @@ -0,0 +1,50 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QRegion is a Querydsl query type for Region + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QRegion extends EntityPathBase { + + private static final long serialVersionUID = 1509930656L; + + public static final QRegion region = new QRegion("region"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final StringPath name = createString("name"); + + public final ListPath storeList = this.createList("storeList", Store.class, QStore.class, PathInits.DIRECT2); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QRegion(String variable) { + super(Region.class, forVariable(variable)); + } + + public QRegion(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QRegion(PathMetadata metadata) { + super(Region.class, metadata); + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QReview.java b/sanho/spring/src/main/generated/umc/spring/domain/QReview.java new file mode 100644 index 0000000..e91a5ee --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QReview.java @@ -0,0 +1,68 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QReview is a Querydsl query type for Review + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QReview extends EntityPathBase { + + private static final long serialVersionUID = 1510377220L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QReview review = new QReview("review"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + public final StringPath body = createString("body"); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final QMember member; + + public final NumberPath score = createNumber("score", Float.class); + + public final QStore store; + + public final StringPath title = createString("title"); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QReview(String variable) { + this(Review.class, forVariable(variable), INITS); + } + + public QReview(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QReview(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QReview(PathMetadata metadata, PathInits inits) { + this(Review.class, metadata, inits); + } + + public QReview(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.member = inits.isInitialized("member") ? new QMember(forProperty("member")) : null; + this.store = inits.isInitialized("store") ? new QStore(forProperty("store"), inits.get("store")) : null; + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QStore.java b/sanho/spring/src/main/generated/umc/spring/domain/QStore.java new file mode 100644 index 0000000..a4ec49a --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QStore.java @@ -0,0 +1,67 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QStore is a Querydsl query type for Store + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QStore extends EntityPathBase { + + private static final long serialVersionUID = 1158464437L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QStore store = new QStore("store"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + public final StringPath address = createString("address"); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final StringPath name = createString("name"); + + public final QRegion region; + + public final ListPath reviewList = this.createList("reviewList", Review.class, QReview.class, PathInits.DIRECT2); + + public final NumberPath score = createNumber("score", Float.class); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QStore(String variable) { + this(Store.class, forVariable(variable), INITS); + } + + public QStore(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QStore(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QStore(PathMetadata metadata, PathInits inits) { + this(Store.class, metadata, inits); + } + + public QStore(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.region = inits.isInitialized("region") ? new QRegion(forProperty("region")) : null; + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QTerms.java b/sanho/spring/src/main/generated/umc/spring/domain/QTerms.java new file mode 100644 index 0000000..1066bf2 --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/QTerms.java @@ -0,0 +1,54 @@ +package umc.spring.domain; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QTerms is a Querydsl query type for Terms + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QTerms extends EntityPathBase { + + private static final long serialVersionUID = 1158943835L; + + public static final QTerms terms = new QTerms("terms"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + public final StringPath body = createString("body"); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final ListPath memberAgreeList = this.createList("memberAgreeList", umc.spring.domain.mapping.MemberAgree.class, umc.spring.domain.mapping.QMemberAgree.class, PathInits.DIRECT2); + + public final BooleanPath optional = createBoolean("optional"); + + public final StringPath title = createString("title"); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QTerms(String variable) { + super(Terms.class, forVariable(variable)); + } + + public QTerms(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QTerms(PathMetadata metadata) { + super(Terms.class, metadata); + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java b/sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java new file mode 100644 index 0000000..3ea8c77 --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java @@ -0,0 +1,39 @@ +package umc.spring.domain.common; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; + + +/** + * QBaseEntity is a Querydsl query type for BaseEntity + */ +@Generated("com.querydsl.codegen.DefaultSupertypeSerializer") +public class QBaseEntity extends EntityPathBase { + + private static final long serialVersionUID = -1748720885L; + + public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity"); + + public final DateTimePath createdAt = createDateTime("createdAt", java.time.LocalDateTime.class); + + public final DateTimePath updatedAt = createDateTime("updatedAt", java.time.LocalDateTime.class); + + public QBaseEntity(String variable) { + super(BaseEntity.class, forVariable(variable)); + } + + public QBaseEntity(Path path) { + super(path.getType(), path.getMetadata()); + } + + public QBaseEntity(PathMetadata metadata) { + super(BaseEntity.class, metadata); + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java new file mode 100644 index 0000000..b84c2c1 --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java @@ -0,0 +1,62 @@ +package umc.spring.domain.mapping; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QMemberAgree is a Querydsl query type for MemberAgree + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QMemberAgree extends EntityPathBase { + + private static final long serialVersionUID = -2051556634L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QMemberAgree memberAgree = new QMemberAgree("memberAgree"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final umc.spring.domain.QMember member; + + public final umc.spring.domain.QTerms terms; + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QMemberAgree(String variable) { + this(MemberAgree.class, forVariable(variable), INITS); + } + + public QMemberAgree(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QMemberAgree(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QMemberAgree(PathMetadata metadata, PathInits inits) { + this(MemberAgree.class, metadata, inits); + } + + public QMemberAgree(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.member = inits.isInitialized("member") ? new umc.spring.domain.QMember(forProperty("member")) : null; + this.terms = inits.isInitialized("terms") ? new umc.spring.domain.QTerms(forProperty("terms")) : null; + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java new file mode 100644 index 0000000..0f3eb3c --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java @@ -0,0 +1,64 @@ +package umc.spring.domain.mapping; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QMemberMission is a Querydsl query type for MemberMission + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QMemberMission extends EntityPathBase { + + private static final long serialVersionUID = 1962779462L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QMemberMission memberMission = new QMemberMission("memberMission"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final NumberPath id = createNumber("id", Long.class); + + public final umc.spring.domain.QMember member; + + public final umc.spring.domain.QMission mission; + + public final EnumPath status = createEnum("status", umc.spring.domain.enums.MissionStatus.class); + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QMemberMission(String variable) { + this(MemberMission.class, forVariable(variable), INITS); + } + + public QMemberMission(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QMemberMission(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QMemberMission(PathMetadata metadata, PathInits inits) { + this(MemberMission.class, metadata, inits); + } + + public QMemberMission(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.member = inits.isInitialized("member") ? new umc.spring.domain.QMember(forProperty("member")) : null; + this.mission = inits.isInitialized("mission") ? new umc.spring.domain.QMission(forProperty("mission"), inits.get("mission")) : null; + } + +} + diff --git a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java new file mode 100644 index 0000000..6aa11cb --- /dev/null +++ b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java @@ -0,0 +1,62 @@ +package umc.spring.domain.mapping; + +import static com.querydsl.core.types.PathMetadataFactory.*; + +import com.querydsl.core.types.dsl.*; + +import com.querydsl.core.types.PathMetadata; +import javax.annotation.processing.Generated; +import com.querydsl.core.types.Path; +import com.querydsl.core.types.dsl.PathInits; + + +/** + * QMemberPrefer is a Querydsl query type for MemberPrefer + */ +@Generated("com.querydsl.codegen.DefaultEntitySerializer") +public class QMemberPrefer extends EntityPathBase { + + private static final long serialVersionUID = 1265463574L; + + private static final PathInits INITS = PathInits.DIRECT2; + + public static final QMemberPrefer memberPrefer = new QMemberPrefer("memberPrefer"); + + public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); + + //inherited + public final DateTimePath createdAt = _super.createdAt; + + public final umc.spring.domain.QFoodCategory foodCategory; + + public final NumberPath id = createNumber("id", Long.class); + + public final umc.spring.domain.QMember member; + + //inherited + public final DateTimePath updatedAt = _super.updatedAt; + + public QMemberPrefer(String variable) { + this(MemberPrefer.class, forVariable(variable), INITS); + } + + public QMemberPrefer(Path path) { + this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); + } + + public QMemberPrefer(PathMetadata metadata) { + this(metadata, PathInits.getFor(metadata, INITS)); + } + + public QMemberPrefer(PathMetadata metadata, PathInits inits) { + this(MemberPrefer.class, metadata, inits); + } + + public QMemberPrefer(Class type, PathMetadata metadata, PathInits inits) { + super(type, metadata, inits); + this.foodCategory = inits.isInitialized("foodCategory") ? new umc.spring.domain.QFoodCategory(forProperty("foodCategory")) : null; + this.member = inits.isInitialized("member") ? new umc.spring.domain.QMember(forProperty("member")) : null; + } + +} + diff --git a/sanho/spring/src/main/java/umc/spring/Application.java b/sanho/spring/src/main/java/umc/spring/Application.java new file mode 100644 index 0000000..05e37ce --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/Application.java @@ -0,0 +1,37 @@ +package umc.spring; + +import org.springframework.boot.CommandLineRunner; +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.ApplicationContext; +import org.springframework.context.annotation.Bean; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +import umc.spring.service.store.StoreQueryService; + +@SpringBootApplication +@EnableJpaAuditing +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + + @Bean + public CommandLineRunner run(ApplicationContext context) { + return args -> { + StoreQueryService storeService = context.getBean(StoreQueryService.class); + + // 파라미터 값 설정 + String name = "요아정"; + Float score = 4.0f; + + // 쿼리 메서드 호출 및 쿼리 문자열과 파라미터 출력 + System.out.println("Executing findStoresByNameAndScore with parameters:"); + System.out.println("Name: " + name); + System.out.println("Score: " + score); + + storeService.findStoresByNameAndScore(name, score) + .forEach(System.out::println); + }; + } +} diff --git a/sanho/spring/src/main/java/umc/spring/config/QueryDSLConfig.java b/sanho/spring/src/main/java/umc/spring/config/QueryDSLConfig.java new file mode 100644 index 0000000..36da20e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/config/QueryDSLConfig.java @@ -0,0 +1,19 @@ +package umc.spring.config; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class QueryDSLConfig { // JPAQueryFactory 를 Bean으로 등록 + + private final EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory(){ + return new JPAQueryFactory(entityManager); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/FoodCategory.java b/sanho/spring/src/main/java/umc/spring/domain/FoodCategory.java new file mode 100644 index 0000000..9e4773b --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/FoodCategory.java @@ -0,0 +1,22 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class FoodCategory extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 15) + private String name; + + +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Member.java b/sanho/spring/src/main/java/umc/spring/domain/Member.java new file mode 100644 index 0000000..277ac3b --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/Member.java @@ -0,0 +1,82 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; +import umc.spring.domain.enums.Gender; +import umc.spring.domain.enums.MemberStatus; +import umc.spring.domain.enums.SocialType; +import umc.spring.domain.mapping.MemberAgree; +import umc.spring.domain.mapping.MemberMission; +import umc.spring.domain.mapping.MemberPrefer; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity // JPA의 엔티티 +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Member extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) // JPA가 통신하는 DBMS의 방식을 따른다. - Mysql + private Long id; + + @Column(nullable = false, length = 20) // 널 값 허용하지 않음 + private String name; + +// @Column(columnDefinition = "VARCHAR(20)") // 널 값 허용 +// private String name; + + @Column(nullable = false, length = 40) + private String address; + + @Column(nullable = false, length = 40) + private String specAddress; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(10)") + private Gender gender; + + @Enumerated(EnumType.STRING) + private SocialType socialType; + + @Enumerated(EnumType.STRING) + @Column(columnDefinition = "VARCHAR(15) DEFAULT 'ACTIVE'") + private MemberStatus status; + + @Column(columnDefinition = "DATETIME") + private LocalDate inactiveDate; + + @Column(nullable = false, length = 50) + private String email; + + private Integer point; + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) // CascadeType.ALL로 인해 persist(member) 하면 아래 4개도 같이 persist 됨. + private List memberAgreeList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List memberPreferList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) + private List memberMissionList = new ArrayList<>(); +} + +/** + * 정리 + * 1. 각 도메인 다 만들기 + * 이 때 created_at과 updated_at은 BaseEntity로 빼고 상속 받기, Application에 @EnableJpaAuditing도 넣어줘야되 + * 2. 매핑 테이블 만들기 + * 3. 연관관계 매핑 @ManyToOne (단방향 매핑) - FK 갖는 연관관계 주인 기준 + * ex) @ManyToOne, @JoinColumn + * 4. 연관관계 매핑 @OneToMany (양방향 매핑) - 수정/삭제 많이 안 하는 엔티티는 양방향 설정 안 해도 됨. - 연관관계 주인 반대 + * @ManyToOne 한 것을 @OneToMany로 받아야 됨. + * 5. 칼럼 별 세부적 설정 @Column + * */ \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Mission.java b/sanho/spring/src/main/java/umc/spring/domain/Mission.java new file mode 100644 index 0000000..0a1fb4b --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/Mission.java @@ -0,0 +1,37 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; +import umc.spring.domain.mapping.MemberMission; + +import java.time.LocalDate; +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Mission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private Integer reward; + + @Column(columnDefinition = "DATETIME") // LocalDate는 기본으로 DATE로 바뀜 + private LocalDate deadline; + + @Column(columnDefinition = "TEXT") + private String missionSpec; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; + + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) + private List memberMissionList = new ArrayList<>(); +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Region.java b/sanho/spring/src/main/java/umc/spring/domain/Region.java new file mode 100644 index 0000000..48a3b5e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/Region.java @@ -0,0 +1,26 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Region extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String name; + + @OneToMany(mappedBy = "region", cascade = CascadeType.ALL) + private List storeList = new ArrayList<>(); +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Review.java b/sanho/spring/src/main/java/umc/spring/domain/Review.java new file mode 100644 index 0000000..81d613d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/Review.java @@ -0,0 +1,31 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Review extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String title; + + private String body; + + private Float score; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "store_id") + private Store store; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Store.java b/sanho/spring/src/main/java/umc/spring/domain/Store.java new file mode 100644 index 0000000..cecac2d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/Store.java @@ -0,0 +1,47 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Store extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 50) + private String name; + + @Column(nullable = false, length = 50) + private String address; + + private Float score; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "region_id") + private Region region; + + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List reviewList = new ArrayList<>(); + + + @Override + public String toString() { + return "Store{" + + "id=" + id + + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", score=" + score + + ", region=" + (region != null ? region.getName() : "N/A") + // region의 이름 출력 + '}'; + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Terms.java b/sanho/spring/src/main/java/umc/spring/domain/Terms.java new file mode 100644 index 0000000..25fb0be --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/Terms.java @@ -0,0 +1,32 @@ +package umc.spring.domain; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.common.BaseEntity; +import umc.spring.domain.mapping.MemberAgree; + +import java.util.ArrayList; +import java.util.List; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class Terms extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false, length = 20) + private String title; + + @Column(columnDefinition = "TEXT") + private String body; + + private Boolean optional; + + @OneToMany(mappedBy = "terms", cascade = CascadeType.ALL) + private List memberAgreeList = new ArrayList<>(); +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/common/BaseEntity.java b/sanho/spring/src/main/java/umc/spring/domain/common/BaseEntity.java new file mode 100644 index 0000000..c6e6249 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/common/BaseEntity.java @@ -0,0 +1,25 @@ +package umc.spring.domain.common; + +import jakarta.persistence.Column; +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.Getter; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; + +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +@Getter +public abstract class BaseEntity { + + @CreatedDate + @Column(columnDefinition = "DATETIME(6)") + private LocalDateTime createdAt; + + @LastModifiedDate + @Column(columnDefinition = "DATETIME(6)") + private LocalDateTime updatedAt; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java b/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java new file mode 100644 index 0000000..d2ffaa7 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java @@ -0,0 +1,5 @@ +package umc.spring.domain.enums; + +public enum Gender { + MALE, FEMALE; +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/enums/MemberStatus.java b/sanho/spring/src/main/java/umc/spring/domain/enums/MemberStatus.java new file mode 100644 index 0000000..3a2959f --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/enums/MemberStatus.java @@ -0,0 +1,5 @@ +package umc.spring.domain.enums; + +public enum MemberStatus { + ACTIVE, INACTIVE; +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/enums/MissionStatus.java b/sanho/spring/src/main/java/umc/spring/domain/enums/MissionStatus.java new file mode 100644 index 0000000..b481036 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/enums/MissionStatus.java @@ -0,0 +1,5 @@ +package umc.spring.domain.enums; + +public enum MissionStatus { + CHALLENGING, COMPLETE; +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/enums/SocialType.java b/sanho/spring/src/main/java/umc/spring/domain/enums/SocialType.java new file mode 100644 index 0000000..a73078e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/enums/SocialType.java @@ -0,0 +1,5 @@ +package umc.spring.domain.enums; + +public enum SocialType { + KAKAO, GOOGLE, NAVER, APPLE; +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberAgree.java b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberAgree.java new file mode 100644 index 0000000..8a34132 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberAgree.java @@ -0,0 +1,27 @@ +package umc.spring.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.Member; +import umc.spring.domain.Terms; +import umc.spring.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MemberAgree extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "terms_id") + private Terms terms; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java new file mode 100644 index 0000000..119771d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java @@ -0,0 +1,32 @@ +package umc.spring.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.Member; +import umc.spring.domain.Mission; +import umc.spring.domain.common.BaseEntity; +import umc.spring.domain.enums.MissionStatus; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MemberMission extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Enumerated(EnumType.STRING) + @Column(nullable = false, length = 15) + private MissionStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "mission_id") + private Mission mission; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java new file mode 100644 index 0000000..2e28916 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java @@ -0,0 +1,28 @@ +package umc.spring.domain.mapping; + +import jakarta.persistence.*; +import lombok.*; +import umc.spring.domain.FoodCategory; +import umc.spring.domain.Member; +import umc.spring.domain.common.BaseEntity; + +@Entity +@Getter +@Builder +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@AllArgsConstructor +public class MemberPrefer extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) // 지연 로딩 + @JoinColumn(name = "member_id") // FK 이름 + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "category_id") + private FoodCategory foodCategory; + +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepository.java b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepository.java new file mode 100644 index 0000000..5151d83 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.store; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Store; + +public interface StoreRepository extends JpaRepository, StoreRepositoryCustom { // 구현이 아닌 단순 확장이라 extends +} diff --git a/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryCustom.java b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryCustom.java new file mode 100644 index 0000000..94dac34 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryCustom.java @@ -0,0 +1,9 @@ +package umc.spring.repository.store; + +import umc.spring.domain.Store; + +import java.util.List; + +public interface StoreRepositoryCustom { + List dynamicQueryWithBooleanBuilder(String name, Float score); +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java new file mode 100644 index 0000000..29a0ae5 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java @@ -0,0 +1,37 @@ +package umc.spring.repository.store; + +import com.querydsl.core.BooleanBuilder; +import com.querydsl.jpa.impl.JPAQueryFactory; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; +import umc.spring.domain.QStore; +import umc.spring.domain.Store; + +import java.util.List; + +@Repository +@RequiredArgsConstructor +public class StoreRepositoryImpl implements StoreRepositoryCustom{ + + private final JPAQueryFactory jpaQueryFactory; + private final QStore store = QStore.store; + + @Override + public List dynamicQueryWithBooleanBuilder(String name, Float score) { + BooleanBuilder predicate = new BooleanBuilder(); // 동적 쿼리 작성 BooleanBuilder + + if (name != null) { + predicate.and(store.name.eq(name)); // equal + } + + if (score != null) { + predicate.and(store.score.goe(4.0f)); // "greater than or equal to" + } + + // 가게 이름이 name이고, 평점이 4.0보다 크거나 같은 가게 + return jpaQueryFactory + .selectFrom(store) + .where(predicate) + .fetch(); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java new file mode 100644 index 0000000..0d56e6a --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java @@ -0,0 +1,12 @@ +package umc.spring.service.store; + +import umc.spring.domain.Store; + +import java.util.List; +import java.util.Optional; + +public interface StoreQueryService { + + Optional findStore(Long id); // null 반환 가능 + List findStoresByNameAndScore(String name, Float score); +} diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java new file mode 100644 index 0000000..eeab533 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java @@ -0,0 +1,32 @@ +package umc.spring.service.store; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import umc.spring.domain.Store; +import umc.spring.repository.store.StoreRepository; + +import java.util.List; +import java.util.Optional; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) // 조회에만 +public class StoreQueryServiceImpl implements StoreQueryService{ + + private final StoreRepository storeRepository; + + @Override + public Optional findStore(Long id) { + return storeRepository.findById(id); + } + + @Override + public List findStoresByNameAndScore(String name, Float score) { + List filteredStores = storeRepository.dynamicQueryWithBooleanBuilder(name, score); + + filteredStores.forEach(store -> System.out.println("Store: " + store)); + + return filteredStores; + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/resources/application.yml b/sanho/spring/src/main/resources/application.yml new file mode 100644 index 0000000..e692f79 --- /dev/null +++ b/sanho/spring/src/main/resources/application.yml @@ -0,0 +1,63 @@ +#spring: +# datasource: +# driver-class-name: com.mysql.cj.jdbc.Driver +# url: jdbc:mysql://localhost:3306/umc7th +# username: root +# password: +# +## jpa: +## hibernate: +## ddl-auto: create +## properties: +## hibernate: +## # show_sql: true +## format_sql: true +## +## +## logging.level: +## org.hibernate.SQL: debug +## # org.hibernate.type: trace #스프링 부트 2.x, hibernate5 +## # org.hibernate.orm.jdbc.bind: trace #스프링 부트 3.x, hibernate6 + + +# local DB 사용 +spring: + datasource: + url: jdbc:mysql://localhost:3306/study + username: root + password: ssh159357! + driver-class-name: com.mysql.cj.jdbc.Driver + sql: + init: + mode: never + jpa: + properties: + hibernate: + dialect: org.hibernate.dialect.MySQL8Dialect + show_sql: true + format_sql: true + use_sql_comments: true + hbm2ddl: + auto: update # 처음에만 create, 나중에는 update. (create면 기존 테이블 모두 없애버리고 새로 만들게 됨) + default_batch_fetch_size: 1000 + +## RDS 사용 +#spring: +# datasource: +# url: jdbc:mysql://zipdabang-db.claedpluhwyw.ap-northeast-2.rds.amazonaws.com:3306/study +# username: 님들의 rds 루트 유저 이름 +# password: 님들의 rds 비밀번호 +# driver-class-name: com.mysql.cj.jdbc.Driver +# sql: +# init: +# mode: never +# jpa: +# properties: +# hibernate: +# dialect: org.hibernate.dialect.MySQL8Dialect +# show_sql: true +# format_sql: true +# use_sql_comments: true +# hbm2ddl: +# auto: update +# default_batch_fetch_size: 1000 \ No newline at end of file diff --git a/sanho/spring/src/test/java/umc/spring/ApplicationTests.java b/sanho/spring/src/test/java/umc/spring/ApplicationTests.java new file mode 100644 index 0000000..dc36e6c --- /dev/null +++ b/sanho/spring/src/test/java/umc/spring/ApplicationTests.java @@ -0,0 +1,13 @@ +package umc.spring; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } + +} From 2d43605d685edcfb05e33f0435c73ab016cce1c5 Mon Sep 17 00:00:00 2001 From: sshnote Date: Sun, 10 Nov 2024 16:44:48 +0900 Subject: [PATCH 3/9] =?UTF-8?q?week6=20=EC=8B=A4=EC=8A=B5=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sanho/spring/build.gradle | 2 + .../umc/spring/apipayload/ApiResponse.java | 38 ++++++ .../umc/spring/apipayload/code/BaseCode.java | 8 ++ .../spring/apipayload/code/BaseErrorCode.java | 8 ++ .../apipayload/code/ErrorReasonDTO.java | 18 +++ .../umc/spring/apipayload/code/ReasonDTO.java | 18 +++ .../apipayload/code/status/ErrorStatus.java | 54 ++++++++ .../apipayload/code/status/SuccessStatus.java | 38 ++++++ .../apipayload/exception/ExceptionAdvice.java | 119 ++++++++++++++++++ .../exception/GeneralException.java | 21 ++++ .../exception/handler/TempHandler.java | 11 ++ .../umc/spring/converter/TempConverter.java | 18 +++ .../repository/store/StoreRepositoryImpl.java | 6 + .../tempservice/TempCommandService.java | 4 + .../tempservice/TempCommandServiceImpl.java | 14 +++ .../service/tempservice/TempQueryService.java | 9 ++ .../tempservice/TempQueryServiceImpl.java | 17 +++ .../web/controller/TempRestController.java | 31 +++++ .../java/umc/spring/web/dto/TempRequest.java | 4 + .../java/umc/spring/web/dto/TempResponse.java | 26 ++++ 20 files changed, 464 insertions(+) create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/converter/TempConverter.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java diff --git a/sanho/spring/build.gradle b/sanho/spring/build.gradle index 9ac62e3..1412fee 100644 --- a/sanho/spring/build.gradle +++ b/sanho/spring/build.gradle @@ -44,6 +44,8 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + +// implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0' } tasks.named('test') { diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java b/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java new file mode 100644 index 0000000..d8fe291 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java @@ -0,0 +1,38 @@ +package umc.spring.apipayload; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.fasterxml.jackson.annotation.JsonProperty; +import com.fasterxml.jackson.annotation.JsonPropertyOrder; +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.spring.apipayload.code.BaseCode; +import umc.spring.apipayload.code.status.SuccessStatus; + +@Getter +@AllArgsConstructor +@JsonPropertyOrder({"isSuccess", "code", "message", "result"}) // 필드 순서 명시적 지정 +public class ApiResponse { + + @JsonProperty("isSuccess") // 필드 이름 지정 + private final Boolean isSuccess; + private final String code; + private final String message; + @JsonInclude(JsonInclude.Include.NON_NULL) // Null은 포함하지 않음 + private T result; // 제네릭 + + + // 성공한 경우 응답 생성 + public static ApiResponse onSuccess(T result){ + return new ApiResponse<>(true, SuccessStatus._OK.getCode() , SuccessStatus._OK.getMessage(), result); + } + + public static ApiResponse of(BaseCode code, T result){ // HttpStatus까지 + return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result); + } + + + // 실패한 경우 응답 생성 + public static ApiResponse onFailure(String code, String message, T data){ + return new ApiResponse<>(false, code, message, data); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java new file mode 100644 index 0000000..253ba45 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java @@ -0,0 +1,8 @@ +package umc.spring.apipayload.code; + +public interface BaseCode { + + ReasonDTO getReason(); + + ReasonDTO getReasonHttpStatus(); +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java new file mode 100644 index 0000000..cf259ae --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java @@ -0,0 +1,8 @@ +package umc.spring.apipayload.code; + +public interface BaseErrorCode { + + ErrorReasonDTO getReason(); + + ErrorReasonDTO getReasonHttpStatus(); +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java new file mode 100644 index 0000000..4846fb4 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java @@ -0,0 +1,18 @@ +package umc.spring.apipayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ErrorReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java new file mode 100644 index 0000000..5530fab --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java @@ -0,0 +1,18 @@ +package umc.spring.apipayload.code; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@Builder +public class ReasonDTO { + + private HttpStatus httpStatus; + + private final boolean isSuccess; + private final String code; + private final String message; + + public boolean getIsSuccess(){return isSuccess;} +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java new file mode 100644 index 0000000..1af7e97 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java @@ -0,0 +1,54 @@ +package umc.spring.apipayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public enum ErrorStatus implements BaseErrorCode { + + // 가장 일반적인 응답 + _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), + _BAD_REQUEST(HttpStatus.BAD_REQUEST,"COMMON400","잘못된 요청입니다."), + _UNAUTHORIZED(HttpStatus.UNAUTHORIZED,"COMMON401","인증이 필요합니다."), + _FORBIDDEN(HttpStatus.FORBIDDEN, "COMMON403", "금지된 요청입니다."), + + + // 멤버 관려 에러 + MEMBER_NOT_FOUND(HttpStatus.BAD_REQUEST, "MEMBER4001", "사용자가 없습니다."), + NICKNAME_NOT_EXIST(HttpStatus.BAD_REQUEST, "MEMBER4002", "닉네임은 필수 입니다."), + + // 예시,,, + ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."), + + // For test + TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"); + + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ErrorReasonDTO getReason() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .build(); + } + + @Override + public ErrorReasonDTO getReasonHttpStatus() { + return ErrorReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(false) + .httpStatus(httpStatus) + .build() + ; + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java new file mode 100644 index 0000000..1c0086f --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java @@ -0,0 +1,38 @@ +package umc.spring.apipayload.code.status; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; +import umc.spring.apipayload.code.BaseCode; +import umc.spring.apipayload.code.ReasonDTO; + +@Getter +@AllArgsConstructor +public enum SuccessStatus implements BaseCode { + + // 일반적인 응답 + _OK(HttpStatus.OK, "COMMON200", "성공입니다."); // enum에서 선언하고 바로 초기화 + + private final HttpStatus httpStatus; + private final String code; + private final String message; + + @Override + public ReasonDTO getReason() { // of를 위한 코드 + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .build(); + } + + @Override + public ReasonDTO getReasonHttpStatus() { // of를 위한 코드 + return ReasonDTO.builder() + .message(message) + .code(code) + .isSuccess(true) + .httpStatus(httpStatus) + .build(); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java new file mode 100644 index 0000000..c3c910a --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java @@ -0,0 +1,119 @@ +package umc.spring.apipayload.exception; + +import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolationException; +import lombok.extern.slf4j.Slf4j; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.HttpStatusCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.context.request.ServletWebRequest; +import org.springframework.web.context.request.WebRequest; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; +import umc.spring.apipayload.ApiResponse; +import umc.spring.apipayload.code.ErrorReasonDTO; +import umc.spring.apipayload.code.status.ErrorStatus; + +import java.util.LinkedHashMap; +import java.util.Map; +import java.util.Optional; + +@Slf4j +@RestControllerAdvice(annotations = {RestController.class}) +public class ExceptionAdvice extends ResponseEntityExceptionHandler { + + + @ExceptionHandler + public ResponseEntity validation(ConstraintViolationException e, WebRequest request) { + String errorMessage = e.getConstraintViolations().stream() + .map(constraintViolation -> constraintViolation.getMessage()) + .findFirst() + .orElseThrow(() -> new RuntimeException("ConstraintViolationException 추출 도중 에러 발생")); + + return handleExceptionInternalConstraint(e, ErrorStatus.valueOf(errorMessage), HttpHeaders.EMPTY,request); + } + + @Override + public ResponseEntity handleMethodArgumentNotValid(MethodArgumentNotValidException e, HttpHeaders headers, HttpStatusCode status, WebRequest request) { + + Map errors = new LinkedHashMap<>(); + + e.getBindingResult().getFieldErrors().stream() + .forEach(fieldError -> { + String fieldName = fieldError.getField(); + String errorMessage = Optional.ofNullable(fieldError.getDefaultMessage()).orElse(""); + errors.merge(fieldName, errorMessage, (existingErrorMessage, newErrorMessage) -> existingErrorMessage + ", " + newErrorMessage); + }); + + return handleExceptionInternalArgs(e,HttpHeaders.EMPTY,ErrorStatus.valueOf("_BAD_REQUEST"),request,errors); + } + + @ExceptionHandler + public ResponseEntity exception(Exception e, WebRequest request) { + e.printStackTrace(); + + return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); + } + + @ExceptionHandler(value = GeneralException.class) + public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { + ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); + return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); + } + + private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, + HttpHeaders headers, HttpServletRequest request) { + + ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); +// e.printStackTrace(); + + WebRequest webRequest = new ServletWebRequest(request); + return super.handleExceptionInternal( + e, + body, + headers, + reason.getHttpStatus(), + webRequest + ); + } + + private ResponseEntity handleExceptionInternalFalse(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, HttpStatus status, WebRequest request, String errorPoint) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorPoint); + return super.handleExceptionInternal( + e, + body, + headers, + status, + request + ); + } + + private ResponseEntity handleExceptionInternalArgs(Exception e, HttpHeaders headers, ErrorStatus errorCommonStatus, + WebRequest request, Map errorArgs) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(),errorCommonStatus.getMessage(),errorArgs); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } + + private ResponseEntity handleExceptionInternalConstraint(Exception e, ErrorStatus errorCommonStatus, + HttpHeaders headers, WebRequest request) { + ApiResponse body = ApiResponse.onFailure(errorCommonStatus.getCode(), errorCommonStatus.getMessage(), null); + return super.handleExceptionInternal( + e, + body, + headers, + errorCommonStatus.getHttpStatus(), + request + ); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java new file mode 100644 index 0000000..7d723ef --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java @@ -0,0 +1,21 @@ +package umc.spring.apipayload.exception; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.code.ErrorReasonDTO; + +@Getter +@AllArgsConstructor +public class GeneralException extends RuntimeException { + + private BaseErrorCode code; + + public ErrorReasonDTO getErrorReason() { + return this.code.getReason(); + } + + public ErrorReasonDTO getErrorReasonHttpStatus(){ + return this.code.getReasonHttpStatus(); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java new file mode 100644 index 0000000..50518c8 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java @@ -0,0 +1,11 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class TempHandler extends GeneralException { + + public TempHandler(BaseErrorCode errorCode) { + super(errorCode); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java b/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java new file mode 100644 index 0000000..cc7d35c --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java @@ -0,0 +1,18 @@ +package umc.spring.converter; + +import umc.spring.web.dto.TempResponse; + +public class TempConverter { // TempResponse.TempTestDTO의 형태로 바꿔주는 역할 + + public static TempResponse.TempTestDTO toTempTestDTO(){ // static으로 선언 + return TempResponse.TempTestDTO.builder() + .testString("This is Test!") + .build(); + } + + public static TempResponse.TempExceptionDTO toTempExceptionDTO(Integer flag){ + return TempResponse.TempExceptionDTO.builder() + .flag(flag) + .build(); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java index 29a0ae5..6a47b8b 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java +++ b/sanho/spring/src/main/java/umc/spring/repository/store/StoreRepositoryImpl.java @@ -33,5 +33,11 @@ public List dynamicQueryWithBooleanBuilder(String name, Float score) { .selectFrom(store) .where(predicate) .fetch(); + + +// List fetch = jpaQueryFactory +// .selectFrom(store) +// .where(store.name.eq(name), store.score.goe(4.0f)) +// .fetch(); } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java new file mode 100644 index 0000000..f29ab02 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java @@ -0,0 +1,4 @@ +package umc.spring.service.tempservice; + +public class TempCommandService { +} diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java new file mode 100644 index 0000000..f02f6ee --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java @@ -0,0 +1,14 @@ +package umc.spring.service.tempservice; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +//@Service +//@RequiredArgsConstructor +//public class TempCommandServiceImpl implements TempQueryService{ +// +// @Override +// public void checkFlag(Integer flag) { +// +// } +//} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java new file mode 100644 index 0000000..55eda96 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java @@ -0,0 +1,9 @@ +package umc.spring.service.tempservice; + +import org.springframework.stereotype.Service; + +@Service +public interface TempQueryService { + + void checkFlag(Integer flag); +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java new file mode 100644 index 0000000..ba3e40d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java @@ -0,0 +1,17 @@ +package umc.spring.service.tempservice; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.apipayload.exception.handler.TempHandler; + +@Service +@RequiredArgsConstructor +public class TempQueryServiceImpl implements TempQueryService{ + + @Override + public void checkFlag(Integer flag) { + if (flag == 1) + throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java new file mode 100644 index 0000000..27680f4 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java @@ -0,0 +1,31 @@ +package umc.spring.web.controller; + +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import umc.spring.apipayload.ApiResponse; +import umc.spring.converter.TempConverter; +import umc.spring.service.tempservice.TempQueryService; +import umc.spring.web.dto.TempResponse; + +@RestController +@RequestMapping("/temp") +@RequiredArgsConstructor +public class TempRestController { + + private final TempQueryService tempQueryService; + + @GetMapping("/test") + public ApiResponse testAPI(){ + + return ApiResponse.onSuccess(TempConverter.toTempTestDTO()); + } + + @GetMapping("/exception") + public ApiResponse exceptionAPI(@RequestParam Integer flag){ + tempQueryService.checkFlag(flag); + return ApiResponse.onSuccess(TempConverter.toTempExceptionDTO(flag)); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java b/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java new file mode 100644 index 0000000..87f1fed --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java @@ -0,0 +1,4 @@ +package umc.spring.web.dto; + +public class TempRequest { +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java b/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java new file mode 100644 index 0000000..e734d82 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java @@ -0,0 +1,26 @@ +package umc.spring.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +public class TempResponse { // DTO + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempTestDTO{ + String testString; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class TempExceptionDTO{ + Integer flag; + } + +} \ No newline at end of file From c175158961c09a1c0148c8f0bdf9120bbb82ee58 Mon Sep 17 00:00:00 2001 From: sshnote Date: Thu, 14 Nov 2024 16:04:38 +0900 Subject: [PATCH 4/9] week7 mission --- .../umc/spring/domain/QFoodCategory.java | 47 ------------ .../generated/umc/spring/domain/QMember.java | 72 ------------------- .../generated/umc/spring/domain/QMission.java | 67 ----------------- .../generated/umc/spring/domain/QRegion.java | 50 ------------- .../generated/umc/spring/domain/QReview.java | 68 ------------------ .../generated/umc/spring/domain/QStore.java | 67 ----------------- .../generated/umc/spring/domain/QTerms.java | 54 -------------- .../umc/spring/domain/common/QBaseEntity.java | 39 ---------- .../spring/domain/mapping/QMemberAgree.java | 62 ---------------- .../spring/domain/mapping/QMemberMission.java | 64 ----------------- .../spring/domain/mapping/QMemberPrefer.java | 62 ---------------- .../umc/spring/apipayload/ApiResponse.java | 11 +-- .../umc/spring/apipayload/code/BaseCode.java | 2 +- .../spring/apipayload/code/BaseErrorCode.java | 2 +- .../apipayload/code/ErrorReasonDTO.java | 4 +- .../umc/spring/apipayload/code/ReasonDTO.java | 2 +- .../apipayload/code/status/ErrorStatus.java | 4 +- .../apipayload/code/status/SuccessStatus.java | 2 +- .../apipayload/exception/ExceptionAdvice.java | 7 +- .../exception/GeneralException.java | 4 +- .../exception/handler/TempHandler.java | 4 +- .../umc/spring/converter/TempConverter.java | 4 +- .../tempservice/TempCommandService.java | 2 +- .../tempservice/TempCommandServiceImpl.java | 13 ++-- .../service/tempservice/TempQueryService.java | 2 +- .../tempservice/TempQueryServiceImpl.java | 5 +- .../web/controller/TempRestController.java | 2 +- .../java/umc/spring/web/dto/TempRequest.java | 2 +- .../java/umc/spring/web/dto/TempResponse.java | 2 +- 29 files changed, 38 insertions(+), 688 deletions(-) delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QMember.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QMission.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QRegion.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QReview.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QStore.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/QTerms.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java delete mode 100644 sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java b/sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java deleted file mode 100644 index 3cb3321..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QFoodCategory.java +++ /dev/null @@ -1,47 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; - - -/** - * QFoodCategory is a Querydsl query type for FoodCategory - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QFoodCategory extends EntityPathBase { - - private static final long serialVersionUID = -811463128L; - - public static final QFoodCategory foodCategory = new QFoodCategory("foodCategory"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final StringPath name = createString("name"); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QFoodCategory(String variable) { - super(FoodCategory.class, forVariable(variable)); - } - - public QFoodCategory(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QFoodCategory(PathMetadata metadata) { - super(FoodCategory.class, metadata); - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QMember.java b/sanho/spring/src/main/generated/umc/spring/domain/QMember.java deleted file mode 100644 index 536f52d..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QMember.java +++ /dev/null @@ -1,72 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QMember is a Querydsl query type for Member - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QMember extends EntityPathBase { - - private static final long serialVersionUID = 1366956614L; - - public static final QMember member = new QMember("member1"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - public final StringPath address = createString("address"); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final StringPath email = createString("email"); - - public final EnumPath gender = createEnum("gender", umc.spring.domain.enums.Gender.class); - - public final NumberPath id = createNumber("id", Long.class); - - public final DatePath inactiveDate = createDate("inactiveDate", java.time.LocalDate.class); - - public final ListPath memberAgreeList = this.createList("memberAgreeList", umc.spring.domain.mapping.MemberAgree.class, umc.spring.domain.mapping.QMemberAgree.class, PathInits.DIRECT2); - - public final ListPath memberMissionList = this.createList("memberMissionList", umc.spring.domain.mapping.MemberMission.class, umc.spring.domain.mapping.QMemberMission.class, PathInits.DIRECT2); - - public final ListPath memberPreferList = this.createList("memberPreferList", umc.spring.domain.mapping.MemberPrefer.class, umc.spring.domain.mapping.QMemberPrefer.class, PathInits.DIRECT2); - - public final StringPath name = createString("name"); - - public final NumberPath point = createNumber("point", Integer.class); - - public final ListPath reviewList = this.createList("reviewList", Review.class, QReview.class, PathInits.DIRECT2); - - public final EnumPath socialType = createEnum("socialType", umc.spring.domain.enums.SocialType.class); - - public final StringPath specAddress = createString("specAddress"); - - public final EnumPath status = createEnum("status", umc.spring.domain.enums.MemberStatus.class); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QMember(String variable) { - super(Member.class, forVariable(variable)); - } - - public QMember(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QMember(PathMetadata metadata) { - super(Member.class, metadata); - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QMission.java b/sanho/spring/src/main/generated/umc/spring/domain/QMission.java deleted file mode 100644 index e8d8de0..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QMission.java +++ /dev/null @@ -1,67 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QMission is a Querydsl query type for Mission - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QMission extends EntityPathBase { - - private static final long serialVersionUID = -453449888L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QMission mission = new QMission("mission"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final DatePath deadline = createDate("deadline", java.time.LocalDate.class); - - public final NumberPath id = createNumber("id", Long.class); - - public final ListPath memberMissionList = this.createList("memberMissionList", umc.spring.domain.mapping.MemberMission.class, umc.spring.domain.mapping.QMemberMission.class, PathInits.DIRECT2); - - public final StringPath missionSpec = createString("missionSpec"); - - public final NumberPath reward = createNumber("reward", Integer.class); - - public final QStore store; - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QMission(String variable) { - this(Mission.class, forVariable(variable), INITS); - } - - public QMission(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QMission(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QMission(PathMetadata metadata, PathInits inits) { - this(Mission.class, metadata, inits); - } - - public QMission(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.store = inits.isInitialized("store") ? new QStore(forProperty("store"), inits.get("store")) : null; - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QRegion.java b/sanho/spring/src/main/generated/umc/spring/domain/QRegion.java deleted file mode 100644 index d70fa68..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QRegion.java +++ /dev/null @@ -1,50 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QRegion is a Querydsl query type for Region - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QRegion extends EntityPathBase { - - private static final long serialVersionUID = 1509930656L; - - public static final QRegion region = new QRegion("region"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final StringPath name = createString("name"); - - public final ListPath storeList = this.createList("storeList", Store.class, QStore.class, PathInits.DIRECT2); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QRegion(String variable) { - super(Region.class, forVariable(variable)); - } - - public QRegion(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QRegion(PathMetadata metadata) { - super(Region.class, metadata); - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QReview.java b/sanho/spring/src/main/generated/umc/spring/domain/QReview.java deleted file mode 100644 index e91a5ee..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QReview.java +++ /dev/null @@ -1,68 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QReview is a Querydsl query type for Review - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QReview extends EntityPathBase { - - private static final long serialVersionUID = 1510377220L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QReview review = new QReview("review"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - public final StringPath body = createString("body"); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final QMember member; - - public final NumberPath score = createNumber("score", Float.class); - - public final QStore store; - - public final StringPath title = createString("title"); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QReview(String variable) { - this(Review.class, forVariable(variable), INITS); - } - - public QReview(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QReview(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QReview(PathMetadata metadata, PathInits inits) { - this(Review.class, metadata, inits); - } - - public QReview(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.member = inits.isInitialized("member") ? new QMember(forProperty("member")) : null; - this.store = inits.isInitialized("store") ? new QStore(forProperty("store"), inits.get("store")) : null; - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QStore.java b/sanho/spring/src/main/generated/umc/spring/domain/QStore.java deleted file mode 100644 index a4ec49a..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QStore.java +++ /dev/null @@ -1,67 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QStore is a Querydsl query type for Store - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QStore extends EntityPathBase { - - private static final long serialVersionUID = 1158464437L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QStore store = new QStore("store"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - public final StringPath address = createString("address"); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final StringPath name = createString("name"); - - public final QRegion region; - - public final ListPath reviewList = this.createList("reviewList", Review.class, QReview.class, PathInits.DIRECT2); - - public final NumberPath score = createNumber("score", Float.class); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QStore(String variable) { - this(Store.class, forVariable(variable), INITS); - } - - public QStore(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QStore(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QStore(PathMetadata metadata, PathInits inits) { - this(Store.class, metadata, inits); - } - - public QStore(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.region = inits.isInitialized("region") ? new QRegion(forProperty("region")) : null; - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/QTerms.java b/sanho/spring/src/main/generated/umc/spring/domain/QTerms.java deleted file mode 100644 index 1066bf2..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/QTerms.java +++ /dev/null @@ -1,54 +0,0 @@ -package umc.spring.domain; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QTerms is a Querydsl query type for Terms - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QTerms extends EntityPathBase { - - private static final long serialVersionUID = 1158943835L; - - public static final QTerms terms = new QTerms("terms"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - public final StringPath body = createString("body"); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final ListPath memberAgreeList = this.createList("memberAgreeList", umc.spring.domain.mapping.MemberAgree.class, umc.spring.domain.mapping.QMemberAgree.class, PathInits.DIRECT2); - - public final BooleanPath optional = createBoolean("optional"); - - public final StringPath title = createString("title"); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QTerms(String variable) { - super(Terms.class, forVariable(variable)); - } - - public QTerms(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QTerms(PathMetadata metadata) { - super(Terms.class, metadata); - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java b/sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java deleted file mode 100644 index 3ea8c77..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/common/QBaseEntity.java +++ /dev/null @@ -1,39 +0,0 @@ -package umc.spring.domain.common; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; - - -/** - * QBaseEntity is a Querydsl query type for BaseEntity - */ -@Generated("com.querydsl.codegen.DefaultSupertypeSerializer") -public class QBaseEntity extends EntityPathBase { - - private static final long serialVersionUID = -1748720885L; - - public static final QBaseEntity baseEntity = new QBaseEntity("baseEntity"); - - public final DateTimePath createdAt = createDateTime("createdAt", java.time.LocalDateTime.class); - - public final DateTimePath updatedAt = createDateTime("updatedAt", java.time.LocalDateTime.class); - - public QBaseEntity(String variable) { - super(BaseEntity.class, forVariable(variable)); - } - - public QBaseEntity(Path path) { - super(path.getType(), path.getMetadata()); - } - - public QBaseEntity(PathMetadata metadata) { - super(BaseEntity.class, metadata); - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java deleted file mode 100644 index b84c2c1..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberAgree.java +++ /dev/null @@ -1,62 +0,0 @@ -package umc.spring.domain.mapping; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QMemberAgree is a Querydsl query type for MemberAgree - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QMemberAgree extends EntityPathBase { - - private static final long serialVersionUID = -2051556634L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QMemberAgree memberAgree = new QMemberAgree("memberAgree"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final umc.spring.domain.QMember member; - - public final umc.spring.domain.QTerms terms; - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QMemberAgree(String variable) { - this(MemberAgree.class, forVariable(variable), INITS); - } - - public QMemberAgree(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QMemberAgree(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QMemberAgree(PathMetadata metadata, PathInits inits) { - this(MemberAgree.class, metadata, inits); - } - - public QMemberAgree(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.member = inits.isInitialized("member") ? new umc.spring.domain.QMember(forProperty("member")) : null; - this.terms = inits.isInitialized("terms") ? new umc.spring.domain.QTerms(forProperty("terms")) : null; - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java deleted file mode 100644 index 0f3eb3c..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberMission.java +++ /dev/null @@ -1,64 +0,0 @@ -package umc.spring.domain.mapping; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QMemberMission is a Querydsl query type for MemberMission - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QMemberMission extends EntityPathBase { - - private static final long serialVersionUID = 1962779462L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QMemberMission memberMission = new QMemberMission("memberMission"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final NumberPath id = createNumber("id", Long.class); - - public final umc.spring.domain.QMember member; - - public final umc.spring.domain.QMission mission; - - public final EnumPath status = createEnum("status", umc.spring.domain.enums.MissionStatus.class); - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QMemberMission(String variable) { - this(MemberMission.class, forVariable(variable), INITS); - } - - public QMemberMission(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QMemberMission(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QMemberMission(PathMetadata metadata, PathInits inits) { - this(MemberMission.class, metadata, inits); - } - - public QMemberMission(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.member = inits.isInitialized("member") ? new umc.spring.domain.QMember(forProperty("member")) : null; - this.mission = inits.isInitialized("mission") ? new umc.spring.domain.QMission(forProperty("mission"), inits.get("mission")) : null; - } - -} - diff --git a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java b/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java deleted file mode 100644 index 6aa11cb..0000000 --- a/sanho/spring/src/main/generated/umc/spring/domain/mapping/QMemberPrefer.java +++ /dev/null @@ -1,62 +0,0 @@ -package umc.spring.domain.mapping; - -import static com.querydsl.core.types.PathMetadataFactory.*; - -import com.querydsl.core.types.dsl.*; - -import com.querydsl.core.types.PathMetadata; -import javax.annotation.processing.Generated; -import com.querydsl.core.types.Path; -import com.querydsl.core.types.dsl.PathInits; - - -/** - * QMemberPrefer is a Querydsl query type for MemberPrefer - */ -@Generated("com.querydsl.codegen.DefaultEntitySerializer") -public class QMemberPrefer extends EntityPathBase { - - private static final long serialVersionUID = 1265463574L; - - private static final PathInits INITS = PathInits.DIRECT2; - - public static final QMemberPrefer memberPrefer = new QMemberPrefer("memberPrefer"); - - public final umc.spring.domain.common.QBaseEntity _super = new umc.spring.domain.common.QBaseEntity(this); - - //inherited - public final DateTimePath createdAt = _super.createdAt; - - public final umc.spring.domain.QFoodCategory foodCategory; - - public final NumberPath id = createNumber("id", Long.class); - - public final umc.spring.domain.QMember member; - - //inherited - public final DateTimePath updatedAt = _super.updatedAt; - - public QMemberPrefer(String variable) { - this(MemberPrefer.class, forVariable(variable), INITS); - } - - public QMemberPrefer(Path path) { - this(path.getType(), path.getMetadata(), PathInits.getFor(path.getMetadata(), INITS)); - } - - public QMemberPrefer(PathMetadata metadata) { - this(metadata, PathInits.getFor(metadata, INITS)); - } - - public QMemberPrefer(PathMetadata metadata, PathInits inits) { - this(MemberPrefer.class, metadata, inits); - } - - public QMemberPrefer(Class type, PathMetadata metadata, PathInits inits) { - super(type, metadata, inits); - this.foodCategory = inits.isInitialized("foodCategory") ? new umc.spring.domain.QFoodCategory(forProperty("foodCategory")) : null; - this.member = inits.isInitialized("member") ? new umc.spring.domain.QMember(forProperty("member")) : null; - } - -} - diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java b/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java index d8fe291..3f48546 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/ApiResponse.java @@ -5,15 +5,16 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; import lombok.AllArgsConstructor; import lombok.Getter; + import umc.spring.apipayload.code.BaseCode; import umc.spring.apipayload.code.status.SuccessStatus; @Getter @AllArgsConstructor @JsonPropertyOrder({"isSuccess", "code", "message", "result"}) // 필드 순서 명시적 지정 -public class ApiResponse { +public class ApiResponse { // "일관된" 에러 메시지 응답 Dto - @JsonProperty("isSuccess") // 필드 이름 지정 + @JsonProperty("isSuccess") // 필드 이름 지정, 여기 같은 경우는 이미 isSuccess라 굳이 안 적어도 되긴 함. private final Boolean isSuccess; private final String code; private final String message; @@ -22,11 +23,13 @@ public class ApiResponse { // 성공한 경우 응답 생성 - public static ApiResponse onSuccess(T result){ + public static ApiResponse onSuccess(T result){ // 제네릭 메서드, result가 어디서 오는지 잘 확인. return new ApiResponse<>(true, SuccessStatus._OK.getCode() , SuccessStatus._OK.getMessage(), result); } - public static ApiResponse of(BaseCode code, T result){ // HttpStatus까지 + // 기존의 onSuccess 메서드보다 좀 더 유연하게 특정 상태 코드나 메시지를 커스터마이징해서 사용할 수 있다. + + public static ApiResponse of(BaseCode code, T result){ // HttpStatus까지, code는 인터페이스로 SuccessStatus가 이를 구현함 return new ApiResponse<>(true, code.getReasonHttpStatus().getCode() , code.getReasonHttpStatus().getMessage(), result); } diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java index 253ba45..23ec249 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseCode.java @@ -1,6 +1,6 @@ package umc.spring.apipayload.code; -public interface BaseCode { +public interface BaseCode { // SuccessStatus 코드를 위한 인터페이스 ReasonDTO getReason(); diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java index cf259ae..e172306 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/BaseErrorCode.java @@ -1,6 +1,6 @@ package umc.spring.apipayload.code; -public interface BaseErrorCode { +public interface BaseErrorCode { // ErrorStatus 코드를 위한 인터페이스 ErrorReasonDTO getReason(); diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java index 4846fb4..f43e8e4 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/ErrorReasonDTO.java @@ -6,7 +6,7 @@ @Getter @Builder -public class ErrorReasonDTO { +public class ErrorReasonDTO { // 에러 내용을 보여주는 Dto private HttpStatus httpStatus; @@ -14,5 +14,5 @@ public class ErrorReasonDTO { private final String code; private final String message; - public boolean getIsSuccess(){return isSuccess;} + public boolean getIsSuccess() {return isSuccess;} } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java index 5530fab..b4230dc 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/ReasonDTO.java @@ -6,7 +6,7 @@ @Getter @Builder -public class ReasonDTO { +public class ReasonDTO { // 성공 시 데이터 보여주는 Dto private HttpStatus httpStatus; diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java index 1af7e97..2562410 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java @@ -33,7 +33,7 @@ public enum ErrorStatus implements BaseErrorCode { private final String message; @Override - public ErrorReasonDTO getReason() { + public ErrorReasonDTO getReason() { // enum에 등록된 에러 코드를 Dto의 형태로 보내주는 역할 return ErrorReasonDTO.builder() .message(message) .code(code) @@ -42,7 +42,7 @@ public ErrorReasonDTO getReason() { } @Override - public ErrorReasonDTO getReasonHttpStatus() { + public ErrorReasonDTO getReasonHttpStatus() { // GenereationException에서 쓰는데, 이 ErrorStatus의 message, code, isSuccss, httpStatus를 ErrorReasonDTO 형식에 맞게 보내줌 return ErrorReasonDTO.builder() .message(message) .code(code) diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java index 1c0086f..19de481 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/SuccessStatus.java @@ -27,7 +27,7 @@ public ReasonDTO getReason() { // of를 위한 코드 } @Override - public ReasonDTO getReasonHttpStatus() { // of를 위한 코드 + public ReasonDTO getReasonHttpStatus() { // of를 위한 코드 - 이 Status의 message, code, isSuccess, httpStatus를 ReasonDTO 형식에 맞게 보내줌 return ReasonDTO.builder() .message(message) .code(code) diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java index c3c910a..4a60d4d 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java @@ -59,18 +59,21 @@ public ResponseEntity exception(Exception e, WebRequest request) { return handleExceptionInternalFalse(e, ErrorStatus._INTERNAL_SERVER_ERROR, HttpHeaders.EMPTY, ErrorStatus._INTERNAL_SERVER_ERROR.getHttpStatus(),request, e.getMessage()); } - @ExceptionHandler(value = GeneralException.class) + @ExceptionHandler(value = GeneralException.class) // GeneralException을 상속 받은 예외들도 다 처리가 됨 public ResponseEntity onThrowException(GeneralException generalException, HttpServletRequest request) { ErrorReasonDTO errorReasonHttpStatus = generalException.getErrorReasonHttpStatus(); return handleExceptionInternal(generalException,errorReasonHttpStatus,null,request); } private ResponseEntity handleExceptionInternal(Exception e, ErrorReasonDTO reason, - HttpHeaders headers, HttpServletRequest request) { + HttpHeaders headers, HttpServletRequest request) { // 여기서 발생한 예외에 대한 응답을 보냄. + // 응답 본문 생성 ApiResponse body = ApiResponse.onFailure(reason.getCode(),reason.getMessage(),null); // e.printStackTrace(); + + // 실제로 생성된 예외 응답을 클라이언트에게 반환하는 역할 WebRequest webRequest = new ServletWebRequest(request); return super.handleExceptionInternal( e, diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java index 7d723ef..94ad517 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/GeneralException.java @@ -9,13 +9,13 @@ @AllArgsConstructor public class GeneralException extends RuntimeException { - private BaseErrorCode code; + private BaseErrorCode code; // 이 code를 SuccessStatus가 구현하고, SuccessStatus에서 데이터를 가져온다. public ErrorReasonDTO getErrorReason() { return this.code.getReason(); } - public ErrorReasonDTO getErrorReasonHttpStatus(){ + public ErrorReasonDTO getErrorReasonHttpStatus(){ // ErrorStatus에서 ErrorReasonDTO 형식으로 받아와서 ExceptionAdvice로 넘김 return this.code.getReasonHttpStatus(); } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java index 50518c8..746625a 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/TempHandler.java @@ -3,9 +3,9 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class TempHandler extends GeneralException { +public class TempHandler extends GeneralException { // GeneralException을 상속 받음. Exception 핸들링 예시. - public TempHandler(BaseErrorCode errorCode) { + public TempHandler(BaseErrorCode errorCode) { // 에러 코드 ErrorStatus ex) ErrorStatus.TEMP_EXCEPTION super(errorCode); } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java b/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java index cc7d35c..8dd2fc3 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/TempConverter.java @@ -5,8 +5,8 @@ public class TempConverter { // TempResponse.TempTestDTO의 형태로 바꿔주는 역할 public static TempResponse.TempTestDTO toTempTestDTO(){ // static으로 선언 - return TempResponse.TempTestDTO.builder() - .testString("This is Test!") + return TempResponse.TempTestDTO.builder() // 응답도 builder 패턴으로 생성 + .testString("This is Test!") // 이게 result 값 .build(); } diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java index f29ab02..f1ab793 100644 --- a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandService.java @@ -1,4 +1,4 @@ package umc.spring.service.tempservice; -public class TempCommandService { +public interface TempCommandService { } diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java index f02f6ee..987eae2 100644 --- a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempCommandServiceImpl.java @@ -3,12 +3,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -//@Service -//@RequiredArgsConstructor -//public class TempCommandServiceImpl implements TempQueryService{ -// -// @Override -// public void checkFlag(Integer flag) { -// -// } -//} \ No newline at end of file +@Service +@RequiredArgsConstructor +public class TempCommandServiceImpl implements TempCommandService{ +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java index 55eda96..44ade74 100644 --- a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryService.java @@ -3,7 +3,7 @@ import org.springframework.stereotype.Service; @Service -public interface TempQueryService { +public interface TempQueryService { // 인터페이스 void checkFlag(Integer flag); } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java index ba3e40d..f1ac189 100644 --- a/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/tempservice/TempQueryServiceImpl.java @@ -7,11 +7,12 @@ @Service @RequiredArgsConstructor -public class TempQueryServiceImpl implements TempQueryService{ +public class TempQueryServiceImpl implements TempQueryService{ // Service에서 예외를 터뜨림 @Override public void checkFlag(Integer flag) { if (flag == 1) - throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); + throw new TempHandler(ErrorStatus.TEMP_EXCEPTION); // 이건 그냥 flag가 1일 때의 예시이고, 실제로는 필요한 곳에서 해당 예외를 터뜨림 + // 여기서 Controller로 안 가고 바로 Exception handler에 의해 응답이 보내짐. @RestControllerAdvice } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java index 27680f4..949b42b 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java @@ -13,7 +13,7 @@ @RestController @RequestMapping("/temp") @RequiredArgsConstructor -public class TempRestController { +public class TempRestController { // @RestController라 json 형태로 바로 화면으로 값을 뿌림 private final TempQueryService tempQueryService; diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java b/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java index 87f1fed..a48750a 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/TempRequest.java @@ -1,4 +1,4 @@ package umc.spring.web.dto; -public class TempRequest { +public class TempRequest { // @RequestBody에는 담아 오는 값이 없음 } diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java b/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java index e734d82..56add33 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/TempResponse.java @@ -5,7 +5,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; -public class TempResponse { // DTO +public class TempResponse { // DTO 묶음 클래스 @Builder @Getter From 81d1b894758bc945a19021d3b05e024fb43511fd Mon Sep 17 00:00:00 2001 From: sshnote Date: Sat, 23 Nov 2024 17:40:33 +0900 Subject: [PATCH 5/9] =?UTF-8?q?week8=20=EB=AF=B8=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sanho/spring/build.gradle | 1 + .../apipayload/code/status/ErrorStatus.java | 14 ++++- .../apipayload/exception/ExceptionAdvice.java | 2 + .../handler/FoodCategoryHandler.java | 10 ++++ .../exception/handler/MemberHandler.java | 10 ++++ .../handler/MemberMissionHandler.java | 10 ++++ .../exception/handler/MissionHandler.java | 11 ++++ .../exception/handler/RegionHandler.java | 11 ++++ .../exception/handler/StoreHandler.java | 10 ++++ .../java/umc/spring/config/SwaggerConfig.java | 41 ++++++++++++++ .../umc/spring/converter/MemberConverter.java | 44 +++++++++++++++ .../converter/MemberPreferConverter.java | 20 +++++++ .../spring/converter/MissionConverter.java | 34 ++++++++++++ .../umc/spring/converter/ReviewConverter.java | 30 +++++++++++ .../umc/spring/converter/StoreConverter.java | 31 +++++++++++ .../main/java/umc/spring/domain/Member.java | 11 +++- .../main/java/umc/spring/domain/Mission.java | 12 +++++ .../main/java/umc/spring/domain/Review.java | 11 ++++ .../main/java/umc/spring/domain/Store.java | 9 ++++ .../java/umc/spring/domain/enums/Gender.java | 2 +- .../spring/domain/mapping/MemberMission.java | 1 + .../spring/domain/mapping/MemberPrefer.java | 12 +++++ .../foodcategory/FoodCategoryRepository.java | 7 +++ .../repository/member/MemberRepository.java | 7 +++ .../MemberMissionRepository.java | 7 +++ .../repository/mission/MissionRepository.java | 7 +++ .../repository/region/RegionRepository.java | 7 +++ .../repository/review/ReviewRepository.java | 7 +++ .../service/member/MemberCommandService.java | 9 ++++ .../member/MemberCommandServiceImpl.java | 47 ++++++++++++++++ .../service/member/MemberQueryService.java | 4 ++ .../member/MemberQueryServiceImpl.java | 4 ++ .../mission/MissionCommandService.java | 9 ++++ .../mission/MissionCommandServiceImpl.java | 53 +++++++++++++++++++ .../service/review/ReviewCommandService.java | 9 ++++ .../review/ReviewCommandServiceImpl.java | 43 +++++++++++++++ .../service/store/StoreCommandService.java | 9 ++++ .../store/StoreCommandServiceImpl.java | 36 +++++++++++++ .../annotation/ExistCategories.java | 18 +++++++ .../validation/annotation/ExistMember.java | 19 +++++++ .../annotation/ExistMemberMission.java | 18 +++++++ .../validation/annotation/ExistRegion.java | 18 +++++++ .../validation/annotation/ExistStore.java | 19 +++++++ .../validator/CategoriesExistValidator.java | 37 +++++++++++++ .../validator/MemberExistValidator.java | 39 ++++++++++++++ .../MemberMissionExistValidator.java | 37 +++++++++++++ .../validator/RegionExistValidator.java | 37 +++++++++++++ .../validator/StoreExistValidator.java | 37 +++++++++++++ .../web/controller/MemberRestController.java | 28 ++++++++++ .../web/controller/MissionRestController.java | 35 ++++++++++++ .../web/controller/ReviewRestController.java | 31 +++++++++++ .../web/controller/StoreRestController.java | 29 ++++++++++ .../umc/spring/web/dto/MemberRequestDTO.java | 32 +++++++++++ .../umc/spring/web/dto/MemberResponseDTO.java | 20 +++++++ .../umc/spring/web/dto/MissionRequestDTO.java | 32 +++++++++++ .../spring/web/dto/MissionResponseDTO.java | 20 +++++++ .../umc/spring/web/dto/ReviewRequestDTO.java | 31 +++++++++++ .../umc/spring/web/dto/ReviewResponseDTO.java | 20 +++++++ .../umc/spring/web/dto/StoreRequestDTO.java | 22 ++++++++ .../umc/spring/web/dto/StoreResponseDTO.java | 20 +++++++ 60 files changed, 1198 insertions(+), 3 deletions(-) create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java create mode 100644 sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java create mode 100644 sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java create mode 100644 sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java create mode 100644 sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java create mode 100644 sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java create mode 100644 sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java create mode 100644 sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java diff --git a/sanho/spring/build.gradle b/sanho/spring/build.gradle index 1412fee..fe0250a 100644 --- a/sanho/spring/build.gradle +++ b/sanho/spring/build.gradle @@ -28,6 +28,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' // queryDSL implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java index 2562410..55bc891 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java @@ -25,7 +25,19 @@ public enum ErrorStatus implements BaseErrorCode { ARTICLE_NOT_FOUND(HttpStatus.NOT_FOUND, "ARTICLE4001", "게시글이 없습니다."), // For test - TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"); + TEMP_EXCEPTION(HttpStatus.BAD_REQUEST, "TEMP4001", "이거는 테스트"), + + // 음식 카테고리 관련 에러 + FOOD_CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "FOODCATEGORY4001", "음식 카테고리가 없습니다."), + + // 지역 관련 에러 + REGION_NOT_FOUND(HttpStatus.BAD_REQUEST, "REGION4001", "지역이 없습니다."), + + // 가게 관련 에러 + STORE_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE4001", "가게가 없습니다."), + + // 미션 관련 에러 + Member_Mission_NOT_FOUND(HttpStatus.BAD_REQUEST, "MemberMission4001", "미션이 없습니다."); private final HttpStatus httpStatus; diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java index 4a60d4d..26882a3 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java @@ -119,4 +119,6 @@ private ResponseEntity handleExceptionInternalConstraint(Exception e, Er request ); } + + } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java new file mode 100644 index 0000000..e2820c0 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java @@ -0,0 +1,10 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class FoodCategoryHandler extends GeneralException { + public FoodCategoryHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java new file mode 100644 index 0000000..0342754 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java @@ -0,0 +1,10 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class MemberHandler extends GeneralException { + public MemberHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java new file mode 100644 index 0000000..8822837 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java @@ -0,0 +1,10 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class MemberMissionHandler extends GeneralException { + public MemberMissionHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java new file mode 100644 index 0000000..0eb0394 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java @@ -0,0 +1,11 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class MissionHandler extends GeneralException { + + public MissionHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java new file mode 100644 index 0000000..131b790 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java @@ -0,0 +1,11 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class RegionHandler extends GeneralException { + + public RegionHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java new file mode 100644 index 0000000..8861d0d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java @@ -0,0 +1,10 @@ +package umc.spring.apipayload.exception.handler; + +import umc.spring.apipayload.code.BaseErrorCode; +import umc.spring.apipayload.exception.GeneralException; + +public class StoreHandler extends GeneralException { + public StoreHandler(BaseErrorCode code) { + super(code); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java b/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java new file mode 100644 index 0000000..fa177fb --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java @@ -0,0 +1,41 @@ +package umc.spring.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import io.swagger.v3.oas.models.servers.Server; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI UMCstudyAPI() { + Info info = new Info() + .title("UMC Server WorkBook API") + .description("UMC Server WorkBook API 명세서") + .version("1.0.0"); + + String jwtSchemeName = "JWT TOKEN"; + + // API 요청헤더에 인증정보 포함 + SecurityRequirement securityRequirement = new SecurityRequirement().addList(jwtSchemeName); + + // SecuritySchemes 등록 + Components components = new Components() + .addSecuritySchemes(jwtSchemeName, new SecurityScheme() + .name(jwtSchemeName) + .type(SecurityScheme.Type.HTTP) // HTTP 방식 + .scheme("bearer") + .bearerFormat("JWT")); + + return new OpenAPI() + .addServersItem(new Server().url("/")) + .info(info) + .addSecurityItem(securityRequirement) + .components(components); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java new file mode 100644 index 0000000..168e90e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java @@ -0,0 +1,44 @@ +package umc.spring.converter; + +import umc.spring.domain.Member; +import umc.spring.domain.enums.Gender; +import umc.spring.web.dto.MemberRequestDTO; +import umc.spring.web.dto.MemberResponseDTO; + +import java.time.LocalDateTime; +import java.util.ArrayList; + +public class MemberConverter { + + public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member){ + return MemberResponseDTO.JoinResultDTO.builder() + .memberId(member.getId()) + .createdAt(LocalDateTime.now()) + .build(); + } + + public static Member toMember(MemberRequestDTO.JoinDto request){ + + Gender gender = null; // 선택 안 했을 수도 있음 + + switch (request.getGender()){ + case 1: + gender = Gender.MALE; + break; + case 2: + gender = Gender.FEMALE; + break; + case 3: + gender = Gender.NONE; + break; + } + + return Member.builder() + .address(request.getAddress()) + .specAddress(request.getSpecAddress()) + .gender(gender) + .name(request.getName()) + .memberPreferList(new ArrayList<>()) + .build(); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java new file mode 100644 index 0000000..47942ae --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java @@ -0,0 +1,20 @@ +package umc.spring.converter; + +import umc.spring.domain.FoodCategory; +import umc.spring.domain.mapping.MemberPrefer; + +import java.util.List; +import java.util.stream.Collectors; + +public class MemberPreferConverter { + + public static List toMemberPreferList(List foodCategoryList){ + + return foodCategoryList.stream() + .map(foodCategory -> + MemberPrefer.builder() + .foodCategory(foodCategory) + .build() + ).collect(Collectors.toList()); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java new file mode 100644 index 0000000..939ad90 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java @@ -0,0 +1,34 @@ +package umc.spring.converter; + +import umc.spring.domain.Mission; +import umc.spring.domain.Store; +import umc.spring.domain.mapping.MemberMission; +import umc.spring.web.dto.MissionRequestDTO; +import umc.spring.web.dto.MissionResponseDTO; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; + + +public class MissionConverter { + + public static MissionResponseDTO.AddMissionResultDTO toAddMissionDTO(Mission mission){ + return MissionResponseDTO.AddMissionResultDTO.builder() + .missionId(mission.getId()) + .createdAt(LocalDateTime.now()) + .build(); + } + + public static Mission toMission(MissionRequestDTO.AddMissionDTO request, Store store, List memberMissionList) { + + return Mission.builder() + .reward(request.getReward()) + .deadline(request.getDeadline()) + .missionSpec(request.getMissionSpec()) + .store(store) + .memberMissionList(memberMissionList) + .build(); + } + + +} diff --git a/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java b/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java new file mode 100644 index 0000000..8f97f53 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java @@ -0,0 +1,30 @@ +package umc.spring.converter; + +import umc.spring.domain.Member; +import umc.spring.domain.Review; +import umc.spring.domain.Store; +import umc.spring.web.dto.ReviewRequestDTO; +import umc.spring.web.dto.ReviewResponseDTO; +import java.time.LocalDateTime; + + +public class ReviewConverter { + + public static ReviewResponseDTO.AddReviewResultDTO toAddResultDTO(Review review){ + return ReviewResponseDTO.AddReviewResultDTO.builder() + .reviewId(review.getId()) + .createdAt(LocalDateTime.now()) + .build(); + } + + public static Review toReview(ReviewRequestDTO.AddReviewDto request, Member member, Store store){ + + return Review.builder() + .title(request.getTitle()) + .body(request.getBody()) + .score(request.getScore()) + .member(member) + .store(store) + .build(); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java new file mode 100644 index 0000000..b102647 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java @@ -0,0 +1,31 @@ +package umc.spring.converter; + +import umc.spring.domain.Region; +import umc.spring.domain.Store; +import umc.spring.web.dto.StoreRequestDTO; +import umc.spring.web.dto.StoreResponseDTO; + +import java.time.LocalDateTime; +import java.util.ArrayList; + + +public class StoreConverter { + + public static StoreResponseDTO.AddStoreDTO toAddResultDTO(Store store){ + return StoreResponseDTO.AddStoreDTO.builder() + .storeId(store.getId()) + .createdAt(LocalDateTime.now()) + .build(); + } + + public static Store toStore(StoreRequestDTO.AddStoreDto request, Region region){ // name, address, region + + return Store.builder() + .name(request.getName()) + .address(request.getAddress()) + .region(region) + .reviewList(new ArrayList<>()) + .build(); + } + +} diff --git a/sanho/spring/src/main/java/umc/spring/domain/Member.java b/sanho/spring/src/main/java/umc/spring/domain/Member.java index 277ac3b..e181b78 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Member.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Member.java @@ -2,6 +2,9 @@ import jakarta.persistence.*; import lombok.*; +import org.hibernate.annotations.ColumnDefault; +import org.hibernate.annotations.DynamicInsert; +import org.hibernate.annotations.DynamicUpdate; import umc.spring.domain.common.BaseEntity; import umc.spring.domain.enums.Gender; import umc.spring.domain.enums.MemberStatus; @@ -16,6 +19,8 @@ @Entity // JPA의 엔티티 @Getter +@DynamicUpdate +@DynamicInsert @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor @@ -51,11 +56,15 @@ public class Member extends BaseEntity { @Column(columnDefinition = "DATETIME") private LocalDate inactiveDate; - @Column(nullable = false, length = 50) +// @Column(nullable = false, length = 50) private String email; + @ColumnDefault("0") private Integer point; + // 나이 추가 + private Integer age; + @OneToMany(mappedBy = "member", cascade = CascadeType.ALL) // CascadeType.ALL로 인해 persist(member) 하면 아래 4개도 같이 persist 됨. private List memberAgreeList = new ArrayList<>(); diff --git a/sanho/spring/src/main/java/umc/spring/domain/Mission.java b/sanho/spring/src/main/java/umc/spring/domain/Mission.java index 0a1fb4b..13bfe3e 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Mission.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Mission.java @@ -32,6 +32,18 @@ public class Mission extends BaseEntity { @JoinColumn(name = "store_id") private Store store; + @OneToMany(mappedBy = "mission", cascade = CascadeType.ALL) private List memberMissionList = new ArrayList<>(); + + //==연관관계 메서드==// + public void setStore(Store store) { + this.store = store; + store.getMisisonList().add(this); + } + + public void setMemberMissionList(MemberMission memberMission) { + this.memberMissionList.add(memberMission); + memberMission.setMission(this); + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Review.java b/sanho/spring/src/main/java/umc/spring/domain/Review.java index 81d613d..d5725ea 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Review.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Review.java @@ -28,4 +28,15 @@ public class Review extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "store_id") private Store store; + + //==연관관계 메서드==// + public void setMember(Member member) { + this.member = member; + member.getReviewList().add(this); + } + + public void setStore(Store store) { + this.store = store; + store.getReviewList().add(this); + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/domain/Store.java b/sanho/spring/src/main/java/umc/spring/domain/Store.java index cecac2d..2189e92 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Store.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Store.java @@ -33,6 +33,15 @@ public class Store extends BaseEntity { @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) private List reviewList = new ArrayList<>(); + @OneToMany(mappedBy = "store", cascade = CascadeType.ALL) + private List misisonList = new ArrayList<>(); + + //==연관관계 메서드==// + public void setRegion(Region region) { + this.region = region; + region.getStoreList().add(this); + } + @Override public String toString() { diff --git a/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java b/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java index d2ffaa7..81b604b 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java +++ b/sanho/spring/src/main/java/umc/spring/domain/enums/Gender.java @@ -1,5 +1,5 @@ package umc.spring.domain.enums; public enum Gender { - MALE, FEMALE; + MALE, FEMALE, NONE; } diff --git a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java index 119771d..86e4459 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java +++ b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberMission.java @@ -9,6 +9,7 @@ @Entity @Getter +@Setter @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor diff --git a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java index 2e28916..061fc9c 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java +++ b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java @@ -25,4 +25,16 @@ public class MemberPrefer extends BaseEntity { @JoinColumn(name = "category_id") private FoodCategory foodCategory; + + //==연관관계 메서드==// + public void setMember(Member member){ + if(this.member != null) + member.getMemberPreferList().remove(this); + this.member = member; + member.getMemberPreferList().add(this); + } + + public void setFoodCategory(FoodCategory foodCategory){ + this.foodCategory = foodCategory; + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java b/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java new file mode 100644 index 0000000..b8b8cc6 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.foodcategory; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.FoodCategory; + +public interface FoodCategoryRepository extends JpaRepository { +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java b/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java new file mode 100644 index 0000000..cea07c3 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.member; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Member; + +public interface MemberRepository extends JpaRepository { +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java new file mode 100644 index 0000000..a7d1255 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.membermission; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.mapping.MemberMission; + +public interface MemberMissionRepository extends JpaRepository { +} diff --git a/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java new file mode 100644 index 0000000..ea112d4 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.mission; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Mission; + +public interface MissionRepository extends JpaRepository { +} diff --git a/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java new file mode 100644 index 0000000..d2b2791 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.region; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Region; + +public interface RegionRepository extends JpaRepository { +} diff --git a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java new file mode 100644 index 0000000..2373b04 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java @@ -0,0 +1,7 @@ +package umc.spring.repository.review; + +import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Review; + +public interface ReviewRepository extends JpaRepository { +} diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java new file mode 100644 index 0000000..b47bdb2 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java @@ -0,0 +1,9 @@ +package umc.spring.service.member; + +import umc.spring.domain.Member; +import umc.spring.web.dto.MemberRequestDTO; + +public interface MemberCommandService { + + Member joinMember(MemberRequestDTO.JoinDto request); +} diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java new file mode 100644 index 0000000..8ba2453 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java @@ -0,0 +1,47 @@ +package umc.spring.service.member; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.apipayload.exception.handler.FoodCategoryHandler; +import umc.spring.converter.MemberConverter; +import umc.spring.converter.MemberPreferConverter; +import umc.spring.domain.FoodCategory; +import umc.spring.domain.Member; +import umc.spring.domain.mapping.MemberPrefer; +import umc.spring.repository.foodcategory.FoodCategoryRepository; +import umc.spring.repository.member.MemberRepository; +import umc.spring.web.dto.MemberRequestDTO; + +import java.util.List; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +public class MemberCommandServiceImpl implements MemberCommandService{ + + private final MemberRepository memberRepository; + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + @Transactional + public Member joinMember(MemberRequestDTO.JoinDto request) { + + Member newMember = MemberConverter.toMember(request); + +// List preferCategory = request.getPreferCategory(); + + List foodCategoryList = request.getPreferCategory().stream() + .map(category -> { + return foodCategoryRepository.findById(category).orElseThrow(() -> new FoodCategoryHandler(ErrorStatus.FOOD_CATEGORY_NOT_FOUND)); + }).collect(Collectors.toList()); + + List memberPreferList = MemberPreferConverter.toMemberPreferList(foodCategoryList); + + memberPreferList.forEach(memberPrefer -> {memberPrefer.setMember(newMember);}); + + return memberRepository.save(newMember); + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java new file mode 100644 index 0000000..a81fb58 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java @@ -0,0 +1,4 @@ +package umc.spring.service.member; + +public interface MemberQueryService { +} diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java new file mode 100644 index 0000000..863c858 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java @@ -0,0 +1,4 @@ +package umc.spring.service.member; + +public class MemberQueryServiceImpl { +} diff --git a/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java new file mode 100644 index 0000000..4baf149 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java @@ -0,0 +1,9 @@ +package umc.spring.service.mission; + +import umc.spring.domain.Mission; +import umc.spring.web.dto.MissionRequestDTO; + +public interface MissionCommandService { + + Mission addMission(MissionRequestDTO.AddMissionDTO request); +} diff --git a/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java new file mode 100644 index 0000000..98e90f5 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java @@ -0,0 +1,53 @@ +package umc.spring.service.mission; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.apipayload.exception.handler.*; +import umc.spring.converter.MissionConverter; +import umc.spring.domain.*; +import umc.spring.domain.mapping.MemberMission; +import umc.spring.repository.membermission.MemberMissionRepository; +import umc.spring.repository.mission.MissionRepository; +import umc.spring.repository.store.StoreRepository; +import umc.spring.web.dto.MissionRequestDTO; +import java.util.ArrayList; +import java.util.List; + + +@Service +@RequiredArgsConstructor +public class MissionCommandServiceImpl implements MissionCommandService { + + private final MissionRepository missionRepository; + private final StoreRepository storeRepository; + private final MemberMissionRepository memberMissionRepository; + private List memberMissionList = new ArrayList<>(); // 리스트를 필드로 유지 + + + @Override + @Transactional + public Mission addMission(MissionRequestDTO.AddMissionDTO request) { + + Store store = storeRepository.findById(request.getStoreId()) + .orElseThrow(() -> new MissionHandler(ErrorStatus.MEMBER_NOT_FOUND)); + + MemberMission memberMission = memberMissionRepository.findById(request.getMemberMissionId()) + .orElseThrow(() -> new MemberMissionHandler(ErrorStatus.Member_Mission_NOT_FOUND)); + + // 첫 번째 요청에서는 리스트를 생성, 이후에는 기존 리스트에 추가 + if (memberMissionList == null) { + memberMissionList = new ArrayList<>(); + } + memberMissionList.add(memberMission); // memberMission 추가 + + + Mission newMission = MissionConverter.toMission(request, store, memberMissionList); + + newMission.setStore(store); + newMission.setMemberMissionList(memberMission); + + return missionRepository.save(newMission); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java new file mode 100644 index 0000000..890b7ec --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java @@ -0,0 +1,9 @@ +package umc.spring.service.review; + +import umc.spring.domain.Review; +import umc.spring.web.dto.ReviewRequestDTO; + +public interface ReviewCommandService { + + Review addReview(ReviewRequestDTO.AddReviewDto request); +} diff --git a/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java new file mode 100644 index 0000000..a780dd4 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java @@ -0,0 +1,43 @@ +package umc.spring.service.review; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.apipayload.exception.handler.MemberHandler; +import umc.spring.apipayload.exception.handler.StoreHandler; +import umc.spring.converter.ReviewConverter; +import umc.spring.domain.Member; +import umc.spring.domain.Review; +import umc.spring.domain.Store; +import umc.spring.repository.member.MemberRepository; +import umc.spring.repository.review.ReviewRepository; +import umc.spring.repository.store.StoreRepository; +import umc.spring.web.dto.ReviewRequestDTO; + +@Service +@RequiredArgsConstructor +public class ReviewCommandServiceImpl implements ReviewCommandService { + + private final ReviewRepository reviewRepository; + private final MemberRepository memberRepository; + private final StoreRepository storeRepository; + + @Override + @Transactional + public Review addReview(ReviewRequestDTO.AddReviewDto request) { + + Member member = memberRepository.findById(request.getMemberId()) + .orElseThrow(() -> new MemberHandler(ErrorStatus.MEMBER_NOT_FOUND)); + + Store store = storeRepository.findById(request.getStoreId()) + .orElseThrow(() -> new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); + + Review newReview = ReviewConverter.toReview(request, member, store); + + newReview.setMember(member); + newReview.setStore(store); + + return reviewRepository.save(newReview); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java new file mode 100644 index 0000000..a6f34d4 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java @@ -0,0 +1,9 @@ +package umc.spring.service.store; + +import umc.spring.domain.Store; +import umc.spring.web.dto.StoreRequestDTO; + +public interface StoreCommandService { + + Store addStore(StoreRequestDTO.AddStoreDto request); +} diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java new file mode 100644 index 0000000..4031cf1 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java @@ -0,0 +1,36 @@ +package umc.spring.service.store; + +import jakarta.transaction.Transactional; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.apipayload.exception.handler.RegionHandler; +import umc.spring.converter.StoreConverter; +import umc.spring.domain.Region; +import umc.spring.domain.Store; +import umc.spring.repository.region.RegionRepository; +import umc.spring.repository.store.StoreRepository; +import umc.spring.web.dto.StoreRequestDTO; + + + +@Service +@RequiredArgsConstructor +public class StoreCommandServiceImpl implements StoreCommandService { + + private final StoreRepository storeRepository; + private final RegionRepository regionRepository; + + @Override + @Transactional + public Store addStore(StoreRequestDTO.AddStoreDto request) { + + Region region = regionRepository.findById(request.getRegionId()) + .orElseThrow(() -> new RegionHandler(ErrorStatus.REGION_NOT_FOUND)); + + Store newStore = StoreConverter.toStore(request, region); + newStore.setRegion(region); + + return storeRepository.save(newStore); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java new file mode 100644 index 0000000..fa18030 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java @@ -0,0 +1,18 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.CategoriesExistValidator; + +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = CategoriesExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistCategories { + + String message() default "해당하는 카테고리가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java new file mode 100644 index 0000000..37bebc6 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java @@ -0,0 +1,19 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.MemberExistValidator; +import umc.spring.validation.validator.RegionExistValidator; + +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = MemberExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistMember { + + String message() default "해당하는 멤버가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java new file mode 100644 index 0000000..2e70796 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java @@ -0,0 +1,18 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.MemberMissionExistValidator; + +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = MemberMissionExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistMemberMission { + + String message() default "해당하는 미션이 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java new file mode 100644 index 0000000..8e57592 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java @@ -0,0 +1,18 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.RegionExistValidator; + +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = RegionExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistRegion { + + String message() default "해당하는 지역이 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java new file mode 100644 index 0000000..b2a5c63 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java @@ -0,0 +1,19 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.RegionExistValidator; +import umc.spring.validation.validator.StoreExistValidator; + +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = StoreExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistStore { + + String message() default "해당하는 가게가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java new file mode 100644 index 0000000..8c96629 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java @@ -0,0 +1,37 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.repository.foodcategory.FoodCategoryRepository; +import umc.spring.validation.annotation.ExistCategories; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class CategoriesExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 + + private final FoodCategoryRepository foodCategoryRepository; + + @Override + public void initialize(ExistCategories constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> foodCategoryRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.FOOD_CATEGORY_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java new file mode 100644 index 0000000..04743d1 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java @@ -0,0 +1,39 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.repository.member.MemberRepository; +import umc.spring.repository.region.RegionRepository; +import umc.spring.validation.annotation.ExistMember; +import umc.spring.validation.annotation.ExistRegion; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class MemberExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 + + private final MemberRepository memberRepository; + + @Override + public void initialize(ExistMember constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> memberRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MEMBER_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java new file mode 100644 index 0000000..ae8c1c2 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java @@ -0,0 +1,37 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.repository.membermission.MemberMissionRepository; +import umc.spring.validation.annotation.ExistMemberMission; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class MemberMissionExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 + + private final MemberMissionRepository memberMissionRepository; + + @Override + public void initialize(ExistMemberMission constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> memberMissionRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.Member_Mission_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java new file mode 100644 index 0000000..4296e2f --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java @@ -0,0 +1,37 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.repository.region.RegionRepository; +import umc.spring.validation.annotation.ExistRegion; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class RegionExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 + + private final RegionRepository regionRepository; + + @Override + public void initialize(ExistRegion constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> regionRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.REGION_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java new file mode 100644 index 0000000..99fbe0f --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java @@ -0,0 +1,37 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.repository.store.StoreRepository; +import umc.spring.validation.annotation.ExistStore; + +import java.util.List; + +@Component +@RequiredArgsConstructor +public class StoreExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 + + private final StoreRepository storeRepository; + + @Override + public void initialize(ExistStore constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(List values, ConstraintValidatorContext context) { + boolean isValid = values.stream() + .allMatch(value -> storeRepository.existsById(value)); + + if (!isValid) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()).addConstraintViolation(); + } + + return isValid; + + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java new file mode 100644 index 0000000..255e4e5 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java @@ -0,0 +1,28 @@ +package umc.spring.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +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; +import umc.spring.apipayload.ApiResponse; +import umc.spring.converter.MemberConverter; +import umc.spring.domain.Member; +import umc.spring.service.member.MemberCommandService; +import umc.spring.web.dto.MemberRequestDTO; +import umc.spring.web.dto.MemberResponseDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/members") +public class MemberRestController { + + private final MemberCommandService memberCommandService; + + @PostMapping("/") + public ApiResponse join(@RequestBody @Valid MemberRequestDTO.JoinDto request){ + Member member = memberCommandService.joinMember(request); + return ApiResponse.onSuccess(MemberConverter.toJoinResultDTO(member)); // result를 리턴하는데, 이 result가 id와 생성시간 + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java new file mode 100644 index 0000000..64baeec --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java @@ -0,0 +1,35 @@ +package umc.spring.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +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; +import umc.spring.apipayload.ApiResponse; +import umc.spring.converter.MissionConverter; +import umc.spring.converter.ReviewConverter; +import umc.spring.domain.Mission; +import umc.spring.domain.Review; +import umc.spring.service.mission.MissionCommandService; +import umc.spring.web.dto.MissionRequestDTO; +import umc.spring.web.dto.MissionResponseDTO; +import umc.spring.web.dto.ReviewRequestDTO; +import umc.spring.web.dto.ReviewResponseDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/missons") +public class MissionRestController { + + private final MissionCommandService missionCommandService; + + @PostMapping("/") + public ApiResponse add(@RequestBody @Valid MissionRequestDTO.AddMissionDTO request){ + + Mission mission = missionCommandService.addMission(request); + + return ApiResponse.onSuccess((MissionConverter.toAddMissionDTO(mission))); + + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java new file mode 100644 index 0000000..6e480ea --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java @@ -0,0 +1,31 @@ +package umc.spring.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +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; +import umc.spring.apipayload.ApiResponse; +import umc.spring.converter.ReviewConverter; +import umc.spring.domain.Review; +import umc.spring.service.review.ReviewCommandService; +import umc.spring.web.dto.ReviewRequestDTO; +import umc.spring.web.dto.ReviewResponseDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/reviews") +public class ReviewRestController { + + private final ReviewCommandService reviewCommandService; + + @PostMapping("/") + public ApiResponse add(@RequestBody @Valid ReviewRequestDTO.AddReviewDto request){ + + Review review = reviewCommandService.addReview(request); + + return ApiResponse.onSuccess((ReviewConverter.toAddResultDTO(review))); + + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java new file mode 100644 index 0000000..7640e84 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java @@ -0,0 +1,29 @@ +package umc.spring.web.controller; + +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +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; +import umc.spring.apipayload.ApiResponse; +import umc.spring.converter.StoreConverter; +import umc.spring.domain.Store; +import umc.spring.service.store.StoreCommandService; +import umc.spring.web.dto.StoreRequestDTO; +import umc.spring.web.dto.StoreResponseDTO; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/stores") +public class StoreRestController { + + private final StoreCommandService storeCommandService; + + @PostMapping("/") + public ApiResponse add(@RequestBody @Valid StoreRequestDTO.AddStoreDto request){ + Store store = storeCommandService.addStore(request); + return ApiResponse.onSuccess((StoreConverter.toAddResultDTO(store))); + + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java new file mode 100644 index 0000000..da88399 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java @@ -0,0 +1,32 @@ +package umc.spring.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.Getter; +import umc.spring.validation.annotation.ExistCategories; + +import java.util.List; + +public class MemberRequestDTO { + + @Getter + public static class JoinDto{ + @NotBlank + String name; + @NotNull + Integer gender; + @NotNull + Integer birthYear; + @NotNull + Integer birthMonth; + @NotNull + Integer birthDay; + @Size(min = 5, max = 12) + String address; + @Size(min = 5, max = 12) + String specAddress; + @ExistCategories + List preferCategory; + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java new file mode 100644 index 0000000..2fd1c2e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java @@ -0,0 +1,20 @@ +package umc.spring.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class MemberResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class JoinResultDTO{ + Long memberId; + LocalDateTime createdAt; + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java new file mode 100644 index 0000000..4d48e70 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java @@ -0,0 +1,32 @@ +package umc.spring.web.dto; + +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import umc.spring.validation.annotation.ExistMemberMission; + +import java.time.LocalDate; +import java.util.List; + +public class MissionRequestDTO { + + @Getter + public static class AddMissionDTO { + + @NotNull + Integer reward; + + @NotEmpty + LocalDate deadline; + + @NotEmpty + String missionSpec; + + @NotEmpty + Long storeId; + + @ExistMemberMission + Long memberMissionId; + + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java new file mode 100644 index 0000000..dab1421 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java @@ -0,0 +1,20 @@ +package umc.spring.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class MissionResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class AddMissionResultDTO{ + Long missionId; + LocalDateTime createdAt; + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java new file mode 100644 index 0000000..bce08eb --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java @@ -0,0 +1,31 @@ +package umc.spring.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import umc.spring.validation.annotation.ExistMember; +import umc.spring.validation.annotation.ExistStore; + + +public class ReviewRequestDTO { + + @Getter + public static class AddReviewDto { + + @NotBlank + String title; + + @NotNull + String body; + + @NotNull + Float score; + + @ExistMember + Long memberId; + + @ExistStore + Long storeId; + } + +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java new file mode 100644 index 0000000..e20d057 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java @@ -0,0 +1,20 @@ +package umc.spring.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class ReviewResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class AddReviewResultDTO { + Long reviewId; + LocalDateTime createdAt; + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java new file mode 100644 index 0000000..eb6ad9d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java @@ -0,0 +1,22 @@ +package umc.spring.web.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import lombok.Getter; +import umc.spring.validation.annotation.ExistRegion; + +public class StoreRequestDTO { + + @Getter + public static class AddStoreDto { + + @NotBlank + String name; + + @NotNull + String address; + + @ExistRegion + Long regionId; + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java new file mode 100644 index 0000000..7b94d47 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java @@ -0,0 +1,20 @@ +package umc.spring.web.dto; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +public class StoreResponseDTO { + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class AddStoreDTO { + Long storeId; + LocalDateTime createdAt; + } +} From 7aef3c953958ff9abb1e7434da8881fbce271d74 Mon Sep 17 00:00:00 2001 From: sshnote Date: Sat, 23 Nov 2024 17:47:03 +0900 Subject: [PATCH 6/9] =?UTF-8?q?week8=20=EB=AF=B8=EC=85=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sanho/spring/build.gradle | 2 +- .../java/umc/spring/apipayload/code/status/ErrorStatus.java | 2 +- .../apipayload/exception/handler/FoodCategoryHandler.java | 2 +- .../umc/spring/apipayload/exception/handler/MemberHandler.java | 2 +- .../apipayload/exception/handler/MemberMissionHandler.java | 2 +- .../umc/spring/apipayload/exception/handler/MissionHandler.java | 2 +- .../umc/spring/apipayload/exception/handler/RegionHandler.java | 2 +- .../umc/spring/apipayload/exception/handler/StoreHandler.java | 2 +- sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java | 2 +- .../src/main/java/umc/spring/converter/MemberConverter.java | 2 +- .../main/java/umc/spring/converter/MemberPreferConverter.java | 2 +- .../src/main/java/umc/spring/converter/MissionConverter.java | 2 +- .../src/main/java/umc/spring/converter/ReviewConverter.java | 2 +- .../src/main/java/umc/spring/converter/StoreConverter.java | 2 +- sanho/spring/src/main/java/umc/spring/domain/Mission.java | 2 +- sanho/spring/src/main/java/umc/spring/domain/Region.java | 2 +- sanho/spring/src/main/java/umc/spring/domain/Review.java | 2 +- sanho/spring/src/main/java/umc/spring/domain/Store.java | 2 +- .../src/main/java/umc/spring/domain/mapping/MemberPrefer.java | 2 +- .../spring/repository/foodcategory/FoodCategoryRepository.java | 2 +- .../java/umc/spring/repository/member/MemberRepository.java | 2 +- .../repository/membermission/MemberMissionRepository.java | 2 +- .../java/umc/spring/repository/mission/MissionRepository.java | 2 +- .../java/umc/spring/repository/region/RegionRepository.java | 2 +- .../java/umc/spring/repository/review/ReviewRepository.java | 2 +- .../java/umc/spring/service/member/MemberCommandService.java | 2 +- .../umc/spring/service/member/MemberCommandServiceImpl.java | 2 +- .../java/umc/spring/service/mission/MissionCommandService.java | 2 +- .../umc/spring/service/mission/MissionCommandServiceImpl.java | 2 +- .../java/umc/spring/service/review/ReviewCommandService.java | 2 +- .../umc/spring/service/review/ReviewCommandServiceImpl.java | 2 +- .../main/java/umc/spring/service/store/StoreCommandService.java | 2 +- .../java/umc/spring/service/store/StoreCommandServiceImpl.java | 2 +- .../java/umc/spring/validation/annotation/ExistCategories.java | 2 +- .../main/java/umc/spring/validation/annotation/ExistMember.java | 2 +- .../umc/spring/validation/annotation/ExistMemberMission.java | 2 +- .../main/java/umc/spring/validation/annotation/ExistRegion.java | 2 +- .../main/java/umc/spring/validation/annotation/ExistStore.java | 2 +- .../spring/validation/validator/CategoriesExistValidator.java | 1 + .../umc/spring/validation/validator/MemberExistValidator.java | 2 +- .../validation/validator/MemberMissionExistValidator.java | 2 +- .../umc/spring/validation/validator/RegionExistValidator.java | 2 +- .../umc/spring/validation/validator/StoreExistValidator.java | 2 +- .../java/umc/spring/web/controller/MemberRestController.java | 2 +- .../java/umc/spring/web/controller/MissionRestController.java | 2 +- .../java/umc/spring/web/controller/ReviewRestController.java | 2 +- .../java/umc/spring/web/controller/StoreRestController.java | 2 +- .../main/java/umc/spring/web/controller/TempRestController.java | 2 +- .../src/main/java/umc/spring/web/dto/MemberRequestDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/MemberResponseDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/MissionRequestDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/MissionResponseDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/ReviewRequestDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/ReviewResponseDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/StoreRequestDTO.java | 2 +- .../src/main/java/umc/spring/web/dto/StoreResponseDTO.java | 2 +- 56 files changed, 56 insertions(+), 55 deletions(-) diff --git a/sanho/spring/build.gradle b/sanho/spring/build.gradle index fe0250a..72d02b0 100644 --- a/sanho/spring/build.gradle +++ b/sanho/spring/build.gradle @@ -28,7 +28,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-validation' implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.3.0' // swagger // queryDSL implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta' diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java index 55bc891..9d47ba0 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java @@ -8,7 +8,7 @@ @Getter @AllArgsConstructor -public enum ErrorStatus implements BaseErrorCode { +public enum ErrorStatus implements BaseErrorCode { // week8 미션 // 가장 일반적인 응답 _INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "COMMON500", "서버 에러, 관리자에게 문의 바랍니다."), diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java index e2820c0..906f80c 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/FoodCategoryHandler.java @@ -3,7 +3,7 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class FoodCategoryHandler extends GeneralException { +public class FoodCategoryHandler extends GeneralException { // week8 미션 public FoodCategoryHandler(BaseErrorCode code) { super(code); } diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java index 0342754..9b7ce43 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberHandler.java @@ -3,7 +3,7 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class MemberHandler extends GeneralException { +public class MemberHandler extends GeneralException { // week8 미션 public MemberHandler(BaseErrorCode code) { super(code); } diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java index 8822837..c7e1776 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MemberMissionHandler.java @@ -3,7 +3,7 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class MemberMissionHandler extends GeneralException { +public class MemberMissionHandler extends GeneralException { // week8 미션 public MemberMissionHandler(BaseErrorCode code) { super(code); } diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java index 0eb0394..9b959d7 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/MissionHandler.java @@ -3,7 +3,7 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class MissionHandler extends GeneralException { +public class MissionHandler extends GeneralException { // week8 미션 public MissionHandler(BaseErrorCode code) { super(code); diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java index 131b790..d1dbe95 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/RegionHandler.java @@ -3,7 +3,7 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class RegionHandler extends GeneralException { +public class RegionHandler extends GeneralException { // week8 미션 public RegionHandler(BaseErrorCode code) { super(code); diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java index 8861d0d..13c29c5 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/handler/StoreHandler.java @@ -3,7 +3,7 @@ import umc.spring.apipayload.code.BaseErrorCode; import umc.spring.apipayload.exception.GeneralException; -public class StoreHandler extends GeneralException { +public class StoreHandler extends GeneralException { // week8 미션 public StoreHandler(BaseErrorCode code) { super(code); } diff --git a/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java b/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java index fa177fb..b409788 100644 --- a/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java +++ b/sanho/spring/src/main/java/umc/spring/config/SwaggerConfig.java @@ -10,7 +10,7 @@ import org.springframework.context.annotation.Configuration; @Configuration -public class SwaggerConfig { +public class SwaggerConfig { // week8 미션 @Bean public OpenAPI UMCstudyAPI() { diff --git a/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java index 168e90e..d878f15 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; import java.util.ArrayList; -public class MemberConverter { +public class MemberConverter { // week8 미션 public static MemberResponseDTO.JoinResultDTO toJoinResultDTO(Member member){ return MemberResponseDTO.JoinResultDTO.builder() diff --git a/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java index 47942ae..0ee0945 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/MemberPreferConverter.java @@ -6,7 +6,7 @@ import java.util.List; import java.util.stream.Collectors; -public class MemberPreferConverter { +public class MemberPreferConverter { // week8 미션 public static List toMemberPreferList(List foodCategoryList){ diff --git a/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java index 939ad90..d69a4bf 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java @@ -10,7 +10,7 @@ import java.util.List; -public class MissionConverter { +public class MissionConverter { // week8 미션 public static MissionResponseDTO.AddMissionResultDTO toAddMissionDTO(Mission mission){ return MissionResponseDTO.AddMissionResultDTO.builder() diff --git a/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java b/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java index 8f97f53..48b6c4f 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/ReviewConverter.java @@ -8,7 +8,7 @@ import java.time.LocalDateTime; -public class ReviewConverter { +public class ReviewConverter { // week8 미션 public static ReviewResponseDTO.AddReviewResultDTO toAddResultDTO(Review review){ return ReviewResponseDTO.AddReviewResultDTO.builder() diff --git a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java index b102647..9dc8d4c 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java @@ -9,7 +9,7 @@ import java.util.ArrayList; -public class StoreConverter { +public class StoreConverter { // week8 미션 public static StoreResponseDTO.AddStoreDTO toAddResultDTO(Store store){ return StoreResponseDTO.AddStoreDTO.builder() diff --git a/sanho/spring/src/main/java/umc/spring/domain/Mission.java b/sanho/spring/src/main/java/umc/spring/domain/Mission.java index 13bfe3e..a221e26 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Mission.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Mission.java @@ -14,7 +14,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor -public class Mission extends BaseEntity { +public class Mission extends BaseEntity { // week8 미션 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/sanho/spring/src/main/java/umc/spring/domain/Region.java b/sanho/spring/src/main/java/umc/spring/domain/Region.java index 48a3b5e..0ce35d6 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Region.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Region.java @@ -12,7 +12,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor -public class Region extends BaseEntity { +public class Region extends BaseEntity { // week8 미션 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/sanho/spring/src/main/java/umc/spring/domain/Review.java b/sanho/spring/src/main/java/umc/spring/domain/Review.java index d5725ea..260f891 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Review.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Review.java @@ -9,7 +9,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor -public class Review extends BaseEntity { +public class Review extends BaseEntity { // week8 미션 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/sanho/spring/src/main/java/umc/spring/domain/Store.java b/sanho/spring/src/main/java/umc/spring/domain/Store.java index 2189e92..8af8c48 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/Store.java +++ b/sanho/spring/src/main/java/umc/spring/domain/Store.java @@ -12,7 +12,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor -public class Store extends BaseEntity { +public class Store extends BaseEntity { // week8 미션 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java index 061fc9c..a846d7a 100644 --- a/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java +++ b/sanho/spring/src/main/java/umc/spring/domain/mapping/MemberPrefer.java @@ -11,7 +11,7 @@ @Builder @NoArgsConstructor(access = AccessLevel.PROTECTED) @AllArgsConstructor -public class MemberPrefer extends BaseEntity { +public class MemberPrefer extends BaseEntity { // week8 미션 @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java b/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java index b8b8cc6..7397bfe 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/foodcategory/FoodCategoryRepository.java @@ -3,5 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.FoodCategory; -public interface FoodCategoryRepository extends JpaRepository { +public interface FoodCategoryRepository extends JpaRepository { // week8 미션 } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java b/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java index cea07c3..4ef62d5 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/member/MemberRepository.java @@ -3,5 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.Member; -public interface MemberRepository extends JpaRepository { +public interface MemberRepository extends JpaRepository { // week8 미션 } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java index a7d1255..ca40e33 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java @@ -3,5 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.mapping.MemberMission; -public interface MemberMissionRepository extends JpaRepository { +public interface MemberMissionRepository extends JpaRepository { // week8 미션 } diff --git a/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java index ea112d4..d365cdd 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java @@ -3,5 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.Mission; -public interface MissionRepository extends JpaRepository { +public interface MissionRepository extends JpaRepository { // week8 미션 } diff --git a/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java index d2b2791..c3101be 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/region/RegionRepository.java @@ -3,5 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.Region; -public interface RegionRepository extends JpaRepository { +public interface RegionRepository extends JpaRepository { // week8 미션 } diff --git a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java index 2373b04..4951293 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java @@ -3,5 +3,5 @@ import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.Review; -public interface ReviewRepository extends JpaRepository { +public interface ReviewRepository extends JpaRepository { // week8 미션 } diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java index b47bdb2..47ffc37 100644 --- a/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandService.java @@ -3,7 +3,7 @@ import umc.spring.domain.Member; import umc.spring.web.dto.MemberRequestDTO; -public interface MemberCommandService { +public interface MemberCommandService { // week8 미션 Member joinMember(MemberRequestDTO.JoinDto request); } diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java index 8ba2453..f692e4f 100644 --- a/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberCommandServiceImpl.java @@ -19,7 +19,7 @@ @Service @RequiredArgsConstructor -public class MemberCommandServiceImpl implements MemberCommandService{ +public class MemberCommandServiceImpl implements MemberCommandService{ // week8 미션 private final MemberRepository memberRepository; diff --git a/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java index 4baf149..e67aeae 100644 --- a/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java +++ b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandService.java @@ -3,7 +3,7 @@ import umc.spring.domain.Mission; import umc.spring.web.dto.MissionRequestDTO; -public interface MissionCommandService { +public interface MissionCommandService { // week8 미션 Mission addMission(MissionRequestDTO.AddMissionDTO request); } diff --git a/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java index 98e90f5..cf5d9a6 100644 --- a/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/mission/MissionCommandServiceImpl.java @@ -28,7 +28,7 @@ public class MissionCommandServiceImpl implements MissionCommandService { @Override @Transactional - public Mission addMission(MissionRequestDTO.AddMissionDTO request) { + public Mission addMission(MissionRequestDTO.AddMissionDTO request) { // week8 미션 Store store = storeRepository.findById(request.getStoreId()) .orElseThrow(() -> new MissionHandler(ErrorStatus.MEMBER_NOT_FOUND)); diff --git a/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java index 890b7ec..e144409 100644 --- a/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java +++ b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandService.java @@ -5,5 +5,5 @@ public interface ReviewCommandService { - Review addReview(ReviewRequestDTO.AddReviewDto request); + Review addReview(ReviewRequestDTO.AddReviewDto request); // week8 미션 } diff --git a/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java index a780dd4..059b438 100644 --- a/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/review/ReviewCommandServiceImpl.java @@ -17,7 +17,7 @@ @Service @RequiredArgsConstructor -public class ReviewCommandServiceImpl implements ReviewCommandService { +public class ReviewCommandServiceImpl implements ReviewCommandService { // week8 미션 private final ReviewRepository reviewRepository; private final MemberRepository memberRepository; diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java index a6f34d4..3cc1444 100644 --- a/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandService.java @@ -3,7 +3,7 @@ import umc.spring.domain.Store; import umc.spring.web.dto.StoreRequestDTO; -public interface StoreCommandService { +public interface StoreCommandService { // week8 미션 Store addStore(StoreRequestDTO.AddStoreDto request); } diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java index 4031cf1..1e1ca0c 100644 --- a/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreCommandServiceImpl.java @@ -16,7 +16,7 @@ @Service @RequiredArgsConstructor -public class StoreCommandServiceImpl implements StoreCommandService { +public class StoreCommandServiceImpl implements StoreCommandService { // week8 미션 private final StoreRepository storeRepository; private final RegionRepository regionRepository; diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java index fa18030..3e6d800 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistCategories.java @@ -10,7 +10,7 @@ @Constraint(validatedBy = CategoriesExistValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) -public @interface ExistCategories { +public @interface ExistCategories { // week8 미션 String message() default "해당하는 카테고리가 존재하지 않습니다."; Class[] groups() default {}; diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java index 37bebc6..858b1c4 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java @@ -11,7 +11,7 @@ @Constraint(validatedBy = MemberExistValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) -public @interface ExistMember { +public @interface ExistMember { // week8 미션 String message() default "해당하는 멤버가 존재하지 않습니다."; Class[] groups() default {}; diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java index 2e70796..45d17ea 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMemberMission.java @@ -10,7 +10,7 @@ @Constraint(validatedBy = MemberMissionExistValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) -public @interface ExistMemberMission { +public @interface ExistMemberMission { // week8 미션 String message() default "해당하는 미션이 존재하지 않습니다."; Class[] groups() default {}; diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java index 8e57592..4bae724 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistRegion.java @@ -10,7 +10,7 @@ @Constraint(validatedBy = RegionExistValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) -public @interface ExistRegion { +public @interface ExistRegion { // week8 미션 String message() default "해당하는 지역이 존재하지 않습니다."; Class[] groups() default {}; diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java index b2a5c63..8d27f02 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java @@ -11,7 +11,7 @@ @Constraint(validatedBy = StoreExistValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) -public @interface ExistStore { +public @interface ExistStore { // week8 미션 String message() default "해당하는 가게가 존재하지 않습니다."; Class[] groups() default {}; diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java index 8c96629..f6e84f4 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/CategoriesExistValidator.java @@ -13,6 +13,7 @@ @Component @RequiredArgsConstructor public class CategoriesExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 + // week8 미션 private final FoodCategoryRepository foodCategoryRepository; diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java index 04743d1..e9279c5 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java @@ -15,7 +15,7 @@ @Component @RequiredArgsConstructor public class MemberExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 - + // week8 미션 private final MemberRepository memberRepository; @Override diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java index ae8c1c2..04c2a98 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberMissionExistValidator.java @@ -13,7 +13,7 @@ @Component @RequiredArgsConstructor public class MemberMissionExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 - + // week8 미션 private final MemberMissionRepository memberMissionRepository; @Override diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java index 4296e2f..565c464 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/RegionExistValidator.java @@ -13,7 +13,7 @@ @Component @RequiredArgsConstructor public class RegionExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 - + // week8 미션 private final RegionRepository regionRepository; @Override diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java index 99fbe0f..44443b2 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java @@ -13,7 +13,7 @@ @Component @RequiredArgsConstructor public class StoreExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 - + // week8 미션 private final StoreRepository storeRepository; @Override diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java index 255e4e5..52c27c3 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java @@ -16,7 +16,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/members") -public class MemberRestController { +public class MemberRestController { // week8 미션 private final MemberCommandService memberCommandService; diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java index 64baeec..14c2109 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java @@ -20,7 +20,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/missons") -public class MissionRestController { +public class MissionRestController { // week8 미션 private final MissionCommandService missionCommandService; diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java index 6e480ea..57aa7d7 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/ReviewRestController.java @@ -16,7 +16,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/reviews") -public class ReviewRestController { +public class ReviewRestController { // week8 미션 private final ReviewCommandService reviewCommandService; diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java index 7640e84..259a215 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java @@ -16,7 +16,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/stores") -public class StoreRestController { +public class StoreRestController { // week8 미션 private final StoreCommandService storeCommandService; diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java index 949b42b..7446f0e 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/TempRestController.java @@ -14,7 +14,7 @@ @RequestMapping("/temp") @RequiredArgsConstructor public class TempRestController { // @RestController라 json 형태로 바로 화면으로 값을 뿌림 - + // week8 미션 private final TempQueryService tempQueryService; @GetMapping("/test") diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java index da88399..51d41a8 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MemberRequestDTO.java @@ -8,7 +8,7 @@ import java.util.List; -public class MemberRequestDTO { +public class MemberRequestDTO { // week8 미션 @Getter public static class JoinDto{ diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java index 2fd1c2e..f96a3e3 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; -public class MemberResponseDTO { +public class MemberResponseDTO { // week8 미션 @Builder @Getter diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java index 4d48e70..c7ab218 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MissionRequestDTO.java @@ -8,7 +8,7 @@ import java.time.LocalDate; import java.util.List; -public class MissionRequestDTO { +public class MissionRequestDTO { // week8 미션 @Getter public static class AddMissionDTO { diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java index dab1421..7406e95 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; -public class MissionResponseDTO { +public class MissionResponseDTO { // week8 미션 @Builder @Getter diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java index bce08eb..a79ee55 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewRequestDTO.java @@ -7,7 +7,7 @@ import umc.spring.validation.annotation.ExistStore; -public class ReviewRequestDTO { +public class ReviewRequestDTO { // week8 미션 @Getter public static class AddReviewDto { diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java index e20d057..66282ed 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/ReviewResponseDTO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; -public class ReviewResponseDTO { +public class ReviewResponseDTO { // week8 미션 @Builder @Getter diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java index eb6ad9d..8d65891 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/StoreRequestDTO.java @@ -5,7 +5,7 @@ import lombok.Getter; import umc.spring.validation.annotation.ExistRegion; -public class StoreRequestDTO { +public class StoreRequestDTO { // week8 미션 @Getter public static class AddStoreDto { diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java index 7b94d47..6cbb812 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java @@ -7,7 +7,7 @@ import java.time.LocalDateTime; -public class StoreResponseDTO { +public class StoreResponseDTO { // week8 미션 @Builder @Getter From 1ec319b03ebe91351ebeec2e62ba175a28e31089 Mon Sep 17 00:00:00 2001 From: sshnote Date: Mon, 25 Nov 2024 21:04:57 +0900 Subject: [PATCH 7/9] =?UTF-8?q?week9=20=EC=8B=A4=EC=8A=B5=20-=20=EB=A6=AC?= =?UTF-8?q?=EB=B7=B0=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apipayload/exception/ExceptionAdvice.java | 2 - .../umc/spring/converter/StoreConverter.java | 27 ++++++++++ .../repository/review/ReviewRepository.java | 5 ++ .../service/store/StoreQueryService.java | 5 ++ .../service/store/StoreQueryServiceImpl.java | 18 ++++++- .../validation/annotation/ExistStore.java | 1 - .../validator/StoreExistValidator.java | 51 ++++++++++++++++--- .../web/controller/StoreRestController.java | 45 ++++++++++++++-- .../umc/spring/web/dto/StoreResponseDTO.java | 30 ++++++++++- 9 files changed, 167 insertions(+), 17 deletions(-) diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java index 26882a3..4a60d4d 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java @@ -119,6 +119,4 @@ private ResponseEntity handleExceptionInternalConstraint(Exception e, Er request ); } - - } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java index 9dc8d4c..45ed7f1 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java @@ -1,12 +1,16 @@ package umc.spring.converter; +import org.springframework.data.domain.Page; import umc.spring.domain.Region; +import umc.spring.domain.Review; import umc.spring.domain.Store; import umc.spring.web.dto.StoreRequestDTO; import umc.spring.web.dto.StoreResponseDTO; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; public class StoreConverter { // week8 미션 @@ -28,4 +32,27 @@ public static Store toStore(StoreRequestDTO.AddStoreDto request, Region region){ .build(); } + // week9 코드 - 미션 목록 조회 + public static StoreResponseDTO.ReviewPreViewDTO reviewPreViewDTO(Review review){ // 해당 가게 각각의 리뷰 DTO + return StoreResponseDTO.ReviewPreViewDTO.builder() + .ownerNickname(review.getMember().getName()) + .score(review.getScore()) + .createdAt(review.getCreatedAt().toLocalDate()) + .body(review.getBody()) + .build(); + } + + public static StoreResponseDTO.ReviewPreViewListDTO reviewPreViewListDTO(Page reviewPage){ // 위 DTO를 java stream으로 변환된 각각의 DTO를 List에 넣어줌 + List reviewPreViewDTOList = reviewPage.stream() + .map(StoreConverter::reviewPreViewDTO).collect(Collectors.toList()); + + return StoreResponseDTO.ReviewPreViewListDTO.builder() + .isLast(reviewPage.isLast()) + .isFirst(reviewPage.isFirst()) + .totalPage(reviewPage.getTotalPages()) + .totalElements(reviewPage.getTotalElements()) + .listSize(reviewPreViewDTOList.size()) + .reviewList(reviewPreViewDTOList) + .build(); + } } diff --git a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java index 4951293..a6ed988 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java @@ -1,7 +1,12 @@ package umc.spring.repository.review; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.Review; +import umc.spring.domain.Store; public interface ReviewRepository extends JpaRepository { // week8 미션 + + Page findAllByStore(Store store, PageRequest pageRequest); // PageRequest는 페이징과 관련된 옵션이 포함 } diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java index 0d56e6a..b3dd556 100644 --- a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java @@ -1,5 +1,7 @@ package umc.spring.service.store; +import org.springframework.data.domain.Page; +import umc.spring.domain.Review; import umc.spring.domain.Store; import java.util.List; @@ -9,4 +11,7 @@ public interface StoreQueryService { Optional findStore(Long id); // null 반환 가능 List findStoresByNameAndScore(String name, Float score); + + // week9 코드 + Page getReviewList(Long storeId, Integer page); // Page 자체에 페이징과 관련된 여러 정보가 담김 -> Paging을 위한 추상화 제공 } diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java index eeab533..97c9733 100644 --- a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java @@ -1,11 +1,14 @@ package umc.spring.service.store; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.data.domain.Page; +import umc.spring.domain.Review; import umc.spring.domain.Store; +import umc.spring.repository.review.ReviewRepository; import umc.spring.repository.store.StoreRepository; - import java.util.List; import java.util.Optional; @@ -15,6 +18,7 @@ public class StoreQueryServiceImpl implements StoreQueryService{ private final StoreRepository storeRepository; + private final ReviewRepository reviewRepository; @Override public Optional findStore(Long id) { @@ -29,4 +33,16 @@ public List findStoresByNameAndScore(String name, Float score) { return filteredStores; } + + //week9 코드 + @Override + public Page getReviewList(Long storeId, Integer page) { + Store store = storeRepository.findById(storeId).get(); // 먼저 storeId로 가게를 찾고 + + Page storePage = reviewRepository.findAllByStore(store, PageRequest.of(page, 10)); // 해당 가게의 리뷰 10개 단위로 가져오기 + // Page : 데이터, 페이지 번호, 페이지 개수, 전체 데이터 개수, 페이지 크기, 페이지 여부, 정렬 정보 등 + + return storePage; + } + } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java index 8d27f02..adf3b2e 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistStore.java @@ -2,7 +2,6 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; -import umc.spring.validation.validator.RegionExistValidator; import umc.spring.validation.validator.StoreExistValidator; import java.lang.annotation.*; diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java index 44443b2..68c354d 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/StoreExistValidator.java @@ -12,7 +12,7 @@ @Component @RequiredArgsConstructor -public class StoreExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 +public class StoreExistValidator implements ConstraintValidator { // 여기서 바로 repository에 접근하면 안 됨 // week8 미션 private final StoreRepository storeRepository; @@ -22,16 +22,51 @@ public void initialize(ExistStore constraintAnnotation) { } @Override - public boolean isValid(List values, ConstraintValidatorContext context) { - boolean isValid = values.stream() - .allMatch(value -> storeRepository.existsById(value)); + public boolean isValid(Long value, ConstraintValidatorContext context) { +// boolean isValid = values.stream() +// .allMatch(value -> storeRepository.existsById(value)); +// +// if (!isValid) { +// context.disableDefaultConstraintViolation(); +// context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()).addConstraintViolation(); +// } +// +// return isValid; - if (!isValid) { + +// // Store ID가 null이면 검증 실패 +// if (value == null) { +// return false; +// } +// +// // StoreRepository를 사용해 존재 여부 검증 +// return storeRepository.existsById(value); + +// // Store ID가 null이면 검증 실패 +// if (value == null) { +// context.disableDefaultConstraintViolation(); +// context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()).addConstraintViolation(); +// return false; +// } +// +// // StoreRepository를 사용해 존재 여부 검증 +// boolean isValid = storeRepository.existsById(value); +// if (!isValid) { +// context.disableDefaultConstraintViolation(); +// context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()).addConstraintViolation(); +// } +// +// return isValid; // 검증 성공 + + + // Store ID가 null이면 검증 실패 + if (value == null || !storeRepository.existsById(value)) { context.disableDefaultConstraintViolation(); - context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()).addConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.STORE_NOT_FOUND.toString()) + .addConstraintViolation(); + return false; } - return isValid; - + return true; // 검증 성공 } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java index 259a215..5bf977d 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java @@ -1,15 +1,22 @@ package umc.spring.web.controller; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -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; +import org.springframework.data.domain.Page; +import org.springframework.web.bind.annotation.*; import umc.spring.apipayload.ApiResponse; import umc.spring.converter.StoreConverter; +import umc.spring.domain.Review; import umc.spring.domain.Store; import umc.spring.service.store.StoreCommandService; +import umc.spring.service.store.StoreQueryService; +import umc.spring.validation.annotation.ExistStore; import umc.spring.web.dto.StoreRequestDTO; import umc.spring.web.dto.StoreResponseDTO; @@ -19,6 +26,7 @@ public class StoreRestController { // week8 미션 private final StoreCommandService storeCommandService; + private final StoreQueryService storeQueryService; // week9 코드 @PostMapping("/") public ApiResponse add(@RequestBody @Valid StoreRequestDTO.AddStoreDto request){ @@ -26,4 +34,33 @@ public ApiResponse add(@RequestBody @Valid StoreRe return ApiResponse.onSuccess((StoreConverter.toAddResultDTO(store))); } + + // week9 코드 + @GetMapping("/{storeId}/reviews") + @Operation(summary = "특정 가게의 리뷰 목록 조회 API",description = "특정 가게의 리뷰들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "storeId", description = "가게의 아이디, path variable 입니다!") + }) + public ApiResponse getReviewList( + @ExistStore @PathVariable(name = "storeId") Long storeId, + @RequestParam(name = "page") Integer page + ) { +// storeQueryService.getReviewList(storeId, page); +// return ApiResponse.onSuccess(StoreConverter.reviewPreViewListDTO(reviewList)); + + // 서비스에서 리뷰 목록 가져오기 + Page reviewPage = storeQueryService.getReviewList(storeId, page); + + // DTO 변환: 리뷰 목록과 페이징 정보 + StoreResponseDTO.ReviewPreViewListDTO reviewListDTO = StoreConverter.reviewPreViewListDTO(reviewPage); + + // 성공 응답 반환 + return ApiResponse.onSuccess(reviewListDTO); + } } diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java index 6cbb812..e98b5b6 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java @@ -4,8 +4,9 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; - +import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; public class StoreResponseDTO { // week8 미션 @@ -17,4 +18,31 @@ public static class AddStoreDTO { Long storeId; LocalDateTime createdAt; } + + // 여기부터 week9 코드 - 리뷰 목록 조회 응답 DTO + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewListDTO { + List reviewList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class ReviewPreViewDTO { + String ownerNickname; // 닉네임 말고도 사용자의 정보 더 적을 게 있다면 여기도 DTO로 빼는 게 낫다. + // MemberInfoDTO memberInfo; - 사용자의 정보가 담긴 DTO + Float score; + String body; + LocalDate createdAt; + } + } From 7465ec57ba8e53b0b1ed442ff727b1fa7f44c825 Mon Sep 17 00:00:00 2001 From: sshnote Date: Thu, 28 Nov 2024 16:23:33 +0900 Subject: [PATCH 8/9] =?UTF-8?q?=E2=9C=A8=20Week9=20mission?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit week9 mission --- .../apipayload/code/status/ErrorStatus.java | 6 +- .../apipayload/exception/ExceptionAdvice.java | 3 + .../umc/spring/converter/MemberConverter.java | 57 ++++++++++++++++++ .../umc/spring/converter/StoreConverter.java | 27 ++++++++- .../MemberMissionRepository.java | 7 +++ .../repository/mission/MissionRepository.java | 9 +++ .../repository/review/ReviewRepository.java | 4 ++ .../service/member/MemberQueryService.java | 11 ++++ .../member/MemberQueryServiceImpl.java | 41 ++++++++++++- .../service/store/StoreQueryService.java | 4 ++ .../service/store/StoreQueryServiceImpl.java | 15 ++++- .../validation/annotation/CheckPage.java | 17 ++++++ .../validation/annotation/ExistMember.java | 3 +- .../validator/MemberExistValidator.java | 19 +++--- .../validator/PageCheckValidator.java | 32 ++++++++++ .../web/controller/MemberRestController.java | 59 +++++++++++++++++-- .../web/controller/StoreRestController.java | 32 +++++++++- .../umc/spring/web/dto/MemberResponseDTO.java | 57 +++++++++++++++++- .../umc/spring/web/dto/StoreResponseDTO.java | 27 +++++++++ 19 files changed, 406 insertions(+), 24 deletions(-) create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/CheckPage.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/PageCheckValidator.java diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java index 9d47ba0..8358592 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java @@ -37,7 +37,11 @@ public enum ErrorStatus implements BaseErrorCode { // week8 미션 STORE_NOT_FOUND(HttpStatus.BAD_REQUEST, "STORE4001", "가게가 없습니다."), // 미션 관련 에러 - Member_Mission_NOT_FOUND(HttpStatus.BAD_REQUEST, "MemberMission4001", "미션이 없습니다."); + Member_Mission_NOT_FOUND(HttpStatus.BAD_REQUEST, "MemberMission4001", "미션이 없습니다."), + + // 페이지 관련 에러 + PAGE_NOT_FOUND(HttpStatus.BAD_REQUEST, "page4001", "유효한 페이지가 없습니다."); + private final HttpStatus httpStatus; diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java index 4a60d4d..add2804 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/exception/ExceptionAdvice.java @@ -1,6 +1,7 @@ package umc.spring.apipayload.exception; import jakarta.servlet.http.HttpServletRequest; +import jakarta.validation.ConstraintViolation; import jakarta.validation.ConstraintViolationException; import lombok.extern.slf4j.Slf4j; import org.springframework.http.HttpHeaders; @@ -19,8 +20,10 @@ import umc.spring.apipayload.code.status.ErrorStatus; import java.util.LinkedHashMap; +import java.util.List; import java.util.Map; import java.util.Optional; +import java.util.stream.Collectors; @Slf4j @RestControllerAdvice(annotations = {RestController.class}) diff --git a/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java index d878f15..cae009f 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/MemberConverter.java @@ -1,12 +1,19 @@ package umc.spring.converter; +import org.springframework.data.domain.Page; import umc.spring.domain.Member; +import umc.spring.domain.Mission; +import umc.spring.domain.Review; import umc.spring.domain.enums.Gender; +import umc.spring.domain.enums.MissionStatus; +import umc.spring.domain.mapping.MemberMission; import umc.spring.web.dto.MemberRequestDTO; import umc.spring.web.dto.MemberResponseDTO; import java.time.LocalDateTime; import java.util.ArrayList; +import java.util.List; +import java.util.stream.Collectors; public class MemberConverter { // week8 미션 @@ -41,4 +48,54 @@ public static Member toMember(MemberRequestDTO.JoinDto request){ .memberPreferList(new ArrayList<>()) .build(); } + + // week9 미션 - 특정 멤버 리뷰 조회 + public static MemberResponseDTO.MemberReviewDTO memberReviewDTO(Review review) { + return MemberResponseDTO.MemberReviewDTO.builder() + .ownerNickname(review.getMember().getName()) + .score(review.getScore()) + .body(review.getBody()) + .createdAt(review.getCreatedAt().toLocalDate()) + .build(); + } + + public static MemberResponseDTO.MemberReviewListDTO memberReviewListDTO(Page reviewPage) { + List memberReviewDTOList = reviewPage.stream() + .map(MemberConverter::memberReviewDTO).collect(Collectors.toList()); // 각각의 memberReviewDTO를 리스트에 넣어줌 + + return MemberResponseDTO.MemberReviewListDTO.builder() + .isLast(reviewPage.isLast()) + .isFirst(reviewPage.isFirst()) + .totalPage(reviewPage.getTotalPages()) + .totalElements(reviewPage.getTotalElements()) + .listSize(memberReviewDTOList.size()) + .reviewList(memberReviewDTOList) + .build(); + } + + // week9 미션 - 내가 진행 중인 미션 목록 + public static MemberResponseDTO.MemberMissionDTO memberMissionDTO(MemberMission memberMission) { + Mission mission = memberMission.getMission(); + + return MemberResponseDTO.MemberMissionDTO.builder() + .storeName(mission.getStore().getName()) + .missionSpec(mission.getMissionSpec()) + .reward(mission.getReward()) + .status(MissionStatus.CHALLENGING) // 진행 중인 미션으로 하드 코딩 + .build(); + } + + public static MemberResponseDTO.MemberMissionListDTO memberMissionListDTO(Page memberMissionPage) { + List memberMissionDTOList = memberMissionPage.stream() + .map(MemberConverter::memberMissionDTO).collect(Collectors.toList()); + + return MemberResponseDTO.MemberMissionListDTO.builder() + .isLast(memberMissionPage.isLast()) + .isFirst(memberMissionPage.isFirst()) + .totalPage(memberMissionPage.getTotalPages()) + .totalElements(memberMissionPage.getTotalElements()) + .listSize(memberMissionDTOList.size()) + .missionList(memberMissionDTOList) + .build(); + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java index 45ed7f1..6ca7171 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/StoreConverter.java @@ -1,6 +1,7 @@ package umc.spring.converter; import org.springframework.data.domain.Page; +import umc.spring.domain.Mission; import umc.spring.domain.Region; import umc.spring.domain.Review; import umc.spring.domain.Store; @@ -32,7 +33,7 @@ public static Store toStore(StoreRequestDTO.AddStoreDto request, Region region){ .build(); } - // week9 코드 - 미션 목록 조회 + // week9 코드 - 리뷰 목록 조회 public static StoreResponseDTO.ReviewPreViewDTO reviewPreViewDTO(Review review){ // 해당 가게 각각의 리뷰 DTO return StoreResponseDTO.ReviewPreViewDTO.builder() .ownerNickname(review.getMember().getName()) @@ -55,4 +56,28 @@ public static StoreResponseDTO.ReviewPreViewListDTO reviewPreViewListDTO(Page missionPage) { + List storeMissionDTOList = missionPage.stream() + .map(StoreConverter::storeMissionDTO).collect(Collectors.toList()); + + return StoreResponseDTO.StoreMissionListDTO.builder() + .isLast(missionPage.isLast()) + .isFirst(missionPage.isFirst()) + .totalPage(missionPage.getTotalPages()) + .totalElements(missionPage.getTotalElements()) + .listSize(storeMissionDTOList.size()) + .missionList(storeMissionDTOList) + .build(); + } } diff --git a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java index ca40e33..8db70e4 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java @@ -1,7 +1,14 @@ package umc.spring.repository.membermission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Member; +import umc.spring.domain.Mission; import umc.spring.domain.mapping.MemberMission; public interface MemberMissionRepository extends JpaRepository { // week8 미션 + + // week9 미션 - 내가 진행 중인 미션 목록 + Page findAllByMember(Member member, PageRequest pageRequest); } diff --git a/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java index d365cdd..d87c0ad 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/mission/MissionRepository.java @@ -1,7 +1,16 @@ package umc.spring.repository.mission; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; import umc.spring.domain.Mission; +import umc.spring.domain.Store; +import umc.spring.domain.mapping.MemberMission; + +import java.util.List; public interface MissionRepository extends JpaRepository { // week8 미션 + + // week9 미션 - 특정 가게 미션 목록 조회 + Page findAllByStore(Store store, PageRequest pageRequest); // store를 통해 미션 목록을 가져감 } diff --git a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java index a6ed988..32a3388 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/review/ReviewRepository.java @@ -3,10 +3,14 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageRequest; import org.springframework.data.jpa.repository.JpaRepository; +import umc.spring.domain.Member; import umc.spring.domain.Review; import umc.spring.domain.Store; public interface ReviewRepository extends JpaRepository { // week8 미션 Page findAllByStore(Store store, PageRequest pageRequest); // PageRequest는 페이징과 관련된 옵션이 포함 + + // week9 미션 - 특정 멤버 리뷰 조회 + Page findAllByMember(Member member, PageRequest pageRequest); } diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java index a81fb58..125e9e3 100644 --- a/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryService.java @@ -1,4 +1,15 @@ package umc.spring.service.member; +import org.springframework.data.domain.Page; +import umc.spring.domain.Mission; +import umc.spring.domain.Review; +import umc.spring.domain.mapping.MemberMission; + public interface MemberQueryService { + + // week9 미션 + Page getReviewList(Long memberId, Integer page); // Page 자체에 페이징과 관련된 여러 정보가 담김 -> Paging을 위한 추상화 제공 + + // week9 미션 - 내가 진행 중인 미션 목록 + Page getMemberMissionList(Long memberId, Integer page); } diff --git a/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java index 863c858..68a0a72 100644 --- a/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/member/MemberQueryServiceImpl.java @@ -1,4 +1,43 @@ package umc.spring.service.member; -public class MemberQueryServiceImpl { +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.stereotype.Service; +import umc.spring.domain.Member; +import umc.spring.domain.Review; +import umc.spring.domain.mapping.MemberMission; +import umc.spring.repository.member.MemberRepository; +import umc.spring.repository.membermission.MemberMissionRepository; +import umc.spring.repository.mission.MissionRepository; +import umc.spring.repository.review.ReviewRepository; + + +@Service +@RequiredArgsConstructor +public class MemberQueryServiceImpl implements MemberQueryService{ + + private final MemberRepository memberRepository; + private final ReviewRepository reviewRepository; + private final MissionRepository missionRepository; + private final MemberMissionRepository memberMissionRepository; + + // week9 미션 - 특정 멤버 리뷰 조회 + @Override + public Page getReviewList(Long memberId, Integer page) { + Member member = memberRepository.findById(memberId).get(); // .get()을 안 붙이면 Optional + + Page reviewPage = reviewRepository.findAllByMember(member, PageRequest.of(page, 10)); + + return reviewPage; + } + + // week9 미션 - 내가 진행 중인 미션 목록 + + @Override + public Page getMemberMissionList(Long memberId, Integer page) { + Member member = memberRepository.findById(memberId).get(); + + return memberMissionRepository.findAllByMember(member, PageRequest.of(page, 10)); + } } diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java index b3dd556..2880610 100644 --- a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryService.java @@ -1,6 +1,7 @@ package umc.spring.service.store; import org.springframework.data.domain.Page; +import umc.spring.domain.Mission; import umc.spring.domain.Review; import umc.spring.domain.Store; @@ -14,4 +15,7 @@ public interface StoreQueryService { // week9 코드 Page getReviewList(Long storeId, Integer page); // Page 자체에 페이징과 관련된 여러 정보가 담김 -> Paging을 위한 추상화 제공 + + // week9 미션 - 특정 가게 미션 목록 조회 + Page getMissionList(Long storeId, Integer page); } diff --git a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java index 97c9733..b516a29 100644 --- a/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java +++ b/sanho/spring/src/main/java/umc/spring/service/store/StoreQueryServiceImpl.java @@ -5,8 +5,10 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.data.domain.Page; +import umc.spring.domain.Mission; import umc.spring.domain.Review; import umc.spring.domain.Store; +import umc.spring.repository.mission.MissionRepository; import umc.spring.repository.review.ReviewRepository; import umc.spring.repository.store.StoreRepository; import java.util.List; @@ -19,6 +21,7 @@ public class StoreQueryServiceImpl implements StoreQueryService{ private final StoreRepository storeRepository; private final ReviewRepository reviewRepository; + private final MissionRepository missionRepository; @Override public Optional findStore(Long id) { @@ -34,15 +37,25 @@ public List findStoresByNameAndScore(String name, Float score) { return filteredStores; } - //week9 코드 + // week9 실습 코드 @Override public Page getReviewList(Long storeId, Integer page) { Store store = storeRepository.findById(storeId).get(); // 먼저 storeId로 가게를 찾고 +// Store store = storeRepository.findById(storeId) +// .orElseThrow(() -> new StoreHandler(ErrorStatus.STORE_NOT_FOUND)); + Page storePage = reviewRepository.findAllByStore(store, PageRequest.of(page, 10)); // 해당 가게의 리뷰 10개 단위로 가져오기 // Page : 데이터, 페이지 번호, 페이지 개수, 전체 데이터 개수, 페이지 크기, 페이지 여부, 정렬 정보 등 return storePage; } + // week9 미션 - 특정 가게 미션 목록 조회 + + @Override + public Page getMissionList(Long storeId, Integer page) { + Store store = storeRepository.findById(storeId).get(); + return missionRepository.findAllByStore(store, PageRequest.of(page, 10)); + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/CheckPage.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/CheckPage.java new file mode 100644 index 0000000..6d77f9e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/CheckPage.java @@ -0,0 +1,17 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.PageCheckValidator; +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = PageCheckValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface CheckPage { // week9 미션 + + String message() default "해당하는 페이지가 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java index 858b1c4..9cb1ec6 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMember.java @@ -3,7 +3,6 @@ import jakarta.validation.Constraint; import jakarta.validation.Payload; import umc.spring.validation.validator.MemberExistValidator; -import umc.spring.validation.validator.RegionExistValidator; import java.lang.annotation.*; @@ -11,7 +10,7 @@ @Constraint(validatedBy = MemberExistValidator.class) @Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) @Retention(RetentionPolicy.RUNTIME) -public @interface ExistMember { // week8 미션 +public @interface ExistMember { // week9 미션 String message() default "해당하는 멤버가 존재하지 않습니다."; Class[] groups() default {}; diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java index e9279c5..9c8e5ac 100644 --- a/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/MemberExistValidator.java @@ -14,8 +14,9 @@ @Component @RequiredArgsConstructor -public class MemberExistValidator implements ConstraintValidator> { // 여기서 바로 repository에 접근하면 안 됨 - // week8 미션 +public class MemberExistValidator implements ConstraintValidator { + // week9 미션 + private final MemberRepository memberRepository; @Override @@ -24,16 +25,16 @@ public void initialize(ExistMember constraintAnnotation) { } @Override - public boolean isValid(List values, ConstraintValidatorContext context) { - boolean isValid = values.stream() - .allMatch(value -> memberRepository.existsById(value)); + public boolean isValid(Long value, ConstraintValidatorContext context) { - if (!isValid) { + // 멤버 id가 null이거나, 레포지토리에 존재하지 않으면 에러 + if (value == null || !memberRepository.existsById(value)) { context.disableDefaultConstraintViolation(); - context.buildConstraintViolationWithTemplate(ErrorStatus.MEMBER_NOT_FOUND.toString()).addConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MEMBER_NOT_FOUND.toString()) + .addConstraintViolation(); + return false; } - return isValid; - + return true; // 검증 성공 } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/PageCheckValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/PageCheckValidator.java new file mode 100644 index 0000000..546d798 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/PageCheckValidator.java @@ -0,0 +1,32 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.validation.annotation.CheckPage; + +@Component +public class PageCheckValidator implements ConstraintValidator { + // week9 미션 + + @Override + public void initialize(CheckPage constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + // 여기서 페이지 번호를 -1 해주지는 못 하고 검증만 가능 + @Override + public boolean isValid(Integer value, ConstraintValidatorContext context) { + + // 요청으로 온 페이지 번호가 null이거나 1 미만이면 검증 실패 + if (value == null || value < 1) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.PAGE_NOT_FOUND.toString()) + .addConstraintViolation(); + return false; + } + + return true; // 검증 성공 + } +} diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java index 52c27c3..7485780 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/MemberRestController.java @@ -1,28 +1,77 @@ package umc.spring.web.controller; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -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; +import org.springframework.data.domain.Page; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import umc.spring.apipayload.ApiResponse; import umc.spring.converter.MemberConverter; import umc.spring.domain.Member; +import umc.spring.domain.Mission; +import umc.spring.domain.Review; +import umc.spring.domain.mapping.MemberMission; import umc.spring.service.member.MemberCommandService; +import umc.spring.service.member.MemberQueryService; +import umc.spring.validation.annotation.ExistMember; +import umc.spring.validation.annotation.CheckPage; import umc.spring.web.dto.MemberRequestDTO; import umc.spring.web.dto.MemberResponseDTO; @RestController @RequiredArgsConstructor @RequestMapping("/members") +@Validated public class MemberRestController { // week8 미션 private final MemberCommandService memberCommandService; + private final MemberQueryService memberQueryService; @PostMapping("/") - public ApiResponse join(@RequestBody @Valid MemberRequestDTO.JoinDto request){ + public ApiResponse join(@RequestBody @Valid MemberRequestDTO.JoinDto request) { Member member = memberCommandService.joinMember(request); return ApiResponse.onSuccess(MemberConverter.toJoinResultDTO(member)); // result를 리턴하는데, 이 result가 id와 생성시간 } + + // week9 미션 - 특정 멤버 리뷰 목록 + @GetMapping("/{memberId}/reviews") + @Operation(summary = "특정 멤버의 리뷰 목록 조회 API", description = "특정 멤버의 리뷰 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "memberId", description = "멤버의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호, query string 입니다. 1 이상의 페이지 번호를 보내주세요!") + }) + public ApiResponse getReviewList(@ExistMember @PathVariable Long memberId, @CheckPage @RequestParam Integer page) { + Page reviewPage = memberQueryService.getReviewList(memberId, page - 1); // 여기서 1 빼주기 + return ApiResponse.onSuccess(MemberConverter.memberReviewListDTO(reviewPage)); + } + + // week9 미션 - 내가 진행 중인 미션 목록 + @GetMapping("/{memberId}/missions") + @Operation(summary = "특정 멤버의 미션 목록 조회 API", description = "특정 멤버의 미션 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "memberId", description = "멤버의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호, query string 입니다. 1 이상의 페이지 번호를 보내주세요!") + }) + public ApiResponse getMissionList(@ExistMember @PathVariable Long memberId, @CheckPage @RequestParam Integer page) { + Page memberMissionPage = memberQueryService.getMemberMissionList(memberId, page - 1); + return ApiResponse.onSuccess(MemberConverter.memberMissionListDTO(memberMissionPage)); + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java index 5bf977d..893baed 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/StoreRestController.java @@ -9,13 +9,16 @@ import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import umc.spring.apipayload.ApiResponse; import umc.spring.converter.StoreConverter; +import umc.spring.domain.Mission; import umc.spring.domain.Review; import umc.spring.domain.Store; import umc.spring.service.store.StoreCommandService; import umc.spring.service.store.StoreQueryService; +import umc.spring.validation.annotation.CheckPage; import umc.spring.validation.annotation.ExistStore; import umc.spring.web.dto.StoreRequestDTO; import umc.spring.web.dto.StoreResponseDTO; @@ -23,6 +26,7 @@ @RestController @RequiredArgsConstructor @RequestMapping("/stores") +@Validated public class StoreRestController { // week8 미션 private final StoreCommandService storeCommandService; @@ -35,7 +39,7 @@ public ApiResponse add(@RequestBody @Valid StoreRe } - // week9 코드 + // week9 실습 코드 @GetMapping("/{storeId}/reviews") @Operation(summary = "특정 가게의 리뷰 목록 조회 API",description = "특정 가게의 리뷰들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") @ApiResponses({ @@ -49,13 +53,13 @@ public ApiResponse add(@RequestBody @Valid StoreRe }) public ApiResponse getReviewList( @ExistStore @PathVariable(name = "storeId") Long storeId, - @RequestParam(name = "page") Integer page + @CheckPage @RequestParam(name = "page") Integer page ) { // storeQueryService.getReviewList(storeId, page); // return ApiResponse.onSuccess(StoreConverter.reviewPreViewListDTO(reviewList)); // 서비스에서 리뷰 목록 가져오기 - Page reviewPage = storeQueryService.getReviewList(storeId, page); + Page reviewPage = storeQueryService.getReviewList(storeId, page - 1); // DTO 변환: 리뷰 목록과 페이징 정보 StoreResponseDTO.ReviewPreViewListDTO reviewListDTO = StoreConverter.reviewPreViewListDTO(reviewPage); @@ -63,4 +67,26 @@ public ApiResponse getReviewList( // 성공 응답 반환 return ApiResponse.onSuccess(reviewListDTO); } + + // week9 미션 - 특정 가게 미션 목록 조회 + @GetMapping("/{storeId}/misisons") + @Operation(summary = "특정 가게의 미션 목록 조회 API",description = "특정 가게의 미션들의 목록을 조회하는 API이며, 페이징을 포함합니다. query String 으로 page 번호를 주세요") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "storeId", description = "가게의 아이디, path variable 입니다!"), + @Parameter(name = "page", description = "페이지 번호, query string 입니다. 1 이상의 페이지 번호를 보내주세요!") + }) + public ApiResponse getMissionList(@ExistStore @PathVariable Long storeId, @CheckPage @RequestParam Integer page) { + + // 서비스에서 미션 목록 가져오기 + Page missionPage = storeQueryService.getMissionList(storeId, page - 1); + + // 성공 응답 반환 + return ApiResponse.onSuccess(StoreConverter.storeMissionListDTO(missionPage)); + } } diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java index f96a3e3..d63c651 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MemberResponseDTO.java @@ -4,10 +4,13 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import umc.spring.domain.enums.MissionStatus; +import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.List; -public class MemberResponseDTO { // week8 미션 +public class MemberResponseDTO { @Builder @Getter @@ -17,4 +20,56 @@ public static class JoinResultDTO{ Long memberId; LocalDateTime createdAt; } + + // week9 미션 - 특정 멤버 리뷰 목록 + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MemberReviewDTO { // 닉네임, 생성 일자, 별점, 리뷰 본문 + String ownerNickname; // 닉네임 말고도 사용자의 정보 더 적을 게 있다면 여기도 DTO로 빼는 게 낫다. + // MemberInfoDTO memberInfo; - 사용자의 정보가 담긴 DTO + Float score; + String body; + LocalDate createdAt; + } + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MemberReviewListDTO { + List reviewList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + // week9 미션 - 내가 진행 중인 미션 목록 + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MemberMissionDTO { + String storeName; + String missionSpec; + Integer reward; + MissionStatus status; + } + + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MemberMissionListDTO { + List missionList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } } \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java index e98b5b6..6dff53d 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/StoreResponseDTO.java @@ -45,4 +45,31 @@ public static class ReviewPreViewDTO { LocalDate createdAt; } + // week9 미션 - 특정 가게 미션 목록 + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class StoreMissionDTO { + String storeName; + String missionSpec; + Integer reward; + LocalDate createdAt; + } + + + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class StoreMissionListDTO { + List missionList; + Integer listSize; + Integer totalPage; + Long totalElements; + Boolean isFirst; + Boolean isLast; + } + + } From 1978bf7f7795a5db1b3ca1d5ba9e6c7d4b7645fa Mon Sep 17 00:00:00 2001 From: sshnote Date: Thu, 28 Nov 2024 20:23:44 +0900 Subject: [PATCH 9/9] =?UTF-8?q?=E2=9C=A8=20Week9=20mission=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit week9 미션 수정입니다. --- .../apipayload/code/status/ErrorStatus.java | 7 +++- .../spring/converter/MissionConverter.java | 11 ++++++ .../MemberMissionRepository.java | 3 ++ .../service/mission/MissionQueryService.java | 9 +++++ .../mission/MissionQueryServiceImpl.java | 39 +++++++++++++++++++ .../validation/annotation/ExistMission.java | 19 +++++++++ .../validator/MissionExistValidator.java | 36 +++++++++++++++++ .../web/controller/MissionRestController.java | 34 ++++++++++++++-- .../spring/web/dto/MissionResponseDTO.java | 15 +++++++ 9 files changed, 168 insertions(+), 5 deletions(-) create mode 100644 sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryService.java create mode 100644 sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryServiceImpl.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMission.java create mode 100644 sanho/spring/src/main/java/umc/spring/validation/validator/MissionExistValidator.java diff --git a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java index 8358592..54cd6b8 100644 --- a/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java +++ b/sanho/spring/src/main/java/umc/spring/apipayload/code/status/ErrorStatus.java @@ -40,7 +40,12 @@ public enum ErrorStatus implements BaseErrorCode { // week8 미션 Member_Mission_NOT_FOUND(HttpStatus.BAD_REQUEST, "MemberMission4001", "미션이 없습니다."), // 페이지 관련 에러 - PAGE_NOT_FOUND(HttpStatus.BAD_REQUEST, "page4001", "유효한 페이지가 없습니다."); + PAGE_NOT_FOUND(HttpStatus.BAD_REQUEST, "page4001", "유효한 페이지가 없습니다."), + + // 미션 관련 에러 + MISSION_NOT_FOUND(HttpStatus.BAD_REQUEST, "mission4001", "해당 미션이 없습니다."), + MISSION_ALREADY_COMPLETE(HttpStatus.BAD_REQUEST, "mission4002", "이미 완료된 미션입니다."); + diff --git a/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java b/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java index d69a4bf..5d11b3b 100644 --- a/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java +++ b/sanho/spring/src/main/java/umc/spring/converter/MissionConverter.java @@ -30,5 +30,16 @@ public static Mission toMission(MissionRequestDTO.AddMissionDTO request, Store s .build(); } + // week9 미션 - 진행 중인 미션을 진행 완료로 수정하기 + public static MissionResponseDTO.MemberMissionDTO memberMissionDTO(MemberMission memberMission) { + Mission mission = memberMission.getMission(); + + return MissionResponseDTO.MemberMissionDTO.builder() + .memberName(memberMission.getMember().getName()) + .missionSpec(mission.getMissionSpec()) + .reward(mission.getReward()) + .status(memberMission.getStatus()) + .build(); + } } diff --git a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java index 8db70e4..10fd466 100644 --- a/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java +++ b/sanho/spring/src/main/java/umc/spring/repository/membermission/MemberMissionRepository.java @@ -11,4 +11,7 @@ public interface MemberMissionRepository extends JpaRepository findAllByMember(Member member, PageRequest pageRequest); + + // week9 미션 - 진행 중인 미션을 진행 완료로 수정하기 + MemberMission findByMission(Mission mission); } diff --git a/sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryService.java b/sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryService.java new file mode 100644 index 0000000..d53e875 --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryService.java @@ -0,0 +1,9 @@ +package umc.spring.service.mission; + +import umc.spring.domain.mapping.MemberMission; + +public interface MissionQueryService { + MemberMission findMemberMission(Long missionId); + + void completeMission(MemberMission memberMission); +} diff --git a/sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryServiceImpl.java b/sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryServiceImpl.java new file mode 100644 index 0000000..5ef542e --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/service/mission/MissionQueryServiceImpl.java @@ -0,0 +1,39 @@ +package umc.spring.service.mission; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.apipayload.exception.handler.MemberMissionHandler; +import umc.spring.domain.Mission; +import umc.spring.domain.enums.MissionStatus; +import umc.spring.domain.mapping.MemberMission; +import umc.spring.repository.membermission.MemberMissionRepository; +import umc.spring.repository.mission.MissionRepository; + +@Service +@RequiredArgsConstructor +public class MissionQueryServiceImpl implements MissionQueryService { + + private final MissionRepository missionRepository; + private final MemberMissionRepository memberMissionRepository; + + @Override + public MemberMission findMemberMission(Long missionId) { + Mission mission = missionRepository.findById(missionId).get(); + MemberMission memberMission = memberMissionRepository.findByMission(mission); + + return memberMission; + } + + @Override + @Transactional + public void completeMission(MemberMission memberMission) { + // 미션 상태가 COMPLETE면 예외 터뜨리기 + if (memberMission.getStatus() == MissionStatus.COMPLETE) { + throw new MemberMissionHandler(ErrorStatus.MISSION_ALREADY_COMPLETE); + } + + memberMission.setStatus(MissionStatus.COMPLETE); + } +} diff --git a/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMission.java b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMission.java new file mode 100644 index 0000000..de7128b --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/annotation/ExistMission.java @@ -0,0 +1,19 @@ +package umc.spring.validation.annotation; + +import jakarta.validation.Constraint; +import jakarta.validation.Payload; +import umc.spring.validation.validator.MemberExistValidator; +import umc.spring.validation.validator.MissionExistValidator; + +import java.lang.annotation.*; + +@Documented // 사용자 정의 애노테이션 +@Constraint(validatedBy = MissionExistValidator.class) +@Target( { ElementType.METHOD, ElementType.FIELD, ElementType.PARAMETER }) +@Retention(RetentionPolicy.RUNTIME) +public @interface ExistMission { // week9 미션 - 진행 중인 미션을 진행 완료로 수정하기 + + String message() default "해당하는 미션이 존재하지 않습니다."; + Class[] groups() default {}; + Class[] payload() default {}; +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/validation/validator/MissionExistValidator.java b/sanho/spring/src/main/java/umc/spring/validation/validator/MissionExistValidator.java new file mode 100644 index 0000000..57b481d --- /dev/null +++ b/sanho/spring/src/main/java/umc/spring/validation/validator/MissionExistValidator.java @@ -0,0 +1,36 @@ +package umc.spring.validation.validator; + +import jakarta.validation.ConstraintValidator; +import jakarta.validation.ConstraintValidatorContext; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import umc.spring.apipayload.code.status.ErrorStatus; +import umc.spring.repository.mission.MissionRepository; +import umc.spring.validation.annotation.ExistMission; + +@Component +@RequiredArgsConstructor +public class MissionExistValidator implements ConstraintValidator { + // week9 미션 - 진행 중인 미션을 진행 완료로 수정하기 + + private final MissionRepository missionRepository; + + @Override + public void initialize(ExistMission constraintAnnotation) { + ConstraintValidator.super.initialize(constraintAnnotation); + } + + @Override + public boolean isValid(Long value, ConstraintValidatorContext context) { + + // 멤버 id가 null이거나, 레포지토리에 존재하지 않으면 에러 + if (value == null || !missionRepository.existsById(value)) { + context.disableDefaultConstraintViolation(); + context.buildConstraintViolationWithTemplate(ErrorStatus.MISSION_NOT_FOUND.toString()) + .addConstraintViolation(); + return false; + } + + return true; // 검증 성공 + } +} \ No newline at end of file diff --git a/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java b/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java index 14c2109..7c605bc 100644 --- a/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java +++ b/sanho/spring/src/main/java/umc/spring/web/controller/MissionRestController.java @@ -1,17 +1,25 @@ package umc.spring.web.controller; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.Parameters; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponses; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; -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; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; import umc.spring.apipayload.ApiResponse; import umc.spring.converter.MissionConverter; import umc.spring.converter.ReviewConverter; import umc.spring.domain.Mission; import umc.spring.domain.Review; +import umc.spring.domain.mapping.MemberMission; import umc.spring.service.mission.MissionCommandService; +import umc.spring.service.mission.MissionQueryService; +import umc.spring.validation.annotation.ExistMember; +import umc.spring.validation.annotation.ExistMission; import umc.spring.web.dto.MissionRequestDTO; import umc.spring.web.dto.MissionResponseDTO; import umc.spring.web.dto.ReviewRequestDTO; @@ -20,9 +28,11 @@ @RestController @RequiredArgsConstructor @RequestMapping("/missons") +@Validated public class MissionRestController { // week8 미션 private final MissionCommandService missionCommandService; + private final MissionQueryService missionQueryService; @PostMapping("/") public ApiResponse add(@RequestBody @Valid MissionRequestDTO.AddMissionDTO request){ @@ -30,6 +40,22 @@ public ApiResponse add(@RequestBody @Val Mission mission = missionCommandService.addMission(request); return ApiResponse.onSuccess((MissionConverter.toAddMissionDTO(mission))); + } + @PatchMapping("/{missionId}/status") + @Operation(summary = "진행 중인 미션을 진행 완료로 수정하는 API", description = "진행 중인 미션을 진행 완료로 수정하는 API입니다.") + @ApiResponses({ + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "COMMON200",description = "OK, 성공"), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH003", description = "access 토큰을 주세요!",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH004", description = "acess 토큰 만료",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + @io.swagger.v3.oas.annotations.responses.ApiResponse(responseCode = "AUTH006", description = "acess 토큰 모양이 이상함",content = @Content(schema = @Schema(implementation = ApiResponse.class))), + }) + @Parameters({ + @Parameter(name = "missionId", description = "진행 완료로 수정할 미션의 아이디, path variable 입니다!"), + }) + public ApiResponse completeMission(@ExistMission @PathVariable Long missionId) { + MemberMission memberMission = missionQueryService.findMemberMission(missionId); + missionQueryService.completeMission(memberMission); + return ApiResponse.onSuccess(MissionConverter.memberMissionDTO(memberMission)); } } diff --git a/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java b/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java index 7406e95..65ba713 100644 --- a/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java +++ b/sanho/spring/src/main/java/umc/spring/web/dto/MissionResponseDTO.java @@ -4,8 +4,10 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import umc.spring.domain.enums.MissionStatus; import java.time.LocalDateTime; +import java.util.List; public class MissionResponseDTO { // week8 미션 @@ -17,4 +19,17 @@ public static class AddMissionResultDTO{ Long missionId; LocalDateTime createdAt; } + + // week9 미션 - 진행 중인 미션 진행 완료로 바꾸기 + @Builder + @Getter + @NoArgsConstructor + @AllArgsConstructor + public static class MemberMissionDTO { + String memberName; + String missionSpec; + Integer reward; + MissionStatus status; + } + }