From 6d6be99bef66ee9d6e4446be3c6d7d94565c87ed Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 16:40:54 +0900 Subject: [PATCH 01/47] =?UTF-8?q?:tada:=20=ED=94=84=EB=A1=9C=EC=A0=9D?= =?UTF-8?q?=ED=8A=B8=20=EC=85=8B=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 40 +++ 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 + .../com/pedalgenie/vote/VoteApplication.java | 13 + src/main/resources/application.yml | 23 ++ .../pedalgenie/vote/VoteApplicationTests.java | 13 + 10 files changed, 481 insertions(+) create mode 100644 .gitignore create mode 100644 build.gradle create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100755 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/pedalgenie/vote/VoteApplication.java create mode 100644 src/main/resources/application.yml create mode 100644 src/test/java/com/pedalgenie/vote/VoteApplicationTests.java diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..badf06b --- /dev/null +++ b/.gitignore @@ -0,0 +1,40 @@ +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/ +.env + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ +.DS_Store +dump.rdb \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..a94b702 --- /dev/null +++ b/build.gradle @@ -0,0 +1,38 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.4.0' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com.pedalgenie' +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-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-web' + compileOnly 'org.projectlombok:lombok' + runtimeOnly 'com.mysql:mysql-connector-j' + annotationProcessor 'org.projectlombok:lombok' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/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?(_ 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 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 0000000..e2847c8 --- /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 0000000..f5feea6 --- /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 0000000..9d21a21 --- /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 0000000..bfce6e0 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'vote' diff --git a/src/main/java/com/pedalgenie/vote/VoteApplication.java b/src/main/java/com/pedalgenie/vote/VoteApplication.java new file mode 100644 index 0000000..3ace07f --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/VoteApplication.java @@ -0,0 +1,13 @@ +package com.pedalgenie.vote; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class VoteApplication { + + public static void main(String[] args) { + SpringApplication.run(VoteApplication.class, args); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 0000000..ab49360 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,23 @@ +spring: + config: + import: optional:file:.env[.properties] + datasource: + url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME} + username: ${DB_USER} + password: ${DB_PASSWORD} + driver-class-name: com.mysql.cj.jdbc.Driver + jpa: + hibernate: + ddl-auto: update + properties: + show-sql: true + format_sql: true + naming: + physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl +jwt: + secret: ${JWT} + +#----필요시 사용------ +#redis: +# host: ${REDIS_HOST} +# port: ${REDIS_PORT} diff --git a/src/test/java/com/pedalgenie/vote/VoteApplicationTests.java b/src/test/java/com/pedalgenie/vote/VoteApplicationTests.java new file mode 100644 index 0000000..ee3102f --- /dev/null +++ b/src/test/java/com/pedalgenie/vote/VoteApplicationTests.java @@ -0,0 +1,13 @@ +package com.pedalgenie.vote; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VoteApplicationTests { + + @Test + void contextLoads() { + } + +} From cd866343aea2d4b4a13d2928410e53956562645c Mon Sep 17 00:00:00 2001 From: chaewon <89545462+gchaewon@users.noreply.github.com> Date: Wed, 18 Dec 2024 16:43:57 +0900 Subject: [PATCH 02/47] =?UTF-8?q?=F0=9F=93=9D=20PR=20=ED=85=9C=ED=94=8C?= =?UTF-8?q?=EB=A6=BF=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/pull_request_template.md | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/pull_request_template.md diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 0000000..08c72df --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,13 @@ +## #️⃣ 연관된 이슈 +ex) #이슈번호, #이슈번호 + +--- +## 📝 작업 내용 +이번 PR에서 작업한 내용을 간략히 설명해주세요. + +--- +## 💬 리뷰 요구사항 +리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요. + +--- +## 🔗 레퍼런스 From 524c8441e8d389b0b2d515d0100109290a479739 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 17:21:19 +0900 Subject: [PATCH 03/47] =?UTF-8?q?:tada:=20=EC=9D=98=EC=A1=B4=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/build.gradle b/build.gradle index a94b702..8fa30ac 100644 --- a/build.gradle +++ b/build.gradle @@ -25,7 +25,12 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jdbc' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' + // 검증 의존 + implementation 'org.springframework.boot:spring-boot-starter-validation' + // API 문서 의존 + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0' compileOnly 'org.projectlombok:lombok' runtimeOnly 'com.mysql:mysql-connector-j' annotationProcessor 'org.projectlombok:lombok' From fac696b842a2b1f2959e7057df3180320e02f278 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 17:21:43 +0900 Subject: [PATCH 04/47] =?UTF-8?q?:sparkles:=20BaseTimeEntity=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pedalgenie/vote/VoteApplication.java | 2 ++ .../vote/global/BaseTimeEntity.java | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java diff --git a/src/main/java/com/pedalgenie/vote/VoteApplication.java b/src/main/java/com/pedalgenie/vote/VoteApplication.java index 3ace07f..2107a65 100644 --- a/src/main/java/com/pedalgenie/vote/VoteApplication.java +++ b/src/main/java/com/pedalgenie/vote/VoteApplication.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +@EnableJpaAuditing @SpringBootApplication public class VoteApplication { diff --git a/src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java b/src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java new file mode 100644 index 0000000..4317c3c --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/BaseTimeEntity.java @@ -0,0 +1,27 @@ +package com.pedalgenie.vote.global; + +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import lombok.AccessLevel; +import lombok.Getter; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +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 +@SuperBuilder +@NoArgsConstructor (access = AccessLevel.PROTECTED) +@EntityListeners(AuditingEntityListener.class) + +public abstract class BaseTimeEntity { + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime modifiedAt; +} From 5915122e7f5c674bd14fc7e6bb733d8ec448d0aa Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 17:22:14 +0900 Subject: [PATCH 05/47] =?UTF-8?q?:sparkles:=20GlobalException=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/exception/CustomException.java | 12 ++++++ .../pedalgenie/vote/exception/ErrorCode.java | 42 +++++++++++++++++++ .../exception/GlobalExceptionHandler.java | 36 ++++++++++++++++ 3 files changed, 90 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/exception/CustomException.java create mode 100644 src/main/java/com/pedalgenie/vote/exception/ErrorCode.java create mode 100644 src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java diff --git a/src/main/java/com/pedalgenie/vote/exception/CustomException.java b/src/main/java/com/pedalgenie/vote/exception/CustomException.java new file mode 100644 index 0000000..f0eece8 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/exception/CustomException.java @@ -0,0 +1,12 @@ +package com.pedalgenie.vote.exception; +import lombok.Getter; + +@Getter +public class CustomException extends RuntimeException { + private final ErrorCode errorCode; + + public CustomException(ErrorCode errorCode) { + super(errorCode.getMessage()); + this.errorCode = errorCode; + } +} diff --git a/src/main/java/com/pedalgenie/vote/exception/ErrorCode.java b/src/main/java/com/pedalgenie/vote/exception/ErrorCode.java new file mode 100644 index 0000000..cf807ab --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/exception/ErrorCode.java @@ -0,0 +1,42 @@ +package com.pedalgenie.vote.exception; + +import lombok.Getter; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; + +@Getter +@RequiredArgsConstructor +public enum ErrorCode { + // 400 + BAD_REQUEST(HttpStatus.BAD_REQUEST, 400, "잘못된 요청입니다."), + PASSWORD_MISMATCH(HttpStatus.BAD_REQUEST, 400, "비밀번호가 일치하지 않습니다."), + + // 401 + AUTHENTICATION_FAILED(HttpStatus.UNAUTHORIZED, 401, "인증에 실패했습니다."), + TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, 401, "토큰이 만료되었습니다."), + NOT_VALID_TOKEN(HttpStatus.UNAUTHORIZED, 401, "토큰이 유효하지 않습니다."), + NOT_EXISTS_AUTHORIZATION(HttpStatus.UNAUTHORIZED, 401, "Authorization 헤더가 비어 있습니다."), + NOT_VALID_BEARER_GRANT_TYPE(HttpStatus.UNAUTHORIZED, 401, "인증 타입이 Bearer 타입이 아닙니다."), + REFRESH_TOKEN_NOT_FOUND(HttpStatus.UNAUTHORIZED, 401, "refresh token이 존재하지 않습니다."), + REFRESH_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, 401, "refresh token이 만료되었습니다."), + NOT_ACCESS_TOKEN_TYPE(HttpStatus.UNAUTHORIZED, 401, "해당 토큰은 ACCESS TOKEN이 아닙니다."), + + // 403 + NO_PERMISSION(HttpStatus.FORBIDDEN, 403, "권한이 없습니다."), + FORBIDDEN_ROLE(HttpStatus.FORBIDDEN, 403, "허용되지 않은 역할을 가진 유저의 요청입니다."), + + // 404 + NOT_EXISTS_MEMBER_ID(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 아이디입니다."), + NOT_EXISTS_MEMBER_NICKNAME(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 닉네임입니다."), + NOT_EXISTS_MEMBER_EMAIL(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 이메일입니다."), + + // 409 + ALREADY_REGISTERED_MEMBER_EMAIL(HttpStatus.CONFLICT, 409, "이미 가입된 이메일입니다."), + + // 500 + INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 500, "서버 오류가 발생했습니다."); + + private final HttpStatus httpStatus; + private final int code; + private final String message; +} \ No newline at end of file diff --git a/src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java b/src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java new file mode 100644 index 0000000..d382541 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java @@ -0,0 +1,36 @@ +package com.pedalgenie.vote.exception; + +import com.pedalgenie.vote.global.ResponseTemplate; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; + +@ControllerAdvice +public class GlobalExceptionHandler { + @ExceptionHandler(CustomException.class) + public ResponseEntity> handleCustomException(CustomException exception) { + ErrorCode errorCode = exception.getErrorCode(); + + return ResponseTemplate.createTemplate( + errorCode.getHttpStatus(), + false, + errorCode.getMessage(), + null + ); + } + + // 정의한 예외 외에는 500 서버 에러처리 + @ExceptionHandler(Exception.class) + public ResponseEntity> handleGeneralException(Exception ex) { + // 로그 출력 + ex.printStackTrace(); + + return ResponseTemplate.createTemplate( + HttpStatus.INTERNAL_SERVER_ERROR, + false, + "서버 오류가 발생했습니다..", + null + ); + } +} From 98503d6633afef13f0ea658143c6b0c89489387b Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 17:22:25 +0900 Subject: [PATCH 06/47] =?UTF-8?q?:sparkles:=20=EA=B3=B5=EC=9A=A9=20Respons?= =?UTF-8?q?Template=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/global/ResponseTemplate.java | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java diff --git a/src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java b/src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java new file mode 100644 index 0000000..b1b85a1 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/ResponseTemplate.java @@ -0,0 +1,28 @@ +package com.pedalgenie.vote.global; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; + +@JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드는 제외 +@Builder +public class ResponseTemplate { + public int status; + public boolean success; + public String message; + public T data; + + public static ResponseEntity> createTemplate(HttpStatus status, boolean success, String message, T data) { + ResponseTemplate responseTemplate = ResponseTemplate.builder() + .status(status.value()) + .success(success) + .message(message) + .data(data) + .build(); + + return ResponseEntity + .status(status) + .body(responseTemplate); + } +} From 228d613bf4c732f02d17190eec4e248bf538a528 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 17:22:36 +0900 Subject: [PATCH 07/47] =?UTF-8?q?:sparkles:=20swagger=20config=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pedalgenie/vote/config/SwaggerConfig.java | 24 +++++++++++++++++++ 1 file changed, 24 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java diff --git a/src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java b/src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java new file mode 100644 index 0000000..84a3401 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java @@ -0,0 +1,24 @@ +package com.pedalgenie.vote.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .components(new Components()) + .info(apiInfo()); + } + + private Info apiInfo() { + return new Info() + .title("PedalGenie API") + .description("PedalGenie API Doc") + .version("1.0.0"); + } +} \ No newline at end of file From 7ad355847bca940f3d47eadd68799539576029c9 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Wed, 18 Dec 2024 18:20:33 +0900 Subject: [PATCH 08/47] =?UTF-8?q?:recycle:=20=ED=8F=B4=EB=8D=94=20?= =?UTF-8?q?=EA=B5=AC=EC=A1=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pedalgenie/vote/{ => global}/config/SwaggerConfig.java | 2 +- .../pedalgenie/vote/{ => global}/exception/CustomException.java | 2 +- .../com/pedalgenie/vote/{ => global}/exception/ErrorCode.java | 2 +- .../vote/{ => global}/exception/GlobalExceptionHandler.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename src/main/java/com/pedalgenie/vote/{ => global}/config/SwaggerConfig.java (93%) rename src/main/java/com/pedalgenie/vote/{ => global}/exception/CustomException.java (84%) rename src/main/java/com/pedalgenie/vote/{ => global}/exception/ErrorCode.java (97%) rename src/main/java/com/pedalgenie/vote/{ => global}/exception/GlobalExceptionHandler.java (96%) diff --git a/src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SwaggerConfig.java similarity index 93% rename from src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java rename to src/main/java/com/pedalgenie/vote/global/config/SwaggerConfig.java index 84a3401..d764e65 100644 --- a/src/main/java/com/pedalgenie/vote/config/SwaggerConfig.java +++ b/src/main/java/com/pedalgenie/vote/global/config/SwaggerConfig.java @@ -1,4 +1,4 @@ -package com.pedalgenie.vote.config; +package com.pedalgenie.vote.global.config; import io.swagger.v3.oas.models.Components; import io.swagger.v3.oas.models.OpenAPI; diff --git a/src/main/java/com/pedalgenie/vote/exception/CustomException.java b/src/main/java/com/pedalgenie/vote/global/exception/CustomException.java similarity index 84% rename from src/main/java/com/pedalgenie/vote/exception/CustomException.java rename to src/main/java/com/pedalgenie/vote/global/exception/CustomException.java index f0eece8..0e5d13c 100644 --- a/src/main/java/com/pedalgenie/vote/exception/CustomException.java +++ b/src/main/java/com/pedalgenie/vote/global/exception/CustomException.java @@ -1,4 +1,4 @@ -package com.pedalgenie.vote.exception; +package com.pedalgenie.vote.global.exception; import lombok.Getter; @Getter diff --git a/src/main/java/com/pedalgenie/vote/exception/ErrorCode.java b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java similarity index 97% rename from src/main/java/com/pedalgenie/vote/exception/ErrorCode.java rename to src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java index cf807ab..2d542a9 100644 --- a/src/main/java/com/pedalgenie/vote/exception/ErrorCode.java +++ b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java @@ -1,4 +1,4 @@ -package com.pedalgenie.vote.exception; +package com.pedalgenie.vote.global.exception; import lombok.Getter; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java b/src/main/java/com/pedalgenie/vote/global/exception/GlobalExceptionHandler.java similarity index 96% rename from src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java rename to src/main/java/com/pedalgenie/vote/global/exception/GlobalExceptionHandler.java index d382541..008a160 100644 --- a/src/main/java/com/pedalgenie/vote/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/pedalgenie/vote/global/exception/GlobalExceptionHandler.java @@ -1,4 +1,4 @@ -package com.pedalgenie.vote.exception; +package com.pedalgenie.vote.global.exception; import com.pedalgenie.vote.global.ResponseTemplate; import org.springframework.http.HttpStatus; From 631262e88287fd43088f1bcca720b089b78ceaac Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:06:39 +0900 Subject: [PATCH 09/47] =?UTF-8?q?:sparkles:=20Member=20=EA=B4=80=EB=A0=A8?= =?UTF-8?q?=20=EC=97=94=ED=8B=B0=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/member/entity/Member.java | 47 +++++++++++++++++++ .../vote/domain/member/entity/Part.java | 18 +++++++ .../vote/domain/member/entity/Team.java | 9 ++++ 3 files changed, 74 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java new file mode 100644 index 0000000..b9cc0d4 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java @@ -0,0 +1,47 @@ +package com.pedalgenie.vote.domain.member.entity; + +import com.pedalgenie.vote.global.BaseTimeEntity; +import jakarta.persistence.*; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@Getter +public class Member extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="member_id") + private Long memberId; + + @NotNull + private String loginId; + + @NotNull + private String name; + + @NotNull + private String email; + + @NotNull + private String password; + + @Enumerated(EnumType.STRING) + private Part part; + + @Enumerated(EnumType.STRING) + private Team team; + + @Builder + public Member(String loginId, String name, String email, String password, Part part, Team team) { + this.loginId = loginId; + this.name = name; + this.email = email; + this.password = password; + this.part = part; + this.team = team; + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java new file mode 100644 index 0000000..fcd5a60 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java @@ -0,0 +1,18 @@ +package com.pedalgenie.vote.domain.member.entity; + +import java.util.List; + +public enum Part { + FRONT(List.of("윤영준", "박지수", "송유선", "최지원", "김류원", "지민재", "강다혜", "이희원", "권혜인", "이가빈")), + BACK(List.of("김연수", "남승현", "나혜인", "문서영", "임가현", "이한슬", "이채원", "유지민", "황서아", "최서지")); + + private final List members; + + Part(List members) { + this.members = members; + } + public List getMembers() { + return members; + } +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java new file mode 100644 index 0000000..c6886a1 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Team.java @@ -0,0 +1,9 @@ +package com.pedalgenie.vote.domain.member.entity; + +public enum Team { + PHOTO_GROUND, + ANGEL_BRIDGE, + PEDAL_GENIE, + CAKE_WAY, + COFFEE_DEAL +} From d728faa6c8a50c940b60aff50e6725b1e9a432f2 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:06:48 +0900 Subject: [PATCH 10/47] =?UTF-8?q?:sparkles:=20Member=20=EB=A0=88=ED=8F=AC?= =?UTF-8?q?=EC=A7=80=ED=86=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/member/repostiory/MemberRepository.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java diff --git a/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java new file mode 100644 index 0000000..e686eb0 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java @@ -0,0 +1,7 @@ +package com.pedalgenie.vote.domain.member.repostiory; + +import com.pedalgenie.vote.domain.member.entity.Member; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface MemberRepository extends JpaRepository { +} From e0e9b84f54044cf73471c0882c7500854d076ee6 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:07:05 +0900 Subject: [PATCH 11/47] =?UTF-8?q?:sparkles:=20=ED=88=AC=ED=91=9C=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=98=88=EC=99=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pedalgenie/vote/global/exception/ErrorCode.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java index 2d542a9..72b770b 100644 --- a/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java +++ b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java @@ -10,6 +10,9 @@ public enum ErrorCode { // 400 BAD_REQUEST(HttpStatus.BAD_REQUEST, 400, "잘못된 요청입니다."), PASSWORD_MISMATCH(HttpStatus.BAD_REQUEST, 400, "비밀번호가 일치하지 않습니다."), + NOT_EXISTS_PART_MEMBER(HttpStatus.BAD_REQUEST, 400, "해당 파트의 구성원이 아닙니다."), + CANNOT_VOTE_FOR_ANOTHER_PART(HttpStatus.BAD_REQUEST, 400, "다른 파트의 후보를 투표할 수 없습니다."), + CANNOT_VOTE_FOR_OWN_TEAM(HttpStatus.BAD_REQUEST, 400, "자신의 팀을 투표할 수 없습니다."), // 401 AUTHENTICATION_FAILED(HttpStatus.UNAUTHORIZED, 401, "인증에 실패했습니다."), @@ -32,6 +35,7 @@ public enum ErrorCode { // 409 ALREADY_REGISTERED_MEMBER_EMAIL(HttpStatus.CONFLICT, 409, "이미 가입된 이메일입니다."), + ALREADY_VOTED(HttpStatus.CONFLICT, 409, "이미 투표한 유저의 요청입니다."), // 500 INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, 500, "서버 오류가 발생했습니다."); From a46369175562d25f0dc9008cc8687182821b4576 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:07:28 +0900 Subject: [PATCH 12/47] =?UTF-8?q?:sparkles:=20Vote=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=ED=8B=B0=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/vote/entity/LeaderVote.java | 31 +++++++++++++++++++ .../vote/domain/vote/entity/TeamVote.java | 27 ++++++++++++++++ .../vote/domain/vote/entity/Vote.java | 28 +++++++++++++++++ 3 files changed, 86 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java b/src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java new file mode 100644 index 0000000..07fbfec --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/entity/LeaderVote.java @@ -0,0 +1,31 @@ +package com.pedalgenie.vote.domain.vote.entity; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class LeaderVote extends Vote{ + @Enumerated(EnumType.STRING) + @NotNull + private Part part; + + @NotNull + private String partMember; + + @Builder + public LeaderVote(Member member, Part part, String partMember){ + super(member); + this.part = part; + this.partMember = partMember; + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java b/src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java new file mode 100644 index 0000000..2d2fb99 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/entity/TeamVote.java @@ -0,0 +1,27 @@ +package com.pedalgenie.vote.domain.vote.entity; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Team; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.validation.constraints.NotNull; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Entity +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +public class TeamVote extends Vote{ + @Enumerated(EnumType.STRING) + @NotNull + private Team team; + + @Builder + public TeamVote(Member member, Team team){ + super(member); + this.team = team; + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java b/src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java new file mode 100644 index 0000000..8fd9be5 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/entity/Vote.java @@ -0,0 +1,28 @@ +package com.pedalgenie.vote.domain.vote.entity; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.global.BaseTimeEntity; +import jakarta.persistence.*; +import lombok.AccessLevel; +import lombok.Builder; +import lombok.Getter; +import lombok.NoArgsConstructor; + +@Getter +@NoArgsConstructor(access = AccessLevel.PROTECTED) +@MappedSuperclass +public abstract class Vote extends BaseTimeEntity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "vote_id") + private Long voteId; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(name = "member_id", nullable = false) + private Member member; + + protected Vote(Member member) { + this.member = member; + } +} + From ac2e0b59d7496e348020323dbfdde6225dfc0a76 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:07:38 +0900 Subject: [PATCH 13/47] =?UTF-8?q?:sparkles:=20Vote=20=EB=A0=88=ED=8F=AC?= =?UTF-8?q?=EC=A7=80=ED=86=A0=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/repository/LeaderVoteRepository.java | 20 +++++++++++++++++++ .../vote/repository/TeamVoteRepository.java | 14 +++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java b/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java new file mode 100644 index 0000000..8b7b320 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java @@ -0,0 +1,20 @@ +package com.pedalgenie.vote.domain.vote.repository; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.vote.entity.LeaderVote; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; + +import java.util.List; + +public interface LeaderVoteRepository extends JpaRepository { + boolean existsByMember(Member member); + + @Query("SELECT lv.partMember, COUNT(lv) " + + "FROM LeaderVote lv " + + "WHERE lv.part = :part " + + "GROUP BY lv.partMember") + List countVotesByPart(@Param("part") Part part); +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java b/src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java new file mode 100644 index 0000000..435c3d0 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/repository/TeamVoteRepository.java @@ -0,0 +1,14 @@ +package com.pedalgenie.vote.domain.vote.repository; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.vote.entity.TeamVote; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; + +import java.util.List; + +public interface TeamVoteRepository extends JpaRepository { + boolean existsByMember(Member member); + @Query("SELECT t.team, COUNT(t) FROM TeamVote t GROUP BY t.team") + List countVotesByTeam(); +} From 8f3b90cb49731554bcd0605f8df10fa2c4968c71 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:07:51 +0900 Subject: [PATCH 14/47] =?UTF-8?q?:sparkles:=20Vote=20=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?dto=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/vote/dto/VoteRequestDto.java | 25 +++++++++++++++++++ .../vote/domain/vote/dto/VoteResponseDto.java | 11 ++++++++ .../vote/domain/vote/dto/VoteResultDto.java | 14 +++++++++++ 3 files changed, 50 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java new file mode 100644 index 0000000..c183f09 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteRequestDto.java @@ -0,0 +1,25 @@ +package com.pedalgenie.vote.domain.vote.dto; + +import com.pedalgenie.vote.domain.member.entity.Part; +import lombok.Builder; +import lombok.Getter; + +@Getter +public class VoteRequestDto { + private String type; + private Part part; + private String voted; + + @Builder + public VoteRequestDto(String type, String part, String voted) { + this.type = type; + this.voted = voted; + + if (part != null) { + this.part = Part.valueOf(part); + } else { + this.part = null; + } + } +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java new file mode 100644 index 0000000..7d48d55 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResponseDto.java @@ -0,0 +1,11 @@ +package com.pedalgenie.vote.domain.vote.dto; + +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +public class VoteResponseDto { + private String voter; // 투표한 사람 이름 + private String voted; // 투표 받은 사람 이름 +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java new file mode 100644 index 0000000..ea0de3a --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/dto/VoteResultDto.java @@ -0,0 +1,14 @@ +package com.pedalgenie.vote.domain.vote.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import lombok.Builder; +import lombok.Getter; + +@Getter +@Builder +@JsonInclude(JsonInclude.Include.NON_NULL) +public class VoteResultDto { + private String name; + private String team; + private int votes; +} From 84ede69e890c79356d3942a3fd06530ea3ddfc3f Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:08:05 +0900 Subject: [PATCH 15/47] =?UTF-8?q?:sparkles:=20=ED=88=AC=ED=91=9C=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1,=20=ED=9B=84=EB=B3=B4=20=EC=A1=B0=ED=9A=8C,?= =?UTF-8?q?=20=EA=B2=B0=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/vote/service/VoteService.java | 201 ++++++++++++++++++ 1 file changed, 201 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java b/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java new file mode 100644 index 0000000..9b2c307 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java @@ -0,0 +1,201 @@ +package com.pedalgenie.vote.domain.vote.service; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.member.entity.Team; +import com.pedalgenie.vote.domain.vote.dto.VoteResultDto; +import com.pedalgenie.vote.domain.vote.repository.LeaderVoteRepository; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.domain.vote.dto.VoteRequestDto; +import com.pedalgenie.vote.domain.vote.dto.VoteResponseDto; +import com.pedalgenie.vote.domain.vote.entity.LeaderVote; +import com.pedalgenie.vote.domain.vote.entity.TeamVote; +import com.pedalgenie.vote.domain.vote.repository.TeamVoteRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.Comparator; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; + +@Service +@RequiredArgsConstructor +@Transactional(readOnly = true) +public class VoteService { + private final MemberRepository memberRepository; + private final TeamVoteRepository teamVoteRepository; + private final LeaderVoteRepository leaderVoteRepository; + + // 투표 생성 메서드 + @Transactional + public VoteResponseDto createVote(VoteRequestDto requestDto, Long memberId) { + Member voter = memberRepository.findById(memberId) + .orElseThrow(() -> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); + + if ("leader".equalsIgnoreCase(requestDto.getType())) { + return createLeaderVote(voter, requestDto); + } else if ("team".equalsIgnoreCase(requestDto.getType())) { + return createTeamVote(voter, requestDto); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + private VoteResponseDto createLeaderVote(Member voter, VoteRequestDto requestDto) { + // 유저가 이미 투표한 경우 예외 처리 + boolean hasVoted = leaderVoteRepository.existsByMember(voter); + if (hasVoted) { + throw new CustomException(ErrorCode.ALREADY_VOTED); + } + + Part part = requestDto.getPart(); // 투표받는 파트 + String partMember = requestDto.getVoted(); // 투표받는 후보자 + + // 투표자가 속하지 않은 파트에 투표를 시도하는 경우 예외처리 + if (!voter.getPart().equals(part)) { + throw new CustomException(ErrorCode.CANNOT_VOTE_FOR_ANOTHER_PART); + } + + // 투표받는 후보자가 해당 파트에 속하지 않는 경우 예외처리 + if (!part.getMembers().contains(partMember)) { + throw new CustomException(ErrorCode.NOT_EXISTS_PART_MEMBER); + } + + LeaderVote leaderVote = LeaderVote.builder() + .member(voter) + .part(part) + .partMember(partMember) + .build(); + + leaderVoteRepository.save(leaderVote); + + return VoteResponseDto.builder() + .voter(voter.getName()) + .voted(partMember) + .build(); + } + + private VoteResponseDto createTeamVote(Member voter, VoteRequestDto requestDto) { + // 유저가 이미 투표한 경우 예외 처리 + boolean hasVoted = teamVoteRepository.existsByMember(voter); + if (hasVoted) { + throw new CustomException(ErrorCode.ALREADY_VOTED); + } + + String votedTeam = requestDto.getVoted(); // 투표받는 팀 + Team voterTeam = voter.getTeam(); // 투표자가 속한 팀 + + // 자신이 속한 팀에 투표할 경우 예외처리 + if (voterTeam.name().equals(votedTeam)) { + throw new CustomException(ErrorCode.CANNOT_VOTE_FOR_OWN_TEAM); + } + + TeamVote teamVote = TeamVote.builder() + .member(voter) + .team(Team.valueOf(votedTeam)) + .build(); + + teamVoteRepository.save(teamVote); + + return VoteResponseDto.builder() + .voter(voter.getName()) + .voted(votedTeam) + .build(); + } + + // 후보 조회 메서드 + public List getCandidates(String type, String part) { + if (type.equalsIgnoreCase("leader")) { + return getPartCandidates(part); + } else if (type.equalsIgnoreCase("team")) { + return getTeamCandidates(); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + // 파트별 후보 조회 메서드 + private List getPartCandidates(String partName) { + if (partName == null || partName.trim().isEmpty()) { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + + if (partName.equalsIgnoreCase("FRONT")) { + return Part.FRONT.getMembers(); + } else if (partName.equalsIgnoreCase("BACK")) { + return Part.BACK.getMembers(); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + // 팀별 후보 조회 메서드 + private List getTeamCandidates(){ + return List.of(Team.PHOTO_GROUND.name(), Team.ANGEL_BRIDGE.name(), Team.PEDAL_GENIE.name(), + Team.CAKE_WAY.name(), Team.COFFEE_DEAL.name()); + } + + // 투표 결과 조회 메서드 + public List getResults(String type, String partName) { + if (type.equalsIgnoreCase("leader")) { + return getPartVoteResults(partName); + } else if (type.equalsIgnoreCase("team")) { + return getTeamVoteResults(); + } else { + throw new CustomException(ErrorCode.BAD_REQUEST); + } + } + + // 팀별 결과 조회 메서드 + public List getTeamVoteResults() { + // 모든 팀 조회 + List teams = Arrays.asList(Team.values()); + + // 투표 결과 조회 및 map 생성 + List results = teamVoteRepository.countVotesByTeam(); + Map teamVotesMap = results.stream() + .collect(Collectors.toMap(result -> (Team) result[0], result -> ((Number) result[1]).longValue())); + + // 모든 팀에 대해 결과 생성, 없으면 0표로 처리 + return teams.stream() + .map(team -> VoteResultDto.builder() + .name(team.name()) + .votes(teamVotesMap.getOrDefault(team, 0L).intValue()) + .build()) + .sorted((r1, r2) -> Integer.compare(r2.getVotes(), r1.getVotes())) // 내림차순 정렬 + .collect(Collectors.toList()); + } + + + + // 파트별 결과 조회 메서드 + public List getPartVoteResults(String partName) { + Part part = Part.valueOf(partName.toUpperCase()); + + // 파트별 투표 결과 조회 + List results = leaderVoteRepository.countVotesByPart(part); + + // 투표 결과를 map으로 변환 + Map voteCountMap = results.stream() + .collect(Collectors.toMap( + result -> (String) result[0], // 후보 이름 + result -> ((Number) result[1]).intValue() // 투표 수 + )); + + // 모든 후보에 대해 결과 생성, 없으면 0표로 처리 + return part.getMembers().stream() + .map(member -> VoteResultDto.builder() + .name(member) + .team(part.name()) + .votes(voteCountMap.getOrDefault(member, 0)) + .build()) + .sorted(Comparator.comparingInt(VoteResultDto::getVotes).reversed() + .thenComparing(VoteResultDto::getName)) // 투표 수 내림차순, 이름순 정렬 + .collect(Collectors.toList()); + } +} From 6e19cea17eb33d4068ae90d15cf56dedcc055952 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Mon, 23 Dec 2024 01:08:13 +0900 Subject: [PATCH 16/47] =?UTF-8?q?:sparkles:=20=ED=88=AC=ED=91=9C=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1,=20=ED=9B=84=EB=B3=B4=20=EC=A1=B0=ED=9A=8C,?= =?UTF-8?q?=20=EA=B2=B0=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=20API=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/controller/VoteController.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java new file mode 100644 index 0000000..8322edb --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java @@ -0,0 +1,66 @@ +package com.pedalgenie.vote.domain.vote.controller; + +import com.pedalgenie.vote.domain.vote.dto.VoteResultDto; +import com.pedalgenie.vote.domain.vote.service.VoteService; +import com.pedalgenie.vote.domain.vote.dto.VoteRequestDto; +import com.pedalgenie.vote.domain.vote.dto.VoteResponseDto; +import com.pedalgenie.vote.global.ResponseTemplate; +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.*; + +import java.util.List; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/votes") +@Tag(name = "Vote Controller", description="투표 API \n 생성, 조회 로직을 포함합니다.") +public class VoteController { + private final VoteService voteService; + + // 투표 생성 + @Operation(summary = "투표 생성") + @PostMapping + public ResponseEntity> createVote( + @RequestParam String type, + @RequestParam(required = false) String part, + @RequestParam String voted + ) { + Long memberId = 1L; // static, 추후 인증 정보로 변경 예정 + + VoteRequestDto requestDto = VoteRequestDto.builder() + .type(type) + .part(part) + .voted(voted) + .build(); + VoteResponseDto voteDto = voteService.createVote(requestDto, memberId); + + return ResponseTemplate.createTemplate(HttpStatus.CREATED, true, "투표 생성 성공", voteDto); + } + + // 후보 조회 + @Operation(summary = "후보 조회") + @GetMapping("/candidates") + public ResponseEntity>> getCandidates( + @RequestParam String type, + @RequestParam(required = false) String part + ){ + + List candidateList = voteService.getCandidates(type, part); + return ResponseTemplate.createTemplate(HttpStatus.OK, true, "후보 조회 성공", candidateList); + } + + // 투표 결과 조회 + @Operation(summary = "투표 결과 조회") + @GetMapping("/results") + public ResponseEntity>> getResults( + @RequestParam String type, + @RequestParam(required = false) String part + ){ + List resultList = voteService.getResults(type, part); + return ResponseTemplate.createTemplate(HttpStatus.OK, true, "투표 결과 조회 성공", resultList); + } +} From b550d7e58097ef15a32f3557235408b213224143 Mon Sep 17 00:00:00 2001 From: juanxiu <2316007@ewhain.net> Date: Thu, 26 Dec 2024 00:07:29 +0900 Subject: [PATCH 17/47] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85,=20?= =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8,=20=ED=9A=8C=EC=9B=90=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 10 ++ .../vote/domain/auth/CustomUserDetails.java | 60 ++++++++++++ .../domain/auth/CustomUserDetailsService.java | 26 ++++++ .../pedalgenie/vote/domain/jwt/JwtUtil.java | 65 +++++++++++++ .../vote/domain/jwt/TokenValidator.java | 20 ++++ .../jwt/filter/JwtAuthenticationFilter.java | 91 +++++++++++++++++++ .../jwt/filter/JwtValidationFilter.java | 77 ++++++++++++++++ .../member/controller/AuthController.java | 31 +++++++ .../member/controller/MemberController.java | 32 +++++++ .../vote/domain/member/dto/LoginRequest.java | 4 + .../vote/domain/member/dto/LoginResponse.java | 6 ++ .../vote/domain/member/dto/SignUpRequest.java | 26 ++++++ .../domain/member/dto/SignUpResponse.java | 14 +++ .../vote/domain/member/entity/Member.java | 7 +- .../member/repostiory/MemberRepository.java | 8 ++ .../domain/member/service/AuthService.java | 45 +++++++++ .../domain/member/service/MemberService.java | 26 ++++++ .../vote/controller/VoteController.java | 7 +- .../vote/repository/LeaderVoteRepository.java | 1 + .../vote/domain/vote/service/VoteService.java | 4 +- .../vote/global/config/SecurityConfig.java | 80 ++++++++++++++++ .../vote/global/exception/ErrorCode.java | 4 +- src/main/resources/application.yml | 1 + 23 files changed, 637 insertions(+), 8 deletions(-) create mode 100644 src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java create mode 100644 src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java create mode 100644 src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java diff --git a/build.gradle b/build.gradle index 8fa30ac..e3d2212 100644 --- a/build.gradle +++ b/build.gradle @@ -36,6 +36,16 @@ dependencies { annotationProcessor 'org.projectlombok:lombok' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + + // 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' + + // spring security + implementation 'org.springframework.boot:spring-boot-starter-security' + + } tasks.named('test') { diff --git a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java new file mode 100644 index 0000000..4c26a23 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java @@ -0,0 +1,60 @@ +package com.pedalgenie.vote.domain.auth; + +import com.pedalgenie.vote.domain.member.entity.Member; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.userdetails.UserDetails; + +import java.util.ArrayList; +import java.util.Collection; + +@RequiredArgsConstructor +public class CustomUserDetails implements UserDetails { + + private final Member member; + + // 권한 객체 목록을 반환 + @Override + public Collection getAuthorities(){ + // 권한 목록 + Collection authorities = new ArrayList<>(); + // 권한 추가 + authorities.add(new SimpleGrantedAuthority("ROLE_USER")); + return authorities; + } + @Override + public String getPassword(){ + return member.getPassword(); + } + @Override + public String getUsername() { + return member.getUsername(); + } + + // memberId 얻는 메서드 추가 + public Long getMemberId(){ + return member.getMemberId(); + } + + @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/pedalgenie/vote/domain/auth/CustomUserDetailsService.java b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java new file mode 100644 index 0000000..e3a8af5 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java @@ -0,0 +1,26 @@ +package com.pedalgenie.vote.domain.auth; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.core.userdetails.UsernameNotFoundException; +import org.springframework.stereotype.Service; + +@Service +@RequiredArgsConstructor +public class CustomUserDetailsService implements UserDetailsService { + + private final MemberRepository memberRepository; + + public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException{ + final Member member= memberRepository.findByUsername(username) + .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_NAME)); + + return new CustomUserDetails(member); + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java b/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java new file mode 100644 index 0000000..e13554b --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java @@ -0,0 +1,65 @@ +package com.pedalgenie.vote.domain.jwt; + +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.SignatureAlgorithm; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; + +import javax.crypto.SecretKey; +import javax.crypto.spec.SecretKeySpec; + +import java.nio.charset.StandardCharsets; +import java.util.Date; + +import static io.jsonwebtoken.SignatureAlgorithm.HS256; + + +@Component +public class JwtUtil { + + private final SecretKey secretKey; + + public JwtUtil(@Value("${jwt.secret}")final String secret) { +// final String algorithm = HS256.getValue(); + this.secretKey = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8),"HmacSHA256"); + } + + public String createJwt(final String category,final String username, Long expiredMs){ + return Jwts.builder() + .claim("category", category) + .claim("username", username) + .setIssuedAt(new Date(System.currentTimeMillis())) // 발급 시간 + .setExpiration(new Date(System.currentTimeMillis()+ expiredMs)) // 만료 시간 + .signWith(secretKey, HS256) + .compact(); + } + + // 토큰에서 유저네임 추출 메서드 + public String getUsername(final String token){ + Claims claims= getPayload(token); + return claims.get("username", String.class); + } + + // 토큰에서 카테고리(액세스, 리프레시) 추출 메서드 + public String getCategory(final String token){ + Claims claims= getPayload(token); + return claims.get("category", String.class); + } + + // 토큰 만료 검사 메서드 + public boolean isExpired(final String token){ + return getPayload(token) + .getExpiration() + .before(new Date()); + } + + // 토큰 페이로드 메서드 + private Claims getPayload(final String token){ + return Jwts.parserBuilder() + .setSigningKey(secretKey) + .build() + .parseClaimsJws(token) + .getBody(); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java b/src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java new file mode 100644 index 0000000..fe34c07 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/TokenValidator.java @@ -0,0 +1,20 @@ +package com.pedalgenie.vote.domain.jwt; + +import io.jsonwebtoken.ExpiredJwtException; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Component; + +@Component +@RequiredArgsConstructor +public class TokenValidator { + private final JwtUtil jwtUtil; + + // 토큰 만료 여부 확인 + public void validateTokenExpired(final String token){ + try{ + jwtUtil.isExpired(token); + }catch (ExpiredJwtException e){ + throw new IllegalArgumentException(jwtUtil.getCategory(token)+" 토큰 만료"); + } + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java new file mode 100644 index 0000000..658007a --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java @@ -0,0 +1,91 @@ +package com.pedalgenie.vote.domain.jwt.filter; + +import com.fasterxml.jackson.databind.ObjectMapper; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.member.dto.LoginRequest; +import jakarta.annotation.PostConstruct; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.AuthenticationException; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; +import org.springframework.util.StreamUtils; + +import java.io.IOException; +import java.nio.charset.StandardCharsets; + +@RequiredArgsConstructor +public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilter { + + private final AuthenticationManager authenticationManager; + private final JwtUtil jwtUtil; + + @PostConstruct + public void init() { + setAuthenticationManager(authenticationManager); // 명시적으로 AuthenticationManager 설정 + } + + @Override + public Authentication attemptAuthentication(HttpServletRequest request, HttpServletResponse response) + throws AuthenticationException { + + LoginRequest loginRequest; + + try { + ObjectMapper objectMapper=new ObjectMapper(); + + // JSON 요청 본문을 읽어 LoginRequestDto 객체로 변환 + ServletInputStream inputStream = request.getInputStream(); + String messageBody = StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8); + loginRequest = objectMapper.readValue(messageBody, LoginRequest.class); + + // 스프링 시큐리티에서 사용자의 인증 정보(username, password)를 검증하기 위해서는 token(dto)에 담아야 함 + UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = + new UsernamePasswordAuthenticationToken(loginRequest.username(), loginRequest.password()); + + // token에 담은 값들의 검증을 위해 AuthenticationManager로 전달 -> 검증 진행 + return authenticationManager.authenticate(usernamePasswordAuthenticationToken); + + } catch (IOException e) { + throw new RuntimeException("요청 바디 파싱 에러"); + } + } + + // 로그인 성공 시 실행하는 메서드 (JWT 토큰 발급) + @Override + protected void successfulAuthentication(final HttpServletRequest request, final HttpServletResponse response, + final FilterChain filterChain, final Authentication authResult) + throws IOException, ServletException{ + + // CustomUserDetails의 메서드에서 추출한 값 + final String username = authResult.getName(); + + // 권한 목록에 있는 권한을 추출(ROLE_USER) + String role = authResult.getAuthorities() + .iterator() + .next() + .getAuthority(); + + // 토큰 생성 + String access = jwtUtil.createJwt("access", username,1000L * 60 * 60 * 2); // 2시간 + + // 응답 설정: 헤더 key 값을 access로 설정 + response.setHeader("access", access); + response.setStatus(HttpStatus.OK.value()); + + // 시큐리티 컨텍스트 홀더에 저장 + SecurityContextHolder.getContext().setAuthentication(authResult); + + } + + +} + diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java new file mode 100644 index 0000000..1d04c78 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java @@ -0,0 +1,77 @@ +package com.pedalgenie.vote.domain.jwt.filter; + +import com.pedalgenie.vote.domain.auth.CustomUserDetails; +import com.pedalgenie.vote.domain.auth.CustomUserDetailsService; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.jwt.TokenValidator; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import jakarta.servlet.FilterChain; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import lombok.RequiredArgsConstructor; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.authority.SimpleGrantedAuthority; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.util.StringUtils; +import org.springframework.web.filter.OncePerRequestFilter; + +import java.io.IOException; +import java.util.List; + +@RequiredArgsConstructor +public class JwtValidationFilter extends OncePerRequestFilter { + + private final JwtUtil jwtUtil; + private final TokenValidator tokenValidator; + private final MemberRepository memberRepository; + + @Override + protected void doFilterInternal(final HttpServletRequest request, + final HttpServletResponse response, + final FilterChain filterChain) + throws ServletException, IOException{ + + // 헤더에서 access 키에 담긴 토큰을 꺼냄 + String accessToken = request.getHeader("access"); + + // 토큰이 없다면 다음 필터로 넘김 + if(!StringUtils.hasText(accessToken)){ + filterChain.doFilter(request,response); + return; + } + // 토큰 만료 여부 확인, 만료 시 다음 필터로 넘기지 않음 + tokenValidator.validateTokenExpired(accessToken); + + // 인증 정보 저장 + setAuthentication(accessToken); + + filterChain.doFilter(request, response); + + } + + // jwt 토큰 사용해서 사용자 인증, SecurityContext 에 인증 정보 설정 + private void setAuthentication(String accessToken){ + + // 토큰에서 유저 이름 추출 + String username = jwtUtil.getUsername(accessToken); + + // 유저 디비에서 이름 찾기 + Member member = memberRepository.findByUsername(username) + .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_NAME)); + + // 해당 유저 정보 로드 + CustomUserDetails userDetails = new CustomUserDetails(member); + + // 인증 객체 생성(principal, credentials), 비밀번호는 인증 후 더 이상 필요하지 않으므로 null + Authentication authToken = + new UsernamePasswordAuthenticationToken(userDetails,null, userDetails.getAuthorities()); + + // 인증 정보 저장 + SecurityContextHolder.getContext().setAuthentication(authToken); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java b/src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java new file mode 100644 index 0000000..6f1ee16 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/controller/AuthController.java @@ -0,0 +1,31 @@ +package com.pedalgenie.vote.domain.member.controller; + +import com.pedalgenie.vote.domain.member.dto.SignUpRequest; +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.service.AuthService; +import com.pedalgenie.vote.global.ResponseTemplate; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequestMapping("/api/auth") +@RequiredArgsConstructor +public class AuthController { + + private final AuthService memberService; + + @Operation(summary="회원가입") + @PostMapping + public ResponseEntity> signUp(@RequestBody final SignUpRequest request){ + SignUpResponse signUpResponse = memberService.signUp(request); + return ResponseTemplate.createTemplate(HttpStatus.CREATED,true,"회원가입 성공",signUpResponse); + } + + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java b/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java new file mode 100644 index 0000000..ff6bfd5 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java @@ -0,0 +1,32 @@ +package com.pedalgenie.vote.domain.member.controller; + +import com.pedalgenie.vote.domain.auth.CustomUserDetails; +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.service.MemberService; +import com.pedalgenie.vote.global.ResponseTemplate; +import io.swagger.v3.oas.annotations.Operation; +import lombok.RequiredArgsConstructor; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +@RequiredArgsConstructor +@RequestMapping("/api/member") +public class MemberController { + private final MemberService memberService; + + @Operation(summary="회원 정보 조회") + @GetMapping + public ResponseEntity> memberInfo(@AuthenticationPrincipal CustomUserDetails userDetails){ + + Long memberId = userDetails.getMemberId(); + SignUpResponse signUpResponse = memberService.getMemberInfo(memberId); + return ResponseTemplate.createTemplate(HttpStatus.OK,true,"회원 정보 조회 성공", signUpResponse); + } + + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java new file mode 100644 index 0000000..1c26cf2 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java @@ -0,0 +1,4 @@ +package com.pedalgenie.vote.domain.member.dto; + +public record LoginRequest(String username, String password) { +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java new file mode 100644 index 0000000..e1527a4 --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java @@ -0,0 +1,6 @@ +package com.pedalgenie.vote.domain.member.dto; + +public record LoginResponse( + +) { +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java new file mode 100644 index 0000000..7c6ed5a --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpRequest.java @@ -0,0 +1,26 @@ +package com.pedalgenie.vote.domain.member.dto; + +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.member.entity.Team; +import org.springframework.security.crypto.password.PasswordEncoder; + +public record SignUpRequest( + String loginId, + String password, + String email, + String username, + Part part, + Team team +) { + public Member toEntity(PasswordEncoder passwordEncoder){ + return Member.builder() + .loginId(loginId) + .password(passwordEncoder.encode(password)) + .email(email) + .username(username) + .part(part) + .team(team) + .build(); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java new file mode 100644 index 0000000..6960f9f --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java @@ -0,0 +1,14 @@ +package com.pedalgenie.vote.domain.member.dto; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.pedalgenie.vote.domain.member.entity.Member; + +@JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드 json에서 제외 +public record SignUpResponse( + String loginId, + String username +) { + public static SignUpResponse from(Member member){ + return new SignUpResponse(member.getLoginId(),member.getUsername()); + } +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java index b9cc0d4..c434c29 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java @@ -11,6 +11,7 @@ @Entity @NoArgsConstructor(access = AccessLevel.PROTECTED) @Getter +@Table(name = "member") public class Member extends BaseTimeEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @@ -21,7 +22,7 @@ public class Member extends BaseTimeEntity { private String loginId; @NotNull - private String name; + private String username; @NotNull private String email; @@ -36,9 +37,9 @@ public class Member extends BaseTimeEntity { private Team team; @Builder - public Member(String loginId, String name, String email, String password, Part part, Team team) { + public Member(String loginId, String username, String email, String password, Part part, Team team) { this.loginId = loginId; - this.name = name; + this.username = username; this.email = email; this.password = password; this.part = part; diff --git a/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java index e686eb0..2d0eec5 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java @@ -2,6 +2,14 @@ import com.pedalgenie.vote.domain.member.entity.Member; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.Optional; public interface MemberRepository extends JpaRepository { + + boolean existsByLoginId(final String loginId); + boolean existsByEmail(final String email); + + Optional findByUsername(String username); } diff --git a/src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java b/src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java new file mode 100644 index 0000000..4c86e7c --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/service/AuthService.java @@ -0,0 +1,45 @@ +package com.pedalgenie.vote.domain.member.service; + +import com.pedalgenie.vote.domain.auth.CustomUserDetailsService; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.member.dto.SignUpRequest; +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +@Transactional +@RequiredArgsConstructor +public class AuthService { + + private final MemberRepository memberRepository; + private final PasswordEncoder passwordEncoder; + private final CustomUserDetailsService customUserDetailsService; + private final JwtUtil jwtUtil; + + + // 회원 가입 + public SignUpResponse signUp(final SignUpRequest request){ + + // 로그인 아이디 중복 검사 + if(memberRepository.existsByLoginId(request.loginId())){ + throw new CustomException(ErrorCode.ALREADY_REGISTERED_LOGIN_ID); + } + // 이메일 중복 검사 + if(memberRepository.existsByEmail(request.email())){ + throw new CustomException(ErrorCode.ALREADY_REGISTERED_MEMBER_EMAIL); + } + final Member member = request.toEntity(passwordEncoder); + memberRepository.save(member); + + return SignUpResponse.from(member); + + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java b/src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java new file mode 100644 index 0000000..4dac4fe --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/domain/member/service/MemberService.java @@ -0,0 +1,26 @@ +package com.pedalgenie.vote.domain.member.service; + +import com.pedalgenie.vote.domain.member.dto.SignUpResponse; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + + +@Service +@Transactional(readOnly = true) +@RequiredArgsConstructor +public class MemberService { + private final MemberRepository memberRepository; + + // 회원 조회 메서드 + public SignUpResponse getMemberInfo(Long memberId){ + Member member = memberRepository.findById(memberId) + .orElseThrow(()->new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); + return SignUpResponse.from(member); + } + +} diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java index 8322edb..d7e1e66 100644 --- a/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java +++ b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java @@ -1,5 +1,6 @@ package com.pedalgenie.vote.domain.vote.controller; +import com.pedalgenie.vote.domain.auth.CustomUserDetails; import com.pedalgenie.vote.domain.vote.dto.VoteResultDto; import com.pedalgenie.vote.domain.vote.service.VoteService; import com.pedalgenie.vote.domain.vote.dto.VoteRequestDto; @@ -10,6 +11,7 @@ import lombok.RequiredArgsConstructor; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.security.core.annotation.AuthenticationPrincipal; import org.springframework.web.bind.annotation.*; import java.util.List; @@ -27,9 +29,10 @@ public class VoteController { public ResponseEntity> createVote( @RequestParam String type, @RequestParam(required = false) String part, - @RequestParam String voted + @RequestParam String voted, + @AuthenticationPrincipal CustomUserDetails userDetails ) { - Long memberId = 1L; // static, 추후 인증 정보로 변경 예정 + Long memberId = userDetails.getMemberId(); // 인증 정보로 변경 VoteRequestDto requestDto = VoteRequestDto.builder() .type(type) diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java b/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java index 8b7b320..3555b84 100644 --- a/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java +++ b/src/main/java/com/pedalgenie/vote/domain/vote/repository/LeaderVoteRepository.java @@ -9,6 +9,7 @@ import java.util.List; + public interface LeaderVoteRepository extends JpaRepository { boolean existsByMember(Member member); diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java b/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java index 9b2c307..9d4842f 100644 --- a/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java +++ b/src/main/java/com/pedalgenie/vote/domain/vote/service/VoteService.java @@ -75,7 +75,7 @@ private VoteResponseDto createLeaderVote(Member voter, VoteRequestDto requestDto leaderVoteRepository.save(leaderVote); return VoteResponseDto.builder() - .voter(voter.getName()) + .voter(voter.getUsername()) .voted(partMember) .build(); } @@ -103,7 +103,7 @@ private VoteResponseDto createTeamVote(Member voter, VoteRequestDto requestDto) teamVoteRepository.save(teamVote); return VoteResponseDto.builder() - .voter(voter.getName()) + .voter(voter.getUsername()) .voted(votedTeam) .build(); } diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java new file mode 100644 index 0000000..ba8ec9f --- /dev/null +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -0,0 +1,80 @@ +package com.pedalgenie.vote.global.config; + +import com.pedalgenie.vote.domain.jwt.filter.JwtAuthenticationFilter; +import com.pedalgenie.vote.domain.jwt.JwtUtil; +import com.pedalgenie.vote.domain.jwt.filter.JwtValidationFilter; +import com.pedalgenie.vote.domain.jwt.TokenValidator; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import lombok.RequiredArgsConstructor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.authentication.AuthenticationManager; +import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; +import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; +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.annotation.web.configurers.HttpBasicConfigurer; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.web.SecurityFilterChain; +import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter; + +import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS; + +@Configuration +@EnableWebSecurity +@RequiredArgsConstructor +public class SecurityConfig { + private final AuthenticationConfiguration authenticationConfiguration; + private final JwtUtil jwtUtil; + private final TokenValidator tokenValidator; + private final MemberRepository memberRepository; + + @Bean + public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ + + http + .csrf(AbstractHttpConfigurer::disable) + .formLogin(AbstractHttpConfigurer::disable) + .httpBasic(HttpBasicConfigurer::disable); + + http + // 접근 허용된 URI + .authorizeHttpRequests(auth ->auth + .requestMatchers("/login", + "/", + "/api/auth").permitAll() + .requestMatchers("/swwagger-ui/index.html", + "/v3/api-docs/**").permitAll() + .anyRequest().authenticated()); + + // AuthenticationManager 생성 + AuthenticationManager authenticationManager = authenticationManager(authenticationConfiguration); + + // JwtAuthenticationFilter 설정 + JwtAuthenticationFilter jwtAuthenticationFilter = new JwtAuthenticationFilter(authenticationManager, jwtUtil); + jwtAuthenticationFilter.setFilterProcessesUrl("/login"); // 로그인 URL 설정 + + // 필터 추가 + http + .addFilterBefore(new JwtValidationFilter(jwtUtil, tokenValidator,memberRepository), JwtAuthenticationFilter.class) + .addFilterAt(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class); + + http + .sessionManagement((session)->session.sessionCreationPolicy(STATELESS)); + + return http.build(); + } + + // AuthenticationManager 빈 등록 + @Bean + public AuthenticationManager authenticationManager(AuthenticationConfiguration configuration) throws Exception { + return configuration.getAuthenticationManager(); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} diff --git a/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java index 72b770b..36b9f79 100644 --- a/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java +++ b/src/main/java/com/pedalgenie/vote/global/exception/ErrorCode.java @@ -30,11 +30,13 @@ public enum ErrorCode { // 404 NOT_EXISTS_MEMBER_ID(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 아이디입니다."), - NOT_EXISTS_MEMBER_NICKNAME(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 닉네임입니다."), + NOT_EXISTS_MEMBER_NAME(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 이름입니다."), NOT_EXISTS_MEMBER_EMAIL(HttpStatus.NOT_FOUND, 404, "존재하지 않는 멤버 이메일입니다."), + // 409 ALREADY_REGISTERED_MEMBER_EMAIL(HttpStatus.CONFLICT, 409, "이미 가입된 이메일입니다."), + ALREADY_REGISTERED_LOGIN_ID(HttpStatus.CONFLICT,409,"이미 가입된 아이디입니다."), ALREADY_VOTED(HttpStatus.CONFLICT, 409, "이미 투표한 유저의 요청입니다."), // 500 diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index ab49360..da70514 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -14,6 +14,7 @@ spring: format_sql: true naming: physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl + dialect: org.hibernate.dialect.MySQL8Dialect # 이 항목 추가 jwt: secret: ${JWT} From ac54d4a45ded024ace6241db1e5101bbd589b4e4 Mon Sep 17 00:00:00 2001 From: juanxiu <2316007@ewhain.net> Date: Thu, 26 Dec 2024 01:34:13 +0900 Subject: [PATCH 18/47] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=20=EC=9D=91=EB=8B=B5=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jwt/filter/JwtAuthenticationFilter.java | 25 +++++++++++++++++++ .../jwt/filter/JwtValidationFilter.java | 1 + .../vote/global/config/SecurityConfig.java | 9 +++---- 3 files changed, 29 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java index 658007a..8f30091 100644 --- a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java @@ -3,6 +3,10 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.pedalgenie.vote.domain.jwt.JwtUtil; import com.pedalgenie.vote.domain.member.dto.LoginRequest; +import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; +import com.pedalgenie.vote.global.exception.CustomException; +import com.pedalgenie.vote.global.exception.ErrorCode; import jakarta.annotation.PostConstruct; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -27,6 +31,7 @@ public class JwtAuthenticationFilter extends UsernamePasswordAuthenticationFilte private final AuthenticationManager authenticationManager; private final JwtUtil jwtUtil; + private final MemberRepository memberRepository; @PostConstruct public void init() { @@ -47,6 +52,7 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ String messageBody = StreamUtils.copyToString(inputStream, StandardCharsets.UTF_8); loginRequest = objectMapper.readValue(messageBody, LoginRequest.class); + // 스프링 시큐리티에서 사용자의 인증 정보(username, password)를 검증하기 위해서는 token(dto)에 담아야 함 UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = new UsernamePasswordAuthenticationToken(loginRequest.username(), loginRequest.password()); @@ -81,11 +87,30 @@ protected void successfulAuthentication(final HttpServletRequest request, final response.setHeader("access", access); response.setStatus(HttpStatus.OK.value()); + // 프론트에 넘겨주기 위한 JSON 응답 + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write("{\"result\": \"로그인이 성공적으로 완료되었습니다.\"}"); + // 시큐리티 컨텍스트 홀더에 저장 SecurityContextHolder.getContext().setAuthentication(authResult); } + // 로그인 실패 시 + @Override + protected void unsuccessfulAuthentication(HttpServletRequest request,HttpServletResponse response, + AuthenticationException failed) throws IOException, ServletException { + +// super.unsuccessfulAuthentication(request, response, failed); + + // 프론트에 넘겨주기 위한 JSON 응답 + response.setStatus(401); + response.setContentType("application/json"); + response.setCharacterEncoding("UTF-8"); + response.getWriter().write("{\"result\": \"로그인에 실패하였습니다.\"}"); + } + } diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java index 1d04c78..ca7f2b4 100644 --- a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java @@ -67,6 +67,7 @@ private void setAuthentication(String accessToken){ // 해당 유저 정보 로드 CustomUserDetails userDetails = new CustomUserDetails(member); + // 인증 객체 생성(principal, credentials), 비밀번호는 인증 후 더 이상 필요하지 않으므로 null Authentication authToken = new UsernamePasswordAuthenticationToken(userDetails,null, userDetails.getAuthorities()); diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java index ba8ec9f..3f804af 100644 --- a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -42,18 +42,15 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ http // 접근 허용된 URI .authorizeHttpRequests(auth ->auth - .requestMatchers("/login", - "/", - "/api/auth").permitAll() - .requestMatchers("/swwagger-ui/index.html", - "/v3/api-docs/**").permitAll() + .requestMatchers("/login", "/", "/api/auth").permitAll() + .requestMatchers("/swwagger-ui/index.html", "/v3/api-docs/**", "http://localhost:3000/**").permitAll() .anyRequest().authenticated()); // AuthenticationManager 생성 AuthenticationManager authenticationManager = authenticationManager(authenticationConfiguration); // JwtAuthenticationFilter 설정 - JwtAuthenticationFilter jwtAuthenticationFilter = new JwtAuthenticationFilter(authenticationManager, jwtUtil); + JwtAuthenticationFilter jwtAuthenticationFilter = new JwtAuthenticationFilter(authenticationManager, jwtUtil,memberRepository); jwtAuthenticationFilter.setFilterProcessesUrl("/login"); // 로그인 URL 설정 // 필터 추가 From c495e6e273cbcfd87c6e07e8f509125daa74724a Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 11:38:23 +0900 Subject: [PATCH 19/47] =?UTF-8?q?:sparkles:=20CORS=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/global/config/SecurityConfig.java | 26 +++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java index 3f804af..528e749 100644 --- a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -13,12 +13,16 @@ import org.springframework.security.config.annotation.authentication.configuration.AuthenticationConfiguration; 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.configuration.WebSecurityCustomizer; import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer; import org.springframework.security.config.annotation.web.configurers.HttpBasicConfigurer; import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; import org.springframework.security.crypto.password.PasswordEncoder; 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.security.config.http.SessionCreationPolicy.STATELESS; @@ -35,6 +39,7 @@ public class SecurityConfig { public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ http + .cors(cors -> cors.configurationSource(corsConfigurationSource())) .csrf(AbstractHttpConfigurer::disable) .formLogin(AbstractHttpConfigurer::disable) .httpBasic(HttpBasicConfigurer::disable); @@ -42,8 +47,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ http // 접근 허용된 URI .authorizeHttpRequests(auth ->auth - .requestMatchers("/login", "/", "/api/auth").permitAll() - .requestMatchers("/swwagger-ui/index.html", "/v3/api-docs/**", "http://localhost:3000/**").permitAll() + .requestMatchers("/login", "/api/auth").permitAll() + .requestMatchers("/swagger-ui/index.html", "/v3/api-docs/**", "http://localhost:3000/**").permitAll() .anyRequest().authenticated()); // AuthenticationManager 생성 @@ -63,6 +68,23 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ return http.build(); } + protected CorsConfigurationSource corsConfigurationSource() { + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", getDefaultCorsConfiguration()); + return source; + } + + private CorsConfiguration getDefaultCorsConfiguration() { + CorsConfiguration config = new CorsConfiguration(); + config.addAllowedOrigin("http://localhost:3000"); + config.addAllowedOrigin("http://localhost:8080"); + // 프론트 배포 url 추가 필요 + config.addAllowedMethod("*"); + config.addAllowedHeader("*"); + config.setAllowCredentials(true); + config.setMaxAge(3600L); + return config; + } // AuthenticationManager 빈 등록 @Bean From d813ad90e71e73f3ab65a297b199f4ac0357a934 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 16:22:33 +0900 Subject: [PATCH 20/47] =?UTF-8?q?:rocket:=20=EB=B0=B0=ED=8F=AC=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 4 ++++ src/main/resources/application.yml | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..21c0708 --- /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"] \ No newline at end of file diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index da70514..0ed83d7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,7 +2,7 @@ spring: config: import: optional:file:.env[.properties] datasource: - url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME} + url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 username: ${DB_USER} password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver From d4f7e152f4bea188c15c5c3bf60a4a64dd8ea0fc Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 16:42:31 +0900 Subject: [PATCH 21/47] =?UTF-8?q?:rocket:=20=EB=B0=B0=ED=8F=AC=EC=9A=A9=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EB=B3=80=EC=88=98=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0ed83d7..04307f4 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: config: import: optional:file:.env[.properties] datasource: - url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 - username: ${DB_USER} - password: ${DB_PASSWORD} + url: jdbc:mysql://${secrets.DB_HOST}:${secrets.DB_PORT}/${secrets.DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 + username: ${secrets.DB_USER} + password: ${secrets.DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver jpa: hibernate: @@ -16,7 +16,7 @@ spring: physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl dialect: org.hibernate.dialect.MySQL8Dialect # 이 항목 추가 jwt: - secret: ${JWT} + secret: ${secrets.JWT} #----필요시 사용------ #redis: From b0f250489d60ddc324b675be0fbf2cf0a7f52241 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 17:02:47 +0900 Subject: [PATCH 22/47] =?UTF-8?q?:bug:=20env=EC=97=90=EC=84=9C=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EB=B3=80=EC=88=98=20=EA=B0=80=EC=A0=B8=EC=98=A4?= =?UTF-8?q?=EA=B8=B0=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 04307f4..0ed83d7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: config: import: optional:file:.env[.properties] datasource: - url: jdbc:mysql://${secrets.DB_HOST}:${secrets.DB_PORT}/${secrets.DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 - username: ${secrets.DB_USER} - password: ${secrets.DB_PASSWORD} + url: jdbc:mysql://${DB_HOST}:${DB_PORT}/${DB_NAME}?serverTimezone=Asia/Seoul&characterEncoding=UTF-8 + username: ${DB_USER} + password: ${DB_PASSWORD} driver-class-name: com.mysql.cj.jdbc.Driver jpa: hibernate: @@ -16,7 +16,7 @@ spring: physical-strategy: org.hibernate.boot.model.naming.PhysicalNamingStrategyStandardImpl dialect: org.hibernate.dialect.MySQL8Dialect # 이 항목 추가 jwt: - secret: ${secrets.JWT} + secret: ${JWT} #----필요시 사용------ #redis: From d09939f4a737fd9f75a7ad2ea840dc6ec8173159 Mon Sep 17 00:00:00 2001 From: chaewon <89545462+gchaewon@users.noreply.github.com> Date: Thu, 26 Dec 2024 17:32:49 +0900 Subject: [PATCH 23/47] =?UTF-8?q?=20=F0=9F=9A=80=20CI/CD=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 59 ++++++++++++++++++++++++++++++++++++ 1 file changed, 59 insertions(+) create mode 100644 .github/workflows/gradle.yml diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml new file mode 100644 index 0000000..4fe8cf2 --- /dev/null +++ b/.github/workflows/gradle.yml @@ -0,0 +1,59 @@ +name: deploy dev server + +on: + push: + branches: [ "dev" ] + pull_request: + branches: [ "dev" ] + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + steps: + # 레포지토리 브랜치 체크아웃 + - uses: actions/checkout@v4 + + # JDK 설정 + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + # gradle 빌드 + - name: Build with Gradle + run: ./gradlew bootJar + + # 이미지 빌드 및 Docker Hub 업로드 + - name: web docker build and push + run: | + docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} + docker build -t my-repo/my-web-image:latest . + docker push my-repo/my-web-image + + # EC2 서버에 접속해 Docker 컨테이너 실행 + - name: executing remote ssh commands + uses: appleboy/ssh-action@master + with: + host: ${{ secrets.HOST }} # EC2 public DNS + username: ubuntu + key: ${{ secrets.KEY }} # .pem key + script: | + # 원하는 경로로 이동 + cd /home/ubuntu/app + + # .env 파일 생성 (필요한 환경 변수 설정) + sudo touch .env + echo "${{ secrets.ENV_VARS }}" | sudo tee .env > /dev/null + + # 기존 컨테이너가 있다면 중지 후 제거 + sudo docker stop app-container || true + sudo docker rm app-container || true + + # Docker 이미지 다운로드 + sudo docker pull my-repo/my-web-image:latest + + # 새로운 Docker 컨테이너 실행 + sudo docker run -d --name app-container --env-file .env -p 8080:8080 my-repo/my-web-image:latest From 56e3b0b4b6f0dd301392b2e7819bf4d2f4627544 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 17:41:57 +0900 Subject: [PATCH 24/47] =?UTF-8?q?:rocket:=20ci/cd=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=EC=9A=A9=20=ED=8E=98=EC=9D=B4=EC=A7=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pedalgenie/vote/TestController.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 src/test/java/com/pedalgenie/vote/TestController.java diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java new file mode 100644 index 0000000..5658b6b --- /dev/null +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -0,0 +1,12 @@ +package com.pedalgenie.vote; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class TestController { + + @GetMapping("/test") + public String testPage() { + return "git hub actions CI/CD 테스트"; + } +} From 889678e78660e7ef842233b8d95d0fba4dd15917 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 17:51:54 +0900 Subject: [PATCH 25/47] =?UTF-8?q?:bug:=20=EB=8F=84=EC=BB=A4=20=EB=A0=88?= =?UTF-8?q?=ED=8F=AC=EC=A7=80=ED=86=A0=EB=A6=AC,=20=EC=9D=B4=EB=AF=B8?= =?UTF-8?q?=EC=A7=80=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 4fe8cf2..7fec268 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -30,8 +30,8 @@ jobs: - name: web docker build and push run: | docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }} - docker build -t my-repo/my-web-image:latest . - docker push my-repo/my-web-image + docker build -t ${{ secrets.DOCKER_USERNAME }}/ceos:latest . + docker push ${{ secrets.DOCKER_USERNAME }}/ceos:latest # EC2 서버에 접속해 Docker 컨테이너 실행 - name: executing remote ssh commands @@ -53,7 +53,7 @@ jobs: sudo docker rm app-container || true # Docker 이미지 다운로드 - sudo docker pull my-repo/my-web-image:latest + sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos:latest # 새로운 Docker 컨테이너 실행 - sudo docker run -d --name app-container --env-file .env -p 8080:8080 my-repo/my-web-image:latest + sudo docker run -d --name app-container --env-file .env -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest From 25928f082629fa8f1cee8e1ef88d1405fa1c0592 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 18:34:04 +0900 Subject: [PATCH 26/47] =?UTF-8?q?:bug:=20=EC=9D=B8=EC=8A=A4=ED=84=B4?= =?UTF-8?q?=EC=8A=A4=20=EB=B3=80=EA=B2=BD=20=ED=99=95=EC=9D=B8=EC=9A=A9=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/pedalgenie/vote/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java index 5658b6b..a65e449 100644 --- a/src/test/java/com/pedalgenie/vote/TestController.java +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -7,6 +7,6 @@ public class TestController { @GetMapping("/test") public String testPage() { - return "git hub actions CI/CD 테스트"; + return "git hub actions CI/CD 테스트, 인스턴스 변경 후"; } } From 2ea964fc16042e60f42a6e26a0c13e3c8e961cdb Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 18:45:23 +0900 Subject: [PATCH 27/47] =?UTF-8?q?:bug:=20=EB=B0=B0=ED=8F=AC=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0=20=ED=99=95=EC=9D=B8=EC=9A=A9=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/pedalgenie/vote/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java index a65e449..48789e3 100644 --- a/src/test/java/com/pedalgenie/vote/TestController.java +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -7,6 +7,6 @@ public class TestController { @GetMapping("/test") public String testPage() { - return "git hub actions CI/CD 테스트, 인스턴스 변경 후"; + return "git hub actions CI/CD 테스트, ssh config 추가 후"; } } From 6b86adc8457861044e851895621e26ead4b6c06c Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 21:04:13 +0900 Subject: [PATCH 28/47] =?UTF-8?q?:bug:=20=EB=B0=B0=ED=8F=AC=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0=20=ED=99=95=EC=9D=B8=EC=9A=A9=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/pedalgenie/vote/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java index 48789e3..617546c 100644 --- a/src/test/java/com/pedalgenie/vote/TestController.java +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -7,6 +7,6 @@ public class TestController { @GetMapping("/test") public String testPage() { - return "git hub actions CI/CD 테스트, ssh config 추가 후"; + return "git hub actions CI/CD 테스트, pem key 업데이트 후"; } } From 067d20ce3089b43843eed667116e13310bb1902c Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 21:15:22 +0900 Subject: [PATCH 29/47] =?UTF-8?q?:bug:=20ssh=20=EC=97=B0=EA=B2=B0=20?= =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7fec268..f8f7c76 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -35,7 +35,7 @@ jobs: # EC2 서버에 접속해 Docker 컨테이너 실행 - name: executing remote ssh commands - uses: appleboy/ssh-action@master + uses: appleboy/ssh-action@v1.0.3 with: host: ${{ secrets.HOST }} # EC2 public DNS username: ubuntu From 8e16531f1d2718340fa9e9c7942aa76e1c856a76 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 21:19:40 +0900 Subject: [PATCH 30/47] =?UTF-8?q?:bug:=20ssh=20=EB=B2=84=EC=A0=84=20?= =?UTF-8?q?=EC=9B=90=EB=B3=B8=EC=9C=BC=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- src/test/java/com/pedalgenie/vote/TestController.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index f8f7c76..7fec268 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -35,7 +35,7 @@ jobs: # EC2 서버에 접속해 Docker 컨테이너 실행 - name: executing remote ssh commands - uses: appleboy/ssh-action@v1.0.3 + uses: appleboy/ssh-action@master with: host: ${{ secrets.HOST }} # EC2 public DNS username: ubuntu diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java index 617546c..bc6e7bf 100644 --- a/src/test/java/com/pedalgenie/vote/TestController.java +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -7,6 +7,6 @@ public class TestController { @GetMapping("/test") public String testPage() { - return "git hub actions CI/CD 테스트, pem key 업데이트 후"; + return "git hub actions CI/CD 테스트, key begin, end 삭제 및 업데이트 버전"; } } From 4aa1a748edbf51ab7bb49bb03ed9df891f56ba9d Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 21:42:38 +0900 Subject: [PATCH 31/47] =?UTF-8?q?:bug:=20ssh=20username=20linux=20?= =?UTF-8?q?=EA=B8=B0=EB=B0=98=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 7fec268..1bdccb4 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -38,7 +38,7 @@ jobs: uses: appleboy/ssh-action@master with: host: ${{ secrets.HOST }} # EC2 public DNS - username: ubuntu + username: ec2-user key: ${{ secrets.KEY }} # .pem key script: | # 원하는 경로로 이동 From 49926a2ea60a1ec802f3226fee17fc1f6f840664 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 21:45:22 +0900 Subject: [PATCH 32/47] =?UTF-8?q?:bug:=20directory=20linux=20=EA=B8=B0?= =?UTF-8?q?=EB=B0=98=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 1bdccb4..72258df 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -42,7 +42,8 @@ jobs: key: ${{ secrets.KEY }} # .pem key script: | # 원하는 경로로 이동 - cd /home/ubuntu/app + mkdir -p /home/ec2-user/app + cd /home/ec2-user/app # .env 파일 생성 (필요한 환경 변수 설정) sudo touch .env From 8d928313e1602d6f86f357515ffdd7ee136d2b77 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 21:50:16 +0900 Subject: [PATCH 33/47] =?UTF-8?q?:bug:=20=EB=B0=B0=ED=8F=AC=20=EC=98=A4?= =?UTF-8?q?=EB=A5=98=20=ED=95=B4=EA=B2=B0=20=ED=99=95=EC=9D=B8=EC=9A=A9=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/test/java/com/pedalgenie/vote/TestController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/com/pedalgenie/vote/TestController.java b/src/test/java/com/pedalgenie/vote/TestController.java index bc6e7bf..c8fb377 100644 --- a/src/test/java/com/pedalgenie/vote/TestController.java +++ b/src/test/java/com/pedalgenie/vote/TestController.java @@ -7,6 +7,6 @@ public class TestController { @GetMapping("/test") public String testPage() { - return "git hub actions CI/CD 테스트, key begin, end 삭제 및 업데이트 버전"; + return "git hub actions CI/CD 테스트, ec2 도커 설치 후 버전"; } } From ba51ab3307e70c8b98effe6b68294288a6fa45da Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 22:03:06 +0900 Subject: [PATCH 34/47] =?UTF-8?q?:bug:=20docker=20pull=20=EA=B6=8C?= =?UTF-8?q?=ED=95=9C=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 72258df..6190770 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -54,6 +54,7 @@ jobs: sudo docker rm app-container || true # Docker 이미지 다운로드 + echo "${{ secrets.DOCKER_PASSWORD }}" | sudo docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos:latest # 새로운 Docker 컨테이너 실행 From f0ba592058d2cea3149442e12f7585a0a4c0c4bc Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 22:16:29 +0900 Subject: [PATCH 35/47] =?UTF-8?q?:bug:=20docker=20=EB=84=A4=ED=8A=B8?= =?UTF-8?q?=EC=9B=8C=ED=81=AC=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6190770..418e0f0 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,4 +58,4 @@ jobs: sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos:latest # 새로운 Docker 컨테이너 실행 - sudo docker run -d --name app-container --env-file .env -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest + sudo docker run -d --name app-container --env-file .env --network host -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest From d22604543debe54cb00065cce8155b9c5bb8094d Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 22:33:56 +0900 Subject: [PATCH 36/47] =?UTF-8?q?:bug:=20=EC=99=B8=EB=B6=80=20=EB=84=A4?= =?UTF-8?q?=ED=8A=B8=EC=9B=8C=ED=81=AC=20=ED=97=88=EC=9A=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/application.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 0ed83d7..6e9bde6 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,6 +17,9 @@ spring: dialect: org.hibernate.dialect.MySQL8Dialect # 이 항목 추가 jwt: secret: ${JWT} +server: + port: 8080 + address: 0.0.0.0 #----필요시 사용------ #redis: From 7df72bc5261c87c3b14e6c00a6559afe94feff12 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 22:43:48 +0900 Subject: [PATCH 37/47] =?UTF-8?q?:fire:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=84=A4=EC=A0=95=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- src/main/resources/application.yml | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 418e0f0..6190770 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,4 +58,4 @@ jobs: sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos:latest # 새로운 Docker 컨테이너 실행 - sudo docker run -d --name app-container --env-file .env --network host -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest + sudo docker run -d --name app-container --env-file .env -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 6e9bde6..0ed83d7 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -17,9 +17,6 @@ spring: dialect: org.hibernate.dialect.MySQL8Dialect # 이 항목 추가 jwt: secret: ${JWT} -server: - port: 8080 - address: 0.0.0.0 #----필요시 사용------ #redis: From 1a405ecd706d3fbe6336dc06a0aeb8fb0a20f4ba Mon Sep 17 00:00:00 2001 From: gchaewon Date: Thu, 26 Dec 2024 23:11:15 +0900 Subject: [PATCH 38/47] =?UTF-8?q?:ambulance:=20=ED=8F=AC=ED=8A=B8=20?= =?UTF-8?q?=EB=A7=A4=ED=95=91=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/gradle.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 6190770..4b61eab 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -58,4 +58,4 @@ jobs: sudo docker pull ${{ secrets.DOCKER_USERNAME }}/ceos:latest # 새로운 Docker 컨테이너 실행 - sudo docker run -d --name app-container --env-file .env -p 8080:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest + sudo docker run -d --name app-container --env-file .env -p 80:8080 ${{ secrets.DOCKER_USERNAME }}/ceos:latest From 5fd030439cfe01806485813a51ac135784114199 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Sat, 28 Dec 2024 17:35:23 +0900 Subject: [PATCH 39/47] =?UTF-8?q?:recycle:=20uri=20=ED=86=B5=EC=9D=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/member/controller/MemberController.java | 2 +- .../vote/domain/vote/controller/VoteController.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java b/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java index ff6bfd5..2d6c602 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/controller/MemberController.java @@ -15,7 +15,7 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/api/member") +@RequestMapping("/members") public class MemberController { private final MemberService memberService; diff --git a/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java index d7e1e66..d3cb1f4 100644 --- a/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java +++ b/src/main/java/com/pedalgenie/vote/domain/vote/controller/VoteController.java @@ -18,14 +18,13 @@ @RestController @RequiredArgsConstructor -@RequestMapping("/votes") @Tag(name = "Vote Controller", description="투표 API \n 생성, 조회 로직을 포함합니다.") public class VoteController { private final VoteService voteService; // 투표 생성 @Operation(summary = "투표 생성") - @PostMapping + @PostMapping("/votes") public ResponseEntity> createVote( @RequestParam String type, @RequestParam(required = false) String part, @@ -46,7 +45,7 @@ public ResponseEntity> createVote( // 후보 조회 @Operation(summary = "후보 조회") - @GetMapping("/candidates") + @GetMapping("/api/votes/candidates") public ResponseEntity>> getCandidates( @RequestParam String type, @RequestParam(required = false) String part @@ -58,7 +57,7 @@ public ResponseEntity>> getCandidates( // 투표 결과 조회 @Operation(summary = "투표 결과 조회") - @GetMapping("/results") + @GetMapping("/api/votes/results") public ResponseEntity>> getResults( @RequestParam String type, @RequestParam(required = false) String part From eec359f16c7255615f9a0d2afa9b4136c7d8cb41 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Sat, 28 Dec 2024 17:36:11 +0900 Subject: [PATCH 40/47] =?UTF-8?q?:ambulance:=20filter=20=EC=A0=9C=EC=99=B8?= =?UTF-8?q?=20uri=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/global/config/SecurityConfig.java | 32 ++++++++++++++++--- 1 file changed, 28 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java index 528e749..6cb10e4 100644 --- a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -24,6 +24,9 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import java.util.Arrays; +import java.util.List; + import static org.springframework.security.config.http.SessionCreationPolicy.STATELESS; @Configuration @@ -35,6 +38,18 @@ public class SecurityConfig { private final TokenValidator tokenValidator; private final MemberRepository memberRepository; + // 허용된 URI 목록 + private static final List ALLOWED_URIS = Arrays.asList( + "/swagger-ui/index.html", + "/swagger-ui.html", + "/swagger-ui/**", + "/v3/api-docs/**", + "/swagger-resources/**", + "/webjars/**", + "/api/**", + "http://localhost:3000/**" + ); + @Bean public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ @@ -46,9 +61,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ http // 접근 허용된 URI - .authorizeHttpRequests(auth ->auth - .requestMatchers("/login", "/api/auth").permitAll() - .requestMatchers("/swagger-ui/index.html", "/v3/api-docs/**", "http://localhost:3000/**").permitAll() + .authorizeHttpRequests(auth -> auth + .requestMatchers(ALLOWED_URIS.toArray(new String[0])).permitAll() .anyRequest().authenticated()); // AuthenticationManager 생성 @@ -56,7 +70,7 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ // JwtAuthenticationFilter 설정 JwtAuthenticationFilter jwtAuthenticationFilter = new JwtAuthenticationFilter(authenticationManager, jwtUtil,memberRepository); - jwtAuthenticationFilter.setFilterProcessesUrl("/login"); // 로그인 URL 설정 + jwtAuthenticationFilter.setFilterProcessesUrl("/api/login"); // 로그인 URL 설정 // 필터 추가 http @@ -68,6 +82,16 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ return http.build(); } + + // 필터 체인에서 제외 (토큰 불필요) + @Bean + public WebSecurityCustomizer webSecurityCustomizer() { + return web -> { + web.ignoring() + .requestMatchers(ALLOWED_URIS.toArray(new String[0])); + }; + } + protected CorsConfigurationSource corsConfigurationSource() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", getDefaultCorsConfiguration()); From 5958f4df867832880425f8ad685c14f990d4dcf4 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Sat, 28 Dec 2024 18:18:16 +0900 Subject: [PATCH 41/47] =?UTF-8?q?:art:=20=ED=94=84=EB=A1=A0=ED=8A=B8=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=98=A4=EB=A6=84=EC=B0=A8=EC=88=9C=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/pedalgenie/vote/domain/member/entity/Part.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java index fcd5a60..4d2f901 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Part.java @@ -3,7 +3,7 @@ import java.util.List; public enum Part { - FRONT(List.of("윤영준", "박지수", "송유선", "최지원", "김류원", "지민재", "강다혜", "이희원", "권혜인", "이가빈")), + FRONT(List.of("강다혜", "권혜인", "김류원", "박지수", "송유선", "윤영준", "이가빈", "이희원", "지민재", "최지원")), BACK(List.of("김연수", "남승현", "나혜인", "문서영", "임가현", "이한슬", "이채원", "유지민", "황서아", "최서지")); private final List members; From 4bcf107f2b5573cfcd70796b5d6b67eaf92a9be9 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Sat, 28 Dec 2024 18:18:44 +0900 Subject: [PATCH 42/47] =?UTF-8?q?:ambulance:=20static=20=EB=A6=AC=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/pedalgenie/vote/global/config/SecurityConfig.java | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java index 6cb10e4..f07dda0 100644 --- a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -83,14 +83,6 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception{ return http.build(); } - // 필터 체인에서 제외 (토큰 불필요) - @Bean - public WebSecurityCustomizer webSecurityCustomizer() { - return web -> { - web.ignoring() - .requestMatchers(ALLOWED_URIS.toArray(new String[0])); - }; - } protected CorsConfigurationSource corsConfigurationSource() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); From 56ca11fea76dd49f03e17d6ad66c00def245847a Mon Sep 17 00:00:00 2001 From: gchaewon Date: Sat, 28 Dec 2024 19:13:53 +0900 Subject: [PATCH 43/47] =?UTF-8?q?:fire:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pedalgenie/vote/domain/member/dto/LoginResponse.java | 6 ------ 1 file changed, 6 deletions(-) delete mode 100644 src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java deleted file mode 100644 index e1527a4..0000000 --- a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.pedalgenie.vote.domain.member.dto; - -public record LoginResponse( - -) { -} From 2d7dbb7013e57bdfb74243f028c1496dc2f5c493 Mon Sep 17 00:00:00 2001 From: gchaewon Date: Sat, 28 Dec 2024 19:14:43 +0900 Subject: [PATCH 44/47] =?UTF-8?q?:recycle:=20=ED=9A=8C=EC=9B=90=20response?= =?UTF-8?q?=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pedalgenie/vote/domain/member/dto/SignUpResponse.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java index 6960f9f..d1786b3 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/SignUpResponse.java @@ -2,13 +2,17 @@ import com.fasterxml.jackson.annotation.JsonInclude; import com.pedalgenie.vote.domain.member.entity.Member; +import com.pedalgenie.vote.domain.member.entity.Part; +import com.pedalgenie.vote.domain.member.entity.Team; @JsonInclude(JsonInclude.Include.NON_NULL) // null인 필드 json에서 제외 public record SignUpResponse( String loginId, - String username + String username, + Part part, + Team team ) { public static SignUpResponse from(Member member){ - return new SignUpResponse(member.getLoginId(),member.getUsername()); + return new SignUpResponse(member.getLoginId(),member.getUsername(), member.getPart(), member.getTeam()); } } From dcde8f0881d37d61bd3fa1995fa3cfbd0c851231 Mon Sep 17 00:00:00 2001 From: juanxiu <2316007@ewhain.net> Date: Mon, 30 Dec 2024 00:56:28 +0900 Subject: [PATCH 45/47] =?UTF-8?q?refactor:=20=EB=A1=9C=EA=B7=B8=EC=9D=B8?= =?UTF-8?q?=20=EC=9A=94=EC=B2=AD=20API=20=EC=88=98=EC=A0=95,=20cors=20head?= =?UTF-8?q?er=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vote/domain/auth/CustomUserDetails.java | 2 +- .../domain/auth/CustomUserDetailsService.java | 6 +++--- .../com/pedalgenie/vote/domain/jwt/JwtUtil.java | 11 +++++------ .../jwt/filter/JwtAuthenticationFilter.java | 17 ++++------------- .../domain/jwt/filter/JwtValidationFilter.java | 11 ++++------- .../vote/domain/member/dto/LoginRequest.java | 2 +- .../vote/domain/member/entity/Member.java | 1 + .../member/repostiory/MemberRepository.java | 4 +++- .../vote/global/config/SecurityConfig.java | 1 + 9 files changed, 23 insertions(+), 32 deletions(-) diff --git a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java index 4c26a23..e0e8be2 100644 --- a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java +++ b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetails.java @@ -29,7 +29,7 @@ public String getPassword(){ } @Override public String getUsername() { - return member.getUsername(); + return member.getLoginId(); // 로그인 아이디 리턴 } // memberId 얻는 메서드 추가 diff --git a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java index e3a8af5..46965f1 100644 --- a/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java +++ b/src/main/java/com/pedalgenie/vote/domain/auth/CustomUserDetailsService.java @@ -16,9 +16,9 @@ public class CustomUserDetailsService implements UserDetailsService { private final MemberRepository memberRepository; - public UserDetails loadUserByUsername(final String username) throws UsernameNotFoundException{ - final Member member= memberRepository.findByUsername(username) - .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_NAME)); + public UserDetails loadUserByUsername(final String loginId) throws UsernameNotFoundException{ + final Member member= memberRepository.findByLoginId(loginId) + .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); return new CustomUserDetails(member); } diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java b/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java index e13554b..53a9b48 100644 --- a/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/JwtUtil.java @@ -2,7 +2,6 @@ import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; -import io.jsonwebtoken.SignatureAlgorithm; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; @@ -25,20 +24,20 @@ public JwtUtil(@Value("${jwt.secret}")final String secret) { this.secretKey = new SecretKeySpec(secret.getBytes(StandardCharsets.UTF_8),"HmacSHA256"); } - public String createJwt(final String category,final String username, Long expiredMs){ + public String createJwt(final String category,final String loginId, Long expiredMs){ return Jwts.builder() .claim("category", category) - .claim("username", username) + .claim("loginId", loginId) .setIssuedAt(new Date(System.currentTimeMillis())) // 발급 시간 .setExpiration(new Date(System.currentTimeMillis()+ expiredMs)) // 만료 시간 .signWith(secretKey, HS256) .compact(); } - // 토큰에서 유저네임 추출 메서드 - public String getUsername(final String token){ + // 토큰에서 로그인 아이디 추출 메서드 + public String getLoginId(final String token){ Claims claims= getPayload(token); - return claims.get("username", String.class); + return claims.get("loginId", String.class); } // 토큰에서 카테고리(액세스, 리프레시) 추출 메서드 diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java index 8f30091..4afced7 100644 --- a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtAuthenticationFilter.java @@ -3,10 +3,7 @@ import com.fasterxml.jackson.databind.ObjectMapper; import com.pedalgenie.vote.domain.jwt.JwtUtil; import com.pedalgenie.vote.domain.member.dto.LoginRequest; -import com.pedalgenie.vote.domain.member.entity.Member; import com.pedalgenie.vote.domain.member.repostiory.MemberRepository; -import com.pedalgenie.vote.global.exception.CustomException; -import com.pedalgenie.vote.global.exception.ErrorCode; import jakarta.annotation.PostConstruct; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; @@ -53,9 +50,9 @@ public Authentication attemptAuthentication(HttpServletRequest request, HttpServ loginRequest = objectMapper.readValue(messageBody, LoginRequest.class); - // 스프링 시큐리티에서 사용자의 인증 정보(username, password)를 검증하기 위해서는 token(dto)에 담아야 함 + // 스프링 시큐리티에서 사용자의 인증 정보(loginId, password)를 검증하기 위해서는 token(dto)에 담아야 함 UsernamePasswordAuthenticationToken usernamePasswordAuthenticationToken = - new UsernamePasswordAuthenticationToken(loginRequest.username(), loginRequest.password()); + new UsernamePasswordAuthenticationToken(loginRequest.loginId(), loginRequest.password()); // token에 담은 값들의 검증을 위해 AuthenticationManager로 전달 -> 검증 진행 return authenticationManager.authenticate(usernamePasswordAuthenticationToken); @@ -72,16 +69,10 @@ protected void successfulAuthentication(final HttpServletRequest request, final throws IOException, ServletException{ // CustomUserDetails의 메서드에서 추출한 값 - final String username = authResult.getName(); - - // 권한 목록에 있는 권한을 추출(ROLE_USER) - String role = authResult.getAuthorities() - .iterator() - .next() - .getAuthority(); + final String loginId = authResult.getName(); // 토큰 생성 - String access = jwtUtil.createJwt("access", username,1000L * 60 * 60 * 2); // 2시간 + String access = jwtUtil.createJwt("access", loginId,1000L * 60 * 60 * 2); // 2시간 // 응답 설정: 헤더 key 값을 access로 설정 response.setHeader("access", access); diff --git a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java index ca7f2b4..3903cdc 100644 --- a/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java +++ b/src/main/java/com/pedalgenie/vote/domain/jwt/filter/JwtValidationFilter.java @@ -1,7 +1,6 @@ package com.pedalgenie.vote.domain.jwt.filter; import com.pedalgenie.vote.domain.auth.CustomUserDetails; -import com.pedalgenie.vote.domain.auth.CustomUserDetailsService; import com.pedalgenie.vote.domain.jwt.JwtUtil; import com.pedalgenie.vote.domain.jwt.TokenValidator; import com.pedalgenie.vote.domain.member.entity.Member; @@ -15,13 +14,11 @@ import lombok.RequiredArgsConstructor; import org.springframework.security.authentication.UsernamePasswordAuthenticationToken; import org.springframework.security.core.Authentication; -import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.util.StringUtils; import org.springframework.web.filter.OncePerRequestFilter; import java.io.IOException; -import java.util.List; @RequiredArgsConstructor public class JwtValidationFilter extends OncePerRequestFilter { @@ -57,12 +54,12 @@ protected void doFilterInternal(final HttpServletRequest request, // jwt 토큰 사용해서 사용자 인증, SecurityContext 에 인증 정보 설정 private void setAuthentication(String accessToken){ - // 토큰에서 유저 이름 추출 - String username = jwtUtil.getUsername(accessToken); + // 토큰에서 유저 아이디 추출 + String loginId = jwtUtil.getLoginId(accessToken); // 유저 디비에서 이름 찾기 - Member member = memberRepository.findByUsername(username) - .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_NAME)); + Member member = memberRepository.findByLoginId(loginId) + .orElseThrow(()-> new CustomException(ErrorCode.NOT_EXISTS_MEMBER_ID)); // 해당 유저 정보 로드 CustomUserDetails userDetails = new CustomUserDetails(member); diff --git a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java index 1c26cf2..7bd889f 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/dto/LoginRequest.java @@ -1,4 +1,4 @@ package com.pedalgenie.vote.domain.member.dto; -public record LoginRequest(String username, String password) { +public record LoginRequest(String loginId, String password) { } diff --git a/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java index c434c29..c2cfcec 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/entity/Member.java @@ -19,6 +19,7 @@ public class Member extends BaseTimeEntity { private Long memberId; @NotNull + @Column(nullable = false, unique = true) private String loginId; @NotNull diff --git a/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java index 2d0eec5..8e0e5c8 100644 --- a/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java +++ b/src/main/java/com/pedalgenie/vote/domain/member/repostiory/MemberRepository.java @@ -11,5 +11,7 @@ public interface MemberRepository extends JpaRepository { boolean existsByLoginId(final String loginId); boolean existsByEmail(final String email); - Optional findByUsername(String username); +// Optional findByUsername(String username); + + Optional findByLoginId(String loginId); } diff --git a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java index f07dda0..96e9955 100644 --- a/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java +++ b/src/main/java/com/pedalgenie/vote/global/config/SecurityConfig.java @@ -99,6 +99,7 @@ private CorsConfiguration getDefaultCorsConfiguration() { config.addAllowedHeader("*"); config.setAllowCredentials(true); config.setMaxAge(3600L); + config.addExposedHeader("access"); // 헤더 추가 return config; } From bb7ee61064718d0a2f05950d6bb9b2ad76897f2f Mon Sep 17 00:00:00 2001 From: chaewon <89545462+gchaewon@users.noreply.github.com> Date: Wed, 1 Jan 2025 19:13:14 +0900 Subject: [PATCH 46/47] =?UTF-8?q?=F0=9F=93=9D=20=EB=A6=AC=EB=93=9C?= =?UTF-8?q?=EB=AF=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 125 +++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 124 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 76efd88..bf10cb5 100644 --- a/README.md +++ b/README.md @@ -1 +1,124 @@ -# spring_vote_20th \ No newline at end of file +# spring_vote_20th +--- +## DB 설계 +**BaseEntity** + - createdAt: 생성 날짜/시간 (LocalDateTime) + - updatedAt: 수정 날짜/시간 (LocalDateTime) + - deletedAt + +**Member** + +- memberId (PK) +- loginId +- password +- email +- name (이름) +- part(ENUM) +- team(ENUM) +- createdAt + +**Part(ENUM)** + +```sql +public enum Part { + FRONT(Arrays.asList("A", "B", "C")), + BACK(Arrays.asList("D", "E", "F")); + + private final List partMembers; +} +``` + +**Team(ENUM)** + +```sql +public enum Team { + PHOTO_GROUND, + ANGEL_BRIDGE, + PEDAL_GENIE, + CAKE_WAY, + COFFEE_DEAL +} +``` + +**Vote (추상클래스)** + +- voteId (PK) +- memberId (FK - 투표한 사용자ID) +- createdAt + +**LeaderVote** + +- part(ENUM) +- partMember(String) + +**TeamVote** + +- team (ENUM) +- editedAt + + +--- +## API 명세서 & 테스트 + + + +### **1) 회원 가입** + + + +### **2) 로그인** + + + +### **3) 회원 프로필 조회** + + + +### **4) 후보 조회** + +**팀 조회** + + + +**파트별 조회** + + + + + +### **5) 투표 생성** + +**팀 투표** + +**201 - 생성 성공** + + + +**400 - 자신의 팀에 투표 시도** + + + + +**409 - 중복 투표 시도** + + + +**파트 리더 투표** + +**201 - 생성 성공** + + + +**400 - 다른 파트에 투표 시도** + + + +**400 - 해당 파트에 속하지 않는 구성원에 투표 시도** + + + +**409 - 중복 투표 시도** + + + + From 998a7d2e0a7cd968b51b23a9d6fc3060b3ddb5a7 Mon Sep 17 00:00:00 2001 From: chaewon <89545462+gchaewon@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:54:08 +0900 Subject: [PATCH 47/47] =?UTF-8?q?=F0=9F=93=9D=20=EB=A6=AC=EB=93=9C?= =?UTF-8?q?=EB=AF=B8=20API=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 46 +++++++++++++++++++++++++++++++++------------- 1 file changed, 33 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index bf10cb5..d6e8c80 100644 --- a/README.md +++ b/README.md @@ -64,27 +64,34 @@ public enum Team { ### **1) 회원 가입** - +**201 - 회원가입 성공** + +스크린샷 2025-01-06 13 37 40 + +**409 - 아이디 중복 가입 시도하는 경우** + +스크린샷 2025-01-06 13 38 27 ### **2) 로그인** - +스크린샷 2025-01-06 13 39 42 ### **3) 회원 프로필 조회** - +스크린샷 2025-01-06 13 42 01 ### **4) 후보 조회** **팀 조회** - +스크린샷 2025-01-06 13 43 39 **파트별 조회** - +스크린샷 2025-01-06 13 44 09 + +스크린샷 2025-01-06 13 44 28 - ### **5) 투표 생성** @@ -92,33 +99,46 @@ public enum Team { **201 - 생성 성공** - +스크린샷 2025-01-06 13 45 50 **400 - 자신의 팀에 투표 시도** - +스크린샷 2025-01-06 13 46 37 **409 - 중복 투표 시도** - +스크린샷 2025-01-06 13 47 05 + **파트 리더 투표** **201 - 생성 성공** - +스크린샷 2025-01-06 13 49 00 **400 - 다른 파트에 투표 시도** - +스크린샷 2025-01-06 13 47 57 + **400 - 해당 파트에 속하지 않는 구성원에 투표 시도** - +스크린샷 2025-01-06 13 48 24 **409 - 중복 투표 시도** - +스크린샷 2025-01-06 13 49 18 + +### 6) 투표 결과 조회 +**1. 팀 투표 결과 조회** + +스크린샷 2025-01-06 13 50 57 + + +**2. 파트 투표 결과 조회** + +스크린샷 2025-01-06 13 51 21 +스크린샷 2025-01-06 13 53 00