From 480e7a560bc306338cae3c48ea162a8de632cc18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=84=92=E1=85=A7=E1=86=AB=E1=84=90=E1=85=A2=20=E1=84=8E?= =?UTF-8?q?=E1=85=AC?= Date: Sun, 19 Jan 2025 20:36:16 +0900 Subject: [PATCH 001/107] init: project initial --- .gitattributes | 3 + .gitignore | 37 +++ build.gradle | 38 +++ gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43583 bytes gradle/wrapper/gradle-wrapper.properties | 7 + gradlew | 252 ++++++++++++++++++ gradlew.bat | 94 +++++++ settings.gradle | 1 + .../java/com/amcamp/DevFitApplication.java | 13 + src/main/resources/application.yml | 0 .../com/amcamp/DevFitApplicationTests.java | 13 + test/.gitignore | 29 ++ test/src/Main.java | 5 + test/src/Person.java | 20 ++ test/src/Student.java | 8 + test/src/Worker.java | 7 + 16 files changed, 527 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/amcamp/DevFitApplication.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/amcamp/DevFitApplicationTests.java create mode 100644 test/.gitignore create mode 100644 test/src/Main.java create mode 100644 test/src/Person.java create mode 100644 test/src/Student.java create mode 100644 test/src/Worker.java diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..8af972cd --- /dev/null +++ b/.gitattributes @@ -0,0 +1,3 @@ +/gradlew text eol=lf +*.bat text eol=crlf +*.jar binary diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..c2065bc2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/build.gradle b/build.gradle new file mode 100644 index 00000000..0ed1b786 --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.1' + id 'io.spring.dependency-management' version '1.1.7' +} + +group = 'com.amcamp' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +configurations { + compileOnly { + extendsFrom annotationProcessor + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.h2database:h2' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..a4b76b9530d66f5e68d973ea569d8e19de379189 GIT binary patch literal 43583 zcma&N1CXTcmMvW9vTb(Rwr$&4wr$(C?dmSu>@vG-+vuvg^_??!{yS%8zW-#zn-LkA z5&1^$^{lnmUON?}LBF8_K|(?T0Ra(xUH{($5eN!MR#ZihR#HxkUPe+_R8Cn`RRs(P z_^*#_XlXmGv7!4;*Y%p4nw?{bNp@UZHv1?Um8r6)Fei3p@ClJn0ECfg1hkeuUU@Or zDaPa;U3fE=3L}DooL;8f;P0ipPt0Z~9P0)lbStMS)ag54=uL9ia-Lm3nh|@(Y?B`; zx_#arJIpXH!U{fbCbI^17}6Ri*H<>OLR%c|^mh8+)*h~K8Z!9)DPf zR2h?lbDZQ`p9P;&DQ4F0sur@TMa!Y}S8irn(%d-gi0*WxxCSk*A?3lGh=gcYN?FGl z7D=Js!i~0=u3rox^eO3i@$0=n{K1lPNU zwmfjRVmLOCRfe=seV&P*1Iq=^i`502keY8Uy-WNPwVNNtJFx?IwAyRPZo2Wo1+S(xF37LJZ~%i)kpFQ3Fw=mXfd@>%+)RpYQLnr}B~~zoof(JVm^^&f zxKV^+3D3$A1G;qh4gPVjhrC8e(VYUHv#dy^)(RoUFM?o%W-EHxufuWf(l*@-l+7vt z=l`qmR56K~F|v<^Pd*p~1_y^P0P^aPC##d8+HqX4IR1gu+7w#~TBFphJxF)T$2WEa zxa?H&6=Qe7d(#tha?_1uQys2KtHQ{)Qco)qwGjrdNL7thd^G5i8Os)CHqc>iOidS} z%nFEDdm=GXBw=yXe1W-ShHHFb?Cc70+$W~z_+}nAoHFYI1MV1wZegw*0y^tC*s%3h zhD3tN8b=Gv&rj}!SUM6|ajSPp*58KR7MPpI{oAJCtY~JECm)*m_x>AZEu>DFgUcby z1Qaw8lU4jZpQ_$;*7RME+gq1KySGG#Wql>aL~k9tLrSO()LWn*q&YxHEuzmwd1?aAtI zBJ>P=&$=l1efe1CDU;`Fd+_;&wI07?V0aAIgc(!{a z0Jg6Y=inXc3^n!U0Atk`iCFIQooHqcWhO(qrieUOW8X(x?(RD}iYDLMjSwffH2~tB z)oDgNBLB^AJBM1M^c5HdRx6fBfka`(LD-qrlh5jqH~);#nw|iyp)()xVYak3;Ybik z0j`(+69aK*B>)e_p%=wu8XC&9e{AO4c~O1U`5X9}?0mrd*m$_EUek{R?DNSh(=br# z#Q61gBzEpmy`$pA*6!87 zSDD+=@fTY7<4A?GLqpA?Pb2z$pbCc4B4zL{BeZ?F-8`s$?>*lXXtn*NC61>|*w7J* z$?!iB{6R-0=KFmyp1nnEmLsA-H0a6l+1uaH^g%c(p{iT&YFrbQ$&PRb8Up#X3@Zsk zD^^&LK~111%cqlP%!_gFNa^dTYT?rhkGl}5=fL{a`UViaXWI$k-UcHJwmaH1s=S$4 z%4)PdWJX;hh5UoK?6aWoyLxX&NhNRqKam7tcOkLh{%j3K^4Mgx1@i|Pi&}<^5>hs5 zm8?uOS>%)NzT(%PjVPGa?X%`N2TQCKbeH2l;cTnHiHppPSJ<7y-yEIiC!P*ikl&!B z%+?>VttCOQM@ShFguHVjxX^?mHX^hSaO_;pnyh^v9EumqSZTi+#f&_Vaija0Q-e*| z7ulQj6Fs*bbmsWp{`auM04gGwsYYdNNZcg|ph0OgD>7O}Asn7^Z=eI>`$2*v78;sj-}oMoEj&@)9+ycEOo92xSyY344^ z11Hb8^kdOvbf^GNAK++bYioknrpdN>+u8R?JxG=!2Kd9r=YWCOJYXYuM0cOq^FhEd zBg2puKy__7VT3-r*dG4c62Wgxi52EMCQ`bKgf*#*ou(D4-ZN$+mg&7$u!! z-^+Z%;-3IDwqZ|K=ah85OLwkO zKxNBh+4QHh)u9D?MFtpbl)us}9+V!D%w9jfAMYEb>%$A;u)rrI zuBudh;5PN}_6J_}l55P3l_)&RMlH{m!)ai-i$g)&*M`eN$XQMw{v^r@-125^RRCF0 z^2>|DxhQw(mtNEI2Kj(;KblC7x=JlK$@78`O~>V!`|1Lm-^JR$-5pUANAnb(5}B}JGjBsliK4& zk6y(;$e&h)lh2)L=bvZKbvh@>vLlreBdH8No2>$#%_Wp1U0N7Ank!6$dFSi#xzh|( zRi{Uw%-4W!{IXZ)fWx@XX6;&(m_F%c6~X8hx=BN1&q}*( zoaNjWabE{oUPb!Bt$eyd#$5j9rItB-h*5JiNi(v^e|XKAj*8(k<5-2$&ZBR5fF|JA z9&m4fbzNQnAU}r8ab>fFV%J0z5awe#UZ|bz?Ur)U9bCIKWEzi2%A+5CLqh?}K4JHi z4vtM;+uPsVz{Lfr;78W78gC;z*yTch~4YkLr&m-7%-xc ztw6Mh2d>_iO*$Rd8(-Cr1_V8EO1f*^@wRoSozS) zy1UoC@pruAaC8Z_7~_w4Q6n*&B0AjOmMWa;sIav&gu z|J5&|{=a@vR!~k-OjKEgPFCzcJ>#A1uL&7xTDn;{XBdeM}V=l3B8fE1--DHjSaxoSjNKEM9|U9#m2<3>n{Iuo`r3UZp;>GkT2YBNAh|b z^jTq-hJp(ebZh#Lk8hVBP%qXwv-@vbvoREX$TqRGTgEi$%_F9tZES@z8Bx}$#5eeG zk^UsLBH{bc2VBW)*EdS({yw=?qmevwi?BL6*=12k9zM5gJv1>y#ML4!)iiPzVaH9% zgSImetD@dam~e>{LvVh!phhzpW+iFvWpGT#CVE5TQ40n%F|p(sP5mXxna+Ev7PDwA zamaV4m*^~*xV+&p;W749xhb_X=$|LD;FHuB&JL5?*Y2-oIT(wYY2;73<^#46S~Gx| z^cez%V7x$81}UWqS13Gz80379Rj;6~WdiXWOSsdmzY39L;Hg3MH43o*y8ibNBBH`(av4|u;YPq%{R;IuYow<+GEsf@R?=@tT@!}?#>zIIn0CoyV!hq3mw zHj>OOjfJM3F{RG#6ujzo?y32m^tgSXf@v=J$ELdJ+=5j|=F-~hP$G&}tDZsZE?5rX ztGj`!S>)CFmdkccxM9eGIcGnS2AfK#gXwj%esuIBNJQP1WV~b~+D7PJTmWGTSDrR` zEAu4B8l>NPuhsk5a`rReSya2nfV1EK01+G!x8aBdTs3Io$u5!6n6KX%uv@DxAp3F@{4UYg4SWJtQ-W~0MDb|j-$lwVn znAm*Pl!?Ps&3wO=R115RWKb*JKoexo*)uhhHBncEDMSVa_PyA>k{Zm2(wMQ(5NM3# z)jkza|GoWEQo4^s*wE(gHz?Xsg4`}HUAcs42cM1-qq_=+=!Gk^y710j=66(cSWqUe zklbm8+zB_syQv5A2rj!Vbw8;|$@C!vfNmNV!yJIWDQ>{+2x zKjuFX`~~HKG~^6h5FntRpnnHt=D&rq0>IJ9#F0eM)Y-)GpRjiN7gkA8wvnG#K=q{q z9dBn8_~wm4J<3J_vl|9H{7q6u2A!cW{bp#r*-f{gOV^e=8S{nc1DxMHFwuM$;aVI^ zz6A*}m8N-&x8;aunp1w7_vtB*pa+OYBw=TMc6QK=mbA-|Cf* zvyh8D4LRJImooUaSb7t*fVfih<97Gf@VE0|z>NcBwBQze);Rh!k3K_sfunToZY;f2 z^HmC4KjHRVg+eKYj;PRN^|E0>Gj_zagfRbrki68I^#~6-HaHg3BUW%+clM1xQEdPYt_g<2K+z!$>*$9nQ>; zf9Bei{?zY^-e{q_*|W#2rJG`2fy@{%6u0i_VEWTq$*(ZN37|8lFFFt)nCG({r!q#9 z5VK_kkSJ3?zOH)OezMT{!YkCuSSn!K#-Rhl$uUM(bq*jY? zi1xbMVthJ`E>d>(f3)~fozjg^@eheMF6<)I`oeJYx4*+M&%c9VArn(OM-wp%M<-`x z7sLP1&3^%Nld9Dhm@$3f2}87!quhI@nwd@3~fZl_3LYW-B?Ia>ui`ELg z&Qfe!7m6ze=mZ`Ia9$z|ARSw|IdMpooY4YiPN8K z4B(ts3p%2i(Td=tgEHX z0UQ_>URBtG+-?0E;E7Ld^dyZ;jjw0}XZ(}-QzC6+NN=40oDb2^v!L1g9xRvE#@IBR zO!b-2N7wVfLV;mhEaXQ9XAU+>=XVA6f&T4Z-@AX!leJ8obP^P^wP0aICND?~w&NykJ#54x3_@r7IDMdRNy4Hh;h*!u(Ol(#0bJdwEo$5437-UBjQ+j=Ic>Q2z` zJNDf0yO6@mr6y1#n3)s(W|$iE_i8r@Gd@!DWDqZ7J&~gAm1#~maIGJ1sls^gxL9LLG_NhU!pTGty!TbhzQnu)I*S^54U6Yu%ZeCg`R>Q zhBv$n5j0v%O_j{QYWG!R9W?5_b&67KB$t}&e2LdMvd(PxN6Ir!H4>PNlerpBL>Zvyy!yw z-SOo8caEpDt(}|gKPBd$qND5#a5nju^O>V&;f890?yEOfkSG^HQVmEbM3Ugzu+UtH zC(INPDdraBN?P%kE;*Ae%Wto&sgw(crfZ#Qy(<4nk;S|hD3j{IQRI6Yq|f^basLY; z-HB&Je%Gg}Jt@={_C{L$!RM;$$|iD6vu#3w?v?*;&()uB|I-XqEKqZPS!reW9JkLewLb!70T7n`i!gNtb1%vN- zySZj{8-1>6E%H&=V}LM#xmt`J3XQoaD|@XygXjdZ1+P77-=;=eYpoEQ01B@L*a(uW zrZeZz?HJsw_4g0vhUgkg@VF8<-X$B8pOqCuWAl28uB|@r`19DTUQQsb^pfqB6QtiT z*`_UZ`fT}vtUY#%sq2{rchyfu*pCg;uec2$-$N_xgjZcoumE5vSI{+s@iLWoz^Mf; zuI8kDP{!XY6OP~q5}%1&L}CtfH^N<3o4L@J@zg1-mt{9L`s^z$Vgb|mr{@WiwAqKg zp#t-lhrU>F8o0s1q_9y`gQNf~Vb!F%70f}$>i7o4ho$`uciNf=xgJ>&!gSt0g;M>*x4-`U)ysFW&Vs^Vk6m%?iuWU+o&m(2Jm26Y(3%TL; zA7T)BP{WS!&xmxNw%J=$MPfn(9*^*TV;$JwRy8Zl*yUZi8jWYF>==j~&S|Xinsb%c z2?B+kpet*muEW7@AzjBA^wAJBY8i|#C{WtO_or&Nj2{=6JTTX05}|H>N2B|Wf!*3_ z7hW*j6p3TvpghEc6-wufFiY!%-GvOx*bZrhZu+7?iSrZL5q9}igiF^*R3%DE4aCHZ zqu>xS8LkW+Auv%z-<1Xs92u23R$nk@Pk}MU5!gT|c7vGlEA%G^2th&Q*zfg%-D^=f z&J_}jskj|Q;73NP4<4k*Y%pXPU2Thoqr+5uH1yEYM|VtBPW6lXaetokD0u z9qVek6Q&wk)tFbQ8(^HGf3Wp16gKmr>G;#G(HRBx?F`9AIRboK+;OfHaLJ(P>IP0w zyTbTkx_THEOs%Q&aPrxbZrJlio+hCC_HK<4%f3ZoSAyG7Dn`=X=&h@m*|UYO-4Hq0 z-Bq&+Ie!S##4A6OGoC~>ZW`Y5J)*ouaFl_e9GA*VSL!O_@xGiBw!AF}1{tB)z(w%c zS1Hmrb9OC8>0a_$BzeiN?rkPLc9%&;1CZW*4}CDDNr2gcl_3z+WC15&H1Zc2{o~i) z)LLW=WQ{?ricmC`G1GfJ0Yp4Dy~Ba;j6ZV4r{8xRs`13{dD!xXmr^Aga|C=iSmor% z8hi|pTXH)5Yf&v~exp3o+sY4B^^b*eYkkCYl*T{*=-0HniSA_1F53eCb{x~1k3*`W zr~};p1A`k{1DV9=UPnLDgz{aJH=-LQo<5%+Em!DNN252xwIf*wF_zS^!(XSm(9eoj z=*dXG&n0>)_)N5oc6v!>-bd(2ragD8O=M|wGW z!xJQS<)u70m&6OmrF0WSsr@I%T*c#Qo#Ha4d3COcX+9}hM5!7JIGF>7<~C(Ear^Sn zm^ZFkV6~Ula6+8S?oOROOA6$C&q&dp`>oR-2Ym3(HT@O7Sd5c~+kjrmM)YmgPH*tL zX+znN>`tv;5eOfX?h{AuX^LK~V#gPCu=)Tigtq9&?7Xh$qN|%A$?V*v=&-2F$zTUv z`C#WyIrChS5|Kgm_GeudCFf;)!WH7FI60j^0o#65o6`w*S7R@)88n$1nrgU(oU0M9 zx+EuMkC>(4j1;m6NoGqEkpJYJ?vc|B zOlwT3t&UgL!pX_P*6g36`ZXQ; z9~Cv}ANFnJGp(;ZhS(@FT;3e)0)Kp;h^x;$*xZn*k0U6-&FwI=uOGaODdrsp-!K$Ac32^c{+FhI-HkYd5v=`PGsg%6I`4d9Jy)uW0y%) zm&j^9WBAp*P8#kGJUhB!L?a%h$hJgQrx!6KCB_TRo%9{t0J7KW8!o1B!NC)VGLM5! zpZy5Jc{`r{1e(jd%jsG7k%I+m#CGS*BPA65ZVW~fLYw0dA-H_}O zrkGFL&P1PG9p2(%QiEWm6x;U-U&I#;Em$nx-_I^wtgw3xUPVVu zqSuKnx&dIT-XT+T10p;yjo1Y)z(x1fb8Dzfn8e 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/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..e2847c82 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100755 index 00000000..f5feea6d --- /dev/null +++ b/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/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9d21a218 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 00000000..2230a9d7 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'amcamp' diff --git a/src/main/java/com/amcamp/DevFitApplication.java b/src/main/java/com/amcamp/DevFitApplication.java new file mode 100644 index 00000000..9d534e01 --- /dev/null +++ b/src/main/java/com/amcamp/DevFitApplication.java @@ -0,0 +1,13 @@ +package com.amcamp; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class DevFitApplication { + + public static void main(String[] args) { + SpringApplication.run(DevFitApplication.class, args); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..e69de29b diff --git a/src/test/java/com/amcamp/DevFitApplicationTests.java b/src/test/java/com/amcamp/DevFitApplicationTests.java new file mode 100644 index 00000000..ce1d4231 --- /dev/null +++ b/src/test/java/com/amcamp/DevFitApplicationTests.java @@ -0,0 +1,13 @@ +package com.amcamp; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class DevFitApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/test/.gitignore b/test/.gitignore new file mode 100644 index 00000000..f68d1099 --- /dev/null +++ b/test/.gitignore @@ -0,0 +1,29 @@ +### IntelliJ IDEA ### +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/test/src/Main.java b/test/src/Main.java new file mode 100644 index 00000000..8b9a3bdb --- /dev/null +++ b/test/src/Main.java @@ -0,0 +1,5 @@ +public class Main { + public static void main(String[] args) { + } + +} \ No newline at end of file diff --git a/test/src/Person.java b/test/src/Person.java new file mode 100644 index 00000000..955635c2 --- /dev/null +++ b/test/src/Person.java @@ -0,0 +1,20 @@ +public class Person { + private int name; + private int age; + + public Person() { + } + + public Person(int name, int age) { + this.name = name; + this.age = age; + } + + private void eat() { + System.out.println("먹기"); + } + + private void sleep() { + System.out.println("잠자기"); + } +} diff --git a/test/src/Student.java b/test/src/Student.java new file mode 100644 index 00000000..713d0b92 --- /dev/null +++ b/test/src/Student.java @@ -0,0 +1,8 @@ +public class Student extends Person { + public int number; + + public void goSchool() { + System.out.println("등교하기"); + } + +} diff --git a/test/src/Worker.java b/test/src/Worker.java new file mode 100644 index 00000000..fb8ae8da --- /dev/null +++ b/test/src/Worker.java @@ -0,0 +1,7 @@ +public class Worker extends Person { + private int url; + + private void goWork() { + System.out.println("출근하기"); + } +} From 4c7ee6572d089036fc6ffce363dce39239106187 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 20 Jan 2025 10:55:41 +0900 Subject: [PATCH 002/107] =?UTF-8?q?chore:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B4=88=EA=B8=B0=20=EC=84=B8=ED=8C=85=20(#4)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * docs: ISSUE 템플릿 추가 * docs: PR 템플릿 추가 * chore: .editorconfig 설정 파일 추가 * chore: checkstyle 적용 * chore: develop Branch Pull Request Workflow 추가 * fix: build.gradle checkstyle 경로 수정 --- .editorconfig | 28 ++ .../\342\231\273\357\270\217-refactor.md" | 12 + .../\342\232\231\357\270\217-chore.md" | 12 + .../ISSUE_TEMPLATE/\342\234\250-feature.md" | 12 + .../ISSUE_TEMPLATE/\360\237\220\233-fix.md" | 12 + .github/PULL_REQUEST_TEMPLATE.md | 13 + .github/workflows/develop_pull_request.yml | 37 ++ build.gradle | 13 + config/checkstyle/naver-checkstyle-rules.xml | 433 ++++++++++++++++++ .../naver-checkstyle-suppressions.xml | 7 + 10 files changed, 579 insertions(+) create mode 100644 .editorconfig create mode 100644 ".github/ISSUE_TEMPLATE/\342\231\273\357\270\217-refactor.md" create mode 100644 ".github/ISSUE_TEMPLATE/\342\232\231\357\270\217-chore.md" create mode 100644 ".github/ISSUE_TEMPLATE/\342\234\250-feature.md" create mode 100644 ".github/ISSUE_TEMPLATE/\360\237\220\233-fix.md" create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 .github/workflows/develop_pull_request.yml create mode 100644 config/checkstyle/naver-checkstyle-rules.xml create mode 100644 config/checkstyle/naver-checkstyle-suppressions.xml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..81553563 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,28 @@ +root = true + +[*] +# [encoding-utf8] +charset = utf-8 + +# [newline-lf] +end_of_line = lf + +# [newline-eof] +insert_final_newline = true + +[*.bat] +end_of_line = crlf + +[*.java] +# [indentation-tab] +indent_style = tab + +# [4-spaces-tab] +indent_size = 4 +tab_width = 4 + +# [no-trailing-spaces] +trim_trailing_whitespace = true + +[line-length-120] +max_line_length = 120 \ No newline at end of file diff --git "a/.github/ISSUE_TEMPLATE/\342\231\273\357\270\217-refactor.md" "b/.github/ISSUE_TEMPLATE/\342\231\273\357\270\217-refactor.md" new file mode 100644 index 00000000..8675f0ac --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\342\231\273\357\270\217-refactor.md" @@ -0,0 +1,12 @@ +--- +name: "♻️ refactor" +about: 리팩토링 이슈 템플릿 +titles: "♻️ " +labels: "♻️ refactor" +assignees: '' + +--- + +## 📌 Description + +- \ No newline at end of file diff --git "a/.github/ISSUE_TEMPLATE/\342\232\231\357\270\217-chore.md" "b/.github/ISSUE_TEMPLATE/\342\232\231\357\270\217-chore.md" new file mode 100644 index 00000000..9df46a80 --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\342\232\231\357\270\217-chore.md" @@ -0,0 +1,12 @@ +--- +name: "⚙️ chore" +about: CI/CD 및 설정 이슈 템플릿 +titles: "⚙️ " +labels: "⚙️ chore" +assignees: '' + +--- + +## 📌 Description + +- \ No newline at end of file diff --git "a/.github/ISSUE_TEMPLATE/\342\234\250-feature.md" "b/.github/ISSUE_TEMPLATE/\342\234\250-feature.md" new file mode 100644 index 00000000..2a7f8a62 --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\342\234\250-feature.md" @@ -0,0 +1,12 @@ +--- +name: "✨ feature" +about: 기능 추가 이슈 템플릿 +titles: "✨ " +labels: "✨ feature" +assignees: '' + +--- + +## 📌 Description + +- \ No newline at end of file diff --git "a/.github/ISSUE_TEMPLATE/\360\237\220\233-fix.md" "b/.github/ISSUE_TEMPLATE/\360\237\220\233-fix.md" new file mode 100644 index 00000000..37f21488 --- /dev/null +++ "b/.github/ISSUE_TEMPLATE/\360\237\220\233-fix.md" @@ -0,0 +1,12 @@ +--- +name: "🐛 fix" +about: 버그 및 에러 이슈 템플릿 +titles: "🐛 " +labels: "🐛 bug/error" +assignees: '' + +--- + +## 📌 Description + +- diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..7b46d00f --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,13 @@ +## 🌱 관련 이슈 + +- close #Issue_number + +--- +## 📌 작업 내용 및 특이사항 + +- + +--- +## 📚 참고사항 + +- diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml new file mode 100644 index 00000000..7710e724 --- /dev/null +++ b/.github/workflows/develop_pull_request.yml @@ -0,0 +1,37 @@ +name: Check Style And Test +on: + pull_request: + branches: + - develop +jobs: + test: + runs-on: ubuntu-latest + strategy: + matrix: + java-version: [ 17 ] + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Set up Java + uses: actions/setup-java@v3 + with: + java-version: ${{ matrix.java-version }} + distribution: 'adopt' + + - name: Cache Gradle packages + uses: actions/cache@v3 + with: + path: ~/.gradle/caches + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle') }} + restore-keys: ${{ runner.os }}-gradle + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Code Formatting Check With CheckStyle + run: | + ./gradlew checkstyleMain checkstyleTest + - name: Test + run: | + ./gradlew test diff --git a/build.gradle b/build.gradle index 0ed1b786..f7240086 100644 --- a/build.gradle +++ b/build.gradle @@ -2,6 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.4.1' id 'io.spring.dependency-management' version '1.1.7' + id 'checkstyle' } group = 'com.amcamp' @@ -36,3 +37,15 @@ dependencies { tasks.named('test') { useJUnitPlatform() } + +tasks.withType(Checkstyle) { + reports { + xml.required = true + html.required = true + } +} + +checkstyle { + configFile = file("config/checkstyle/naver-checkstyle-rules.xml") + configProperties = ['suppressionFile': file("config/checkstyle/naver-checkstyle-suppressions.xml")] +} diff --git a/config/checkstyle/naver-checkstyle-rules.xml b/config/checkstyle/naver-checkstyle-rules.xml new file mode 100644 index 00000000..dafbb4d1 --- /dev/null +++ b/config/checkstyle/naver-checkstyle-rules.xml @@ -0,0 +1,433 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/config/checkstyle/naver-checkstyle-suppressions.xml b/config/checkstyle/naver-checkstyle-suppressions.xml new file mode 100644 index 00000000..3f11e0cd --- /dev/null +++ b/config/checkstyle/naver-checkstyle-suppressions.xml @@ -0,0 +1,7 @@ + + + + + From 5e7b1c91879c8756a6b1b438ffae22d134b3c077 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 21 Jan 2025 10:35:40 +0900 Subject: [PATCH 003/107] =?UTF-8?q?chore:=20Swagger=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20(#6)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Swagger 설정 * feat: health check api 구현 --- build.gradle | 3 ++ src/main/java/com/amcamp/domain/.gitkeep | 0 .../com/amcamp/domain/HealthController.java | 17 +++++++++++ .../amcamp/global/config/SwaggerConfig.java | 28 +++++++++++++++++++ src/main/java/com/amcamp/infra/.gitkeep | 0 5 files changed, 48 insertions(+) create mode 100644 src/main/java/com/amcamp/domain/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/HealthController.java create mode 100644 src/main/java/com/amcamp/global/config/SwaggerConfig.java create mode 100644 src/main/java/com/amcamp/infra/.gitkeep diff --git a/build.gradle b/build.gradle index f7240086..834cc206 100644 --- a/build.gradle +++ b/build.gradle @@ -32,6 +32,9 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + //Swagger + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' } tasks.named('test') { diff --git a/src/main/java/com/amcamp/domain/.gitkeep b/src/main/java/com/amcamp/domain/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/amcamp/domain/HealthController.java b/src/main/java/com/amcamp/domain/HealthController.java new file mode 100644 index 00000000..da25795c --- /dev/null +++ b/src/main/java/com/amcamp/domain/HealthController.java @@ -0,0 +1,17 @@ +package com.amcamp.domain; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "Health Check", description = "애플리케이션 상태 확인 API") +@RestController +public class HealthController { + + @Operation(summary = "애플리케이션 헬스 체크", description = "서버 상태를 확인하고 정상 동작 여부를 확인하는 API") + @GetMapping("/health_check") + public String healthCheck() { + return "good"; + } +} diff --git a/src/main/java/com/amcamp/global/config/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/SwaggerConfig.java new file mode 100644 index 00000000..ed2105f6 --- /dev/null +++ b/src/main/java/com/amcamp/global/config/SwaggerConfig.java @@ -0,0 +1,28 @@ +package com.amcamp.global.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public GroupedOpenApi publicApi() { + return GroupedOpenApi.builder() + .group("v1") + .pathsToMatch("/**") + .build(); + } + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .info(new Info() + .title("DevFit Server API") + .description("DevFit Server API 명세서입니다.") + .version("v0.0.1")); + } +} diff --git a/src/main/java/com/amcamp/infra/.gitkeep b/src/main/java/com/amcamp/infra/.gitkeep new file mode 100644 index 00000000..e69de29b From 7c596f4f2cab458f44a9eb1983acf64ce30fb1ba Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 21 Jan 2025 16:39:25 +0900 Subject: [PATCH 004/107] =?UTF-8?q?chore:=20actuator=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20(#10)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 3 +++ src/main/resources/application.yml | 14 ++++++++++++++ 2 files changed, 17 insertions(+) diff --git a/build.gradle b/build.gradle index 834cc206..d4b61359 100644 --- a/build.gradle +++ b/build.gradle @@ -35,6 +35,9 @@ dependencies { //Swagger implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + + // Actuator + implementation 'org.springframework.boot:spring-boot-starter-actuator' } tasks.named('test') { diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index e69de29b..f0cabf26 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -0,0 +1,14 @@ +management: + endpoints: + jmx: + exposure: + exclude: "*" + web: + exposure: + include: health + base-path: /devfit-actuator + access: + default: none + endpoint: + health: + access: unrestricted From 8d841e1c458ec913090c63ef5a37c67f56d5da49 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 22 Jan 2025 15:22:06 +0900 Subject: [PATCH 005/107] =?UTF-8?q?chore:=20Spring=20Security=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20(#13)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: security 의존성 추가 * refactor: swagger 패키지 이동 * feat: security 설정 --- build.gradle | 4 ++ .../config/security/WebSecurityConfig.java | 52 +++++++++++++++++++ .../config/{ => swagger}/SwaggerConfig.java | 2 +- 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java rename src/main/java/com/amcamp/global/config/{ => swagger}/SwaggerConfig.java (93%) diff --git a/build.gradle b/build.gradle index d4b61359..aafeab4b 100644 --- a/build.gradle +++ b/build.gradle @@ -38,6 +38,10 @@ dependencies { // Actuator implementation 'org.springframework.boot:spring-boot-starter-actuator' + + // Spring Security + implementation 'org.springframework.boot:spring-boot-starter-security' + implementation 'org.springframework.security:spring-security-test' } tasks.named('test') { diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java new file mode 100644 index 00000000..6361e866 --- /dev/null +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -0,0 +1,52 @@ +package com.amcamp.global.config.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; +import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; + +import static org.springframework.security.config.Customizer.withDefaults; + +@Configuration +@EnableWebSecurity +public class WebSecurityConfig { + + @Bean + public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + http + .csrf(AbstractHttpConfigurer::disable) + .cors(withDefaults()) + .httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .sessionManagement( + session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + + http.authorizeHttpRequests( + auth -> + auth.requestMatchers("/devfit-actuator/**").permitAll() + .requestMatchers("**").permitAll() + .anyRequest().authenticated()); + + return http.build(); + } + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + + configuration.addAllowedHeader("*"); + configuration.addAllowedMethod("*"); + configuration.setAllowCredentials(true); + configuration.setMaxAge(3600L); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } +} diff --git a/src/main/java/com/amcamp/global/config/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java similarity index 93% rename from src/main/java/com/amcamp/global/config/SwaggerConfig.java rename to src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index ed2105f6..f8d0d38d 100644 --- a/src/main/java/com/amcamp/global/config/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.amcamp.global.config; +package com.amcamp.global.config.swagger; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; From c044afb83247e1ea3f3509fd6f2778eea629e208 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 22 Jan 2025 17:36:26 +0900 Subject: [PATCH 006/107] =?UTF-8?q?chore:=20=EA=B3=B5=ED=86=B5=20=EC=9D=91?= =?UTF-8?q?=EB=8B=B5=20=EB=A1=9C=EC=A7=81=20=EC=84=A4=EC=A0=95=20(#14)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 공통 응답 로직 설정 (#11) * refactor: TestController 및 TestResponse 삭제 --- .../amcamp/global/common/CommonResponse.java | 38 +++++++++++++++++++ .../global/common/CommonResponseAdvice.java | 34 +++++++++++++++++ 2 files changed, 72 insertions(+) create mode 100644 src/main/java/com/amcamp/global/common/CommonResponse.java create mode 100644 src/main/java/com/amcamp/global/common/CommonResponseAdvice.java diff --git a/src/main/java/com/amcamp/global/common/CommonResponse.java b/src/main/java/com/amcamp/global/common/CommonResponse.java new file mode 100644 index 00000000..209e7ed1 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/CommonResponse.java @@ -0,0 +1,38 @@ +package com.amcamp.global.common; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@NoArgsConstructor +@AllArgsConstructor +@Builder +@Data +public class CommonResponse { + private boolean success; + private int status; + private T data; + private LocalDateTime timestamp; + + public static CommonResponse onSuccess(int status, T data) { + return CommonResponse.builder() + .success(true) + .status(status) + .data(data) + .timestamp(LocalDateTime.now()) + .build(); + } + public static CommonResponse onFailure(int status, T data) { + return CommonResponse.builder() + .success(false) + .status(status) + .data(data) + .timestamp(LocalDateTime.now()) + .build(); + } + + +} diff --git a/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java b/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java new file mode 100644 index 00000000..e9459f3c --- /dev/null +++ b/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java @@ -0,0 +1,34 @@ +package com.amcamp.global.common; + +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletResponse; +import org.springframework.core.MethodParameter; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.server.ServerHttpRequest; +import org.springframework.http.server.ServerHttpResponse; +import org.springframework.http.server.ServletServerHttpResponse; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; +@RestControllerAdvice(basePackages = "com.amcamp") +public class CommonResponseAdvice implements ResponseBodyAdvice { + @Override + public boolean supports(MethodParameter returnType, Class converterType) { + return true; //어떤 응답을 가로채서 반환할 것인지 -> 모든 응답 가로채기 + } + + @Override + public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) { + HttpServletResponse httpServletResponse = ((ServletServerHttpResponse) response).getServletResponse(); + int status = httpServletResponse.getStatus(); + HttpStatus resolve = HttpStatus.resolve(status); + + if (resolve == null || body instanceof String) { + return body; + } + if (resolve.is2xxSuccessful()) { + return CommonResponse.onSuccess(status, body); + } + return body; + } +} From fdb11a5be84c4d680ee687fc4f8c7251e6975bc9 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Mon, 27 Jan 2025 17:03:30 +0900 Subject: [PATCH 007/107] =?UTF-8?q?chore:=20=EA=B3=B5=ED=86=B5=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EB=A1=9C=EC=A7=81=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84(Exception=20Handler,=20ErrorCode,=20ErrorDetail)(#9)?= =?UTF-8?q?=20(#15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 공통 예외 처리 로직 구현(Exception Handler, ErrorCode, ErrorDetail)(#9) * fix: 공통 예외처리 로직&구조 수정 * fix: 공통 예외처리 로직&구조 수정 - AuthExceptionHandler -> GlobalHandlerManager 클래스명 변경 - Handler>Exception -> Manager>Handler로 구조 변경, Handler 메소드가 Exception 처리 - CustomException, CustomErrorCode 만 도메인 별로 생성, ErrorDetail 및 GlobalExceptionManager은 추후 필요에 따라 수정 - CommonResponseAdvice -> instance type 체크 로직 추가(Exception onFailure 응답 body 중복 방지) * fix: ExceptionHandler 메소드 내 ErrorDetail 생성 시 ResponseMessage 필드 문자열 메세지 입력 방식 수정 - 기존 하드코딩 되던 responseMessage -> ErrorCode enum 인스턴스로 message 추가 - AuthException 등 excetpion 클래스 내 Getter 추가 -> ErrorCode.name + ErrorCode.message 결합하여 메세지 형태로 반환 - 추후 배포 시 ErrorCode 프론트단에 직접 노출할 필요 없어지면 해당 로직 수정 * fix: build.gradle 의존성 추가 및 ErrorDetail 생성자 내 경고 해결 - validation 의존성 추가 - swagger 의존성 파일 버전 변경(2.2.0 -> 2.8.0) - ErrorDetail 생성자 내 불필요한 null 체크 로직 제거 --- build.gradle | 5 ++- .../global/common/CommonResponseAdvice.java | 5 +++ .../global/common/exception/ErrorDetail.java | 24 ++++++++++++ .../exception/GlobalExceptionManager.java | 19 +++++++++ .../common/exception/auth/AuthErrorCode.java | 39 +++++++++++++++++++ .../common/exception/auth/AuthException.java | 25 ++++++++++++ .../exception/AuthExceptionHandlerTest.java | 28 +++++++++++++ 7 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amcamp/global/common/exception/ErrorDetail.java create mode 100644 src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java create mode 100644 src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java create mode 100644 src/main/java/com/amcamp/global/common/exception/auth/AuthException.java create mode 100644 src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java diff --git a/build.gradle b/build.gradle index aafeab4b..79061cba 100644 --- a/build.gradle +++ b/build.gradle @@ -34,7 +34,7 @@ dependencies { testRuntimeOnly 'org.junit.platform:junit-platform-launcher' //Swagger - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.8.0' // Actuator implementation 'org.springframework.boot:spring-boot-starter-actuator' @@ -42,6 +42,9 @@ dependencies { // Spring Security implementation 'org.springframework.boot:spring-boot-starter-security' implementation 'org.springframework.security:spring-security-test' + + // Validation + implementation 'org.springframework.boot:spring-boot-starter-validation' } tasks.named('test') { diff --git a/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java b/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java index e9459f3c..76504818 100644 --- a/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java +++ b/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java @@ -23,6 +23,11 @@ public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType int status = httpServletResponse.getStatus(); HttpStatus resolve = HttpStatus.resolve(status); + //ExceptionHandler 에서 생성된 CommonResponseBody 넘어오면 별도로 wrapping 하지 않고 즉시 리턴 + if (body instanceof CommonResponse) { + return body; + } + if (resolve == null || body instanceof String) { return body; } diff --git a/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java b/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java new file mode 100644 index 00000000..3ad61d6c --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java @@ -0,0 +1,24 @@ +package com.amcamp.global.common.exception; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import org.springframework.validation.FieldError; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ErrorDetail { + private String field; + private String given; + private String reasonMessage; + + public ErrorDetail(FieldError fieldError) { + this.field = fieldError.getField(); + this.given = fieldError.getRejectedValue().toString(); + this.reasonMessage = fieldError.getDefaultMessage(); + } +} + diff --git a/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java b/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java new file mode 100644 index 00000000..45e4f5db --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java @@ -0,0 +1,19 @@ +package com.amcamp.global.common.exception; + +import com.amcamp.global.common.CommonResponse; +import com.amcamp.global.common.exception.auth.AuthException; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice(basePackages = "com.amcamp")//모듈 별로 나누어 적용 +public class GlobalExceptionManager { + @ExceptionHandler(AuthException.class) + public CommonResponse AuthExceptionHandler(AuthException e){ + ErrorDetail errorDetail = ErrorDetail.builder() + .field(e.getErrorField()) + .given(e.getErrorGiven()) + .reasonMessage(e.getErrorMsg()) + .build(); + return CommonResponse.onFailure(e.getAuthErrorCode().getHttpStatusValue(),errorDetail); + } +} diff --git a/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java b/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java new file mode 100644 index 00000000..463d86cf --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java @@ -0,0 +1,39 @@ +package com.amcamp.global.common.exception.auth; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum AuthErrorCode { + + //잘못된 요청 + WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), + + //Member 요청 관련 에러 + USER_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 USER 정보를 찾을 수 없습니다"), + USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), + NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), + + //Token 유효성 Error + INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다"), + TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "요청한 토큰을 찾을 수 없습니다"), + + //Role 권한 관련 오류 + NO_AUTHORITY(HttpStatus.BAD_REQUEST, "권한 정보를 찾을 수 없습니다"), + INVALID_AUTHORITY(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); + + + private final HttpStatus httpStatus; + private final String message; + + AuthErrorCode(HttpStatus httpStatus, String message){ + this.httpStatus = httpStatus; + this.message = message; + } + + public int getHttpStatusValue(){ + return httpStatus.value(); + } + + +} diff --git a/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java b/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java new file mode 100644 index 00000000..c8277556 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java @@ -0,0 +1,25 @@ +package com.amcamp.global.common.exception.auth; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public class AuthException extends RuntimeException{ + + private final AuthErrorCode authErrorCode; + private String errorField; + private String errorGiven; + + // field/given null 처리용 생성자 + public AuthException(AuthErrorCode authErrorCode){ + this.authErrorCode = authErrorCode; + } + + public String getErrorMsg(){ + return this.authErrorCode.name() + ": " + this.authErrorCode.getMessage(); + } + + + +} diff --git a/src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java b/src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java new file mode 100644 index 00000000..f5e9bfda --- /dev/null +++ b/src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java @@ -0,0 +1,28 @@ +package com.amcamp.exception; + + +import com.amcamp.global.common.exception.auth.AuthErrorCode; +import com.amcamp.global.common.exception.GlobalExceptionManager; +import com.amcamp.global.common.exception.auth.AuthException; +import org.junit.jupiter.api.Test; + +public class AuthExceptionHandlerTest { + + @Test() + public void globalExceptionManagerTest(){ + System.out.println( + new GlobalExceptionManager().AuthExceptionHandler( + new AuthException(AuthErrorCode.NO_AUTHORITY) + ) + ); + } + @Test() + public void globalExceptionManagerTestWithFieldAndGiven(){ + System.out.println( + new GlobalExceptionManager().AuthExceptionHandler( + new AuthException(AuthErrorCode.NO_AUTHORIZED_USER,"username","user1") + ) + ); + } + +} From 941d9a88fc00564a3d9302261a9c7077abbf9bf3 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 29 Jan 2025 23:14:23 +0900 Subject: [PATCH 008/107] =?UTF-8?q?chore:=20CI/CD=20=ED=8C=8C=EC=9D=B4?= =?UTF-8?q?=ED=94=84=EB=9D=BC=EC=9D=B8=20=EA=B5=AC=EC=B6=95=20(#20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: plain jar 파일 생성 비활성화 * chore: Dockerfile 생성 * chore: CI/CD workflow 추가 --- .github/workflows/develop_deploy.yml | 59 ++++++++++++++++++++++++++++ Dockerfile | 4 ++ build.gradle | 2 + 3 files changed, 65 insertions(+) create mode 100644 .github/workflows/develop_deploy.yml create mode 100644 Dockerfile diff --git a/.github/workflows/develop_deploy.yml b/.github/workflows/develop_deploy.yml new file mode 100644 index 00000000..4956c7ce --- /dev/null +++ b/.github/workflows/develop_deploy.yml @@ -0,0 +1,59 @@ +name: Develop Deploy + +on: + push: + branches: + - develop + pull_request: + branches: + - develop + +jobs: + build: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew clean build -x test + + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build and Push Docker image + uses: docker/build-push-action@v4.1.1 + with: + context: . + push: true + tags: ${{ secrets.DOCKER_USERNAME }}/spring-boot-server + + deploy: + runs-on: ubuntu-latest + needs: build + steps: + - name: Deploy to EC2 + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USER }} + key: ${{ secrets.EC2_SSH_KEY }} + script: | + docker pull ${{ secrets.DOCKER_USERNAME }}/spring-boot-server + docker stop $(docker ps -a -q) + docker run -d --name spring-boot-server -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/spring-boot-server + docker rm $(docker ps --filter 'status=exited' -a -q) + docker image prune -a -f diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..04331186 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,4 @@ +FROM openjdk:17 +ARG JAR_FILE=build/libs/*.jar +COPY ${JAR_FILE} app.jar +ENTRYPOINT ["java", "-jar", "/app.jar"] diff --git a/build.gradle b/build.gradle index 79061cba..9075ca27 100644 --- a/build.gradle +++ b/build.gradle @@ -62,3 +62,5 @@ checkstyle { configFile = file("config/checkstyle/naver-checkstyle-rules.xml") configProperties = ['suppressionFile': file("config/checkstyle/naver-checkstyle-suppressions.xml")] } + +jar.enabled = true From 6ee204ffdb6f8eca7fe0ff6852225084369f1c38 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Thu, 30 Jan 2025 23:04:22 +0900 Subject: [PATCH 009/107] =?UTF-8?q?chore:=20Docker=20Compose=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9=20(#22)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: docker compose 파일 작성 * chore: DockerHub 사용자명 및 이미지 이름을 환경 변수로 변경 * chore: DockerHub 로그인에 액세스 토큰을 사용하도록 변경 * chore: Docker 이미지 태그 설정을 메타데이터 액션을 사용하도록 변경 * chore: EC2에 docker-compose.yml 복사하는 액션 추가 * chore: ssh-action에 환경 변수 전달 설정 추가 * fix: secrets ec2 유저네임 수정 * chore: docker-compose 적용으로 인한 배포스크립트 수정 * fix: 메타데이터 액션 오타 수정 * chore: 메타데이터 액션에 id 추가 * chore: docker-compose.yml에 env_file 추가 * chore: 개발 서버 workflow 이름 수정 * chore: build와 deploy를 하나의 job으로 통합 * chore: 테스트 트리거 제거 --- .github/workflows/develop_build_deploy.yml | 75 ++++++++++++++++++++++ .github/workflows/develop_deploy.yml | 59 ----------------- docker-compose.yml | 10 +++ 3 files changed, 85 insertions(+), 59 deletions(-) create mode 100644 .github/workflows/develop_build_deploy.yml delete mode 100644 .github/workflows/develop_deploy.yml create mode 100644 docker-compose.yml diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml new file mode 100644 index 00000000..a9b19b46 --- /dev/null +++ b/.github/workflows/develop_build_deploy.yml @@ -0,0 +1,75 @@ +name: Build and Deploy to Develop + +on: + push: + branches: + - develop + +env: + DOCKERHUB_USERNAME: ht3064 + DOCKERHUB_IMAGE_NAME: devfit-server + +jobs: + build-deploy: + runs-on: ubuntu-latest + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build with Gradle + run: ./gradlew clean build -x test + + - name: Login to DockerHub + uses: docker/login-action@v2 + with: + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: Extract metadata for Docker + id: metadata + uses: docker/metadata-action@v4 + with: + images: ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }} + tags: | + type=sha,prefix= + + - name: Build and Push Docker image + uses: docker/build-push-action@v4.1.1 + with: + context: . + push: true + tags: ${{ steps.metadata.outputs.tags }} + + - name: Copy docker-compose.yml to EC2 + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + source: docker-compose.yml + target: /home/ubuntu/ + + - name: Deploy to EC2 + uses: appleboy/ssh-action@master + env: + IMAGE_FULL_URL: ${{ steps.metadata.outputs.tags }} + DOCKERHUB_IMAGE_NAME: ${{ env.DOCKERHUB_IMAGE_NAME }} + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + envs: IMAGE_FULL_URL, DOCKERHUB_IMAGE_NAME + script: | + echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u "${{ env.DOCKERHUB_USERNAME }}" --password-stdin + docker compose up -d + docker image prune -a -f diff --git a/.github/workflows/develop_deploy.yml b/.github/workflows/develop_deploy.yml deleted file mode 100644 index 4956c7ce..00000000 --- a/.github/workflows/develop_deploy.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Develop Deploy - -on: - push: - branches: - - develop - pull_request: - branches: - - develop - -jobs: - build: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Set up JDK 17 - uses: actions/setup-java@v4 - with: - java-version: '17' - distribution: 'temurin' - - - name: Grant execute permission for gradlew - run: chmod +x ./gradlew - - - name: Build with Gradle - run: ./gradlew clean build -x test - - - name: Login to DockerHub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build and Push Docker image - uses: docker/build-push-action@v4.1.1 - with: - context: . - push: true - tags: ${{ secrets.DOCKER_USERNAME }}/spring-boot-server - - deploy: - runs-on: ubuntu-latest - needs: build - steps: - - name: Deploy to EC2 - uses: appleboy/ssh-action@master - with: - host: ${{ secrets.EC2_HOST }} - username: ${{ secrets.EC2_USER }} - key: ${{ secrets.EC2_SSH_KEY }} - script: | - docker pull ${{ secrets.DOCKER_USERNAME }}/spring-boot-server - docker stop $(docker ps -a -q) - docker run -d --name spring-boot-server -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/spring-boot-server - docker rm $(docker ps --filter 'status=exited' -a -q) - docker image prune -a -f diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..dfe5d711 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,10 @@ +version: "3.8" + +services: + backend: + image: ${IMAGE_FULL_URL} + container_name: ${DOCKERHUB_IMAGE_NAME} + restart: always + network_mode: host + env_file: + - .env From afc3f1a2d8ad2c09d00a02541366286d773c2b7f Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 31 Jan 2025 11:24:08 +0900 Subject: [PATCH 010/107] =?UTF-8?q?chore:=20Redis=20=EC=84=A4=EC=A0=95=20(?= =?UTF-8?q?#23)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: .gitkeep 삭제 * chore: redis 의존성 추가 * chore: application.yml에 redis 설정 추가 * chore: env 파일 gitignore 추가 * chore: redis properties 추가 * chore: redis config 추가 * test: application-test.yml에 redis 설정 추가 * test: 테스트 환경에서 test 프로파일 활성화를 위한 @ActiveProfiles 추가 * chore: test를 위한 docker-compose-test.yml 생성 * chore: 빌드 시 docker-compose-test.yml을 사용하도록 설정 * chore: docker-compose.yml에 redis 추가 * chore: 테스트 트리거 활성화 * chore: redis 설정에 default 값 추가 --- .github/workflows/develop_build_deploy.yml | 6 ++++ .gitignore | 3 ++ build.gradle | 3 ++ docker-compose-test.yml | 7 ++++ docker-compose.yml | 6 ++++ src/main/java/com/amcamp/infra/.gitkeep | 0 .../config/properties/PropertiesConfig.java | 11 ++++++ .../infra/config/redis/RedisConfig.java | 35 +++++++++++++++++++ .../infra/config/redis/RedisProperties.java | 6 ++++ src/main/resources/application.yml | 7 ++++ .../com/amcamp/DevFitApplicationTests.java | 2 ++ src/test/resources/application-test.yml | 6 ++++ 12 files changed, 92 insertions(+) create mode 100644 docker-compose-test.yml delete mode 100644 src/main/java/com/amcamp/infra/.gitkeep create mode 100644 src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java create mode 100644 src/main/java/com/amcamp/infra/config/redis/RedisConfig.java create mode 100644 src/main/java/com/amcamp/infra/config/redis/RedisProperties.java create mode 100644 src/test/resources/application-test.yml diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index a9b19b46..7f791445 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -4,6 +4,9 @@ on: push: branches: - develop + pull_request: + branches: + - develop env: DOCKERHUB_USERNAME: ht3064 @@ -23,6 +26,9 @@ jobs: java-version: '17' distribution: 'temurin' + - name: Start Redis container for test + run: docker compose -f ./docker-compose-test.yml up -d + - name: Grant execute permission for gradlew run: chmod +x ./gradlew diff --git a/.gitignore b/.gitignore index c2065bc2..e30b31bd 100644 --- a/.gitignore +++ b/.gitignore @@ -35,3 +35,6 @@ out/ ### VS Code ### .vscode/ + +### Custom ### +.env diff --git a/build.gradle b/build.gradle index 9075ca27..8bc1a7b5 100644 --- a/build.gradle +++ b/build.gradle @@ -45,6 +45,9 @@ dependencies { // Validation implementation 'org.springframework.boot:spring-boot-starter-validation' + + // Redis + implementation 'org.springframework.boot:spring-boot-starter-data-redis' } tasks.named('test') { diff --git a/docker-compose-test.yml b/docker-compose-test.yml new file mode 100644 index 00000000..668cecb7 --- /dev/null +++ b/docker-compose-test.yml @@ -0,0 +1,7 @@ +version: "3.8" + +services: + redis: + image: "redis:alpine" + ports: + - "6379:6379" diff --git a/docker-compose.yml b/docker-compose.yml index dfe5d711..5c5ea96e 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,3 +8,9 @@ services: network_mode: host env_file: - .env + redis: + image: "redis:alpine" + container_name: redis + ports: + - "6379:6379" + network_mode: host diff --git a/src/main/java/com/amcamp/infra/.gitkeep b/src/main/java/com/amcamp/infra/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java new file mode 100644 index 00000000..7b00df11 --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java @@ -0,0 +1,11 @@ +package com.amcamp.infra.config.properties; + +import com.amcamp.infra.config.redis.RedisProperties; +import org.springframework.boot.context.properties.EnableConfigurationProperties; +import org.springframework.context.annotation.Configuration; + +@EnableConfigurationProperties({ + RedisProperties.class +}) +@Configuration +public class PropertiesConfig {} diff --git a/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java b/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java new file mode 100644 index 00000000..92846dff --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java @@ -0,0 +1,35 @@ +package com.amcamp.infra.config.redis; + +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.data.redis.connection.RedisConnectionFactory; +import org.springframework.data.redis.connection.RedisStandaloneConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration; +import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; + +import java.time.Duration; + +@Configuration +@RequiredArgsConstructor +public class RedisConfig { + + private final RedisProperties redisProperties; + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration redisStandaloneConfig = + new RedisStandaloneConfiguration(redisProperties.host(), redisProperties.port()); + if (!redisProperties.password().isBlank()) { + redisStandaloneConfig.setPassword(redisProperties.password()); + } + + LettuceClientConfiguration lettuceClientConfig = + LettuceClientConfiguration.builder() + .commandTimeout(Duration.ofSeconds(1)) + .shutdownTimeout(Duration.ZERO) + .build(); + + return new LettuceConnectionFactory(redisStandaloneConfig, lettuceClientConfig); + } +} diff --git a/src/main/java/com/amcamp/infra/config/redis/RedisProperties.java b/src/main/java/com/amcamp/infra/config/redis/RedisProperties.java new file mode 100644 index 00000000..1feea301 --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/redis/RedisProperties.java @@ -0,0 +1,6 @@ +package com.amcamp.infra.config.redis; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("spring.data.redis") +public record RedisProperties(String host, int port, String password) {} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f0cabf26..2118df27 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,3 +1,10 @@ +spring: + data: + redis: + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:} + management: endpoints: jmx: diff --git a/src/test/java/com/amcamp/DevFitApplicationTests.java b/src/test/java/com/amcamp/DevFitApplicationTests.java index ce1d4231..e49c17b2 100644 --- a/src/test/java/com/amcamp/DevFitApplicationTests.java +++ b/src/test/java/com/amcamp/DevFitApplicationTests.java @@ -2,8 +2,10 @@ import org.junit.jupiter.api.Test; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; @SpringBootTest +@ActiveProfiles("test") class DevFitApplicationTests { @Test diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml new file mode 100644 index 00000000..e862bf70 --- /dev/null +++ b/src/test/resources/application-test.yml @@ -0,0 +1,6 @@ +spring: + data: + redis: + host: localhost + port: 6379 + password: From 73c0d7b782365eb81046666f85ea57b996f8c2bb Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 31 Jan 2025 16:58:55 +0900 Subject: [PATCH 011/107] =?UTF-8?q?chore:=20application.yml=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=EB=B6=84=EB=A6=AC=20=EB=B0=8F=20DB=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20(#25)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: application.yml 환경 별로 분리 * chore: 로컬 환경 h2 db 설정 * chore: mysql 의존성 추가 * chore: 개발 환경 rds 설정 * test: 테스트 환경 h2 db 설정 * chore: db 연결 설정에 serverTimezone 및 characterEncoding 추가 --- build.gradle | 3 +++ src/main/resources/application-actuator.yml | 18 +++++++++++++ src/main/resources/application-datasource.yml | 16 +++++++++++ src/main/resources/application-dev.yml | 7 +++++ src/main/resources/application-local.yml | 19 +++++++++++++ src/main/resources/application-redis.yml | 9 +++++++ src/main/resources/application.yml | 27 +++++-------------- src/test/resources/application-test.yml | 5 ++++ 8 files changed, 84 insertions(+), 20 deletions(-) create mode 100644 src/main/resources/application-actuator.yml create mode 100644 src/main/resources/application-datasource.yml create mode 100644 src/main/resources/application-dev.yml create mode 100644 src/main/resources/application-local.yml create mode 100644 src/main/resources/application-redis.yml diff --git a/build.gradle b/build.gradle index 8bc1a7b5..2d2dc94d 100644 --- a/build.gradle +++ b/build.gradle @@ -48,6 +48,9 @@ dependencies { // Redis implementation 'org.springframework.boot:spring-boot-starter-data-redis' + + // MySQL + implementation 'mysql:mysql-connector-java:8.0.33' } tasks.named('test') { diff --git a/src/main/resources/application-actuator.yml b/src/main/resources/application-actuator.yml new file mode 100644 index 00000000..ed1b57d5 --- /dev/null +++ b/src/main/resources/application-actuator.yml @@ -0,0 +1,18 @@ +spring: + config: + activate: + on-profile: "actuator" +management: + endpoints: + jmx: + exposure: + exclude: "*" + web: + exposure: + include: health + base-path: /devfit-actuator + access: + default: none + endpoint: + health: + access: unrestricted diff --git a/src/main/resources/application-datasource.yml b/src/main/resources/application-datasource.yml new file mode 100644 index 00000000..0470f2b0 --- /dev/null +++ b/src/main/resources/application-datasource.yml @@ -0,0 +1,16 @@ +spring: + config: + activate: + on-profile: "datasource" + datasource: + driver-class-name: com.mysql.cj.jdbc.Driver + url: jdbc:mysql://${MYSQL_HOST}:${MYSQL_PORT}/${DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 + username: ${MYSQL_USERNAME} + password: ${MYSQL_PASSWORD} + jpa: + properties: + hibernate: + default_batch_fetch_size: 100 +logging: + level: + org.hibernate.SQL: debug diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml new file mode 100644 index 00000000..07476c55 --- /dev/null +++ b/src/main/resources/application-dev.yml @@ -0,0 +1,7 @@ +spring: + config: + activate: + on-profile: "dev" + jpa: + hibernate: + ddl-auto: create diff --git a/src/main/resources/application-local.yml b/src/main/resources/application-local.yml new file mode 100644 index 00000000..c8b51b6b --- /dev/null +++ b/src/main/resources/application-local.yml @@ -0,0 +1,19 @@ +spring: + config: + activate: + on-profile: "local" + datasource: + driver-class-name: org.h2.Driver + url: jdbc:h2:tcp://localhost/~/devfit + username: sa + password: + jpa: + hibernate: + ddl-auto: create + properties: + hibernate: + format_sql: true + open-in-view: false +logging: + level: + org.hibernate.SQL: debug diff --git a/src/main/resources/application-redis.yml b/src/main/resources/application-redis.yml new file mode 100644 index 00000000..0f5ac38c --- /dev/null +++ b/src/main/resources/application-redis.yml @@ -0,0 +1,9 @@ +spring: + config: + activate: + on-profile: "redis" + data: + redis: + host: ${REDIS_HOST:localhost} + port: ${REDIS_PORT:6379} + password: ${REDIS_PASSWORD:} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 2118df27..62e93b31 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,21 +1,8 @@ spring: - data: - redis: - host: ${REDIS_HOST:localhost} - port: ${REDIS_PORT:6379} - password: ${REDIS_PASSWORD:} - -management: - endpoints: - jmx: - exposure: - exclude: "*" - web: - exposure: - include: health - base-path: /devfit-actuator - access: - default: none - endpoint: - health: - access: unrestricted + profiles: + group: + test: "test" + local: "local" + dev: "dev, datasource, actuator" + include: + - redis diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index e862bf70..05e3c539 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -1,4 +1,9 @@ spring: + config: + activate: + on-profile: "test" + datasource: + url: jdbc:h2:mem:test data: redis: host: localhost From 7198ca9f63f0e3eba262aac0171eab8ba1ad146d Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 3 Feb 2025 09:19:41 +0900 Subject: [PATCH 012/107] =?UTF-8?q?feat:=20=EC=86=8C=EC=85=9C=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EA=B5=AC=ED=98=84=20(#26)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: .gitkeep 삭제 * refactor: 사용하지 않는 헬스 체크 API 제거 * chore: security.yml 추가 * chore: google, kakao properties 추가 * chore: openfeign 의존성 추가 * chore: feign config 설정 * feat: 구글, 카카오 인증 서버로부터 ID 토큰 발급받는 기능 구현 * chore: jwt 의존성 추가 * chore: security.yml에 jwt 설정 추가 * chore: jwt properties 추가 * feat: 회원 도메인 구현 * feat: jwt 토큰 생성 유틸리티 구현 * feat: 리프레시 토큰 도메인 구현 * chore: jwt 토큰 검증 의존성 추가 * feat: 구글, 카카오 인증 서버로부터 받은 ID 토큰 검증 로직 구현 * chore: feign post 요청 시 body가 없을 경우 기본 값 설정 * feat: 소셜 로그인 기능 구현 * fix: 빌드 시 테스트 실패 문제 수정 * feat: 쿠키 유틸리티 구현 * refactor: 리프레시 토큰을 쿠키로 관리하도록 개선 * feat: 엑세스, 리프레시 토큰 파싱 로직 구현 * feat: 엑세스 토큰 검증 로직 및 jwt 필터 추가 * feat: 리프레시 토큰 검증 및 토큰 재발급 로직 추가 * fix: 임시로 모든 url 요청 허용 * chore: 테스트 트리거 제거 --- .github/workflows/develop_build_deploy.yml | 3 - .github/workflows/develop_pull_request.yml | 4 + build.gradle | 14 ++ .../com/amcamp/domain/HealthController.java | 17 --- .../domain/auth/api/AuthController.java | 36 +++++ .../domain/auth/application/AuthService.java | 77 +++++++++++ .../auth/application/GoogleService.java | 26 ++++ .../auth/application/IdTokenVerifier.java | 81 +++++++++++ .../auth/application/JwtTokenService.java | 106 +++++++++++++++ .../domain/auth/application/KakaoService.java | 26 ++++ .../auth/dao/RefreshTokenRepository.java | 7 + .../domain/auth/domain/OauthProvider.java | 27 ++++ .../domain/auth/domain/RefreshToken.java | 27 ++++ .../domain/auth/dto/AccessTokenDto.java | 9 ++ .../domain/auth/dto/RefreshTokenDto.java | 7 + .../auth/dto/request/AuthCodeRequest.java | 10 ++ .../auth/dto/response/IdTokenResponse.java | 3 + .../dto/response/SocialLoginResponse.java | 11 ++ .../amcamp/domain/{ => member/api}/.gitkeep | 0 .../amcamp/domain/member/application/.gitkeep | 0 .../domain/member/dao/MemberRepository.java | 11 ++ .../amcamp/domain/member/domain/Member.java | 51 +++++++ .../domain/member/domain/MemberRole.java | 15 ++ .../domain/member/domain/MemberStatus.java | 16 +++ .../domain/member/domain/OauthInfo.java | 29 ++++ .../com/amcamp/domain/member/dto/.gitkeep | 0 .../common/constants/SecurityConstants.java | 20 +++ .../common/exception/auth/AuthErrorCode.java | 22 +-- .../common/exception/auth/AuthException.java | 3 - .../global/config/feign/FeignConfig.java | 22 +++ .../config/security/WebSecurityConfig.java | 21 ++- .../security/JwtAuthenticationFilter.java | 108 +++++++++++++++ .../com/amcamp/global/util/CookieUtil.java | 27 ++++ .../java/com/amcamp/global/util/JwtUtil.java | 128 ++++++++++++++++++ .../infra/config/feign/GoogleOauthClient.java | 24 ++++ .../infra/config/feign/KakaoOauthClient.java | 24 ++++ .../infra/config/jwt/JwtProperties.java | 18 +++ .../infra/config/oauth/GoogleProperties.java | 11 ++ .../infra/config/oauth/KakaoProperties.java | 11 ++ .../config/properties/PropertiesConfig.java | 8 +- src/main/resources/application-security.yml | 18 +++ src/main/resources/application.yml | 1 + .../exception/AuthExceptionHandlerTest.java | 28 ---- src/test/resources/application-test.yml | 8 +- 44 files changed, 1044 insertions(+), 71 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/HealthController.java create mode 100644 src/main/java/com/amcamp/domain/auth/api/AuthController.java create mode 100644 src/main/java/com/amcamp/domain/auth/application/AuthService.java create mode 100644 src/main/java/com/amcamp/domain/auth/application/GoogleService.java create mode 100644 src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java create mode 100644 src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java create mode 100644 src/main/java/com/amcamp/domain/auth/application/KakaoService.java create mode 100644 src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java create mode 100644 src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java create mode 100644 src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java create mode 100644 src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java create mode 100644 src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java create mode 100644 src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java create mode 100644 src/main/java/com/amcamp/domain/auth/dto/response/IdTokenResponse.java create mode 100644 src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java rename src/main/java/com/amcamp/domain/{ => member/api}/.gitkeep (100%) create mode 100644 src/main/java/com/amcamp/domain/member/application/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/member/dao/MemberRepository.java create mode 100644 src/main/java/com/amcamp/domain/member/domain/Member.java create mode 100644 src/main/java/com/amcamp/domain/member/domain/MemberRole.java create mode 100644 src/main/java/com/amcamp/domain/member/domain/MemberStatus.java create mode 100644 src/main/java/com/amcamp/domain/member/domain/OauthInfo.java create mode 100644 src/main/java/com/amcamp/domain/member/dto/.gitkeep create mode 100644 src/main/java/com/amcamp/global/common/constants/SecurityConstants.java create mode 100644 src/main/java/com/amcamp/global/config/feign/FeignConfig.java create mode 100644 src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java create mode 100644 src/main/java/com/amcamp/global/util/CookieUtil.java create mode 100644 src/main/java/com/amcamp/global/util/JwtUtil.java create mode 100644 src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java create mode 100644 src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java create mode 100644 src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java create mode 100644 src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java create mode 100644 src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java create mode 100644 src/main/resources/application-security.yml delete mode 100644 src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index 7f791445..bc9cbdfd 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -4,9 +4,6 @@ on: push: branches: - develop - pull_request: - branches: - - develop env: DOCKERHUB_USERNAME: ht3064 diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index 7710e724..e774734f 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -1,14 +1,17 @@ name: Check Style And Test + on: pull_request: branches: - develop + jobs: test: runs-on: ubuntu-latest strategy: matrix: java-version: [ 17 ] + steps: - name: Checkout code uses: actions/checkout@v2 @@ -32,6 +35,7 @@ jobs: - name: Code Formatting Check With CheckStyle run: | ./gradlew checkstyleMain checkstyleTest + - name: Test run: | ./gradlew test diff --git a/build.gradle b/build.gradle index 2d2dc94d..9207a185 100644 --- a/build.gradle +++ b/build.gradle @@ -51,6 +51,20 @@ dependencies { // MySQL implementation 'mysql:mysql-connector-java:8.0.33' + + // Spring Cloud + implementation platform("org.springframework.cloud:spring-cloud-dependencies:2024.0.0") + + // Spring Cloud Open Feign + implementation 'org.springframework.cloud:spring-cloud-starter-openfeign' + + // JWT + implementation 'io.jsonwebtoken:jjwt-api:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-impl:0.11.5' + runtimeOnly 'io.jsonwebtoken:jjwt-jackson:0.11.5' + + // Oauth2 Jose + implementation 'org.springframework.security:spring-security-oauth2-jose' } tasks.named('test') { diff --git a/src/main/java/com/amcamp/domain/HealthController.java b/src/main/java/com/amcamp/domain/HealthController.java deleted file mode 100644 index da25795c..00000000 --- a/src/main/java/com/amcamp/domain/HealthController.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.amcamp.domain; - -import io.swagger.v3.oas.annotations.Operation; -import io.swagger.v3.oas.annotations.tags.Tag; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RestController; - -@Tag(name = "Health Check", description = "애플리케이션 상태 확인 API") -@RestController -public class HealthController { - - @Operation(summary = "애플리케이션 헬스 체크", description = "서버 상태를 확인하고 정상 동작 여부를 확인하는 API") - @GetMapping("/health_check") - public String healthCheck() { - return "good"; - } -} diff --git a/src/main/java/com/amcamp/domain/auth/api/AuthController.java b/src/main/java/com/amcamp/domain/auth/api/AuthController.java new file mode 100644 index 00000000..0696ff4a --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/api/AuthController.java @@ -0,0 +1,36 @@ +package com.amcamp.domain.auth.api; + +import com.amcamp.domain.auth.application.AuthService; +import com.amcamp.domain.auth.domain.OauthProvider; +import com.amcamp.domain.auth.dto.request.AuthCodeRequest; +import com.amcamp.domain.auth.dto.response.SocialLoginResponse; +import com.amcamp.global.util.CookieUtil; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "인증 API", description = "인증 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/auth") +public class AuthController { + + private final AuthService authService; + private final CookieUtil cookieUtil; + + @Operation(summary = "회원가입 및 로그인", description = "회원가입 및 로그인을 진행합니다.") + @PostMapping("/social-login") + public ResponseEntity memberSocialLogin( + @RequestParam(name = "oauthProvider") OauthProvider provider, + @RequestBody AuthCodeRequest request) { + SocialLoginResponse response = authService.socialLoginMember(request, provider); + + String refreshToken = response.refreshToken(); + HttpHeaders headers = cookieUtil.generateRefreshTokenCookie(refreshToken); + + return ResponseEntity.ok().headers(headers).body(response); + } +} diff --git a/src/main/java/com/amcamp/domain/auth/application/AuthService.java b/src/main/java/com/amcamp/domain/auth/application/AuthService.java new file mode 100644 index 00000000..5cd01d17 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/application/AuthService.java @@ -0,0 +1,77 @@ +package com.amcamp.domain.auth.application; + +import com.amcamp.domain.auth.domain.OauthProvider; +import com.amcamp.domain.auth.dto.request.AuthCodeRequest; +import com.amcamp.domain.auth.dto.response.SocialLoginResponse; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Optional; + +@Transactional +@Service +@RequiredArgsConstructor +@Slf4j +public class AuthService { + + private final KakaoService kakaoService; + private final GoogleService googleService; + private final JwtTokenService jwtTokenService; + private final IdTokenVerifier idTokenVerifier; + private final MemberRepository memberRepository; + + public SocialLoginResponse socialLoginMember(AuthCodeRequest request, OauthProvider provider) { + String idToken = getIdToken(request.code(), provider); + + OidcUser oidcUser = idTokenVerifier.getOidcUser(idToken, provider); + + Optional optionalMember = findByOidcUser(oidcUser); + Member member = optionalMember.orElseGet(() -> saveMember(oidcUser, provider)); + + return getLoginResponse(member); + } + + private SocialLoginResponse getLoginResponse(Member member) { + String accessToken = jwtTokenService.createAccessToken(member.getId(), member.getRole()); + String refreshToken = jwtTokenService.createRefreshToken(member.getId()); + return SocialLoginResponse.of(accessToken, refreshToken); + } + + private String getIdToken(String code, OauthProvider provider) { + return switch (provider) { + case GOOGLE -> googleService.getIdToken(code); + case KAKAO -> kakaoService.getIdToken(code); + }; + } + + private Optional findByOidcUser(OidcUser oidcUser) { + OauthInfo oauthInfo = extractOauthInfo(oidcUser); + return memberRepository.findByOauthInfo(oauthInfo); + } + + private Member saveMember(OidcUser oidcUser, OauthProvider provider) { + OauthInfo oauthInfo = extractOauthInfo(oidcUser); + String nickname = getDisplayName(oidcUser, provider); + + Member member = Member.createMember(nickname, oidcUser.getPicture(), oauthInfo); + return memberRepository.save(member); + } + + private OauthInfo extractOauthInfo(OidcUser oidcUser) { + return OauthInfo.createOauthInfo( + oidcUser.getSubject(), oidcUser.getIssuer().toString()); + } + + private String getDisplayName(OidcUser oidcUser, OauthProvider provider) { + return switch (provider) { + case GOOGLE -> (String) oidcUser.getClaims().get("name"); + case KAKAO -> (String) oidcUser.getClaims().get("nickname"); + }; + } +} diff --git a/src/main/java/com/amcamp/domain/auth/application/GoogleService.java b/src/main/java/com/amcamp/domain/auth/application/GoogleService.java new file mode 100644 index 00000000..250d24f3 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/application/GoogleService.java @@ -0,0 +1,26 @@ +package com.amcamp.domain.auth.application; + +import com.amcamp.domain.auth.dto.response.IdTokenResponse; +import com.amcamp.infra.config.feign.GoogleOauthClient; +import com.amcamp.infra.config.oauth.GoogleProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class GoogleService { + + private final GoogleOauthClient googleOauthClient; + private final GoogleProperties googleProperties; + + public String getIdToken(String code) { + IdTokenResponse response = googleOauthClient.getIdToken( + googleProperties.grantType(), + googleProperties.clientId(), + googleProperties.redirectUri(), + code, + googleProperties.clientSecret()); + + return response.id_token(); + } +} diff --git a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java new file mode 100644 index 00000000..d9b39431 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java @@ -0,0 +1,81 @@ +package com.amcamp.domain.auth.application; + +import com.amcamp.domain.auth.domain.OauthProvider; +import com.amcamp.global.common.exception.auth.AuthErrorCode; +import com.amcamp.global.common.exception.auth.AuthException; +import com.amcamp.infra.config.oauth.GoogleProperties; +import com.amcamp.infra.config.oauth.KakaoProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.security.oauth2.core.oidc.OidcIdToken; +import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser; +import org.springframework.security.oauth2.core.oidc.user.OidcUser; +import org.springframework.security.oauth2.jwt.Jwt; +import org.springframework.security.oauth2.jwt.JwtDecoder; +import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; +import org.springframework.stereotype.Component; + +import java.time.Instant; +import java.util.Map; + +@Component +@RequiredArgsConstructor +public class IdTokenVerifier { + + private final KakaoProperties kakaoProperties; + private final GoogleProperties googleProperties; + + private final Map decoders = + Map.of( + OauthProvider.GOOGLE, buildDecoder(OauthProvider.GOOGLE.getJwkSetUrl()), + OauthProvider.KAKAO, buildDecoder(OauthProvider.KAKAO.getJwkSetUrl())); + + private JwtDecoder buildDecoder(String jwkSetUrl) { + return NimbusJwtDecoder + .withJwkSetUri(jwkSetUrl) + .build(); + } + + public OidcUser getOidcUser(String idToken, OauthProvider provider) { + Jwt jwt = getJwt(idToken, provider); + OidcIdToken oidcIdToken = getOidcIdToken(jwt); + + validateAudience(oidcIdToken, provider.getClientId(googleProperties, kakaoProperties)); + validateIssuer(oidcIdToken, provider.getIssuer()); + validateExpiresAt(oidcIdToken); + + return new DefaultOidcUser(null, oidcIdToken); + } + + private Jwt getJwt(String idToken, OauthProvider provider) { + return decoders.get(provider).decode(idToken); + } + + private OidcIdToken getOidcIdToken(Jwt jwt) { + return new OidcIdToken( + jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), jwt.getClaims()); + } + + private void validateAudience(OidcIdToken oidcIdToken, String clientId) { + String idTokenAudience = oidcIdToken.getAudience().get(0); + + if (idTokenAudience == null || !idTokenAudience.equals(clientId)) { + throw new AuthException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + } + } + + private void validateIssuer(OidcIdToken oidcIdToken, String issuer) { + String idTokenIssuer = oidcIdToken.getIssuer().toString(); + + if (idTokenIssuer == null || !idTokenIssuer.equals(issuer)) { + throw new AuthException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + } + } + + private void validateExpiresAt(OidcIdToken oidcIdToken) { + Instant expiresAt = oidcIdToken.getExpiresAt(); + + if (expiresAt == null || expiresAt.isBefore(Instant.now())) { + throw new AuthException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + } + } +} diff --git a/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java b/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java new file mode 100644 index 00000000..e6200cb3 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java @@ -0,0 +1,106 @@ +package com.amcamp.domain.auth.application; + +import com.amcamp.domain.auth.dao.RefreshTokenRepository; +import com.amcamp.domain.auth.domain.RefreshToken; +import com.amcamp.domain.auth.dto.AccessTokenDto; +import com.amcamp.domain.auth.dto.RefreshTokenDto; +import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.global.util.JwtUtil; +import io.jsonwebtoken.ExpiredJwtException; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.Optional; + +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_ROLE_NAME; + +@Service +@RequiredArgsConstructor +public class JwtTokenService { + + private final JwtUtil jwtUtil; + private final RefreshTokenRepository refreshTokenRepository; + + public AccessTokenDto createAccessTokenDto(Long memberId, MemberRole memberRole) { + return jwtUtil.generateAccessTokenDto(memberId, memberRole); + } + + public String createAccessToken(Long memberId, MemberRole memberRole) { + return jwtUtil.generateAccessToken(memberId, memberRole); + } + + public RefreshTokenDto createRefreshTokenDto(Long memberId) { + RefreshTokenDto refreshTokenDto = jwtUtil.generateRefreshTokenDto(memberId); + RefreshToken refreshToken = + RefreshToken.builder() + .memberId(memberId) + .token(refreshTokenDto.refreshTokenValue()) + .ttl(refreshTokenDto.ttl()) + .build(); + refreshTokenRepository.save(refreshToken); + + return refreshTokenDto; + } + + public String createRefreshToken(Long memberId) { + String token = jwtUtil.generateRefreshToken(memberId); + RefreshToken refreshToken = + RefreshToken.builder() + .memberId(memberId) + .token(token) + .ttl(jwtUtil.getRefreshTokenExpirationTime()) + .build(); + refreshTokenRepository.save(refreshToken); + + return token; + } + + public AccessTokenDto retrieveAccessToken(String accessTokenValue) { + try { + return jwtUtil.parseAccessToken(accessTokenValue); + } catch (Exception e) { + return null; + } + } + + public RefreshTokenDto retrieveRefreshToken(String refreshTokenValue) { + RefreshTokenDto refreshTokenDto = parseRefreshToken(refreshTokenValue); + + if (refreshTokenDto == null) { + return null; + } + + Optional refreshToken = getRefreshToken(refreshTokenDto.memberId()); + + if (refreshToken.isPresent() && + refreshTokenDto.refreshTokenValue().equals(refreshToken.get().getToken())) { + return refreshTokenDto; + } + + return null; + } + + public AccessTokenDto reissueAccessTokenIfExpired(String accessTokenValue) { + try { + jwtUtil.parseAccessToken(accessTokenValue); + return null; + } catch (ExpiredJwtException e) { + Long memberId = Long.parseLong(e.getClaims().getSubject()); + MemberRole memberRole = MemberRole.valueOf(e.getClaims().get(TOKEN_ROLE_NAME, String.class)); + + return createAccessTokenDto(memberId, memberRole); + } + } + + private RefreshTokenDto parseRefreshToken(String refreshTokenValue) { + try { + return jwtUtil.parseRefreshToken(refreshTokenValue); + } catch (Exception e) { + return null; + } + } + + private Optional getRefreshToken(Long memberId) { + return refreshTokenRepository.findById(memberId); + } +} diff --git a/src/main/java/com/amcamp/domain/auth/application/KakaoService.java b/src/main/java/com/amcamp/domain/auth/application/KakaoService.java new file mode 100644 index 00000000..8e11a1d1 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/application/KakaoService.java @@ -0,0 +1,26 @@ +package com.amcamp.domain.auth.application; + +import com.amcamp.domain.auth.dto.response.IdTokenResponse; +import com.amcamp.infra.config.feign.KakaoOauthClient; +import com.amcamp.infra.config.oauth.KakaoProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class KakaoService { + + private final KakaoOauthClient kakaoOauthClient; + private final KakaoProperties kakaoProperties; + + public String getIdToken(String code) { + IdTokenResponse response = kakaoOauthClient.getIdToken( + kakaoProperties.grantType(), + kakaoProperties.clientId(), + kakaoProperties.redirectUri(), + code, + kakaoProperties.clientSecret()); + + return response.id_token(); + } +} diff --git a/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java b/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java new file mode 100644 index 00000000..925e8396 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.auth.dao; + +import com.amcamp.domain.auth.domain.RefreshToken; +import org.springframework.data.repository.CrudRepository; + +public interface RefreshTokenRepository extends CrudRepository { +} diff --git a/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java b/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java new file mode 100644 index 00000000..5abe01b8 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java @@ -0,0 +1,27 @@ +package com.amcamp.domain.auth.domain; + +import com.amcamp.infra.config.oauth.GoogleProperties; +import com.amcamp.infra.config.oauth.KakaoProperties; +import lombok.AllArgsConstructor; +import lombok.Getter; + +import static com.amcamp.global.common.constants.SecurityConstants.*; + +@Getter +@AllArgsConstructor +public enum OauthProvider { + + KAKAO(KAKAO_JWK_SET_URL, KAKAO_ISSUER), + GOOGLE(GOOGLE_JWK_SET_URL, GOOGLE_ISSUER), + ; + + private final String jwkSetUrl; + private final String issuer; + + public String getClientId(GoogleProperties googleProperties, KakaoProperties kakaoProperties) { + return switch (this) { + case GOOGLE -> googleProperties.clientId(); + case KAKAO -> kakaoProperties.clientId(); + }; + } +} diff --git a/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java b/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java new file mode 100644 index 00000000..e16d7362 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java @@ -0,0 +1,27 @@ +package com.amcamp.domain.auth.domain; + +import lombok.Builder; +import lombok.Getter; +import org.springframework.data.annotation.Id; +import org.springframework.data.redis.core.RedisHash; +import org.springframework.data.redis.core.TimeToLive; + +@Getter +@RedisHash(value = "refreshToken") +public class RefreshToken { + + @Id + private Long memberId; + + private String token; + + @TimeToLive + private long ttl; + + @Builder + private RefreshToken(Long memberId, String token, long ttl) { + this.memberId = memberId; + this.token = token; + this.ttl = ttl; + } +} diff --git a/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java b/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java new file mode 100644 index 00000000..d9ba41a1 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java @@ -0,0 +1,9 @@ +package com.amcamp.domain.auth.dto; + +import com.amcamp.domain.member.domain.MemberRole; + +public record AccessTokenDto(Long memberId, MemberRole role, String accessTokenValue) { + public static AccessTokenDto of(Long memberId, MemberRole role, String accessTokenValue) { + return new AccessTokenDto(memberId, role, accessTokenValue); + } +} diff --git a/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java b/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java new file mode 100644 index 00000000..c83fedc0 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.auth.dto; + +public record RefreshTokenDto(Long memberId, String refreshTokenValue, Long ttl) { + public static RefreshTokenDto of(Long memberId, String refreshTokenValue, Long ttl) { + return new RefreshTokenDto(memberId, refreshTokenValue, ttl); + } +} diff --git a/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java b/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java new file mode 100644 index 00000000..c31660bd --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java @@ -0,0 +1,10 @@ +package com.amcamp.domain.auth.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; + +public record AuthCodeRequest( + @NotNull(message = "인증코드는 필수입니다") + @Schema(description = "구글, 카카오 로그인을 통한 인증코드") + String code) { +} diff --git a/src/main/java/com/amcamp/domain/auth/dto/response/IdTokenResponse.java b/src/main/java/com/amcamp/domain/auth/dto/response/IdTokenResponse.java new file mode 100644 index 00000000..a18edc22 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/dto/response/IdTokenResponse.java @@ -0,0 +1,3 @@ +package com.amcamp.domain.auth.dto.response; + +public record IdTokenResponse(String id_token) {} diff --git a/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java b/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java new file mode 100644 index 00000000..c48ffc35 --- /dev/null +++ b/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.auth.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record SocialLoginResponse( + @Schema(description = "엑세스 토큰") String accessToken, + @Schema(description = "리프레시 토큰") String refreshToken) { + public static SocialLoginResponse of(String accessToken, String refreshToken) { + return new SocialLoginResponse(accessToken, refreshToken); + } +} diff --git a/src/main/java/com/amcamp/domain/.gitkeep b/src/main/java/com/amcamp/domain/member/api/.gitkeep similarity index 100% rename from src/main/java/com/amcamp/domain/.gitkeep rename to src/main/java/com/amcamp/domain/member/api/.gitkeep diff --git a/src/main/java/com/amcamp/domain/member/application/.gitkeep b/src/main/java/com/amcamp/domain/member/application/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java b/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java new file mode 100644 index 00000000..2cb3df13 --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.member.dao; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface MemberRepository extends JpaRepository { + Optional findByOauthInfo(OauthInfo oauthInfo); +} diff --git a/src/main/java/com/amcamp/domain/member/domain/Member.java b/src/main/java/com/amcamp/domain/member/domain/Member.java new file mode 100644 index 00000000..382a258c --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/domain/Member.java @@ -0,0 +1,51 @@ +package com.amcamp.domain.member.domain; + +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Member { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "member_id") + private Long id; + + private String nickname; + + private String profileImageUrl; + + @Embedded + private OauthInfo oauthInfo; + + @Enumerated(EnumType.STRING) + private MemberStatus status; + + @Enumerated(EnumType.STRING) + private MemberRole role; + + @Builder(access = AccessLevel.PRIVATE) + private Member( + String nickname, String profileImageUrl, OauthInfo oauthInfo, MemberStatus status, MemberRole role) { + this.nickname = nickname; + this.profileImageUrl = profileImageUrl; + this.oauthInfo = oauthInfo; + this.status = status; + this.role = role; + } + + public static Member createMember(String nickname, String profileImageUrl, OauthInfo oauthInfo) { + return Member.builder() + .nickname(nickname) + .profileImageUrl(profileImageUrl) + .oauthInfo(oauthInfo) + .status(MemberStatus.NORMAL) + .role(MemberRole.USER) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/member/domain/MemberRole.java b/src/main/java/com/amcamp/domain/member/domain/MemberRole.java new file mode 100644 index 00000000..7540ad90 --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/domain/MemberRole.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.member.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MemberRole { + + ADMIN("ROLE_ADMIN"), + USER("ROLE_USER"), + ; + + private final String role; +} diff --git a/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java b/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java new file mode 100644 index 00000000..6a4953ef --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java @@ -0,0 +1,16 @@ +package com.amcamp.domain.member.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum MemberStatus { + + NORMAL("NORMAL"), + DELETED("DELETED"), + FORBIDDEN("FORBIDDEN"), + ; + + private final String status; +} diff --git a/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java b/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java new file mode 100644 index 00000000..38b4141e --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java @@ -0,0 +1,29 @@ +package com.amcamp.domain.member.domain; + +import jakarta.persistence.Embeddable; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Embeddable +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class OauthInfo { + + private String oauthId; + private String oauthProvider; + + @Builder(access = AccessLevel.PRIVATE) + private OauthInfo(String oauthId, String oauthProvider) { + this.oauthId = oauthId; + this.oauthProvider = oauthProvider; + } + + public static OauthInfo createOauthInfo(String oauthId, String oauthProvider) { + return OauthInfo.builder() + .oauthId(oauthId) + .oauthProvider(oauthProvider) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/member/dto/.gitkeep b/src/main/java/com/amcamp/domain/member/dto/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java b/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java new file mode 100644 index 00000000..d44d9b71 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java @@ -0,0 +1,20 @@ +package com.amcamp.global.common.constants; + +public final class SecurityConstants { + public static final String TOKEN_ROLE_NAME = "role"; + public static final String TOKEN_PREFIX = "Bearer "; + + public static final String KAKAO_LOGIN_URL = "https://kauth.kakao.com"; + public static final String KAKAO_LOGIN_ENDPOINT = "/oauth/token"; + + public static final String GOOGLE_LOGIN_URL = "https://oauth2.googleapis.com"; + public static final String GOOGLE_LOGIN_ENDPOINT = "/token"; + + public static final String KAKAO_JWK_SET_URL = "https://kauth.kakao.com/.well-known/jwks.json"; + public static final String KAKAO_ISSUER = "https://kauth.kakao.com"; + + public static final String GOOGLE_JWK_SET_URL = "https://www.googleapis.com/oauth2/v3/certs"; + public static final String GOOGLE_ISSUER = "https://accounts.google.com"; + + public static final String REFRESH_TOKEN_COOKIE_NAME = "refreshToken"; +} diff --git a/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java b/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java index 463d86cf..3de13f14 100644 --- a/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java +++ b/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java @@ -6,22 +6,24 @@ @Getter public enum AuthErrorCode { + ID_TOKEN_VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "ID 토큰 검증에 실패했습니다."), + ; + //잘못된 요청 - WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), +// WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), //Member 요청 관련 에러 - USER_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 USER 정보를 찾을 수 없습니다"), - USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), - NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), +// USER_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 USER 정보를 찾을 수 없습니다"), +// USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), +// NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), //Token 유효성 Error - INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다"), - TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "요청한 토큰을 찾을 수 없습니다"), +// INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다"), +// TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "요청한 토큰을 찾을 수 없습니다"), //Role 권한 관련 오류 - NO_AUTHORITY(HttpStatus.BAD_REQUEST, "권한 정보를 찾을 수 없습니다"), - INVALID_AUTHORITY(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); - +// NO_AUTHORITY(HttpStatus.BAD_REQUEST, "권한 정보를 찾을 수 없습니다"), +// INVALID_AUTHORITY(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); private final HttpStatus httpStatus; private final String message; @@ -34,6 +36,4 @@ public enum AuthErrorCode { public int getHttpStatusValue(){ return httpStatus.value(); } - - } diff --git a/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java b/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java index c8277556..157b1006 100644 --- a/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java +++ b/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java @@ -19,7 +19,4 @@ public AuthException(AuthErrorCode authErrorCode){ public String getErrorMsg(){ return this.authErrorCode.name() + ": " + this.authErrorCode.getMessage(); } - - - } diff --git a/src/main/java/com/amcamp/global/config/feign/FeignConfig.java b/src/main/java/com/amcamp/global/config/feign/FeignConfig.java new file mode 100644 index 00000000..2640782c --- /dev/null +++ b/src/main/java/com/amcamp/global/config/feign/FeignConfig.java @@ -0,0 +1,22 @@ +package com.amcamp.global.config.feign; + +import feign.RequestInterceptor; +import org.springframework.cloud.openfeign.EnableFeignClients; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@EnableFeignClients(basePackages = "com.amcamp.infra.config.feign") +public class FeignConfig { + + @Bean + public RequestInterceptor requestInterceptor() { + return requestTemplate -> { + requestTemplate.header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); + + if (requestTemplate.body() == null) { + requestTemplate.body(""); + } + }; + } +} diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 6361e866..c0b5f938 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -1,5 +1,9 @@ package com.amcamp.global.config.security; +import com.amcamp.domain.auth.application.JwtTokenService; +import com.amcamp.global.security.JwtAuthenticationFilter; +import com.amcamp.global.util.CookieUtil; +import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.security.config.annotation.web.builders.HttpSecurity; @@ -7,16 +11,22 @@ import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import static org.springframework.http.HttpHeaders.SET_COOKIE; import static org.springframework.security.config.Customizer.withDefaults; @Configuration @EnableWebSecurity +@RequiredArgsConstructor public class WebSecurityConfig { + private final JwtTokenService jwtTokenService; + private final CookieUtil cookieUtil; + @Bean public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { http @@ -30,9 +40,12 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws http.authorizeHttpRequests( auth -> auth.requestMatchers("/devfit-actuator/**").permitAll() - .requestMatchers("**").permitAll() + .requestMatchers("/**").permitAll() .anyRequest().authenticated()); + http.addFilterBefore( + jwtAuthenticationFilter(jwtTokenService, cookieUtil), UsernamePasswordAuthenticationFilter.class); + return http.build(); } @@ -44,9 +57,15 @@ public CorsConfigurationSource corsConfigurationSource() { configuration.addAllowedMethod("*"); configuration.setAllowCredentials(true); configuration.setMaxAge(3600L); + configuration.addExposedHeader(SET_COOKIE); UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", configuration); return source; } + + @Bean + public JwtAuthenticationFilter jwtAuthenticationFilter(JwtTokenService jwtTokenService, CookieUtil cookieUtil) { + return new JwtAuthenticationFilter(jwtTokenService, cookieUtil); + } } diff --git a/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java b/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java new file mode 100644 index 00000000..8a55b375 --- /dev/null +++ b/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java @@ -0,0 +1,108 @@ +package com.amcamp.global.security; + +import com.amcamp.domain.auth.application.JwtTokenService; +import com.amcamp.domain.auth.dto.AccessTokenDto; +import com.amcamp.domain.auth.dto.RefreshTokenDto; +import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.global.util.CookieUtil; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpHeaders; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.web.filter.OncePerRequestFilter; +import org.springframework.web.util.WebUtils; + +import java.io.IOException; + +import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_PREFIX; + +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends OncePerRequestFilter { + + private final JwtTokenService jwtTokenService; + private final CookieUtil cookieUtil; + + @Override + protected void doFilterInternal( + HttpServletRequest request, HttpServletResponse response, FilterChain filterChain) + throws ServletException, IOException { + + String accessTokenHeaderValue = extractAccessTokenFromHeader(request); + String refreshTokenCookieValue = extractRefreshTokenFromCookie(request); + + // 헤더에 AT가 있으면 우선적으로 검증 + if (accessTokenHeaderValue != null) { + AccessTokenDto accessTokenDto = jwtTokenService.retrieveAccessToken(accessTokenHeaderValue); + + // AT가 유효하면 통과 + if (accessTokenDto != null) { + setAuthenticationToken(accessTokenDto.memberId(), accessTokenDto.role()); + + filterChain.doFilter(request, response); + return; + } + } + + // AT가 유효하지 않다면 RT 파싱 + RefreshTokenDto refreshTokenDto = jwtTokenService.retrieveRefreshToken(refreshTokenCookieValue); + + // RT가 유효하면 AT, RT 재발급 + if (refreshTokenDto != null) { + AccessTokenDto reissueAccessTokenDto = + jwtTokenService.reissueAccessTokenIfExpired(accessTokenHeaderValue); + RefreshTokenDto reissueRefreshTokenDto = + jwtTokenService.createRefreshTokenDto(refreshTokenDto.memberId()); + + HttpHeaders headers = + cookieUtil.generateRefreshTokenCookie(reissueRefreshTokenDto.refreshTokenValue()); + + response.addHeader(HttpHeaders.AUTHORIZATION, + TOKEN_PREFIX + reissueAccessTokenDto.accessTokenValue()); + response.addHeader(HttpHeaders.SET_COOKIE, headers.getFirst(HttpHeaders.SET_COOKIE)); + } + + // AT, RT가 모두 만료된 경우 실패 + filterChain.doFilter(request, response); + } + + private void setAuthenticationToken(Long memberId, MemberRole memberRole) { + UserDetails userDetails = + User.withUsername(memberId.toString()) + .password("") + .authorities(memberRole.toString()) + .build(); + + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + + SecurityContextHolder.getContext().setAuthentication(token); + } + + private String extractAccessTokenFromHeader(HttpServletRequest request) { + String header = request.getHeader(HttpHeaders.AUTHORIZATION); + + if (header != null && header.startsWith(TOKEN_PREFIX)) { + return header.replace(TOKEN_PREFIX, ""); + } + + return null; + } + + private String extractRefreshTokenFromCookie(HttpServletRequest request) { + Cookie cookie = WebUtils.getCookie(request, REFRESH_TOKEN_COOKIE_NAME); + + if (cookie != null) { + return cookie.getValue(); + } + + return null; + } +} diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java new file mode 100644 index 00000000..1b2418f4 --- /dev/null +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -0,0 +1,27 @@ +package com.amcamp.global.util; + +import org.springframework.boot.web.server.Cookie; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; +import org.springframework.stereotype.Component; + +import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; + +@Component +public class CookieUtil { + + public HttpHeaders generateRefreshTokenCookie(String refreshToken) { + ResponseCookie refreshTokenCookie = + ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken) + .path("/") + .secure(false) + .sameSite(Cookie.SameSite.NONE.attributeValue()) + .httpOnly(true) + .build(); + + HttpHeaders headers = new HttpHeaders(); + headers.add(HttpHeaders.SET_COOKIE, refreshTokenCookie.toString()); + + return headers; + } +} diff --git a/src/main/java/com/amcamp/global/util/JwtUtil.java b/src/main/java/com/amcamp/global/util/JwtUtil.java new file mode 100644 index 00000000..88790533 --- /dev/null +++ b/src/main/java/com/amcamp/global/util/JwtUtil.java @@ -0,0 +1,128 @@ +package com.amcamp.global.util; + +import com.amcamp.domain.auth.dto.AccessTokenDto; +import com.amcamp.domain.auth.dto.RefreshTokenDto; +import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.infra.config.jwt.JwtProperties; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.Jws; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +import java.security.Key; +import java.util.Date; + +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_ROLE_NAME; + +@Component +@RequiredArgsConstructor +public class JwtUtil { + + private final JwtProperties jwtProperties; + + public AccessTokenDto generateAccessTokenDto(Long memberId, MemberRole memberRole) { + Date issuedAt = new Date(); + Date expiredAt = + new Date(issuedAt.getTime() + jwtProperties.accessTokenExpirationMilliTime()); + String accessTokenValue = buildAccessToken(memberId, memberRole, issuedAt, expiredAt); + return AccessTokenDto.of(memberId, memberRole, accessTokenValue); + } + + public String generateAccessToken(Long memberId, MemberRole memberRole) { + Date issuedAt = new Date(); + Date expiredAt = + new Date(issuedAt.getTime() + jwtProperties.accessTokenExpirationMilliTime()); + return buildAccessToken(memberId, memberRole, issuedAt, expiredAt); + } + + public RefreshTokenDto generateRefreshTokenDto(Long memberId) { + Date issuedAt = new Date(); + Date expiredAt = + new Date(issuedAt.getTime() + jwtProperties.refreshTokenExpirationMilliTime()); + String refreshTokenValue = buildRefreshToken(memberId, issuedAt, expiredAt); + return RefreshTokenDto.of(memberId, refreshTokenValue, jwtProperties.refreshTokenExpirationTime()); + } + + public String generateRefreshToken(Long memberId) { + Date issuedAt = new Date(); + Date expiredAt = + new Date(issuedAt.getTime() + jwtProperties.refreshTokenExpirationMilliTime()); + return buildRefreshToken(memberId, issuedAt, expiredAt); + } + + public AccessTokenDto parseAccessToken(String accessTokenValue) throws ExpiredJwtException { + try { + Jws claims = getClaims(accessTokenValue, getAccessTokenKey()); + + return AccessTokenDto.of( + Long.parseLong(claims.getBody().getSubject()), + MemberRole.valueOf(claims.getBody().get(TOKEN_ROLE_NAME, String.class)), + accessTokenValue); + } catch (ExpiredJwtException e) { + throw e; + } catch (Exception e) { + return null; + } + } + + public RefreshTokenDto parseRefreshToken(String refreshTokenValue) throws ExpiredJwtException { + try { + Jws claims = getClaims(refreshTokenValue, getRefreshTokenKey()); + + return RefreshTokenDto.of( + Long.parseLong(claims.getBody().getSubject()), + refreshTokenValue, + jwtProperties.refreshTokenExpirationTime()); + } catch (ExpiredJwtException e) { + throw e; + } catch (Exception e) { + return null; + } + } + + private Jws getClaims(String token, Key key) { + return Jwts.parserBuilder() + .requireIssuer(jwtProperties.issuer()) + .setSigningKey(key) + .build() + .parseClaimsJws(token); + } + + public long getRefreshTokenExpirationTime() { + return jwtProperties.refreshTokenExpirationTime(); + } + + private Key getAccessTokenKey() { + return Keys.hmacShaKeyFor(jwtProperties.accessTokenSecret().getBytes()); + } + + private Key getRefreshTokenKey() { + return Keys.hmacShaKeyFor(jwtProperties.refreshTokenSecret().getBytes()); + } + + private String buildAccessToken( + Long memberId, MemberRole memberRole, Date issuedAt, Date expiredAt) { + return Jwts.builder() + .setIssuer(jwtProperties.issuer()) + .setSubject(memberId.toString()) + .claim(TOKEN_ROLE_NAME, memberRole.name()) + .setIssuedAt(issuedAt) + .setExpiration(expiredAt) + .signWith(getAccessTokenKey()) + .compact(); + } + + private String buildRefreshToken( + Long memberId, Date issuedAt, Date expiredAt) { + return Jwts.builder() + .setIssuer(jwtProperties.issuer()) + .setSubject(memberId.toString()) + .setIssuedAt(issuedAt) + .setExpiration(expiredAt) + .signWith(getRefreshTokenKey()) + .compact(); + } +} diff --git a/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java b/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java new file mode 100644 index 00000000..0057b6fa --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java @@ -0,0 +1,24 @@ +package com.amcamp.infra.config.feign; + +import com.amcamp.domain.auth.dto.response.IdTokenResponse; +import com.amcamp.global.config.feign.FeignConfig; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import static com.amcamp.global.common.constants.SecurityConstants.GOOGLE_LOGIN_ENDPOINT; +import static com.amcamp.global.common.constants.SecurityConstants.GOOGLE_LOGIN_URL; + +@FeignClient( + name = "googleOauthClient", + url = GOOGLE_LOGIN_URL, + configuration = FeignConfig.class) +public interface GoogleOauthClient { + @PostMapping(value = GOOGLE_LOGIN_ENDPOINT) + IdTokenResponse getIdToken( + @RequestParam("grant_type") String grantType, + @RequestParam("client_id") String clientId, + @RequestParam("redirect_uri") String redirectUri, + @RequestParam("code") String code, + @RequestParam("client_secret") String clientSecret); +} diff --git a/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java b/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java new file mode 100644 index 00000000..326da108 --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java @@ -0,0 +1,24 @@ +package com.amcamp.infra.config.feign; + +import com.amcamp.domain.auth.dto.response.IdTokenResponse; +import com.amcamp.global.config.feign.FeignConfig; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestParam; + +import static com.amcamp.global.common.constants.SecurityConstants.KAKAO_LOGIN_ENDPOINT; +import static com.amcamp.global.common.constants.SecurityConstants.KAKAO_LOGIN_URL; + +@FeignClient( + name = "kakaoOauthClient", + url = KAKAO_LOGIN_URL, + configuration = FeignConfig.class) +public interface KakaoOauthClient { + @PostMapping(value = KAKAO_LOGIN_ENDPOINT) + IdTokenResponse getIdToken( + @RequestParam("grant_type") String grantType, + @RequestParam("client_id") String clientId, + @RequestParam("redirect_uri") String redirectUri, + @RequestParam("code") String code, + @RequestParam("client_secret") String clientSecret); +} diff --git a/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java b/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java new file mode 100644 index 00000000..2e55de9c --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java @@ -0,0 +1,18 @@ +package com.amcamp.infra.config.jwt; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "jwt") +public record JwtProperties( + String accessTokenSecret, + String refreshTokenSecret, + Long accessTokenExpirationTime, + Long refreshTokenExpirationTime, + String issuer) { + public Long accessTokenExpirationMilliTime() { + return accessTokenExpirationTime * 1000; + } + public Long refreshTokenExpirationMilliTime() { + return refreshTokenExpirationTime * 1000; + } +} diff --git a/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java b/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java new file mode 100644 index 00000000..24ba749f --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java @@ -0,0 +1,11 @@ +package com.amcamp.infra.config.oauth; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "oauth.google") +public record GoogleProperties( + String clientId, + String clientSecret, + String redirectUri, + String grantType) { +} diff --git a/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java b/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java new file mode 100644 index 00000000..d5328db5 --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java @@ -0,0 +1,11 @@ +package com.amcamp.infra.config.oauth; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "oauth.kakao") +public record KakaoProperties( + String clientId, + String clientSecret, + String redirectUri, + String grantType) { +} diff --git a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java index 7b00df11..2819fc2a 100644 --- a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java +++ b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java @@ -1,11 +1,17 @@ package com.amcamp.infra.config.properties; +import com.amcamp.infra.config.jwt.JwtProperties; +import com.amcamp.infra.config.oauth.GoogleProperties; +import com.amcamp.infra.config.oauth.KakaoProperties; import com.amcamp.infra.config.redis.RedisProperties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties({ - RedisProperties.class + RedisProperties.class, + GoogleProperties.class, + KakaoProperties.class, + JwtProperties.class, }) @Configuration public class PropertiesConfig {} diff --git a/src/main/resources/application-security.yml b/src/main/resources/application-security.yml new file mode 100644 index 00000000..fc8cdb97 --- /dev/null +++ b/src/main/resources/application-security.yml @@ -0,0 +1,18 @@ +oauth: + kakao: + client-id: ${KAKAO_CLIENT_ID} + client-secret: ${KAKAO_CLIENT_SECRET} + redirect-uri: ${KAKAO_REDIRECT_URI} + grant-type: ${KAKAO_CLIENT_GRANT_TYPE} + google: + client-id: ${GOOGLE_CLIENT_ID} + client-secret: ${GOOGLE_CLIENT_SECRET} + redirect-uri: ${GOOGLE_REDIRECT_URI} + grant-type: ${GOOGLE_CLIENT_GRANT_TYPE} + +jwt: + access-token-secret: ${JWT_ACCESS_TOKEN_SECRET} + refresh-token-secret: ${JWT_REFRESH_TOKEN_SECRET} + access-token-expiration-time: ${JWT_ACCESS_TOKEN_EXPIRATION_TIME:7200} + refresh-token-expiration-time: ${JWT_REFRESH_TOKEN_EXPIRATION_TIME:172800} + issuer: ${JWT_ISSUER} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 62e93b31..df1c0dde 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -6,3 +6,4 @@ spring: dev: "dev, datasource, actuator" include: - redis + - security diff --git a/src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java b/src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java deleted file mode 100644 index f5e9bfda..00000000 --- a/src/test/java/com/amcamp/exception/AuthExceptionHandlerTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.amcamp.exception; - - -import com.amcamp.global.common.exception.auth.AuthErrorCode; -import com.amcamp.global.common.exception.GlobalExceptionManager; -import com.amcamp.global.common.exception.auth.AuthException; -import org.junit.jupiter.api.Test; - -public class AuthExceptionHandlerTest { - - @Test() - public void globalExceptionManagerTest(){ - System.out.println( - new GlobalExceptionManager().AuthExceptionHandler( - new AuthException(AuthErrorCode.NO_AUTHORITY) - ) - ); - } - @Test() - public void globalExceptionManagerTestWithFieldAndGiven(){ - System.out.println( - new GlobalExceptionManager().AuthExceptionHandler( - new AuthException(AuthErrorCode.NO_AUTHORIZED_USER,"username","user1") - ) - ); - } - -} diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index 05e3c539..ec2233b1 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -2,10 +2,4 @@ spring: config: activate: on-profile: "test" - datasource: - url: jdbc:h2:mem:test - data: - redis: - host: localhost - port: 6379 - password: + From 5693b56eae4fcb2499849fd2d8553a660d5de836 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 3 Feb 2025 21:54:37 +0900 Subject: [PATCH 013/107] =?UTF-8?q?feat:=20BaseTimeEntity=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20(#30)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: BaseTimeEntity 생성 * chore: jpa auditing config 추가 --- .../domain/common/model/BaseTimeEntity.java | 24 +++++++++++++++++++ .../amcamp/domain/member/domain/Member.java | 3 ++- .../infra/config/jpa/JpaAuditingConfig.java | 9 +++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java create mode 100644 src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java diff --git a/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java b/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java new file mode 100644 index 00000000..990addac --- /dev/null +++ b/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java @@ -0,0 +1,24 @@ +package com.amcamp.domain.common.model; + +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; + +@Getter +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseTimeEntity { + + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdDt; + + @LastModifiedDate + private LocalDateTime updatedDt; +} diff --git a/src/main/java/com/amcamp/domain/member/domain/Member.java b/src/main/java/com/amcamp/domain/member/domain/Member.java index 382a258c..5ff27ff1 100644 --- a/src/main/java/com/amcamp/domain/member/domain/Member.java +++ b/src/main/java/com/amcamp/domain/member/domain/Member.java @@ -1,5 +1,6 @@ package com.amcamp.domain.member.domain; +import com.amcamp.domain.common.model.BaseTimeEntity; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -9,7 +10,7 @@ @Getter @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Member { +public class Member extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java b/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java new file mode 100644 index 00000000..a9c3acbd --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java @@ -0,0 +1,9 @@ +package com.amcamp.infra.config.jpa; + +import org.springframework.context.annotation.Configuration; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; + +@Configuration +@EnableJpaAuditing +public class JpaAuditingConfig { +} From 5d23c281dcafbdfafe23f96683057c7bed93648a Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Mon, 3 Feb 2025 23:42:43 +0900 Subject: [PATCH 014/107] =?UTF-8?q?refactor:=20=EA=B3=B5=ED=86=B5=EC=98=88?= =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EB=A1=9C=EC=A7=81=20=EB=B0=8F=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95=20(#31)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - ErrorCode -> BaseErrorCode interface implements 하여 기존 error message, code, status 출력 로직 default method로 추가 - 문자열 조합하여 출력하던 errormessage -> ErrorMsg 객체 추가 + Builder 패턴 적용 - *Exception, *ExceptionHandler -> CommonException, CommonExceptionHandler 클래스로 일원화(필요시 각 클래스 extends) - 테스트 코드 추가(단위테스트: given/when/then 3단계 로직 따라 수행) --- .../auth/application/IdTokenVerifier.java | 4 +- .../common/exception/AuthException.java | 13 +++ .../common/exception/CommonException.java | 25 ++++++ .../global/common/exception/ErrorDetail.java | 7 +- .../global/common/exception/ErrorMsg.java | 21 +++++ .../exception/GlobalExceptionManager.java | 11 +-- .../common/exception/auth/AuthException.java | 22 ----- .../{auth => errorcode}/AuthErrorCode.java | 9 ++- .../exception/errorcode/BaseErrorCode.java | 23 ++++++ .../exception/errorcode/ProjectErrorCode.java | 24 ++++++ .../exception/ExceptionHandlerTest.java | 81 +++++++++++++++++++ 11 files changed, 201 insertions(+), 39 deletions(-) create mode 100644 src/main/java/com/amcamp/global/common/exception/AuthException.java create mode 100644 src/main/java/com/amcamp/global/common/exception/CommonException.java create mode 100644 src/main/java/com/amcamp/global/common/exception/ErrorMsg.java delete mode 100644 src/main/java/com/amcamp/global/common/exception/auth/AuthException.java rename src/main/java/com/amcamp/global/common/exception/{auth => errorcode}/AuthErrorCode.java (87%) create mode 100644 src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java create mode 100644 src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java create mode 100644 src/test/java/com/amcamp/exception/ExceptionHandlerTest.java diff --git a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java index d9b39431..418981f4 100644 --- a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java +++ b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java @@ -1,8 +1,8 @@ package com.amcamp.domain.auth.application; import com.amcamp.domain.auth.domain.OauthProvider; -import com.amcamp.global.common.exception.auth.AuthErrorCode; -import com.amcamp.global.common.exception.auth.AuthException; +import com.amcamp.global.common.exception.errorcode.AuthErrorCode; +import com.amcamp.global.common.exception.AuthException; import com.amcamp.infra.config.oauth.GoogleProperties; import com.amcamp.infra.config.oauth.KakaoProperties; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/amcamp/global/common/exception/AuthException.java b/src/main/java/com/amcamp/global/common/exception/AuthException.java new file mode 100644 index 00000000..86bfd316 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/AuthException.java @@ -0,0 +1,13 @@ +package com.amcamp.global.common.exception; + +import com.amcamp.global.common.exception.errorcode.BaseErrorCode; +import lombok.Getter; + + +@Getter +public class AuthException extends CommonException { + + public AuthException(BaseErrorCode errorCode) { + super(errorCode); + } +} diff --git a/src/main/java/com/amcamp/global/common/exception/CommonException.java b/src/main/java/com/amcamp/global/common/exception/CommonException.java new file mode 100644 index 00000000..1c40023d --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/CommonException.java @@ -0,0 +1,25 @@ +package com.amcamp.global.common.exception; + +import com.amcamp.global.common.exception.errorcode.BaseErrorCode; +import lombok.Getter; + + +@Getter +public class CommonException extends RuntimeException { + + private BaseErrorCode errorCode; + private String errorField; + private String errorGiven; + + public CommonException(BaseErrorCode errorCode) { + super(errorCode.getErrorMsg().getReason()); + this.errorCode = errorCode; + } + + public CommonException(BaseErrorCode errorCode, String errorField, String errorGiven) { + super(errorCode.getErrorMsg().getReason()); //RuntimeExceptio + this.errorCode = errorCode; + this.errorField = errorField; + this.errorGiven = errorGiven; + } +} diff --git a/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java b/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java index 3ad61d6c..4a85651c 100644 --- a/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java +++ b/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java @@ -13,12 +13,7 @@ public class ErrorDetail { private String field; private String given; - private String reasonMessage; + private ErrorMsg reasonMessage; - public ErrorDetail(FieldError fieldError) { - this.field = fieldError.getField(); - this.given = fieldError.getRejectedValue().toString(); - this.reasonMessage = fieldError.getDefaultMessage(); - } } diff --git a/src/main/java/com/amcamp/global/common/exception/ErrorMsg.java b/src/main/java/com/amcamp/global/common/exception/ErrorMsg.java new file mode 100644 index 00000000..898f3816 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/ErrorMsg.java @@ -0,0 +1,21 @@ +package com.amcamp.global.common.exception; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class ErrorMsg { + private Integer status; + private String code; + private String reason; + + @Override + public String toString() { + return String.format("ErrorMsg{code='%s', status=%d, reason='%s'}", code, status, reason); + } +} diff --git a/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java b/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java index 45e4f5db..79758003 100644 --- a/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java +++ b/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java @@ -1,19 +1,20 @@ package com.amcamp.global.common.exception; import com.amcamp.global.common.CommonResponse; -import com.amcamp.global.common.exception.auth.AuthException; +import com.amcamp.global.common.exception.errorcode.BaseErrorCode; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; -@RestControllerAdvice(basePackages = "com.amcamp")//모듈 별로 나누어 적용 +@RestControllerAdvice(basePackages = "com.amcamp") public class GlobalExceptionManager { @ExceptionHandler(AuthException.class) - public CommonResponse AuthExceptionHandler(AuthException e){ + public CommonResponse commonExceptionHandler(CommonException e){ + BaseErrorCode baseErrorCode = e.getErrorCode(); ErrorDetail errorDetail = ErrorDetail.builder() .field(e.getErrorField()) .given(e.getErrorGiven()) - .reasonMessage(e.getErrorMsg()) + .reasonMessage(baseErrorCode.getErrorMsg()) .build(); - return CommonResponse.onFailure(e.getAuthErrorCode().getHttpStatusValue(),errorDetail); + return CommonResponse.onFailure(baseErrorCode.getHttpStatus().value(),errorDetail); } } diff --git a/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java b/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java deleted file mode 100644 index 157b1006..00000000 --- a/src/main/java/com/amcamp/global/common/exception/auth/AuthException.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.amcamp.global.common.exception.auth; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@AllArgsConstructor -@Getter -public class AuthException extends RuntimeException{ - - private final AuthErrorCode authErrorCode; - private String errorField; - private String errorGiven; - - // field/given null 처리용 생성자 - public AuthException(AuthErrorCode authErrorCode){ - this.authErrorCode = authErrorCode; - } - - public String getErrorMsg(){ - return this.authErrorCode.name() + ": " + this.authErrorCode.getMessage(); - } -} diff --git a/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java b/src/main/java/com/amcamp/global/common/exception/errorcode/AuthErrorCode.java similarity index 87% rename from src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java rename to src/main/java/com/amcamp/global/common/exception/errorcode/AuthErrorCode.java index 3de13f14..4edfcf43 100644 --- a/src/main/java/com/amcamp/global/common/exception/auth/AuthErrorCode.java +++ b/src/main/java/com/amcamp/global/common/exception/errorcode/AuthErrorCode.java @@ -1,10 +1,10 @@ -package com.amcamp.global.common.exception.auth; +package com.amcamp.global.common.exception.errorcode; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter -public enum AuthErrorCode { +public enum AuthErrorCode implements BaseErrorCode { ID_TOKEN_VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "ID 토큰 검증에 실패했습니다."), ; @@ -33,7 +33,8 @@ public enum AuthErrorCode { this.message = message; } - public int getHttpStatusValue(){ - return httpStatus.value(); + @Override + public String getCodeName() { + return this.name(); } } diff --git a/src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java b/src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java new file mode 100644 index 00000000..71a5f8a1 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java @@ -0,0 +1,23 @@ +package com.amcamp.global.common.exception.errorcode; + +import com.amcamp.global.common.exception.ErrorMsg; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.http.HttpStatus; + +public interface BaseErrorCode { + HttpStatus getHttpStatus(); + String getMessage(); + + String getCodeName(); + + // 공통 ErrorMsg 생성 메서드 + default ErrorMsg getErrorMsg(){ + return ErrorMsg.builder() + .code(getCodeName()) // Enum 이름을 사용 + .status(getHttpStatus().value()) // HttpStatus의 숫자 값 + .reason(getMessage()) // 오류 메시지 + .build(); + } + +} diff --git a/src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java new file mode 100644 index 00000000..a1ed47da --- /dev/null +++ b/src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java @@ -0,0 +1,24 @@ +package com.amcamp.global.common.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum ProjectErrorCode implements BaseErrorCode { + + PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "요청한 project 를 찾을 수 없습니다."); + + private final HttpStatus httpStatus; + private final String message; + + ProjectErrorCode(HttpStatus httpStatus, String message){ + this.httpStatus = httpStatus; + this.message = message; + } + + @Override + public String getCodeName() { + return this.name(); + } + +} diff --git a/src/test/java/com/amcamp/exception/ExceptionHandlerTest.java b/src/test/java/com/amcamp/exception/ExceptionHandlerTest.java new file mode 100644 index 00000000..384c0f48 --- /dev/null +++ b/src/test/java/com/amcamp/exception/ExceptionHandlerTest.java @@ -0,0 +1,81 @@ +package com.amcamp.exception; + +import com.amcamp.global.common.CommonResponse; +import com.amcamp.global.common.exception.CommonException; +import com.amcamp.global.common.exception.ErrorDetail; +import com.amcamp.global.common.exception.ErrorMsg; +import com.amcamp.global.common.exception.GlobalExceptionManager; +import com.amcamp.global.common.exception.errorcode.AuthErrorCode; +import com.amcamp.global.common.exception.errorcode.ProjectErrorCode; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import java.util.Optional; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +public class ExceptionHandlerTest { + + AuthErrorCode authErrorCode = AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED; + ProjectErrorCode projectErrorCode = ProjectErrorCode.PROJECT_NOT_FOUND; + void throwExceptionWithAuthErrorCode(Object o){ + Optional mockObject = Optional.ofNullable(o); + if(!mockObject.isPresent()){ + throw new CommonException(authErrorCode); + } + } + void throwExceptionWithProjectErrorCode(Object o){ + Optional mockObject = Optional.ofNullable(o); + if(!mockObject.isPresent()){ + throw new CommonException(projectErrorCode); + } + } + @Test + @DisplayName("authError Test") + void commonExceptionWithAuthErrorTest() { + assertThatThrownBy(()-> throwExceptionWithAuthErrorCode(null)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(authErrorCode.getMessage()); + } + + @Test + @DisplayName("projectError Test") + void commonExceptionWithProjectErrorTest() { + assertThatThrownBy(()-> throwExceptionWithProjectErrorCode(null)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(projectErrorCode.getMessage()); + + } + + @Test + @DisplayName("ExceptionHandler Test") + void globalExceptionHandlerTest() { + + //given: 예외 핸들러와 예외 생성 + GlobalExceptionManager globalExceptionManager = new GlobalExceptionManager(); + CommonException exception = new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND, "project_id", null); + + //when: 예외 핸들러 실행 + CommonResponse response = globalExceptionManager.commonExceptionHandler(exception); + + //then: 응답 객체 검증 + assertThat(response).isNotNull(); + assertThat(response.getStatus()).isEqualTo(400); + assertThat(response.getData()).isInstanceOf(ErrorDetail.class); + + //ErrorMsg 객체 세부 검증 + ObjectMapper objectMapper = new ObjectMapper(); + + ErrorDetail errorDetail = objectMapper.convertValue(response.getData(), ErrorDetail.class); + ErrorMsg errorMsg = objectMapper.convertValue(errorDetail.getReasonMessage(), ErrorMsg.class); + + assertThat(errorMsg.getStatus()).isEqualTo(projectErrorCode.getErrorMsg().getStatus()); + assertThat(errorMsg.getReason()).isEqualTo(projectErrorCode.getErrorMsg().getReason()); + assertThat(errorMsg.getCode()).isEqualTo(projectErrorCode.getErrorMsg().getCode()); + + + + } + +} From 1f2a6a880aa67b05abad65b962a04abfa86609d0 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 4 Feb 2025 13:40:59 +0900 Subject: [PATCH 015/107] =?UTF-8?q?chore:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=ED=95=9C=20=EB=A9=A4=EB=B2=84=20=EC=A1=B0=ED=9A=8C=20=EC=9C=A0?= =?UTF-8?q?=ED=8B=B8=EB=A6=AC=ED=8B=B0=20=EA=B5=AC=ED=98=84=20(#34)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: response 패키지로 이동 * refactor: exception 패키지로 이동 * refactor: 사용하지 않는 AuthException 제거 * fix: 예외 발생 시 HTTP 상태 코드가 올바르게 반환되도록 수정 * refactor: 중복된 status 필드 제거 * feat: 멤버 유틸리티 구현 * test: exception test 패키지 이동 * refactor: UserDetails 생성 시 PrincipalDetails 사용하도록 변경 * test: 멤버 유틸리티 테스트 --- .../auth/application/IdTokenVerifier.java | 10 ++-- .../common/exception/AuthException.java | 13 ----- .../exception/GlobalExceptionManager.java | 20 ------- .../common/{ => response}/CommonResponse.java | 5 +- .../{ => response}/CommonResponseAdvice.java | 11 ++-- .../exception/CommonException.java | 6 +-- .../{common => }/exception/ErrorDetail.java | 3 +- .../{common => }/exception/ErrorMsg.java | 5 +- .../exception/GlobalExceptionHandler.java | 26 ++++++++++ .../exception/errorcode/AuthErrorCode.java | 5 +- .../exception/errorcode/BaseErrorCode.java | 8 +-- .../exception/errorcode/MemberErrorCode.java | 24 +++++++++ .../exception/errorcode/ProjectErrorCode.java | 2 +- .../security/JwtAuthenticationFilter.java | 13 ++--- .../global/security/PrincipalDetails.java | 52 +++++++++++++++++++ .../com/amcamp/global/util/MemberUtil.java | 34 ++++++++++++ .../exception/ExceptionHandlerTest.java | 20 +++---- .../amcamp/global/util/MemberUtilTest.java | 45 ++++++++++++++++ 18 files changed, 216 insertions(+), 86 deletions(-) delete mode 100644 src/main/java/com/amcamp/global/common/exception/AuthException.java delete mode 100644 src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java rename src/main/java/com/amcamp/global/common/{ => response}/CommonResponse.java (94%) rename src/main/java/com/amcamp/global/common/{ => response}/CommonResponseAdvice.java (84%) rename src/main/java/com/amcamp/global/{common => }/exception/CommonException.java (74%) rename src/main/java/com/amcamp/global/{common => }/exception/ErrorDetail.java (74%) rename src/main/java/com/amcamp/global/{common => }/exception/ErrorMsg.java (63%) create mode 100644 src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java rename src/main/java/com/amcamp/global/{common => }/exception/errorcode/AuthErrorCode.java (86%) rename src/main/java/com/amcamp/global/{common => }/exception/errorcode/BaseErrorCode.java (56%) create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java rename src/main/java/com/amcamp/global/{common => }/exception/errorcode/ProjectErrorCode.java (90%) create mode 100644 src/main/java/com/amcamp/global/security/PrincipalDetails.java create mode 100644 src/main/java/com/amcamp/global/util/MemberUtil.java rename src/test/java/com/amcamp/{ => global}/exception/ExceptionHandlerTest.java (76%) create mode 100644 src/test/java/com/amcamp/global/util/MemberUtilTest.java diff --git a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java index 418981f4..6c978f22 100644 --- a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java +++ b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java @@ -1,8 +1,8 @@ package com.amcamp.domain.auth.application; import com.amcamp.domain.auth.domain.OauthProvider; -import com.amcamp.global.common.exception.errorcode.AuthErrorCode; -import com.amcamp.global.common.exception.AuthException; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.AuthErrorCode; import com.amcamp.infra.config.oauth.GoogleProperties; import com.amcamp.infra.config.oauth.KakaoProperties; import lombok.RequiredArgsConstructor; @@ -59,7 +59,7 @@ private void validateAudience(OidcIdToken oidcIdToken, String clientId) { String idTokenAudience = oidcIdToken.getAudience().get(0); if (idTokenAudience == null || !idTokenAudience.equals(clientId)) { - throw new AuthException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); } } @@ -67,7 +67,7 @@ private void validateIssuer(OidcIdToken oidcIdToken, String issuer) { String idTokenIssuer = oidcIdToken.getIssuer().toString(); if (idTokenIssuer == null || !idTokenIssuer.equals(issuer)) { - throw new AuthException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); } } @@ -75,7 +75,7 @@ private void validateExpiresAt(OidcIdToken oidcIdToken) { Instant expiresAt = oidcIdToken.getExpiresAt(); if (expiresAt == null || expiresAt.isBefore(Instant.now())) { - throw new AuthException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); } } } diff --git a/src/main/java/com/amcamp/global/common/exception/AuthException.java b/src/main/java/com/amcamp/global/common/exception/AuthException.java deleted file mode 100644 index 86bfd316..00000000 --- a/src/main/java/com/amcamp/global/common/exception/AuthException.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.amcamp.global.common.exception; - -import com.amcamp.global.common.exception.errorcode.BaseErrorCode; -import lombok.Getter; - - -@Getter -public class AuthException extends CommonException { - - public AuthException(BaseErrorCode errorCode) { - super(errorCode); - } -} diff --git a/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java b/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java deleted file mode 100644 index 79758003..00000000 --- a/src/main/java/com/amcamp/global/common/exception/GlobalExceptionManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.amcamp.global.common.exception; - -import com.amcamp.global.common.CommonResponse; -import com.amcamp.global.common.exception.errorcode.BaseErrorCode; -import org.springframework.web.bind.annotation.ExceptionHandler; -import org.springframework.web.bind.annotation.RestControllerAdvice; - -@RestControllerAdvice(basePackages = "com.amcamp") -public class GlobalExceptionManager { - @ExceptionHandler(AuthException.class) - public CommonResponse commonExceptionHandler(CommonException e){ - BaseErrorCode baseErrorCode = e.getErrorCode(); - ErrorDetail errorDetail = ErrorDetail.builder() - .field(e.getErrorField()) - .given(e.getErrorGiven()) - .reasonMessage(baseErrorCode.getErrorMsg()) - .build(); - return CommonResponse.onFailure(baseErrorCode.getHttpStatus().value(),errorDetail); - } -} diff --git a/src/main/java/com/amcamp/global/common/CommonResponse.java b/src/main/java/com/amcamp/global/common/response/CommonResponse.java similarity index 94% rename from src/main/java/com/amcamp/global/common/CommonResponse.java rename to src/main/java/com/amcamp/global/common/response/CommonResponse.java index 209e7ed1..d69701cf 100644 --- a/src/main/java/com/amcamp/global/common/CommonResponse.java +++ b/src/main/java/com/amcamp/global/common/response/CommonResponse.java @@ -1,4 +1,4 @@ -package com.amcamp.global.common; +package com.amcamp.global.common.response; import lombok.AllArgsConstructor; import lombok.Builder; @@ -25,6 +25,7 @@ public static CommonResponse onSuccess(int status, T data) { .timestamp(LocalDateTime.now()) .build(); } + public static CommonResponse onFailure(int status, T data) { return CommonResponse.builder() .success(false) @@ -33,6 +34,4 @@ public static CommonResponse onFailure(int status, T data) { .timestamp(LocalDateTime.now()) .build(); } - - } diff --git a/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java b/src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java similarity index 84% rename from src/main/java/com/amcamp/global/common/CommonResponseAdvice.java rename to src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java index 76504818..b88c8255 100644 --- a/src/main/java/com/amcamp/global/common/CommonResponseAdvice.java +++ b/src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java @@ -1,6 +1,5 @@ -package com.amcamp.global.common; +package com.amcamp.global.common.response; -import jakarta.servlet.ServletResponse; import jakarta.servlet.http.HttpServletResponse; import org.springframework.core.MethodParameter; import org.springframework.http.HttpStatus; @@ -10,6 +9,7 @@ import org.springframework.http.server.ServletServerHttpResponse; import org.springframework.web.bind.annotation.RestControllerAdvice; import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice; + @RestControllerAdvice(basePackages = "com.amcamp") public class CommonResponseAdvice implements ResponseBodyAdvice { @Override @@ -23,17 +23,14 @@ public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType int status = httpServletResponse.getStatus(); HttpStatus resolve = HttpStatus.resolve(status); - //ExceptionHandler 에서 생성된 CommonResponseBody 넘어오면 별도로 wrapping 하지 않고 즉시 리턴 - if (body instanceof CommonResponse) { - return body; - } - if (resolve == null || body instanceof String) { return body; } + if (resolve.is2xxSuccessful()) { return CommonResponse.onSuccess(status, body); } + return body; } } diff --git a/src/main/java/com/amcamp/global/common/exception/CommonException.java b/src/main/java/com/amcamp/global/exception/CommonException.java similarity index 74% rename from src/main/java/com/amcamp/global/common/exception/CommonException.java rename to src/main/java/com/amcamp/global/exception/CommonException.java index 1c40023d..471d43cd 100644 --- a/src/main/java/com/amcamp/global/common/exception/CommonException.java +++ b/src/main/java/com/amcamp/global/exception/CommonException.java @@ -1,6 +1,6 @@ -package com.amcamp.global.common.exception; +package com.amcamp.global.exception; -import com.amcamp.global.common.exception.errorcode.BaseErrorCode; +import com.amcamp.global.exception.errorcode.BaseErrorCode; import lombok.Getter; @@ -17,7 +17,7 @@ public CommonException(BaseErrorCode errorCode) { } public CommonException(BaseErrorCode errorCode, String errorField, String errorGiven) { - super(errorCode.getErrorMsg().getReason()); //RuntimeExceptio + super(errorCode.getErrorMsg().getReason()); //RuntimeException this.errorCode = errorCode; this.errorField = errorField; this.errorGiven = errorGiven; diff --git a/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java b/src/main/java/com/amcamp/global/exception/ErrorDetail.java similarity index 74% rename from src/main/java/com/amcamp/global/common/exception/ErrorDetail.java rename to src/main/java/com/amcamp/global/exception/ErrorDetail.java index 4a85651c..81439cca 100644 --- a/src/main/java/com/amcamp/global/common/exception/ErrorDetail.java +++ b/src/main/java/com/amcamp/global/exception/ErrorDetail.java @@ -1,10 +1,9 @@ -package com.amcamp.global.common.exception; +package com.amcamp.global.exception; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.springframework.validation.FieldError; @Data @Builder diff --git a/src/main/java/com/amcamp/global/common/exception/ErrorMsg.java b/src/main/java/com/amcamp/global/exception/ErrorMsg.java similarity index 63% rename from src/main/java/com/amcamp/global/common/exception/ErrorMsg.java rename to src/main/java/com/amcamp/global/exception/ErrorMsg.java index 898f3816..8e2594f7 100644 --- a/src/main/java/com/amcamp/global/common/exception/ErrorMsg.java +++ b/src/main/java/com/amcamp/global/exception/ErrorMsg.java @@ -1,4 +1,4 @@ -package com.amcamp.global.common.exception; +package com.amcamp.global.exception; import lombok.AllArgsConstructor; import lombok.Builder; @@ -10,12 +10,11 @@ @NoArgsConstructor @AllArgsConstructor public class ErrorMsg { - private Integer status; private String code; private String reason; @Override public String toString() { - return String.format("ErrorMsg{code='%s', status=%d, reason='%s'}", code, status, reason); + return String.format("ErrorMsg{code='%s', reason='%s'}", code, reason); } } diff --git a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java new file mode 100644 index 00000000..d865c775 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java @@ -0,0 +1,26 @@ +package com.amcamp.global.exception; + +import com.amcamp.global.common.response.CommonResponse; +import com.amcamp.global.exception.errorcode.BaseErrorCode; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; +import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; + +@RestControllerAdvice(basePackages = "com.amcamp") +public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { + + @ExceptionHandler(CommonException.class) + public ResponseEntity> commonExceptionHandler(CommonException e) { + final BaseErrorCode errorCode = e.getErrorCode(); + final ErrorDetail errorDetail = ErrorDetail.builder() + .field(e.getErrorField()) + .given(e.getErrorGiven()) + .reasonMessage(errorCode.getErrorMsg()) + .build(); + final CommonResponse response = + CommonResponse.onFailure(errorCode.getHttpStatus().value(), errorDetail); + + return ResponseEntity.status(errorCode.getHttpStatus()).body(response); + } +} diff --git a/src/main/java/com/amcamp/global/common/exception/errorcode/AuthErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java similarity index 86% rename from src/main/java/com/amcamp/global/common/exception/errorcode/AuthErrorCode.java rename to src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java index 4edfcf43..351ced93 100644 --- a/src/main/java/com/amcamp/global/common/exception/errorcode/AuthErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java @@ -1,4 +1,4 @@ -package com.amcamp.global.common.exception.errorcode; +package com.amcamp.global.exception.errorcode; import lombok.Getter; import org.springframework.http.HttpStatus; @@ -7,13 +7,14 @@ public enum AuthErrorCode implements BaseErrorCode { ID_TOKEN_VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "ID 토큰 검증에 실패했습니다."), + + AUTH_NOT_FOUND(HttpStatus.UNAUTHORIZED, "사용자 인증 정보를 찾을 수 없습니다. 올바른 토큰으로 요청해주세요."), ; //잘못된 요청 // WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), //Member 요청 관련 에러 -// USER_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 USER 정보를 찾을 수 없습니다"), // USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), // NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), diff --git a/src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java similarity index 56% rename from src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java rename to src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java index 71a5f8a1..9c00cba3 100644 --- a/src/main/java/com/amcamp/global/common/exception/errorcode/BaseErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java @@ -1,21 +1,17 @@ -package com.amcamp.global.common.exception.errorcode; +package com.amcamp.global.exception.errorcode; -import com.amcamp.global.common.exception.ErrorMsg; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.ObjectMapper; +import com.amcamp.global.exception.ErrorMsg; import org.springframework.http.HttpStatus; public interface BaseErrorCode { HttpStatus getHttpStatus(); String getMessage(); - String getCodeName(); // 공통 ErrorMsg 생성 메서드 default ErrorMsg getErrorMsg(){ return ErrorMsg.builder() .code(getCodeName()) // Enum 이름을 사용 - .status(getHttpStatus().value()) // HttpStatus의 숫자 값 .reason(getMessage()) // 오류 메시지 .build(); } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java new file mode 100644 index 00000000..bddac903 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java @@ -0,0 +1,24 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum MemberErrorCode implements BaseErrorCode { + + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다."), + ; + + private final HttpStatus httpStatus; + private final String message; + + MemberErrorCode(HttpStatus httpStatus, String message){ + this.httpStatus = httpStatus; + this.message = message; + } + + @Override + public String getCodeName() { + return this.name(); + } +} diff --git a/src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java similarity index 90% rename from src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java rename to src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index a1ed47da..3c8a130b 100644 --- a/src/main/java/com/amcamp/global/common/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -1,4 +1,4 @@ -package com.amcamp.global.common.exception.errorcode; +package com.amcamp.global.exception.errorcode; import lombok.Getter; import org.springframework.http.HttpStatus; diff --git a/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java b/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java index 8a55b375..9c29c414 100644 --- a/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java +++ b/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java @@ -14,7 +14,6 @@ import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.WebUtils; @@ -74,14 +73,10 @@ protected void doFilterInternal( } private void setAuthenticationToken(Long memberId, MemberRole memberRole) { - UserDetails userDetails = - User.withUsername(memberId.toString()) - .password("") - .authorities(memberRole.toString()) - .build(); - - UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + UserDetails userDetails = new PrincipalDetails(memberId, memberRole); + + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(token); } diff --git a/src/main/java/com/amcamp/global/security/PrincipalDetails.java b/src/main/java/com/amcamp/global/security/PrincipalDetails.java new file mode 100644 index 00000000..854e1e45 --- /dev/null +++ b/src/main/java/com/amcamp/global/security/PrincipalDetails.java @@ -0,0 +1,52 @@ +package com.amcamp.global.security; + +import com.amcamp.domain.member.domain.MemberRole; +import lombok.AllArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.Collection; +import java.util.List; + +@AllArgsConstructor +public class PrincipalDetails implements UserDetails { + + private final Long memberId; + private final MemberRole memberRole; + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority(memberRole.name())); + } + + @Override + public String getPassword() { + return null; + } + + @Override + public String getUsername() { + return memberId.toString(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } +} diff --git a/src/main/java/com/amcamp/global/util/MemberUtil.java b/src/main/java/com/amcamp/global/util/MemberUtil.java new file mode 100644 index 00000000..0b50049a --- /dev/null +++ b/src/main/java/com/amcamp/global/util/MemberUtil.java @@ -0,0 +1,34 @@ +package com.amcamp.global.util; + +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.AuthErrorCode; +import com.amcamp.global.exception.errorcode.MemberErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class MemberUtil { + + private final MemberRepository memberRepository; + + public Member getCurrentMember() { + return memberRepository + .findById(getCurrentMemberId()) + .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); + } + + public Long getCurrentMemberId() { + Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); + + try { + return Long.parseLong(authentication.getName()); + } catch (Exception e) { + throw new CommonException(AuthErrorCode.AUTH_NOT_FOUND); + } + } +} diff --git a/src/test/java/com/amcamp/exception/ExceptionHandlerTest.java b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java similarity index 76% rename from src/test/java/com/amcamp/exception/ExceptionHandlerTest.java rename to src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java index 384c0f48..e9ab3afa 100644 --- a/src/test/java/com/amcamp/exception/ExceptionHandlerTest.java +++ b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java @@ -1,12 +1,8 @@ -package com.amcamp.exception; - -import com.amcamp.global.common.CommonResponse; -import com.amcamp.global.common.exception.CommonException; -import com.amcamp.global.common.exception.ErrorDetail; -import com.amcamp.global.common.exception.ErrorMsg; -import com.amcamp.global.common.exception.GlobalExceptionManager; -import com.amcamp.global.common.exception.errorcode.AuthErrorCode; -import com.amcamp.global.common.exception.errorcode.ProjectErrorCode; +package com.amcamp.global.exception; + +import com.amcamp.global.common.response.CommonResponse; +import com.amcamp.global.exception.errorcode.AuthErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -15,6 +11,7 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + public class ExceptionHandlerTest { AuthErrorCode authErrorCode = AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED; @@ -53,11 +50,11 @@ void commonExceptionWithProjectErrorTest() { void globalExceptionHandlerTest() { //given: 예외 핸들러와 예외 생성 - GlobalExceptionManager globalExceptionManager = new GlobalExceptionManager(); + GlobalExceptionHandler globalExceptionHandler = new GlobalExceptionHandler(); CommonException exception = new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND, "project_id", null); //when: 예외 핸들러 실행 - CommonResponse response = globalExceptionManager.commonExceptionHandler(exception); + CommonResponse response = globalExceptionHandler.commonExceptionHandler(exception).getBody(); //then: 응답 객체 검증 assertThat(response).isNotNull(); @@ -70,7 +67,6 @@ void globalExceptionHandlerTest() { ErrorDetail errorDetail = objectMapper.convertValue(response.getData(), ErrorDetail.class); ErrorMsg errorMsg = objectMapper.convertValue(errorDetail.getReasonMessage(), ErrorMsg.class); - assertThat(errorMsg.getStatus()).isEqualTo(projectErrorCode.getErrorMsg().getStatus()); assertThat(errorMsg.getReason()).isEqualTo(projectErrorCode.getErrorMsg().getReason()); assertThat(errorMsg.getCode()).isEqualTo(projectErrorCode.getErrorMsg().getCode()); diff --git a/src/test/java/com/amcamp/global/util/MemberUtilTest.java b/src/test/java/com/amcamp/global/util/MemberUtilTest.java new file mode 100644 index 00000000..b1f5630d --- /dev/null +++ b/src/test/java/com/amcamp/global/util/MemberUtilTest.java @@ -0,0 +1,45 @@ +package com.amcamp.global.util; + +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.global.security.PrincipalDetails; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.test.context.ActiveProfiles; + +@SpringBootTest +@ActiveProfiles("test") +public class MemberUtilTest { + + @Autowired + private MemberUtil memberUtil; + @Autowired + private MemberRepository memberRepository; + + @Test + void 로그인한_멤버의_정보를_조회한다() { + + // given + UserDetails userDetails = new PrincipalDetails(1L, MemberRole.USER); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + + Member savedMember = + memberRepository.save(Member.createMember("", null, null)); + + // when + Member currentMember = memberUtil.getCurrentMember(); + + // then + Assertions.assertEquals(savedMember.getId(), currentMember.getId()); + Assertions.assertEquals(savedMember.getRole(), currentMember.getRole()); + } +} From 90957b59b6f70a77dd479e3c74b7e0b00b050d7f Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:35:35 +0900 Subject: [PATCH 016/107] =?UTF-8?q?feat:=20Swagger=20Authorization=20?= =?UTF-8?q?=ED=97=A4=EB=8D=94=20=EC=B6=94=EA=B0=80=20(#36)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../global/config/swagger/SwaggerConfig.java | 25 ++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index f8d0d38d..ba279ae0 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -1,7 +1,10 @@ package com.amcamp.global.config.swagger; +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 org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -23,6 +26,26 @@ public OpenAPI openAPI() { .info(new Info() .title("DevFit Server API") .description("DevFit Server API 명세서입니다.") - .version("v0.0.1")); + .version("v0.0.1")) + .components(authSetting()) + .addSecurityItem(securityRequirement()); + } + + private Components authSetting() { + return new Components() + .addSecuritySchemes( + "accessToken", + new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .in(SecurityScheme.In.HEADER) + .name("Authorization")); + } + + private SecurityRequirement securityRequirement() { + SecurityRequirement securityRequirement = new SecurityRequirement(); + securityRequirement.addList("Authorization"); + return securityRequirement; } } From d5d6a3ee20b57b208e9d07aece11d0cc0a706337 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 5 Feb 2025 19:35:50 +0900 Subject: [PATCH 017/107] =?UTF-8?q?fix:=20=EB=8F=84=EC=BB=A4=20=EC=BB=A8?= =?UTF-8?q?=ED=85=8C=EC=9D=B4=EB=84=88=20Timezone=20Asia/Seoul=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#38)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- docker-compose.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/docker-compose.yml b/docker-compose.yml index 5c5ea96e..0216c6da 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,6 +6,8 @@ services: container_name: ${DOCKERHUB_IMAGE_NAME} restart: always network_mode: host + environment: + - TZ=Asia/Seoul env_file: - .env redis: @@ -14,3 +16,5 @@ services: ports: - "6379:6379" network_mode: host + environment: + - TZ=Asia/Seoul From 915df58ca627a596417aaef23ea89a902ea8a497 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:24:19 +0900 Subject: [PATCH 018/107] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=ED=83=88?= =?UTF-8?q?=ED=87=B4=20=EA=B5=AC=ED=98=84=20(#40)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: gitkeep 제거 * feat: 쿠키 삭제 로직 구현 * feat: 회원 탈퇴 기능 구현 * feat: 회원 탈퇴한 멤버의 엑세스 토큰으로 요청 시 예외가 발생하도록 설정 * feat: 회원 탈퇴 후 재가입 시 회원의 상태를 normal로 변경 * test: 회원 탈퇴 테스트 코드 작성 * test: 멤버 유틸리티 테스트 코드 수정 * fix: 소셜 로그인 시 리프레시 토큰은 응답 바디에 포함되지 않도록 수정 * fix: swagger 인증 설정 오류 수정 --- .github/workflows/develop_pull_request.yml | 14 ++-- .../domain/auth/application/AuthService.java | 5 ++ .../dto/response/SocialLoginResponse.java | 3 +- .../com/amcamp/domain/member/api/.gitkeep | 0 .../domain/member/api/MemberController.java | 28 +++++++ .../amcamp/domain/member/application/.gitkeep | 0 .../member/application/MemberService.java | 27 ++++++ .../amcamp/domain/member/domain/Member.java | 14 ++++ .../global/config/swagger/SwaggerConfig.java | 2 +- .../exception/errorcode/MemberErrorCode.java | 2 + .../com/amcamp/global/util/CookieUtil.java | 16 ++++ .../com/amcamp/global/util/MemberUtil.java | 16 +++- .../member/application/MemberServiceTest.java | 83 +++++++++++++++++++ .../amcamp/global/util/MemberUtilTest.java | 29 ++++--- 14 files changed, 215 insertions(+), 24 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/member/api/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/member/api/MemberController.java delete mode 100644 src/main/java/com/amcamp/domain/member/application/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/member/application/MemberService.java create mode 100644 src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index e774734f..ec623d75 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -8,19 +8,19 @@ on: jobs: test: runs-on: ubuntu-latest - strategy: - matrix: - java-version: [ 17 ] steps: - name: Checkout code uses: actions/checkout@v2 - - name: Set up Java - uses: actions/setup-java@v3 + - name: Set up JDK 17 + uses: actions/setup-java@v4 with: - java-version: ${{ matrix.java-version }} - distribution: 'adopt' + java-version: '17' + distribution: 'temurin' + + - name: Start Redis container for test + run: docker compose -f ./docker-compose-test.yml up -d - name: Cache Gradle packages uses: actions/cache@v3 diff --git a/src/main/java/com/amcamp/domain/auth/application/AuthService.java b/src/main/java/com/amcamp/domain/auth/application/AuthService.java index 5cd01d17..103689c6 100644 --- a/src/main/java/com/amcamp/domain/auth/application/AuthService.java +++ b/src/main/java/com/amcamp/domain/auth/application/AuthService.java @@ -5,6 +5,7 @@ import com.amcamp.domain.auth.dto.response.SocialLoginResponse; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberStatus; import com.amcamp.domain.member.domain.OauthInfo; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -34,6 +35,10 @@ public SocialLoginResponse socialLoginMember(AuthCodeRequest request, OauthProvi Optional optionalMember = findByOidcUser(oidcUser); Member member = optionalMember.orElseGet(() -> saveMember(oidcUser, provider)); + if (member.getStatus() == MemberStatus.DELETED){ + member.reEnroll(); + } + return getLoginResponse(member); } diff --git a/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java b/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java index c48ffc35..3670f1df 100644 --- a/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java +++ b/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java @@ -1,10 +1,11 @@ package com.amcamp.domain.auth.dto.response; +import com.fasterxml.jackson.annotation.JsonIgnore; import io.swagger.v3.oas.annotations.media.Schema; public record SocialLoginResponse( @Schema(description = "엑세스 토큰") String accessToken, - @Schema(description = "리프레시 토큰") String refreshToken) { + @JsonIgnore String refreshToken) { public static SocialLoginResponse of(String accessToken, String refreshToken) { return new SocialLoginResponse(accessToken, refreshToken); } diff --git a/src/main/java/com/amcamp/domain/member/api/.gitkeep b/src/main/java/com/amcamp/domain/member/api/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java new file mode 100644 index 00000000..a9226402 --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -0,0 +1,28 @@ +package com.amcamp.domain.member.api; + +import com.amcamp.domain.member.application.MemberService; +import com.amcamp.global.util.CookieUtil; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "회원 API", description = "회원 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/members") +public class MemberController { + + private final CookieUtil cookieUtil; + private final MemberService memberService; + + @Operation(summary = "회원 탈퇴", description = "회원 탈퇴를 진행합니다.") + @DeleteMapping("/withdrawal") + public ResponseEntity memberWithdrawal() { + memberService.withdrawalMember(); + return ResponseEntity.ok().headers(cookieUtil.deleteRefreshTokenCookie()).build(); + } +} diff --git a/src/main/java/com/amcamp/domain/member/application/.gitkeep b/src/main/java/com/amcamp/domain/member/application/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/amcamp/domain/member/application/MemberService.java b/src/main/java/com/amcamp/domain/member/application/MemberService.java new file mode 100644 index 00000000..ad86612c --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/application/MemberService.java @@ -0,0 +1,27 @@ +package com.amcamp.domain.member.application; + +import com.amcamp.domain.auth.dao.RefreshTokenRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.global.util.MemberUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +@RequiredArgsConstructor +public class MemberService { + + private final MemberUtil memberUtil; + private final RefreshTokenRepository refreshTokenRepository; + + public void withdrawalMember() { + Member currentMember = memberUtil.getCurrentMember(); + + refreshTokenRepository + .findById(currentMember.getId()) + .ifPresent(refreshTokenRepository::delete); + + currentMember.withdrawal(); + } +} diff --git a/src/main/java/com/amcamp/domain/member/domain/Member.java b/src/main/java/com/amcamp/domain/member/domain/Member.java index 5ff27ff1..bc3e9ffc 100644 --- a/src/main/java/com/amcamp/domain/member/domain/Member.java +++ b/src/main/java/com/amcamp/domain/member/domain/Member.java @@ -1,6 +1,8 @@ package com.amcamp.domain.member.domain; import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.MemberErrorCode; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -49,4 +51,16 @@ public static Member createMember(String nickname, String profileImageUrl, Oauth .role(MemberRole.USER) .build(); } + + public void withdrawal() { + if (this.status == MemberStatus.DELETED) { + throw new CommonException(MemberErrorCode.MEMBER_ALREADY_DELETED); + } + + this.status = MemberStatus.DELETED; + } + + public void reEnroll() { + this.status = MemberStatus.NORMAL; + } } diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index ba279ae0..4fadf4d9 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -45,7 +45,7 @@ private Components authSetting() { private SecurityRequirement securityRequirement() { SecurityRequirement securityRequirement = new SecurityRequirement(); - securityRequirement.addList("Authorization"); + securityRequirement.addList("accessToken"); return securityRequirement; } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java index bddac903..c0ee9e9a 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java @@ -7,6 +7,8 @@ public enum MemberErrorCode implements BaseErrorCode { MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다."), + + MEMBER_ALREADY_DELETED(HttpStatus.BAD_REQUEST, "이미 탈퇴한 회원입니다."), ; private final HttpStatus httpStatus; diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index 1b2418f4..f35dc811 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -24,4 +24,20 @@ public HttpHeaders generateRefreshTokenCookie(String refreshToken) { return headers; } + + public HttpHeaders deleteRefreshTokenCookie() { + ResponseCookie refreshTokenCookie = + ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") + .path("/") + .maxAge(0) + .secure(false) + .sameSite(Cookie.SameSite.NONE.attributeValue()) + .httpOnly(true) + .build(); + + HttpHeaders headers = new HttpHeaders(); + headers.add(HttpHeaders.SET_COOKIE, refreshTokenCookie.toString()); + + return headers; + } } diff --git a/src/main/java/com/amcamp/global/util/MemberUtil.java b/src/main/java/com/amcamp/global/util/MemberUtil.java index 0b50049a..c153924d 100644 --- a/src/main/java/com/amcamp/global/util/MemberUtil.java +++ b/src/main/java/com/amcamp/global/util/MemberUtil.java @@ -2,6 +2,7 @@ import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberStatus; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.AuthErrorCode; import com.amcamp.global.exception.errorcode.MemberErrorCode; @@ -17,12 +18,19 @@ public class MemberUtil { private final MemberRepository memberRepository; public Member getCurrentMember() { - return memberRepository - .findById(getCurrentMemberId()) - .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); + Member member = + memberRepository + .findById(getCurrentMemberId()) + .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); + + if (member.getStatus() == MemberStatus.DELETED){ + throw new CommonException(MemberErrorCode.MEMBER_ALREADY_DELETED); + } + + return member; } - public Long getCurrentMemberId() { + private Long getCurrentMemberId() { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); try { diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java new file mode 100644 index 00000000..ede6518d --- /dev/null +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -0,0 +1,83 @@ +package com.amcamp.domain.member.application; + +import com.amcamp.domain.auth.dao.RefreshTokenRepository; +import com.amcamp.domain.auth.domain.RefreshToken; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberStatus; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.MemberErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.MemberUtil; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.test.context.ActiveProfiles; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +@SpringBootTest +@ActiveProfiles("test") +class MemberServiceTest { + + @Autowired + private MemberUtil memberUtil; + @Autowired + private MemberService memberService; + @Autowired + private MemberRepository memberRepository; + @Autowired + private RefreshTokenRepository refreshTokenRepository; + + private Member registerAuthenticatedMember() { + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + + return member; + } + + @Nested + class 회원_탈퇴_시 { + @Test + void 탈퇴하지_않은_유저면_성공한다() { + // given + Member member = registerAuthenticatedMember(); + + RefreshToken refreshToken = + RefreshToken.builder().memberId(member.getId()).token("testRefreshToken").build(); + refreshTokenRepository.save(refreshToken); + + // when + memberService.withdrawalMember(); + Member currentMember = memberRepository.findById(member.getId()).get(); + + // then + assertThat(refreshTokenRepository.findById(member.getId())).isEmpty(); + assertThat(currentMember.getStatus()).isEqualTo(MemberStatus.DELETED); + } + + @Test + void 탈퇴한_유저면_예외가_발생한다() { + // given + registerAuthenticatedMember(); + memberService.withdrawalMember(); + + // when & then + assertThatThrownBy(() -> memberService.withdrawalMember()) + .isInstanceOf(CommonException.class) + .hasMessage(MemberErrorCode.MEMBER_ALREADY_DELETED.getMessage()); + } + } +} diff --git a/src/test/java/com/amcamp/global/util/MemberUtilTest.java b/src/test/java/com/amcamp/global/util/MemberUtilTest.java index b1f5630d..3454ab84 100644 --- a/src/test/java/com/amcamp/global/util/MemberUtilTest.java +++ b/src/test/java/com/amcamp/global/util/MemberUtilTest.java @@ -2,18 +2,18 @@ import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.global.security.PrincipalDetails; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; -import org.springframework.security.core.userdetails.User; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.test.context.ActiveProfiles; +import static org.assertj.core.api.Assertions.assertThat; + @SpringBootTest @ActiveProfiles("test") public class MemberUtilTest { @@ -23,23 +23,30 @@ public class MemberUtilTest { @Autowired private MemberRepository memberRepository; - @Test - void 로그인한_멤버의_정보를_조회한다() { + private Member registerAuthenticatedMember() { + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); - // given - UserDetails userDetails = new PrincipalDetails(1L, MemberRole.USER); + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(token); - Member savedMember = - memberRepository.save(Member.createMember("", null, null)); + return member; + } + + @Test + void 로그인한_멤버의_정보를_조회한다() { + + // given + Member member = registerAuthenticatedMember(); // when Member currentMember = memberUtil.getCurrentMember(); // then - Assertions.assertEquals(savedMember.getId(), currentMember.getId()); - Assertions.assertEquals(savedMember.getRole(), currentMember.getRole()); + assertThat(member.getId()).isEqualTo(currentMember.getId()); + assertThat(member.getRole()).isEqualTo(currentMember.getRole()); } } From 6cc0090cdbe284720142e2d7cb2249f64d9e8d5f Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 7 Feb 2025 15:24:35 +0900 Subject: [PATCH 019/107] =?UTF-8?q?chore:=20Querydsl=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=20(#42)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: querydsl 의존성 추가 * chore: querydsl config 추가 --- build.gradle | 10 ++++++++++ .../config/querydsl/QueryDslConfig.java | 19 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java diff --git a/build.gradle b/build.gradle index 9207a185..2f948679 100644 --- a/build.gradle +++ b/build.gradle @@ -65,12 +65,22 @@ dependencies { // Oauth2 Jose implementation 'org.springframework.security:spring-security-oauth2-jose' + + // 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" } tasks.named('test') { useJUnitPlatform() } +clean { + delete file('src/main/generated') +} + tasks.withType(Checkstyle) { reports { xml.required = true diff --git a/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java b/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java new file mode 100644 index 00000000..f5174619 --- /dev/null +++ b/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java @@ -0,0 +1,19 @@ +package com.amcamp.global.config.querydsl; + +import com.querydsl.jpa.impl.JPAQueryFactory; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class QueryDslConfig { + + @PersistenceContext + private EntityManager entityManager; + + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } +} From 0c40236050293b80009c8de72721ecc47ac24b29 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sun, 9 Feb 2025 23:01:00 +0900 Subject: [PATCH 020/107] =?UTF-8?q?feat:=20=ED=8C=80=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=20=EB=B0=8F=20=EC=B0=B8=EC=97=AC=20=EA=B5=AC=ED=98=84=20(#44)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 팀 서비스 구현 * feat: 팀 참가 서비스 구현 * feat: 팀 api 구현 * test: 팀 서비스 테스트 * chore: RedisTemplate 추가 * feat: 팀 초대 코드 서비스 추가 * fix: 팀 생성/참가 기능에 초대 코드 추가 * fix: response에서 data 내부로 이중 반환하는 문제 수정 * test: 초대코드 서비스 테스트 * test: 팀 서비스 테스트 수정 * refactor: 팀 생성/참여 관련 swagger 설명 추가 * chore: redisUtil 구현 * refactor: 팀 컨트롤러 반환 값 변경 및 코드 컨벤션 * fix: 팀 생성 요청 스키마 설정 * refactor: 메소드 명 수정 * fix: dto 스키마 설정 * test: 팀 생성/참여 관련 서비스 테스트 * fix: 스키마 재설정과 @Valid 설정 * fix: dto 스키마 수정 * refactor: 팀 서비스 assertThat & Nested 사용 수정 * refactor: 팀 서비스 테스트 @BeforeEach 삭제 * refactor: redisConstants 설정 * refactor: randomUtil 설정 * refactor: dto 스키마 --- .../dao/ParticipantRepository.java | 12 + .../participant/domain/Participant.java | 46 ++++ .../participant/domain/ParticipantRole.java | 16 ++ .../domain/team/api/TeamController.java | 48 ++++ .../domain/team/application/TeamService.java | 89 ++++++++ .../domain/team/dao/TeamRepository.java | 7 + .../com/amcamp/domain/team/domain/Team.java | 33 +++ .../team/dto/request/TeamCreateRequest.java | 17 ++ .../dto/request/TeamInviteCodeRequest.java | 12 + .../team/dto/response/TeamInfoResponse.java | 12 + .../dto/response/TeamInviteCodeResponse.java | 10 + .../common/constants/RedisConstants.java | 13 ++ .../exception/errorcode/TeamErrorCode.java | 24 ++ .../com/amcamp/global/util/RandomUtil.java | 30 +++ .../com/amcamp/global/util/RedisUtil.java | 28 +++ .../infra/config/redis/RedisConfig.java | 12 + .../amcamp/domain/team/TeamServiceTest.java | 210 ++++++++++++++++++ 17 files changed, 619 insertions(+) create mode 100644 src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java create mode 100644 src/main/java/com/amcamp/domain/participant/domain/Participant.java create mode 100644 src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java create mode 100644 src/main/java/com/amcamp/domain/team/api/TeamController.java create mode 100644 src/main/java/com/amcamp/domain/team/application/TeamService.java create mode 100644 src/main/java/com/amcamp/domain/team/dao/TeamRepository.java create mode 100644 src/main/java/com/amcamp/domain/team/domain/Team.java create mode 100644 src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java create mode 100644 src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java create mode 100644 src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java create mode 100644 src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java create mode 100644 src/main/java/com/amcamp/global/common/constants/RedisConstants.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java create mode 100644 src/main/java/com/amcamp/global/util/RandomUtil.java create mode 100644 src/main/java/com/amcamp/global/util/RedisUtil.java create mode 100644 src/test/java/com/amcamp/domain/team/TeamServiceTest.java diff --git a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java new file mode 100644 index 00000000..245d413a --- /dev/null +++ b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java @@ -0,0 +1,12 @@ +package com.amcamp.domain.participant.dao; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.participant.domain.Participant; +import com.amcamp.domain.team.domain.Team; +import org.springframework.data.jpa.repository.JpaRepository; + +import java.util.Optional; + +public interface ParticipantRepository extends JpaRepository { + Optional findByMemberAndTeam(Member member, Team team); +} diff --git a/src/main/java/com/amcamp/domain/participant/domain/Participant.java b/src/main/java/com/amcamp/domain/participant/domain/Participant.java new file mode 100644 index 00000000..afe38914 --- /dev/null +++ b/src/main/java/com/amcamp/domain/participant/domain/Participant.java @@ -0,0 +1,46 @@ +package com.amcamp.domain.participant.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.team.domain.Team; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Participant extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "participant_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id") + private Team team; + + @Enumerated(EnumType.STRING) + private ParticipantRole role; + + @Builder(access = AccessLevel.PRIVATE) + private Participant(Member member, Team team, ParticipantRole role) { + this.member = member; + this.team = team; + this.role = role; + } + + public static Participant createParticipant(Member member, Team team, ParticipantRole role) { + return Participant.builder() + .member(member) + .team(team) + .role(role) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java b/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java new file mode 100644 index 00000000..271d3ee9 --- /dev/null +++ b/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java @@ -0,0 +1,16 @@ +package com.amcamp.domain.participant.domain; + + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ParticipantRole { + + ADMIN("TEAM_ADMIN"), + USER("TEAM_USER"), + ; + + private final String role; +} diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java new file mode 100644 index 00000000..94a3dd1e --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -0,0 +1,48 @@ +package com.amcamp.domain.team.api; + +import com.amcamp.domain.participant.domain.Participant; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.response.TeamInfoResponse; +import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "팀 API", description = "팀 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/teams") +public class TeamController { + private final TeamService teamService; + + @Operation(summary = "팀 생성", description = "팀을 생성합니다.") + @PostMapping("/create") + public TeamInviteCodeResponse teamCreate (@Valid @RequestBody TeamCreateRequest teamCreateRequest){ + return teamService.createTeam(teamCreateRequest.teamName(), teamCreateRequest.teamDescription()); + } + + @Operation(summary = "코드 확인", description = "팀 가입을 위한 초대 코드를 확인합니다.") + @GetMapping("{teamId}/invite-code") + public TeamInviteCodeResponse teamInvite (@PathVariable Long teamId){ + return teamService.getTeamCode(teamId); + } + + @Operation(summary = "팀 참가 전 팀 확인", description = "초대 코드를 입력하여 참여하려고 하는 팀 정보를 확인합니다.") + @PostMapping("/check") + public TeamInfoResponse teamCheck (@Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest){ + return teamService.getTeamInfo(teamInviteCodeRequest.inviteCode()); + } + + @Operation(summary = "팀 참가", description = "팀 정보를 확인 후 팀에 참가합니다.") + @PostMapping("/join") + public ResponseEntity teamJoin (@Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest){ + teamService.joinTeam(teamInviteCodeRequest.inviteCode()); + return ResponseEntity.ok().build(); + } +} diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java new file mode 100644 index 00000000..9bdeb27e --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -0,0 +1,89 @@ +package com.amcamp.domain.team.application; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.participant.dao.ParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.participant.domain.Participant; +import com.amcamp.domain.participant.domain.ParticipantRole; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.response.TeamInfoResponse; +import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.util.MemberUtil; +import com.amcamp.global.util.RandomUtil; +import com.amcamp.global.util.RedisUtil; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; +import static com.amcamp.global.common.constants.RedisConstants.*; + +@Transactional +@Service +@RequiredArgsConstructor +@Slf4j +public class TeamService{ + private final MemberUtil memberUtil; + private final TeamRepository teamRepository; + private final ParticipantRepository participantRepository; + private final RedisUtil redisUtil; + private final RandomUtil randomUtil; + + public TeamInviteCodeResponse createTeam(String teamName, String teamDescription) { + Member member = memberUtil.getCurrentMember(); + + Team team = Team.createTeam(teamName, teamDescription); + teamRepository.save(team); + + Participant participant = Participant.createParticipant(member, team, ParticipantRole.ADMIN); + participantRepository.save(participant); + + String code = randomUtil.generateCode(team.getId()); + + return new TeamInviteCodeResponse(code); + } + + + public TeamInviteCodeResponse getTeamCode (Long teamId) { + Team team = teamRepository.findById(teamId) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + String code = randomUtil.generateCode(team.getId()); + + return new TeamInviteCodeResponse(code); + } + + public TeamInfoResponse getTeamInfo (String inviteCode){ + Team team = searchTeamByCode(inviteCode); + return new TeamInfoResponse(team.getId(), team.getTeamName()); + } + + + public void joinTeam (String inviteCode) { + Member member = memberUtil.getCurrentMember(); + Team team = searchTeamByCode(inviteCode); + validateTeamJoin(member, team); + + Participant participant = Participant.createParticipant(member, team, ParticipantRole.USER); + participantRepository.save(participant); + + } + + private Team searchTeamByCode(String inviteCode){ + Long teamId = redisUtil.getData(INVITE_CODE_PREFIX.formatted(inviteCode)) + .map(Long::valueOf) + .orElseThrow(() -> new CommonException(TeamErrorCode.INVALID_INVITE_CODE)); + + return teamRepository.findById(teamId).orElseThrow(() -> + new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + } + + private void validateTeamJoin(Member member, Team team) { + + if (participantRepository.findByMemberAndTeam(member, team).isPresent()) { + throw new CommonException(TeamErrorCode.MEMBER_ALREADY_JOINED); + } + } +} diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java b/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java new file mode 100644 index 00000000..d7f20610 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.team.dao; + +import com.amcamp.domain.team.domain.Team; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TeamRepository extends JpaRepository { +} diff --git a/src/main/java/com/amcamp/domain/team/domain/Team.java b/src/main/java/com/amcamp/domain/team/domain/Team.java new file mode 100644 index 00000000..32c087d7 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/domain/Team.java @@ -0,0 +1,33 @@ +package com.amcamp.domain.team.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Team extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "team_id") + private Long id; + private String teamName; + private String teamDescription; + + @Builder(access = AccessLevel.PRIVATE) + private Team(String teamName, String teamDescription){ + this.teamName = teamName; + this.teamDescription = teamDescription; + } + + public static Team createTeam (String teamName, String teamDescription){ + return Team.builder() + .teamName(teamName) + .teamDescription(teamDescription) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java new file mode 100644 index 00000000..e93001c8 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java @@ -0,0 +1,17 @@ +package com.amcamp.domain.team.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + +public record TeamCreateRequest( + @NotEmpty(message = "팀 이름은 필수 사항입니다.") + @Size(max = 25, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Schema(description = "팀 이름", example = "LG CNS AM CAMP") + String teamName, + + @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") + @Schema(description = "팀 설명", example = "LG CNS AM CAMP에서 운영하는 팀입니다.") + String teamDescription){ +} diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java new file mode 100644 index 00000000..0237d8c0 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java @@ -0,0 +1,12 @@ +package com.amcamp.domain.team.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + +public record TeamInviteCodeRequest( + @NotEmpty + @Size(min = 8, max = 8, message = "8자리 초대 코드를 입력해주세요.") + @Schema(description = "팀 코드", example = "FFbKeJvJ") + String inviteCode) { +} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java new file mode 100644 index 00000000..7500e1bc --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java @@ -0,0 +1,12 @@ +package com.amcamp.domain.team.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + +public record TeamInfoResponse( + @Schema(description = "팀 아이디", example = "1") + Long teamId, + @Schema(description = "팀 이름", example = "LG CNS AM CAMP") + String teamName) { +} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java new file mode 100644 index 00000000..fe9c8fd8 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java @@ -0,0 +1,10 @@ +package com.amcamp.domain.team.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.Size; + +public record TeamInviteCodeResponse( + @Schema(description = "초대 코드", example = "FFbKeJvJ") + String inviteCode) { +} diff --git a/src/main/java/com/amcamp/global/common/constants/RedisConstants.java b/src/main/java/com/amcamp/global/common/constants/RedisConstants.java new file mode 100644 index 00000000..c6c46d7b --- /dev/null +++ b/src/main/java/com/amcamp/global/common/constants/RedisConstants.java @@ -0,0 +1,13 @@ +package com.amcamp.global.common.constants; + +import java.security.SecureRandom; +import java.util.Base64; + +public final class RedisConstants { + public static final SecureRandom secureRandom = new SecureRandom(); + public static final Base64.Encoder base64Encoder = Base64.getUrlEncoder(); + + public static final String TEAM_ID_PREFIX = "teamId=%d"; + public static final String INVITE_CODE_PREFIX = "inviteCode=%s"; + public static final long expirationTime = 24; +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java new file mode 100644 index 00000000..28471792 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java @@ -0,0 +1,24 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; +@Getter +public enum TeamErrorCode implements BaseErrorCode{ + TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 팀을 찾을 수 없습니다."), + MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), + TEAM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 참여자가 아닙니다."), + INVALID_INVITE_CODE(HttpStatus.NOT_FOUND,"팀이 존재하지 않거나 코드가 만료되었습니다." ); + + private final HttpStatus httpStatus; + private final String message; + + TeamErrorCode(HttpStatus httpStatus, String message){ + this.httpStatus = httpStatus; + this.message = message; + } + + @Override + public String getCodeName() { + return this.name(); + } +} diff --git a/src/main/java/com/amcamp/global/util/RandomUtil.java b/src/main/java/com/amcamp/global/util/RandomUtil.java new file mode 100644 index 00000000..2dad409c --- /dev/null +++ b/src/main/java/com/amcamp/global/util/RandomUtil.java @@ -0,0 +1,30 @@ +package com.amcamp.global.util; + +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; +import com.amcamp.global.util.RedisUtil; +import java.util.Optional; + +import static com.amcamp.global.common.constants.RedisConstants.*; + +@Component +@RequiredArgsConstructor +public class RandomUtil { + private final RedisUtil redisUtil; + private static String codeGenerator(int length){ + byte[] randomBytes = new byte[length]; + secureRandom.nextBytes(randomBytes); + return base64Encoder.encodeToString(randomBytes); + } + public String generateCode(Long teamId) { + final Optional existingCode = redisUtil.getData(TEAM_ID_PREFIX.formatted(teamId)); + + if (existingCode.isEmpty()) { + String inviteCode = codeGenerator(6); + redisUtil.setDataExpire(TEAM_ID_PREFIX.formatted(teamId), inviteCode, expirationTime); + redisUtil.setDataExpire(INVITE_CODE_PREFIX.formatted(inviteCode), teamId.toString(), expirationTime); + return inviteCode; + } + return existingCode.get(); + } +} diff --git a/src/main/java/com/amcamp/global/util/RedisUtil.java b/src/main/java/com/amcamp/global/util/RedisUtil.java new file mode 100644 index 00000000..3255e16e --- /dev/null +++ b/src/main/java/com/amcamp/global/util/RedisUtil.java @@ -0,0 +1,28 @@ +package com.amcamp.global.util; + +import lombok.RequiredArgsConstructor; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.core.ValueOperations; +import org.springframework.stereotype.Component; + +import java.time.Duration; +import java.util.Optional; + +@Component +@RequiredArgsConstructor +public class RedisUtil { + private final StringRedisTemplate redisTemplate; + + public void setDataExpire(final String key, String value, final long durationHours) { + final ValueOperations valueOperations = redisTemplate.opsForValue(); + final Duration expireDuration = Duration.ofHours(durationHours); + + valueOperations.set(key, value, expireDuration); + } + public Optional getData(final String key) { + final ValueOperations valueOperations = redisTemplate.opsForValue(); + final String value = valueOperations.get(key); + + return Optional.ofNullable(value); + } +} diff --git a/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java b/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java index 92846dff..53c5b66b 100644 --- a/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java +++ b/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java @@ -7,6 +7,10 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; +import org.springframework.data.redis.core.RedisTemplate; +import org.springframework.data.redis.core.StringRedisTemplate; +import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; +import org.springframework.data.redis.serializer.StringRedisSerializer; import java.time.Duration; @@ -32,4 +36,12 @@ public RedisConnectionFactory redisConnectionFactory() { return new LettuceConnectionFactory(redisStandaloneConfig, lettuceClientConfig); } + @Bean + public StringRedisTemplate redisTemplate() { + final StringRedisTemplate redisTemplate = new StringRedisTemplate(); + redisTemplate.setConnectionFactory(redisConnectionFactory()); + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new StringRedisSerializer()); + return redisTemplate; + } } diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java new file mode 100644 index 00000000..46e39564 --- /dev/null +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -0,0 +1,210 @@ +package com.amcamp.domain.team; + +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.participant.dao.ParticipantRepository; +import com.amcamp.domain.participant.domain.Participant; +import com.amcamp.domain.participant.domain.ParticipantRole; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.response.TeamInfoResponse; +import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.transaction.annotation.Transactional; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest +@ActiveProfiles("test") +public class TeamServiceTest { + @Autowired + private TeamRepository teamRepository; + @Autowired + private MemberRepository memberRepository; + @Autowired + private ParticipantRepository participantRepository; + @Autowired + private TeamService teamService; + + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + @Nested + class 팀_생성_시 { + @Test + void 초대코드를_반환한다 () { + // given + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + // when + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + + // then + assertThat(inviteCodeResponse).isNotNull(); + assertThat(inviteCodeResponse.inviteCode()).isNotNull(); + assertThat(inviteCodeResponse.inviteCode()).hasSize(8); + } + } + + @Nested + class 팀_아이디로_코드확인_시{ + @Test + void 팀이_유효한_경우에는_초대코드를_반환한다 (){ + // given + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + Long teamId = teamService.getTeamInfo(inviteCodeResponse.inviteCode()).teamId(); + + // when + TeamInviteCodeResponse response = teamService.getTeamCode(teamId); + + // then + assertThat(response).isNotNull(); + assertThat(response.inviteCode()).isNotNull(); + assertThat(response.inviteCode()).hasSize(8); + } + + @Test + void 팀이_유효하지않는_경우에는_예외가_발생한다 (){ + // given + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + + // when & then + assertThatThrownBy(() -> teamService.getTeamCode(-999L)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); + + } + } + @Nested + class 팀_참가_시{ + @Test + @Transactional + void 새롭게_참여하는_경우에는_팀에_USER로_등록된다(){ + //given + // 1. savedAdmin 로그인 후 팀 생성 + Member savedAdmin = Member.createMember("admin", "testProfileImageUrl", + OauthInfo.createOauthInfo("adminOauthId", "adminOauthProvider")); + memberRepository.save(savedAdmin); + loginAs(savedAdmin); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + String inviteCode = inviteCodeResponse.inviteCode(); + + + // 2. savedMember 로그인 처리 후 팀 참여 + Member savedMember = memberRepository.save(Member.createMember("member", null, null)); +// UserDetails newUserDetails = new PrincipalDetails(savedMember.getId(), savedMember.getRole()); +// UsernamePasswordAuthenticationToken newToken = +// new UsernamePasswordAuthenticationToken(newUserDetails, null, newUserDetails.getAuthorities()); +// SecurityContextHolder.getContext().setAuthentication(newToken); + loginAs(savedMember); + + // when + teamService.joinTeam(inviteCode); + + // then + TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(inviteCode); + Team savedTeam = teamRepository.findById(teamInfoResponse.teamId()).orElseThrow(() + -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + Participant participant = participantRepository.findByMemberAndTeam(savedMember, savedTeam) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + + assertThat(participant.getMember()).isEqualTo(savedMember); + assertThat(participant.getRole()).isEqualTo(ParticipantRole.USER); + assertThat(participant.getTeam()).isEqualTo(savedTeam); + + } + @Test + void 이미_팀에_참가한_경우에는_예외가_발생한다(){ + //given + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + String inviteCode = inviteCodeResponse.inviteCode(); + + // when & then + assertThatThrownBy(() -> teamService.joinTeam(inviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.MEMBER_ALREADY_JOINED); + } + } + @Nested + class 초대코드로_팀_확인_시{ + @Test + void 코드가_유효한_경우에는_팀_정보를_반환한다(){ + //given + Member member = Member.createMember("testNickName", "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + String validInviteCode = inviteCodeResponse.inviteCode(); + + // when + TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(validInviteCode); + + // then + assertThat(teamInfoResponse).isNotNull(); + assertThat(teamInfoResponse.teamId()).isNotNull(); + + Team savedTeam = teamRepository.findById(teamInfoResponse.teamId()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + assertThat(teamInfoResponse.teamName()).isEqualTo(savedTeam.getTeamName()); + assertThat(teamInfoResponse.teamId()).isEqualTo(savedTeam.getId()); + } + + @Test + void 코드가_유효하지않는_경우에는_예외를_반환한다(){ + // given + String invalidInviteCode = "invalidCode"; + + // when & then + assertThatThrownBy(() -> teamService.getTeamInfo(invalidInviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); + } + } +} From 1240c701329d5b85d39c77534aaa63fc8a3fcc2d Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 10 Feb 2025 16:51:22 +0900 Subject: [PATCH 021/107] =?UTF-8?q?refactor:=20Spotless=20Code=20Formatter?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9=20(#51)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: checkstyle 제거 * chore: spotless 플러그인 추가 및 설정 * style: spotless * chore: pre-commit 파일 생성 * chore: build.gradle 스크립트 추가 --- .github/workflows/develop_pull_request.yml | 4 - build.gradle | 38 +- config/checkstyle/naver-checkstyle-rules.xml | 433 ------------------ .../naver-checkstyle-suppressions.xml | 7 - scripts/pre-commit | 12 + .../java/com/amcamp/DevFitApplication.java | 1 - .../domain/auth/application/AuthService.java | 12 +- .../auth/application/GoogleService.java | 13 +- .../auth/application/IdTokenVerifier.java | 91 ++-- .../auth/application/JwtTokenService.java | 14 +- .../domain/auth/application/KakaoService.java | 13 +- .../auth/dao/RefreshTokenRepository.java | 3 +- .../domain/auth/domain/OauthProvider.java | 5 +- .../domain/auth/domain/RefreshToken.java | 6 +- .../domain/auth/dto/AccessTokenDto.java | 6 +- .../domain/auth/dto/RefreshTokenDto.java | 6 +- .../auth/dto/request/AuthCodeRequest.java | 6 +- .../dto/response/SocialLoginResponse.java | 3 +- .../domain/common/model/BaseTimeEntity.java | 12 +- .../domain/member/api/MemberController.java | 16 +- .../member/application/MemberService.java | 18 +- .../domain/member/dao/MemberRepository.java | 3 +- .../amcamp/domain/member/domain/Member.java | 30 +- .../domain/member/domain/MemberRole.java | 9 +- .../domain/member/domain/MemberStatus.java | 11 +- .../domain/member/domain/OauthInfo.java | 23 +- .../dao/ParticipantRepository.java | 5 +- .../participant/domain/Participant.java | 46 +- .../participant/domain/ParticipantRole.java | 10 +- .../domain/team/api/TeamController.java | 54 +-- .../domain/team/application/TeamService.java | 133 +++--- .../domain/team/dao/TeamRepository.java | 3 +- .../com/amcamp/domain/team/domain/Team.java | 32 +- .../team/dto/request/TeamCreateRequest.java | 17 +- .../dto/request/TeamInviteCodeRequest.java | 9 +- .../team/dto/response/TeamInfoResponse.java | 9 +- .../dto/response/TeamInviteCodeResponse.java | 6 +- .../common/constants/RedisConstants.java | 10 +- .../common/constants/SecurityConstants.java | 22 +- .../common/response/CommonResponse.java | 45 +- .../common/response/CommonResponseAdvice.java | 41 +- .../global/config/feign/FeignConfig.java | 3 +- .../config/querydsl/QueryDslConfig.java | 11 +- .../config/security/WebSecurityConfig.java | 82 ++-- .../global/config/swagger/SwaggerConfig.java | 64 ++- .../global/exception/CommonException.java | 27 +- .../amcamp/global/exception/ErrorDetail.java | 8 +- .../com/amcamp/global/exception/ErrorMsg.java | 12 +- .../exception/GlobalExceptionHandler.java | 25 +- .../exception/errorcode/AuthErrorCode.java | 49 +- .../exception/errorcode/BaseErrorCode.java | 21 +- .../exception/errorcode/MemberErrorCode.java | 27 +- .../exception/errorcode/ProjectErrorCode.java | 24 +- .../exception/errorcode/TeamErrorCode.java | 31 +- .../security/JwtAuthenticationFilter.java | 28 +- .../global/security/PrincipalDetails.java | 79 ++-- .../com/amcamp/global/util/CookieUtil.java | 34 +- .../java/com/amcamp/global/util/JwtUtil.java | 15 +- .../com/amcamp/global/util/MemberUtil.java | 16 +- .../com/amcamp/global/util/RandomUtil.java | 42 +- .../com/amcamp/global/util/RedisUtil.java | 28 +- .../infra/config/feign/GoogleOauthClient.java | 25 +- .../infra/config/feign/KakaoOauthClient.java | 25 +- .../infra/config/jpa/JpaAuditingConfig.java | 3 +- .../infra/config/jwt/JwtProperties.java | 23 +- .../infra/config/oauth/GoogleProperties.java | 6 +- .../infra/config/oauth/KakaoProperties.java | 6 +- .../config/properties/PropertiesConfig.java | 8 +- .../infra/config/redis/RedisConfig.java | 52 +-- .../com/amcamp/DevFitApplicationTests.java | 4 +- .../member/application/MemberServiceTest.java | 99 ++-- .../amcamp/domain/team/TeamServiceTest.java | 383 ++++++++-------- .../exception/ExceptionHandlerTest.java | 130 +++--- .../amcamp/global/util/MemberUtilTest.java | 54 +-- 74 files changed, 1127 insertions(+), 1554 deletions(-) delete mode 100644 config/checkstyle/naver-checkstyle-rules.xml delete mode 100644 config/checkstyle/naver-checkstyle-suppressions.xml create mode 100644 scripts/pre-commit diff --git a/.github/workflows/develop_pull_request.yml b/.github/workflows/develop_pull_request.yml index ec623d75..770868d7 100644 --- a/.github/workflows/develop_pull_request.yml +++ b/.github/workflows/develop_pull_request.yml @@ -32,10 +32,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x ./gradlew - - name: Code Formatting Check With CheckStyle - run: | - ./gradlew checkstyleMain checkstyleTest - - name: Test run: | ./gradlew test diff --git a/build.gradle b/build.gradle index 2f948679..cd178020 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ plugins { id 'java' id 'org.springframework.boot' version '3.4.1' id 'io.spring.dependency-management' version '1.1.7' - id 'checkstyle' + id 'com.diffplug.spotless' version '6.20.0' } group = 'com.amcamp' @@ -81,16 +81,36 @@ clean { delete file('src/main/generated') } -tasks.withType(Checkstyle) { - reports { - xml.required = true - html.required = true +jar.enabled = true + +spotless { + java { + // Google Java 포맷 적용 + /* + googleJavaFormat() : 탭은 2개의 공백 + googleJavaFormat().aosp() : 탭은 4개의 공백 + [참고] https://github.com/google/google-java-format/issues/525 + */ + googleJavaFormat().aosp() + // import 순서 정렬 + importOrder() + // 사용하지 않는 import 제거 + removeUnusedImports() + // 각 라인 끝에 있는 공백을 제거 + trimTrailingWhitespace() + // 파일 끝에 새로운 라인 추가 + endWithNewline() } } -checkstyle { - configFile = file("config/checkstyle/naver-checkstyle-rules.xml") - configProperties = ['suppressionFile': file("config/checkstyle/naver-checkstyle-suppressions.xml")] +tasks.register('updateGitHooks', Copy) { + from './scripts/pre-commit' + into './.git/hooks' } -jar.enabled = true +tasks.register('makeGitHooksExecutable', Exec) { + commandLine 'chmod', '+x', './.git/hooks/pre-commit' + dependsOn updateGitHooks +} + +compileJava.dependsOn makeGitHooksExecutable diff --git a/config/checkstyle/naver-checkstyle-rules.xml b/config/checkstyle/naver-checkstyle-rules.xml deleted file mode 100644 index dafbb4d1..00000000 --- a/config/checkstyle/naver-checkstyle-rules.xml +++ /dev/null @@ -1,433 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/config/checkstyle/naver-checkstyle-suppressions.xml b/config/checkstyle/naver-checkstyle-suppressions.xml deleted file mode 100644 index 3f11e0cd..00000000 --- a/config/checkstyle/naver-checkstyle-suppressions.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/scripts/pre-commit b/scripts/pre-commit new file mode 100644 index 00000000..ac68c3ce --- /dev/null +++ b/scripts/pre-commit @@ -0,0 +1,12 @@ +#!/bin/sh + +stagedFiles=$(git diff --staged --name-only) + +echo "Running SpotlessApply. Formatting Code..." +./gradlew spotlessApply + +for file in $stagedFiles; do + if test -f "$file"; then + git add $file + fi +done diff --git a/src/main/java/com/amcamp/DevFitApplication.java b/src/main/java/com/amcamp/DevFitApplication.java index 9d534e01..ec2d282a 100644 --- a/src/main/java/com/amcamp/DevFitApplication.java +++ b/src/main/java/com/amcamp/DevFitApplication.java @@ -9,5 +9,4 @@ public class DevFitApplication { public static void main(String[] args) { SpringApplication.run(DevFitApplication.class, args); } - } diff --git a/src/main/java/com/amcamp/domain/auth/application/AuthService.java b/src/main/java/com/amcamp/domain/auth/application/AuthService.java index 103689c6..5b8b83a8 100644 --- a/src/main/java/com/amcamp/domain/auth/application/AuthService.java +++ b/src/main/java/com/amcamp/domain/auth/application/AuthService.java @@ -7,14 +7,13 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.MemberStatus; import com.amcamp.domain.member.domain.OauthInfo; +import java.util.Optional; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.security.oauth2.core.oidc.user.OidcUser; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; - @Transactional @Service @RequiredArgsConstructor @@ -35,9 +34,9 @@ public SocialLoginResponse socialLoginMember(AuthCodeRequest request, OauthProvi Optional optionalMember = findByOidcUser(oidcUser); Member member = optionalMember.orElseGet(() -> saveMember(oidcUser, provider)); - if (member.getStatus() == MemberStatus.DELETED){ - member.reEnroll(); - } + if (member.getStatus() == MemberStatus.DELETED) { + member.reEnroll(); + } return getLoginResponse(member); } @@ -69,8 +68,7 @@ private Member saveMember(OidcUser oidcUser, OauthProvider provider) { } private OauthInfo extractOauthInfo(OidcUser oidcUser) { - return OauthInfo.createOauthInfo( - oidcUser.getSubject(), oidcUser.getIssuer().toString()); + return OauthInfo.createOauthInfo(oidcUser.getSubject(), oidcUser.getIssuer().toString()); } private String getDisplayName(OidcUser oidcUser, OauthProvider provider) { diff --git a/src/main/java/com/amcamp/domain/auth/application/GoogleService.java b/src/main/java/com/amcamp/domain/auth/application/GoogleService.java index 250d24f3..11dafcc8 100644 --- a/src/main/java/com/amcamp/domain/auth/application/GoogleService.java +++ b/src/main/java/com/amcamp/domain/auth/application/GoogleService.java @@ -14,12 +14,13 @@ public class GoogleService { private final GoogleProperties googleProperties; public String getIdToken(String code) { - IdTokenResponse response = googleOauthClient.getIdToken( - googleProperties.grantType(), - googleProperties.clientId(), - googleProperties.redirectUri(), - code, - googleProperties.clientSecret()); + IdTokenResponse response = + googleOauthClient.getIdToken( + googleProperties.grantType(), + googleProperties.clientId(), + googleProperties.redirectUri(), + code, + googleProperties.clientSecret()); return response.id_token(); } diff --git a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java index 6c978f22..a882724c 100644 --- a/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java +++ b/src/main/java/com/amcamp/domain/auth/application/IdTokenVerifier.java @@ -5,6 +5,8 @@ import com.amcamp.global.exception.errorcode.AuthErrorCode; import com.amcamp.infra.config.oauth.GoogleProperties; import com.amcamp.infra.config.oauth.KakaoProperties; +import java.time.Instant; +import java.util.Map; import lombok.RequiredArgsConstructor; import org.springframework.security.oauth2.core.oidc.OidcIdToken; import org.springframework.security.oauth2.core.oidc.user.DefaultOidcUser; @@ -14,68 +16,63 @@ import org.springframework.security.oauth2.jwt.NimbusJwtDecoder; import org.springframework.stereotype.Component; -import java.time.Instant; -import java.util.Map; - @Component @RequiredArgsConstructor public class IdTokenVerifier { - private final KakaoProperties kakaoProperties; - private final GoogleProperties googleProperties; + private final KakaoProperties kakaoProperties; + private final GoogleProperties googleProperties; - private final Map decoders = - Map.of( - OauthProvider.GOOGLE, buildDecoder(OauthProvider.GOOGLE.getJwkSetUrl()), - OauthProvider.KAKAO, buildDecoder(OauthProvider.KAKAO.getJwkSetUrl())); + private final Map decoders = + Map.of( + OauthProvider.GOOGLE, buildDecoder(OauthProvider.GOOGLE.getJwkSetUrl()), + OauthProvider.KAKAO, buildDecoder(OauthProvider.KAKAO.getJwkSetUrl())); - private JwtDecoder buildDecoder(String jwkSetUrl) { - return NimbusJwtDecoder - .withJwkSetUri(jwkSetUrl) - .build(); - } + private JwtDecoder buildDecoder(String jwkSetUrl) { + return NimbusJwtDecoder.withJwkSetUri(jwkSetUrl).build(); + } - public OidcUser getOidcUser(String idToken, OauthProvider provider) { - Jwt jwt = getJwt(idToken, provider); - OidcIdToken oidcIdToken = getOidcIdToken(jwt); + public OidcUser getOidcUser(String idToken, OauthProvider provider) { + Jwt jwt = getJwt(idToken, provider); + OidcIdToken oidcIdToken = getOidcIdToken(jwt); - validateAudience(oidcIdToken, provider.getClientId(googleProperties, kakaoProperties)); - validateIssuer(oidcIdToken, provider.getIssuer()); - validateExpiresAt(oidcIdToken); + validateAudience(oidcIdToken, provider.getClientId(googleProperties, kakaoProperties)); + validateIssuer(oidcIdToken, provider.getIssuer()); + validateExpiresAt(oidcIdToken); - return new DefaultOidcUser(null, oidcIdToken); - } + return new DefaultOidcUser(null, oidcIdToken); + } - private Jwt getJwt(String idToken, OauthProvider provider) { - return decoders.get(provider).decode(idToken); - } + private Jwt getJwt(String idToken, OauthProvider provider) { + return decoders.get(provider).decode(idToken); + } - private OidcIdToken getOidcIdToken(Jwt jwt) { - return new OidcIdToken( - jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), jwt.getClaims()); - } + private OidcIdToken getOidcIdToken(Jwt jwt) { + return new OidcIdToken( + jwt.getTokenValue(), jwt.getIssuedAt(), jwt.getExpiresAt(), jwt.getClaims()); + } - private void validateAudience(OidcIdToken oidcIdToken, String clientId) { - String idTokenAudience = oidcIdToken.getAudience().get(0); + private void validateAudience(OidcIdToken oidcIdToken, String clientId) { + String idTokenAudience = oidcIdToken.getAudience().get(0); - if (idTokenAudience == null || !idTokenAudience.equals(clientId)) { - throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); - } - } + if (idTokenAudience == null || !idTokenAudience.equals(clientId)) { + throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + } + } - private void validateIssuer(OidcIdToken oidcIdToken, String issuer) { - String idTokenIssuer = oidcIdToken.getIssuer().toString(); + private void validateIssuer(OidcIdToken oidcIdToken, String issuer) { + String idTokenIssuer = oidcIdToken.getIssuer().toString(); - if (idTokenIssuer == null || !idTokenIssuer.equals(issuer)) { - throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); - } - } + if (idTokenIssuer == null || !idTokenIssuer.equals(issuer)) { + throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + } + } - private void validateExpiresAt(OidcIdToken oidcIdToken) { - Instant expiresAt = oidcIdToken.getExpiresAt(); + private void validateExpiresAt(OidcIdToken oidcIdToken) { + Instant expiresAt = oidcIdToken.getExpiresAt(); - if (expiresAt == null || expiresAt.isBefore(Instant.now())) { - throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); - } - } + if (expiresAt == null || expiresAt.isBefore(Instant.now())) { + throw new CommonException(AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED); + } + } } diff --git a/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java b/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java index e6200cb3..8c555164 100644 --- a/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java +++ b/src/main/java/com/amcamp/domain/auth/application/JwtTokenService.java @@ -1,5 +1,7 @@ package com.amcamp.domain.auth.application; +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_ROLE_NAME; + import com.amcamp.domain.auth.dao.RefreshTokenRepository; import com.amcamp.domain.auth.domain.RefreshToken; import com.amcamp.domain.auth.dto.AccessTokenDto; @@ -7,13 +9,10 @@ import com.amcamp.domain.member.domain.MemberRole; import com.amcamp.global.util.JwtUtil; import io.jsonwebtoken.ExpiredJwtException; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; -import java.util.Optional; - -import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_ROLE_NAME; - @Service @RequiredArgsConstructor public class JwtTokenService { @@ -72,8 +71,8 @@ public RefreshTokenDto retrieveRefreshToken(String refreshTokenValue) { Optional refreshToken = getRefreshToken(refreshTokenDto.memberId()); - if (refreshToken.isPresent() && - refreshTokenDto.refreshTokenValue().equals(refreshToken.get().getToken())) { + if (refreshToken.isPresent() + && refreshTokenDto.refreshTokenValue().equals(refreshToken.get().getToken())) { return refreshTokenDto; } @@ -86,7 +85,8 @@ public AccessTokenDto reissueAccessTokenIfExpired(String accessTokenValue) { return null; } catch (ExpiredJwtException e) { Long memberId = Long.parseLong(e.getClaims().getSubject()); - MemberRole memberRole = MemberRole.valueOf(e.getClaims().get(TOKEN_ROLE_NAME, String.class)); + MemberRole memberRole = + MemberRole.valueOf(e.getClaims().get(TOKEN_ROLE_NAME, String.class)); return createAccessTokenDto(memberId, memberRole); } diff --git a/src/main/java/com/amcamp/domain/auth/application/KakaoService.java b/src/main/java/com/amcamp/domain/auth/application/KakaoService.java index 8e11a1d1..479a0f14 100644 --- a/src/main/java/com/amcamp/domain/auth/application/KakaoService.java +++ b/src/main/java/com/amcamp/domain/auth/application/KakaoService.java @@ -14,12 +14,13 @@ public class KakaoService { private final KakaoProperties kakaoProperties; public String getIdToken(String code) { - IdTokenResponse response = kakaoOauthClient.getIdToken( - kakaoProperties.grantType(), - kakaoProperties.clientId(), - kakaoProperties.redirectUri(), - code, - kakaoProperties.clientSecret()); + IdTokenResponse response = + kakaoOauthClient.getIdToken( + kakaoProperties.grantType(), + kakaoProperties.clientId(), + kakaoProperties.redirectUri(), + code, + kakaoProperties.clientSecret()); return response.id_token(); } diff --git a/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java b/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java index 925e8396..196f4e29 100644 --- a/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java +++ b/src/main/java/com/amcamp/domain/auth/dao/RefreshTokenRepository.java @@ -3,5 +3,4 @@ import com.amcamp.domain.auth.domain.RefreshToken; import org.springframework.data.repository.CrudRepository; -public interface RefreshTokenRepository extends CrudRepository { -} +public interface RefreshTokenRepository extends CrudRepository {} diff --git a/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java b/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java index 5abe01b8..46038712 100644 --- a/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java +++ b/src/main/java/com/amcamp/domain/auth/domain/OauthProvider.java @@ -1,16 +1,15 @@ package com.amcamp.domain.auth.domain; +import static com.amcamp.global.common.constants.SecurityConstants.*; + import com.amcamp.infra.config.oauth.GoogleProperties; import com.amcamp.infra.config.oauth.KakaoProperties; import lombok.AllArgsConstructor; import lombok.Getter; -import static com.amcamp.global.common.constants.SecurityConstants.*; - @Getter @AllArgsConstructor public enum OauthProvider { - KAKAO(KAKAO_JWK_SET_URL, KAKAO_ISSUER), GOOGLE(GOOGLE_JWK_SET_URL, GOOGLE_ISSUER), ; diff --git a/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java b/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java index e16d7362..0ca1f5b8 100644 --- a/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java +++ b/src/main/java/com/amcamp/domain/auth/domain/RefreshToken.java @@ -10,13 +10,11 @@ @RedisHash(value = "refreshToken") public class RefreshToken { - @Id - private Long memberId; + @Id private Long memberId; private String token; - @TimeToLive - private long ttl; + @TimeToLive private long ttl; @Builder private RefreshToken(Long memberId, String token, long ttl) { diff --git a/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java b/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java index d9ba41a1..164fb613 100644 --- a/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java +++ b/src/main/java/com/amcamp/domain/auth/dto/AccessTokenDto.java @@ -3,7 +3,7 @@ import com.amcamp.domain.member.domain.MemberRole; public record AccessTokenDto(Long memberId, MemberRole role, String accessTokenValue) { - public static AccessTokenDto of(Long memberId, MemberRole role, String accessTokenValue) { - return new AccessTokenDto(memberId, role, accessTokenValue); - } + public static AccessTokenDto of(Long memberId, MemberRole role, String accessTokenValue) { + return new AccessTokenDto(memberId, role, accessTokenValue); + } } diff --git a/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java b/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java index c83fedc0..a2e6c98d 100644 --- a/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java +++ b/src/main/java/com/amcamp/domain/auth/dto/RefreshTokenDto.java @@ -1,7 +1,7 @@ package com.amcamp.domain.auth.dto; public record RefreshTokenDto(Long memberId, String refreshTokenValue, Long ttl) { - public static RefreshTokenDto of(Long memberId, String refreshTokenValue, Long ttl) { - return new RefreshTokenDto(memberId, refreshTokenValue, ttl); - } + public static RefreshTokenDto of(Long memberId, String refreshTokenValue, Long ttl) { + return new RefreshTokenDto(memberId, refreshTokenValue, ttl); + } } diff --git a/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java b/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java index c31660bd..7b32cd83 100644 --- a/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java +++ b/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java @@ -4,7 +4,5 @@ import jakarta.validation.constraints.NotNull; public record AuthCodeRequest( - @NotNull(message = "인증코드는 필수입니다") - @Schema(description = "구글, 카카오 로그인을 통한 인증코드") - String code) { -} + @NotNull(message = "인증코드는 필수입니다") @Schema(description = "구글, 카카오 로그인을 통한 인증코드") + String code) {} diff --git a/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java b/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java index 3670f1df..a5d90b96 100644 --- a/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java +++ b/src/main/java/com/amcamp/domain/auth/dto/response/SocialLoginResponse.java @@ -4,8 +4,7 @@ import io.swagger.v3.oas.annotations.media.Schema; public record SocialLoginResponse( - @Schema(description = "엑세스 토큰") String accessToken, - @JsonIgnore String refreshToken) { + @Schema(description = "엑세스 토큰") String accessToken, @JsonIgnore String refreshToken) { public static SocialLoginResponse of(String accessToken, String refreshToken) { return new SocialLoginResponse(accessToken, refreshToken); } diff --git a/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java b/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java index 990addac..a59b9749 100644 --- a/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java +++ b/src/main/java/com/amcamp/domain/common/model/BaseTimeEntity.java @@ -3,22 +3,20 @@ import jakarta.persistence.Column; import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; 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; - @Getter @MappedSuperclass @EntityListeners(AuditingEntityListener.class) public abstract class BaseTimeEntity { - @CreatedDate - @Column(updatable = false) - private LocalDateTime createdDt; + @CreatedDate + @Column(updatable = false) + private LocalDateTime createdDt; - @LastModifiedDate - private LocalDateTime updatedDt; + @LastModifiedDate private LocalDateTime updatedDt; } diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java index a9226402..02fb39a6 100644 --- a/src/main/java/com/amcamp/domain/member/api/MemberController.java +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -16,13 +16,13 @@ @RequestMapping("/members") public class MemberController { - private final CookieUtil cookieUtil; - private final MemberService memberService; + private final CookieUtil cookieUtil; + private final MemberService memberService; - @Operation(summary = "회원 탈퇴", description = "회원 탈퇴를 진행합니다.") - @DeleteMapping("/withdrawal") - public ResponseEntity memberWithdrawal() { - memberService.withdrawalMember(); - return ResponseEntity.ok().headers(cookieUtil.deleteRefreshTokenCookie()).build(); - } + @Operation(summary = "회원 탈퇴", description = "회원 탈퇴를 진행합니다.") + @DeleteMapping("/withdrawal") + public ResponseEntity memberWithdrawal() { + memberService.withdrawalMember(); + return ResponseEntity.ok().headers(cookieUtil.deleteRefreshTokenCookie()).build(); + } } diff --git a/src/main/java/com/amcamp/domain/member/application/MemberService.java b/src/main/java/com/amcamp/domain/member/application/MemberService.java index ad86612c..2a9851d9 100644 --- a/src/main/java/com/amcamp/domain/member/application/MemberService.java +++ b/src/main/java/com/amcamp/domain/member/application/MemberService.java @@ -12,16 +12,16 @@ @RequiredArgsConstructor public class MemberService { - private final MemberUtil memberUtil; - private final RefreshTokenRepository refreshTokenRepository; + private final MemberUtil memberUtil; + private final RefreshTokenRepository refreshTokenRepository; - public void withdrawalMember() { - Member currentMember = memberUtil.getCurrentMember(); + public void withdrawalMember() { + Member currentMember = memberUtil.getCurrentMember(); - refreshTokenRepository - .findById(currentMember.getId()) - .ifPresent(refreshTokenRepository::delete); + refreshTokenRepository + .findById(currentMember.getId()) + .ifPresent(refreshTokenRepository::delete); - currentMember.withdrawal(); - } + currentMember.withdrawal(); + } } diff --git a/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java b/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java index 2cb3df13..7ddbae6a 100644 --- a/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java +++ b/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java @@ -2,9 +2,8 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; public interface MemberRepository extends JpaRepository { Optional findByOauthInfo(OauthInfo oauthInfo); diff --git a/src/main/java/com/amcamp/domain/member/domain/Member.java b/src/main/java/com/amcamp/domain/member/domain/Member.java index bc3e9ffc..f46161fc 100644 --- a/src/main/java/com/amcamp/domain/member/domain/Member.java +++ b/src/main/java/com/amcamp/domain/member/domain/Member.java @@ -23,8 +23,7 @@ public class Member extends BaseTimeEntity { private String profileImageUrl; - @Embedded - private OauthInfo oauthInfo; + @Embedded private OauthInfo oauthInfo; @Enumerated(EnumType.STRING) private MemberStatus status; @@ -34,7 +33,11 @@ public class Member extends BaseTimeEntity { @Builder(access = AccessLevel.PRIVATE) private Member( - String nickname, String profileImageUrl, OauthInfo oauthInfo, MemberStatus status, MemberRole role) { + String nickname, + String profileImageUrl, + OauthInfo oauthInfo, + MemberStatus status, + MemberRole role) { this.nickname = nickname; this.profileImageUrl = profileImageUrl; this.oauthInfo = oauthInfo; @@ -42,7 +45,8 @@ private Member( this.role = role; } - public static Member createMember(String nickname, String profileImageUrl, OauthInfo oauthInfo) { + public static Member createMember( + String nickname, String profileImageUrl, OauthInfo oauthInfo) { return Member.builder() .nickname(nickname) .profileImageUrl(profileImageUrl) @@ -52,15 +56,15 @@ public static Member createMember(String nickname, String profileImageUrl, Oauth .build(); } - public void withdrawal() { - if (this.status == MemberStatus.DELETED) { - throw new CommonException(MemberErrorCode.MEMBER_ALREADY_DELETED); - } + public void withdrawal() { + if (this.status == MemberStatus.DELETED) { + throw new CommonException(MemberErrorCode.MEMBER_ALREADY_DELETED); + } - this.status = MemberStatus.DELETED; - } + this.status = MemberStatus.DELETED; + } - public void reEnroll() { - this.status = MemberStatus.NORMAL; - } + public void reEnroll() { + this.status = MemberStatus.NORMAL; + } } diff --git a/src/main/java/com/amcamp/domain/member/domain/MemberRole.java b/src/main/java/com/amcamp/domain/member/domain/MemberRole.java index 7540ad90..a079ca71 100644 --- a/src/main/java/com/amcamp/domain/member/domain/MemberRole.java +++ b/src/main/java/com/amcamp/domain/member/domain/MemberRole.java @@ -6,10 +6,9 @@ @Getter @AllArgsConstructor public enum MemberRole { + ADMIN("ROLE_ADMIN"), + USER("ROLE_USER"), + ; - ADMIN("ROLE_ADMIN"), - USER("ROLE_USER"), - ; - - private final String role; + private final String role; } diff --git a/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java b/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java index 6a4953ef..d5cdf124 100644 --- a/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java +++ b/src/main/java/com/amcamp/domain/member/domain/MemberStatus.java @@ -6,11 +6,10 @@ @Getter @AllArgsConstructor public enum MemberStatus { + NORMAL("NORMAL"), + DELETED("DELETED"), + FORBIDDEN("FORBIDDEN"), + ; - NORMAL("NORMAL"), - DELETED("DELETED"), - FORBIDDEN("FORBIDDEN"), - ; - - private final String status; + private final String status; } diff --git a/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java b/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java index 38b4141e..cad3e5ed 100644 --- a/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java +++ b/src/main/java/com/amcamp/domain/member/domain/OauthInfo.java @@ -11,19 +11,16 @@ @NoArgsConstructor(access = AccessLevel.PROTECTED) public class OauthInfo { - private String oauthId; - private String oauthProvider; + private String oauthId; + private String oauthProvider; - @Builder(access = AccessLevel.PRIVATE) - private OauthInfo(String oauthId, String oauthProvider) { - this.oauthId = oauthId; - this.oauthProvider = oauthProvider; - } + @Builder(access = AccessLevel.PRIVATE) + private OauthInfo(String oauthId, String oauthProvider) { + this.oauthId = oauthId; + this.oauthProvider = oauthProvider; + } - public static OauthInfo createOauthInfo(String oauthId, String oauthProvider) { - return OauthInfo.builder() - .oauthId(oauthId) - .oauthProvider(oauthProvider) - .build(); - } + public static OauthInfo createOauthInfo(String oauthId, String oauthProvider) { + return OauthInfo.builder().oauthId(oauthId).oauthProvider(oauthProvider).build(); + } } diff --git a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java index 245d413a..e6cae88f 100644 --- a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java +++ b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java @@ -3,10 +3,9 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.participant.domain.Participant; import com.amcamp.domain.team.domain.Team; -import org.springframework.data.jpa.repository.JpaRepository; - import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; public interface ParticipantRepository extends JpaRepository { - Optional findByMemberAndTeam(Member member, Team team); + Optional findByMemberAndTeam(Member member, Team team); } diff --git a/src/main/java/com/amcamp/domain/participant/domain/Participant.java b/src/main/java/com/amcamp/domain/participant/domain/Participant.java index afe38914..9a4ee989 100644 --- a/src/main/java/com/amcamp/domain/participant/domain/Participant.java +++ b/src/main/java/com/amcamp/domain/participant/domain/Participant.java @@ -13,34 +13,30 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Participant extends BaseTimeEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "participant_id") - private Long id; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "participant_id") + private Long id; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "member_id") - private Member member; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id") + private Member member; - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "team_id") - private Team team; + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id") + private Team team; - @Enumerated(EnumType.STRING) - private ParticipantRole role; + @Enumerated(EnumType.STRING) + private ParticipantRole role; - @Builder(access = AccessLevel.PRIVATE) - private Participant(Member member, Team team, ParticipantRole role) { - this.member = member; - this.team = team; - this.role = role; - } + @Builder(access = AccessLevel.PRIVATE) + private Participant(Member member, Team team, ParticipantRole role) { + this.member = member; + this.team = team; + this.role = role; + } - public static Participant createParticipant(Member member, Team team, ParticipantRole role) { - return Participant.builder() - .member(member) - .team(team) - .role(role) - .build(); - } + public static Participant createParticipant(Member member, Team team, ParticipantRole role) { + return Participant.builder().member(member).team(team).role(role).build(); + } } diff --git a/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java b/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java index 271d3ee9..04619d2c 100644 --- a/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java +++ b/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java @@ -1,16 +1,14 @@ package com.amcamp.domain.participant.domain; - import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor public enum ParticipantRole { + ADMIN("TEAM_ADMIN"), + USER("TEAM_USER"), + ; - ADMIN("TEAM_ADMIN"), - USER("TEAM_USER"), - ; - - private final String role; + private final String role; } diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index 94a3dd1e..f2a4c7df 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -1,12 +1,10 @@ package com.amcamp.domain.team.api; -import com.amcamp.domain.participant.domain.Participant; import com.amcamp.domain.team.application.TeamService; -import com.amcamp.domain.team.domain.Team; -import com.amcamp.domain.team.dto.response.TeamInfoResponse; -import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.domain.team.dto.response.TeamInfoResponse; +import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -19,30 +17,34 @@ @RequiredArgsConstructor @RequestMapping("/teams") public class TeamController { - private final TeamService teamService; + private final TeamService teamService; - @Operation(summary = "팀 생성", description = "팀을 생성합니다.") - @PostMapping("/create") - public TeamInviteCodeResponse teamCreate (@Valid @RequestBody TeamCreateRequest teamCreateRequest){ - return teamService.createTeam(teamCreateRequest.teamName(), teamCreateRequest.teamDescription()); - } + @Operation(summary = "팀 생성", description = "팀을 생성합니다.") + @PostMapping("/create") + public TeamInviteCodeResponse teamCreate( + @Valid @RequestBody TeamCreateRequest teamCreateRequest) { + return teamService.createTeam( + teamCreateRequest.teamName(), teamCreateRequest.teamDescription()); + } - @Operation(summary = "코드 확인", description = "팀 가입을 위한 초대 코드를 확인합니다.") - @GetMapping("{teamId}/invite-code") - public TeamInviteCodeResponse teamInvite (@PathVariable Long teamId){ - return teamService.getTeamCode(teamId); - } + @Operation(summary = "코드 확인", description = "팀 가입을 위한 초대 코드를 확인합니다.") + @GetMapping("{teamId}/invite-code") + public TeamInviteCodeResponse teamInvite(@PathVariable Long teamId) { + return teamService.getTeamCode(teamId); + } - @Operation(summary = "팀 참가 전 팀 확인", description = "초대 코드를 입력하여 참여하려고 하는 팀 정보를 확인합니다.") - @PostMapping("/check") - public TeamInfoResponse teamCheck (@Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest){ - return teamService.getTeamInfo(teamInviteCodeRequest.inviteCode()); - } + @Operation(summary = "팀 참가 전 팀 확인", description = "초대 코드를 입력하여 참여하려고 하는 팀 정보를 확인합니다.") + @PostMapping("/check") + public TeamInfoResponse teamCheck( + @Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest) { + return teamService.getTeamInfo(teamInviteCodeRequest.inviteCode()); + } - @Operation(summary = "팀 참가", description = "팀 정보를 확인 후 팀에 참가합니다.") - @PostMapping("/join") - public ResponseEntity teamJoin (@Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest){ - teamService.joinTeam(teamInviteCodeRequest.inviteCode()); - return ResponseEntity.ok().build(); - } + @Operation(summary = "팀 참가", description = "팀 정보를 확인 후 팀에 참가합니다.") + @PostMapping("/join") + public ResponseEntity teamJoin( + @Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest) { + teamService.joinTeam(teamInviteCodeRequest.inviteCode()); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index 9bdeb27e..dec9127d 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -1,10 +1,12 @@ package com.amcamp.domain.team.application; +import static com.amcamp.global.common.constants.RedisConstants.*; + import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.participant.dao.ParticipantRepository; -import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.participant.domain.Participant; import com.amcamp.domain.participant.domain.ParticipantRole; +import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; @@ -17,73 +19,74 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.util.Optional; -import static com.amcamp.global.common.constants.RedisConstants.*; @Transactional @Service @RequiredArgsConstructor @Slf4j -public class TeamService{ - private final MemberUtil memberUtil; - private final TeamRepository teamRepository; - private final ParticipantRepository participantRepository; - private final RedisUtil redisUtil; - private final RandomUtil randomUtil; - - public TeamInviteCodeResponse createTeam(String teamName, String teamDescription) { - Member member = memberUtil.getCurrentMember(); - - Team team = Team.createTeam(teamName, teamDescription); - teamRepository.save(team); - - Participant participant = Participant.createParticipant(member, team, ParticipantRole.ADMIN); - participantRepository.save(participant); - - String code = randomUtil.generateCode(team.getId()); - - return new TeamInviteCodeResponse(code); - } - - - public TeamInviteCodeResponse getTeamCode (Long teamId) { - Team team = teamRepository.findById(teamId) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - - String code = randomUtil.generateCode(team.getId()); - - return new TeamInviteCodeResponse(code); - } - - public TeamInfoResponse getTeamInfo (String inviteCode){ - Team team = searchTeamByCode(inviteCode); - return new TeamInfoResponse(team.getId(), team.getTeamName()); - } - - - public void joinTeam (String inviteCode) { - Member member = memberUtil.getCurrentMember(); - Team team = searchTeamByCode(inviteCode); - validateTeamJoin(member, team); - - Participant participant = Participant.createParticipant(member, team, ParticipantRole.USER); - participantRepository.save(participant); - - } - - private Team searchTeamByCode(String inviteCode){ - Long teamId = redisUtil.getData(INVITE_CODE_PREFIX.formatted(inviteCode)) - .map(Long::valueOf) - .orElseThrow(() -> new CommonException(TeamErrorCode.INVALID_INVITE_CODE)); - - return teamRepository.findById(teamId).orElseThrow(() -> - new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - } - - private void validateTeamJoin(Member member, Team team) { - - if (participantRepository.findByMemberAndTeam(member, team).isPresent()) { - throw new CommonException(TeamErrorCode.MEMBER_ALREADY_JOINED); - } - } +public class TeamService { + private final MemberUtil memberUtil; + private final TeamRepository teamRepository; + private final ParticipantRepository participantRepository; + private final RedisUtil redisUtil; + private final RandomUtil randomUtil; + + public TeamInviteCodeResponse createTeam(String teamName, String teamDescription) { + Member member = memberUtil.getCurrentMember(); + + Team team = Team.createTeam(teamName, teamDescription); + teamRepository.save(team); + + Participant participant = + Participant.createParticipant(member, team, ParticipantRole.ADMIN); + participantRepository.save(participant); + + String code = randomUtil.generateCode(team.getId()); + + return new TeamInviteCodeResponse(code); + } + + public TeamInviteCodeResponse getTeamCode(Long teamId) { + Team team = + teamRepository + .findById(teamId) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + String code = randomUtil.generateCode(team.getId()); + + return new TeamInviteCodeResponse(code); + } + + public TeamInfoResponse getTeamInfo(String inviteCode) { + Team team = searchTeamByCode(inviteCode); + return new TeamInfoResponse(team.getId(), team.getTeamName()); + } + + public void joinTeam(String inviteCode) { + Member member = memberUtil.getCurrentMember(); + Team team = searchTeamByCode(inviteCode); + validateTeamJoin(member, team); + + Participant participant = Participant.createParticipant(member, team, ParticipantRole.USER); + participantRepository.save(participant); + } + + private Team searchTeamByCode(String inviteCode) { + Long teamId = + redisUtil + .getData(INVITE_CODE_PREFIX.formatted(inviteCode)) + .map(Long::valueOf) + .orElseThrow(() -> new CommonException(TeamErrorCode.INVALID_INVITE_CODE)); + + return teamRepository + .findById(teamId) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + } + + private void validateTeamJoin(Member member, Team team) { + + if (participantRepository.findByMemberAndTeam(member, team).isPresent()) { + throw new CommonException(TeamErrorCode.MEMBER_ALREADY_JOINED); + } + } } diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java b/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java index d7f20610..e617249a 100644 --- a/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java +++ b/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java @@ -3,5 +3,4 @@ import com.amcamp.domain.team.domain.Team; import org.springframework.data.jpa.repository.JpaRepository; -public interface TeamRepository extends JpaRepository { -} +public interface TeamRepository extends JpaRepository {} diff --git a/src/main/java/com/amcamp/domain/team/domain/Team.java b/src/main/java/com/amcamp/domain/team/domain/Team.java index 32c087d7..618280c8 100644 --- a/src/main/java/com/amcamp/domain/team/domain/Team.java +++ b/src/main/java/com/amcamp/domain/team/domain/Team.java @@ -11,23 +11,21 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) public class Team extends BaseTimeEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "team_id") - private Long id; - private String teamName; - private String teamDescription; + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "team_id") + private Long id; - @Builder(access = AccessLevel.PRIVATE) - private Team(String teamName, String teamDescription){ - this.teamName = teamName; - this.teamDescription = teamDescription; - } + private String teamName; + private String teamDescription; - public static Team createTeam (String teamName, String teamDescription){ - return Team.builder() - .teamName(teamName) - .teamDescription(teamDescription) - .build(); - } + @Builder(access = AccessLevel.PRIVATE) + private Team(String teamName, String teamDescription) { + this.teamName = teamName; + this.teamDescription = teamDescription; + } + + public static Team createTeam(String teamName, String teamDescription) { + return Team.builder().teamName(teamName).teamDescription(teamDescription).build(); + } } diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java index e93001c8..e868b981 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java @@ -1,17 +1,14 @@ package com.amcamp.domain.team.dto.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotEmpty; import jakarta.validation.constraints.Size; public record TeamCreateRequest( - @NotEmpty(message = "팀 이름은 필수 사항입니다.") - @Size(max = 25, message = "팀 이름은 최대 25자까지 입력 가능합니다.") - @Schema(description = "팀 이름", example = "LG CNS AM CAMP") - String teamName, - - @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") - @Schema(description = "팀 설명", example = "LG CNS AM CAMP에서 운영하는 팀입니다.") - String teamDescription){ -} + @NotEmpty(message = "팀 이름은 필수 사항입니다.") + @Size(max = 25, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Schema(description = "팀 이름", example = "LG CNS AM CAMP") + String teamName, + @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") + @Schema(description = "팀 설명", example = "LG CNS AM CAMP에서 운영하는 팀입니다.") + String teamDescription) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java index 0237d8c0..58073f5f 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java @@ -5,8 +5,7 @@ import jakarta.validation.constraints.Size; public record TeamInviteCodeRequest( - @NotEmpty - @Size(min = 8, max = 8, message = "8자리 초대 코드를 입력해주세요.") - @Schema(description = "팀 코드", example = "FFbKeJvJ") - String inviteCode) { -} + @NotEmpty + @Size(min = 8, max = 8, message = "8자리 초대 코드를 입력해주세요.") + @Schema(description = "팀 코드", example = "FFbKeJvJ") + String inviteCode) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java index 7500e1bc..0cda008b 100644 --- a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java @@ -1,12 +1,7 @@ package com.amcamp.domain.team.dto.response; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.Size; public record TeamInfoResponse( - @Schema(description = "팀 아이디", example = "1") - Long teamId, - @Schema(description = "팀 이름", example = "LG CNS AM CAMP") - String teamName) { -} + @Schema(description = "팀 아이디", example = "1") Long teamId, + @Schema(description = "팀 이름", example = "LG CNS AM CAMP") String teamName) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java index fe9c8fd8..a6f2c2a8 100644 --- a/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInviteCodeResponse.java @@ -1,10 +1,6 @@ package com.amcamp.domain.team.dto.response; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.Size; public record TeamInviteCodeResponse( - @Schema(description = "초대 코드", example = "FFbKeJvJ") - String inviteCode) { -} + @Schema(description = "초대 코드", example = "FFbKeJvJ") String inviteCode) {} diff --git a/src/main/java/com/amcamp/global/common/constants/RedisConstants.java b/src/main/java/com/amcamp/global/common/constants/RedisConstants.java index c6c46d7b..0bf5c898 100644 --- a/src/main/java/com/amcamp/global/common/constants/RedisConstants.java +++ b/src/main/java/com/amcamp/global/common/constants/RedisConstants.java @@ -4,10 +4,10 @@ import java.util.Base64; public final class RedisConstants { - public static final SecureRandom secureRandom = new SecureRandom(); - public static final Base64.Encoder base64Encoder = Base64.getUrlEncoder(); + public static final SecureRandom secureRandom = new SecureRandom(); + public static final Base64.Encoder base64Encoder = Base64.getUrlEncoder(); - public static final String TEAM_ID_PREFIX = "teamId=%d"; - public static final String INVITE_CODE_PREFIX = "inviteCode=%s"; - public static final long expirationTime = 24; + public static final String TEAM_ID_PREFIX = "teamId=%d"; + public static final String INVITE_CODE_PREFIX = "inviteCode=%s"; + public static final long expirationTime = 24; } diff --git a/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java b/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java index d44d9b71..9bb3dcb0 100644 --- a/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java +++ b/src/main/java/com/amcamp/global/common/constants/SecurityConstants.java @@ -1,20 +1,20 @@ package com.amcamp.global.common.constants; public final class SecurityConstants { - public static final String TOKEN_ROLE_NAME = "role"; - public static final String TOKEN_PREFIX = "Bearer "; + public static final String TOKEN_ROLE_NAME = "role"; + public static final String TOKEN_PREFIX = "Bearer "; - public static final String KAKAO_LOGIN_URL = "https://kauth.kakao.com"; - public static final String KAKAO_LOGIN_ENDPOINT = "/oauth/token"; + public static final String KAKAO_LOGIN_URL = "https://kauth.kakao.com"; + public static final String KAKAO_LOGIN_ENDPOINT = "/oauth/token"; - public static final String GOOGLE_LOGIN_URL = "https://oauth2.googleapis.com"; - public static final String GOOGLE_LOGIN_ENDPOINT = "/token"; + public static final String GOOGLE_LOGIN_URL = "https://oauth2.googleapis.com"; + public static final String GOOGLE_LOGIN_ENDPOINT = "/token"; - public static final String KAKAO_JWK_SET_URL = "https://kauth.kakao.com/.well-known/jwks.json"; - public static final String KAKAO_ISSUER = "https://kauth.kakao.com"; + public static final String KAKAO_JWK_SET_URL = "https://kauth.kakao.com/.well-known/jwks.json"; + public static final String KAKAO_ISSUER = "https://kauth.kakao.com"; - public static final String GOOGLE_JWK_SET_URL = "https://www.googleapis.com/oauth2/v3/certs"; - public static final String GOOGLE_ISSUER = "https://accounts.google.com"; + public static final String GOOGLE_JWK_SET_URL = "https://www.googleapis.com/oauth2/v3/certs"; + public static final String GOOGLE_ISSUER = "https://accounts.google.com"; - public static final String REFRESH_TOKEN_COOKIE_NAME = "refreshToken"; + public static final String REFRESH_TOKEN_COOKIE_NAME = "refreshToken"; } diff --git a/src/main/java/com/amcamp/global/common/response/CommonResponse.java b/src/main/java/com/amcamp/global/common/response/CommonResponse.java index d69701cf..07e4a7d9 100644 --- a/src/main/java/com/amcamp/global/common/response/CommonResponse.java +++ b/src/main/java/com/amcamp/global/common/response/CommonResponse.java @@ -1,37 +1,36 @@ package com.amcamp.global.common.response; +import java.time.LocalDateTime; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import java.time.LocalDateTime; - @NoArgsConstructor @AllArgsConstructor @Builder @Data -public class CommonResponse { - private boolean success; - private int status; - private T data; - private LocalDateTime timestamp; +public class CommonResponse { + private boolean success; + private int status; + private T data; + private LocalDateTime timestamp; - public static CommonResponse onSuccess(int status, T data) { - return CommonResponse.builder() - .success(true) - .status(status) - .data(data) - .timestamp(LocalDateTime.now()) - .build(); - } + public static CommonResponse onSuccess(int status, T data) { + return CommonResponse.builder() + .success(true) + .status(status) + .data(data) + .timestamp(LocalDateTime.now()) + .build(); + } - public static CommonResponse onFailure(int status, T data) { - return CommonResponse.builder() - .success(false) - .status(status) - .data(data) - .timestamp(LocalDateTime.now()) - .build(); - } + public static CommonResponse onFailure(int status, T data) { + return CommonResponse.builder() + .success(false) + .status(status) + .data(data) + .timestamp(LocalDateTime.now()) + .build(); + } } diff --git a/src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java b/src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java index b88c8255..1063ae80 100644 --- a/src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java +++ b/src/main/java/com/amcamp/global/common/response/CommonResponseAdvice.java @@ -12,25 +12,32 @@ @RestControllerAdvice(basePackages = "com.amcamp") public class CommonResponseAdvice implements ResponseBodyAdvice { - @Override - public boolean supports(MethodParameter returnType, Class converterType) { - return true; //어떤 응답을 가로채서 반환할 것인지 -> 모든 응답 가로채기 - } + @Override + public boolean supports(MethodParameter returnType, Class converterType) { + return true; // 어떤 응답을 가로채서 반환할 것인지 -> 모든 응답 가로채기 + } - @Override - public Object beforeBodyWrite(Object body, MethodParameter returnType, MediaType selectedContentType, Class selectedConverterType, ServerHttpRequest request, ServerHttpResponse response) { - HttpServletResponse httpServletResponse = ((ServletServerHttpResponse) response).getServletResponse(); - int status = httpServletResponse.getStatus(); - HttpStatus resolve = HttpStatus.resolve(status); + @Override + public Object beforeBodyWrite( + Object body, + MethodParameter returnType, + MediaType selectedContentType, + Class selectedConverterType, + ServerHttpRequest request, + ServerHttpResponse response) { + HttpServletResponse httpServletResponse = + ((ServletServerHttpResponse) response).getServletResponse(); + int status = httpServletResponse.getStatus(); + HttpStatus resolve = HttpStatus.resolve(status); - if (resolve == null || body instanceof String) { - return body; - } + if (resolve == null || body instanceof String) { + return body; + } - if (resolve.is2xxSuccessful()) { - return CommonResponse.onSuccess(status, body); - } + if (resolve.is2xxSuccessful()) { + return CommonResponse.onSuccess(status, body); + } - return body; - } + return body; + } } diff --git a/src/main/java/com/amcamp/global/config/feign/FeignConfig.java b/src/main/java/com/amcamp/global/config/feign/FeignConfig.java index 2640782c..8813b64a 100644 --- a/src/main/java/com/amcamp/global/config/feign/FeignConfig.java +++ b/src/main/java/com/amcamp/global/config/feign/FeignConfig.java @@ -12,7 +12,8 @@ public class FeignConfig { @Bean public RequestInterceptor requestInterceptor() { return requestTemplate -> { - requestTemplate.header("Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); + requestTemplate.header( + "Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); if (requestTemplate.body() == null) { requestTemplate.body(""); diff --git a/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java b/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java index f5174619..b4beaa42 100644 --- a/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java +++ b/src/main/java/com/amcamp/global/config/querydsl/QueryDslConfig.java @@ -9,11 +9,10 @@ @Configuration public class QueryDslConfig { - @PersistenceContext - private EntityManager entityManager; + @PersistenceContext private EntityManager entityManager; - @Bean - public JPAQueryFactory jpaQueryFactory() { - return new JPAQueryFactory(entityManager); - } + @Bean + public JPAQueryFactory jpaQueryFactory() { + return new JPAQueryFactory(entityManager); + } } diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index c0b5f938..7ec62a09 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -1,5 +1,8 @@ package com.amcamp.global.config.security; +import static org.springframework.http.HttpHeaders.SET_COOKIE; +import static org.springframework.security.config.Customizer.withDefaults; + import com.amcamp.domain.auth.application.JwtTokenService; import com.amcamp.global.security.JwtAuthenticationFilter; import com.amcamp.global.util.CookieUtil; @@ -16,56 +19,57 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import static org.springframework.http.HttpHeaders.SET_COOKIE; -import static org.springframework.security.config.Customizer.withDefaults; - @Configuration @EnableWebSecurity @RequiredArgsConstructor public class WebSecurityConfig { - private final JwtTokenService jwtTokenService; - private final CookieUtil cookieUtil; + private final JwtTokenService jwtTokenService; + private final CookieUtil cookieUtil; - @Bean - public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { - http - .csrf(AbstractHttpConfigurer::disable) - .cors(withDefaults()) - .httpBasic(AbstractHttpConfigurer::disable) - .formLogin(AbstractHttpConfigurer::disable) - .sessionManagement( - session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + @Bean + public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { + http.csrf(AbstractHttpConfigurer::disable) + .cors(withDefaults()) + .httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .sessionManagement( + session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); - http.authorizeHttpRequests( - auth -> - auth.requestMatchers("/devfit-actuator/**").permitAll() - .requestMatchers("/**").permitAll() - .anyRequest().authenticated()); + http.authorizeHttpRequests( + auth -> + auth.requestMatchers("/devfit-actuator/**") + .permitAll() + .requestMatchers("/**") + .permitAll() + .anyRequest() + .authenticated()); - http.addFilterBefore( - jwtAuthenticationFilter(jwtTokenService, cookieUtil), UsernamePasswordAuthenticationFilter.class); + http.addFilterBefore( + jwtAuthenticationFilter(jwtTokenService, cookieUtil), + UsernamePasswordAuthenticationFilter.class); - return http.build(); - } + return http.build(); + } - @Bean - public CorsConfigurationSource corsConfigurationSource() { - CorsConfiguration configuration = new CorsConfiguration(); + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); - configuration.addAllowedHeader("*"); - configuration.addAllowedMethod("*"); - configuration.setAllowCredentials(true); - configuration.setMaxAge(3600L); - configuration.addExposedHeader(SET_COOKIE); + configuration.addAllowedHeader("*"); + configuration.addAllowedMethod("*"); + configuration.setAllowCredentials(true); + configuration.setMaxAge(3600L); + configuration.addExposedHeader(SET_COOKIE); - UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); - source.registerCorsConfiguration("/**", configuration); - return source; - } + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + return source; + } - @Bean - public JwtAuthenticationFilter jwtAuthenticationFilter(JwtTokenService jwtTokenService, CookieUtil cookieUtil) { - return new JwtAuthenticationFilter(jwtTokenService, cookieUtil); - } + @Bean + public JwtAuthenticationFilter jwtAuthenticationFilter( + JwtTokenService jwtTokenService, CookieUtil cookieUtil) { + return new JwtAuthenticationFilter(jwtTokenService, cookieUtil); + } } diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index 4fadf4d9..e2593aec 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -12,40 +12,38 @@ @Configuration public class SwaggerConfig { - @Bean - public GroupedOpenApi publicApi() { - return GroupedOpenApi.builder() - .group("v1") - .pathsToMatch("/**") - .build(); - } + @Bean + public GroupedOpenApi publicApi() { + return GroupedOpenApi.builder().group("v1").pathsToMatch("/**").build(); + } - @Bean - public OpenAPI openAPI() { - return new OpenAPI() - .info(new Info() - .title("DevFit Server API") - .description("DevFit Server API 명세서입니다.") - .version("v0.0.1")) - .components(authSetting()) - .addSecurityItem(securityRequirement()); - } + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .info( + new Info() + .title("DevFit Server API") + .description("DevFit Server API 명세서입니다.") + .version("v0.0.1")) + .components(authSetting()) + .addSecurityItem(securityRequirement()); + } - private Components authSetting() { - return new Components() - .addSecuritySchemes( - "accessToken", - new SecurityScheme() - .type(SecurityScheme.Type.HTTP) - .scheme("bearer") - .bearerFormat("JWT") - .in(SecurityScheme.In.HEADER) - .name("Authorization")); - } + private Components authSetting() { + return new Components() + .addSecuritySchemes( + "accessToken", + new SecurityScheme() + .type(SecurityScheme.Type.HTTP) + .scheme("bearer") + .bearerFormat("JWT") + .in(SecurityScheme.In.HEADER) + .name("Authorization")); + } - private SecurityRequirement securityRequirement() { - SecurityRequirement securityRequirement = new SecurityRequirement(); - securityRequirement.addList("accessToken"); - return securityRequirement; - } + private SecurityRequirement securityRequirement() { + SecurityRequirement securityRequirement = new SecurityRequirement(); + securityRequirement.addList("accessToken"); + return securityRequirement; + } } diff --git a/src/main/java/com/amcamp/global/exception/CommonException.java b/src/main/java/com/amcamp/global/exception/CommonException.java index 471d43cd..7a23048d 100644 --- a/src/main/java/com/amcamp/global/exception/CommonException.java +++ b/src/main/java/com/amcamp/global/exception/CommonException.java @@ -3,23 +3,22 @@ import com.amcamp.global.exception.errorcode.BaseErrorCode; import lombok.Getter; - @Getter public class CommonException extends RuntimeException { - private BaseErrorCode errorCode; - private String errorField; - private String errorGiven; + private BaseErrorCode errorCode; + private String errorField; + private String errorGiven; - public CommonException(BaseErrorCode errorCode) { - super(errorCode.getErrorMsg().getReason()); - this.errorCode = errorCode; - } + public CommonException(BaseErrorCode errorCode) { + super(errorCode.getErrorMsg().getReason()); + this.errorCode = errorCode; + } - public CommonException(BaseErrorCode errorCode, String errorField, String errorGiven) { - super(errorCode.getErrorMsg().getReason()); //RuntimeException - this.errorCode = errorCode; - this.errorField = errorField; - this.errorGiven = errorGiven; - } + public CommonException(BaseErrorCode errorCode, String errorField, String errorGiven) { + super(errorCode.getErrorMsg().getReason()); // RuntimeException + this.errorCode = errorCode; + this.errorField = errorField; + this.errorGiven = errorGiven; + } } diff --git a/src/main/java/com/amcamp/global/exception/ErrorDetail.java b/src/main/java/com/amcamp/global/exception/ErrorDetail.java index 81439cca..951e2ece 100644 --- a/src/main/java/com/amcamp/global/exception/ErrorDetail.java +++ b/src/main/java/com/amcamp/global/exception/ErrorDetail.java @@ -10,9 +10,7 @@ @NoArgsConstructor @AllArgsConstructor public class ErrorDetail { - private String field; - private String given; - private ErrorMsg reasonMessage; - + private String field; + private String given; + private ErrorMsg reasonMessage; } - diff --git a/src/main/java/com/amcamp/global/exception/ErrorMsg.java b/src/main/java/com/amcamp/global/exception/ErrorMsg.java index 8e2594f7..83cd96f5 100644 --- a/src/main/java/com/amcamp/global/exception/ErrorMsg.java +++ b/src/main/java/com/amcamp/global/exception/ErrorMsg.java @@ -10,11 +10,11 @@ @NoArgsConstructor @AllArgsConstructor public class ErrorMsg { - private String code; - private String reason; + private String code; + private String reason; - @Override - public String toString() { - return String.format("ErrorMsg{code='%s', reason='%s'}", code, reason); - } + @Override + public String toString() { + return String.format("ErrorMsg{code='%s', reason='%s'}", code, reason); + } } diff --git a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java index d865c775..1e78e0ea 100644 --- a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java @@ -10,17 +10,18 @@ @RestControllerAdvice(basePackages = "com.amcamp") public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { - @ExceptionHandler(CommonException.class) - public ResponseEntity> commonExceptionHandler(CommonException e) { - final BaseErrorCode errorCode = e.getErrorCode(); - final ErrorDetail errorDetail = ErrorDetail.builder() - .field(e.getErrorField()) - .given(e.getErrorGiven()) - .reasonMessage(errorCode.getErrorMsg()) - .build(); - final CommonResponse response = - CommonResponse.onFailure(errorCode.getHttpStatus().value(), errorDetail); + @ExceptionHandler(CommonException.class) + public ResponseEntity> commonExceptionHandler(CommonException e) { + final BaseErrorCode errorCode = e.getErrorCode(); + final ErrorDetail errorDetail = + ErrorDetail.builder() + .field(e.getErrorField()) + .given(e.getErrorGiven()) + .reasonMessage(errorCode.getErrorMsg()) + .build(); + final CommonResponse response = + CommonResponse.onFailure(errorCode.getHttpStatus().value(), errorDetail); - return ResponseEntity.status(errorCode.getHttpStatus()).body(response); - } + return ResponseEntity.status(errorCode.getHttpStatus()).body(response); + } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java index 351ced93..eeb4411e 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java @@ -5,37 +5,36 @@ @Getter public enum AuthErrorCode implements BaseErrorCode { + ID_TOKEN_VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "ID 토큰 검증에 실패했습니다."), - ID_TOKEN_VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "ID 토큰 검증에 실패했습니다."), + AUTH_NOT_FOUND(HttpStatus.UNAUTHORIZED, "사용자 인증 정보를 찾을 수 없습니다. 올바른 토큰으로 요청해주세요."), + ; - AUTH_NOT_FOUND(HttpStatus.UNAUTHORIZED, "사용자 인증 정보를 찾을 수 없습니다. 올바른 토큰으로 요청해주세요."), - ; + // 잘못된 요청 + // WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), - //잘못된 요청 -// WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), + // Member 요청 관련 에러 + // USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), + // NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), - //Member 요청 관련 에러 -// USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), -// NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), + // Token 유효성 Error + // INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다"), + // TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "요청한 토큰을 찾을 수 없습니다"), - //Token 유효성 Error -// INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다"), -// TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "요청한 토큰을 찾을 수 없습니다"), + // Role 권한 관련 오류 + // NO_AUTHORITY(HttpStatus.BAD_REQUEST, "권한 정보를 찾을 수 없습니다"), + // INVALID_AUTHORITY(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); - //Role 권한 관련 오류 -// NO_AUTHORITY(HttpStatus.BAD_REQUEST, "권한 정보를 찾을 수 없습니다"), -// INVALID_AUTHORITY(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); + private final HttpStatus httpStatus; + private final String message; - private final HttpStatus httpStatus; - private final String message; + AuthErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } - AuthErrorCode(HttpStatus httpStatus, String message){ - this.httpStatus = httpStatus; - this.message = message; - } - - @Override - public String getCodeName() { - return this.name(); - } + @Override + public String getCodeName() { + return this.name(); + } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java index 9c00cba3..afce9d09 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java @@ -4,16 +4,17 @@ import org.springframework.http.HttpStatus; public interface BaseErrorCode { - HttpStatus getHttpStatus(); - String getMessage(); - String getCodeName(); + HttpStatus getHttpStatus(); - // 공통 ErrorMsg 생성 메서드 - default ErrorMsg getErrorMsg(){ - return ErrorMsg.builder() - .code(getCodeName()) // Enum 이름을 사용 - .reason(getMessage()) // 오류 메시지 - .build(); - } + String getMessage(); + String getCodeName(); + + // 공통 ErrorMsg 생성 메서드 + default ErrorMsg getErrorMsg() { + return ErrorMsg.builder() + .code(getCodeName()) // Enum 이름을 사용 + .reason(getMessage()) // 오류 메시지 + .build(); + } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java index c0ee9e9a..2fbbd025 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java @@ -5,22 +5,21 @@ @Getter public enum MemberErrorCode implements BaseErrorCode { + MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다."), - MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다."), + MEMBER_ALREADY_DELETED(HttpStatus.BAD_REQUEST, "이미 탈퇴한 회원입니다."), + ; - MEMBER_ALREADY_DELETED(HttpStatus.BAD_REQUEST, "이미 탈퇴한 회원입니다."), - ; + private final HttpStatus httpStatus; + private final String message; - private final HttpStatus httpStatus; - private final String message; + MemberErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } - MemberErrorCode(HttpStatus httpStatus, String message){ - this.httpStatus = httpStatus; - this.message = message; - } - - @Override - public String getCodeName() { - return this.name(); - } + @Override + public String getCodeName() { + return this.name(); + } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 3c8a130b..3da87957 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -5,20 +5,18 @@ @Getter public enum ProjectErrorCode implements BaseErrorCode { + PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "요청한 project 를 찾을 수 없습니다."); - PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "요청한 project 를 찾을 수 없습니다."); + private final HttpStatus httpStatus; + private final String message; - private final HttpStatus httpStatus; - private final String message; - - ProjectErrorCode(HttpStatus httpStatus, String message){ - this.httpStatus = httpStatus; - this.message = message; - } - - @Override - public String getCodeName() { - return this.name(); - } + ProjectErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } + @Override + public String getCodeName() { + return this.name(); + } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java index 28471792..1475a04f 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java @@ -2,23 +2,24 @@ import lombok.Getter; import org.springframework.http.HttpStatus; + @Getter -public enum TeamErrorCode implements BaseErrorCode{ - TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 팀을 찾을 수 없습니다."), - MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), - TEAM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 참여자가 아닙니다."), - INVALID_INVITE_CODE(HttpStatus.NOT_FOUND,"팀이 존재하지 않거나 코드가 만료되었습니다." ); +public enum TeamErrorCode implements BaseErrorCode { + TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 팀을 찾을 수 없습니다."), + MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), + TEAM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 참여자가 아닙니다."), + INVALID_INVITE_CODE(HttpStatus.NOT_FOUND, "팀이 존재하지 않거나 코드가 만료되었습니다."); - private final HttpStatus httpStatus; - private final String message; + private final HttpStatus httpStatus; + private final String message; - TeamErrorCode(HttpStatus httpStatus, String message){ - this.httpStatus = httpStatus; - this.message = message; - } + TeamErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } - @Override - public String getCodeName() { - return this.name(); - } + @Override + public String getCodeName() { + return this.name(); + } } diff --git a/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java b/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java index 9c29c414..aa643867 100644 --- a/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java +++ b/src/main/java/com/amcamp/global/security/JwtAuthenticationFilter.java @@ -1,5 +1,8 @@ package com.amcamp.global.security; +import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_PREFIX; + import com.amcamp.domain.auth.application.JwtTokenService; import com.amcamp.domain.auth.dto.AccessTokenDto; import com.amcamp.domain.auth.dto.RefreshTokenDto; @@ -10,6 +13,7 @@ import jakarta.servlet.http.Cookie; import jakarta.servlet.http.HttpServletRequest; import jakarta.servlet.http.HttpServletResponse; +import java.io.IOException; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpHeaders; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -18,11 +22,6 @@ import org.springframework.web.filter.OncePerRequestFilter; import org.springframework.web.util.WebUtils; -import java.io.IOException; - -import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; -import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_PREFIX; - @RequiredArgsConstructor public class JwtAuthenticationFilter extends OncePerRequestFilter { @@ -39,7 +38,8 @@ protected void doFilterInternal( // 헤더에 AT가 있으면 우선적으로 검증 if (accessTokenHeaderValue != null) { - AccessTokenDto accessTokenDto = jwtTokenService.retrieveAccessToken(accessTokenHeaderValue); + AccessTokenDto accessTokenDto = + jwtTokenService.retrieveAccessToken(accessTokenHeaderValue); // AT가 유효하면 통과 if (accessTokenDto != null) { @@ -51,7 +51,8 @@ protected void doFilterInternal( } // AT가 유효하지 않다면 RT 파싱 - RefreshTokenDto refreshTokenDto = jwtTokenService.retrieveRefreshToken(refreshTokenCookieValue); + RefreshTokenDto refreshTokenDto = + jwtTokenService.retrieveRefreshToken(refreshTokenCookieValue); // RT가 유효하면 AT, RT 재발급 if (refreshTokenDto != null) { @@ -61,9 +62,11 @@ protected void doFilterInternal( jwtTokenService.createRefreshTokenDto(refreshTokenDto.memberId()); HttpHeaders headers = - cookieUtil.generateRefreshTokenCookie(reissueRefreshTokenDto.refreshTokenValue()); + cookieUtil.generateRefreshTokenCookie( + reissueRefreshTokenDto.refreshTokenValue()); - response.addHeader(HttpHeaders.AUTHORIZATION, + response.addHeader( + HttpHeaders.AUTHORIZATION, TOKEN_PREFIX + reissueAccessTokenDto.accessTokenValue()); response.addHeader(HttpHeaders.SET_COOKIE, headers.getFirst(HttpHeaders.SET_COOKIE)); } @@ -73,10 +76,11 @@ protected void doFilterInternal( } private void setAuthenticationToken(Long memberId, MemberRole memberRole) { - UserDetails userDetails = new PrincipalDetails(memberId, memberRole); + UserDetails userDetails = new PrincipalDetails(memberId, memberRole); - UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(token); } diff --git a/src/main/java/com/amcamp/global/security/PrincipalDetails.java b/src/main/java/com/amcamp/global/security/PrincipalDetails.java index 854e1e45..7df2c4f1 100644 --- a/src/main/java/com/amcamp/global/security/PrincipalDetails.java +++ b/src/main/java/com/amcamp/global/security/PrincipalDetails.java @@ -1,52 +1,51 @@ package com.amcamp.global.security; import com.amcamp.domain.member.domain.MemberRole; +import java.util.Collection; +import java.util.List; import lombok.AllArgsConstructor; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; -import java.util.Collection; -import java.util.List; - @AllArgsConstructor public class PrincipalDetails implements UserDetails { - private final Long memberId; - private final MemberRole memberRole; - - @Override - public Collection getAuthorities() { - return List.of(new SimpleGrantedAuthority(memberRole.name())); - } - - @Override - public String getPassword() { - return null; - } - - @Override - public String getUsername() { - return memberId.toString(); - } - - @Override - public boolean isAccountNonExpired() { - return true; - } - - @Override - public boolean isAccountNonLocked() { - return true; - } - - @Override - public boolean isCredentialsNonExpired() { - return true; - } - - @Override - public boolean isEnabled() { - return true; - } + private final Long memberId; + private final MemberRole memberRole; + + @Override + public Collection getAuthorities() { + return List.of(new SimpleGrantedAuthority(memberRole.name())); + } + + @Override + public String getPassword() { + return null; + } + + @Override + public String getUsername() { + return memberId.toString(); + } + + @Override + public boolean isAccountNonExpired() { + return true; + } + + @Override + public boolean isAccountNonLocked() { + return true; + } + + @Override + public boolean isCredentialsNonExpired() { + return true; + } + + @Override + public boolean isEnabled() { + return true; + } } diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index f35dc811..a3c7ebf8 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -1,12 +1,12 @@ package com.amcamp.global.util; +import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; + import org.springframework.boot.web.server.Cookie; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; -import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; - @Component public class CookieUtil { @@ -25,19 +25,19 @@ public HttpHeaders generateRefreshTokenCookie(String refreshToken) { return headers; } - public HttpHeaders deleteRefreshTokenCookie() { - ResponseCookie refreshTokenCookie = - ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") - .path("/") - .maxAge(0) - .secure(false) - .sameSite(Cookie.SameSite.NONE.attributeValue()) - .httpOnly(true) - .build(); - - HttpHeaders headers = new HttpHeaders(); - headers.add(HttpHeaders.SET_COOKIE, refreshTokenCookie.toString()); - - return headers; - } + public HttpHeaders deleteRefreshTokenCookie() { + ResponseCookie refreshTokenCookie = + ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") + .path("/") + .maxAge(0) + .secure(false) + .sameSite(Cookie.SameSite.NONE.attributeValue()) + .httpOnly(true) + .build(); + + HttpHeaders headers = new HttpHeaders(); + headers.add(HttpHeaders.SET_COOKIE, refreshTokenCookie.toString()); + + return headers; + } } diff --git a/src/main/java/com/amcamp/global/util/JwtUtil.java b/src/main/java/com/amcamp/global/util/JwtUtil.java index 88790533..31d0ff8c 100644 --- a/src/main/java/com/amcamp/global/util/JwtUtil.java +++ b/src/main/java/com/amcamp/global/util/JwtUtil.java @@ -1,5 +1,7 @@ package com.amcamp.global.util; +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_ROLE_NAME; + import com.amcamp.domain.auth.dto.AccessTokenDto; import com.amcamp.domain.auth.dto.RefreshTokenDto; import com.amcamp.domain.member.domain.MemberRole; @@ -9,13 +11,10 @@ import io.jsonwebtoken.Jws; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Component; - import java.security.Key; import java.util.Date; - -import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_ROLE_NAME; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; @Component @RequiredArgsConstructor @@ -43,7 +42,8 @@ public RefreshTokenDto generateRefreshTokenDto(Long memberId) { Date expiredAt = new Date(issuedAt.getTime() + jwtProperties.refreshTokenExpirationMilliTime()); String refreshTokenValue = buildRefreshToken(memberId, issuedAt, expiredAt); - return RefreshTokenDto.of(memberId, refreshTokenValue, jwtProperties.refreshTokenExpirationTime()); + return RefreshTokenDto.of( + memberId, refreshTokenValue, jwtProperties.refreshTokenExpirationTime()); } public String generateRefreshToken(Long memberId) { @@ -115,8 +115,7 @@ private String buildAccessToken( .compact(); } - private String buildRefreshToken( - Long memberId, Date issuedAt, Date expiredAt) { + private String buildRefreshToken(Long memberId, Date issuedAt, Date expiredAt) { return Jwts.builder() .setIssuer(jwtProperties.issuer()) .setSubject(memberId.toString()) diff --git a/src/main/java/com/amcamp/global/util/MemberUtil.java b/src/main/java/com/amcamp/global/util/MemberUtil.java index c153924d..86292448 100644 --- a/src/main/java/com/amcamp/global/util/MemberUtil.java +++ b/src/main/java/com/amcamp/global/util/MemberUtil.java @@ -18,16 +18,16 @@ public class MemberUtil { private final MemberRepository memberRepository; public Member getCurrentMember() { - Member member = - memberRepository - .findById(getCurrentMemberId()) - .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); + Member member = + memberRepository + .findById(getCurrentMemberId()) + .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); - if (member.getStatus() == MemberStatus.DELETED){ - throw new CommonException(MemberErrorCode.MEMBER_ALREADY_DELETED); - } + if (member.getStatus() == MemberStatus.DELETED) { + throw new CommonException(MemberErrorCode.MEMBER_ALREADY_DELETED); + } - return member; + return member; } private Long getCurrentMemberId() { diff --git a/src/main/java/com/amcamp/global/util/RandomUtil.java b/src/main/java/com/amcamp/global/util/RandomUtil.java index 2dad409c..ca49348f 100644 --- a/src/main/java/com/amcamp/global/util/RandomUtil.java +++ b/src/main/java/com/amcamp/global/util/RandomUtil.java @@ -1,30 +1,32 @@ package com.amcamp.global.util; +import static com.amcamp.global.common.constants.RedisConstants.*; + +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Component; -import com.amcamp.global.util.RedisUtil; -import java.util.Optional; - -import static com.amcamp.global.common.constants.RedisConstants.*; @Component @RequiredArgsConstructor public class RandomUtil { - private final RedisUtil redisUtil; - private static String codeGenerator(int length){ - byte[] randomBytes = new byte[length]; - secureRandom.nextBytes(randomBytes); - return base64Encoder.encodeToString(randomBytes); - } - public String generateCode(Long teamId) { - final Optional existingCode = redisUtil.getData(TEAM_ID_PREFIX.formatted(teamId)); + private final RedisUtil redisUtil; + + private static String codeGenerator(int length) { + byte[] randomBytes = new byte[length]; + secureRandom.nextBytes(randomBytes); + return base64Encoder.encodeToString(randomBytes); + } + + public String generateCode(Long teamId) { + final Optional existingCode = redisUtil.getData(TEAM_ID_PREFIX.formatted(teamId)); - if (existingCode.isEmpty()) { - String inviteCode = codeGenerator(6); - redisUtil.setDataExpire(TEAM_ID_PREFIX.formatted(teamId), inviteCode, expirationTime); - redisUtil.setDataExpire(INVITE_CODE_PREFIX.formatted(inviteCode), teamId.toString(), expirationTime); - return inviteCode; - } - return existingCode.get(); - } + if (existingCode.isEmpty()) { + String inviteCode = codeGenerator(6); + redisUtil.setDataExpire(TEAM_ID_PREFIX.formatted(teamId), inviteCode, expirationTime); + redisUtil.setDataExpire( + INVITE_CODE_PREFIX.formatted(inviteCode), teamId.toString(), expirationTime); + return inviteCode; + } + return existingCode.get(); + } } diff --git a/src/main/java/com/amcamp/global/util/RedisUtil.java b/src/main/java/com/amcamp/global/util/RedisUtil.java index 3255e16e..d10bd925 100644 --- a/src/main/java/com/amcamp/global/util/RedisUtil.java +++ b/src/main/java/com/amcamp/global/util/RedisUtil.java @@ -1,28 +1,28 @@ package com.amcamp.global.util; +import java.time.Duration; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.data.redis.core.StringRedisTemplate; import org.springframework.data.redis.core.ValueOperations; import org.springframework.stereotype.Component; -import java.time.Duration; -import java.util.Optional; - @Component @RequiredArgsConstructor public class RedisUtil { - private final StringRedisTemplate redisTemplate; + private final StringRedisTemplate redisTemplate; + + public void setDataExpire(final String key, String value, final long durationHours) { + final ValueOperations valueOperations = redisTemplate.opsForValue(); + final Duration expireDuration = Duration.ofHours(durationHours); - public void setDataExpire(final String key, String value, final long durationHours) { - final ValueOperations valueOperations = redisTemplate.opsForValue(); - final Duration expireDuration = Duration.ofHours(durationHours); + valueOperations.set(key, value, expireDuration); + } - valueOperations.set(key, value, expireDuration); - } - public Optional getData(final String key) { - final ValueOperations valueOperations = redisTemplate.opsForValue(); - final String value = valueOperations.get(key); + public Optional getData(final String key) { + final ValueOperations valueOperations = redisTemplate.opsForValue(); + final String value = valueOperations.get(key); - return Optional.ofNullable(value); - } + return Optional.ofNullable(value); + } } diff --git a/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java b/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java index 0057b6fa..950a8a8f 100644 --- a/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java +++ b/src/main/java/com/amcamp/infra/config/feign/GoogleOauthClient.java @@ -1,24 +1,21 @@ package com.amcamp.infra.config.feign; +import static com.amcamp.global.common.constants.SecurityConstants.GOOGLE_LOGIN_ENDPOINT; +import static com.amcamp.global.common.constants.SecurityConstants.GOOGLE_LOGIN_URL; + import com.amcamp.domain.auth.dto.response.IdTokenResponse; import com.amcamp.global.config.feign.FeignConfig; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -import static com.amcamp.global.common.constants.SecurityConstants.GOOGLE_LOGIN_ENDPOINT; -import static com.amcamp.global.common.constants.SecurityConstants.GOOGLE_LOGIN_URL; - -@FeignClient( - name = "googleOauthClient", - url = GOOGLE_LOGIN_URL, - configuration = FeignConfig.class) +@FeignClient(name = "googleOauthClient", url = GOOGLE_LOGIN_URL, configuration = FeignConfig.class) public interface GoogleOauthClient { - @PostMapping(value = GOOGLE_LOGIN_ENDPOINT) - IdTokenResponse getIdToken( - @RequestParam("grant_type") String grantType, - @RequestParam("client_id") String clientId, - @RequestParam("redirect_uri") String redirectUri, - @RequestParam("code") String code, - @RequestParam("client_secret") String clientSecret); + @PostMapping(value = GOOGLE_LOGIN_ENDPOINT) + IdTokenResponse getIdToken( + @RequestParam("grant_type") String grantType, + @RequestParam("client_id") String clientId, + @RequestParam("redirect_uri") String redirectUri, + @RequestParam("code") String code, + @RequestParam("client_secret") String clientSecret); } diff --git a/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java b/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java index 326da108..66bb0fcf 100644 --- a/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java +++ b/src/main/java/com/amcamp/infra/config/feign/KakaoOauthClient.java @@ -1,24 +1,21 @@ package com.amcamp.infra.config.feign; +import static com.amcamp.global.common.constants.SecurityConstants.KAKAO_LOGIN_ENDPOINT; +import static com.amcamp.global.common.constants.SecurityConstants.KAKAO_LOGIN_URL; + import com.amcamp.domain.auth.dto.response.IdTokenResponse; import com.amcamp.global.config.feign.FeignConfig; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestParam; -import static com.amcamp.global.common.constants.SecurityConstants.KAKAO_LOGIN_ENDPOINT; -import static com.amcamp.global.common.constants.SecurityConstants.KAKAO_LOGIN_URL; - -@FeignClient( - name = "kakaoOauthClient", - url = KAKAO_LOGIN_URL, - configuration = FeignConfig.class) +@FeignClient(name = "kakaoOauthClient", url = KAKAO_LOGIN_URL, configuration = FeignConfig.class) public interface KakaoOauthClient { - @PostMapping(value = KAKAO_LOGIN_ENDPOINT) - IdTokenResponse getIdToken( - @RequestParam("grant_type") String grantType, - @RequestParam("client_id") String clientId, - @RequestParam("redirect_uri") String redirectUri, - @RequestParam("code") String code, - @RequestParam("client_secret") String clientSecret); + @PostMapping(value = KAKAO_LOGIN_ENDPOINT) + IdTokenResponse getIdToken( + @RequestParam("grant_type") String grantType, + @RequestParam("client_id") String clientId, + @RequestParam("redirect_uri") String redirectUri, + @RequestParam("code") String code, + @RequestParam("client_secret") String clientSecret); } diff --git a/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java b/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java index a9c3acbd..513cbeec 100644 --- a/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java +++ b/src/main/java/com/amcamp/infra/config/jpa/JpaAuditingConfig.java @@ -5,5 +5,4 @@ @Configuration @EnableJpaAuditing -public class JpaAuditingConfig { -} +public class JpaAuditingConfig {} diff --git a/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java b/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java index 2e55de9c..c8eae7e9 100644 --- a/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java +++ b/src/main/java/com/amcamp/infra/config/jwt/JwtProperties.java @@ -4,15 +4,16 @@ @ConfigurationProperties(prefix = "jwt") public record JwtProperties( - String accessTokenSecret, - String refreshTokenSecret, - Long accessTokenExpirationTime, - Long refreshTokenExpirationTime, - String issuer) { - public Long accessTokenExpirationMilliTime() { - return accessTokenExpirationTime * 1000; - } - public Long refreshTokenExpirationMilliTime() { - return refreshTokenExpirationTime * 1000; - } + String accessTokenSecret, + String refreshTokenSecret, + Long accessTokenExpirationTime, + Long refreshTokenExpirationTime, + String issuer) { + public Long accessTokenExpirationMilliTime() { + return accessTokenExpirationTime * 1000; + } + + public Long refreshTokenExpirationMilliTime() { + return refreshTokenExpirationTime * 1000; + } } diff --git a/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java b/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java index 24ba749f..bb57b3c8 100644 --- a/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java +++ b/src/main/java/com/amcamp/infra/config/oauth/GoogleProperties.java @@ -4,8 +4,4 @@ @ConfigurationProperties(prefix = "oauth.google") public record GoogleProperties( - String clientId, - String clientSecret, - String redirectUri, - String grantType) { -} + String clientId, String clientSecret, String redirectUri, String grantType) {} diff --git a/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java b/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java index d5328db5..b29e6d52 100644 --- a/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java +++ b/src/main/java/com/amcamp/infra/config/oauth/KakaoProperties.java @@ -4,8 +4,4 @@ @ConfigurationProperties(prefix = "oauth.kakao") public record KakaoProperties( - String clientId, - String clientSecret, - String redirectUri, - String grantType) { -} + String clientId, String clientSecret, String redirectUri, String grantType) {} diff --git a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java index 2819fc2a..f82ea119 100644 --- a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java +++ b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java @@ -8,10 +8,10 @@ import org.springframework.context.annotation.Configuration; @EnableConfigurationProperties({ - RedisProperties.class, - GoogleProperties.class, - KakaoProperties.class, - JwtProperties.class, + RedisProperties.class, + GoogleProperties.class, + KakaoProperties.class, + JwtProperties.class, }) @Configuration public class PropertiesConfig {} diff --git a/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java b/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java index 53c5b66b..e733acac 100644 --- a/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java +++ b/src/main/java/com/amcamp/infra/config/redis/RedisConfig.java @@ -1,5 +1,6 @@ package com.amcamp.infra.config.redis; +import java.time.Duration; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -7,41 +8,38 @@ import org.springframework.data.redis.connection.RedisStandaloneConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceClientConfiguration; import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory; -import org.springframework.data.redis.core.RedisTemplate; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer; import org.springframework.data.redis.serializer.StringRedisSerializer; -import java.time.Duration; - @Configuration @RequiredArgsConstructor public class RedisConfig { - private final RedisProperties redisProperties; + private final RedisProperties redisProperties; + + @Bean + public RedisConnectionFactory redisConnectionFactory() { + RedisStandaloneConfiguration redisStandaloneConfig = + new RedisStandaloneConfiguration(redisProperties.host(), redisProperties.port()); + if (!redisProperties.password().isBlank()) { + redisStandaloneConfig.setPassword(redisProperties.password()); + } - @Bean - public RedisConnectionFactory redisConnectionFactory() { - RedisStandaloneConfiguration redisStandaloneConfig = - new RedisStandaloneConfiguration(redisProperties.host(), redisProperties.port()); - if (!redisProperties.password().isBlank()) { - redisStandaloneConfig.setPassword(redisProperties.password()); - } + LettuceClientConfiguration lettuceClientConfig = + LettuceClientConfiguration.builder() + .commandTimeout(Duration.ofSeconds(1)) + .shutdownTimeout(Duration.ZERO) + .build(); - LettuceClientConfiguration lettuceClientConfig = - LettuceClientConfiguration.builder() - .commandTimeout(Duration.ofSeconds(1)) - .shutdownTimeout(Duration.ZERO) - .build(); + return new LettuceConnectionFactory(redisStandaloneConfig, lettuceClientConfig); + } - return new LettuceConnectionFactory(redisStandaloneConfig, lettuceClientConfig); - } - @Bean - public StringRedisTemplate redisTemplate() { - final StringRedisTemplate redisTemplate = new StringRedisTemplate(); - redisTemplate.setConnectionFactory(redisConnectionFactory()); - redisTemplate.setKeySerializer(new StringRedisSerializer()); - redisTemplate.setValueSerializer(new StringRedisSerializer()); - return redisTemplate; - } + @Bean + public StringRedisTemplate redisTemplate() { + final StringRedisTemplate redisTemplate = new StringRedisTemplate(); + redisTemplate.setConnectionFactory(redisConnectionFactory()); + redisTemplate.setKeySerializer(new StringRedisSerializer()); + redisTemplate.setValueSerializer(new StringRedisSerializer()); + return redisTemplate; + } } diff --git a/src/test/java/com/amcamp/DevFitApplicationTests.java b/src/test/java/com/amcamp/DevFitApplicationTests.java index e49c17b2..df9b12f8 100644 --- a/src/test/java/com/amcamp/DevFitApplicationTests.java +++ b/src/test/java/com/amcamp/DevFitApplicationTests.java @@ -9,7 +9,5 @@ class DevFitApplicationTests { @Test - void contextLoads() { - } - + void contextLoads() {} } diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java index ede6518d..9f6e0687 100644 --- a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -1,5 +1,8 @@ package com.amcamp.domain.member.application; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.amcamp.domain.auth.dao.RefreshTokenRepository; import com.amcamp.domain.auth.domain.RefreshToken; import com.amcamp.domain.member.dao.MemberRepository; @@ -19,65 +22,65 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.test.context.ActiveProfiles; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - @SpringBootTest @ActiveProfiles("test") class MemberServiceTest { - @Autowired - private MemberUtil memberUtil; - @Autowired - private MemberService memberService; - @Autowired - private MemberRepository memberRepository; - @Autowired - private RefreshTokenRepository refreshTokenRepository; + @Autowired private MemberUtil memberUtil; + @Autowired private MemberService memberService; + @Autowired private MemberRepository memberRepository; + @Autowired private RefreshTokenRepository refreshTokenRepository; - private Member registerAuthenticatedMember() { - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); + private Member registerAuthenticatedMember() { + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); - UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); - UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(token); + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); - return member; - } + return member; + } - @Nested - class 회원_탈퇴_시 { - @Test - void 탈퇴하지_않은_유저면_성공한다() { - // given - Member member = registerAuthenticatedMember(); + @Nested + class 회원_탈퇴_시 { + @Test + void 탈퇴하지_않은_유저면_성공한다() { + // given + Member member = registerAuthenticatedMember(); - RefreshToken refreshToken = - RefreshToken.builder().memberId(member.getId()).token("testRefreshToken").build(); - refreshTokenRepository.save(refreshToken); + RefreshToken refreshToken = + RefreshToken.builder() + .memberId(member.getId()) + .token("testRefreshToken") + .build(); + refreshTokenRepository.save(refreshToken); - // when - memberService.withdrawalMember(); - Member currentMember = memberRepository.findById(member.getId()).get(); + // when + memberService.withdrawalMember(); + Member currentMember = memberRepository.findById(member.getId()).get(); - // then - assertThat(refreshTokenRepository.findById(member.getId())).isEmpty(); - assertThat(currentMember.getStatus()).isEqualTo(MemberStatus.DELETED); - } + // then + assertThat(refreshTokenRepository.findById(member.getId())).isEmpty(); + assertThat(currentMember.getStatus()).isEqualTo(MemberStatus.DELETED); + } - @Test - void 탈퇴한_유저면_예외가_발생한다() { - // given - registerAuthenticatedMember(); - memberService.withdrawalMember(); + @Test + void 탈퇴한_유저면_예외가_발생한다() { + // given + registerAuthenticatedMember(); + memberService.withdrawalMember(); - // when & then - assertThatThrownBy(() -> memberService.withdrawalMember()) - .isInstanceOf(CommonException.class) - .hasMessage(MemberErrorCode.MEMBER_ALREADY_DELETED.getMessage()); - } - } + // when & then + assertThatThrownBy(() -> memberService.withdrawalMember()) + .isInstanceOf(CommonException.class) + .hasMessage(MemberErrorCode.MEMBER_ALREADY_DELETED.getMessage()); + } + } } diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 46e39564..81acf184 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -1,8 +1,11 @@ package com.amcamp.domain.team; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.*; + import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.member.domain.MemberRole; import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.domain.participant.dao.ParticipantRepository; import com.amcamp.domain.participant.domain.Participant; @@ -15,8 +18,6 @@ import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; -import org.junit.jupiter.api.Assertions; -import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,184 +28,206 @@ import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.*; - @SpringBootTest @ActiveProfiles("test") public class TeamServiceTest { - @Autowired - private TeamRepository teamRepository; - @Autowired - private MemberRepository memberRepository; - @Autowired - private ParticipantRepository participantRepository; - @Autowired - private TeamService teamService; - - private void loginAs(Member member) { - UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); - UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(token); - } - - @Nested - class 팀_생성_시 { - @Test - void 초대코드를_반환한다 () { - // given - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - // when - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - - // then - assertThat(inviteCodeResponse).isNotNull(); - assertThat(inviteCodeResponse.inviteCode()).isNotNull(); - assertThat(inviteCodeResponse.inviteCode()).hasSize(8); - } - } - - @Nested - class 팀_아이디로_코드확인_시{ - @Test - void 팀이_유효한_경우에는_초대코드를_반환한다 (){ - // given - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - Long teamId = teamService.getTeamInfo(inviteCodeResponse.inviteCode()).teamId(); - - // when - TeamInviteCodeResponse response = teamService.getTeamCode(teamId); - - // then - assertThat(response).isNotNull(); - assertThat(response.inviteCode()).isNotNull(); - assertThat(response.inviteCode()).hasSize(8); - } - - @Test - void 팀이_유효하지않는_경우에는_예외가_발생한다 (){ - // given - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - - // when & then - assertThatThrownBy(() -> teamService.getTeamCode(-999L)) - .isInstanceOf(CommonException.class) - .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); - - } - } - @Nested - class 팀_참가_시{ - @Test - @Transactional - void 새롭게_참여하는_경우에는_팀에_USER로_등록된다(){ - //given - // 1. savedAdmin 로그인 후 팀 생성 - Member savedAdmin = Member.createMember("admin", "testProfileImageUrl", - OauthInfo.createOauthInfo("adminOauthId", "adminOauthProvider")); - memberRepository.save(savedAdmin); - loginAs(savedAdmin); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - String inviteCode = inviteCodeResponse.inviteCode(); - - - // 2. savedMember 로그인 처리 후 팀 참여 - Member savedMember = memberRepository.save(Member.createMember("member", null, null)); -// UserDetails newUserDetails = new PrincipalDetails(savedMember.getId(), savedMember.getRole()); -// UsernamePasswordAuthenticationToken newToken = -// new UsernamePasswordAuthenticationToken(newUserDetails, null, newUserDetails.getAuthorities()); -// SecurityContextHolder.getContext().setAuthentication(newToken); - loginAs(savedMember); - - // when - teamService.joinTeam(inviteCode); - - // then - TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(inviteCode); - Team savedTeam = teamRepository.findById(teamInfoResponse.teamId()).orElseThrow(() - -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - - Participant participant = participantRepository.findByMemberAndTeam(savedMember, savedTeam) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); - - assertThat(participant.getMember()).isEqualTo(savedMember); - assertThat(participant.getRole()).isEqualTo(ParticipantRole.USER); - assertThat(participant.getTeam()).isEqualTo(savedTeam); - - } - @Test - void 이미_팀에_참가한_경우에는_예외가_발생한다(){ - //given - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - String inviteCode = inviteCodeResponse.inviteCode(); - - // when & then - assertThatThrownBy(() -> teamService.joinTeam(inviteCode)) - .isInstanceOf(CommonException.class) - .extracting("errorCode") - .isEqualTo(TeamErrorCode.MEMBER_ALREADY_JOINED); - } - } - @Nested - class 초대코드로_팀_확인_시{ - @Test - void 코드가_유효한_경우에는_팀_정보를_반환한다(){ - //given - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - String validInviteCode = inviteCodeResponse.inviteCode(); - - // when - TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(validInviteCode); - - // then - assertThat(teamInfoResponse).isNotNull(); - assertThat(teamInfoResponse.teamId()).isNotNull(); - - Team savedTeam = teamRepository.findById(teamInfoResponse.teamId()) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - - assertThat(teamInfoResponse.teamName()).isEqualTo(savedTeam.getTeamName()); - assertThat(teamInfoResponse.teamId()).isEqualTo(savedTeam.getId()); - } - - @Test - void 코드가_유효하지않는_경우에는_예외를_반환한다(){ - // given - String invalidInviteCode = "invalidCode"; - - // when & then - assertThatThrownBy(() -> teamService.getTeamInfo(invalidInviteCode)) - .isInstanceOf(CommonException.class) - .extracting("errorCode") - .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); - } - } + @Autowired private TeamRepository teamRepository; + @Autowired private MemberRepository memberRepository; + @Autowired private ParticipantRepository participantRepository; + @Autowired private TeamService teamService; + + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + @Nested + class 팀_생성_시 { + @Test + void 초대코드를_반환한다() { + // given + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + // when + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + + // then + assertThat(inviteCodeResponse).isNotNull(); + assertThat(inviteCodeResponse.inviteCode()).isNotNull(); + assertThat(inviteCodeResponse.inviteCode()).hasSize(8); + } + } + + @Nested + class 팀_아이디로_코드확인_시 { + @Test + void 팀이_유효한_경우에는_초대코드를_반환한다() { + // given + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + Long teamId = teamService.getTeamInfo(inviteCodeResponse.inviteCode()).teamId(); + + // when + TeamInviteCodeResponse response = teamService.getTeamCode(teamId); + + // then + assertThat(response).isNotNull(); + assertThat(response.inviteCode()).isNotNull(); + assertThat(response.inviteCode()).hasSize(8); + } + + @Test + void 팀이_유효하지않는_경우에는_예외가_발생한다() { + // given + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + + // when & then + assertThatThrownBy(() -> teamService.getTeamCode(-999L)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); + } + } + + @Nested + class 팀_참가_시 { + @Test + @Transactional + void 새롭게_참여하는_경우에는_팀에_USER로_등록된다() { + // given + // 1. savedAdmin 로그인 후 팀 생성 + Member savedAdmin = + Member.createMember( + "admin", + "testProfileImageUrl", + OauthInfo.createOauthInfo("adminOauthId", "adminOauthProvider")); + memberRepository.save(savedAdmin); + loginAs(savedAdmin); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + String inviteCode = inviteCodeResponse.inviteCode(); + + // 2. savedMember 로그인 처리 후 팀 참여 + Member savedMember = memberRepository.save(Member.createMember("member", null, null)); + // UserDetails newUserDetails = new PrincipalDetails(savedMember.getId(), + // savedMember.getRole()); + // UsernamePasswordAuthenticationToken newToken = + // new UsernamePasswordAuthenticationToken(newUserDetails, null, + // newUserDetails.getAuthorities()); + // SecurityContextHolder.getContext().setAuthentication(newToken); + loginAs(savedMember); + + // when + teamService.joinTeam(inviteCode); + + // then + TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(inviteCode); + Team savedTeam = + teamRepository + .findById(teamInfoResponse.teamId()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + Participant participant = + participantRepository + .findByMemberAndTeam(savedMember, savedTeam) + .orElseThrow( + () -> + new CommonException( + TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + + assertThat(participant.getMember()).isEqualTo(savedMember); + assertThat(participant.getRole()).isEqualTo(ParticipantRole.USER); + assertThat(participant.getTeam()).isEqualTo(savedTeam); + } + + @Test + void 이미_팀에_참가한_경우에는_예외가_발생한다() { + // given + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + String inviteCode = inviteCodeResponse.inviteCode(); + + // when & then + assertThatThrownBy(() -> teamService.joinTeam(inviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.MEMBER_ALREADY_JOINED); + } + } + + @Nested + class 초대코드로_팀_확인_시 { + @Test + void 코드가_유효한_경우에는_팀_정보를_반환한다() { + // given + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + String validInviteCode = inviteCodeResponse.inviteCode(); + + // when + TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(validInviteCode); + + // then + assertThat(teamInfoResponse).isNotNull(); + assertThat(teamInfoResponse.teamId()).isNotNull(); + + Team savedTeam = + teamRepository + .findById(teamInfoResponse.teamId()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + assertThat(teamInfoResponse.teamName()).isEqualTo(savedTeam.getTeamName()); + assertThat(teamInfoResponse.teamId()).isEqualTo(savedTeam.getId()); + } + + @Test + void 코드가_유효하지않는_경우에는_예외를_반환한다() { + // given + String invalidInviteCode = "invalidCode"; + + // when & then + assertThatThrownBy(() -> teamService.getTeamInfo(invalidInviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); + } + } } diff --git a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java index e9ab3afa..264429e0 100644 --- a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java +++ b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java @@ -1,77 +1,77 @@ package com.amcamp.global.exception; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + import com.amcamp.global.common.response.CommonResponse; import com.amcamp.global.exception.errorcode.AuthErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.fasterxml.jackson.databind.ObjectMapper; +import java.util.Optional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -import java.util.Optional; - -import static org.assertj.core.api.AssertionsForClassTypes.assertThat; -import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; - public class ExceptionHandlerTest { - AuthErrorCode authErrorCode = AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED; - ProjectErrorCode projectErrorCode = ProjectErrorCode.PROJECT_NOT_FOUND; - void throwExceptionWithAuthErrorCode(Object o){ - Optional mockObject = Optional.ofNullable(o); - if(!mockObject.isPresent()){ - throw new CommonException(authErrorCode); - } - } - void throwExceptionWithProjectErrorCode(Object o){ - Optional mockObject = Optional.ofNullable(o); - if(!mockObject.isPresent()){ - throw new CommonException(projectErrorCode); - } - } - @Test - @DisplayName("authError Test") - void commonExceptionWithAuthErrorTest() { - assertThatThrownBy(()-> throwExceptionWithAuthErrorCode(null)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(authErrorCode.getMessage()); - } - - @Test - @DisplayName("projectError Test") - void commonExceptionWithProjectErrorTest() { - assertThatThrownBy(()-> throwExceptionWithProjectErrorCode(null)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(projectErrorCode.getMessage()); - - } - - @Test - @DisplayName("ExceptionHandler Test") - void globalExceptionHandlerTest() { - - //given: 예외 핸들러와 예외 생성 - GlobalExceptionHandler globalExceptionHandler = new GlobalExceptionHandler(); - CommonException exception = new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND, "project_id", null); - - //when: 예외 핸들러 실행 - CommonResponse response = globalExceptionHandler.commonExceptionHandler(exception).getBody(); - - //then: 응답 객체 검증 - assertThat(response).isNotNull(); - assertThat(response.getStatus()).isEqualTo(400); - assertThat(response.getData()).isInstanceOf(ErrorDetail.class); - - //ErrorMsg 객체 세부 검증 - ObjectMapper objectMapper = new ObjectMapper(); - - ErrorDetail errorDetail = objectMapper.convertValue(response.getData(), ErrorDetail.class); - ErrorMsg errorMsg = objectMapper.convertValue(errorDetail.getReasonMessage(), ErrorMsg.class); - - assertThat(errorMsg.getReason()).isEqualTo(projectErrorCode.getErrorMsg().getReason()); - assertThat(errorMsg.getCode()).isEqualTo(projectErrorCode.getErrorMsg().getCode()); - - - - } - + AuthErrorCode authErrorCode = AuthErrorCode.ID_TOKEN_VERIFICATION_FAILED; + ProjectErrorCode projectErrorCode = ProjectErrorCode.PROJECT_NOT_FOUND; + + void throwExceptionWithAuthErrorCode(Object o) { + Optional mockObject = Optional.ofNullable(o); + if (!mockObject.isPresent()) { + throw new CommonException(authErrorCode); + } + } + + void throwExceptionWithProjectErrorCode(Object o) { + Optional mockObject = Optional.ofNullable(o); + if (!mockObject.isPresent()) { + throw new CommonException(projectErrorCode); + } + } + + @Test + @DisplayName("authError Test") + void commonExceptionWithAuthErrorTest() { + assertThatThrownBy(() -> throwExceptionWithAuthErrorCode(null)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(authErrorCode.getMessage()); + } + + @Test + @DisplayName("projectError Test") + void commonExceptionWithProjectErrorTest() { + assertThatThrownBy(() -> throwExceptionWithProjectErrorCode(null)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(projectErrorCode.getMessage()); + } + + @Test + @DisplayName("ExceptionHandler Test") + void globalExceptionHandlerTest() { + + // given: 예외 핸들러와 예외 생성 + GlobalExceptionHandler globalExceptionHandler = new GlobalExceptionHandler(); + CommonException exception = + new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND, "project_id", null); + + // when: 예외 핸들러 실행 + CommonResponse response = + globalExceptionHandler.commonExceptionHandler(exception).getBody(); + + // then: 응답 객체 검증 + assertThat(response).isNotNull(); + assertThat(response.getStatus()).isEqualTo(400); + assertThat(response.getData()).isInstanceOf(ErrorDetail.class); + + // ErrorMsg 객체 세부 검증 + ObjectMapper objectMapper = new ObjectMapper(); + + ErrorDetail errorDetail = objectMapper.convertValue(response.getData(), ErrorDetail.class); + ErrorMsg errorMsg = + objectMapper.convertValue(errorDetail.getReasonMessage(), ErrorMsg.class); + + assertThat(errorMsg.getReason()).isEqualTo(projectErrorCode.getErrorMsg().getReason()); + assertThat(errorMsg.getCode()).isEqualTo(projectErrorCode.getErrorMsg().getCode()); + } } diff --git a/src/test/java/com/amcamp/global/util/MemberUtilTest.java b/src/test/java/com/amcamp/global/util/MemberUtilTest.java index 3454ab84..c692721a 100644 --- a/src/test/java/com/amcamp/global/util/MemberUtilTest.java +++ b/src/test/java/com/amcamp/global/util/MemberUtilTest.java @@ -1,5 +1,7 @@ package com.amcamp.global.util; +import static org.assertj.core.api.Assertions.assertThat; + import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; @@ -12,41 +14,41 @@ import org.springframework.security.core.userdetails.UserDetails; import org.springframework.test.context.ActiveProfiles; -import static org.assertj.core.api.Assertions.assertThat; - @SpringBootTest @ActiveProfiles("test") public class MemberUtilTest { - @Autowired - private MemberUtil memberUtil; - @Autowired - private MemberRepository memberRepository; + @Autowired private MemberUtil memberUtil; + @Autowired private MemberRepository memberRepository; - private Member registerAuthenticatedMember() { - Member member = Member.createMember("testNickName", "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); + private Member registerAuthenticatedMember() { + Member member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); - UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); - UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken(userDetails, null, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(token); + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); - return member; - } + return member; + } - @Test - void 로그인한_멤버의_정보를_조회한다() { + @Test + void 로그인한_멤버의_정보를_조회한다() { - // given - Member member = registerAuthenticatedMember(); + // given + Member member = registerAuthenticatedMember(); - // when - Member currentMember = memberUtil.getCurrentMember(); + // when + Member currentMember = memberUtil.getCurrentMember(); - // then - assertThat(member.getId()).isEqualTo(currentMember.getId()); - assertThat(member.getRole()).isEqualTo(currentMember.getRole()); - } + // then + assertThat(member.getId()).isEqualTo(currentMember.getId()); + assertThat(member.getRole()).isEqualTo(currentMember.getRole()); + } } From 93f0a8e47523d8e2b14bae4f79b82870e8d51d84 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 10 Feb 2025 20:42:50 +0900 Subject: [PATCH 022/107] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=ED=94=84?= =?UTF-8?q?=EB=A1=9C=ED=95=84=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EB=B0=8F=20?= =?UTF-8?q?=EB=8B=89=EB=84=A4=EC=9E=84=20=EB=B3=80=EA=B2=BD=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#47)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: s3 의존성 추가 * chore: s3.yml 추가 * chore: s3 properties 추가 * chore: s3 client config 추가 * feat: 회원 프로필 이미지 Presigned URL 생성 * feat: url 공통 상수 추가 * feat: 회원 프로필 이미지 업로드 완료 처리 * fix: 기본 S3 엔드포인트 사용하도록 수정 * feat: 회원 닉네임 변경 기능 구현 * test: 이미지 업로드 및 완료 처리 테스트 * refactor: 잘못 추가된 패키지 제거 * refactor: gitkeep 제거 * refactor: 패키지명 수정 * test: 회원 닉네임 변경 테스트 * style: spotless --- build.gradle | 3 + .../domain/image/api/ImageController.java | 41 ++++++ .../image/application/ImageService.java | 117 ++++++++++++++++++ .../domain/image/dao/ImageRepository.java | 15 +++ .../com/amcamp/domain/image/domain/Image.java | 42 +++++++ .../image/domain/ImageFileExtension.java | 15 +++ .../MemberImageUploadCompleteRequest.java | 10 ++ .../dto/request/MemberImageUploadRequest.java | 10 ++ .../dto/response/PresignedUrlResponse.java | 5 + .../domain/member/api/MemberController.java | 14 ++- .../member/application/MemberService.java | 7 ++ .../amcamp/domain/member/domain/Member.java | 8 ++ .../com/amcamp/domain/member/dto/.gitkeep | 0 .../dto/request/NicknameUpdateRequest.java | 8 ++ .../global/common/constants/UrlConstants.java | 6 + .../exception/errorcode/ImageErrorCode.java | 23 ++++ .../config/properties/PropertiesConfig.java | 2 + .../com/amcamp/infra/config/s3/S3Config.java | 31 +++++ .../amcamp/infra/config/s3/S3Properties.java | 7 ++ src/main/resources/application-s3.yml | 11 ++ src/main/resources/application.yml | 1 + .../image/application/ImageServiceTest.java | 116 +++++++++++++++++ .../member/application/MemberServiceTest.java | 39 +++++- test/.gitignore | 29 ----- test/src/Main.java | 5 - test/src/Person.java | 20 --- test/src/Student.java | 8 -- test/src/Worker.java | 7 -- 28 files changed, 526 insertions(+), 74 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/image/api/ImageController.java create mode 100644 src/main/java/com/amcamp/domain/image/application/ImageService.java create mode 100644 src/main/java/com/amcamp/domain/image/dao/ImageRepository.java create mode 100644 src/main/java/com/amcamp/domain/image/domain/Image.java create mode 100644 src/main/java/com/amcamp/domain/image/domain/ImageFileExtension.java create mode 100644 src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java create mode 100644 src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java create mode 100644 src/main/java/com/amcamp/domain/image/dto/response/PresignedUrlResponse.java delete mode 100644 src/main/java/com/amcamp/domain/member/dto/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java create mode 100644 src/main/java/com/amcamp/global/common/constants/UrlConstants.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java create mode 100644 src/main/java/com/amcamp/infra/config/s3/S3Config.java create mode 100644 src/main/java/com/amcamp/infra/config/s3/S3Properties.java create mode 100644 src/main/resources/application-s3.yml create mode 100644 src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java delete mode 100644 test/.gitignore delete mode 100644 test/src/Main.java delete mode 100644 test/src/Person.java delete mode 100644 test/src/Student.java delete mode 100644 test/src/Worker.java diff --git a/build.gradle b/build.gradle index cd178020..ed4a8b46 100644 --- a/build.gradle +++ b/build.gradle @@ -71,6 +71,9 @@ dependencies { annotationProcessor "com.querydsl:querydsl-apt:5.0.0:jakarta" annotationProcessor "jakarta.annotation:jakarta.annotation-api" annotationProcessor "jakarta.persistence:jakarta.persistence-api" + + // S3 + implementation 'io.awspring.cloud:spring-cloud-starter-aws:2.4.4' } tasks.named('test') { diff --git a/src/main/java/com/amcamp/domain/image/api/ImageController.java b/src/main/java/com/amcamp/domain/image/api/ImageController.java new file mode 100644 index 00000000..a47cb355 --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/api/ImageController.java @@ -0,0 +1,41 @@ +package com.amcamp.domain.image.api; + +import com.amcamp.domain.image.application.ImageService; +import com.amcamp.domain.image.dto.request.MemberImageUploadCompleteRequest; +import com.amcamp.domain.image.dto.request.MemberImageUploadRequest; +import com.amcamp.domain.image.dto.response.PresignedUrlResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "이미지 API", description = "이미지 관련 API입니다.") +@RestController +@RequiredArgsConstructor +public class ImageController { + + private final ImageService imageService; + + @Operation( + summary = "회원 프로필 이미지 Presigned URL 생성", + description = "회원 프로필 이미지 Presigned URL을 생성합니다.") + @PostMapping("/members/me/image/upload-url") + public PresignedUrlResponse memberImagePresignedUrlCreate( + @Valid @RequestBody MemberImageUploadRequest request) { + return imageService.createMemberImagePresignedUrl(request); + } + + @Operation( + summary = "회원 프로필 이미지 업로드 완료 처리", + description = "회원 프로필 이미지의 업로드가 완료되었을 때 호출하시면 됩니다.") + @PostMapping("/members/me/image/upload-complete") + public ResponseEntity memberImageUploadComplete( + @Valid @RequestBody MemberImageUploadCompleteRequest request) { + imageService.uploadCompleteMemberImage(request); + return ResponseEntity.ok().build(); + } +} diff --git a/src/main/java/com/amcamp/domain/image/application/ImageService.java b/src/main/java/com/amcamp/domain/image/application/ImageService.java new file mode 100644 index 00000000..3e901b26 --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/application/ImageService.java @@ -0,0 +1,117 @@ +package com.amcamp.domain.image.application; + +import com.amazonaws.HttpMethod; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.Headers; +import com.amazonaws.services.s3.model.CannedAccessControlList; +import com.amazonaws.services.s3.model.GeneratePresignedUrlRequest; +import com.amcamp.domain.image.dao.ImageRepository; +import com.amcamp.domain.image.domain.Image; +import com.amcamp.domain.image.domain.ImageFileExtension; +import com.amcamp.domain.image.dto.request.MemberImageUploadCompleteRequest; +import com.amcamp.domain.image.dto.request.MemberImageUploadRequest; +import com.amcamp.domain.image.dto.response.PresignedUrlResponse; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.global.common.constants.UrlConstants; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ImageErrorCode; +import com.amcamp.global.util.MemberUtil; +import com.amcamp.infra.config.s3.S3Properties; +import java.util.Date; +import java.util.UUID; +import java.util.concurrent.TimeUnit; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +@RequiredArgsConstructor +public class ImageService { + + private final MemberUtil memberUtil; + private final S3Properties s3Properties; + private final ImageRepository imageRepository; + private final AmazonS3 amazonS3; + + public PresignedUrlResponse createMemberImagePresignedUrl(MemberImageUploadRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + + String imageKey = generateUUID(); + String imageName = + createImageFileName(currentMember.getId(), imageKey, request.imageFileExtension()); + GeneratePresignedUrlRequest generatePresignedUrlRequest = + generatePresignedUrlRequest( + s3Properties.bucket(), + imageName, + request.imageFileExtension().getExtension()); + + String presignedUrl = amazonS3.generatePresignedUrl(generatePresignedUrlRequest).toString(); + + imageRepository.save( + Image.createImage(currentMember.getId(), imageKey, request.imageFileExtension())); + + return new PresignedUrlResponse(presignedUrl); + } + + public void uploadCompleteMemberImage(MemberImageUploadCompleteRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + + String imageUrl = null; + if (request.imageFileExtension() != null) { + Image image = findImage(currentMember.getId(), request.imageFileExtension()); + imageUrl = + createReadImageUrl( + currentMember.getId(), + image.getImageKey(), + image.getImageFileExtension()); + } + + currentMember.updateProfileImageUrl(imageUrl); + } + + private GeneratePresignedUrlRequest generatePresignedUrlRequest( + String bucket, String imageName, String imageFileExtension) { + GeneratePresignedUrlRequest generatePresignedUrlRequest = + new GeneratePresignedUrlRequest(bucket, imageName, HttpMethod.PUT) + .withKey(imageName) + .withContentType("image/" + imageFileExtension) + .withExpiration(getPresignedUrlExpiration()); + + generatePresignedUrlRequest.addRequestParameter( + Headers.S3_CANNED_ACL, CannedAccessControlList.PublicRead.toString()); + + return generatePresignedUrlRequest; + } + + private String generateUUID() { + return UUID.randomUUID().toString(); + } + + private String createImageFileName( + Long memberId, String imageKey, ImageFileExtension imageFileExtension) { + return memberId + "/" + imageKey + "." + imageFileExtension.getExtension(); + } + + private Date getPresignedUrlExpiration() { + Date expiration = new Date(); + long expTime = expiration.getTime(); + expTime += TimeUnit.MINUTES.toMillis(3); + expiration.setTime(expTime); + + return expiration; + } + + private Image findImage(Long memberId, ImageFileExtension imageFileExtension) { + return imageRepository + .findLatestByMemberIdAndExtension(memberId, imageFileExtension) + .orElseThrow(() -> new CommonException(ImageErrorCode.IMAGE_NOT_FOUND)); + } + + private String createReadImageUrl( + Long memberId, String imageKey, ImageFileExtension imageFileExtension) { + return UrlConstants.IMAGE_URL + + "/" + + createImageFileName(memberId, imageKey, imageFileExtension); + } +} diff --git a/src/main/java/com/amcamp/domain/image/dao/ImageRepository.java b/src/main/java/com/amcamp/domain/image/dao/ImageRepository.java new file mode 100644 index 00000000..2354c08e --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/dao/ImageRepository.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.image.dao; + +import com.amcamp.domain.image.domain.Image; +import com.amcamp.domain.image.domain.ImageFileExtension; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +public interface ImageRepository extends JpaRepository { + @Query( + "select i from Image i where i.memberId = :memberId and i.imageFileExtension = :imageFileExtension " + + "order by i.id desc limit 1") + Optional findLatestByMemberIdAndExtension( + Long memberId, ImageFileExtension imageFileExtension); +} diff --git a/src/main/java/com/amcamp/domain/image/domain/Image.java b/src/main/java/com/amcamp/domain/image/domain/Image.java new file mode 100644 index 00000000..09940a36 --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/domain/Image.java @@ -0,0 +1,42 @@ +package com.amcamp.domain.image.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Image extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "image_id") + private Long id; + + private Long memberId; + + private String imageKey; + + @Enumerated(EnumType.STRING) + private ImageFileExtension imageFileExtension; + + @Builder(access = AccessLevel.PRIVATE) + private Image(Long memberId, String imageKey, ImageFileExtension imageFileExtension) { + this.memberId = memberId; + this.imageKey = imageKey; + this.imageFileExtension = imageFileExtension; + } + + public static Image createImage( + Long memberId, String imageKey, ImageFileExtension imageFileExtension) { + return Image.builder() + .memberId(memberId) + .imageKey(imageKey) + .imageFileExtension(imageFileExtension) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/image/domain/ImageFileExtension.java b/src/main/java/com/amcamp/domain/image/domain/ImageFileExtension.java new file mode 100644 index 00000000..084b549a --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/domain/ImageFileExtension.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.image.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ImageFileExtension { + PNG("png"), + JPG("jpg"), + JPEG("jpeg"), + ; + + private final String extension; +} diff --git a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java new file mode 100644 index 00000000..52f34e62 --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java @@ -0,0 +1,10 @@ +package com.amcamp.domain.image.dto.request; + +import com.amcamp.domain.image.domain.ImageFileExtension; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; + +public record MemberImageUploadCompleteRequest( + @NotNull(message = "이미지 파일 확장자는 비워둘 수 없습니다.") + @Schema(description = "이미지 파일 확장자", defaultValue = "JPEG") + ImageFileExtension imageFileExtension) {} diff --git a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java new file mode 100644 index 00000000..5a666f8f --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java @@ -0,0 +1,10 @@ +package com.amcamp.domain.image.dto.request; + +import com.amcamp.domain.image.domain.ImageFileExtension; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; + +public record MemberImageUploadRequest( + @NotNull(message = "이미지 파일 확장자는 비워둘 수 없습니다.") + @Schema(description = "이미지 파일 확장자", defaultValue = "JPEG") + ImageFileExtension imageFileExtension) {} diff --git a/src/main/java/com/amcamp/domain/image/dto/response/PresignedUrlResponse.java b/src/main/java/com/amcamp/domain/image/dto/response/PresignedUrlResponse.java new file mode 100644 index 00000000..75ce7e1e --- /dev/null +++ b/src/main/java/com/amcamp/domain/image/dto/response/PresignedUrlResponse.java @@ -0,0 +1,5 @@ +package com.amcamp.domain.image.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record PresignedUrlResponse(@Schema(description = "Presigned URL") String presignedUrl) {} diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java index 02fb39a6..9bfee860 100644 --- a/src/main/java/com/amcamp/domain/member/api/MemberController.java +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -1,14 +1,14 @@ package com.amcamp.domain.member.api; import com.amcamp.domain.member.application.MemberService; +import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; import com.amcamp.global.util.CookieUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Tag(name = "회원 API", description = "회원 관련 API입니다.") @RestController @@ -25,4 +25,12 @@ public ResponseEntity memberWithdrawal() { memberService.withdrawalMember(); return ResponseEntity.ok().headers(cookieUtil.deleteRefreshTokenCookie()).build(); } + + @Operation(summary = "회원 닉네임 변경", description = "회원 닉네임을 변경합니다.") + @PostMapping("/me/nickname") + public ResponseEntity memberNicknameUpdate( + @Valid @RequestBody NicknameUpdateRequest request) { + memberService.updateMemberNickname(request); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/amcamp/domain/member/application/MemberService.java b/src/main/java/com/amcamp/domain/member/application/MemberService.java index 2a9851d9..6d169f53 100644 --- a/src/main/java/com/amcamp/domain/member/application/MemberService.java +++ b/src/main/java/com/amcamp/domain/member/application/MemberService.java @@ -2,6 +2,7 @@ import com.amcamp.domain.auth.dao.RefreshTokenRepository; import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; import com.amcamp.global.util.MemberUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -24,4 +25,10 @@ public void withdrawalMember() { currentMember.withdrawal(); } + + public void updateMemberNickname(NicknameUpdateRequest request) { + Member currentMember = memberUtil.getCurrentMember(); + + currentMember.updateNickname(request.nickname()); + } } diff --git a/src/main/java/com/amcamp/domain/member/domain/Member.java b/src/main/java/com/amcamp/domain/member/domain/Member.java index f46161fc..3b4dc14a 100644 --- a/src/main/java/com/amcamp/domain/member/domain/Member.java +++ b/src/main/java/com/amcamp/domain/member/domain/Member.java @@ -67,4 +67,12 @@ public void withdrawal() { public void reEnroll() { this.status = MemberStatus.NORMAL; } + + public void updateProfileImageUrl(String profileImageUrl) { + this.profileImageUrl = profileImageUrl; + } + + public void updateNickname(String nickname) { + this.nickname = nickname; + } } diff --git a/src/main/java/com/amcamp/domain/member/dto/.gitkeep b/src/main/java/com/amcamp/domain/member/dto/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java b/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java new file mode 100644 index 00000000..b904d85b --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.member.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; + +public record NicknameUpdateRequest( + @NotNull(message = "닉네임은 비워둘 수 없습니다.") @Schema(description = "닉네임", example = "최현태") + String nickname) {} diff --git a/src/main/java/com/amcamp/global/common/constants/UrlConstants.java b/src/main/java/com/amcamp/global/common/constants/UrlConstants.java new file mode 100644 index 00000000..99189af0 --- /dev/null +++ b/src/main/java/com/amcamp/global/common/constants/UrlConstants.java @@ -0,0 +1,6 @@ +package com.amcamp.global.common.constants; + +public final class UrlConstants { + + public static final String IMAGE_URL = "https://devfit-bucket.s3.ap-northeast-2.amazonaws.com"; +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java new file mode 100644 index 00000000..a7a4a0d4 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java @@ -0,0 +1,23 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum ImageErrorCode implements BaseErrorCode { + IMAGE_NOT_FOUND(HttpStatus.NOT_FOUND, "이미지를 찾을 수 없습니다."), + ; + + private final HttpStatus httpStatus; + private final String message; + + ImageErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } + + @Override + public String getCodeName() { + return this.name(); + } +} diff --git a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java index f82ea119..0d305c3c 100644 --- a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java +++ b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java @@ -4,6 +4,7 @@ import com.amcamp.infra.config.oauth.GoogleProperties; import com.amcamp.infra.config.oauth.KakaoProperties; import com.amcamp.infra.config.redis.RedisProperties; +import com.amcamp.infra.config.s3.S3Properties; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.Configuration; @@ -12,6 +13,7 @@ GoogleProperties.class, KakaoProperties.class, JwtProperties.class, + S3Properties.class }) @Configuration public class PropertiesConfig {} diff --git a/src/main/java/com/amcamp/infra/config/s3/S3Config.java b/src/main/java/com/amcamp/infra/config/s3/S3Config.java new file mode 100644 index 00000000..b8363a60 --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/s3/S3Config.java @@ -0,0 +1,31 @@ +package com.amcamp.infra.config.s3; + +import com.amazonaws.auth.AWSStaticCredentialsProvider; +import com.amazonaws.auth.BasicAWSCredentials; +import com.amazonaws.client.builder.AwsClientBuilder; +import com.amazonaws.services.s3.AmazonS3; +import com.amazonaws.services.s3.AmazonS3ClientBuilder; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +@RequiredArgsConstructor +public class S3Config { + + private final S3Properties s3Properties; + + @Bean + public AmazonS3 s3Client() { + BasicAWSCredentials credentials = + new BasicAWSCredentials(s3Properties.accessKey(), s3Properties.secretKey()); + AwsClientBuilder.EndpointConfiguration endpointConfiguration = + new AwsClientBuilder.EndpointConfiguration( + s3Properties.endpoint(), s3Properties.region()); + + return AmazonS3ClientBuilder.standard() + .withEndpointConfiguration(endpointConfiguration) + .withCredentials(new AWSStaticCredentialsProvider(credentials)) + .build(); + } +} diff --git a/src/main/java/com/amcamp/infra/config/s3/S3Properties.java b/src/main/java/com/amcamp/infra/config/s3/S3Properties.java new file mode 100644 index 00000000..dfbf08db --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/s3/S3Properties.java @@ -0,0 +1,7 @@ +package com.amcamp.infra.config.s3; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties("cloud.aws") +public record S3Properties( + String region, String accessKey, String secretKey, String bucket, String endpoint) {} diff --git a/src/main/resources/application-s3.yml b/src/main/resources/application-s3.yml new file mode 100644 index 00000000..3fc934b7 --- /dev/null +++ b/src/main/resources/application-s3.yml @@ -0,0 +1,11 @@ +spring: + config: + activate: + on-profile: "s3" +cloud: + aws: + region: ${AWS_REGION} + accessKey: ${AWS_ACCESS_KEY} + secretKey: ${AWS_SECRET_KEY} + bucket: ${AWS_BUCKET} + endpoint: ${S3_ENDPOINT:https://s3.ap-northeast-2.amazonaws.com} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index df1c0dde..a87de562 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -7,3 +7,4 @@ spring: include: - redis - security + - s3 diff --git a/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java b/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java new file mode 100644 index 00000000..cece1867 --- /dev/null +++ b/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java @@ -0,0 +1,116 @@ +package com.amcamp.domain.image.application; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.amcamp.domain.image.dao.ImageRepository; +import com.amcamp.domain.image.domain.Image; +import com.amcamp.domain.image.domain.ImageFileExtension; +import com.amcamp.domain.image.dto.request.MemberImageUploadCompleteRequest; +import com.amcamp.domain.image.dto.request.MemberImageUploadRequest; +import com.amcamp.domain.image.dto.response.PresignedUrlResponse; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ImageErrorCode; +import com.amcamp.global.exception.errorcode.MemberErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.test.context.ActiveProfiles; + +@SpringBootTest +@ActiveProfiles("test") +class ImageServiceTest { + + @Autowired private ImageService imageService; + @Autowired private ImageRepository imageRepository; + @Autowired private MemberRepository memberRepository; + + @BeforeEach + void setUp() { + Member member = + memberRepository.save( + Member.createMember( + "testNickname", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + @Nested + class 회원_프로필_이미지_PresignedUrl_생성_시 { + @Test + void 회원이_존재하지_않는다면_예외가_발생한다() { + // given + memberRepository.deleteAll(); + MemberImageUploadRequest request = + new MemberImageUploadRequest(ImageFileExtension.JPEG); + + // when & then + assertThatThrownBy(() -> imageService.createMemberImagePresignedUrl(request)) + .isInstanceOf(CommonException.class) + .hasMessage(MemberErrorCode.MEMBER_NOT_FOUND.getMessage()); + } + + @Test + void 회원이_존재하면_PresignedUrl이_생성된다() { + // given + MemberImageUploadRequest request = + new MemberImageUploadRequest(ImageFileExtension.JPEG); + + // when + PresignedUrlResponse response = imageService.createMemberImagePresignedUrl(request); + + // then + assertThat(response.presignedUrl()).isNotNull(); + assertThat(response.presignedUrl()) + .startsWith("https://s3.ap-northeast-2.amazonaws.com/"); + } + } + + @Nested + class 회원_프로필_이미지_업로드_완료_처리_시 { + @Test + void 회원이_업로드한_이미지가_존재하지_않는다면_예외가_발생한다() { + // given + MemberImageUploadCompleteRequest request = + new MemberImageUploadCompleteRequest(ImageFileExtension.JPEG); + + // when & then + assertThatThrownBy(() -> imageService.uploadCompleteMemberImage(request)) + .isInstanceOf(CommonException.class) + .hasMessage(ImageErrorCode.IMAGE_NOT_FOUND.getMessage()); + } + + @Test + void 이미지가_존재하면_회원의_프로필_이미지가_변경된다() { + // given + imageRepository.save(Image.createImage(1L, "testImageKey", ImageFileExtension.JPEG)); + + MemberImageUploadCompleteRequest request = + new MemberImageUploadCompleteRequest(ImageFileExtension.JPEG); + + // when + imageService.uploadCompleteMemberImage(request); + + // then + Member member = memberRepository.findById(1L).get(); + assertThat(member.getProfileImageUrl()) + .isEqualTo( + "https://devfit-bucket.s3.ap-northeast-2.amazonaws.com/1/testImageKey.jpeg"); + } + } +} diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java index 9f6e0687..1a7f4b4f 100644 --- a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -9,10 +9,13 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.MemberStatus; import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.MemberErrorCode; import com.amcamp.global.security.PrincipalDetails; -import com.amcamp.global.util.MemberUtil; +import jakarta.validation.ConstraintViolation; +import jakarta.validation.Validation; +import java.util.Set; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -26,7 +29,6 @@ @ActiveProfiles("test") class MemberServiceTest { - @Autowired private MemberUtil memberUtil; @Autowired private MemberService memberService; @Autowired private MemberRepository memberRepository; @Autowired private RefreshTokenRepository refreshTokenRepository; @@ -83,4 +85,37 @@ class 회원_탈퇴_시 { .hasMessage(MemberErrorCode.MEMBER_ALREADY_DELETED.getMessage()); } } + + @Nested + class 회원_닉네임_변경_시 { + @Test + void 닉네임이_NULL_이면_예외가_발생한다() { + // given + registerAuthenticatedMember(); + NicknameUpdateRequest request = new NicknameUpdateRequest(null); + + // when + memberService.updateMemberNickname(request); + Set> violations = + Validation.buildDefaultValidatorFactory().getValidator().validate(request); + + // then + assertThat(violations).isNotEmpty(); + assertThat(violations.iterator().next().getMessage()).isEqualTo("닉네임은 비워둘 수 없습니다."); + } + + @Test + void 유효한_입력값이면_닉네임이_변경된다() { + // given + Member member = registerAuthenticatedMember(); + NicknameUpdateRequest request = new NicknameUpdateRequest("현태 최"); + + // when + memberService.updateMemberNickname(request); + Member currentMember = memberRepository.findById(member.getId()).get(); + + // then + assertThat(currentMember.getNickname()).isEqualTo("현태 최"); + } + } } diff --git a/test/.gitignore b/test/.gitignore deleted file mode 100644 index f68d1099..00000000 --- a/test/.gitignore +++ /dev/null @@ -1,29 +0,0 @@ -### IntelliJ IDEA ### -out/ -!**/src/main/**/out/ -!**/src/test/**/out/ - -### Eclipse ### -.apt_generated -.classpath -.factorypath -.project -.settings -.springBeans -.sts4-cache -bin/ -!**/src/main/**/bin/ -!**/src/test/**/bin/ - -### NetBeans ### -/nbproject/private/ -/nbbuild/ -/dist/ -/nbdist/ -/.nb-gradle/ - -### VS Code ### -.vscode/ - -### Mac OS ### -.DS_Store \ No newline at end of file diff --git a/test/src/Main.java b/test/src/Main.java deleted file mode 100644 index 8b9a3bdb..00000000 --- a/test/src/Main.java +++ /dev/null @@ -1,5 +0,0 @@ -public class Main { - public static void main(String[] args) { - } - -} \ No newline at end of file diff --git a/test/src/Person.java b/test/src/Person.java deleted file mode 100644 index 955635c2..00000000 --- a/test/src/Person.java +++ /dev/null @@ -1,20 +0,0 @@ -public class Person { - private int name; - private int age; - - public Person() { - } - - public Person(int name, int age) { - this.name = name; - this.age = age; - } - - private void eat() { - System.out.println("먹기"); - } - - private void sleep() { - System.out.println("잠자기"); - } -} diff --git a/test/src/Student.java b/test/src/Student.java deleted file mode 100644 index 713d0b92..00000000 --- a/test/src/Student.java +++ /dev/null @@ -1,8 +0,0 @@ -public class Student extends Person { - public int number; - - public void goSchool() { - System.out.println("등교하기"); - } - -} diff --git a/test/src/Worker.java b/test/src/Worker.java deleted file mode 100644 index fb8ae8da..00000000 --- a/test/src/Worker.java +++ /dev/null @@ -1,7 +0,0 @@ -public class Worker extends Person { - private int url; - - private void goWork() { - System.out.println("출근하기"); - } -} From 582615339fcd009cea2e13cc2d5a75ee6ab4e26f Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 11 Feb 2025 11:32:00 +0900 Subject: [PATCH 023/107] =?UTF-8?q?chore:=20Validation=20=EB=B0=8F=20Inter?= =?UTF-8?q?nal=20Server=20Error=20=EC=B2=98=EB=A6=AC=20(#55)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: MethodArgumentNotValidException 예외 처리 * fix: request dto valid @NotEmpty로 수정 * feat: Internal Server Error 예외 처리 * refactor: custom exception 메서드명 변경 --- .../auth/dto/request/AuthCodeRequest.java | 4 +-- .../MemberImageUploadCompleteRequest.java | 4 +-- .../dto/request/MemberImageUploadRequest.java | 4 +-- .../dto/request/NicknameUpdateRequest.java | 4 +-- .../global/exception/ErrorResponse.java | 7 ++++ .../exception/GlobalExceptionHandler.java | 36 ++++++++++++++++++- .../exception/errorcode/GlobalErrorCode.java | 23 ++++++++++++ .../exception/ExceptionHandlerTest.java | 2 +- 8 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 src/main/java/com/amcamp/global/exception/ErrorResponse.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java diff --git a/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java b/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java index 7b32cd83..1b7636b6 100644 --- a/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java +++ b/src/main/java/com/amcamp/domain/auth/dto/request/AuthCodeRequest.java @@ -1,8 +1,8 @@ package com.amcamp.domain.auth.dto.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; public record AuthCodeRequest( - @NotNull(message = "인증코드는 필수입니다") @Schema(description = "구글, 카카오 로그인을 통한 인증코드") + @NotBlank(message = "인증코드는 필수입니다") @Schema(description = "구글, 카카오 로그인을 통한 인증코드") String code) {} diff --git a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java index 52f34e62..573939f4 100644 --- a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java +++ b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java @@ -2,9 +2,9 @@ import com.amcamp.domain.image.domain.ImageFileExtension; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; public record MemberImageUploadCompleteRequest( - @NotNull(message = "이미지 파일 확장자는 비워둘 수 없습니다.") + @NotBlank(message = "이미지 파일 확장자는 비워둘 수 없습니다.") @Schema(description = "이미지 파일 확장자", defaultValue = "JPEG") ImageFileExtension imageFileExtension) {} diff --git a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java index 5a666f8f..97f5ddd0 100644 --- a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java +++ b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java @@ -2,9 +2,9 @@ import com.amcamp.domain.image.domain.ImageFileExtension; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; public record MemberImageUploadRequest( - @NotNull(message = "이미지 파일 확장자는 비워둘 수 없습니다.") + @NotBlank(message = "이미지 파일 확장자는 비워둘 수 없습니다.") @Schema(description = "이미지 파일 확장자", defaultValue = "JPEG") ImageFileExtension imageFileExtension) {} diff --git a/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java b/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java index b904d85b..e1f2597c 100644 --- a/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java @@ -1,8 +1,8 @@ package com.amcamp.domain.member.dto.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.NotBlank; public record NicknameUpdateRequest( - @NotNull(message = "닉네임은 비워둘 수 없습니다.") @Schema(description = "닉네임", example = "최현태") + @NotBlank(message = "닉네임은 비워둘 수 없습니다.") @Schema(description = "닉네임", example = "최현태") String nickname) {} diff --git a/src/main/java/com/amcamp/global/exception/ErrorResponse.java b/src/main/java/com/amcamp/global/exception/ErrorResponse.java new file mode 100644 index 00000000..c7c5774f --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/ErrorResponse.java @@ -0,0 +1,7 @@ +package com.amcamp.global.exception; + +public record ErrorResponse(String errorClassName, String message) { + public static ErrorResponse of(String errorClassName, String message) { + return new ErrorResponse(errorClassName, message); + } +} diff --git a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java index 1e78e0ea..b4050524 100644 --- a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java @@ -2,16 +2,23 @@ import com.amcamp.global.common.response.CommonResponse; import com.amcamp.global.exception.errorcode.BaseErrorCode; +import com.amcamp.global.exception.errorcode.GlobalErrorCode; +import lombok.SneakyThrows; +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.RestControllerAdvice; +import org.springframework.web.context.request.WebRequest; import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler; @RestControllerAdvice(basePackages = "com.amcamp") public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { @ExceptionHandler(CommonException.class) - public ResponseEntity> commonExceptionHandler(CommonException e) { + public ResponseEntity> handleCustomException(CommonException e) { final BaseErrorCode errorCode = e.getErrorCode(); final ErrorDetail errorDetail = ErrorDetail.builder() @@ -24,4 +31,31 @@ public ResponseEntity> commonExceptionHandler(Common return ResponseEntity.status(errorCode.getHttpStatus()).body(response); } + + @SneakyThrows + @Override + protected ResponseEntity handleMethodArgumentNotValid( + MethodArgumentNotValidException e, + HttpHeaders headers, + HttpStatusCode status, + WebRequest request) { + final String errorMessage = e.getBindingResult().getAllErrors().get(0).getDefaultMessage(); + final ErrorResponse errorResponse = + ErrorResponse.of(e.getClass().getSimpleName(), errorMessage); + final CommonResponse response = + CommonResponse.onFailure(HttpStatus.BAD_REQUEST.value(), errorResponse); + + return ResponseEntity.status(status).body(response); + } + + @ExceptionHandler(Exception.class) + protected ResponseEntity handleException(Exception e) { + final BaseErrorCode errorCode = GlobalErrorCode.INTERNAL_SERVER_ERROR; + final ErrorResponse errorResponse = + ErrorResponse.of(e.getClass().getSimpleName(), errorCode.getMessage()); + final CommonResponse response = + CommonResponse.onFailure(errorCode.getHttpStatus().value(), errorResponse); + + return ResponseEntity.status(errorCode.getHttpStatus().value()).body(response); + } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java new file mode 100644 index 00000000..30cc1708 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java @@ -0,0 +1,23 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum GlobalErrorCode implements BaseErrorCode { + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류입니다. 관리자에게 문의해주세요."), + ; + + private final HttpStatus httpStatus; + private final String message; + + GlobalErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } + + @Override + public String getCodeName() { + return this.name(); + } +} diff --git a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java index 264429e0..a887558b 100644 --- a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java +++ b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java @@ -57,7 +57,7 @@ void globalExceptionHandlerTest() { // when: 예외 핸들러 실행 CommonResponse response = - globalExceptionHandler.commonExceptionHandler(exception).getBody(); + globalExceptionHandler.handleCustomException(exception).getBody(); // then: 응답 객체 검증 assertThat(response).isNotNull(); From 5ed88415ef26d978c6cc5ceb1ff9ef9032d87e10 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:32:17 +0900 Subject: [PATCH 024/107] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20(#59)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 회원 정보 조회 기능 구현 * test: 회원 정보 조회 테스트 --- .../domain/member/api/MemberController.java | 7 +++++++ .../member/application/MemberService.java | 7 +++++++ .../dto/response/MemberInfoResponse.java | 21 +++++++++++++++++++ .../member/application/MemberServiceTest.java | 19 ++++++++++++++++- 4 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java index 9bfee860..907edcb3 100644 --- a/src/main/java/com/amcamp/domain/member/api/MemberController.java +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -2,6 +2,7 @@ import com.amcamp.domain.member.application.MemberService; import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; +import com.amcamp.domain.member.dto.response.MemberInfoResponse; import com.amcamp.global.util.CookieUtil; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -33,4 +34,10 @@ public ResponseEntity memberNicknameUpdate( memberService.updateMemberNickname(request); return ResponseEntity.ok().build(); } + + @Operation(summary = "회원 정보 조회", description = "로그인한 회원 정보를 조회합니다.") + @GetMapping("/me") + public MemberInfoResponse memberInfo() { + return memberService.getMemberInfo(); + } } diff --git a/src/main/java/com/amcamp/domain/member/application/MemberService.java b/src/main/java/com/amcamp/domain/member/application/MemberService.java index 6d169f53..db055202 100644 --- a/src/main/java/com/amcamp/domain/member/application/MemberService.java +++ b/src/main/java/com/amcamp/domain/member/application/MemberService.java @@ -3,6 +3,7 @@ import com.amcamp.domain.auth.dao.RefreshTokenRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; +import com.amcamp.domain.member.dto.response.MemberInfoResponse; import com.amcamp.global.util.MemberUtil; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -31,4 +32,10 @@ public void updateMemberNickname(NicknameUpdateRequest request) { currentMember.updateNickname(request.nickname()); } + + @Transactional(readOnly = true) + public MemberInfoResponse getMemberInfo() { + Member currentMember = memberUtil.getCurrentMember(); + return MemberInfoResponse.from(currentMember); + } } diff --git a/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java b/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java new file mode 100644 index 00000000..e9af6e06 --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java @@ -0,0 +1,21 @@ +package com.amcamp.domain.member.dto.response; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberRole; +import com.amcamp.domain.member.domain.MemberStatus; + +public record MemberInfoResponse( + Long memberId, + String nickname, + String profileImageUrl, + MemberStatus status, + MemberRole role) { + public static MemberInfoResponse from(Member member) { + return new MemberInfoResponse( + member.getId(), + member.getNickname(), + member.getProfileImageUrl(), + member.getStatus(), + member.getRole()); + } +} diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java index 1a7f4b4f..df64ff72 100644 --- a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -7,9 +7,11 @@ import com.amcamp.domain.auth.domain.RefreshToken; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.MemberRole; import com.amcamp.domain.member.domain.MemberStatus; import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; +import com.amcamp.domain.member.dto.response.MemberInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.MemberErrorCode; import com.amcamp.global.security.PrincipalDetails; @@ -36,7 +38,7 @@ class MemberServiceTest { private Member registerAuthenticatedMember() { Member member = Member.createMember( - "testNickName", + "testNickname", "testProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); memberRepository.save(member); @@ -118,4 +120,19 @@ class 회원_닉네임_변경_시 { assertThat(currentMember.getNickname()).isEqualTo("현태 최"); } } + + @Test + void 회원_정보를_조회한다() { + // given + registerAuthenticatedMember(); + + // when + MemberInfoResponse response = memberService.getMemberInfo(); + + // then + assertThat(response.nickname()).isEqualTo("testNickname"); + assertThat(response.profileImageUrl()).isEqualTo("testProfileImageUrl"); + assertThat(response.role()).isEqualTo(MemberRole.USER); + assertThat(response.status()).isEqualTo(MemberStatus.NORMAL); + } } From cbf678306bcdc5b9e7183d40ca5dd80f20b17b17 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:32:30 +0900 Subject: [PATCH 025/107] =?UTF-8?q?feat:=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EA=B5=AC=ED=98=84=20(#58)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 로그아웃 기능 구현 * test: 로그아웃 테스트 --- .../domain/member/api/MemberController.java | 7 ++++++ .../member/application/MemberService.java | 7 ++++++ .../member/application/MemberServiceTest.java | 22 +++++++++++++++++++ 3 files changed, 36 insertions(+) diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java index 907edcb3..b05fb47b 100644 --- a/src/main/java/com/amcamp/domain/member/api/MemberController.java +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -20,6 +20,13 @@ public class MemberController { private final CookieUtil cookieUtil; private final MemberService memberService; + @Operation(summary = "로그아웃", description = "로그아웃을 진행합니다.") + @PostMapping("/logout") + public ResponseEntity memberLogout() { + memberService.logoutMember(); + return ResponseEntity.ok().headers(cookieUtil.deleteRefreshTokenCookie()).build(); + } + @Operation(summary = "회원 탈퇴", description = "회원 탈퇴를 진행합니다.") @DeleteMapping("/withdrawal") public ResponseEntity memberWithdrawal() { diff --git a/src/main/java/com/amcamp/domain/member/application/MemberService.java b/src/main/java/com/amcamp/domain/member/application/MemberService.java index db055202..310f4bd4 100644 --- a/src/main/java/com/amcamp/domain/member/application/MemberService.java +++ b/src/main/java/com/amcamp/domain/member/application/MemberService.java @@ -17,6 +17,13 @@ public class MemberService { private final MemberUtil memberUtil; private final RefreshTokenRepository refreshTokenRepository; + public void logoutMember() { + Member currentMember = memberUtil.getCurrentMember(); + refreshTokenRepository + .findById(currentMember.getId()) + .ifPresent(refreshTokenRepository::delete); + } + public void withdrawalMember() { Member currentMember = memberUtil.getCurrentMember(); diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java index df64ff72..5d5ab379 100644 --- a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -52,6 +52,28 @@ private Member registerAuthenticatedMember() { return member; } + @Nested + class 로그아웃_시 { + @Test + void 로그아웃하면_리프레시_토큰이_삭제된다() { + // given + Member member = registerAuthenticatedMember(); + + RefreshToken refreshToken = + RefreshToken.builder() + .memberId(member.getId()) + .token("testRefreshToken") + .build(); + refreshTokenRepository.save(refreshToken); + + // when + memberService.logoutMember(); + + // then + assertThat(refreshTokenRepository.findById(member.getId())).isEmpty(); + } + } + @Nested class 회원_탈퇴_시 { @Test From 6405f43b0b840c5fae7282096bebeb57037556fc Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 12 Feb 2025 09:46:43 +0900 Subject: [PATCH 026/107] =?UTF-8?q?feat:=20=ED=8C=80=20=EC=88=98=EC=A0=95,?= =?UTF-8?q?=20=ED=8C=80=20=EC=82=AD=EC=A0=9C,=20=ED=8C=80=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#53)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 팀 수정 및 삭제 기능 구현 * test: 팀 수정 및 삭제 서비스 테스트 * fix: 팀 이름 제한 수정 * fix: 초대코드 사이즈 제한 삭제 * refactor: PathVariable 앞 슬래시 추가 --- .../dao/ParticipantRepository.java | 4 + .../domain/team/api/TeamController.java | 30 +- .../domain/team/application/TeamService.java | 93 ++++- .../com/amcamp/domain/team/domain/Team.java | 7 + .../team/dto/request/TeamCreateRequest.java | 10 +- .../dto/request/TeamInviteCodeRequest.java | 8 +- .../team/dto/request/TeamUpdateRequest.java | 14 + .../team/dto/response/TeamCheckResponse.java | 7 + .../team/dto/response/TeamInfoResponse.java | 4 +- .../exception/errorcode/TeamErrorCode.java | 3 +- .../com/amcamp/global/util/RedisUtil.java | 4 + .../amcamp/domain/team/TeamServiceTest.java | 375 +++++++++++++----- 12 files changed, 441 insertions(+), 118 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/team/dto/response/TeamCheckResponse.java diff --git a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java index e6cae88f..0cdfb32c 100644 --- a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java +++ b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java @@ -8,4 +8,8 @@ public interface ParticipantRepository extends JpaRepository { Optional findByMemberAndTeam(Member member, Team team); + + void deleteByTeam(Team team); + + Optional findByTeamId(Long teamId); } diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index f2a4c7df..c2c96505 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -3,6 +3,8 @@ import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.domain.team.dto.request.TeamUpdateRequest; +import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import io.swagger.v3.oas.annotations.Operation; @@ -28,16 +30,16 @@ public TeamInviteCodeResponse teamCreate( } @Operation(summary = "코드 확인", description = "팀 가입을 위한 초대 코드를 확인합니다.") - @GetMapping("{teamId}/invite-code") + @GetMapping("/{teamId}/invite-code") public TeamInviteCodeResponse teamInvite(@PathVariable Long teamId) { - return teamService.getTeamCode(teamId); + return teamService.getInviteCode(teamId); } @Operation(summary = "팀 참가 전 팀 확인", description = "초대 코드를 입력하여 참여하려고 하는 팀 정보를 확인합니다.") @PostMapping("/check") - public TeamInfoResponse teamCheck( + public TeamCheckResponse teamCheck( @Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest) { - return teamService.getTeamInfo(teamInviteCodeRequest.inviteCode()); + return teamService.getTeamByCode(teamInviteCodeRequest.inviteCode()); } @Operation(summary = "팀 참가", description = "팀 정보를 확인 후 팀에 참가합니다.") @@ -47,4 +49,24 @@ public ResponseEntity teamJoin( teamService.joinTeam(teamInviteCodeRequest.inviteCode()); return ResponseEntity.ok().build(); } + + @Operation(summary = "팀 수정", description = "팀 이름과 설명을 수정합니다.") + @PatchMapping("/{teamId}") + public TeamInfoResponse teamEdit( + @PathVariable Long teamId, @Valid @RequestBody TeamUpdateRequest teamUpdateRequest) { + return teamService.editTeam(teamId, teamUpdateRequest); + } + + @Operation(summary = "팀 삭제", description = "팀을 삭제합니다.") + @DeleteMapping("/{teamId}") + public ResponseEntity teamDelete(@PathVariable Long teamId) { + teamService.deleteTeam(teamId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "팀 정보", description = "팀 이름과 설명 등 기본 정보를 반환합니다.") + @GetMapping("/{teamId}") + public TeamInfoResponse teamInfo(@PathVariable Long teamId) { + return teamService.getTeamInfo(teamId); + } } diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index dec9127d..beb8c651 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -8,6 +8,8 @@ import com.amcamp.domain.participant.domain.ParticipantRole; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.request.TeamUpdateRequest; +import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import com.amcamp.global.exception.CommonException; @@ -33,8 +35,7 @@ public class TeamService { public TeamInviteCodeResponse createTeam(String teamName, String teamDescription) { Member member = memberUtil.getCurrentMember(); - - Team team = Team.createTeam(teamName, teamDescription); + Team team = Team.createTeam(normalizeTeamName(teamName), teamDescription); teamRepository.save(team); Participant participant = @@ -46,20 +47,19 @@ public TeamInviteCodeResponse createTeam(String teamName, String teamDescription return new TeamInviteCodeResponse(code); } - public TeamInviteCodeResponse getTeamCode(Long teamId) { - Team team = - teamRepository - .findById(teamId) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + public TeamInviteCodeResponse getInviteCode(Long teamId) { + Member member = memberUtil.getCurrentMember(); + Team team = validateTeam(teamId); + validateAdminParticipant(member, team); String code = randomUtil.generateCode(team.getId()); return new TeamInviteCodeResponse(code); } - public TeamInfoResponse getTeamInfo(String inviteCode) { + public TeamCheckResponse getTeamByCode(String inviteCode) { Team team = searchTeamByCode(inviteCode); - return new TeamInfoResponse(team.getId(), team.getTeamName()); + return new TeamCheckResponse(team.getId(), team.getTeamName()); } public void joinTeam(String inviteCode) { @@ -71,6 +71,48 @@ public void joinTeam(String inviteCode) { participantRepository.save(participant); } + public TeamInfoResponse editTeam(Long teamId, TeamUpdateRequest teamUpdateRequest) { + Member member = memberUtil.getCurrentMember(); + Team team = validateTeam(teamId); + validateAdminParticipant(member, team); + + TeamUpdateRequest normalizedTeamUpdateRequest = + new TeamUpdateRequest( + normalizeTeamName(teamUpdateRequest.teamName()), + teamUpdateRequest.teamDescription()); + + team.updateTeam(normalizedTeamUpdateRequest); + + return new TeamInfoResponse(team.getId(), team.getTeamName(), team.getTeamDescription()); + } + + public void deleteTeam(Long teamId) { + Member member = memberUtil.getCurrentMember(); + Team team = validateTeam(teamId); + validateAdminParticipant(member, team); + + participantRepository.deleteByTeam(team); + + redisUtil + .getData(TEAM_ID_PREFIX.formatted(teamId)) + .ifPresent( + inviteCode -> { + redisUtil.deleteData(INVITE_CODE_PREFIX.formatted(inviteCode)); + redisUtil.deleteData(TEAM_ID_PREFIX.formatted(teamId)); + }); + + teamRepository.delete(team); + } + + @Transactional(readOnly = true) + public TeamInfoResponse getTeamInfo(Long teamId) { + Member member = memberUtil.getCurrentMember(); + Team team = validateTeam(teamId); + validateParticipant(member, team); + + return new TeamInfoResponse(team.getId(), team.getTeamName(), team.getTeamDescription()); + } + private Team searchTeamByCode(String inviteCode) { Long teamId = redisUtil @@ -83,10 +125,41 @@ private Team searchTeamByCode(String inviteCode) { .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); } - private void validateTeamJoin(Member member, Team team) { + private String normalizeTeamName(String name) { + return name.replaceAll("[^0-9a-zA-Z가-힣 ]", "_"); + } + private Team validateTeam(Long teamId) { + Team team = + teamRepository + .findById(teamId) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + return team; + } + + private void validateTeamJoin(Member member, Team team) { if (participantRepository.findByMemberAndTeam(member, team).isPresent()) { throw new CommonException(TeamErrorCode.MEMBER_ALREADY_JOINED); } } + + private void validateParticipant(Member member, Team team) { + if (!participantRepository.findByMemberAndTeam(member, team).isPresent()) { + throw new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); + } + } + + private void validateAdminParticipant(Member member, Team team) { + Participant participant = + participantRepository + .findByMemberAndTeam(member, team) + .orElseThrow( + () -> + new CommonException( + TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + + if (participant.getRole() != ParticipantRole.ADMIN) { + throw new CommonException(TeamErrorCode.UNAUTHORIZED_ACCESS); + } + } } diff --git a/src/main/java/com/amcamp/domain/team/domain/Team.java b/src/main/java/com/amcamp/domain/team/domain/Team.java index 618280c8..8c768d51 100644 --- a/src/main/java/com/amcamp/domain/team/domain/Team.java +++ b/src/main/java/com/amcamp/domain/team/domain/Team.java @@ -1,6 +1,7 @@ package com.amcamp.domain.team.domain; import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -28,4 +29,10 @@ private Team(String teamName, String teamDescription) { public static Team createTeam(String teamName, String teamDescription) { return Team.builder().teamName(teamName).teamDescription(teamDescription).build(); } + + public void updateTeam(TeamUpdateRequest teamUpdateRequest) { + + this.teamName = teamUpdateRequest.teamName(); + this.teamDescription = teamUpdateRequest.teamDescription(); + } } diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java index e868b981..d2058446 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java @@ -1,14 +1,14 @@ package com.amcamp.domain.team.dto.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; +import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; public record TeamCreateRequest( - @NotEmpty(message = "팀 이름은 필수 사항입니다.") - @Size(max = 25, message = "팀 이름은 최대 25자까지 입력 가능합니다.") - @Schema(description = "팀 이름", example = "LG CNS AM CAMP") + @NotBlank(message = "팀 이름은 필수 사항입니다.") + @Size(max = 15, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Schema(description = "팀 이름", example = "Side Effect") String teamName, @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") - @Schema(description = "팀 설명", example = "LG CNS AM CAMP에서 운영하는 팀입니다.") + @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") String teamDescription) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java index 58073f5f..50171cb8 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamInviteCodeRequest.java @@ -1,11 +1,7 @@ package com.amcamp.domain.team.dto.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotEmpty; -import jakarta.validation.constraints.Size; +import jakarta.validation.constraints.NotBlank; public record TeamInviteCodeRequest( - @NotEmpty - @Size(min = 8, max = 8, message = "8자리 초대 코드를 입력해주세요.") - @Schema(description = "팀 코드", example = "FFbKeJvJ") - String inviteCode) {} + @NotBlank @Schema(description = "팀 코드", example = "FFbKeJvJ") String inviteCode) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java new file mode 100644 index 00000000..4a990de9 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.team.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public record TeamUpdateRequest( + @NotBlank(message = "팀 이름은 필수 사항입니다.") + @Size(max = 15, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Schema(description = "팀 이름", example = "Side Effect") + String teamName, + @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") + @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") + String teamDescription) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamCheckResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamCheckResponse.java new file mode 100644 index 00000000..d513b69c --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamCheckResponse.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.team.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record TeamCheckResponse( + @Schema(description = "팀 아이디", example = "1") Long teamId, + @Schema(description = "팀 이름", example = "Side Effect") String teamName) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java index 0cda008b..752c9a65 100644 --- a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java @@ -4,4 +4,6 @@ public record TeamInfoResponse( @Schema(description = "팀 아이디", example = "1") Long teamId, - @Schema(description = "팀 이름", example = "LG CNS AM CAMP") String teamName) {} + @Schema(description = "팀 이름", example = "Side Effect") String teamName, + @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") + String teamDescription) {} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java index 1475a04f..4b125060 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java @@ -8,7 +8,8 @@ public enum TeamErrorCode implements BaseErrorCode { TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 팀을 찾을 수 없습니다."), MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), TEAM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 참여자가 아닙니다."), - INVALID_INVITE_CODE(HttpStatus.NOT_FOUND, "팀이 존재하지 않거나 코드가 만료되었습니다."); + INVALID_INVITE_CODE(HttpStatus.NOT_FOUND, "팀이 존재하지 않거나 코드가 만료되었습니다."), + UNAUTHORIZED_ACCESS(HttpStatus.UNAUTHORIZED, "수정 권한이 없습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/main/java/com/amcamp/global/util/RedisUtil.java b/src/main/java/com/amcamp/global/util/RedisUtil.java index d10bd925..ff09e268 100644 --- a/src/main/java/com/amcamp/global/util/RedisUtil.java +++ b/src/main/java/com/amcamp/global/util/RedisUtil.java @@ -25,4 +25,8 @@ public Optional getData(final String key) { return Optional.ofNullable(value); } + + public void deleteData(final String key) { + redisTemplate.unlink(key); + } } diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 81acf184..277793ca 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -1,8 +1,9 @@ package com.amcamp.domain.team; +import static com.amcamp.global.common.constants.RedisConstants.INVITE_CODE_PREFIX; +import static com.amcamp.global.common.constants.RedisConstants.TEAM_ID_PREFIX; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.*; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; @@ -13,11 +14,16 @@ import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.request.TeamUpdateRequest; +import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.RedisUtil; +import java.util.Optional; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -35,6 +41,10 @@ public class TeamServiceTest { @Autowired private MemberRepository memberRepository; @Autowired private ParticipantRepository participantRepository; @Autowired private TeamService teamService; + @Autowired private RedisUtil redisUtil; + + private Member member; + private TeamInviteCodeResponse inviteCodeResponse; private void loginAs(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); @@ -44,22 +54,24 @@ private void loginAs(Member member) { SecurityContextHolder.getContext().setAuthentication(token); } + @BeforeEach + void setUp() { + // given + member = + Member.createMember( + "testNickName", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + } + @Nested class 팀_생성_시 { @Test void 초대코드를_반환한다() { - // given - Member member = - Member.createMember( - "testNickName", - "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - // when - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - // then assertThat(inviteCodeResponse).isNotNull(); assertThat(inviteCodeResponse.inviteCode()).isNotNull(); @@ -72,19 +84,10 @@ class 팀_아이디로_코드확인_시 { @Test void 팀이_유효한_경우에는_초대코드를_반환한다() { // given - Member member = - Member.createMember( - "testNickName", - "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - Long teamId = teamService.getTeamInfo(inviteCodeResponse.inviteCode()).teamId(); + Long teamId = teamService.getTeamByCode(inviteCodeResponse.inviteCode()).teamId(); // when - TeamInviteCodeResponse response = teamService.getTeamCode(teamId); + TeamInviteCodeResponse response = teamService.getInviteCode(teamId); // then assertThat(response).isNotNull(); @@ -95,139 +98,329 @@ class 팀_아이디로_코드확인_시 { @Test void 팀이_유효하지않는_경우에는_예외가_발생한다() { // given - Member member = - Member.createMember( - "testNickName", - "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); + Long invalidTeamId = -999L; + // when & then + assertThatThrownBy(() -> teamService.getInviteCode(invalidTeamId)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); + } + + @Test + void 팀_참가자가_아닌_경우에는_에러를_반환한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); // when & then - assertThatThrownBy(() -> teamService.getTeamCode(-999L)) + assertThatThrownBy(() -> teamService.getInviteCode(teamId)) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); } } @Nested class 팀_참가_시 { + @Test + void 이미_팀에_참가한_경우에는_예외가_발생한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + + // when & then + assertThatThrownBy(() -> teamService.joinTeam(inviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.MEMBER_ALREADY_JOINED); + } + @Test @Transactional void 새롭게_참여하는_경우에는_팀에_USER로_등록된다() { // given - // 1. savedAdmin 로그인 후 팀 생성 - Member savedAdmin = - Member.createMember( - "admin", - "testProfileImageUrl", - OauthInfo.createOauthInfo("adminOauthId", "adminOauthProvider")); - memberRepository.save(savedAdmin); - loginAs(savedAdmin); - - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); String inviteCode = inviteCodeResponse.inviteCode(); - // 2. savedMember 로그인 처리 후 팀 참여 - Member savedMember = memberRepository.save(Member.createMember("member", null, null)); - // UserDetails newUserDetails = new PrincipalDetails(savedMember.getId(), - // savedMember.getRole()); - // UsernamePasswordAuthenticationToken newToken = - // new UsernamePasswordAuthenticationToken(newUserDetails, null, - // newUserDetails.getAuthorities()); - // SecurityContextHolder.getContext().setAuthentication(newToken); - loginAs(savedMember); + // savedMember 로그인 처리 후 팀 참여 + Member newMember = memberRepository.save(Member.createMember("member", null, null)); + loginAs(newMember); // when teamService.joinTeam(inviteCode); // then - TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(inviteCode); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); Team savedTeam = teamRepository - .findById(teamInfoResponse.teamId()) + .findById(teamCheckResponse.teamId()) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); Participant participant = participantRepository - .findByMemberAndTeam(savedMember, savedTeam) + .findByMemberAndTeam(newMember, savedTeam) .orElseThrow( () -> new CommonException( TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); - assertThat(participant.getMember()).isEqualTo(savedMember); + assertThat(participant.getMember()).isEqualTo(newMember); assertThat(participant.getRole()).isEqualTo(ParticipantRole.USER); assertThat(participant.getTeam()).isEqualTo(savedTeam); } + } + @Nested + class 초대코드로_팀_확인_시 { @Test - void 이미_팀에_참가한_경우에는_예외가_발생한다() { + void 코드가_유효한_경우에는_팀_정보를_반환한다() { // given - Member member = - Member.createMember( - "testNickName", - "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); + String validInviteCode = inviteCodeResponse.inviteCode(); - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + // when + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(validInviteCode); + + // then + assertThat(teamCheckResponse).isNotNull(); + assertThat(teamCheckResponse.teamId()).isNotNull(); + + Team savedTeam = + teamRepository + .findById(teamCheckResponse.teamId()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + + assertThat(teamCheckResponse.teamName()).isEqualTo(savedTeam.getTeamName()); + assertThat(teamCheckResponse.teamId()).isEqualTo(savedTeam.getId()); + } + + @Test + void 코드가_유효하지않는_경우에는_예외를_반환한다() { + // given + String invalidInviteCode = "invalidCode"; + + // when & then + assertThatThrownBy(() -> teamService.getTeamByCode(invalidInviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); + } + } + + @Nested + class 팀_수정_시 { + + @Test + void 팀이름과_팀설명을_수정한다() { + // given String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + // when + TeamUpdateRequest teamUpdateRequest = new TeamUpdateRequest("새 팀 이름", "새 팀 설명"); + TeamInfoResponse teamInfoResponse = teamService.editTeam(teamId, teamUpdateRequest); + + // then + assertThat(teamInfoResponse).isNotNull(); + assertThat(teamInfoResponse.teamName()).isEqualTo("새 팀 이름"); + assertThat(teamInfoResponse.teamDescription()).isEqualTo("새 팀 설명"); + } + + @Test + void 팀이_유효하지않는_경우에는_예외를_반환한다() { + // given + Long invalidTeamId = -999L; // when & then - assertThatThrownBy(() -> teamService.joinTeam(inviteCode)) + assertThatThrownBy( + () -> + teamService.editTeam( + invalidTeamId, + new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.MEMBER_ALREADY_JOINED); + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); + } + + @Test + void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); + + // when & then + assertThatThrownBy( + () -> + teamService.editTeam( + teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); // 사용자 권한이 없을 때 + } + + @Test + void 로그인된_회원이_팀_관리자가_아닌_경우에는_예외를_반환한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + // 일반 사용자 로그인 및 팀 참가 + Member userMember = + memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); + loginAs(userMember); + teamService.joinTeam(inviteCode); + + // when & then + assertThatThrownBy( + () -> + teamService.editTeam( + teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.UNAUTHORIZED_ACCESS); // 팀 관리자 권한이 없을 경우 } } @Nested - class 초대코드로_팀_확인_시 { + class 팀_삭제_시 { @Test - void 코드가_유효한_경우에는_팀_정보를_반환한다() { + void 팀을_삭제한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + // when + teamService.deleteTeam(teamId); + + // then + assertThatThrownBy(() -> teamService.getTeamByCode(inviteCode)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); + + // 1. 팀 삭제 확인 + assertThat(teamRepository.findById(teamId)).isEmpty(); + // 2. 팀 참가자 삭제 확인 + assertThat(participantRepository.findByTeamId(teamId)).isEmpty(); + // 3. 초대 코드가 Redis에서 삭제되었는지 확인 + Optional inviteCodeInRedisAfterDelete = + redisUtil.getData(TEAM_ID_PREFIX.formatted(teamId)); + Optional teamIdInRedisAfterDelete = + redisUtil.getData(INVITE_CODE_PREFIX.formatted(inviteCode)); + assertThat(inviteCodeInRedisAfterDelete).isEmpty(); + assertThat(teamIdInRedisAfterDelete).isEmpty(); + } + + @Test + void 팀이_유효하지않는_경우에는_예외를_반환한다() { // given - Member member = - Member.createMember( - "testNickName", - "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); + Long invalidTeamId = -999L; - TeamInviteCodeResponse inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); - String validInviteCode = inviteCodeResponse.inviteCode(); + // when & then + assertThatThrownBy(() -> teamService.deleteTeam(invalidTeamId)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); // 존재하지 않는 팀 삭제 시 예외 + } + + @Test + void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); + + // when & then + assertThatThrownBy(() -> teamService.deleteTeam(teamId)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); + } + + @Test + void 로그인된_회원이_팀_관리자가_아닌_경우에는_예외를_반환한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + Member userMember = + memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); + loginAs(userMember); + teamService.joinTeam(inviteCode); + + // when & then + assertThatThrownBy(() -> teamService.deleteTeam(teamId)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.UNAUTHORIZED_ACCESS); + } + } + + @Nested + class 팀_정보_조회_시 { + @Test + void 팀이름과_팀설명을_반환한다() { + // given + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); // when - TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(validInviteCode); + TeamInfoResponse teamInfoResponse = teamService.getTeamInfo(teamId); // then assertThat(teamInfoResponse).isNotNull(); - assertThat(teamInfoResponse.teamId()).isNotNull(); + assertThat(teamInfoResponse.teamName()).isEqualTo("팀 이름"); + assertThat(teamInfoResponse.teamDescription()).isEqualTo("팀 설명"); + } - Team savedTeam = - teamRepository - .findById(teamInfoResponse.teamId()) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + @Test + void 팀이_유효하지않는_경우에는_예외를_반환한다() { + // given + Long invalidTeamId = -999L; - assertThat(teamInfoResponse.teamName()).isEqualTo(savedTeam.getTeamName()); - assertThat(teamInfoResponse.teamId()).isEqualTo(savedTeam.getId()); + // when & then + assertThatThrownBy(() -> teamService.getTeamInfo(invalidTeamId)) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); } @Test - void 코드가_유효하지않는_경우에는_예외를_반환한다() { + void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { // given - String invalidInviteCode = "invalidCode"; + String inviteCode = inviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + Long teamId = teamCheckResponse.teamId(); + + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); // when & then - assertThatThrownBy(() -> teamService.getTeamInfo(invalidInviteCode)) + assertThatThrownBy(() -> teamService.getTeamInfo(teamId)) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); } } } From 810d9eda7f97575454fc30b4e6ef2da15872c374 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:01:49 +0900 Subject: [PATCH 027/107] =?UTF-8?q?fix:=20image=20request=20dto=20validati?= =?UTF-8?q?on=20=EC=88=98=EC=A0=95=20(#64)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../image/dto/request/MemberImageUploadCompleteRequest.java | 4 ++-- .../domain/image/dto/request/MemberImageUploadRequest.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java index 573939f4..52f34e62 100644 --- a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java +++ b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadCompleteRequest.java @@ -2,9 +2,9 @@ import com.amcamp.domain.image.domain.ImageFileExtension; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record MemberImageUploadCompleteRequest( - @NotBlank(message = "이미지 파일 확장자는 비워둘 수 없습니다.") + @NotNull(message = "이미지 파일 확장자는 비워둘 수 없습니다.") @Schema(description = "이미지 파일 확장자", defaultValue = "JPEG") ImageFileExtension imageFileExtension) {} diff --git a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java index 97f5ddd0..5a666f8f 100644 --- a/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java +++ b/src/main/java/com/amcamp/domain/image/dto/request/MemberImageUploadRequest.java @@ -2,9 +2,9 @@ import com.amcamp.domain.image.domain.ImageFileExtension; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; public record MemberImageUploadRequest( - @NotBlank(message = "이미지 파일 확장자는 비워둘 수 없습니다.") + @NotNull(message = "이미지 파일 확장자는 비워둘 수 없습니다.") @Schema(description = "이미지 파일 확장자", defaultValue = "JPEG") ImageFileExtension imageFileExtension) {} From ea7198737cc6294196e64f0c622870ef0ff25375 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Wed, 12 Feb 2025 14:15:50 +0900 Subject: [PATCH 028/107] =?UTF-8?q?feat:=20project/sprint/task=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=20=EC=B6=94=EA=B0=80=20(#56)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: project/sprint/task 도메인 추가 * fix: project/sprint/task 도메인 수정사항 반영 -@ManyToOne 매핑 fetch 옵션 LAZY 추가 - Ranking 엔티티 삭제(추후 구현) - 일대다 매핑 추가(Sprint, Task 등 영속성 및 생명주기 관리 위한 cascade, orphanremoval 옵션 추가) * fix: Project/Sprint 객체 생성 시 매개변수 필드 수정 - @Nullable 로 List 자료형 매개변수 입력받는 기존 로직 -> 매개변수에서 제외, 무조건 빈 ArrayList 객체 필드 초기화, 자식 객체 생성 시에 매핑 - taskDifficulty 상/중/하(High/Mid/Low) 로 enum 값 설정 * fix: 중복된 칼럼 이름 변경 * fix:Builder에 사용된 중복된 List 객체 초기화 로직 제거 --- .../domain/project/application/.gitkeep | 0 .../amcamp/domain/project/domain/Project.java | 69 +++++++++++++++++ .../project/domain/ProjectParticipant.java | 35 +++++++++ .../domain/ProjectParticipantRole.java | 13 ++++ .../domain/project/domain/ToDoInfo.java | 37 ++++++++++ .../domain/project/domain/ToDoStatus.java | 14 ++++ .../amcamp/domain/sprint/domain/Sprint.java | 56 ++++++++++++++ .../sprint/domain/SprintContribution.java | 32 ++++++++ .../domain/task/domain/AssignedStatus.java | 13 ++++ .../com/amcamp/domain/task/domain/Task.java | 74 +++++++++++++++++++ .../domain/task/domain/TaskDifficulty.java | 14 ++++ 11 files changed, 357 insertions(+) create mode 100644 src/main/java/com/amcamp/domain/project/application/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/project/domain/Project.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java create mode 100644 src/main/java/com/amcamp/domain/sprint/domain/Sprint.java create mode 100644 src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java create mode 100644 src/main/java/com/amcamp/domain/task/domain/AssignedStatus.java create mode 100644 src/main/java/com/amcamp/domain/task/domain/Task.java create mode 100644 src/main/java/com/amcamp/domain/task/domain/TaskDifficulty.java diff --git a/src/main/java/com/amcamp/domain/project/application/.gitkeep b/src/main/java/com/amcamp/domain/project/application/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/src/main/java/com/amcamp/domain/project/domain/Project.java b/src/main/java/com/amcamp/domain/project/domain/Project.java new file mode 100644 index 00000000..885d425d --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/Project.java @@ -0,0 +1,69 @@ +package com.amcamp.domain.project.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.team.domain.Team; +import jakarta.persistence.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Project extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "project_id") + private Long id; + + // 팀 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_id") + private Team team; + + // 프로젝트 이름 + @Column(name = "project_title") + private String title; + + // 설명 + @Lob private String description; + + // 프로젝트 목표 + @Lob private String goal; + + @Embedded private ToDoInfo toDoInfo; + + @OneToMany(mappedBy = "project", cascade = CascadeType.ALL, orphanRemoval = true) + private List sprints = new ArrayList<>(); + + // 캘린더 + @Builder(access = AccessLevel.PRIVATE) + private Project(Team team, String title, String description, String goal, ToDoInfo toDoInfo) { + this.team = team; + this.title = title; + this.description = description; + this.goal = goal; + this.toDoInfo = toDoInfo; + } + + public static Project createProject( + Team team, + String title, + String description, + String goal, + LocalDateTime startDt, + LocalDateTime dueDt) { + return Project.builder() + .team(team) + .title(title) + .description(description) + .goal(goal) + .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java new file mode 100644 index 00000000..4b06fc83 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java @@ -0,0 +1,35 @@ +package com.amcamp.domain.project.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.participant.domain.Participant; +import jakarta.persistence.*; +import lombok.Getter; +import lombok.NoArgsConstructor; +import org.springframework.lang.Nullable; + +@Entity +@NoArgsConstructor +@Getter +public class ProjectParticipant extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "project_participant_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "team_participant_id") + private Participant participant; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id") + private Project project; + + // 프로젝트 내 권한 + @Enumerated(EnumType.STRING) + private ProjectParticipantRole projectRole; + + // 사용자 지정 역할 + @Nullable + @Column(name = "position") + private String ProjectPosition; +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java new file mode 100644 index 00000000..a5b52409 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java @@ -0,0 +1,13 @@ +package com.amcamp.domain.project.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ProjectParticipantRole { + ADMIN("PROJECT_ADMIN"), + USER("PROJECT_USER"); + + private final String projectRole; +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java new file mode 100644 index 00000000..9f701791 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java @@ -0,0 +1,37 @@ +package com.amcamp.domain.project.domain; + +import jakarta.persistence.Embeddable; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Embeddable +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +public class ToDoInfo { + // 시작&마감일 + private LocalDateTime startDt; // 시작 일자 + private LocalDateTime dueDt; // 마감 일자 + + @Enumerated(value = EnumType.STRING) + private ToDoStatus toDoStatus; // 진행 상태 + + @Builder(access = AccessLevel.PRIVATE) + private ToDoInfo(LocalDateTime startDt, LocalDateTime dueDt, ToDoStatus toDoStatus) { + this.startDt = startDt; + this.dueDt = dueDt; + this.toDoStatus = toDoStatus; + } + + public static ToDoInfo createToDoInfo(LocalDateTime startDt, LocalDateTime dueDt) { + return ToDoInfo.builder() + .startDt(startDt) + .dueDt(dueDt) + .toDoStatus(ToDoStatus.NOT_STARTED) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java b/src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java new file mode 100644 index 00000000..339c272d --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.project.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum ToDoStatus { + NOT_STARTED("STATUS_NOT_STARTED"), + ON_GOING("STATUS_ON_GOING"), + COMPLETED("STATUS_COMPLETED"); + + private final String status; +} diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java new file mode 100644 index 00000000..dfe294e1 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -0,0 +1,56 @@ +package com.amcamp.domain.sprint.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ToDoInfo; +import com.amcamp.domain.task.domain.Task; +import jakarta.persistence.*; +import java.time.LocalDateTime; +import java.util.ArrayList; +import java.util.List; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Sprint extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "sprint_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id") + private Project project; + + @Lob private String description; + + @Embedded private ToDoInfo toDoInfo; + + // Task + @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) + private List tasks = new ArrayList<>(); + + // 기여도 + @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) + private List contributions = new ArrayList<>(); + + @Builder(access = AccessLevel.PRIVATE) + private Sprint(Project project, String description, ToDoInfo toDoInfo) { + this.project = project; + this.description = description; + this.toDoInfo = toDoInfo; + } + + public static Sprint createSprint( + Project project, String description, LocalDateTime startDt, LocalDateTime dueDt) { + return Sprint.builder() + .project(project) + .description(description) + .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java b/src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java new file mode 100644 index 00000000..3c4b2f23 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java @@ -0,0 +1,32 @@ +package com.amcamp.domain.sprint.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.project.domain.ProjectParticipant; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +public class SprintContribution extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "sprint_contribution_id") + private Long Id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sprint_id") + private Sprint sprint; + + // 기여한 멤버 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "participant_id") + private ProjectParticipant participant; + + // 등위 + private Integer placement; + // 기여도 점수/비율 + private Double contribution; +} diff --git a/src/main/java/com/amcamp/domain/task/domain/AssignedStatus.java b/src/main/java/com/amcamp/domain/task/domain/AssignedStatus.java new file mode 100644 index 00000000..c7ba165a --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/domain/AssignedStatus.java @@ -0,0 +1,13 @@ +package com.amcamp.domain.task.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum AssignedStatus { + ASSIGNED("TASK_STATUS_ASSIGNED"), + NOT_ASSIGNED("TASK_STATUS_NOT_ASSIGNED"); + + private final String taskStatus; +} diff --git a/src/main/java/com/amcamp/domain/task/domain/Task.java b/src/main/java/com/amcamp/domain/task/domain/Task.java new file mode 100644 index 00000000..d77e0f6d --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/domain/Task.java @@ -0,0 +1,74 @@ +package com.amcamp.domain.task.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ToDoInfo; +import com.amcamp.domain.sprint.domain.Sprint; +import jakarta.persistence.*; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Task extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "task_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sprint_id") + private Sprint sprint; + + @Lob private String description; + + @Embedded private ToDoInfo toDoInfo; + + @Enumerated(EnumType.STRING) + private TaskDifficulty taskDifficulty; + + @Enumerated(EnumType.STRING) + private AssignedStatus assignedStatus; + + // 태스크 수행 멤버 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "assignee_id") + private ProjectParticipant assignee; + + @Builder(access = AccessLevel.PRIVATE) + private Task( + Sprint sprint, + String description, + TaskDifficulty taskDifficulty, + ToDoInfo toDoInfo, + AssignedStatus assignedStatus, + ProjectParticipant assignee) { + this.sprint = sprint; + this.description = description; + this.toDoInfo = toDoInfo; + this.taskDifficulty = taskDifficulty; + this.assignedStatus = assignedStatus; + this.assignee = assignee; + } + + public static Task createTask( + Sprint sprint, + String description, + LocalDateTime startDt, + LocalDateTime dueDt, + TaskDifficulty taskDifficulty, + ProjectParticipant assignee) { + return Task.builder() + .sprint(sprint) + .description(description) + .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) + .taskDifficulty(taskDifficulty) + .assignedStatus(AssignedStatus.ASSIGNED) + .assignee(assignee) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/task/domain/TaskDifficulty.java b/src/main/java/com/amcamp/domain/task/domain/TaskDifficulty.java new file mode 100644 index 00000000..be65a0e8 --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/domain/TaskDifficulty.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.task.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum TaskDifficulty { + HIGH("DIFFICULTY_HIGH"), + MID("DIFFICULTY_MID"), + LOW("DIFFICULTY_LOW"); + + private final String taskDifficulty; +} From 1c34aac43e0fa1ab44b30ebdd498e8014f84d21e Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Thu, 13 Feb 2025 00:48:24 +0900 Subject: [PATCH 029/107] =?UTF-8?q?feat:=20=ED=8C=80=20=EB=8F=84=EB=A9=94?= =?UTF-8?q?=EC=9D=B8=EC=97=90=20=EC=9D=B4=EB=AA=A8=EC=A7=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20(#66)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 팀 이모지 관련 기능 추가 * test: 팀 이모지 기능 구현에 따른 팀 생성/수정 서비스 테스트 * refactor: 팀 서비스 테스트 전역 변수 관련 수정 --- .../domain/team/api/TeamController.java | 16 +- .../domain/team/application/TeamService.java | 33 +- .../com/amcamp/domain/team/domain/Team.java | 15 +- .../dto/request/TeamEmojiUpdateRequest.java | 8 + .../team/dto/response/TeamInfoResponse.java | 11 +- .../amcamp/domain/team/TeamServiceTest.java | 283 +++++++++++++++--- 6 files changed, 305 insertions(+), 61 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index c2c96505..802fb758 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -2,6 +2,7 @@ import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import com.amcamp.domain.team.dto.response.TeamCheckResponse; @@ -25,8 +26,7 @@ public class TeamController { @PostMapping("/create") public TeamInviteCodeResponse teamCreate( @Valid @RequestBody TeamCreateRequest teamCreateRequest) { - return teamService.createTeam( - teamCreateRequest.teamName(), teamCreateRequest.teamDescription()); + return teamService.createTeam(teamCreateRequest); } @Operation(summary = "코드 확인", description = "팀 가입을 위한 초대 코드를 확인합니다.") @@ -39,14 +39,14 @@ public TeamInviteCodeResponse teamInvite(@PathVariable Long teamId) { @PostMapping("/check") public TeamCheckResponse teamCheck( @Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest) { - return teamService.getTeamByCode(teamInviteCodeRequest.inviteCode()); + return teamService.getTeamByCode(teamInviteCodeRequest); } @Operation(summary = "팀 참가", description = "팀 정보를 확인 후 팀에 참가합니다.") @PostMapping("/join") public ResponseEntity teamJoin( @Valid @RequestBody TeamInviteCodeRequest teamInviteCodeRequest) { - teamService.joinTeam(teamInviteCodeRequest.inviteCode()); + teamService.joinTeam(teamInviteCodeRequest); return ResponseEntity.ok().build(); } @@ -57,6 +57,14 @@ public TeamInfoResponse teamEdit( return teamService.editTeam(teamId, teamUpdateRequest); } + @Operation(summary = "팀 이모지 수정", description = "팀 이모지를 수정합니다.") + @PatchMapping("/{teamId}/emoji") + public TeamInfoResponse teamEmojiEdit( + @PathVariable Long teamId, + @Valid @RequestBody TeamEmojiUpdateRequest teamEmojiUpdateRequest) { + return teamService.editTeamEmoji(teamId, teamEmojiUpdateRequest); + } + @Operation(summary = "팀 삭제", description = "팀을 삭제합니다.") @DeleteMapping("/{teamId}") public ResponseEntity teamDelete(@PathVariable Long teamId) { diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index beb8c651..0bc8b83a 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -8,6 +8,9 @@ import com.amcamp.domain.participant.domain.ParticipantRole; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; @@ -33,9 +36,12 @@ public class TeamService { private final RedisUtil redisUtil; private final RandomUtil randomUtil; - public TeamInviteCodeResponse createTeam(String teamName, String teamDescription) { + public TeamInviteCodeResponse createTeam(TeamCreateRequest teamCreateRequest) { Member member = memberUtil.getCurrentMember(); - Team team = Team.createTeam(normalizeTeamName(teamName), teamDescription); + Team team = + Team.createTeam( + normalizeTeamName(teamCreateRequest.teamName()), + teamCreateRequest.teamDescription()); teamRepository.save(team); Participant participant = @@ -57,14 +63,14 @@ public TeamInviteCodeResponse getInviteCode(Long teamId) { return new TeamInviteCodeResponse(code); } - public TeamCheckResponse getTeamByCode(String inviteCode) { - Team team = searchTeamByCode(inviteCode); + public TeamCheckResponse getTeamByCode(TeamInviteCodeRequest teamInviteCodeRequest) { + Team team = searchTeamByCode(teamInviteCodeRequest.inviteCode()); return new TeamCheckResponse(team.getId(), team.getTeamName()); } - public void joinTeam(String inviteCode) { + public void joinTeam(TeamInviteCodeRequest teamInviteCodeRequest) { Member member = memberUtil.getCurrentMember(); - Team team = searchTeamByCode(inviteCode); + Team team = searchTeamByCode(teamInviteCodeRequest.inviteCode()); validateTeamJoin(member, team); Participant participant = Participant.createParticipant(member, team, ParticipantRole.USER); @@ -83,7 +89,16 @@ public TeamInfoResponse editTeam(Long teamId, TeamUpdateRequest teamUpdateReques team.updateTeam(normalizedTeamUpdateRequest); - return new TeamInfoResponse(team.getId(), team.getTeamName(), team.getTeamDescription()); + return TeamInfoResponse.from(team); + } + + public TeamInfoResponse editTeamEmoji( + Long teamId, TeamEmojiUpdateRequest teamEmojiUpdateRequest) { + Member member = memberUtil.getCurrentMember(); + Team team = validateTeam(teamId); + validateAdminParticipant(member, team); + team.updateTeamEmoji(teamEmojiUpdateRequest); + return TeamInfoResponse.from(team); } public void deleteTeam(Long teamId) { @@ -110,7 +125,7 @@ public TeamInfoResponse getTeamInfo(Long teamId) { Team team = validateTeam(teamId); validateParticipant(member, team); - return new TeamInfoResponse(team.getId(), team.getTeamName(), team.getTeamDescription()); + return TeamInfoResponse.from(team); } private Team searchTeamByCode(String inviteCode) { @@ -126,7 +141,7 @@ private Team searchTeamByCode(String inviteCode) { } private String normalizeTeamName(String name) { - return name.replaceAll("[^0-9a-zA-Z가-힣 ]", "_"); + return name.trim().replaceAll("[^0-9a-zA-Z가-힣 ]", "_"); } private Team validateTeam(Long teamId) { diff --git a/src/main/java/com/amcamp/domain/team/domain/Team.java b/src/main/java/com/amcamp/domain/team/domain/Team.java index 8c768d51..ed153a05 100644 --- a/src/main/java/com/amcamp/domain/team/domain/Team.java +++ b/src/main/java/com/amcamp/domain/team/domain/Team.java @@ -1,6 +1,7 @@ package com.amcamp.domain.team.domain; import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import jakarta.persistence.*; import lombok.AccessLevel; @@ -19,15 +20,21 @@ public class Team extends BaseTimeEntity { private String teamName; private String teamDescription; + private String teamEmoji; @Builder(access = AccessLevel.PRIVATE) - private Team(String teamName, String teamDescription) { + private Team(String teamName, String teamDescription, String teamEmoji) { this.teamName = teamName; this.teamDescription = teamDescription; + this.teamEmoji = teamEmoji; } public static Team createTeam(String teamName, String teamDescription) { - return Team.builder().teamName(teamName).teamDescription(teamDescription).build(); + return Team.builder() + .teamName(teamName) + .teamDescription(teamDescription) + .teamEmoji("🍇") + .build(); } public void updateTeam(TeamUpdateRequest teamUpdateRequest) { @@ -35,4 +42,8 @@ public void updateTeam(TeamUpdateRequest teamUpdateRequest) { this.teamName = teamUpdateRequest.teamName(); this.teamDescription = teamUpdateRequest.teamDescription(); } + + public void updateTeamEmoji(TeamEmojiUpdateRequest teamEmojiUpdateRequest) { + this.teamEmoji = teamEmojiUpdateRequest.teamEmoji(); + } } diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java new file mode 100644 index 00000000..7469ebe8 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.team.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; + +public record TeamEmojiUpdateRequest( + @NotBlank(message = "팀 이모지는 필수 사항입니다.") @Schema(description = "팀 이모지", example = "🍇") + String teamEmoji) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java index 752c9a65..bf39d4e0 100644 --- a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java @@ -1,9 +1,16 @@ package com.amcamp.domain.team.dto.response; +import com.amcamp.domain.team.domain.Team; import io.swagger.v3.oas.annotations.media.Schema; public record TeamInfoResponse( @Schema(description = "팀 아이디", example = "1") Long teamId, @Schema(description = "팀 이름", example = "Side Effect") String teamName, - @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") - String teamDescription) {} + @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") String teamDescription, + @Schema(description = "팀 이모지", example = "🍇") String teamEmoji) { + + public static TeamInfoResponse from(Team team) { + return new TeamInfoResponse( + team.getId(), team.getTeamName(), team.getTeamDescription(), team.getTeamEmoji()); + } +} diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 277793ca..01baa15d 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -14,6 +14,9 @@ import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; @@ -21,6 +24,7 @@ import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.MemberUtil; import com.amcamp.global.util.RedisUtil; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; @@ -42,9 +46,7 @@ public class TeamServiceTest { @Autowired private ParticipantRepository participantRepository; @Autowired private TeamService teamService; @Autowired private RedisUtil redisUtil; - - private Member member; - private TeamInviteCodeResponse inviteCodeResponse; + @Autowired private MemberUtil memberUtil; private void loginAs(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); @@ -56,26 +58,52 @@ private void loginAs(Member member) { @BeforeEach void setUp() { - // given - member = - Member.createMember( - "testNickName", - "testProfileImageUrl", - OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); - - inviteCodeResponse = teamService.createTeam("팀 이름", "팀 설명"); + Member member = + memberRepository.save( + Member.createMember( + "testNickname", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); } @Nested class 팀_생성_시 { @Test void 초대코드를_반환한다() { + // when + Member currentMember = memberUtil.getCurrentMember(); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + // then assertThat(inviteCodeResponse).isNotNull(); assertThat(inviteCodeResponse.inviteCode()).isNotNull(); assertThat(inviteCodeResponse.inviteCode()).hasSize(8); + + // 생성 시 자동으로 설정되는 정보 확인 + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + Team savedTeam = + teamRepository + .findById(teamCheckResponse.teamId()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + Participant participant = + participantRepository + .findByMemberAndTeam(currentMember, savedTeam) + .orElseThrow( + () -> + new CommonException( + TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + + assertThat(participant.getRole()).isEqualTo(ParticipantRole.ADMIN); + assertThat(savedTeam.getTeamEmoji()).isEqualTo("🍇"); } } @@ -84,7 +112,13 @@ class 팀_아이디로_코드확인_시 { @Test void 팀이_유효한_경우에는_초대코드를_반환한다() { // given - Long teamId = teamService.getTeamByCode(inviteCodeResponse.inviteCode()).teamId(); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + Long teamId = + teamService + .getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())) + .teamId(); // when TeamInviteCodeResponse response = teamService.getInviteCode(teamId); @@ -109,9 +143,13 @@ class 팀_아이디로_코드확인_시 { @Test void 팀_참가자가_아닌_경우에는_에러를_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); - Long teamId = teamCheckResponse.teamId(); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + Long teamId = + teamService + .getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())) + .teamId(); Member nonMember = memberRepository.save( @@ -131,10 +169,15 @@ class 팀_참가_시 { @Test void 이미_팀에_참가한_경우에는_예외가_발생한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); // when & then - assertThatThrownBy(() -> teamService.joinTeam(inviteCode)) + assertThatThrownBy( + () -> + teamService.joinTeam( + new TeamInviteCodeRequest( + inviteCodeResponse.inviteCode()))) .isInstanceOf(CommonException.class) .extracting("errorCode") .isEqualTo(TeamErrorCode.MEMBER_ALREADY_JOINED); @@ -144,6 +187,9 @@ class 팀_참가_시 { @Transactional void 새롭게_참여하는_경우에는_팀에_USER로_등록된다() { // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + String inviteCode = inviteCodeResponse.inviteCode(); // savedMember 로그인 처리 후 팀 참여 @@ -151,10 +197,11 @@ class 팀_참가_시 { loginAs(newMember); // when - teamService.joinTeam(inviteCode); + teamService.joinTeam(new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); // then - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode(new TeamInviteCodeRequest(inviteCode)); Team savedTeam = teamRepository .findById(teamCheckResponse.teamId()) @@ -179,10 +226,13 @@ class 초대코드로_팀_확인_시 { @Test void 코드가_유효한_경우에는_팀_정보를_반환한다() { // given - String validInviteCode = inviteCodeResponse.inviteCode(); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); // when - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(validInviteCode); + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); // then assertThat(teamCheckResponse).isNotNull(); @@ -200,10 +250,16 @@ class 초대코드로_팀_확인_시 { @Test void 코드가_유효하지않는_경우에는_예외를_반환한다() { // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + String invalidInviteCode = "invalidCode"; // when & then - assertThatThrownBy(() -> teamService.getTeamByCode(invalidInviteCode)) + assertThatThrownBy( + () -> + teamService.getTeamByCode( + new TeamInviteCodeRequest(invalidInviteCode))) .isInstanceOf(CommonException.class) .extracting("errorCode") .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); @@ -216,8 +272,12 @@ class 팀_수정_시 { @Test void 팀이름과_팀설명을_수정한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); // when @@ -233,6 +293,8 @@ class 팀_수정_시 { @Test void 팀이_유효하지않는_경우에는_예외를_반환한다() { // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); Long invalidTeamId = -999L; // when & then @@ -249,8 +311,12 @@ class 팀_수정_시 { @Test void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); Member nonMember = @@ -271,15 +337,19 @@ teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) @Test void 로그인된_회원이_팀_관리자가_아닌_경우에는_예외를_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); // 일반 사용자 로그인 및 팀 참가 Member userMember = memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); loginAs(userMember); - teamService.joinTeam(inviteCode); + teamService.joinTeam(new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); // when & then assertThatThrownBy( @@ -292,20 +362,122 @@ teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) } } + class 팀_이모지_수정_시 { + @Test + void 팀이모지를_수정한다() { + // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + Long teamId = teamCheckResponse.teamId(); + + // when + TeamEmojiUpdateRequest teamEmojiUpdateRequest = new TeamEmojiUpdateRequest("⭐️"); + TeamInfoResponse teamInfoResponse = + teamService.editTeamEmoji(teamId, teamEmojiUpdateRequest); + + // then + assertThat(teamInfoResponse).isNotNull(); + assertThat(teamInfoResponse.teamEmoji()).isEqualTo("⭐️"); + } + + @Test + void 팀이_유효하지않는_경우에는_예외를_반환한다() { + // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + Long invalidTeamId = -999L; + + // when & then + assertThatThrownBy( + () -> + teamService.editTeamEmoji( + invalidTeamId, new TeamEmojiUpdateRequest("⭐️"))) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); + } + + @Test + void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { + // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + Long teamId = teamCheckResponse.teamId(); + + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); + + // when & then + assertThatThrownBy( + () -> + teamService.editTeamEmoji( + teamId, new TeamEmojiUpdateRequest("⭐️"))) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); // 사용자 권한이 없을 때 + } + + @Test + void 로그인된_회원이_팀_관리자가_아닌_경우에는_예외를_반환한다() { + // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + Long teamId = teamCheckResponse.teamId(); + + // 일반 사용자 로그인 및 팀 참가 + Member userMember = + memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); + loginAs(userMember); + teamService.joinTeam(new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + + // when & then + assertThatThrownBy( + () -> + teamService.editTeamEmoji( + teamId, new TeamEmojiUpdateRequest("⭐️"))) + .isInstanceOf(CommonException.class) + .extracting("errorCode") + .isEqualTo(TeamErrorCode.UNAUTHORIZED_ACCESS); // 팀 관리자 권한이 없을 경우 + } + } + @Nested class 팀_삭제_시 { @Test void 팀을_삭제한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); // when teamService.deleteTeam(teamId); // then - assertThatThrownBy(() -> teamService.getTeamByCode(inviteCode)) + assertThatThrownBy( + () -> + teamService.getTeamByCode( + new TeamInviteCodeRequest( + inviteCodeResponse.inviteCode()))) .isInstanceOf(CommonException.class) .extracting("errorCode") .isEqualTo(TeamErrorCode.INVALID_INVITE_CODE); @@ -318,7 +490,8 @@ class 팀_삭제_시 { Optional inviteCodeInRedisAfterDelete = redisUtil.getData(TEAM_ID_PREFIX.formatted(teamId)); Optional teamIdInRedisAfterDelete = - redisUtil.getData(INVITE_CODE_PREFIX.formatted(inviteCode)); + redisUtil.getData( + INVITE_CODE_PREFIX.formatted(inviteCodeResponse.inviteCode())); assertThat(inviteCodeInRedisAfterDelete).isEmpty(); assertThat(teamIdInRedisAfterDelete).isEmpty(); } @@ -326,6 +499,9 @@ class 팀_삭제_시 { @Test void 팀이_유효하지않는_경우에는_예외를_반환한다() { // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + Long invalidTeamId = -999L; // when & then @@ -338,8 +514,12 @@ class 팀_삭제_시 { @Test void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); Member nonMember = @@ -357,14 +537,18 @@ class 팀_삭제_시 { @Test void 로그인된_회원이_팀_관리자가_아닌_경우에는_예외를_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); Member userMember = memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); loginAs(userMember); - teamService.joinTeam(inviteCode); + teamService.joinTeam(new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); // when & then assertThatThrownBy(() -> teamService.deleteTeam(teamId)) @@ -379,8 +563,12 @@ class 팀_정보_조회_시 { @Test void 팀이름과_팀설명을_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); // when @@ -395,6 +583,9 @@ class 팀_정보_조회_시 { @Test void 팀이_유효하지않는_경우에는_예외를_반환한다() { // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + Long invalidTeamId = -999L; // when & then @@ -407,8 +598,12 @@ class 팀_정보_조회_시 { @Test void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { // given - String inviteCode = inviteCodeResponse.inviteCode(); - TeamCheckResponse teamCheckResponse = teamService.getTeamByCode(inviteCode); + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); Member nonMember = From 770695bdd73a388728cb1a3dff33103c129ccd2e Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Thu, 13 Feb 2025 13:40:38 +0900 Subject: [PATCH 030/107] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EC=9D=B4=20?= =?UTF-8?q?=EC=B0=B8=EC=97=AC=ED=95=9C=20=ED=8C=80=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20(#67)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 팀 도메인 필드명 수정 * feat: 회원이 참여한 팀 목록 조회 * test: 회원이 참여한 팀 목록 조회 테스트 * fix: 테스트가 실행되지 않는 오류 수정 --- .../domain/team/api/TeamController.java | 13 ++++ .../domain/team/application/TeamService.java | 9 ++- .../domain/team/dao/TeamRepository.java | 2 +- .../domain/team/dao/TeamRepositoryCustom.java | 8 +++ .../domain/team/dao/TeamRepositoryImpl.java | 70 +++++++++++++++++++ .../com/amcamp/domain/team/domain/Team.java | 29 ++++---- .../team/dto/request/TeamCreateRequest.java | 6 +- .../team/dto/response/TeamInfoResponse.java | 2 +- .../exception/errorcode/TeamErrorCode.java | 5 +- .../amcamp/domain/team/TeamServiceTest.java | 45 +++++++++++- 10 files changed, 165 insertions(+), 24 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/team/dao/TeamRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index 802fb758..af9ddada 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -9,9 +9,11 @@ import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -77,4 +79,15 @@ public ResponseEntity teamDelete(@PathVariable Long teamId) { public TeamInfoResponse teamInfo(@PathVariable Long teamId) { return teamService.getTeamInfo(teamId); } + + @Operation(summary = "팀 목록 조회", description = "회원이 참여한 팀 목록을 조회합니다.") + @GetMapping("/list") + public Slice teamFindAll( + @Parameter(description = "이전 페이지의 마지막 팀 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastTeamId, + @Parameter(description = "페이지당 팀 수", example = "1") @RequestParam(value = "size") + int pageSize) { + return teamService.findAllTeam(lastTeamId, pageSize); + } } diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index 0bc8b83a..44184604 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -22,6 +22,7 @@ import com.amcamp.global.util.RedisUtil; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -65,7 +66,7 @@ public TeamInviteCodeResponse getInviteCode(Long teamId) { public TeamCheckResponse getTeamByCode(TeamInviteCodeRequest teamInviteCodeRequest) { Team team = searchTeamByCode(teamInviteCodeRequest.inviteCode()); - return new TeamCheckResponse(team.getId(), team.getTeamName()); + return new TeamCheckResponse(team.getId(), team.getName()); } public void joinTeam(TeamInviteCodeRequest teamInviteCodeRequest) { @@ -177,4 +178,10 @@ private void validateAdminParticipant(Member member, Team team) { throw new CommonException(TeamErrorCode.UNAUTHORIZED_ACCESS); } } + + @Transactional(readOnly = true) + public Slice findAllTeam(Long lastTeamId, int pageSize) { + Member currentMember = memberUtil.getCurrentMember(); + return teamRepository.findAllTeamByMemberId(currentMember.getId(), lastTeamId, pageSize); + } } diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java b/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java index e617249a..e3d34fcf 100644 --- a/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java +++ b/src/main/java/com/amcamp/domain/team/dao/TeamRepository.java @@ -3,4 +3,4 @@ import com.amcamp.domain.team.domain.Team; import org.springframework.data.jpa.repository.JpaRepository; -public interface TeamRepository extends JpaRepository {} +public interface TeamRepository extends JpaRepository, TeamRepositoryCustom {} diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryCustom.java b/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryCustom.java new file mode 100644 index 00000000..ae43fc26 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryCustom.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.team.dao; + +import com.amcamp.domain.team.dto.response.TeamInfoResponse; +import org.springframework.data.domain.Slice; + +public interface TeamRepositoryCustom { + Slice findAllTeamByMemberId(Long memberId, Long lastTeamId, int pageSize); +} diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java b/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java new file mode 100644 index 00000000..a2a06776 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java @@ -0,0 +1,70 @@ +package com.amcamp.domain.team.dao; + +import static com.amcamp.domain.participant.domain.QParticipant.participant; +import static com.amcamp.domain.team.domain.QTeam.team; + +import com.amcamp.domain.team.dto.response.TeamInfoResponse; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class TeamRepositoryImpl implements TeamRepositoryCustom { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findAllTeamByMemberId( + Long memberId, Long lastTeamId, int pageSize) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + TeamInfoResponse.class, + team.id, + team.name, + team.description, + team.emoji)) + .from(participant) + .leftJoin(participant.team, team) + .on(team.id.eq(participant.team.id)) + .where(lastTeamId(lastTeamId), participant.member.id.eq(memberId)) + .orderBy(participant.createdDt.desc()) + .limit(pageSize + 1) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(TeamErrorCode.TEAM_NOT_EXISTS); + } + + return checkLastPage(pageSize, results); + } + + private BooleanExpression lastTeamId(Long teamId) { + if (teamId == null) { + return null; + } + + return team.id.lt(teamId); + } + + private Slice checkLastPage(int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/team/domain/Team.java b/src/main/java/com/amcamp/domain/team/domain/Team.java index ed153a05..71b1e47e 100644 --- a/src/main/java/com/amcamp/domain/team/domain/Team.java +++ b/src/main/java/com/amcamp/domain/team/domain/Team.java @@ -18,32 +18,27 @@ public class Team extends BaseTimeEntity { @Column(name = "team_id") private Long id; - private String teamName; - private String teamDescription; - private String teamEmoji; + private String name; + private String description; + private String emoji; @Builder(access = AccessLevel.PRIVATE) - private Team(String teamName, String teamDescription, String teamEmoji) { - this.teamName = teamName; - this.teamDescription = teamDescription; - this.teamEmoji = teamEmoji; + private Team(String name, String description, String emoji) { + this.name = name; + this.description = description; + this.emoji = emoji; } - public static Team createTeam(String teamName, String teamDescription) { - return Team.builder() - .teamName(teamName) - .teamDescription(teamDescription) - .teamEmoji("🍇") - .build(); + public static Team createTeam(String name, String description) { + return Team.builder().name(name).description(description).emoji("🍇").build(); } public void updateTeam(TeamUpdateRequest teamUpdateRequest) { - - this.teamName = teamUpdateRequest.teamName(); - this.teamDescription = teamUpdateRequest.teamDescription(); + this.name = teamUpdateRequest.teamName(); + this.description = teamUpdateRequest.teamDescription(); } public void updateTeamEmoji(TeamEmojiUpdateRequest teamEmojiUpdateRequest) { - this.teamEmoji = teamEmojiUpdateRequest.teamEmoji(); + this.emoji = teamEmojiUpdateRequest.teamEmoji(); } } diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java index d2058446..9bd6e040 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java @@ -11,4 +11,8 @@ public record TeamCreateRequest( String teamName, @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") - String teamDescription) {} + String teamDescription) { + public static TeamCreateRequest of(String teamName, String teamDescription) { + return new TeamCreateRequest(teamName, teamDescription); + } +} diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java index bf39d4e0..937e6c25 100644 --- a/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamInfoResponse.java @@ -11,6 +11,6 @@ public record TeamInfoResponse( public static TeamInfoResponse from(Team team) { return new TeamInfoResponse( - team.getId(), team.getTeamName(), team.getTeamDescription(), team.getTeamEmoji()); + team.getId(), team.getName(), team.getDescription(), team.getEmoji()); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java index 4b125060..9330e169 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java @@ -9,7 +9,10 @@ public enum TeamErrorCode implements BaseErrorCode { MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), TEAM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 참여자가 아닙니다."), INVALID_INVITE_CODE(HttpStatus.NOT_FOUND, "팀이 존재하지 않거나 코드가 만료되었습니다."), - UNAUTHORIZED_ACCESS(HttpStatus.UNAUTHORIZED, "수정 권한이 없습니다."); + UNAUTHORIZED_ACCESS(HttpStatus.UNAUTHORIZED, "수정 권한이 없습니다."), + + TEAM_NOT_EXISTS(HttpStatus.NOT_FOUND, "회원이 참여한 팀이 존재하지 않습니다."), + ; private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 01baa15d..5d90308e 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -4,6 +4,7 @@ import static com.amcamp.global.common.constants.RedisConstants.TEAM_ID_PREFIX; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; +import static org.assertj.core.api.AssertionsForClassTypes.tuple; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; @@ -26,12 +27,14 @@ import com.amcamp.global.security.PrincipalDetails; import com.amcamp.global.util.MemberUtil; import com.amcamp.global.util.RedisUtil; +import java.util.List; import java.util.Optional; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -103,7 +106,7 @@ class 팀_생성_시 { TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); assertThat(participant.getRole()).isEqualTo(ParticipantRole.ADMIN); - assertThat(savedTeam.getTeamEmoji()).isEqualTo("🍇"); + assertThat(savedTeam.getEmoji()).isEqualTo("🍇"); } } @@ -243,7 +246,7 @@ class 초대코드로_팀_확인_시 { .findById(teamCheckResponse.teamId()) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - assertThat(teamCheckResponse.teamName()).isEqualTo(savedTeam.getTeamName()); + assertThat(teamCheckResponse.teamName()).isEqualTo(savedTeam.getName()); assertThat(teamCheckResponse.teamId()).isEqualTo(savedTeam.getId()); } @@ -362,6 +365,7 @@ teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) } } + @Nested class 팀_이모지_수정_시 { @Test void 팀이모지를_수정한다() { @@ -618,4 +622,41 @@ class 팀_정보_조회_시 { .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); } } + + @Nested + class 회원이_참여한_팀_목록_조회_시 { + @Test + void 회원이_참여한_팀_정보를_반환한다() { + // given + List requests = + List.of( + TeamCreateRequest.of("testTeamName1", "testTeamDescription1"), + TeamCreateRequest.of("testTeamName2", "testTeamDescription2"), + TeamCreateRequest.of("testTeamName3", "testTeamDescription3")); + + for (TeamCreateRequest request : requests) { + teamService.createTeam(request); + } + + // when + Slice results = teamService.findAllTeam(null, 3); + + // then + assertThat(results.getSize()).isEqualTo(3); + assertThat(results) + .extracting("teamId", "teamName", "teamDescription") + .containsExactlyInAnyOrder( + tuple(3L, "testTeamName3", "testTeamDescription3"), + tuple(2L, "testTeamName2", "testTeamDescription2"), + tuple(1L, "testTeamName1", "testTeamDescription1")); + } + + @Test + void 회원이_참여한_팀이_존재하지_않을_시_예외가_발생한다() { + // when & then + assertThatThrownBy(() -> teamService.findAllTeam(0L, 4)) + .isInstanceOf(CommonException.class) + .hasMessage(TeamErrorCode.TEAM_NOT_EXISTS.getMessage()); + } + } } From f172b6e96a395fbc830773223fd3105c66b58ebf Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 14 Feb 2025 15:02:28 +0900 Subject: [PATCH 031/107] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EA=B2=A9=EB=A6=AC=20(#76)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: 데이터베이스 클리너 구현 * test: 통합 테스트 베이스 클래스 구현 * test: 통합 테스트 베이스 클래스 상속받도록 변경 * test: 테스트 환경 H2 DB 설정 * fix: 데이터베이스 클리너 로직 수정 * refactor: participant 도메인명 수정 --- .../dao/ParticipantRepository.java | 15 ------ .../project/domain/ProjectParticipant.java | 4 +- .../domain/team/application/TeamService.java | 31 ++++++------ .../team/dao/TeamParticipantRepository.java | 15 ++++++ .../domain/team/dao/TeamRepositoryImpl.java | 12 ++--- .../domain/TeamParticipant.java} | 16 +++--- .../domain/TeamParticipantRole.java} | 4 +- src/test/java/com/amcamp/DatabaseCleaner.java | 49 +++++++++++++++++++ src/test/java/com/amcamp/IntegrationTest.java | 18 +++++++ .../image/application/ImageServiceTest.java | 7 +-- .../member/application/MemberServiceTest.java | 7 +-- .../amcamp/domain/team/TeamServiceTest.java | 34 ++++++------- src/test/resources/application-test.yml | 3 +- 13 files changed, 138 insertions(+), 77 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java create mode 100644 src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java rename src/main/java/com/amcamp/domain/{participant/domain/Participant.java => team/domain/TeamParticipant.java} (62%) rename src/main/java/com/amcamp/domain/{participant/domain/ParticipantRole.java => team/domain/TeamParticipantRole.java} (69%) create mode 100644 src/test/java/com/amcamp/DatabaseCleaner.java create mode 100644 src/test/java/com/amcamp/IntegrationTest.java diff --git a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java b/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java deleted file mode 100644 index 0cdfb32c..00000000 --- a/src/main/java/com/amcamp/domain/participant/dao/ParticipantRepository.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.amcamp.domain.participant.dao; - -import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.participant.domain.Participant; -import com.amcamp.domain.team.domain.Team; -import java.util.Optional; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface ParticipantRepository extends JpaRepository { - Optional findByMemberAndTeam(Member member, Team team); - - void deleteByTeam(Team team); - - Optional findByTeamId(Long teamId); -} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java index 4b06fc83..80e95ca8 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java @@ -1,7 +1,7 @@ package com.amcamp.domain.project.domain; import com.amcamp.domain.common.model.BaseTimeEntity; -import com.amcamp.domain.participant.domain.Participant; +import com.amcamp.domain.team.domain.TeamParticipant; import jakarta.persistence.*; import lombok.Getter; import lombok.NoArgsConstructor; @@ -18,7 +18,7 @@ public class ProjectParticipant extends BaseTimeEntity { @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "team_participant_id") - private Participant participant; + private TeamParticipant teamParticipant; @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "project_id") diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index 44184604..9149bbe8 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -3,11 +3,11 @@ import static com.amcamp.global.common.constants.RedisConstants.*; import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.participant.dao.ParticipantRepository; -import com.amcamp.domain.participant.domain.Participant; -import com.amcamp.domain.participant.domain.ParticipantRole; +import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; @@ -33,7 +33,7 @@ public class TeamService { private final MemberUtil memberUtil; private final TeamRepository teamRepository; - private final ParticipantRepository participantRepository; + private final TeamParticipantRepository teamParticipantRepository; private final RedisUtil redisUtil; private final RandomUtil randomUtil; @@ -45,9 +45,9 @@ public TeamInviteCodeResponse createTeam(TeamCreateRequest teamCreateRequest) { teamCreateRequest.teamDescription()); teamRepository.save(team); - Participant participant = - Participant.createParticipant(member, team, ParticipantRole.ADMIN); - participantRepository.save(participant); + TeamParticipant teamParticipant = + TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN); + teamParticipantRepository.save(teamParticipant); String code = randomUtil.generateCode(team.getId()); @@ -74,8 +74,9 @@ public void joinTeam(TeamInviteCodeRequest teamInviteCodeRequest) { Team team = searchTeamByCode(teamInviteCodeRequest.inviteCode()); validateTeamJoin(member, team); - Participant participant = Participant.createParticipant(member, team, ParticipantRole.USER); - participantRepository.save(participant); + TeamParticipant teamParticipant = + TeamParticipant.createParticipant(member, team, TeamParticipantRole.USER); + teamParticipantRepository.save(teamParticipant); } public TeamInfoResponse editTeam(Long teamId, TeamUpdateRequest teamUpdateRequest) { @@ -107,7 +108,7 @@ public void deleteTeam(Long teamId) { Team team = validateTeam(teamId); validateAdminParticipant(member, team); - participantRepository.deleteByTeam(team); + teamParticipantRepository.deleteByTeam(team); redisUtil .getData(TEAM_ID_PREFIX.formatted(teamId)) @@ -154,27 +155,27 @@ private Team validateTeam(Long teamId) { } private void validateTeamJoin(Member member, Team team) { - if (participantRepository.findByMemberAndTeam(member, team).isPresent()) { + if (teamParticipantRepository.findByMemberAndTeam(member, team).isPresent()) { throw new CommonException(TeamErrorCode.MEMBER_ALREADY_JOINED); } } private void validateParticipant(Member member, Team team) { - if (!participantRepository.findByMemberAndTeam(member, team).isPresent()) { + if (!teamParticipantRepository.findByMemberAndTeam(member, team).isPresent()) { throw new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); } } private void validateAdminParticipant(Member member, Team team) { - Participant participant = - participantRepository + TeamParticipant teamParticipant = + teamParticipantRepository .findByMemberAndTeam(member, team) .orElseThrow( () -> new CommonException( TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); - if (participant.getRole() != ParticipantRole.ADMIN) { + if (teamParticipant.getRole() != TeamParticipantRole.ADMIN) { throw new CommonException(TeamErrorCode.UNAUTHORIZED_ACCESS); } } diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java b/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java new file mode 100644 index 00000000..5c03ab0b --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.team.dao; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TeamParticipantRepository extends JpaRepository { + Optional findByMemberAndTeam(Member member, Team team); + + void deleteByTeam(Team team); + + Optional findByTeamId(Long teamId); +} diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java b/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java index a2a06776..2aff504f 100644 --- a/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/team/dao/TeamRepositoryImpl.java @@ -1,7 +1,7 @@ package com.amcamp.domain.team.dao; -import static com.amcamp.domain.participant.domain.QParticipant.participant; import static com.amcamp.domain.team.domain.QTeam.team; +import static com.amcamp.domain.team.domain.QTeamParticipant.teamParticipant; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.global.exception.CommonException; @@ -34,11 +34,11 @@ public Slice findAllTeamByMemberId( team.name, team.description, team.emoji)) - .from(participant) - .leftJoin(participant.team, team) - .on(team.id.eq(participant.team.id)) - .where(lastTeamId(lastTeamId), participant.member.id.eq(memberId)) - .orderBy(participant.createdDt.desc()) + .from(teamParticipant) + .leftJoin(teamParticipant.team, team) + .on(team.id.eq(teamParticipant.team.id)) + .where(lastTeamId(lastTeamId), teamParticipant.member.id.eq(memberId)) + .orderBy(teamParticipant.createdDt.desc()) .limit(pageSize + 1) .fetch(); diff --git a/src/main/java/com/amcamp/domain/participant/domain/Participant.java b/src/main/java/com/amcamp/domain/team/domain/TeamParticipant.java similarity index 62% rename from src/main/java/com/amcamp/domain/participant/domain/Participant.java rename to src/main/java/com/amcamp/domain/team/domain/TeamParticipant.java index 9a4ee989..7313bc9c 100644 --- a/src/main/java/com/amcamp/domain/participant/domain/Participant.java +++ b/src/main/java/com/amcamp/domain/team/domain/TeamParticipant.java @@ -1,8 +1,7 @@ -package com.amcamp.domain.participant.domain; +package com.amcamp.domain.team.domain; import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.team.domain.Team; import jakarta.persistence.*; import lombok.AccessLevel; import lombok.Builder; @@ -12,10 +11,10 @@ @Getter @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Participant extends BaseTimeEntity { +public class TeamParticipant extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "participant_id") + @Column(name = "team_participant_id") private Long id; @ManyToOne(fetch = FetchType.LAZY) @@ -27,16 +26,17 @@ public class Participant extends BaseTimeEntity { private Team team; @Enumerated(EnumType.STRING) - private ParticipantRole role; + private TeamParticipantRole role; @Builder(access = AccessLevel.PRIVATE) - private Participant(Member member, Team team, ParticipantRole role) { + private TeamParticipant(Member member, Team team, TeamParticipantRole role) { this.member = member; this.team = team; this.role = role; } - public static Participant createParticipant(Member member, Team team, ParticipantRole role) { - return Participant.builder().member(member).team(team).role(role).build(); + public static TeamParticipant createParticipant( + Member member, Team team, TeamParticipantRole role) { + return TeamParticipant.builder().member(member).team(team).role(role).build(); } } diff --git a/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java b/src/main/java/com/amcamp/domain/team/domain/TeamParticipantRole.java similarity index 69% rename from src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java rename to src/main/java/com/amcamp/domain/team/domain/TeamParticipantRole.java index 04619d2c..d788e578 100644 --- a/src/main/java/com/amcamp/domain/participant/domain/ParticipantRole.java +++ b/src/main/java/com/amcamp/domain/team/domain/TeamParticipantRole.java @@ -1,11 +1,11 @@ -package com.amcamp.domain.participant.domain; +package com.amcamp.domain.team.domain; import lombok.AllArgsConstructor; import lombok.Getter; @Getter @AllArgsConstructor -public enum ParticipantRole { +public enum TeamParticipantRole { ADMIN("TEAM_ADMIN"), USER("TEAM_USER"), ; diff --git a/src/test/java/com/amcamp/DatabaseCleaner.java b/src/test/java/com/amcamp/DatabaseCleaner.java new file mode 100644 index 00000000..b360f759 --- /dev/null +++ b/src/test/java/com/amcamp/DatabaseCleaner.java @@ -0,0 +1,49 @@ +package com.amcamp; + +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; +import java.sql.Connection; +import java.sql.SQLException; +import java.sql.Statement; +import java.util.List; +import java.util.stream.Collectors; +import org.hibernate.Session; +import org.springframework.beans.factory.InitializingBean; +import org.springframework.stereotype.Component; + +@Component +public class DatabaseCleaner implements InitializingBean { + + @PersistenceContext private EntityManager entityManager; + + private List tableNames; + + @Override + public void afterPropertiesSet() { + entityManager.unwrap(Session.class).doWork(this::extractTableNames); + } + + private void extractTableNames(Connection conn) { + tableNames = + entityManager.getMetamodel().getEntities().stream() + .map(e -> e.getName().replaceAll("([a-z])([A-Z])", "$1_$2").toLowerCase()) + .collect(Collectors.toList()); + } + + public void execute() { + entityManager.unwrap(Session.class).doWork(this::cleanTables); + } + + private void cleanTables(Connection conn) throws SQLException { + Statement statement = conn.createStatement(); + statement.executeUpdate("SET REFERENTIAL_INTEGRITY FALSE"); + + for (String name : tableNames) { + statement.executeUpdate(String.format("TRUNCATE TABLE %s", name)); + statement.executeUpdate( + String.format("ALTER TABLE %s ALTER COLUMN %s_id RESTART WITH 1", name, name)); + } + + statement.executeUpdate("SET REFERENTIAL_INTEGRITY TRUE"); + } +} diff --git a/src/test/java/com/amcamp/IntegrationTest.java b/src/test/java/com/amcamp/IntegrationTest.java new file mode 100644 index 00000000..87967f07 --- /dev/null +++ b/src/test/java/com/amcamp/IntegrationTest.java @@ -0,0 +1,18 @@ +package com.amcamp; + +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.test.context.ActiveProfiles; + +@SpringBootTest +@ActiveProfiles("test") +public abstract class IntegrationTest { + + @Autowired protected DatabaseCleaner databaseCleaner; + + @BeforeEach + void setUp() { + databaseCleaner.execute(); + } +} diff --git a/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java b/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java index cece1867..407d29c5 100644 --- a/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java +++ b/src/test/java/com/amcamp/domain/image/application/ImageServiceTest.java @@ -3,6 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.amcamp.IntegrationTest; import com.amcamp.domain.image.dao.ImageRepository; import com.amcamp.domain.image.domain.Image; import com.amcamp.domain.image.domain.ImageFileExtension; @@ -20,15 +21,11 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.test.context.ActiveProfiles; -@SpringBootTest -@ActiveProfiles("test") -class ImageServiceTest { +class ImageServiceTest extends IntegrationTest { @Autowired private ImageService imageService; @Autowired private ImageRepository imageRepository; diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java index 5d5ab379..d230956f 100644 --- a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -3,6 +3,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import com.amcamp.IntegrationTest; import com.amcamp.domain.auth.dao.RefreshTokenRepository; import com.amcamp.domain.auth.domain.RefreshToken; import com.amcamp.domain.member.dao.MemberRepository; @@ -21,15 +22,11 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.test.context.ActiveProfiles; -@SpringBootTest -@ActiveProfiles("test") -class MemberServiceTest { +class MemberServiceTest extends IntegrationTest { @Autowired private MemberService memberService; @Autowired private MemberRepository memberRepository; diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 5d90308e..7abab9e8 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -6,15 +6,16 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import static org.assertj.core.api.AssertionsForClassTypes.tuple; +import com.amcamp.IntegrationTest; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; -import com.amcamp.domain.participant.dao.ParticipantRepository; -import com.amcamp.domain.participant.domain.Participant; -import com.amcamp.domain.participant.domain.ParticipantRole; import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; @@ -33,20 +34,17 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; -@SpringBootTest -@ActiveProfiles("test") -public class TeamServiceTest { +public class TeamServiceTest extends IntegrationTest { + @Autowired private TeamRepository teamRepository; @Autowired private MemberRepository memberRepository; - @Autowired private ParticipantRepository participantRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private TeamService teamService; @Autowired private RedisUtil redisUtil; @Autowired private MemberUtil memberUtil; @@ -97,15 +95,15 @@ class 팀_생성_시 { teamRepository .findById(teamCheckResponse.teamId()) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - Participant participant = - participantRepository + TeamParticipant teamParticipant = + teamParticipantRepository .findByMemberAndTeam(currentMember, savedTeam) .orElseThrow( () -> new CommonException( TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); - assertThat(participant.getRole()).isEqualTo(ParticipantRole.ADMIN); + assertThat(teamParticipant.getRole()).isEqualTo(TeamParticipantRole.ADMIN); assertThat(savedTeam.getEmoji()).isEqualTo("🍇"); } } @@ -210,17 +208,17 @@ class 팀_참가_시 { .findById(teamCheckResponse.teamId()) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); - Participant participant = - participantRepository + TeamParticipant teamParticipant = + teamParticipantRepository .findByMemberAndTeam(newMember, savedTeam) .orElseThrow( () -> new CommonException( TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); - assertThat(participant.getMember()).isEqualTo(newMember); - assertThat(participant.getRole()).isEqualTo(ParticipantRole.USER); - assertThat(participant.getTeam()).isEqualTo(savedTeam); + assertThat(teamParticipant.getMember()).isEqualTo(newMember); + assertThat(teamParticipant.getRole()).isEqualTo(TeamParticipantRole.USER); + assertThat(teamParticipant.getTeam()).isEqualTo(savedTeam); } } @@ -489,7 +487,7 @@ class 팀_삭제_시 { // 1. 팀 삭제 확인 assertThat(teamRepository.findById(teamId)).isEmpty(); // 2. 팀 참가자 삭제 확인 - assertThat(participantRepository.findByTeamId(teamId)).isEmpty(); + assertThat(teamParticipantRepository.findByTeamId(teamId)).isEmpty(); // 3. 초대 코드가 Redis에서 삭제되었는지 확인 Optional inviteCodeInRedisAfterDelete = redisUtil.getData(TEAM_ID_PREFIX.formatted(teamId)); diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index ec2233b1..21d0d118 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -2,4 +2,5 @@ spring: config: activate: on-profile: "test" - + datasource: + url: jdbc:h2:mem:test;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=false;MODE=MYSQL From 092229bbd49e2630acfea4672441e6379019c6be Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 16 Feb 2025 00:59:21 +0900 Subject: [PATCH 032/107] =?UTF-8?q?feat:=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=8A=A4=EC=BC=80=EC=A4=84=EB=9F=AC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#72)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: scheduler config 추가 * feat: 이미지 삭제 스케줄러 구현 --- .../domain/image/application/ImageService.java | 4 ++++ .../config/scheduler/SchedulerConfig.java | 8 ++++++++ .../infra/scheduler/ImageCleanupScheduler.java | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) create mode 100644 src/main/java/com/amcamp/global/config/scheduler/SchedulerConfig.java create mode 100644 src/main/java/com/amcamp/infra/scheduler/ImageCleanupScheduler.java diff --git a/src/main/java/com/amcamp/domain/image/application/ImageService.java b/src/main/java/com/amcamp/domain/image/application/ImageService.java index 3e901b26..80590a7e 100644 --- a/src/main/java/com/amcamp/domain/image/application/ImageService.java +++ b/src/main/java/com/amcamp/domain/image/application/ImageService.java @@ -114,4 +114,8 @@ private String createReadImageUrl( + "/" + createImageFileName(memberId, imageKey, imageFileExtension); } + + public void deleteAllImage() { + imageRepository.deleteAll(); + } } diff --git a/src/main/java/com/amcamp/global/config/scheduler/SchedulerConfig.java b/src/main/java/com/amcamp/global/config/scheduler/SchedulerConfig.java new file mode 100644 index 00000000..adf43e92 --- /dev/null +++ b/src/main/java/com/amcamp/global/config/scheduler/SchedulerConfig.java @@ -0,0 +1,8 @@ +package com.amcamp.global.config.scheduler; + +import org.springframework.context.annotation.Configuration; +import org.springframework.scheduling.annotation.EnableScheduling; + +@EnableScheduling +@Configuration +public class SchedulerConfig {} diff --git a/src/main/java/com/amcamp/infra/scheduler/ImageCleanupScheduler.java b/src/main/java/com/amcamp/infra/scheduler/ImageCleanupScheduler.java new file mode 100644 index 00000000..04e15527 --- /dev/null +++ b/src/main/java/com/amcamp/infra/scheduler/ImageCleanupScheduler.java @@ -0,0 +1,18 @@ +package com.amcamp.infra.scheduler; + +import com.amcamp.domain.image.application.ImageService; +import lombok.RequiredArgsConstructor; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class ImageCleanupScheduler { + + private final ImageService imageService; + + @Scheduled(cron = "00 00 00 * * *", zone = "Asia/Seoul") + public void deleteAllImages() { + imageService.deleteAllImage(); + } +} From f4101eee97d22cb000788467dcf4fb90d3ebf7be Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sun, 16 Feb 2025 01:36:21 +0900 Subject: [PATCH 033/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=83=9D=EC=84=B1/=EC=A1=B0=ED=9A=8C=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20(#68)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: project 생성/조회 구현 * feat: projectParticipant 등록 구현 * refactor: 테스트 로직 및 API 응답 코드 수정/ 팀 ID로 프로젝트 목록 전체 조회 로직 추가 * feat: date period 유효성 검증 로직 추가 * fix: date period 유효성 검증 방식: 서비스에서 util 활용-> 엔티티 생성 시 검증하도록 변경 * fix: teamCreate 매개변수 타입 오류 해결 및 깃 merge commit 롤백 * fix: ProjectController API @Valid 어노테이션 제거 * fix: 테스트 오류 디버깅 위한 ProjectServiceTest 주석 처리 * fix: ProjectServiceTest @AfterEach 사용한 DB clear 로직 추가 * fix: 테스트 오류 디버깅 위한 TeamServiceTest 내 회원 참여 팀 정보 조회 테스트 주석 처리 * fix: Project 도메인 및 관련 클래스 내 Participant -> TeamParticipant 수정 / ProjectServiceTest->IntegrationTest 상속 * fix: createService 반환 타입 void 변경 및 테스트 코드 수정, ProjectInfoResponse 에 누락된 projectDescription 필드 추가 * fix: project dto schema 수정- projectDescription의 description * fix: project reqeust - validation 추가(description 필드제외) * fix: project request dto -> json 포맷팅 추가 * fix: project request 수정에 의한 테스트 오류 수정 * fix: project test 어노테이션 제거 --- .../domain/project/api/ProjectController.java | 43 ++++ .../domain/project/application/.gitkeep | 0 .../project/application/ProjectService.java | 108 +++++++++ .../dao/ProjectParticipantRepository.java | 12 + .../domain/project/dao/ProjectRepository.java | 6 + .../project/dao/ProjectRepositoryCustom.java | 8 + .../dao/ProjectRepositoryCustomImpl.java | 20 ++ .../project/domain/ProjectParticipant.java | 19 ++ .../domain/project/domain/ToDoInfo.java | 5 + .../dto/request/ProjectCreateRequest.java | 35 +++ .../dto/response/ProjectInfoResponse.java | 25 ++ .../dto/response/ProjectListInfoResponse.java | 9 + .../exception/errorcode/GlobalErrorCode.java | 2 +- .../exception/errorcode/ProjectErrorCode.java | 2 +- .../domain/project/ProjectServiceTest.java | 227 ++++++++++++++++++ 15 files changed, 519 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/api/ProjectController.java delete mode 100644 src/main/java/com/amcamp/domain/project/application/.gitkeep create mode 100644 src/main/java/com/amcamp/domain/project/application/ProjectService.java create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java create mode 100644 src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java create mode 100644 src/test/java/com/amcamp/domain/project/ProjectServiceTest.java diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java new file mode 100644 index 00000000..b3041fd5 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -0,0 +1,43 @@ +package com.amcamp.domain.project.api; + +import com.amcamp.domain.project.application.ProjectService; +import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "프로젝트 API", description = "프로젝트 관련 API 입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/projects") +public class ProjectController { + + private final ProjectService projectService; + + @Operation(summary = "프로젝트 생성", description = "새로운 프로젝트를 생성합니다.") + @PostMapping("/create") + public ResponseEntity projectCreate( + @RequestBody ProjectCreateRequest projectCreateRequest) { + projectService.createProject(projectCreateRequest); + return ResponseEntity.status(HttpStatus.CREATED).build(); + } + + @Operation( + summary = "전체 프로젝트 목록 조회", + description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") + @GetMapping("/{teamId}/list") + public ProjectListInfoResponse projectListInfo(@PathVariable Long teamId) { + return projectService.getProjectListInfo(teamId); + } + + @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") + @GetMapping("/{projectId}") + public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { + return projectService.getProjectInfo(projectId); + } +} diff --git a/src/main/java/com/amcamp/domain/project/application/.gitkeep b/src/main/java/com/amcamp/domain/project/application/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java new file mode 100644 index 00000000..e9f693d9 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -0,0 +1,108 @@ +package com.amcamp.domain.project.application; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.dao.ProjectRepositoryCustom; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.util.MemberUtil; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +@RequiredArgsConstructor +public class ProjectService { + + private final ProjectRepository projectRepository; + private final TeamRepository teamRepository; + private final MemberUtil memberUtil; + private final TeamParticipantRepository teamParticipantRepository; + private final ProjectParticipantRepository projectParticipantRepository; + private final ProjectRepositoryCustom projectRepositoryCustom; + + public void createProject(ProjectCreateRequest request) { + Member member = memberUtil.getCurrentMember(); + Team team = getTeam(request.teamId()); + TeamParticipant teamParticipant = getTeamParticipant(member, team); + Project project = + projectRepository.save( + Project.createProject( + team, + request.projectTitle(), + request.projectDescription(), + request.projectGoal(), + request.startDt(), + request.dueDt())); + + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipant, project, ProjectParticipantRole.ADMIN)); + } + + @Transactional(readOnly = true) + public ProjectInfoResponse getProjectInfo(Long projectId) { + return ProjectInfoResponse.from(getProjectById(projectId)); + } + + @Transactional(readOnly = true) + public ProjectListInfoResponse getProjectListInfo(Long teamId) { + List projectList = projectRepositoryCustom.findAllByTeamId(teamId); + Member member = memberUtil.getCurrentMember(); + Team team = getTeam(teamId); + + TeamParticipant teamParticipant = getTeamParticipant(member, team); + + Map> partitionedProjects = + projectList.stream() + .collect( + Collectors.partitioningBy( + project -> isTeamParticipant(project, teamParticipant), + Collectors.mapping( + ProjectInfoResponse::from, Collectors.toList()))); + + return new ProjectListInfoResponse( + partitionedProjects.get(true), partitionedProjects.get(false)); + } + + private Project getProjectById(Long projectId) { + return projectRepository + .findById(projectId) + .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); + } + + // util methods + private TeamParticipant getTeamParticipant(Member member, Team team) { + return teamParticipantRepository + .findByMemberAndTeam(member, team) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + } + + private Team getTeam(Long teamId) { + return teamRepository + .findById(teamId) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); + } + + private Boolean isTeamParticipant(Project project, TeamParticipant teamParticipant) { + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .isPresent(); + } +} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java new file mode 100644 index 00000000..519bacc5 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java @@ -0,0 +1,12 @@ +package com.amcamp.domain.project.dao; + +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.team.domain.TeamParticipant; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ProjectParticipantRepository extends JpaRepository { + Optional findByProjectAndTeamParticipant( + Project project, TeamParticipant teamParticipant); +} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java new file mode 100644 index 00000000..7d989a90 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java @@ -0,0 +1,6 @@ +package com.amcamp.domain.project.dao; + +import com.amcamp.domain.project.domain.Project; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ProjectRepository extends JpaRepository {} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java new file mode 100644 index 00000000..30557fb2 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.project.dao; + +import com.amcamp.domain.project.domain.Project; +import java.util.List; + +public interface ProjectRepositoryCustom { + List findAllByTeamId(Long teamId); +} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java new file mode 100644 index 00000000..51158610 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java @@ -0,0 +1,20 @@ +package com.amcamp.domain.project.dao; + +import static com.amcamp.domain.project.domain.QProject.project; + +import com.amcamp.domain.project.domain.Project; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class ProjectRepositoryCustomImpl implements ProjectRepositoryCustom { + private final JPAQueryFactory queryFactory; + + @Override + public List findAllByTeamId(Long teamId) { + return queryFactory.selectFrom(project).where(project.team.id.eq(teamId)).fetch(); + } +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java index 80e95ca8..fbeecc2e 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java @@ -3,6 +3,8 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.team.domain.TeamParticipant; import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; import org.springframework.lang.Nullable; @@ -32,4 +34,21 @@ public class ProjectParticipant extends BaseTimeEntity { @Nullable @Column(name = "position") private String ProjectPosition; + + @Builder(access = AccessLevel.PRIVATE) + private ProjectParticipant( + TeamParticipant teamParticipant, Project project, ProjectParticipantRole projectRole) { + this.teamParticipant = teamParticipant; + this.project = project; + this.projectRole = projectRole; + } + + public static ProjectParticipant createProjectParticipant( + TeamParticipant teamParticipant, Project project, ProjectParticipantRole projectRole) { + return ProjectParticipant.builder() + .teamParticipant(teamParticipant) + .project(project) + .projectRole(projectRole) + .build(); + } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java index 9f701791..345e432b 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java @@ -1,5 +1,7 @@ package com.amcamp.domain.project.domain; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.GlobalErrorCode; import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -28,6 +30,9 @@ private ToDoInfo(LocalDateTime startDt, LocalDateTime dueDt, ToDoStatus toDoStat } public static ToDoInfo createToDoInfo(LocalDateTime startDt, LocalDateTime dueDt) { + if (startDt.isAfter(dueDt) || startDt.isBefore(LocalDateTime.now())) { + throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + } return ToDoInfo.builder() .startDt(startDt) .dueDt(dueDt) diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java new file mode 100644 index 00000000..15f2ea5e --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java @@ -0,0 +1,35 @@ +package com.amcamp.domain.project.dto.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.annotation.JsonProperty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; + +public record ProjectCreateRequest( + @Schema(description = "팀 ID", example = "1", required = true) + @JsonProperty("team_id") + @NotNull + Long teamId, + @Schema(description = "프로젝트 제목", example = "Devfit", required = true) + @JsonProperty("project_title") + @NotBlank + String projectTitle, + @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발", required = true) + @JsonProperty("project_goal") + @NotBlank + String projectGoal, + @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01T00:00", required = true) + @JsonProperty("start_dt") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @NotNull + LocalDateTime startDt, + @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01T00:00", required = true) + @JsonProperty("due_dt") + @JsonFormat(shape = JsonFormat.Shape.STRING) + @NotNull + LocalDateTime dueDt, + @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") + @JsonProperty("project_description") + String projectDescription) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java new file mode 100644 index 00000000..dabc13c9 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java @@ -0,0 +1,25 @@ +package com.amcamp.domain.project.dto.response; + +import com.amcamp.domain.project.domain.Project; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDateTime; + +public record ProjectInfoResponse( + @Schema(description = "프로젝트 아이디", example = "1") Long projectId, + @Schema(description = "프로젝트 제목", example = "Devfit") String projectTitle, + @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") + String projectDescription, + @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발") String projectGoal, + @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01T00:00") LocalDateTime startDt, + @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01T00:00") LocalDateTime dueDt) { + + public static ProjectInfoResponse from(Project project) { + return new ProjectInfoResponse( + project.getId(), + project.getTitle(), + project.getGoal(), + project.getDescription(), + project.getToDoInfo().getStartDt(), + project.getToDoInfo().getDueDt()); + } +} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java new file mode 100644 index 00000000..c206d636 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java @@ -0,0 +1,9 @@ +package com.amcamp.domain.project.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; + +public record ProjectListInfoResponse( + @Schema(description = "사용자가 참여중인 프로젝트 목록") List participatingProjects, + @Schema(description = "사용자가 참여하지 않은 프로젝트 목록") + List nonParticipatingProjects) {} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java index 30cc1708..5d3f1165 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java @@ -6,7 +6,7 @@ @Getter public enum GlobalErrorCode implements BaseErrorCode { INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류입니다. 관리자에게 문의해주세요."), - ; + INVALID_DATE_ERROR(HttpStatus.BAD_REQUEST, "유효하지 않은 날짜 입력입니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 3da87957..3aa793dd 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -5,7 +5,7 @@ @Getter public enum ProjectErrorCode implements BaseErrorCode { - PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "요청한 project 를 찾을 수 없습니다."); + PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "project 를 찾을 수 없습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java new file mode 100644 index 00000000..2e171466 --- /dev/null +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -0,0 +1,227 @@ +package com.amcamp.domain.project; + +import static org.assertj.core.api.AssertionsForClassTypes.*; + +import com.amcamp.IntegrationTest; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.project.application.ProjectService; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import java.time.LocalDateTime; +import org.junit.jupiter.api.*; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; + +public class ProjectServiceTest extends IntegrationTest { + @Autowired private ProjectService projectService; + @Autowired private TeamService teamService; + @Autowired private MemberRepository memberRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; + @Autowired private TeamRepository teamRepository; + @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private ProjectRepository projectRepository; + + private Member member; + private Member anotherMember; + + private LocalDateTime startDt = LocalDateTime.of(2026, 1, 1, 1, 00); + private LocalDateTime dueDt = LocalDateTime.of(2026, 12, 1, 1, 00); + + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + private void logout() { + SecurityContextHolder.clearContext(); + } + + @BeforeEach + private void setUp() { + member = + Member.createMember( + "member", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member); + loginAs(member); + + anotherMember = + Member.createMember( + "anotherMember", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(anotherMember); + } + + @AfterEach + public void afterEach() { + logout(); + projectParticipantRepository.deleteAll(); + projectRepository.deleteAll(); + teamParticipantRepository.deleteAll(); + teamRepository.deleteAll(); + memberRepository.deleteAll(); + } + + @Test + void 프로젝트를_생성하면_정상적으로_저장된다() { + // given + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + + ProjectCreateRequest request = + new ProjectCreateRequest( + teamId, + "testProjectTitle", + "testProjectGoal", + startDt, + dueDt, + "testProjectDescription"); + + // when + projectService.createProject(request); + + // then + Project project = projectRepository.findById(1L).get(); + assertThat(project.getId()).isEqualTo(1L); + assertThat(project) + .extracting("id", "title", "description", "goal") + .containsExactlyInAnyOrder( + 1L, "testProjectTitle", "testProjectDescription", "testProjectGoal"); + } + + @Nested + class 프로젝트_조회 { + // @Test + // void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { + // // given + // TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + // String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + // TeamInviteCodeRequest teamInviteCodeRequest = new + // TeamInviteCodeRequest(inviteCode); + // Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + // + // ProjectCreateRequest request1 = + // new ProjectCreateRequest( + // teamId, + // "project1", + // "projectDescription", + // "projectGoal", + // startDt, + // dueDt); + // ProjectCreateRequest request2 = + // new ProjectCreateRequest( + // teamId, + // "project2", + // "projectDescription", + // "projectGoal", + // startDt, + // dueDt); + // + // ProjectCreateRequest request3 = + // new ProjectCreateRequest( + // teamId, + // "project3", + // "projectDescription", + // "projectGoal", + // startDt, + // dueDt); + // + // ProjectCreateRequest request4 = + // new ProjectCreateRequest( + // teamId, + // "project4", + // "projectDescription", + // "projectGoal", + // startDt, + // dueDt); + // + // projectService.createProject(request1); + // projectService.createProject(request2); + // // member logout 후 anotherMember 로그인 + // logout(); + // loginAs(anotherMember); + // // 팀 참가 + // teamService.joinTeam(teamInviteCodeRequest); + // // anotherMember 새 프로젝트 생성 + // projectService.createProject(request1); + // projectService.createProject(request2); + // + // // when + // ProjectListInfoResponse foundResponse = + // projectService.getProjectListInfo(teamId); + + // } + + @Test + void 프로젝트를_ID로_조회하면_정상적으로_반환된다() { + // given + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + + ProjectCreateRequest request = + new ProjectCreateRequest( + teamId, + "testProjectTitle", + "testProjectGoal", + startDt, + dueDt, + "testProjectDescription"); + + projectService.createProject(request); + Project project = projectRepository.findById(1L).get(); + // when + ProjectInfoResponse foundResponse = projectService.getProjectInfo(1L); + // then + + assertThat(foundResponse) + .extracting( + "projectId", + "projectTitle", + "projectDescription", + "projectGoal", + "startDt", + "dueDt") + .containsExactlyInAnyOrder( + project.getId(), + project.getTitle(), + project.getDescription(), + project.getGoal(), + project.getToDoInfo().getStartDt(), + project.getToDoInfo().getDueDt()); + } + + @Test + void ID가_유효하지_않으면_예외가_발생한다() { + // given + Long invalidProjectId = Long.MAX_VALUE; + // when, then + assertThatThrownBy(() -> projectService.getProjectInfo(invalidProjectId)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + } +} From e2a4399d711761aa60bbf7284b83f8cf81b3ab52 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sun, 2 Mar 2025 18:19:34 +0900 Subject: [PATCH 034/107] =?UTF-8?q?refactor:=20LocalDateTime=20=ED=83=80?= =?UTF-8?q?=EC=9E=85=20LocalDate=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20JsonPr?= =?UTF-8?q?operty=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=20(#80)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: LocalDateTime 타입 LocalDate 변경 및 JsonProperty 어노테이션 제거 * refactor: deprecated 된 required = 'true' 옵션 제거 --- .../amcamp/domain/project/domain/Project.java | 6 ++-- .../domain/project/domain/ToDoInfo.java | 12 ++++---- .../dto/request/ProjectCreateRequest.java | 28 ++++++------------- .../dto/response/ProjectInfoResponse.java | 6 ++-- .../amcamp/domain/sprint/domain/Sprint.java | 4 +-- .../com/amcamp/domain/task/domain/Task.java | 6 ++-- .../domain/project/ProjectServiceTest.java | 6 ++-- 7 files changed, 28 insertions(+), 40 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/domain/Project.java b/src/main/java/com/amcamp/domain/project/domain/Project.java index 885d425d..49020506 100644 --- a/src/main/java/com/amcamp/domain/project/domain/Project.java +++ b/src/main/java/com/amcamp/domain/project/domain/Project.java @@ -4,7 +4,7 @@ import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.team.domain.Team; import jakarta.persistence.*; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import lombok.AccessLevel; @@ -56,8 +56,8 @@ public static Project createProject( String title, String description, String goal, - LocalDateTime startDt, - LocalDateTime dueDt) { + LocalDate startDt, + LocalDate dueDt) { return Project.builder() .team(team) .title(title) diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java index 345e432b..11adcc95 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java @@ -5,7 +5,7 @@ import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; -import java.time.LocalDateTime; +import java.time.LocalDate; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -16,21 +16,21 @@ @Getter public class ToDoInfo { // 시작&마감일 - private LocalDateTime startDt; // 시작 일자 - private LocalDateTime dueDt; // 마감 일자 + private LocalDate startDt; // 시작 일자 + private LocalDate dueDt; // 마감 일자 @Enumerated(value = EnumType.STRING) private ToDoStatus toDoStatus; // 진행 상태 @Builder(access = AccessLevel.PRIVATE) - private ToDoInfo(LocalDateTime startDt, LocalDateTime dueDt, ToDoStatus toDoStatus) { + private ToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus toDoStatus) { this.startDt = startDt; this.dueDt = dueDt; this.toDoStatus = toDoStatus; } - public static ToDoInfo createToDoInfo(LocalDateTime startDt, LocalDateTime dueDt) { - if (startDt.isAfter(dueDt) || startDt.isBefore(LocalDateTime.now())) { + public static ToDoInfo createToDoInfo(LocalDate startDt, LocalDate dueDt) { + if (startDt.isAfter(dueDt) || startDt.isBefore(LocalDate.now())) { throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); } return ToDoInfo.builder() diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java index 15f2ea5e..1a077046 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java @@ -1,35 +1,23 @@ package com.amcamp.domain.project.dto.request; import com.fasterxml.jackson.annotation.JsonFormat; -import com.fasterxml.jackson.annotation.JsonProperty; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; -import java.time.LocalDateTime; +import java.time.LocalDate; public record ProjectCreateRequest( - @Schema(description = "팀 ID", example = "1", required = true) - @JsonProperty("team_id") - @NotNull - Long teamId, - @Schema(description = "프로젝트 제목", example = "Devfit", required = true) - @JsonProperty("project_title") - @NotBlank - String projectTitle, - @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발", required = true) - @JsonProperty("project_goal") - @NotBlank + @Schema(description = "팀 ID", example = "1") @NotNull Long teamId, + @Schema(description = "프로젝트 제목", example = "Devfit") @NotBlank String projectTitle, + @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발") @NotBlank String projectGoal, - @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01T00:00", required = true) - @JsonProperty("start_dt") + @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull - LocalDateTime startDt, - @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01T00:00", required = true) - @JsonProperty("due_dt") + LocalDate startDt, + @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull - LocalDateTime dueDt, + LocalDate dueDt, @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") - @JsonProperty("project_description") String projectDescription) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java index dabc13c9..827730fb 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java @@ -2,7 +2,7 @@ import com.amcamp.domain.project.domain.Project; import io.swagger.v3.oas.annotations.media.Schema; -import java.time.LocalDateTime; +import java.time.LocalDate; public record ProjectInfoResponse( @Schema(description = "프로젝트 아이디", example = "1") Long projectId, @@ -10,8 +10,8 @@ public record ProjectInfoResponse( @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") String projectDescription, @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발") String projectGoal, - @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01T00:00") LocalDateTime startDt, - @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01T00:00") LocalDateTime dueDt) { + @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01") LocalDate startDt, + @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01") LocalDate dueDt) { public static ProjectInfoResponse from(Project project) { return new ProjectInfoResponse( diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index dfe294e1..2b612649 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -5,7 +5,7 @@ import com.amcamp.domain.project.domain.ToDoInfo; import com.amcamp.domain.task.domain.Task; import jakarta.persistence.*; -import java.time.LocalDateTime; +import java.time.LocalDate; import java.util.ArrayList; import java.util.List; import lombok.AccessLevel; @@ -46,7 +46,7 @@ private Sprint(Project project, String description, ToDoInfo toDoInfo) { } public static Sprint createSprint( - Project project, String description, LocalDateTime startDt, LocalDateTime dueDt) { + Project project, String description, LocalDate startDt, LocalDate dueDt) { return Sprint.builder() .project(project) .description(description) diff --git a/src/main/java/com/amcamp/domain/task/domain/Task.java b/src/main/java/com/amcamp/domain/task/domain/Task.java index d77e0f6d..31e7d977 100644 --- a/src/main/java/com/amcamp/domain/task/domain/Task.java +++ b/src/main/java/com/amcamp/domain/task/domain/Task.java @@ -5,7 +5,7 @@ import com.amcamp.domain.project.domain.ToDoInfo; import com.amcamp.domain.sprint.domain.Sprint; import jakarta.persistence.*; -import java.time.LocalDateTime; +import java.time.LocalDate; import lombok.AccessLevel; import lombok.Builder; import lombok.Getter; @@ -58,8 +58,8 @@ private Task( public static Task createTask( Sprint sprint, String description, - LocalDateTime startDt, - LocalDateTime dueDt, + LocalDate startDt, + LocalDate dueDt, TaskDifficulty taskDifficulty, ProjectParticipant assignee) { return Task.builder() diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 2e171466..9bcc17c1 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -20,7 +20,7 @@ import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.security.PrincipalDetails; -import java.time.LocalDateTime; +import java.time.LocalDate; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -39,8 +39,8 @@ public class ProjectServiceTest extends IntegrationTest { private Member member; private Member anotherMember; - private LocalDateTime startDt = LocalDateTime.of(2026, 1, 1, 1, 00); - private LocalDateTime dueDt = LocalDateTime.of(2026, 12, 1, 1, 00); + private LocalDate startDt = LocalDate.of(2026, 1, 1); + private LocalDate dueDt = LocalDate.of(2026, 12, 1); private void loginAs(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); From ba273a16fc86aaf39c428aee9a88725ffe6cf63c Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sun, 2 Mar 2025 18:19:45 +0900 Subject: [PATCH 035/107] =?UTF-8?q?feat:=20=ED=8C=80=EC=97=90=20=EC=86=8D?= =?UTF-8?q?=ED=95=9C=20=ED=9A=8C=EC=9B=90=20=EC=9D=B4=EB=AF=B8=EC=A7=80,?= =?UTF-8?q?=20=ED=9A=8C=EC=9B=90=20=EB=AA=A9=EB=A1=9D,=20=ED=8C=80?= =?UTF-8?q?=EC=9E=A5=20=EC=A1=B0=ED=9A=8C=20=20(#78)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 팀에 속한 회원 프로필 이미지 기능 구현 * test: 팀 멤버 조회 서비스 테스트 * feat: 팀장 제외 모든 멤버 목록 조회 * refactor: 팀 멤버 프로필 이미지 쿼리 변경 * feat: 팀 스페이스 내 팀장 조회 기능 * feat: 팀장 조회, 팀 멤버 목록 조회 기능 구현 * test: 팀장 조회, 팀 멤버 목록 조회 기능 테스트 * refactor: 리뷰 내용 반영 - 팀 컨트롤러 내부 스키마 설명 수정 - 조회 메소드 Transactional 설정 - 팀 내 멤버 조회 메소드 멤버 리포지토리 이동 - TeamAdminResponse 구현 * refactor: 팀장 응답 DTO 반환 시 query projection 사용 설정 * refactor: PathVariable 사용 변경 * refactor: projection에서 정적 팩토리 메소드 사용 변경 * refactor: projection 삭제 * fix: 팀장 조회 시 팀 참가자 validation 추가 --- .../domain/member/api/MemberController.java | 14 ++++ .../member/application/MemberService.java | 11 +++ .../domain/member/dao/MemberRepository.java | 2 +- .../member/dao/MemberRepositoryCustom.java | 10 +++ .../member/dao/MemberRepositoryImpl.java | 69 +++++++++++++++++ .../dto/response/BasicMemberResponse.java | 15 ++++ .../dto/response/MemberInfoResponse.java | 11 +-- .../domain/team/api/TeamController.java | 7 ++ .../domain/team/application/TeamService.java | 10 +++ .../team/dao/TeamParticipantRepository.java | 20 +++++ .../team/dto/response/TeamAdminResponse.java | 14 ++++ .../member/application/MemberServiceTest.java | 75 +++++++++++++++++++ .../amcamp/domain/team/TeamServiceTest.java | 35 +++++++++ 13 files changed, 287 insertions(+), 6 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/member/dao/MemberRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/member/dao/MemberRepositoryImpl.java create mode 100644 src/main/java/com/amcamp/domain/member/dto/response/BasicMemberResponse.java create mode 100644 src/main/java/com/amcamp/domain/team/dto/response/TeamAdminResponse.java diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java index b05fb47b..a3c09c6d 100644 --- a/src/main/java/com/amcamp/domain/member/api/MemberController.java +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -2,12 +2,15 @@ import com.amcamp.domain.member.application.MemberService; import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; +import com.amcamp.domain.member.dto.response.BasicMemberResponse; import com.amcamp.domain.member.dto.response.MemberInfoResponse; import com.amcamp.global.util.CookieUtil; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -47,4 +50,15 @@ public ResponseEntity memberNicknameUpdate( public MemberInfoResponse memberInfo() { return memberService.getMemberInfo(); } + + @Operation(summary = "팀에 속한 회원 목록 조회", description = "멤버 페이지에서 팀장을 제외한 회원을 모두 조회합니다.") + @GetMapping("/{teamId}/list") + public Slice memberFindAll( + @PathVariable Long teamId, + @Parameter(description = "이전 페이지의 마지막 멤버 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastMemberId, + @RequestParam(value = "size", defaultValue = "3") int pageSize) { + return memberService.findAllMembers(teamId, lastMemberId, pageSize); + } } diff --git a/src/main/java/com/amcamp/domain/member/application/MemberService.java b/src/main/java/com/amcamp/domain/member/application/MemberService.java index 310f4bd4..dfee700e 100644 --- a/src/main/java/com/amcamp/domain/member/application/MemberService.java +++ b/src/main/java/com/amcamp/domain/member/application/MemberService.java @@ -1,11 +1,15 @@ package com.amcamp.domain.member.application; import com.amcamp.domain.auth.dao.RefreshTokenRepository; +import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; +import com.amcamp.domain.member.dto.response.BasicMemberResponse; import com.amcamp.domain.member.dto.response.MemberInfoResponse; +import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.global.util.MemberUtil; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -16,6 +20,7 @@ public class MemberService { private final MemberUtil memberUtil; private final RefreshTokenRepository refreshTokenRepository; + private final MemberRepository memberRepository; public void logoutMember() { Member currentMember = memberUtil.getCurrentMember(); @@ -45,4 +50,10 @@ public MemberInfoResponse getMemberInfo() { Member currentMember = memberUtil.getCurrentMember(); return MemberInfoResponse.from(currentMember); } + + @Transactional(readOnly = true) + public Slice findAllMembers(Long teamId, Long lastMemberId, int pageSize) { + return memberRepository.findMemberByTeamExceptAdmin( + teamId, lastMemberId, pageSize, TeamParticipantRole.ADMIN); + } } diff --git a/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java b/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java index 7ddbae6a..ff72929c 100644 --- a/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java +++ b/src/main/java/com/amcamp/domain/member/dao/MemberRepository.java @@ -5,6 +5,6 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -public interface MemberRepository extends JpaRepository { +public interface MemberRepository extends JpaRepository, MemberRepositoryCustom { Optional findByOauthInfo(OauthInfo oauthInfo); } diff --git a/src/main/java/com/amcamp/domain/member/dao/MemberRepositoryCustom.java b/src/main/java/com/amcamp/domain/member/dao/MemberRepositoryCustom.java new file mode 100644 index 00000000..661a016c --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/dao/MemberRepositoryCustom.java @@ -0,0 +1,10 @@ +package com.amcamp.domain.member.dao; + +import com.amcamp.domain.member.dto.response.BasicMemberResponse; +import com.amcamp.domain.team.domain.TeamParticipantRole; +import org.springframework.data.domain.Slice; + +public interface MemberRepositoryCustom { + Slice findMemberByTeamExceptAdmin( + Long teamId, Long lastMemberId, int pageSize, TeamParticipantRole role); +} diff --git a/src/main/java/com/amcamp/domain/member/dao/MemberRepositoryImpl.java b/src/main/java/com/amcamp/domain/member/dao/MemberRepositoryImpl.java new file mode 100644 index 00000000..fc8167b0 --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/dao/MemberRepositoryImpl.java @@ -0,0 +1,69 @@ +package com.amcamp.domain.member.dao; + +import static com.amcamp.domain.member.domain.QMember.member; +import static com.amcamp.domain.team.domain.QTeam.team; +import static com.amcamp.domain.team.domain.QTeamParticipant.teamParticipant; + +import com.amcamp.domain.member.dto.response.BasicMemberResponse; +import com.amcamp.domain.team.domain.TeamParticipantRole; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class MemberRepositoryImpl implements MemberRepositoryCustom { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findMemberByTeamExceptAdmin( + Long teamId, Long lastMemberId, int pageSize, TeamParticipantRole role) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + BasicMemberResponse.class, + member.id, + member.nickname, + member.profileImageUrl)) + .from(teamParticipant) + .leftJoin(teamParticipant.member, member) + .on(member.id.eq(teamParticipant.member.id)) + .where( + team.id.eq(teamId), + teamParticipant.role.ne(role), + lastMemberId(lastMemberId)) + .orderBy(teamParticipant.createdDt.desc()) + .limit(pageSize + 1) + .fetch(); + + return checkLastPage(pageSize, results); + } + + private BooleanExpression lastMemberId(Long memberId) { + if (memberId == null) { + return null; + } + + return member.id.lt(memberId); + } + + private Slice checkLastPage( + int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/member/dto/response/BasicMemberResponse.java b/src/main/java/com/amcamp/domain/member/dto/response/BasicMemberResponse.java new file mode 100644 index 00000000..bfbafe6a --- /dev/null +++ b/src/main/java/com/amcamp/domain/member/dto/response/BasicMemberResponse.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.member.dto.response; + +import com.amcamp.domain.member.domain.Member; +import io.swagger.v3.oas.annotations.media.Schema; + +public record BasicMemberResponse( + @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "멤버 닉네임", example = "최현태") String nickname, + @Schema(description = "멤버 프로필 url", example = "Presigned URL") String profileImageUrl) { + + public static BasicMemberResponse from(Member member) { + return new BasicMemberResponse( + member.getId(), member.getNickname(), member.getProfileImageUrl()); + } +} diff --git a/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java b/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java index e9af6e06..111e4469 100644 --- a/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java +++ b/src/main/java/com/amcamp/domain/member/dto/response/MemberInfoResponse.java @@ -3,13 +3,14 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.MemberRole; import com.amcamp.domain.member.domain.MemberStatus; +import io.swagger.v3.oas.annotations.media.Schema; public record MemberInfoResponse( - Long memberId, - String nickname, - String profileImageUrl, - MemberStatus status, - MemberRole role) { + @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "멤버 닉네임", example = "최현태") String nickname, + @Schema(description = "멤버 프로필 url", example = "Presigned URL") String profileImageUrl, + @Schema(description = "멤버 상태", example = "NORMAL") MemberStatus status, + @Schema(description = "멤버 역할", example = "ROLE_USER") MemberRole role) { public static MemberInfoResponse from(Member member) { return new MemberInfoResponse( member.getId(), diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index af9ddada..e9b17322 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -5,6 +5,7 @@ import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; +import com.amcamp.domain.team.dto.response.TeamAdminResponse; import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; @@ -80,6 +81,12 @@ public TeamInfoResponse teamInfo(@PathVariable Long teamId) { return teamService.getTeamInfo(teamId); } + @Operation(summary = "팀장 조회", description = "팀 페이지에서 팀장을 조회합니다.") + @GetMapping("/{teamId}/admin") + public TeamAdminResponse teamFindAdmin(@PathVariable Long teamId) { + return teamService.findTeamAdmin(teamId); + } + @Operation(summary = "팀 목록 조회", description = "회원이 참여한 팀 목록을 조회합니다.") @GetMapping("/list") public Slice teamFindAll( diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index 9149bbe8..ea87f9f9 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -12,6 +12,7 @@ import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; +import com.amcamp.domain.team.dto.response.TeamAdminResponse; import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; @@ -185,4 +186,13 @@ public Slice findAllTeam(Long lastTeamId, int pageSize) { Member currentMember = memberUtil.getCurrentMember(); return teamRepository.findAllTeamByMemberId(currentMember.getId(), lastTeamId, pageSize); } + + @Transactional(readOnly = true) + public TeamAdminResponse findTeamAdmin(Long teamId) { + Member member = memberUtil.getCurrentMember(); + Team team = validateTeam(teamId); + validateParticipant(member, team); + return TeamAdminResponse.from( + teamParticipantRepository.findAdmin(teamId, TeamParticipantRole.ADMIN)); + } } diff --git a/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java b/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java index 5c03ab0b..cf4567c6 100644 --- a/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java +++ b/src/main/java/com/amcamp/domain/team/dao/TeamParticipantRepository.java @@ -3,8 +3,11 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.team.domain.Team; import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface TeamParticipantRepository extends JpaRepository { Optional findByMemberAndTeam(Member member, Team team); @@ -12,4 +15,21 @@ public interface TeamParticipantRepository extends JpaRepository findByTeamId(Long teamId); + + // @Query( + // "SELECT new com.amcamp.domain.team.dto.response.TeamAdminResponse (m.id, + // m.nickname, m.profileImageUrl) " + // + "FROM Member m " + // + "JOIN TeamParticipant tp ON m.id = tp.member.id " + // + "WHERE tp.team.id = :teamId " + // + "AND tp.role = :role ") + // TeamAdminResponse findAdmin( + // @Param("teamId") Long teamId, @Param("role") TeamParticipantRole role); + + @Query( + "SELECT m FROM Member m " + + "JOIN TeamParticipant tp ON m.id = tp.member.id " + + "WHERE tp.team.id = :teamId " + + "AND tp.role = :role") + Member findAdmin(@Param("teamId") Long teamId, @Param("role") TeamParticipantRole role); } diff --git a/src/main/java/com/amcamp/domain/team/dto/response/TeamAdminResponse.java b/src/main/java/com/amcamp/domain/team/dto/response/TeamAdminResponse.java new file mode 100644 index 00000000..376a26a8 --- /dev/null +++ b/src/main/java/com/amcamp/domain/team/dto/response/TeamAdminResponse.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.team.dto.response; + +import com.amcamp.domain.member.domain.Member; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TeamAdminResponse( + @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "멤버 닉네임", example = "최현태") String nickname, + @Schema(description = "멤버 프로필 url", example = "Presigned URL") String profileImageUrl) { + public static TeamAdminResponse from(Member member) { + return new TeamAdminResponse( + member.getId(), member.getNickname(), member.getProfileImageUrl()); + } +} diff --git a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java index d230956f..f92afb15 100644 --- a/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java +++ b/src/test/java/com/amcamp/domain/member/application/MemberServiceTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.AssertionsForClassTypes.tuple; import com.amcamp.IntegrationTest; import com.amcamp.domain.auth.dao.RefreshTokenRepository; @@ -12,16 +13,24 @@ import com.amcamp.domain.member.domain.MemberStatus; import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.domain.member.dto.request.NicknameUpdateRequest; +import com.amcamp.domain.member.dto.response.BasicMemberResponse; import com.amcamp.domain.member.dto.response.MemberInfoResponse; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.domain.team.dto.response.TeamCheckResponse; +import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.MemberErrorCode; import com.amcamp.global.security.PrincipalDetails; import jakarta.validation.ConstraintViolation; import jakarta.validation.Validation; +import java.util.List; import java.util.Set; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -29,6 +38,7 @@ class MemberServiceTest extends IntegrationTest { @Autowired private MemberService memberService; + @Autowired private TeamService teamService; @Autowired private MemberRepository memberRepository; @Autowired private RefreshTokenRepository refreshTokenRepository; @@ -49,6 +59,14 @@ private Member registerAuthenticatedMember() { return member; } + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + @Nested class 로그아웃_시 { @Test @@ -154,4 +172,61 @@ class 회원_닉네임_변경_시 { assertThat(response.role()).isEqualTo(MemberRole.USER); assertThat(response.status()).isEqualTo(MemberStatus.NORMAL); } + + @Nested + class 내가_속한_팀의_멤버를_조회_시 { + @Test + void 팀장을_포함한_멤버가_1명() { + // given + registerAuthenticatedMember(); + TeamInviteCodeResponse teamInviteCodeResponse = + teamService.createTeam(TeamCreateRequest.of("MyTeam", "This is my team")); + String inviteCode = teamInviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode(new TeamInviteCodeRequest(inviteCode)); + + // when + Slice results = + memberService.findAllMembers(teamCheckResponse.teamId(), null, 3); + + // then + assertThat(results.getContent()).hasSize(0); + } + + @Test + void 팀장을_제외한_멤버가_3명() { + // given + registerAuthenticatedMember(); + TeamInviteCodeResponse teamInviteCodeResponse = + teamService.createTeam(TeamCreateRequest.of("MyTeam", "This is my team")); + String inviteCode = teamInviteCodeResponse.inviteCode(); + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode(new TeamInviteCodeRequest(inviteCode)); + + List requests = + List.of( + Member.createMember("member1", "url1", null), // 2L + Member.createMember("member2", "url2", null), // 3L + Member.createMember("member3", "url3", null), // 4L + Member.createMember("member4", "url4", null), // 5L + Member.createMember("member5", "url5", null)); // 6L + + for (Member member : requests) { + memberRepository.save(member); + loginAs(member); + teamService.joinTeam(new TeamInviteCodeRequest(inviteCode)); + } + + // when + Slice results = + memberService.findAllMembers(teamCheckResponse.teamId(), null, 2); + + // then + assertThat(results.getContent()).hasSize(2); + assertThat(results) + .extracting("memberId", "nickname", "profileImageUrl") + .containsExactlyInAnyOrder( + tuple(6L, "member5", "url5"), tuple(5L, "member4", "url4")); + } + } } diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 7abab9e8..45140155 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -20,6 +20,7 @@ import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; +import com.amcamp.domain.team.dto.response.TeamAdminResponse; import com.amcamp.domain.team.dto.response.TeamCheckResponse; import com.amcamp.domain.team.dto.response.TeamInfoResponse; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; @@ -657,4 +658,38 @@ class 회원이_참여한_팀_목록_조회_시 { .hasMessage(TeamErrorCode.TEAM_NOT_EXISTS.getMessage()); } } + + @Test + void 회원이_참여한_팀의_팀장_정보를_반환한다() { + // given + TeamInviteCodeResponse inviteCodeResponse = + teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); + + TeamCheckResponse teamCheckResponse = + teamService.getTeamByCode( + new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + Long teamId = teamCheckResponse.teamId(); + + // when + TeamAdminResponse result = teamService.findTeamAdmin(teamId); + + // then + assertThat(result) + .extracting("memberId", "nickname", "profileImageUrl") + .containsExactly(1L, "testNickname", "testProfileImageUrl"); + + // 다른 멤버가 팀 참가 후 팀장 정보를 조회했을 때도 동일한지 확인 + Member userMember = + memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); + loginAs(userMember); + teamService.joinTeam(new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); + + // when + TeamAdminResponse anotherResult = teamService.findTeamAdmin(teamId); + + // then + assertThat(anotherResult) + .extracting("memberId", "nickname", "profileImageUrl") + .containsExactly(1L, "testNickname", "testProfileImageUrl"); + } } From 25d6eca66b85879dd98f368dccc67c75045a8a10 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 3 Mar 2025 01:02:50 +0900 Subject: [PATCH 036/107] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=83=9D=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20(#83)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 스프린트 생성 구현 * refactor: 예외 처리 시 상태 코드 수정 --- .../project/application/ProjectService.java | 2 +- .../domain/sprint/api/SprintController.java | 30 +++++++++ .../sprint/application/SprintService.java | 65 +++++++++++++++++++ .../domain/sprint/dao/SprintRepository.java | 6 ++ .../amcamp/domain/sprint/domain/Sprint.java | 14 ++-- .../dto/request/SprintCreateRequest.java | 36 ++++++++++ .../domain/team/application/TeamService.java | 6 +- .../exception/errorcode/ProjectErrorCode.java | 5 +- .../exception/errorcode/TeamErrorCode.java | 2 +- .../amcamp/domain/team/TeamServiceTest.java | 14 ++-- 10 files changed, 161 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/sprint/api/SprintController.java create mode 100644 src/main/java/com/amcamp/domain/sprint/application/SprintService.java create mode 100644 src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index e9f693d9..74a1c32e 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -91,7 +91,7 @@ private Project getProjectById(Long projectId) { private TeamParticipant getTeamParticipant(Member member, Team team) { return teamParticipantRepository .findByMemberAndTeam(member, team) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); } private Team getTeam(Long teamId) { diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java new file mode 100644 index 00000000..30f3d64a --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -0,0 +1,30 @@ +package com.amcamp.domain.sprint.api; + +import com.amcamp.domain.sprint.application.SprintService; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Tag(name = "스프린트 API", description = "스프린트 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/sprints") +public class SprintController { + + private final SprintService sprintService; + + @Operation(summary = "스프린트 생성", description = "스프린트를 생성합니다.") + @PostMapping("/create") + public ResponseEntity sprintCreate(@Valid @RequestBody SprintCreateRequest request) { + sprintService.createSprint(request); + return ResponseEntity.status(HttpStatus.CREATED).build(); + } +} diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java new file mode 100644 index 00000000..5294861c --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -0,0 +1,65 @@ +package com.amcamp.domain.sprint.application; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.util.MemberUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +@RequiredArgsConstructor +public class SprintService { + + private final MemberUtil memberUtil; + private final SprintRepository sprintRepository; + private final ProjectRepository projectRepository; + private final TeamParticipantRepository teamParticipantRepository; + private final ProjectParticipantRepository projectParticipantRepository; + + public void createSprint(SprintCreateRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + final Project project = findByProjectId(request.projectId()); + + validateProjectParticipant(project, project.getTeam(), currentMember); + + sprintRepository.save( + Sprint.createSprint( + project, + request.title(), + request.goal(), + request.startDt(), + request.dueDt())); + } + + private Project findByProjectId(Long projectId) { + return projectRepository + .findById(projectId) + .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); + } + + private void validateProjectParticipant(Project project, Team team, Member currentMember) { + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(currentMember, team) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } +} diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java new file mode 100644 index 00000000..4357439a --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -0,0 +1,6 @@ +package com.amcamp.domain.sprint.dao; + +import com.amcamp.domain.sprint.domain.Sprint; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface SprintRepository extends JpaRepository {} diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index 2b612649..14ac7585 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -26,7 +26,9 @@ public class Sprint extends BaseTimeEntity { @JoinColumn(name = "project_id") private Project project; - @Lob private String description; + private String title; + + @Lob private String goal; @Embedded private ToDoInfo toDoInfo; @@ -39,17 +41,19 @@ public class Sprint extends BaseTimeEntity { private List contributions = new ArrayList<>(); @Builder(access = AccessLevel.PRIVATE) - private Sprint(Project project, String description, ToDoInfo toDoInfo) { + private Sprint(Project project, String title, String goal, ToDoInfo toDoInfo) { this.project = project; - this.description = description; + this.title = title; + this.goal = goal; this.toDoInfo = toDoInfo; } public static Sprint createSprint( - Project project, String description, LocalDate startDt, LocalDate dueDt) { + Project project, String title, String goal, LocalDate startDt, LocalDate dueDt) { return Sprint.builder() .project(project) - .description(description) + .title(title) + .goal(goal) .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) .build(); } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java new file mode 100644 index 00000000..47ff2052 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java @@ -0,0 +1,36 @@ +package com.amcamp.domain.sprint.dto.request; + +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDate; + +public record SprintCreateRequest( + @NotNull(message = "프로젝트 ID는 비워둘 수 없습니다.") @Schema(description = "프로젝트 ID", example = "1") + Long projectId, + @NotBlank(message = "스프린트 제목은 비워둘 수 없습니다.") + @Schema(description = "스프린트 제목", example = "1차 스프린트") + String title, + @NotBlank(message = "스프린트 중간 목표는 비워둘 수 없습니다.") + @Schema(description = "중간 목표", example = "MVP 개발") + String goal, + @NotNull(message = "스프린트 시작 날짜는 비워둘 수 없습니다.") + @JsonFormat( + shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd", + timezone = "Asia/Seoul") + @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") + LocalDate startDt, + @NotNull(message = "스프린트 마감 날짜는 비워둘 수 없습니다.") + @JsonFormat( + shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd", + timezone = "Asia/Seoul") + @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") + LocalDate dueDt) { + public static SprintCreateRequest of( + Long projectId, String title, String goal, LocalDate startDt, LocalDate dueDt) { + return new SprintCreateRequest(projectId, title, goal, startDt, dueDt); + } +} diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index ea87f9f9..3056bb72 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -163,7 +163,7 @@ private void validateTeamJoin(Member member, Team team) { private void validateParticipant(Member member, Team team) { if (!teamParticipantRepository.findByMemberAndTeam(member, team).isPresent()) { - throw new CommonException(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); + throw new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); } } @@ -172,9 +172,7 @@ private void validateAdminParticipant(Member member, Team team) { teamParticipantRepository .findByMemberAndTeam(member, team) .orElseThrow( - () -> - new CommonException( - TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); if (teamParticipant.getRole() != TeamParticipantRole.ADMIN) { throw new CommonException(TeamErrorCode.UNAUTHORIZED_ACCESS); diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 3aa793dd..33eb4de9 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -5,7 +5,10 @@ @Getter public enum ProjectErrorCode implements BaseErrorCode { - PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "project 를 찾을 수 없습니다."); + PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "project 를 찾을 수 없습니다."), + + PROJECT_PARTICIPATION_REQUIRED(HttpStatus.FORBIDDEN, "해당 프로젝트 참여자만 스프린트를 생성할 수 있습니다."), + ; private final HttpStatus httpStatus; private final String message; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java index 9330e169..169167fa 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java @@ -7,7 +7,7 @@ public enum TeamErrorCode implements BaseErrorCode { TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 팀을 찾을 수 없습니다."), MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), - TEAM_PARTICIPANT_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 참여자가 아닙니다."), + TEAM_PARTICIPANT_REQUIRED(HttpStatus.FORBIDDEN, "팀 참여자가 아닙니다."), INVALID_INVITE_CODE(HttpStatus.NOT_FOUND, "팀이 존재하지 않거나 코드가 만료되었습니다."), UNAUTHORIZED_ACCESS(HttpStatus.UNAUTHORIZED, "수정 권한이 없습니다."), diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 45140155..4435cb9e 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -102,7 +102,7 @@ class 팀_생성_시 { .orElseThrow( () -> new CommonException( - TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); assertThat(teamParticipant.getRole()).isEqualTo(TeamParticipantRole.ADMIN); assertThat(savedTeam.getEmoji()).isEqualTo("🍇"); @@ -162,7 +162,7 @@ class 팀_아이디로_코드확인_시 { assertThatThrownBy(() -> teamService.getInviteCode(teamId)) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); } } @@ -215,7 +215,7 @@ class 팀_참가_시 { .orElseThrow( () -> new CommonException( - TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND)); + TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); assertThat(teamParticipant.getMember()).isEqualTo(newMember); assertThat(teamParticipant.getRole()).isEqualTo(TeamParticipantRole.USER); @@ -333,7 +333,7 @@ class 팀_수정_시 { teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); // 사용자 권한이 없을 때 + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); // 사용자 권한이 없을 때 } @Test @@ -428,7 +428,7 @@ invalidTeamId, new TeamEmojiUpdateRequest("⭐️"))) teamId, new TeamEmojiUpdateRequest("⭐️"))) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); // 사용자 권한이 없을 때 + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); // 사용자 권한이 없을 때 } @Test @@ -534,7 +534,7 @@ class 팀_삭제_시 { assertThatThrownBy(() -> teamService.deleteTeam(teamId)) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); } @Test @@ -618,7 +618,7 @@ class 팀_정보_조회_시 { assertThatThrownBy(() -> teamService.getTeamInfo(teamId)) .isInstanceOf(CommonException.class) .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_NOT_FOUND); + .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); } } From 156ab09460f2e3b351c6fa2aec67bcb575c4feb0 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 4 Mar 2025 19:16:39 +0900 Subject: [PATCH 037/107] =?UTF-8?q?refactor:=20Swagger=20API=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A0=95=EB=A0=AC=20(#89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: swagger yml 설정 * refactor: API 태그 수정 --- .../com/amcamp/domain/auth/api/AuthController.java | 2 +- .../com/amcamp/domain/image/api/ImageController.java | 2 +- .../com/amcamp/domain/member/api/MemberController.java | 2 +- .../amcamp/domain/project/api/ProjectController.java | 2 +- .../com/amcamp/domain/sprint/api/SprintController.java | 2 +- .../com/amcamp/domain/team/api/TeamController.java | 2 +- src/main/resources/application.yml | 10 ++++++++++ 7 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/amcamp/domain/auth/api/AuthController.java b/src/main/java/com/amcamp/domain/auth/api/AuthController.java index 0696ff4a..3d0f071c 100644 --- a/src/main/java/com/amcamp/domain/auth/api/AuthController.java +++ b/src/main/java/com/amcamp/domain/auth/api/AuthController.java @@ -12,7 +12,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -@Tag(name = "인증 API", description = "인증 관련 API입니다.") +@Tag(name = "1-1. 인증 API", description = "인증 관련 API입니다.") @RestController @RequiredArgsConstructor @RequestMapping("/auth") diff --git a/src/main/java/com/amcamp/domain/image/api/ImageController.java b/src/main/java/com/amcamp/domain/image/api/ImageController.java index a47cb355..64594879 100644 --- a/src/main/java/com/amcamp/domain/image/api/ImageController.java +++ b/src/main/java/com/amcamp/domain/image/api/ImageController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "이미지 API", description = "이미지 관련 API입니다.") +@Tag(name = "2. 이미지 API", description = "이미지 관련 API입니다.") @RestController @RequiredArgsConstructor public class ImageController { diff --git a/src/main/java/com/amcamp/domain/member/api/MemberController.java b/src/main/java/com/amcamp/domain/member/api/MemberController.java index a3c09c6d..a9934fa3 100644 --- a/src/main/java/com/amcamp/domain/member/api/MemberController.java +++ b/src/main/java/com/amcamp/domain/member/api/MemberController.java @@ -14,7 +14,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -@Tag(name = "회원 API", description = "회원 관련 API입니다.") +@Tag(name = "1-2. 회원 API", description = "회원 관련 API입니다.") @RestController @RequiredArgsConstructor @RequestMapping("/members") diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index b3041fd5..124e6f38 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -11,7 +11,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -@Tag(name = "프로젝트 API", description = "프로젝트 관련 API 입니다.") +@Tag(name = "4. 프로젝트 API", description = "프로젝트 관련 API 입니다.") @RestController @RequiredArgsConstructor @RequestMapping("/projects") diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 30f3d64a..0313c85e 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -13,7 +13,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -@Tag(name = "스프린트 API", description = "스프린트 관련 API입니다.") +@Tag(name = "5. 스프린트 API", description = "스프린트 관련 API입니다.") @RestController @RequiredArgsConstructor @RequestMapping("/sprints") diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index e9b17322..ba18901c 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -18,7 +18,7 @@ import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; -@Tag(name = "팀 API", description = "팀 관련 API입니다.") +@Tag(name = "3. 팀 API", description = "팀 관련 API입니다.") @RestController @RequiredArgsConstructor @RequestMapping("/teams") diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index a87de562..21110bcd 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,3 +8,13 @@ spring: - redis - security - s3 + +spring-doc: + default-consumes-media-type: application/json + default-produces-media-type: application/json + swagger-ui: + tags-sorter: alpha + operations-sorter : method + disable-swagger-default-url: true + path: /swagger-ui + doc-expansion : none From 2fb289c3df9e873fe1abf1b174a11f1c0fd6c4dc Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 4 Mar 2025 22:32:18 +0900 Subject: [PATCH 038/107] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95,=20=EC=82=AD=EC=A0=9C=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#86)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 스프린트 기본 정보 수정 구현 * feat: 스프린트 일정 및 진행 상태 수정 구현 * feat: 스프린트 삭제 구현 * refactor: 상태 코드 NOT FOUND로 수정 * feat: 스프린트 일정 validation 추가 * feat: 스프린트 생성 시에도 프로젝트 일정 범위 내에 있는지 체크하는 validation 추가 * feat: 프로젝트 리더만 스프린트를 삭제할 수 있도록 수정 --- .../domain/project/domain/ToDoInfo.java | 23 +++++- .../domain/sprint/api/SprintController.java | 29 +++++++- .../sprint/application/SprintService.java | 74 ++++++++++++++++++- .../amcamp/domain/sprint/domain/Sprint.java | 10 +++ .../dto/request/SprintBasicUpdateRequest.java | 7 ++ .../dto/request/SprintToDoUpdateRequest.java | 21 ++++++ .../dto/response/SprintInfoResponse.java | 22 ++++++ .../exception/errorcode/SprintErrorCode.java | 25 +++++++ 8 files changed, 202 insertions(+), 9 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java index 11adcc95..8a54156a 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java @@ -30,13 +30,30 @@ private ToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus toDoStatus) { } public static ToDoInfo createToDoInfo(LocalDate startDt, LocalDate dueDt) { - if (startDt.isAfter(dueDt) || startDt.isBefore(LocalDate.now())) { - throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); - } + validateDates(startDt, dueDt); return ToDoInfo.builder() .startDt(startDt) .dueDt(dueDt) .toDoStatus(ToDoStatus.NOT_STARTED) .build(); } + + public void updateToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus status) { + if (startDt != null) { + validateDates(startDt, this.dueDt); + this.startDt = startDt; + } + if (dueDt != null) { + validateDates(this.startDt, dueDt); + this.dueDt = dueDt; + } + if (status != null) this.toDoStatus = status; + } + + private static void validateDates(LocalDate startDt, LocalDate dueDt) { + if (startDt == null || dueDt == null) return; + if (startDt.isAfter(dueDt) || startDt.isBefore(LocalDate.now())) { + throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + } + } } diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 0313c85e..96913403 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -1,17 +1,17 @@ package com.amcamp.domain.sprint.api; import com.amcamp.domain.sprint.application.SprintService; +import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; @Tag(name = "5. 스프린트 API", description = "스프린트 관련 API입니다.") @RestController @@ -27,4 +27,25 @@ public ResponseEntity sprintCreate(@Valid @RequestBody SprintCreateRequest sprintService.createSprint(request); return ResponseEntity.status(HttpStatus.CREATED).build(); } + + @Operation(summary = "스프린트 기본 정보 수정", description = "스프린트의 기본 정보(제목, 목표)를 수정합니다.") + @PatchMapping("/{sprintId}/basic-info") + public SprintInfoResponse sprintUpdateBasic( + @PathVariable Long sprintId, @Valid @RequestBody SprintBasicUpdateRequest request) { + return sprintService.updateSprintBasicInfo(sprintId, request); + } + + @Operation(summary = "스프린트 일정 및 진행 상태 수정", description = "스프린트의 일정 및 진행 상태를 수정합니다.") + @PatchMapping("/{sprintId}/todo-info") + public SprintInfoResponse sprintUpdateToDo( + @PathVariable Long sprintId, @Valid @RequestBody SprintToDoUpdateRequest request) { + return sprintService.updateSprintToDoInfo(sprintId, request); + } + + @Operation(summary = "스프린트 삭제", description = "스프린트를 삭제합니다.") + @DeleteMapping("/{sprintId}") + public ResponseEntity sprintDelete(@PathVariable Long sprintId) { + sprintService.deleteSprint(sprintId); + return ResponseEntity.status(HttpStatus.OK).build(); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index 5294861c..a68772ed 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -4,16 +4,25 @@ import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.ToDoInfo; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.domain.Team; import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; +import java.time.LocalDate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -35,6 +44,8 @@ public void createSprint(SprintCreateRequest request) { validateProjectParticipant(project, project.getTeam(), currentMember); + validateDate(request.startDt(), request.dueDt(), project.getToDoInfo()); + sprintRepository.save( Sprint.createSprint( project, @@ -44,22 +55,81 @@ public void createSprint(SprintCreateRequest request) { request.dueDt())); } + public SprintInfoResponse updateSprintBasicInfo( + Long sprintId, SprintBasicUpdateRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + + validateProjectParticipant( + sprint.getProject(), sprint.getProject().getTeam(), currentMember); + + sprint.updateSprintBasic(request.title(), request.goal()); + + return SprintInfoResponse.from(sprint); + } + + public SprintInfoResponse updateSprintToDoInfo(Long sprintId, SprintToDoUpdateRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + + validateProjectParticipant( + sprint.getProject(), sprint.getProject().getTeam(), currentMember); + + validateDate(request.startDt(), request.dueDt(), sprint.getProject().getToDoInfo()); + + sprint.updateSprintToDo(request.startDt(), request.dueDt(), request.status()); + + return SprintInfoResponse.from(sprint); + } + + public void deleteSprint(Long sprintId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + + ProjectParticipant projectParticipant = + validateProjectParticipant( + sprint.getProject(), sprint.getProject().getTeam(), currentMember); + + validateAdminProjectParticipant(projectParticipant); + + sprintRepository.deleteById(sprintId); + } + + private Sprint findBySprintId(Long sprintId) { + return sprintRepository + .findById(sprintId) + .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + } + private Project findByProjectId(Long projectId) { return projectRepository .findById(projectId) .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); } - private void validateProjectParticipant(Project project, Team team, Member currentMember) { + private ProjectParticipant validateProjectParticipant( + Project project, Team team, Member currentMember) { TeamParticipant teamParticipant = teamParticipantRepository .findByMemberAndTeam(currentMember, team) .orElseThrow( () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); - projectParticipantRepository + return projectParticipantRepository .findByProjectAndTeamParticipant(project, teamParticipant) .orElseThrow( () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); } + + private void validateAdminProjectParticipant(ProjectParticipant projectParticipant) { + if (!projectParticipant.getProjectRole().equals(ProjectParticipantRole.ADMIN)) { + throw new CommonException(SprintErrorCode.SPRINT_DELETE_FORBIDDEN); + } + } + + private void validateDate(LocalDate startDt, LocalDate dueDt, ToDoInfo toDoInfo) { + if (startDt.isBefore(toDoInfo.getStartDt()) || dueDt.isAfter(toDoInfo.getDueDt())) { + throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + } + } } diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index 14ac7585..6caed6a5 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -3,6 +3,7 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ToDoInfo; +import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.task.domain.Task; import jakarta.persistence.*; import java.time.LocalDate; @@ -57,4 +58,13 @@ public static Sprint createSprint( .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) .build(); } + + public void updateSprintBasic(String title, String goal) { + if (title != null) this.title = title; + if (goal != null) this.goal = goal; + } + + public void updateSprintToDo(LocalDate startDt, LocalDate dueDt, ToDoStatus status) { + toDoInfo.updateToDoInfo(startDt, dueDt, status); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java new file mode 100644 index 00000000..584001d3 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.sprint.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record SprintBasicUpdateRequest( + @Schema(description = "스프린트 제목", example = "2차 스프린트") String title, + @Schema(description = "중간 목표", example = "MVP 개발") String goal) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java new file mode 100644 index 00000000..6706cd3f --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java @@ -0,0 +1,21 @@ +package com.amcamp.domain.sprint.dto.request; + +import com.amcamp.domain.project.domain.ToDoStatus; +import com.fasterxml.jackson.annotation.JsonFormat; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; + +public record SprintToDoUpdateRequest( + @JsonFormat( + shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd", + timezone = "Asia/Seoul") + @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") + LocalDate startDt, + @JsonFormat( + shape = JsonFormat.Shape.STRING, + pattern = "yyyy-MM-dd", + timezone = "Asia/Seoul") + @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") + LocalDate dueDt, + @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java new file mode 100644 index 00000000..4e7f5919 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java @@ -0,0 +1,22 @@ +package com.amcamp.domain.sprint.dto.response; + +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.sprint.domain.Sprint; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; + +public record SprintInfoResponse( + @Schema(description = "스프린트 제목", example = "1차 스프린트") String title, + @Schema(description = "중간 목표", example = "MVP 개발") String goal, + @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, + @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, + @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status) { + public static SprintInfoResponse from(Sprint sprint) { + return new SprintInfoResponse( + sprint.getTitle(), + sprint.getGoal(), + sprint.getToDoInfo().getStartDt(), + sprint.getToDoInfo().getDueDt(), + sprint.getToDoInfo().getToDoStatus()); + } +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java new file mode 100644 index 00000000..acc82701 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -0,0 +1,25 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +public enum SprintErrorCode implements BaseErrorCode { + SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), + + SPRINT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "스프린트 삭제 권한이 없습니다."), + ; + + private final HttpStatus httpStatus; + private final String message; + + SprintErrorCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } + + @Override + public String getCodeName() { + return this.name(); + } +} From e63b2cccb916970352f9bd529bc2b2fac67fa5de Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 5 Mar 2025 11:50:48 +0900 Subject: [PATCH 039/107] =?UTF-8?q?refactor:=20=EC=98=88=EC=99=B8=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=EC=97=90=EC=84=9C=20field=20=EB=B0=8F=20give?= =?UTF-8?q?n=20=EC=A0=9C=EA=B1=B0=20(#93)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 예외 응답에서 field, given 제거 * fix: 테스트 코드 수정 --- .../global/exception/CommonException.java | 13 ++-------- .../amcamp/global/exception/ErrorDetail.java | 16 ------------- .../com/amcamp/global/exception/ErrorMsg.java | 20 ---------------- .../exception/GlobalExceptionHandler.java | 14 ++++------- .../exception/errorcode/AuthErrorCode.java | 24 +++---------------- .../exception/errorcode/BaseErrorCode.java | 11 +-------- .../exception/errorcode/GlobalErrorCode.java | 9 +++---- .../exception/errorcode/ImageErrorCode.java | 9 +++---- .../exception/errorcode/MemberErrorCode.java | 9 +++---- .../exception/errorcode/ProjectErrorCode.java | 9 +++---- .../exception/errorcode/SprintErrorCode.java | 9 +++---- .../exception/errorcode/TeamErrorCode.java | 9 +++---- .../exception/ExceptionHandlerTest.java | 20 ++++++---------- 13 files changed, 36 insertions(+), 136 deletions(-) delete mode 100644 src/main/java/com/amcamp/global/exception/ErrorDetail.java delete mode 100644 src/main/java/com/amcamp/global/exception/ErrorMsg.java diff --git a/src/main/java/com/amcamp/global/exception/CommonException.java b/src/main/java/com/amcamp/global/exception/CommonException.java index 7a23048d..7cbb215c 100644 --- a/src/main/java/com/amcamp/global/exception/CommonException.java +++ b/src/main/java/com/amcamp/global/exception/CommonException.java @@ -6,19 +6,10 @@ @Getter public class CommonException extends RuntimeException { - private BaseErrorCode errorCode; - private String errorField; - private String errorGiven; + private final BaseErrorCode errorCode; public CommonException(BaseErrorCode errorCode) { - super(errorCode.getErrorMsg().getReason()); + super(errorCode.getMessage()); this.errorCode = errorCode; } - - public CommonException(BaseErrorCode errorCode, String errorField, String errorGiven) { - super(errorCode.getErrorMsg().getReason()); // RuntimeException - this.errorCode = errorCode; - this.errorField = errorField; - this.errorGiven = errorGiven; - } } diff --git a/src/main/java/com/amcamp/global/exception/ErrorDetail.java b/src/main/java/com/amcamp/global/exception/ErrorDetail.java deleted file mode 100644 index 951e2ece..00000000 --- a/src/main/java/com/amcamp/global/exception/ErrorDetail.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.amcamp.global.exception; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Data; -import lombok.NoArgsConstructor; - -@Data -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ErrorDetail { - private String field; - private String given; - private ErrorMsg reasonMessage; -} diff --git a/src/main/java/com/amcamp/global/exception/ErrorMsg.java b/src/main/java/com/amcamp/global/exception/ErrorMsg.java deleted file mode 100644 index 83cd96f5..00000000 --- a/src/main/java/com/amcamp/global/exception/ErrorMsg.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.amcamp.global.exception; - -import lombok.AllArgsConstructor; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Getter -@Builder -@NoArgsConstructor -@AllArgsConstructor -public class ErrorMsg { - private String code; - private String reason; - - @Override - public String toString() { - return String.format("ErrorMsg{code='%s', reason='%s'}", code, reason); - } -} diff --git a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java index b4050524..891f0710 100644 --- a/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/amcamp/global/exception/GlobalExceptionHandler.java @@ -18,16 +18,12 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler { @ExceptionHandler(CommonException.class) - public ResponseEntity> handleCustomException(CommonException e) { + public ResponseEntity handleCustomException(CommonException e) { final BaseErrorCode errorCode = e.getErrorCode(); - final ErrorDetail errorDetail = - ErrorDetail.builder() - .field(e.getErrorField()) - .given(e.getErrorGiven()) - .reasonMessage(errorCode.getErrorMsg()) - .build(); - final CommonResponse response = - CommonResponse.onFailure(errorCode.getHttpStatus().value(), errorDetail); + final ErrorResponse errorResponse = + ErrorResponse.of(errorCode.errorClassName(), errorCode.getMessage()); + final CommonResponse response = + CommonResponse.onFailure(errorCode.getHttpStatus().value(), errorResponse); return ResponseEntity.status(errorCode.getHttpStatus()).body(response); } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java index eeb4411e..a816a636 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/AuthErrorCode.java @@ -1,40 +1,22 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum AuthErrorCode implements BaseErrorCode { ID_TOKEN_VERIFICATION_FAILED(HttpStatus.UNAUTHORIZED, "ID 토큰 검증에 실패했습니다."), AUTH_NOT_FOUND(HttpStatus.UNAUTHORIZED, "사용자 인증 정보를 찾을 수 없습니다. 올바른 토큰으로 요청해주세요."), ; - // 잘못된 요청 - // WRONG_REQUEST(HttpStatus.BAD_REQUEST, "잘못된 요청입니다"), - - // Member 요청 관련 에러 - // USERNAME_DUPLICATED(HttpStatus.CONFLICT, "이미 존재하는 USER 입니다"), - // NO_AUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "인증되지 않은 USER 입니다"), - - // Token 유효성 Error - // INVALID_TOKEN(HttpStatus.UNAUTHORIZED, "유효하지 않은 토큰입니다"), - // TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, "요청한 토큰을 찾을 수 없습니다"), - - // Role 권한 관련 오류 - // NO_AUTHORITY(HttpStatus.BAD_REQUEST, "권한 정보를 찾을 수 없습니다"), - // INVALID_AUTHORITY(HttpStatus.BAD_REQUEST, "접근 권한이 없습니다"); - private final HttpStatus httpStatus; private final String message; - AuthErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java index afce9d09..51a8a0ac 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/BaseErrorCode.java @@ -1,6 +1,5 @@ package com.amcamp.global.exception.errorcode; -import com.amcamp.global.exception.ErrorMsg; import org.springframework.http.HttpStatus; public interface BaseErrorCode { @@ -8,13 +7,5 @@ public interface BaseErrorCode { String getMessage(); - String getCodeName(); - - // 공통 ErrorMsg 생성 메서드 - default ErrorMsg getErrorMsg() { - return ErrorMsg.builder() - .code(getCodeName()) // Enum 이름을 사용 - .reason(getMessage()) // 오류 메시지 - .build(); - } + String errorClassName(); } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java index 5d3f1165..88f105ed 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java @@ -1,9 +1,11 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum GlobalErrorCode implements BaseErrorCode { INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류입니다. 관리자에게 문의해주세요."), INVALID_DATE_ERROR(HttpStatus.BAD_REQUEST, "유효하지 않은 날짜 입력입니다."); @@ -11,13 +13,8 @@ public enum GlobalErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String message; - GlobalErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java index a7a4a0d4..2944888a 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ImageErrorCode.java @@ -1,9 +1,11 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum ImageErrorCode implements BaseErrorCode { IMAGE_NOT_FOUND(HttpStatus.NOT_FOUND, "이미지를 찾을 수 없습니다."), ; @@ -11,13 +13,8 @@ public enum ImageErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String message; - ImageErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java index 2fbbd025..231624c3 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/MemberErrorCode.java @@ -1,9 +1,11 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum MemberErrorCode implements BaseErrorCode { MEMBER_NOT_FOUND(HttpStatus.NOT_FOUND, "회원을 찾을 수 없습니다."), @@ -13,13 +15,8 @@ public enum MemberErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String message; - MemberErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 33eb4de9..c3822147 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -1,9 +1,11 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum ProjectErrorCode implements BaseErrorCode { PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "project 를 찾을 수 없습니다."), @@ -13,13 +15,8 @@ public enum ProjectErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String message; - ProjectErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index acc82701..5752dd1f 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -1,9 +1,11 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum SprintErrorCode implements BaseErrorCode { SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), @@ -13,13 +15,8 @@ public enum SprintErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String message; - SprintErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java index 169167fa..01022e4f 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TeamErrorCode.java @@ -1,9 +1,11 @@ package com.amcamp.global.exception.errorcode; +import lombok.AllArgsConstructor; import lombok.Getter; import org.springframework.http.HttpStatus; @Getter +@AllArgsConstructor public enum TeamErrorCode implements BaseErrorCode { TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "요청한 팀을 찾을 수 없습니다."), MEMBER_ALREADY_JOINED(HttpStatus.BAD_REQUEST, "이미 이 팀에 참가한 회원입니다."), @@ -17,13 +19,8 @@ public enum TeamErrorCode implements BaseErrorCode { private final HttpStatus httpStatus; private final String message; - TeamErrorCode(HttpStatus httpStatus, String message) { - this.httpStatus = httpStatus; - this.message = message; - } - @Override - public String getCodeName() { + public String errorClassName() { return this.name(); } } diff --git a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java index a887558b..f8edd8ca 100644 --- a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java +++ b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java @@ -6,7 +6,6 @@ import com.amcamp.global.common.response.CommonResponse; import com.amcamp.global.exception.errorcode.AuthErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; -import com.fasterxml.jackson.databind.ObjectMapper; import java.util.Optional; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -52,8 +51,7 @@ void globalExceptionHandlerTest() { // given: 예외 핸들러와 예외 생성 GlobalExceptionHandler globalExceptionHandler = new GlobalExceptionHandler(); - CommonException exception = - new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND, "project_id", null); + CommonException exception = new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND); // when: 예외 핸들러 실행 CommonResponse response = @@ -62,16 +60,12 @@ void globalExceptionHandlerTest() { // then: 응답 객체 검증 assertThat(response).isNotNull(); assertThat(response.getStatus()).isEqualTo(400); - assertThat(response.getData()).isInstanceOf(ErrorDetail.class); - // ErrorMsg 객체 세부 검증 - ObjectMapper objectMapper = new ObjectMapper(); - - ErrorDetail errorDetail = objectMapper.convertValue(response.getData(), ErrorDetail.class); - ErrorMsg errorMsg = - objectMapper.convertValue(errorDetail.getReasonMessage(), ErrorMsg.class); - - assertThat(errorMsg.getReason()).isEqualTo(projectErrorCode.getErrorMsg().getReason()); - assertThat(errorMsg.getCode()).isEqualTo(projectErrorCode.getErrorMsg().getCode()); + // ErrorResponse 객체 검증 + ErrorResponse errorResponse = (ErrorResponse) response.getData(); + assertThat(errorResponse.errorClassName()) + .isEqualTo(ProjectErrorCode.PROJECT_NOT_FOUND.name()); + assertThat(errorResponse.message()) + .isEqualTo(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } } From 92e53b8b76b301044434db493e04006494397b06 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 5 Mar 2025 16:06:18 +0900 Subject: [PATCH 040/107] =?UTF-8?q?refactor:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=A0=9C=EB=AA=A9=EC=97=90=20=EB=B2=88=ED=98=B8?= =?UTF-8?q?=EA=B0=80=20=EC=9E=90=EB=8F=99=EC=9C=BC=EB=A1=9C=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80=EA=B2=BD=20(#9?= =?UTF-8?q?5)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 스프린트 생성 시 번호가 자동으로 지정되도록 변경 * refactor: 스프린트 수정 시 제목을 수정하지 않도록 변경 * refactor: 스프린트 삭제 시 제목이 자동으로 조정되도록 변경 --- .../domain/sprint/api/SprintController.java | 7 ++-- .../sprint/application/SprintService.java | 32 +++++++++++++------ .../domain/sprint/dao/SprintRepository.java | 12 ++++++- .../amcamp/domain/sprint/domain/Sprint.java | 7 ++-- .../dto/request/SprintBasicUpdateRequest.java | 1 - .../dto/request/SprintCreateRequest.java | 7 ++-- 6 files changed, 44 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 96913403..077194bf 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -23,9 +23,10 @@ public class SprintController { @Operation(summary = "스프린트 생성", description = "스프린트를 생성합니다.") @PostMapping("/create") - public ResponseEntity sprintCreate(@Valid @RequestBody SprintCreateRequest request) { - sprintService.createSprint(request); - return ResponseEntity.status(HttpStatus.CREATED).build(); + public ResponseEntity sprintCreate( + @Valid @RequestBody SprintCreateRequest request) { + SprintInfoResponse response = sprintService.createSprint(request); + return ResponseEntity.status(HttpStatus.CREATED).body(response); } @Operation(summary = "스프린트 기본 정보 수정", description = "스프린트의 기본 정보(제목, 목표)를 수정합니다.") diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index a68772ed..d59bcae2 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -23,6 +23,7 @@ import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,21 +39,26 @@ public class SprintService { private final TeamParticipantRepository teamParticipantRepository; private final ProjectParticipantRepository projectParticipantRepository; - public void createSprint(SprintCreateRequest request) { + public SprintInfoResponse createSprint(SprintCreateRequest request) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(request.projectId()); validateProjectParticipant(project, project.getTeam(), currentMember); - validateDate(request.startDt(), request.dueDt(), project.getToDoInfo()); - sprintRepository.save( - Sprint.createSprint( - project, - request.title(), - request.goal(), - request.startDt(), - request.dueDt())); + long count = sprintRepository.countByProject(project); + String autoTitle = String.valueOf(count + 1); + + Sprint sprint = + sprintRepository.save( + Sprint.createSprint( + project, + autoTitle, + request.goal(), + request.startDt(), + request.dueDt())); + + return SprintInfoResponse.from(sprint); } public SprintInfoResponse updateSprintBasicInfo( @@ -63,7 +69,7 @@ public SprintInfoResponse updateSprintBasicInfo( validateProjectParticipant( sprint.getProject(), sprint.getProject().getTeam(), currentMember); - sprint.updateSprintBasic(request.title(), request.goal()); + sprint.updateSprintBasic(request.goal()); return SprintInfoResponse.from(sprint); } @@ -93,6 +99,12 @@ public void deleteSprint(Long sprintId) { validateAdminProjectParticipant(projectParticipant); sprintRepository.deleteById(sprintId); + + List sprintList = + sprintRepository.findAllByProjectOrderByCreatedAt(sprint.getProject()); + for (int i = 0; i < sprintList.size(); i++) { + sprintList.get(i).updateSprintTitle(String.valueOf(i + 1)); + } } private Sprint findBySprintId(Long sprintId) { diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index 4357439a..04a7ee35 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -1,6 +1,16 @@ package com.amcamp.domain.sprint.dao; +import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.sprint.domain.Sprint; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; -public interface SprintRepository extends JpaRepository {} +public interface SprintRepository extends JpaRepository { + @Query("SELECT COUNT(s) FROM Sprint s WHERE s.project = :project") + long countByProject(@Param("project") Project project); + + @Query("SELECT s FROM Sprint s WHERE s.project = :project ORDER BY s.id ASC") + List findAllByProjectOrderByCreatedAt(@Param("project") Project project); +} diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index 6caed6a5..0c4fc65a 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -59,12 +59,15 @@ public static Sprint createSprint( .build(); } - public void updateSprintBasic(String title, String goal) { - if (title != null) this.title = title; + public void updateSprintBasic(String goal) { if (goal != null) this.goal = goal; } public void updateSprintToDo(LocalDate startDt, LocalDate dueDt, ToDoStatus status) { toDoInfo.updateToDoInfo(startDt, dueDt, status); } + + public void updateSprintTitle(String title) { + this.title = title; + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java index 584001d3..04813775 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java @@ -3,5 +3,4 @@ import io.swagger.v3.oas.annotations.media.Schema; public record SprintBasicUpdateRequest( - @Schema(description = "스프린트 제목", example = "2차 스프린트") String title, @Schema(description = "중간 목표", example = "MVP 개발") String goal) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java index 47ff2052..b3a76c36 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java @@ -9,9 +9,6 @@ public record SprintCreateRequest( @NotNull(message = "프로젝트 ID는 비워둘 수 없습니다.") @Schema(description = "프로젝트 ID", example = "1") Long projectId, - @NotBlank(message = "스프린트 제목은 비워둘 수 없습니다.") - @Schema(description = "스프린트 제목", example = "1차 스프린트") - String title, @NotBlank(message = "스프린트 중간 목표는 비워둘 수 없습니다.") @Schema(description = "중간 목표", example = "MVP 개발") String goal, @@ -30,7 +27,7 @@ public record SprintCreateRequest( @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt) { public static SprintCreateRequest of( - Long projectId, String title, String goal, LocalDate startDt, LocalDate dueDt) { - return new SprintCreateRequest(projectId, title, goal, startDt, dueDt); + Long projectId, String goal, LocalDate startDt, LocalDate dueDt) { + return new SprintCreateRequest(projectId, goal, startDt, dueDt); } } From 22bc5f49ad6497be6ca99773d46777dc1c9c6837 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Wed, 5 Mar 2025 18:15:51 +0900 Subject: [PATCH 041/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=20(#85)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: project 타이틀/목표/상세설명/일정 정보(시작/마감/상태) 업데이트 로직 구현 * refactor: 프로젝트 업데이트 API http method 수정 * refactor: 프로젝트 업데이트 로직 수정: Basic/TodoDate/TodoStatus update로 로직 재편 및 path variable 추가 * refactor: 프로젝트 업데이트 시 프로젝트 참여자 검증 로직 추가 * refactor: project save 메소드 제거 & dynamicUpdate 어노테이션 제거 * refactor: project not found 에러코드 교체 * refactor: project 참여 중인 프로젝트 리스트 패키징 -> isParticipate 로 구분하도록 로직 수정 * refactor: todo date/status 업데이트 로직 통합 * refactor: Project not found 에러코드 수정으로 인한 exception handler 테스트 오류 수정(400 -> 404) * refactor: Project Controller Validation추가 + 단일 조회 시 프로젝트 참여자 검증 로직 추가 * refactor: basic-info/todo-info 엔드포인트명 수정 & ProjectTodoInfoUpdateRequest @NotNull validation 해제 * refactor: Project Title 텍스트 정규화 추가 * refactor: Basic/Todo Nullable 어노테이션 제거 --- .../domain/project/api/ProjectController.java | 29 +- .../project/application/ProjectService.java | 68 +++-- .../amcamp/domain/project/domain/Project.java | 6 + .../domain/project/domain/ToDoInfo.java | 6 +- .../ProjectBasicInfoUpdateRequest.java | 8 + .../request/ProjectTodoInfoUpdateRequest.java | 10 + .../dto/response/ProjectListInfoResponse.java | 9 - .../ProjectParticipationInfoResponse.java | 7 + .../exception/errorcode/ProjectErrorCode.java | 4 +- .../domain/project/ProjectServiceTest.java | 276 ++++++++++++++---- .../exception/ExceptionHandlerTest.java | 2 +- 11 files changed, 331 insertions(+), 94 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java delete mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index 124e6f38..33e9d545 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -1,11 +1,13 @@ package com.amcamp.domain.project.api; import com.amcamp.domain.project.application.ProjectService; -import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipationInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -22,7 +24,7 @@ public class ProjectController { @Operation(summary = "프로젝트 생성", description = "새로운 프로젝트를 생성합니다.") @PostMapping("/create") public ResponseEntity projectCreate( - @RequestBody ProjectCreateRequest projectCreateRequest) { + @Valid @RequestBody ProjectCreateRequest projectCreateRequest) { projectService.createProject(projectCreateRequest); return ResponseEntity.status(HttpStatus.CREATED).build(); } @@ -31,7 +33,7 @@ public ResponseEntity projectCreate( summary = "전체 프로젝트 목록 조회", description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") @GetMapping("/{teamId}/list") - public ProjectListInfoResponse projectListInfo(@PathVariable Long teamId) { + public List projectListInfo(@PathVariable Long teamId) { return projectService.getProjectListInfo(teamId); } @@ -40,4 +42,23 @@ public ProjectListInfoResponse projectListInfo(@PathVariable Long teamId) { public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { return projectService.getProjectInfo(projectId); } + + // update + @Operation(summary = "프로젝트 기본 정보 업데이트", description = "프로젝트 타이틀/목표/상세설정을 수정합니다") + @PatchMapping("/{projectId}/basic-info") + public ResponseEntity projectBasicInfoUpdate( + @PathVariable Long projectId, + @Valid @RequestBody ProjectBasicInfoUpdateRequest request) { + projectService.updateProjectBasicInfo(projectId, request); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "프로젝트 시작/마감기한/진행상태 업데이트", description = "프로젝트 시작/마감기한/진행상태를 수정합니다") + @PatchMapping("/{projectId}/todo-info") + public ResponseEntity projectTodoInfoUpdate( + @PathVariable Long projectId, + @Valid @RequestBody ProjectTodoInfoUpdateRequest request) { + projectService.updateProjectTodoInfo(projectId, request); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 74a1c32e..a4310013 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -7,9 +7,9 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; -import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -19,7 +19,7 @@ import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; import java.util.List; -import java.util.Map; +import java.util.Optional; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -45,7 +45,7 @@ public void createProject(ProjectCreateRequest request) { projectRepository.save( Project.createProject( team, - request.projectTitle(), + normalizeProjectTitle(request.projectTitle()), request.projectDescription(), request.projectGoal(), request.startDt(), @@ -58,27 +58,47 @@ public void createProject(ProjectCreateRequest request) { @Transactional(readOnly = true) public ProjectInfoResponse getProjectInfo(Long projectId) { - return ProjectInfoResponse.from(getProjectById(projectId)); + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectParticipant(member, project); + return ProjectInfoResponse.from(project); } @Transactional(readOnly = true) - public ProjectListInfoResponse getProjectListInfo(Long teamId) { + public List getProjectListInfo(Long teamId) { List projectList = projectRepositoryCustom.findAllByTeamId(teamId); Member member = memberUtil.getCurrentMember(); Team team = getTeam(teamId); - TeamParticipant teamParticipant = getTeamParticipant(member, team); + return projectList.stream() + .map( + p -> + new ProjectParticipationInfoResponse( + ProjectInfoResponse.from(p), + isProjectParticipant(p, teamParticipant))) + .collect(Collectors.toList()); + } - Map> partitionedProjects = - projectList.stream() - .collect( - Collectors.partitioningBy( - project -> isTeamParticipant(project, teamParticipant), - Collectors.mapping( - ProjectInfoResponse::from, Collectors.toList()))); + // update + public void updateProjectBasicInfo(Long projectId, ProjectBasicInfoUpdateRequest request) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectParticipant(member, project); + project.updateBasic(request.title(), request.goal(), request.description()); + } - return new ProjectListInfoResponse( - partitionedProjects.get(true), partitionedProjects.get(false)); + public void updateProjectTodoInfo(Long projectId, ProjectTodoInfoUpdateRequest request) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectParticipant(member, project); + project.getToDoInfo() + .updateToDoInfo(request.startDt(), request.DueDt(), request.toDoStatus()); + } + + // project utils + + private String normalizeProjectTitle(String name) { + return name.trim().replaceAll("[^0-9a-zA-Z가-힣 ]", "_"); } private Project getProjectById(Long projectId) { @@ -100,9 +120,23 @@ private Team getTeam(Long teamId) { .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); } - private Boolean isTeamParticipant(Project project, TeamParticipant teamParticipant) { + private Boolean isProjectParticipant(Project project, TeamParticipant teamParticipant) { return projectParticipantRepository .findByProjectAndTeamParticipant(project, teamParticipant) .isPresent(); } + + private void validateProjectParticipant(Member member, Project project) { + Optional teamParticipant = + teamParticipantRepository.findByMemberAndTeam(member, project.getTeam()); + if (teamParticipant.isEmpty()) { + throw new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); + } else { + if (projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant.get()) + .isEmpty()) { + throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED); + } + } + } } diff --git a/src/main/java/com/amcamp/domain/project/domain/Project.java b/src/main/java/com/amcamp/domain/project/domain/Project.java index 49020506..84a6867d 100644 --- a/src/main/java/com/amcamp/domain/project/domain/Project.java +++ b/src/main/java/com/amcamp/domain/project/domain/Project.java @@ -66,4 +66,10 @@ public static Project createProject( .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) .build(); } + + public void updateBasic(String title, String goal, String description) { + this.title = (title != null) ? title : this.title; + this.goal = (goal != null) ? goal : this.goal; + this.description = (description != null) ? description : this.description; + } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java index 8a54156a..7b58c9d6 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java @@ -2,6 +2,7 @@ import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.GlobalErrorCode; +import jakarta.annotation.Nullable; import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -23,7 +24,10 @@ public class ToDoInfo { private ToDoStatus toDoStatus; // 진행 상태 @Builder(access = AccessLevel.PRIVATE) - private ToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus toDoStatus) { + private ToDoInfo( + @Nullable LocalDate startDt, + @Nullable LocalDate dueDt, + @Nullable ToDoStatus toDoStatus) { this.startDt = startDt; this.dueDt = dueDt; this.toDoStatus = toDoStatus; diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java new file mode 100644 index 00000000..3f812240 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.project.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record ProjectBasicInfoUpdateRequest( + @Schema(description = "수정된 텍스트", example = "new project title") String title, + @Schema(description = "수정된 텍스트", example = "new project goal") String goal, + @Schema(description = "수정된 텍스트", example = "new project description") String description) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java new file mode 100644 index 00000000..9b666872 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java @@ -0,0 +1,10 @@ +package com.amcamp.domain.project.dto.request; + +import com.amcamp.domain.project.domain.ToDoStatus; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; + +public record ProjectTodoInfoUpdateRequest( + @Schema(description = "수정된 프로젝트 시작일자", example = "2026-03-01") LocalDate startDt, + @Schema(description = "수정된 프로젝트 마감일자", example = "2026-04-01") LocalDate DueDt, + @Schema(description = "수정된 프로젝트 진행상태", example = "COMPLETED") ToDoStatus toDoStatus) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java deleted file mode 100644 index c206d636..00000000 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.amcamp.domain.project.dto.response; - -import io.swagger.v3.oas.annotations.media.Schema; -import java.util.List; - -public record ProjectListInfoResponse( - @Schema(description = "사용자가 참여중인 프로젝트 목록") List participatingProjects, - @Schema(description = "사용자가 참여하지 않은 프로젝트 목록") - List nonParticipatingProjects) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java new file mode 100644 index 00000000..f450bf90 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.project.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record ProjectParticipationInfoResponse( + @Schema(description = "사용자가 참여중인 프로젝트 목록") ProjectInfoResponse projectInfo, + @Schema(description = "참여 여부", example = "false") boolean isParticipate) {} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index c3822147..926c63fd 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -7,9 +7,9 @@ @Getter @AllArgsConstructor public enum ProjectErrorCode implements BaseErrorCode { - PROJECT_NOT_FOUND(HttpStatus.BAD_REQUEST, "project 를 찾을 수 없습니다."), + PROJECT_NOT_FOUND(HttpStatus.NOT_FOUND, "project 를 찾을 수 없습니다."), - PROJECT_PARTICIPATION_REQUIRED(HttpStatus.FORBIDDEN, "해당 프로젝트 참여자만 스프린트를 생성할 수 있습니다."), + PROJECT_PARTICIPATION_REQUIRED(HttpStatus.FORBIDDEN, "해당 프로젝트 참여자가 아닙니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 9bcc17c1..31c14f37 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -10,17 +10,24 @@ import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.project.dto.request.ProjectBasicInfoUpdateRequest; import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipationInfoResponse; import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; +import java.util.List; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -113,66 +120,52 @@ public void afterEach() { @Nested class 프로젝트_조회 { - // @Test - // void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { - // // given - // TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); - // String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); - // TeamInviteCodeRequest teamInviteCodeRequest = new - // TeamInviteCodeRequest(inviteCode); - // Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - // - // ProjectCreateRequest request1 = - // new ProjectCreateRequest( - // teamId, - // "project1", - // "projectDescription", - // "projectGoal", - // startDt, - // dueDt); - // ProjectCreateRequest request2 = - // new ProjectCreateRequest( - // teamId, - // "project2", - // "projectDescription", - // "projectGoal", - // startDt, - // dueDt); - // - // ProjectCreateRequest request3 = - // new ProjectCreateRequest( - // teamId, - // "project3", - // "projectDescription", - // "projectGoal", - // startDt, - // dueDt); - // - // ProjectCreateRequest request4 = - // new ProjectCreateRequest( - // teamId, - // "project4", - // "projectDescription", - // "projectGoal", - // startDt, - // dueDt); - // - // projectService.createProject(request1); - // projectService.createProject(request2); - // // member logout 후 anotherMember 로그인 - // logout(); - // loginAs(anotherMember); - // // 팀 참가 - // teamService.joinTeam(teamInviteCodeRequest); - // // anotherMember 새 프로젝트 생성 - // projectService.createProject(request1); - // projectService.createProject(request2); - // - // // when - // ProjectListInfoResponse foundResponse = - // projectService.getProjectListInfo(teamId); - - // } + @Test + void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { + // given + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + + ProjectCreateRequest request1 = + new ProjectCreateRequest( + teamId, + "project1", + "projectGoal", + startDt, + dueDt, + "projectDescription"); + ProjectCreateRequest request2 = + new ProjectCreateRequest( + teamId, + "project1", + "projectGoal", + startDt, + dueDt, + "projectDescription"); + + projectService.createProject(request1); + // member logout 후 anotherMember 로그인 + logout(); + loginAs(anotherMember); + // 팀 참가 + teamService.joinTeam(teamInviteCodeRequest); + // anotherMember 새 프로젝트 생성 + projectService.createProject(request2); + + // when + + List foundResponse = + projectService.getProjectListInfo(teamId); + + foundResponse.stream() + .filter(ProjectParticipationInfoResponse::isParticipate) + .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project1")); + foundResponse.stream() + .filter(f -> !f.isParticipate()) + .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project1")); + } @Test void 프로젝트를_ID로_조회하면_정상적으로_반환된다() { @@ -224,4 +217,167 @@ class 프로젝트_조회 { .hasMessageContaining(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } } + + @Nested + class 프로젝트_업데이트 { + String originalTitle = "originalProjectTitle"; + String originalGoal = "originalProjectTitle"; + String originalDescription = "originalProjectGoal"; + String updatedTitle = "updatedProjectTitle"; + String updatedGoal = "updatedProjectGoal"; + String updatedDescription = "updatedProjectDescription"; + TeamInviteCodeRequest teamInviteCodeRequest; + + void createTestProject() { + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + + ProjectCreateRequest request = + new ProjectCreateRequest( + teamId, + originalTitle, + originalGoal, + startDt, + dueDt, + originalDescription); + + projectService.createProject(request); + } + + @Test + void 프로젝트_기본정보를_수정하면_정상적으로_수정된다() { + // given + createTestProject(); + // when + projectService.updateProjectBasicInfo( + 1L, + new ProjectBasicInfoUpdateRequest( + updatedTitle, updatedGoal, updatedDescription)); + Project updatedProject = projectRepository.findById(1L).get(); + // then + assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); + assertThat(updatedProject.getGoal()).isEqualTo(updatedGoal); + assertThat(updatedProject.getDescription()).isEqualTo(updatedDescription); + } + + @Test + void 팀_참여자가_아닌_사용자는_프로젝트_수정이_제한된다() { + // given + createTestProject(); + logout(); + // 팀에 속하지 않은 사용자 로그인 + loginAs(anotherMember); + + // when, then + assertThatThrownBy( + () -> + projectService.updateProjectBasicInfo( + 1L, + new ProjectBasicInfoUpdateRequest( + updatedTitle, updatedGoal, updatedDescription))) + .isInstanceOf(CommonException.class) + .hasMessageContaining(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); + } + + @Test + void 프로젝트_참여자가_아닌_팀_참가자는_수정이_제한된다() { + // given + createTestProject(); + logout(); + // 다른 팀 멤버 + loginAs(anotherMember); + teamService.joinTeam(teamInviteCodeRequest); + + // when, then + assertThatThrownBy( + () -> + projectService.updateProjectBasicInfo( + 1L, + new ProjectBasicInfoUpdateRequest( + updatedTitle, updatedGoal, updatedDescription))) + .isInstanceOf(CommonException.class) + .hasMessageContaining( + ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + } + + @Test + void 프로젝트_기본정보를_타이틀만_수정하면_타이틀만_수정된다() { + // given + createTestProject(); + // when + projectService.updateProjectBasicInfo( + 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, null, null)); + Project updatedProject = projectRepository.findById(1L).get(); + // then + assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); + assertThat(updatedProject.getGoal()).isEqualTo(originalGoal); + assertThat(updatedProject.getDescription()).isEqualTo(originalDescription); + } + + @Test + void 프로젝트_기본정보를_목표만_수정하면_목표만_수정된다() { + // given + createTestProject(); + // when + projectService.updateProjectBasicInfo( + 1L, new ProjectBasicInfoUpdateRequest(null, updatedGoal, null)); + Project updatedProject = projectRepository.findById(1L).get(); + // then + assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); + assertThat(updatedProject.getGoal()).isEqualTo(updatedGoal); + assertThat(updatedProject.getDescription()).isEqualTo(originalDescription); + } + + @Test + void 프로젝트_기본정보를_상세설명만_수정하면_상세설명만_수정된다() { + // given + createTestProject(); + // when + projectService.updateProjectBasicInfo( + 1L, new ProjectBasicInfoUpdateRequest(null, null, updatedDescription)); + Project updatedProject = projectRepository.findById(1L).get(); + // then + assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); + assertThat(updatedProject.getGoal()).isEqualTo(originalGoal); + assertThat(updatedProject.getDescription()).isEqualTo(updatedDescription); + } + + @Test + void 프로젝트_일정정보를_수정하면_정상적으로_수정된다() { + // given + createTestProject(); + // when + LocalDate updatedStartDt = LocalDate.of(2026, 1, 15); + LocalDate updatedDueDt = LocalDate.of(2027, 12, 1); + projectService.updateProjectTodoInfo( + 1L, + new ProjectTodoInfoUpdateRequest( + updatedStartDt, updatedDueDt, ToDoStatus.COMPLETED)); + Project updatedProject = projectRepository.findById(1L).get(); + // then + assertThat(updatedProject.getToDoInfo().getStartDt()).isEqualTo(updatedStartDt); + assertThat(updatedProject.getToDoInfo().getDueDt()).isEqualTo(updatedDueDt); + assertThat(updatedProject.getToDoInfo().getToDoStatus()) + .isEqualTo(ToDoStatus.COMPLETED); + } + + @Test + void 잘못된_날짜를_입력하면_오류가_발생한다() { + // given + createTestProject(); + // when + LocalDate updatedStartDt = LocalDate.of(2027, 1, 1); + LocalDate updatedDueDt = LocalDate.of(2026, 1, 1); + ProjectTodoInfoUpdateRequest request = + new ProjectTodoInfoUpdateRequest( + updatedStartDt, updatedDueDt, ToDoStatus.COMPLETED); + + // then + assertThatThrownBy(() -> projectService.updateProjectTodoInfo(1L, request)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); + } + } } diff --git a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java index f8edd8ca..fa392d46 100644 --- a/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java +++ b/src/test/java/com/amcamp/global/exception/ExceptionHandlerTest.java @@ -59,7 +59,7 @@ void globalExceptionHandlerTest() { // then: 응답 객체 검증 assertThat(response).isNotNull(); - assertThat(response.getStatus()).isEqualTo(400); + assertThat(response.getStatus()).isEqualTo(404); // ErrorResponse 객체 검증 ErrorResponse errorResponse = (ErrorResponse) response.getData(); From 7ba6e2514fe7a2780ae63d96df1dae6729691245 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Thu, 6 Mar 2025 09:04:20 +0900 Subject: [PATCH 042/107] =?UTF-8?q?feat:=20Task=20=EC=83=9D=EC=84=B1,=20?= =?UTF-8?q?=EC=88=98=EC=A0=95,=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84=20(#96)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 태스크 생성, 수정, 삭제 기능 구현 * test: 태스크 생성, 수정, 삭제 기능 테스트 * fix: 프로젝트 생성 테스트시 예시 변경 * fix: valid 어노테이션 및 request dto 수정 * refactor: 에러코드 메시지 수정 * refactor: swagger api 순서 기재, 에러코드 수정 * fix: 요청 dto 내 not null, not blank 삭제 * refactor: swagger tag 수정 * refactor: 태스크 에러코드 메시지 수정 * fix: 태스크 assign status 서비스 관련 수정 * feat: 태스크 완료 기능 구현 * test: 태스크 완료 & 할당 기능 테스트 * fix: taskInfoResponse 내용 수정 * fix: TaskServiceTest 내 스프린트 생성 수정 * refactor: 태스크 응답 dto 메소드 오버로딩 * fix: 프로젝트 참여자 검증 로직 추가 * feat: 태스크 중복 할당 예외처리 * refactor: 미사용 메소드 삭제 --- .../dto/request/ProjectCreateRequest.java | 4 +- .../domain/task/api/TaskController.java | 53 +++++ .../domain/task/application/TaskService.java | 153 ++++++++++++++ .../domain/task/dao/TaskRepository.java | 6 + .../com/amcamp/domain/task/domain/Task.java | 35 +++- .../request/TaskBasicInfoUpdateRequest.java | 8 + .../task/dto/request/TaskCreateRequest.java | 15 ++ .../task/dto/response/TaskInfoResponse.java | 51 +++++ .../exception/errorcode/TaskErrorCode.java | 21 ++ .../amcamp/domain/task/TaskServiceTest.java | 193 ++++++++++++++++++ 10 files changed, 528 insertions(+), 11 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/task/api/TaskController.java create mode 100644 src/main/java/com/amcamp/domain/task/application/TaskService.java create mode 100644 src/main/java/com/amcamp/domain/task/dao/TaskRepository.java create mode 100644 src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java create mode 100644 src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java create mode 100644 src/test/java/com/amcamp/domain/task/TaskServiceTest.java diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java index 1a077046..b812bd2c 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java @@ -11,11 +11,11 @@ public record ProjectCreateRequest( @Schema(description = "프로젝트 제목", example = "Devfit") @NotBlank String projectTitle, @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발") @NotBlank String projectGoal, - @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01") + @Schema(description = "프로젝트 시작 날짜", example = "2026-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull LocalDate startDt, - @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01") + @Schema(description = "프로젝트 마감 날짜", example = "2027-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull LocalDate dueDt, diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java new file mode 100644 index 00000000..fc509126 --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -0,0 +1,53 @@ +package com.amcamp.domain.task.api; + +import com.amcamp.domain.task.application.TaskService; +import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; +import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.task.dto.response.TaskInfoResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "6. 태스크 API", description = "태스크 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/tasks") +public class TaskController { + private final TaskService taskService; + + @Operation(summary = "태스크 생성", description = "태스크를 생성합니다.") + @PostMapping("/create") + public TaskInfoResponse taskCreate(@Valid @RequestBody TaskCreateRequest request) { + return taskService.createTask(request); + } + + @Operation(summary = "태스크 기본 정보 수정", description = "태스크 기본 정보를 수정합니다.") + @PatchMapping("/{taskId}/basic-info") + public TaskInfoResponse taskUpdateBasic( + @PathVariable Long taskId, @Valid @RequestBody TaskBasicInfoUpdateRequest request) { + return taskService.updateTaskBasicInfo(taskId, request); + } + + @Operation(summary = "태스크 완료", description = "태스크 완료에 따른 일정 및 진행 상태를 수정합니다.") + @PatchMapping("/{taskId}") + public TaskInfoResponse taskUpdateToDo(@PathVariable Long taskId) { + return taskService.updateTaskToDoInfo(taskId); + } + + @Operation(summary = "태스크 담당자 할당", description = "태스크 담당 상태를 수정합니다.") + @PostMapping("/{taskId}") + public TaskInfoResponse taskAssign(@PathVariable Long taskId) { + return taskService.assignTask(taskId); + } + + @Operation(summary = "태스크 삭제", description = "태스크를 삭제합니다.") + @DeleteMapping("/{taskId}") + public ResponseEntity taskDelete(@PathVariable Long taskId) { + taskService.deleteTask(taskId); + return ResponseEntity.status(HttpStatus.OK).build(); + } +} diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java new file mode 100644 index 00000000..189446ca --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -0,0 +1,153 @@ +package com.amcamp.domain.task.application; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.task.dao.TaskRepository; +import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.Task; +import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; +import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.task.dto.response.TaskInfoResponse; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.*; +import com.amcamp.global.util.MemberUtil; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +@RequiredArgsConstructor +public class TaskService { + private final MemberUtil memberUtil; + private final TaskRepository taskRepository; + private final SprintRepository sprintRepository; + private final ProjectParticipantRepository projectParticipantRepository; + private final TeamParticipantRepository teamParticipantRepository; + + public TaskInfoResponse createTask(TaskCreateRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(request.sprintId()); + final Project project = sprint.getProject(); + validateProjectParticipant(project, project.getTeam(), currentMember); + Task task = + taskRepository.save( + Task.createTask(sprint, request.description(), request.taskDifficulty())); + + return findProjectParticipantMember(task) != null + ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) + : TaskInfoResponse.from(task); + } + + public TaskInfoResponse updateTaskBasicInfo(Long taskId, TaskBasicInfoUpdateRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + final Task task = findByTaskId(taskId); + final Sprint sprint = findBySprintId(task.getSprint().getId()); + final Project project = sprint.getProject(); + + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskModify(currentMember, task); + task.updateTaskBasicInfo(request); + + return findProjectParticipantMember(task) != null + ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) + : TaskInfoResponse.from(task); + } + + public TaskInfoResponse updateTaskToDoInfo(Long taskId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Task task = findByTaskId(taskId); + final Sprint sprint = findBySprintId(task.getSprint().getId()); + final Project project = sprint.getProject(); + + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskModify(currentMember, task); + task.updateTaskTodoInfo(); + + return findProjectParticipantMember(task) != null + ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) + : TaskInfoResponse.from(task); + } + + public TaskInfoResponse assignTask(Long taskId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Task task = findByTaskId(taskId); + final Sprint sprint = findBySprintId(task.getSprint().getId()); + final Project project = sprint.getProject(); + + ProjectParticipant projectParticipant = + validateProjectParticipant(project, project.getTeam(), currentMember); + // validateTaskModify(currentMember, task); + + if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED && task.getAssignee() != null) { + throw new CommonException(TaskErrorCode.TASK_ALREADY_ASSIGNED); + } + + task.assignTask(projectParticipant); + return findProjectParticipantMember(task) != null + ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) + : TaskInfoResponse.from(task); + } + + public void deleteTask(Long taskId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Task task = findByTaskId(taskId); + final Sprint sprint = findBySprintId(task.getSprint().getId()); + final Project project = sprint.getProject(); + + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskModify(currentMember, task); + taskRepository.delete(task); + } + + private void validateTaskModify(Member member, Task task) { + if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED || task.getAssignee() != null) { + if (!task.getAssignee().getProjectRole().equals(ProjectParticipantRole.ADMIN) + || !member.equals(task.getAssignee().getTeamParticipant().getMember())) { + throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); + } + } + } + + private ProjectParticipant validateProjectParticipant( + Project project, Team team, Member currentMember) { + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(currentMember, team) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } + + private Sprint findBySprintId(Long sprintId) { + return sprintRepository + .findById(sprintId) + .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + } + + private Task findByTaskId(Long taskId) { + return taskRepository + .findById(taskId) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + } + + private Member findProjectParticipantMember(Task task) { + Member member = null; + if (task.getAssignee() != null && task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED) { + member = task.getAssignee().getTeamParticipant().getMember(); + } + return member; + } +} diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java new file mode 100644 index 00000000..0cae7e6a --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java @@ -0,0 +1,6 @@ +package com.amcamp.domain.task.dao; + +import com.amcamp.domain.task.domain.Task; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface TaskRepository extends JpaRepository {} diff --git a/src/main/java/com/amcamp/domain/task/domain/Task.java b/src/main/java/com/amcamp/domain/task/domain/Task.java index 31e7d977..7be4664b 100644 --- a/src/main/java/com/amcamp/domain/task/domain/Task.java +++ b/src/main/java/com/amcamp/domain/task/domain/Task.java @@ -3,7 +3,9 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ToDoInfo; +import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import jakarta.persistence.*; import java.time.LocalDate; import lombok.AccessLevel; @@ -56,19 +58,34 @@ private Task( } public static Task createTask( - Sprint sprint, - String description, - LocalDate startDt, - LocalDate dueDt, - TaskDifficulty taskDifficulty, - ProjectParticipant assignee) { + Sprint sprint, String description, TaskDifficulty taskDifficulty) { return Task.builder() .sprint(sprint) .description(description) - .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) .taskDifficulty(taskDifficulty) - .assignedStatus(AssignedStatus.ASSIGNED) - .assignee(assignee) + .assignedStatus(AssignedStatus.NOT_ASSIGNED) + .toDoInfo(ToDoInfo.createToDoInfo(null, null)) + .assignee(null) .build(); } + + public void updateTaskBasicInfo(TaskBasicInfoUpdateRequest request) { + if (request.description() != null) { + this.description = request.description(); + } + if (request.taskDifficulty() != null) { + this.taskDifficulty = request.taskDifficulty(); + } + } + + public void updateTaskTodoInfo() { + this.toDoInfo.updateToDoInfo( + this.toDoInfo.getStartDt(), LocalDate.now(), ToDoStatus.COMPLETED); + } + + public void assignTask(ProjectParticipant projectParticipant) { + this.assignedStatus = AssignedStatus.ASSIGNED; + this.assignee = projectParticipant; + this.toDoInfo.updateToDoInfo(LocalDate.now(), null, ToDoStatus.ON_GOING); + } } diff --git a/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java new file mode 100644 index 00000000..267f8d3c --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.task.dto.request; + +import com.amcamp.domain.task.domain.TaskDifficulty; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TaskBasicInfoUpdateRequest( + @Schema(description = "태스크 내용", example = "피그마 화면 설계 1차 수정") String description, + @Schema(description = "태스크 난이도", example = "HIGH") TaskDifficulty taskDifficulty) {} diff --git a/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java b/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java new file mode 100644 index 00000000..877d7d3a --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.task.dto.request; + +import com.amcamp.domain.task.domain.TaskDifficulty; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; + +public record TaskCreateRequest( + @NotNull(message = "스프린트 ID는 필수값입니다.") @Schema(description = "스프린트 ID", example = "1") + Long sprintId, + @NotBlank(message = "태스크 내용은 필수값입니다.") + @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") + String description, + @NotNull(message = "태스크 난이도는 필수값입니다.") @Schema(description = "태스크 난이도", example = "MID") + TaskDifficulty taskDifficulty) {} diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java new file mode 100644 index 00000000..91227a2d --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java @@ -0,0 +1,51 @@ +package com.amcamp.domain.task.dto.response; + +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.Task; +import com.amcamp.domain.task.domain.TaskDifficulty; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; + +public record TaskInfoResponse( + @Schema(description = "태스크 아이디", example = "1") Long taskId, + @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") String description, + @Schema(description = "태스크 난이도", example = "MID") TaskDifficulty taskDifficulty, + @Schema(description = "태스크 시작일자", example = "2024-01-01") LocalDate startDt, + @Schema(description = "태스크 마감일자", example = "2024-01-02") LocalDate dueDt, + @Schema(description = "태스크 진행현황", example = "1") ToDoStatus toDoStatus, + @Schema(description = "태스크 담당 상태", example = "ASSIGNED") AssignedStatus assignedStatus, + @Schema(description = "태스크 담당자 아이디", example = "1") Long memberId, + @Schema(description = "태스크 담당자 닉네임", example = "최현태") String nickname, + @Schema(description = "태스크 담당자 프로필 url", example = "Presigned URL") + String profileImageUrl) { + + public static TaskInfoResponse from(Task task, Member member) { + return new TaskInfoResponse( + task.getId(), + task.getDescription(), + task.getTaskDifficulty(), + task.getToDoInfo().getStartDt(), + task.getToDoInfo().getDueDt(), + task.getToDoInfo().getToDoStatus(), + task.getAssignedStatus(), + member.getId(), + member.getNickname(), + member.getProfileImageUrl()); + } + + public static TaskInfoResponse from(Task task) { + return new TaskInfoResponse( + task.getId(), + task.getDescription(), + task.getTaskDifficulty(), + task.getToDoInfo().getStartDt(), + task.getToDoInfo().getDueDt(), + task.getToDoInfo().getToDoStatus(), + task.getAssignedStatus(), + null, + null, + null); + } +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java new file mode 100644 index 00000000..b0d42b32 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java @@ -0,0 +1,21 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum TaskErrorCode implements BaseErrorCode { + TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "task를 찾을 수 없습니다."), + TASK_MODIFY_FORBIDDEN(HttpStatus.FORBIDDEN, "task 수정·삭제 권한이 없습니다. "), + TASK_ALREADY_ASSIGNED(HttpStatus.FORBIDDEN, "이미 담당자가 존재하는 task입니다."); + + private final HttpStatus httpStatus; + private final String message; + + @Override + public String errorClassName() { + return this.name(); + } +} diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java new file mode 100644 index 00000000..95506230 --- /dev/null +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -0,0 +1,193 @@ +package com.amcamp.domain.task; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import com.amcamp.IntegrationTest; +import com.amcamp.domain.member.application.MemberService; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.project.application.ProjectService; +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.sprint.application.SprintService; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.task.application.TaskService; +import com.amcamp.domain.task.dao.TaskRepository; +import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.Task; +import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; +import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.task.dto.response.TaskInfoResponse; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.TaskErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.MemberUtil; +import java.time.LocalDate; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; + +public class TaskServiceTest extends IntegrationTest { + @Autowired private MemberService memberService; + @Autowired private TeamService teamService; + @Autowired private MemberRepository memberRepository; + @Autowired private MemberUtil memberUtil; + @Autowired private ProjectService projectService; + @Autowired private SprintService sprintService; + @Autowired private TaskService taskService; + @Autowired private TaskRepository taskRepository; + + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + @BeforeEach + void setUp() { + Member member = + memberRepository.save( + Member.createMember( + "testNickname", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + + ProjectCreateRequest projectRequest = + new ProjectCreateRequest( + teamId, + "testProjectTitle", + "testProjectGoal", + LocalDate.of(2026, 1, 1), + LocalDate.of(2026, 12, 1), + "testProjectDescription"); + + projectService.createProject(projectRequest); + + SprintCreateRequest sprintRequest = + new SprintCreateRequest( + 1L, "1차 스프린트", LocalDate.of(2026, 2, 1), LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); + } + + @Test + void 태스크를_생성한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + + // when + taskService.createTask(taskRequest); + + // then + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + assertThat(task.getSprint().getId()).isEqualTo(taskRequest.sprintId()); + assertThat(task.getDescription()).isEqualTo(taskRequest.description()); + assertThat(task.getTaskDifficulty()).isEqualTo(taskRequest.taskDifficulty()); + } + + @Nested + class 태스크_수정_시 { + // @Test + // void 수정_권한이_없으면_예외처리() { + // // assignee가 존재할때, 프로젝트 팀장이 아니면 예외처리 + // Member member = memberUtil.getCurrentMember(); + // TaskCreateRequest taskRequest = + // new TaskCreateRequest( + // 1L, + // "피그마 화면 설계 수정", + // TaskDifficulty.MID, + // LocalDate.of(2026, 2, 1), + // LocalDate.of(2026, 3, 1)); + // taskService.createTask(taskRequest); + // + // Member newMember = memberRepository.save(Member.createMember("member", null, + // null)); + // loginAs(newMember); + // + // TeamInviteCodeResponse teamInviteCodeResponse = teamService.getInviteCode(1L); + // teamService.joinTeam(new + // TeamInviteCodeRequest(teamInviteCodeResponse.inviteCode())); + // + // // 프로젝트 참여 관련 코드 필요 + // + // } + + @Test + void 정상적으로_기본_기한정보를_수정_한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + // when - update basic info & assigned + TaskBasicInfoUpdateRequest taskBasicInfoUpdateRequest = + new TaskBasicInfoUpdateRequest("피그마 화면 설계 재수정", TaskDifficulty.HIGH); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + TaskInfoResponse response = + taskService.updateTaskBasicInfo(1L, taskBasicInfoUpdateRequest); + response = taskService.assignTask(1L); + + // then + assertThat(task.getSprint().getId()).isEqualTo(taskRequest.sprintId()); + assertThat(response.description()).isEqualTo(taskBasicInfoUpdateRequest.description()); + assertThat(response.taskDifficulty()) + .isEqualTo(taskBasicInfoUpdateRequest.taskDifficulty()); + assertThat(response.toDoStatus()).isEqualTo(ToDoStatus.ON_GOING); + assertThat(response.assignedStatus()).isEqualTo(AssignedStatus.ASSIGNED); + assertThat(response.nickname()).isEqualTo(member.getNickname()); + + // when & then - finished + response = taskService.updateTaskToDoInfo(1L); + assertThat(response.toDoStatus()).isEqualTo(ToDoStatus.COMPLETED); + + // when - delete + taskService.deleteTask(1L); + + // then + assertThatThrownBy( + () -> + taskRepository + .findById(1L) + .orElseThrow( + () -> + new CommonException( + TaskErrorCode.TASK_NOT_FOUND))) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); + } + } +} From 56e612e41ea164704e4302f1a32e62592db2ccf9 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Thu, 6 Mar 2025 20:32:19 +0900 Subject: [PATCH 043/107] =?UTF-8?q?test:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#100)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * test: 스프린트 생성 테스트 작성 * test: 스프린트 수정 테스트 작성 * test: 스프린트 삭제 테스트 작성 --- .../sprint/application/SprintServiceTest.java | 177 ++++++++++++++++++ 1 file changed, 177 insertions(+) create mode 100644 src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java new file mode 100644 index 00000000..b4cc0f77 --- /dev/null +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -0,0 +1,177 @@ +package com.amcamp.domain.sprint.application; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +import com.amcamp.IntegrationTest; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.GlobalErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import java.time.LocalDate; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; + +public class SprintServiceTest extends IntegrationTest { + + private final LocalDate startDt = LocalDate.of(2026, 1, 2); + private final LocalDate dueDt = LocalDate.of(2026, 3, 1); + + @Autowired private SprintService sprintService; + @Autowired private SprintRepository sprintRepository; + @Autowired private MemberRepository memberRepository; + @Autowired private TeamRepository teamRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; + @Autowired private ProjectRepository projectRepository; + @Autowired private ProjectParticipantRepository projectParticipantRepository; + + private Project project; + + @BeforeEach + void setUp() { + Member member = + memberRepository.save( + Member.createMember( + "testNickname", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + + Team team = Team.createTeam("testName", "testDescription"); + teamRepository.save(team); + TeamParticipant teamParticipant = + TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN); + teamParticipantRepository.save(teamParticipant); + + project = + Project.createProject( + team, "testTitle", "testDescription", "testGoal", startDt, dueDt); + projectRepository.save(project); + ProjectParticipant projectParticipant = + ProjectParticipant.createProjectParticipant( + teamParticipant, project, ProjectParticipantRole.ADMIN); + projectParticipantRepository.save(projectParticipant); + } + + @Nested + class 스프린트_생성할_때 { + @Test + void 프로젝트_기간_내라면_스프린트를_생성한다() { + // given + SprintCreateRequest request = + new SprintCreateRequest(project.getId(), "testGoal", startDt, dueDt); + + // when + SprintInfoResponse response = sprintService.createSprint(request); + + // then + assertThat(response.goal()).isEqualTo("testGoal"); + assertThat(response.startDt()).isEqualTo(LocalDate.of(2026, 1, 2)); + assertThat(response.dueDt()).isEqualTo(LocalDate.of(2026, 3, 1)); + } + + @Test + void 프로젝트_기간_외라면_예외가_발생한다() { + // given + SprintCreateRequest request = + new SprintCreateRequest( + project.getId(), + "testGoal", + LocalDate.of(2026, 1, 1), + LocalDate.of(2026, 3, 2)); + + // when & then + assertThatThrownBy(() -> sprintService.createSprint(request)) + .isInstanceOf(CommonException.class) + .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); + } + } + + @Nested + class 스프린트_수정할_때 { + @Test + void 스프린트가_존재하지_않으면_예외가_발생한다() { + // given + SprintBasicUpdateRequest request = new SprintBasicUpdateRequest("testGoal"); + + // when & then + assertThatThrownBy(() -> sprintService.updateSprintBasicInfo(2L, request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 스프린트_시작_날짜가_프로젝트_기간_내라면_성공한다() { + // given + sprintRepository.save( + Sprint.createSprint(project, "testTitle", "testDescription", startDt, dueDt)); + SprintToDoUpdateRequest request = + new SprintToDoUpdateRequest( + LocalDate.of(2026, 2, 14), LocalDate.of(2026, 2, 28), null); + + // when + SprintInfoResponse response = sprintService.updateSprintToDoInfo(1L, request); + + // then + assertThat(response.startDt()).isEqualTo(LocalDate.of(2026, 2, 14)); + assertThat(response.dueDt()).isEqualTo(LocalDate.of(2026, 2, 28)); + assertThat(response.status()).isEqualTo(ToDoStatus.NOT_STARTED); + assertThat(response.title()).isEqualTo("testTitle"); + } + } + + @Nested + class 스프린트_삭제할_때 { + @Test + void 스프린트가_존재하지_않으면_예외가_발생한다() { + // when & then + assertThatThrownBy(() -> sprintService.deleteSprint(2L)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 프로젝트_리더가_삭제할_경우_성공한다() { + // given + sprintRepository.save( + Sprint.createSprint(project, "testTitle", "testDescription", startDt, dueDt)); + + // when + sprintService.deleteSprint(1L); + + // then + assertThat(sprintRepository.findAll()).isEmpty(); + assertThat(sprintRepository.count()).isEqualTo(0); + } + } +} From 515845d05a49bff4c71f6a82f773ed77772de984 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Fri, 7 Mar 2025 09:00:19 +0900 Subject: [PATCH 044/107] =?UTF-8?q?feat:=20sos=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20&=20=EA=B4=80=EB=A0=A8=20=ED=83=9C?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=20=EB=A9=94=EC=86=8C=EB=93=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=20(#104)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: sos 상태 변환 메소드 구현 * feat: sos에서 task 할당 관련 권한 처리 * test: sos 관련 task 서비스 테스트 * fix: sos처리 된 task 할당 시 sos 상태 변경 수정 --- .../domain/task/api/TaskController.java | 6 ++ .../domain/task/application/TaskService.java | 28 +++++++- .../amcamp/domain/task/domain/SOSStatus.java | 13 ++++ .../com/amcamp/domain/task/domain/Task.java | 17 ++++- .../task/dto/response/TaskInfoResponse.java | 4 ++ .../exception/errorcode/TaskErrorCode.java | 3 +- .../amcamp/domain/task/TaskServiceTest.java | 65 +++++++++++++++++++ 7 files changed, 132 insertions(+), 4 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/task/domain/SOSStatus.java diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index fc509126..5b991a4e 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -38,6 +38,12 @@ public TaskInfoResponse taskUpdateToDo(@PathVariable Long taskId) { return taskService.updateTaskToDoInfo(taskId); } + @Operation(summary = "태스크 SOS", description = "태스크 sos 상태를 수정합니다.") + @PatchMapping("/{taskId}/sos") + public TaskInfoResponse taskUpdateSOS(@PathVariable Long taskId) { + return taskService.updateTaskSOS(taskId); + } + @Operation(summary = "태스크 담당자 할당", description = "태스크 담당 상태를 수정합니다.") @PostMapping("/{taskId}") public TaskInfoResponse taskAssign(@PathVariable Long taskId) { diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index 189446ca..1f4bd2ea 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -9,6 +9,7 @@ import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.SOSStatus; import com.amcamp.domain.task.domain.Task; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import com.amcamp.domain.task.dto.request.TaskCreateRequest; @@ -77,6 +78,22 @@ public TaskInfoResponse updateTaskToDoInfo(Long taskId) { : TaskInfoResponse.from(task); } + public TaskInfoResponse updateTaskSOS(Long taskId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Task task = findByTaskId(taskId); + final Sprint sprint = findBySprintId(task.getSprint().getId()); + final Project project = sprint.getProject(); + + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskNotAssignedForSos(task); + // validateTaskModify(currentMember, task); + task.updateTaskSOS(); + + return findProjectParticipantMember(task) != null + ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) + : TaskInfoResponse.from(task); + } + public TaskInfoResponse assignTask(Long taskId) { final Member currentMember = memberUtil.getCurrentMember(); final Task task = findByTaskId(taskId); @@ -85,9 +102,10 @@ public TaskInfoResponse assignTask(Long taskId) { ProjectParticipant projectParticipant = validateProjectParticipant(project, project.getTeam(), currentMember); - // validateTaskModify(currentMember, task); - if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED && task.getAssignee() != null) { + if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED + && task.getAssignee() != null + && task.getSosStatus() != SOSStatus.SOS) { throw new CommonException(TaskErrorCode.TASK_ALREADY_ASSIGNED); } @@ -108,6 +126,12 @@ public void deleteTask(Long taskId) { taskRepository.delete(task); } + private void validateTaskNotAssignedForSos(Task task) { + if (task.getAssignedStatus() == AssignedStatus.NOT_ASSIGNED) { + throw new CommonException(TaskErrorCode.TASK_NOT_ASSIGNED); + } + } + private void validateTaskModify(Member member, Task task) { if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED || task.getAssignee() != null) { if (!task.getAssignee().getProjectRole().equals(ProjectParticipantRole.ADMIN) diff --git a/src/main/java/com/amcamp/domain/task/domain/SOSStatus.java b/src/main/java/com/amcamp/domain/task/domain/SOSStatus.java new file mode 100644 index 00000000..ac51114d --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/domain/SOSStatus.java @@ -0,0 +1,13 @@ +package com.amcamp.domain.task.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum SOSStatus { + SOS("TASK_SOS"), + NOT_SOS("TASK_NOT_SOS"); + + private final String sosStatus; +} diff --git a/src/main/java/com/amcamp/domain/task/domain/Task.java b/src/main/java/com/amcamp/domain/task/domain/Task.java index 7be4664b..6b03f793 100644 --- a/src/main/java/com/amcamp/domain/task/domain/Task.java +++ b/src/main/java/com/amcamp/domain/task/domain/Task.java @@ -36,6 +36,9 @@ public class Task extends BaseTimeEntity { @Enumerated(EnumType.STRING) private AssignedStatus assignedStatus; + @Enumerated(EnumType.STRING) + private SOSStatus sosStatus; + // 태스크 수행 멤버 @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(name = "assignee_id") @@ -48,13 +51,15 @@ private Task( TaskDifficulty taskDifficulty, ToDoInfo toDoInfo, AssignedStatus assignedStatus, - ProjectParticipant assignee) { + ProjectParticipant assignee, + SOSStatus sosStatus) { this.sprint = sprint; this.description = description; this.toDoInfo = toDoInfo; this.taskDifficulty = taskDifficulty; this.assignedStatus = assignedStatus; this.assignee = assignee; + this.sosStatus = sosStatus; } public static Task createTask( @@ -66,6 +71,7 @@ public static Task createTask( .assignedStatus(AssignedStatus.NOT_ASSIGNED) .toDoInfo(ToDoInfo.createToDoInfo(null, null)) .assignee(null) + .sosStatus(SOSStatus.NOT_SOS) .build(); } @@ -87,5 +93,14 @@ public void assignTask(ProjectParticipant projectParticipant) { this.assignedStatus = AssignedStatus.ASSIGNED; this.assignee = projectParticipant; this.toDoInfo.updateToDoInfo(LocalDate.now(), null, ToDoStatus.ON_GOING); + this.sosStatus = SOSStatus.NOT_SOS; + } + + public void updateTaskSOS() { + if (this.sosStatus != SOSStatus.SOS) { + this.sosStatus = SOSStatus.SOS; + } else { + this.sosStatus = SOSStatus.NOT_SOS; + } } } diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java index 91227a2d..2fd1d4de 100644 --- a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java @@ -3,6 +3,7 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.SOSStatus; import com.amcamp.domain.task.domain.Task; import com.amcamp.domain.task.domain.TaskDifficulty; import io.swagger.v3.oas.annotations.media.Schema; @@ -16,6 +17,7 @@ public record TaskInfoResponse( @Schema(description = "태스크 마감일자", example = "2024-01-02") LocalDate dueDt, @Schema(description = "태스크 진행현황", example = "1") ToDoStatus toDoStatus, @Schema(description = "태스크 담당 상태", example = "ASSIGNED") AssignedStatus assignedStatus, + @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus, @Schema(description = "태스크 담당자 아이디", example = "1") Long memberId, @Schema(description = "태스크 담당자 닉네임", example = "최현태") String nickname, @Schema(description = "태스크 담당자 프로필 url", example = "Presigned URL") @@ -30,6 +32,7 @@ public static TaskInfoResponse from(Task task, Member member) { task.getToDoInfo().getDueDt(), task.getToDoInfo().getToDoStatus(), task.getAssignedStatus(), + task.getSosStatus(), member.getId(), member.getNickname(), member.getProfileImageUrl()); @@ -44,6 +47,7 @@ public static TaskInfoResponse from(Task task) { task.getToDoInfo().getDueDt(), task.getToDoInfo().getToDoStatus(), task.getAssignedStatus(), + task.getSosStatus(), null, null, null); diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java index b0d42b32..a4823bb3 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java @@ -9,7 +9,8 @@ public enum TaskErrorCode implements BaseErrorCode { TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "task를 찾을 수 없습니다."), TASK_MODIFY_FORBIDDEN(HttpStatus.FORBIDDEN, "task 수정·삭제 권한이 없습니다. "), - TASK_ALREADY_ASSIGNED(HttpStatus.FORBIDDEN, "이미 담당자가 존재하는 task입니다."); + TASK_ALREADY_ASSIGNED(HttpStatus.FORBIDDEN, "이미 담당자가 존재하는 task입니다."), + TASK_NOT_ASSIGNED(HttpStatus.FORBIDDEN, "아직 할당되지 않은 task입니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 95506230..ce010f29 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -16,6 +16,7 @@ import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.SOSStatus; import com.amcamp.domain.task.domain.Task; import com.amcamp.domain.task.domain.TaskDifficulty; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; @@ -190,4 +191,68 @@ class 태스크_수정_시 { .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); } } + + @Nested + class sos_실행_시 { + @Test + void 태스크가_할당되지않았을_경우_SOS_실행하지_않는다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + // when + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + // when & then + assertThatThrownBy(() -> taskService.updateTaskSOS(task.getId())) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_NOT_ASSIGNED.getMessage()); + } + + @Test + void 태스크가_할당되었을_경우_SOS_실행한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + // when & then + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + TaskInfoResponse response = taskService.assignTask(task.getId()); + assertThat(response.sosStatus()).isEqualTo(SOSStatus.NOT_SOS); + + response = taskService.updateTaskSOS(task.getId()); + assertThat(response.sosStatus()).isEqualTo(SOSStatus.SOS); + } + // @Test + // void sos인_상태에서_태스크_할당상태를_수정한다 (){ + // // given + // Member member = memberUtil.getCurrentMember(); + // TaskCreateRequest taskRequest = + // new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + // taskService.createTask(taskRequest); + // + // Task task = + // taskRepository + // .findById(1L) + // .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + // + // taskService.assignTask(task.getId()); + // taskService.updateTaskSOS(task.getId()); + // + // // 프로젝트 참가 메소드 필요 + // + // } + + } } From 5bfe36efb5bb4d498fedf9e19f68412f9bb519d1 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Fri, 7 Mar 2025 14:38:53 +0900 Subject: [PATCH 045/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=82=AD=EC=A0=9C/=EB=82=98=EA=B0=80=EA=B8=B0=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=20(#101)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: project 삭제/나가기 로직 구현 + utill 중복 제거 * feat: delete 테스트 추가 및 프로젝트 삭제 시 연관된 모든 projectParticipant 삭제 로직 추가 * refactor: Http 상태코드 수정 + 메소드 래핑 제거 * feat: project 나가기 -> admin 권한 예외처리 - 프로젝트 참여자가 admin 1명일 때: project 삭제 - 프로젝트 참여자가 admin + 일반 유저 N명일 때: 에러 발생 -> 별도 API 로 권한 변경 필요 - projectAdminChange 위한 엔드포인트 추가 * refactor: 프로젝트 삭제 swagger summary 수정 --- .../domain/project/api/ProjectController.java | 23 +++ .../project/application/ProjectService.java | 93 +++++++-- .../dao/ProjectParticipantRepository.java | 8 + .../project/domain/ProjectParticipant.java | 4 + .../domain/ProjectParticipantRole.java | 2 +- .../request/ProjectAdminChangeRequest.java | 7 + .../exception/errorcode/ProjectErrorCode.java | 4 +- .../domain/project/ProjectServiceTest.java | 193 ++++++++++-------- 8 files changed, 226 insertions(+), 108 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/dto/request/ProjectAdminChangeRequest.java diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index 33e9d545..7e97e27e 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -61,4 +61,27 @@ public ResponseEntity projectTodoInfoUpdate( projectService.updateProjectTodoInfo(projectId, request); return ResponseEntity.ok().build(); } + + // delete + @Operation(summary = "프로젝트 삭제", description = "프로젝트를 삭제합니다.") + @DeleteMapping("/{projectId}/") + public ResponseEntity projectDelete(@PathVariable Long projectId) { + projectService.deleteProject(projectId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "프로젝트 나가기", description = "프로젝트에 참여중인 프로젝트 참여자 정보를 삭제합니다.") + @DeleteMapping("/{projectId}/leave") + public ResponseEntity projectParticipantDelete(@PathVariable Long projectId) { + projectService.deleteProjectParticipant(projectId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "admin 권한 양도", description = "프로젝트 Admin 권한을 양도합니다.") + @PostMapping("/{projectId}/admin/change") + public ResponseEntity projectAdminChange( + @PathVariable Long projectId, @Valid @RequestBody ProjectAdminChangeRequest request) { + projectService.changeProjectAdmin(projectId, request.newAdminId()); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index a4310013..3d5be509 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -1,5 +1,6 @@ package com.amcamp.domain.project.application; +import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; @@ -15,11 +16,11 @@ import com.amcamp.domain.team.domain.Team; import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.MemberErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; import java.util.List; -import java.util.Optional; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; @@ -36,6 +37,7 @@ public class ProjectService { private final TeamParticipantRepository teamParticipantRepository; private final ProjectParticipantRepository projectParticipantRepository; private final ProjectRepositoryCustom projectRepositoryCustom; + private final MemberRepository memberRepository; public void createProject(ProjectCreateRequest request) { Member member = memberUtil.getCurrentMember(); @@ -60,7 +62,7 @@ public void createProject(ProjectCreateRequest request) { public ProjectInfoResponse getProjectInfo(Long projectId) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - validateProjectParticipant(member, project); + getProjectParticipant(member, project); return ProjectInfoResponse.from(project); } @@ -68,8 +70,7 @@ public ProjectInfoResponse getProjectInfo(Long projectId) { public List getProjectListInfo(Long teamId) { List projectList = projectRepositoryCustom.findAllByTeamId(teamId); Member member = memberUtil.getCurrentMember(); - Team team = getTeam(teamId); - TeamParticipant teamParticipant = getTeamParticipant(member, team); + TeamParticipant teamParticipant = getTeamParticipant(member, getTeam(teamId)); return projectList.stream() .map( p -> @@ -83,18 +84,62 @@ public List getProjectListInfo(Long teamId) { public void updateProjectBasicInfo(Long projectId, ProjectBasicInfoUpdateRequest request) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - validateProjectParticipant(member, project); + getProjectParticipant(member, project); project.updateBasic(request.title(), request.goal(), request.description()); } public void updateProjectTodoInfo(Long projectId, ProjectTodoInfoUpdateRequest request) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - validateProjectParticipant(member, project); + getProjectParticipant(member, project); project.getToDoInfo() .updateToDoInfo(request.startDt(), request.DueDt(), request.toDoStatus()); } + // delete + + public void deleteProject(Long projectId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectAdmin(member, project); + projectParticipantRepository.deleteAllByProject(project); + projectRepository.delete(project); + } + + public void deleteProjectParticipant(Long projectId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + ProjectParticipant participant = getProjectParticipant(member, project); + if (isProjectAdmin(member, project)) { + boolean hasOtherParticipants = + projectParticipantRepository.existsByProjectAndProjectRoleNot( + project, ProjectParticipantRole.ADMIN); + // 다른 팀원 있을 떄 -> 예외 발생 + if (hasOtherParticipants) { + throw new CommonException(ProjectErrorCode.PROJECT_ADMIN_CANNOT_LEAVE); + } + projectParticipantRepository.deleteAllByProject(project); + projectRepository.delete(project); + } else { + projectParticipantRepository.delete(participant); + } + } + + public void changeProjectAdmin(Long projectId, Long newAdminId) { + Member currentMember = memberUtil.getCurrentMember(); // 현재 사용자 (기존 Admin) + Project project = getProjectById(projectId); + ProjectParticipant currentAdmin = validateProjectAdmin(currentMember, project); + + Member newAdminMember = + memberRepository + .findById(newAdminId) + .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); + ProjectParticipant newAdmin = getProjectParticipant(newAdminMember, project); + + currentAdmin.changeRole(ProjectParticipantRole.MEMBER); + newAdmin.changeRole(ProjectParticipantRole.ADMIN); + } + // project utils private String normalizeProjectTitle(String name) { @@ -107,36 +152,42 @@ private Project getProjectById(Long projectId) { .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); } - // util methods private TeamParticipant getTeamParticipant(Member member, Team team) { return teamParticipantRepository .findByMemberAndTeam(member, team) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); } + private ProjectParticipant getProjectParticipant(Member member, Project project) { + TeamParticipant teamParticipant = getTeamParticipant(member, project.getTeam()); + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } + private Team getTeam(Long teamId) { return teamRepository .findById(teamId) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); } + private ProjectParticipant validateProjectAdmin(Member member, Project project) { + ProjectParticipant participant = getProjectParticipant(member, project); + if (!participant.getProjectRole().equals(ProjectParticipantRole.ADMIN)) { + throw new CommonException(ProjectErrorCode.UNAUTHORIZED_ACCESS); + } + return participant; + } + + private boolean isProjectAdmin(Member member, Project project) { + ProjectParticipant participant = getProjectParticipant(member, project); + return participant.getProjectRole().equals(ProjectParticipantRole.ADMIN); + } + private Boolean isProjectParticipant(Project project, TeamParticipant teamParticipant) { return projectParticipantRepository .findByProjectAndTeamParticipant(project, teamParticipant) .isPresent(); } - - private void validateProjectParticipant(Member member, Project project) { - Optional teamParticipant = - teamParticipantRepository.findByMemberAndTeam(member, project.getTeam()); - if (teamParticipant.isEmpty()) { - throw new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); - } else { - if (projectParticipantRepository - .findByProjectAndTeamParticipant(project, teamParticipant.get()) - .isEmpty()) { - throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED); - } - } - } } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java index 519bacc5..5cc158cf 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectParticipantRepository.java @@ -2,11 +2,19 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.team.domain.TeamParticipant; +import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; public interface ProjectParticipantRepository extends JpaRepository { Optional findByProjectAndTeamParticipant( Project project, TeamParticipant teamParticipant); + + List findAllByProject(Project project); + + boolean existsByProjectAndProjectRoleNot(Project project, ProjectParticipantRole role); + + void deleteAllByProject(Project project); } diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java index fbeecc2e..c809712b 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java @@ -51,4 +51,8 @@ public static ProjectParticipant createProjectParticipant( .projectRole(projectRole) .build(); } + + public void changeRole(ProjectParticipantRole projectRole) { + this.projectRole = projectRole; + } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java index a5b52409..1008a6e3 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantRole.java @@ -7,7 +7,7 @@ @AllArgsConstructor public enum ProjectParticipantRole { ADMIN("PROJECT_ADMIN"), - USER("PROJECT_USER"); + MEMBER("PROJECT_MEMBER"); private final String projectRole; } diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectAdminChangeRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectAdminChangeRequest.java new file mode 100644 index 00000000..759a4066 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectAdminChangeRequest.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.project.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; + +public record ProjectAdminChangeRequest( + @Schema(description = "새 Admin ID", example = "1") @NotNull Long newAdminId) {} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 926c63fd..bd534339 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -10,7 +10,9 @@ public enum ProjectErrorCode implements BaseErrorCode { PROJECT_NOT_FOUND(HttpStatus.NOT_FOUND, "project 를 찾을 수 없습니다."), PROJECT_PARTICIPATION_REQUIRED(HttpStatus.FORBIDDEN, "해당 프로젝트 참여자가 아닙니다."), - ; + UNAUTHORIZED_ACCESS(HttpStatus.FORBIDDEN, "권한이 없습니다."), + PROJECT_ADMIN_CANNOT_LEAVE( + HttpStatus.FORBIDDEN, "프로젝트 Admin은 다른 팀원에게 권한을 넘긴 후에만 프로젝트를 나갈 수 있습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 31c14f37..ad02e64a 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -45,7 +45,9 @@ public class ProjectServiceTest extends IntegrationTest { private Member member; private Member anotherMember; - + private String title = "projectTitle"; + private String goal = "projectTitle"; + private String description = "projectGoal"; private LocalDate startDt = LocalDate.of(2026, 1, 1); private LocalDate dueDt = LocalDate.of(2026, 12, 1); @@ -61,6 +63,37 @@ private void logout() { SecurityContextHolder.clearContext(); } + private TeamInviteCodeRequest teamInviteCodeRequest; + + private Long getTeamId() { + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + return teamId; + } + + void createTestProject() { + Long teamId = getTeamId(); + ProjectCreateRequest request = + new ProjectCreateRequest(teamId, title, goal, startDt, dueDt, description); + + projectService.createProject(request); + } + + void createTestProject( + Long teamId, + String title, + String goal, + LocalDate startDt, + LocalDate dueDt, + String description) { + ProjectCreateRequest request = + new ProjectCreateRequest(teamId, title, goal, startDt, dueDt, description); + + projectService.createProject(request); + } + @BeforeEach private void setUp() { member = @@ -92,30 +125,16 @@ public void afterEach() { @Test void 프로젝트를_생성하면_정상적으로_저장된다() { // given - TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); - String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); - TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); - Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - - ProjectCreateRequest request = - new ProjectCreateRequest( - teamId, - "testProjectTitle", - "testProjectGoal", - startDt, - dueDt, - "testProjectDescription"); - + Long teamId = getTeamId(); // when - projectService.createProject(request); + createTestProject(teamId, title, goal, startDt, dueDt, description); // then Project project = projectRepository.findById(1L).get(); assertThat(project.getId()).isEqualTo(1L); assertThat(project) .extracting("id", "title", "description", "goal") - .containsExactlyInAnyOrder( - 1L, "testProjectTitle", "testProjectDescription", "testProjectGoal"); + .containsExactlyInAnyOrder(1L, title, goal, description); } @Nested @@ -123,45 +142,23 @@ class 프로젝트_조회 { @Test void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { // given - TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); - String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); - TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); - Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - - ProjectCreateRequest request1 = - new ProjectCreateRequest( - teamId, - "project1", - "projectGoal", - startDt, - dueDt, - "projectDescription"); - ProjectCreateRequest request2 = - new ProjectCreateRequest( - teamId, - "project1", - "projectGoal", - startDt, - dueDt, - "projectDescription"); - - projectService.createProject(request1); + Long teamId = getTeamId(); + createTestProject(teamId, "project1", goal, startDt, dueDt, description); // member logout 후 anotherMember 로그인 logout(); loginAs(anotherMember); // 팀 참가 teamService.joinTeam(teamInviteCodeRequest); // anotherMember 새 프로젝트 생성 - projectService.createProject(request2); + createTestProject(teamId, "project2", goal, startDt, dueDt, description); // when - List foundResponse = projectService.getProjectListInfo(teamId); foundResponse.stream() .filter(ProjectParticipationInfoResponse::isParticipate) - .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project1")); + .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project2")); foundResponse.stream() .filter(f -> !f.isParticipate()) .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project1")); @@ -170,21 +167,7 @@ class 프로젝트_조회 { @Test void 프로젝트를_ID로_조회하면_정상적으로_반환된다() { // given - TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); - String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); - TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); - Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - - ProjectCreateRequest request = - new ProjectCreateRequest( - teamId, - "testProjectTitle", - "testProjectGoal", - startDt, - dueDt, - "testProjectDescription"); - - projectService.createProject(request); + createTestProject(); Project project = projectRepository.findById(1L).get(); // when ProjectInfoResponse foundResponse = projectService.getProjectInfo(1L); @@ -226,30 +209,17 @@ class 프로젝트_업데이트 { String updatedTitle = "updatedProjectTitle"; String updatedGoal = "updatedProjectGoal"; String updatedDescription = "updatedProjectDescription"; - TeamInviteCodeRequest teamInviteCodeRequest; - - void createTestProject() { - TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); - String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); - teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); - Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - - ProjectCreateRequest request = - new ProjectCreateRequest( - teamId, - originalTitle, - originalGoal, - startDt, - dueDt, - originalDescription); - - projectService.createProject(request); + + void createOriginalProject() { + Long teamId = getTeamId(); + createTestProject( + teamId, originalTitle, originalGoal, startDt, dueDt, originalDescription); } @Test void 프로젝트_기본정보를_수정하면_정상적으로_수정된다() { // given - createTestProject(); + createOriginalProject(); // when projectService.updateProjectBasicInfo( 1L, @@ -265,7 +235,7 @@ void createTestProject() { @Test void 팀_참여자가_아닌_사용자는_프로젝트_수정이_제한된다() { // given - createTestProject(); + createOriginalProject(); logout(); // 팀에 속하지 않은 사용자 로그인 loginAs(anotherMember); @@ -284,7 +254,7 @@ void createTestProject() { @Test void 프로젝트_참여자가_아닌_팀_참가자는_수정이_제한된다() { // given - createTestProject(); + createOriginalProject(); logout(); // 다른 팀 멤버 loginAs(anotherMember); @@ -305,7 +275,7 @@ void createTestProject() { @Test void 프로젝트_기본정보를_타이틀만_수정하면_타이틀만_수정된다() { // given - createTestProject(); + createOriginalProject(); // when projectService.updateProjectBasicInfo( 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, null, null)); @@ -319,7 +289,7 @@ void createTestProject() { @Test void 프로젝트_기본정보를_목표만_수정하면_목표만_수정된다() { // given - createTestProject(); + createOriginalProject(); // when projectService.updateProjectBasicInfo( 1L, new ProjectBasicInfoUpdateRequest(null, updatedGoal, null)); @@ -333,7 +303,7 @@ void createTestProject() { @Test void 프로젝트_기본정보를_상세설명만_수정하면_상세설명만_수정된다() { // given - createTestProject(); + createOriginalProject(); // when projectService.updateProjectBasicInfo( 1L, new ProjectBasicInfoUpdateRequest(null, null, updatedDescription)); @@ -347,7 +317,7 @@ void createTestProject() { @Test void 프로젝트_일정정보를_수정하면_정상적으로_수정된다() { // given - createTestProject(); + createOriginalProject(); // when LocalDate updatedStartDt = LocalDate.of(2026, 1, 15); LocalDate updatedDueDt = LocalDate.of(2027, 12, 1); @@ -366,7 +336,7 @@ void createTestProject() { @Test void 잘못된_날짜를_입력하면_오류가_발생한다() { // given - createTestProject(); + createOriginalProject(); // when LocalDate updatedStartDt = LocalDate.of(2027, 1, 1); LocalDate updatedDueDt = LocalDate.of(2026, 1, 1); @@ -380,4 +350,57 @@ void createTestProject() { .hasMessageContaining(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); } } + + @Nested + class 프로젝트_삭제_및_나가기 { + @Test + void 프로젝트를_삭제하면_정상적으로_삭제된다() { + // given + createTestProject(); + // when + projectService.deleteProject(1L); + // then + assertThatThrownBy(() -> projectService.getProjectInfo(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + + // @Test + // void 권한이_없으면_삭제가_거부된다(){ + // //given + // createTestProject(); + // //권한 수정 + // //when + // projectService.deleteProjectParticipant(1L); + // //then + // assertThatThrownBy(()->projectService.getProjectInfo(1L)) + // .isInstanceOf(CommonException.class) + // .hasMessageContaining(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + // } + + // @Test + // void 프로젝트_참가자가_2명_이상이면_admin은_프로젝트를_못나간다() { + // // given + // createTestProject(); + // // when + // //project 일반 멤버 추가 + // // then + // assertThatThrownBy(() -> projectService.deleteProjectParticipant(1L)) + // .isInstanceOf(CommonException.class) + // .hasMessageContaining( + // ProjectErrorCode.PROJECT_ADMIN_CANNOT_LEAVE.getMessage()); + // } + + @Test + void 프로젝트_참가자가_admin_1명이면_프로젝트가_삭제된다() { + // given + createTestProject(); + // when + projectService.deleteProjectParticipant(1L); + // then + assertThatThrownBy(() -> projectService.getProjectInfo(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + } } From 1cb565e43358985135c3d8743a0f9ccaf894ed45 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 11 Mar 2025 23:13:48 +0900 Subject: [PATCH 046/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=EB=B3=84=20=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20(#106)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 프로젝트별 스프린트 목록 조회 구현 * test: 프로젝트별 스프린트 목록 조회 테스트 * refactor: 파라미터 설명 수정 * fix: 팀 참여자가 스프린트 목록을 조회할 수 있도록 수정 --- .../domain/sprint/api/SprintController.java | 12 ++++ .../sprint/application/SprintService.java | 13 ++++ .../domain/sprint/dao/SprintRepository.java | 2 +- .../sprint/dao/SprintRepositoryCustom.java | 8 +++ .../sprint/dao/SprintRepositoryImpl.java | 68 +++++++++++++++++++ .../dto/response/SprintInfoResponse.java | 2 + .../sprint/application/SprintServiceTest.java | 35 ++++++++++ 7 files changed, 139 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 077194bf..e76123f7 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -6,9 +6,11 @@ import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -49,4 +51,14 @@ public ResponseEntity sprintDelete(@PathVariable Long sprintId) { sprintService.deleteSprint(sprintId); return ResponseEntity.status(HttpStatus.OK).build(); } + + @Operation(summary = "프로젝트별 스프린트 목록 조회", description = "특정 프로젝트의 스프린트 목록을 조회합니다.") + @GetMapping("/{projectId}") + public Slice sprintFindAll( + @PathVariable Long projectId, + @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastSprintId) { + return sprintService.findAllSprint(projectId, lastSprintId); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index d59bcae2..a6ade399 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -25,6 +25,7 @@ import java.time.LocalDate; import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -107,6 +108,18 @@ public void deleteSprint(Long sprintId) { } } + @Transactional(readOnly = true) + public Slice findAllSprint(Long projectId, Long lastSprintId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Project project = findByProjectId(projectId); + + teamParticipantRepository + .findByMemberAndTeam(currentMember, project.getTeam()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); + } + private Sprint findBySprintId(Long sprintId) { return sprintRepository .findById(sprintId) diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index 04a7ee35..cba83428 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -7,7 +7,7 @@ import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; -public interface SprintRepository extends JpaRepository { +public interface SprintRepository extends JpaRepository, SprintRepositoryCustom { @Query("SELECT COUNT(s) FROM Sprint s WHERE s.project = :project") long countByProject(@Param("project") Project project); diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java new file mode 100644 index 00000000..dd306771 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java @@ -0,0 +1,8 @@ +package com.amcamp.domain.sprint.dao; + +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import org.springframework.data.domain.Slice; + +public interface SprintRepositoryCustom { + Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); +} diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java new file mode 100644 index 00000000..cd562544 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -0,0 +1,68 @@ +package com.amcamp.domain.sprint.dao; + +import static com.amcamp.domain.sprint.domain.QSprint.sprint; + +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class SprintRepositoryImpl implements SprintRepositoryCustom { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + SprintInfoResponse.class, + sprint.id, + sprint.title, + sprint.goal, + sprint.toDoInfo.startDt, + sprint.toDoInfo.dueDt, + sprint.toDoInfo.toDoStatus)) + .from(sprint) + .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) + .orderBy(sprint.title.asc()) + .limit(2) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); + } + + return checkLastPage(results); + } + + private BooleanExpression lastSprintId(Long sprintId) { + if (sprintId == null) { + return null; + } + + return sprint.id.gt(sprintId); + } + + private Slice checkLastPage(List results) { + boolean hasNext = false; + + if (results.size() > 1) { + hasNext = true; + results.remove(1); + } + + return new SliceImpl<>(results, PageRequest.of(0, 1), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java index 4e7f5919..915815b1 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java @@ -6,6 +6,7 @@ import java.time.LocalDate; public record SprintInfoResponse( + @Schema(description = "스프린트 ID", example = "1") Long id, @Schema(description = "스프린트 제목", example = "1차 스프린트") String title, @Schema(description = "중간 목표", example = "MVP 개발") String goal, @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, @@ -13,6 +14,7 @@ public record SprintInfoResponse( @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status) { public static SprintInfoResponse from(Sprint sprint) { return new SprintInfoResponse( + sprint.getId(), sprint.getTitle(), sprint.getGoal(), sprint.getToDoInfo().getStartDt(), diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index b4cc0f77..09fb1e84 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -2,6 +2,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.AssertionsForClassTypes.tuple; import com.amcamp.IntegrationTest; import com.amcamp.domain.member.dao.MemberRepository; @@ -26,13 +27,16 @@ import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.GlobalErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -174,4 +178,35 @@ class 스프린트_삭제할_때 { assertThat(sprintRepository.count()).isEqualTo(0); } } + + @Nested + class 프로젝트별_스프린트_목록을_조회할_때 { + @Test + void 프로젝트가_존재하지_않으면_예외가_발생한다() { + // when & then + assertThatThrownBy(() -> sprintService.findAllSprint(999L, null)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + + @Test + void 프로젝트가_존재한다면_첫_번쨰_스프린트를_반환한다() { + // given + List sprintList = + List.of( + Sprint.createSprint(project, "1", "testDescription1", startDt, dueDt), + Sprint.createSprint(project, "2", "testDescription2", startDt, dueDt), + Sprint.createSprint(project, "3", "testDescription3", startDt, dueDt)); + sprintRepository.saveAll(sprintList); + + // when + Slice results = sprintService.findAllSprint(project.getId(), null); + + // then + assertThat(results.getSize()).isEqualTo(1); + assertThat(results) + .extracting("id", "title", "goal") + .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + } + } } From a3fcd83bf955b59b419340ab1444777046751a7c Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 12 Mar 2025 19:00:33 +0900 Subject: [PATCH 047/107] =?UTF-8?q?feat:=20OpenAI=20=EA=B8=B0=EB=B0=98=20?= =?UTF-8?q?=ED=94=BC=EB=93=9C=EB=B0=B1=20=EB=A9=94=EC=8B=9C=EC=A7=80=20?= =?UTF-8?q?=EA=B0=9C=EC=84=A0=20(#109)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: openai 설정 추가 * chore: openai properties 추가 * chore: openai feign client 추가 * refactor: openai 도입에 따른 feign config 수정 * feat: openai 기반 피드백 메시지 개선 구현 * refactor: 엔드포인트 수정 --- .../feedback/api/FeedbackController.java | 28 +++++++++++++++++++ .../feedback/application/ChatGptService.java | 26 +++++++++++++++++ .../feedback/application/FeedbackService.java | 20 +++++++++++++ .../amcamp/domain/feedback/dto/Choice.java | 3 ++ .../amcamp/domain/feedback/dto/Message.java | 3 ++ .../feedback/dto/request/ChatRequest.java | 24 ++++++++++++++++ .../dto/request/OriginalFeedbackRequest.java | 11 ++++++++ .../feedback/dto/response/ChatResponse.java | 5 ++++ .../dto/response/FeedbackRefineResponse.java | 7 +++++ .../global/config/feign/FeignConfig.java | 15 +++++++--- .../infra/config/feign/OpenAiClient.java | 21 ++++++++++++++ .../infra/config/openai/OpenAiProperties.java | 6 ++++ .../config/properties/PropertiesConfig.java | 4 ++- src/main/resources/application-openai.yml | 8 ++++++ src/main/resources/application.yml | 1 + 15 files changed, 177 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java create mode 100644 src/main/java/com/amcamp/domain/feedback/application/ChatGptService.java create mode 100644 src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/Choice.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/Message.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/request/OriginalFeedbackRequest.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/response/ChatResponse.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackRefineResponse.java create mode 100644 src/main/java/com/amcamp/infra/config/feign/OpenAiClient.java create mode 100644 src/main/java/com/amcamp/infra/config/openai/OpenAiProperties.java create mode 100644 src/main/resources/application-openai.yml diff --git a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java new file mode 100644 index 00000000..283b94fc --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java @@ -0,0 +1,28 @@ +package com.amcamp.domain.feedback.api; + +import com.amcamp.domain.feedback.application.FeedbackService; +import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; +import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "7. 피드백 API", description = "피드백 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/feedbacks") +public class FeedbackController { + + private final FeedbackService feedbackService; + + @Operation( + summary = "OpenAI 기반 피드백 메시지 개선", + description = "사용자가 입력한 피드백을 AI가 분석하여 부드럽고 명확하게 개선합니다.") + @PostMapping(value = "/refinement") + public FeedbackRefineResponse feedbackRefine( + @Valid @RequestBody OriginalFeedbackRequest request) { + return feedbackService.refineFeedback(request); + } +} diff --git a/src/main/java/com/amcamp/domain/feedback/application/ChatGptService.java b/src/main/java/com/amcamp/domain/feedback/application/ChatGptService.java new file mode 100644 index 00000000..1d54399e --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/application/ChatGptService.java @@ -0,0 +1,26 @@ +package com.amcamp.domain.feedback.application; + +import static com.amcamp.global.common.constants.SecurityConstants.TOKEN_PREFIX; + +import com.amcamp.domain.feedback.dto.request.ChatRequest; +import com.amcamp.domain.feedback.dto.response.ChatResponse; +import com.amcamp.infra.config.feign.OpenAiClient; +import com.amcamp.infra.config.openai.OpenAiProperties; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class ChatGptService { + + private final OpenAiProperties openAiProperties; + private final OpenAiClient openAiClient; + + public String getAiFeedback(String userMessage) { + String apiKey = TOKEN_PREFIX + openAiProperties.apiKey(); + ChatRequest request = ChatRequest.of(openAiProperties.model(), userMessage); + + ChatResponse response = openAiClient.getAiFeedback(apiKey, request); + return response.choices()[0].message().content(); + } +} diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java new file mode 100644 index 00000000..a4d5fe73 --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -0,0 +1,20 @@ +package com.amcamp.domain.feedback.application; + +import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; +import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +@RequiredArgsConstructor +public class FeedbackService { + + private final ChatGptService chatGptService; + + public FeedbackRefineResponse refineFeedback(OriginalFeedbackRequest request) { + String chatResponse = chatGptService.getAiFeedback(request.originalMessage()); + return new FeedbackRefineResponse(chatResponse); + } +} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/Choice.java b/src/main/java/com/amcamp/domain/feedback/dto/Choice.java new file mode 100644 index 00000000..e49ae57c --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/Choice.java @@ -0,0 +1,3 @@ +package com.amcamp.domain.feedback.dto; + +public record Choice(Message message) {} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/Message.java b/src/main/java/com/amcamp/domain/feedback/dto/Message.java new file mode 100644 index 00000000..2525dcea --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/Message.java @@ -0,0 +1,3 @@ +package com.amcamp.domain.feedback.dto; + +public record Message(String role, String content) {} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java b/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java new file mode 100644 index 00000000..93c1903c --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java @@ -0,0 +1,24 @@ +package com.amcamp.domain.feedback.dto.request; + +import com.amcamp.domain.feedback.dto.Message; + +public record ChatRequest(String model, Message[] messages) { + public static ChatRequest of(String model, String userMessage) { + return new ChatRequest( + model, + new Message[] { + new Message( + "system", + """ + 당신은 팀 프로젝트의 동료 평가를 수행하는 역할을 맡고 있습니다. 사용자가 제공한 피드백이 부정적인 뉘앙스를 가질 경우, 이를 순화하여 긍정적이고 건설적인 피드백으로 바꿔주세요. + 피드백의 본래 의도와 핵심은 유지하면서, 상대방이 개선할 점을 부드럽고 긍정적인 방식으로 전달해주세요. 예를 들어: + + - "이번 스프린트 동안 정말 역할을 하지 않은 것 같아요." -> "이번 스프린트 동안 역할을 제대로 수행하기 어려운 부분이 있었습니다. 다음에는 더 나은 협업을 위해 서로 돕는 방향을 찾아보면 좋겠습니다." + - "많은 일들이 제대로 진행되지 않았고, 필요한 시간에 도움을 주지 않았습니다." -> "몇 가지 작업이 계획대로 진행되지 않았습니다. 앞으로 더 원활한 소통과 협력이 이루어질 수 있도록 노력할 수 있으면 좋겠습니다." + + 주어진 피드백을 순화하면서 상대방이 개선할 수 있는 방향을 제시해주세요. 피드백을 긍정적인 방향으로 재구성하여 상대방이 성장할 수 있도록 도와주세요. + """), + new Message("user", userMessage) + }); + } +} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/request/OriginalFeedbackRequest.java b/src/main/java/com/amcamp/domain/feedback/dto/request/OriginalFeedbackRequest.java new file mode 100644 index 00000000..518716fa --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/request/OriginalFeedbackRequest.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.feedback.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; + +public record OriginalFeedbackRequest( + @NotBlank(message = "피드백 메시지는 비워둘 수 없습니다.") + @Schema(description = "사용자가 입력한 원본 피드백 메시지", example = "이 프로젝트 진행 방식이 별로였습니다.") + @Size(max = 300, message = "피드백 메시지는 최대 300자까지 입력할 수 있습니다.") + String originalMessage) {} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/response/ChatResponse.java b/src/main/java/com/amcamp/domain/feedback/dto/response/ChatResponse.java new file mode 100644 index 00000000..01ac93f0 --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/response/ChatResponse.java @@ -0,0 +1,5 @@ +package com.amcamp.domain.feedback.dto.response; + +import com.amcamp.domain.feedback.dto.Choice; + +public record ChatResponse(Choice[] choices) {} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackRefineResponse.java b/src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackRefineResponse.java new file mode 100644 index 00000000..8c0540a9 --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackRefineResponse.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.feedback.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record FeedbackRefineResponse( + @Schema(description = "AI가 개선한 피드백 메시지", example = "이번 프로젝트에서 협업이 조금 더 원활했으면 좋았을 것 같습니다.") + String refinedMessage) {} diff --git a/src/main/java/com/amcamp/global/config/feign/FeignConfig.java b/src/main/java/com/amcamp/global/config/feign/FeignConfig.java index 8813b64a..fae27474 100644 --- a/src/main/java/com/amcamp/global/config/feign/FeignConfig.java +++ b/src/main/java/com/amcamp/global/config/feign/FeignConfig.java @@ -12,11 +12,18 @@ public class FeignConfig { @Bean public RequestInterceptor requestInterceptor() { return requestTemplate -> { - requestTemplate.header( - "Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); + if (requestTemplate.url().contains("kakao") + || requestTemplate.url().contains("google")) { + requestTemplate.header( + "Content-Type", "application/x-www-form-urlencoded;charset=utf-8"); - if (requestTemplate.body() == null) { - requestTemplate.body(""); + if (requestTemplate.body() == null) { + requestTemplate.body(""); + } + } + + if (requestTemplate.url().contains("openai")) { + requestTemplate.header("Content-Type", "application/json"); } }; } diff --git a/src/main/java/com/amcamp/infra/config/feign/OpenAiClient.java b/src/main/java/com/amcamp/infra/config/feign/OpenAiClient.java new file mode 100644 index 00000000..9c97907a --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/feign/OpenAiClient.java @@ -0,0 +1,21 @@ +package com.amcamp.infra.config.feign; + +import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE; + +import com.amcamp.domain.feedback.dto.request.ChatRequest; +import com.amcamp.domain.feedback.dto.response.ChatResponse; +import com.amcamp.global.config.feign.FeignConfig; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; + +@FeignClient( + name = "openAiClient", + url = "https://api.openai.com", + configuration = FeignConfig.class) +public interface OpenAiClient { + @PostMapping(value = "/v1/chat/completions", consumes = APPLICATION_JSON_VALUE) + ChatResponse getAiFeedback( + @RequestHeader("Authorization") String apiKey, @RequestBody ChatRequest request); +} diff --git a/src/main/java/com/amcamp/infra/config/openai/OpenAiProperties.java b/src/main/java/com/amcamp/infra/config/openai/OpenAiProperties.java new file mode 100644 index 00000000..c9dae648 --- /dev/null +++ b/src/main/java/com/amcamp/infra/config/openai/OpenAiProperties.java @@ -0,0 +1,6 @@ +package com.amcamp.infra.config.openai; + +import org.springframework.boot.context.properties.ConfigurationProperties; + +@ConfigurationProperties(prefix = "openai") +public record OpenAiProperties(String apiKey, String model) {} diff --git a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java index 0d305c3c..173c2620 100644 --- a/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java +++ b/src/main/java/com/amcamp/infra/config/properties/PropertiesConfig.java @@ -3,6 +3,7 @@ import com.amcamp.infra.config.jwt.JwtProperties; import com.amcamp.infra.config.oauth.GoogleProperties; import com.amcamp.infra.config.oauth.KakaoProperties; +import com.amcamp.infra.config.openai.OpenAiProperties; import com.amcamp.infra.config.redis.RedisProperties; import com.amcamp.infra.config.s3.S3Properties; import org.springframework.boot.context.properties.EnableConfigurationProperties; @@ -13,7 +14,8 @@ GoogleProperties.class, KakaoProperties.class, JwtProperties.class, - S3Properties.class + S3Properties.class, + OpenAiProperties.class }) @Configuration public class PropertiesConfig {} diff --git a/src/main/resources/application-openai.yml b/src/main/resources/application-openai.yml new file mode 100644 index 00000000..8c89078d --- /dev/null +++ b/src/main/resources/application-openai.yml @@ -0,0 +1,8 @@ +spring: + config: + activate: + on-profile: "openai" + +openai: + api-key: ${OPENAI_API_KEY} + model: ${OPENAI_MODEL} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 21110bcd..eca14c62 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -8,6 +8,7 @@ spring: - redis - security - s3 + - openai spring-doc: default-consumes-media-type: application/json From 8445e4414141449f39a0ff28db5c985981a64d0b Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Thu, 13 Mar 2025 01:06:54 +0900 Subject: [PATCH 048/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EA=B0=80=EC=9E=85/=EC=B0=B8=EC=97=AC=EC=9E=90=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B5=AC=ED=98=84=20(#108)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 프로젝트 가입신청/승인/거절, 프로젝트 참가자 개인/목록 조회 로직 구현 * feat: 프로젝트 가입신청 취소 로직 구현 + 일부 메소드/url 매핑 오류 해결 * feat: 프로젝트 가입 신청/승인&거부, 프로젝트 참가자 조회 테스트 구현 * refactor: projectParticipant 도메인 projectNickname/projectProfileImageUrl 필드 추가 및 관련 로직 수정, 프로젝트 조회 시 프로젝트 멤버 확인 로직 삭제 * refactor: project 도메인 goal 필드 제거 * refactor: projectParticipant 도메인 position 필드 제거 * refactor: project 최대 참여 가능 멤버 수 제한(15명) * refactor: projectParticipant 삭제 -> nickname/profileurl unknown 변경 * refactor: projectRegistration 스키마 오류 수정/fetchType 변경 * refactor: 이미 참가충인 프로젝트 참가자 가입신청 제한 로직 추가(admin/일반유저 구분 x) * refactor: 미사용 projectParticiaption 존재 여부 확인 메서드 삭제 --- .../domain/project/api/ProjectController.java | 81 ++- .../project/application/ProjectService.java | 154 +++++- .../dao/ProjectRegistrationRepository.java | 14 + .../amcamp/domain/project/domain/Project.java | 18 +- .../project/domain/ProjectParticipant.java | 31 +- .../domain/ProjectParticipantUnknown.java | 11 + .../project/domain/ProjectRegistration.java | 50 ++ .../domain/ProjectRegistrationStatus.java | 14 + .../dto/request/ProjectCreateRequest.java | 2 - .../dto/response/ProjectInfoResponse.java | 2 - ...onse.java => ProjectListInfoResponse.java} | 2 +- .../ProjectParticipantInfoResponse.java | 24 + .../ProjectRegistrationInfoResponse.java | 24 + .../exception/errorcode/ProjectErrorCode.java | 7 +- .../domain/project/ProjectServiceTest.java | 464 +++++++++++++++--- .../sprint/application/SprintServiceTest.java | 10 +- .../amcamp/domain/task/TaskServiceTest.java | 1 - 17 files changed, 768 insertions(+), 141 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java create mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java rename src/main/java/com/amcamp/domain/project/dto/response/{ProjectParticipationInfoResponse.java => ProjectListInfoResponse.java} (86%) create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index 7e97e27e..a9e84f8e 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -3,7 +3,9 @@ import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectParticipationInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; @@ -21,6 +23,9 @@ public class ProjectController { private final ProjectService projectService; + // project + + // create @Operation(summary = "프로젝트 생성", description = "새로운 프로젝트를 생성합니다.") @PostMapping("/create") public ResponseEntity projectCreate( @@ -29,20 +34,21 @@ public ResponseEntity projectCreate( return ResponseEntity.status(HttpStatus.CREATED).build(); } + // read + @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") + @GetMapping("/{projectId}") + public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { + return projectService.getProjectInfo(projectId); + } + @Operation( summary = "전체 프로젝트 목록 조회", description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") @GetMapping("/{teamId}/list") - public List projectListInfo(@PathVariable Long teamId) { + public List projectListInfo(@PathVariable Long teamId) { return projectService.getProjectListInfo(teamId); } - @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") - @GetMapping("/{projectId}") - public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { - return projectService.getProjectInfo(projectId); - } - // update @Operation(summary = "프로젝트 기본 정보 업데이트", description = "프로젝트 타이틀/목표/상세설정을 수정합니다") @PatchMapping("/{projectId}/basic-info") @@ -70,6 +76,65 @@ public ResponseEntity projectDelete(@PathVariable Long projectId) { return ResponseEntity.ok().build(); } + // project member + @Operation(summary = "프로젝트 가입 신청", description = "프로젝트 가입 신청 요청을 보냅니다.") + @PostMapping("/{projectId}/registration") + public ResponseEntity projectRegister(@PathVariable Long projectId) { + projectService.requestToProjectRegistration(projectId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "프로젝트 가입 신청 조회", description = "프로젝트 가입 신청 정보를 조회합니다.") + @GetMapping("/{projectId}/registration") + public List projectRegistrationGet( + @PathVariable Long projectId) { + return projectService.getProjectRegistrationList(projectId); + } + + @Operation(summary = "프로젝트 가입 신청 목록 조회", description = "현재 프로젝트에 신청된 가입 요청 목록을 조회합니다.") + @GetMapping("/{projectId}/registration/list") + public ProjectRegistrationInfoResponse projectRegistrationListGet( + @PathVariable Long projectId, @RequestParam Long projectRegisterId) { + return projectService.getProjectRegistration(projectId, projectRegisterId); + } + + @Operation(summary = "프로젝트 가입 신청 승인", description = "프로젝트 가입 신청을 승인합니다.") + @PutMapping("/{projectId}/registration/approve") + public ResponseEntity projectRegistrationApprove( + @PathVariable Long projectId, @RequestParam Long projectRegisterId) { + projectService.approveProjectRegistration(projectId, projectRegisterId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "프로젝트 가입 신청 거부", description = "프로젝트 가입 신청을 거부합니다.") + @PutMapping("/{projectId}/registration/reject") + public ResponseEntity projectRegistrationReject( + @PathVariable Long projectId, @RequestParam Long projectRegisterId) { + projectService.rejectProjectRegistration(projectId, projectRegisterId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "프로젝트 가입 신청 취소", description = "프로젝트 가입 신청을 취소합니다.") + @DeleteMapping("/{projectId}/registration/cancel") + public ResponseEntity projectRegistrationDelete( + @PathVariable Long projectId, @RequestParam Long projectRegisterId) { + projectService.deleteProjectRegistration(projectId, projectRegisterId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "프로젝트 참가자 정보 조회", description = "프로젝트 참여자 정보를 조회합니다.") + @GetMapping("/{projectId}/me") + public ProjectParticipantInfoResponse projectParticipantGet(@PathVariable Long projectId) { + return projectService.getProjectParticipant(projectId); + } + + @Operation(summary = "프로젝트 참가자 목록 조회", description = "현재 프로젝트에 참여하고 있는 참가자 전체 목록을 조회합니다. ") + @GetMapping("/{projectId}/participants") + public List projectParticipantListGet( + @PathVariable Long projectId) { + return projectService.getProjectParticipantList(projectId); + } + @Operation(summary = "프로젝트 나가기", description = "프로젝트에 참여중인 프로젝트 참여자 정보를 삭제합니다.") @DeleteMapping("/{projectId}/leave") public ResponseEntity projectParticipantDelete(@PathVariable Long projectId) { diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 3d5be509..d17b4caa 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -3,14 +3,16 @@ import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRegistrationRepository; import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.dao.ProjectRepositoryCustom; -import com.amcamp.domain.project.domain.Project; -import com.amcamp.domain.project.domain.ProjectParticipant; -import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.*; +import com.amcamp.domain.project.domain.ProjectRegistration; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectParticipationInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -38,43 +40,47 @@ public class ProjectService { private final ProjectParticipantRepository projectParticipantRepository; private final ProjectRepositoryCustom projectRepositoryCustom; private final MemberRepository memberRepository; + private final ProjectRegistrationRepository projectRegistrationRepository; public void createProject(ProjectCreateRequest request) { Member member = memberUtil.getCurrentMember(); Team team = getTeam(request.teamId()); - TeamParticipant teamParticipant = getTeamParticipant(member, team); + TeamParticipant teamParticipant = getValidTeamParticipant(member, team); Project project = projectRepository.save( Project.createProject( team, normalizeProjectTitle(request.projectTitle()), request.projectDescription(), - request.projectGoal(), request.startDt(), request.dueDt())); projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipant, project, ProjectParticipantRole.ADMIN)); + teamParticipant, + project, + member.getNickname(), + member.getProfileImageUrl(), + ProjectParticipantRole.ADMIN)); } @Transactional(readOnly = true) public ProjectInfoResponse getProjectInfo(Long projectId) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - getProjectParticipant(member, project); + getValidTeamParticipant(member, project.getTeam()); return ProjectInfoResponse.from(project); } @Transactional(readOnly = true) - public List getProjectListInfo(Long teamId) { + public List getProjectListInfo(Long teamId) { List projectList = projectRepositoryCustom.findAllByTeamId(teamId); Member member = memberUtil.getCurrentMember(); - TeamParticipant teamParticipant = getTeamParticipant(member, getTeam(teamId)); + TeamParticipant teamParticipant = getValidTeamParticipant(member, getTeam(teamId)); return projectList.stream() .map( p -> - new ProjectParticipationInfoResponse( + new ProjectListInfoResponse( ProjectInfoResponse.from(p), isProjectParticipant(p, teamParticipant))) .collect(Collectors.toList()); @@ -84,20 +90,19 @@ public List getProjectListInfo(Long teamId) { public void updateProjectBasicInfo(Long projectId, ProjectBasicInfoUpdateRequest request) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - getProjectParticipant(member, project); - project.updateBasic(request.title(), request.goal(), request.description()); + getValidProjectParticipant(member, project); + project.updateBasic(request.title(), request.description()); } public void updateProjectTodoInfo(Long projectId, ProjectTodoInfoUpdateRequest request) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - getProjectParticipant(member, project); + getValidProjectParticipant(member, project); project.getToDoInfo() .updateToDoInfo(request.startDt(), request.DueDt(), request.toDoStatus()); } // delete - public void deleteProject(Long projectId) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); @@ -109,7 +114,7 @@ public void deleteProject(Long projectId) { public void deleteProjectParticipant(Long projectId) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); - ProjectParticipant participant = getProjectParticipant(member, project); + ProjectParticipant participant = getValidProjectParticipant(member, project); if (isProjectAdmin(member, project)) { boolean hasOtherParticipants = projectParticipantRepository.existsByProjectAndProjectRoleNot( @@ -121,7 +126,7 @@ public void deleteProjectParticipant(Long projectId) { projectParticipantRepository.deleteAllByProject(project); projectRepository.delete(project); } else { - projectParticipantRepository.delete(participant); + participant.changeParticipantToUnknown(); } } @@ -134,12 +139,94 @@ public void changeProjectAdmin(Long projectId, Long newAdminId) { memberRepository .findById(newAdminId) .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); - ProjectParticipant newAdmin = getProjectParticipant(newAdminMember, project); + ProjectParticipant newAdmin = getValidProjectParticipant(newAdminMember, project); currentAdmin.changeRole(ProjectParticipantRole.MEMBER); newAdmin.changeRole(ProjectParticipantRole.ADMIN); } + // project Registration + public void requestToProjectRegistration(Long projectId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + if (projectParticipantRepository.findAllByProject(project).size() >= 15) { + throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_LIMIT_EXCEED); + } + + TeamParticipant requester = validateProjectRegistrationAlreadyExists(member, project); + + projectRegistrationRepository.save(ProjectRegistration.createRequest(project, requester)); + } + + public ProjectRegistrationInfoResponse getProjectRegistration( + Long projectId, Long registrationId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectAdmin(member, project); + return ProjectRegistrationInfoResponse.from(getProjectRegistrationById(registrationId)); + } + + public List getProjectRegistrationList(Long projectId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectAdmin(member, project); + return projectRegistrationRepository.findAllByProject(project).stream() + .map(ProjectRegistrationInfoResponse::from) + .collect(Collectors.toList()); + } + + public void approveProjectRegistration(Long projectId, Long registrationId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectAdmin(member, project); + ProjectRegistration registration = getProjectRegistrationById(registrationId); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + registration.getRequester(), + project, + registration.getRequester().getMember().getNickname(), + registration.getRequester().getMember().getProfileImageUrl(), + ProjectParticipantRole.MEMBER)); + registration.updateStatus(ProjectRegistrationStatus.APPROVED); + } + + public void rejectProjectRegistration(Long projectId, Long registrationId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + validateProjectAdmin(member, project); + getProjectRegistrationById(registrationId).updateStatus(ProjectRegistrationStatus.REJECTED); + } + + public void deleteProjectRegistration(Long projectId, Long projectRegisterId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + TeamParticipant teamParticipant = getValidTeamParticipant(member, project.getTeam()); + ProjectRegistration registration = getProjectRegistrationById(projectRegisterId); + + if (teamParticipant.equals(registration.getRequester())) { + projectRegistrationRepository.delete(registration); + } else { + throw new CommonException(ProjectErrorCode.UNAUTHORIZED_ACCESS); + } + } + + // project participant info + public ProjectParticipantInfoResponse getProjectParticipant(Long projectId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + ProjectParticipant participant = getValidProjectParticipant(member, project); + return ProjectParticipantInfoResponse.from(participant); + } + + public List getProjectParticipantList(Long projectId) { + Member member = memberUtil.getCurrentMember(); + Project project = getProjectById(projectId); + getValidProjectParticipant(member, project); + return projectParticipantRepository.findAllByProject(project).stream() + .map(ProjectParticipantInfoResponse::from) + .collect(Collectors.toList()); + } + // project utils private String normalizeProjectTitle(String name) { @@ -152,14 +239,14 @@ private Project getProjectById(Long projectId) { .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); } - private TeamParticipant getTeamParticipant(Member member, Team team) { + private TeamParticipant getValidTeamParticipant(Member member, Team team) { return teamParticipantRepository .findByMemberAndTeam(member, team) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); } - private ProjectParticipant getProjectParticipant(Member member, Project project) { - TeamParticipant teamParticipant = getTeamParticipant(member, project.getTeam()); + private ProjectParticipant getValidProjectParticipant(Member member, Project project) { + TeamParticipant teamParticipant = getValidTeamParticipant(member, project.getTeam()); return projectParticipantRepository .findByProjectAndTeamParticipant(project, teamParticipant) .orElseThrow( @@ -172,8 +259,29 @@ private Team getTeam(Long teamId) { .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_NOT_FOUND)); } + private TeamParticipant validateProjectRegistrationAlreadyExists( + Member member, Project project) { + TeamParticipant participant = getValidTeamParticipant(member, project.getTeam()); + if (projectParticipantRepository + .findByProjectAndTeamParticipant(project, participant) + .isPresent()) { + throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_ALREADY_EXISTS); + } + if (projectRegistrationRepository.findByRequester(participant).isPresent()) { + throw new CommonException(ProjectErrorCode.PROJECT_REGISTRATION_ALREADY_EXISTS); + } + return participant; + } + + private ProjectRegistration getProjectRegistrationById(Long registrationId) { + return projectRegistrationRepository + .findById(registrationId) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_REGISTRATION_NOT_FOUND)); + } + private ProjectParticipant validateProjectAdmin(Member member, Project project) { - ProjectParticipant participant = getProjectParticipant(member, project); + ProjectParticipant participant = getValidProjectParticipant(member, project); if (!participant.getProjectRole().equals(ProjectParticipantRole.ADMIN)) { throw new CommonException(ProjectErrorCode.UNAUTHORIZED_ACCESS); } @@ -181,7 +289,7 @@ private ProjectParticipant validateProjectAdmin(Member member, Project project) } private boolean isProjectAdmin(Member member, Project project) { - ProjectParticipant participant = getProjectParticipant(member, project); + ProjectParticipant participant = getValidProjectParticipant(member, project); return participant.getProjectRole().equals(ProjectParticipantRole.ADMIN); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java new file mode 100644 index 00000000..4532a0e6 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.project.dao; + +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectRegistration; +import com.amcamp.domain.team.domain.TeamParticipant; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ProjectRegistrationRepository extends JpaRepository { + List findAllByProject(Project project); + + Optional findByRequester(TeamParticipant teamParticipant); +} diff --git a/src/main/java/com/amcamp/domain/project/domain/Project.java b/src/main/java/com/amcamp/domain/project/domain/Project.java index 84a6867d..66582b39 100644 --- a/src/main/java/com/amcamp/domain/project/domain/Project.java +++ b/src/main/java/com/amcamp/domain/project/domain/Project.java @@ -33,8 +33,8 @@ public class Project extends BaseTimeEntity { // 설명 @Lob private String description; - // 프로젝트 목표 - @Lob private String goal; + // // 프로젝트 목표 + // @Lob private String goal; @Embedded private ToDoInfo toDoInfo; @@ -43,33 +43,25 @@ public class Project extends BaseTimeEntity { // 캘린더 @Builder(access = AccessLevel.PRIVATE) - private Project(Team team, String title, String description, String goal, ToDoInfo toDoInfo) { + private Project(Team team, String title, String description, ToDoInfo toDoInfo) { this.team = team; this.title = title; this.description = description; - this.goal = goal; this.toDoInfo = toDoInfo; } public static Project createProject( - Team team, - String title, - String description, - String goal, - LocalDate startDt, - LocalDate dueDt) { + Team team, String title, String description, LocalDate startDt, LocalDate dueDt) { return Project.builder() .team(team) .title(title) .description(description) - .goal(goal) .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) .build(); } - public void updateBasic(String title, String goal, String description) { + public void updateBasic(String title, String description) { this.title = (title != null) ? title : this.title; - this.goal = (goal != null) ? goal : this.goal; this.description = (description != null) ? description : this.description; } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java index c809712b..35e3923b 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java @@ -7,7 +7,6 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; -import org.springframework.lang.Nullable; @Entity @NoArgsConstructor @@ -26,28 +25,39 @@ public class ProjectParticipant extends BaseTimeEntity { @JoinColumn(name = "project_id") private Project project; + private String projectNickname; + + private String projectProfile; + // 프로젝트 내 권한 @Enumerated(EnumType.STRING) private ProjectParticipantRole projectRole; - // 사용자 지정 역할 - @Nullable - @Column(name = "position") - private String ProjectPosition; - @Builder(access = AccessLevel.PRIVATE) private ProjectParticipant( - TeamParticipant teamParticipant, Project project, ProjectParticipantRole projectRole) { + TeamParticipant teamParticipant, + Project project, + String projectNickname, + String projectProfile, + ProjectParticipantRole projectRole) { this.teamParticipant = teamParticipant; this.project = project; + this.projectNickname = projectNickname; + this.projectProfile = projectProfile; this.projectRole = projectRole; } public static ProjectParticipant createProjectParticipant( - TeamParticipant teamParticipant, Project project, ProjectParticipantRole projectRole) { + TeamParticipant teamParticipant, + Project project, + String projectNickname, + String projectProfile, + ProjectParticipantRole projectRole) { return ProjectParticipant.builder() .teamParticipant(teamParticipant) .project(project) + .projectNickname(projectNickname) + .projectProfile(projectProfile) .projectRole(projectRole) .build(); } @@ -55,4 +65,9 @@ public static ProjectParticipant createProjectParticipant( public void changeRole(ProjectParticipantRole projectRole) { this.projectRole = projectRole; } + + public void changeParticipantToUnknown() { + this.projectNickname = String.valueOf(ProjectParticipantUnknown.NICKNAME); + this.projectProfile = String.valueOf(ProjectParticipantUnknown.PROFILE_URL); + } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java new file mode 100644 index 00000000..0006d47c --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.project.domain; + +import lombok.AllArgsConstructor; + +@AllArgsConstructor +public enum ProjectParticipantUnknown { + NICKNAME("UNKNOWN_PROJECT_NICKNAME"), + PROFILE_URL("UNKNOWN_PROJECT_PROFILE_URL"); + + private final String s; +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java new file mode 100644 index 00000000..9a0b4cd0 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java @@ -0,0 +1,50 @@ +package com.amcamp.domain.project.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.team.domain.TeamParticipant; +import jakarta.persistence.*; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor +@Getter +public class ProjectRegistration extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "project_registration_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_id") + private Project project; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "project_participant_id", unique = true) + private TeamParticipant requester; + + @Enumerated(EnumType.STRING) + private ProjectRegistrationStatus requestStatus; + + @Builder + public ProjectRegistration( + Project project, TeamParticipant requester, ProjectRegistrationStatus requestStatus) { + this.project = project; + this.requester = requester; + this.requestStatus = requestStatus; + } + + public static ProjectRegistration createRequest(Project project, TeamParticipant requester) { + return ProjectRegistration.builder() + .project(project) + .requester(requester) + .requestStatus(ProjectRegistrationStatus.PENDING) + .build(); + } + + public void updateStatus(ProjectRegistrationStatus requestStatus) { + this.requestStatus = requestStatus; + } +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java new file mode 100644 index 00000000..8170fce2 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.project.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum ProjectRegistrationStatus { + PENDING("REQUEST_PENDING"), + APPROVED("REQUEST_APPROVED"), + REJECTED("REQUEST_REJECTED"); + + private final String status; +} diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java index b812bd2c..ce52bfc3 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java @@ -9,8 +9,6 @@ public record ProjectCreateRequest( @Schema(description = "팀 ID", example = "1") @NotNull Long teamId, @Schema(description = "프로젝트 제목", example = "Devfit") @NotBlank String projectTitle, - @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발") @NotBlank - String projectGoal, @Schema(description = "프로젝트 시작 날짜", example = "2026-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java index 827730fb..d616e1f9 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java @@ -9,7 +9,6 @@ public record ProjectInfoResponse( @Schema(description = "프로젝트 제목", example = "Devfit") String projectTitle, @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") String projectDescription, - @Schema(description = "프로젝트 목표", example = "개발자 건강을 위한 협업 툴 개발") String projectGoal, @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01") LocalDate startDt, @Schema(description = "프로젝트 마감 날짜", example = "2025-01-01") LocalDate dueDt) { @@ -17,7 +16,6 @@ public static ProjectInfoResponse from(Project project) { return new ProjectInfoResponse( project.getId(), project.getTitle(), - project.getGoal(), project.getDescription(), project.getToDoInfo().getStartDt(), project.getToDoInfo().getDueDt()); diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java similarity index 86% rename from src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java rename to src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java index f450bf90..97661a7a 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipationInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java @@ -2,6 +2,6 @@ import io.swagger.v3.oas.annotations.media.Schema; -public record ProjectParticipationInfoResponse( +public record ProjectListInfoResponse( @Schema(description = "사용자가 참여중인 프로젝트 목록") ProjectInfoResponse projectInfo, @Schema(description = "참여 여부", example = "false") boolean isParticipate) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java new file mode 100644 index 00000000..5c6a9067 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java @@ -0,0 +1,24 @@ +package com.amcamp.domain.project.dto.response; + +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import io.swagger.v3.oas.annotations.media.Schema; + +public record ProjectParticipantInfoResponse( + @Schema(description = "프로젝트 아이디", example = "1") Long projectId, + @Schema(description = "프로젝트 참여자 멤버 아이디", example = "1") Long memberId, + @Schema(description = "프로젝트 참여자 아이디", example = "1") Long projectParticipantId, + @Schema(description = "프로젝트 참여자 이름", example = "정선우") String projectNickname, + @Schema(description = "프로젝트 참여자 이미지 url", example = "PreSigned URL") String profileImageUrl, + @Schema(description = "프로젝트 참여자 권한", example = "PROJECT_ADMIN") + ProjectParticipantRole role) { + public static ProjectParticipantInfoResponse from(ProjectParticipant participant) { + return new ProjectParticipantInfoResponse( + participant.getProject().getId(), + participant.getId(), + participant.getTeamParticipant().getMember().getId(), + participant.getProjectNickname(), + participant.getProjectProfile(), + participant.getProjectRole()); + } +} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java new file mode 100644 index 00000000..c56b9293 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java @@ -0,0 +1,24 @@ +package com.amcamp.domain.project.dto.response; + +import com.amcamp.domain.project.domain.ProjectRegistration; +import com.amcamp.domain.project.domain.ProjectRegistrationStatus; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; + +public record ProjectRegistrationInfoResponse( + @Schema(description = "프로젝트 아이디", example = "1") Long projectId, + @Schema(description = "프로젝트 가입 요청 아이디", example = "1") Long registrationId, + @Schema(description = "프로젝트 가입 요청자 아이디", example = "1") Long requesterId, + @Schema(description = "프로젝트 가입 요청 진행 상태", example = "REQUEST_PENDING") + ProjectRegistrationStatus projectRegistrationStatus, + @Schema(description = "최종 수정 날짜", example = "2024-01-01") LocalDate lastModifiedAt) { + + public static ProjectRegistrationInfoResponse from(ProjectRegistration projectRegistration) { + return new ProjectRegistrationInfoResponse( + projectRegistration.getProject().getId(), + projectRegistration.getId(), + projectRegistration.getRequester().getId(), + projectRegistration.getRequestStatus(), + projectRegistration.getUpdatedDt().toLocalDate()); + } +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index bd534339..fbe13599 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -8,11 +8,14 @@ @AllArgsConstructor public enum ProjectErrorCode implements BaseErrorCode { PROJECT_NOT_FOUND(HttpStatus.NOT_FOUND, "project 를 찾을 수 없습니다."), - + PROJECT_PARTICIPANT_LIMIT_EXCEED(HttpStatus.BAD_REQUEST, "project 별 최대 참여 가능 참여자 수를 초과했습니다."), PROJECT_PARTICIPATION_REQUIRED(HttpStatus.FORBIDDEN, "해당 프로젝트 참여자가 아닙니다."), UNAUTHORIZED_ACCESS(HttpStatus.FORBIDDEN, "권한이 없습니다."), + PROJECT_PARTICIPANT_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 참여중인 프로젝트 참가자입니다."), PROJECT_ADMIN_CANNOT_LEAVE( - HttpStatus.FORBIDDEN, "프로젝트 Admin은 다른 팀원에게 권한을 넘긴 후에만 프로젝트를 나갈 수 있습니다."); + HttpStatus.FORBIDDEN, "프로젝트 Admin은 다른 팀원에게 권한을 넘긴 후에만 프로젝트를 나갈 수 있습니다."), + PROJECT_REGISTRATION_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 프로젝트 가입 요청이 생성되어 있습니다"), + PROJECT_REGISTRATION_NOT_FOUND(HttpStatus.NOT_FOUND, "project 가입 요청을 찾을 수 없습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index ad02e64a..75ca3e2a 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -8,17 +8,21 @@ import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRegistrationRepository; import com.amcamp.domain.project.dao.ProjectRepository; -import com.amcamp.domain.project.domain.Project; -import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.project.domain.*; import com.amcamp.domain.project.dto.request.ProjectBasicInfoUpdateRequest; import com.amcamp.domain.project.dto.request.ProjectCreateRequest; import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectParticipationInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.global.exception.CommonException; @@ -27,7 +31,9 @@ import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; @@ -40,16 +46,17 @@ public class ProjectServiceTest extends IntegrationTest { @Autowired private MemberRepository memberRepository; @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private TeamRepository teamRepository; + @Autowired private ProjectRegistrationRepository projectRegistrationRepository; @Autowired private ProjectParticipantRepository projectParticipantRepository; @Autowired private ProjectRepository projectRepository; - private Member member; - private Member anotherMember; - private String title = "projectTitle"; - private String goal = "projectTitle"; - private String description = "projectGoal"; - private LocalDate startDt = LocalDate.of(2026, 1, 1); - private LocalDate dueDt = LocalDate.of(2026, 12, 1); + private Member memberAdmin; + private Member member1; + private Member member2; + private final String title = "projectTitle"; + private final String description = "projectDescription"; + private final LocalDate startDt = LocalDate.of(2026, 1, 1); + private final LocalDate dueDt = LocalDate.of(2026, 12, 1); private void loginAs(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); @@ -69,52 +76,61 @@ private Long getTeamId() { TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); - Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - return teamId; + return teamService.getTeamByCode(teamInviteCodeRequest).teamId(); } void createTestProject() { Long teamId = getTeamId(); ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, goal, startDt, dueDt, description); + new ProjectCreateRequest(teamId, title, startDt, dueDt, description); + + projectService.createProject(request); + } + + void createTestProject(Long teamId) { + ProjectCreateRequest request = + new ProjectCreateRequest(teamId, title, startDt, dueDt, description); projectService.createProject(request); } void createTestProject( - Long teamId, - String title, - String goal, - LocalDate startDt, - LocalDate dueDt, - String description) { + Long teamId, String title, LocalDate startDt, LocalDate dueDt, String description) { ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, goal, startDt, dueDt, description); + new ProjectCreateRequest(teamId, title, startDt, dueDt, description); projectService.createProject(request); } @BeforeEach - private void setUp() { - member = + public void setUp() { + memberAdmin = Member.createMember( - "member", + "memberAdmin", "testProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(member); - loginAs(member); + memberRepository.save(memberAdmin); + loginAs(memberAdmin); - anotherMember = + member1 = Member.createMember( - "anotherMember", + "member1", "testProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - memberRepository.save(anotherMember); + memberRepository.save(member1); + + member2 = + Member.createMember( + "member2", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(member2); } @AfterEach public void afterEach() { logout(); + projectRegistrationRepository.deleteAll(); projectParticipantRepository.deleteAll(); projectRepository.deleteAll(); teamParticipantRepository.deleteAll(); @@ -127,14 +143,14 @@ public void afterEach() { // given Long teamId = getTeamId(); // when - createTestProject(teamId, title, goal, startDt, dueDt, description); + createTestProject(teamId, title, startDt, dueDt, description); // then Project project = projectRepository.findById(1L).get(); assertThat(project.getId()).isEqualTo(1L); assertThat(project) - .extracting("id", "title", "description", "goal") - .containsExactlyInAnyOrder(1L, title, goal, description); + .extracting("id", "title", "description") + .containsExactlyInAnyOrder(1L, title, description); } @Nested @@ -143,21 +159,20 @@ class 프로젝트_조회 { void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, "project1", goal, startDt, dueDt, description); + createTestProject(teamId, "project1", startDt, dueDt, description); // member logout 후 anotherMember 로그인 logout(); - loginAs(anotherMember); + loginAs(member1); // 팀 참가 teamService.joinTeam(teamInviteCodeRequest); // anotherMember 새 프로젝트 생성 - createTestProject(teamId, "project2", goal, startDt, dueDt, description); + createTestProject(teamId, "project2", startDt, dueDt, description); // when - List foundResponse = - projectService.getProjectListInfo(teamId); + List foundResponse = projectService.getProjectListInfo(teamId); foundResponse.stream() - .filter(ProjectParticipationInfoResponse::isParticipate) + .filter(ProjectListInfoResponse::isParticipate) .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project2")); foundResponse.stream() .filter(f -> !f.isParticipate()) @@ -175,17 +190,11 @@ class 프로젝트_조회 { assertThat(foundResponse) .extracting( - "projectId", - "projectTitle", - "projectDescription", - "projectGoal", - "startDt", - "dueDt") + "projectId", "projectTitle", "projectDescription", "startDt", "dueDt") .containsExactlyInAnyOrder( project.getId(), project.getTitle(), project.getDescription(), - project.getGoal(), project.getToDoInfo().getStartDt(), project.getToDoInfo().getDueDt()); } @@ -212,8 +221,7 @@ class 프로젝트_업데이트 { void createOriginalProject() { Long teamId = getTeamId(); - createTestProject( - teamId, originalTitle, originalGoal, startDt, dueDt, originalDescription); + createTestProject(teamId, originalTitle, startDt, dueDt, originalDescription); } @Test @@ -228,7 +236,6 @@ void createOriginalProject() { Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); - assertThat(updatedProject.getGoal()).isEqualTo(updatedGoal); assertThat(updatedProject.getDescription()).isEqualTo(updatedDescription); } @@ -238,7 +245,7 @@ void createOriginalProject() { createOriginalProject(); logout(); // 팀에 속하지 않은 사용자 로그인 - loginAs(anotherMember); + loginAs(member1); // when, then assertThatThrownBy( @@ -257,7 +264,7 @@ void createOriginalProject() { createOriginalProject(); logout(); // 다른 팀 멤버 - loginAs(anotherMember); + loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); // when, then @@ -282,7 +289,6 @@ void createOriginalProject() { Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); - assertThat(updatedProject.getGoal()).isEqualTo(originalGoal); assertThat(updatedProject.getDescription()).isEqualTo(originalDescription); } @@ -296,7 +302,6 @@ void createOriginalProject() { Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); - assertThat(updatedProject.getGoal()).isEqualTo(updatedGoal); assertThat(updatedProject.getDescription()).isEqualTo(originalDescription); } @@ -310,7 +315,6 @@ void createOriginalProject() { Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); - assertThat(updatedProject.getGoal()).isEqualTo(originalGoal); assertThat(updatedProject.getDescription()).isEqualTo(updatedDescription); } @@ -351,8 +355,299 @@ void createOriginalProject() { } } + @Nested + class 프로젝트_가입_신청 { + @Test + void 프로젝트_가입신청을_하면_정상적으로_요청이_생성된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + projectService.requestToProjectRegistration(1L); + Team team = teamRepository.findById(teamId).get(); + TeamParticipant teamParticipant = + teamParticipantRepository.findByMemberAndTeam(member1, team).get(); + + // then + logout(); + loginAs(memberAdmin); + ProjectRegistrationInfoResponse registrationInfo = + projectService.getProjectRegistration(1L, 1L); + assertThat(registrationInfo.requesterId()).isEqualTo(teamParticipant.getId()); + assertThat( + registrationInfo.projectRegistrationStatus() + == ProjectRegistrationStatus.PENDING); + } + + @Test + void 프로젝트_멤버_수가_15명을_초과하면_가입신청이_제한된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); + + for (int i = 0; i < 14; i++) { + Member tmpMember = + Member.createMember( + "tmpMember" + i, + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + + memberRepository.save(tmpMember); + loginAs(tmpMember); + teamService.joinTeam(teamInviteCodeRequest); + projectService.requestToProjectRegistration(1L); + logout(); + } + + loginAs(memberAdmin); + for (long registrationId = 1L; registrationId < 15L; registrationId++) { + projectService.approveProjectRegistration(1L, (registrationId)); + } + logout(); + + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining( + ProjectErrorCode.PROJECT_PARTICIPANT_LIMIT_EXCEED.getMessage()); + } + + @Test + void 프로젝트_가입신청_목록을_조회하면_정상적으로_조회된다() { + // given + Long teamId = getTeamId(); + Team team = teamRepository.findById(teamId).get(); + createTestProject(teamId); + logout(); + + // when + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + TeamParticipant teamParticipant1 = + teamParticipantRepository.findByMemberAndTeam(member1, team).get(); + projectService.requestToProjectRegistration(1L); + + logout(); + loginAs(member2); + teamService.joinTeam(teamInviteCodeRequest); + TeamParticipant teamParticipant2 = + teamParticipantRepository.findByMemberAndTeam(member2, team).get(); + projectService.requestToProjectRegistration(1L); + + // then + logout(); + loginAs(memberAdmin); + List requesterIds = + projectService.getProjectRegistrationList(1L).stream() + .map(ProjectRegistrationInfoResponse::requesterId) + .toList(); + + assertThat(new HashSet<>(requesterIds)) + .isEqualTo(Set.of(teamParticipant1.getId(), teamParticipant2.getId())); + } + + @Test + void 이미_가입신청한_팀참여자는_신청하면_예외가_발생한다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + projectService.requestToProjectRegistration(1L); + + // then + assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining( + ProjectErrorCode.PROJECT_REGISTRATION_ALREADY_EXISTS.getMessage()); + } + + @Test + void 이미_가입된_프로젝트_참여자가_가입신청하면_예외가_발생한다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + + // when,then + assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining( + ProjectErrorCode.PROJECT_PARTICIPANT_ALREADY_EXISTS.getMessage()); + } + + @Test + void 프로젝트_가입을_승인하면_정상적으로_승인된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + projectService.requestToProjectRegistration(1L); + Team team = teamRepository.findById(teamId).get(); + TeamParticipant teamParticipant = + teamParticipantRepository.findByMemberAndTeam(member1, team).get(); + + // then + logout(); + loginAs(memberAdmin); + ProjectRegistrationInfoResponse registrationInfo = + projectService.getProjectRegistration(1L, 1L); + projectService.approveProjectRegistration(1L, registrationInfo.registrationId()); + + // then + ProjectRegistrationInfoResponse approvedRegistration = + projectService.getProjectRegistration(1L, 1L); + assertThat(approvedRegistration.requesterId()).isEqualTo(teamParticipant.getId()); + assertThat( + approvedRegistration.projectRegistrationStatus() + == ProjectRegistrationStatus.APPROVED); + } + + @Test + void 프로젝트_가입을_거부하면_정상적으로_거부된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + projectService.requestToProjectRegistration(1L); + Team team = teamRepository.findById(teamId).get(); + TeamParticipant teamParticipant = + teamParticipantRepository.findByMemberAndTeam(member1, team).get(); + + // then + logout(); + loginAs(memberAdmin); + ProjectRegistrationInfoResponse registrationInfo = + projectService.getProjectRegistration(1L, 1L); + projectService.rejectProjectRegistration(1L, registrationInfo.registrationId()); + + // then + ProjectRegistrationInfoResponse approvedRegistration = + projectService.getProjectRegistration(1L, 1L); + assertThat(approvedRegistration.requesterId()).isEqualTo(teamParticipant.getId()); + assertThat( + approvedRegistration.projectRegistrationStatus() + == ProjectRegistrationStatus.REJECTED); + } + + @Test + void 프로젝트_가입을_취소하면_요청이_정상적으로_삭제된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + // when + projectService.requestToProjectRegistration(1L); + projectService.deleteProjectRegistration(1L, 1L); + // then + logout(); + loginAs(memberAdmin); + assertThatThrownBy(() -> projectService.getProjectRegistration(1L, 1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining( + ProjectErrorCode.PROJECT_REGISTRATION_NOT_FOUND.getMessage()); + } + + @Test + void 프로젝트_참여자를_조회하면_정상적으로_조회된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); // 어드민 로그아웃 + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + projectService.requestToProjectRegistration(1L); + + // then + logout(); // member project 가입 신청 후 로그아웃 + loginAs(memberAdmin); // admin 다시 로그인 후 가입 승인 + ProjectRegistrationInfoResponse registrationInfo = + projectService.getProjectRegistration(1L, 1L); + projectService.approveProjectRegistration(1L, registrationInfo.registrationId()); + + // then + logout(); + loginAs(member1); + projectService.getProjectParticipantList(1L).forEach(System.out::println); + ProjectParticipantInfoResponse myInfo = projectService.getProjectParticipant(1L); + assertThat(myInfo.projectNickname()).isEqualTo(member1.getNickname()); + assertThat(myInfo.role()).isEqualTo(ProjectParticipantRole.MEMBER); + } + + @Test + void 프로젝트_참여자_목록을_조회하면_정상적으로_조회된다() { + // given + Long teamId = getTeamId(); + createTestProject(teamId); + logout(); // admin 로그아웃 + + // when + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + projectService.requestToProjectRegistration(1L); + logout(); // + + loginAs(member2); + teamService.joinTeam(teamInviteCodeRequest); + projectService.requestToProjectRegistration(1L); + logout(); + + loginAs(memberAdmin); + projectService.getProjectRegistrationList(1L).stream() + .map(ProjectRegistrationInfoResponse::registrationId) + .forEach(i -> projectService.approveProjectRegistration(1L, i)); + + // then + List requesterIds = + projectService.getProjectParticipantList(1L).stream() + .map(ProjectParticipantInfoResponse::memberId) + .toList(); + + assertThat(new HashSet<>(requesterIds)) + .isEqualTo(Set.of(memberAdmin.getId(), member1.getId(), member2.getId())); + } + } + @Nested class 프로젝트_삭제_및_나가기 { + + void composeProjectMembers() { + createTestProject(); + logout(); + loginAs(member1); + teamService.joinTeam(teamInviteCodeRequest); + + // when + projectService.requestToProjectRegistration(1L); + + // then + logout(); + loginAs(memberAdmin); + projectService.approveProjectRegistration(1L, 1L); + } + @Test void 프로젝트를_삭제하면_정상적으로_삭제된다() { // given @@ -365,31 +660,28 @@ class 프로젝트_삭제_및_나가기 { .hasMessageContaining(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } - // @Test - // void 권한이_없으면_삭제가_거부된다(){ - // //given - // createTestProject(); - // //권한 수정 - // //when - // projectService.deleteProjectParticipant(1L); - // //then - // assertThatThrownBy(()->projectService.getProjectInfo(1L)) - // .isInstanceOf(CommonException.class) - // .hasMessageContaining(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); - // } - - // @Test - // void 프로젝트_참가자가_2명_이상이면_admin은_프로젝트를_못나간다() { - // // given - // createTestProject(); - // // when - // //project 일반 멤버 추가 - // // then - // assertThatThrownBy(() -> projectService.deleteProjectParticipant(1L)) - // .isInstanceOf(CommonException.class) - // .hasMessageContaining( - // ProjectErrorCode.PROJECT_ADMIN_CANNOT_LEAVE.getMessage()); - // } + @Test + void 권한이_없으면_삭제가_거부된다() { + // given + composeProjectMembers(); + logout(); + loginAs(member1); + // when, then + assertThatThrownBy(() -> projectService.deleteProject(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(ProjectErrorCode.UNAUTHORIZED_ACCESS.getMessage()); + } + + @Test + void 프로젝트_참가자가_2명_이상이면_admin은_프로젝트를_못나간다() { + // given + composeProjectMembers(); + + // when, then + assertThatThrownBy(() -> projectService.deleteProjectParticipant(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(ProjectErrorCode.PROJECT_ADMIN_CANNOT_LEAVE.getMessage()); + } @Test void 프로젝트_참가자가_admin_1명이면_프로젝트가_삭제된다() { @@ -402,5 +694,23 @@ class 프로젝트_삭제_및_나가기 { .isInstanceOf(CommonException.class) .hasMessageContaining(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } + + @Test + void admin권한을_양도하면_정상적으로_프로젝트_참여자가_삭제된다() { + // given + composeProjectMembers(); + Long newAdminId = + projectService.getProjectParticipantList(1L).stream() + .filter(r -> !r.memberId().equals(memberAdmin.getId())) + .map(ProjectParticipantInfoResponse::projectParticipantId) + .findAny() + .get(); + // when + projectService.changeProjectAdmin(1L, newAdminId); + projectService.deleteProjectParticipant(1L); + // then + assertThat(projectService.getProjectParticipant(1L).projectNickname()) + .isEqualTo(String.valueOf(ProjectParticipantUnknown.NICKNAME)); + } } } diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 09fb1e84..e1b49f03 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -77,13 +77,15 @@ void setUp() { TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN); teamParticipantRepository.save(teamParticipant); - project = - Project.createProject( - team, "testTitle", "testDescription", "testGoal", startDt, dueDt); + project = Project.createProject(team, "testTitle", "testDescription", startDt, dueDt); projectRepository.save(project); ProjectParticipant projectParticipant = ProjectParticipant.createProjectParticipant( - teamParticipant, project, ProjectParticipantRole.ADMIN); + teamParticipant, + project, + member.getNickname(), + member.getProfileImageUrl(), + ProjectParticipantRole.ADMIN); projectParticipantRepository.save(projectParticipant); } diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index ce010f29..8d791826 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -80,7 +80,6 @@ void setUp() { new ProjectCreateRequest( teamId, "testProjectTitle", - "testProjectGoal", LocalDate.of(2026, 1, 1), LocalDate.of(2026, 12, 1), "testProjectDescription"); From 23b4f600406d016315ceb280b8bec9e46bdea22d Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 17 Mar 2025 18:26:01 +0900 Subject: [PATCH 049/107] =?UTF-8?q?feat:=20=ED=94=BC=EB=93=9C=EB=B0=B1=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=A0=84=EC=86=A1=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#114)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 피드백 메시지 전송 기능 구현 * feat: 같은 스프린트에서 특정 대상에게 피드백은 한 번만 보낼 수 있도록 제한 * refactor: 피드백 중복 전송 예외 상태 코드를 409 CONFLICT로 변경 * feat: 피드백 메시지 전송 시 최대 길이를 600자로 제한 * test: 피드백 메시지 전송 기능 테스트 * feat: 스프린트 마감 당일에만 피드백 메시지를 전송할 수 있도록 제한 * test: 스프린트 마감 당일에만 피드백 전송 가능 여부 검증 테스트 추가 * refactor: 불필요한 value 속성 제거 --- .../feedback/api/FeedbackController.java | 11 +- .../feedback/application/FeedbackService.java | 97 +++++++ .../feedback/dao/FeedbackRepository.java | 11 + .../domain/feedback/domain/Feedback.java | 54 ++++ .../dto/request/FeedbackSendRequest.java | 17 ++ .../errorcode/FeedbackErrorCode.java | 27 ++ .../application/FeedbackServiceTest.java | 242 ++++++++++++++++++ 7 files changed, 458 insertions(+), 1 deletion(-) create mode 100644 src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java create mode 100644 src/main/java/com/amcamp/domain/feedback/domain/Feedback.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/request/FeedbackSendRequest.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java create mode 100644 src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java diff --git a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java index 283b94fc..092e1b79 100644 --- a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java +++ b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java @@ -1,12 +1,14 @@ package com.amcamp.domain.feedback.api; import com.amcamp.domain.feedback.application.FeedbackService; +import com.amcamp.domain.feedback.dto.request.FeedbackSendRequest; import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @Tag(name = "7. 피드백 API", description = "피드백 관련 API입니다.") @@ -20,9 +22,16 @@ public class FeedbackController { @Operation( summary = "OpenAI 기반 피드백 메시지 개선", description = "사용자가 입력한 피드백을 AI가 분석하여 부드럽고 명확하게 개선합니다.") - @PostMapping(value = "/refinement") + @PostMapping("/refinement") public FeedbackRefineResponse feedbackRefine( @Valid @RequestBody OriginalFeedbackRequest request) { return feedbackService.refineFeedback(request); } + + @Operation(summary = "개선된 피드백 메시지 전송", description = "사용자가 AI를 통해 개선한 피드백을 특정 팀원에게 전송합니다.") + @PostMapping("/sent") + public ResponseEntity feedbackSend(@Valid @RequestBody FeedbackSendRequest request) { + feedbackService.sendFeedback(request); + return ResponseEntity.ok().build(); + } } diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java index a4d5fe73..e94597e4 100644 --- a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -1,7 +1,25 @@ package com.amcamp.domain.feedback.application; +import com.amcamp.domain.feedback.dao.FeedbackRepository; +import com.amcamp.domain.feedback.domain.Feedback; +import com.amcamp.domain.feedback.dto.request.FeedbackSendRequest; import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.FeedbackErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.util.MemberUtil; +import java.time.LocalDate; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -12,9 +30,88 @@ public class FeedbackService { private final ChatGptService chatGptService; + private final MemberUtil memberUtil; + private final FeedbackRepository feedbackRepository; + private final TeamParticipantRepository teamParticipantRepository; + private final ProjectParticipantRepository projectParticipantRepository; + private final SprintRepository sprintRepository; public FeedbackRefineResponse refineFeedback(OriginalFeedbackRequest request) { String chatResponse = chatGptService.getAiFeedback(request.originalMessage()); return new FeedbackRefineResponse(chatResponse); } + + public void sendFeedback(FeedbackSendRequest request) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(request.sprintId()); + + validateSprintDueDate(sprint); + + // 피드백을 보낼 대상 + final ProjectParticipant sender = findSender(currentMember, sprint.getProject()); + + // 피드백을 받을 대상 + final ProjectParticipant receiver = findReceiver(request.receiverId()); + + validateSenderIsNotReceiver(sender, receiver); + validateDuplicateFeedback(sender, receiver, sprint); + validateSameProject(sender, receiver); + + feedbackRepository.save( + Feedback.createFeedback(sender, receiver, sprint, request.message())); + } + + private Sprint findBySprintId(Long sprintId) { + return sprintRepository + .findById(sprintId) + .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + } + + private ProjectParticipant findSender(Member currentMember, Project project) { + final TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(currentMember, project.getTeam()) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } + + private ProjectParticipant findReceiver(Long receiverId) { + return projectParticipantRepository + .findById(receiverId) + .orElseThrow(() -> new CommonException(FeedbackErrorCode.RECEIVER_NOT_FOUND)); + } + + private void validateSenderIsNotReceiver( + ProjectParticipant sender, ProjectParticipant receiver) { + if (sender.getId().equals(receiver.getId())) { + throw new CommonException(FeedbackErrorCode.CANNOT_SEND_FEEDBACK_TO_SELF); + } + } + + private void validateSameProject(ProjectParticipant sender, ProjectParticipant receiver) { + if (!sender.getProject().equals(receiver.getProject())) { + throw new CommonException(FeedbackErrorCode.INVALID_PROJECT_PARTICIPANT); + } + } + + private void validateDuplicateFeedback( + ProjectParticipant sender, ProjectParticipant receiver, Sprint sprint) { + boolean feedbackExists = + feedbackRepository.existsBySenderAndReceiverAndSprint(sender, receiver, sprint); + + if (feedbackExists) { + throw new CommonException(FeedbackErrorCode.FEEDBACK_ALREADY_SENT); + } + } + + private void validateSprintDueDate(Sprint sprint) { + if (!sprint.getToDoInfo().getDueDt().isEqual(LocalDate.now())) { + throw new CommonException(FeedbackErrorCode.FEEDBACK_DUE_DATE_ONLY); + } + } } diff --git a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java new file mode 100644 index 00000000..4d64c96a --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.feedback.dao; + +import com.amcamp.domain.feedback.domain.Feedback; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.domain.Sprint; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface FeedbackRepository extends JpaRepository { + boolean existsBySenderAndReceiverAndSprint( + ProjectParticipant sender, ProjectParticipant receiver, Sprint sprint); +} diff --git a/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java b/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java new file mode 100644 index 00000000..93c2677e --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java @@ -0,0 +1,54 @@ +package com.amcamp.domain.feedback.domain; + +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.domain.Sprint; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class Feedback { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "feedback_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sender_id") + private ProjectParticipant sender; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "receiver_id") + private ProjectParticipant receiver; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sprint_id") + private Sprint sprint; + + @Column(length = 600) + private String message; + + @Builder(access = AccessLevel.PRIVATE) + private Feedback( + ProjectParticipant sender, ProjectParticipant receiver, Sprint sprint, String message) { + this.sender = sender; + this.receiver = receiver; + this.sprint = sprint; + this.message = message; + } + + public static Feedback createFeedback( + ProjectParticipant sender, ProjectParticipant receiver, Sprint sprint, String message) { + return Feedback.builder() + .sender(sender) + .receiver(receiver) + .sprint(sprint) + .message(message) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/feedback/dto/request/FeedbackSendRequest.java b/src/main/java/com/amcamp/domain/feedback/dto/request/FeedbackSendRequest.java new file mode 100644 index 00000000..5a6b8099 --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/request/FeedbackSendRequest.java @@ -0,0 +1,17 @@ +package com.amcamp.domain.feedback.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; + +public record FeedbackSendRequest( + @Schema(description = "스프린트 ID", example = "1") @NotNull(message = "스프린트 ID는 필수입니다.") + Long sprintId, + @Schema(description = "피드백을 받을 대상의 프로젝트 참여자 ID", example = "2") + @NotNull(message = "receiverId는 필수입니다.") + Long receiverId, + @Schema(description = "보낼 피드백 메시지", example = "이번 프로젝트에서 협업 방식이 좋았습니다!") + @NotBlank(message = "피드백 메시지는 비워둘 수 없습니다.") + @Size(max = 600, message = "피드백 메시지는 최대 600자까지 전송할 수 있습니다.") + String message) {} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java new file mode 100644 index 00000000..a12b7c6d --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java @@ -0,0 +1,27 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum FeedbackErrorCode implements BaseErrorCode { + RECEIVER_NOT_FOUND(HttpStatus.NOT_FOUND, "피드백을 받을 프로젝트 참여자를 찾을 수 없습니다."), + + INVALID_PROJECT_PARTICIPANT(HttpStatus.BAD_REQUEST, "같은 프로젝트에 속한 사람에게만 피드백을 보낼 수 있습니다."), + CANNOT_SEND_FEEDBACK_TO_SELF(HttpStatus.BAD_REQUEST, "본인에게 피드백을 보낼 수 없습니다."), + + FEEDBACK_ALREADY_SENT(HttpStatus.CONFLICT, "이미 해당 사용자에게 피드백을 보냈습니다."), + + FEEDBACK_DUE_DATE_ONLY(HttpStatus.BAD_REQUEST, "스프린트 마감 당일에만 피드백을 전송할 수 있습니다."), + ; + + private final HttpStatus httpStatus; + private final String message; + + @Override + public String errorClassName() { + return this.name(); + } +} diff --git a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java new file mode 100644 index 00000000..c8ba854a --- /dev/null +++ b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java @@ -0,0 +1,242 @@ +package com.amcamp.domain.feedback.application; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; + +import com.amcamp.IntegrationTest; +import com.amcamp.domain.feedback.dao.FeedbackRepository; +import com.amcamp.domain.feedback.domain.Feedback; +import com.amcamp.domain.feedback.dto.request.FeedbackSendRequest; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.FeedbackErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import java.time.LocalDate; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.transaction.annotation.Transactional; + +public class FeedbackServiceTest extends IntegrationTest { + + private final String feedbackMessage = "이번 스프린트에서 아주 잘해주셨습니다."; + + private final LocalDate startDt = LocalDate.now(); + private final LocalDate dueDt = LocalDate.now(); + + @Autowired private FeedbackService feedbackService; + @Autowired private FeedbackRepository feedbackRepository; + @Autowired private SprintRepository sprintRepository; + @Autowired private MemberRepository memberRepository; + @Autowired private TeamRepository teamRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; + @Autowired private ProjectRepository projectRepository; + @Autowired private ProjectParticipantRepository projectParticipantRepository; + + private ProjectParticipant sender; + private ProjectParticipant receiver; + private ProjectParticipant anotherReceiver; + private Sprint sprint; + private Project project; + + @BeforeEach + void setUp() { + Member senderMember = + memberRepository.save( + Member.createMember( + "testSenderNickname", + "testSenderProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + Member receiverMember = + memberRepository.save( + Member.createMember( + "testReceiverNickname", + "testReceiverProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + + UserDetails userDetails = + new PrincipalDetails(senderMember.getId(), senderMember.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + + Team team = teamRepository.save(Team.createTeam("testName", "testDescription")); + + TeamParticipant teamParticipantAdmin = + teamParticipantRepository.save( + TeamParticipant.createParticipant( + senderMember, team, TeamParticipantRole.ADMIN)); + TeamParticipant teamParticipantUser = + teamParticipantRepository.save( + TeamParticipant.createParticipant( + receiverMember, team, TeamParticipantRole.USER)); + + project = + projectRepository.save( + Project.createProject( + team, "testTitle", "testDescription", startDt, dueDt)); + Project anotherProject = + projectRepository.save( + Project.createProject( + team, "testTitle", "testDescription", startDt, dueDt)); + + sender = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantAdmin, + project, + senderMember.getNickname(), + senderMember.getProfileImageUrl(), + ProjectParticipantRole.ADMIN)); + + receiver = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUser, + project, + senderMember.getNickname(), + senderMember.getProfileImageUrl(), + ProjectParticipantRole.MEMBER)); + + anotherReceiver = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUser, + anotherProject, + "test", + "test", + ProjectParticipantRole.ADMIN)); + + sprint = + sprintRepository.save( + Sprint.createSprint(project, "testSprint", "testGoal", startDt, dueDt)); + } + + @Nested + class 피드백_메시지를_전송할_때 { + + @Test + @Transactional + void 입력_값이_정상이라면_피드백_메시지_전송에_성공한다() { + // given + FeedbackSendRequest request = + new FeedbackSendRequest(sprint.getId(), receiver.getId(), feedbackMessage); + + // when + feedbackService.sendFeedback(request); + + // then + Feedback feedback = feedbackRepository.findById(1L).get(); + assertThat(feedback.getSender()).isEqualTo(sender); + assertThat(feedback.getReceiver()).isEqualTo(receiver); + assertThat(feedback.getSprint()).isEqualTo(sprint); + assertThat(feedback.getMessage()).isEqualTo(feedbackMessage); + } + + @Test + void 본인에게_피드백_메시지를_전송하면_예외가_발생한다() { + // given + FeedbackSendRequest request = + new FeedbackSendRequest(sprint.getId(), sender.getId(), feedbackMessage); + + // when & then + assertThatThrownBy(() -> feedbackService.sendFeedback(request)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.CANNOT_SEND_FEEDBACK_TO_SELF.getMessage()); + } + + @Test + void 같은_스프린트에서_특정_대상에게_피드백_메시지를_두_번_전송하면_예외가_발생한다() { + // given + FeedbackSendRequest request = + new FeedbackSendRequest(sprint.getId(), receiver.getId(), feedbackMessage); + feedbackService.sendFeedback(request); + + // when & then + FeedbackSendRequest duplicateRequest = + new FeedbackSendRequest(sprint.getId(), receiver.getId(), feedbackMessage); + assertThatThrownBy(() -> feedbackService.sendFeedback(duplicateRequest)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.FEEDBACK_ALREADY_SENT.getMessage()); + } + + @Test + void 스프린트가_존재하지_않는다면_예외가_발생한다() { + // given + FeedbackSendRequest request = + new FeedbackSendRequest(999L, receiver.getId(), feedbackMessage); + + // when & then + assertThatThrownBy(() -> feedbackService.sendFeedback(request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 피드백을_받을_대상이_존재하지_않는다면_예외가_발생한다() { + // given + FeedbackSendRequest request = + new FeedbackSendRequest(sprint.getId(), 999L, feedbackMessage); + + // when & then + assertThatThrownBy(() -> feedbackService.sendFeedback(request)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.RECEIVER_NOT_FOUND.getMessage()); + } + + @Test + void 같은_프로젝트에_속하지_않은_대상에게_피드백_메시지를_전송하면_예외가_발생한다() { + // given + FeedbackSendRequest request = + new FeedbackSendRequest( + sprint.getId(), anotherReceiver.getId(), feedbackMessage); + + // when & then + assertThatThrownBy(() -> feedbackService.sendFeedback(request)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.INVALID_PROJECT_PARTICIPANT.getMessage()); + } + + @Test + @Transactional + void 스프린트_마감_당일_날이_아니라면_예외가_발생한다() { + // given + sprint = + sprintRepository.save( + Sprint.createSprint( + project, + "testSprint", + "testGoal", + startDt, + LocalDate.of(2030, 1, 1))); + + FeedbackSendRequest request = + new FeedbackSendRequest(sprint.getId(), receiver.getId(), feedbackMessage); + + // when & then + assertThatThrownBy(() -> feedbackService.sendFeedback(request)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.FEEDBACK_DUE_DATE_ONLY.getMessage()); + } + } +} From 899c1f9fca4dfcdbf340f6deb9fa52380824e542 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Thu, 20 Mar 2025 15:22:38 +0900 Subject: [PATCH 050/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20QueryDSL?= =?UTF-8?q?=20=EC=A0=81=EC=9A=A9=20(#105)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: project 목록 참여별 조회 -> QueryDSL 페이지네이션 적용 * refactor: Project 목록조회 -> isParticipant 필터 적용, ProjectRegistration 목록 조회 페이지네이션 적용 * refactor: QEntity static import * refactor: Projection constructor 생성자 컨벤션 수정 * refactor: custom Repostiory 상속 관계 정리 -> 메인 레포지토리로 일원화 * refactor: projectRegistrationRepository 칼럼 매핑명 오류 수정 --- .../domain/project/api/ProjectController.java | 43 +++++----- .../project/application/ProjectService.java | 35 ++++---- .../dao/ProjectRegistrationRepository.java | 3 +- .../ProjectRegistrationRepositoryCustom.java | 9 ++ .../ProjectRegistrationRepositoryImpl.java | 64 ++++++++++++++ .../domain/project/dao/ProjectRepository.java | 2 +- .../project/dao/ProjectRepositoryCustom.java | 13 ++- .../dao/ProjectRepositoryCustomImpl.java | 20 ----- .../project/dao/ProjectRepositoryImpl.java | 84 +++++++++++++++++++ .../ProjectRegistrationInfoResponse.java | 7 +- .../domain/project/ProjectServiceTest.java | 26 +++--- 11 files changed, 224 insertions(+), 82 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java delete mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java create mode 100644 src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index a9e84f8e..aae73039 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -3,7 +3,6 @@ import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import io.swagger.v3.oas.annotations.Operation; @@ -11,6 +10,7 @@ import jakarta.validation.Valid; import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -34,19 +34,22 @@ public ResponseEntity projectCreate( return ResponseEntity.status(HttpStatus.CREATED).build(); } - // read - @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") - @GetMapping("/{projectId}") - public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { - return projectService.getProjectInfo(projectId); - } - @Operation( summary = "전체 프로젝트 목록 조회", description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") @GetMapping("/{teamId}/list") - public List projectListInfo(@PathVariable Long teamId) { - return projectService.getProjectListInfo(teamId); + public Slice projectListInfo( + @PathVariable Long teamId, + @RequestParam boolean isParticipant, + @RequestParam(required = false) Long lastProjectId, + @RequestParam(defaultValue = "10") int pageSize) { + return projectService.getProjectListInfo(teamId, lastProjectId, pageSize, isParticipant); + } + + @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") + @GetMapping("/{projectId}") + public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { + return projectService.getProjectInfo(projectId); } // update @@ -84,18 +87,20 @@ public ResponseEntity projectRegister(@PathVariable Long projectId) { return ResponseEntity.ok().build(); } - @Operation(summary = "프로젝트 가입 신청 조회", description = "프로젝트 가입 신청 정보를 조회합니다.") - @GetMapping("/{projectId}/registration") - public List projectRegistrationGet( - @PathVariable Long projectId) { - return projectService.getProjectRegistrationList(projectId); - } + // @Operation(summary = "프로젝트 가입 신청 조회", description = "프로젝트 가입 신청 정보를 조회합니다.") + // @GetMapping("/{projectId}/registration") + // public List projectRegistrationGet( + // @PathVariable Long projectId) { + // return projectService.getProjectRegistration(projectId); + // } @Operation(summary = "프로젝트 가입 신청 목록 조회", description = "현재 프로젝트에 신청된 가입 요청 목록을 조회합니다.") @GetMapping("/{projectId}/registration/list") - public ProjectRegistrationInfoResponse projectRegistrationListGet( - @PathVariable Long projectId, @RequestParam Long projectRegisterId) { - return projectService.getProjectRegistration(projectId, projectRegisterId); + public Slice projectRegistrationListGet( + @PathVariable Long projectId, + @RequestParam(required = false) Long lastRegistrationId, + @RequestParam(defaultValue = "10") int pageSize) { + return projectService.getProjectRegistrationList(projectId, lastRegistrationId, pageSize); } @Operation(summary = "프로젝트 가입 신청 승인", description = "프로젝트 가입 신청을 승인합니다.") diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index d17b4caa..d2b02049 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -2,15 +2,11 @@ import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.project.dao.ProjectParticipantRepository; -import com.amcamp.domain.project.dao.ProjectRegistrationRepository; -import com.amcamp.domain.project.dao.ProjectRepository; -import com.amcamp.domain.project.dao.ProjectRepositoryCustom; +import com.amcamp.domain.project.dao.*; import com.amcamp.domain.project.domain.*; import com.amcamp.domain.project.domain.ProjectRegistration; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -25,6 +21,7 @@ import java.util.List; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -38,7 +35,6 @@ public class ProjectService { private final MemberUtil memberUtil; private final TeamParticipantRepository teamParticipantRepository; private final ProjectParticipantRepository projectParticipantRepository; - private final ProjectRepositoryCustom projectRepositoryCustom; private final MemberRepository memberRepository; private final ProjectRegistrationRepository projectRegistrationRepository; @@ -73,17 +69,14 @@ public ProjectInfoResponse getProjectInfo(Long projectId) { } @Transactional(readOnly = true) - public List getProjectListInfo(Long teamId) { - List projectList = projectRepositoryCustom.findAllByTeamId(teamId); + public Slice getProjectListInfo( + Long teamId, Long lastProjectId, int pageSize, boolean isParticipant) { + Member member = memberUtil.getCurrentMember(); - TeamParticipant teamParticipant = getValidTeamParticipant(member, getTeam(teamId)); - return projectList.stream() - .map( - p -> - new ProjectListInfoResponse( - ProjectInfoResponse.from(p), - isProjectParticipant(p, teamParticipant))) - .collect(Collectors.toList()); + Team team = getTeam(teamId); + TeamParticipant teamParticipant = getValidTeamParticipant(member, team); + return projectRepository.findAllByTeamIdWithPagination( + teamId, lastProjectId, pageSize, teamParticipant, isParticipant); } // update @@ -158,6 +151,7 @@ public void requestToProjectRegistration(Long projectId) { projectRegistrationRepository.save(ProjectRegistration.createRequest(project, requester)); } + @Transactional(readOnly = true) public ProjectRegistrationInfoResponse getProjectRegistration( Long projectId, Long registrationId) { Member member = memberUtil.getCurrentMember(); @@ -166,13 +160,14 @@ public ProjectRegistrationInfoResponse getProjectRegistration( return ProjectRegistrationInfoResponse.from(getProjectRegistrationById(registrationId)); } - public List getProjectRegistrationList(Long projectId) { + @Transactional(readOnly = true) + public Slice getProjectRegistrationList( + Long projectId, Long lastRegistrationId, int pageSize) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); validateProjectAdmin(member, project); - return projectRegistrationRepository.findAllByProject(project).stream() - .map(ProjectRegistrationInfoResponse::from) - .collect(Collectors.toList()); + return projectRegistrationRepository.findAllByProjectIdWithPagination( + projectId, lastRegistrationId, pageSize); } public void approveProjectRegistration(Long projectId, Long registrationId) { diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java index 4532a0e6..55193813 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java @@ -7,7 +7,8 @@ import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; -public interface ProjectRegistrationRepository extends JpaRepository { +public interface ProjectRegistrationRepository + extends JpaRepository, ProjectRegistrationRepositoryCustom { List findAllByProject(Project project); Optional findByRequester(TeamParticipant teamParticipant); diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java new file mode 100644 index 00000000..0f125c4a --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java @@ -0,0 +1,9 @@ +package com.amcamp.domain.project.dao; + +import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; +import org.springframework.data.domain.Slice; + +public interface ProjectRegistrationRepositoryCustom { + Slice findAllByProjectIdWithPagination( + Long projectId, Long lastRegistrationId, int pageSize); +} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java new file mode 100644 index 00000000..93aa43bf --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java @@ -0,0 +1,64 @@ +package com.amcamp.domain.project.dao; + +import static com.amcamp.domain.project.domain.QProject.project; +import static com.amcamp.domain.project.domain.QProjectRegistration.projectRegistration; + +import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; + +@RequiredArgsConstructor +public class ProjectRegistrationRepositoryImpl implements ProjectRegistrationRepositoryCustom { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findAllByProjectIdWithPagination( + Long projectId, Long lastRegistrationId, int pageSize) { + + List responses = + jpaQueryFactory + .select( + Projections.constructor( + ProjectRegistrationInfoResponse.class, + projectRegistration.project.id, + projectRegistration.id, + projectRegistration.requester.id, + projectRegistration.requestStatus)) + .from(projectRegistration) + .leftJoin(project) + .on(projectRegistration.project.eq(project)) + .where( + projectRegistration.project.id.eq(projectId), + lastProjectRegistrationCondition(lastRegistrationId)) + .orderBy(projectRegistration.id.desc()) + .limit(pageSize + 1) + .fetch(); + + return checkLastPage(pageSize, responses); + } + + private BooleanExpression lastProjectRegistrationCondition(Long projectRegistrationId) { + return (projectRegistrationId == null) + ? null + : projectRegistration.id.lt(projectRegistrationId); + } + + private Slice checkLastPage( + int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java index 7d989a90..f343f28e 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepository.java @@ -3,4 +3,4 @@ import com.amcamp.domain.project.domain.Project; import org.springframework.data.jpa.repository.JpaRepository; -public interface ProjectRepository extends JpaRepository {} +public interface ProjectRepository extends JpaRepository, ProjectRepositoryCustom {} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java index 30557fb2..d1f664b6 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java @@ -1,8 +1,15 @@ package com.amcamp.domain.project.dao; -import com.amcamp.domain.project.domain.Project; -import java.util.List; +import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.team.domain.TeamParticipant; +import org.springframework.data.domain.Slice; public interface ProjectRepositoryCustom { - List findAllByTeamId(Long teamId); + + Slice findAllByTeamIdWithPagination( + Long teamId, + Long lastProjectId, + int pageSize, + TeamParticipant teamParticipant, + boolean isParticipant); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java deleted file mode 100644 index 51158610..00000000 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustomImpl.java +++ /dev/null @@ -1,20 +0,0 @@ -package com.amcamp.domain.project.dao; - -import static com.amcamp.domain.project.domain.QProject.project; - -import com.amcamp.domain.project.domain.Project; -import com.querydsl.jpa.impl.JPAQueryFactory; -import java.util.List; -import lombok.RequiredArgsConstructor; -import org.springframework.stereotype.Repository; - -@Repository -@RequiredArgsConstructor -public class ProjectRepositoryCustomImpl implements ProjectRepositoryCustom { - private final JPAQueryFactory queryFactory; - - @Override - public List findAllByTeamId(Long teamId) { - return queryFactory.selectFrom(project).where(project.team.id.eq(teamId)).fetch(); - } -} diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java new file mode 100644 index 00000000..894dfcaa --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -0,0 +1,84 @@ +package com.amcamp.domain.project.dao; + +import static com.amcamp.domain.project.domain.QProject.project; +import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; + +import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; + +@RequiredArgsConstructor +public class ProjectRepositoryImpl implements ProjectRepositoryCustom { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findAllByTeamIdWithPagination( + Long teamId, + Long lastProjectId, + int pageSize, + TeamParticipant teamParticipant, + boolean isParticipant) { + + List responses = + jpaQueryFactory + .select( + Projections.constructor( + ProjectInfoResponse.class, + project.id, + project.title, + project.description, + project.toDoInfo.startDt, + project.toDoInfo.dueDt)) + .from(project) + .leftJoin(projectParticipant) + .on( + projectParticipant + .project + .eq(project) + .and( + projectParticipant.teamParticipant.eq( + teamParticipant))) + .where( + project.team.id.eq(teamId), + lastProjectCondition(lastProjectId), + participantCondition(isParticipant, teamParticipant)) + .orderBy(project.id.desc()) + .limit(pageSize + 1) + .fetch(); + + return checkLastPage(pageSize, responses); + } + + private BooleanExpression participantCondition( + boolean isParticipant, TeamParticipant teamParticipant) { + if (isParticipant) { + return projectParticipant.teamParticipant.eq(teamParticipant); + } else { + return projectParticipant.teamParticipant.isNull(); + } + } + + private BooleanExpression lastProjectCondition(Long projectId) { + return (projectId == null) ? null : project.id.lt(projectId); + } + + private Slice checkLastPage( + int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java index c56b9293..ed5843d2 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegistrationInfoResponse.java @@ -3,22 +3,19 @@ import com.amcamp.domain.project.domain.ProjectRegistration; import com.amcamp.domain.project.domain.ProjectRegistrationStatus; import io.swagger.v3.oas.annotations.media.Schema; -import java.time.LocalDate; public record ProjectRegistrationInfoResponse( @Schema(description = "프로젝트 아이디", example = "1") Long projectId, @Schema(description = "프로젝트 가입 요청 아이디", example = "1") Long registrationId, @Schema(description = "프로젝트 가입 요청자 아이디", example = "1") Long requesterId, @Schema(description = "프로젝트 가입 요청 진행 상태", example = "REQUEST_PENDING") - ProjectRegistrationStatus projectRegistrationStatus, - @Schema(description = "최종 수정 날짜", example = "2024-01-01") LocalDate lastModifiedAt) { + ProjectRegistrationStatus projectRegistrationStatus) { public static ProjectRegistrationInfoResponse from(ProjectRegistration projectRegistration) { return new ProjectRegistrationInfoResponse( projectRegistration.getProject().getId(), projectRegistration.getId(), projectRegistration.getRequester().getId(), - projectRegistration.getRequestStatus(), - projectRegistration.getUpdatedDt().toLocalDate()); + projectRegistration.getRequestStatus()); } } diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 75ca3e2a..e8b6621f 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -15,7 +15,6 @@ import com.amcamp.domain.project.dto.request.ProjectCreateRequest; import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.application.TeamService; @@ -36,6 +35,7 @@ import java.util.Set; import org.junit.jupiter.api.*; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -169,14 +169,12 @@ class 프로젝트_조회 { createTestProject(teamId, "project2", startDt, dueDt, description); // when - List foundResponse = projectService.getProjectListInfo(teamId); - - foundResponse.stream() - .filter(ProjectListInfoResponse::isParticipate) - .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project2")); - foundResponse.stream() - .filter(f -> !f.isParticipate()) - .forEach(r -> assertThat(r.projectInfo().projectTitle()).isEqualTo("project1")); + Slice responseTrue = + projectService.getProjectListInfo(teamId, null, 10, true); + Slice responseFalse = + projectService.getProjectListInfo(teamId, null, 10, false); + assertThat(responseTrue.getContent().get(0).projectTitle()).isEqualTo("project2"); + assertThat(responseFalse.getContent().get(0).projectTitle()).isEqualTo("project1"); } @Test @@ -445,10 +443,11 @@ class 프로젝트_가입_신청 { // then logout(); loginAs(memberAdmin); + Slice response = + projectService.getProjectRegistrationList(1L, null, 10); + List requesterIds = - projectService.getProjectRegistrationList(1L).stream() - .map(ProjectRegistrationInfoResponse::requesterId) - .toList(); + response.stream().map(ProjectRegistrationInfoResponse::requesterId).toList(); assertThat(new HashSet<>(requesterIds)) .isEqualTo(Set.of(teamParticipant1.getId(), teamParticipant2.getId())); @@ -615,7 +614,8 @@ class 프로젝트_가입_신청 { logout(); loginAs(memberAdmin); - projectService.getProjectRegistrationList(1L).stream() + + projectService.getProjectRegistrationList(1L, null, 10).stream() .map(ProjectRegistrationInfoResponse::registrationId) .forEach(i -> projectService.approveProjectRegistration(1L, i)); From 49409d4d0a2fe401b7c1c4a6352a82c1b957516b Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Thu, 20 Mar 2025 15:22:58 +0900 Subject: [PATCH 051/107] =?UTF-8?q?feat:=20=ED=8C=80=20=EB=AF=B8=ED=8C=85?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1=20=EA=B5=AC=ED=98=84=20(#117)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 팀 미팅 생성 구현(Sprint 도메인 의존성 추가 +SprintRepository 단일 조회 로직 추가 * refactor: 미팅 일시 dto description 수정 * refactor: meetingCreate 요청 형식 수정, 불필요한 Sprint 레포지토리 쿼리 메소드 삭제 * refactor: mapping url 추가 * refactor: 응답코드 created 수정 * refactor: 동일 제목/타이틀 방지 검증 로직 추가 * refactor: SprintRepository 기본조회로직 제거 확인 * refactor: MeetingRepository 기본조회로직 제거 * refactor: MeetingDt -> MeetingStart, MeetingEnd 분화, 8:00-00:00 검증로직 추가 * refactor: create url 수정 * refactor: 에러코드 메세지 도메인 변경사항 맞춰 일부 수정 * refactor: 스웨거 명세서 번호 수정 (8->9) --- .../domain/meeting/api/MeetingController.java | 26 ++ .../meeting/application/MeetingService.java | 104 +++++++ .../domain/meeting/dao/MeetingRepository.java | 24 ++ .../amcamp/domain/meeting/domain/Meeting.java | 62 ++++ .../domain/meeting/domain/MeetingStatus.java | 13 + .../dto/request/MeetingCreateRequest.java | 14 + .../amcamp/domain/sprint/domain/Sprint.java | 5 + .../exception/errorcode/MeetingErrorCode.java | 23 ++ .../domain/meeting/MeetingServiceTest.java | 264 ++++++++++++++++++ 9 files changed, 535 insertions(+) create mode 100644 src/main/java/com/amcamp/domain/meeting/api/MeetingController.java create mode 100644 src/main/java/com/amcamp/domain/meeting/application/MeetingService.java create mode 100644 src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java create mode 100644 src/main/java/com/amcamp/domain/meeting/domain/Meeting.java create mode 100644 src/main/java/com/amcamp/domain/meeting/domain/MeetingStatus.java create mode 100644 src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java create mode 100644 src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java diff --git a/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java b/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java new file mode 100644 index 00000000..7675cf08 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java @@ -0,0 +1,26 @@ +package com.amcamp.domain.meeting.api; + +import com.amcamp.domain.meeting.application.MeetingService; +import com.amcamp.domain.meeting.dto.request.MeetingCreateRequest; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "9. 팀 미팅 API", description = "팀 미팅 관련 API입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/meetings") +public class MeetingController { + + private final MeetingService meetingService; + + @Operation(summary = "미팅 생성", description = "새로운 미팅을 생성합니다.") + @PostMapping("/create") + public ResponseEntity meetingCreate(@RequestBody MeetingCreateRequest request) { + meetingService.createMeeting(request); + return ResponseEntity.status(HttpStatus.CREATED).build(); + } +} diff --git a/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java b/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java new file mode 100644 index 00000000..76b41580 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java @@ -0,0 +1,104 @@ +package com.amcamp.domain.meeting.application; + +import com.amcamp.domain.meeting.dao.MeetingRepository; +import com.amcamp.domain.meeting.domain.Meeting; +import com.amcamp.domain.meeting.dto.request.MeetingCreateRequest; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.MeetingErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.util.MemberUtil; +import java.time.LocalDateTime; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +@RequiredArgsConstructor +public class MeetingService { + + private final TeamParticipantRepository teamParticipantRepository; + private final ProjectParticipantRepository projectParticipantRepository; + private final MeetingRepository meetingRepository; + private final SprintRepository sprintRepository; + private final MemberUtil memberUtil; + + // 미팅 생성 + public void createMeeting(MeetingCreateRequest request) { + Member member = memberUtil.getCurrentMember(); + Sprint sprint = getValidateSprint(member, request.sprintId()); + validateMeetingTime(sprint, request.meetingStart(), request.meetingEnd()); + meetingRepository.save( + Meeting.createMeeting( + request.title(), request.meetingStart(), request.meetingEnd(), sprint)); + } + + // util + private void validateMeetingTime( + Sprint sprint, LocalDateTime meetingStart, LocalDateTime meetingEnd) { + + // start,end 선후 관계 확인 + if (meetingStart.isAfter(meetingEnd) || meetingStart.isEqual(meetingEnd)) { + throw new CommonException(MeetingErrorCode.INVALID_MEETING_TIME_RANGE); + } + // 8:00~00:00 + if (meetingStart.getHour() < 8 + || (meetingEnd.getHour() == 0 && meetingEnd.getMinute() > 0)) { + throw new CommonException(MeetingErrorCode.INVALID_MEETING_TIME_RANGE); + } + // 스프린트 범위 확인 + if (meetingStart.toLocalDate().isBefore(sprint.getToDoInfo().getStartDt()) + || meetingEnd.toLocalDate().isAfter(sprint.getToDoInfo().getDueDt())) { + throw new CommonException(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT); + } // 기존 일정과의 중복 확인 + if (meetingRepository + .findOverlappingMeeting(sprint, meetingStart, meetingEnd) + .isPresent()) { + throw new CommonException(MeetingErrorCode.MEETING_ALREADY_EXISTS); + } + } + + private TeamParticipant getValidTeamParticipant(Member member, Team team) { + return teamParticipantRepository + .findByMemberAndTeam(member, team) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + } + + private ProjectParticipant validateProjectParticipant(Member member, Project project) { + TeamParticipant teamParticipant = getValidTeamParticipant(member, project.getTeam()); + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } + + private Sprint getValidateSprint(Member member, Long sprintId) { + Sprint sprint = + sprintRepository + .findById(sprintId) + .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + validateProjectParticipant(member, sprint.getProject()); + return sprint; + } + + private Meeting getMeetingById(Long meetingId) { + return meetingRepository + .findById(meetingId) + .orElseThrow(() -> new CommonException(MeetingErrorCode.MEETING_NOT_FOUND)); + } + + private boolean isMeetingExist(Long meetingId) { + return meetingRepository.findById(meetingId).isPresent(); + } +} diff --git a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java new file mode 100644 index 00000000..6f9cd5ba --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java @@ -0,0 +1,24 @@ +package com.amcamp.domain.meeting.dao; + +import com.amcamp.domain.meeting.domain.Meeting; +import com.amcamp.domain.sprint.domain.Sprint; +import feign.Param; +import java.time.LocalDateTime; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +@Repository +public interface MeetingRepository extends JpaRepository { + @Query( + "select m from Meeting m where m.sprint = :sprint " + + "and ((:meetingStart between m.meetingStart and m.meetingEnd) " + + "or (:meetingEnd between m.meetingStart and m.meetingEnd) " + + "or (m.meetingStart between :meetingStart and :meetingEnd) " + + "or (m.meetingEnd between :meetingStart and :meetingEnd))") + Optional findOverlappingMeeting( + @Param("sprint") Sprint sprint, + @Param("meetingStart") LocalDateTime meetingStart, + @Param("meetingEnd") LocalDateTime meetingEnd); +} diff --git a/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java b/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java new file mode 100644 index 00000000..c41fff11 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java @@ -0,0 +1,62 @@ +package com.amcamp.domain.meeting.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.sprint.domain.Sprint; +import jakarta.persistence.*; +import java.time.LocalDateTime; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor +public class Meeting extends BaseTimeEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "meeting_id") + private Long id; + + @Column(name = "meeting_title") + private String title; + + @Column(name = "meeting_start") + private LocalDateTime meetingStart; + + @Column(name = "meeting_end") + private LocalDateTime meetingEnd; + + @Column(name = "meeting_status") + private MeetingStatus status; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sprint_id") + private Sprint sprint; + + @Builder(access = AccessLevel.PRIVATE) + private Meeting( + String title, + LocalDateTime meetingStart, + LocalDateTime meetingEnd, + Sprint sprint, + MeetingStatus status) { + this.title = title; + this.meetingStart = meetingStart; + this.meetingEnd = meetingEnd; + this.sprint = sprint; + this.status = status; + } + + public static Meeting createMeeting( + String title, LocalDateTime meetingStart, LocalDateTime meetingEnd, Sprint sprint) { + return Meeting.builder() + .title(title) + .meetingStart(meetingStart) + .meetingEnd(meetingEnd) + .sprint(sprint) + .status(MeetingStatus.OPEN) + .build(); + } +} diff --git a/src/main/java/com/amcamp/domain/meeting/domain/MeetingStatus.java b/src/main/java/com/amcamp/domain/meeting/domain/MeetingStatus.java new file mode 100644 index 00000000..d68bddbb --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/domain/MeetingStatus.java @@ -0,0 +1,13 @@ +package com.amcamp.domain.meeting.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum MeetingStatus { + OPEN("MEETING_OPEN"), + CLOSE("MEETING_CLOSE"); + + private final String status; +} diff --git a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java new file mode 100644 index 00000000..59df904a --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.meeting.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; + +public record MeetingCreateRequest( + @Schema(description = "스프린트 아이디", example = "1") @NotNull Long sprintId, + @Schema(description = "미팅 타이틀", example = "중간 점검 회의") @NotBlank String title, + @Schema(description = "미팅 시작 날짜/시간", example = "2026-03-01T15:17:00") @NotNull + LocalDateTime meetingStart, + @Schema(description = "미팅 종료 날짜/시간", example = "2026-03-01T15:18:00") @NotNull + LocalDateTime meetingEnd) {} diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index 0c4fc65a..2498dff3 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -1,6 +1,7 @@ package com.amcamp.domain.sprint.domain; import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ToDoInfo; import com.amcamp.domain.project.domain.ToDoStatus; @@ -37,6 +38,10 @@ public class Sprint extends BaseTimeEntity { @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) private List tasks = new ArrayList<>(); + // Meeting + @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) + private List meetings = new ArrayList<>(); + // 기여도 @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) private List contributions = new ArrayList<>(); diff --git a/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java new file mode 100644 index 00000000..d2086a13 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java @@ -0,0 +1,23 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum MeetingErrorCode implements BaseErrorCode { + MEETING_NOT_FOUND(HttpStatus.NOT_FOUND, "팀 미팅을 찾을 수 없습니다."), + UNAUTHORIZED_ACCESS(HttpStatus.FORBIDDEN, "권한이 없습니다."), + INVALID_MEETING_TIME_RANGE(HttpStatus.BAD_REQUEST, "유효한 범위 내의 시간을 입력해야합니다."), + MEETING_DATE_OUT_OF_SPRINT(HttpStatus.BAD_REQUEST, "팀 미팅은 스프린트 기간 내에 생성되어야 합니다."), + MEETING_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 해당 시간대에 일정이 존재합니다."); + + private final HttpStatus httpStatus; + private final String message; + + @Override + public String errorClassName() { + return this.name(); + } +} diff --git a/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java b/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java new file mode 100644 index 00000000..71f71a25 --- /dev/null +++ b/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java @@ -0,0 +1,264 @@ +package com.amcamp.domain.meeting; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import com.amcamp.IntegrationTest; +import com.amcamp.domain.meeting.application.MeetingService; +import com.amcamp.domain.meeting.dao.MeetingRepository; +import com.amcamp.domain.meeting.domain.Meeting; +import com.amcamp.domain.meeting.domain.MeetingStatus; +import com.amcamp.domain.meeting.dto.request.MeetingCreateRequest; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.project.application.ProjectService; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRegistrationRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.sprint.application.SprintService; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.MeetingErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import java.time.LocalDate; +import java.time.LocalDateTime; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; + +public class MeetingServiceTest extends IntegrationTest { + @Autowired private SprintService sprintService; + @Autowired private ProjectService projectService; + @Autowired private TeamService teamService; + @Autowired private MemberRepository memberRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; + @Autowired private TeamRepository teamRepository; + @Autowired private ProjectRegistrationRepository projectRegistrationRepository; + @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private ProjectRepository projectRepository; + @Autowired private SprintRepository sprintRepository; + @Autowired private MeetingRepository meetingRepository; + @Autowired private MeetingService meetingService; + + private Member memberAdmin; + private Member member1; + private Member member2; + private final String projectTitle = "projectTitle"; + private final String description = "projectDescription"; + private final String meetingTitle = "meetingTitle"; + private final LocalDate projectStartDt = LocalDate.of(2026, 1, 1); + private final LocalDate projectDueDt = LocalDate.of(2026, 12, 1); + private final LocalDate sprintStartDt = LocalDate.of(2026, 3, 1); + private final LocalDate sprintDueDt = LocalDate.of(2026, 3, 31); + private final LocalDateTime meetingStart = LocalDateTime.of(2026, 3, 15, 17, 0); + private final LocalDateTime meetingEnd = LocalDateTime.of(2026, 3, 15, 18, 0); + + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + private void logout() { + SecurityContextHolder.clearContext(); + } + + private TeamInviteCodeRequest teamInviteCodeRequest; + + // 팀 가입 및 아이디 생성 + private Long getTeamId() { + TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); + String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); + teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); + return teamService.getTeamByCode(teamInviteCodeRequest).teamId(); + } + + // 프로젝트 생성 + void createTestProject() { + Long teamId = getTeamId(); + ProjectCreateRequest request = + new ProjectCreateRequest( + teamId, projectTitle, projectStartDt, projectDueDt, description); + + projectService.createProject(request); + } + + void createTestProject(Long teamId) { + ProjectCreateRequest request = + new ProjectCreateRequest( + teamId, projectTitle, projectStartDt, projectDueDt, description); + + projectService.createProject(request); + } + + void createTestProject( + Long teamId, String title, LocalDate startDt, LocalDate dueDt, String description) { + ProjectCreateRequest request = + new ProjectCreateRequest(teamId, title, startDt, dueDt, description); + + projectService.createProject(request); + } + + // 스프린트 생성 + void createTestSprint(Long projectId) { + SprintCreateRequest request = + new SprintCreateRequest(projectId, "testSprintGoal", sprintStartDt, sprintDueDt); + sprintService.createSprint(request); + } + + // 미팅 생성 + void createTestMeeting(Long sprintId) { + MeetingCreateRequest request = + new MeetingCreateRequest(sprintId, meetingTitle, meetingStart, meetingEnd); + meetingService.createMeeting(request); + } + + void createTestMeeting(Long sprintId, LocalDateTime meetingStart, LocalDateTime meetingEnd) { + MeetingCreateRequest request = + new MeetingCreateRequest(sprintId, meetingTitle, meetingStart, meetingEnd); + meetingService.createMeeting(request); + } + + @BeforeEach + public void setUp() { + memberAdmin = + Member.createMember( + "memberAdmin", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + memberRepository.save(memberAdmin); + loginAs(memberAdmin); + createTestProject(); + createTestSprint(1L); + + // member1 = + // Member.createMember( + // "member1", + // "testProfileImageUrl", + // OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + // memberRepository.save(member1); + // + // member2 = + // Member.createMember( + // "member2", + // "testProfileImageUrl", + // OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); + // memberRepository.save(member2); + + } + + @AfterEach + public void afterEach() { + logout(); + projectRegistrationRepository.deleteAll(); + projectParticipantRepository.deleteAll(); + projectRepository.deleteAll(); + teamParticipantRepository.deleteAll(); + teamRepository.deleteAll(); + memberRepository.deleteAll(); + meetingRepository.deleteAll(); + sprintRepository.deleteAll(); + } + + @Test + void 미팅을_생성하면_정상적으로_저장된다() { + // given + createTestMeeting(1L); + // then + Meeting meeting = meetingRepository.findById(1L).get(); + assertThat(meeting.getId()).isEqualTo(1L); + assertThat(meeting) + .extracting("id", "title", "meetingStart", "meetingEnd", "status") + .containsExactlyInAnyOrder( + 1L, meetingTitle, meetingStart, meetingEnd, MeetingStatus.OPEN); + } + + @Test + void 스프린트_시작일을_벗어나면_오류가_발생한다() { + // given + LocalDateTime wrongDtBeforeStartDt = LocalDateTime.of(2020, 3, 15, 17, 0); + + // then + assertThatThrownBy(() -> createTestMeeting(1L, wrongDtBeforeStartDt, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); + } + + @Test + void 스프린트_마감일을_벗어나면_오류가_발생한다() { + // given + LocalDateTime wrongDtAfterDueDt = LocalDateTime.of(2030, 3, 15, 17, 0); + // then + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, wrongDtAfterDueDt)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); + } + + @Test + void 시작시간이_종료시간보다_느리거나_같으면_오류가_발생한다() { + + // then + assertThatThrownBy(() -> createTestMeeting(1L, meetingEnd, meetingStart)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, meetingStart)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + } + + @Test + void 시간이_8시부터_00시_범위를_벗어나면_오류가_발생한다() { + // given + createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 + + // when + LocalDateTime before8 = LocalDateTime.of(2026, 3, 15, 1, 0); + LocalDateTime after0 = LocalDateTime.of(2026, 3, 16, 0, 1); + // then + assertThatThrownBy(() -> createTestMeeting(1L, before8, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, after0)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + } + + @Test + void 기존_미팅과_일시가_겹치면_오류가_발생한다() { + // given + createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 + + // when + LocalDateTime beforeStart = LocalDateTime.of(2026, 3, 15, 16, 0); + LocalDateTime afterEnd = LocalDateTime.of(2026, 3, 15, 19, 0); + LocalDateTime afterStart = LocalDateTime.of(2026, 3, 15, 17, 20); + LocalDateTime beforeEnd = LocalDateTime.of(2026, 3, 15, 17, 40); + // then + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, beforeStart, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, afterEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, afterStart, beforeEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + } +} From d9abcdf048116eb44d6ff8f179c6851ce2462133 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Thu, 20 Mar 2025 16:06:04 +0900 Subject: [PATCH 052/107] =?UTF-8?q?feat:=20=ED=94=BC=EB=93=9C=EB=B0=B1=20?= =?UTF-8?q?=EB=A9=94=EC=8B=9C=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#116)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 특정 프로젝트 참여자가 스프린트에서 받은 피드백 조회 기능 구현 * test: 특정 프로젝트 참여자가 스프린트에서 받은 피드백 조회 기능 테스트 * refactor: 프로젝트 참여자 ID 대신 프로젝트 ID 기반으로 조회하도록 변경 * test: 프로젝트 ID 기반 조회 방식 적용에 따른 테스트 코드 수정 --- .../feedback/api/FeedbackController.java | 17 +++ .../feedback/application/FeedbackService.java | 43 ++++++ .../feedback/dao/FeedbackRepository.java | 3 +- .../dao/FeedbackRepositoryCustom.java | 9 ++ .../feedback/dao/FeedbackRepositoryImpl.java | 70 ++++++++++ .../domain/feedback/domain/Feedback.java | 3 +- .../dto/response/FeedbackInfoResponse.java | 14 ++ .../errorcode/FeedbackErrorCode.java | 2 + .../exception/errorcode/ProjectErrorCode.java | 5 +- .../application/FeedbackServiceTest.java | 123 ++++++++++++++++-- 10 files changed, 277 insertions(+), 12 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java create mode 100644 src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java index 092e1b79..d97624b7 100644 --- a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java +++ b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java @@ -3,11 +3,14 @@ import com.amcamp.domain.feedback.application.FeedbackService; import com.amcamp.domain.feedback.dto.request.FeedbackSendRequest; import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; +import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -34,4 +37,18 @@ public ResponseEntity feedbackSend(@Valid @RequestBody FeedbackSendRequest feedbackService.sendFeedback(request); return ResponseEntity.ok().build(); } + + @Operation(summary = "피드백 메시지 조회", description = "특정 프로젝트 참여자가 스프린트에서 받은 피드백을 조회합니다.") + @GetMapping("/{projectId}") + public Slice participantFindSprintFeedbacks( + @PathVariable Long projectId, + @Parameter(description = "피드백을 조회할 스프린트 ID") @RequestParam Long sprintId, + @Parameter(description = "이전 페이지의 마지막 피드백 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastFeedbackId, + @Parameter(description = "페이지당 피드백 수", example = "1") @RequestParam(value = "size") + int pageSize) { + return feedbackService.findSprintFeedbacksByParticipant( + projectId, sprintId, lastFeedbackId, pageSize); + } } diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java index e94597e4..4b69cb4a 100644 --- a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -4,9 +4,11 @@ import com.amcamp.domain.feedback.domain.Feedback; import com.amcamp.domain.feedback.dto.request.FeedbackSendRequest; import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; +import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.sprint.dao.SprintRepository; @@ -21,6 +23,7 @@ import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -34,6 +37,7 @@ public class FeedbackService { private final FeedbackRepository feedbackRepository; private final TeamParticipantRepository teamParticipantRepository; private final ProjectParticipantRepository projectParticipantRepository; + private final ProjectRepository projectRepository; private final SprintRepository sprintRepository; public FeedbackRefineResponse refineFeedback(OriginalFeedbackRequest request) { @@ -61,6 +65,26 @@ public void sendFeedback(FeedbackSendRequest request) { Feedback.createFeedback(sender, receiver, sprint, request.message())); } + @Transactional(readOnly = true) + public Slice findSprintFeedbacksByParticipant( + Long projectId, Long sprintId, Long lastFeedbackId, int pageSize) { + final Member currentMember = memberUtil.getCurrentMember(); + final Project project = findByProjectId(projectId); + final Sprint sprint = findBySprintId(sprintId); + + ProjectParticipant projectParticipant = validateProjectParticipant(currentMember, project); + validateProjectSprintMismatch(project, sprint); + + return feedbackRepository.findSprintFeedbacksByParticipant( + projectParticipant.getId(), sprintId, lastFeedbackId, pageSize); + } + + private Project findByProjectId(Long projectId) { + return projectRepository + .findById(projectId) + .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); + } + private Sprint findBySprintId(Long sprintId) { return sprintRepository .findById(sprintId) @@ -114,4 +138,23 @@ private void validateSprintDueDate(Sprint sprint) { throw new CommonException(FeedbackErrorCode.FEEDBACK_DUE_DATE_ONLY); } } + + private void validateProjectSprintMismatch(Project project, Sprint sprint) { + if (!project.equals(sprint.getProject())) { + throw new CommonException(ProjectErrorCode.PROJECT_SPRINT_MISMATCH); + } + } + + private ProjectParticipant validateProjectParticipant(Member member, Project project) { + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(member, project.getTeam()) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } } diff --git a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java index 4d64c96a..f5568dc4 100644 --- a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java +++ b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepository.java @@ -5,7 +5,8 @@ import com.amcamp.domain.sprint.domain.Sprint; import org.springframework.data.jpa.repository.JpaRepository; -public interface FeedbackRepository extends JpaRepository { +public interface FeedbackRepository + extends JpaRepository, FeedbackRepositoryCustom { boolean existsBySenderAndReceiverAndSprint( ProjectParticipant sender, ProjectParticipant receiver, Sprint sprint); } diff --git a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java new file mode 100644 index 00000000..ddae7097 --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java @@ -0,0 +1,9 @@ +package com.amcamp.domain.feedback.dao; + +import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; +import org.springframework.data.domain.Slice; + +public interface FeedbackRepositoryCustom { + Slice findSprintFeedbacksByParticipant( + Long projectParticipantId, Long sprintId, Long lastFeedbackId, int pageSize); +} diff --git a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java new file mode 100644 index 00000000..7529523c --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java @@ -0,0 +1,70 @@ +package com.amcamp.domain.feedback.dao; + +import static com.amcamp.domain.feedback.domain.QFeedback.feedback; + +import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.FeedbackErrorCode; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class FeedbackRepositoryImpl implements FeedbackRepositoryCustom { + + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findSprintFeedbacksByParticipant( + Long projectParticipantId, Long sprintId, Long lastFeedbackId, int pageSize) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + FeedbackInfoResponse.class, + feedback.id, + feedback.message, + feedback.createdDt)) + .from(feedback) + .where( + feedback.sprint.id.eq(sprintId), + feedback.receiver.id.eq(projectParticipantId), + lastFeedbackId(lastFeedbackId)) + .orderBy(feedback.createdDt.desc()) + .limit(pageSize + 1) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(FeedbackErrorCode.FEEDBACK_NOT_EXISTS); + } + + return checkLastPage(pageSize, results); + } + + private BooleanExpression lastFeedbackId(Long feedbackId) { + if (feedbackId == null) { + return null; + } + + return feedback.id.lt(feedbackId); + } + + private Slice checkLastPage( + int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java b/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java index 93c2677e..e76072ae 100644 --- a/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java +++ b/src/main/java/com/amcamp/domain/feedback/domain/Feedback.java @@ -1,5 +1,6 @@ package com.amcamp.domain.feedback.domain; +import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.sprint.domain.Sprint; import jakarta.persistence.*; @@ -11,7 +12,7 @@ @Getter @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) -public class Feedback { +public class Feedback extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackInfoResponse.java b/src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackInfoResponse.java new file mode 100644 index 00000000..0f747b87 --- /dev/null +++ b/src/main/java/com/amcamp/domain/feedback/dto/response/FeedbackInfoResponse.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.feedback.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.time.LocalDateTime; + +public record FeedbackInfoResponse( + @Schema(description = "피드백 ID", example = "1") Long feedbackId, + @Schema(description = "받은 피드백 메시지", example = "이번 스프린트에서 아주 잘해주셨습니다.") String message, + @Schema(description = "피드백을 받은 날짜", example = "2026-01-01") LocalDate receivedDt) { + public FeedbackInfoResponse(Long feedbackId, String message, LocalDateTime createdDt) { + this(feedbackId, message, createdDt.toLocalDate()); + } +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java index a12b7c6d..43d8b1b5 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java @@ -15,6 +15,8 @@ public enum FeedbackErrorCode implements BaseErrorCode { FEEDBACK_ALREADY_SENT(HttpStatus.CONFLICT, "이미 해당 사용자에게 피드백을 보냈습니다."), FEEDBACK_DUE_DATE_ONLY(HttpStatus.BAD_REQUEST, "스프린트 마감 당일에만 피드백을 전송할 수 있습니다."), + + FEEDBACK_NOT_EXISTS(HttpStatus.NOT_FOUND, "해당 스프린트에서 받은 피드백이 존재하지 않습니다."), ; private final HttpStatus httpStatus; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index fbe13599..882c254c 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -15,7 +15,10 @@ public enum ProjectErrorCode implements BaseErrorCode { PROJECT_ADMIN_CANNOT_LEAVE( HttpStatus.FORBIDDEN, "프로젝트 Admin은 다른 팀원에게 권한을 넘긴 후에만 프로젝트를 나갈 수 있습니다."), PROJECT_REGISTRATION_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 프로젝트 가입 요청이 생성되어 있습니다"), - PROJECT_REGISTRATION_NOT_FOUND(HttpStatus.NOT_FOUND, "project 가입 요청을 찾을 수 없습니다."); + PROJECT_REGISTRATION_NOT_FOUND(HttpStatus.NOT_FOUND, "project 가입 요청을 찾을 수 없습니다."), + + PROJECT_SPRINT_MISMATCH(HttpStatus.FORBIDDEN, "요청한 스프린트는 현재 참여 중인 프로젝트의 스프린트가 아닙니다."), + ; private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java index c8ba854a..bc1ccf16 100644 --- a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java +++ b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java @@ -7,6 +7,7 @@ import com.amcamp.domain.feedback.dao.FeedbackRepository; import com.amcamp.domain.feedback.domain.Feedback; import com.amcamp.domain.feedback.dto.request.FeedbackSendRequest; +import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; @@ -24,6 +25,7 @@ import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.FeedbackErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; @@ -31,6 +33,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -56,7 +59,9 @@ public class FeedbackServiceTest extends IntegrationTest { private ProjectParticipant receiver; private ProjectParticipant anotherReceiver; private Sprint sprint; + private Sprint anotherSprint; private Project project; + private Project anotherProject; @BeforeEach void setUp() { @@ -73,12 +78,8 @@ void setUp() { "testReceiverProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); - UserDetails userDetails = - new PrincipalDetails(senderMember.getId(), senderMember.getRole()); - UsernamePasswordAuthenticationToken token = - new UsernamePasswordAuthenticationToken( - userDetails, null, userDetails.getAuthorities()); - SecurityContextHolder.getContext().setAuthentication(token); + // 초기에 로그인한 사용자를 sender로 설정 + setAuthenticatedUser(senderMember); Team team = teamRepository.save(Team.createTeam("testName", "testDescription")); @@ -95,7 +96,7 @@ void setUp() { projectRepository.save( Project.createProject( team, "testTitle", "testDescription", startDt, dueDt)); - Project anotherProject = + anotherProject = projectRepository.save( Project.createProject( team, "testTitle", "testDescription", startDt, dueDt)); @@ -114,8 +115,8 @@ void setUp() { ProjectParticipant.createProjectParticipant( teamParticipantUser, project, - senderMember.getNickname(), - senderMember.getProfileImageUrl(), + receiverMember.getNickname(), + receiverMember.getProfileImageUrl(), ProjectParticipantRole.MEMBER)); anotherReceiver = @@ -130,6 +131,15 @@ void setUp() { sprint = sprintRepository.save( Sprint.createSprint(project, "testSprint", "testGoal", startDt, dueDt)); + + anotherSprint = + sprintRepository.save( + Sprint.createSprint( + anotherProject, + "testAnotherSprint", + "testAnotherGoal", + startDt, + dueDt)); } @Nested @@ -239,4 +249,99 @@ class 피드백_메시지를_전송할_때 { .hasMessage(FeedbackErrorCode.FEEDBACK_DUE_DATE_ONLY.getMessage()); } } + + @Nested + class 피드백_메시지를_조회할_때 { + + @BeforeEach + void 피드백_메시지_조회를_위해_로그인한_사용자를_receiver로_변경한다() { + setAuthenticatedUser(receiver.getTeamParticipant().getMember()); + } + + @Test + void 받은_피드백_메시지가_있다면_성공한다() { + // given + feedbackRepository.save( + Feedback.createFeedback(sender, receiver, sprint, feedbackMessage)); + + // when + Slice result = + feedbackService.findSprintFeedbacksByParticipant( + project.getId(), sprint.getId(), null, 1); + + // then + assertThat(result).isNotNull(); + assertThat(result.getContent().size()).isEqualTo(1); + assertThat(result.getContent().get(0).message()).isEqualTo("이번 스프린트에서 아주 잘해주셨습니다."); + } + + @Test + void 요청한_프로젝트가_로그인된_사용자가_참여한_프로젝트가_아니라면_예외가_발생한다() { + // given + + // sender는 project(1)에만 참여 중이고, + // receiver는 project(1)와 anotherProject(2) 둘 다 참여 중이므로 + // 검증을 명확히 하기 위해 로그인한 사용자를 sender로 변경 + setAuthenticatedUser(sender.getTeamParticipant().getMember()); + + // when & then + assertThatThrownBy( + () -> + feedbackService.findSprintFeedbacksByParticipant( + anotherProject.getId(), sprint.getId(), null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + } + + @Test + void 참여_중인_프로젝트_스프린트가_아닌_스프린트_ID로_요청하는_경우_예외가_발생한다() { + // when & then + assertThatThrownBy( + () -> + feedbackService.findSprintFeedbacksByParticipant( + project.getId(), anotherSprint.getId(), null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_SPRINT_MISMATCH.getMessage()); + } + + @Test + void 해당_스프린트에서_받은_피드백_메시지가_없는_경우_예외가_발생한다() { + // when & then + assertThatThrownBy( + () -> + feedbackService.findSprintFeedbacksByParticipant( + project.getId(), sprint.getId(), null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.FEEDBACK_NOT_EXISTS.getMessage()); + } + + @Test + void 프로젝트가_존재하지_않는_경우_예외가_발생한다() { + // when & then + assertThatThrownBy( + () -> + feedbackService.findSprintFeedbacksByParticipant( + 999L, sprint.getId(), null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + + @Test + void 스프린트가_존재하지_않는_경우_예외가_발생한다() { + assertThatThrownBy( + () -> + feedbackService.findSprintFeedbacksByParticipant( + project.getId(), 999L, null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + } + + private void setAuthenticatedUser(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } } From fae1fd10f79e44469cabe00c34c79e671305abdd Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Thu, 20 Mar 2025 17:08:01 +0900 Subject: [PATCH 053/107] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=EB=B3=84=20=ED=83=9C=EC=8A=A4=ED=81=AC=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=C2=B7=20=ED=9A=8C=EC=9B=90?= =?UTF-8?q?=EC=9D=B4=20=EB=8B=B4=EB=8B=B9=ED=95=98=EA=B3=A0=20=EC=9E=88?= =?UTF-8?q?=EB=8A=94=20=ED=83=9C=EC=8A=A4=ED=81=AC=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=20(#107)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 프로젝트별/스프린트별/멤버별 태스크 목록 조회 기능 구현 * refactor: 프로젝트별 태스크 조회 기능 삭제 * feat: 회원이 담당하고 있는 task 목록 스프린트 아이디별 조회 기능 구현 * test: 회원이 담당하고 있는 task 목록 스프린트 아이디별 조회 기능 테스트 * fix: 태스크 조회 시 필요 권한 삭제 * feat: 프로젝트 내 태스크 조회 권한 수정 * fix: 응답 dto 로직 제거 * feat: 태스크 목록 조회 시 queryDSL 설정 * refactor: task내 todoInfo 삭제 및 타 필드 추가 --- .../domain/task/api/TaskController.java | 26 +++ .../domain/task/application/TaskService.java | 39 ++++- .../domain/task/dao/TaskRepository.java | 8 +- .../domain/task/dao/TaskRepositoryCustom.java | 12 ++ .../domain/task/dao/TaskRepositoryImpl.java | 123 +++++++++++++++ .../com/amcamp/domain/task/domain/Task.java | 23 +-- .../amcamp/domain/task/domain/TaskStatus.java | 14 ++ .../task/dto/response/TaskInfoResponse.java | 23 +-- .../amcamp/domain/task/TaskServiceTest.java | 148 +++++++++++++++++- 9 files changed, 381 insertions(+), 35 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java create mode 100644 src/main/java/com/amcamp/domain/task/domain/TaskStatus.java diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index 5b991a4e..de4d75d0 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -5,9 +5,11 @@ import com.amcamp.domain.task.dto.request.TaskCreateRequest; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -56,4 +58,28 @@ public ResponseEntity taskDelete(@PathVariable Long taskId) { taskService.deleteTask(taskId); return ResponseEntity.status(HttpStatus.OK).build(); } + + @Operation(summary = "태스크 목록 조회", description = "태스크를 스프린트 아이디값에 따라 불러 옵니다.") + @GetMapping("/{sprintId}/sprint") + public Slice taskList( + @PathVariable Long sprintId, + @Parameter(description = "이전 페이지의 마지막 태스크 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastTaskId, + @RequestParam(value = "size", defaultValue = "3") int size) { + return taskService.getTasksBySprint(sprintId, lastTaskId, size); + } + + @Operation( + summary = "마이 페이지 내 스프린트별 태스크 조회", + description = "멤버에 할당된 태스크를 스프린트 아이디값에 따라 불러 옵니다.") + @GetMapping("/{sprintId}/me") + public Slice taskListByMember( + @PathVariable Long sprintId, + @Parameter(description = "이전 페이지의 마지막 태스크 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastTaskId, + @RequestParam(value = "size", defaultValue = "3") int size) { + return taskService.getTasksByMember(sprintId, lastTaskId, size); + } } diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index 1f4bd2ea..08ab4e28 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -2,6 +2,7 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; @@ -21,6 +22,7 @@ import com.amcamp.global.exception.errorcode.*; import com.amcamp.global.util.MemberUtil; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -33,6 +35,7 @@ public class TaskService { private final SprintRepository sprintRepository; private final ProjectParticipantRepository projectParticipantRepository; private final TeamParticipantRepository teamParticipantRepository; + private final ProjectRepository projectRepository; public TaskInfoResponse createTask(TaskCreateRequest request) { final Member currentMember = memberUtil.getCurrentMember(); @@ -71,7 +74,7 @@ public TaskInfoResponse updateTaskToDoInfo(Long taskId) { validateProjectParticipant(project, project.getTeam(), currentMember); validateTaskModify(currentMember, task); - task.updateTaskTodoInfo(); + task.updateTaskStatus(); return findProjectParticipantMember(task) != null ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) @@ -126,12 +129,40 @@ public void deleteTask(Long taskId) { taskRepository.delete(task); } + @Transactional(readOnly = true) + public Slice getTasksBySprint(Long sprintId, Long lastTaskId, int size) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + final Project project = sprint.getProject(); + validateTeamParticipant(project.getTeam(), currentMember); + return taskRepository.findBySprint(sprintId, lastTaskId, size); + } + + @Transactional(readOnly = true) + public Slice getTasksByMember(Long sprintId, Long lastTaskId, int size) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + final Project project = sprint.getProject(); + ProjectParticipant projectParticipant = + validateProjectParticipant(project, project.getTeam(), currentMember); + return taskRepository.findBySprintAndAssignee( + sprintId, projectParticipant, lastTaskId, size); + } + private void validateTaskNotAssignedForSos(Task task) { if (task.getAssignedStatus() == AssignedStatus.NOT_ASSIGNED) { throw new CommonException(TaskErrorCode.TASK_NOT_ASSIGNED); } } + private void validateTeamParticipant(Team team, Member currentMember) { + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(currentMember, team) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + } + private void validateTaskModify(Member member, Task task) { if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED || task.getAssignee() != null) { if (!task.getAssignee().getProjectRole().equals(ProjectParticipantRole.ADMIN) @@ -161,6 +192,12 @@ private Sprint findBySprintId(Long sprintId) { .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); } + private Project findProject(Long projectId) { + return projectRepository + .findById(projectId) + .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); + } + private Task findByTaskId(Long taskId) { return taskRepository .findById(taskId) diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java index 0cae7e6a..3202d030 100644 --- a/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java @@ -1,6 +1,12 @@ package com.amcamp.domain.task.dao; +import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.task.domain.Task; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; -public interface TaskRepository extends JpaRepository {} +public interface TaskRepository extends JpaRepository, TaskRepositoryCustom { + List findBySprintId(Long sprintId); + + List findBySprintIdAndAssignee(Long sprintId, ProjectParticipant assignee); +} diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java new file mode 100644 index 00000000..df90fe8c --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java @@ -0,0 +1,12 @@ +package com.amcamp.domain.task.dao; + +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.task.dto.response.TaskInfoResponse; +import org.springframework.data.domain.Slice; + +public interface TaskRepositoryCustom { + Slice findBySprint(Long sprintId, Long lastTaskId, int pageSize); + + Slice findBySprintAndAssignee( + Long sprintId, ProjectParticipant assignee, Long lastTaskId, int pageSize); +} diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java new file mode 100644 index 00000000..a9cad677 --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java @@ -0,0 +1,123 @@ +package com.amcamp.domain.task.dao; + +import static com.amcamp.domain.task.domain.QTask.task; + +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.task.domain.AssignedStatus; +import com.amcamp.domain.task.domain.QTask; +import com.amcamp.domain.task.dto.response.TaskInfoResponse; +import com.querydsl.core.types.Expression; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.CaseBuilder; +import com.querydsl.core.types.dsl.Expressions; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; +import org.springframework.stereotype.Repository; + +@Repository +@RequiredArgsConstructor +public class TaskRepositoryImpl implements TaskRepositoryCustom { + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findBySprint(Long sprintId, Long lastTaskId, int size) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + TaskInfoResponse.class, + task.id, + task.description, + task.taskDifficulty, + task.dueDt, + task.taskStatus, + task.assignedStatus, + task.sosStatus, + getAssigneeId(task), + getAssigneeNickname(task), + getAssigneeProfile(task))) + .from(task) + .leftJoin(task.assignee) + .where(task.sprint.id.eq(sprintId), lastTaskId(lastTaskId)) + .orderBy(task.createdDt.asc()) + .limit(size + 1) + .fetch(); + + System.out.println("조회된 Task 개수: " + results.size()); + return checkLastPage(size, results); + } + + @Override + public Slice findBySprintAndAssignee( + Long sprintId, ProjectParticipant assignee, Long lastTaskId, int size) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + TaskInfoResponse.class, + task.id, + task.description, + task.taskDifficulty, + task.dueDt, + task.taskStatus, + task.assignedStatus, + task.sosStatus, + task.assignee.id, + task.assignee.projectNickname, + task.assignee.projectProfile)) + .from(task) + .where( + task.sprint.id.eq(sprintId), + lastTaskId(lastTaskId), + task.assignee.eq(assignee)) + .orderBy(task.createdDt.asc()) + .limit(size + 1) + .fetch(); + + return checkLastPage(size, results); + } + + public Expression getAssigneeId(QTask task) { + return new CaseBuilder() + .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) + .then(task.assignee.id) + .otherwise(Expressions.nullExpression()); + } + + public Expression getAssigneeNickname(QTask task) { + return new CaseBuilder() + .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) + .then(task.assignee.projectNickname) + .otherwise(Expressions.nullExpression()); + } + + private Expression getAssigneeProfile(QTask task) { + return new CaseBuilder() + .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) + .then(task.assignee.projectProfile) + .otherwise(Expressions.nullExpression()); + } + + private BooleanExpression lastTaskId(Long taskId) { + if (taskId == null) { + return null; + } + return task.id.gt(taskId); + } + + private Slice checkLastPage(int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/task/domain/Task.java b/src/main/java/com/amcamp/domain/task/domain/Task.java index 6b03f793..a4961bc0 100644 --- a/src/main/java/com/amcamp/domain/task/domain/Task.java +++ b/src/main/java/com/amcamp/domain/task/domain/Task.java @@ -2,8 +2,6 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.project.domain.ProjectParticipant; -import com.amcamp.domain.project.domain.ToDoInfo; -import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import jakarta.persistence.*; @@ -28,7 +26,10 @@ public class Task extends BaseTimeEntity { @Lob private String description; - @Embedded private ToDoInfo toDoInfo; + @Enumerated(value = EnumType.STRING) + private TaskStatus taskStatus; + + private LocalDate dueDt; @Enumerated(EnumType.STRING) private TaskDifficulty taskDifficulty; @@ -49,13 +50,15 @@ private Task( Sprint sprint, String description, TaskDifficulty taskDifficulty, - ToDoInfo toDoInfo, + LocalDate dueDt, + TaskStatus taskStatus, AssignedStatus assignedStatus, ProjectParticipant assignee, SOSStatus sosStatus) { this.sprint = sprint; this.description = description; - this.toDoInfo = toDoInfo; + this.dueDt = dueDt; + this.taskStatus = taskStatus; this.taskDifficulty = taskDifficulty; this.assignedStatus = assignedStatus; this.assignee = assignee; @@ -69,7 +72,8 @@ public static Task createTask( .description(description) .taskDifficulty(taskDifficulty) .assignedStatus(AssignedStatus.NOT_ASSIGNED) - .toDoInfo(ToDoInfo.createToDoInfo(null, null)) + .dueDt(null) + .taskStatus(TaskStatus.NOT_STARTED) .assignee(null) .sosStatus(SOSStatus.NOT_SOS) .build(); @@ -84,15 +88,14 @@ public void updateTaskBasicInfo(TaskBasicInfoUpdateRequest request) { } } - public void updateTaskTodoInfo() { - this.toDoInfo.updateToDoInfo( - this.toDoInfo.getStartDt(), LocalDate.now(), ToDoStatus.COMPLETED); + public void updateTaskStatus() { + if (this.taskStatus != TaskStatus.COMPLETED) this.taskStatus = TaskStatus.COMPLETED; } public void assignTask(ProjectParticipant projectParticipant) { this.assignedStatus = AssignedStatus.ASSIGNED; this.assignee = projectParticipant; - this.toDoInfo.updateToDoInfo(LocalDate.now(), null, ToDoStatus.ON_GOING); + this.taskStatus = TaskStatus.ON_GOING; this.sosStatus = SOSStatus.NOT_SOS; } diff --git a/src/main/java/com/amcamp/domain/task/domain/TaskStatus.java b/src/main/java/com/amcamp/domain/task/domain/TaskStatus.java new file mode 100644 index 00000000..a10dce57 --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/domain/TaskStatus.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.task.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@AllArgsConstructor +@Getter +public enum TaskStatus { + NOT_STARTED("STATUS_NOT_STARTED"), + ON_GOING("STATUS_ON_GOING"), + COMPLETED("STATUS_COMPLETED"); + + private final String status; +} diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java index 2fd1d4de..359004e0 100644 --- a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java @@ -1,11 +1,7 @@ package com.amcamp.domain.task.dto.response; import com.amcamp.domain.member.domain.Member; -import com.amcamp.domain.project.domain.ToDoStatus; -import com.amcamp.domain.task.domain.AssignedStatus; -import com.amcamp.domain.task.domain.SOSStatus; -import com.amcamp.domain.task.domain.Task; -import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.domain.*; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; @@ -13,13 +9,12 @@ public record TaskInfoResponse( @Schema(description = "태스크 아이디", example = "1") Long taskId, @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") String description, @Schema(description = "태스크 난이도", example = "MID") TaskDifficulty taskDifficulty, - @Schema(description = "태스크 시작일자", example = "2024-01-01") LocalDate startDt, - @Schema(description = "태스크 마감일자", example = "2024-01-02") LocalDate dueDt, - @Schema(description = "태스크 진행현황", example = "1") ToDoStatus toDoStatus, + @Schema(description = "태스크 완료일자", example = "2024-01-02") LocalDate dueDt, + @Schema(description = "태스크 진행 현황", example = "ON_GOING") TaskStatus taskStatus, @Schema(description = "태스크 담당 상태", example = "ASSIGNED") AssignedStatus assignedStatus, @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus, @Schema(description = "태스크 담당자 아이디", example = "1") Long memberId, - @Schema(description = "태스크 담당자 닉네임", example = "최현태") String nickname, + @Schema(description = "태스크 담당자 닉네임", example = "최현태") String projectNickname, @Schema(description = "태스크 담당자 프로필 url", example = "Presigned URL") String profileImageUrl) { @@ -28,9 +23,8 @@ public static TaskInfoResponse from(Task task, Member member) { task.getId(), task.getDescription(), task.getTaskDifficulty(), - task.getToDoInfo().getStartDt(), - task.getToDoInfo().getDueDt(), - task.getToDoInfo().getToDoStatus(), + task.getDueDt(), + task.getTaskStatus(), task.getAssignedStatus(), task.getSosStatus(), member.getId(), @@ -43,9 +37,8 @@ public static TaskInfoResponse from(Task task) { task.getId(), task.getDescription(), task.getTaskDifficulty(), - task.getToDoInfo().getStartDt(), - task.getToDoInfo().getDueDt(), - task.getToDoInfo().getToDoStatus(), + task.getDueDt(), + task.getTaskStatus(), task.getAssignedStatus(), task.getSosStatus(), null, diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 8d791826..38170bf1 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -9,24 +9,24 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.domain.project.application.ProjectService; -import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.project.dto.request.ProjectCreateRequest; import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; -import com.amcamp.domain.task.domain.AssignedStatus; -import com.amcamp.domain.task.domain.SOSStatus; -import com.amcamp.domain.task.domain.Task; -import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.domain.*; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import com.amcamp.domain.task.dto.request.TaskCreateRequest; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; +import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.exception.errorcode.TaskErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; @@ -34,6 +34,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -166,13 +167,13 @@ class 태스크_수정_시 { assertThat(response.description()).isEqualTo(taskBasicInfoUpdateRequest.description()); assertThat(response.taskDifficulty()) .isEqualTo(taskBasicInfoUpdateRequest.taskDifficulty()); - assertThat(response.toDoStatus()).isEqualTo(ToDoStatus.ON_GOING); + assertThat(response.taskStatus()).isEqualTo(TaskStatus.ON_GOING); assertThat(response.assignedStatus()).isEqualTo(AssignedStatus.ASSIGNED); - assertThat(response.nickname()).isEqualTo(member.getNickname()); + // assertThat(response.projectNickname()).isEqualTo(member.getNickname()); // when & then - finished response = taskService.updateTaskToDoInfo(1L); - assertThat(response.toDoStatus()).isEqualTo(ToDoStatus.COMPLETED); + assertThat(response.taskStatus()).isEqualTo(TaskStatus.COMPLETED); // when - delete taskService.deleteTask(1L); @@ -254,4 +255,135 @@ class sos_실행_시 { // } } + + @Nested + class 태스크_목록_조회_시 { + @Test + void 스프린트가_유효하지않으면_에러를_반환한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest1 = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest1); + TaskCreateRequest taskRequest2 = + new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + taskService.createTask(taskRequest2); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 + + // when & then + // assertThatThrownBy(() -> taskService.getTasksBySprint(2l)) + // .isInstanceOf(CommonException.class) + // .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + assertThatThrownBy(() -> taskService.getTasksBySprint(2l, 0L, 3)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 내가_담당하는_태스크_조회_시_프로젝트_참가자가_아니면_에러를_반환한다() { + // given + Member member = memberUtil.getCurrentMember(); + TeamInviteCodeResponse teamInviteCodeResponse = teamService.getInviteCode(1L); + TaskCreateRequest taskRequest1 = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest1); + TaskCreateRequest taskRequest2 = + new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + taskService.createTask(taskRequest2); + + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); + + teamService.joinTeam(new TeamInviteCodeRequest(teamInviteCodeResponse.inviteCode())); + + // when & then + assertThatThrownBy(() -> taskService.getTasksByMember(1l, 0L, 3)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + } + + @Test + void 프로젝트_태스크_조회_시_팀_참가자가_아니면_에러를_반환한다() { + // given + Member member = memberUtil.getCurrentMember(); + TeamInviteCodeResponse teamInviteCodeResponse = teamService.getInviteCode(1L); + TaskCreateRequest taskRequest1 = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest1); + TaskCreateRequest taskRequest2 = + new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + taskService.createTask(taskRequest2); + + Member nonMember = + memberRepository.save( + Member.createMember("nonMember", "testProfileImageUrl", null)); + loginAs(nonMember); + + // when & then + assertThatThrownBy(() -> taskService.getTasksBySprint(1l, 0L, 3)) + .isInstanceOf(CommonException.class) + .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); + } + + @Test + void 프로젝트별로_조회한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest1 = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest1); + TaskCreateRequest taskRequest2 = + new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + taskService.createTask(taskRequest2); + + // when + Slice result = taskService.getTasksBySprint(1L, 0L, 3); + + // then + assertThat(result.getContent()).hasSize(2); + assertThat(result.getContent().get(0).memberId()).isEqualTo(null); + assertThat(result.getContent().get(0).projectNickname()).isEqualTo(null); + assertThat(result.getContent().get(0).profileImageUrl()).isEqualTo(null); + } + + @Test + void 멤버별로_조회한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest1 = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest1); + TaskCreateRequest taskRequest2 = + new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + taskService.createTask(taskRequest2); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 + + Task task1 = + taskRepository + .findById(2L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + taskService.assignTask(task1.getId()); // 첫번쨰 태스크에만 담당자 배정 + + // when + Slice result = taskService.getTasksByMember(1L, 0L, 3); + + // then + assertThat(result.getContent()).hasSize(2); + } + } } From 5439a43c796f3f0ebcdf69cfb23eb5dd33e07ce4 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Thu, 20 Mar 2025 17:26:14 +0900 Subject: [PATCH 054/107] =?UTF-8?q?refactor:=20projectParticipant=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=ED=85=8C?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EC=BC=80=EC=9D=B4=EC=8A=A4=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=20(#125)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/ProjectParticipantInfoResponse.java | 4 ---- .../amcamp/domain/project/ProjectServiceTest.java | 12 ++++++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java index 5c6a9067..44fade62 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java @@ -5,8 +5,6 @@ import io.swagger.v3.oas.annotations.media.Schema; public record ProjectParticipantInfoResponse( - @Schema(description = "프로젝트 아이디", example = "1") Long projectId, - @Schema(description = "프로젝트 참여자 멤버 아이디", example = "1") Long memberId, @Schema(description = "프로젝트 참여자 아이디", example = "1") Long projectParticipantId, @Schema(description = "프로젝트 참여자 이름", example = "정선우") String projectNickname, @Schema(description = "프로젝트 참여자 이미지 url", example = "PreSigned URL") String profileImageUrl, @@ -14,9 +12,7 @@ public record ProjectParticipantInfoResponse( ProjectParticipantRole role) { public static ProjectParticipantInfoResponse from(ProjectParticipant participant) { return new ProjectParticipantInfoResponse( - participant.getProject().getId(), participant.getId(), - participant.getTeamParticipant().getMember().getId(), participant.getProjectNickname(), participant.getProjectProfile(), participant.getProjectRole()); diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index e8b6621f..1b871485 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -620,13 +620,17 @@ class 프로젝트_가입_신청 { .forEach(i -> projectService.approveProjectRegistration(1L, i)); // then - List requesterIds = + List requesterIds = projectService.getProjectParticipantList(1L).stream() - .map(ProjectParticipantInfoResponse::memberId) + .map(ProjectParticipantInfoResponse::projectNickname) .toList(); assertThat(new HashSet<>(requesterIds)) - .isEqualTo(Set.of(memberAdmin.getId(), member1.getId(), member2.getId())); + .isEqualTo( + Set.of( + memberAdmin.getNickname(), + member1.getNickname(), + member2.getNickname())); } } @@ -701,7 +705,7 @@ void composeProjectMembers() { composeProjectMembers(); Long newAdminId = projectService.getProjectParticipantList(1L).stream() - .filter(r -> !r.memberId().equals(memberAdmin.getId())) + .filter(r -> !r.projectNickname().equals(memberAdmin.getNickname())) .map(ProjectParticipantInfoResponse::projectParticipantId) .findAny() .get(); From 25fc6ffe6396cb1c6fbd3daac1857332133ba261 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Fri, 21 Mar 2025 10:45:35 +0900 Subject: [PATCH 055/107] =?UTF-8?q?feat:=20=EA=B8=B0=EC=97=AC=EB=8F=84=20?= =?UTF-8?q?=C2=B7=20=EC=A7=84=EC=B2=99=EB=8F=84=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20(#112)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: sprint 패키지 내 기여도 부분 삭제 * feat: 기여도 조회 기능 구현 * test: 기여도 기능 테스트 * refactor: api description 수정 * feat: sprint별 진척도 조회 기능 구현 * test: sprint별 진척도 조회 기능 테스트 * fix: 스프린트 내 태스크가 존재하지 않을 경우 에러 처리 * fix: 등위 처리 관련 오류 수정 * fix: 스프린트 기여도 조회 권한 수정 * fix: 등위 필드 삭제 * refactor: 태스크 완료 시 진척도 업데이트 수정 * fix: 스프린트 필드 수정으로 인한 타 테스트 에러 수정 * refactor: 기여도 패키지/필드 이름 수정 * feat: 태스크 상태 변경 시 기여도 업데이트 * fix: 개인 기여도 조회 시 프로젝트 참여자 아이디 참조 수정: * fix: PathVariable 프로젝트 아이디 수정 * test: 프로젝트 참가 포함 테스트 코드 추가 * fix: contribution dto 수정 * refactor: 개인 기여도 조회 시 스프린트 아이디 조회 설정 * fix: 프로젝트와 스프린트 일치 validate 로직 추가 * fix: 진척도/기여도 계산 시 유리수, dto 반환 시 정수 설정 * fix: 태스크 상태·sos 상태 수정 권한 수정, 이미 완료된 태스크 완료 시 에러 처리 --- .../api/ContributionController.java | 31 ++ .../application/ContributionService.java | 113 +++++++ .../dao/ContributionRepository.java | 15 + .../contribution/domain/Contribution.java | 48 +++ .../BasicContributionInfoResponse.java | 19 ++ .../response/ContributionInfoResponse.java | 22 ++ .../sprint/application/SprintService.java | 5 +- .../sprint/dao/SprintRepositoryImpl.java | 3 +- .../amcamp/domain/sprint/domain/Sprint.java | 14 +- .../sprint/domain/SprintContribution.java | 32 -- .../dto/response/SprintInfoResponse.java | 6 +- .../dto/response/SprintProgressResponse.java | 11 + .../domain/task/api/TaskController.java | 2 +- .../domain/task/application/TaskService.java | 94 ++++-- .../domain/task/dao/TaskRepository.java | 16 +- .../errorcode/ContributionErrorCode.java | 19 ++ .../exception/errorcode/ProjectErrorCode.java | 1 - .../exception/errorcode/SprintErrorCode.java | 1 + .../exception/errorcode/TaskErrorCode.java | 3 +- .../contribution/ContributionServiceTest.java | 282 ++++++++++++++++++ .../sprint/application/SprintServiceTest.java | 12 + .../amcamp/domain/task/TaskServiceTest.java | 279 ++++++++++++----- 22 files changed, 885 insertions(+), 143 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/contribution/api/ContributionController.java create mode 100644 src/main/java/com/amcamp/domain/contribution/application/ContributionService.java create mode 100644 src/main/java/com/amcamp/domain/contribution/dao/ContributionRepository.java create mode 100644 src/main/java/com/amcamp/domain/contribution/domain/Contribution.java create mode 100644 src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java create mode 100644 src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java delete mode 100644 src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java create mode 100644 src/main/java/com/amcamp/global/exception/errorcode/ContributionErrorCode.java create mode 100644 src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java diff --git a/src/main/java/com/amcamp/domain/contribution/api/ContributionController.java b/src/main/java/com/amcamp/domain/contribution/api/ContributionController.java new file mode 100644 index 00000000..2f2290d1 --- /dev/null +++ b/src/main/java/com/amcamp/domain/contribution/api/ContributionController.java @@ -0,0 +1,31 @@ +package com.amcamp.domain.contribution.api; + +import com.amcamp.domain.contribution.application.ContributionService; +import com.amcamp.domain.contribution.dto.response.BasicContributionInfoResponse; +import com.amcamp.domain.contribution.dto.response.ContributionInfoResponse; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.tags.Tag; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.web.bind.annotation.*; + +@Tag(name = "8. 기여도 API", description = "기여도 관련 API 입니다.") +@RestController +@RequiredArgsConstructor +@RequestMapping("/contributions") +public class ContributionController { + private final ContributionService contributionService; + + @Operation(summary = "개별 회원 기여도 조회", description = "스프린트별 개별 회원의 기여도를 조회합니다.") + @GetMapping("/{projectId}/me") + public BasicContributionInfoResponse contributionByMember( + @PathVariable Long projectId, @RequestParam Long sprintId) { + return contributionService.getContributionByMember(projectId, sprintId); + } + + @Operation(summary = "프로젝트 내 회원 기여도 조회", description = "프로젝트 페이지에서 스프린트별 기여도를 조회합니다.") + @GetMapping("/{sprintId}") + public List contributionBySprint(@PathVariable Long sprintId) { + return contributionService.getContributionBySprint(sprintId); + } +} diff --git a/src/main/java/com/amcamp/domain/contribution/application/ContributionService.java b/src/main/java/com/amcamp/domain/contribution/application/ContributionService.java new file mode 100644 index 00000000..62d464f4 --- /dev/null +++ b/src/main/java/com/amcamp/domain/contribution/application/ContributionService.java @@ -0,0 +1,113 @@ +package com.amcamp.domain.contribution.application; + +import com.amcamp.domain.contribution.dao.ContributionRepository; +import com.amcamp.domain.contribution.domain.Contribution; +import com.amcamp.domain.contribution.dto.response.BasicContributionInfoResponse; +import com.amcamp.domain.contribution.dto.response.ContributionInfoResponse; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ContributionErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.util.MemberUtil; +import java.util.ArrayList; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Transactional +@Service +@RequiredArgsConstructor +public class ContributionService { + private final MemberUtil memberUtil; + private final SprintRepository sprintRepository; + private final ContributionRepository contributionRepository; + private final ProjectRepository projectRepository; + private final TeamParticipantRepository teamParticipantRepository; + private final ProjectParticipantRepository projectParticipantRepository; + + public BasicContributionInfoResponse getContributionByMember(Long projectId, Long sprintId) { + Member member = memberUtil.getCurrentMember(); + Project project = + projectRepository + .findById(projectId) + .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); + + ProjectParticipant currentParticipant = + validateProjectParticipant(project, project.getTeam(), member); + Sprint sprint = validateSprint(sprintId); + validateProjectSprintMismatch(project, sprint); + + Contribution contribution = validateContribution(sprint, currentParticipant); + return BasicContributionInfoResponse.of(contribution, contribution.getScore()); + } + + public List getContributionBySprint(Long sprintId) { + Member member = memberUtil.getCurrentMember(); + Sprint sprint = validateSprint(sprintId); + Project project = sprint.getProject(); + validateTeamParticipant(project.getTeam(), member); + + List contributionList = + contributionRepository.findBySprintOrderByScoreDesc(sprint); + + List result = new ArrayList<>(); + for (Contribution contribution : contributionList) { + result.add(ContributionInfoResponse.of(contribution, contribution.getScore())); + } + + return result; + } + + private void validateProjectSprintMismatch(Project project, Sprint sprint) { + if (!project.equals(sprint.getProject())) { + throw new CommonException(ProjectErrorCode.PROJECT_SPRINT_MISMATCH); + } + } + + private void validateTeamParticipant(Team team, Member member) { + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(member, team) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + } + + private ProjectParticipant validateProjectParticipant( + Project project, Team team, Member currentMember) { + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam(currentMember, team) + .orElseThrow( + () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); + } + + private Sprint validateSprint(Long sprintId) { + return sprintRepository + .findById(sprintId) + .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + } + + private Contribution validateContribution(Sprint sprint, ProjectParticipant participant) { + return contributionRepository + .findBySprintAndParticipant(sprint, participant) + .orElseThrow( + () -> new CommonException(ContributionErrorCode.CONTRIBUTION_NOT_FOUND)); + } +} diff --git a/src/main/java/com/amcamp/domain/contribution/dao/ContributionRepository.java b/src/main/java/com/amcamp/domain/contribution/dao/ContributionRepository.java new file mode 100644 index 00000000..4e078e30 --- /dev/null +++ b/src/main/java/com/amcamp/domain/contribution/dao/ContributionRepository.java @@ -0,0 +1,15 @@ +package com.amcamp.domain.contribution.dao; + +import com.amcamp.domain.contribution.domain.Contribution; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.domain.Sprint; +import java.util.List; +import java.util.Optional; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ContributionRepository extends JpaRepository { + Optional findBySprintAndParticipant( + Sprint sprint, ProjectParticipant participant); + + List findBySprintOrderByScoreDesc(Sprint sprint); +} diff --git a/src/main/java/com/amcamp/domain/contribution/domain/Contribution.java b/src/main/java/com/amcamp/domain/contribution/domain/Contribution.java new file mode 100644 index 00000000..e9e26977 --- /dev/null +++ b/src/main/java/com/amcamp/domain/contribution/domain/Contribution.java @@ -0,0 +1,48 @@ +package com.amcamp.domain.contribution.domain; + +import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.domain.Sprint; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +public class Contribution extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "contribution_id") + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "sprint_id") + private Sprint sprint; + + // 기여한 멤버 + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "participant_id") + private ProjectParticipant participant; + + // 기여도 점수/비율 + private Double score; + + @Builder(access = AccessLevel.PRIVATE) + Contribution(Sprint sprint, ProjectParticipant participant, Double score) { + this.sprint = sprint; + this.participant = participant; + this.score = score; + } + + public static Contribution createContribution( + Sprint sprint, ProjectParticipant participant, Double score) { + return Contribution.builder().sprint(sprint).participant(participant).score(score).build(); + } + + public void updateScore(Double score) { + this.score = score; + } +} diff --git a/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java b/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java new file mode 100644 index 00000000..9a0f185e --- /dev/null +++ b/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java @@ -0,0 +1,19 @@ +package com.amcamp.domain.contribution.dto.response; + +import com.amcamp.domain.contribution.domain.Contribution; +import io.swagger.v3.oas.annotations.media.Schema; + +public record BasicContributionInfoResponse( + @Schema(description = "기여도 아이디", example = "1") Long contributionId, + @Schema(description = "스프린트 아이디", example = "1") Long sprintId, + @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "기여도 점수", example = "68.1") int score) { + + public static BasicContributionInfoResponse of(Contribution contribution, Double score) { + return new BasicContributionInfoResponse( + contribution.getId(), + contribution.getSprint().getId(), + contribution.getParticipant().getId(), + score.intValue()); + } +} diff --git a/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java b/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java new file mode 100644 index 00000000..d121b276 --- /dev/null +++ b/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java @@ -0,0 +1,22 @@ +package com.amcamp.domain.contribution.dto.response; + +import com.amcamp.domain.contribution.domain.Contribution; +import io.swagger.v3.oas.annotations.media.Schema; + +public record ContributionInfoResponse( + @Schema(description = "기여도 아이디", example = "1") Long contributionId, + @Schema(description = "스프린트 아이디", example = "1") Long sprintId, + @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "멤버 닉네임", example = "최현태") String nickname, + @Schema(description = "멤버 프로필 url", example = "Presigned URL") String profileImageUrl, + @Schema(description = "기여도 점수", example = "68") int score) { + public static ContributionInfoResponse of(Contribution contribution, Double score) { + return new ContributionInfoResponse( + contribution.getId(), + contribution.getSprint().getId(), + contribution.getParticipant().getId(), + contribution.getParticipant().getProjectNickname(), + contribution.getParticipant().getProjectProfile(), + score.intValue()); + } +} diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index a6ade399..48014c33 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -3,10 +3,7 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; -import com.amcamp.domain.project.domain.Project; -import com.amcamp.domain.project.domain.ProjectParticipant; -import com.amcamp.domain.project.domain.ProjectParticipantRole; -import com.amcamp.domain.project.domain.ToDoInfo; +import com.amcamp.domain.project.domain.*; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index cd562544..cc7a7f15 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -33,7 +33,8 @@ public Slice findAllSprintByProjectId(Long projectId, Long l sprint.goal, sprint.toDoInfo.startDt, sprint.toDoInfo.dueDt, - sprint.toDoInfo.toDoStatus)) + sprint.toDoInfo.toDoStatus, + sprint.progress)) .from(sprint) .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) .orderBy(sprint.title.asc()) diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index 2498dff3..461f7eab 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -1,6 +1,7 @@ package com.amcamp.domain.sprint.domain; import com.amcamp.domain.common.model.BaseTimeEntity; +import com.amcamp.domain.contribution.domain.Contribution; import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ToDoInfo; @@ -44,14 +45,18 @@ public class Sprint extends BaseTimeEntity { // 기여도 @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) - private List contributions = new ArrayList<>(); + private List contribution = new ArrayList<>(); + + // 진척도 + private Double progress; @Builder(access = AccessLevel.PRIVATE) - private Sprint(Project project, String title, String goal, ToDoInfo toDoInfo) { + private Sprint(Project project, String title, String goal, ToDoInfo toDoInfo, Double progress) { this.project = project; this.title = title; this.goal = goal; this.toDoInfo = toDoInfo; + this.progress = progress; } public static Sprint createSprint( @@ -61,6 +66,7 @@ public static Sprint createSprint( .title(title) .goal(goal) .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) + .progress(0.0) .build(); } @@ -75,4 +81,8 @@ public void updateSprintToDo(LocalDate startDt, LocalDate dueDt, ToDoStatus stat public void updateSprintTitle(String title) { this.title = title; } + + public void updateProgress(Double progress) { + this.progress = progress; + } } diff --git a/src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java b/src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java deleted file mode 100644 index 3c4b2f23..00000000 --- a/src/main/java/com/amcamp/domain/sprint/domain/SprintContribution.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.amcamp.domain.sprint.domain; - -import com.amcamp.domain.common.model.BaseTimeEntity; -import com.amcamp.domain.project.domain.ProjectParticipant; -import jakarta.persistence.*; -import lombok.AccessLevel; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Entity -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@Getter -public class SprintContribution extends BaseTimeEntity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "sprint_contribution_id") - private Long Id; - - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "sprint_id") - private Sprint sprint; - - // 기여한 멤버 - @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "participant_id") - private ProjectParticipant participant; - - // 등위 - private Integer placement; - // 기여도 점수/비율 - private Double contribution; -} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java index 915815b1..8a9b9547 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java @@ -11,7 +11,8 @@ public record SprintInfoResponse( @Schema(description = "중간 목표", example = "MVP 개발") String goal, @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, - @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status) { + @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, + @Schema(description = "스프린트 진척도", defaultValue = "0") Double progress) { public static SprintInfoResponse from(Sprint sprint) { return new SprintInfoResponse( sprint.getId(), @@ -19,6 +20,7 @@ public static SprintInfoResponse from(Sprint sprint) { sprint.getGoal(), sprint.getToDoInfo().getStartDt(), sprint.getToDoInfo().getDueDt(), - sprint.getToDoInfo().getToDoStatus()); + sprint.getToDoInfo().getToDoStatus(), + sprint.getProgress()); } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java new file mode 100644 index 00000000..7c9bd508 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.sprint.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record SprintProgressResponse( + @Schema(description = "스프린트 아이디", example = "1L") Long sprintId, + @Schema(description = "스프린트 진척도", example = "50.0") Double progress) { + public static SprintProgressResponse from(Long sprintId, Double progress) { + return new SprintProgressResponse(sprintId, progress); + } +} diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index de4d75d0..5331fc45 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -37,7 +37,7 @@ public TaskInfoResponse taskUpdateBasic( @Operation(summary = "태스크 완료", description = "태스크 완료에 따른 일정 및 진행 상태를 수정합니다.") @PatchMapping("/{taskId}") public TaskInfoResponse taskUpdateToDo(@PathVariable Long taskId) { - return taskService.updateTaskToDoInfo(taskId); + return taskService.updateTaskStatus(taskId); } @Operation(summary = "태스크 SOS", description = "태스크 sos 상태를 수정합니다.") diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index 08ab4e28..d4c005d1 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -1,5 +1,7 @@ package com.amcamp.domain.task.application; +import com.amcamp.domain.contribution.dao.ContributionRepository; +import com.amcamp.domain.contribution.domain.Contribution; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; @@ -9,9 +11,7 @@ import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.dao.TaskRepository; -import com.amcamp.domain.task.domain.AssignedStatus; -import com.amcamp.domain.task.domain.SOSStatus; -import com.amcamp.domain.task.domain.Task; +import com.amcamp.domain.task.domain.*; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import com.amcamp.domain.task.dto.request.TaskCreateRequest; import com.amcamp.domain.task.dto.response.TaskInfoResponse; @@ -36,6 +36,7 @@ public class TaskService { private final ProjectParticipantRepository projectParticipantRepository; private final TeamParticipantRepository teamParticipantRepository; private final ProjectRepository projectRepository; + private final ContributionRepository contributionRepository; public TaskInfoResponse createTask(TaskCreateRequest request) { final Member currentMember = memberUtil.getCurrentMember(); @@ -57,8 +58,9 @@ public TaskInfoResponse updateTaskBasicInfo(Long taskId, TaskBasicInfoUpdateRequ final Sprint sprint = findBySprintId(task.getSprint().getId()); final Project project = sprint.getProject(); - validateProjectParticipant(project, project.getTeam(), currentMember); - validateTaskModify(currentMember, task); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskModify(participant, task); task.updateTaskBasicInfo(request); return findProjectParticipantMember(task) != null @@ -66,15 +68,24 @@ public TaskInfoResponse updateTaskBasicInfo(Long taskId, TaskBasicInfoUpdateRequ : TaskInfoResponse.from(task); } - public TaskInfoResponse updateTaskToDoInfo(Long taskId) { + public TaskInfoResponse updateTaskStatus(Long taskId) { final Member currentMember = memberUtil.getCurrentMember(); final Task task = findByTaskId(taskId); final Sprint sprint = findBySprintId(task.getSprint().getId()); final Project project = sprint.getProject(); - validateProjectParticipant(project, project.getTeam(), currentMember); - validateTaskModify(currentMember, task); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskModify(participant, task); + + if (task.getTaskStatus() == TaskStatus.COMPLETED) { + throw new CommonException(TaskErrorCode.TASK_ALREADY_COMPLETED); + } + task.updateTaskStatus(); + Contribution contribution = validateContribution(sprint, participant); + sprint.updateProgress(getSprintProgress(sprint)); + contribution.updateScore(getScore(sprint, participant)); return findProjectParticipantMember(task) != null ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) @@ -87,9 +98,10 @@ public TaskInfoResponse updateTaskSOS(Long taskId) { final Sprint sprint = findBySprintId(task.getSprint().getId()); final Project project = sprint.getProject(); - validateProjectParticipant(project, project.getTeam(), currentMember); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); validateTaskNotAssignedForSos(task); - // validateTaskModify(currentMember, task); + validateTaskModify(participant, task); task.updateTaskSOS(); return findProjectParticipantMember(task) != null @@ -124,8 +136,9 @@ public void deleteTask(Long taskId) { final Sprint sprint = findBySprintId(task.getSprint().getId()); final Project project = sprint.getProject(); - validateProjectParticipant(project, project.getTeam(), currentMember); - validateTaskModify(currentMember, task); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); + validateTaskModify(participant, task); taskRepository.delete(task); } @@ -149,6 +162,48 @@ public Slice getTasksByMember(Long sprintId, Long lastTaskId, sprintId, projectParticipant, lastTaskId, size); } + private Double getScore(Sprint sprint, ProjectParticipant participant) { + int highTask = taskRepository.countBySprintAndTaskDifficulty(sprint, TaskDifficulty.HIGH); + int midTask = taskRepository.countBySprintAndTaskDifficulty(sprint, TaskDifficulty.MID); + int lowTask = taskRepository.countBySprintAndTaskDifficulty(sprint, TaskDifficulty.LOW); + + int highTaskCompleted = + taskRepository.countBySprintAndAssigneeAndTaskDifficulty( + sprint, participant, TaskDifficulty.HIGH); + int midTaskCompleted = + taskRepository.countBySprintAndAssigneeAndTaskDifficulty( + sprint, participant, TaskDifficulty.MID); + int lowTaskCompleted = + taskRepository.countBySprintAndAssigneeAndTaskDifficulty( + sprint, participant, TaskDifficulty.LOW); + + int maxScore = 20 * highTask + 10 * midTask + lowTask * 5; + if (maxScore == 0) { + throw new CommonException(SprintErrorCode.TASK_NOT_CREATED_YET); + } + + double total = + (20 * highTaskCompleted + 10 * midTaskCompleted + 5 * lowTaskCompleted) * 100; + return total / maxScore; + } + + private Contribution validateContribution(Sprint sprint, ProjectParticipant participant) { + return contributionRepository + .findBySprintAndParticipant(sprint, participant) + .orElseGet( + () -> + contributionRepository.save( + Contribution.createContribution(sprint, participant, 0.0))); + } + + private Double getSprintProgress(Sprint sprint) { + int totalTasks = taskRepository.countBySprint(sprint); + double completedTasks = + taskRepository.countBySprintAndTaskStatus(sprint, TaskStatus.COMPLETED); + Double progress = completedTasks * 100 / totalTasks; + return progress; + } + private void validateTaskNotAssignedForSos(Task task) { if (task.getAssignedStatus() == AssignedStatus.NOT_ASSIGNED) { throw new CommonException(TaskErrorCode.TASK_NOT_ASSIGNED); @@ -163,10 +218,13 @@ private void validateTeamParticipant(Team team, Member currentMember) { () -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); } - private void validateTaskModify(Member member, Task task) { + private void validateTaskModify(ProjectParticipant participant, Task task) { if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED || task.getAssignee() != null) { - if (!task.getAssignee().getProjectRole().equals(ProjectParticipantRole.ADMIN) - || !member.equals(task.getAssignee().getTeamParticipant().getMember())) { + System.out.println(task.getAssignee().getProjectRole()); + System.out.println(task.getAssignee().getTeamParticipant().getMember().getId()); + + if (!participant.getProjectRole().equals(ProjectParticipantRole.ADMIN) + && !participant.equals(task.getAssignee())) { throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); } } @@ -192,12 +250,6 @@ private Sprint findBySprintId(Long sprintId) { .orElseThrow(() -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); } - private Project findProject(Long projectId) { - return projectRepository - .findById(projectId) - .orElseThrow(() -> new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND)); - } - private Task findByTaskId(Long taskId) { return taskRepository .findById(taskId) diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java index 3202d030..7509757c 100644 --- a/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepository.java @@ -1,12 +1,22 @@ package com.amcamp.domain.task.dao; import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.domain.Task; -import java.util.List; +import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.domain.TaskStatus; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; public interface TaskRepository extends JpaRepository, TaskRepositoryCustom { - List findBySprintId(Long sprintId); - List findBySprintIdAndAssignee(Long sprintId, ProjectParticipant assignee); + int countBySprintAndTaskDifficulty(Sprint sprint, TaskDifficulty taskDifficulty); + + int countBySprintAndAssigneeAndTaskDifficulty( + Sprint sprint, ProjectParticipant assignee, TaskDifficulty taskDifficulty); + + int countBySprint(Sprint sprint); + + @Query("SELECT COUNT(t) FROM Task t WHERE t.sprint = :sprint AND t.taskStatus = :taskStatus") + int countBySprintAndTaskStatus(Sprint sprint, TaskStatus taskStatus); } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ContributionErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ContributionErrorCode.java new file mode 100644 index 00000000..2d274be3 --- /dev/null +++ b/src/main/java/com/amcamp/global/exception/errorcode/ContributionErrorCode.java @@ -0,0 +1,19 @@ +package com.amcamp.global.exception.errorcode; + +import lombok.AllArgsConstructor; +import lombok.Getter; +import org.springframework.http.HttpStatus; + +@Getter +@AllArgsConstructor +public enum ContributionErrorCode implements BaseErrorCode { + CONTRIBUTION_NOT_FOUND(HttpStatus.NOT_FOUND, "기여도를 찾을 수 없습니다."); + + private final HttpStatus httpStatus; + private final String message; + + @Override + public String errorClassName() { + return this.name(); + } +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 882c254c..acb498fb 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -16,7 +16,6 @@ public enum ProjectErrorCode implements BaseErrorCode { HttpStatus.FORBIDDEN, "프로젝트 Admin은 다른 팀원에게 권한을 넘긴 후에만 프로젝트를 나갈 수 있습니다."), PROJECT_REGISTRATION_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 프로젝트 가입 요청이 생성되어 있습니다"), PROJECT_REGISTRATION_NOT_FOUND(HttpStatus.NOT_FOUND, "project 가입 요청을 찾을 수 없습니다."), - PROJECT_SPRINT_MISMATCH(HttpStatus.FORBIDDEN, "요청한 스프린트는 현재 참여 중인 프로젝트의 스프린트가 아닙니다."), ; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index 5752dd1f..c4a0e287 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -10,6 +10,7 @@ public enum SprintErrorCode implements BaseErrorCode { SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), SPRINT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "스프린트 삭제 권한이 없습니다."), + TASK_NOT_CREATED_YET(HttpStatus.NOT_FOUND, "스프린트 내 태스크가 존재하지 않습니다."), ; private final HttpStatus httpStatus; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java index a4823bb3..ea065eea 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java @@ -10,7 +10,8 @@ public enum TaskErrorCode implements BaseErrorCode { TASK_NOT_FOUND(HttpStatus.NOT_FOUND, "task를 찾을 수 없습니다."), TASK_MODIFY_FORBIDDEN(HttpStatus.FORBIDDEN, "task 수정·삭제 권한이 없습니다. "), TASK_ALREADY_ASSIGNED(HttpStatus.FORBIDDEN, "이미 담당자가 존재하는 task입니다."), - TASK_NOT_ASSIGNED(HttpStatus.FORBIDDEN, "아직 할당되지 않은 task입니다."); + TASK_NOT_ASSIGNED(HttpStatus.FORBIDDEN, "아직 할당되지 않은 task입니다."), + TASK_ALREADY_COMPLETED(HttpStatus.FORBIDDEN, "이미 완료된 task입니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java new file mode 100644 index 00000000..50858d03 --- /dev/null +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -0,0 +1,282 @@ +package com.amcamp.domain.contribution; + +import static org.assertj.core.api.AssertionsForClassTypes.assertThat; +import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; + +import com.amcamp.IntegrationTest; +import com.amcamp.domain.contribution.application.ContributionService; +import com.amcamp.domain.contribution.dto.response.BasicContributionInfoResponse; +import com.amcamp.domain.contribution.dto.response.ContributionInfoResponse; +import com.amcamp.domain.member.dao.MemberRepository; +import com.amcamp.domain.member.domain.Member; +import com.amcamp.domain.member.domain.OauthInfo; +import com.amcamp.domain.project.application.ProjectService; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.sprint.application.SprintService; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.task.application.TaskService; +import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.team.application.TeamService; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ContributionErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; +import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.MemberUtil; +import java.time.LocalDate; +import java.util.List; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.core.userdetails.UserDetails; + +public class ContributionServiceTest extends IntegrationTest { + @Autowired private TeamService teamService; + @Autowired private MemberRepository memberRepository; + @Autowired private MemberUtil memberUtil; + @Autowired private ProjectService projectService; + @Autowired private SprintService sprintService; + @Autowired private TaskService taskService; + @Autowired private ContributionService contributionService; + @Autowired private TeamRepository teamRepository; + @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; + @Autowired private ProjectRepository projectRepository; + @Autowired private SprintRepository sprintRepository; + + private ProjectParticipant participant; + private ProjectParticipant newParticipant; + private Sprint sprint; + private Project project; + private Project anotherProject; + private Member newMember; + + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + + @BeforeEach + void setUp() { + Member member = + memberRepository.save( + Member.createMember( + "testNickname", + "testProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + + newMember = memberRepository.save(Member.createMember("member", null, null)); + + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + + Team team = teamRepository.save(Team.createTeam("testName", "testDescription")); + TeamParticipant teamParticipantAdmin = + teamParticipantRepository.save( + TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN)); + TeamParticipant teamParticipantUser = + teamParticipantRepository.save( + TeamParticipant.createParticipant( + newMember, team, TeamParticipantRole.USER)); + + project = + projectRepository.save( + Project.createProject( + team, + "testTitle", + "testDescription", + LocalDate.of(2026, 1, 1), + LocalDate.of(2026, 12, 1))); + anotherProject = + projectRepository.save( + Project.createProject( + team, + "testTitle", + "testDescription", + LocalDate.of(2026, 1, 1), + LocalDate.of(2026, 12, 1))); + + participant = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantAdmin, + project, + member.getNickname(), + member.getProfileImageUrl(), + ProjectParticipantRole.ADMIN)); + newParticipant = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUser, + project, + newMember.getNickname(), + newMember.getProfileImageUrl(), + ProjectParticipantRole.MEMBER)); + + sprint = + sprintRepository.save( + Sprint.createSprint( + project, + "1차 스프린트", + "아이디어 기획서 제출", + LocalDate.of(2026, 2, 1), + LocalDate.of(2026, 3, 1))); + + // 상 2, 중 3, 하 4 + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.HIGH)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.HIGH)); + + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID)); + + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.LOW)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.LOW)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.LOW)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.LOW)); + + // 내가 상 2개, 중 1개, 하 1개를 하고, 다른 팀원이 중 2개, 하 3개를 한 상황 가정 + taskService.assignTask(1L); + taskService.assignTask(2L); + taskService.assignTask(3L); + taskService.assignTask(9L); + + taskService.updateTaskStatus(1L); + taskService.updateTaskStatus(2L); + taskService.updateTaskStatus(3L); + taskService.updateTaskStatus(9L); + } + + @Nested + class 개별_기여도_조회_시 { + @Test + void 팀_참여자가_아니라면_에러반환() { + Member newTeamMember = memberRepository.save(Member.createMember("member", null, null)); + loginAs(newTeamMember); + + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 1L)) + .isInstanceOf( + new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) + .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); + } + + @Test + void 프로젝트_참여자가_아니라면_에러반환() { + loginAs(newMember); + assertThatThrownBy(() -> contributionService.getContributionByMember(2L, 1L)) + .isInstanceOf( + new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED) + .getClass()) + .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + } + + @Test + void 유효한_프로젝트가_아니라면_에러반환() { + Member member = memberUtil.getCurrentMember(); + assertThatThrownBy(() -> contributionService.getContributionByMember(3L, 1L)) + .isInstanceOf( + new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND).getClass()) + .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + + @Test + void 태스크가_존재하지_않으면_빈_값_반환() { + SprintCreateRequest sprintRequest = + new SprintCreateRequest( + 1L, "2차 스프린트", LocalDate.of(2026, 2, 1), LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); + + // when & then + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) + .isInstanceOf( + new CommonException(ContributionErrorCode.CONTRIBUTION_NOT_FOUND) + .getClass()) + .hasMessage(ContributionErrorCode.CONTRIBUTION_NOT_FOUND.getMessage()); + } + + @Test + void 스프린트가_존재하지_않으면_빈_값_반환() { + // when & then + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) + .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 프로젝트_참여자라면_기여도_반환() { + Member member = memberUtil.getCurrentMember(); + BasicContributionInfoResponse basicContributionInfoResponse = + contributionService.getContributionByMember(1L, 1L); + assertThat(basicContributionInfoResponse.memberId()).isEqualTo(member.getId()); + assertThat(basicContributionInfoResponse.score()).isEqualTo(61); + } + } + + @Nested + class 프로젝트_기여도_조회_시 { + @Test + void 팀_참여자가_아니라면_에러반환() { + Member newMember = memberRepository.save(Member.createMember("member", null, null)); + loginAs(newMember); + + assertThatThrownBy(() -> contributionService.getContributionBySprint(1L)) + .isInstanceOf( + new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) + .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); + } + + @Test + void 스프린트가_존재하지_않으면_에러_반환() { + Member member = memberUtil.getCurrentMember(); + assertThatThrownBy(() -> contributionService.getContributionBySprint(2L)) + .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 태스크가_존재하지_않으면_빈_값_반환() { + SprintCreateRequest sprintRequest = + new SprintCreateRequest( + 1L, "2차 스프린트", LocalDate.of(2026, 2, 1), LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); + + // when + List contributions = + contributionService.getContributionBySprint(2L); + + // then + assertThat(contributions.isEmpty()).isEqualTo(true); + } + + @Test + void 팀_참여자라면_기여도_반환() { + Member member = memberUtil.getCurrentMember(); + List contributionInfoResponse = + contributionService.getContributionBySprint(1L); + assertThat(contributionInfoResponse.get(0).memberId()).isEqualTo(member.getId()); + assertThat(contributionInfoResponse.get(0).score()).isEqualTo(61); + } + } +} diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index e1b49f03..74b1adfb 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -20,6 +20,8 @@ import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.task.application.TaskService; +import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -47,15 +49,25 @@ public class SprintServiceTest extends IntegrationTest { private final LocalDate dueDt = LocalDate.of(2026, 3, 1); @Autowired private SprintService sprintService; + @Autowired private TaskService taskService; @Autowired private SprintRepository sprintRepository; @Autowired private MemberRepository memberRepository; @Autowired private TeamRepository teamRepository; @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private ProjectRepository projectRepository; @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private TaskRepository taskRepository; private Project project; + private void loginAs(Member member) { + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); + UsernamePasswordAuthenticationToken token = + new UsernamePasswordAuthenticationToken( + userDetails, null, userDetails.getAuthorities()); + SecurityContextHolder.getContext().setAuthentication(token); + } + @BeforeEach void setUp() { Member member = diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 38170bf1..16b0c7a7 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -4,14 +4,21 @@ import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy; import com.amcamp.IntegrationTest; +import com.amcamp.domain.contribution.dao.ContributionRepository; +import com.amcamp.domain.contribution.domain.Contribution; import com.amcamp.domain.member.application.MemberService; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; import com.amcamp.domain.project.application.ProjectService; -import com.amcamp.domain.project.dto.request.ProjectCreateRequest; +import com.amcamp.domain.project.dao.ProjectParticipantRepository; +import com.amcamp.domain.project.dao.ProjectRepository; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.sprint.application.SprintService; -import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; +import com.amcamp.domain.sprint.dao.SprintRepository; +import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.*; @@ -19,16 +26,18 @@ import com.amcamp.domain.task.dto.request.TaskCreateRequest; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import com.amcamp.domain.team.application.TeamService; -import com.amcamp.domain.team.dto.request.TeamCreateRequest; +import com.amcamp.domain.team.dao.TeamParticipantRepository; +import com.amcamp.domain.team.dao.TeamRepository; +import com.amcamp.domain.team.domain.Team; +import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.response.TeamInviteCodeResponse; import com.amcamp.global.exception.CommonException; -import com.amcamp.global.exception.errorcode.ProjectErrorCode; -import com.amcamp.global.exception.errorcode.SprintErrorCode; -import com.amcamp.global.exception.errorcode.TaskErrorCode; -import com.amcamp.global.exception.errorcode.TeamErrorCode; +import com.amcamp.global.exception.errorcode.*; import com.amcamp.global.security.PrincipalDetails; import com.amcamp.global.util.MemberUtil; +import jakarta.transaction.Transactional; import java.time.LocalDate; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; @@ -41,13 +50,26 @@ public class TaskServiceTest extends IntegrationTest { @Autowired private MemberService memberService; - @Autowired private TeamService teamService; + @Autowired private TeamRepository teamRepository; @Autowired private MemberRepository memberRepository; @Autowired private MemberUtil memberUtil; @Autowired private ProjectService projectService; + @Autowired private ProjectRepository projectRepository; @Autowired private SprintService sprintService; + @Autowired private TeamService teamService; @Autowired private TaskService taskService; @Autowired private TaskRepository taskRepository; + @Autowired private SprintRepository sprintRepository; + @Autowired private ContributionRepository contributionRepository; + @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private TeamParticipantRepository teamParticipantRepository; + + private ProjectParticipant participant; + private ProjectParticipant newParticipant; + private Sprint sprint; + private Project project; + private Project anotherProject; + private Member newMember; private void loginAs(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); @@ -66,31 +88,65 @@ void setUp() { "testProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + newMember = memberRepository.save(Member.createMember("member", null, null)); + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( userDetails, null, userDetails.getAuthorities()); SecurityContextHolder.getContext().setAuthentication(token); - TeamCreateRequest teamCreateRequest = new TeamCreateRequest("팀 이름", "팀 설명"); - String inviteCode = teamService.createTeam(teamCreateRequest).inviteCode(); - TeamInviteCodeRequest teamInviteCodeRequest = new TeamInviteCodeRequest(inviteCode); - Long teamId = teamService.getTeamByCode(teamInviteCodeRequest).teamId(); - - ProjectCreateRequest projectRequest = - new ProjectCreateRequest( - teamId, - "testProjectTitle", - LocalDate.of(2026, 1, 1), - LocalDate.of(2026, 12, 1), - "testProjectDescription"); - - projectService.createProject(projectRequest); - - SprintCreateRequest sprintRequest = - new SprintCreateRequest( - 1L, "1차 스프린트", LocalDate.of(2026, 2, 1), LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); + Team team = teamRepository.save(Team.createTeam("testName", "testDescription")); + TeamParticipant teamParticipantAdmin = + teamParticipantRepository.save( + TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN)); + TeamParticipant teamParticipantUser = + teamParticipantRepository.save( + TeamParticipant.createParticipant( + newMember, team, TeamParticipantRole.USER)); + + project = + projectRepository.save( + Project.createProject( + team, + "testTitle", + "testDescription", + LocalDate.of(2026, 1, 1), + LocalDate.of(2026, 12, 1))); + anotherProject = + projectRepository.save( + Project.createProject( + team, + "testTitle", + "testDescription", + LocalDate.of(2026, 1, 1), + LocalDate.of(2026, 12, 1))); + + participant = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantAdmin, + project, + member.getNickname(), + member.getProfileImageUrl(), + ProjectParticipantRole.ADMIN)); + newParticipant = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUser, + project, + newMember.getNickname(), + newMember.getProfileImageUrl(), + ProjectParticipantRole.MEMBER)); + + sprint = + sprintRepository.save( + Sprint.createSprint( + project, + "1차 스프린트", + "아이디어 기획서 제출", + LocalDate.of(2026, 2, 1), + LocalDate.of(2026, 3, 1))); } @Test @@ -116,30 +172,37 @@ void setUp() { @Nested class 태스크_수정_시 { - // @Test - // void 수정_권한이_없으면_예외처리() { - // // assignee가 존재할때, 프로젝트 팀장이 아니면 예외처리 - // Member member = memberUtil.getCurrentMember(); - // TaskCreateRequest taskRequest = - // new TaskCreateRequest( - // 1L, - // "피그마 화면 설계 수정", - // TaskDifficulty.MID, - // LocalDate.of(2026, 2, 1), - // LocalDate.of(2026, 3, 1)); - // taskService.createTask(taskRequest); - // - // Member newMember = memberRepository.save(Member.createMember("member", null, - // null)); - // loginAs(newMember); - // - // TeamInviteCodeResponse teamInviteCodeResponse = teamService.getInviteCode(1L); - // teamService.joinTeam(new - // TeamInviteCodeRequest(teamInviteCodeResponse.inviteCode())); - // - // // 프로젝트 참여 관련 코드 필요 - // - // } + @Test + @Transactional + void 수정_권한이_없으면_예외처리() { + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + taskService.assignTask(1L); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + loginAs(newMember); + + assertThatThrownBy( + () -> + taskService.updateTaskBasicInfo( + 1L, + new TaskBasicInfoUpdateRequest( + "피그마 화면 설계 재수정", TaskDifficulty.LOW))) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_MODIFY_FORBIDDEN.getMessage()); + } + + @Test + void 태스크가_존재하지않으면_예외처리() { + assertThatThrownBy(() -> taskService.updateTaskStatus(1L)) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); + } @Test void 정상적으로_기본_기한정보를_수정_한다() { @@ -172,7 +235,7 @@ class 태스크_수정_시 { // assertThat(response.projectNickname()).isEqualTo(member.getNickname()); // when & then - finished - response = taskService.updateTaskToDoInfo(1L); + response = taskService.updateTaskStatus(1L); assertThat(response.taskStatus()).isEqualTo(TaskStatus.COMPLETED); // when - delete @@ -190,6 +253,72 @@ class 태스크_수정_시 { .isInstanceOf(CommonException.class) .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); } + + @Test + @Transactional + void 정상적으로_진행상태를_수정한다() { + Sprint sprint = + sprintRepository + .findById(1L) + .orElseThrow( + () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + + TeamParticipant teamParticipant = + teamParticipantRepository + .findByMemberAndTeam( + memberUtil.getCurrentMember(), sprint.getProject().getTeam()) + .orElseThrow( + () -> + new CommonException( + TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + ProjectParticipant participant = + projectParticipantRepository + .findByProjectAndTeamParticipant(sprint.getProject(), teamParticipant) + .orElseThrow( + () -> + new CommonException( + ProjectErrorCode + .PROJECT_PARTICIPATION_REQUIRED)); + + // when & then # of completed Task is 0 + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID)); + taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID)); + + assertThat(sprint.getProgress()).isEqualTo(0); + + // when & then # of completed Task is 1 + taskService.assignTask(1L); + taskService.updateTaskStatus(1L); + + Contribution contribution = + contributionRepository + .findBySprintAndParticipant(sprint, participant) + .orElseThrow( + () -> + new CommonException( + ContributionErrorCode.CONTRIBUTION_NOT_FOUND)); + + assertThat(contribution.getScore()).isEqualTo(33.333333333333336); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + assertThat(task.getTaskStatus()).isEqualTo(TaskStatus.COMPLETED); + assertThat(sprint.getProgress()).isEqualTo(33.333333333333336); + + // when & then # of completed Task is 3 + taskService.assignTask(2L); + taskService.updateTaskStatus(2L); + taskService.assignTask(3L); + taskService.updateTaskStatus(3L); + + assertThat(sprint.getProgress()).isEqualTo(100.0); + assertThat(contribution.getScore()).isEqualTo(100.0); + } } @Nested @@ -234,26 +363,30 @@ class sos_실행_시 { response = taskService.updateTaskSOS(task.getId()); assertThat(response.sosStatus()).isEqualTo(SOSStatus.SOS); } - // @Test - // void sos인_상태에서_태스크_할당상태를_수정한다 (){ - // // given - // Member member = memberUtil.getCurrentMember(); - // TaskCreateRequest taskRequest = - // new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); - // taskService.createTask(taskRequest); - // - // Task task = - // taskRepository - // .findById(1L) - // .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - // - // taskService.assignTask(task.getId()); - // taskService.updateTaskSOS(task.getId()); - // - // // 프로젝트 참가 메소드 필요 - // - // } + @Test + @Transactional + void sos인_상태에서_태스크_할당상태를_수정한다() { + // given + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + taskService.assignTask(task.getId()); + taskService.updateTaskSOS(task.getId()); + + loginAs(newMember); + taskService.assignTask(task.getId()); + + assertThat(task.getAssignedStatus()).isEqualTo(AssignedStatus.ASSIGNED); + assertThat(task.getSosStatus()).isEqualTo(SOSStatus.NOT_SOS); + assertThat(task.getAssignee()).isEqualTo(newParticipant); + } } @Nested @@ -276,10 +409,6 @@ class 태스크_목록_조회_시 { taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 - // when & then - // assertThatThrownBy(() -> taskService.getTasksBySprint(2l)) - // .isInstanceOf(CommonException.class) - // .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); assertThatThrownBy(() -> taskService.getTasksBySprint(2l, 0L, 3)) .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); From 658322e69ca2d1b5b51b7207f8a282e6f9f874c9 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 21 Mar 2025 15:19:12 +0900 Subject: [PATCH 056/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8,=20=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EC=8B=9C=20=EC=8B=9C=EC=9E=91=20=EB=82=A0=EC=A7=9C?= =?UTF-8?q?=EB=A5=BC=20=ED=98=84=EC=9E=AC=20=EB=82=A0=EC=A7=9C=EB=A1=9C=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=EB=90=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#128)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 프로젝트 생성 시 시작 날짜를 현재 날짜로 설정되도록 변경 * refactor: 스프린트 생성 시 시작 날짜를 현재 날짜로 설정되도록 변경 * refactor: 프로젝트 수정 시 시작 날짜를 요청에서 제외하도록 변경 * fix: request dto 필드 수정 * refactor: 스프린트 수정 시 시작 날짜를 요청에서 제외하도록 변경 * test: 시작 날짜 요청 제거에 따른 테스트 코드 수정 * test: 스프린트 테스트 추가 * test: 스프린트 테스트 코드 수정 * test: 기여도 테스트 코드 수정 * test: 태스크 테스트 코드 수정 --- .../domain/project/api/ProjectController.java | 2 +- .../project/application/ProjectService.java | 5 +- .../amcamp/domain/project/domain/Project.java | 11 +-- .../domain/project/domain/ToDoInfo.java | 39 ++++------ .../dto/request/ProjectCreateRequest.java | 4 - .../request/ProjectTodoInfoUpdateRequest.java | 3 +- .../sprint/application/SprintService.java | 24 +++--- .../amcamp/domain/sprint/domain/Sprint.java | 9 +-- .../dto/request/SprintCreateRequest.java | 12 +-- .../dto/request/SprintToDoUpdateRequest.java | 6 -- .../exception/errorcode/GlobalErrorCode.java | 2 +- .../exception/errorcode/SprintErrorCode.java | 3 + .../contribution/ContributionServiceTest.java | 24 ++---- .../application/FeedbackServiceTest.java | 18 ++--- .../domain/meeting/MeetingServiceTest.java | 33 ++------- .../domain/project/ProjectServiceTest.java | 33 +++------ .../sprint/application/SprintServiceTest.java | 74 ++++++++++++++----- .../amcamp/domain/task/TaskServiceTest.java | 31 +++----- 18 files changed, 134 insertions(+), 199 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index aae73039..a7bdfe24 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -62,7 +62,7 @@ public ResponseEntity projectBasicInfoUpdate( return ResponseEntity.ok().build(); } - @Operation(summary = "프로젝트 시작/마감기한/진행상태 업데이트", description = "프로젝트 시작/마감기한/진행상태를 수정합니다") + @Operation(summary = "프로젝트 마감기한/진행상태 업데이트", description = "프로젝트 마감기한/진행상태를 수정합니다") @PatchMapping("/{projectId}/todo-info") public ResponseEntity projectTodoInfoUpdate( @PathVariable Long projectId, diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index d2b02049..e9cc9f4b 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -48,7 +48,6 @@ public void createProject(ProjectCreateRequest request) { team, normalizeProjectTitle(request.projectTitle()), request.projectDescription(), - request.startDt(), request.dueDt())); projectParticipantRepository.save( @@ -91,8 +90,8 @@ public void updateProjectTodoInfo(Long projectId, ProjectTodoInfoUpdateRequest r Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); getValidProjectParticipant(member, project); - project.getToDoInfo() - .updateToDoInfo(request.startDt(), request.DueDt(), request.toDoStatus()); + + project.updateToDo(request.dueDt(), request.toDoStatus()); } // delete diff --git a/src/main/java/com/amcamp/domain/project/domain/Project.java b/src/main/java/com/amcamp/domain/project/domain/Project.java index 66582b39..7c59fda6 100644 --- a/src/main/java/com/amcamp/domain/project/domain/Project.java +++ b/src/main/java/com/amcamp/domain/project/domain/Project.java @@ -33,9 +33,6 @@ public class Project extends BaseTimeEntity { // 설명 @Lob private String description; - // // 프로젝트 목표 - // @Lob private String goal; - @Embedded private ToDoInfo toDoInfo; @OneToMany(mappedBy = "project", cascade = CascadeType.ALL, orphanRemoval = true) @@ -51,12 +48,12 @@ private Project(Team team, String title, String description, ToDoInfo toDoInfo) } public static Project createProject( - Team team, String title, String description, LocalDate startDt, LocalDate dueDt) { + Team team, String title, String description, LocalDate dueDt) { return Project.builder() .team(team) .title(title) .description(description) - .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) + .toDoInfo(ToDoInfo.createToDoInfo(dueDt)) .build(); } @@ -64,4 +61,8 @@ public void updateBasic(String title, String description) { this.title = (title != null) ? title : this.title; this.description = (description != null) ? description : this.description; } + + public void updateToDo(LocalDate dueDt, ToDoStatus status) { + toDoInfo.updateToDoInfo(dueDt, status); + } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java index 7b58c9d6..be3730c9 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java +++ b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java @@ -2,7 +2,6 @@ import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.GlobalErrorCode; -import jakarta.annotation.Nullable; import jakarta.persistence.Embeddable; import jakarta.persistence.EnumType; import jakarta.persistence.Enumerated; @@ -24,40 +23,30 @@ public class ToDoInfo { private ToDoStatus toDoStatus; // 진행 상태 @Builder(access = AccessLevel.PRIVATE) - private ToDoInfo( - @Nullable LocalDate startDt, - @Nullable LocalDate dueDt, - @Nullable ToDoStatus toDoStatus) { + private ToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus toDoStatus) { this.startDt = startDt; this.dueDt = dueDt; this.toDoStatus = toDoStatus; } - public static ToDoInfo createToDoInfo(LocalDate startDt, LocalDate dueDt) { - validateDates(startDt, dueDt); - return ToDoInfo.builder() - .startDt(startDt) - .dueDt(dueDt) - .toDoStatus(ToDoStatus.NOT_STARTED) - .build(); + public static ToDoInfo createToDoInfo(LocalDate dueDt) { + LocalDate now = LocalDate.now(); + if (dueDt.isBefore(now)) { + throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + } + + return ToDoInfo.builder().startDt(now).dueDt(dueDt).toDoStatus(ToDoStatus.ON_GOING).build(); } - public void updateToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus status) { - if (startDt != null) { - validateDates(startDt, this.dueDt); - this.startDt = startDt; - } + public void updateToDoInfo(LocalDate dueDt, ToDoStatus status) { if (dueDt != null) { - validateDates(this.startDt, dueDt); + if (dueDt.isBefore(this.startDt)) { + throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + } this.dueDt = dueDt; } - if (status != null) this.toDoStatus = status; - } - - private static void validateDates(LocalDate startDt, LocalDate dueDt) { - if (startDt == null || dueDt == null) return; - if (startDt.isAfter(dueDt) || startDt.isBefore(LocalDate.now())) { - throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + if (status != null) { + this.toDoStatus = status; } } } diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java index ce52bfc3..5490a54d 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java @@ -9,10 +9,6 @@ public record ProjectCreateRequest( @Schema(description = "팀 ID", example = "1") @NotNull Long teamId, @Schema(description = "프로젝트 제목", example = "Devfit") @NotBlank String projectTitle, - @Schema(description = "프로젝트 시작 날짜", example = "2026-01-01") - @JsonFormat(shape = JsonFormat.Shape.STRING) - @NotNull - LocalDate startDt, @Schema(description = "프로젝트 마감 날짜", example = "2027-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java index 9b666872..32acc795 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java @@ -5,6 +5,5 @@ import java.time.LocalDate; public record ProjectTodoInfoUpdateRequest( - @Schema(description = "수정된 프로젝트 시작일자", example = "2026-03-01") LocalDate startDt, - @Schema(description = "수정된 프로젝트 마감일자", example = "2026-04-01") LocalDate DueDt, + @Schema(description = "수정된 프로젝트 마감일자", example = "2026-04-01") LocalDate dueDt, @Schema(description = "수정된 프로젝트 진행상태", example = "COMPLETED") ToDoStatus toDoStatus) {} diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index 48014c33..d957d7f6 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -3,7 +3,9 @@ import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; -import com.amcamp.domain.project.domain.*; +import com.amcamp.domain.project.domain.Project; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; @@ -14,7 +16,6 @@ import com.amcamp.domain.team.domain.Team; import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.global.exception.CommonException; -import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; @@ -42,19 +43,14 @@ public SprintInfoResponse createSprint(SprintCreateRequest request) { final Project project = findByProjectId(request.projectId()); validateProjectParticipant(project, project.getTeam(), currentMember); - validateDate(request.startDt(), request.dueDt(), project.getToDoInfo()); + validateSprintDueDate(request.dueDt(), project.getToDoInfo().getDueDt()); long count = sprintRepository.countByProject(project); String autoTitle = String.valueOf(count + 1); Sprint sprint = sprintRepository.save( - Sprint.createSprint( - project, - autoTitle, - request.goal(), - request.startDt(), - request.dueDt())); + Sprint.createSprint(project, autoTitle, request.goal(), request.dueDt())); return SprintInfoResponse.from(sprint); } @@ -79,9 +75,9 @@ public SprintInfoResponse updateSprintToDoInfo(Long sprintId, SprintToDoUpdateRe validateProjectParticipant( sprint.getProject(), sprint.getProject().getTeam(), currentMember); - validateDate(request.startDt(), request.dueDt(), sprint.getProject().getToDoInfo()); + validateSprintDueDate(request.dueDt(), sprint.getProject().getToDoInfo().getDueDt()); - sprint.updateSprintToDo(request.startDt(), request.dueDt(), request.status()); + sprint.updateSprintToDo(request.dueDt(), request.status()); return SprintInfoResponse.from(sprint); } @@ -149,9 +145,9 @@ private void validateAdminProjectParticipant(ProjectParticipant projectParticipa } } - private void validateDate(LocalDate startDt, LocalDate dueDt, ToDoInfo toDoInfo) { - if (startDt.isBefore(toDoInfo.getStartDt()) || dueDt.isAfter(toDoInfo.getDueDt())) { - throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); + private void validateSprintDueDate(LocalDate sprintDueDt, LocalDate projectDueDt) { + if (sprintDueDt.isAfter(projectDueDt)) { + throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_INVALID); } } } diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index 461f7eab..f1c3f387 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -59,14 +59,13 @@ private Sprint(Project project, String title, String goal, ToDoInfo toDoInfo, Do this.progress = progress; } - public static Sprint createSprint( - Project project, String title, String goal, LocalDate startDt, LocalDate dueDt) { + public static Sprint createSprint(Project project, String title, String goal, LocalDate dueDt) { return Sprint.builder() .project(project) .title(title) .goal(goal) - .toDoInfo(ToDoInfo.createToDoInfo(startDt, dueDt)) .progress(0.0) + .toDoInfo(ToDoInfo.createToDoInfo(dueDt)) .build(); } @@ -74,8 +73,8 @@ public void updateSprintBasic(String goal) { if (goal != null) this.goal = goal; } - public void updateSprintToDo(LocalDate startDt, LocalDate dueDt, ToDoStatus status) { - toDoInfo.updateToDoInfo(startDt, dueDt, status); + public void updateSprintToDo(LocalDate dueDt, ToDoStatus status) { + toDoInfo.updateToDoInfo(dueDt, status); } public void updateSprintTitle(String title) { diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java index b3a76c36..434b19d1 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java @@ -12,13 +12,6 @@ public record SprintCreateRequest( @NotBlank(message = "스프린트 중간 목표는 비워둘 수 없습니다.") @Schema(description = "중간 목표", example = "MVP 개발") String goal, - @NotNull(message = "스프린트 시작 날짜는 비워둘 수 없습니다.") - @JsonFormat( - shape = JsonFormat.Shape.STRING, - pattern = "yyyy-MM-dd", - timezone = "Asia/Seoul") - @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") - LocalDate startDt, @NotNull(message = "스프린트 마감 날짜는 비워둘 수 없습니다.") @JsonFormat( shape = JsonFormat.Shape.STRING, @@ -26,8 +19,7 @@ public record SprintCreateRequest( timezone = "Asia/Seoul") @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt) { - public static SprintCreateRequest of( - Long projectId, String goal, LocalDate startDt, LocalDate dueDt) { - return new SprintCreateRequest(projectId, goal, startDt, dueDt); + public static SprintCreateRequest of(Long projectId, String goal, LocalDate dueDt) { + return new SprintCreateRequest(projectId, goal, dueDt); } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java index 6706cd3f..fd360a8d 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java @@ -6,12 +6,6 @@ import java.time.LocalDate; public record SprintToDoUpdateRequest( - @JsonFormat( - shape = JsonFormat.Shape.STRING, - pattern = "yyyy-MM-dd", - timezone = "Asia/Seoul") - @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") - LocalDate startDt, @JsonFormat( shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", diff --git a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java index 88f105ed..ca4faa63 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java @@ -8,7 +8,7 @@ @AllArgsConstructor public enum GlobalErrorCode implements BaseErrorCode { INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류입니다. 관리자에게 문의해주세요."), - INVALID_DATE_ERROR(HttpStatus.BAD_REQUEST, "유효하지 않은 날짜 입력입니다."); + INVALID_DATE_ERROR(HttpStatus.BAD_REQUEST, "마감일은 현재 날짜 이후여야 합니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index c4a0e287..e3d12415 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -10,7 +10,10 @@ public enum SprintErrorCode implements BaseErrorCode { SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), SPRINT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "스프린트 삭제 권한이 없습니다."), + TASK_NOT_CREATED_YET(HttpStatus.NOT_FOUND, "스프린트 내 태스크가 존재하지 않습니다."), + + SPRINT_DUE_DATE_INVALID(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java index 50858d03..dc4b006b 100644 --- a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -104,19 +104,11 @@ void setUp() { project = projectRepository.save( Project.createProject( - team, - "testTitle", - "testDescription", - LocalDate.of(2026, 1, 1), - LocalDate.of(2026, 12, 1))); + team, "testTitle", "testDescription", LocalDate.of(2026, 12, 1))); anotherProject = projectRepository.save( Project.createProject( - team, - "testTitle", - "testDescription", - LocalDate.of(2026, 1, 1), - LocalDate.of(2026, 12, 1))); + team, "testTitle", "testDescription", LocalDate.of(2026, 12, 1))); participant = projectParticipantRepository.save( @@ -138,11 +130,7 @@ void setUp() { sprint = sprintRepository.save( Sprint.createSprint( - project, - "1차 스프린트", - "아이디어 기획서 제출", - LocalDate.of(2026, 2, 1), - LocalDate.of(2026, 3, 1))); + project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); // 상 2, 중 3, 하 4 taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.HIGH)); @@ -204,8 +192,7 @@ class 개별_기여도_조회_시 { @Test void 태스크가_존재하지_않으면_빈_값_반환() { SprintCreateRequest sprintRequest = - new SprintCreateRequest( - 1L, "2차 스프린트", LocalDate.of(2026, 2, 1), LocalDate.of(2026, 3, 1)); + new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); sprintService.createSprint(sprintRequest); // when & then @@ -258,8 +245,7 @@ class 프로젝트_기여도_조회_시 { @Test void 태스크가_존재하지_않으면_빈_값_반환() { SprintCreateRequest sprintRequest = - new SprintCreateRequest( - 1L, "2차 스프린트", LocalDate.of(2026, 2, 1), LocalDate.of(2026, 3, 1)); + new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); sprintService.createSprint(sprintRequest); // when diff --git a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java index bc1ccf16..185f0d18 100644 --- a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java +++ b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java @@ -43,9 +43,6 @@ public class FeedbackServiceTest extends IntegrationTest { private final String feedbackMessage = "이번 스프린트에서 아주 잘해주셨습니다."; - private final LocalDate startDt = LocalDate.now(); - private final LocalDate dueDt = LocalDate.now(); - @Autowired private FeedbackService feedbackService; @Autowired private FeedbackRepository feedbackRepository; @Autowired private SprintRepository sprintRepository; @@ -95,11 +92,11 @@ void setUp() { project = projectRepository.save( Project.createProject( - team, "testTitle", "testDescription", startDt, dueDt)); + team, "testTitle", "testDescription", LocalDate.of(2030, 1, 1))); anotherProject = projectRepository.save( Project.createProject( - team, "testTitle", "testDescription", startDt, dueDt)); + team, "testTitle", "testDescription", LocalDate.of(2030, 1, 1))); sender = projectParticipantRepository.save( @@ -130,7 +127,7 @@ void setUp() { sprint = sprintRepository.save( - Sprint.createSprint(project, "testSprint", "testGoal", startDt, dueDt)); + Sprint.createSprint(project, "testSprint", "testGoal", LocalDate.now())); anotherSprint = sprintRepository.save( @@ -138,8 +135,7 @@ void setUp() { anotherProject, "testAnotherSprint", "testAnotherGoal", - startDt, - dueDt)); + LocalDate.now())); } @Nested @@ -234,11 +230,7 @@ class 피드백_메시지를_전송할_때 { sprint = sprintRepository.save( Sprint.createSprint( - project, - "testSprint", - "testGoal", - startDt, - LocalDate.of(2030, 1, 1))); + project, "testSprint", "testGoal", LocalDate.of(2030, 1, 1))); FeedbackSendRequest request = new FeedbackSendRequest(sprint.getId(), receiver.getId(), feedbackMessage); diff --git a/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java b/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java index 71f71a25..c27eeae4 100644 --- a/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java +++ b/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java @@ -53,14 +53,10 @@ public class MeetingServiceTest extends IntegrationTest { @Autowired private MeetingService meetingService; private Member memberAdmin; - private Member member1; - private Member member2; private final String projectTitle = "projectTitle"; private final String description = "projectDescription"; private final String meetingTitle = "meetingTitle"; - private final LocalDate projectStartDt = LocalDate.of(2026, 1, 1); private final LocalDate projectDueDt = LocalDate.of(2026, 12, 1); - private final LocalDate sprintStartDt = LocalDate.of(2026, 3, 1); private final LocalDate sprintDueDt = LocalDate.of(2026, 3, 31); private final LocalDateTime meetingStart = LocalDateTime.of(2026, 3, 15, 17, 0); private final LocalDateTime meetingEnd = LocalDateTime.of(2026, 3, 15, 18, 0); @@ -91,24 +87,20 @@ private Long getTeamId() { void createTestProject() { Long teamId = getTeamId(); ProjectCreateRequest request = - new ProjectCreateRequest( - teamId, projectTitle, projectStartDt, projectDueDt, description); + new ProjectCreateRequest(teamId, projectTitle, projectDueDt, description); projectService.createProject(request); } void createTestProject(Long teamId) { ProjectCreateRequest request = - new ProjectCreateRequest( - teamId, projectTitle, projectStartDt, projectDueDt, description); + new ProjectCreateRequest(teamId, projectTitle, projectDueDt, description); projectService.createProject(request); } - void createTestProject( - Long teamId, String title, LocalDate startDt, LocalDate dueDt, String description) { - ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, startDt, dueDt, description); + void createTestProject(Long teamId, String title, LocalDate dueDt, String description) { + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); projectService.createProject(request); } @@ -116,7 +108,7 @@ void createTestProject( // 스프린트 생성 void createTestSprint(Long projectId) { SprintCreateRequest request = - new SprintCreateRequest(projectId, "testSprintGoal", sprintStartDt, sprintDueDt); + new SprintCreateRequest(projectId, "testSprintGoal", sprintDueDt); sprintService.createSprint(request); } @@ -144,21 +136,6 @@ public void setUp() { loginAs(memberAdmin); createTestProject(); createTestSprint(1L); - - // member1 = - // Member.createMember( - // "member1", - // "testProfileImageUrl", - // OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - // memberRepository.save(member1); - // - // member2 = - // Member.createMember( - // "member2", - // "testProfileImageUrl", - // OauthInfo.createOauthInfo("testOauthId", "testOauthProvider")); - // memberRepository.save(member2); - } @AfterEach diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 1b871485..c432b228 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -55,7 +55,6 @@ public class ProjectServiceTest extends IntegrationTest { private Member member2; private final String title = "projectTitle"; private final String description = "projectDescription"; - private final LocalDate startDt = LocalDate.of(2026, 1, 1); private final LocalDate dueDt = LocalDate.of(2026, 12, 1); private void loginAs(Member member) { @@ -81,23 +80,19 @@ private Long getTeamId() { void createTestProject() { Long teamId = getTeamId(); - ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, startDt, dueDt, description); + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); projectService.createProject(request); } void createTestProject(Long teamId) { - ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, startDt, dueDt, description); + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); projectService.createProject(request); } - void createTestProject( - Long teamId, String title, LocalDate startDt, LocalDate dueDt, String description) { - ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, startDt, dueDt, description); + void createTestProject(Long teamId, String title, LocalDate dueDt, String description) { + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); projectService.createProject(request); } @@ -143,7 +138,7 @@ public void afterEach() { // given Long teamId = getTeamId(); // when - createTestProject(teamId, title, startDt, dueDt, description); + createTestProject(teamId, title, dueDt, description); // then Project project = projectRepository.findById(1L).get(); @@ -159,14 +154,14 @@ class 프로젝트_조회 { void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, "project1", startDt, dueDt, description); + createTestProject(teamId, "project1", dueDt, description); // member logout 후 anotherMember 로그인 logout(); loginAs(member1); // 팀 참가 teamService.joinTeam(teamInviteCodeRequest); // anotherMember 새 프로젝트 생성 - createTestProject(teamId, "project2", startDt, dueDt, description); + createTestProject(teamId, "project2", dueDt, description); // when Slice responseTrue = @@ -219,7 +214,7 @@ class 프로젝트_업데이트 { void createOriginalProject() { Long teamId = getTeamId(); - createTestProject(teamId, originalTitle, startDt, dueDt, originalDescription); + createTestProject(teamId, originalTitle, dueDt, originalDescription); } @Test @@ -321,15 +316,11 @@ void createOriginalProject() { // given createOriginalProject(); // when - LocalDate updatedStartDt = LocalDate.of(2026, 1, 15); LocalDate updatedDueDt = LocalDate.of(2027, 12, 1); projectService.updateProjectTodoInfo( - 1L, - new ProjectTodoInfoUpdateRequest( - updatedStartDt, updatedDueDt, ToDoStatus.COMPLETED)); + 1L, new ProjectTodoInfoUpdateRequest(updatedDueDt, ToDoStatus.COMPLETED)); Project updatedProject = projectRepository.findById(1L).get(); // then - assertThat(updatedProject.getToDoInfo().getStartDt()).isEqualTo(updatedStartDt); assertThat(updatedProject.getToDoInfo().getDueDt()).isEqualTo(updatedDueDt); assertThat(updatedProject.getToDoInfo().getToDoStatus()) .isEqualTo(ToDoStatus.COMPLETED); @@ -340,11 +331,9 @@ void createOriginalProject() { // given createOriginalProject(); // when - LocalDate updatedStartDt = LocalDate.of(2027, 1, 1); - LocalDate updatedDueDt = LocalDate.of(2026, 1, 1); + LocalDate updatedDueDt = LocalDate.of(2024, 1, 1); ProjectTodoInfoUpdateRequest request = - new ProjectTodoInfoUpdateRequest( - updatedStartDt, updatedDueDt, ToDoStatus.COMPLETED); + new ProjectTodoInfoUpdateRequest(updatedDueDt, ToDoStatus.COMPLETED); // then assertThatThrownBy(() -> projectService.updateProjectTodoInfo(1L, request)) diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 74b1adfb..1ee289c9 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -45,7 +45,6 @@ public class SprintServiceTest extends IntegrationTest { - private final LocalDate startDt = LocalDate.of(2026, 1, 2); private final LocalDate dueDt = LocalDate.of(2026, 3, 1); @Autowired private SprintService sprintService; @@ -89,7 +88,7 @@ void setUp() { TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN); teamParticipantRepository.save(teamParticipant); - project = Project.createProject(team, "testTitle", "testDescription", startDt, dueDt); + project = Project.createProject(team, "testTitle", "testDescription", dueDt); projectRepository.save(project); ProjectParticipant projectParticipant = ProjectParticipant.createProjectParticipant( @@ -107,28 +106,37 @@ class 스프린트_생성할_때 { void 프로젝트_기간_내라면_스프린트를_생성한다() { // given SprintCreateRequest request = - new SprintCreateRequest(project.getId(), "testGoal", startDt, dueDt); + new SprintCreateRequest(project.getId(), "testGoal", dueDt); // when SprintInfoResponse response = sprintService.createSprint(request); // then assertThat(response.goal()).isEqualTo("testGoal"); - assertThat(response.startDt()).isEqualTo(LocalDate.of(2026, 1, 2)); assertThat(response.dueDt()).isEqualTo(LocalDate.of(2026, 3, 1)); } @Test - void 프로젝트_기간_외라면_예외가_발생한다() { + void 스프린트_마감_날짜가_프로젝트_마감_날짜_이후라면_예외가_발생한다() { // given SprintCreateRequest request = - new SprintCreateRequest( - project.getId(), - "testGoal", - LocalDate.of(2026, 1, 1), - LocalDate.of(2026, 3, 2)); + new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2026, 3, 2)); // when & then + assertThatThrownBy(() -> sprintService.createSprint(request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_INVALID.getMessage()); + } + + @Test + void 스프린트_마감_날짜가_스프린트_시작_날짜_이전이라면_예외가_발생한다() { + // given + sprintRepository.save( + Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); + SprintCreateRequest request = + new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2024, 1, 1)); + + // when assertThatThrownBy(() -> sprintService.createSprint(request)) .isInstanceOf(CommonException.class) .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); @@ -149,23 +157,49 @@ class 스프린트_수정할_때 { } @Test - void 스프린트_시작_날짜가_프로젝트_기간_내라면_성공한다() { + void 스프린트_마감_날짜가_프로젝트_마감_날짜_이내라면_성공한다() { // given sprintRepository.save( - Sprint.createSprint(project, "testTitle", "testDescription", startDt, dueDt)); + Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); SprintToDoUpdateRequest request = - new SprintToDoUpdateRequest( - LocalDate.of(2026, 2, 14), LocalDate.of(2026, 2, 28), null); + new SprintToDoUpdateRequest(LocalDate.of(2026, 2, 28), null); // when SprintInfoResponse response = sprintService.updateSprintToDoInfo(1L, request); // then - assertThat(response.startDt()).isEqualTo(LocalDate.of(2026, 2, 14)); assertThat(response.dueDt()).isEqualTo(LocalDate.of(2026, 2, 28)); - assertThat(response.status()).isEqualTo(ToDoStatus.NOT_STARTED); + assertThat(response.status()).isEqualTo(ToDoStatus.ON_GOING); assertThat(response.title()).isEqualTo("testTitle"); } + + @Test + void 스프린트_마감_날짜가_프로젝트_마감_날짜_이후라면_예외가_발생한다() { + // given + sprintRepository.save( + Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); + SprintToDoUpdateRequest request = + new SprintToDoUpdateRequest(LocalDate.of(2030, 1, 1), null); + + // when + assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_INVALID.getMessage()); + } + + @Test + void 스프린트_마감_날짜가_스프린트_시작_날짜_이전이라면_예외가_발생한다() { + // given + sprintRepository.save( + Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); + SprintToDoUpdateRequest request = + new SprintToDoUpdateRequest(LocalDate.of(2024, 1, 1), null); + + // when + assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) + .isInstanceOf(CommonException.class) + .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); + } } @Nested @@ -182,7 +216,7 @@ class 스프린트_삭제할_때 { void 프로젝트_리더가_삭제할_경우_성공한다() { // given sprintRepository.save( - Sprint.createSprint(project, "testTitle", "testDescription", startDt, dueDt)); + Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); // when sprintService.deleteSprint(1L); @@ -208,9 +242,9 @@ class 프로젝트별_스프린트_목록을_조회할_때 { // given List sprintList = List.of( - Sprint.createSprint(project, "1", "testDescription1", startDt, dueDt), - Sprint.createSprint(project, "2", "testDescription2", startDt, dueDt), - Sprint.createSprint(project, "3", "testDescription3", startDt, dueDt)); + Sprint.createSprint(project, "1", "testDescription1", dueDt), + Sprint.createSprint(project, "2", "testDescription2", dueDt), + Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); // when diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 16b0c7a7..2960bf43 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -19,6 +19,7 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.*; @@ -108,19 +109,11 @@ void setUp() { project = projectRepository.save( Project.createProject( - team, - "testTitle", - "testDescription", - LocalDate.of(2026, 1, 1), - LocalDate.of(2026, 12, 1))); + team, "testTitle", "testDescription", LocalDate.of(2026, 12, 1))); anotherProject = projectRepository.save( Project.createProject( - team, - "testTitle", - "testDescription", - LocalDate.of(2026, 1, 1), - LocalDate.of(2026, 12, 1))); + team, "testTitle", "testDescription", LocalDate.of(2026, 12, 1))); participant = projectParticipantRepository.save( @@ -142,11 +135,11 @@ void setUp() { sprint = sprintRepository.save( Sprint.createSprint( - project, - "1차 스프린트", - "아이디어 기획서 제출", - LocalDate.of(2026, 2, 1), - LocalDate.of(2026, 3, 1))); + project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); + + SprintCreateRequest sprintRequest = + new SprintCreateRequest(1L, "1차 스프린트", LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); } @Test @@ -394,7 +387,6 @@ class 태스크_목록_조회_시 { @Test void 스프린트가_유효하지않으면_에러를_반환한다() { // given - Member member = memberUtil.getCurrentMember(); TaskCreateRequest taskRequest1 = new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); taskService.createTask(taskRequest1); @@ -402,14 +394,11 @@ class 태스크_목록_조회_시 { new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); taskService.createTask(taskRequest2); - Task task = - taskRepository - .findById(1L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + Task task = taskRepository.findById(1L).get(); taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 - assertThatThrownBy(() -> taskService.getTasksBySprint(2l, 0L, 3)) + assertThatThrownBy(() -> taskService.getTasksBySprint(999L, 0L, 3)) .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } From d5829456c2c39bc826f4d9f1a1c9ebabb603f452 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sat, 22 Mar 2025 23:12:40 +0900 Subject: [PATCH 057/107] =?UTF-8?q?feat:=20=ED=8C=80=20=EB=AF=B8=ED=8C=85?= =?UTF-8?q?=20=EC=88=98=EC=A0=95/=EC=A1=B0=ED=9A=8C/=EC=82=AD=EC=A0=9C=20(?= =?UTF-8?q?#123)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 팀 미팅 생성 구현(Sprint 도메인 의존성 추가 +SprintRepository 단일 조회 로직 추가 * refactor: 미팅 일시 dto description 수정 * refactor: meetingCreate 요청 형식 수정, 불필요한 Sprint 레포지토리 쿼리 메소드 삭제 * refactor: 동일 제목/타이틀 방지 검증 로직 추가 * refactor: SprintRepository 기본조회로직 제거 확인 * refactor: MeetingDt -> MeetingStart, MeetingEnd 분화, 8:00-00:00 검증로직 추가 * refactor: 팀 미팅 수정(스케줄러 로직-> 서비스 레이어로 이동, MeetingStart/End 개별 업데이트 가능하도록 로직 수정, MeetingInfoResponse 정적팩토리메소드 이름 수정) * feat: meeting update 테스트 케이스 추가 * feat: meeting 조회 테스트 케이스 추가 * refactor: 미팅 시작/종료 시간 검증로직 순서 재배치 * refactor: 테스트 중 작성한 디버깅 코드 삭제 * refactor: start/end null 값으로 개별 업데이트 가능하도록 수정 * refactor: start/end 업데이트 시 검증 로직 수정 + 기존 일정 중첩 여부 검사 시 객체 자신 포함하지 않도록 쿼리 수정 --- .../domain/meeting/api/MeetingController.java | 45 +- .../meeting/application/MeetingService.java | 79 +++- .../domain/meeting/dao/MeetingRepository.java | 10 +- .../meeting/dao/MeetingRepositoryCustom.java | 9 + .../meeting/dao/MeetingRepositoryImpl.java | 58 +++ .../amcamp/domain/meeting/domain/Meeting.java | 25 +- .../dto/request/MeetingDtUpdateRequest.java | 11 + .../request/MeetingTitleUpdateRequest.java | 7 + .../dto/response/MeetingInfoResponse.java | 16 + .../exception/errorcode/MeetingErrorCode.java | 1 - .../scheduler/MeetingStatusScheduler.java | 18 + .../domain/meeting/MeetingServiceTest.java | 408 ++++++++++++++---- 12 files changed, 586 insertions(+), 101 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryCustom.java create mode 100644 src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java create mode 100644 src/main/java/com/amcamp/domain/meeting/dto/request/MeetingDtUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java create mode 100644 src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java create mode 100644 src/main/java/com/amcamp/infra/scheduler/MeetingStatusScheduler.java diff --git a/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java b/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java index 7675cf08..616fbc97 100644 --- a/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java +++ b/src/main/java/com/amcamp/domain/meeting/api/MeetingController.java @@ -2,9 +2,14 @@ import com.amcamp.domain.meeting.application.MeetingService; import com.amcamp.domain.meeting.dto.request.MeetingCreateRequest; +import com.amcamp.domain.meeting.dto.request.MeetingDtUpdateRequest; +import com.amcamp.domain.meeting.dto.request.MeetingTitleUpdateRequest; +import com.amcamp.domain.meeting.dto.response.MeetingInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.validation.Valid; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -19,8 +24,46 @@ public class MeetingController { @Operation(summary = "미팅 생성", description = "새로운 미팅을 생성합니다.") @PostMapping("/create") - public ResponseEntity meetingCreate(@RequestBody MeetingCreateRequest request) { + public ResponseEntity meetingCreate(@Valid @RequestBody MeetingCreateRequest request) { meetingService.createMeeting(request); return ResponseEntity.status(HttpStatus.CREATED).build(); } + + @Operation(summary = "미팅 일시 업데이트", description = "미팅 일시를 업데이트합니다.") + @PostMapping("/{meetingId}/date") + public ResponseEntity meetingDateUpdate( + @PathVariable Long meetingId, @Valid @RequestBody MeetingDtUpdateRequest request) { + meetingService.updateMeetingDt(meetingId, request); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "미팅 타이틀 업데이트", description = "미팅 타이틀을 업데이트합니다.") + @PostMapping("/{meetingId}/title") + public ResponseEntity meetingTitleUpdate( + @PathVariable Long meetingId, @Valid @RequestBody MeetingTitleUpdateRequest request) { + meetingService.updateMeetingTitle(meetingId, request); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "미팅 취소", description = "미팅을 삭제합니다.") + @DeleteMapping("/{meetingId}") + public ResponseEntity meetingCancel(@PathVariable Long meetingId) { + meetingService.deleteMeeting(meetingId); + return ResponseEntity.ok().build(); + } + + @Operation(summary = "미팅 조회", description = "미팅 개별 정보를 조회합니다.") + @GetMapping("/{meetingId}") + public MeetingInfoResponse meetingGet(@PathVariable Long meetingId) { + return meetingService.getMeeting(meetingId); + } + + @Operation(summary = "미팅 목록 조회", description = "스프린트 별 미팅 목록을 조회합니다.") + @GetMapping("/{sprintId}/list") + public Slice meetingListGet( + @PathVariable Long sprintId, + @RequestParam(required = false) Long lastMeetingId, + @RequestParam(defaultValue = "10") int pageSize) { + return meetingService.getMeetingList(sprintId, lastMeetingId, pageSize); + } } diff --git a/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java b/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java index 76b41580..75bcec8b 100644 --- a/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java +++ b/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java @@ -2,7 +2,11 @@ import com.amcamp.domain.meeting.dao.MeetingRepository; import com.amcamp.domain.meeting.domain.Meeting; +import com.amcamp.domain.meeting.domain.MeetingStatus; import com.amcamp.domain.meeting.dto.request.MeetingCreateRequest; +import com.amcamp.domain.meeting.dto.request.MeetingDtUpdateRequest; +import com.amcamp.domain.meeting.dto.request.MeetingTitleUpdateRequest; +import com.amcamp.domain.meeting.dto.response.MeetingInfoResponse; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.domain.Project; @@ -18,8 +22,11 @@ import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; +import jakarta.annotation.Nullable; import java.time.LocalDateTime; +import java.util.List; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -37,19 +44,67 @@ public class MeetingService { // 미팅 생성 public void createMeeting(MeetingCreateRequest request) { Member member = memberUtil.getCurrentMember(); - Sprint sprint = getValidateSprint(member, request.sprintId()); - validateMeetingTime(sprint, request.meetingStart(), request.meetingEnd()); + Sprint sprint = getValidSprint(member, request.sprintId()); + validateMeetingTime(null, sprint, request.meetingStart(), request.meetingEnd()); meetingRepository.save( Meeting.createMeeting( request.title(), request.meetingStart(), request.meetingEnd(), sprint)); } + @Transactional(readOnly = true) + public MeetingInfoResponse getMeeting(Long meetingId) { + Member member = memberUtil.getCurrentMember(); + Meeting meeting = getMeetingById(meetingId); + validateProjectParticipant(member, meeting.getSprint().getProject()); + return MeetingInfoResponse.from(meeting); + } + + @Transactional(readOnly = true) + public Slice getMeetingList( + Long sprintId, Long lastMeetingId, int pageSize) { + Member member = memberUtil.getCurrentMember(); + Sprint sprint = getValidSprint(member, sprintId); + validateProjectParticipant(member, sprint.getProject()); + return meetingRepository.findAllBySprintIdWithPagination(sprintId, lastMeetingId, pageSize); + } + + // 업데이트 + public void updateMeetingTitle(Long meetingId, MeetingTitleUpdateRequest request) { + Member member = memberUtil.getCurrentMember(); + Meeting meeting = getMeetingById(meetingId); + validateProjectParticipant(member, meeting.getSprint().getProject()); + + meeting.updateTitle(request.title()); + } + + public void updateMeetingDt(Long meetingId, MeetingDtUpdateRequest request) { + Member member = memberUtil.getCurrentMember(); + Meeting meeting = getMeetingById(meetingId); + validateProjectParticipant(member, meeting.getSprint().getProject()); + LocalDateTime meetingStart = + request.meetingStart() != null ? request.meetingStart() : meeting.getMeetingStart(); + LocalDateTime meetingEnd = + request.meetingEnd() != null ? request.meetingEnd() : meeting.getMeetingEnd(); + validateMeetingTime(meeting.getId(), meeting.getSprint(), meetingStart, meetingEnd); + meeting.updateMeetingDt(meetingStart, meetingEnd); + } + + // 삭제 + public void deleteMeeting(Long meetingId) { + Member member = memberUtil.getCurrentMember(); + Meeting meeting = getMeetingById(meetingId); + validateProjectParticipant(member, meeting.getSprint().getProject()); + meetingRepository.delete(meeting); + } + // util private void validateMeetingTime( - Sprint sprint, LocalDateTime meetingStart, LocalDateTime meetingEnd) { + @Nullable Long meetingId, + Sprint sprint, + LocalDateTime meetingStart, + LocalDateTime meetingEnd) { - // start,end 선후 관계 확인 - if (meetingStart.isAfter(meetingEnd) || meetingStart.isEqual(meetingEnd)) { + if (!meetingStart.isBefore(meetingEnd) || meetingStart.isEqual(meetingEnd)) { throw new CommonException(MeetingErrorCode.INVALID_MEETING_TIME_RANGE); } // 8:00~00:00 @@ -63,7 +118,7 @@ private void validateMeetingTime( throw new CommonException(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT); } // 기존 일정과의 중복 확인 if (meetingRepository - .findOverlappingMeeting(sprint, meetingStart, meetingEnd) + .findOverlappingMeeting(meetingId, sprint, meetingStart, meetingEnd) .isPresent()) { throw new CommonException(MeetingErrorCode.MEETING_ALREADY_EXISTS); } @@ -83,7 +138,7 @@ private ProjectParticipant validateProjectParticipant(Member member, Project pro () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); } - private Sprint getValidateSprint(Member member, Long sprintId) { + private Sprint getValidSprint(Member member, Long sprintId) { Sprint sprint = sprintRepository .findById(sprintId) @@ -98,7 +153,13 @@ private Meeting getMeetingById(Long meetingId) { .orElseThrow(() -> new CommonException(MeetingErrorCode.MEETING_NOT_FOUND)); } - private boolean isMeetingExist(Long meetingId) { - return meetingRepository.findById(meetingId).isPresent(); + public void updateExpiredMeetings() { + // 상태:OPEN, meetingEnd 현재 시간보다 이전인 미팅 + List expiredMeetings = + meetingRepository.findByStatusAndMeetingEndBefore( + MeetingStatus.OPEN, LocalDateTime.now()); + + // CLOSE로 변경 + expiredMeetings.forEach(meeting -> meeting.updateStatus(MeetingStatus.CLOSE)); } } diff --git a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java index 6f9cd5ba..a418b9a3 100644 --- a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java +++ b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepository.java @@ -1,24 +1,28 @@ package com.amcamp.domain.meeting.dao; import com.amcamp.domain.meeting.domain.Meeting; +import com.amcamp.domain.meeting.domain.MeetingStatus; import com.amcamp.domain.sprint.domain.Sprint; import feign.Param; import java.time.LocalDateTime; +import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; -import org.springframework.stereotype.Repository; -@Repository -public interface MeetingRepository extends JpaRepository { +public interface MeetingRepository extends JpaRepository, MeetingRepositoryCustom { @Query( "select m from Meeting m where m.sprint = :sprint " + + " and ((:meetingId is NULL) or m.id <> :meetingId)" + "and ((:meetingStart between m.meetingStart and m.meetingEnd) " + "or (:meetingEnd between m.meetingStart and m.meetingEnd) " + "or (m.meetingStart between :meetingStart and :meetingEnd) " + "or (m.meetingEnd between :meetingStart and :meetingEnd))") Optional findOverlappingMeeting( + @Param("meetingId") Long meetingId, @Param("sprint") Sprint sprint, @Param("meetingStart") LocalDateTime meetingStart, @Param("meetingEnd") LocalDateTime meetingEnd); + + List findByStatusAndMeetingEndBefore(MeetingStatus status, LocalDateTime dateTime); } diff --git a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryCustom.java b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryCustom.java new file mode 100644 index 00000000..38030259 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryCustom.java @@ -0,0 +1,9 @@ +package com.amcamp.domain.meeting.dao; + +import com.amcamp.domain.meeting.dto.response.MeetingInfoResponse; +import org.springframework.data.domain.Slice; + +public interface MeetingRepositoryCustom { + Slice findAllBySprintIdWithPagination( + Long sprintId, Long lastMeetingId, int pageSize); +} diff --git a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java new file mode 100644 index 00000000..03475886 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java @@ -0,0 +1,58 @@ +package com.amcamp.domain.meeting.dao; + +import static com.amcamp.domain.meeting.domain.QMeeting.meeting; +import static com.amcamp.domain.sprint.domain.QSprint.sprint; + +import com.amcamp.domain.meeting.dto.response.MeetingInfoResponse; +import com.querydsl.core.types.Projections; +import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.List; +import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Slice; +import org.springframework.data.domain.SliceImpl; + +@RequiredArgsConstructor +public class MeetingRepositoryImpl implements MeetingRepositoryCustom { + private final JPAQueryFactory jpaQueryFactory; + + @Override + public Slice findAllBySprintIdWithPagination( + Long sprintId, Long lastMeetingId, int pageSize) { + + List responses = + jpaQueryFactory + .select( + Projections.constructor( + MeetingInfoResponse.class, + meeting.title, + meeting.meetingStart, + meeting.meetingEnd)) + .from(meeting) + .leftJoin(sprint) + .on(meeting.sprint.eq(sprint)) + .where(meeting.sprint.id.eq(sprintId), lastMeetingCondition(lastMeetingId)) + .orderBy(meeting.id.desc()) + .limit(pageSize + 1) + .fetch(); + + return checkLastPage(pageSize, responses); + } + + private BooleanExpression lastMeetingCondition(Long meetingId) { + return (meetingId == null) ? null : meeting.id.lt(meetingId); + } + + private Slice checkLastPage( + int pageSize, List results) { + boolean hasNext = false; + + if (results.size() > pageSize) { + hasNext = true; + results.remove(pageSize); + } + + return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); + } +} diff --git a/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java b/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java index c41fff11..1796935f 100644 --- a/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java +++ b/src/main/java/com/amcamp/domain/meeting/domain/Meeting.java @@ -2,6 +2,8 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.MeetingErrorCode; import jakarta.persistence.*; import java.time.LocalDateTime; import lombok.AccessLevel; @@ -11,7 +13,7 @@ @Entity @Getter -@NoArgsConstructor +@NoArgsConstructor(access = AccessLevel.PROTECTED) public class Meeting extends BaseTimeEntity { @Id @@ -51,6 +53,10 @@ private Meeting( public static Meeting createMeeting( String title, LocalDateTime meetingStart, LocalDateTime meetingEnd, Sprint sprint) { + + if (meetingStart.isAfter(meetingEnd) || meetingStart.isEqual(meetingEnd)) { + throw new CommonException(MeetingErrorCode.INVALID_MEETING_TIME_RANGE); + } return Meeting.builder() .title(title) .meetingStart(meetingStart) @@ -59,4 +65,21 @@ public static Meeting createMeeting( .status(MeetingStatus.OPEN) .build(); } + + public void updateStatus(MeetingStatus status) { + this.status = status; + } + + public void updateTitle(String title) { + this.title = title; + } + + public void updateMeetingDt(LocalDateTime meetingStart, LocalDateTime meetingEnd) { + if (meetingStart != null) { + this.meetingStart = meetingStart; + } + if (meetingEnd != null) { + this.meetingEnd = meetingEnd; + } + } } diff --git a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingDtUpdateRequest.java b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingDtUpdateRequest.java new file mode 100644 index 00000000..896f4f69 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingDtUpdateRequest.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.meeting.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.annotation.Nullable; +import java.time.LocalDateTime; + +public record MeetingDtUpdateRequest( + @Schema(description = "수정된 미팅 시작날짜, 시간", example = "회의 일시") @Nullable + LocalDateTime meetingStart, + @Schema(description = "수정된 미팅 종료날짜, 시간", example = "회의 일시") @Nullable + LocalDateTime meetingEnd) {} diff --git a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java new file mode 100644 index 00000000..af07c278 --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.meeting.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotBlank; + +public record MeetingTitleUpdateRequest( + @Schema(description = "수정된 미팅 타이틀", example = "중간 점검 회의") @NotBlank String title) {} diff --git a/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java b/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java new file mode 100644 index 00000000..2d2d211c --- /dev/null +++ b/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java @@ -0,0 +1,16 @@ +package com.amcamp.domain.meeting.dto.response; + +import com.amcamp.domain.meeting.domain.Meeting; +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.NotNull; +import java.time.LocalDateTime; + +public record MeetingInfoResponse( + @Schema(description = "미팅 타이틀", example = "미팅 타이틀") @NotNull String meetingTitle, + @Schema(description = "미팅 시작날짜, 시간", example = "회의 일시") @NotNull LocalDateTime meetingStart, + @Schema(description = "미팅 종료날짜, 시간", example = "회의 일시") @NotNull LocalDateTime meetingEnd) { + public static MeetingInfoResponse from(Meeting meeting) { + return new MeetingInfoResponse( + meeting.getTitle(), meeting.getMeetingStart(), meeting.getMeetingEnd()); + } +} diff --git a/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java index d2086a13..3deda00d 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/MeetingErrorCode.java @@ -12,7 +12,6 @@ public enum MeetingErrorCode implements BaseErrorCode { INVALID_MEETING_TIME_RANGE(HttpStatus.BAD_REQUEST, "유효한 범위 내의 시간을 입력해야합니다."), MEETING_DATE_OUT_OF_SPRINT(HttpStatus.BAD_REQUEST, "팀 미팅은 스프린트 기간 내에 생성되어야 합니다."), MEETING_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 해당 시간대에 일정이 존재합니다."); - private final HttpStatus httpStatus; private final String message; diff --git a/src/main/java/com/amcamp/infra/scheduler/MeetingStatusScheduler.java b/src/main/java/com/amcamp/infra/scheduler/MeetingStatusScheduler.java new file mode 100644 index 00000000..8f075051 --- /dev/null +++ b/src/main/java/com/amcamp/infra/scheduler/MeetingStatusScheduler.java @@ -0,0 +1,18 @@ +package com.amcamp.infra.scheduler; + +import com.amcamp.domain.meeting.application.MeetingService; +import lombok.RequiredArgsConstructor; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class MeetingStatusScheduler { + + private final MeetingService meetingService; + + @Scheduled(fixedRate = 24 * 60 * 60000) // 하루 한번 체크(시간당 한번..?) + public void updateExpiredMeetings() { + meetingService.updateExpiredMeetings(); + } +} diff --git a/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java b/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java index c27eeae4..7da6b598 100644 --- a/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java +++ b/src/test/java/com/amcamp/domain/meeting/MeetingServiceTest.java @@ -9,6 +9,9 @@ import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.meeting.domain.MeetingStatus; import com.amcamp.domain.meeting.dto.request.MeetingCreateRequest; +import com.amcamp.domain.meeting.dto.request.MeetingDtUpdateRequest; +import com.amcamp.domain.meeting.dto.request.MeetingTitleUpdateRequest; +import com.amcamp.domain.meeting.dto.response.MeetingInfoResponse; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; @@ -30,10 +33,15 @@ import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; import java.time.LocalDateTime; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -125,6 +133,16 @@ void createTestMeeting(Long sprintId, LocalDateTime meetingStart, LocalDateTime meetingService.createMeeting(request); } + void createTestMeeting( + Long sprintId, + String meetingTitle, + LocalDateTime meetingStart, + LocalDateTime meetingEnd) { + MeetingCreateRequest request = + new MeetingCreateRequest(sprintId, meetingTitle, meetingStart, meetingEnd); + meetingService.createMeeting(request); + } + @BeforeEach public void setUp() { memberAdmin = @@ -151,91 +169,309 @@ public void afterEach() { sprintRepository.deleteAll(); } - @Test - void 미팅을_생성하면_정상적으로_저장된다() { - // given - createTestMeeting(1L); - // then - Meeting meeting = meetingRepository.findById(1L).get(); - assertThat(meeting.getId()).isEqualTo(1L); - assertThat(meeting) - .extracting("id", "title", "meetingStart", "meetingEnd", "status") - .containsExactlyInAnyOrder( - 1L, meetingTitle, meetingStart, meetingEnd, MeetingStatus.OPEN); - } - - @Test - void 스프린트_시작일을_벗어나면_오류가_발생한다() { - // given - LocalDateTime wrongDtBeforeStartDt = LocalDateTime.of(2020, 3, 15, 17, 0); - - // then - assertThatThrownBy(() -> createTestMeeting(1L, wrongDtBeforeStartDt, meetingEnd)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); - } - - @Test - void 스프린트_마감일을_벗어나면_오류가_발생한다() { - // given - LocalDateTime wrongDtAfterDueDt = LocalDateTime.of(2030, 3, 15, 17, 0); - // then - assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, wrongDtAfterDueDt)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); - } - - @Test - void 시작시간이_종료시간보다_느리거나_같으면_오류가_발생한다() { - - // then - assertThatThrownBy(() -> createTestMeeting(1L, meetingEnd, meetingStart)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); - assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, meetingStart)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); - } - - @Test - void 시간이_8시부터_00시_범위를_벗어나면_오류가_발생한다() { - // given - createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 - - // when - LocalDateTime before8 = LocalDateTime.of(2026, 3, 15, 1, 0); - LocalDateTime after0 = LocalDateTime.of(2026, 3, 16, 0, 1); - // then - assertThatThrownBy(() -> createTestMeeting(1L, before8, meetingEnd)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); - assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, after0)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); - } - - @Test - void 기존_미팅과_일시가_겹치면_오류가_발생한다() { - // given - createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 - - // when - LocalDateTime beforeStart = LocalDateTime.of(2026, 3, 15, 16, 0); - LocalDateTime afterEnd = LocalDateTime.of(2026, 3, 15, 19, 0); - LocalDateTime afterStart = LocalDateTime.of(2026, 3, 15, 17, 20); - LocalDateTime beforeEnd = LocalDateTime.of(2026, 3, 15, 17, 40); - // then - assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, meetingEnd)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); - assertThatThrownBy(() -> createTestMeeting(1L, beforeStart, meetingEnd)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); - assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, afterEnd)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); - assertThatThrownBy(() -> createTestMeeting(1L, afterStart, beforeEnd)) - .isInstanceOf(CommonException.class) - .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + @Nested + class 미팅_생성 { + @Test + void 미팅을_생성하면_정상적으로_저장된다() { + // given + createTestMeeting(1L); + // then + Meeting meeting = meetingRepository.findById(1L).get(); + assertThat(meeting.getId()).isEqualTo(1L); + assertThat(meeting) + .extracting("id", "title", "meetingStart", "meetingEnd", "status") + .containsExactlyInAnyOrder( + 1L, meetingTitle, meetingStart, meetingEnd, MeetingStatus.OPEN); + } + + @Test + void 스프린트_시작일을_벗어나면_오류가_발생한다() { + // given + LocalDateTime wrongDtBeforeStartDt = LocalDateTime.of(2020, 3, 15, 17, 0); + + // then + assertThatThrownBy(() -> createTestMeeting(1L, wrongDtBeforeStartDt, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); + } + + @Test + void 스프린트_마감일을_벗어나면_오류가_발생한다() { + // given + LocalDateTime wrongDtAfterDueDt = LocalDateTime.of(2030, 3, 15, 17, 0); + // then + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, wrongDtAfterDueDt)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); + } + + @Test + void 시작시간이_종료시간보다_느리거나_같으면_오류가_발생한다() { + + // then + assertThatThrownBy(() -> createTestMeeting(1L, meetingEnd, meetingStart)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, meetingStart)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + } + + @Test + void 시간이_8시부터_00시_범위를_벗어나면_오류가_발생한다() { + // given + LocalDateTime before8 = LocalDateTime.of(2026, 3, 15, 1, 0); + LocalDateTime after0 = LocalDateTime.of(2026, 3, 16, 0, 1); + // then + assertThatThrownBy(() -> createTestMeeting(1L, before8, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, after0)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + } + + @Test + void 기존_미팅과_일시가_겹치면_오류가_발생한다() { + // given + createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 + // when + LocalDateTime beforeStart = LocalDateTime.of(2026, 3, 15, 16, 0); + LocalDateTime afterEnd = LocalDateTime.of(2026, 3, 15, 19, 0); + LocalDateTime afterStart = LocalDateTime.of(2026, 3, 15, 17, 20); + LocalDateTime beforeEnd = LocalDateTime.of(2026, 3, 15, 17, 40); + // then + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, beforeStart, meetingEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, meetingStart, afterEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> createTestMeeting(1L, afterStart, beforeEnd)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + } + } + + @Nested + class 미팅_업데이트 { + @Test + void 미팅_타이틀을_변경하면_정상적으로_변경된다() { + // given + createTestMeeting(1L); + MeetingTitleUpdateRequest request = new MeetingTitleUpdateRequest("new title"); + // when + meetingService.updateMeetingTitle(1L, request); + // then + Meeting meeting = meetingRepository.findById(1L).get(); + assertThat(meeting.getTitle()).isEqualTo("new title"); + } + + @Test + void 미팅_일시를_변경하면_정상적으로_변경된다() { + createTestMeeting(1L); + LocalDateTime modifiedStart = LocalDateTime.of(2026, 3, 25, 17, 0); + LocalDateTime modifiedEnd = LocalDateTime.of(2026, 3, 25, 18, 0); + MeetingDtUpdateRequest request = new MeetingDtUpdateRequest(modifiedStart, modifiedEnd); + // when + meetingService.updateMeetingDt(1L, request); + // then + Meeting meeting = meetingRepository.findById(1L).get(); + assertThat(meeting.getMeetingStart()).isEqualTo(modifiedStart); + assertThat(meeting.getMeetingEnd()).isEqualTo(modifiedEnd); + } + + @Test + void 미팅_일시를_하나만_변경해도_정상적으로_변경된다() { + // given + createTestMeeting(1L); + LocalDateTime modifiedStart = LocalDateTime.of(2026, 3, 15, 14, 0); + LocalDateTime modifiedEnd = LocalDateTime.of(2026, 3, 15, 20, 0); + + // when + MeetingDtUpdateRequest request1 = new MeetingDtUpdateRequest(modifiedStart, null); + MeetingDtUpdateRequest request2 = new MeetingDtUpdateRequest(null, modifiedEnd); + + // then + meetingService.updateMeetingDt(1L, request1); + assertThat(meetingRepository.findById(1L).get().getMeetingStart()) + .isEqualTo(modifiedStart); + assertThat(meetingRepository.findById(1L).get().getMeetingEnd()).isEqualTo(meetingEnd); + meetingService.updateMeetingDt(1L, request2); + assertThat(meetingRepository.findById(1L).get().getMeetingEnd()).isEqualTo(modifiedEnd); + } + + @Test + void 스프린트_시작일을_벗어나면_업데이트중_오류가_발생한다() { + // given + createTestMeeting(1L); + LocalDateTime modifiedStart = LocalDateTime.of(2026, 3, 25, 17, 0); + LocalDateTime modifiedEnd = LocalDateTime.of(2026, 3, 25, 18, 0); + LocalDateTime wrongDtBeforeStartDt = LocalDateTime.of(2020, 3, 15, 17, 0); + MeetingDtUpdateRequest request = + new MeetingDtUpdateRequest(wrongDtBeforeStartDt, modifiedEnd); + // then + assertThatThrownBy(() -> meetingService.updateMeetingDt(1L, request)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); + } + + @Test + void 스프린트_마감일을_벗어나면_업데이트중_오류가_발생한다() { + // given + createTestMeeting(1L); + LocalDateTime modifiedStart = LocalDateTime.of(2026, 3, 25, 17, 0); + LocalDateTime wrongDtAfterDueDt = LocalDateTime.of(2030, 3, 15, 17, 0); + MeetingDtUpdateRequest request = + new MeetingDtUpdateRequest(modifiedStart, wrongDtAfterDueDt); + // then + assertThatThrownBy(() -> meetingService.updateMeetingDt(1L, request)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT.getMessage()); + } + + @Test + void 시작시간이_종료시간보다_느리거나_같으면_업데이트중_오류가_발생한다() { + createTestMeeting(1L); + MeetingDtUpdateRequest request1 = new MeetingDtUpdateRequest(meetingEnd, meetingStart); + MeetingDtUpdateRequest request2 = + new MeetingDtUpdateRequest(meetingStart, meetingStart); + // then + assertThatThrownBy(() -> meetingService.updateMeetingDt(1L, request1)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + assertThatThrownBy(() -> meetingService.updateMeetingDt(1L, request2)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + } + + @Test + void 시간이_8시부터_00시_범위를_벗어나면_업데이트중_오류가_발생한다() { + // given + createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 + // when + LocalDateTime before8 = LocalDateTime.of(2026, 3, 15, 1, 0); + LocalDateTime after0 = LocalDateTime.of(2026, 3, 16, 0, 1); + + MeetingDtUpdateRequest request1 = new MeetingDtUpdateRequest(before8, meetingEnd); + MeetingDtUpdateRequest request2 = new MeetingDtUpdateRequest(meetingStart, after0); + + // then + assertThatThrownBy(() -> meetingService.updateMeetingDt(1L, request1)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + assertThatThrownBy(() -> meetingService.updateMeetingDt(1L, request2)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.INVALID_MEETING_TIME_RANGE.getMessage()); + } + + @Test + void 기존_미팅과_일시가_겹치면_오류가_발생한다() { + // given + LocalDateTime anotherMeetingStart = LocalDateTime.of(2026, 3, 16, 17, 0); + LocalDateTime anotherMeetingEnd = LocalDateTime.of(2026, 3, 16, 18, 0); + + createTestMeeting(1L); // 기존 meetingStart, meetingEnd로 생성 + createTestMeeting(1L, anotherMeetingStart, anotherMeetingEnd); // 새로운 미팅 + + // when + LocalDateTime beforeStart = LocalDateTime.of(2026, 3, 15, 16, 0); + LocalDateTime afterEnd = LocalDateTime.of(2026, 3, 15, 19, 0); + LocalDateTime afterStart = LocalDateTime.of(2026, 3, 15, 17, 20); + LocalDateTime beforeEnd = LocalDateTime.of(2026, 3, 15, 17, 40); + + MeetingDtUpdateRequest request1 = new MeetingDtUpdateRequest(meetingStart, meetingEnd); + MeetingDtUpdateRequest request2 = new MeetingDtUpdateRequest(beforeStart, meetingEnd); + MeetingDtUpdateRequest request3 = new MeetingDtUpdateRequest(meetingStart, afterEnd); + MeetingDtUpdateRequest request4 = new MeetingDtUpdateRequest(afterStart, beforeEnd); + // then + assertThatThrownBy(() -> meetingService.updateMeetingDt(2L, request1)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> meetingService.updateMeetingDt(2L, request2)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> meetingService.updateMeetingDt(2L, request3)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> meetingService.updateMeetingDt(2L, request4)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_ALREADY_EXISTS.getMessage()); + } + } + + @Nested + class 미팅_삭제 { + + @Test + void 미팅을_삭제하면_정상적으로_삭제된다() { + createTestMeeting(1L); + // when + meetingService.deleteMeeting(1L); + // then + assertThatThrownBy(() -> meetingService.getMeeting(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_NOT_FOUND.getMessage()); + } + + @Test + void 미팅이_존재하지않으면_삭제중_오류가_발생한다() { + + assertThatThrownBy(() -> meetingService.deleteMeeting(1L)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_NOT_FOUND.getMessage()); + } + } + + @Nested + class 미팅_조회 { + @Test + void 미팅아이디로_미팅을_조회하면_정상적으로_조회된다() { + createTestMeeting(1L); + // when + MeetingInfoResponse response = meetingService.getMeeting(1L); + // then + assertThat(response) + .extracting("meetingTitle", "meetingStart", "meetingEnd") + .containsExactlyInAnyOrder(meetingTitle, meetingStart, meetingEnd); + } + + @Test + void 미팅ID가_유효하지_않으면_예외가_발생한다() { + // given + createTestMeeting(1L); + Long invalidMeetingId = Long.MAX_VALUE; + // then + assertThatThrownBy(() -> meetingService.getMeeting(invalidMeetingId)) + .isInstanceOf(CommonException.class) + .hasMessageContaining(MeetingErrorCode.MEETING_NOT_FOUND.getMessage()); + } + + @Test + void 스프린트ID로_조회하면_전체미팅목록이_정상적으로_조회된다() { + // given + String title1 = "title1"; + LocalDateTime start1 = LocalDateTime.of(2026, 3, 15, 17, 0); + LocalDateTime end1 = LocalDateTime.of(2026, 3, 15, 18, 0); + String title2 = "title2"; + LocalDateTime start2 = LocalDateTime.of(2026, 3, 16, 17, 0); + LocalDateTime end2 = LocalDateTime.of(2026, 3, 16, 18, 0); + String title3 = "title3"; + LocalDateTime start3 = LocalDateTime.of(2026, 3, 17, 17, 0); + LocalDateTime end3 = LocalDateTime.of(2026, 3, 17, 18, 0); + + createTestMeeting(1L, title1, start1, end1); + createTestMeeting(1L, title2, start2, end2); + createTestMeeting(1L, title3, start3, end3); + // when, then + Slice response = meetingService.getMeetingList(1L, null, 10); + + List titles = response.stream().map(MeetingInfoResponse::meetingTitle).toList(); + + assertThat(new HashSet<>(titles)).isEqualTo(Set.of(title1, title2, title3)); + } } } From 9ba4a3c4304bc393ca8a45973612e044b169d247 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sat, 22 Mar 2025 23:12:57 +0900 Subject: [PATCH 058/107] =?UTF-8?q?refactor:=20projectListInfoResponse=20?= =?UTF-8?q?=EC=9A=94=EC=B2=AD/=EC=9D=91=EB=8B=B5=20=ED=98=95=EC=8B=9D=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20=EB=B0=8F=20isParticipant,=20isAdmin=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=ED=95=84=EB=93=9C=20=EC=B6=94=EA=B0=80=20(#1?= =?UTF-8?q?33)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/project/api/ProjectController.java | 6 +- .../project/application/ProjectService.java | 13 +- .../project/dao/ProjectRepositoryCustom.java | 10 +- .../project/dao/ProjectRepositoryImpl.java | 55 ++++--- .../dto/response/ProjectListInfoResponse.java | 8 +- .../domain/project/ProjectServiceTest.java | 146 ++++++++++++++---- 6 files changed, 156 insertions(+), 82 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index a7bdfe24..57c98e5f 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -3,6 +3,7 @@ import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import io.swagger.v3.oas.annotations.Operation; @@ -38,12 +39,11 @@ public ResponseEntity projectCreate( summary = "전체 프로젝트 목록 조회", description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") @GetMapping("/{teamId}/list") - public Slice projectListInfo( + public Slice projectListInfo( @PathVariable Long teamId, - @RequestParam boolean isParticipant, @RequestParam(required = false) Long lastProjectId, @RequestParam(defaultValue = "10") int pageSize) { - return projectService.getProjectListInfo(teamId, lastProjectId, pageSize, isParticipant); + return projectService.getProjectListInfo(teamId, lastProjectId, pageSize); } @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index e9cc9f4b..c2953779 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -7,6 +7,7 @@ import com.amcamp.domain.project.domain.ProjectRegistration; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -68,14 +69,14 @@ public ProjectInfoResponse getProjectInfo(Long projectId) { } @Transactional(readOnly = true) - public Slice getProjectListInfo( - Long teamId, Long lastProjectId, int pageSize, boolean isParticipant) { + public Slice getProjectListInfo( + Long teamId, Long lastProjectId, int pageSize) { Member member = memberUtil.getCurrentMember(); Team team = getTeam(teamId); TeamParticipant teamParticipant = getValidTeamParticipant(member, team); return projectRepository.findAllByTeamIdWithPagination( - teamId, lastProjectId, pageSize, teamParticipant, isParticipant); + teamId, lastProjectId, pageSize, teamParticipant); } // update @@ -286,10 +287,4 @@ private boolean isProjectAdmin(Member member, Project project) { ProjectParticipant participant = getValidProjectParticipant(member, project); return participant.getProjectRole().equals(ProjectParticipantRole.ADMIN); } - - private Boolean isProjectParticipant(Project project, TeamParticipant teamParticipant) { - return projectParticipantRepository - .findByProjectAndTeamParticipant(project, teamParticipant) - .isPresent(); - } } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java index d1f664b6..b6661ff6 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java @@ -1,15 +1,11 @@ package com.amcamp.domain.project.dao; -import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import org.springframework.data.domain.Slice; public interface ProjectRepositoryCustom { - Slice findAllByTeamIdWithPagination( - Long teamId, - Long lastProjectId, - int pageSize, - TeamParticipant teamParticipant, - boolean isParticipant); + Slice findAllByTeamIdWithPagination( + Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index 894dfcaa..d2ee9236 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -3,10 +3,14 @@ import static com.amcamp.domain.project.domain.QProject.project; import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.CaseBuilder; +import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; @@ -20,23 +24,29 @@ public class ProjectRepositoryImpl implements ProjectRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllByTeamIdWithPagination( - Long teamId, - Long lastProjectId, - int pageSize, - TeamParticipant teamParticipant, - boolean isParticipant) { + public Slice findAllByTeamIdWithPagination( + Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant) { - List responses = + NumberExpression adminCase = + new CaseBuilder() + .when(projectParticipant.projectRole.eq(ProjectParticipantRole.ADMIN)) + .then(1) + .otherwise(0); + + List responses = jpaQueryFactory .select( Projections.constructor( - ProjectInfoResponse.class, - project.id, - project.title, - project.description, - project.toDoInfo.startDt, - project.toDoInfo.dueDt)) + ProjectListInfoResponse.class, + Projections.constructor( + ProjectInfoResponse.class, + project.id, + project.title, + project.description, + project.toDoInfo.startDt, + project.toDoInfo.dueDt), + projectParticipant.id.count().gt(0), + adminCase.sum().gt(0))) .from(project) .leftJoin(projectParticipant) .on( @@ -46,10 +56,8 @@ public Slice findAllByTeamIdWithPagination( .and( projectParticipant.teamParticipant.eq( teamParticipant))) - .where( - project.team.id.eq(teamId), - lastProjectCondition(lastProjectId), - participantCondition(isParticipant, teamParticipant)) + .where(project.team.id.eq(teamId), lastProjectCondition(lastProjectId)) + .groupBy(project.id) .orderBy(project.id.desc()) .limit(pageSize + 1) .fetch(); @@ -57,21 +65,12 @@ public Slice findAllByTeamIdWithPagination( return checkLastPage(pageSize, responses); } - private BooleanExpression participantCondition( - boolean isParticipant, TeamParticipant teamParticipant) { - if (isParticipant) { - return projectParticipant.teamParticipant.eq(teamParticipant); - } else { - return projectParticipant.teamParticipant.isNull(); - } - } - private BooleanExpression lastProjectCondition(Long projectId) { return (projectId == null) ? null : project.id.lt(projectId); } - private Slice checkLastPage( - int pageSize, List results) { + private Slice checkLastPage( + int pageSize, List results) { boolean hasNext = false; if (results.size() > pageSize) { diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java index 97661a7a..b6b42fbf 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java @@ -4,4 +4,10 @@ public record ProjectListInfoResponse( @Schema(description = "사용자가 참여중인 프로젝트 목록") ProjectInfoResponse projectInfo, - @Schema(description = "참여 여부", example = "false") boolean isParticipate) {} + @Schema(description = "프로젝트 참여 여부", example = "false") boolean isParticipant, + @Schema(description = "프로젝트 팀장 여부", example = "false") boolean isAdmin) { + public static ProjectListInfoResponse from( + ProjectInfoResponse projectInfo, boolean isParticipant, boolean isAdmin) { + return new ProjectListInfoResponse(projectInfo, isParticipant, isAdmin); + } +} diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index c432b228..69dd849e 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -15,6 +15,7 @@ import com.amcamp.domain.project.dto.request.ProjectCreateRequest; import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.application.TeamService; @@ -29,6 +30,7 @@ import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; import java.util.HashSet; import java.util.List; @@ -41,6 +43,7 @@ import org.springframework.security.core.userdetails.UserDetails; public class ProjectServiceTest extends IntegrationTest { + @Autowired private MemberUtil memberUtil; @Autowired private ProjectService projectService; @Autowired private TeamService teamService; @Autowired private MemberRepository memberRepository; @@ -78,23 +81,61 @@ private Long getTeamId() { return teamService.getTeamByCode(teamInviteCodeRequest).teamId(); } - void createTestProject() { + Project createTestProject() { + Member member = memberUtil.getCurrentMember(); Long teamId = getTeamId(); - ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + Team team = teamRepository.findById(teamId).orElseThrow(); + TeamParticipant participant = teamParticipantRepository.findById(1L).get(); + Project project = + projectRepository.save( + Project.createProject(team, title, description, dueDt)); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + project, + member.getNickname(), + "Profile", + ProjectParticipantRole.ADMIN)); + return project; } - void createTestProject(Long teamId) { - ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + Project createTestProject(Long teamId, Long teamParticipantId) { + Member member = memberUtil.getCurrentMember(); + Team team = teamRepository.findById(teamId).orElseThrow(); + TeamParticipant participant = teamParticipantRepository.findById(teamParticipantId).get(); + Project project = + projectRepository.save( + Project.createProject(team, title, description, dueDt)); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + project, + member.getNickname(), + "Profile", + ProjectParticipantRole.ADMIN)); + return project; } - void createTestProject(Long teamId, String title, LocalDate dueDt, String description) { - ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + Project createTestProject( + Long teamId, + Long teamParticipantId, + String title, + LocalDate dueDt, + String description) { + Member member = memberUtil.getCurrentMember(); + Team team = teamRepository.findById(teamId).orElseThrow(); + TeamParticipant participant = teamParticipantRepository.findById(teamParticipantId).get(); + Project project = + projectRepository.save( + Project.createProject(team, title, description, dueDt)); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + project, + member.getNickname(), + "Profile", + ProjectParticipantRole.ADMIN)); + return project; } @BeforeEach @@ -138,7 +179,10 @@ public void afterEach() { // given Long teamId = getTeamId(); // when - createTestProject(teamId, title, dueDt, description); + ProjectCreateRequest request = + new ProjectCreateRequest(teamId, title, dueDt, description); + + projectService.createProject(request); // then Project project = projectRepository.findById(1L).get(); @@ -154,22 +198,57 @@ class 프로젝트_조회 { void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, "project1", dueDt, description); + createTestProject(teamId, 1L, "project1", dueDt, description); + Project member1JoinProject = + createTestProject(teamId, 1L, "project2", dueDt, description); + // member logout 후 anotherMember 로그인 logout(); loginAs(member1); // 팀 참가 teamService.joinTeam(teamInviteCodeRequest); // anotherMember 새 프로젝트 생성 - createTestProject(teamId, "project2", dueDt, description); - + createTestProject(teamId, 2L, "project3", dueDt, description); + // Project1에 일반 멤버로 참여 + TeamParticipant participant = teamParticipantRepository.findById(2L).get(); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + member1JoinProject, + "Nickname", + "Profile", + ProjectParticipantRole.MEMBER)); // when - Slice responseTrue = - projectService.getProjectListInfo(teamId, null, 10, true); - Slice responseFalse = - projectService.getProjectListInfo(teamId, null, 10, false); - assertThat(responseTrue.getContent().get(0).projectTitle()).isEqualTo("project2"); - assertThat(responseFalse.getContent().get(0).projectTitle()).isEqualTo("project1"); + Slice response = + projectService.getProjectListInfo(teamId, null, 10); + response.getContent().forEach(System.out::println); + assertThat( + response.getContent().stream() + .filter(r -> !r.isParticipant()) + // .filter(ProjectListInfoResponse::isAdmin) + .map(ProjectListInfoResponse::projectInfo) + .findAny() + .get() + .projectTitle()) + .isEqualTo("project1"); + assertThat( + response.getContent().stream() + .filter(ProjectListInfoResponse::isParticipant) + .filter(f -> !f.isAdmin()) + .map(ProjectListInfoResponse::projectInfo) + .findAny() + .get() + .projectTitle()) + .isEqualTo("project2"); + assertThat( + response.getContent().stream() + .filter(ProjectListInfoResponse::isParticipant) + .filter(ProjectListInfoResponse::isAdmin) + .map(ProjectListInfoResponse::projectInfo) + .findAny() + .get() + .projectTitle()) + .isEqualTo("project3"); } @Test @@ -206,7 +285,6 @@ class 프로젝트_조회 { @Nested class 프로젝트_업데이트 { String originalTitle = "originalProjectTitle"; - String originalGoal = "originalProjectTitle"; String originalDescription = "originalProjectGoal"; String updatedTitle = "updatedProjectTitle"; String updatedGoal = "updatedProjectGoal"; @@ -214,7 +292,7 @@ class 프로젝트_업데이트 { void createOriginalProject() { Long teamId = getTeamId(); - createTestProject(teamId, originalTitle, dueDt, originalDescription); + createTestProject(teamId, 1L, originalTitle, dueDt, originalDescription); } @Test @@ -348,7 +426,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입신청을_하면_정상적으로_요청이_생성된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -374,7 +452,7 @@ class 프로젝트_가입_신청 { void 프로젝트_멤버_수가_15명을_초과하면_가입신청이_제한된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); for (int i = 0; i < 14; i++) { @@ -412,7 +490,7 @@ class 프로젝트_가입_신청 { // given Long teamId = getTeamId(); Team team = teamRepository.findById(teamId).get(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); // when @@ -446,7 +524,7 @@ class 프로젝트_가입_신청 { void 이미_가입신청한_팀참여자는_신청하면_예외가_발생한다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -465,7 +543,7 @@ class 프로젝트_가입_신청 { void 이미_가입된_프로젝트_참여자가_가입신청하면_예외가_발생한다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); // when,then assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) @@ -478,7 +556,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_승인하면_정상적으로_승인된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -509,7 +587,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_거부하면_정상적으로_거부된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -540,7 +618,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_취소하면_요청이_정상적으로_삭제된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -560,7 +638,7 @@ class 프로젝트_가입_신청 { void 프로젝트_참여자를_조회하면_정상적으로_조회된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); // 어드민 로그아웃 loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -588,7 +666,7 @@ class 프로젝트_가입_신청 { void 프로젝트_참여자_목록을_조회하면_정상적으로_조회된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); // admin 로그아웃 // when From 32d65a239b96900a962a33d2caf4e240dadc8a37 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sat, 22 Mar 2025 23:18:02 +0900 Subject: [PATCH 059/107] =?UTF-8?q?fix:=20=EA=B8=B0=EC=A1=B4=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=EA=B0=80=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=EA=B0=80=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=20(#131)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 스프린트 삭제 시 연관된 피드백도 함께 삭제되도록 orphanRemoval 설정 추가 * fix: 기존 스프린트가 종료되지 않은 상태에서 새로운 스프린트가 생성되지 않도록 수정 * test: 기존 스프린트가 종료되지 않은 경우 새 스프린트 생성 제한 테스트 * refactor: Class 객체 참조 시 불필요한 객체 생성 제거 * test: 기능 수정에 따른 기여도 테스트 코드 수정 * test: 태스크 테스트 코드 수정 --- .../sprint/application/SprintService.java | 12 +++++ .../domain/sprint/dao/SprintRepository.java | 3 ++ .../amcamp/domain/sprint/domain/Sprint.java | 4 ++ .../exception/errorcode/SprintErrorCode.java | 2 +- .../contribution/ContributionServiceTest.java | 50 ++++++++----------- .../sprint/application/SprintServiceTest.java | 20 ++++++-- .../amcamp/domain/task/TaskServiceTest.java | 9 ++-- 7 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index d957d7f6..a746cc4c 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -43,6 +43,8 @@ public SprintInfoResponse createSprint(SprintCreateRequest request) { final Project project = findByProjectId(request.projectId()); validateProjectParticipant(project, project.getTeam(), currentMember); + + validatePreviousSprintEnded(project); validateSprintDueDate(request.dueDt(), project.getToDoInfo().getDueDt()); long count = sprintRepository.countByProject(project); @@ -150,4 +152,14 @@ private void validateSprintDueDate(LocalDate sprintDueDt, LocalDate projectDueDt throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_INVALID); } } + + private void validatePreviousSprintEnded(Project project) { + sprintRepository + .findTopByProjectOrderByCreatedDtDesc(project) + .filter(sprint -> !sprint.getToDoInfo().getDueDt().isBefore(LocalDate.now())) + .ifPresent( + sprint -> { + throw new CommonException(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED); + }); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index cba83428..f23530b5 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -3,6 +3,7 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.sprint.domain.Sprint; import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -13,4 +14,6 @@ public interface SprintRepository extends JpaRepository, SprintRep @Query("SELECT s FROM Sprint s WHERE s.project = :project ORDER BY s.id ASC") List findAllByProjectOrderByCreatedAt(@Param("project") Project project); + + Optional findTopByProjectOrderByCreatedDtDesc(Project project); } diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index f1c3f387..ad38b25c 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -2,6 +2,7 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.contribution.domain.Contribution; +import com.amcamp.domain.feedback.domain.Feedback; import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ToDoInfo; @@ -35,6 +36,9 @@ public class Sprint extends BaseTimeEntity { @Embedded private ToDoInfo toDoInfo; + @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) + private List feedbacks = new ArrayList<>(); + // Task @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) private List tasks = new ArrayList<>(); diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index e3d12415..831ece7f 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -8,12 +8,12 @@ @AllArgsConstructor public enum SprintErrorCode implements BaseErrorCode { SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), - SPRINT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "스프린트 삭제 권한이 없습니다."), TASK_NOT_CREATED_YET(HttpStatus.NOT_FOUND, "스프린트 내 태스크가 존재하지 않습니다."), SPRINT_DUE_DATE_INVALID(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), + PREVIOUS_SPRINT_NOT_ENDED(HttpStatus.BAD_REQUEST, "이전 스프린트가 아직 종료되지 않았습니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java index dc4b006b..3d347201 100644 --- a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -19,7 +19,6 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; -import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.domain.TaskDifficulty; import com.amcamp.domain.task.dto.request.TaskCreateRequest; @@ -63,6 +62,7 @@ public class ContributionServiceTest extends IntegrationTest { private ProjectParticipant participant; private ProjectParticipant newParticipant; private Sprint sprint; + private Sprint anotherSprint; private Project project; private Project anotherProject; private Member newMember; @@ -128,9 +128,13 @@ void setUp() { ProjectParticipantRole.MEMBER)); sprint = + sprintRepository.save( + Sprint.createSprint(project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.now())); + + anotherSprint = sprintRepository.save( Sprint.createSprint( - project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); + project, "2차 스프린트", "기능 개발", LocalDate.of(2030, 12, 1))); // 상 2, 중 3, 하 4 taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.HIGH)); @@ -165,8 +169,7 @@ class 개별_기여도_조회_시 { loginAs(newTeamMember); assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 1L)) - .isInstanceOf( - new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) + .isInstanceOf(CommonException.class) .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @@ -174,40 +177,33 @@ class 개별_기여도_조회_시 { void 프로젝트_참여자가_아니라면_에러반환() { loginAs(newMember); assertThatThrownBy(() -> contributionService.getContributionByMember(2L, 1L)) - .isInstanceOf( - new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED) - .getClass()) + .isInstanceOf(CommonException.class) .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); } @Test void 유효한_프로젝트가_아니라면_에러반환() { - Member member = memberUtil.getCurrentMember(); assertThatThrownBy(() -> contributionService.getContributionByMember(3L, 1L)) - .isInstanceOf( - new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND).getClass()) + .isInstanceOf(CommonException.class) .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } @Test void 태스크가_존재하지_않으면_빈_값_반환() { - SprintCreateRequest sprintRequest = - new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); - // when & then - assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) - .isInstanceOf( - new CommonException(ContributionErrorCode.CONTRIBUTION_NOT_FOUND) - .getClass()) + assertThatThrownBy( + () -> + contributionService.getContributionByMember( + 1L, anotherSprint.getId())) + .isInstanceOf(CommonException.class) .hasMessage(ContributionErrorCode.CONTRIBUTION_NOT_FOUND.getMessage()); } @Test void 스프린트가_존재하지_않으면_빈_값_반환() { // when & then - assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) - .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 999L)) + .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @@ -229,28 +225,22 @@ class 프로젝트_기여도_조회_시 { loginAs(newMember); assertThatThrownBy(() -> contributionService.getContributionBySprint(1L)) - .isInstanceOf( - new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) + .isInstanceOf(CommonException.class) .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @Test void 스프린트가_존재하지_않으면_에러_반환() { - Member member = memberUtil.getCurrentMember(); - assertThatThrownBy(() -> contributionService.getContributionBySprint(2L)) - .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) + assertThatThrownBy(() -> contributionService.getContributionBySprint(999L)) + .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @Test void 태스크가_존재하지_않으면_빈_값_반환() { - SprintCreateRequest sprintRequest = - new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); - // when List contributions = - contributionService.getContributionBySprint(2L); + contributionService.getContributionBySprint(anotherSprint.getId()); // then assertThat(contributions.isEmpty()).isEqualTo(true); diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 1ee289c9..216649d0 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -129,10 +129,8 @@ class 스프린트_생성할_때 { } @Test - void 스프린트_마감_날짜가_스프린트_시작_날짜_이전이라면_예외가_발생한다() { + void 스프린트_마감_날짜가_현재_날짜_이전이라면_예외가_발생한다() { // given - sprintRepository.save( - Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); SprintCreateRequest request = new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2024, 1, 1)); @@ -141,6 +139,22 @@ class 스프린트_생성할_때 { .isInstanceOf(CommonException.class) .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); } + + @Test + void 기존_스프린트가_종료되지_않은_상태에서_새로운_스프린트를_생성하면_예외가_발생한다() { + // given + sprintRepository.save( + Sprint.createSprint( + project, "testTitle", "testGoal", LocalDate.of(2030, 1, 1))); + + SprintCreateRequest request = + new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2031, 1, 1)); + + // when & then + assertThatThrownBy(() -> sprintService.createSprint(request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED.getMessage()); + } } @Nested diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 2960bf43..c35c449a 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -19,7 +19,6 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; -import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.*; @@ -68,6 +67,7 @@ public class TaskServiceTest extends IntegrationTest { private ProjectParticipant participant; private ProjectParticipant newParticipant; private Sprint sprint; + private Sprint anotherSprint; private Project project; private Project anotherProject; private Member newMember; @@ -137,9 +137,10 @@ void setUp() { Sprint.createSprint( project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); - SprintCreateRequest sprintRequest = - new SprintCreateRequest(1L, "1차 스프린트", LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); + anotherSprint = + sprintRepository.save( + Sprint.createSprint( + project, "2차 스프린트", "기능 개발", LocalDate.of(2030, 12, 1))); } @Test From d9b1a032e3b0798020b49835cbdbeef73202f239 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 23 Mar 2025 01:34:47 +0900 Subject: [PATCH 060/107] =?UTF-8?q?Revert=20"refactor:=20projectListInfoRe?= =?UTF-8?q?sponse=20=EC=9A=94=EC=B2=AD/=EC=9D=91=EB=8B=B5=20=ED=98=95?= =?UTF-8?q?=EC=8B=9D=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20isParticipant,=20i?= =?UTF-8?q?sAdmi=E2=80=A6"=20(#135)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9ba4a3c4304bc393ca8a45973612e044b169d247. --- .../domain/project/api/ProjectController.java | 6 +- .../project/application/ProjectService.java | 13 +- .../project/dao/ProjectRepositoryCustom.java | 10 +- .../project/dao/ProjectRepositoryImpl.java | 55 +++---- .../dto/response/ProjectListInfoResponse.java | 8 +- .../domain/project/ProjectServiceTest.java | 146 ++++-------------- 6 files changed, 82 insertions(+), 156 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index 57c98e5f..a7bdfe24 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -3,7 +3,6 @@ import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import io.swagger.v3.oas.annotations.Operation; @@ -39,11 +38,12 @@ public ResponseEntity projectCreate( summary = "전체 프로젝트 목록 조회", description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") @GetMapping("/{teamId}/list") - public Slice projectListInfo( + public Slice projectListInfo( @PathVariable Long teamId, + @RequestParam boolean isParticipant, @RequestParam(required = false) Long lastProjectId, @RequestParam(defaultValue = "10") int pageSize) { - return projectService.getProjectListInfo(teamId, lastProjectId, pageSize); + return projectService.getProjectListInfo(teamId, lastProjectId, pageSize, isParticipant); } @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index c2953779..e9cc9f4b 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -7,7 +7,6 @@ import com.amcamp.domain.project.domain.ProjectRegistration; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -69,14 +68,14 @@ public ProjectInfoResponse getProjectInfo(Long projectId) { } @Transactional(readOnly = true) - public Slice getProjectListInfo( - Long teamId, Long lastProjectId, int pageSize) { + public Slice getProjectListInfo( + Long teamId, Long lastProjectId, int pageSize, boolean isParticipant) { Member member = memberUtil.getCurrentMember(); Team team = getTeam(teamId); TeamParticipant teamParticipant = getValidTeamParticipant(member, team); return projectRepository.findAllByTeamIdWithPagination( - teamId, lastProjectId, pageSize, teamParticipant); + teamId, lastProjectId, pageSize, teamParticipant, isParticipant); } // update @@ -287,4 +286,10 @@ private boolean isProjectAdmin(Member member, Project project) { ProjectParticipant participant = getValidProjectParticipant(member, project); return participant.getProjectRole().equals(ProjectParticipantRole.ADMIN); } + + private Boolean isProjectParticipant(Project project, TeamParticipant teamParticipant) { + return projectParticipantRepository + .findByProjectAndTeamParticipant(project, teamParticipant) + .isPresent(); + } } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java index b6661ff6..d1f664b6 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java @@ -1,11 +1,15 @@ package com.amcamp.domain.project.dao; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import org.springframework.data.domain.Slice; public interface ProjectRepositoryCustom { - Slice findAllByTeamIdWithPagination( - Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant); + Slice findAllByTeamIdWithPagination( + Long teamId, + Long lastProjectId, + int pageSize, + TeamParticipant teamParticipant, + boolean isParticipant); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index d2ee9236..894dfcaa 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -3,14 +3,10 @@ import static com.amcamp.domain.project.domain.QProject.project; import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; -import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; -import com.querydsl.core.types.dsl.CaseBuilder; -import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; @@ -24,29 +20,23 @@ public class ProjectRepositoryImpl implements ProjectRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllByTeamIdWithPagination( - Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant) { + public Slice findAllByTeamIdWithPagination( + Long teamId, + Long lastProjectId, + int pageSize, + TeamParticipant teamParticipant, + boolean isParticipant) { - NumberExpression adminCase = - new CaseBuilder() - .when(projectParticipant.projectRole.eq(ProjectParticipantRole.ADMIN)) - .then(1) - .otherwise(0); - - List responses = + List responses = jpaQueryFactory .select( Projections.constructor( - ProjectListInfoResponse.class, - Projections.constructor( - ProjectInfoResponse.class, - project.id, - project.title, - project.description, - project.toDoInfo.startDt, - project.toDoInfo.dueDt), - projectParticipant.id.count().gt(0), - adminCase.sum().gt(0))) + ProjectInfoResponse.class, + project.id, + project.title, + project.description, + project.toDoInfo.startDt, + project.toDoInfo.dueDt)) .from(project) .leftJoin(projectParticipant) .on( @@ -56,8 +46,10 @@ public Slice findAllByTeamIdWithPagination( .and( projectParticipant.teamParticipant.eq( teamParticipant))) - .where(project.team.id.eq(teamId), lastProjectCondition(lastProjectId)) - .groupBy(project.id) + .where( + project.team.id.eq(teamId), + lastProjectCondition(lastProjectId), + participantCondition(isParticipant, teamParticipant)) .orderBy(project.id.desc()) .limit(pageSize + 1) .fetch(); @@ -65,12 +57,21 @@ public Slice findAllByTeamIdWithPagination( return checkLastPage(pageSize, responses); } + private BooleanExpression participantCondition( + boolean isParticipant, TeamParticipant teamParticipant) { + if (isParticipant) { + return projectParticipant.teamParticipant.eq(teamParticipant); + } else { + return projectParticipant.teamParticipant.isNull(); + } + } + private BooleanExpression lastProjectCondition(Long projectId) { return (projectId == null) ? null : project.id.lt(projectId); } - private Slice checkLastPage( - int pageSize, List results) { + private Slice checkLastPage( + int pageSize, List results) { boolean hasNext = false; if (results.size() > pageSize) { diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java index b6b42fbf..97661a7a 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java @@ -4,10 +4,4 @@ public record ProjectListInfoResponse( @Schema(description = "사용자가 참여중인 프로젝트 목록") ProjectInfoResponse projectInfo, - @Schema(description = "프로젝트 참여 여부", example = "false") boolean isParticipant, - @Schema(description = "프로젝트 팀장 여부", example = "false") boolean isAdmin) { - public static ProjectListInfoResponse from( - ProjectInfoResponse projectInfo, boolean isParticipant, boolean isAdmin) { - return new ProjectListInfoResponse(projectInfo, isParticipant, isAdmin); - } -} + @Schema(description = "참여 여부", example = "false") boolean isParticipate) {} diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 69dd849e..c432b228 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -15,7 +15,6 @@ import com.amcamp.domain.project.dto.request.ProjectCreateRequest; import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.application.TeamService; @@ -30,7 +29,6 @@ import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; -import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; import java.util.HashSet; import java.util.List; @@ -43,7 +41,6 @@ import org.springframework.security.core.userdetails.UserDetails; public class ProjectServiceTest extends IntegrationTest { - @Autowired private MemberUtil memberUtil; @Autowired private ProjectService projectService; @Autowired private TeamService teamService; @Autowired private MemberRepository memberRepository; @@ -81,61 +78,23 @@ private Long getTeamId() { return teamService.getTeamByCode(teamInviteCodeRequest).teamId(); } - Project createTestProject() { - Member member = memberUtil.getCurrentMember(); + void createTestProject() { Long teamId = getTeamId(); - Team team = teamRepository.findById(teamId).orElseThrow(); - TeamParticipant participant = teamParticipantRepository.findById(1L).get(); - Project project = - projectRepository.save( - Project.createProject(team, title, description, dueDt)); - projectParticipantRepository.save( - ProjectParticipant.createProjectParticipant( - participant, - project, - member.getNickname(), - "Profile", - ProjectParticipantRole.ADMIN)); - return project; + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); + + projectService.createProject(request); } - Project createTestProject(Long teamId, Long teamParticipantId) { - Member member = memberUtil.getCurrentMember(); - Team team = teamRepository.findById(teamId).orElseThrow(); - TeamParticipant participant = teamParticipantRepository.findById(teamParticipantId).get(); - Project project = - projectRepository.save( - Project.createProject(team, title, description, dueDt)); - projectParticipantRepository.save( - ProjectParticipant.createProjectParticipant( - participant, - project, - member.getNickname(), - "Profile", - ProjectParticipantRole.ADMIN)); - return project; + void createTestProject(Long teamId) { + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); + + projectService.createProject(request); } - Project createTestProject( - Long teamId, - Long teamParticipantId, - String title, - LocalDate dueDt, - String description) { - Member member = memberUtil.getCurrentMember(); - Team team = teamRepository.findById(teamId).orElseThrow(); - TeamParticipant participant = teamParticipantRepository.findById(teamParticipantId).get(); - Project project = - projectRepository.save( - Project.createProject(team, title, description, dueDt)); - projectParticipantRepository.save( - ProjectParticipant.createProjectParticipant( - participant, - project, - member.getNickname(), - "Profile", - ProjectParticipantRole.ADMIN)); - return project; + void createTestProject(Long teamId, String title, LocalDate dueDt, String description) { + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); + + projectService.createProject(request); } @BeforeEach @@ -179,10 +138,7 @@ public void afterEach() { // given Long teamId = getTeamId(); // when - ProjectCreateRequest request = - new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + createTestProject(teamId, title, dueDt, description); // then Project project = projectRepository.findById(1L).get(); @@ -198,57 +154,22 @@ class 프로젝트_조회 { void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L, "project1", dueDt, description); - Project member1JoinProject = - createTestProject(teamId, 1L, "project2", dueDt, description); - + createTestProject(teamId, "project1", dueDt, description); // member logout 후 anotherMember 로그인 logout(); loginAs(member1); // 팀 참가 teamService.joinTeam(teamInviteCodeRequest); // anotherMember 새 프로젝트 생성 - createTestProject(teamId, 2L, "project3", dueDt, description); - // Project1에 일반 멤버로 참여 - TeamParticipant participant = teamParticipantRepository.findById(2L).get(); - projectParticipantRepository.save( - ProjectParticipant.createProjectParticipant( - participant, - member1JoinProject, - "Nickname", - "Profile", - ProjectParticipantRole.MEMBER)); + createTestProject(teamId, "project2", dueDt, description); + // when - Slice response = - projectService.getProjectListInfo(teamId, null, 10); - response.getContent().forEach(System.out::println); - assertThat( - response.getContent().stream() - .filter(r -> !r.isParticipant()) - // .filter(ProjectListInfoResponse::isAdmin) - .map(ProjectListInfoResponse::projectInfo) - .findAny() - .get() - .projectTitle()) - .isEqualTo("project1"); - assertThat( - response.getContent().stream() - .filter(ProjectListInfoResponse::isParticipant) - .filter(f -> !f.isAdmin()) - .map(ProjectListInfoResponse::projectInfo) - .findAny() - .get() - .projectTitle()) - .isEqualTo("project2"); - assertThat( - response.getContent().stream() - .filter(ProjectListInfoResponse::isParticipant) - .filter(ProjectListInfoResponse::isAdmin) - .map(ProjectListInfoResponse::projectInfo) - .findAny() - .get() - .projectTitle()) - .isEqualTo("project3"); + Slice responseTrue = + projectService.getProjectListInfo(teamId, null, 10, true); + Slice responseFalse = + projectService.getProjectListInfo(teamId, null, 10, false); + assertThat(responseTrue.getContent().get(0).projectTitle()).isEqualTo("project2"); + assertThat(responseFalse.getContent().get(0).projectTitle()).isEqualTo("project1"); } @Test @@ -285,6 +206,7 @@ class 프로젝트_조회 { @Nested class 프로젝트_업데이트 { String originalTitle = "originalProjectTitle"; + String originalGoal = "originalProjectTitle"; String originalDescription = "originalProjectGoal"; String updatedTitle = "updatedProjectTitle"; String updatedGoal = "updatedProjectGoal"; @@ -292,7 +214,7 @@ class 프로젝트_업데이트 { void createOriginalProject() { Long teamId = getTeamId(); - createTestProject(teamId, 1L, originalTitle, dueDt, originalDescription); + createTestProject(teamId, originalTitle, dueDt, originalDescription); } @Test @@ -426,7 +348,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입신청을_하면_정상적으로_요청이_생성된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -452,7 +374,7 @@ class 프로젝트_가입_신청 { void 프로젝트_멤버_수가_15명을_초과하면_가입신청이_제한된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); for (int i = 0; i < 14; i++) { @@ -490,7 +412,7 @@ class 프로젝트_가입_신청 { // given Long teamId = getTeamId(); Team team = teamRepository.findById(teamId).get(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); // when @@ -524,7 +446,7 @@ class 프로젝트_가입_신청 { void 이미_가입신청한_팀참여자는_신청하면_예외가_발생한다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -543,7 +465,7 @@ class 프로젝트_가입_신청 { void 이미_가입된_프로젝트_참여자가_가입신청하면_예외가_발생한다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); // when,then assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) @@ -556,7 +478,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_승인하면_정상적으로_승인된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -587,7 +509,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_거부하면_정상적으로_거부된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -618,7 +540,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_취소하면_요청이_정상적으로_삭제된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -638,7 +560,7 @@ class 프로젝트_가입_신청 { void 프로젝트_참여자를_조회하면_정상적으로_조회된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); // 어드민 로그아웃 loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -666,7 +588,7 @@ class 프로젝트_가입_신청 { void 프로젝트_참여자_목록을_조회하면_정상적으로_조회된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, 1L); + createTestProject(teamId); logout(); // admin 로그아웃 // when From 5b0de6a9fcfd90e00f567120a1b7a7b2ad8df563 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 23 Mar 2025 01:38:20 +0900 Subject: [PATCH 061/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B0=B8=EA=B0=80=EC=9E=90=20=EB=AA=A9=EB=A1=9D=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4?= =?UTF-8?q?=EC=9D=B4=EC=85=98=20=EC=A0=81=EC=9A=A9=20(#126)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 프로젝트 참가자 목록 조회 페이지네이션 적용 * refactor: 프로젝트 내 개인 참가자 정보 조회 스웨거 설명 수정 * test: 리팩토링에 따른 테스트 코드 수정 --- .../domain/project/api/ProjectController.java | 16 +++++--- .../project/application/ProjectService.java | 27 +++++++------ .../project/dao/ProjectRepositoryCustom.java | 4 ++ .../project/dao/ProjectRepositoryImpl.java | 38 ++++++++++++++++++- .../exception/errorcode/ProjectErrorCode.java | 2 + .../domain/project/ProjectServiceTest.java | 6 +-- 6 files changed, 72 insertions(+), 21 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index a7bdfe24..a548c097 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -6,9 +6,9 @@ import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Slice; import org.springframework.http.HttpStatus; @@ -127,7 +127,7 @@ public ResponseEntity projectRegistrationDelete( return ResponseEntity.ok().build(); } - @Operation(summary = "프로젝트 참가자 정보 조회", description = "프로젝트 참여자 정보를 조회합니다.") + @Operation(summary = "프로젝트 내 개인 참가자 정보 조회", description = "로그인한 사용자의 해당 프로젝트 참가자 정보를 조회합니다.") @GetMapping("/{projectId}/me") public ProjectParticipantInfoResponse projectParticipantGet(@PathVariable Long projectId) { return projectService.getProjectParticipant(projectId); @@ -135,9 +135,15 @@ public ProjectParticipantInfoResponse projectParticipantGet(@PathVariable Long p @Operation(summary = "프로젝트 참가자 목록 조회", description = "현재 프로젝트에 참여하고 있는 참가자 전체 목록을 조회합니다. ") @GetMapping("/{projectId}/participants") - public List projectParticipantListGet( - @PathVariable Long projectId) { - return projectService.getProjectParticipantList(projectId); + public Slice projectParticipantListGet( + @PathVariable Long projectId, + @Parameter(description = "이전 페이지의 마지막 프로젝트 참가자 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastProjectParticipantId, + @Parameter(description = "페이지당 프로젝트 참여자 수", example = "1") @RequestParam(value = "size") + int pageSize) { + return projectService.getProjectParticipantList( + projectId, lastProjectParticipantId, pageSize); } @Operation(summary = "프로젝트 나가기", description = "프로젝트에 참여중인 프로젝트 참여자 정보를 삭제합니다.") diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index e9cc9f4b..0a611e7b 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -18,8 +18,6 @@ import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; -import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; @@ -205,20 +203,27 @@ public void deleteProjectRegistration(Long projectId, Long projectRegisterId) { } // project participant info + + @Transactional(readOnly = true) public ProjectParticipantInfoResponse getProjectParticipant(Long projectId) { - Member member = memberUtil.getCurrentMember(); - Project project = getProjectById(projectId); + final Member member = memberUtil.getCurrentMember(); + final Project project = getProjectById(projectId); + ProjectParticipant participant = getValidProjectParticipant(member, project); + return ProjectParticipantInfoResponse.from(participant); } - public List getProjectParticipantList(Long projectId) { - Member member = memberUtil.getCurrentMember(); - Project project = getProjectById(projectId); - getValidProjectParticipant(member, project); - return projectParticipantRepository.findAllByProject(project).stream() - .map(ProjectParticipantInfoResponse::from) - .collect(Collectors.toList()); + @Transactional(readOnly = true) + public Slice getProjectParticipantList( + Long projectId, Long lastProjectParticipantId, int pageSize) { + final Member member = memberUtil.getCurrentMember(); + final Project project = getProjectById(projectId); + + getValidTeamParticipant(member, project.getTeam()); + + return projectRepository.findAllProjectParticipantByProject( + projectId, lastProjectParticipantId, pageSize); } // project utils diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java index d1f664b6..69f38785 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java @@ -1,6 +1,7 @@ package com.amcamp.domain.project.dao; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import org.springframework.data.domain.Slice; @@ -12,4 +13,7 @@ Slice findAllByTeamIdWithPagination( int pageSize, TeamParticipant teamParticipant, boolean isParticipant); + + Slice findAllProjectParticipantByProject( + Long projectId, Long lastProjectParticipantId, int pageSize); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index 894dfcaa..056afab3 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -4,7 +4,10 @@ import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -57,6 +60,32 @@ public Slice findAllByTeamIdWithPagination( return checkLastPage(pageSize, responses); } + @Override + public Slice findAllProjectParticipantByProject( + Long projectId, Long lastProjectParticipantId, int pageSize) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + ProjectParticipantInfoResponse.class, + projectParticipant.id, + projectParticipant.projectNickname, + projectParticipant.projectProfile, + projectParticipant.projectRole)) + .from(projectParticipant) + .where( + projectParticipant.project.id.eq(projectId), + lastProjectParticipantId(lastProjectParticipantId)) + .limit(pageSize + 1) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_NOT_EXISTS); + } + + return checkLastPage(pageSize, results); + } + private BooleanExpression participantCondition( boolean isParticipant, TeamParticipant teamParticipant) { if (isParticipant) { @@ -70,8 +99,13 @@ private BooleanExpression lastProjectCondition(Long projectId) { return (projectId == null) ? null : project.id.lt(projectId); } - private Slice checkLastPage( - int pageSize, List results) { + private BooleanExpression lastProjectParticipantId(Long projectParticipantId) { + return (projectParticipantId == null) + ? null + : projectParticipant.id.gt(projectParticipantId); + } + + private Slice checkLastPage(int pageSize, List results) { boolean hasNext = false; if (results.size() > pageSize) { diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index acb498fb..9dd8468e 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -17,6 +17,8 @@ public enum ProjectErrorCode implements BaseErrorCode { PROJECT_REGISTRATION_ALREADY_EXISTS(HttpStatus.CONFLICT, "이미 프로젝트 가입 요청이 생성되어 있습니다"), PROJECT_REGISTRATION_NOT_FOUND(HttpStatus.NOT_FOUND, "project 가입 요청을 찾을 수 없습니다."), PROJECT_SPRINT_MISMATCH(HttpStatus.FORBIDDEN, "요청한 스프린트는 현재 참여 중인 프로젝트의 스프린트가 아닙니다."), + + PROJECT_PARTICIPANT_NOT_EXISTS(HttpStatus.NOT_FOUND, "프로젝트 참가자가 존재하지 않습니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index c432b228..edcf97a0 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -578,7 +578,7 @@ class 프로젝트_가입_신청 { // then logout(); loginAs(member1); - projectService.getProjectParticipantList(1L).forEach(System.out::println); + projectService.getProjectParticipantList(1L, null, 1).forEach(System.out::println); ProjectParticipantInfoResponse myInfo = projectService.getProjectParticipant(1L); assertThat(myInfo.projectNickname()).isEqualTo(member1.getNickname()); assertThat(myInfo.role()).isEqualTo(ProjectParticipantRole.MEMBER); @@ -610,7 +610,7 @@ class 프로젝트_가입_신청 { // then List requesterIds = - projectService.getProjectParticipantList(1L).stream() + projectService.getProjectParticipantList(1L, null, 3).stream() .map(ProjectParticipantInfoResponse::projectNickname) .toList(); @@ -693,7 +693,7 @@ void composeProjectMembers() { // given composeProjectMembers(); Long newAdminId = - projectService.getProjectParticipantList(1L).stream() + projectService.getProjectParticipantList(1L, null, 3).stream() .filter(r -> !r.projectNickname().equals(memberAdmin.getNickname())) .map(ProjectParticipantInfoResponse::projectParticipantId) .findAny() From ff38d30eea95cde2b0d8f54e6d6fea2bef2d18c1 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 23 Mar 2025 01:47:11 +0900 Subject: [PATCH 062/107] =?UTF-8?q?Revert=20"fix:=20=EA=B8=B0=EC=A1=B4=20?= =?UTF-8?q?=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=EA=B0=80=20=EC=A2=85?= =?UTF-8?q?=EB=A3=8C=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=EC=97=90=EC=84=9C=20=EC=83=88=EB=A1=9C=EC=9A=B4=20?= =?UTF-8?q?=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=EA=B0=80=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=20(#131)"=20(#136)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 32d65a239b96900a962a33d2caf4e240dadc8a37. --- .../sprint/application/SprintService.java | 12 ----- .../domain/sprint/dao/SprintRepository.java | 3 -- .../amcamp/domain/sprint/domain/Sprint.java | 4 -- .../exception/errorcode/SprintErrorCode.java | 2 +- .../contribution/ContributionServiceTest.java | 50 +++++++++++-------- .../sprint/application/SprintServiceTest.java | 20 ++------ .../amcamp/domain/task/TaskServiceTest.java | 9 ++-- 7 files changed, 38 insertions(+), 62 deletions(-) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index a746cc4c..d957d7f6 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -43,8 +43,6 @@ public SprintInfoResponse createSprint(SprintCreateRequest request) { final Project project = findByProjectId(request.projectId()); validateProjectParticipant(project, project.getTeam(), currentMember); - - validatePreviousSprintEnded(project); validateSprintDueDate(request.dueDt(), project.getToDoInfo().getDueDt()); long count = sprintRepository.countByProject(project); @@ -152,14 +150,4 @@ private void validateSprintDueDate(LocalDate sprintDueDt, LocalDate projectDueDt throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_INVALID); } } - - private void validatePreviousSprintEnded(Project project) { - sprintRepository - .findTopByProjectOrderByCreatedDtDesc(project) - .filter(sprint -> !sprint.getToDoInfo().getDueDt().isBefore(LocalDate.now())) - .ifPresent( - sprint -> { - throw new CommonException(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED); - }); - } } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index f23530b5..cba83428 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -3,7 +3,6 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.sprint.domain.Sprint; import java.util.List; -import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -14,6 +13,4 @@ public interface SprintRepository extends JpaRepository, SprintRep @Query("SELECT s FROM Sprint s WHERE s.project = :project ORDER BY s.id ASC") List findAllByProjectOrderByCreatedAt(@Param("project") Project project); - - Optional findTopByProjectOrderByCreatedDtDesc(Project project); } diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index ad38b25c..f1c3f387 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -2,7 +2,6 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.contribution.domain.Contribution; -import com.amcamp.domain.feedback.domain.Feedback; import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ToDoInfo; @@ -36,9 +35,6 @@ public class Sprint extends BaseTimeEntity { @Embedded private ToDoInfo toDoInfo; - @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) - private List feedbacks = new ArrayList<>(); - // Task @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) private List tasks = new ArrayList<>(); diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index 831ece7f..e3d12415 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -8,12 +8,12 @@ @AllArgsConstructor public enum SprintErrorCode implements BaseErrorCode { SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), + SPRINT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "스프린트 삭제 권한이 없습니다."), TASK_NOT_CREATED_YET(HttpStatus.NOT_FOUND, "스프린트 내 태스크가 존재하지 않습니다."), SPRINT_DUE_DATE_INVALID(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), - PREVIOUS_SPRINT_NOT_ENDED(HttpStatus.BAD_REQUEST, "이전 스프린트가 아직 종료되지 않았습니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java index 3d347201..dc4b006b 100644 --- a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -19,6 +19,7 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.domain.TaskDifficulty; import com.amcamp.domain.task.dto.request.TaskCreateRequest; @@ -62,7 +63,6 @@ public class ContributionServiceTest extends IntegrationTest { private ProjectParticipant participant; private ProjectParticipant newParticipant; private Sprint sprint; - private Sprint anotherSprint; private Project project; private Project anotherProject; private Member newMember; @@ -128,13 +128,9 @@ void setUp() { ProjectParticipantRole.MEMBER)); sprint = - sprintRepository.save( - Sprint.createSprint(project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.now())); - - anotherSprint = sprintRepository.save( Sprint.createSprint( - project, "2차 스프린트", "기능 개발", LocalDate.of(2030, 12, 1))); + project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); // 상 2, 중 3, 하 4 taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.HIGH)); @@ -169,7 +165,8 @@ class 개별_기여도_조회_시 { loginAs(newTeamMember); assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 1L)) - .isInstanceOf(CommonException.class) + .isInstanceOf( + new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @@ -177,33 +174,40 @@ class 개별_기여도_조회_시 { void 프로젝트_참여자가_아니라면_에러반환() { loginAs(newMember); assertThatThrownBy(() -> contributionService.getContributionByMember(2L, 1L)) - .isInstanceOf(CommonException.class) + .isInstanceOf( + new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED) + .getClass()) .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); } @Test void 유효한_프로젝트가_아니라면_에러반환() { + Member member = memberUtil.getCurrentMember(); assertThatThrownBy(() -> contributionService.getContributionByMember(3L, 1L)) - .isInstanceOf(CommonException.class) + .isInstanceOf( + new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND).getClass()) .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } @Test void 태스크가_존재하지_않으면_빈_값_반환() { + SprintCreateRequest sprintRequest = + new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); + // when & then - assertThatThrownBy( - () -> - contributionService.getContributionByMember( - 1L, anotherSprint.getId())) - .isInstanceOf(CommonException.class) + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) + .isInstanceOf( + new CommonException(ContributionErrorCode.CONTRIBUTION_NOT_FOUND) + .getClass()) .hasMessage(ContributionErrorCode.CONTRIBUTION_NOT_FOUND.getMessage()); } @Test void 스프린트가_존재하지_않으면_빈_값_반환() { // when & then - assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 999L)) - .isInstanceOf(CommonException.class) + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) + .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @@ -225,22 +229,28 @@ class 프로젝트_기여도_조회_시 { loginAs(newMember); assertThatThrownBy(() -> contributionService.getContributionBySprint(1L)) - .isInstanceOf(CommonException.class) + .isInstanceOf( + new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @Test void 스프린트가_존재하지_않으면_에러_반환() { - assertThatThrownBy(() -> contributionService.getContributionBySprint(999L)) - .isInstanceOf(CommonException.class) + Member member = memberUtil.getCurrentMember(); + assertThatThrownBy(() -> contributionService.getContributionBySprint(2L)) + .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @Test void 태스크가_존재하지_않으면_빈_값_반환() { + SprintCreateRequest sprintRequest = + new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); + // when List contributions = - contributionService.getContributionBySprint(anotherSprint.getId()); + contributionService.getContributionBySprint(2L); // then assertThat(contributions.isEmpty()).isEqualTo(true); diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 216649d0..1ee289c9 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -129,8 +129,10 @@ class 스프린트_생성할_때 { } @Test - void 스프린트_마감_날짜가_현재_날짜_이전이라면_예외가_발생한다() { + void 스프린트_마감_날짜가_스프린트_시작_날짜_이전이라면_예외가_발생한다() { // given + sprintRepository.save( + Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); SprintCreateRequest request = new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2024, 1, 1)); @@ -139,22 +141,6 @@ class 스프린트_생성할_때 { .isInstanceOf(CommonException.class) .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); } - - @Test - void 기존_스프린트가_종료되지_않은_상태에서_새로운_스프린트를_생성하면_예외가_발생한다() { - // given - sprintRepository.save( - Sprint.createSprint( - project, "testTitle", "testGoal", LocalDate.of(2030, 1, 1))); - - SprintCreateRequest request = - new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2031, 1, 1)); - - // when & then - assertThatThrownBy(() -> sprintService.createSprint(request)) - .isInstanceOf(CommonException.class) - .hasMessage(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED.getMessage()); - } } @Nested diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index c35c449a..2960bf43 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -19,6 +19,7 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; +import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.*; @@ -67,7 +68,6 @@ public class TaskServiceTest extends IntegrationTest { private ProjectParticipant participant; private ProjectParticipant newParticipant; private Sprint sprint; - private Sprint anotherSprint; private Project project; private Project anotherProject; private Member newMember; @@ -137,10 +137,9 @@ void setUp() { Sprint.createSprint( project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); - anotherSprint = - sprintRepository.save( - Sprint.createSprint( - project, "2차 스프린트", "기능 개발", LocalDate.of(2030, 12, 1))); + SprintCreateRequest sprintRequest = + new SprintCreateRequest(1L, "1차 스프린트", LocalDate.of(2026, 3, 1)); + sprintService.createSprint(sprintRequest); } @Test From 6f91b06c3eb2028e12280352487ee969d3b3231e Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 23 Mar 2025 01:53:45 +0900 Subject: [PATCH 063/107] =?UTF-8?q?fix:=20=EA=B8=B0=EC=A1=B4=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=EA=B0=80=20=EC=A2=85=EB=A3=8C?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=80=20=EC=83=81=ED=83=9C?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=83=88=EB=A1=9C=EC=9A=B4=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=EA=B0=80=20=EC=83=9D=EC=84=B1?= =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#137)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 스프린트 삭제 시 연관된 피드백도 함께 삭제되도록 orphanRemoval 설정 추가 * fix: 기존 스프린트가 종료되지 않은 상태에서 새로운 스프린트가 생성되지 않도록 수정 * test: 기존 스프린트가 종료되지 않은 경우 새 스프린트 생성 제한 테스트 * refactor: Class 객체 참조 시 불필요한 객체 생성 제거 * test: 기능 수정에 따른 기여도 테스트 코드 수정 * test: 태스크 테스트 코드 수정 --- .../sprint/application/SprintService.java | 12 +++++ .../domain/sprint/dao/SprintRepository.java | 3 ++ .../amcamp/domain/sprint/domain/Sprint.java | 4 ++ .../exception/errorcode/SprintErrorCode.java | 2 +- .../contribution/ContributionServiceTest.java | 50 ++++++++----------- .../sprint/application/SprintServiceTest.java | 20 ++++++-- .../amcamp/domain/task/TaskServiceTest.java | 9 ++-- 7 files changed, 62 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index d957d7f6..a746cc4c 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -43,6 +43,8 @@ public SprintInfoResponse createSprint(SprintCreateRequest request) { final Project project = findByProjectId(request.projectId()); validateProjectParticipant(project, project.getTeam(), currentMember); + + validatePreviousSprintEnded(project); validateSprintDueDate(request.dueDt(), project.getToDoInfo().getDueDt()); long count = sprintRepository.countByProject(project); @@ -150,4 +152,14 @@ private void validateSprintDueDate(LocalDate sprintDueDt, LocalDate projectDueDt throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_INVALID); } } + + private void validatePreviousSprintEnded(Project project) { + sprintRepository + .findTopByProjectOrderByCreatedDtDesc(project) + .filter(sprint -> !sprint.getToDoInfo().getDueDt().isBefore(LocalDate.now())) + .ifPresent( + sprint -> { + throw new CommonException(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED); + }); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index cba83428..f23530b5 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -3,6 +3,7 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.sprint.domain.Sprint; import java.util.List; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -13,4 +14,6 @@ public interface SprintRepository extends JpaRepository, SprintRep @Query("SELECT s FROM Sprint s WHERE s.project = :project ORDER BY s.id ASC") List findAllByProjectOrderByCreatedAt(@Param("project") Project project); + + Optional findTopByProjectOrderByCreatedDtDesc(Project project); } diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index f1c3f387..ad38b25c 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -2,6 +2,7 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.contribution.domain.Contribution; +import com.amcamp.domain.feedback.domain.Feedback; import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ToDoInfo; @@ -35,6 +36,9 @@ public class Sprint extends BaseTimeEntity { @Embedded private ToDoInfo toDoInfo; + @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) + private List feedbacks = new ArrayList<>(); + // Task @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) private List tasks = new ArrayList<>(); diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index e3d12415..831ece7f 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -8,12 +8,12 @@ @AllArgsConstructor public enum SprintErrorCode implements BaseErrorCode { SPRINT_NOT_FOUND(HttpStatus.NOT_FOUND, "스프린트를 찾을 수 없습니다."), - SPRINT_DELETE_FORBIDDEN(HttpStatus.FORBIDDEN, "스프린트 삭제 권한이 없습니다."), TASK_NOT_CREATED_YET(HttpStatus.NOT_FOUND, "스프린트 내 태스크가 존재하지 않습니다."), SPRINT_DUE_DATE_INVALID(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), + PREVIOUS_SPRINT_NOT_ENDED(HttpStatus.BAD_REQUEST, "이전 스프린트가 아직 종료되지 않았습니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java index dc4b006b..3d347201 100644 --- a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -19,7 +19,6 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; -import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.domain.TaskDifficulty; import com.amcamp.domain.task.dto.request.TaskCreateRequest; @@ -63,6 +62,7 @@ public class ContributionServiceTest extends IntegrationTest { private ProjectParticipant participant; private ProjectParticipant newParticipant; private Sprint sprint; + private Sprint anotherSprint; private Project project; private Project anotherProject; private Member newMember; @@ -128,9 +128,13 @@ void setUp() { ProjectParticipantRole.MEMBER)); sprint = + sprintRepository.save( + Sprint.createSprint(project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.now())); + + anotherSprint = sprintRepository.save( Sprint.createSprint( - project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); + project, "2차 스프린트", "기능 개발", LocalDate.of(2030, 12, 1))); // 상 2, 중 3, 하 4 taskService.createTask(new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.HIGH)); @@ -165,8 +169,7 @@ class 개별_기여도_조회_시 { loginAs(newTeamMember); assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 1L)) - .isInstanceOf( - new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) + .isInstanceOf(CommonException.class) .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @@ -174,40 +177,33 @@ class 개별_기여도_조회_시 { void 프로젝트_참여자가_아니라면_에러반환() { loginAs(newMember); assertThatThrownBy(() -> contributionService.getContributionByMember(2L, 1L)) - .isInstanceOf( - new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED) - .getClass()) + .isInstanceOf(CommonException.class) .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); } @Test void 유효한_프로젝트가_아니라면_에러반환() { - Member member = memberUtil.getCurrentMember(); assertThatThrownBy(() -> contributionService.getContributionByMember(3L, 1L)) - .isInstanceOf( - new CommonException(ProjectErrorCode.PROJECT_NOT_FOUND).getClass()) + .isInstanceOf(CommonException.class) .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } @Test void 태스크가_존재하지_않으면_빈_값_반환() { - SprintCreateRequest sprintRequest = - new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); - // when & then - assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) - .isInstanceOf( - new CommonException(ContributionErrorCode.CONTRIBUTION_NOT_FOUND) - .getClass()) + assertThatThrownBy( + () -> + contributionService.getContributionByMember( + 1L, anotherSprint.getId())) + .isInstanceOf(CommonException.class) .hasMessage(ContributionErrorCode.CONTRIBUTION_NOT_FOUND.getMessage()); } @Test void 스프린트가_존재하지_않으면_빈_값_반환() { // when & then - assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 2L)) - .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) + assertThatThrownBy(() -> contributionService.getContributionByMember(1L, 999L)) + .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @@ -229,28 +225,22 @@ class 프로젝트_기여도_조회_시 { loginAs(newMember); assertThatThrownBy(() -> contributionService.getContributionBySprint(1L)) - .isInstanceOf( - new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED).getClass()) + .isInstanceOf(CommonException.class) .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @Test void 스프린트가_존재하지_않으면_에러_반환() { - Member member = memberUtil.getCurrentMember(); - assertThatThrownBy(() -> contributionService.getContributionBySprint(2L)) - .isInstanceOf(new CommonException(SprintErrorCode.SPRINT_NOT_FOUND).getClass()) + assertThatThrownBy(() -> contributionService.getContributionBySprint(999L)) + .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @Test void 태스크가_존재하지_않으면_빈_값_반환() { - SprintCreateRequest sprintRequest = - new SprintCreateRequest(1L, "2차 스프린트", LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); - // when List contributions = - contributionService.getContributionBySprint(2L); + contributionService.getContributionBySprint(anotherSprint.getId()); // then assertThat(contributions.isEmpty()).isEqualTo(true); diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 1ee289c9..216649d0 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -129,10 +129,8 @@ class 스프린트_생성할_때 { } @Test - void 스프린트_마감_날짜가_스프린트_시작_날짜_이전이라면_예외가_발생한다() { + void 스프린트_마감_날짜가_현재_날짜_이전이라면_예외가_발생한다() { // given - sprintRepository.save( - Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); SprintCreateRequest request = new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2024, 1, 1)); @@ -141,6 +139,22 @@ class 스프린트_생성할_때 { .isInstanceOf(CommonException.class) .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); } + + @Test + void 기존_스프린트가_종료되지_않은_상태에서_새로운_스프린트를_생성하면_예외가_발생한다() { + // given + sprintRepository.save( + Sprint.createSprint( + project, "testTitle", "testGoal", LocalDate.of(2030, 1, 1))); + + SprintCreateRequest request = + new SprintCreateRequest(project.getId(), "testGoal", LocalDate.of(2031, 1, 1)); + + // when & then + assertThatThrownBy(() -> sprintService.createSprint(request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED.getMessage()); + } } @Nested diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 2960bf43..c35c449a 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -19,7 +19,6 @@ import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; -import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.*; @@ -68,6 +67,7 @@ public class TaskServiceTest extends IntegrationTest { private ProjectParticipant participant; private ProjectParticipant newParticipant; private Sprint sprint; + private Sprint anotherSprint; private Project project; private Project anotherProject; private Member newMember; @@ -137,9 +137,10 @@ void setUp() { Sprint.createSprint( project, "1차 스프린트", "아이디어 기획서 제출", LocalDate.of(2026, 3, 1))); - SprintCreateRequest sprintRequest = - new SprintCreateRequest(1L, "1차 스프린트", LocalDate.of(2026, 3, 1)); - sprintService.createSprint(sprintRequest); + anotherSprint = + sprintRepository.save( + Sprint.createSprint( + project, "2차 스프린트", "기능 개발", LocalDate.of(2030, 12, 1))); } @Test From 83a97ec2acad4c31507ec57043d955015c84a604 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sun, 23 Mar 2025 19:10:15 +0900 Subject: [PATCH 064/107] =?UTF-8?q?feat:=20=ED=9A=8C=EC=9B=90=EB=B3=84=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EB=82=B4=20=EC=8A=A4?= =?UTF-8?q?=ED=94=84=EB=A6=B0=ED=8A=B8=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20=20(#132)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 개인별 스프린트 목록 조회 기능 구현 * fix: 진척도 반환 시 정수로 반환 수정 * fix: 팀 참가자 검증 로직 수정 --- .../domain/sprint/api/SprintController.java | 10 +++++ .../sprint/application/SprintService.java | 10 +++++ .../sprint/dao/SprintRepositoryImpl.java | 2 +- .../dto/response/SprintInfoResponse.java | 4 +- .../dto/response/SprintProgressResponse.java | 11 ----- .../sprint/application/SprintServiceTest.java | 44 ++++++++++++++++++- 6 files changed, 66 insertions(+), 15 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index e76123f7..1be6258b 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -61,4 +61,14 @@ public Slice sprintFindAll( Long lastSprintId) { return sprintService.findAllSprint(projectId, lastSprintId); } + + @Operation(summary = "회원별 프로젝트 내 스프린트 목록 조회", description = "마이페이지에서 특정 프로젝트의 스프린트 목록을 조회합니다.") + @GetMapping("/{projectId}/me") + public Slice sprintFindAllByMember( + @PathVariable Long projectId, + @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastSprintId) { + return sprintService.findAllSprintByMember(projectId, lastSprintId); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index a746cc4c..f30a6588 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -115,6 +115,16 @@ public Slice findAllSprint(Long projectId, Long lastSprintId return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); } + @Transactional(readOnly = true) + public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Project project = findByProjectId(projectId); + + validateProjectParticipant(project, project.getTeam(), currentMember); + + return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); + } + private Sprint findBySprintId(Long sprintId) { return sprintRepository .findById(sprintId) diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index cc7a7f15..a9d4988b 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -34,7 +34,7 @@ public Slice findAllSprintByProjectId(Long projectId, Long l sprint.toDoInfo.startDt, sprint.toDoInfo.dueDt, sprint.toDoInfo.toDoStatus, - sprint.progress)) + sprint.progress.intValue())) .from(sprint) .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) .orderBy(sprint.title.asc()) diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java index 8a9b9547..53f50a6b 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java @@ -12,7 +12,7 @@ public record SprintInfoResponse( @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, - @Schema(description = "스프린트 진척도", defaultValue = "0") Double progress) { + @Schema(description = "스프린트 진척도", defaultValue = "0") Integer progress) { public static SprintInfoResponse from(Sprint sprint) { return new SprintInfoResponse( sprint.getId(), @@ -21,6 +21,6 @@ public static SprintInfoResponse from(Sprint sprint) { sprint.getToDoInfo().getStartDt(), sprint.getToDoInfo().getDueDt(), sprint.getToDoInfo().getToDoStatus(), - sprint.getProgress()); + sprint.getProgress().intValue()); } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java deleted file mode 100644 index 7c9bd508..00000000 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.amcamp.domain.sprint.dto.response; - -import io.swagger.v3.oas.annotations.media.Schema; - -public record SprintProgressResponse( - @Schema(description = "스프린트 아이디", example = "1L") Long sprintId, - @Schema(description = "스프린트 진척도", example = "50.0") Double progress) { - public static SprintProgressResponse from(Long sprintId, Double progress) { - return new SprintProgressResponse(sprintId, progress); - } -} diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 216649d0..0adb05c8 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -58,6 +58,7 @@ public class SprintServiceTest extends IntegrationTest { @Autowired private TaskRepository taskRepository; private Project project; + private Member newMember; private void loginAs(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); @@ -76,6 +77,8 @@ void setUp() { "testProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + newMember = memberRepository.save(Member.createMember("member", null, null)); + UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); UsernamePasswordAuthenticationToken token = new UsernamePasswordAuthenticationToken( @@ -87,6 +90,10 @@ void setUp() { TeamParticipant teamParticipant = TeamParticipant.createParticipant(member, team, TeamParticipantRole.ADMIN); teamParticipantRepository.save(teamParticipant); + TeamParticipant teamParticipantUser = + teamParticipantRepository.save( + TeamParticipant.createParticipant( + newMember, team, TeamParticipantRole.USER)); project = Project.createProject(team, "testTitle", "testDescription", dueDt); projectRepository.save(project); @@ -252,7 +259,41 @@ class 프로젝트별_스프린트_목록을_조회할_때 { } @Test - void 프로젝트가_존재한다면_첫_번쨰_스프린트를_반환한다() { + void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { + // given + List sprintList = + List.of( + Sprint.createSprint(project, "1", "testDescription1", dueDt), + Sprint.createSprint(project, "2", "testDescription2", dueDt), + Sprint.createSprint(project, "3", "testDescription3", dueDt)); + sprintRepository.saveAll(sprintList); + + // when + Slice results = sprintService.findAllSprint(project.getId(), null); + + // then + assertThat(results.getSize()).isEqualTo(1); + assertThat(results) + .extracting("id", "title", "goal") + .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + } + } + + @Nested + class 회원별_스프린트_목록을_조회할_떄 { + @Test + void 프로젝트_참가자가_아니면_예외가_발생한다() { + // given + loginAs(newMember); + + // when & then + assertThatThrownBy(() -> sprintService.findAllSprintByMember(1L, null)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + } + + @Test + void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = List.of( @@ -269,6 +310,7 @@ class 프로젝트별_스프린트_목록을_조회할_때 { assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + assertThat(results.getContent().get(0).progress()).isInstanceOf(Integer.class); } } } From b6cf9a85172d731191b21521635817f9a4506bf4 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 23 Mar 2025 21:00:17 +0900 Subject: [PATCH 065/107] =?UTF-8?q?chore:=20Nginx=20=EB=A6=AC=EB=B2=84?= =?UTF-8?q?=EC=8A=A4=20=ED=94=84=EB=A1=9D=EC=8B=9C=20=EB=8F=84=EC=9E=85=20?= =?UTF-8?q?=EB=B0=8F=20HTTPS=20=EC=A0=81=EC=9A=A9=20(#138)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: docker compose version 제거 * chore: nginx.conf 파일 추가 * chore: docker compose에 nginx 컨테이너 추가 * chore: nginx 도입에 따른 CI/CD 워크플로 수정 * chore: 테스트 트리거 활성화 * chore: 프로파일에 따라 Swagger 서버 URL 동적 설정 * chore: 개발 환경에서 CORS 허용 도메인 설정 추가 * chore: 테스트 트리거 제거 --- .github/workflows/develop_build_deploy.yml | 10 ++++++++ docker-compose.yml | 10 ++++++-- nginx/default.conf | 18 +++++++++++++ .../global/common/constants/UrlConstants.java | 5 ++++ .../config/security/WebSecurityConfig.java | 12 +++++++++ .../global/config/swagger/SwaggerConfig.java | 25 +++++++++++++++++++ 6 files changed, 78 insertions(+), 2 deletions(-) create mode 100644 nginx/default.conf diff --git a/.github/workflows/develop_build_deploy.yml b/.github/workflows/develop_build_deploy.yml index bc9cbdfd..b8f026a5 100644 --- a/.github/workflows/develop_build_deploy.yml +++ b/.github/workflows/develop_build_deploy.yml @@ -62,6 +62,15 @@ jobs: source: docker-compose.yml target: /home/ubuntu/ + - name: Copy default.conf to EC2 + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + source: nginx/default.conf + target: /home/ubuntu/ + - name: Deploy to EC2 uses: appleboy/ssh-action@master env: @@ -75,4 +84,5 @@ jobs: script: | echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u "${{ env.DOCKERHUB_USERNAME }}" --password-stdin docker compose up -d + docker exec nginx nginx -s reload docker image prune -a -f diff --git a/docker-compose.yml b/docker-compose.yml index 0216c6da..9b2635bd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: "3.8" - services: backend: image: ${IMAGE_FULL_URL} @@ -18,3 +16,11 @@ services: network_mode: host environment: - TZ=Asia/Seoul + nginx: + image: "nginx:alpine" + container_name: nginx + network_mode: host + environment: + - TZ=Asia/Seoul + volumes: + - ./nginx/default.conf:/etc/nginx/conf.d/default.conf diff --git a/nginx/default.conf b/nginx/default.conf new file mode 100644 index 00000000..be57a8cf --- /dev/null +++ b/nginx/default.conf @@ -0,0 +1,18 @@ +server { + listen 80; + server_name devfit.site; + + if ($http_x_forwarded_proto != 'https') { + return 301 https://$host$request_uri; + } + + location / { + proxy_pass http://localhost:8080; + proxy_redirect off; + + proxy_set_header X-Real-IP $remote_addr; + proxy_set_header HOST $http_host; + proxy_set_header X-NginX-Proxy true; + proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; + } +} diff --git a/src/main/java/com/amcamp/global/common/constants/UrlConstants.java b/src/main/java/com/amcamp/global/common/constants/UrlConstants.java index 99189af0..c1e9a8a9 100644 --- a/src/main/java/com/amcamp/global/common/constants/UrlConstants.java +++ b/src/main/java/com/amcamp/global/common/constants/UrlConstants.java @@ -1,6 +1,11 @@ package com.amcamp.global.common.constants; public final class UrlConstants { + public static final String DEV_SERVER_URL = "https://dev-api.devfit.site"; + public static final String LOCAL_SERVER_URL = "http://localhost:8080"; + + public static final String DEV_DOMAIN_URL = "https://www.dev.devfit.site"; + public static final String LOCAL_DOMAIN_URL = "http://localhost:3000"; public static final String IMAGE_URL = "https://devfit-bucket.s3.ap-northeast-2.amazonaws.com"; } diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 7ec62a09..9fd1617f 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -4,11 +4,14 @@ import static org.springframework.security.config.Customizer.withDefaults; import com.amcamp.domain.auth.application.JwtTokenService; +import com.amcamp.global.common.constants.UrlConstants; import com.amcamp.global.security.JwtAuthenticationFilter; import com.amcamp.global.util.CookieUtil; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -26,6 +29,7 @@ public class WebSecurityConfig { private final JwtTokenService jwtTokenService; private final CookieUtil cookieUtil; + private final Environment environment; @Bean public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { @@ -56,6 +60,14 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); + List profiles = List.of(environment.getActiveProfiles()); + + if (profiles.contains("dev")) { + configuration.addAllowedOriginPattern(UrlConstants.DEV_SERVER_URL); + configuration.addAllowedOriginPattern(UrlConstants.DEV_DOMAIN_URL); + configuration.addAllowedOriginPattern(UrlConstants.LOCAL_DOMAIN_URL); + } + configuration.addAllowedHeader("*"); configuration.addAllowedMethod("*"); configuration.setAllowCredentials(true); diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index e2593aec..b5f72758 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -1,17 +1,27 @@ package com.amcamp.global.config.swagger; +import com.amcamp.global.common.constants.UrlConstants; 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 java.util.List; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.env.Environment; @Configuration +@RequiredArgsConstructor +@Slf4j public class SwaggerConfig { + private final Environment environment; + @Bean public GroupedOpenApi publicApi() { return GroupedOpenApi.builder().group("v1").pathsToMatch("/**").build(); @@ -25,10 +35,25 @@ public OpenAPI openAPI() { .title("DevFit Server API") .description("DevFit Server API 명세서입니다.") .version("v0.0.1")) + .servers(getSwaggerServers()) .components(authSetting()) .addSecurityItem(securityRequirement()); } + private List getSwaggerServers() { + return List.of(new Server().url(resolveServerUrl())); + } + + private String resolveServerUrl() { + List profiles = List.of(environment.getActiveProfiles()); + + if (profiles.contains("dev")) { + return UrlConstants.DEV_SERVER_URL; + } + + return UrlConstants.LOCAL_SERVER_URL; + } + private Components authSetting() { return new Components() .addSecuritySchemes( From e8c302e793fc970d28b8769a1ce11b39f5b97190 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Tue, 25 Mar 2025 13:20:25 +0900 Subject: [PATCH 066/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C?= =?UTF-8?q?=20Admin=20=ED=91=9C=EC=8B=9C=20(#142)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: projectListInfoResponse 요청/응답 형식 수정 및 isParticipant, isAdmin 응답필드 추가 * refactor: 테스트 코드 줄바꿈 적용 --- .../domain/project/api/ProjectController.java | 6 +- .../project/application/ProjectService.java | 13 +- .../project/dao/ProjectRepositoryCustom.java | 10 +- .../project/dao/ProjectRepositoryImpl.java | 44 +++--- .../dto/response/ProjectListInfoResponse.java | 8 +- .../domain/project/ProjectServiceTest.java | 142 +++++++++++++----- 6 files changed, 151 insertions(+), 72 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index a548c097..b8bdce49 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -3,6 +3,7 @@ import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import io.swagger.v3.oas.annotations.Operation; @@ -38,12 +39,11 @@ public ResponseEntity projectCreate( summary = "전체 프로젝트 목록 조회", description = "팀 ID를 통해 사용자가 참여 중인 프로젝트와 참여 중이지 않은 프로젝트를 나누어 조회합니다.") @GetMapping("/{teamId}/list") - public Slice projectListInfo( + public Slice projectListInfo( @PathVariable Long teamId, - @RequestParam boolean isParticipant, @RequestParam(required = false) Long lastProjectId, @RequestParam(defaultValue = "10") int pageSize) { - return projectService.getProjectListInfo(teamId, lastProjectId, pageSize, isParticipant); + return projectService.getProjectListInfo(teamId, lastProjectId, pageSize); } @Operation(summary = "프로젝트 조회", description = "프로젝트 ID를 통해 프로젝트 정보를 조회합니다.") diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 0a611e7b..4608be5b 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -7,6 +7,7 @@ import com.amcamp.domain.project.domain.ProjectRegistration; import com.amcamp.domain.project.dto.request.*; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -66,14 +67,14 @@ public ProjectInfoResponse getProjectInfo(Long projectId) { } @Transactional(readOnly = true) - public Slice getProjectListInfo( - Long teamId, Long lastProjectId, int pageSize, boolean isParticipant) { + public Slice getProjectListInfo( + Long teamId, Long lastProjectId, int pageSize) { Member member = memberUtil.getCurrentMember(); Team team = getTeam(teamId); TeamParticipant teamParticipant = getValidTeamParticipant(member, team); return projectRepository.findAllByTeamIdWithPagination( - teamId, lastProjectId, pageSize, teamParticipant, isParticipant); + teamId, lastProjectId, pageSize, teamParticipant); } // update @@ -291,10 +292,4 @@ private boolean isProjectAdmin(Member member, Project project) { ProjectParticipant participant = getValidProjectParticipant(member, project); return participant.getProjectRole().equals(ProjectParticipantRole.ADMIN); } - - private Boolean isProjectParticipant(Project project, TeamParticipant teamParticipant) { - return projectParticipantRepository - .findByProjectAndTeamParticipant(project, teamParticipant) - .isPresent(); - } } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java index 69f38785..07c22775 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryCustom.java @@ -1,18 +1,14 @@ package com.amcamp.domain.project.dao; -import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import org.springframework.data.domain.Slice; public interface ProjectRepositoryCustom { - Slice findAllByTeamIdWithPagination( - Long teamId, - Long lastProjectId, - int pageSize, - TeamParticipant teamParticipant, - boolean isParticipant); + Slice findAllByTeamIdWithPagination( + Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant); Slice findAllProjectParticipantByProject( Long projectId, Long lastProjectParticipantId, int pageSize); diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index 056afab3..a2bb76a0 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -3,13 +3,17 @@ import static com.amcamp.domain.project.domain.QProject.project; import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.CaseBuilder; +import com.querydsl.core.types.dsl.NumberExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; @@ -23,23 +27,29 @@ public class ProjectRepositoryImpl implements ProjectRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllByTeamIdWithPagination( - Long teamId, - Long lastProjectId, - int pageSize, - TeamParticipant teamParticipant, - boolean isParticipant) { - - List responses = + public Slice findAllByTeamIdWithPagination( + Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant) { + + NumberExpression adminCase = + new CaseBuilder() + .when(projectParticipant.projectRole.eq(ProjectParticipantRole.ADMIN)) + .then(1) + .otherwise(0); + + List responses = jpaQueryFactory .select( Projections.constructor( - ProjectInfoResponse.class, - project.id, - project.title, - project.description, - project.toDoInfo.startDt, - project.toDoInfo.dueDt)) + ProjectListInfoResponse.class, + Projections.constructor( + ProjectInfoResponse.class, + project.id, + project.title, + project.description, + project.toDoInfo.startDt, + project.toDoInfo.dueDt), + projectParticipant.id.count().gt(0), + adminCase.sum().gt(0))) .from(project) .leftJoin(projectParticipant) .on( @@ -49,10 +59,8 @@ public Slice findAllByTeamIdWithPagination( .and( projectParticipant.teamParticipant.eq( teamParticipant))) - .where( - project.team.id.eq(teamId), - lastProjectCondition(lastProjectId), - participantCondition(isParticipant, teamParticipant)) + .where(project.team.id.eq(teamId), lastProjectCondition(lastProjectId)) + .groupBy(project.id) .orderBy(project.id.desc()) .limit(pageSize + 1) .fetch(); diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java index 97661a7a..b6b42fbf 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java @@ -4,4 +4,10 @@ public record ProjectListInfoResponse( @Schema(description = "사용자가 참여중인 프로젝트 목록") ProjectInfoResponse projectInfo, - @Schema(description = "참여 여부", example = "false") boolean isParticipate) {} + @Schema(description = "프로젝트 참여 여부", example = "false") boolean isParticipant, + @Schema(description = "프로젝트 팀장 여부", example = "false") boolean isAdmin) { + public static ProjectListInfoResponse from( + ProjectInfoResponse projectInfo, boolean isParticipant, boolean isAdmin) { + return new ProjectListInfoResponse(projectInfo, isParticipant, isAdmin); + } +} diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index edcf97a0..9995dad7 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -15,6 +15,7 @@ import com.amcamp.domain.project.dto.request.ProjectCreateRequest; import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.application.TeamService; @@ -29,6 +30,7 @@ import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; +import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; import java.util.HashSet; import java.util.List; @@ -41,6 +43,7 @@ import org.springframework.security.core.userdetails.UserDetails; public class ProjectServiceTest extends IntegrationTest { + @Autowired private MemberUtil memberUtil; @Autowired private ProjectService projectService; @Autowired private TeamService teamService; @Autowired private MemberRepository memberRepository; @@ -78,23 +81,58 @@ private Long getTeamId() { return teamService.getTeamByCode(teamInviteCodeRequest).teamId(); } - void createTestProject() { + Project createTestProject() { + Member member = memberUtil.getCurrentMember(); Long teamId = getTeamId(); - ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + Team team = teamRepository.findById(teamId).orElseThrow(); + TeamParticipant participant = teamParticipantRepository.findById(1L).get(); + Project project = + projectRepository.save(Project.createProject(team, title, description, dueDt)); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + project, + member.getNickname(), + "Profile", + ProjectParticipantRole.ADMIN)); + return project; } - void createTestProject(Long teamId) { - ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + Project createTestProject(Long teamId, Long teamParticipantId) { + Member member = memberUtil.getCurrentMember(); + Team team = teamRepository.findById(teamId).orElseThrow(); + TeamParticipant participant = teamParticipantRepository.findById(teamParticipantId).get(); + Project project = + projectRepository.save(Project.createProject(team, title, description, dueDt)); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + project, + member.getNickname(), + "Profile", + ProjectParticipantRole.ADMIN)); + return project; } - void createTestProject(Long teamId, String title, LocalDate dueDt, String description) { - ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); - - projectService.createProject(request); + Project createTestProject( + Long teamId, + Long teamParticipantId, + String title, + LocalDate dueDt, + String description) { + Member member = memberUtil.getCurrentMember(); + Team team = teamRepository.findById(teamId).orElseThrow(); + TeamParticipant participant = teamParticipantRepository.findById(teamParticipantId).get(); + Project project = + projectRepository.save(Project.createProject(team, title, description, dueDt)); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + project, + member.getNickname(), + "Profile", + ProjectParticipantRole.ADMIN)); + return project; } @BeforeEach @@ -138,7 +176,9 @@ public void afterEach() { // given Long teamId = getTeamId(); // when - createTestProject(teamId, title, dueDt, description); + ProjectCreateRequest request = new ProjectCreateRequest(teamId, title, dueDt, description); + + projectService.createProject(request); // then Project project = projectRepository.findById(1L).get(); @@ -154,22 +194,57 @@ class 프로젝트_조회 { void 팀_ID로_조회하면_전체_프로젝트가_정상적으로_반환된다() { // given Long teamId = getTeamId(); - createTestProject(teamId, "project1", dueDt, description); + createTestProject(teamId, 1L, "project1", dueDt, description); + Project member1JoinProject = + createTestProject(teamId, 1L, "project2", dueDt, description); + // member logout 후 anotherMember 로그인 logout(); loginAs(member1); // 팀 참가 teamService.joinTeam(teamInviteCodeRequest); // anotherMember 새 프로젝트 생성 - createTestProject(teamId, "project2", dueDt, description); - + createTestProject(teamId, 2L, "project3", dueDt, description); + // Project1에 일반 멤버로 참여 + TeamParticipant participant = teamParticipantRepository.findById(2L).get(); + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + participant, + member1JoinProject, + "Nickname", + "Profile", + ProjectParticipantRole.MEMBER)); // when - Slice responseTrue = - projectService.getProjectListInfo(teamId, null, 10, true); - Slice responseFalse = - projectService.getProjectListInfo(teamId, null, 10, false); - assertThat(responseTrue.getContent().get(0).projectTitle()).isEqualTo("project2"); - assertThat(responseFalse.getContent().get(0).projectTitle()).isEqualTo("project1"); + Slice response = + projectService.getProjectListInfo(teamId, null, 10); + response.getContent().forEach(System.out::println); + assertThat( + response.getContent().stream() + .filter(r -> !r.isParticipant()) + // .filter(ProjectListInfoResponse::isAdmin) + .map(ProjectListInfoResponse::projectInfo) + .findAny() + .get() + .projectTitle()) + .isEqualTo("project1"); + assertThat( + response.getContent().stream() + .filter(ProjectListInfoResponse::isParticipant) + .filter(f -> !f.isAdmin()) + .map(ProjectListInfoResponse::projectInfo) + .findAny() + .get() + .projectTitle()) + .isEqualTo("project2"); + assertThat( + response.getContent().stream() + .filter(ProjectListInfoResponse::isParticipant) + .filter(ProjectListInfoResponse::isAdmin) + .map(ProjectListInfoResponse::projectInfo) + .findAny() + .get() + .projectTitle()) + .isEqualTo("project3"); } @Test @@ -206,7 +281,6 @@ class 프로젝트_조회 { @Nested class 프로젝트_업데이트 { String originalTitle = "originalProjectTitle"; - String originalGoal = "originalProjectTitle"; String originalDescription = "originalProjectGoal"; String updatedTitle = "updatedProjectTitle"; String updatedGoal = "updatedProjectGoal"; @@ -214,7 +288,7 @@ class 프로젝트_업데이트 { void createOriginalProject() { Long teamId = getTeamId(); - createTestProject(teamId, originalTitle, dueDt, originalDescription); + createTestProject(teamId, 1L, originalTitle, dueDt, originalDescription); } @Test @@ -348,7 +422,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입신청을_하면_정상적으로_요청이_생성된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -374,7 +448,7 @@ class 프로젝트_가입_신청 { void 프로젝트_멤버_수가_15명을_초과하면_가입신청이_제한된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); for (int i = 0; i < 14; i++) { @@ -412,7 +486,7 @@ class 프로젝트_가입_신청 { // given Long teamId = getTeamId(); Team team = teamRepository.findById(teamId).get(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); // when @@ -446,7 +520,7 @@ class 프로젝트_가입_신청 { void 이미_가입신청한_팀참여자는_신청하면_예외가_발생한다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -465,7 +539,7 @@ class 프로젝트_가입_신청 { void 이미_가입된_프로젝트_참여자가_가입신청하면_예외가_발생한다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); // when,then assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) @@ -478,7 +552,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_승인하면_정상적으로_승인된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -509,7 +583,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_거부하면_정상적으로_거부된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -540,7 +614,7 @@ class 프로젝트_가입_신청 { void 프로젝트_가입을_취소하면_요청이_정상적으로_삭제된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -560,7 +634,7 @@ class 프로젝트_가입_신청 { void 프로젝트_참여자를_조회하면_정상적으로_조회된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); // 어드민 로그아웃 loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); @@ -588,7 +662,7 @@ class 프로젝트_가입_신청 { void 프로젝트_참여자_목록을_조회하면_정상적으로_조회된다() { // given Long teamId = getTeamId(); - createTestProject(teamId); + createTestProject(teamId, 1L); logout(); // admin 로그아웃 // when From c37b39d2f6a2d789b428e835ab12186cd80d9352 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:17:27 +0900 Subject: [PATCH 067/107] =?UTF-8?q?chore:=20SpringEnvironmentHelper=20?= =?UTF-8?q?=EC=A0=81=EC=9A=A9=20(#144)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/security/WebSecurityConfig.java | 9 ++---- .../global/config/swagger/SwaggerConfig.java | 19 +++++------- .../helper/SpringEnvironmentHelper.java | 29 +++++++++++++++++++ 3 files changed, 40 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 9fd1617f..d3cfcca6 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -5,13 +5,12 @@ import com.amcamp.domain.auth.application.JwtTokenService; import com.amcamp.global.common.constants.UrlConstants; +import com.amcamp.global.helper.SpringEnvironmentHelper; import com.amcamp.global.security.JwtAuthenticationFilter; import com.amcamp.global.util.CookieUtil; -import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -27,9 +26,9 @@ @RequiredArgsConstructor public class WebSecurityConfig { + private final SpringEnvironmentHelper springEnvironmentHelper; private final JwtTokenService jwtTokenService; private final CookieUtil cookieUtil; - private final Environment environment; @Bean public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { @@ -60,9 +59,7 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); - List profiles = List.of(environment.getActiveProfiles()); - - if (profiles.contains("dev")) { + if (springEnvironmentHelper.isDevProfile()) { configuration.addAllowedOriginPattern(UrlConstants.DEV_SERVER_URL); configuration.addAllowedOriginPattern(UrlConstants.DEV_DOMAIN_URL); configuration.addAllowedOriginPattern(UrlConstants.LOCAL_DOMAIN_URL); diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index b5f72758..295b23c3 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -1,6 +1,7 @@ package com.amcamp.global.config.swagger; import com.amcamp.global.common.constants.UrlConstants; +import com.amcamp.global.helper.SpringEnvironmentHelper; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; import io.swagger.v3.oas.models.info.Info; @@ -13,14 +14,13 @@ import org.springdoc.core.models.GroupedOpenApi; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.core.env.Environment; @Configuration @RequiredArgsConstructor @Slf4j public class SwaggerConfig { - private final Environment environment; + private final SpringEnvironmentHelper springEnvironmentHelper; @Bean public GroupedOpenApi publicApi() { @@ -41,17 +41,14 @@ public OpenAPI openAPI() { } private List getSwaggerServers() { - return List.of(new Server().url(resolveServerUrl())); + return List.of(new Server().url(getServerUrlByProfile())); } - private String resolveServerUrl() { - List profiles = List.of(environment.getActiveProfiles()); - - if (profiles.contains("dev")) { - return UrlConstants.DEV_SERVER_URL; - } - - return UrlConstants.LOCAL_SERVER_URL; + private String getServerUrlByProfile() { + return switch (springEnvironmentHelper.getCurrentProfile()) { + case "dev" -> UrlConstants.DEV_SERVER_URL; + default -> UrlConstants.LOCAL_SERVER_URL; + }; } private Components authSetting() { diff --git a/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java b/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java new file mode 100644 index 00000000..0beeb934 --- /dev/null +++ b/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java @@ -0,0 +1,29 @@ +package com.amcamp.global.helper; + +import java.util.Arrays; +import java.util.stream.Stream; +import lombok.RequiredArgsConstructor; +import org.springframework.core.env.Environment; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class SpringEnvironmentHelper { + + private final Environment environment; + + public static final String DEV = "dev"; + public static final String LOCAL = "local"; + + public String getCurrentProfile() { + return getActiveProfiles().filter(profile -> profile.equals(DEV)).findFirst().orElse(LOCAL); + } + + public Boolean isDevProfile() { + return getActiveProfiles().anyMatch(DEV::equals); + } + + private Stream getActiveProfiles() { + return Arrays.stream(environment.getActiveProfiles()); + } +} From d6190697afa64aa6a77a852158bcdb88ed340603 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:18:27 +0900 Subject: [PATCH 068/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EA=B0=80=EC=9E=85=20=EC=8B=A0=EC=B2=AD=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20request=EC=9D=98?= =?UTF-8?q?=20=EB=8B=89=EB=84=A4=EC=9E=84=EA=B3=BC=20=ED=94=84=EB=A1=9C?= =?UTF-8?q?=ED=95=84=20=ED=95=A8=EA=BB=98=20=EC=A1=B0=ED=9A=8C=20(#146)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/project/api/ProjectController.java | 4 +-- .../project/application/ProjectService.java | 3 ++- .../ProjectRegistrationRepositoryCustom.java | 4 +-- .../ProjectRegistrationRepositoryImpl.java | 20 +++++++------- .../ProjectRegisterDetailResponse.java | 26 +++++++++++++++++++ .../domain/project/ProjectServiceTest.java | 7 ++--- 6 files changed, 47 insertions(+), 17 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectRegisterDetailResponse.java diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index b8bdce49..eecedd81 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -5,7 +5,7 @@ import com.amcamp.domain.project.dto.response.ProjectInfoResponse; import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; -import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegisterDetailResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -96,7 +96,7 @@ public ResponseEntity projectRegister(@PathVariable Long projectId) { @Operation(summary = "프로젝트 가입 신청 목록 조회", description = "현재 프로젝트에 신청된 가입 요청 목록을 조회합니다.") @GetMapping("/{projectId}/registration/list") - public Slice projectRegistrationListGet( + public Slice projectRegistrationListGet( @PathVariable Long projectId, @RequestParam(required = false) Long lastRegistrationId, @RequestParam(defaultValue = "10") int pageSize) { diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 4608be5b..791a12e2 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -9,6 +9,7 @@ import com.amcamp.domain.project.dto.response.ProjectInfoResponse; import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegisterDetailResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; @@ -159,7 +160,7 @@ public ProjectRegistrationInfoResponse getProjectRegistration( } @Transactional(readOnly = true) - public Slice getProjectRegistrationList( + public Slice getProjectRegistrationList( Long projectId, Long lastRegistrationId, int pageSize) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java index 0f125c4a..c44cec00 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryCustom.java @@ -1,9 +1,9 @@ package com.amcamp.domain.project.dao; -import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegisterDetailResponse; import org.springframework.data.domain.Slice; public interface ProjectRegistrationRepositoryCustom { - Slice findAllByProjectIdWithPagination( + Slice findAllByProjectIdWithPagination( Long projectId, Long lastRegistrationId, int pageSize); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java index 93aa43bf..86cce572 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepositoryImpl.java @@ -1,9 +1,9 @@ package com.amcamp.domain.project.dao; -import static com.amcamp.domain.project.domain.QProject.project; +import static com.amcamp.domain.member.domain.QMember.member; import static com.amcamp.domain.project.domain.QProjectRegistration.projectRegistration; -import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegisterDetailResponse; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.jpa.impl.JPAQueryFactory; @@ -19,21 +19,23 @@ public class ProjectRegistrationRepositoryImpl implements ProjectRegistrationRep private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllByProjectIdWithPagination( + public Slice findAllByProjectIdWithPagination( Long projectId, Long lastRegistrationId, int pageSize) { - List responses = + List responses = jpaQueryFactory .select( Projections.constructor( - ProjectRegistrationInfoResponse.class, + ProjectRegisterDetailResponse.class, projectRegistration.project.id, projectRegistration.id, projectRegistration.requester.id, + member.nickname, + member.profileImageUrl, projectRegistration.requestStatus)) .from(projectRegistration) - .leftJoin(project) - .on(projectRegistration.project.eq(project)) + .leftJoin(member) + .on(projectRegistration.requester.member.eq(member)) .where( projectRegistration.project.id.eq(projectId), lastProjectRegistrationCondition(lastRegistrationId)) @@ -50,8 +52,8 @@ private BooleanExpression lastProjectRegistrationCondition(Long projectRegistrat : projectRegistration.id.lt(projectRegistrationId); } - private Slice checkLastPage( - int pageSize, List results) { + private Slice checkLastPage( + int pageSize, List results) { boolean hasNext = false; if (results.size() > pageSize) { diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegisterDetailResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegisterDetailResponse.java new file mode 100644 index 00000000..084be2a2 --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectRegisterDetailResponse.java @@ -0,0 +1,26 @@ +package com.amcamp.domain.project.dto.response; + +import com.amcamp.domain.project.domain.ProjectRegistration; +import com.amcamp.domain.project.domain.ProjectRegistrationStatus; +import io.swagger.v3.oas.annotations.media.Schema; + +public record ProjectRegisterDetailResponse( + @Schema(description = "프로젝트 아이디", example = "1") Long projectId, + @Schema(description = "프로젝트 가입 요청 아이디", example = "1") Long registrationId, + @Schema(description = "프로젝트 가입 요청자 아이디", example = "1") Long requesterId, + @Schema(description = "프로젝트 가입 요청자 회원 닉네임", example = "최현태") String requesterNickname, + @Schema(description = "프로젝트 가입 요청자 회원 프로필 이미지", example = "presigend image ") + String requesterImageUrl, + @Schema(description = "프로젝트 가입 요청 진행 상태", example = "REQUEST_PENDING") + ProjectRegistrationStatus projectRegistrationStatus) { + + public static ProjectRegisterDetailResponse from(ProjectRegistration projectRegistration) { + return new ProjectRegisterDetailResponse( + projectRegistration.getProject().getId(), + projectRegistration.getId(), + projectRegistration.getRequester().getId(), + projectRegistration.getRequester().getMember().getNickname(), + projectRegistration.getRequester().getMember().getProfileImageUrl(), + projectRegistration.getRequestStatus()); + } +} diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 9995dad7..a86f7945 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -17,6 +17,7 @@ import com.amcamp.domain.project.dto.response.ProjectInfoResponse; import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; +import com.amcamp.domain.project.dto.response.ProjectRegisterDetailResponse; import com.amcamp.domain.project.dto.response.ProjectRegistrationInfoResponse; import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -506,11 +507,11 @@ class 프로젝트_가입_신청 { // then logout(); loginAs(memberAdmin); - Slice response = + Slice response = projectService.getProjectRegistrationList(1L, null, 10); List requesterIds = - response.stream().map(ProjectRegistrationInfoResponse::requesterId).toList(); + response.stream().map(ProjectRegisterDetailResponse::requesterId).toList(); assertThat(new HashSet<>(requesterIds)) .isEqualTo(Set.of(teamParticipant1.getId(), teamParticipant2.getId())); @@ -679,7 +680,7 @@ class 프로젝트_가입_신청 { loginAs(memberAdmin); projectService.getProjectRegistrationList(1L, null, 10).stream() - .map(ProjectRegistrationInfoResponse::registrationId) + .map(ProjectRegisterDetailResponse::registrationId) .forEach(i -> projectService.approveProjectRegistration(1L, i)); // then From 77a8c1d3955aa65ff5a4633c2a8f2361f96ed197 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:39:33 +0900 Subject: [PATCH 069/107] =?UTF-8?q?chore:=20=EA=B0=9C=EB=B0=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20ddl-auto=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20(#148)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 피드백 API security 설정 * chore: 개발 환경 ddl auto update로 변경 --- .../com/amcamp/global/config/security/WebSecurityConfig.java | 2 ++ src/main/resources/application-dev.yml | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index d3cfcca6..8b043693 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -45,6 +45,8 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws .permitAll() .requestMatchers("/**") .permitAll() + .requestMatchers("/feedbacks/**") + .authenticated() .anyRequest() .authenticated()); diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index 07476c55..516b2490 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -4,4 +4,4 @@ spring: on-profile: "dev" jpa: hibernate: - ddl-auto: create + ddl-auto: update From 0f162435552b4defa96b49b7cdebc0db62bc3386 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 25 Mar 2025 16:39:44 +0900 Subject: [PATCH 070/107] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=EC=97=90=EC=84=9C=20=EB=82=98=EA=B0=84=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90(Unknown)=EC=97=90=EA=B2=8C=20=ED=94=BC?= =?UTF-8?q?=EB=93=9C=EB=B0=B1=20=EC=A0=84=EC=86=A1=EC=9D=B4=20=EB=B6=88?= =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#150)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: 피드백 API security 설정 * fix: 프로젝트에서 나간 사용자(Unknown)에게 피드백 전송이 불가능하도록 수정 * test: Unknown 사용자에게 피드백 전송 시 예외 발생 테스트 * test: 피드백 전송 테스트 코드 수정 --- .../feedback/application/FeedbackService.java | 8 +++++ .../config/security/WebSecurityConfig.java | 2 ++ .../errorcode/FeedbackErrorCode.java | 2 ++ .../application/FeedbackServiceTest.java | 36 +++++++++++++++++++ 4 files changed, 48 insertions(+) diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java index 4b69cb4a..0136a2e4 100644 --- a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -56,6 +56,7 @@ public void sendFeedback(FeedbackSendRequest request) { // 피드백을 받을 대상 final ProjectParticipant receiver = findReceiver(request.receiverId()); + validateUnknownUser(receiver); validateSenderIsNotReceiver(sender, receiver); validateDuplicateFeedback(sender, receiver, sprint); @@ -157,4 +158,11 @@ private ProjectParticipant validateProjectParticipant(Member member, Project pro .orElseThrow( () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED)); } + + private void validateUnknownUser(ProjectParticipant participant) { + if (participant.getProjectNickname().equals("UNKNOWN_PROJECT_NICKNAME") + && participant.getProjectProfile().equals("UNKNOWN_PROJECT_PROFILE_URL")) { + throw new CommonException(FeedbackErrorCode.PARTICIPANT_IS_UNKNOWN); + } + } } diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 8b043693..490e6f7e 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -43,6 +43,8 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws auth -> auth.requestMatchers("/devfit-actuator/**") .permitAll() + .requestMatchers("/feedbacks/**") + .authenticated() .requestMatchers("/**") .permitAll() .requestMatchers("/feedbacks/**") diff --git a/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java index 43d8b1b5..3b0c1d72 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/FeedbackErrorCode.java @@ -17,6 +17,8 @@ public enum FeedbackErrorCode implements BaseErrorCode { FEEDBACK_DUE_DATE_ONLY(HttpStatus.BAD_REQUEST, "스프린트 마감 당일에만 피드백을 전송할 수 있습니다."), FEEDBACK_NOT_EXISTS(HttpStatus.NOT_FOUND, "해당 스프린트에서 받은 피드백이 존재하지 않습니다."), + + PARTICIPANT_IS_UNKNOWN(HttpStatus.BAD_REQUEST, "프로젝트에서 나간 사용자에게는 피드백을 전송할 수 없습니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java index 185f0d18..cd119627 100644 --- a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java +++ b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java @@ -53,8 +53,10 @@ public class FeedbackServiceTest extends IntegrationTest { @Autowired private ProjectParticipantRepository projectParticipantRepository; private ProjectParticipant sender; + private ProjectParticipant anotherSender; private ProjectParticipant receiver; private ProjectParticipant anotherReceiver; + private ProjectParticipant unknownReceiver; private Sprint sprint; private Sprint anotherSprint; private Project project; @@ -125,6 +127,24 @@ void setUp() { "test", ProjectParticipantRole.ADMIN)); + anotherSender = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUser, + anotherProject, + "test", + "test", + ProjectParticipantRole.ADMIN)); + + unknownReceiver = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUser, + anotherProject, + "UNKNOWN_PROJECT_NICKNAME", + "UNKNOWN_PROJECT_PROFILE_URL", + ProjectParticipantRole.MEMBER)); + sprint = sprintRepository.save( Sprint.createSprint(project, "testSprint", "testGoal", LocalDate.now())); @@ -240,6 +260,22 @@ class 피드백_메시지를_전송할_때 { .isInstanceOf(CommonException.class) .hasMessage(FeedbackErrorCode.FEEDBACK_DUE_DATE_ONLY.getMessage()); } + + @Test + void 프로젝트에서_나간_사용자에게_피드백_메시지를_전송하면_예외가_발생한다() { + // given + // 로그인한 사용자를 project(2)에 참여중인 anotherSender로 변경 + setAuthenticatedUser(anotherSender.getTeamParticipant().getMember()); + + FeedbackSendRequest request = + new FeedbackSendRequest( + sprint.getId(), unknownReceiver.getId(), feedbackMessage); + + // when & then + assertThatThrownBy(() -> feedbackService.sendFeedback(request)) + .isInstanceOf(CommonException.class) + .hasMessage(FeedbackErrorCode.PARTICIPANT_IS_UNKNOWN.getMessage()); + } } @Nested From 91aa0ed7b83ec6bfa194e649a18fcb157c6b8d94 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 26 Mar 2025 22:57:16 +0900 Subject: [PATCH 071/107] =?UTF-8?q?fix:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=EB=A7=88=EA=B0=90?= =?UTF-8?q?=EC=9D=BC=EC=9D=84=20=EB=8B=A4=EC=9D=8C=20=EC=8A=A4=ED=94=84?= =?UTF-8?q?=EB=A6=B0=ED=8A=B8=20=EC=8B=9C=EC=9E=91=EC=9D=BC=20=EC=9D=B4?= =?UTF-8?q?=ED=9B=84=EB=A1=9C=20=EC=84=A4=EC=A0=95=ED=95=A0=20=EC=88=98=20?= =?UTF-8?q?=EC=97=86=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95=20(#153)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 스프린트 일정 수정 요청 시 마감일이 다음 스프린트 시작일 이후면 예외 발생하도록 검증 추가 * test: 스프린트 일정 수정 시 마감일 검증 테스트 추가 --- .../sprint/application/SprintService.java | 13 ++++++++++ .../domain/sprint/dao/SprintRepository.java | 12 ++++++++++ .../exception/errorcode/SprintErrorCode.java | 1 + .../sprint/application/SprintServiceTest.java | 24 ++++++++++++++----- 4 files changed, 44 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index f30a6588..86f8962f 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -22,6 +22,7 @@ import com.amcamp.global.util.MemberUtil; import java.time.LocalDate; import java.util.List; +import java.util.Optional; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Slice; import org.springframework.stereotype.Service; @@ -78,6 +79,7 @@ public SprintInfoResponse updateSprintToDoInfo(Long sprintId, SprintToDoUpdateRe sprint.getProject(), sprint.getProject().getTeam(), currentMember); validateSprintDueDate(request.dueDt(), sprint.getProject().getToDoInfo().getDueDt()); + validateDueDtIfNextSprintExists(sprint.getProject(), request.dueDt(), sprintId); sprint.updateSprintToDo(request.dueDt(), request.status()); @@ -172,4 +174,15 @@ private void validatePreviousSprintEnded(Project project) { throw new CommonException(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED); }); } + + private void validateDueDtIfNextSprintExists(Project project, LocalDate dueDt, Long sprintId) { + Optional nextSprint = + sprintRepository.findNextSprintAfterDueDate(project.getId(), dueDt, sprintId); + + if (nextSprint.isPresent()) { + if (!dueDt.isBefore(nextSprint.get().getToDoInfo().getStartDt())) { + throw new CommonException(SprintErrorCode.NEXT_SPRINT_ALREADY_EXISTS); + } + } + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index f23530b5..20525b55 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -2,6 +2,7 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.sprint.domain.Sprint; +import java.time.LocalDate; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; @@ -16,4 +17,15 @@ public interface SprintRepository extends JpaRepository, SprintRep List findAllByProjectOrderByCreatedAt(@Param("project") Project project); Optional findTopByProjectOrderByCreatedDtDesc(Project project); + + @Query( + "SELECT s FROM Sprint s " + + "WHERE s.project.id = :projectId " + + "AND s.toDoInfo.dueDt > :currentDueDate " + + "AND s.id != :currentSprintId " + + "ORDER BY s.toDoInfo.dueDt ASC") + Optional findNextSprintAfterDueDate( + @Param("projectId") Long projectId, + @Param("currentDueDate") LocalDate currentDueDate, + @Param("currentSprintId") Long currentSprintId); } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index 831ece7f..e9765731 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -14,6 +14,7 @@ public enum SprintErrorCode implements BaseErrorCode { SPRINT_DUE_DATE_INVALID(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), PREVIOUS_SPRINT_NOT_ENDED(HttpStatus.BAD_REQUEST, "이전 스프린트가 아직 종료되지 않았습니다."), + NEXT_SPRINT_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, "다음 스프린트가 존재할 경우, 마감일은 그 이전이어야 합니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 0adb05c8..35a1e5f6 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -20,8 +20,6 @@ import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; -import com.amcamp.domain.task.application.TaskService; -import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -48,14 +46,12 @@ public class SprintServiceTest extends IntegrationTest { private final LocalDate dueDt = LocalDate.of(2026, 3, 1); @Autowired private SprintService sprintService; - @Autowired private TaskService taskService; @Autowired private SprintRepository sprintRepository; @Autowired private MemberRepository memberRepository; @Autowired private TeamRepository teamRepository; @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private ProjectRepository projectRepository; @Autowired private ProjectParticipantRepository projectParticipantRepository; - @Autowired private TaskRepository taskRepository; private Project project; private Member newMember; @@ -202,7 +198,7 @@ class 스프린트_수정할_때 { SprintToDoUpdateRequest request = new SprintToDoUpdateRequest(LocalDate.of(2030, 1, 1), null); - // when + // when & then assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_INVALID.getMessage()); @@ -216,11 +212,27 @@ class 스프린트_수정할_때 { SprintToDoUpdateRequest request = new SprintToDoUpdateRequest(LocalDate.of(2024, 1, 1), null); - // when + // when & then assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) .isInstanceOf(CommonException.class) .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); } + + @Test + void 다음_스프린트의_시작일_이전에_마감일을_설정하면_예외가_발생한다() { + // given + sprintRepository.save( + Sprint.createSprint(project, "sprint 1", "sprint 1", LocalDate.now())); + sprintRepository.save(Sprint.createSprint(project, "sprint 2", "sprint 2", dueDt)); + + SprintToDoUpdateRequest request = + new SprintToDoUpdateRequest(LocalDate.of(2026, 1, 1), null); + + // when & then + assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.NEXT_SPRINT_ALREADY_EXISTS.getMessage()); + } } @Nested From e2e0ba4db913990b7db552035eb6cb3b90ac5690 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Thu, 27 Mar 2025 13:50:48 +0900 Subject: [PATCH 072/107] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=EC=99=80=20=ED=83=9C=EC=8A=A4=ED=81=AC=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20=20(#152)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 프로젝트 내 스프린트&태스크 목록 조회 기능 구현 * feat: 스프린트 기본 정보 조회 기능 구현 * feat: 회원별 스프린트 목록 조회 기능 구현 * fix: task response에 sos status 추가 * fix: task response 내 스프린트 아이디 필드 삭제 * fix: 메소드명 수정 --- .../domain/sprint/api/SprintController.java | 13 +- .../sprint/application/SprintService.java | 24 +++- .../sprint/dao/SprintRepositoryCustom.java | 8 +- .../sprint/dao/SprintRepositoryImpl.java | 115 ++++++++++++++++-- .../dto/response/SprintDetailResponse.java | 18 +++ .../domain/task/api/TaskController.java | 1 + .../dto/response/TaskBasicInfoResponse.java | 11 ++ .../sprint/application/SprintServiceTest.java | 105 +++++++++++++++- 8 files changed, 276 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java create mode 100644 src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 1be6258b..7757cda1 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -4,6 +4,7 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -52,9 +53,15 @@ public ResponseEntity sprintDelete(@PathVariable Long sprintId) { return ResponseEntity.status(HttpStatus.OK).build(); } + @Operation(summary = "스프린트 상세 조회", description = "스프린트 기본 정보를 조회합니다.") + @GetMapping("/{sprintId}") + public SprintInfoResponse sprintFind(@PathVariable Long sprintId) { + return sprintService.findSprint(sprintId); + } + @Operation(summary = "프로젝트별 스프린트 목록 조회", description = "특정 프로젝트의 스프린트 목록을 조회합니다.") - @GetMapping("/{projectId}") - public Slice sprintFindAll( + @GetMapping("/{projectId}/project") + public Slice sprintFindAll( @PathVariable Long projectId, @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) @@ -64,7 +71,7 @@ public Slice sprintFindAll( @Operation(summary = "회원별 프로젝트 내 스프린트 목록 조회", description = "마이페이지에서 특정 프로젝트의 스프린트 목록을 조회합니다.") @GetMapping("/{projectId}/me") - public Slice sprintFindAllByMember( + public Slice sprintFindAllByMember( @PathVariable Long projectId, @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index 86f8962f..19050601 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -11,6 +11,7 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.domain.Team; @@ -106,7 +107,20 @@ public void deleteSprint(Long sprintId) { } @Transactional(readOnly = true) - public Slice findAllSprint(Long projectId, Long lastSprintId) { + public SprintInfoResponse findSprint(Long sprintId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + final Project project = findByProjectId(sprint.getProject().getId()); + + teamParticipantRepository + .findByMemberAndTeam(currentMember, project.getTeam()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return SprintInfoResponse.from(sprint); + } + + @Transactional(readOnly = true) + public Slice findAllSprint(Long projectId, Long lastSprintId) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); @@ -118,13 +132,15 @@ public Slice findAllSprint(Long projectId, Long lastSprintId } @Transactional(readOnly = true) - public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { + public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); - validateProjectParticipant(project, project.getTeam(), currentMember); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); - return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); + return sprintRepository.findAllSprintByProjectIdAndAssignee( + projectId, lastSprintId, participant); } private Sprint findBySprintId(Long sprintId) { diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java index dd306771..89a6aa1e 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java @@ -1,8 +1,12 @@ package com.amcamp.domain.sprint.dao; -import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import org.springframework.data.domain.Slice; public interface SprintRepositoryCustom { - Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); + Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); + + Slice findAllSprintByProjectIdAndAssignee( + Long projectId, Long lastSprintId, ProjectParticipant participant); } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index a9d4988b..5594ef9c 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -1,14 +1,20 @@ package com.amcamp.domain.sprint.dao; import static com.amcamp.domain.sprint.domain.QSprint.sprint; +import static com.amcamp.domain.task.domain.QTask.task; -import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; @@ -22,19 +28,20 @@ public class SprintRepositoryImpl implements SprintRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { - List results = + public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { + List results = jpaQueryFactory .select( Projections.constructor( - SprintInfoResponse.class, + SprintDetailResponse.class, sprint.id, sprint.title, sprint.goal, sprint.toDoInfo.startDt, sprint.toDoInfo.dueDt, sprint.toDoInfo.toDoStatus, - sprint.progress.intValue())) + sprint.progress.intValue(), + Expressions.constant(Collections.emptyList()))) .from(sprint) .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) .orderBy(sprint.title.asc()) @@ -45,18 +52,79 @@ public Slice findAllSprintByProjectId(Long projectId, Long l throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); } - return checkLastPage(results); + List taskList = fetchTaskList(results.get(0).id()); + + List finalResult = + results.stream() + .map( + sprint -> + new SprintDetailResponse( + sprint.id(), + sprint.title(), + sprint.goal(), + sprint.startDt(), + sprint.dueDt(), + sprint.status(), + sprint.progress(), + taskList)) + .collect(Collectors.toList()); + return checkLastPage(finalResult); + } + + @Override + public Slice findAllSprintByProjectIdAndAssignee( + Long projectId, Long lastSprintId, ProjectParticipant participant) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + SprintDetailResponse.class, + sprint.id, + sprint.title, + sprint.goal, + sprint.toDoInfo.startDt, + sprint.toDoInfo.dueDt, + sprint.toDoInfo.toDoStatus, + sprint.progress.intValue(), + Expressions.constant(Collections.emptyList()))) + .from(sprint) + .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) + .orderBy(sprint.title.asc()) + .limit(2) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); + } + + List taskList = + fetchTaskListByAssignee(results.get(0).id(), participant); + + List finalResult = + results.stream() + .map( + sprint -> + new SprintDetailResponse( + sprint.id(), + sprint.title(), + sprint.goal(), + sprint.startDt(), + sprint.dueDt(), + sprint.status(), + sprint.progress(), + taskList)) + .collect(Collectors.toList()); + return checkLastPage(finalResult); } private BooleanExpression lastSprintId(Long sprintId) { if (sprintId == null) { return null; } - return sprint.id.gt(sprintId); } - private Slice checkLastPage(List results) { + private Slice checkLastPage(List results) { boolean hasNext = false; if (results.size() > 1) { @@ -66,4 +134,35 @@ private Slice checkLastPage(List results return new SliceImpl<>(results, PageRequest.of(0, 1), hasNext); } + + private List fetchTaskList(Long sprintId) { + return jpaQueryFactory + .select( + Projections.constructor( + TaskBasicInfoResponse.class, + task.id, + task.description, + task.taskStatus, + task.sosStatus)) + .from(task) + .where(task.sprint.id.eq(sprintId)) + .orderBy(task.id.asc()) + .fetch(); + } + + private List fetchTaskListByAssignee( + Long sprintId, ProjectParticipant participant) { + return jpaQueryFactory + .select( + Projections.constructor( + TaskBasicInfoResponse.class, + task.id, + task.description, + task.taskStatus, + task.sosStatus)) + .from(task) + .where(task.sprint.id.eq(sprintId), task.assignee.eq(participant)) + .orderBy(task.id.asc()) + .fetch(); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java new file mode 100644 index 00000000..ccb25f52 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java @@ -0,0 +1,18 @@ +package com.amcamp.domain.sprint.dto.response; + +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.util.List; + +public record SprintDetailResponse( + @Schema(description = "스프린트 ID", example = "1") Long id, + @Schema(description = "스프린트 제목", example = "1차 스프린트") String title, + @Schema(description = "중간 목표", example = "MVP 개발") String goal, + @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, + @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, + @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, + @Schema(description = "스프린트 진척도", defaultValue = "0") Integer progress, + @Schema(description = "태스크 목록", defaultValue = "{}") + List taskList) {} diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index 5331fc45..c9b12cd6 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -70,6 +70,7 @@ public Slice taskList( return taskService.getTasksBySprint(sprintId, lastTaskId, size); } + @Deprecated @Operation( summary = "마이 페이지 내 스프린트별 태스크 조회", description = "멤버에 할당된 태스크를 스프린트 아이디값에 따라 불러 옵니다.") diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java new file mode 100644 index 00000000..1690b471 --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.task.dto.response; + +import com.amcamp.domain.task.domain.SOSStatus; +import com.amcamp.domain.task.domain.TaskStatus; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TaskBasicInfoResponse( + @Schema(description = "태스크 아이디", example = "1") Long taskId, + @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") String description, + @Schema(description = "태스크 진행 현황", example = "ON_GOING") TaskStatus taskStatus, + @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus) {} diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 35a1e5f6..e535e086 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -19,7 +19,13 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.task.application.TaskService; +import com.amcamp.domain.task.dao.TaskRepository; +import com.amcamp.domain.task.domain.Task; +import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.domain.TaskStatus; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -29,6 +35,7 @@ import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.exception.errorcode.TaskErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; import java.util.List; @@ -40,6 +47,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.transaction.annotation.Transactional; public class SprintServiceTest extends IntegrationTest { @@ -52,6 +60,7 @@ public class SprintServiceTest extends IntegrationTest { @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private ProjectRepository projectRepository; @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private TaskRepository taskRepository; private Project project; private Member newMember; @@ -260,6 +269,32 @@ class 스프린트_삭제할_때 { } } + @Nested + class 스프린트_기본정보를_조회할_떄 { + @Test + void 스프린트가_존재하지_않으면_예외가_발생한다() { + // when & then + assertThatThrownBy(() -> sprintService.deleteSprint(2L)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 스프린트_기본_정보를_조회한다() { + // given + List sprintList = + List.of( + Sprint.createSprint(project, "1", "testDescription1", dueDt), + Sprint.createSprint(project, "2", "testDescription2", dueDt), + Sprint.createSprint(project, "3", "testDescription3", dueDt)); + sprintRepository.saveAll(sprintList); + + SprintInfoResponse response = sprintService.findSprint(1L); + + assertThat(response.goal()).isEqualTo("testDescription1"); + } + } + @Nested class 프로젝트별_스프린트_목록을_조회할_때 { @Test @@ -271,6 +306,7 @@ class 프로젝트별_스프린트_목록을_조회할_때 { } @Test + @Transactional void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = @@ -280,14 +316,46 @@ class 프로젝트별_스프린트_목록을_조회할_때 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); + Sprint sprint = + sprintRepository + .findById(1L) + .orElseThrow( + () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + ProjectParticipant participant = + projectParticipantRepository + .findById(1L) + .orElseThrow( + () -> + new CommonException( + ProjectErrorCode + .PROJECT_PARTICIPATION_REQUIRED)); + + task.assignTask(participant); + task.updateTaskStatus(); + // when - Slice results = sprintService.findAllSprint(project.getId(), null); + Slice results = + sprintService.findAllSprint(project.getId(), null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + + assertThat(results.getContent().get(0).taskList().get(0).description()) + .isEqualTo(task.getDescription()); + assertThat(results.getContent().get(0).taskList().size()).isEqualTo(2); + assertThat(results.getContent().get(0).taskList().get(0).taskStatus()) + .isEqualTo(TaskStatus.COMPLETED); } } @@ -305,6 +373,7 @@ class 회원별_스프린트_목록을_조회할_떄 { } @Test + @Transactional void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = @@ -314,15 +383,47 @@ class 회원별_스프린트_목록을_조회할_떄 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); + Sprint sprint = + sprintRepository + .findById(1L) + .orElseThrow( + () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); + + Task task = + taskRepository + .findById(2L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + ProjectParticipant participant = + projectParticipantRepository + .findById(1L) + .orElseThrow( + () -> + new CommonException( + ProjectErrorCode + .PROJECT_PARTICIPATION_REQUIRED)); + + task.assignTask(participant); + task.updateTaskStatus(); + // when - Slice results = sprintService.findAllSprint(project.getId(), null); + Slice results = + sprintService.findAllSprintByMember(project.getId(), null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + + assertThat(results.getContent().get(0).taskList().get(0).description()) + .isEqualTo(task.getDescription()); + assertThat(results.getContent().get(0).taskList().size()).isEqualTo(1); + assertThat(results.getContent().get(0).progress()).isInstanceOf(Integer.class); + // assertThat(results.getContent().get(0).progress()).isEqualTo(50); } } } From 57e8da8fe85896c9a32f5dcef9ed9fba1752a030 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 2 Apr 2025 23:36:00 +0900 Subject: [PATCH 073/107] =?UTF-8?q?Revert=20"feat:=20=EC=8A=A4=ED=94=84?= =?UTF-8?q?=EB=A6=B0=ED=8A=B8=EC=99=80=20=ED=83=9C=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20?= =?UTF-8?q?=20(#152)"=20(#154)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit e2e0ba4db913990b7db552035eb6cb3b90ac5690. --- .../domain/sprint/api/SprintController.java | 13 +- .../sprint/application/SprintService.java | 24 +--- .../sprint/dao/SprintRepositoryCustom.java | 8 +- .../sprint/dao/SprintRepositoryImpl.java | 115 ++---------------- .../dto/response/SprintDetailResponse.java | 18 --- .../domain/task/api/TaskController.java | 1 - .../dto/response/TaskBasicInfoResponse.java | 11 -- .../sprint/application/SprintServiceTest.java | 105 +--------------- 8 files changed, 19 insertions(+), 276 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java delete mode 100644 src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 7757cda1..1be6258b 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -4,7 +4,6 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; -import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -53,15 +52,9 @@ public ResponseEntity sprintDelete(@PathVariable Long sprintId) { return ResponseEntity.status(HttpStatus.OK).build(); } - @Operation(summary = "스프린트 상세 조회", description = "스프린트 기본 정보를 조회합니다.") - @GetMapping("/{sprintId}") - public SprintInfoResponse sprintFind(@PathVariable Long sprintId) { - return sprintService.findSprint(sprintId); - } - @Operation(summary = "프로젝트별 스프린트 목록 조회", description = "특정 프로젝트의 스프린트 목록을 조회합니다.") - @GetMapping("/{projectId}/project") - public Slice sprintFindAll( + @GetMapping("/{projectId}") + public Slice sprintFindAll( @PathVariable Long projectId, @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) @@ -71,7 +64,7 @@ public Slice sprintFindAll( @Operation(summary = "회원별 프로젝트 내 스프린트 목록 조회", description = "마이페이지에서 특정 프로젝트의 스프린트 목록을 조회합니다.") @GetMapping("/{projectId}/me") - public Slice sprintFindAllByMember( + public Slice sprintFindAllByMember( @PathVariable Long projectId, @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index 19050601..86f8962f 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -11,7 +11,6 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; -import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.domain.Team; @@ -107,20 +106,7 @@ public void deleteSprint(Long sprintId) { } @Transactional(readOnly = true) - public SprintInfoResponse findSprint(Long sprintId) { - final Member currentMember = memberUtil.getCurrentMember(); - final Sprint sprint = findBySprintId(sprintId); - final Project project = findByProjectId(sprint.getProject().getId()); - - teamParticipantRepository - .findByMemberAndTeam(currentMember, project.getTeam()) - .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); - - return SprintInfoResponse.from(sprint); - } - - @Transactional(readOnly = true) - public Slice findAllSprint(Long projectId, Long lastSprintId) { + public Slice findAllSprint(Long projectId, Long lastSprintId) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); @@ -132,15 +118,13 @@ public Slice findAllSprint(Long projectId, Long lastSprint } @Transactional(readOnly = true) - public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { + public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); - ProjectParticipant participant = - validateProjectParticipant(project, project.getTeam(), currentMember); + validateProjectParticipant(project, project.getTeam(), currentMember); - return sprintRepository.findAllSprintByProjectIdAndAssignee( - projectId, lastSprintId, participant); + return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); } private Sprint findBySprintId(Long sprintId) { diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java index 89a6aa1e..dd306771 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java @@ -1,12 +1,8 @@ package com.amcamp.domain.sprint.dao; -import com.amcamp.domain.project.domain.ProjectParticipant; -import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import org.springframework.data.domain.Slice; public interface SprintRepositoryCustom { - Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); - - Slice findAllSprintByProjectIdAndAssignee( - Long projectId, Long lastSprintId, ProjectParticipant participant); + Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index 5594ef9c..a9d4988b 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -1,20 +1,14 @@ package com.amcamp.domain.sprint.dao; import static com.amcamp.domain.sprint.domain.QSprint.sprint; -import static com.amcamp.domain.task.domain.QTask.task; -import com.amcamp.domain.project.domain.ProjectParticipant; -import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; -import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; +import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; -import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.impl.JPAQueryFactory; -import java.util.Collections; import java.util.List; -import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; @@ -28,20 +22,19 @@ public class SprintRepositoryImpl implements SprintRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { - List results = + public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { + List results = jpaQueryFactory .select( Projections.constructor( - SprintDetailResponse.class, + SprintInfoResponse.class, sprint.id, sprint.title, sprint.goal, sprint.toDoInfo.startDt, sprint.toDoInfo.dueDt, sprint.toDoInfo.toDoStatus, - sprint.progress.intValue(), - Expressions.constant(Collections.emptyList()))) + sprint.progress.intValue())) .from(sprint) .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) .orderBy(sprint.title.asc()) @@ -52,79 +45,18 @@ public Slice findAllSprintByProjectId(Long projectId, Long throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); } - List taskList = fetchTaskList(results.get(0).id()); - - List finalResult = - results.stream() - .map( - sprint -> - new SprintDetailResponse( - sprint.id(), - sprint.title(), - sprint.goal(), - sprint.startDt(), - sprint.dueDt(), - sprint.status(), - sprint.progress(), - taskList)) - .collect(Collectors.toList()); - return checkLastPage(finalResult); - } - - @Override - public Slice findAllSprintByProjectIdAndAssignee( - Long projectId, Long lastSprintId, ProjectParticipant participant) { - List results = - jpaQueryFactory - .select( - Projections.constructor( - SprintDetailResponse.class, - sprint.id, - sprint.title, - sprint.goal, - sprint.toDoInfo.startDt, - sprint.toDoInfo.dueDt, - sprint.toDoInfo.toDoStatus, - sprint.progress.intValue(), - Expressions.constant(Collections.emptyList()))) - .from(sprint) - .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) - .orderBy(sprint.title.asc()) - .limit(2) - .fetch(); - - if (results.isEmpty()) { - throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); - } - - List taskList = - fetchTaskListByAssignee(results.get(0).id(), participant); - - List finalResult = - results.stream() - .map( - sprint -> - new SprintDetailResponse( - sprint.id(), - sprint.title(), - sprint.goal(), - sprint.startDt(), - sprint.dueDt(), - sprint.status(), - sprint.progress(), - taskList)) - .collect(Collectors.toList()); - return checkLastPage(finalResult); + return checkLastPage(results); } private BooleanExpression lastSprintId(Long sprintId) { if (sprintId == null) { return null; } + return sprint.id.gt(sprintId); } - private Slice checkLastPage(List results) { + private Slice checkLastPage(List results) { boolean hasNext = false; if (results.size() > 1) { @@ -134,35 +66,4 @@ private Slice checkLastPage(List res return new SliceImpl<>(results, PageRequest.of(0, 1), hasNext); } - - private List fetchTaskList(Long sprintId) { - return jpaQueryFactory - .select( - Projections.constructor( - TaskBasicInfoResponse.class, - task.id, - task.description, - task.taskStatus, - task.sosStatus)) - .from(task) - .where(task.sprint.id.eq(sprintId)) - .orderBy(task.id.asc()) - .fetch(); - } - - private List fetchTaskListByAssignee( - Long sprintId, ProjectParticipant participant) { - return jpaQueryFactory - .select( - Projections.constructor( - TaskBasicInfoResponse.class, - task.id, - task.description, - task.taskStatus, - task.sosStatus)) - .from(task) - .where(task.sprint.id.eq(sprintId), task.assignee.eq(participant)) - .orderBy(task.id.asc()) - .fetch(); - } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java deleted file mode 100644 index ccb25f52..00000000 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.amcamp.domain.sprint.dto.response; - -import com.amcamp.domain.project.domain.ToDoStatus; -import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; -import io.swagger.v3.oas.annotations.media.Schema; -import java.time.LocalDate; -import java.util.List; - -public record SprintDetailResponse( - @Schema(description = "스프린트 ID", example = "1") Long id, - @Schema(description = "스프린트 제목", example = "1차 스프린트") String title, - @Schema(description = "중간 목표", example = "MVP 개발") String goal, - @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, - @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, - @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, - @Schema(description = "스프린트 진척도", defaultValue = "0") Integer progress, - @Schema(description = "태스크 목록", defaultValue = "{}") - List taskList) {} diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index c9b12cd6..5331fc45 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -70,7 +70,6 @@ public Slice taskList( return taskService.getTasksBySprint(sprintId, lastTaskId, size); } - @Deprecated @Operation( summary = "마이 페이지 내 스프린트별 태스크 조회", description = "멤버에 할당된 태스크를 스프린트 아이디값에 따라 불러 옵니다.") diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java deleted file mode 100644 index 1690b471..00000000 --- a/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.amcamp.domain.task.dto.response; - -import com.amcamp.domain.task.domain.SOSStatus; -import com.amcamp.domain.task.domain.TaskStatus; -import io.swagger.v3.oas.annotations.media.Schema; - -public record TaskBasicInfoResponse( - @Schema(description = "태스크 아이디", example = "1") Long taskId, - @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") String description, - @Schema(description = "태스크 진행 현황", example = "ON_GOING") TaskStatus taskStatus, - @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus) {} diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index e535e086..35a1e5f6 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -19,13 +19,7 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; -import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; -import com.amcamp.domain.task.application.TaskService; -import com.amcamp.domain.task.dao.TaskRepository; -import com.amcamp.domain.task.domain.Task; -import com.amcamp.domain.task.domain.TaskDifficulty; -import com.amcamp.domain.task.domain.TaskStatus; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -35,7 +29,6 @@ import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; -import com.amcamp.global.exception.errorcode.TaskErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; import java.util.List; @@ -47,7 +40,6 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.transaction.annotation.Transactional; public class SprintServiceTest extends IntegrationTest { @@ -60,7 +52,6 @@ public class SprintServiceTest extends IntegrationTest { @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private ProjectRepository projectRepository; @Autowired private ProjectParticipantRepository projectParticipantRepository; - @Autowired private TaskRepository taskRepository; private Project project; private Member newMember; @@ -269,32 +260,6 @@ class 스프린트_삭제할_때 { } } - @Nested - class 스프린트_기본정보를_조회할_떄 { - @Test - void 스프린트가_존재하지_않으면_예외가_발생한다() { - // when & then - assertThatThrownBy(() -> sprintService.deleteSprint(2L)) - .isInstanceOf(CommonException.class) - .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); - } - - @Test - void 스프린트_기본_정보를_조회한다() { - // given - List sprintList = - List.of( - Sprint.createSprint(project, "1", "testDescription1", dueDt), - Sprint.createSprint(project, "2", "testDescription2", dueDt), - Sprint.createSprint(project, "3", "testDescription3", dueDt)); - sprintRepository.saveAll(sprintList); - - SprintInfoResponse response = sprintService.findSprint(1L); - - assertThat(response.goal()).isEqualTo("testDescription1"); - } - } - @Nested class 프로젝트별_스프린트_목록을_조회할_때 { @Test @@ -306,7 +271,6 @@ class 프로젝트별_스프린트_목록을_조회할_때 { } @Test - @Transactional void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = @@ -316,46 +280,14 @@ class 프로젝트별_스프린트_목록을_조회할_때 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); - Sprint sprint = - sprintRepository - .findById(1L) - .orElseThrow( - () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); - - taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); - taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); - - Task task = - taskRepository - .findById(1L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - ProjectParticipant participant = - projectParticipantRepository - .findById(1L) - .orElseThrow( - () -> - new CommonException( - ProjectErrorCode - .PROJECT_PARTICIPATION_REQUIRED)); - - task.assignTask(participant); - task.updateTaskStatus(); - // when - Slice results = - sprintService.findAllSprint(project.getId(), null); + Slice results = sprintService.findAllSprint(project.getId(), null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); - - assertThat(results.getContent().get(0).taskList().get(0).description()) - .isEqualTo(task.getDescription()); - assertThat(results.getContent().get(0).taskList().size()).isEqualTo(2); - assertThat(results.getContent().get(0).taskList().get(0).taskStatus()) - .isEqualTo(TaskStatus.COMPLETED); } } @@ -373,7 +305,6 @@ class 회원별_스프린트_목록을_조회할_떄 { } @Test - @Transactional void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = @@ -383,47 +314,15 @@ class 회원별_스프린트_목록을_조회할_떄 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); - Sprint sprint = - sprintRepository - .findById(1L) - .orElseThrow( - () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); - - taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); - taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); - - Task task = - taskRepository - .findById(2L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - ProjectParticipant participant = - projectParticipantRepository - .findById(1L) - .orElseThrow( - () -> - new CommonException( - ProjectErrorCode - .PROJECT_PARTICIPATION_REQUIRED)); - - task.assignTask(participant); - task.updateTaskStatus(); - // when - Slice results = - sprintService.findAllSprintByMember(project.getId(), null); + Slice results = sprintService.findAllSprint(project.getId(), null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); - - assertThat(results.getContent().get(0).taskList().get(0).description()) - .isEqualTo(task.getDescription()); - assertThat(results.getContent().get(0).taskList().size()).isEqualTo(1); - assertThat(results.getContent().get(0).progress()).isInstanceOf(Integer.class); - // assertThat(results.getContent().get(0).progress()).isEqualTo(50); } } } From 937abffd27e8a0a5067f0a254d62a01eee4e1c2d Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Thu, 3 Apr 2025 22:17:46 +0900 Subject: [PATCH 074/107] =?UTF-8?q?refactor:=20project=20=EC=82=AD?= =?UTF-8?q?=EC=A0=9C=20uri=20=EC=88=98=EC=A0=95=20(#158)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/amcamp/domain/project/api/ProjectController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index eecedd81..15f47d47 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -73,7 +73,7 @@ public ResponseEntity projectTodoInfoUpdate( // delete @Operation(summary = "프로젝트 삭제", description = "프로젝트를 삭제합니다.") - @DeleteMapping("/{projectId}/") + @DeleteMapping("/{projectId}") public ResponseEntity projectDelete(@PathVariable Long projectId) { projectService.deleteProject(projectId); return ResponseEntity.ok().build(); From 6fb15d4e96bec193c998069e49f5f994b8afcf6a Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Fri, 4 Apr 2025 10:54:00 +0900 Subject: [PATCH 075/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EA=B8=B0=EB=B3=B8=20=EC=A0=95=EB=B3=B4=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20Request=20Dto=EC=97=90=EC=84=9C=20goal=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=A0=9C=EA=B1=B0=20(#160)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 프로젝트 기본 정보 수정 Request Dto에서 goal 필드 제거 * test: Request Dto에서 goal 제거에 따른 테스트 코드 수정 --- .../request/ProjectBasicInfoUpdateRequest.java | 1 - .../amcamp/domain/project/ProjectServiceTest.java | 15 ++++++--------- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java index 3f812240..5b28970d 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java @@ -4,5 +4,4 @@ public record ProjectBasicInfoUpdateRequest( @Schema(description = "수정된 텍스트", example = "new project title") String title, - @Schema(description = "수정된 텍스트", example = "new project goal") String goal, @Schema(description = "수정된 텍스트", example = "new project description") String description) {} diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index a86f7945..7edf190c 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -284,7 +284,6 @@ class 프로젝트_업데이트 { String originalTitle = "originalProjectTitle"; String originalDescription = "originalProjectGoal"; String updatedTitle = "updatedProjectTitle"; - String updatedGoal = "updatedProjectGoal"; String updatedDescription = "updatedProjectDescription"; void createOriginalProject() { @@ -298,9 +297,7 @@ void createOriginalProject() { createOriginalProject(); // when projectService.updateProjectBasicInfo( - 1L, - new ProjectBasicInfoUpdateRequest( - updatedTitle, updatedGoal, updatedDescription)); + 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, updatedDescription)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); @@ -321,7 +318,7 @@ void createOriginalProject() { projectService.updateProjectBasicInfo( 1L, new ProjectBasicInfoUpdateRequest( - updatedTitle, updatedGoal, updatedDescription))) + updatedTitle, updatedDescription))) .isInstanceOf(CommonException.class) .hasMessageContaining(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @@ -341,7 +338,7 @@ void createOriginalProject() { projectService.updateProjectBasicInfo( 1L, new ProjectBasicInfoUpdateRequest( - updatedTitle, updatedGoal, updatedDescription))) + updatedTitle, updatedDescription))) .isInstanceOf(CommonException.class) .hasMessageContaining( ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); @@ -353,7 +350,7 @@ void createOriginalProject() { createOriginalProject(); // when projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, null, null)); + 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, null)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); @@ -366,7 +363,7 @@ void createOriginalProject() { createOriginalProject(); // when projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(null, updatedGoal, null)); + 1L, new ProjectBasicInfoUpdateRequest(null, null)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); @@ -379,7 +376,7 @@ void createOriginalProject() { createOriginalProject(); // when projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(null, null, updatedDescription)); + 1L, new ProjectBasicInfoUpdateRequest(null, updatedDescription)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); From 641f233291369b09ec48ab8a72a81d658278e6c6 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sat, 5 Apr 2025 14:41:17 +0900 Subject: [PATCH 076/107] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20&=20=ED=83=9C=EC=8A=A4=ED=81=AC=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84=20=20(#155)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 프로젝트 내 스프린트&태스크 목록 조회 기능 구현 * feat: 스프린트 기본 정보 조회 기능 구현 * feat: 회원별 스프린트 목록 조회 기능 구현 * fix: task response에 sos status 추가 * fix: task response 내 스프린트 아이디 필드 삭제 * fix: 메소드명 수정 * refactor: 코드 통합 중 충돌 해결 --- .../domain/sprint/api/SprintController.java | 13 +- .../sprint/application/SprintService.java | 24 +++- .../sprint/dao/SprintRepositoryCustom.java | 8 +- .../sprint/dao/SprintRepositoryImpl.java | 115 ++++++++++++++++-- .../dto/response/SprintDetailResponse.java | 18 +++ .../domain/task/api/TaskController.java | 1 + .../dto/response/TaskBasicInfoResponse.java | 11 ++ .../sprint/application/SprintServiceTest.java | 104 +++++++++++++++- 8 files changed, 275 insertions(+), 19 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java create mode 100644 src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 1be6258b..7757cda1 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -4,6 +4,7 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -52,9 +53,15 @@ public ResponseEntity sprintDelete(@PathVariable Long sprintId) { return ResponseEntity.status(HttpStatus.OK).build(); } + @Operation(summary = "스프린트 상세 조회", description = "스프린트 기본 정보를 조회합니다.") + @GetMapping("/{sprintId}") + public SprintInfoResponse sprintFind(@PathVariable Long sprintId) { + return sprintService.findSprint(sprintId); + } + @Operation(summary = "프로젝트별 스프린트 목록 조회", description = "특정 프로젝트의 스프린트 목록을 조회합니다.") - @GetMapping("/{projectId}") - public Slice sprintFindAll( + @GetMapping("/{projectId}/project") + public Slice sprintFindAll( @PathVariable Long projectId, @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) @@ -64,7 +71,7 @@ public Slice sprintFindAll( @Operation(summary = "회원별 프로젝트 내 스프린트 목록 조회", description = "마이페이지에서 특정 프로젝트의 스프린트 목록을 조회합니다.") @GetMapping("/{projectId}/me") - public Slice sprintFindAllByMember( + public Slice sprintFindAllByMember( @PathVariable Long projectId, @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index 86f8962f..19050601 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -11,6 +11,7 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.domain.Team; @@ -106,7 +107,20 @@ public void deleteSprint(Long sprintId) { } @Transactional(readOnly = true) - public Slice findAllSprint(Long projectId, Long lastSprintId) { + public SprintInfoResponse findSprint(Long sprintId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Sprint sprint = findBySprintId(sprintId); + final Project project = findByProjectId(sprint.getProject().getId()); + + teamParticipantRepository + .findByMemberAndTeam(currentMember, project.getTeam()) + .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); + + return SprintInfoResponse.from(sprint); + } + + @Transactional(readOnly = true) + public Slice findAllSprint(Long projectId, Long lastSprintId) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); @@ -118,13 +132,15 @@ public Slice findAllSprint(Long projectId, Long lastSprintId } @Transactional(readOnly = true) - public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { + public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); - validateProjectParticipant(project, project.getTeam(), currentMember); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); - return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); + return sprintRepository.findAllSprintByProjectIdAndAssignee( + projectId, lastSprintId, participant); } private Sprint findBySprintId(Long sprintId) { diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java index dd306771..89a6aa1e 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java @@ -1,8 +1,12 @@ package com.amcamp.domain.sprint.dao; -import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import org.springframework.data.domain.Slice; public interface SprintRepositoryCustom { - Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); + Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); + + Slice findAllSprintByProjectIdAndAssignee( + Long projectId, Long lastSprintId, ProjectParticipant participant); } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index a9d4988b..5594ef9c 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -1,14 +1,20 @@ package com.amcamp.domain.sprint.dao; import static com.amcamp.domain.sprint.domain.QSprint.sprint; +import static com.amcamp.domain.task.domain.QTask.task; -import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.Expressions; import com.querydsl.jpa.impl.JPAQueryFactory; +import java.util.Collections; import java.util.List; +import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.PageRequest; import org.springframework.data.domain.Slice; @@ -22,19 +28,20 @@ public class SprintRepositoryImpl implements SprintRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { - List results = + public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { + List results = jpaQueryFactory .select( Projections.constructor( - SprintInfoResponse.class, + SprintDetailResponse.class, sprint.id, sprint.title, sprint.goal, sprint.toDoInfo.startDt, sprint.toDoInfo.dueDt, sprint.toDoInfo.toDoStatus, - sprint.progress.intValue())) + sprint.progress.intValue(), + Expressions.constant(Collections.emptyList()))) .from(sprint) .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) .orderBy(sprint.title.asc()) @@ -45,18 +52,79 @@ public Slice findAllSprintByProjectId(Long projectId, Long l throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); } - return checkLastPage(results); + List taskList = fetchTaskList(results.get(0).id()); + + List finalResult = + results.stream() + .map( + sprint -> + new SprintDetailResponse( + sprint.id(), + sprint.title(), + sprint.goal(), + sprint.startDt(), + sprint.dueDt(), + sprint.status(), + sprint.progress(), + taskList)) + .collect(Collectors.toList()); + return checkLastPage(finalResult); + } + + @Override + public Slice findAllSprintByProjectIdAndAssignee( + Long projectId, Long lastSprintId, ProjectParticipant participant) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + SprintDetailResponse.class, + sprint.id, + sprint.title, + sprint.goal, + sprint.toDoInfo.startDt, + sprint.toDoInfo.dueDt, + sprint.toDoInfo.toDoStatus, + sprint.progress.intValue(), + Expressions.constant(Collections.emptyList()))) + .from(sprint) + .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) + .orderBy(sprint.title.asc()) + .limit(2) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); + } + + List taskList = + fetchTaskListByAssignee(results.get(0).id(), participant); + + List finalResult = + results.stream() + .map( + sprint -> + new SprintDetailResponse( + sprint.id(), + sprint.title(), + sprint.goal(), + sprint.startDt(), + sprint.dueDt(), + sprint.status(), + sprint.progress(), + taskList)) + .collect(Collectors.toList()); + return checkLastPage(finalResult); } private BooleanExpression lastSprintId(Long sprintId) { if (sprintId == null) { return null; } - return sprint.id.gt(sprintId); } - private Slice checkLastPage(List results) { + private Slice checkLastPage(List results) { boolean hasNext = false; if (results.size() > 1) { @@ -66,4 +134,35 @@ private Slice checkLastPage(List results return new SliceImpl<>(results, PageRequest.of(0, 1), hasNext); } + + private List fetchTaskList(Long sprintId) { + return jpaQueryFactory + .select( + Projections.constructor( + TaskBasicInfoResponse.class, + task.id, + task.description, + task.taskStatus, + task.sosStatus)) + .from(task) + .where(task.sprint.id.eq(sprintId)) + .orderBy(task.id.asc()) + .fetch(); + } + + private List fetchTaskListByAssignee( + Long sprintId, ProjectParticipant participant) { + return jpaQueryFactory + .select( + Projections.constructor( + TaskBasicInfoResponse.class, + task.id, + task.description, + task.taskStatus, + task.sosStatus)) + .from(task) + .where(task.sprint.id.eq(sprintId), task.assignee.eq(participant)) + .orderBy(task.id.asc()) + .fetch(); + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java new file mode 100644 index 00000000..ccb25f52 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java @@ -0,0 +1,18 @@ +package com.amcamp.domain.sprint.dto.response; + +import com.amcamp.domain.project.domain.ToDoStatus; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; +import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; +import java.util.List; + +public record SprintDetailResponse( + @Schema(description = "스프린트 ID", example = "1") Long id, + @Schema(description = "스프린트 제목", example = "1차 스프린트") String title, + @Schema(description = "중간 목표", example = "MVP 개발") String goal, + @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, + @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, + @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, + @Schema(description = "스프린트 진척도", defaultValue = "0") Integer progress, + @Schema(description = "태스크 목록", defaultValue = "{}") + List taskList) {} diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index 5331fc45..c9b12cd6 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -70,6 +70,7 @@ public Slice taskList( return taskService.getTasksBySprint(sprintId, lastTaskId, size); } + @Deprecated @Operation( summary = "마이 페이지 내 스프린트별 태스크 조회", description = "멤버에 할당된 태스크를 스프린트 아이디값에 따라 불러 옵니다.") diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java new file mode 100644 index 00000000..1690b471 --- /dev/null +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskBasicInfoResponse.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.task.dto.response; + +import com.amcamp.domain.task.domain.SOSStatus; +import com.amcamp.domain.task.domain.TaskStatus; +import io.swagger.v3.oas.annotations.media.Schema; + +public record TaskBasicInfoResponse( + @Schema(description = "태스크 아이디", example = "1") Long taskId, + @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") String description, + @Schema(description = "태스크 진행 현황", example = "ON_GOING") TaskStatus taskStatus, + @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus) {} diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 35a1e5f6..b1bc0f38 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -19,7 +19,12 @@ import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; +import com.amcamp.domain.task.dao.TaskRepository; +import com.amcamp.domain.task.domain.Task; +import com.amcamp.domain.task.domain.TaskDifficulty; +import com.amcamp.domain.task.domain.TaskStatus; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -29,6 +34,7 @@ import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.amcamp.global.exception.errorcode.TaskErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; import java.util.List; @@ -40,6 +46,7 @@ import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.transaction.annotation.Transactional; public class SprintServiceTest extends IntegrationTest { @@ -52,6 +59,7 @@ public class SprintServiceTest extends IntegrationTest { @Autowired private TeamParticipantRepository teamParticipantRepository; @Autowired private ProjectRepository projectRepository; @Autowired private ProjectParticipantRepository projectParticipantRepository; + @Autowired private TaskRepository taskRepository; private Project project; private Member newMember; @@ -260,6 +268,32 @@ class 스프린트_삭제할_때 { } } + @Nested + class 스프린트_기본정보를_조회할_떄 { + @Test + void 스프린트가_존재하지_않으면_예외가_발생한다() { + // when & then + assertThatThrownBy(() -> sprintService.deleteSprint(2L)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 스프린트_기본_정보를_조회한다() { + // given + List sprintList = + List.of( + Sprint.createSprint(project, "1", "testDescription1", dueDt), + Sprint.createSprint(project, "2", "testDescription2", dueDt), + Sprint.createSprint(project, "3", "testDescription3", dueDt)); + sprintRepository.saveAll(sprintList); + + SprintInfoResponse response = sprintService.findSprint(1L); + + assertThat(response.goal()).isEqualTo("testDescription1"); + } + } + @Nested class 프로젝트별_스프린트_목록을_조회할_때 { @Test @@ -271,6 +305,7 @@ class 프로젝트별_스프린트_목록을_조회할_때 { } @Test + @Transactional void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = @@ -280,14 +315,46 @@ class 프로젝트별_스프린트_목록을_조회할_때 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); + Sprint sprint = + sprintRepository + .findById(1L) + .orElseThrow( + () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + ProjectParticipant participant = + projectParticipantRepository + .findById(1L) + .orElseThrow( + () -> + new CommonException( + ProjectErrorCode + .PROJECT_PARTICIPATION_REQUIRED)); + + task.assignTask(participant); + task.updateTaskStatus(); + // when - Slice results = sprintService.findAllSprint(project.getId(), null); + Slice results = + sprintService.findAllSprint(project.getId(), null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + + assertThat(results.getContent().get(0).taskList().get(0).description()) + .isEqualTo(task.getDescription()); + assertThat(results.getContent().get(0).taskList().size()).isEqualTo(2); + assertThat(results.getContent().get(0).taskList().get(0).taskStatus()) + .isEqualTo(TaskStatus.COMPLETED); } } @@ -305,6 +372,7 @@ class 회원별_스프린트_목록을_조회할_떄 { } @Test + @Transactional void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { // given List sprintList = @@ -314,15 +382,47 @@ class 회원별_스프린트_목록을_조회할_떄 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); + Sprint sprint = + sprintRepository + .findById(1L) + .orElseThrow( + () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); + taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); + + Task task = + taskRepository + .findById(2L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + ProjectParticipant participant = + projectParticipantRepository + .findById(1L) + .orElseThrow( + () -> + new CommonException( + ProjectErrorCode + .PROJECT_PARTICIPATION_REQUIRED)); + + task.assignTask(participant); + task.updateTaskStatus(); + // when - Slice results = sprintService.findAllSprint(project.getId(), null); + Slice results = + sprintService.findAllSprintByMember(project.getId(), null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + + assertThat(results.getContent().get(0).taskList().get(0).description()) + .isEqualTo(task.getDescription()); + assertThat(results.getContent().get(0).taskList().size()).isEqualTo(1); + assertThat(results.getContent().get(0).progress()).isInstanceOf(Integer.class); + // assertThat(results.getContent().get(0).progress()).isEqualTo(50); } } } From 39b12ceaeab61b8a9eaae8d77bc4d2cf4b6c74fa Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sat, 5 Apr 2025 17:29:26 +0900 Subject: [PATCH 077/107] =?UTF-8?q?fix:=20=ED=8C=80=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=20=EC=8B=9C=20=ED=8C=80=20=EC=9D=B4?= =?UTF-8?q?=EB=AA=A8=EC=A7=80=20=ED=8F=AC=ED=95=A8=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?(#164)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/team/api/TeamController.java | 11 +- .../domain/team/application/TeamService.java | 16 +-- .../com/amcamp/domain/team/domain/Team.java | 17 ++- .../dto/request/TeamEmojiUpdateRequest.java | 8 -- .../team/dto/request/TeamUpdateRequest.java | 7 +- .../amcamp/domain/team/TeamServiceTest.java | 121 +++--------------- 6 files changed, 39 insertions(+), 141 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java diff --git a/src/main/java/com/amcamp/domain/team/api/TeamController.java b/src/main/java/com/amcamp/domain/team/api/TeamController.java index ba18901c..6f0a1e61 100644 --- a/src/main/java/com/amcamp/domain/team/api/TeamController.java +++ b/src/main/java/com/amcamp/domain/team/api/TeamController.java @@ -2,7 +2,6 @@ import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dto.request.TeamCreateRequest; -import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import com.amcamp.domain.team.dto.response.TeamAdminResponse; @@ -53,21 +52,13 @@ public ResponseEntity teamJoin( return ResponseEntity.ok().build(); } - @Operation(summary = "팀 수정", description = "팀 이름과 설명을 수정합니다.") + @Operation(summary = "팀 수정", description = "팀 이름과 설명, 이모지 등 팀 기본정보를 수정합니다.") @PatchMapping("/{teamId}") public TeamInfoResponse teamEdit( @PathVariable Long teamId, @Valid @RequestBody TeamUpdateRequest teamUpdateRequest) { return teamService.editTeam(teamId, teamUpdateRequest); } - @Operation(summary = "팀 이모지 수정", description = "팀 이모지를 수정합니다.") - @PatchMapping("/{teamId}/emoji") - public TeamInfoResponse teamEmojiEdit( - @PathVariable Long teamId, - @Valid @RequestBody TeamEmojiUpdateRequest teamEmojiUpdateRequest) { - return teamService.editTeamEmoji(teamId, teamEmojiUpdateRequest); - } - @Operation(summary = "팀 삭제", description = "팀을 삭제합니다.") @DeleteMapping("/{teamId}") public ResponseEntity teamDelete(@PathVariable Long teamId) { diff --git a/src/main/java/com/amcamp/domain/team/application/TeamService.java b/src/main/java/com/amcamp/domain/team/application/TeamService.java index 3056bb72..c9bdf2dc 100644 --- a/src/main/java/com/amcamp/domain/team/application/TeamService.java +++ b/src/main/java/com/amcamp/domain/team/application/TeamService.java @@ -9,7 +9,6 @@ import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.domain.team.dto.request.TeamCreateRequest; -import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import com.amcamp.domain.team.dto.response.TeamAdminResponse; @@ -88,22 +87,14 @@ public TeamInfoResponse editTeam(Long teamId, TeamUpdateRequest teamUpdateReques TeamUpdateRequest normalizedTeamUpdateRequest = new TeamUpdateRequest( normalizeTeamName(teamUpdateRequest.teamName()), - teamUpdateRequest.teamDescription()); + teamUpdateRequest.teamDescription(), + teamUpdateRequest.teamEmoji()); team.updateTeam(normalizedTeamUpdateRequest); return TeamInfoResponse.from(team); } - public TeamInfoResponse editTeamEmoji( - Long teamId, TeamEmojiUpdateRequest teamEmojiUpdateRequest) { - Member member = memberUtil.getCurrentMember(); - Team team = validateTeam(teamId); - validateAdminParticipant(member, team); - team.updateTeamEmoji(teamEmojiUpdateRequest); - return TeamInfoResponse.from(team); - } - public void deleteTeam(Long teamId) { Member member = memberUtil.getCurrentMember(); Team team = validateTeam(teamId); @@ -144,6 +135,9 @@ private Team searchTeamByCode(String inviteCode) { } private String normalizeTeamName(String name) { + if (name == null || name.trim().isEmpty()) { + return name; + } return name.trim().replaceAll("[^0-9a-zA-Z가-힣 ]", "_"); } diff --git a/src/main/java/com/amcamp/domain/team/domain/Team.java b/src/main/java/com/amcamp/domain/team/domain/Team.java index 71b1e47e..d8a30177 100644 --- a/src/main/java/com/amcamp/domain/team/domain/Team.java +++ b/src/main/java/com/amcamp/domain/team/domain/Team.java @@ -1,7 +1,6 @@ package com.amcamp.domain.team.domain; import com.amcamp.domain.common.model.BaseTimeEntity; -import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import jakarta.persistence.*; import lombok.AccessLevel; @@ -34,11 +33,15 @@ public static Team createTeam(String name, String description) { } public void updateTeam(TeamUpdateRequest teamUpdateRequest) { - this.name = teamUpdateRequest.teamName(); - this.description = teamUpdateRequest.teamDescription(); - } - - public void updateTeamEmoji(TeamEmojiUpdateRequest teamEmojiUpdateRequest) { - this.emoji = teamEmojiUpdateRequest.teamEmoji(); + this.name = + (teamUpdateRequest.teamName() != null) ? teamUpdateRequest.teamName() : this.name; + this.description = + (teamUpdateRequest.teamDescription() != null) + ? teamUpdateRequest.teamDescription() + : this.description; + this.emoji = + (teamUpdateRequest.teamEmoji() != null) + ? teamUpdateRequest.teamEmoji() + : this.emoji; } } diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java deleted file mode 100644 index 7469ebe8..00000000 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamEmojiUpdateRequest.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.amcamp.domain.team.dto.request; - -import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; - -public record TeamEmojiUpdateRequest( - @NotBlank(message = "팀 이모지는 필수 사항입니다.") @Schema(description = "팀 이모지", example = "🍇") - String teamEmoji) {} diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java index 4a990de9..a6ef3165 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java @@ -1,14 +1,13 @@ package com.amcamp.domain.team.dto.request; import io.swagger.v3.oas.annotations.media.Schema; -import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.Size; public record TeamUpdateRequest( - @NotBlank(message = "팀 이름은 필수 사항입니다.") - @Size(max = 15, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Size(max = 15, message = "팀 이름은 최대 25자까지 입력 가능합니다.") @Schema(description = "팀 이름", example = "Side Effect") String teamName, @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") @Schema(description = "팀 설명", example = "Lg cns am camp 1기 개발 스터디") - String teamDescription) {} + String teamDescription, + @Schema(description = "팀 이모지", example = "🍇") String teamEmoji) {} diff --git a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java index 4435cb9e..58f5181f 100644 --- a/src/test/java/com/amcamp/domain/team/TeamServiceTest.java +++ b/src/test/java/com/amcamp/domain/team/TeamServiceTest.java @@ -17,7 +17,6 @@ import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.domain.team.dto.request.TeamCreateRequest; -import com.amcamp.domain.team.dto.request.TeamEmojiUpdateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.domain.team.dto.request.TeamUpdateRequest; import com.amcamp.domain.team.dto.response.TeamAdminResponse; @@ -272,6 +271,7 @@ class 초대코드로_팀_확인_시 { class 팀_수정_시 { @Test + @Transactional void 팀이름과_팀설명을_수정한다() { // given TeamInviteCodeResponse inviteCodeResponse = @@ -282,14 +282,26 @@ class 팀_수정_시 { new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); Long teamId = teamCheckResponse.teamId(); - // when - TeamUpdateRequest teamUpdateRequest = new TeamUpdateRequest("새 팀 이름", "새 팀 설명"); + // when: all arguments provided + TeamUpdateRequest teamUpdateRequest = new TeamUpdateRequest("새 팀 이름", "새 팀 설명", "❤️"); TeamInfoResponse teamInfoResponse = teamService.editTeam(teamId, teamUpdateRequest); // then assertThat(teamInfoResponse).isNotNull(); assertThat(teamInfoResponse.teamName()).isEqualTo("새 팀 이름"); assertThat(teamInfoResponse.teamDescription()).isEqualTo("새 팀 설명"); + assertThat(teamInfoResponse.teamEmoji()).isEqualTo("❤️"); + + // when: new team name is missing + TeamUpdateRequest newTeamUpdateRequest = new TeamUpdateRequest(null, "새 팀 설명-2", "⭐️"); + TeamInfoResponse newTeamInfoResponse = + teamService.editTeam(teamId, newTeamUpdateRequest); + + // then + assertThat(newTeamInfoResponse).isNotNull(); + assertThat(newTeamInfoResponse.teamName()).isEqualTo("새 팀 이름"); + assertThat(newTeamInfoResponse.teamDescription()).isEqualTo("새 팀 설명-2"); + assertThat(newTeamInfoResponse.teamEmoji()).isEqualTo("⭐️"); } @Test @@ -304,7 +316,7 @@ class 팀_수정_시 { () -> teamService.editTeam( invalidTeamId, - new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) + new TeamUpdateRequest("새 팀 이름", "새 팀 설명", "❤️"))) .isInstanceOf(CommonException.class) .extracting("errorCode") .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); @@ -330,7 +342,8 @@ class 팀_수정_시 { assertThatThrownBy( () -> teamService.editTeam( - teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) + teamId, + new TeamUpdateRequest("새 팀 이름", "새 팀 설명", "❤️"))) .isInstanceOf(CommonException.class) .extracting("errorCode") .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); // 사용자 권한이 없을 때 @@ -357,102 +370,8 @@ teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) assertThatThrownBy( () -> teamService.editTeam( - teamId, new TeamUpdateRequest("새 팀 이름", "새 팀 설명"))) - .isInstanceOf(CommonException.class) - .extracting("errorCode") - .isEqualTo(TeamErrorCode.UNAUTHORIZED_ACCESS); // 팀 관리자 권한이 없을 경우 - } - } - - @Nested - class 팀_이모지_수정_시 { - @Test - void 팀이모지를_수정한다() { - // given - TeamInviteCodeResponse inviteCodeResponse = - teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); - - TeamCheckResponse teamCheckResponse = - teamService.getTeamByCode( - new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); - Long teamId = teamCheckResponse.teamId(); - - // when - TeamEmojiUpdateRequest teamEmojiUpdateRequest = new TeamEmojiUpdateRequest("⭐️"); - TeamInfoResponse teamInfoResponse = - teamService.editTeamEmoji(teamId, teamEmojiUpdateRequest); - - // then - assertThat(teamInfoResponse).isNotNull(); - assertThat(teamInfoResponse.teamEmoji()).isEqualTo("⭐️"); - } - - @Test - void 팀이_유효하지않는_경우에는_예외를_반환한다() { - // given - TeamInviteCodeResponse inviteCodeResponse = - teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); - - Long invalidTeamId = -999L; - - // when & then - assertThatThrownBy( - () -> - teamService.editTeamEmoji( - invalidTeamId, new TeamEmojiUpdateRequest("⭐️"))) - .isInstanceOf(CommonException.class) - .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_NOT_FOUND); - } - - @Test - void 로그인된_회원이_팀_참가자가_아닌_경우에는_예외를_반환한다() { - // given - TeamInviteCodeResponse inviteCodeResponse = - teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); - - TeamCheckResponse teamCheckResponse = - teamService.getTeamByCode( - new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); - Long teamId = teamCheckResponse.teamId(); - - Member nonMember = - memberRepository.save( - Member.createMember("nonMember", "testProfileImageUrl", null)); - loginAs(nonMember); - - // when & then - assertThatThrownBy( - () -> - teamService.editTeamEmoji( - teamId, new TeamEmojiUpdateRequest("⭐️"))) - .isInstanceOf(CommonException.class) - .extracting("errorCode") - .isEqualTo(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED); // 사용자 권한이 없을 때 - } - - @Test - void 로그인된_회원이_팀_관리자가_아닌_경우에는_예외를_반환한다() { - // given - TeamInviteCodeResponse inviteCodeResponse = - teamService.createTeam(new TeamCreateRequest("팀 이름", "팀 설명")); - - TeamCheckResponse teamCheckResponse = - teamService.getTeamByCode( - new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); - Long teamId = teamCheckResponse.teamId(); - - // 일반 사용자 로그인 및 팀 참가 - Member userMember = - memberRepository.save(Member.createMember("user", "testProfileImageUrl", null)); - loginAs(userMember); - teamService.joinTeam(new TeamInviteCodeRequest(inviteCodeResponse.inviteCode())); - - // when & then - assertThatThrownBy( - () -> - teamService.editTeamEmoji( - teamId, new TeamEmojiUpdateRequest("⭐️"))) + teamId, + new TeamUpdateRequest("새 팀 이름", "새 팀 설명", "❤️"))) .isInstanceOf(CommonException.class) .extracting("errorCode") .isEqualTo(TeamErrorCode.UNAUTHORIZED_ACCESS); // 팀 관리자 권한이 없을 경우 From 47439645a3625e709a08f60ff6f5b13fb2773eab Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sat, 5 Apr 2025 17:50:08 +0900 Subject: [PATCH 078/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EB=B0=8F=20=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20API=20=ED=95=98=EB=82=98=EB=A1=9C=20?= =?UTF-8?q?=ED=86=B5=ED=95=A9=20(#165)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 프로젝트 수정 API 통합 * refactor: 스프린트 수정 API 통합 * test: API 수정에 따른 테스트 코드 수정 * refactor: 프로젝트 관련 에러 코드 네이밍 변경 * refactor: 스프린트 관련 에러 코드 네이밍 변경 --- .../feedback/application/FeedbackService.java | 2 +- .../meeting/application/MeetingService.java | 4 +- .../domain/project/api/ProjectController.java | 34 ++-------- .../project/application/ProjectService.java | 17 ++--- .../project/dao/ProjectRepositoryImpl.java | 4 +- .../amcamp/domain/project/domain/Project.java | 32 ++++++--- .../domain/project/domain/ToDoInfo.java | 52 --------------- .../domain/project/domain/ToDoStatus.java | 14 ---- .../request/ProjectTodoInfoUpdateRequest.java | 9 --- ...Request.java => ProjectUpdateRequest.java} | 6 +- .../dto/response/ProjectInfoResponse.java | 4 +- .../domain/sprint/api/SprintController.java | 20 ++---- .../sprint/application/SprintService.java | 36 ++++------ .../domain/sprint/dao/SprintRepository.java | 4 +- .../sprint/dao/SprintRepositoryImpl.java | 12 ++-- .../amcamp/domain/sprint/domain/Sprint.java | 39 +++++++---- .../dto/request/SprintBasicUpdateRequest.java | 6 -- ...eRequest.java => SprintUpdateRequest.java} | 7 +- .../dto/response/SprintDetailResponse.java | 2 - .../dto/response/SprintInfoResponse.java | 7 +- .../exception/errorcode/GlobalErrorCode.java | 2 +- .../exception/errorcode/ProjectErrorCode.java | 2 + .../exception/errorcode/SprintErrorCode.java | 6 +- .../domain/project/ProjectServiceTest.java | 65 +++++++------------ .../sprint/application/SprintServiceTest.java | 40 +++++------- 25 files changed, 147 insertions(+), 279 deletions(-) delete mode 100644 src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java delete mode 100644 src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java delete mode 100644 src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java rename src/main/java/com/amcamp/domain/project/dto/request/{ProjectBasicInfoUpdateRequest.java => ProjectUpdateRequest.java} (54%) delete mode 100644 src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java rename src/main/java/com/amcamp/domain/sprint/dto/request/{SprintToDoUpdateRequest.java => SprintUpdateRequest.java} (65%) diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java index 0136a2e4..1a87f32d 100644 --- a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -135,7 +135,7 @@ private void validateDuplicateFeedback( } private void validateSprintDueDate(Sprint sprint) { - if (!sprint.getToDoInfo().getDueDt().isEqual(LocalDate.now())) { + if (!sprint.getDueDt().isEqual(LocalDate.now())) { throw new CommonException(FeedbackErrorCode.FEEDBACK_DUE_DATE_ONLY); } } diff --git a/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java b/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java index 75bcec8b..0b7b8e90 100644 --- a/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java +++ b/src/main/java/com/amcamp/domain/meeting/application/MeetingService.java @@ -113,8 +113,8 @@ private void validateMeetingTime( throw new CommonException(MeetingErrorCode.INVALID_MEETING_TIME_RANGE); } // 스프린트 범위 확인 - if (meetingStart.toLocalDate().isBefore(sprint.getToDoInfo().getStartDt()) - || meetingEnd.toLocalDate().isAfter(sprint.getToDoInfo().getDueDt())) { + if (meetingStart.toLocalDate().isBefore(sprint.getStartDt()) + || meetingEnd.toLocalDate().isAfter(sprint.getDueDt())) { throw new CommonException(MeetingErrorCode.MEETING_DATE_OUT_OF_SPRINT); } // 기존 일정과의 중복 확인 if (meetingRepository diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index 15f47d47..7cf44ece 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -24,9 +24,6 @@ public class ProjectController { private final ProjectService projectService; - // project - - // create @Operation(summary = "프로젝트 생성", description = "새로운 프로젝트를 생성합니다.") @PostMapping("/create") public ResponseEntity projectCreate( @@ -52,26 +49,13 @@ public ProjectInfoResponse projectInfo(@PathVariable Long projectId) { return projectService.getProjectInfo(projectId); } - // update - @Operation(summary = "프로젝트 기본 정보 업데이트", description = "프로젝트 타이틀/목표/상세설정을 수정합니다") - @PatchMapping("/{projectId}/basic-info") - public ResponseEntity projectBasicInfoUpdate( - @PathVariable Long projectId, - @Valid @RequestBody ProjectBasicInfoUpdateRequest request) { - projectService.updateProjectBasicInfo(projectId, request); - return ResponseEntity.ok().build(); - } - - @Operation(summary = "프로젝트 마감기한/진행상태 업데이트", description = "프로젝트 마감기한/진행상태를 수정합니다") - @PatchMapping("/{projectId}/todo-info") - public ResponseEntity projectTodoInfoUpdate( - @PathVariable Long projectId, - @Valid @RequestBody ProjectTodoInfoUpdateRequest request) { - projectService.updateProjectTodoInfo(projectId, request); - return ResponseEntity.ok().build(); + @Operation(summary = "프로젝트 정보 수정", description = "프로젝트 제목, 설명, 마감일자를 수정합니다.") + @PatchMapping("/{projectId}") + public ProjectInfoResponse projectUpdate( + @PathVariable Long projectId, @Valid @RequestBody ProjectUpdateRequest request) { + return projectService.updateProject(projectId, request); } - // delete @Operation(summary = "프로젝트 삭제", description = "프로젝트를 삭제합니다.") @DeleteMapping("/{projectId}") public ResponseEntity projectDelete(@PathVariable Long projectId) { @@ -79,7 +63,6 @@ public ResponseEntity projectDelete(@PathVariable Long projectId) { return ResponseEntity.ok().build(); } - // project member @Operation(summary = "프로젝트 가입 신청", description = "프로젝트 가입 신청 요청을 보냅니다.") @PostMapping("/{projectId}/registration") public ResponseEntity projectRegister(@PathVariable Long projectId) { @@ -87,13 +70,6 @@ public ResponseEntity projectRegister(@PathVariable Long projectId) { return ResponseEntity.ok().build(); } - // @Operation(summary = "프로젝트 가입 신청 조회", description = "프로젝트 가입 신청 정보를 조회합니다.") - // @GetMapping("/{projectId}/registration") - // public List projectRegistrationGet( - // @PathVariable Long projectId) { - // return projectService.getProjectRegistration(projectId); - // } - @Operation(summary = "프로젝트 가입 신청 목록 조회", description = "현재 프로젝트에 신청된 가입 요청 목록을 조회합니다.") @GetMapping("/{projectId}/registration/list") public Slice projectRegistrationListGet( diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 791a12e2..889e962f 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -78,23 +78,16 @@ public Slice getProjectListInfo( teamId, lastProjectId, pageSize, teamParticipant); } - // update - public void updateProjectBasicInfo(Long projectId, ProjectBasicInfoUpdateRequest request) { - Member member = memberUtil.getCurrentMember(); - Project project = getProjectById(projectId); - getValidProjectParticipant(member, project); - project.updateBasic(request.title(), request.description()); - } + public ProjectInfoResponse updateProject(Long projectId, ProjectUpdateRequest request) { + final Member member = memberUtil.getCurrentMember(); + final Project project = getProjectById(projectId); - public void updateProjectTodoInfo(Long projectId, ProjectTodoInfoUpdateRequest request) { - Member member = memberUtil.getCurrentMember(); - Project project = getProjectById(projectId); getValidProjectParticipant(member, project); + project.updateProject(request.title(), request.description(), request.dueDt()); - project.updateToDo(request.dueDt(), request.toDoStatus()); + return ProjectInfoResponse.from(project); } - // delete public void deleteProject(Long projectId) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index a2bb76a0..e78a3fd7 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -46,8 +46,8 @@ public Slice findAllByTeamIdWithPagination( project.id, project.title, project.description, - project.toDoInfo.startDt, - project.toDoInfo.dueDt), + project.startDt, + project.dueDt), projectParticipant.id.count().gt(0), adminCase.sum().gt(0))) .from(project) diff --git a/src/main/java/com/amcamp/domain/project/domain/Project.java b/src/main/java/com/amcamp/domain/project/domain/Project.java index 7c59fda6..71f5bc3d 100644 --- a/src/main/java/com/amcamp/domain/project/domain/Project.java +++ b/src/main/java/com/amcamp/domain/project/domain/Project.java @@ -3,6 +3,8 @@ import com.amcamp.domain.common.model.BaseTimeEntity; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.team.domain.Team; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; import jakarta.persistence.*; import java.time.LocalDate; import java.util.ArrayList; @@ -33,36 +35,48 @@ public class Project extends BaseTimeEntity { // 설명 @Lob private String description; - @Embedded private ToDoInfo toDoInfo; + private LocalDate startDt; + + private LocalDate dueDt; @OneToMany(mappedBy = "project", cascade = CascadeType.ALL, orphanRemoval = true) private List sprints = new ArrayList<>(); // 캘린더 @Builder(access = AccessLevel.PRIVATE) - private Project(Team team, String title, String description, ToDoInfo toDoInfo) { + private Project( + Team team, String title, String description, LocalDate startDt, LocalDate dueDt) { this.team = team; this.title = title; this.description = description; - this.toDoInfo = toDoInfo; + this.startDt = startDt; + this.dueDt = dueDt; } public static Project createProject( Team team, String title, String description, LocalDate dueDt) { + validateDueDt(LocalDate.now(), dueDt); return Project.builder() .team(team) .title(title) .description(description) - .toDoInfo(ToDoInfo.createToDoInfo(dueDt)) + .startDt(LocalDate.now()) + .dueDt(dueDt) .build(); } - public void updateBasic(String title, String description) { - this.title = (title != null) ? title : this.title; - this.description = (description != null) ? description : this.description; + public void updateProject(String title, String description, LocalDate dueDt) { + if (title != null) this.title = title; + if (description != null) this.description = description; + if (dueDt != null) { + validateDueDt(this.startDt, dueDt); + this.dueDt = dueDt; + } } - public void updateToDo(LocalDate dueDt, ToDoStatus status) { - toDoInfo.updateToDoInfo(dueDt, status); + private static void validateDueDt(LocalDate startDt, LocalDate dueDt) { + if (dueDt.isBefore(startDt)) { + throw new CommonException(ProjectErrorCode.PROJECT_DUE_DATE_BEFORE_START); + } } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java b/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java deleted file mode 100644 index be3730c9..00000000 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoInfo.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.amcamp.domain.project.domain; - -import com.amcamp.global.exception.CommonException; -import com.amcamp.global.exception.errorcode.GlobalErrorCode; -import jakarta.persistence.Embeddable; -import jakarta.persistence.EnumType; -import jakarta.persistence.Enumerated; -import java.time.LocalDate; -import lombok.AccessLevel; -import lombok.Builder; -import lombok.Getter; -import lombok.NoArgsConstructor; - -@Embeddable -@NoArgsConstructor(access = AccessLevel.PROTECTED) -@Getter -public class ToDoInfo { - // 시작&마감일 - private LocalDate startDt; // 시작 일자 - private LocalDate dueDt; // 마감 일자 - - @Enumerated(value = EnumType.STRING) - private ToDoStatus toDoStatus; // 진행 상태 - - @Builder(access = AccessLevel.PRIVATE) - private ToDoInfo(LocalDate startDt, LocalDate dueDt, ToDoStatus toDoStatus) { - this.startDt = startDt; - this.dueDt = dueDt; - this.toDoStatus = toDoStatus; - } - - public static ToDoInfo createToDoInfo(LocalDate dueDt) { - LocalDate now = LocalDate.now(); - if (dueDt.isBefore(now)) { - throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); - } - - return ToDoInfo.builder().startDt(now).dueDt(dueDt).toDoStatus(ToDoStatus.ON_GOING).build(); - } - - public void updateToDoInfo(LocalDate dueDt, ToDoStatus status) { - if (dueDt != null) { - if (dueDt.isBefore(this.startDt)) { - throw new CommonException(GlobalErrorCode.INVALID_DATE_ERROR); - } - this.dueDt = dueDt; - } - if (status != null) { - this.toDoStatus = status; - } - } -} diff --git a/src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java b/src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java deleted file mode 100644 index 339c272d..00000000 --- a/src/main/java/com/amcamp/domain/project/domain/ToDoStatus.java +++ /dev/null @@ -1,14 +0,0 @@ -package com.amcamp.domain.project.domain; - -import lombok.AllArgsConstructor; -import lombok.Getter; - -@AllArgsConstructor -@Getter -public enum ToDoStatus { - NOT_STARTED("STATUS_NOT_STARTED"), - ON_GOING("STATUS_ON_GOING"), - COMPLETED("STATUS_COMPLETED"); - - private final String status; -} diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java deleted file mode 100644 index 32acc795..00000000 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectTodoInfoUpdateRequest.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.amcamp.domain.project.dto.request; - -import com.amcamp.domain.project.domain.ToDoStatus; -import io.swagger.v3.oas.annotations.media.Schema; -import java.time.LocalDate; - -public record ProjectTodoInfoUpdateRequest( - @Schema(description = "수정된 프로젝트 마감일자", example = "2026-04-01") LocalDate dueDt, - @Schema(description = "수정된 프로젝트 진행상태", example = "COMPLETED") ToDoStatus toDoStatus) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java similarity index 54% rename from src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java rename to src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java index 5b28970d..dc64230c 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectBasicInfoUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java @@ -1,7 +1,9 @@ package com.amcamp.domain.project.dto.request; import io.swagger.v3.oas.annotations.media.Schema; +import java.time.LocalDate; -public record ProjectBasicInfoUpdateRequest( +public record ProjectUpdateRequest( @Schema(description = "수정된 텍스트", example = "new project title") String title, - @Schema(description = "수정된 텍스트", example = "new project description") String description) {} + @Schema(description = "수정된 텍스트", example = "new project description") String description, + @Schema(description = "수정된 프로젝트 마감일자", example = "2026-04-01") LocalDate dueDt) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java index d616e1f9..f8ac74e3 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java @@ -17,7 +17,7 @@ public static ProjectInfoResponse from(Project project) { project.getId(), project.getTitle(), project.getDescription(), - project.getToDoInfo().getStartDt(), - project.getToDoInfo().getDueDt()); + project.getStartDt(), + project.getDueDt()); } } diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 7757cda1..fc8fa99c 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -1,9 +1,8 @@ package com.amcamp.domain.sprint.api; import com.amcamp.domain.sprint.application.SprintService; -import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; -import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; @@ -32,18 +31,11 @@ public ResponseEntity sprintCreate( return ResponseEntity.status(HttpStatus.CREATED).body(response); } - @Operation(summary = "스프린트 기본 정보 수정", description = "스프린트의 기본 정보(제목, 목표)를 수정합니다.") - @PatchMapping("/{sprintId}/basic-info") - public SprintInfoResponse sprintUpdateBasic( - @PathVariable Long sprintId, @Valid @RequestBody SprintBasicUpdateRequest request) { - return sprintService.updateSprintBasicInfo(sprintId, request); - } - - @Operation(summary = "스프린트 일정 및 진행 상태 수정", description = "스프린트의 일정 및 진행 상태를 수정합니다.") - @PatchMapping("/{sprintId}/todo-info") - public SprintInfoResponse sprintUpdateToDo( - @PathVariable Long sprintId, @Valid @RequestBody SprintToDoUpdateRequest request) { - return sprintService.updateSprintToDoInfo(sprintId, request); + @Operation(summary = "스프린트 정보 수정", description = "스프린트의 목표, 마감일자를 수정합니다.") + @PatchMapping("/{sprintId}") + public SprintInfoResponse sprintUpdate( + @PathVariable Long sprintId, @Valid @RequestBody SprintUpdateRequest request) { + return sprintService.updateSprint(sprintId, request); } @Operation(summary = "스프린트 삭제", description = "스프린트를 삭제합니다.") diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index 19050601..dd794f74 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -8,9 +8,8 @@ import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; -import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; -import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -47,7 +46,7 @@ public SprintInfoResponse createSprint(SprintCreateRequest request) { validateProjectParticipant(project, project.getTeam(), currentMember); validatePreviousSprintEnded(project); - validateSprintDueDate(request.dueDt(), project.getToDoInfo().getDueDt()); + validateSprintDueDate(request.dueDt(), project.getDueDt()); long count = sprintRepository.countByProject(project); String autoTitle = String.valueOf(count + 1); @@ -59,30 +58,19 @@ public SprintInfoResponse createSprint(SprintCreateRequest request) { return SprintInfoResponse.from(sprint); } - public SprintInfoResponse updateSprintBasicInfo( - Long sprintId, SprintBasicUpdateRequest request) { + public SprintInfoResponse updateSprint(Long sprintId, SprintUpdateRequest request) { final Member currentMember = memberUtil.getCurrentMember(); final Sprint sprint = findBySprintId(sprintId); validateProjectParticipant( sprint.getProject(), sprint.getProject().getTeam(), currentMember); - sprint.updateSprintBasic(request.goal()); - - return SprintInfoResponse.from(sprint); - } - - public SprintInfoResponse updateSprintToDoInfo(Long sprintId, SprintToDoUpdateRequest request) { - final Member currentMember = memberUtil.getCurrentMember(); - final Sprint sprint = findBySprintId(sprintId); - - validateProjectParticipant( - sprint.getProject(), sprint.getProject().getTeam(), currentMember); - - validateSprintDueDate(request.dueDt(), sprint.getProject().getToDoInfo().getDueDt()); - validateDueDtIfNextSprintExists(sprint.getProject(), request.dueDt(), sprintId); + if (request.dueDt() != null) { + validateSprintDueDate(request.dueDt(), sprint.getProject().getDueDt()); + validateDueDtIfNextSprintExists(sprint.getProject(), request.dueDt(), sprintId); + } - sprint.updateSprintToDo(request.dueDt(), request.status()); + sprint.updateSprint(request.goal(), request.dueDt()); return SprintInfoResponse.from(sprint); } @@ -177,14 +165,14 @@ private void validateAdminProjectParticipant(ProjectParticipant projectParticipa private void validateSprintDueDate(LocalDate sprintDueDt, LocalDate projectDueDt) { if (sprintDueDt.isAfter(projectDueDt)) { - throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_INVALID); + throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_EXCEEDS_PROJECT_END); } } private void validatePreviousSprintEnded(Project project) { sprintRepository .findTopByProjectOrderByCreatedDtDesc(project) - .filter(sprint -> !sprint.getToDoInfo().getDueDt().isBefore(LocalDate.now())) + .filter(sprint -> !sprint.getDueDt().isBefore(LocalDate.now())) .ifPresent( sprint -> { throw new CommonException(SprintErrorCode.PREVIOUS_SPRINT_NOT_ENDED); @@ -196,8 +184,8 @@ private void validateDueDtIfNextSprintExists(Project project, LocalDate dueDt, L sprintRepository.findNextSprintAfterDueDate(project.getId(), dueDt, sprintId); if (nextSprint.isPresent()) { - if (!dueDt.isBefore(nextSprint.get().getToDoInfo().getStartDt())) { - throw new CommonException(SprintErrorCode.NEXT_SPRINT_ALREADY_EXISTS); + if (!dueDt.isBefore(nextSprint.get().getStartDt())) { + throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_CONFLICT_WITH_NEXT); } } } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java index 20525b55..255dac96 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepository.java @@ -21,9 +21,9 @@ public interface SprintRepository extends JpaRepository, SprintRep @Query( "SELECT s FROM Sprint s " + "WHERE s.project.id = :projectId " - + "AND s.toDoInfo.dueDt > :currentDueDate " + + "AND s.dueDt > :currentDueDate " + "AND s.id != :currentSprintId " - + "ORDER BY s.toDoInfo.dueDt ASC") + + "ORDER BY s.dueDt ASC") Optional findNextSprintAfterDueDate( @Param("projectId") Long projectId, @Param("currentDueDate") LocalDate currentDueDate, diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index 5594ef9c..652c2b1d 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -37,9 +37,8 @@ public Slice findAllSprintByProjectId(Long projectId, Long sprint.id, sprint.title, sprint.goal, - sprint.toDoInfo.startDt, - sprint.toDoInfo.dueDt, - sprint.toDoInfo.toDoStatus, + sprint.startDt, + sprint.dueDt, sprint.progress.intValue(), Expressions.constant(Collections.emptyList()))) .from(sprint) @@ -64,7 +63,6 @@ public Slice findAllSprintByProjectId(Long projectId, Long sprint.goal(), sprint.startDt(), sprint.dueDt(), - sprint.status(), sprint.progress(), taskList)) .collect(Collectors.toList()); @@ -82,9 +80,8 @@ public Slice findAllSprintByProjectIdAndAssignee( sprint.id, sprint.title, sprint.goal, - sprint.toDoInfo.startDt, - sprint.toDoInfo.dueDt, - sprint.toDoInfo.toDoStatus, + sprint.startDt, + sprint.dueDt, sprint.progress.intValue(), Expressions.constant(Collections.emptyList()))) .from(sprint) @@ -110,7 +107,6 @@ public Slice findAllSprintByProjectIdAndAssignee( sprint.goal(), sprint.startDt(), sprint.dueDt(), - sprint.status(), sprint.progress(), taskList)) .collect(Collectors.toList()); diff --git a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java index ad38b25c..58525a84 100644 --- a/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java +++ b/src/main/java/com/amcamp/domain/sprint/domain/Sprint.java @@ -5,9 +5,9 @@ import com.amcamp.domain.feedback.domain.Feedback; import com.amcamp.domain.meeting.domain.Meeting; import com.amcamp.domain.project.domain.Project; -import com.amcamp.domain.project.domain.ToDoInfo; -import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.task.domain.Task; +import com.amcamp.global.exception.CommonException; +import com.amcamp.global.exception.errorcode.SprintErrorCode; import jakarta.persistence.*; import java.time.LocalDate; import java.util.ArrayList; @@ -34,7 +34,9 @@ public class Sprint extends BaseTimeEntity { @Lob private String goal; - @Embedded private ToDoInfo toDoInfo; + private LocalDate startDt; + + private LocalDate dueDt; @OneToMany(mappedBy = "sprint", cascade = CascadeType.ALL, orphanRemoval = true) private List feedbacks = new ArrayList<>(); @@ -55,30 +57,39 @@ public class Sprint extends BaseTimeEntity { private Double progress; @Builder(access = AccessLevel.PRIVATE) - private Sprint(Project project, String title, String goal, ToDoInfo toDoInfo, Double progress) { + private Sprint( + Project project, + String title, + String goal, + LocalDate startDt, + LocalDate dueDt, + Double progress) { this.project = project; this.title = title; this.goal = goal; - this.toDoInfo = toDoInfo; + this.startDt = startDt; + this.dueDt = dueDt; this.progress = progress; } public static Sprint createSprint(Project project, String title, String goal, LocalDate dueDt) { + validateDueDt(LocalDate.now(), dueDt); return Sprint.builder() .project(project) .title(title) .goal(goal) .progress(0.0) - .toDoInfo(ToDoInfo.createToDoInfo(dueDt)) + .startDt(LocalDate.now()) + .dueDt(dueDt) .build(); } - public void updateSprintBasic(String goal) { + public void updateSprint(String goal, LocalDate dueDt) { if (goal != null) this.goal = goal; - } - - public void updateSprintToDo(LocalDate dueDt, ToDoStatus status) { - toDoInfo.updateToDoInfo(dueDt, status); + if (dueDt != null) { + validateDueDt(this.startDt, dueDt); + this.dueDt = dueDt; + } } public void updateSprintTitle(String title) { @@ -88,4 +99,10 @@ public void updateSprintTitle(String title) { public void updateProgress(Double progress) { this.progress = progress; } + + private static void validateDueDt(LocalDate startDt, LocalDate dueDt) { + if (dueDt.isBefore(startDt)) { + throw new CommonException(SprintErrorCode.SPRINT_DUE_DATE_BEFORE_START); + } + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java deleted file mode 100644 index 04813775..00000000 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintBasicUpdateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.amcamp.domain.sprint.dto.request; - -import io.swagger.v3.oas.annotations.media.Schema; - -public record SprintBasicUpdateRequest( - @Schema(description = "중간 목표", example = "MVP 개발") String goal) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintUpdateRequest.java similarity index 65% rename from src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java rename to src/main/java/com/amcamp/domain/sprint/dto/request/SprintUpdateRequest.java index fd360a8d..5fdd2365 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintToDoUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintUpdateRequest.java @@ -1,15 +1,14 @@ package com.amcamp.domain.sprint.dto.request; -import com.amcamp.domain.project.domain.ToDoStatus; import com.fasterxml.jackson.annotation.JsonFormat; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; -public record SprintToDoUpdateRequest( +public record SprintUpdateRequest( + @Schema(description = "중간 목표", example = "MVP 개발") String goal, @JsonFormat( shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd", timezone = "Asia/Seoul") @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") - LocalDate dueDt, - @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status) {} + LocalDate dueDt) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java index ccb25f52..2bfce5fc 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintDetailResponse.java @@ -1,6 +1,5 @@ package com.amcamp.domain.sprint.dto.response; -import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; @@ -12,7 +11,6 @@ public record SprintDetailResponse( @Schema(description = "중간 목표", example = "MVP 개발") String goal, @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, - @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, @Schema(description = "스프린트 진척도", defaultValue = "0") Integer progress, @Schema(description = "태스크 목록", defaultValue = "{}") List taskList) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java index 53f50a6b..2a5a665c 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintInfoResponse.java @@ -1,6 +1,5 @@ package com.amcamp.domain.sprint.dto.response; -import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.sprint.domain.Sprint; import io.swagger.v3.oas.annotations.media.Schema; import java.time.LocalDate; @@ -11,16 +10,14 @@ public record SprintInfoResponse( @Schema(description = "중간 목표", example = "MVP 개발") String goal, @Schema(description = "스프린트 시작 날짜", defaultValue = "2026-02-01") LocalDate startDt, @Schema(description = "스프린트 마감 날짜", defaultValue = "2026-03-01") LocalDate dueDt, - @Schema(description = "스프린트 진행 상태", defaultValue = "NOT_STARTED") ToDoStatus status, @Schema(description = "스프린트 진척도", defaultValue = "0") Integer progress) { public static SprintInfoResponse from(Sprint sprint) { return new SprintInfoResponse( sprint.getId(), sprint.getTitle(), sprint.getGoal(), - sprint.getToDoInfo().getStartDt(), - sprint.getToDoInfo().getDueDt(), - sprint.getToDoInfo().getToDoStatus(), + sprint.getStartDt(), + sprint.getDueDt(), sprint.getProgress().intValue()); } } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java index ca4faa63..a9865870 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/GlobalErrorCode.java @@ -8,7 +8,7 @@ @AllArgsConstructor public enum GlobalErrorCode implements BaseErrorCode { INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "서버 오류입니다. 관리자에게 문의해주세요."), - INVALID_DATE_ERROR(HttpStatus.BAD_REQUEST, "마감일은 현재 날짜 이후여야 합니다."); + ; private final HttpStatus httpStatus; private final String message; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java index 9dd8468e..00812112 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/ProjectErrorCode.java @@ -19,6 +19,8 @@ public enum ProjectErrorCode implements BaseErrorCode { PROJECT_SPRINT_MISMATCH(HttpStatus.FORBIDDEN, "요청한 스프린트는 현재 참여 중인 프로젝트의 스프린트가 아닙니다."), PROJECT_PARTICIPANT_NOT_EXISTS(HttpStatus.NOT_FOUND, "프로젝트 참가자가 존재하지 않습니다."), + + PROJECT_DUE_DATE_BEFORE_START(HttpStatus.BAD_REQUEST, "프로젝트 마감일자는 시작일자 이후여야 합니다."); ; private final HttpStatus httpStatus; diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index e9765731..ad87e6d9 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -12,9 +12,11 @@ public enum SprintErrorCode implements BaseErrorCode { TASK_NOT_CREATED_YET(HttpStatus.NOT_FOUND, "스프린트 내 태스크가 존재하지 않습니다."), - SPRINT_DUE_DATE_INVALID(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), + SPRINT_DUE_DATE_BEFORE_START(HttpStatus.BAD_REQUEST, "스프린트 마감일자는 시작일자 이후여야 합니다."), + SPRINT_DUE_DATE_EXCEEDS_PROJECT_END(HttpStatus.BAD_REQUEST, "스프린트 마감일은 프로젝트 마감일 이내여야 합니다."), PREVIOUS_SPRINT_NOT_ENDED(HttpStatus.BAD_REQUEST, "이전 스프린트가 아직 종료되지 않았습니다."), - NEXT_SPRINT_ALREADY_EXISTS(HttpStatus.BAD_REQUEST, "다음 스프린트가 존재할 경우, 마감일은 그 이전이어야 합니다."), + SPRINT_DUE_DATE_CONFLICT_WITH_NEXT( + HttpStatus.BAD_REQUEST, "다음 스프린트가 존재할 경우, 마감일은 그 이전이어야 합니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 7edf190c..f7d33efb 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -11,9 +11,8 @@ import com.amcamp.domain.project.dao.ProjectRegistrationRepository; import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.*; -import com.amcamp.domain.project.dto.request.ProjectBasicInfoUpdateRequest; import com.amcamp.domain.project.dto.request.ProjectCreateRequest; -import com.amcamp.domain.project.dto.request.ProjectTodoInfoUpdateRequest; +import com.amcamp.domain.project.dto.request.ProjectUpdateRequest; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; @@ -27,7 +26,6 @@ import com.amcamp.domain.team.dto.request.TeamCreateRequest; import com.amcamp.domain.team.dto.request.TeamInviteCodeRequest; import com.amcamp.global.exception.CommonException; -import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.security.PrincipalDetails; @@ -264,8 +262,8 @@ class 프로젝트_조회 { project.getId(), project.getTitle(), project.getDescription(), - project.getToDoInfo().getStartDt(), - project.getToDoInfo().getDueDt()); + project.getStartDt(), + project.getDueDt()); } @Test @@ -296,8 +294,8 @@ void createOriginalProject() { // given createOriginalProject(); // when - projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, updatedDescription)); + projectService.updateProject( + 1L, new ProjectUpdateRequest(updatedTitle, updatedDescription, null)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); @@ -315,10 +313,10 @@ void createOriginalProject() { // when, then assertThatThrownBy( () -> - projectService.updateProjectBasicInfo( + projectService.updateProject( 1L, - new ProjectBasicInfoUpdateRequest( - updatedTitle, updatedDescription))) + new ProjectUpdateRequest( + updatedTitle, updatedDescription, null))) .isInstanceOf(CommonException.class) .hasMessageContaining(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } @@ -335,22 +333,21 @@ void createOriginalProject() { // when, then assertThatThrownBy( () -> - projectService.updateProjectBasicInfo( + projectService.updateProject( 1L, - new ProjectBasicInfoUpdateRequest( - updatedTitle, updatedDescription))) + new ProjectUpdateRequest( + updatedTitle, updatedDescription, null))) .isInstanceOf(CommonException.class) .hasMessageContaining( ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); } @Test - void 프로젝트_기본정보를_타이틀만_수정하면_타이틀만_수정된다() { + void 프로젝트_정보를_타이틀만_수정하면_타이틀만_수정된다() { // given createOriginalProject(); // when - projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(updatedTitle, null)); + projectService.updateProject(1L, new ProjectUpdateRequest(updatedTitle, null, null)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(updatedTitle); @@ -358,25 +355,12 @@ void createOriginalProject() { } @Test - void 프로젝트_기본정보를_목표만_수정하면_목표만_수정된다() { + void 프로젝트_정보를_상세설명만_수정하면_상세설명만_수정된다() { // given createOriginalProject(); // when - projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(null, null)); - Project updatedProject = projectRepository.findById(1L).get(); - // then - assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); - assertThat(updatedProject.getDescription()).isEqualTo(originalDescription); - } - - @Test - void 프로젝트_기본정보를_상세설명만_수정하면_상세설명만_수정된다() { - // given - createOriginalProject(); - // when - projectService.updateProjectBasicInfo( - 1L, new ProjectBasicInfoUpdateRequest(null, updatedDescription)); + projectService.updateProject( + 1L, new ProjectUpdateRequest(null, updatedDescription, null)); Project updatedProject = projectRepository.findById(1L).get(); // then assertThat(updatedProject.getTitle()).isEqualTo(originalTitle); @@ -384,18 +368,15 @@ void createOriginalProject() { } @Test - void 프로젝트_일정정보를_수정하면_정상적으로_수정된다() { + void 프로젝트_정보를_마감일자만_수정하면_마감일자만_수정된다() { // given createOriginalProject(); // when LocalDate updatedDueDt = LocalDate.of(2027, 12, 1); - projectService.updateProjectTodoInfo( - 1L, new ProjectTodoInfoUpdateRequest(updatedDueDt, ToDoStatus.COMPLETED)); + projectService.updateProject(1L, new ProjectUpdateRequest(null, null, updatedDueDt)); Project updatedProject = projectRepository.findById(1L).get(); // then - assertThat(updatedProject.getToDoInfo().getDueDt()).isEqualTo(updatedDueDt); - assertThat(updatedProject.getToDoInfo().getToDoStatus()) - .isEqualTo(ToDoStatus.COMPLETED); + assertThat(updatedProject.getDueDt()).isEqualTo(updatedDueDt); } @Test @@ -404,13 +385,13 @@ void createOriginalProject() { createOriginalProject(); // when LocalDate updatedDueDt = LocalDate.of(2024, 1, 1); - ProjectTodoInfoUpdateRequest request = - new ProjectTodoInfoUpdateRequest(updatedDueDt, ToDoStatus.COMPLETED); + ProjectUpdateRequest request = new ProjectUpdateRequest(null, null, updatedDueDt); // then - assertThatThrownBy(() -> projectService.updateProjectTodoInfo(1L, request)) + assertThatThrownBy(() -> projectService.updateProject(1L, request)) .isInstanceOf(CommonException.class) - .hasMessageContaining(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); + .hasMessageContaining( + ProjectErrorCode.PROJECT_DUE_DATE_BEFORE_START.getMessage()); } } diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index b1bc0f38..957dd23a 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -13,12 +13,10 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; -import com.amcamp.domain.project.domain.ToDoStatus; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; -import com.amcamp.domain.sprint.dto.request.SprintBasicUpdateRequest; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; -import com.amcamp.domain.sprint.dto.request.SprintToDoUpdateRequest; +import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.task.dao.TaskRepository; @@ -31,7 +29,6 @@ import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.domain.team.domain.TeamParticipantRole; import com.amcamp.global.exception.CommonException; -import com.amcamp.global.exception.errorcode.GlobalErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; import com.amcamp.global.exception.errorcode.TaskErrorCode; @@ -136,7 +133,7 @@ class 스프린트_생성할_때 { // when & then assertThatThrownBy(() -> sprintService.createSprint(request)) .isInstanceOf(CommonException.class) - .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_INVALID.getMessage()); + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_EXCEEDS_PROJECT_END.getMessage()); } @Test @@ -148,7 +145,7 @@ class 스프린트_생성할_때 { // when assertThatThrownBy(() -> sprintService.createSprint(request)) .isInstanceOf(CommonException.class) - .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_BEFORE_START.getMessage()); } @Test @@ -173,10 +170,10 @@ class 스프린트_수정할_때 { @Test void 스프린트가_존재하지_않으면_예외가_발생한다() { // given - SprintBasicUpdateRequest request = new SprintBasicUpdateRequest("testGoal"); + SprintUpdateRequest request = new SprintUpdateRequest("testGoal", null); // when & then - assertThatThrownBy(() -> sprintService.updateSprintBasicInfo(2L, request)) + assertThatThrownBy(() -> sprintService.updateSprint(2L, request)) .isInstanceOf(CommonException.class) .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); } @@ -186,15 +183,13 @@ class 스프린트_수정할_때 { // given sprintRepository.save( Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); - SprintToDoUpdateRequest request = - new SprintToDoUpdateRequest(LocalDate.of(2026, 2, 28), null); + SprintUpdateRequest request = new SprintUpdateRequest(null, LocalDate.of(2026, 2, 28)); // when - SprintInfoResponse response = sprintService.updateSprintToDoInfo(1L, request); + SprintInfoResponse response = sprintService.updateSprint(1L, request); // then assertThat(response.dueDt()).isEqualTo(LocalDate.of(2026, 2, 28)); - assertThat(response.status()).isEqualTo(ToDoStatus.ON_GOING); assertThat(response.title()).isEqualTo("testTitle"); } @@ -203,13 +198,12 @@ class 스프린트_수정할_때 { // given sprintRepository.save( Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); - SprintToDoUpdateRequest request = - new SprintToDoUpdateRequest(LocalDate.of(2030, 1, 1), null); + SprintUpdateRequest request = new SprintUpdateRequest(null, LocalDate.of(2030, 1, 1)); // when & then - assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) + assertThatThrownBy(() -> sprintService.updateSprint(1L, request)) .isInstanceOf(CommonException.class) - .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_INVALID.getMessage()); + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_EXCEEDS_PROJECT_END.getMessage()); } @Test @@ -217,13 +211,12 @@ class 스프린트_수정할_때 { // given sprintRepository.save( Sprint.createSprint(project, "testTitle", "testDescription", dueDt)); - SprintToDoUpdateRequest request = - new SprintToDoUpdateRequest(LocalDate.of(2024, 1, 1), null); + SprintUpdateRequest request = new SprintUpdateRequest(null, LocalDate.of(2024, 1, 1)); // when & then - assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) + assertThatThrownBy(() -> sprintService.updateSprint(1L, request)) .isInstanceOf(CommonException.class) - .hasMessage(GlobalErrorCode.INVALID_DATE_ERROR.getMessage()); + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_BEFORE_START.getMessage()); } @Test @@ -233,13 +226,12 @@ class 스프린트_수정할_때 { Sprint.createSprint(project, "sprint 1", "sprint 1", LocalDate.now())); sprintRepository.save(Sprint.createSprint(project, "sprint 2", "sprint 2", dueDt)); - SprintToDoUpdateRequest request = - new SprintToDoUpdateRequest(LocalDate.of(2026, 1, 1), null); + SprintUpdateRequest request = new SprintUpdateRequest(null, LocalDate.of(2026, 1, 1)); // when & then - assertThatThrownBy(() -> sprintService.updateSprintToDoInfo(1L, request)) + assertThatThrownBy(() -> sprintService.updateSprint(1L, request)) .isInstanceOf(CommonException.class) - .hasMessage(SprintErrorCode.NEXT_SPRINT_ALREADY_EXISTS.getMessage()); + .hasMessage(SprintErrorCode.SPRINT_DUE_DATE_CONFLICT_WITH_NEXT.getMessage()); } } From 82abe9d8d8cb907665eefaa1cc45c272c5b3fb3c Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 6 Apr 2025 16:54:20 +0900 Subject: [PATCH 079/107] =?UTF-8?q?fix:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=ED=8E=98=EC=9D=B4=EC=A7=95=20=EB=B0=A9=ED=96=A5=20?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=88=84=EB=9D=BD=EC=9C=BC=EB=A1=9C=20?= =?UTF-8?q?=EC=9D=B8=ED=95=9C=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95=20(#169)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 기존 lastSprintId 기반 단방향 페이징을 direction 기반 양방향 구조로 수정 * test: 스프린트 목록 조회 테스트 코드 수정 * refactor: 스프린트 목록 조회 query 리팩토링 --- .../domain/sprint/api/SprintController.java | 19 +- .../sprint/application/SprintService.java | 22 ++- .../sprint/dao/SprintPagingDirection.java | 6 + .../sprint/dao/SprintRepositoryCustom.java | 8 +- .../sprint/dao/SprintRepositoryImpl.java | 174 +++++++++--------- .../exception/errorcode/SprintErrorCode.java | 7 + .../sprint/application/SprintServiceTest.java | 65 ++----- 7 files changed, 154 insertions(+), 147 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/sprint/dao/SprintPagingDirection.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index fc8fa99c..83e9738a 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -1,6 +1,7 @@ package com.amcamp.domain.sprint.api; import com.amcamp.domain.sprint.application.SprintService; +import com.amcamp.domain.sprint.dao.SprintPagingDirection; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; @@ -55,19 +56,25 @@ public SprintInfoResponse sprintFind(@PathVariable Long sprintId) { @GetMapping("/{projectId}/project") public Slice sprintFindAll( @PathVariable Long projectId, - @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") + @Parameter(description = "기준이 되는 스프린트 ID입니다. 첫 요청 시에는 비워두세요.") @RequestParam(required = false) - Long lastSprintId) { - return sprintService.findAllSprint(projectId, lastSprintId); + Long baseSprintId, + @Parameter(description = "페이징 방향입니다.(NEXT 또는 PREV) 첫 요청 시에는 비워두세요.") + @RequestParam(required = false) + SprintPagingDirection direction) { + return sprintService.findAllSprint(projectId, baseSprintId, direction); } @Operation(summary = "회원별 프로젝트 내 스프린트 목록 조회", description = "마이페이지에서 특정 프로젝트의 스프린트 목록을 조회합니다.") @GetMapping("/{projectId}/me") public Slice sprintFindAllByMember( @PathVariable Long projectId, - @Parameter(description = "이전 페이지의 스프린트 ID (첫 페이지는 비워두세요)") + @Parameter(description = "기준이 되는 스프린트 ID입니다. 첫 요청 시에는 비워두세요.") + @RequestParam(required = false) + Long baseSprintId, + @Parameter(description = "페이징 방향입니다.(NEXT 또는 PREV) 첫 요청 시에는 비워두세요.") @RequestParam(required = false) - Long lastSprintId) { - return sprintService.findAllSprintByMember(projectId, lastSprintId); + SprintPagingDirection direction) { + return sprintService.findAllSprintByMember(projectId, baseSprintId, direction); } } diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index dd794f74..ebffebb6 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -6,6 +6,7 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.sprint.dao.SprintPagingDirection; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; @@ -108,7 +109,8 @@ public SprintInfoResponse findSprint(Long sprintId) { } @Transactional(readOnly = true) - public Slice findAllSprint(Long projectId, Long lastSprintId) { + public Slice findAllSprint( + Long projectId, Long baseSprintId, SprintPagingDirection direction) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); @@ -116,19 +118,24 @@ public Slice findAllSprint(Long projectId, Long lastSprint .findByMemberAndTeam(currentMember, project.getTeam()) .orElseThrow(() -> new CommonException(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED)); - return sprintRepository.findAllSprintByProjectId(projectId, lastSprintId); + validatePagingRequest(baseSprintId, direction); + + return sprintRepository.findAllSprintByProjectId(projectId, baseSprintId, direction); } @Transactional(readOnly = true) - public Slice findAllSprintByMember(Long projectId, Long lastSprintId) { + public Slice findAllSprintByMember( + Long projectId, Long baseSprintId, SprintPagingDirection direction) { final Member currentMember = memberUtil.getCurrentMember(); final Project project = findByProjectId(projectId); ProjectParticipant participant = validateProjectParticipant(project, project.getTeam(), currentMember); + validatePagingRequest(baseSprintId, direction); + return sprintRepository.findAllSprintByProjectIdAndAssignee( - projectId, lastSprintId, participant); + projectId, baseSprintId, direction, participant); } private Sprint findBySprintId(Long sprintId) { @@ -189,4 +196,11 @@ private void validateDueDtIfNextSprintExists(Project project, LocalDate dueDt, L } } } + + private void validatePagingRequest(Long baseSprintId, SprintPagingDirection direction) { + boolean onlyOnePresent = (baseSprintId == null) != (direction == null); + if (onlyOnePresent) { + throw new CommonException(SprintErrorCode.INVALID_PAGING_REQUEST); + } + } } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintPagingDirection.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintPagingDirection.java new file mode 100644 index 00000000..2951fa47 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintPagingDirection.java @@ -0,0 +1,6 @@ +package com.amcamp.domain.sprint.dao; + +public enum SprintPagingDirection { + NEXT, + PREV +} diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java index 89a6aa1e..de483fe2 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java @@ -5,8 +5,12 @@ import org.springframework.data.domain.Slice; public interface SprintRepositoryCustom { - Slice findAllSprintByProjectId(Long projectId, Long lastSprintId); + Slice findAllSprintByProjectId( + Long projectId, Long baseSprintId, SprintPagingDirection direction); Slice findAllSprintByProjectIdAndAssignee( - Long projectId, Long lastSprintId, ProjectParticipant participant); + Long projectId, + Long baseSprintId, + SprintPagingDirection direction, + ProjectParticipant participant); } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index 652c2b1d..b0f382b3 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -8,6 +8,7 @@ import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.SprintErrorCode; +import com.querydsl.core.types.OrderSpecifier; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.Expressions; @@ -28,50 +29,76 @@ public class SprintRepositoryImpl implements SprintRepositoryCustom { private final JPAQueryFactory jpaQueryFactory; @Override - public Slice findAllSprintByProjectId(Long projectId, Long lastSprintId) { - List results = - jpaQueryFactory - .select( - Projections.constructor( - SprintDetailResponse.class, - sprint.id, - sprint.title, - sprint.goal, - sprint.startDt, - sprint.dueDt, - sprint.progress.intValue(), - Expressions.constant(Collections.emptyList()))) - .from(sprint) - .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) - .orderBy(sprint.title.asc()) - .limit(2) - .fetch(); + public Slice findAllSprintByProjectId( + Long projectId, Long baseSprintId, SprintPagingDirection direction) { + List sprintList = fetchSprintList(projectId, baseSprintId, direction); + List taskList = fetchTaskList(sprintList.get(0).id()); - if (results.isEmpty()) { - throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); - } + List results = convertToSprintDetails(sprintList, taskList); - List taskList = fetchTaskList(results.get(0).id()); - - List finalResult = - results.stream() - .map( - sprint -> - new SprintDetailResponse( - sprint.id(), - sprint.title(), - sprint.goal(), - sprint.startDt(), - sprint.dueDt(), - sprint.progress(), - taskList)) - .collect(Collectors.toList()); - return checkLastPage(finalResult); + return checkLastPage(results); } @Override public Slice findAllSprintByProjectIdAndAssignee( - Long projectId, Long lastSprintId, ProjectParticipant participant) { + Long projectId, + Long baseSprintId, + SprintPagingDirection direction, + ProjectParticipant participant) { + List sprintList = fetchSprintList(projectId, baseSprintId, direction); + List taskList = + fetchTaskListByAssignee(sprintList.get(0).id(), participant); + + List results = convertToSprintDetails(sprintList, taskList); + + return checkLastPage(results); + } + + private BooleanExpression buildPagingCondition( + Long baseSprintId, SprintPagingDirection direction) { + if (baseSprintId == null) { + return null; + } + return direction == SprintPagingDirection.NEXT + ? sprint.id.gt(baseSprintId) + : sprint.id.lt(baseSprintId); + } + + private OrderSpecifier getSprintPagingOrder(SprintPagingDirection direction) { + return (direction == null || direction == SprintPagingDirection.PREV) + ? sprint.id.desc() + : sprint.id.asc(); + } + + private Slice checkLastPage(List results) { + boolean hasNext = false; + + if (results.size() > 1) { + hasNext = true; + results.remove(1); + } + + return new SliceImpl<>(results, PageRequest.of(0, 1), hasNext); + } + + private List convertToSprintDetails( + List sprintList, List taskList) { + return sprintList.stream() + .map( + sprint -> + new SprintDetailResponse( + sprint.id(), + sprint.title(), + sprint.goal(), + sprint.startDt(), + sprint.dueDt(), + sprint.progress(), + taskList)) + .collect(Collectors.toList()); + } + + private List fetchSprintList( + Long projectId, Long baseSprintId, SprintPagingDirection direction) { List results = jpaQueryFactory .select( @@ -85,69 +112,38 @@ public Slice findAllSprintByProjectIdAndAssignee( sprint.progress.intValue(), Expressions.constant(Collections.emptyList()))) .from(sprint) - .where(lastSprintId(lastSprintId), sprint.project.id.eq(projectId)) - .orderBy(sprint.title.asc()) + .where( + buildPagingCondition(baseSprintId, direction), + sprint.project.id.eq(projectId)) + .orderBy(getSprintPagingOrder(direction)) .limit(2) .fetch(); if (results.isEmpty()) { - throw new CommonException(SprintErrorCode.SPRINT_NOT_FOUND); + if (direction == null) { + throw new CommonException(SprintErrorCode.SPRINT_NOT_EXISTS); + } + + switch (direction) { + case NEXT -> throw new CommonException(SprintErrorCode.NEXT_SPRINT_NOT_EXISTS); + case PREV -> throw new CommonException(SprintErrorCode.PREV_SPRINT_NOT_EXISTS); + } } - List taskList = - fetchTaskListByAssignee(results.get(0).id(), participant); - - List finalResult = - results.stream() - .map( - sprint -> - new SprintDetailResponse( - sprint.id(), - sprint.title(), - sprint.goal(), - sprint.startDt(), - sprint.dueDt(), - sprint.progress(), - taskList)) - .collect(Collectors.toList()); - return checkLastPage(finalResult); - } - - private BooleanExpression lastSprintId(Long sprintId) { - if (sprintId == null) { - return null; - } - return sprint.id.gt(sprintId); - } - - private Slice checkLastPage(List results) { - boolean hasNext = false; - - if (results.size() > 1) { - hasNext = true; - results.remove(1); - } - - return new SliceImpl<>(results, PageRequest.of(0, 1), hasNext); + return results; } private List fetchTaskList(Long sprintId) { - return jpaQueryFactory - .select( - Projections.constructor( - TaskBasicInfoResponse.class, - task.id, - task.description, - task.taskStatus, - task.sosStatus)) - .from(task) - .where(task.sprint.id.eq(sprintId)) - .orderBy(task.id.asc()) - .fetch(); + return fetchTaskListWithCondition(sprintId, null); } private List fetchTaskListByAssignee( Long sprintId, ProjectParticipant participant) { + return fetchTaskListWithCondition(sprintId, task.assignee.eq(participant)); + } + + private List fetchTaskListWithCondition( + Long sprintId, BooleanExpression condition) { return jpaQueryFactory .select( Projections.constructor( @@ -157,7 +153,7 @@ private List fetchTaskListByAssignee( task.taskStatus, task.sosStatus)) .from(task) - .where(task.sprint.id.eq(sprintId), task.assignee.eq(participant)) + .where(task.sprint.id.eq(sprintId), condition) .orderBy(task.id.asc()) .fetch(); } diff --git a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java index ad87e6d9..cb44d430 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/SprintErrorCode.java @@ -17,6 +17,13 @@ public enum SprintErrorCode implements BaseErrorCode { PREVIOUS_SPRINT_NOT_ENDED(HttpStatus.BAD_REQUEST, "이전 스프린트가 아직 종료되지 않았습니다."), SPRINT_DUE_DATE_CONFLICT_WITH_NEXT( HttpStatus.BAD_REQUEST, "다음 스프린트가 존재할 경우, 마감일은 그 이전이어야 합니다."), + + INVALID_PAGING_REQUEST( + HttpStatus.BAD_REQUEST, "baseSprintId와 direction은 함께 전달되어야 합니다. 첫 요청 시에는 둘 다 생략하세요."), + + SPRINT_NOT_EXISTS(HttpStatus.NOT_FOUND, "스프린트가 존재하지 않습니다."), + NEXT_SPRINT_NOT_EXISTS(HttpStatus.NOT_FOUND, "다음 스프린트가 존재하지 않습니다."), + PREV_SPRINT_NOT_EXISTS(HttpStatus.NOT_FOUND, "이전 스프린트가 존재하지 않습니다."), ; private final HttpStatus httpStatus; diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 957dd23a..f010349b 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -31,7 +31,6 @@ import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.SprintErrorCode; -import com.amcamp.global.exception.errorcode.TaskErrorCode; import com.amcamp.global.security.PrincipalDetails; import java.time.LocalDate; import java.util.List; @@ -291,7 +290,7 @@ class 프로젝트별_스프린트_목록을_조회할_때 { @Test void 프로젝트가_존재하지_않으면_예외가_발생한다() { // when & then - assertThatThrownBy(() -> sprintService.findAllSprint(999L, null)) + assertThatThrownBy(() -> sprintService.findAllSprint(999L, null, null)) .isInstanceOf(CommonException.class) .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); } @@ -307,40 +306,26 @@ class 프로젝트별_스프린트_목록을_조회할_때 { Sprint.createSprint(project, "3", "testDescription3", dueDt)); sprintRepository.saveAll(sprintList); - Sprint sprint = - sprintRepository - .findById(1L) - .orElseThrow( - () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + Sprint sprint = sprintRepository.findById(3L).get(); taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); - Task task = - taskRepository - .findById(1L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - ProjectParticipant participant = - projectParticipantRepository - .findById(1L) - .orElseThrow( - () -> - new CommonException( - ProjectErrorCode - .PROJECT_PARTICIPATION_REQUIRED)); + Task task = taskRepository.findById(1L).get(); + ProjectParticipant participant = projectParticipantRepository.findById(1L).get(); task.assignTask(participant); task.updateTaskStatus(); // when Slice results = - sprintService.findAllSprint(project.getId(), null); + sprintService.findAllSprint(project.getId(), null, null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") - .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + .containsExactlyInAnyOrder(tuple(3L, "3", "testDescription3")); assertThat(results.getContent().get(0).taskList().get(0).description()) .isEqualTo(task.getDescription()); @@ -358,63 +343,51 @@ class 회원별_스프린트_목록을_조회할_떄 { loginAs(newMember); // when & then - assertThatThrownBy(() -> sprintService.findAllSprintByMember(1L, null)) + assertThatThrownBy(() -> sprintService.findAllSprintByMember(1L, null, null)) .isInstanceOf(CommonException.class) .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); } @Test @Transactional - void 프로젝트가_존재한다면_첫_번째_스프린트를_반환한다() { + void 프로젝트가_존재한다면_마지막_스프린트를_반환한다() { // given List sprintList = List.of( - Sprint.createSprint(project, "1", "testDescription1", dueDt), - Sprint.createSprint(project, "2", "testDescription2", dueDt), - Sprint.createSprint(project, "3", "testDescription3", dueDt)); + Sprint.createSprint( + project, "1", "testDescription1", LocalDate.of(2026, 1, 1)), + Sprint.createSprint( + project, "2", "testDescription2", LocalDate.of(2026, 2, 1)), + Sprint.createSprint( + project, "3", "testDescription3", LocalDate.of(2026, 3, 1))); sprintRepository.saveAll(sprintList); - Sprint sprint = - sprintRepository - .findById(1L) - .orElseThrow( - () -> new CommonException(SprintErrorCode.SPRINT_NOT_FOUND)); + Sprint sprint = sprintRepository.findById(3L).get(); taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현1", TaskDifficulty.MID)); taskRepository.save(Task.createTask(sprint, "태스크 조회 기능 구현2", TaskDifficulty.MID)); - Task task = - taskRepository - .findById(2L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - ProjectParticipant participant = - projectParticipantRepository - .findById(1L) - .orElseThrow( - () -> - new CommonException( - ProjectErrorCode - .PROJECT_PARTICIPATION_REQUIRED)); + Task task = taskRepository.findById(1L).get(); + ProjectParticipant participant = projectParticipantRepository.findById(1L).get(); task.assignTask(participant); task.updateTaskStatus(); // when Slice results = - sprintService.findAllSprintByMember(project.getId(), null); + sprintService.findAllSprintByMember(project.getId(), null, null); // then assertThat(results.getSize()).isEqualTo(1); assertThat(results) .extracting("id", "title", "goal") - .containsExactlyInAnyOrder(tuple(1L, "1", "testDescription1")); + .containsExactlyInAnyOrder(tuple(3L, "3", "testDescription3")); assertThat(results.getContent().get(0).taskList().get(0).description()) .isEqualTo(task.getDescription()); assertThat(results.getContent().get(0).taskList().size()).isEqualTo(1); assertThat(results.getContent().get(0).progress()).isInstanceOf(Integer.class); - // assertThat(results.getContent().get(0).progress()).isEqualTo(50); } } } From a491f96e072e1f0e49eac321608666d62d7daace Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 7 Apr 2025 23:01:43 +0900 Subject: [PATCH 080/107] =?UTF-8?q?refactor:=20Docker=20=EB=84=A4=ED=8A=B8?= =?UTF-8?q?=EC=9B=8C=ED=81=AC=20=EB=AA=A8=EB=93=9C=20bridge=EB=A1=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=20(#161)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: docker network bridge로 변경 * fix: nginx.conf 파일 수정 --- docker-compose.yml | 14 +++++++++++--- nginx/default.conf | 2 +- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9b2635bd..64f72981 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -3,7 +3,8 @@ services: image: ${IMAGE_FULL_URL} container_name: ${DOCKERHUB_IMAGE_NAME} restart: always - network_mode: host + networks: + - devfit-net environment: - TZ=Asia/Seoul env_file: @@ -13,14 +14,21 @@ services: container_name: redis ports: - "6379:6379" - network_mode: host + networks: + - devfit-net environment: - TZ=Asia/Seoul nginx: image: "nginx:alpine" container_name: nginx - network_mode: host + networks: + - devfit-net environment: - TZ=Asia/Seoul volumes: - ./nginx/default.conf:/etc/nginx/conf.d/default.conf + +networks: + devfit-net: + external: true + name: devfit-net diff --git a/nginx/default.conf b/nginx/default.conf index be57a8cf..f9e9ab48 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -7,7 +7,7 @@ server { } location / { - proxy_pass http://localhost:8080; + proxy_pass http://backend:8080; proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; From c8a2294aa9f0cc413ce828f78d247900e99c94f4 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:07:11 +0900 Subject: [PATCH 081/107] =?UTF-8?q?fix:=20Docker=20bridge=20=EB=84=A4?= =?UTF-8?q?=ED=8A=B8=EC=9B=8C=ED=81=AC=20=EC=A0=84=ED=99=98=20=ED=9B=84=20?= =?UTF-8?q?Nginx=20502=20=EC=97=90=EB=9F=AC=20=EC=88=98=EC=A0=95=20(#171)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: nginx proxy_pass 대상 devfit-server로 수정 * fix: redis 컨테이너 포트 제거 * fix: nginx 컨테이너 80 포트 추가 * chore: 테스트 트리거 활성화 * chore: 테스트 트리거 제거 --- docker-compose.yml | 4 ++-- nginx/default.conf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 64f72981..03a596cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -12,8 +12,6 @@ services: redis: image: "redis:alpine" container_name: redis - ports: - - "6379:6379" networks: - devfit-net environment: @@ -21,6 +19,8 @@ services: nginx: image: "nginx:alpine" container_name: nginx + ports: + - "80:80" networks: - devfit-net environment: diff --git a/nginx/default.conf b/nginx/default.conf index f9e9ab48..ecbdad96 100644 --- a/nginx/default.conf +++ b/nginx/default.conf @@ -7,7 +7,7 @@ server { } location / { - proxy_pass http://backend:8080; + proxy_pass http://devfit-server:8080; proxy_redirect off; proxy_set_header X-Real-IP $remote_addr; From 19979c6b132b15a32b71df775c45053360a497ec Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:08:01 +0900 Subject: [PATCH 082/107] =?UTF-8?q?fix:=20=ED=83=9C=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=A7=84=ED=96=89=20=EC=83=81=ED=83=9C=EB=B3=84=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EC=82=AD=EC=A0=9C=20=EA=B6=8C=ED=95=9C=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20(#176)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/task/application/TaskService.java | 7 ++- .../amcamp/domain/task/TaskServiceTest.java | 58 +++++++++++-------- 2 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index d4c005d1..048bd846 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -220,14 +220,15 @@ private void validateTeamParticipant(Team team, Member currentMember) { private void validateTaskModify(ProjectParticipant participant, Task task) { if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED || task.getAssignee() != null) { - System.out.println(task.getAssignee().getProjectRole()); - System.out.println(task.getAssignee().getTeamParticipant().getMember().getId()); - if (!participant.getProjectRole().equals(ProjectParticipantRole.ADMIN) && !participant.equals(task.getAssignee())) { throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); } } + + if (task.getTaskStatus() == TaskStatus.COMPLETED) { + throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); + } } private ProjectParticipant validateProjectParticipant( diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index c35c449a..220a24d1 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -166,6 +166,13 @@ void setUp() { @Nested class 태스크_수정_시 { + @Test + void 태스크가_존재하지않으면_예외처리() { + assertThatThrownBy(() -> taskService.updateTaskStatus(1L)) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); + } + @Test @Transactional void 수정_권한이_없으면_예외처리() { @@ -192,10 +199,35 @@ class 태스크_수정_시 { } @Test - void 태스크가_존재하지않으면_예외처리() { - assertThatThrownBy(() -> taskService.updateTaskStatus(1L)) + @Transactional + void 태스크가_완료상태면_예외처리() { + // given + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + // when + task.assignTask(participant); + task.updateTaskStatus(); + + // then + assertThatThrownBy( + () -> + taskService.updateTaskBasicInfo( + 1L, + new TaskBasicInfoUpdateRequest( + "피그마 화면 설계 재수정", TaskDifficulty.HIGH))) .isInstanceOf(CommonException.class) - .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); + .hasMessage(TaskErrorCode.TASK_MODIFY_FORBIDDEN.getMessage()); + + assertThatThrownBy(() -> taskService.deleteTask(1L)) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_MODIFY_FORBIDDEN.getMessage()); } @Test @@ -226,26 +258,6 @@ class 태스크_수정_시 { .isEqualTo(taskBasicInfoUpdateRequest.taskDifficulty()); assertThat(response.taskStatus()).isEqualTo(TaskStatus.ON_GOING); assertThat(response.assignedStatus()).isEqualTo(AssignedStatus.ASSIGNED); - // assertThat(response.projectNickname()).isEqualTo(member.getNickname()); - - // when & then - finished - response = taskService.updateTaskStatus(1L); - assertThat(response.taskStatus()).isEqualTo(TaskStatus.COMPLETED); - - // when - delete - taskService.deleteTask(1L); - - // then - assertThatThrownBy( - () -> - taskRepository - .findById(1L) - .orElseThrow( - () -> - new CommonException( - TaskErrorCode.TASK_NOT_FOUND))) - .isInstanceOf(CommonException.class) - .hasMessage(TaskErrorCode.TASK_NOT_FOUND.getMessage()); } @Test From be7dd48980beddf02060bc770d2631275ed2b0bc Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 9 Apr 2025 10:10:38 +0900 Subject: [PATCH 083/107] =?UTF-8?q?chore:=20Swagger=20=EB=B3=B4=EC=95=88?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20(#167)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: swagger 접근 시 username/pwd 인증 * chore: local과 dev swagger 로그인 설정 분리 * chore: swagger username 관련 application.yml 수정 * chore: .zshrc 파일 삭제 * chore: swagger userdetail 테스트 환경에서 빈 생성 방지 설정 * chore: 환경변수 그룹화 --- .../config/security/WebSecurityConfig.java | 22 +++++++++++++++++++ .../global/config/swagger/SwaggerConfig.java | 17 ++++++++++++++ src/main/resources/application.yml | 4 ++++ 3 files changed, 43 insertions(+) diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 490e6f7e..5592da93 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -11,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; @@ -30,6 +31,27 @@ public class WebSecurityConfig { private final JwtTokenService jwtTokenService; private final CookieUtil cookieUtil; + @Bean + @Order(1) + public SecurityFilterChain swaggerSecurityFilterChain(HttpSecurity http) throws Exception { + + if (springEnvironmentHelper.isDevProfile()) { + http.securityMatcher("/swagger-ui/**", "/v3/api-docs/**") + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth.anyRequest().authenticated()) + .httpBasic(withDefaults()) + .sessionManagement( + session -> + session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + } else { + http.securityMatcher("/swagger-ui/**", "/v3/api-docs/**") + .csrf(AbstractHttpConfigurer::disable) + .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()); + } + + return http.build(); + } + @Bean public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { http.csrf(AbstractHttpConfigurer::disable) diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index 295b23c3..ad2cad08 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -12,8 +12,14 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springdoc.core.models.GroupedOpenApi; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; @Configuration @RequiredArgsConstructor @@ -68,4 +74,15 @@ private SecurityRequirement securityRequirement() { securityRequirement.addList("accessToken"); return securityRequirement; } + + @Profile({"dev", "local"}) + @Bean + public UserDetailsService userDetailsService( + @Value("${swagger.username}") String username, + @Value("${swagger.password}") String password) { + UserDetails user = + User.withUsername(username).password("{noop}" + password).roles("SWAGGER").build(); + + return new InMemoryUserDetailsManager(user); + } } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index eca14c62..f6bdb634 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -19,3 +19,7 @@ spring-doc: disable-swagger-default-url: true path: /swagger-ui doc-expansion : none + +swagger: + username: ${SWAGGER_USERNAME} + password: ${SWAGGER_PASSWORD} From 03bf20b3ee5e739228d995a45faac4c5be4750a0 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Wed, 9 Apr 2025 19:32:20 +0900 Subject: [PATCH 084/107] =?UTF-8?q?refactor:=20projectInfoResponse=20teamN?= =?UTF-8?q?ame=20=EC=B6=94=EA=B0=80=20(#180)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/project/dao/ProjectRepositoryImpl.java | 1 + .../project/dto/response/ProjectInfoResponse.java | 2 ++ .../sprint/dto/response/SprintProgressResponse.java | 11 +++++++++++ 3 files changed, 14 insertions(+) create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index e78a3fd7..8b1b9390 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -45,6 +45,7 @@ public Slice findAllByTeamIdWithPagination( ProjectInfoResponse.class, project.id, project.title, + project.team.name, project.description, project.startDt, project.dueDt), diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java index f8ac74e3..e3fbb0fd 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectInfoResponse.java @@ -7,6 +7,7 @@ public record ProjectInfoResponse( @Schema(description = "프로젝트 아이디", example = "1") Long projectId, @Schema(description = "프로젝트 제목", example = "Devfit") String projectTitle, + @Schema(description = "프로젝트가 속한 팀 이름", example = "1") String teamName, @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") String projectDescription, @Schema(description = "프로젝트 시작 날짜", example = "2024-01-01") LocalDate startDt, @@ -16,6 +17,7 @@ public static ProjectInfoResponse from(Project project) { return new ProjectInfoResponse( project.getId(), project.getTitle(), + project.getTeam().getName(), project.getDescription(), project.getStartDt(), project.getDueDt()); diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java new file mode 100644 index 00000000..7c9bd508 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintProgressResponse.java @@ -0,0 +1,11 @@ +package com.amcamp.domain.sprint.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record SprintProgressResponse( + @Schema(description = "스프린트 아이디", example = "1L") Long sprintId, + @Schema(description = "스프린트 진척도", example = "50.0") Double progress) { + public static SprintProgressResponse from(Long sprintId, Double progress) { + return new SprintProgressResponse(sprintId, progress); + } +} From ed4c59094e1fd741daa400f73aa9aa93b1cd4b2b Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 9 Apr 2025 21:20:02 +0900 Subject: [PATCH 085/107] =?UTF-8?q?fix:=20=ED=83=9C=EC=8A=A4=ED=81=AC=20so?= =?UTF-8?q?s=20=ED=9B=84=20=EB=B3=B8=EC=9D=B8=20=ED=95=A0=EB=8B=B9=20?= =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=EC=88=98=EC=A0=95=20(#178)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 태스크 sos 후 본인 할당 문제 수정 * fix: task 에러코드 메시지 수정 * fix: 에러코드 수정 --- .../domain/task/application/TaskService.java | 6 ++++ .../exception/errorcode/TaskErrorCode.java | 3 +- .../amcamp/domain/task/TaskServiceTest.java | 28 +++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index 048bd846..3d99560e 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -124,6 +124,12 @@ public TaskInfoResponse assignTask(Long taskId) { throw new CommonException(TaskErrorCode.TASK_ALREADY_ASSIGNED); } + if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED + && task.getAssignee() == projectParticipant + && task.getSosStatus() == SOSStatus.SOS) { + throw new CommonException(TaskErrorCode.TASK_ASSIGN_FORBIDDEN); + } + task.assignTask(projectParticipant); return findProjectParticipantMember(task) != null ? TaskInfoResponse.from(task, findProjectParticipantMember(task)) diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java index ea065eea..6c26b636 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java @@ -11,7 +11,8 @@ public enum TaskErrorCode implements BaseErrorCode { TASK_MODIFY_FORBIDDEN(HttpStatus.FORBIDDEN, "task 수정·삭제 권한이 없습니다. "), TASK_ALREADY_ASSIGNED(HttpStatus.FORBIDDEN, "이미 담당자가 존재하는 task입니다."), TASK_NOT_ASSIGNED(HttpStatus.FORBIDDEN, "아직 할당되지 않은 task입니다."), - TASK_ALREADY_COMPLETED(HttpStatus.FORBIDDEN, "이미 완료된 task입니다."); + TASK_ALREADY_COMPLETED(HttpStatus.FORBIDDEN, "이미 완료된 task입니다."), + TASK_ASSIGN_FORBIDDEN(HttpStatus.BAD_REQUEST, "본인에게 task를 할당할 수 없습니다"); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 220a24d1..c6a1920c 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -230,6 +230,34 @@ class 태스크_수정_시 { .hasMessage(TaskErrorCode.TASK_MODIFY_FORBIDDEN.getMessage()); } + @Test + @Transactional + void 태스크가_SOS상태이면서_본인을_할당하려는_경우_예외처리() { + // given + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + task.assignTask(participant); + task.updateTaskSOS(); + + // when & then (1) 자기자신을 할당하는 경우 + assertThatThrownBy(() -> taskService.assignTask(1L)) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_ASSIGN_FORBIDDEN.getMessage()); + + // when & then (2) 그렇지 않은 경우 + loginAs(newMember); + task.assignTask(newParticipant); + assertThat(task.getSosStatus()).isEqualTo(SOSStatus.NOT_SOS); + assertThat(task.getAssignee()).isEqualTo(newParticipant); + } + @Test void 정상적으로_기본_기한정보를_수정_한다() { // given From a4a2b47d74c52aa9374ee7c8ee4d8ec6cddb05f3 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Wed, 9 Apr 2025 21:36:49 +0900 Subject: [PATCH 086/107] =?UTF-8?q?fix:=20=ED=83=9C=EC=8A=A4=ED=81=AC=20?= =?UTF-8?q?=EC=99=84=EB=A3=8C=20=EC=B2=98=EB=A6=AC=20=ED=9B=84=20undo=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20&=20SOS=20=EC=83=81?= =?UTF-8?q?=ED=83=9C=20=ED=83=9C=EC=8A=A4=ED=81=AC=20=EC=99=84=EB=A3=8C=20?= =?UTF-8?q?=EC=8B=9C=20=EC=98=88=EC=99=B8=EC=B2=98=EB=A6=AC=20(#177)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 태스크 완료 처리 후 undo 기능 추가 & SOS 상태 태스크 완료 시 예외처리 * fix: 에러코드 수정 * fix: validateTaskModifyAcess 메소드 분리 --- .../domain/task/application/TaskService.java | 24 ++++++---- .../com/amcamp/domain/task/domain/Task.java | 3 ++ .../exception/errorcode/TaskErrorCode.java | 4 +- .../amcamp/domain/task/TaskServiceTest.java | 44 +++++++++++++++++++ 4 files changed, 64 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index 3d99560e..e7721bcb 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -76,11 +76,7 @@ public TaskInfoResponse updateTaskStatus(Long taskId) { ProjectParticipant participant = validateProjectParticipant(project, project.getTeam(), currentMember); - validateTaskModify(participant, task); - - if (task.getTaskStatus() == TaskStatus.COMPLETED) { - throw new CommonException(TaskErrorCode.TASK_ALREADY_COMPLETED); - } + validateTaskStatusModify(participant, task); task.updateTaskStatus(); Contribution contribution = validateContribution(sprint, participant); @@ -225,16 +221,26 @@ private void validateTeamParticipant(Team team, Member currentMember) { } private void validateTaskModify(ProjectParticipant participant, Task task) { + validateTaskModifyAccess(participant, task); + if (task.getTaskStatus() == TaskStatus.COMPLETED) { + throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); + } + } + + private void validateTaskStatusModify(ProjectParticipant participant, Task task) { + validateTaskModifyAccess(participant, task); + if (task.getSosStatus() == SOSStatus.SOS) { + throw new CommonException(TaskErrorCode.TASK_COMPLETE_FORBIDDEN); + } + } + + private void validateTaskModifyAccess(ProjectParticipant participant, Task task) { if (task.getAssignedStatus() != AssignedStatus.NOT_ASSIGNED || task.getAssignee() != null) { if (!participant.getProjectRole().equals(ProjectParticipantRole.ADMIN) && !participant.equals(task.getAssignee())) { throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); } } - - if (task.getTaskStatus() == TaskStatus.COMPLETED) { - throw new CommonException(TaskErrorCode.TASK_MODIFY_FORBIDDEN); - } } private ProjectParticipant validateProjectParticipant( diff --git a/src/main/java/com/amcamp/domain/task/domain/Task.java b/src/main/java/com/amcamp/domain/task/domain/Task.java index a4961bc0..157d050a 100644 --- a/src/main/java/com/amcamp/domain/task/domain/Task.java +++ b/src/main/java/com/amcamp/domain/task/domain/Task.java @@ -90,6 +90,9 @@ public void updateTaskBasicInfo(TaskBasicInfoUpdateRequest request) { public void updateTaskStatus() { if (this.taskStatus != TaskStatus.COMPLETED) this.taskStatus = TaskStatus.COMPLETED; + else { + this.taskStatus = TaskStatus.ON_GOING; + } } public void assignTask(ProjectParticipant projectParticipant) { diff --git a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java index 6c26b636..b3ada9e2 100644 --- a/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java +++ b/src/main/java/com/amcamp/global/exception/errorcode/TaskErrorCode.java @@ -11,8 +11,8 @@ public enum TaskErrorCode implements BaseErrorCode { TASK_MODIFY_FORBIDDEN(HttpStatus.FORBIDDEN, "task 수정·삭제 권한이 없습니다. "), TASK_ALREADY_ASSIGNED(HttpStatus.FORBIDDEN, "이미 담당자가 존재하는 task입니다."), TASK_NOT_ASSIGNED(HttpStatus.FORBIDDEN, "아직 할당되지 않은 task입니다."), - TASK_ALREADY_COMPLETED(HttpStatus.FORBIDDEN, "이미 완료된 task입니다."), - TASK_ASSIGN_FORBIDDEN(HttpStatus.BAD_REQUEST, "본인에게 task를 할당할 수 없습니다"); + TASK_ASSIGN_FORBIDDEN(HttpStatus.BAD_REQUEST, "본인에게 task를 할당할 수 없습니다"), + TASK_COMPLETE_FORBIDDEN(HttpStatus.BAD_REQUEST, "SOS 상태인 task는 완료 처리할 수 없습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index c6a1920c..942af049 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -258,6 +258,50 @@ class 태스크_수정_시 { assertThat(task.getAssignee()).isEqualTo(newParticipant); } + @Test + @Transactional + void 태스크가_SOS_상태면_예외처리() { + // given + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + task.assignTask(participant); + task.updateTaskSOS(); + + // when & then + assertThatThrownBy(() -> taskService.updateTaskStatus(1L)) + .isInstanceOf(CommonException.class) + .hasMessage(TaskErrorCode.TASK_COMPLETE_FORBIDDEN.getMessage()); + } + + @Test + void 정상적으로_완료된_태스크를_미완료처리한다() { + // given + TaskCreateRequest taskRequest = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + task.assignTask(participant); + task.updateTaskStatus(); + + // when + task.updateTaskStatus(); + + // then + assertThat(task.getTaskStatus()).isEqualTo(TaskStatus.ON_GOING); + } + @Test void 정상적으로_기본_기한정보를_수정_한다() { // given From 94a537ef859d092e2a090c7cb6a61d5e39b0540c Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 13 Apr 2025 00:20:03 +0900 Subject: [PATCH 087/107] =?UTF-8?q?feat:=20=EC=9A=B4=EC=98=81=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=20=EA=B5=AC=EC=84=B1=20(#182)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: prod 환경 지원을 위한 상수 및 profile 설정 추가 * feat: prod 환경에서 Swagger 인증 및 CORS 허용 도메인 설정 추가 * refactor: Swagger 인증용 InMemoryUserDetailsManager를 WebSecurityConfig로 이동 * feat: Swagger 인증 계정에 비밀번호 암호화 적용 * feat: feat: prod 환경 구성용 application-prod.yml 추가 * chore: 운영 환경 workflow 추가 * feat: Swagger 인증 환경 변수에 기본값 적용 --- .github/workflows/production_build_deploy.yml | 94 +++++++++++++++++++ .../global/common/constants/UrlConstants.java | 2 + .../config/security/WebSecurityConfig.java | 75 ++++++++++----- .../global/config/swagger/SwaggerConfig.java | 18 +--- .../helper/SpringEnvironmentHelper.java | 10 +- src/main/resources/application-prod.yml | 7 ++ src/main/resources/application.yml | 4 +- 7 files changed, 168 insertions(+), 42 deletions(-) create mode 100644 .github/workflows/production_build_deploy.yml create mode 100644 src/main/resources/application-prod.yml diff --git a/.github/workflows/production_build_deploy.yml b/.github/workflows/production_build_deploy.yml new file mode 100644 index 00000000..2c084105 --- /dev/null +++ b/.github/workflows/production_build_deploy.yml @@ -0,0 +1,94 @@ +name: Build and Deploy to Production + +on: + push: + tags: + - v*.*.* + +env: + DOCKERHUB_USERNAME: ht3064 + DOCKERHUB_IMAGE_NAME: devfit-server + +jobs: + build-deploy: + runs-on: ubuntu-latest + environment: production + + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Start Redis container for test + run: docker compose -f ./docker-compose-test.yml up -d + + - name: Grant execute permission for gradlew + run: chmod +x ./gradlew + + - name: Build with Gradle + uses: gradle/actions/setup-gradle@v3 + with: + arguments: build + cache-read-only: ${{ github.ref != 'refs/heads/main' && github.ref != 'refs/heads/develop' }} + + - name: Login to DockerHub + uses: docker/login-action@v3 + with: + username: ${{ env.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_ACCESS_TOKEN }} + + - name: Extract metadata for Docker + id: metadata + uses: docker/metadata-action@v5 + with: + images: ${{ env.DOCKERHUB_USERNAME }}/${{ env.DOCKERHUB_IMAGE_NAME }} + tags: | + type=semver,pattern={{version}} + flavor: | + latest=false + + - name: Build and Push Docker image + uses: docker/build-push-action@v6 + with: + context: . + push: true + tags: ${{ steps.metadata.outputs.tags }} + + - name: Copy docker-compose.yml to EC2 + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + source: docker-compose.yml + target: /home/ubuntu/ + + - name: Copy default.conf to EC2 + uses: appleboy/scp-action@v0.1.4 + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + source: nginx/default.conf + target: /home/ubuntu/ + + - name: Deploy to EC2 + uses: appleboy/ssh-action@master + env: + IMAGE_FULL_URL: ${{ steps.metadata.outputs.tags }} + DOCKERHUB_IMAGE_NAME: ${{ env.DOCKERHUB_IMAGE_NAME }} + with: + host: ${{ secrets.EC2_HOST }} + username: ${{ secrets.EC2_USERNAME }} + key: ${{ secrets.EC2_SSH_KEY }} + envs: IMAGE_FULL_URL, DOCKERHUB_IMAGE_NAME + script: | + echo "${{ secrets.DOCKERHUB_ACCESS_TOKEN }}" | docker login -u "${{ env.DOCKERHUB_USERNAME }}" --password-stdin + docker compose up -d + docker exec nginx nginx -s reload + docker image prune -a -f diff --git a/src/main/java/com/amcamp/global/common/constants/UrlConstants.java b/src/main/java/com/amcamp/global/common/constants/UrlConstants.java index c1e9a8a9..0a5fda99 100644 --- a/src/main/java/com/amcamp/global/common/constants/UrlConstants.java +++ b/src/main/java/com/amcamp/global/common/constants/UrlConstants.java @@ -1,9 +1,11 @@ package com.amcamp.global.common.constants; public final class UrlConstants { + public static final String PROD_SERVER_URL = "https://api.devfit.site"; public static final String DEV_SERVER_URL = "https://dev-api.devfit.site"; public static final String LOCAL_SERVER_URL = "http://localhost:8080"; + public static final String PROD_DOMAIN_URL = "https://www.devfit.site"; public static final String DEV_DOMAIN_URL = "https://www.dev.devfit.site"; public static final String LOCAL_DOMAIN_URL = "http://localhost:3000"; diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 5592da93..766fa101 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -9,13 +9,20 @@ import com.amcamp.global.security.JwtAuthenticationFilter; import com.amcamp.global.util.CookieUtil; import lombok.RequiredArgsConstructor; +import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; import org.springframework.core.annotation.Order; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.http.SessionCreationPolicy; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; import org.springframework.security.web.SecurityFilterChain; import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; import org.springframework.web.cors.CorsConfiguration; @@ -31,35 +38,56 @@ public class WebSecurityConfig { private final JwtTokenService jwtTokenService; private final CookieUtil cookieUtil; + @Value("${swagger.username}") + private String swaggerUsername; + + @Value("${swagger.password}") + private String swaggerPassword; + + private void defaultFilterChain(HttpSecurity http) throws Exception { + http.httpBasic(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .cors(withDefaults()) + .csrf(AbstractHttpConfigurer::disable) + .sessionManagement( + session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + } + + @Bean + public InMemoryUserDetailsManager inMemoryUserDetailsManager() { + UserDetails user = + User.withUsername(swaggerUsername) + .password(passwordEncoder().encode(swaggerPassword)) + .roles("SWAGGER") + .build(); + + return new InMemoryUserDetailsManager(user); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } + @Bean @Order(1) - public SecurityFilterChain swaggerSecurityFilterChain(HttpSecurity http) throws Exception { + @Profile({"prod", "dev", "local"}) + public SecurityFilterChain swaggerFilterChain(HttpSecurity http) throws Exception { + defaultFilterChain(http); - if (springEnvironmentHelper.isDevProfile()) { - http.securityMatcher("/swagger-ui/**", "/v3/api-docs/**") - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(auth -> auth.anyRequest().authenticated()) - .httpBasic(withDefaults()) - .sessionManagement( - session -> - session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); - } else { - http.securityMatcher("/swagger-ui/**", "/v3/api-docs/**") - .csrf(AbstractHttpConfigurer::disable) - .authorizeHttpRequests(auth -> auth.anyRequest().permitAll()); - } + http.securityMatcher("/swagger-ui/**", "/v3/api-docs/**").httpBasic(withDefaults()); + + http.authorizeHttpRequests( + springEnvironmentHelper.isProdProfile() || springEnvironmentHelper.isDevProfile() + ? auth -> auth.anyRequest().authenticated() + : auth -> auth.anyRequest().permitAll()); return http.build(); } @Bean - public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws Exception { - http.csrf(AbstractHttpConfigurer::disable) - .cors(withDefaults()) - .httpBasic(AbstractHttpConfigurer::disable) - .formLogin(AbstractHttpConfigurer::disable) - .sessionManagement( - session -> session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)); + public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception { + defaultFilterChain(http); http.authorizeHttpRequests( auth -> @@ -85,8 +113,11 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http) throws public CorsConfigurationSource corsConfigurationSource() { CorsConfiguration configuration = new CorsConfiguration(); + if (springEnvironmentHelper.isProdProfile()) { + configuration.addAllowedOriginPattern(UrlConstants.PROD_DOMAIN_URL); + } + if (springEnvironmentHelper.isDevProfile()) { - configuration.addAllowedOriginPattern(UrlConstants.DEV_SERVER_URL); configuration.addAllowedOriginPattern(UrlConstants.DEV_DOMAIN_URL); configuration.addAllowedOriginPattern(UrlConstants.LOCAL_DOMAIN_URL); } diff --git a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java index ad2cad08..dd65c010 100644 --- a/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java +++ b/src/main/java/com/amcamp/global/config/swagger/SwaggerConfig.java @@ -12,14 +12,8 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springdoc.core.models.GroupedOpenApi; -import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Profile; -import org.springframework.security.core.userdetails.User; -import org.springframework.security.core.userdetails.UserDetails; -import org.springframework.security.core.userdetails.UserDetailsService; -import org.springframework.security.provisioning.InMemoryUserDetailsManager; @Configuration @RequiredArgsConstructor @@ -52,6 +46,7 @@ private List getSwaggerServers() { private String getServerUrlByProfile() { return switch (springEnvironmentHelper.getCurrentProfile()) { + case "prod" -> UrlConstants.PROD_SERVER_URL; case "dev" -> UrlConstants.DEV_SERVER_URL; default -> UrlConstants.LOCAL_SERVER_URL; }; @@ -74,15 +69,4 @@ private SecurityRequirement securityRequirement() { securityRequirement.addList("accessToken"); return securityRequirement; } - - @Profile({"dev", "local"}) - @Bean - public UserDetailsService userDetailsService( - @Value("${swagger.username}") String username, - @Value("${swagger.password}") String password) { - UserDetails user = - User.withUsername(username).password("{noop}" + password).roles("SWAGGER").build(); - - return new InMemoryUserDetailsManager(user); - } } diff --git a/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java b/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java index 0beeb934..46c96ee3 100644 --- a/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java +++ b/src/main/java/com/amcamp/global/helper/SpringEnvironmentHelper.java @@ -12,11 +12,19 @@ public class SpringEnvironmentHelper { private final Environment environment; + public static final String PROD = "prod"; public static final String DEV = "dev"; public static final String LOCAL = "local"; public String getCurrentProfile() { - return getActiveProfiles().filter(profile -> profile.equals(DEV)).findFirst().orElse(LOCAL); + return getActiveProfiles() + .filter(profile -> profile.equals(PROD) || profile.equals(DEV)) + .findFirst() + .orElse(LOCAL); + } + + public Boolean isProdProfile() { + return getActiveProfiles().anyMatch(PROD::equals); } public Boolean isDevProfile() { diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml new file mode 100644 index 00000000..5564164c --- /dev/null +++ b/src/main/resources/application-prod.yml @@ -0,0 +1,7 @@ +spring: + config: + activate: + on-profile: "prod" + jpa: + hibernate: + ddl-auto: none diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index f6bdb634..ef7dbeb0 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -21,5 +21,5 @@ spring-doc: doc-expansion : none swagger: - username: ${SWAGGER_USERNAME} - password: ${SWAGGER_PASSWORD} + username: ${SWAGGER_USERNAME:default} + password: ${SWAGGER_PASSWORD:default} From 943c3703298e1f2af557e01da984ad755d4d8b55 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 13 Apr 2025 00:38:13 +0900 Subject: [PATCH 088/107] =?UTF-8?q?refactor:=20=EA=B0=9C=EB=B0=9C=20?= =?UTF-8?q?=EB=B0=8F=20=EC=9A=B4=EC=98=81=20=ED=99=98=EA=B2=BD=EC=97=90?= =?UTF-8?q?=EC=84=9C=20=EC=BF=A0=ED=82=A4=20=EC=84=A4=EC=A0=95=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=20(#184)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 운영 환경에서 Cookie SameSite 속성 Strict로 변경 * refactor: 개발 및 운영 환경에서 secure 속성 true로 변경 --- .../com/amcamp/global/util/CookieUtil.java | 20 +++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index a3c7ebf8..774eba94 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -2,20 +2,25 @@ import static com.amcamp.global.common.constants.SecurityConstants.REFRESH_TOKEN_COOKIE_NAME; +import com.amcamp.global.helper.SpringEnvironmentHelper; +import lombok.RequiredArgsConstructor; import org.springframework.boot.web.server.Cookie; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; @Component +@RequiredArgsConstructor public class CookieUtil { + private final SpringEnvironmentHelper springEnvironmentHelper; + public HttpHeaders generateRefreshTokenCookie(String refreshToken) { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken) .path("/") - .secure(false) - .sameSite(Cookie.SameSite.NONE.attributeValue()) + .secure(true) + .sameSite(determineSameSitePolicy()) .httpOnly(true) .build(); @@ -30,8 +35,8 @@ public HttpHeaders deleteRefreshTokenCookie() { ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") .path("/") .maxAge(0) - .secure(false) - .sameSite(Cookie.SameSite.NONE.attributeValue()) + .secure(true) + .sameSite(determineSameSitePolicy()) .httpOnly(true) .build(); @@ -40,4 +45,11 @@ public HttpHeaders deleteRefreshTokenCookie() { return headers; } + + private String determineSameSitePolicy() { + if (springEnvironmentHelper.isProdProfile()) { + return Cookie.SameSite.STRICT.attributeValue(); + } + return Cookie.SameSite.NONE.attributeValue(); + } } From 326ed5ee0a475c8faa2dd31bdd1fdd48318a7d0a Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sun, 13 Apr 2025 09:55:45 +0900 Subject: [PATCH 089/107] =?UTF-8?q?refactor:=20=EC=BF=A0=ED=82=A4=20CORS?= =?UTF-8?q?=20=EC=84=B8=ED=8C=85=20=EC=9E=84=EC=8B=9C=20=EC=99=84=ED=99=94?= =?UTF-8?q?=20(#186)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: cookie cors 설정 일시적 무력화 * refactor: cookie secure 설정 해제 --- src/main/java/com/amcamp/global/util/CookieUtil.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index 774eba94..c1a34650 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -19,8 +19,10 @@ public HttpHeaders generateRefreshTokenCookie(String refreshToken) { ResponseCookie refreshTokenCookie = ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, refreshToken) .path("/") - .secure(true) - .sameSite(determineSameSitePolicy()) + // .secure(true) + // .sameSite(determineSameSitePolicy()) + .secure(false) + .sameSite(Cookie.SameSite.NONE.attributeValue()) .httpOnly(true) .build(); @@ -35,8 +37,10 @@ public HttpHeaders deleteRefreshTokenCookie() { ResponseCookie.from(REFRESH_TOKEN_COOKIE_NAME, "") .path("/") .maxAge(0) - .secure(true) - .sameSite(determineSameSitePolicy()) + // .secure(true) + // .sameSite(determineSameSitePolicy()) + .secure(false) + .sameSite(Cookie.SameSite.NONE.attributeValue()) .httpOnly(true) .build(); From 1119788b7753c8ef4e2ed6ff256102d2a2f9d026 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sun, 13 Apr 2025 10:33:43 +0900 Subject: [PATCH 090/107] Refactor/185 cookie cors tmp (#187) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: cookie cors 설정 일시적 무력화 * refactor: cookie secure 설정 해제 * cors 검증 일시 무력화 * cors 운영 프로필에 local url cors 임시 허용 --- .../com/amcamp/global/config/security/WebSecurityConfig.java | 1 + src/main/java/com/amcamp/global/util/CookieUtil.java | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 766fa101..52aae518 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -115,6 +115,7 @@ public CorsConfigurationSource corsConfigurationSource() { if (springEnvironmentHelper.isProdProfile()) { configuration.addAllowedOriginPattern(UrlConstants.PROD_DOMAIN_URL); + configuration.addAllowedOriginPattern(UrlConstants.LOCAL_DOMAIN_URL); // API 연동 완료 후, 삭제 } if (springEnvironmentHelper.isDevProfile()) { diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index c1a34650..f8eae3cb 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -52,7 +52,8 @@ public HttpHeaders deleteRefreshTokenCookie() { private String determineSameSitePolicy() { if (springEnvironmentHelper.isProdProfile()) { - return Cookie.SameSite.STRICT.attributeValue(); + // return Cookie.SameSite.STRICT.attributeValue(); + return Cookie.SameSite.NONE.attributeValue(); } return Cookie.SameSite.NONE.attributeValue(); } From 33a8cefa331928efc17d51d7bb8dae4d06b355b9 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 13 Apr 2025 10:45:21 +0900 Subject: [PATCH 091/107] Revert "Refactor/185 cookie cors tmp (#187)" (#188) This reverts commit 1119788b7753c8ef4e2ed6ff256102d2a2f9d026. --- .../com/amcamp/global/config/security/WebSecurityConfig.java | 1 - src/main/java/com/amcamp/global/util/CookieUtil.java | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java index 52aae518..766fa101 100644 --- a/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java +++ b/src/main/java/com/amcamp/global/config/security/WebSecurityConfig.java @@ -115,7 +115,6 @@ public CorsConfigurationSource corsConfigurationSource() { if (springEnvironmentHelper.isProdProfile()) { configuration.addAllowedOriginPattern(UrlConstants.PROD_DOMAIN_URL); - configuration.addAllowedOriginPattern(UrlConstants.LOCAL_DOMAIN_URL); // API 연동 완료 후, 삭제 } if (springEnvironmentHelper.isDevProfile()) { diff --git a/src/main/java/com/amcamp/global/util/CookieUtil.java b/src/main/java/com/amcamp/global/util/CookieUtil.java index f8eae3cb..c1a34650 100644 --- a/src/main/java/com/amcamp/global/util/CookieUtil.java +++ b/src/main/java/com/amcamp/global/util/CookieUtil.java @@ -52,8 +52,7 @@ public HttpHeaders deleteRefreshTokenCookie() { private String determineSameSitePolicy() { if (springEnvironmentHelper.isProdProfile()) { - // return Cookie.SameSite.STRICT.attributeValue(); - return Cookie.SameSite.NONE.attributeValue(); + return Cookie.SameSite.STRICT.attributeValue(); } return Cookie.SameSite.NONE.attributeValue(); } From b6b3ebb0e1ff1728534d26182f12300e432d90da Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Sun, 13 Apr 2025 19:19:23 +0900 Subject: [PATCH 092/107] =?UTF-8?q?refactor:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B0=B8=EC=97=AC=EC=9E=90=20=EB=82=98=EA=B0=84=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=A5=BC=20UNKNOWN=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?=EB=B0=A9=EC=8B=9D=EC=97=90=EC=84=9C=20=EC=B0=B8=EC=97=AC=20?= =?UTF-8?q?=EC=83=81=ED=83=9C=EB=A1=9C=20=EA=B4=80=EB=A6=AC=ED=95=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EA=B0=9C=EC=84=A0=20(#191)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 프로젝트 참여자 프로필 필드 제거 및 참여 상태 필드 추가 * test: 프로젝트 참여자 필드 변경에 따른 테스트 코드 수정 * test: 프로젝트 서비스 테스트 코드 수정 * chore: 테스트 트리거 활성화 * chore: 테스트 트리거 제거 * test: 태스크 조회 테스트 코드 임시 주석 처리 --- .../response/ContributionInfoResponse.java | 4 +- .../feedback/application/FeedbackService.java | 4 +- .../project/application/ProjectService.java | 14 +- .../project/dao/ProjectRepositoryImpl.java | 16 +-- .../project/domain/ProjectParticipant.java | 29 ++-- .../domain/ProjectParticipantStatus.java | 14 ++ .../domain/ProjectParticipantUnknown.java | 11 -- .../ProjectParticipantInfoResponse.java | 15 +- .../domain/task/dao/TaskRepositoryImpl.java | 12 +- .../task/dto/response/TaskInfoResponse.java | 2 +- .../contribution/ContributionServiceTest.java | 18 +-- .../application/FeedbackServiceTest.java | 33 ++--- .../domain/project/ProjectServiceTest.java | 34 ++--- .../sprint/application/SprintServiceTest.java | 6 +- .../amcamp/domain/task/TaskServiceTest.java | 132 ++++++++---------- 15 files changed, 132 insertions(+), 212 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectParticipantStatus.java delete mode 100644 src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java diff --git a/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java b/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java index d121b276..01671c68 100644 --- a/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java +++ b/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java @@ -15,8 +15,8 @@ public static ContributionInfoResponse of(Contribution contribution, Double scor contribution.getId(), contribution.getSprint().getId(), contribution.getParticipant().getId(), - contribution.getParticipant().getProjectNickname(), - contribution.getParticipant().getProjectProfile(), + contribution.getParticipant().getTeamParticipant().getMember().getNickname(), + contribution.getParticipant().getTeamParticipant().getMember().getProfileImageUrl(), score.intValue()); } } diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java index 1a87f32d..ad027c5b 100644 --- a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -11,6 +11,7 @@ import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.domain.ProjectParticipantStatus; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -160,8 +161,7 @@ private ProjectParticipant validateProjectParticipant(Member member, Project pro } private void validateUnknownUser(ProjectParticipant participant) { - if (participant.getProjectNickname().equals("UNKNOWN_PROJECT_NICKNAME") - && participant.getProjectProfile().equals("UNKNOWN_PROJECT_PROFILE_URL")) { + if (participant.getStatus() == ProjectParticipantStatus.INACTIVE) { throw new CommonException(FeedbackErrorCode.PARTICIPANT_IS_UNKNOWN); } } diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 889e962f..e4dfced5 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -52,11 +52,7 @@ public void createProject(ProjectCreateRequest request) { projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipant, - project, - member.getNickname(), - member.getProfileImageUrl(), - ProjectParticipantRole.ADMIN)); + teamParticipant, project, ProjectParticipantRole.ADMIN)); } @Transactional(readOnly = true) @@ -111,7 +107,7 @@ public void deleteProjectParticipant(Long projectId) { projectParticipantRepository.deleteAllByProject(project); projectRepository.delete(project); } else { - participant.changeParticipantToUnknown(); + participant.changeStatus(ProjectParticipantStatus.INACTIVE); } } @@ -169,11 +165,7 @@ public void approveProjectRegistration(Long projectId, Long registrationId) { ProjectRegistration registration = getProjectRegistrationById(registrationId); projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - registration.getRequester(), - project, - registration.getRequester().getMember().getNickname(), - registration.getRequester().getMember().getProfileImageUrl(), - ProjectParticipantRole.MEMBER)); + registration.getRequester(), project, ProjectParticipantRole.MEMBER)); registration.updateStatus(ProjectRegistrationStatus.APPROVED); } diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index 8b1b9390..fd5198f4 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -78,9 +78,10 @@ public Slice findAllProjectParticipantByProject( Projections.constructor( ProjectParticipantInfoResponse.class, projectParticipant.id, - projectParticipant.projectNickname, - projectParticipant.projectProfile, - projectParticipant.projectRole)) + projectParticipant.teamParticipant.member.nickname, + projectParticipant.teamParticipant.member.profileImageUrl, + projectParticipant.projectRole, + projectParticipant.status)) .from(projectParticipant) .where( projectParticipant.project.id.eq(projectId), @@ -95,15 +96,6 @@ public Slice findAllProjectParticipantByProject( return checkLastPage(pageSize, results); } - private BooleanExpression participantCondition( - boolean isParticipant, TeamParticipant teamParticipant) { - if (isParticipant) { - return projectParticipant.teamParticipant.eq(teamParticipant); - } else { - return projectParticipant.teamParticipant.isNull(); - } - } - private BooleanExpression lastProjectCondition(Long projectId) { return (projectId == null) ? null : project.id.lt(projectId); } diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java index 35e3923b..4e140af7 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipant.java @@ -25,40 +25,32 @@ public class ProjectParticipant extends BaseTimeEntity { @JoinColumn(name = "project_id") private Project project; - private String projectNickname; - - private String projectProfile; - // 프로젝트 내 권한 @Enumerated(EnumType.STRING) private ProjectParticipantRole projectRole; + @Enumerated(EnumType.STRING) + private ProjectParticipantStatus status; + @Builder(access = AccessLevel.PRIVATE) private ProjectParticipant( TeamParticipant teamParticipant, Project project, - String projectNickname, - String projectProfile, - ProjectParticipantRole projectRole) { + ProjectParticipantRole projectRole, + ProjectParticipantStatus status) { this.teamParticipant = teamParticipant; this.project = project; - this.projectNickname = projectNickname; - this.projectProfile = projectProfile; this.projectRole = projectRole; + this.status = status; } public static ProjectParticipant createProjectParticipant( - TeamParticipant teamParticipant, - Project project, - String projectNickname, - String projectProfile, - ProjectParticipantRole projectRole) { + TeamParticipant teamParticipant, Project project, ProjectParticipantRole projectRole) { return ProjectParticipant.builder() .teamParticipant(teamParticipant) .project(project) - .projectNickname(projectNickname) - .projectProfile(projectProfile) .projectRole(projectRole) + .status(ProjectParticipantStatus.ACTIVE) .build(); } @@ -66,8 +58,7 @@ public void changeRole(ProjectParticipantRole projectRole) { this.projectRole = projectRole; } - public void changeParticipantToUnknown() { - this.projectNickname = String.valueOf(ProjectParticipantUnknown.NICKNAME); - this.projectProfile = String.valueOf(ProjectParticipantUnknown.PROFILE_URL); + public void changeStatus(ProjectParticipantStatus status) { + this.status = status; } } diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantStatus.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantStatus.java new file mode 100644 index 00000000..77b9719c --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantStatus.java @@ -0,0 +1,14 @@ +package com.amcamp.domain.project.domain; + +import lombok.AllArgsConstructor; +import lombok.Getter; + +@Getter +@AllArgsConstructor +public enum ProjectParticipantStatus { + ACTIVE("ACTIVE"), + INACTIVE("INACTIVE"), + ; + + private final String status; +} diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java b/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java deleted file mode 100644 index 0006d47c..00000000 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectParticipantUnknown.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.amcamp.domain.project.domain; - -import lombok.AllArgsConstructor; - -@AllArgsConstructor -public enum ProjectParticipantUnknown { - NICKNAME("UNKNOWN_PROJECT_NICKNAME"), - PROFILE_URL("UNKNOWN_PROJECT_PROFILE_URL"); - - private final String s; -} diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java index 44fade62..ff7bb113 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantInfoResponse.java @@ -2,19 +2,22 @@ import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.ProjectParticipantStatus; import io.swagger.v3.oas.annotations.media.Schema; public record ProjectParticipantInfoResponse( @Schema(description = "프로젝트 참여자 아이디", example = "1") Long projectParticipantId, - @Schema(description = "프로젝트 참여자 이름", example = "정선우") String projectNickname, + @Schema(description = "프로젝트 참여자 이름", example = "정선우") String nickname, @Schema(description = "프로젝트 참여자 이미지 url", example = "PreSigned URL") String profileImageUrl, - @Schema(description = "프로젝트 참여자 권한", example = "PROJECT_ADMIN") - ProjectParticipantRole role) { + @Schema(description = "프로젝트 참여자 권한", example = "PROJECT_ADMIN") ProjectParticipantRole role, + @Schema(description = "프로젝트 참여자 참여 상태", example = "ACTIVE") + ProjectParticipantStatus status) { public static ProjectParticipantInfoResponse from(ProjectParticipant participant) { return new ProjectParticipantInfoResponse( participant.getId(), - participant.getProjectNickname(), - participant.getProjectProfile(), - participant.getProjectRole()); + participant.getTeamParticipant().getMember().getNickname(), + participant.getTeamParticipant().getMember().getProfileImageUrl(), + participant.getProjectRole(), + participant.getStatus()); } } diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java index a9cad677..db102fa6 100644 --- a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java @@ -40,7 +40,7 @@ public Slice findBySprint(Long sprintId, Long lastTaskId, int task.sosStatus, getAssigneeId(task), getAssigneeNickname(task), - getAssigneeProfile(task))) + getAssigneeProfileImageUrl(task))) .from(task) .leftJoin(task.assignee) .where(task.sprint.id.eq(sprintId), lastTaskId(lastTaskId)) @@ -67,9 +67,7 @@ public Slice findBySprintAndAssignee( task.taskStatus, task.assignedStatus, task.sosStatus, - task.assignee.id, - task.assignee.projectNickname, - task.assignee.projectProfile)) + task.assignee.id)) .from(task) .where( task.sprint.id.eq(sprintId), @@ -92,14 +90,14 @@ public Expression getAssigneeId(QTask task) { public Expression getAssigneeNickname(QTask task) { return new CaseBuilder() .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) - .then(task.assignee.projectNickname) + .then(task.assignee.teamParticipant.member.nickname) .otherwise(Expressions.nullExpression()); } - private Expression getAssigneeProfile(QTask task) { + private Expression getAssigneeProfileImageUrl(QTask task) { return new CaseBuilder() .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) - .then(task.assignee.projectProfile) + .then(task.assignee.teamParticipant.member.profileImageUrl) .otherwise(Expressions.nullExpression()); } diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java index 359004e0..e6875923 100644 --- a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java @@ -14,7 +14,7 @@ public record TaskInfoResponse( @Schema(description = "태스크 담당 상태", example = "ASSIGNED") AssignedStatus assignedStatus, @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus, @Schema(description = "태스크 담당자 아이디", example = "1") Long memberId, - @Schema(description = "태스크 담당자 닉네임", example = "최현태") String projectNickname, + @Schema(description = "태스크 담당자 닉네임", example = "최현태") String nickname, @Schema(description = "태스크 담당자 프로필 url", example = "Presigned URL") String profileImageUrl) { diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java index 3d347201..03ec01ff 100644 --- a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -10,19 +10,16 @@ import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; -import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; -import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.domain.TaskDifficulty; import com.amcamp.domain.task.dto.request.TaskCreateRequest; -import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.dao.TeamRepository; import com.amcamp.domain.team.domain.Team; @@ -46,11 +43,8 @@ import org.springframework.security.core.userdetails.UserDetails; public class ContributionServiceTest extends IntegrationTest { - @Autowired private TeamService teamService; @Autowired private MemberRepository memberRepository; @Autowired private MemberUtil memberUtil; - @Autowired private ProjectService projectService; - @Autowired private SprintService sprintService; @Autowired private TaskService taskService; @Autowired private ContributionService contributionService; @Autowired private TeamRepository teamRepository; @@ -113,19 +107,11 @@ void setUp() { participant = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantAdmin, - project, - member.getNickname(), - member.getProfileImageUrl(), - ProjectParticipantRole.ADMIN)); + teamParticipantAdmin, project, ProjectParticipantRole.ADMIN)); newParticipant = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantUser, - project, - newMember.getNickname(), - newMember.getProfileImageUrl(), - ProjectParticipantRole.MEMBER)); + teamParticipantUser, project, ProjectParticipantRole.MEMBER)); sprint = sprintRepository.save( diff --git a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java index cd119627..c7d8fc50 100644 --- a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java +++ b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java @@ -16,6 +16,7 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.ProjectParticipantStatus; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -103,48 +104,32 @@ void setUp() { sender = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantAdmin, - project, - senderMember.getNickname(), - senderMember.getProfileImageUrl(), - ProjectParticipantRole.ADMIN)); + teamParticipantAdmin, project, ProjectParticipantRole.ADMIN)); receiver = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantUser, - project, - receiverMember.getNickname(), - receiverMember.getProfileImageUrl(), - ProjectParticipantRole.MEMBER)); + teamParticipantUser, project, ProjectParticipantRole.MEMBER)); anotherReceiver = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantUser, - anotherProject, - "test", - "test", - ProjectParticipantRole.ADMIN)); + teamParticipantUser, anotherProject, ProjectParticipantRole.ADMIN)); anotherSender = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantUser, - anotherProject, - "test", - "test", - ProjectParticipantRole.ADMIN)); + teamParticipantUser, anotherProject, ProjectParticipantRole.ADMIN)); unknownReceiver = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( teamParticipantUser, anotherProject, - "UNKNOWN_PROJECT_NICKNAME", - "UNKNOWN_PROJECT_PROFILE_URL", ProjectParticipantRole.MEMBER)); + unknownReceiver.changeStatus(ProjectParticipantStatus.INACTIVE); + sprint = sprintRepository.save( Sprint.createSprint(project, "testSprint", "testGoal", LocalDate.now())); @@ -262,11 +247,9 @@ class 피드백_메시지를_전송할_때 { } @Test + @Transactional void 프로젝트에서_나간_사용자에게_피드백_메시지를_전송하면_예외가_발생한다() { // given - // 로그인한 사용자를 project(2)에 참여중인 anotherSender로 변경 - setAuthenticatedUser(anotherSender.getTeamParticipant().getMember()); - FeedbackSendRequest request = new FeedbackSendRequest( sprint.getId(), unknownReceiver.getId(), feedbackMessage); diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index f7d33efb..cbaa3756 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -89,11 +89,7 @@ Project createTestProject() { projectRepository.save(Project.createProject(team, title, description, dueDt)); projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - participant, - project, - member.getNickname(), - "Profile", - ProjectParticipantRole.ADMIN)); + participant, project, ProjectParticipantRole.ADMIN)); return project; } @@ -105,11 +101,7 @@ Project createTestProject(Long teamId, Long teamParticipantId) { projectRepository.save(Project.createProject(team, title, description, dueDt)); projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - participant, - project, - member.getNickname(), - "Profile", - ProjectParticipantRole.ADMIN)); + participant, project, ProjectParticipantRole.ADMIN)); return project; } @@ -126,11 +118,7 @@ Project createTestProject( projectRepository.save(Project.createProject(team, title, description, dueDt)); projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - participant, - project, - member.getNickname(), - "Profile", - ProjectParticipantRole.ADMIN)); + participant, project, ProjectParticipantRole.ADMIN)); return project; } @@ -208,11 +196,7 @@ class 프로젝트_조회 { TeamParticipant participant = teamParticipantRepository.findById(2L).get(); projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - participant, - member1JoinProject, - "Nickname", - "Profile", - ProjectParticipantRole.MEMBER)); + participant, member1JoinProject, ProjectParticipantRole.MEMBER)); // when Slice response = projectService.getProjectListInfo(teamId, null, 10); @@ -633,7 +617,7 @@ class 프로젝트_가입_신청 { loginAs(member1); projectService.getProjectParticipantList(1L, null, 1).forEach(System.out::println); ProjectParticipantInfoResponse myInfo = projectService.getProjectParticipant(1L); - assertThat(myInfo.projectNickname()).isEqualTo(member1.getNickname()); + assertThat(myInfo.nickname()).isEqualTo(member1.getNickname()); assertThat(myInfo.role()).isEqualTo(ProjectParticipantRole.MEMBER); } @@ -664,7 +648,7 @@ class 프로젝트_가입_신청 { // then List requesterIds = projectService.getProjectParticipantList(1L, null, 3).stream() - .map(ProjectParticipantInfoResponse::projectNickname) + .map(ProjectParticipantInfoResponse::nickname) .toList(); assertThat(new HashSet<>(requesterIds)) @@ -747,7 +731,7 @@ void composeProjectMembers() { composeProjectMembers(); Long newAdminId = projectService.getProjectParticipantList(1L, null, 3).stream() - .filter(r -> !r.projectNickname().equals(memberAdmin.getNickname())) + .filter(r -> !r.nickname().equals(memberAdmin.getNickname())) .map(ProjectParticipantInfoResponse::projectParticipantId) .findAny() .get(); @@ -755,8 +739,8 @@ void composeProjectMembers() { projectService.changeProjectAdmin(1L, newAdminId); projectService.deleteProjectParticipant(1L); // then - assertThat(projectService.getProjectParticipant(1L).projectNickname()) - .isEqualTo(String.valueOf(ProjectParticipantUnknown.NICKNAME)); + assertThat(projectService.getProjectParticipant(1L).status()) + .isEqualTo(ProjectParticipantStatus.INACTIVE); } } } diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index f010349b..96db8e33 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -99,11 +99,7 @@ void setUp() { projectRepository.save(project); ProjectParticipant projectParticipant = ProjectParticipant.createProjectParticipant( - teamParticipant, - project, - member.getNickname(), - member.getProfileImageUrl(), - ProjectParticipantRole.ADMIN); + teamParticipant, project, ProjectParticipantRole.ADMIN); projectParticipantRepository.save(projectParticipant); } diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index 942af049..be5c1c59 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -6,17 +6,14 @@ import com.amcamp.IntegrationTest; import com.amcamp.domain.contribution.dao.ContributionRepository; import com.amcamp.domain.contribution.domain.Contribution; -import com.amcamp.domain.member.application.MemberService; import com.amcamp.domain.member.dao.MemberRepository; import com.amcamp.domain.member.domain.Member; import com.amcamp.domain.member.domain.OauthInfo; -import com.amcamp.domain.project.application.ProjectService; import com.amcamp.domain.project.dao.ProjectParticipantRepository; import com.amcamp.domain.project.dao.ProjectRepository; import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; -import com.amcamp.domain.sprint.application.SprintService; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.task.application.TaskService; @@ -43,19 +40,15 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; public class TaskServiceTest extends IntegrationTest { - @Autowired private MemberService memberService; @Autowired private TeamRepository teamRepository; @Autowired private MemberRepository memberRepository; @Autowired private MemberUtil memberUtil; - @Autowired private ProjectService projectService; @Autowired private ProjectRepository projectRepository; - @Autowired private SprintService sprintService; @Autowired private TeamService teamService; @Autowired private TaskService taskService; @Autowired private TaskRepository taskRepository; @@ -89,7 +82,9 @@ void setUp() { "testProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); - newMember = memberRepository.save(Member.createMember("member", null, null)); + newMember = + memberRepository.save( + Member.createMember("newNickname", "newProfileImageUrl", null)); UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); UsernamePasswordAuthenticationToken token = @@ -118,19 +113,11 @@ void setUp() { participant = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantAdmin, - project, - member.getNickname(), - member.getProfileImageUrl(), - ProjectParticipantRole.ADMIN)); + teamParticipantAdmin, project, ProjectParticipantRole.ADMIN)); newParticipant = projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( - teamParticipantUser, - project, - newMember.getNickname(), - newMember.getProfileImageUrl(), - ProjectParticipantRole.MEMBER)); + teamParticipantUser, project, ProjectParticipantRole.MEMBER)); sprint = sprintRepository.save( @@ -536,57 +523,62 @@ class 태스크_목록_조회_시 { .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } - @Test - void 프로젝트별로_조회한다() { - // given - Member member = memberUtil.getCurrentMember(); - TaskCreateRequest taskRequest1 = - new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); - taskService.createTask(taskRequest1); - TaskCreateRequest taskRequest2 = - new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); - taskService.createTask(taskRequest2); - - // when - Slice result = taskService.getTasksBySprint(1L, 0L, 3); - - // then - assertThat(result.getContent()).hasSize(2); - assertThat(result.getContent().get(0).memberId()).isEqualTo(null); - assertThat(result.getContent().get(0).projectNickname()).isEqualTo(null); - assertThat(result.getContent().get(0).profileImageUrl()).isEqualTo(null); - } - - @Test - void 멤버별로_조회한다() { - // given - Member member = memberUtil.getCurrentMember(); - TaskCreateRequest taskRequest1 = - new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); - taskService.createTask(taskRequest1); - TaskCreateRequest taskRequest2 = - new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); - taskService.createTask(taskRequest2); - - Task task = - taskRepository - .findById(1L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - - taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 - - Task task1 = - taskRepository - .findById(2L) - .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); - - taskService.assignTask(task1.getId()); // 첫번쨰 태스크에만 담당자 배정 - - // when - Slice result = taskService.getTasksByMember(1L, 0L, 3); - - // then - assertThat(result.getContent()).hasSize(2); - } + // @Test + // @Transactional + // void 프로젝트별로_조회한다() { + // // given + // List taskList = + // List.of(Task.createTask(sprint, "피그마 화면 설계 수정", TaskDifficulty.MID), + // Task.createTask(sprint, "mvp 완성", TaskDifficulty.HIGH)); + // taskRepository.saveAll(taskList); + // + // for (Task task : taskList) { + // task.assignTask(participant); + // } + // + // for (Task task : taskList) { + // System.out.println(task.getAssignee().getTeamParticipant().getMember().getNickname()); + // } + // + // // when + // Slice result = taskService.getTasksBySprint(1L, null, 3); + // + // // then + // assertThat(result.getContent()).hasSize(2); + // } + // + // @Test + // void 멤버별로_조회한다() { + // // given + // Member member = memberUtil.getCurrentMember(); + // TaskCreateRequest taskRequest1 = + // new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + // taskService.createTask(taskRequest1); + // TaskCreateRequest taskRequest2 = + // new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + // taskService.createTask(taskRequest2); + // + // Task task = + // taskRepository + // .findById(1L) + // .orElseThrow(() -> new + // CommonException(TaskErrorCode.TASK_NOT_FOUND)); + // + // taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 + // + // Task task1 = + // taskRepository + // .findById(2L) + // .orElseThrow(() -> new + // CommonException(TaskErrorCode.TASK_NOT_FOUND)); + // + // taskService.assignTask(task1.getId()); // 첫번쨰 태스크에만 담당자 배정 + // + // // when + // Slice result = taskService.getTasksByMember(1L, 0L, 3); + // + // // then + // assertThat(result.getContent()).hasSize(2); + // } } } From d6f0fb5da0a8e8c54be5f09172f9d468f951581e Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Sun, 13 Apr 2025 23:54:44 +0900 Subject: [PATCH 093/107] =?UTF-8?q?refactor:=20meetingInfoResponse=20?= =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=ED=95=84=EB=93=9C=EC=97=90=20meetingId=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20(#194)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amcamp/domain/meeting/dao/MeetingRepositoryImpl.java | 1 + .../domain/meeting/dto/response/MeetingInfoResponse.java | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java index 03475886..4e0153c2 100644 --- a/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/meeting/dao/MeetingRepositoryImpl.java @@ -26,6 +26,7 @@ public Slice findAllBySprintIdWithPagination( .select( Projections.constructor( MeetingInfoResponse.class, + meeting.id, meeting.title, meeting.meetingStart, meeting.meetingEnd)) diff --git a/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java b/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java index 2d2d211c..a25a36e5 100644 --- a/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java +++ b/src/main/java/com/amcamp/domain/meeting/dto/response/MeetingInfoResponse.java @@ -6,11 +6,15 @@ import java.time.LocalDateTime; public record MeetingInfoResponse( + @Schema(description = "미팅 아이디", example = "1") @NotNull Long meetingId, @Schema(description = "미팅 타이틀", example = "미팅 타이틀") @NotNull String meetingTitle, @Schema(description = "미팅 시작날짜, 시간", example = "회의 일시") @NotNull LocalDateTime meetingStart, @Schema(description = "미팅 종료날짜, 시간", example = "회의 일시") @NotNull LocalDateTime meetingEnd) { public static MeetingInfoResponse from(Meeting meeting) { return new MeetingInfoResponse( - meeting.getTitle(), meeting.getMeetingStart(), meeting.getMeetingEnd()); + meeting.getId(), + meeting.getTitle(), + meeting.getMeetingStart(), + meeting.getMeetingEnd()); } } From 8e403aa91c1b20e23395a2ccc256ee154730c3d7 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Mon, 14 Apr 2025 00:48:07 +0900 Subject: [PATCH 094/107] =?UTF-8?q?fix:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=20=EB=82=B4=20=ED=83=9C=EC=8A=A4=ED=81=AC=EA=B0=80=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=EB=90=98=EC=A7=80=20=EC=95=8A=EC=9D=84=20?= =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC=20?= =?UTF-8?q?&=20=ED=8C=80/=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8/=ED=83=9C?= =?UTF-8?q?=EC=8A=A4=ED=81=AC=20=EB=AA=85=20=EA=B8=80=EC=9E=90=EC=88=98=20?= =?UTF-8?q?=EC=A0=9C=ED=95=9C=20=20(#195)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: 팀/프로젝트/스프린트/태스크/미팅/회원 명 글자수 제한 * fix: 프로젝트 참가자 관련 필드 조인 수정 * fix: 기여도/태스크 dto 내 프로젝트 참가자 아이디 필드명 변경 * fix: 중복 메소드 제거 --- .../BasicContributionInfoResponse.java | 2 +- .../response/ContributionInfoResponse.java | 2 +- .../dto/request/MeetingCreateRequest.java | 6 +- .../request/MeetingTitleUpdateRequest.java | 6 +- .../dto/request/NicknameUpdateRequest.java | 5 +- .../dto/request/ProjectCreateRequest.java | 7 +- .../dto/request/ProjectUpdateRequest.java | 9 +- .../dto/request/SprintCreateRequest.java | 2 + .../domain/task/api/TaskController.java | 3 +- .../domain/task/application/TaskService.java | 3 +- .../domain/task/dao/TaskRepositoryCustom.java | 3 +- .../domain/task/dao/TaskRepositoryImpl.java | 41 +++--- .../request/TaskBasicInfoUpdateRequest.java | 5 +- .../task/dto/request/TaskCreateRequest.java | 2 + .../task/dto/response/TaskInfoResponse.java | 2 +- .../team/dto/request/TeamCreateRequest.java | 2 +- .../team/dto/request/TeamUpdateRequest.java | 2 +- .../contribution/ContributionServiceTest.java | 8 +- .../amcamp/domain/task/TaskServiceTest.java | 118 +++++++++--------- 19 files changed, 132 insertions(+), 96 deletions(-) diff --git a/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java b/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java index 9a0f185e..2ed474b8 100644 --- a/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java +++ b/src/main/java/com/amcamp/domain/contribution/dto/response/BasicContributionInfoResponse.java @@ -6,7 +6,7 @@ public record BasicContributionInfoResponse( @Schema(description = "기여도 아이디", example = "1") Long contributionId, @Schema(description = "스프린트 아이디", example = "1") Long sprintId, - @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "프로젝트 참여자 아이디", example = "1") Long projectParticipantId, @Schema(description = "기여도 점수", example = "68.1") int score) { public static BasicContributionInfoResponse of(Contribution contribution, Double score) { diff --git a/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java b/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java index 01671c68..9871bec5 100644 --- a/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java +++ b/src/main/java/com/amcamp/domain/contribution/dto/response/ContributionInfoResponse.java @@ -6,7 +6,7 @@ public record ContributionInfoResponse( @Schema(description = "기여도 아이디", example = "1") Long contributionId, @Schema(description = "스프린트 아이디", example = "1") Long sprintId, - @Schema(description = "멤버 아이디", example = "1") Long memberId, + @Schema(description = "프로젝트참여자 아이디", example = "1") Long projectParticipantId, @Schema(description = "멤버 닉네임", example = "최현태") String nickname, @Schema(description = "멤버 프로필 url", example = "Presigned URL") String profileImageUrl, @Schema(description = "기여도 점수", example = "68") int score) { diff --git a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java index 59df904a..f216619f 100644 --- a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java +++ b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingCreateRequest.java @@ -3,11 +3,15 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.time.LocalDateTime; public record MeetingCreateRequest( @Schema(description = "스프린트 아이디", example = "1") @NotNull Long sprintId, - @Schema(description = "미팅 타이틀", example = "중간 점검 회의") @NotBlank String title, + @Schema(description = "미팅 타이틀", example = "중간 점검 회의") + @Size(max = 15, message = "미팅 타이틀은 최대 15자까지 입력 가능합니다.") + @NotBlank + String title, @Schema(description = "미팅 시작 날짜/시간", example = "2026-03-01T15:17:00") @NotNull LocalDateTime meetingStart, @Schema(description = "미팅 종료 날짜/시간", example = "2026-03-01T15:18:00") @NotNull diff --git a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java index af07c278..b6e41a22 100644 --- a/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/meeting/dto/request/MeetingTitleUpdateRequest.java @@ -2,6 +2,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; public record MeetingTitleUpdateRequest( - @Schema(description = "수정된 미팅 타이틀", example = "중간 점검 회의") @NotBlank String title) {} + @Schema(description = "수정된 미팅 타이틀", example = "중간 점검 회의") + @Size(max = 15, message = "미팅 타이틀은 최대 15자까지 입력 가능합니다.") + @NotBlank + String title) {} diff --git a/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java b/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java index e1f2597c..e84ec142 100644 --- a/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/member/dto/request/NicknameUpdateRequest.java @@ -2,7 +2,10 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; public record NicknameUpdateRequest( - @NotBlank(message = "닉네임은 비워둘 수 없습니다.") @Schema(description = "닉네임", example = "최현태") + @NotBlank(message = "닉네임은 비워둘 수 없습니다.") + @Size(max = 10, message = "닉네임은 최대 10자까지 입력 가능합니다.") + @Schema(description = "닉네임", example = "최현태") String nickname) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java index 5490a54d..148403f8 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectCreateRequest.java @@ -4,14 +4,19 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.time.LocalDate; public record ProjectCreateRequest( @Schema(description = "팀 ID", example = "1") @NotNull Long teamId, - @Schema(description = "프로젝트 제목", example = "Devfit") @NotBlank String projectTitle, + @Schema(description = "프로젝트 제목", example = "Devfit") + @Size(max = 15, message = "프로젝트 제목은 최대 15자까지 입력 가능합니다.") + @NotBlank + String projectTitle, @Schema(description = "프로젝트 마감 날짜", example = "2027-01-01") @JsonFormat(shape = JsonFormat.Shape.STRING) @NotNull LocalDate dueDt, @Schema(description = "프로젝트 설명", example = "LG CNS AM Inspire Camp 사이드 프로젝트") + @Size(max = 100, message = "프로젝트 설명은 최대 100자까지 입력 가능합니다.") String projectDescription) {} diff --git a/src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java b/src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java index dc64230c..f2097b4a 100644 --- a/src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/project/dto/request/ProjectUpdateRequest.java @@ -1,9 +1,14 @@ package com.amcamp.domain.project.dto.request; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; import java.time.LocalDate; public record ProjectUpdateRequest( - @Schema(description = "수정된 텍스트", example = "new project title") String title, - @Schema(description = "수정된 텍스트", example = "new project description") String description, + @Schema(description = "수정된 프로젝트 제목", example = "new project title") + @Size(max = 15, message = "프로젝트 제목은 최대 15자까지 입력 가능합니다.") + String title, + @Schema(description = "수정된 프로젝트 설명", example = "new project description") + @Size(max = 100, message = "프로젝트 설명은 최대 100자까지 입력 가능합니다.") + String description, @Schema(description = "수정된 프로젝트 마감일자", example = "2026-04-01") LocalDate dueDt) {} diff --git a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java index 434b19d1..dd184bcb 100644 --- a/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java +++ b/src/main/java/com/amcamp/domain/sprint/dto/request/SprintCreateRequest.java @@ -4,12 +4,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; import java.time.LocalDate; public record SprintCreateRequest( @NotNull(message = "프로젝트 ID는 비워둘 수 없습니다.") @Schema(description = "프로젝트 ID", example = "1") Long projectId, @NotBlank(message = "스프린트 중간 목표는 비워둘 수 없습니다.") + @Size(max = 100, message = "스프린트 중간 목표는 최대 100자까지 입력 가능합니다.") @Schema(description = "중간 목표", example = "MVP 개발") String goal, @NotNull(message = "스프린트 마감 날짜는 비워둘 수 없습니다.") diff --git a/src/main/java/com/amcamp/domain/task/api/TaskController.java b/src/main/java/com/amcamp/domain/task/api/TaskController.java index c9b12cd6..ec0c546d 100644 --- a/src/main/java/com/amcamp/domain/task/api/TaskController.java +++ b/src/main/java/com/amcamp/domain/task/api/TaskController.java @@ -3,6 +3,7 @@ import com.amcamp.domain.task.application.TaskService; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; @@ -75,7 +76,7 @@ public Slice taskList( summary = "마이 페이지 내 스프린트별 태스크 조회", description = "멤버에 할당된 태스크를 스프린트 아이디값에 따라 불러 옵니다.") @GetMapping("/{sprintId}/me") - public Slice taskListByMember( + public Slice taskListByMember( @PathVariable Long sprintId, @Parameter(description = "이전 페이지의 마지막 태스크 ID (첫 페이지는 비워두세요)") @RequestParam(required = false) diff --git a/src/main/java/com/amcamp/domain/task/application/TaskService.java b/src/main/java/com/amcamp/domain/task/application/TaskService.java index e7721bcb..23b55a83 100644 --- a/src/main/java/com/amcamp/domain/task/application/TaskService.java +++ b/src/main/java/com/amcamp/domain/task/application/TaskService.java @@ -14,6 +14,7 @@ import com.amcamp.domain.task.domain.*; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.domain.Team; @@ -154,7 +155,7 @@ public Slice getTasksBySprint(Long sprintId, Long lastTaskId, } @Transactional(readOnly = true) - public Slice getTasksByMember(Long sprintId, Long lastTaskId, int size) { + public Slice getTasksByMember(Long sprintId, Long lastTaskId, int size) { final Member currentMember = memberUtil.getCurrentMember(); final Sprint sprint = findBySprintId(sprintId); final Project project = sprint.getProject(); diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java index df90fe8c..ea13ce82 100644 --- a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryCustom.java @@ -1,12 +1,13 @@ package com.amcamp.domain.task.dao; import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import org.springframework.data.domain.Slice; public interface TaskRepositoryCustom { Slice findBySprint(Long sprintId, Long lastTaskId, int pageSize); - Slice findBySprintAndAssignee( + Slice findBySprintAndAssignee( Long sprintId, ProjectParticipant assignee, Long lastTaskId, int pageSize); } diff --git a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java index db102fa6..564f97e8 100644 --- a/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/task/dao/TaskRepositoryImpl.java @@ -1,10 +1,15 @@ package com.amcamp.domain.task.dao; +import static com.amcamp.domain.member.domain.QMember.member; +import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; import static com.amcamp.domain.task.domain.QTask.task; +import static com.amcamp.domain.team.domain.QTeamParticipant.teamParticipant; +import com.amcamp.domain.member.domain.QMember; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.task.domain.AssignedStatus; import com.amcamp.domain.task.domain.QTask; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import com.querydsl.core.types.Expression; import com.querydsl.core.types.Projections; @@ -39,35 +44,32 @@ public Slice findBySprint(Long sprintId, Long lastTaskId, int task.assignedStatus, task.sosStatus, getAssigneeId(task), - getAssigneeNickname(task), - getAssigneeProfileImageUrl(task))) + getAssigneeNickname(member), + getAssigneeProfileImageUrl(member))) .from(task) - .leftJoin(task.assignee) + .leftJoin(task.assignee, projectParticipant) + .leftJoin(projectParticipant.teamParticipant, teamParticipant) + .leftJoin(teamParticipant.member, member) .where(task.sprint.id.eq(sprintId), lastTaskId(lastTaskId)) .orderBy(task.createdDt.asc()) .limit(size + 1) .fetch(); - System.out.println("조회된 Task 개수: " + results.size()); return checkLastPage(size, results); } @Override - public Slice findBySprintAndAssignee( + public Slice findBySprintAndAssignee( Long sprintId, ProjectParticipant assignee, Long lastTaskId, int size) { - List results = + List results = jpaQueryFactory .select( Projections.constructor( - TaskInfoResponse.class, + TaskBasicInfoResponse.class, task.id, task.description, - task.taskDifficulty, - task.dueDt, task.taskStatus, - task.assignedStatus, - task.sosStatus, - task.assignee.id)) + task.sosStatus)) .from(task) .where( task.sprint.id.eq(sprintId), @@ -87,17 +89,17 @@ public Expression getAssigneeId(QTask task) { .otherwise(Expressions.nullExpression()); } - public Expression getAssigneeNickname(QTask task) { + public Expression getAssigneeNickname(QMember member) { return new CaseBuilder() - .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) - .then(task.assignee.teamParticipant.member.nickname) + .when(member.isNotNull()) + .then(member.nickname) .otherwise(Expressions.nullExpression()); } - private Expression getAssigneeProfileImageUrl(QTask task) { + private Expression getAssigneeProfileImageUrl(QMember member) { return new CaseBuilder() - .when(task.assignedStatus.eq(AssignedStatus.ASSIGNED)) - .then(task.assignee.teamParticipant.member.profileImageUrl) + .when(member.isNotNull()) + .then(member.profileImageUrl) .otherwise(Expressions.nullExpression()); } @@ -108,14 +110,13 @@ private BooleanExpression lastTaskId(Long taskId) { return task.id.gt(taskId); } - private Slice checkLastPage(int pageSize, List results) { + private Slice checkLastPage(int pageSize, List results) { boolean hasNext = false; if (results.size() > pageSize) { hasNext = true; results.remove(pageSize); } - return new SliceImpl<>(results, PageRequest.of(0, pageSize), hasNext); } } diff --git a/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java b/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java index 267f8d3c..5c47e625 100644 --- a/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/task/dto/request/TaskBasicInfoUpdateRequest.java @@ -2,7 +2,10 @@ import com.amcamp.domain.task.domain.TaskDifficulty; import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; public record TaskBasicInfoUpdateRequest( - @Schema(description = "태스크 내용", example = "피그마 화면 설계 1차 수정") String description, + @Schema(description = "태스크 내용", example = "피그마 화면 설계 1차 수정") + @Size(max = 15, message = "태스크 내용은 최대 15자까지 입력 가능합니다.") + String description, @Schema(description = "태스크 난이도", example = "HIGH") TaskDifficulty taskDifficulty) {} diff --git a/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java b/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java index 877d7d3a..7f28cdab 100644 --- a/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java +++ b/src/main/java/com/amcamp/domain/task/dto/request/TaskCreateRequest.java @@ -4,12 +4,14 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; public record TaskCreateRequest( @NotNull(message = "스프린트 ID는 필수값입니다.") @Schema(description = "스프린트 ID", example = "1") Long sprintId, @NotBlank(message = "태스크 내용은 필수값입니다.") @Schema(description = "태스크 내용", example = "피그마 화면 설계 수정") + @Size(max = 15, message = "태스크 내용은 최대 15자까지 입력 가능합니다.") String description, @NotNull(message = "태스크 난이도는 필수값입니다.") @Schema(description = "태스크 난이도", example = "MID") TaskDifficulty taskDifficulty) {} diff --git a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java index e6875923..625137ee 100644 --- a/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java +++ b/src/main/java/com/amcamp/domain/task/dto/response/TaskInfoResponse.java @@ -13,7 +13,7 @@ public record TaskInfoResponse( @Schema(description = "태스크 진행 현황", example = "ON_GOING") TaskStatus taskStatus, @Schema(description = "태스크 담당 상태", example = "ASSIGNED") AssignedStatus assignedStatus, @Schema(description = "태스크 SOS 상태", example = "SOS") SOSStatus sosStatus, - @Schema(description = "태스크 담당자 아이디", example = "1") Long memberId, + @Schema(description = "태스크 담당자 아이디", example = "1") Long projectParticipantId, @Schema(description = "태스크 담당자 닉네임", example = "최현태") String nickname, @Schema(description = "태스크 담당자 프로필 url", example = "Presigned URL") String profileImageUrl) { diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java index 9bd6e040..64f5bab6 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamCreateRequest.java @@ -6,7 +6,7 @@ public record TeamCreateRequest( @NotBlank(message = "팀 이름은 필수 사항입니다.") - @Size(max = 15, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Size(max = 15, message = "팀 이름은 최대 15자까지 입력 가능합니다.") @Schema(description = "팀 이름", example = "Side Effect") String teamName, @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") diff --git a/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java b/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java index a6ef3165..1757d05d 100644 --- a/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java +++ b/src/main/java/com/amcamp/domain/team/dto/request/TeamUpdateRequest.java @@ -4,7 +4,7 @@ import jakarta.validation.constraints.Size; public record TeamUpdateRequest( - @Size(max = 15, message = "팀 이름은 최대 25자까지 입력 가능합니다.") + @Size(max = 15, message = "팀 이름은 최대 15자까지 입력 가능합니다.") @Schema(description = "팀 이름", example = "Side Effect") String teamName, @Size(max = 100, message = "팀 설명은 최대 100자까지 입력 가능합니다.") diff --git a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java index 03ec01ff..71f21521 100644 --- a/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java +++ b/src/test/java/com/amcamp/domain/contribution/ContributionServiceTest.java @@ -195,10 +195,10 @@ class 개별_기여도_조회_시 { @Test void 프로젝트_참여자라면_기여도_반환() { - Member member = memberUtil.getCurrentMember(); BasicContributionInfoResponse basicContributionInfoResponse = contributionService.getContributionByMember(1L, 1L); - assertThat(basicContributionInfoResponse.memberId()).isEqualTo(member.getId()); + assertThat(basicContributionInfoResponse.projectParticipantId()) + .isEqualTo(participant.getId()); assertThat(basicContributionInfoResponse.score()).isEqualTo(61); } } @@ -234,10 +234,10 @@ class 프로젝트_기여도_조회_시 { @Test void 팀_참여자라면_기여도_반환() { - Member member = memberUtil.getCurrentMember(); List contributionInfoResponse = contributionService.getContributionBySprint(1L); - assertThat(contributionInfoResponse.get(0).memberId()).isEqualTo(member.getId()); + assertThat(contributionInfoResponse.get(0).projectParticipantId()) + .isEqualTo(participant.getId()); assertThat(contributionInfoResponse.get(0).score()).isEqualTo(61); } } diff --git a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java index be5c1c59..cb9a0593 100644 --- a/src/test/java/com/amcamp/domain/task/TaskServiceTest.java +++ b/src/test/java/com/amcamp/domain/task/TaskServiceTest.java @@ -21,6 +21,7 @@ import com.amcamp.domain.task.domain.*; import com.amcamp.domain.task.dto.request.TaskBasicInfoUpdateRequest; import com.amcamp.domain.task.dto.request.TaskCreateRequest; +import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.domain.task.dto.response.TaskInfoResponse; import com.amcamp.domain.team.application.TeamService; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -36,10 +37,12 @@ import com.amcamp.global.util.MemberUtil; import jakarta.transaction.Transactional; import java.time.LocalDate; +import java.util.List; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Slice; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.security.core.userdetails.UserDetails; @@ -523,62 +526,63 @@ class 태스크_목록_조회_시 { .hasMessage(TeamErrorCode.TEAM_PARTICIPANT_REQUIRED.getMessage()); } - // @Test - // @Transactional - // void 프로젝트별로_조회한다() { - // // given - // List taskList = - // List.of(Task.createTask(sprint, "피그마 화면 설계 수정", TaskDifficulty.MID), - // Task.createTask(sprint, "mvp 완성", TaskDifficulty.HIGH)); - // taskRepository.saveAll(taskList); - // - // for (Task task : taskList) { - // task.assignTask(participant); - // } - // - // for (Task task : taskList) { - // System.out.println(task.getAssignee().getTeamParticipant().getMember().getNickname()); - // } - // - // // when - // Slice result = taskService.getTasksBySprint(1L, null, 3); - // - // // then - // assertThat(result.getContent()).hasSize(2); - // } - // - // @Test - // void 멤버별로_조회한다() { - // // given - // Member member = memberUtil.getCurrentMember(); - // TaskCreateRequest taskRequest1 = - // new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); - // taskService.createTask(taskRequest1); - // TaskCreateRequest taskRequest2 = - // new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); - // taskService.createTask(taskRequest2); - // - // Task task = - // taskRepository - // .findById(1L) - // .orElseThrow(() -> new - // CommonException(TaskErrorCode.TASK_NOT_FOUND)); - // - // taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 - // - // Task task1 = - // taskRepository - // .findById(2L) - // .orElseThrow(() -> new - // CommonException(TaskErrorCode.TASK_NOT_FOUND)); - // - // taskService.assignTask(task1.getId()); // 첫번쨰 태스크에만 담당자 배정 - // - // // when - // Slice result = taskService.getTasksByMember(1L, 0L, 3); - // - // // then - // assertThat(result.getContent()).hasSize(2); - // } + @Test + @Transactional + void 프로젝트별로_조회한다() { + // given + List taskList = + List.of( + Task.createTask(sprint, "피그마 화면 설계 수정", TaskDifficulty.MID), + Task.createTask(sprint, "mvp 완성", TaskDifficulty.HIGH)); + taskRepository.saveAll(taskList); + + for (Task task : taskList) { + task.assignTask(participant); + } + + for (Task task : taskList) { + System.out.println( + task.getAssignee().getTeamParticipant().getMember().getNickname()); + } + + // when + Slice result = taskService.getTasksBySprint(1L, null, 3); + + // then + assertThat(result.getContent()).hasSize(2); + System.out.println(result.getContent()); + } + + @Test + void 멤버별로_조회한다() { + // given + Member member = memberUtil.getCurrentMember(); + TaskCreateRequest taskRequest1 = + new TaskCreateRequest(1L, "피그마 화면 설계 수정", TaskDifficulty.MID); + taskService.createTask(taskRequest1); + TaskCreateRequest taskRequest2 = + new TaskCreateRequest(1L, "mvp 완성", TaskDifficulty.HIGH); + taskService.createTask(taskRequest2); + + Task task = + taskRepository + .findById(1L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + taskService.assignTask(task.getId()); // 첫번쨰 태스크에만 담당자 배정 + + Task task1 = + taskRepository + .findById(2L) + .orElseThrow(() -> new CommonException(TaskErrorCode.TASK_NOT_FOUND)); + + taskService.assignTask(task1.getId()); // 첫번쨰 태스크에만 담당자 배정 + + // when + Slice result = taskService.getTasksByMember(1L, 0L, 3); + + // then + assertThat(result.getContent()).hasSize(2); + } } } From 326d29376b81a12e4b3ff7a1288b44e0aa434b95 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Mon, 14 Apr 2025 20:12:15 +0900 Subject: [PATCH 095/107] =?UTF-8?q?refactor:=20changeProjectAdmin->=20memb?= =?UTF-8?q?erId=20->=20projectParticipantId=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=20(#197)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../project/application/ProjectService.java | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index e4dfced5..393da319 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -16,7 +16,6 @@ import com.amcamp.domain.team.domain.Team; import com.amcamp.domain.team.domain.TeamParticipant; import com.amcamp.global.exception.CommonException; -import com.amcamp.global.exception.errorcode.MemberErrorCode; import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.amcamp.global.exception.errorcode.TeamErrorCode; import com.amcamp.global.util.MemberUtil; @@ -115,12 +114,7 @@ public void changeProjectAdmin(Long projectId, Long newAdminId) { Member currentMember = memberUtil.getCurrentMember(); // 현재 사용자 (기존 Admin) Project project = getProjectById(projectId); ProjectParticipant currentAdmin = validateProjectAdmin(currentMember, project); - - Member newAdminMember = - memberRepository - .findById(newAdminId) - .orElseThrow(() -> new CommonException(MemberErrorCode.MEMBER_NOT_FOUND)); - ProjectParticipant newAdmin = getValidProjectParticipant(newAdminMember, project); + ProjectParticipant newAdmin = getProjectParticipantById(newAdminId); // 양도할 프로젝트멤버 currentAdmin.changeRole(ProjectParticipantRole.MEMBER); newAdmin.changeRole(ProjectParticipantRole.ADMIN); @@ -215,6 +209,13 @@ public Slice getProjectParticipantList( // project utils + private ProjectParticipant getProjectParticipantById(Long projectMemberId) { + return projectParticipantRepository + .findById(projectMemberId) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_NOT_EXISTS)); + } + private String normalizeProjectTitle(String name) { return name.trim().replaceAll("[^0-9a-zA-Z가-힣 ]", "_"); } From 8da635f857f8131baf7bbb3cf39e2c55c995c70c Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Tue, 15 Apr 2025 00:30:57 +0900 Subject: [PATCH 096/107] =?UTF-8?q?refactor:=20projectParticipant=20status?= =?UTF-8?q?=20inactive=20=EC=9D=BC=20=EB=95=8C=20isParticipant=20=EC=86=8D?= =?UTF-8?q?=EC=84=B1=20false=20(#201)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/project/dao/ProjectRepositoryImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index fd5198f4..c72872df 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -4,6 +4,7 @@ import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.ProjectParticipantStatus; import com.amcamp.domain.project.dto.response.ProjectInfoResponse; import com.amcamp.domain.project.dto.response.ProjectListInfoResponse; import com.amcamp.domain.project.dto.response.ProjectParticipantInfoResponse; @@ -30,6 +31,13 @@ public class ProjectRepositoryImpl implements ProjectRepositoryCustom { public Slice findAllByTeamIdWithPagination( Long teamId, Long lastProjectId, int pageSize, TeamParticipant teamParticipant) { + NumberExpression activeParticipation = + new CaseBuilder() + .when(projectParticipant.status.eq(ProjectParticipantStatus.ACTIVE)) + .then(1) + .otherwise(0) + .coalesce(0); + NumberExpression adminCase = new CaseBuilder() .when(projectParticipant.projectRole.eq(ProjectParticipantRole.ADMIN)) @@ -49,7 +57,7 @@ public Slice findAllByTeamIdWithPagination( project.description, project.startDt, project.dueDt), - projectParticipant.id.count().gt(0), + activeParticipation.sum().gt(0), adminCase.sum().gt(0))) .from(project) .leftJoin(projectParticipant) From 1b7254b148b26c18058e8900d0d82773b8109bc5 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Tue, 15 Apr 2025 00:52:40 +0900 Subject: [PATCH 097/107] =?UTF-8?q?refactor:=20projectRegistration=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EB=A1=9C=EC=A7=81=20status-Active=20?= =?UTF-8?q?=ED=99=95=EC=9D=B8=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20(#203)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../amcamp/domain/project/application/ProjectService.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 393da319..f2500666 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -251,6 +251,12 @@ private TeamParticipant validateProjectRegistrationAlreadyExists( TeamParticipant participant = getValidTeamParticipant(member, project.getTeam()); if (projectParticipantRepository .findByProjectAndTeamParticipant(project, participant) + .filter( + r -> + r.getStatus() + .equals( + ProjectParticipantStatus + .ACTIVE)) // inactive 인 경우 신청 가능하도록 .isPresent()) { throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_ALREADY_EXISTS); } From 037d5b00b64ae6dca4c591408a43d6bca9fae53a Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Tue, 15 Apr 2025 01:37:32 +0900 Subject: [PATCH 098/107] Refactor/202 project request status (#204) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: projectRegistration 검증 로직 status-Active 확인하도록 수정 * refactor: project 목록 조회 시 joinStatus DTO 필드에 추가 및 쿼리 수정 --- .../project/dao/ProjectRepositoryImpl.java | 14 +++++++++++++- .../domain/ProjectRegistrationStatus.java | 1 + .../dto/response/ProjectListInfoResponse.java | 19 ++++++++++++++++--- 3 files changed, 30 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index c72872df..59c15bf1 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -2,6 +2,7 @@ import static com.amcamp.domain.project.domain.QProject.project; import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; +import static com.amcamp.domain.project.domain.QProjectRegistration.projectRegistration; import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.project.domain.ProjectParticipantStatus; @@ -15,6 +16,7 @@ import com.querydsl.core.types.dsl.BooleanExpression; import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.core.types.dsl.NumberExpression; +import com.querydsl.core.types.dsl.StringExpression; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; @@ -44,6 +46,9 @@ public Slice findAllByTeamIdWithPagination( .then(1) .otherwise(0); + StringExpression joinStatusExpr = + projectRegistration.requestStatus.stringValue().coalesce("NONE"); + List responses = jpaQueryFactory .select( @@ -58,7 +63,8 @@ public Slice findAllByTeamIdWithPagination( project.startDt, project.dueDt), activeParticipation.sum().gt(0), - adminCase.sum().gt(0))) + adminCase.sum().gt(0), + joinStatusExpr)) .from(project) .leftJoin(projectParticipant) .on( @@ -68,6 +74,12 @@ public Slice findAllByTeamIdWithPagination( .and( projectParticipant.teamParticipant.eq( teamParticipant))) + .leftJoin(projectRegistration) + .on( + projectRegistration + .project + .eq(project) + .and(projectRegistration.requester.eq(teamParticipant))) .where(project.team.id.eq(teamId), lastProjectCondition(lastProjectId)) .groupBy(project.id) .orderBy(project.id.desc()) diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java index 8170fce2..ea7f6582 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistrationStatus.java @@ -6,6 +6,7 @@ @AllArgsConstructor @Getter public enum ProjectRegistrationStatus { + NONE("REQUEST_NONE"), PENDING("REQUEST_PENDING"), APPROVED("REQUEST_APPROVED"), REJECTED("REQUEST_REJECTED"); diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java index b6b42fbf..89a39162 100644 --- a/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectListInfoResponse.java @@ -5,9 +5,22 @@ public record ProjectListInfoResponse( @Schema(description = "사용자가 참여중인 프로젝트 목록") ProjectInfoResponse projectInfo, @Schema(description = "프로젝트 참여 여부", example = "false") boolean isParticipant, - @Schema(description = "프로젝트 팀장 여부", example = "false") boolean isAdmin) { + @Schema(description = "프로젝트 팀장 여부", example = "false") boolean isAdmin, + @Schema( + description = "프로젝트 가입신청 상태", + example = "REQUEST_PENDING", + allowableValues = { + "NONE", + "REQUEST_PENDING", + "REQUEST_APPROVED", + "REQUEST_REJECTED" + }) + String joinStatus) { public static ProjectListInfoResponse from( - ProjectInfoResponse projectInfo, boolean isParticipant, boolean isAdmin) { - return new ProjectListInfoResponse(projectInfo, isParticipant, isAdmin); + ProjectInfoResponse projectInfo, + boolean isParticipant, + boolean isAdmin, + String joinStatus) { + return new ProjectListInfoResponse(projectInfo, isParticipant, isAdmin, joinStatus); } } From 7510c4a809fb031b92cb1659411ea8109d2a233f Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Tue, 15 Apr 2025 02:01:12 +0900 Subject: [PATCH 099/107] =?UTF-8?q?refactor:=20projectRegistration=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EC=8B=9C=20=ED=8C=80=20=EC=A0=84=EC=B2=B4?= =?UTF-8?q?->=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=ED=95=B4=EB=8B=B9?= =?UTF-8?q?=ED=95=98=EB=8A=94=20=EC=9A=94=EC=B2=AD=EB=A7=8C=20=EA=B2=80?= =?UTF-8?q?=EC=A6=9D=ED=95=98=EB=8F=84=EB=A1=9D=20=EC=98=A4=EB=A5=98=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#205)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/amcamp/domain/project/application/ProjectService.java | 4 +++- .../domain/project/dao/ProjectRegistrationRepository.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index f2500666..1035cfdb 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -260,7 +260,9 @@ private TeamParticipant validateProjectRegistrationAlreadyExists( .isPresent()) { throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_ALREADY_EXISTS); } - if (projectRegistrationRepository.findByRequester(participant).isPresent()) { + if (projectRegistrationRepository + .findByProjectAndRequester(project, participant) + .isPresent()) { throw new CommonException(ProjectErrorCode.PROJECT_REGISTRATION_ALREADY_EXISTS); } return participant; diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java index 55193813..1fe6a7ea 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRegistrationRepository.java @@ -12,4 +12,7 @@ public interface ProjectRegistrationRepository List findAllByProject(Project project); Optional findByRequester(TeamParticipant teamParticipant); + + Optional findByProjectAndRequester( + Project project, TeamParticipant participant); } From c77b15ec4098a37c3513f0cb0ef095adb9729299 Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Tue, 15 Apr 2025 02:54:16 +0900 Subject: [PATCH 100/107] =?UTF-8?q?bug:=20DB=EC=97=90=20=EC=A4=91=EB=B3=B5?= =?UTF-8?q?=20=EC=B9=BC=EB=9F=BC=20=EC=9E=88=EC=9D=84=20=EC=8B=9C=20?= =?UTF-8?q?=EC=B2=AB=EB=B2=88=EC=A8=B0=20registration=20=EB=B0=98=ED=99=98?= =?UTF-8?q?=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=94=94=EB=B2=84=EA=B9=85=20(#2?= =?UTF-8?q?06)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: projectRegistration 생성 시 팀 전체-> 프로젝트 해당하는 요청만 검증하도록 오류 수정 * db에 중복 칼럼 있을 시 첫번쨰 registration 반환하도록 디버깅 --- .../domain/project/dao/ProjectRepositoryImpl.java | 2 +- .../amcamp/domain/project/ProjectServiceTest.java | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java index 59c15bf1..3a6c8ae3 100644 --- a/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/project/dao/ProjectRepositoryImpl.java @@ -47,7 +47,7 @@ public Slice findAllByTeamIdWithPagination( .otherwise(0); StringExpression joinStatusExpr = - projectRegistration.requestStatus.stringValue().coalesce("NONE"); + projectRegistration.requestStatus.stringValue().min().coalesce("NONE"); List responses = jpaQueryFactory diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index cbaa3756..53af1a7c 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -449,10 +449,11 @@ class 프로젝트_가입_신청 { // given Long teamId = getTeamId(); Team team = teamRepository.findById(teamId).get(); + // 프로젝트 생성, 프로젝트 ID 1L 할당 createTestProject(teamId, 1L); logout(); - // when + // when: member1이 가입 신청 loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); TeamParticipant teamParticipant1 = @@ -460,21 +461,21 @@ class 프로젝트_가입_신청 { projectService.requestToProjectRegistration(1L); logout(); + + // when: member2도 가입 신청 loginAs(member2); teamService.joinTeam(teamInviteCodeRequest); TeamParticipant teamParticipant2 = teamParticipantRepository.findByMemberAndTeam(member2, team).get(); projectService.requestToProjectRegistration(1L); - // then + // then: 팀 관리자인 memberAdmin이 가입 신청 목록을 조회 logout(); loginAs(memberAdmin); Slice response = projectService.getProjectRegistrationList(1L, null, 10); - List requesterIds = response.stream().map(ProjectRegisterDetailResponse::requesterId).toList(); - assertThat(new HashSet<>(requesterIds)) .isEqualTo(Set.of(teamParticipant1.getId(), teamParticipant2.getId())); } @@ -488,10 +489,10 @@ class 프로젝트_가입_신청 { loginAs(member1); teamService.joinTeam(teamInviteCodeRequest); - // when + // when: 최초 가입 신청 projectService.requestToProjectRegistration(1L); - // then + // then: 이미 가입 신청한 팀 참여자가 다시 신청하면 예외 발생 assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) .isInstanceOf(CommonException.class) .hasMessageContaining( @@ -504,7 +505,7 @@ class 프로젝트_가입_신청 { Long teamId = getTeamId(); createTestProject(teamId, 1L); - // when,then + // when, then: 아직 가입 신청하지 않은 상태에서(즉, ACTIVE 상태로 이미 가입되어 있는 상태에서) 가입 신청을 시도하면 예외 발생 assertThatThrownBy(() -> projectService.requestToProjectRegistration(1L)) .isInstanceOf(CommonException.class) .hasMessageContaining( From aea1fcb5ed3bc544e4db2070481c22b94bef7998 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sun, 20 Apr 2025 18:15:43 +0900 Subject: [PATCH 101/107] =?UTF-8?q?fix:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=B0=B8=EA=B0=80=20=EC=B9=BC=EB=9F=BC=EB=AA=85=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=20(#209)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/amcamp/domain/project/domain/ProjectRegistration.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java index 9a0b4cd0..b5fa0fb1 100644 --- a/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java +++ b/src/main/java/com/amcamp/domain/project/domain/ProjectRegistration.java @@ -22,7 +22,7 @@ public class ProjectRegistration extends BaseTimeEntity { private Project project; @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(name = "project_participant_id", unique = true) + @JoinColumn(name = "team_participant_id", unique = true) private TeamParticipant requester; @Enumerated(EnumType.STRING) From f716987d1fe2777a6cab7f29bf1527af704b5568 Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Sun, 20 Apr 2025 19:28:35 +0900 Subject: [PATCH 102/107] =?UTF-8?q?feat:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=EB=B3=84=20=EC=8A=A4=ED=94=84=EB=A6=B0=ED=8A=B8=20?= =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EB=AA=A9=EB=A1=9D=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20(#211)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 프로젝트별 스프린트 아이디 목록 조회 기능 * refactor: sprintIdResponse 내 필드명 수정 --- .../domain/sprint/api/SprintController.java | 8 +++++ .../sprint/application/SprintService.java | 11 +++++++ .../sprint/dao/SprintRepositoryCustom.java | 4 +++ .../sprint/dao/SprintRepositoryImpl.java | 16 ++++++++++ .../sprint/dto/response/SprintIdResponse.java | 7 +++++ .../sprint/application/SprintServiceTest.java | 30 +++++++++++++++++++ 6 files changed, 76 insertions(+) create mode 100644 src/main/java/com/amcamp/domain/sprint/dto/response/SprintIdResponse.java diff --git a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java index 83e9738a..d79b8f1d 100644 --- a/src/main/java/com/amcamp/domain/sprint/api/SprintController.java +++ b/src/main/java/com/amcamp/domain/sprint/api/SprintController.java @@ -5,11 +5,13 @@ import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.sprint.dto.response.SprintIdResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Slice; import org.springframework.http.HttpStatus; @@ -65,6 +67,12 @@ public Slice sprintFindAll( return sprintService.findAllSprint(projectId, baseSprintId, direction); } + @Operation(summary = "프로젝트별 스프린트 아이디 목록 조회", description = "특정 프로젝트의 스프린트 아이디 목록을 조회합니다.") + @GetMapping("/{projectId}/list") + public List sprintIdAllByMember(@PathVariable Long projectId) { + return sprintService.findAllSprintId(projectId); + } + @Operation(summary = "회원별 프로젝트 내 스프린트 목록 조회", description = "마이페이지에서 특정 프로젝트의 스프린트 목록을 조회합니다.") @GetMapping("/{projectId}/me") public Slice sprintFindAllByMember( diff --git a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java index ebffebb6..3d7e5ec5 100644 --- a/src/main/java/com/amcamp/domain/sprint/application/SprintService.java +++ b/src/main/java/com/amcamp/domain/sprint/application/SprintService.java @@ -12,6 +12,7 @@ import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.sprint.dto.response.SprintIdResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.team.dao.TeamParticipantRepository; import com.amcamp.domain.team.domain.Team; @@ -123,6 +124,16 @@ public Slice findAllSprint( return sprintRepository.findAllSprintByProjectId(projectId, baseSprintId, direction); } + @Transactional(readOnly = true) + public List findAllSprintId(Long projectId) { + final Member currentMember = memberUtil.getCurrentMember(); + final Project project = findByProjectId(projectId); + ProjectParticipant participant = + validateProjectParticipant(project, project.getTeam(), currentMember); + + return sprintRepository.findAllSprintIdByProjectId(projectId); + } + @Transactional(readOnly = true) public Slice findAllSprintByMember( Long projectId, Long baseSprintId, SprintPagingDirection direction) { diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java index de483fe2..7b859afd 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryCustom.java @@ -2,6 +2,8 @@ import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.sprint.dto.response.SprintIdResponse; +import java.util.List; import org.springframework.data.domain.Slice; public interface SprintRepositoryCustom { @@ -13,4 +15,6 @@ Slice findAllSprintByProjectIdAndAssignee( Long baseSprintId, SprintPagingDirection direction, ProjectParticipant participant); + + List findAllSprintIdByProjectId(Long projectId); } diff --git a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java index b0f382b3..6bce6b39 100644 --- a/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/sprint/dao/SprintRepositoryImpl.java @@ -5,6 +5,7 @@ import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.sprint.dto.response.SprintIdResponse; import com.amcamp.domain.task.dto.response.TaskBasicInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.SprintErrorCode; @@ -54,6 +55,21 @@ public Slice findAllSprintByProjectIdAndAssignee( return checkLastPage(results); } + @Override + public List findAllSprintIdByProjectId(Long projectId) { + List results = + jpaQueryFactory + .select( + Projections.constructor( + SprintIdResponse.class, sprint.id, sprint.title)) + .from(sprint) + .where(sprint.project.id.eq(projectId)) + .orderBy(sprint.id.asc()) + .fetch(); + + return results; + } + private BooleanExpression buildPagingCondition( Long baseSprintId, SprintPagingDirection direction) { if (baseSprintId == null) { diff --git a/src/main/java/com/amcamp/domain/sprint/dto/response/SprintIdResponse.java b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintIdResponse.java new file mode 100644 index 00000000..c8c96910 --- /dev/null +++ b/src/main/java/com/amcamp/domain/sprint/dto/response/SprintIdResponse.java @@ -0,0 +1,7 @@ +package com.amcamp.domain.sprint.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; + +public record SprintIdResponse( + @Schema(description = "스프린트 ID", example = "1") Long sprintId, + @Schema(description = "스프린트 제목", example = "1차 스프린트") String title) {} diff --git a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java index 96db8e33..1de7d9bf 100644 --- a/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java +++ b/src/test/java/com/amcamp/domain/sprint/application/SprintServiceTest.java @@ -18,6 +18,7 @@ import com.amcamp.domain.sprint.dto.request.SprintCreateRequest; import com.amcamp.domain.sprint.dto.request.SprintUpdateRequest; import com.amcamp.domain.sprint.dto.response.SprintDetailResponse; +import com.amcamp.domain.sprint.dto.response.SprintIdResponse; import com.amcamp.domain.sprint.dto.response.SprintInfoResponse; import com.amcamp.domain.task.dao.TaskRepository; import com.amcamp.domain.task.domain.Task; @@ -331,6 +332,35 @@ class 프로젝트별_스프린트_목록을_조회할_때 { } } + @Nested + class 프로젝트별_스프린트아이디_목록을_조회할_때 { + @Test + void 프로젝트가_존재하지_않으면_예외가_발생한다() { + // when & then + assertThatThrownBy(() -> sprintService.findAllSprint(999L, null, null)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_NOT_FOUND.getMessage()); + } + + @Test + void 프로젝트가_존재한다면_모든_스프린트아이디를_반환한다() { + // given + List sprintList = + List.of( + Sprint.createSprint(project, "1", "testDescription1", dueDt), + Sprint.createSprint(project, "2", "testDescription2", dueDt), + Sprint.createSprint(project, "3", "testDescription3", dueDt)); + sprintRepository.saveAll(sprintList); + + // when + List results = sprintService.findAllSprintId(1L); + + // given + assertThat(results.size()).isEqualTo(3); + assertThat(results).extracting("title").containsExactly("1", "2", "3"); // 순서까지 확인 + } + } + @Nested class 회원별_스프린트_목록을_조회할_떄 { @Test From 9d50b9aff6c3908c26d436c517c1e863a118321d Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Mon, 21 Apr 2025 17:13:34 +0900 Subject: [PATCH 103/107] =?UTF-8?q?refactor:=20projectRegistration=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EC=9A=94=EC=B2=AD=20=ED=8C=8C=EB=9D=BC?= =?UTF-8?q?=EB=AF=B8=ED=84=B0=20=EB=B0=8F=20=EB=82=B4=EB=B6=80=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=20=EC=88=98=EC=A0=95=20(#214)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/project/api/ProjectController.java | 2 +- .../domain/project/application/ProjectService.java | 13 +++++++++++-- .../amcamp/domain/project/ProjectServiceTest.java | 2 +- 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index 7cf44ece..ba09ff1a 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -99,7 +99,7 @@ public ResponseEntity projectRegistrationReject( @DeleteMapping("/{projectId}/registration/cancel") public ResponseEntity projectRegistrationDelete( @PathVariable Long projectId, @RequestParam Long projectRegisterId) { - projectService.deleteProjectRegistration(projectId, projectRegisterId); + projectService.deleteProjectRegistration(projectId); return ResponseEntity.ok().build(); } diff --git a/src/main/java/com/amcamp/domain/project/application/ProjectService.java b/src/main/java/com/amcamp/domain/project/application/ProjectService.java index 1035cfdb..60d93a39 100644 --- a/src/main/java/com/amcamp/domain/project/application/ProjectService.java +++ b/src/main/java/com/amcamp/domain/project/application/ProjectService.java @@ -170,11 +170,12 @@ public void rejectProjectRegistration(Long projectId, Long registrationId) { getProjectRegistrationById(registrationId).updateStatus(ProjectRegistrationStatus.REJECTED); } - public void deleteProjectRegistration(Long projectId, Long projectRegisterId) { + public void deleteProjectRegistration(Long projectId) { Member member = memberUtil.getCurrentMember(); Project project = getProjectById(projectId); TeamParticipant teamParticipant = getValidTeamParticipant(member, project.getTeam()); - ProjectRegistration registration = getProjectRegistrationById(projectRegisterId); + ProjectRegistration registration = + getProjectRegistrationByProjectAndRequester(project, teamParticipant); if (teamParticipant.equals(registration.getRequester())) { projectRegistrationRepository.delete(registration); @@ -275,6 +276,14 @@ private ProjectRegistration getProjectRegistrationById(Long registrationId) { () -> new CommonException(ProjectErrorCode.PROJECT_REGISTRATION_NOT_FOUND)); } + private ProjectRegistration getProjectRegistrationByProjectAndRequester( + Project project, TeamParticipant requester) { + return projectRegistrationRepository + .findByProjectAndRequester(project, requester) + .orElseThrow( + () -> new CommonException(ProjectErrorCode.PROJECT_REGISTRATION_NOT_FOUND)); + } + private ProjectParticipant validateProjectAdmin(Member member, Project project) { ProjectParticipant participant = getValidProjectParticipant(member, project); if (!participant.getProjectRole().equals(ProjectParticipantRole.ADMIN)) { diff --git a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java index 53af1a7c..6637325a 100644 --- a/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java +++ b/src/test/java/com/amcamp/domain/project/ProjectServiceTest.java @@ -584,7 +584,7 @@ class 프로젝트_가입_신청 { teamService.joinTeam(teamInviteCodeRequest); // when projectService.requestToProjectRegistration(1L); - projectService.deleteProjectRegistration(1L, 1L); + projectService.deleteProjectRegistration(1L); // then logout(); loginAs(memberAdmin); From d0e8a81365f0f4b64d6695e23ec2335e25b9212a Mon Sep 17 00:00:00 2001 From: Sunwoo Jung <104188728+willjsw@users.noreply.github.com> Date: Mon, 21 Apr 2025 17:19:31 +0900 Subject: [PATCH 104/107] =?UTF-8?q?refactor:=20api=20=EC=9A=94=EC=B2=AD=20?= =?UTF-8?q?=ED=8C=8C=EB=9D=BC=EB=AF=B8=ED=84=B0=20=EC=88=98=EC=A0=95=20(#2?= =?UTF-8?q?15)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/amcamp/domain/project/api/ProjectController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/com/amcamp/domain/project/api/ProjectController.java b/src/main/java/com/amcamp/domain/project/api/ProjectController.java index ba09ff1a..b39979ee 100644 --- a/src/main/java/com/amcamp/domain/project/api/ProjectController.java +++ b/src/main/java/com/amcamp/domain/project/api/ProjectController.java @@ -97,8 +97,7 @@ public ResponseEntity projectRegistrationReject( @Operation(summary = "프로젝트 가입 신청 취소", description = "프로젝트 가입 신청을 취소합니다.") @DeleteMapping("/{projectId}/registration/cancel") - public ResponseEntity projectRegistrationDelete( - @PathVariable Long projectId, @RequestParam Long projectRegisterId) { + public ResponseEntity projectRegistrationDelete(@PathVariable Long projectId) { projectService.deleteProjectRegistration(projectId); return ResponseEntity.ok().build(); } From e3ba3da2c97850ade1ac29d8082805479347923c Mon Sep 17 00:00:00 2001 From: Subin Cho <109792191+chsubinn@users.noreply.github.com> Date: Mon, 21 Apr 2025 19:31:36 +0900 Subject: [PATCH 105/107] =?UTF-8?q?feat:=20=EC=8A=A4=ED=94=84=EB=A6=B0?= =?UTF-8?q?=ED=8A=B8=EB=B3=84=20=EC=B0=B8=EA=B0=80=EC=9E=90=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20&=20=EB=8F=99=EB=A3=8C=20=ED=8F=89=EA=B0=80=20?= =?UTF-8?q?=EC=97=AC=EB=B6=80=20=EB=B0=98=ED=99=98=20=EB=A9=94=EC=86=8C?= =?UTF-8?q?=EB=93=9C=20(#218)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: 스프린트별 참가자 목록 & 동료 평가 여부 반환 메소드 * fix: 빈 result를 반환하는 문제 수정 --- .../feedback/api/FeedbackController.java | 16 ++++ .../feedback/application/FeedbackService.java | 15 ++++ .../dao/FeedbackRepositoryCustom.java | 8 ++ .../feedback/dao/FeedbackRepositoryImpl.java | 64 +++++++++++++- ...rojectParticipantFeedbackInfoResponse.java | 13 +++ .../application/FeedbackServiceTest.java | 85 +++++++++++++++++++ 6 files changed, 199 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantFeedbackInfoResponse.java diff --git a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java index d97624b7..5d26e42f 100644 --- a/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java +++ b/src/main/java/com/amcamp/domain/feedback/api/FeedbackController.java @@ -5,6 +5,7 @@ import com.amcamp.domain.feedback.dto.request.OriginalFeedbackRequest; import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; import com.amcamp.domain.feedback.dto.response.FeedbackRefineResponse; +import com.amcamp.domain.project.dto.response.ProjectParticipantFeedbackInfoResponse; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.tags.Tag; @@ -22,6 +23,21 @@ public class FeedbackController { private final FeedbackService feedbackService; + @Operation(summary = "스프린트별 동료평가 여부 확인", description = "스프린트별/팀원별 동료평가 여부를 확인합니다. ") + @GetMapping("/{sprintId}/participants") + public Slice feedbackStatusFind( + @PathVariable Long sprintId, + @Parameter(description = "프로젝트 아이디") @RequestParam Long projectId, + @Parameter(description = "이전 페이지의 마지막 프로젝트 참가자 ID (첫 페이지는 비워두세요)") + @RequestParam(required = false) + Long lastProjectParticipantId, + @Parameter(description = "페이지당 프로젝트 참여자 수", example = "5") @RequestParam(value = "size") + int pageSize) { + + return feedbackService.findFeedbackStatusBySprint( + projectId, sprintId, lastProjectParticipantId, pageSize); + } + @Operation( summary = "OpenAI 기반 피드백 메시지 개선", description = "사용자가 입력한 피드백을 AI가 분석하여 부드럽고 명확하게 개선합니다.") diff --git a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java index ad027c5b..b8e42edc 100644 --- a/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java +++ b/src/main/java/com/amcamp/domain/feedback/application/FeedbackService.java @@ -12,6 +12,7 @@ import com.amcamp.domain.project.domain.Project; import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantStatus; +import com.amcamp.domain.project.dto.response.ProjectParticipantFeedbackInfoResponse; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -81,6 +82,20 @@ public Slice findSprintFeedbacksByParticipant( projectParticipant.getId(), sprintId, lastFeedbackId, pageSize); } + @Transactional(readOnly = true) + public Slice findFeedbackStatusBySprint( + Long projectId, Long sprintId, Long lastProjectParticipantId, int pageSize) { + final Member currentMember = memberUtil.getCurrentMember(); + final Project project = findByProjectId(projectId); + final Sprint sprint = findBySprintId(sprintId); + + ProjectParticipant projectParticipant = validateProjectParticipant(currentMember, project); + validateProjectSprintMismatch(project, sprint); + + return feedbackRepository.findSprintFeedbackStatusByParticipant( + projectParticipant, sprintId, lastProjectParticipantId, pageSize); + } + private Project findByProjectId(Long projectId) { return projectRepository .findById(projectId) diff --git a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java index ddae7097..bf9d5af8 100644 --- a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java +++ b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryCustom.java @@ -1,9 +1,17 @@ package com.amcamp.domain.feedback.dao; import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.dto.response.ProjectParticipantFeedbackInfoResponse; import org.springframework.data.domain.Slice; public interface FeedbackRepositoryCustom { Slice findSprintFeedbacksByParticipant( Long projectParticipantId, Long sprintId, Long lastFeedbackId, int pageSize); + + Slice findSprintFeedbackStatusByParticipant( + ProjectParticipant projectParticipant, + Long sprintId, + Long lastProjectParticipantId, + int pageSize); } diff --git a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java index 7529523c..83b56849 100644 --- a/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java +++ b/src/main/java/com/amcamp/domain/feedback/dao/FeedbackRepositoryImpl.java @@ -1,12 +1,19 @@ package com.amcamp.domain.feedback.dao; import static com.amcamp.domain.feedback.domain.QFeedback.feedback; +import static com.amcamp.domain.member.domain.QMember.member; +import static com.amcamp.domain.project.domain.QProjectParticipant.projectParticipant; +import static com.amcamp.domain.team.domain.QTeamParticipant.teamParticipant; import com.amcamp.domain.feedback.dto.response.FeedbackInfoResponse; +import com.amcamp.domain.project.domain.ProjectParticipant; +import com.amcamp.domain.project.dto.response.ProjectParticipantFeedbackInfoResponse; import com.amcamp.global.exception.CommonException; import com.amcamp.global.exception.errorcode.FeedbackErrorCode; +import com.amcamp.global.exception.errorcode.ProjectErrorCode; import com.querydsl.core.types.Projections; import com.querydsl.core.types.dsl.BooleanExpression; +import com.querydsl.core.types.dsl.CaseBuilder; import com.querydsl.jpa.impl.JPAQueryFactory; import java.util.List; import lombok.RequiredArgsConstructor; @@ -48,6 +55,52 @@ public Slice findSprintFeedbacksByParticipant( return checkLastPage(pageSize, results); } + @Override + public Slice findSprintFeedbackStatusByParticipant( + ProjectParticipant sender, Long sprintId, Long lastProjectParticipantId, int pageSize) { + + // 1. sender가 이 sprint에서 피드백한 receiver ID 목록 먼저 뽑기 + List feedbackGivenReceiverIds = + jpaQueryFactory + .select(feedback.receiver.id) + .from(feedback) + .where(feedback.sender.eq(sender), feedback.sprint.id.eq(sprintId)) + .fetch(); + + // 2. 프로젝트 참여자 목록 뽑고, 해당 ID가 feedbackGivenReceiverIds 안에 있는지 체크해서 status 판단 + List results = + jpaQueryFactory + .select( + Projections.constructor( + ProjectParticipantFeedbackInfoResponse.class, + projectParticipant.id, + member.nickname, + member.profileImageUrl, + projectParticipant.projectRole, + projectParticipant.status, + new CaseBuilder() + .when( + projectParticipant.id.in( + feedbackGivenReceiverIds)) + .then("COMPLETED") + .otherwise("PENDING"))) + .from(projectParticipant) + .leftJoin(projectParticipant.teamParticipant, teamParticipant) + .leftJoin(teamParticipant.member, member) + .where( + projectParticipant.project.eq(sender.getProject()), + lastProjectParticipantId(lastProjectParticipantId)) + .orderBy(projectParticipant.id.asc()) + .limit(pageSize + 1) + .fetch(); + + if (results.isEmpty()) { + throw new CommonException(ProjectErrorCode.PROJECT_PARTICIPANT_NOT_EXISTS); + } + + return checkLastPage(pageSize, results); + } + private BooleanExpression lastFeedbackId(Long feedbackId) { if (feedbackId == null) { return null; @@ -56,8 +109,15 @@ private BooleanExpression lastFeedbackId(Long feedbackId) { return feedback.id.lt(feedbackId); } - private Slice checkLastPage( - int pageSize, List results) { + private BooleanExpression lastProjectParticipantId(Long projectParticipantId) { + if (projectParticipantId == null) { + return null; + } + + return projectParticipant.id.gt(projectParticipantId); + } + + private Slice checkLastPage(int pageSize, List results) { boolean hasNext = false; if (results.size() > pageSize) { diff --git a/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantFeedbackInfoResponse.java b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantFeedbackInfoResponse.java new file mode 100644 index 00000000..b52b25bf --- /dev/null +++ b/src/main/java/com/amcamp/domain/project/dto/response/ProjectParticipantFeedbackInfoResponse.java @@ -0,0 +1,13 @@ +package com.amcamp.domain.project.dto.response; + +import com.amcamp.domain.project.domain.ProjectParticipantRole; +import com.amcamp.domain.project.domain.ProjectParticipantStatus; +import io.swagger.v3.oas.annotations.media.Schema; + +public record ProjectParticipantFeedbackInfoResponse( + @Schema(description = "프로젝트 참여자 아이디", example = "1") Long projectParticipantId, + @Schema(description = "프로젝트 참여자 이름", example = "정선우") String nickname, + @Schema(description = "프로젝트 참여자 이미지 url", example = "PreSigned URL") String profileImageUrl, + @Schema(description = "프로젝트 참여자 권한", example = "PROJECT_ADMIN") ProjectParticipantRole role, + @Schema(description = "프로젝트 참여자 참여 상태", example = "ACTIVE") ProjectParticipantStatus status, + @Schema(description = "동료평가 완료 여부", example = "COMPLETED") String feedbackStatus) {} diff --git a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java index c7d8fc50..72678705 100644 --- a/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java +++ b/src/test/java/com/amcamp/domain/feedback/application/FeedbackServiceTest.java @@ -17,6 +17,7 @@ import com.amcamp.domain.project.domain.ProjectParticipant; import com.amcamp.domain.project.domain.ProjectParticipantRole; import com.amcamp.domain.project.domain.ProjectParticipantStatus; +import com.amcamp.domain.project.dto.response.ProjectParticipantFeedbackInfoResponse; import com.amcamp.domain.sprint.dao.SprintRepository; import com.amcamp.domain.sprint.domain.Sprint; import com.amcamp.domain.team.dao.TeamParticipantRepository; @@ -57,6 +58,7 @@ public class FeedbackServiceTest extends IntegrationTest { private ProjectParticipant anotherSender; private ProjectParticipant receiver; private ProjectParticipant anotherReceiver; + private ProjectParticipant notReceiver; private ProjectParticipant unknownReceiver; private Sprint sprint; private Sprint anotherSprint; @@ -78,6 +80,13 @@ void setUp() { "testReceiverProfileImageUrl", OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + Member notReceiverMember = + memberRepository.save( + Member.createMember( + "testNotReceiverNickname", + "testNotReceiverProfileImageUrl", + OauthInfo.createOauthInfo("testOauthId", "testOauthProvider"))); + // 초기에 로그인한 사용자를 sender로 설정 setAuthenticatedUser(senderMember); @@ -92,6 +101,11 @@ void setUp() { TeamParticipant.createParticipant( receiverMember, team, TeamParticipantRole.USER)); + TeamParticipant teamParticipantUserNotReceiver = + teamParticipantRepository.save( + TeamParticipant.createParticipant( + notReceiverMember, team, TeamParticipantRole.USER)); + project = projectRepository.save( Project.createProject( @@ -110,6 +124,12 @@ void setUp() { projectParticipantRepository.save( ProjectParticipant.createProjectParticipant( teamParticipantUser, project, ProjectParticipantRole.MEMBER)); + notReceiver = + projectParticipantRepository.save( + ProjectParticipant.createProjectParticipant( + teamParticipantUserNotReceiver, + project, + ProjectParticipantRole.MEMBER)); anotherReceiver = projectParticipantRepository.save( @@ -348,6 +368,71 @@ class 피드백_메시지를_조회할_때 { } } + @Nested + class 스프린트별_동료평가_여부를_확인할_때 { + @Test + void 스프린트가_존재하지않으면_예외가_발생한다() { + // when & then + assertThatThrownBy( + () -> + feedbackService.findFeedbackStatusBySprint( + project.getId(), 999L, null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(SprintErrorCode.SPRINT_NOT_FOUND.getMessage()); + } + + @Test + void 요청한_프로젝트가_로그인된_사용자가_참여한_프로젝트가_아니라면_예외가_발생한다() { + // given + // sender는 project(1)에만 참여 중이고, + // receiver는 project(1)와 anotherProject(2) 둘 다 참여 중이므로 + // 검증을 명확히 하기 위해 로그인한 사용자를 sender로 변경 + setAuthenticatedUser(sender.getTeamParticipant().getMember()); + + // when & then + assertThatThrownBy( + () -> + feedbackService.findFeedbackStatusBySprint( + anotherProject.getId(), sprint.getId(), null, 1)) + .isInstanceOf(CommonException.class) + .hasMessage(ProjectErrorCode.PROJECT_PARTICIPATION_REQUIRED.getMessage()); + } + + @Test + void 팀원정보와_동료평가여부를_반환한다() { + feedbackRepository.save(Feedback.createFeedback(sender, receiver, sprint, "수고하셨습니다!")); + // when: sender 기준, 해당 스프린트에서의 팀원 평가 상태 조회 + Slice result = + feedbackService.findFeedbackStatusBySprint( + project.getId(), sprint.getId(), 0L, 10); + + // then + assertThat(result.getContent().size()) + .isEqualTo( + 3); // receiver 1명만 ACTIVE 상태로 있는 프로젝트 참가자, 본인과 피드백을 받지 않은 사람은 PENDING + + // (1) 동료평가를 받은 사람은 COMPLETED + ProjectParticipantFeedbackInfoResponse received_response = + result.getContent().stream() + .filter(r -> r.projectParticipantId().equals(receiver.getId())) + .findFirst() + .orElseThrow(() -> new AssertionError("receiver에 대한 응답이 존재하지 않음")); + + assertThat(received_response.nickname()).isEqualTo("testReceiverNickname"); + assertThat(received_response.feedbackStatus()).isEqualTo("COMPLETED"); + + // (1) 동료평가를 받지 사람 & sender는 PENDING + ProjectParticipantFeedbackInfoResponse sender_response = + result.getContent().stream() + .filter(r -> r.projectParticipantId().equals(sender.getId())) + .findFirst() + .orElseThrow(() -> new AssertionError("sender에 대한 응답이 존재하지 않음")); + + assertThat(sender_response.nickname()).isEqualTo("testSenderNickname"); + assertThat(sender_response.feedbackStatus()).isEqualTo("PENDING"); + } + } + private void setAuthenticatedUser(Member member) { UserDetails userDetails = new PrincipalDetails(member.getId(), member.getRole()); UsernamePasswordAuthenticationToken token = From aa402e723cf19e463c520b9b73033d13ed780b49 Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Mon, 21 Apr 2025 19:32:14 +0900 Subject: [PATCH 106/107] =?UTF-8?q?fix:=20OpenAI=20=ED=94=BC=EB=93=9C?= =?UTF-8?q?=EB=B0=B1=20=EB=A9=94=EC=8B=9C=EC=A7=80=20=ED=94=84=EB=A1=AC?= =?UTF-8?q?=ED=94=84=ED=8A=B8=20=EC=88=98=EC=A0=95=20(#217)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fix: OpenAI 피드백 메시지 프롬프트 수정 * chore: 테스트 트리거 활성화 * chore: 테스트 트리거 제거 --- .../domain/feedback/dto/request/ChatRequest.java | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java b/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java index 93c1903c..8899b0b9 100644 --- a/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java +++ b/src/main/java/com/amcamp/domain/feedback/dto/request/ChatRequest.java @@ -10,13 +10,18 @@ public static ChatRequest of(String model, String userMessage) { new Message( "system", """ - 당신은 팀 프로젝트의 동료 평가를 수행하는 역할을 맡고 있습니다. 사용자가 제공한 피드백이 부정적인 뉘앙스를 가질 경우, 이를 순화하여 긍정적이고 건설적인 피드백으로 바꿔주세요. - 피드백의 본래 의도와 핵심은 유지하면서, 상대방이 개선할 점을 부드럽고 긍정적인 방식으로 전달해주세요. 예를 들어: + 당신은 팀 프로젝트의 동료 평가를 위한 피드백 메시지를 순화하는 역할을 맡고 있습니다. + 사용자가 제공한 피드백은 그대로 전달하기엔 다소 직설적이거나 부정적인 뉘앙스를 가질 수 있습니다. 이 메시지를 보다 부드럽고 건설적인 표현으로 다듬어 주세요. + 출력은 사용자가 최종적으로 보낼 메시지입니다. 별도의 설명이나 추가 문장은 포함하지 마세요. - - "이번 스프린트 동안 정말 역할을 하지 않은 것 같아요." -> "이번 스프린트 동안 역할을 제대로 수행하기 어려운 부분이 있었습니다. 다음에는 더 나은 협업을 위해 서로 돕는 방향을 찾아보면 좋겠습니다." - - "많은 일들이 제대로 진행되지 않았고, 필요한 시간에 도움을 주지 않았습니다." -> "몇 가지 작업이 계획대로 진행되지 않았습니다. 앞으로 더 원활한 소통과 협력이 이루어질 수 있도록 노력할 수 있으면 좋겠습니다." + - 피드백의 핵심 의도는 유지해주세요. + - 상대방이 기분 나쁘지 않게 개선점을 전달해주세요. + - 너무 딱딱하거나 로봇처럼 느껴지지 않도록 자연스럽게 표현해주세요. + - 이미 긍정적인 메시지라면, 조금 더 따뜻하게 다듬어주시면 됩니다. - 주어진 피드백을 순화하면서 상대방이 개선할 수 있는 방향을 제시해주세요. 피드백을 긍정적인 방향으로 재구성하여 상대방이 성장할 수 있도록 도와주세요. + 예시: + "항상 고마워요" → "항상 도움을 아끼지 않아줘서 고마워요. 덕분에 이번 스프린트가 더 원활했던 것 같아요." + "이번엔 역할이 부족했던 것 같아요." → "이번엔 조금 어려움이 있었던 것 같아요. 다음엔 더 잘 맞춰갈 수 있으면 좋겠습니다." """), new Message("user", userMessage) }); From f9e1cdd9a64b3358935fe1ad854b44b060ed29fc Mon Sep 17 00:00:00 2001 From: Hyuntaei Choi <145987233+ht3064@users.noreply.github.com> Date: Tue, 22 Apr 2025 00:01:21 +0900 Subject: [PATCH 107/107] =?UTF-8?q?fix:=20prod=20=ED=99=98=EA=B2=BD=20prof?= =?UTF-8?q?ile=20group=20=EC=B6=94=EA=B0=80=20(#221)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ef7dbeb0..7b6df5b5 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -4,6 +4,7 @@ spring: test: "test" local: "local" dev: "dev, datasource, actuator" + prod: "prod, datasource, actuator" include: - redis - security