From bc3e23ba9e2c44adaa4db6795b6ce227e9b7386f Mon Sep 17 00:00:00 2001 From: SangYeong Park <107484383+Imsyp@users.noreply.github.com> Date: Fri, 20 Sep 2024 17:20:11 +0900 Subject: [PATCH 01/14] Update server_cicd.yml --- .github/workflows/server_cicd.yml | 79 +++++++++++++++++++++---------- 1 file changed, 53 insertions(+), 26 deletions(-) diff --git a/.github/workflows/server_cicd.yml b/.github/workflows/server_cicd.yml index 97da6f0..4e5a559 100644 --- a/.github/workflows/server_cicd.yml +++ b/.github/workflows/server_cicd.yml @@ -3,35 +3,62 @@ name: server CI/CD Pipeline on: push: + paths: + - "server/**" branches: - - main + - main jobs: - build: + deploy: runs-on: ubuntu-20.04 steps: - - name: Checkout code - uses: actions/checkout@v3 - with: - path: full-repo - - - name: Set up JDK - uses: actions/setup-java@v3 - with: - java-version: '17' - distribution: 'temurin' - - - name: Set up Gradle - uses: gradle/gradle-build-action@v3 - with: - gradle-version: '8.8' - build-root-directory: server - - - name: Build with Gradle - working-directory: server - run: ./gradlew build -x test - - - name: Deploy - if: success() - run: echo "Deploy your application here" + - name: Checkout code + uses: actions/checkout@v3 + + - name: Set up JDK + uses: actions/setup-java@v3 + with: + java-version: '17' + distribution: 'temurin' + + - name: Set up Gradle + uses: gradle/gradle-build-action@v3 + with: + gradle-version: '8.8' + + - name: Build with Gradle + run: | + cd server + ./gradlew build -x test + + - name: Deliver jar File + if: success() + uses: appleboy/scp-action@v0.1.5 + with: + host: ${{ secrets.GCP_SERVER_VM_HOST }} + username: ${{ secrets.GCP_SERVER_VM_USER }} + key: ${{ secrets.GCP_SERVER_SSH_PRIVATE_KEY }} + port: 22 + source: server/build/libs/swdc-0.0.1-SNAPSHOT.jar + target: /home/patturning1/deployment/ + + - name: Deploy to GCP VM + if: success() + uses: appleboy/ssh-action@v0.1.3 + with: + debug: true + host: ${{ secrets.GCP_SERVER_VM_HOST }} + username: ${{ secrets.GCP_SERVER_VM_USER }} + key: ${{ secrets.GCP_SERVER_SSH_PRIVATE_KEY }} + port: 22 + script: | + sudo docker stop swdc-container || true + sudo docker rm swdc-container || true + + cd /home/patturning1/deployment + sudo docker build -t swdc-app . + sudo docker run -d -p 8080:8080 --name swdc-container -v /mnt:/mnt swdc-app + + + From 46b41910ea58e800896c0234b272b2352dcee531 Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Fri, 20 Sep 2024 21:19:48 +0900 Subject: [PATCH 02/14] change base path --- .../build/libs/swdc-0.0.1-SNAPSHOT-plain.jar | Bin 15869 -> 15874 bytes server/build/libs/swdc-0.0.1-SNAPSHOT.jar | Bin 26799441 -> 26799446 bytes .../com/swdc/server/service/PriceService.java | 2 +- 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/server/build/libs/swdc-0.0.1-SNAPSHOT-plain.jar b/server/build/libs/swdc-0.0.1-SNAPSHOT-plain.jar index 3a42e7cadaeb8c9da78842a8abd2fa24c2dddaec..84b25c5f30fe9fe67e6ba83ee6474ca453b19aa1 100644 GIT binary patch delta 3501 zcmZWsX*kpk_hvG(j$H;bW68dSnPC_e$yl;W=*gNbOZHtuwiF|NBPM$oYu2GGk*wMG z?6O9Q!ec4)R@eXfe|X<>UFY2Qxv%r#+#m1L(1&5nMtbLHIH{=U=%{obBdeKNX+h?1 z00b@OH`H3uy8m5!n9$7TZxk#|Vt-nkb%v{Nu4#^7EfR>(VX974 zpNrFXad&uILVZ4pUbL;eu#W8+BV26XbB3%l)}+6gOnHjzP}Uz+^cdT387eqT zUC;;i=}w&kWcm(fP^T>q6lSJLhYQWei#*NDrYcDXu^MRw3(eQbw@GQc^Grp^w;<3Kva$m?b;FH0+ zyJBJ94FSJ#WhYIbASqyKTC-8^5mhgW#^3Dfh4j41F?v03ty$)u+6K7=LliJ?>8zHo z5SP?=CnXQY*ES~ zOw&uj=GP%EZ@3=avnX-kGUwRzzRN)*CbLahsO3@O{r2+EkNhnv?V<>YQysMlf}Zs$ zI*LxWEwd^8^#w6B+##@rt0e}*xp)V~C?>0Z61Rn=8k=GDldWw`uTEo6Ee#p6r@UYs zqXp9+RXwRLNL56+!+dBvn-8@oRXq1E4hTH2*6$A3VokU2Sb-hih&9MjTmkt$$)da+ zF&Zmbl8gjj6HPOy>#KQXdF_ZnxXPXhX20_H(+>ct2!kv$KbXPmS>5)_buON#4m35z%(j!j=qvG+Y{DRdox8 zNGF=#q0p!}YPF22-hOV>56^(_X0yeYC?@MoHE~TT zJaP2w90?gJK=WEyNgDfS-vx*LG~L4L2TAHJQC9P@urc*ap7tOJtjm$ zk^y%}2_bE1ZGX&KYSzAkpnXyFZs{gdt(GFMX9t$KNGtjk@a&y9&VxsN+}xJYI)9}u zC~I5+e*ea(vry;m{64vVf~$ki3y4+v9K^BEuZxm?o%;1!4h{A#LCAU6Ka)KYGAl)ykg)@=^#|ho z=OR_(0S}Bljgxuky55z`r7KK>qYCT)1`Ct;Vm5}`8j*AO0iR1gt@WCXcx9`d5pT#L zd#k2r(sY_3uVu-XDjP%o`t}+kV`g`5>`%Wi{=-_z?dcX5+3BVO7s|lr{P*?H8txjL zxR}r&@okFzn+!lp78jbZ?k?_J^gWkg_z}SRj5;zW73Ob|y9m#=54zr{UTovp3L4Jy ztT0vKS-go)nRO#8=+KIVcO^^q>D%0YhF0~gW+Cv^FBP;0v8XPWL+35~wHlJujwxB% zCDL8@X44IB*9#`+d80#mx8xK3WM{tQvZEN7M!K3kV1}1$jJEvjC$j67kJH~wP!gjl z{|d6mW%l=9+{5nOtK|~o9CNYuy>)rQ!RfFUqM?q5E2d;=p#>M`-LjweuI|r^C3#NrkIFj|?kWm1M|Hbe|g8q)_S|e)SE!Y(UnW@D+3{g;|*&-P8xx-1tXhWC1 zJUq4`1_5tvN86v?^|>Aw@ce*HYQaP{Q(R0enB137vS4^6^3p760x|DN9+18X7@Gh{6E*Mr&#kb$d#7FyM16*H z&Wz6KYFYkbfs#e{c1_4hnR{MO6}gHZ-z&Ao#Pa#cl$T7q#=?Z`Lq}%U?z&ZRo<{M@ zzTT`oZdrjlhIS%irREI%e1_%|rSaVFp;P>NjUU!+<5GvZZWLMT%Rx@Le0&4yvt84S zvr#e`cHFQ*&OFh+n&~wtRP2(^Sg)60PnZaDX(dLBI9$>GNMy9T{J|J_@Hj6QZ#3^I z5j!d37rlLH)O%s2Y(~25N)AccG0B#QX^T3^#l1&Jy&&aHB-8H7{1F!Th|K8uGiu8o}=Lzt55nWwQxw|D)<(B9j!YcGeta-iZGRSIm+og^I_d|YrX(z@Y;RyDAAY1^q_e~<~d2PN28Z!uCSTA@W@e$!(&as^SST>)IASyU$NW@y-xg zk>LcUogA^Fgk4C`Ijf01bHC(ewrnpJr`=GIp;iXH5@)kB_O7ASDSSj(6SDu1fcVAhdr3obluSu`w1_(~l%=JH9zWK$gH zm5wCwo$l2UiFV6SBHk^@o6Io-mP8B-AdlkC$fd0^yrrvtdtmF*-tPR5jY14qW*Z=O zvJB;?-)Sfws!KmX%SC$={OU~N!MgHOi*9G=CwuUDpG@ZuPs@n1pTh1@O$zvoVhCf^ zwBP>;enT+Zy;54n=4pA>q%ZL+Z9~p!qnyU=W$DF6vbb4aIK$2JBgZM~Lb|mK zbq%ct)^lFw*YUf;o+qGG-N1Q4FVtCK(+{Z#O!_pz!Sy+}PbnbdP`+Jmn*5_zqoC!U zd%Kq@6hQ^?@7_Oh4@A63YNYpY*GKT(hJt>QPxY%KY4h~V+M)nfIl;K(_L zA_gSFm4ED*NGj0bA3J^K#100OGm}#G7MJ0`_(s>y`UtQ^F)zb{L zNy{*861y(ve%?&VL|tLo`ENg{=dcm4vZ0P-wbQcjV=U+!~ZL=|jClpH%n; z4Y?dd;jeG;o@pY8Thc+Yp;9GlZO-zO3vw>qEcD~0*l-A?SwKZ3C2~(#7Tm&|8Bm*4iplY2CuV=cqAY{Z2{Ca251zBFR>_%5 znaNAjUh-0cE0<}wTU_PJ+C}JYTw$#HZWDHE+F2=(^}% z369mEb^+|LM$~1$rzkLmMT1)9fNB{L0Hvk?YLW-q_jCCv_dt{$Tma&a>vNKuIOejMMV-L*?$r9Nq z`x;61WC_`$+xy<%{cz8h=Q-y*zw_aI`^Q9_hO^#6o}=Xi02mkms&&vBR(3kzQY~JX zPWi8p?dZJ!ZM#{NIF@Rmw$1%p1wt$Uz#|X<00!WPVA5EsEn@`d7~h}w#!BQV7H8Z3 z^YJff@P5(<86t{|G%n{5F`6+z{1*e>H*oT1Kl)em(^+ce*yjf7uR(5#OOj>y=kd=c z>eK`GEjw!BuRk8*ImW?H63(JdA54bs&K^W=h5y-#=xZBbQ3K4OYs@q?UMe{kE!4aA zAXJM{>1$Zq73ZtJFsRJ04x31ZCE(aL#k1=qg^)+Cta$xWO9YL8mvvY?pAz1BLr$0y z)@69g^Z{JZ-h`Hqw;-3uv>wG&8f?=T^wRUDiRudh1hV1?>G)9>kF{!% zQ@Q*rTc3uzlGIYOg7 zNl_JIUnh!Ddy75}$Ti#OrJ$(d?ZEk&d&eX>uNwVU7p|;)6Q|6Z&ot!Rv(bH_L3!6! zupni4`F+n&Lv@B{8nHMr8^bUeyg@FzjU297)>quS4Z2|8L{nJ@@;@(iyP_Q|s+Q&* z^JE+f6j&1{C}sH2D8$up|KO~!uAvbK&E%N3l6pFPDbO>I@}agco_6^}uwLUk@ufkB zc)~?O99*XQm5*qi3(wS8cpN@30|j}F)y3S|D$yb1xW5awB6@ov!?i5%*tW(Mzi}1P z9_g2yU5#ajk~dHGD>1yokx_!lixE690GCT?8M^(oa?UXNQKIqnT(4qxU+Rv>n+=TC zfWE%eP_!UZaM@&h|Bz;sDC)0Z&cs78rC5hhAq}0I-2!g<9HGrt?TU&rfm-o_*_e zwUoC<>EZj!sf0_c_rG)Czm*0x+uuB~v*gn0Zod8N^xn@ppy1c^ma;cVMRc^mNAFtC(ioSF zcqcU{!8@>C8E*$V?^JC6cQ+OJ><>W_Zt3N)=oNOeO%(Fpjbl>gMN;zZl9t^HE%UVVQrLlkMIUfE!~S_F1X$Qm&{!B%+ZWWuB~vLBZ= z!+ZHZ-Ftg6fQty?n)R{6z2aasiyOKX{|S?do0tzW?{j;jtn(t7tM6bq$Mtod-0Z^~ z&PKD2oSz<6WfxmFNR=&yIlPKXtH$vClR784`m7oi6cSn3R3F`m|k+op`wPASOP4>blih4}E*#pW7dLJ{my>5xv;K##ij{#zI1e-mHiuS4n)88v)4 zvnzxj!Q_FR5j2Q`N~POFc<@ecxGGI5sF*!?KDgW#ik82r8kJQkM%TTVoVGr=(Ps6= z0zZrGM(f|cZ>VZK8(Go#W$m)WAVjh&hmsQ?MkQ{#*p?QV=Q@_l4?HRi-Yqee)`6Q_ zy_?`q@*Oc&Lyox-MvEzdzUJkpzIr7NH=eZVtuId(2V2}cT3fsEopt<8LxsQ}u>Cb? zg`{-ij-m3G#ABe+own-7Ayj53TjS6EGRkz=1R>nO9bVcUyOpme7B*AcpSgemU3kj| z^eY{7f|8i|ELC~NeTmHYrP6u?r;V+jA?8;4es(9Ig8DqNJM^GBg&l9agG22)SyN_4 znTQwU?=tGpV)8G#Q+_bGB!rIg530@02s1H_ZDhLKQ`53u4gO@bBXoD#+4kJg$973< zIA_5}M)k#$NW-YoB&!6gtX6(54$ZJ!8z14iVk-tQX{}f07o9C{Gg{6);pk-RVj0!= zA)sz=`R;HdW{URhnWRJvf_o~s?Y|^~sj8N+aG5fNFM;V4A zUGFDG|6{(X;Y5Y=X4!W<*Xx>uqyhIJ?EOBEN^jOG4g)Q-D+{s6i^P1wqawl)_$)y} z6cclad8u6te3tSaf!KgWI^JO9L4N4F{hR-Na?-KCb~XHJW;JaCc<}49ya4k@S5H_y zt+WTs_d_-drMT}8<-J*E6Q@o#bt-B^b%!4bJk3UPXR+lw za!4~fF_bqAiHsAqT_1)$5U<%`=f)z3rA(ZoT=kp#e>#qJ_S#&t3gv!KGZ-yz%l&=qygi zT=m1H%}$o6s<|U;7sy^p-`x*~^}rwgVoFXtO6De4#45$UdKlhoH&FQIk>-o-5TC8Q zzOu2zG?VP%s9@)Jp>_^Q$j)yMnoO2mkZSD6Yv+vMy1THdg!&bfmUO*2+85ZrYM&Or zxH=6wPaFz?feVQ6ZHI{T z$>-GK_s1ZSn#=*FelaGtMU{bmXKTs3okzb!DlRV;27n4&S-;iK%2}z$@pNw^fv|Yb zR89UIp#xk@WuKZoy=&{p3`}=%nn}q)FGaIYXZ1Sdj`7Sp&o51sQN=>+h{3ZKrK>|a z#MiCP>k=A?a&wap;2ATzprX{69l&`3F(xHLSSI7GD4r;jaDso9)Hd_y0wVfOI4$$O z--OW8b4r&E1F;y`DoPRS->F35V!hm3G{4IK$F_Ins=_HmrARo5o_g!SAtM&ZvrqufbcB!xaUPC z5uL$kP*9g8rHG<84b}B>qnDw&!N3FTDI)n_5jevT&l?|FN!WoMY6Y*~H@lq015si$ZXs2A278r=mj(1h0^M|J~PN zqgPHGS-WOv_2up|*g$G8D5Od#IT=jgAtl6Wg!0E|4i<2jlQ2Byq&O)3vA*_HS;CHG zEap_iN2uN2G#xTR)$zd19UR8G@^iD9_8Xe_DHdHmeoe*<*zBL`tTUY&pL@at6+LWy5V{y6$CK-bKuDkMvyF%@;#BCoXiba27^VQ( zA!@cVsDL3NnW6J8nKm5`i`dSq{u&j!MK)K)lUb8a>B)Y4j|EuQ%b~WMnT}Lh001C^ zXH`_bybLyx0V8FGrMhLoHB`B31pwd{k_O0m?tg@Wr%?it(TbZi|4@p{4ZVM){6@<^ z@&JZl{Xa;-H^V%Ec6@&^g&$Ai`{0T+vUnO*H=w!9zlR>G zDgmGV*UriC;=ikcfu*wlZsufIp2#u$ov`D3Anbp^>AzJNT?F}e{}XZU1|j=aWUSfOY!RhY)~v}^Awsfb&)Se8C9*Z6aETO3cBP^s3T2mF z)(|R5^^|)5r>EzAdtRT<_jm3+_uM1dN>H`1aRTp=R`+Z^qA))TApB*e55VUqHpm7tC`YGm37x%33&kz0T2jvf<*l!3&88Vk$+%+6$a?H!+ zQ6aW2hEd}2t?N}Bmn+X#PRvG1uJ{ZV74j)~&-Uj(mNe(7ul%)_1IL#G@>uYiDqnN@X+pJ<6V%-*nx0qhdCBU`Ix|O2GNx@&m+WE; zU%#cWWRBTcgxBL{PuWIFB6ea^{oQXXm7x!$$A&!JUVIVkK6lkFny1&{hF{RcumSn6 zSmC15Jq?y5N}jz__126ioeYCk`8PKAuk~p92luI3E~iDXD@WUtTFv#t#8M5jxouTX z*KNfU2N-2ZBQvbW9`c+!Zd>TWW6d?^ca$qFEt#X=c6)AReBj4i^>abCcaFp)UhHqI zND%R{RE*Nz&JSv8K4n zBq88JR^_8k^X|fNnP|G*5){*_*76#=uYnJy_q4Sc7_@fAX7LBl^EX!e~7-R9<3N?XQeFYFGDMrUNmk?oGaIeCKA?2qN zhv(a+C(%!&o@NWP<{oS~LZT1T?s6VB;)@Sdefq%N+uOff?DN8N$rKs>zD{w8hW*#; zt_r9N%CXv)+UN^W)2t6y(r$CrtLxGtA3VQi{FhO~&!SEX(wafne88#Y*7zpxq@6XVU*lA%<(RvI+rmvHdelg;LHSpkC? zFFE&(7cdQQZ8M$F+>`cgfOF6!yU>;DA^{yNA@Nzf!Np$^C27#`@G2s z)Rq0wH{&9==RdPdGs`gL4J%Bfj8Ct0JID?>HzpcvmN;58$6TSO!tc|l&2mHUOik+L zCsO*}8+Y|sJFR!fo2&}S>QNRvv9HTr^y%`*NlxIGLie+p%JKOP? zT&p_#!e7b1zIsnBS;PKaryuKQ&iXw*Ndpu!e!IfArH*C-)eYro>oc2kV!s7O2z;)n zJUCEyOkv>u>aoff^Lfv!`O10A^`#_5U#2}uaejC;RZl@bJYmL5%KgTNoJ6zNsoMTs zt}IE{^A-x45-%^UHa*nZ{CML+NJp+u$^LERjbjH=hCB$A_q<2dhPrbN$rAS{Alk3{)6=o5QKb z#N65Rz?)>IMS=-iuKHSv}Du($H!naWQhY>Js}ZJR%8e>`5nBgx%;%pt&LN3V<9 z=N2-n?k+)JOn(s}j;mopKiZXKH!NM$0U+lFIp@a?SbCxp-1+d=n zG>K``P-RUO`xYmy{ArbAcB%4wgHsb$rS+Io?=CYZe2 zKV7Rf;u-3p$vRk}e>zNAg?1s)Vw0C(#!YoI^0AM(+V{>13D!5LJFgw}-y0WvWtBsA z)W_h&QO(Uo=`PwPqmj2Bj4X&scBo4?U#+}K7nYDY=Va%zId##eSY_;De&5QLBwMB$ z@!M8Oy+R{C1ux_dq*_>}s#W&W@u1yu^jpc8(ZC)x5`(Eso z`>d2)P%6+OJI%~Cf1%%3zCm}iSK+iPi$`W41z*cSh3VTJAM}H2)0e%|6UWHoe%M2`7d^#S)H3dTnvgA!pkkDL zE%K^myPU=w^SwR`ILo=M4-t#vY)g$4*8likI^s$NKHlFPDzxK5+?OAkb(9ZZLwCr2 z`A!g=8QfrK_1yhZ1#vtj<=ePWl(i$j^xnCE6D+Oz1Y=KobIv3*iI(Wm#%8hNA`HGkFSa=wMuaa_g+pOCy9 za4eoyQ2Sz0*rI~A)`U=FuhWLQ&#F((W_b3t(Ue?B%i6sl!0G=@Me1pof_O&)^E+Jf zOTsd12+_Xxqjg~N1V^?no7-}@czZpQaiP1_56&iXdwPFVaVf|BvUvY_X%EuZYIEJ~ zrn%VGfCyRjk3K3(^+lmhKaw&b5rK>8RB4~x@ja^VejK+>W0KUn z=BZBU2C`jvnrD(<0oNd%j8KQL>X*151x5Ap{6$lNAL$&5TAK4-*NQS}vpA;4_7$rI znmjd=3O8cxrRSkPKv(la`qYfZCEI3qzBkTv>-;m_UtKCrQ+N|`oTg9Mze_W*yNv$B zp_3b>Nsa5LzKHM0Y+4D^xoDCUzV~t8^^)6b96$Md$O0nE@^n{AB%5-kbpt63s~k0^ z_9u1ZgIMPFSvHlD`~ul;c>2<=W9&GxB71*PIAth4uQJ(DFvls+_Oad;S3aTXlds=Y z>NB3a$5fxQ-AKB*EUw;(&3)0L#4!92VT?}ZwW9993AwS_0x7H3NTvhpI=`mu5;dw| zs=8Od>M%_9wcfid=JTD9Zgg@)#8>Ud_4|LxMrl$95?ws5@cI{}%DdcJy0t&~uNK|> zy5nB?OGSrI3Eo*fLLS+D^Va?kd;?GY`uS`+E_VsaxAGO{W>xl-=ibydR{DPCl*-|o z$u~wH-(bEMNw@!YLDwV9GN^MMo3n!EhS%E)5_eC%m3V`ZyEaYD7I3iT#R-M>R88I7 zwUaJ-*yRS3s*s03_t&(Hd_#fmwaadtbg3GdNhu$e=i9LX(u0BjoG`v|6`9(+Jan&Lbz<<^kereeWQxUn%Nk8inJqHh3>hem981} zd&TY2RPC9)!zq2<^+?du62B^$JFd@0)uNIv^7h*0+i3nU#VqegD)MJv%zm$}W*4HK za5gUZ)D@1YQblW7t1WW$O1@hKHHvk;Ya4H&VDA|5>aF|Zkk0|_7rq<}P#0kS|2$O8qS2$aAUpbS)iDo_LJU@Oo7nqV8y z0@`3Z*a39FPOuB;g56*b*bDT4J}>}=zz7(FeZT~m0yAI^EPy5053IleU=3`5EwBUj z;2<~z4g&|^2%NwX;0#>AQQ!*PfIBz_Jiu|_3A}(e@Bt@)FYp8YAOHk{AP@{rf)Ef2 z!az8P0FmGnAcH6n4Nij?a0Z+Ou^@pRK>@e{Zh}Hk1d72ea2u3>JD?PlfpSm*DnS*f1~uR= zxCd&%eeeK01a+VuJOYow6VLz}!Bfx#n!z*h9JGK|&<0+Bm!KVVfKJc_xrt3dSWs9|*ihI} zI8ZoIxKOxJcu;szHlS=o;X~m^*@Pm1LP8Nl5ke705kV0}5kuLGB90<~B8eh}B8?)0 zB8wu2B9EegqKKk|vIRvMMFm9_MGZwAWh;sXiYCf76fG2Ol`@M)96~va z;(+3a;)HSp#Tmr~Py$hcP=ZlT zqJ*G?qJ*J@qeP%YqMSk@qeP)Zqnt*GK{fu!hOMgi;INQ-87I%XC zf|+u#Sd@hrJ@xH>>(}8WV{inI8b!aU!T0|^!j8|t5oJQ;kN-cyjGM!m%ET))#PnRE z5#EljBZ9t={qqBjBz&m(=O;gUl}Mzl5s6Z==EfL-oA|$PbrQtD`l^7uX2l_EYmM2C-0P%$3L;vqUgy!I^>W2JmC7h_-l&)NCW@9>@D zRLl%JgkOTuhFBTkgf2m%%mp~HWA^wHG}1OV2w?bYhyhiMl4?XM*aOF|ef0@1+DX3<6Jc!mF-;K47!#7-;^ z?}X8UmRVNj&x`HAsQ4+k=mA>hsofZEDi(wB<2tap0cV(p3t>h078q@4)!@jl!!q~= zc+^<&MwsTujPNlS57NF?aIbRX0!rtw-*+bN3y(iPk@3oeX;oB~qgB9pm zAw`@rjK_W9F4%y7hyAVCeOz^ciYbZ0Ym40_j(r-1?eGB|DE;%yfiXWCgO?(_18#^1 zSAu}yQn5|g16&+N3Hs3MR5;^5 DZGUYR delta 6154 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 diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index d1b04b0..986a8d9 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -34,7 +34,7 @@ public class PriceService { private static final Logger logger = LoggerFactory.getLogger(PriceService.class); - private static final String BASE_PATH = "/Users/sangyeong_park/CE/contest/file_system"; + private static final String BASE_PATH = "/mnt/patturning"; @Autowired private MongoTemplate mongoTemplate; From 99ade0cc9a6b56e3aca949246537bbdd1bc88012 Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Fri, 20 Sep 2024 21:44:34 +0900 Subject: [PATCH 03/14] feat: read '/' as '_' --- .../server/controller/PriceController.class | Bin 2559 -> 2720 bytes .../resources/main/application.properties | 3 ++- .../stash-dir/PriceController.class.uniqueId0 | Bin 2559 -> 3563 bytes .../stash-dir/PriceService.class.uniqueId1 | Bin 7307 -> 0 bytes .../compileJava/previous-compilation-data.bin | Bin 71479 -> 71479 bytes .../server/controller/PriceController.java | 5 +++-- .../com/swdc/server/service/PriceService.java | 2 +- 7 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 server/build/tmp/compileJava/compileTransaction/stash-dir/PriceService.class.uniqueId1 diff --git a/server/build/classes/java/main/com/swdc/server/controller/PriceController.class b/server/build/classes/java/main/com/swdc/server/controller/PriceController.class index 31c476d758bb086137b3c0c9e2b3abb3fd6eade7..1bb56eb1c056d62dc4f51940057dc38d69f120be 100644 GIT binary patch delta 735 zcmZ`$-A)rh7(FxFcGtD7W(`d+kZ6Je+hVCdMM0ZxaEU6@hi=A`6Z)VP%^X;D_AG+)xzrXDO7{{|M`=ea6Feo63 z7V-qoMg~J^oI+8+4E*&~Rr3X=2j*U=H>$X*8ujATiV7C|SFim>%^%yRAHJ8lgC(3c zaVCwkI2V4G_3Q}Fo4An1D8>Z(-Wh%2lCf!xU_6ZpRKj0IGc}1W6PLH=6AjVZQ&Ua9 zz81Xo8tSF*Z9Z?VcpLt@3RH6~*xpI@%Kj22nMA;e-XJr`r!b8KuCV$^w20METIE)E z${BFnHVUJr`x(ReZgZ%O@+a;~T;+NcDXu4w#Yyy_9|a7e43{qyaE&|ju@+`*P@{sIWC<#jaEmP2qResJCQVT?jXOk>qCm!=5-_Xp0}I3~b?@?9 zT!z@dJ=|ySP!#R~NfbE3C~9Rl>I@$>*t2!CLK_$V1&d9#N;<`{_*f@}-AQ3hlkXT=03q$MANX{uejvqzhHO^sO^q9cH?L>x%k)~GtqAp h+CozBpB~0Cb)qYeh!T(W`b3*@SbMCWayOon`U?*yWbgn0 delta 593 zcmZvZ$xZ@65QhI*n1KaGdyy%^~2QPCpFU*7@D#Mi1Tl#z_eQ(*XE7Z_0Y$f}Um7JuO_V!t`nl4n8^dZmi4sK>M1%}2jrJ_&ptBJ0 z!rSCsbFch`mh*^2YRJfRG5$cOiV9B~KAvOfM+_r~Qzpr3DJ;-i_mZ)QDqoc0GFU)Z zOIW6YuvX~Pn4iZgEuAVctkLpO%ch3Gwa&;^NMkgZ3FZI|?tZFmaBrSLxxf~-=^GF| z?9dQ>iCc73{OPF9QW|}hY$n}B{eN66t@OU5OJ? zdl(*!jXjEs@m4qiF$2qa#*CACLZZ!=H&?G#M8eoIs$u=15r0dO2tI{#3S*y{BIiIV U9Ln=Z&M3m{Cf~>W>dooo87r_e1DI zzk@^?14s(o48k2ZYJ{G@vmMI1Itao&_du21NQL_~rQK!eS8FOYYX|sjneAu`ufV+-O_BaxUn*~SzHvzDHvb;}*2BKXVR)7;=zG z;~dfg*B;6}8EVzasU0Pw#RRY3b|ee*&=>fB5jmqc$dz}tw}Q} zd=0l9d_9djc#8?$iwaW#mX6KP+axWtoUE!!P-XhPcdAdlcI)X|KSl@fwt#R4K|)0- zg<-sx#w_L-@lZ8tvcjDfI(IVg3#KCcikj)*uuI-^w}fGG5las4rm>6_fyqixccX)9 z#nzq*-Adr=FsQN6O}bZ1TDQJgeayg$GBwE;lRN+HV$&+9idVMgk>zh8?_f2JHQW=p za+XB`&#}_i!=T!%=mn*vCH{j>7Fy}i;s2?Ui4#DpL0x*jTMzu5U|}xCYk__{jSUn8 zawoPo`OJPWFSXhU!bbx6God;2-kTV6u+`Ov;`SAHJsXS_e>)Ip_TKnREwnRV+BNrV zM0&C#keIhwKa%%+wbrbcRalhe8WSOt4=S>@B}31Aw}c6nKZ|AR1ox+B*o?p+6JBoz zA-gZLzt#0kE}zXifm9<-nvz%LN61s--nMCDB(}^C+s)cd>1B3o8_kl>6R&i@5SJp= zkfGE;C@|cmriE3-9H_2SUsr5vbT7Nn^tD%4TVCYR_gUW$wA3C?0D)Wi(;7{;{^%;d{0j4S?r4|X#7T2L6+T1&i$~o6IzZ;${!3%Ripd+4jjW{Kukt9A!;Sql5;IX+C{D_V2 z_`>1&`@x=S-F}FOd9}o2(zcO5bXId~Vr(?Na79=0L9o|s^r+m9-q*FT_^8o!FtiH& zLC5^o&8YK~XqlLowOYZ`YGx2W78o%c=7Q~<$&l%s7{n*Mf6N)7EhQs22fS5%%8SR- z{+L^1jpR&4Gv$=KX0Ao4nkyt(hZ|qkfL><2y*;eTv8U9;EcMsm~$)2B#1I z#PD?DbBtsYM|cr9M3$;o+o}Ph8aTr1R`qwh@%|UMnjOd{4lyyEG|J==ZdhfOpEv)C zTW#@lOPra>ymN?eOgm<}bA)*-pZqfxu4kPahxq0niKq|XJ;fe)>j w&@yB$yb-@OwJ}Rg?DIQEq7Nv0VxJ$|=TGeOr}p`C{F1X$obfCC2ERl0KlF3&{r~^~ delta 737 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 diff --git a/server/src/main/java/com/swdc/server/controller/PriceController.java b/server/src/main/java/com/swdc/server/controller/PriceController.java index 911721b..0ef5d13 100644 --- a/server/src/main/java/com/swdc/server/controller/PriceController.java +++ b/server/src/main/java/com/swdc/server/controller/PriceController.java @@ -36,9 +36,10 @@ public class PriceController { public Price getPriceInfo(@PathVariable String platform, HttpServletRequest request, @PathVariable String product_id) { String restOfPath = (String) request.getAttribute(HandlerMapping.PATH_WITHIN_HANDLER_MAPPING_ATTRIBUTE); String bestMatchPattern = (String) request.getAttribute(HandlerMapping.BEST_MATCHING_PATTERN_ATTRIBUTE); - String category_name = new AntPathMatcher().extractPathWithinPattern(bestMatchPattern, restOfPath); + String category_name_with_separator = new AntPathMatcher().extractPathWithinPattern(bestMatchPattern, restOfPath); - category_name = UriUtils.decode(category_name, StandardCharsets.UTF_8); + category_name_with_separator = UriUtils.decode(category_name_with_separator, StandardCharsets.UTF_8); + String category_name = category_name_with_separator.replace("/", "_"); return priceService.getProductDetails(platform, category_name, product_id); } diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 986a8d9..64f8dca 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -41,7 +41,7 @@ public class PriceService { /** * - * file system에서 "fileSystemPath/platform/category_name/product_id.txt"에 해당하는 product의 가격 정보를 반환 + * file system에서 "{fileSystemPath}/platform/category_name/product_id.txt"에 해당하는 product의 가격 정보를 반환 * */ public Price getProductDetails(String platform, String category_name, String product_id) { From 6797b103ea642e9645bf1516d1750f1d3d01b070 Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Sat, 21 Sep 2024 14:25:42 +0900 Subject: [PATCH 04/14] change base path --- server/.gitignore | 2 ++ .../swdc/server/service/PriceService.class | Bin 7337 -> 7332 bytes .../stash-dir/PriceController.class.uniqueId0 | Bin 3563 -> 2720 bytes .../compileJava/previous-compilation-data.bin | Bin 71479 -> 71479 bytes .../com/swdc/server/service/PriceService.java | 4 ++-- .../src/main/resources/application.properties | 3 ++- 6 files changed, 6 insertions(+), 3 deletions(-) diff --git a/server/.gitignore b/server/.gitignore index c168328..805ca0c 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -37,3 +37,5 @@ out/ .vscode/ build/classes/java/main/com/swdc/server/config/WebConfig.class src/main/java/com/swdc/server/config/WebConfig.java +src/main/resources/application.properties +build \ No newline at end of file diff --git a/server/build/classes/java/main/com/swdc/server/service/PriceService.class b/server/build/classes/java/main/com/swdc/server/service/PriceService.class index c8e93a2023965bf8dcbd2fb9acb7fe6b2babf0aa..4ae00956ccafa7a6c8a07f6e8bd037b34bc1ccf0 100644 GIT binary patch delta 1983 zcmZ`(X>e0j6#j1VlKYa}mNe=1QkJx|rCYjCwmwQr3k57tWUWvELl+2?1k*M&>0m)#a+P}f9TlJabb`dM?5bL)j$4u_q%6%-}%mY??}a= zisL$~=1696uk~;8mu!p#+DmG}VgJ@SfsTkBZlnsNA)Ucm83+aI!q z@iN0)uNGjUz$8@2_2%lClNl2KB{ayzizxzC1{X_nd#Iz8W9l{9?f&5El0|F6q0RnP z?X7lHqgG%Vrpw>WJ~l&UDp`(MxQ?S%u%ih#ax52Eft8H99woBnY|HdS zKUQ%x3$&n>p)6+Zv?R#0mW8Sxs|D5|AoH!`**dw>nx%TMULc5&?6Nkg3T_q%qeBi@ zi%5@+0-LZ|dihM%f~|(<78&9bRV!{4xDB_e$d8h%k(i zewHjFwlwP@f#>kN?6wuA92Pi&7Z}t?XkjEA2(D&G&XfBUx7`IhUNq+Nl3c;^<@dJP z%yY8Tp343xoZ>DjRqbHRCh#W?IB{T@l?lU;AaEH2P7IL2X=h2y#hIJx z5r<_-Z!Jz`NSYC7Z}kR45pP>)W3WZ{GL_LvrPPJPp|CgH>Te-F-Zly%mlG$bP=-;N zcKr`ra^eyhMi~aLz_0kt$+F}HcSd5iVagHs0Y5s~7^x-?C;B-=TR)GSfV1$r^R2d*K@(wL zKgDSh+c17c$V`O}<8ypLO=MyZz9eKJnq5TcD_H4;W_*orsNlDhBdErp?*jQQl4S|_ zRkX;TQ&Vj^hZl^aS|+4v>Bfz4%%EO@sg|Q|J|`)v(khzc(pu6Yw1|w3(=T zP_v*Q`lnO#?-DMdn<0p$;1qVq*V1QoYIBQXt8{mKfugu4j{dVs4F$A_T_!XZoq?C) zX`i$P!mdH=&=sFX#A>Jmjeq2N@~cLsO07s2uQg4<+u%`2WPy8F?&S4rJ7Kn3;uf zX2;(!kb@<%Vf3Y^#GYv}tHwNRL>!Hbqf9oM<;G(2;+X|QHGJ_JrEDxwbrEGhnpin( LY#f`wCPDiLxp$bG delta 1981 zcmZ`)dr(wW9RAMky?gHN9&lZj$6XK*0byBK@PV=dib^6r$QLF)5e-)fNLIzHu&3HX z!(*CRX(f`CGnf;?I+Zgz{!^)yr9IV|W~|AkvB}Cm%6@lQuxX~5-Fv=s&Ub$2cfRxe z?mbv^xTwp|Y)$|!fmp=JVkL=X%A<;_{hUQ!vI;Xtf-GSP>G5z2BqE8yQXFUu1WOsr zS=rS#BqN0*RbVL6M)=pQPY*JkId8p=?FK`bQ$nA|G5 zTNY|6f&%NXUiMnNq(Q5|Mm!*YwoI{G@SrjC5F^zhS94&HDwptBjiXIqGaiwfcnK|f zOyF@mAy0DO2+c@sE8HC07#w%Rsan2zWnIt-D?Cov;IX3=&kAhE4mngCZg0m<4k@q; z&&xSlk=Bkq0xw{%+@)pM_u(aumjzzIetBA}a=*&Jyf&zKUEm-(=ssGS8v;Rw;YOaa z%o=a$6nF!N4?aYXL0rpfQE(^&Gcd|M`05X;Q+g!8mprR6Ly*cu#UVcft#qUBPjH_c%KV}k|$M27<%M0FVhu>ybKx&zlWmLNCB#4)$r6O&vq z#F$GK_zgE5xJl%p#z30D4gBh0=?t-1)Bmf?xa?{oW*Wrd0zcqK2g{a!#U!yD>2_u4 zxyD4Ez%Sv=^Nn7Cz)!d?>s*`IR(aVqzAY6dQWofOn$7P)?E&{Ix{}k2C=%1GoLdZ4V!@t`!%EM z>g%>a_^rC8Tf0%NYaetX-Ot~_G+hm07SN5kop26}EDDeGV6krLMqM`o#{OMo>_RL; zfa<52oYzXNkDRpyQ^W0E)DYt%I^t}&=$Q{Ym2@U0>Z59IE2PB}Fb0)W(p4y;Kz<4} zngWzk2tT%A9Cj1lOI5xPC1j8ZID#^CQBl8($@rK;HdDw#%*0uo16deRIFC;V?F*w% z36Z||3>T<1(C0V>7DivR5j2J2MM7o@bOe|1C1sq6o%o87N_lRh`urLe+R%(|@GS-W zj@AeY(l>XR=C064HTZ4Ho+^!TsQtfa4*HdHdKb~~q}zywwV#pR$GSryLYSr9f@vbh z)L9%gvM9cIVc)$gx#W`jde9U?i*eH%$R#0cia=cn;b8+mYCn(7zv^}< z14I2P^IKq~a*g!6Q}}Z|*xiE{qgB zpavgRmR0WD`4`ywA1u$@U{)?>`gGshr%#{zyX$p(@bk}?Z@?r^Hv`9b4lNSKaQg?A0wVGu`{{~ToTY3N2RP_+D5Qr%{KJ{g9ii8! z7;=<8Losf3+Tsy+wKKzj!3<{@R9FkhG8A%*;rOk)D3(!<``ZH zDx8h0sh62?CPSu}j*ICHZ-#cC^Y34!-?&u@>YdRlM#9uB(}cr=&GnrM>Rf@-cfrnxSZ64NL* zgwkRua8t+=W5}YSFHXq1BGUYM+Yh%DbKm8 zP*=6U?pCfb(b!Cb5|N{JiJtnc#uCB5C8`8gyJIyqIf*6}{wHVI%E>wn8FeuoJP>*E zQd9CGaU&>gbFMV_k&#Vh*5+L?krmTXzh%YD>V_mF4{xl5v{BN+ipt3X4=uy0{XeoE PMe1Ht{#d7VpPu{$7IatP delta 1599 zcmZuxZF3V<6n<{rHr;M%U1%Vdmz2Jzg@__b!izMu7TZE;N)W5Uk}PT3WH)ASi}fvl zitn9q_KP#lIDYZFpau;yj-TaE_*MPjKX5$vZYOO9va|P|J?Gr#KIggT=DY5HdelGu zYy1Y_B)+_>`quoJr&x|WSKBT+J}LL#&7aI?(dw^uns_l%4b?ZjNQXz>iM znnpRL6HY|KZtP*$T{c$Cv~A@KeyPZp$a1)0ap$Xt2Nx*4XcbZ_os$qB}tD+Ba4Wk%y@35?{6HKHH2|T6Xh=!-}jQbaxZhscX6g;Qlc^r37`}jT` zeni4J!N3w>5EQ$jq605zID>Kbq3=Ssj(`Aq5t9mD(lCXy3~_fO7;Vl*Gcw50c zLgaTD`nS%fXsy{RX2O%!(|yv&al5+C@bz}(HWNM2DZ|Q_Os9XwwpUgwsiwg0-vQ12 z*B`F6WG}2&%&i>i3GWaVo68D`^VgQm98ZmGb8SMTjZ!I7#;e5 zFC}9vjGJ`A@Z6H{bF*5rWb8J>fwaNR0+kaxXOzv@4eF^_#;h1sgKCsXA2RHj zFmra^%*R@iW%Lep#$?elN{_@Cw6m6FR?{WJaZE?Srwjv|!q%wsTO?=|Ou^?2`yV-k z7Hz5TJay4aU2&1F2!k&Af-FDTm+%U;%w=*9(i|r5#@IcuU!nN$dkr1Qz&&(E0}XTo zbwnw4z>85RC_=#o4$9C2^j*G>foL!qsAD7<62VXdhh#8HpND_J(WX1O>DE*F$vRFa z6_Ktqke2@VPnZ~uDz!s(y!-=k^5In)52KyN0qnpadN7O;dXCW@n#33~6n&j8&@zr- zl`hb29K|AK&wDlDHHwPg2Hrr3>K4`&TqR^-8RYX5?oC`HD?qp=atPHBB=9NZ$r&Qp zD7iyWaGe%)_z4Mw0a^_d=-olMOY{~O!5m_;LcUHRa)}HfyqJaL8BcOT_R|BXvfi;e z=C+CzBx}HNSw+lCYgVB)t579(pQP00lawA$r!47o_?k34GDENko6aAnNDHBc8o!T) z_~_4=xJ&zQO7BUgOEM8JZ5tWUPE1k=GAgPIHZ2rODl`Z1ri7_Vjl@5lL*JaDo=&S+ jqwg3=eS>`O$+0HKTYKg7fgC@=$CRd0$|v{?Um*HFgULx6 diff --git a/server/build/tmp/compileJava/previous-compilation-data.bin b/server/build/tmp/compileJava/previous-compilation-data.bin index e7b5dbab4e1f0d53cf1ab0b003db9a4149e8ac98..42d311549db5f264724ccb31e2d5a8695427676c 100644 GIT binary patch delta 35 rcmdnKj%E8gmJQNO0%;z-JxWt{$mVx delta 35 rcmdnKj%E8gmJQNO0zIlRd}nX0JfIXPaC-CghLUD&rtR8Hj69+M2s{m2 diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 64f8dca..a7d8bdf 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -34,7 +34,7 @@ public class PriceService { private static final Logger logger = LoggerFactory.getLogger(PriceService.class); - private static final String BASE_PATH = "/mnt/patturning"; + private static final String BASE_PATH = "/Users/sangyeong_park/CE/contest/file_system"; @Autowired private MongoTemplate mongoTemplate; @@ -46,7 +46,7 @@ public class PriceService { */ public Price getProductDetails(String platform, String category_name, String product_id) { Path fileSystemPath = Paths.get(BASE_PATH); - Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id + ".txt"); + Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id); List> prices = new ArrayList<>(); diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 2d292fa..c6761ca 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -1 +1,2 @@ -spring.application.name=swdc \ No newline at end of file +spring.application.name=swdc +server.port=8090 \ No newline at end of file From a33b7315df96045b5f8b50a3b1d6d214186df77b Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Sat, 21 Sep 2024 14:35:02 +0900 Subject: [PATCH 05/14] fix application properties --- server/.gitignore | 1 - .../swdc/server/service/PriceService.class | Bin 7332 -> 7303 bytes .../resources/main/application.properties | 3 +-- .../compileJava/previous-compilation-data.bin | Bin 71479 -> 71479 bytes .../com/swdc/server/service/PriceService.java | 2 +- .../src/main/resources/application.properties | 3 +-- 6 files changed, 3 insertions(+), 6 deletions(-) diff --git a/server/.gitignore b/server/.gitignore index 805ca0c..214295b 100644 --- a/server/.gitignore +++ b/server/.gitignore @@ -37,5 +37,4 @@ out/ .vscode/ build/classes/java/main/com/swdc/server/config/WebConfig.class src/main/java/com/swdc/server/config/WebConfig.java -src/main/resources/application.properties build \ No newline at end of file diff --git a/server/build/classes/java/main/com/swdc/server/service/PriceService.class b/server/build/classes/java/main/com/swdc/server/service/PriceService.class index 4ae00956ccafa7a6c8a07f6e8bd037b34bc1ccf0..06e2b91639dbbc3b824a8b33c56eb317e11fa8c1 100644 GIT binary patch delta 27 icmZ2t*={+(Qh;ASH?Ks$AhD#Rv?wn#FMVU0oeTho0SWK` delta 56 zcmZp-Tw*!FQddVmv^ce>Sid+iFTFA~KQBGLAh9T0-`Q0^IX|x?wYWq-Ei)%IzPPfu LBsF)Vr=1J{QFs*< diff --git a/server/build/resources/main/application.properties b/server/build/resources/main/application.properties index c6761ca..2d292fa 100644 --- a/server/build/resources/main/application.properties +++ b/server/build/resources/main/application.properties @@ -1,2 +1 @@ -spring.application.name=swdc -server.port=8090 \ No newline at end of file +spring.application.name=swdc \ No newline at end of file diff --git a/server/build/tmp/compileJava/previous-compilation-data.bin b/server/build/tmp/compileJava/previous-compilation-data.bin index 42d311549db5f264724ccb31e2d5a8695427676c..52643f3bfcf8994fd239f1c14ec43a175c4aa337 100644 GIT binary patch delta 35 rcmdnKj%E8gmJQNO0!i0g?6nR$2D^N*{@K_O8qloGv|XEtkw+8&05=S} delta 35 rcmdnKj%E8gmJQNO0%;z-JxWt{$mVx diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index a7d8bdf..6300f54 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -34,7 +34,7 @@ public class PriceService { private static final Logger logger = LoggerFactory.getLogger(PriceService.class); - private static final String BASE_PATH = "/Users/sangyeong_park/CE/contest/file_system"; + private static final String BASE_PATH = "/mnt/patturning"; @Autowired private MongoTemplate mongoTemplate; diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index c6761ca..2d292fa 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -1,2 +1 @@ -spring.application.name=swdc -server.port=8090 \ No newline at end of file +spring.application.name=swdc \ No newline at end of file From f286a32c3312af0f9bf6bac0e8c3762aeb641cba Mon Sep 17 00:00:00 2001 From: SangYeong Park <107484383+Imsyp@users.noreply.github.com> Date: Sat, 21 Sep 2024 14:59:59 +0900 Subject: [PATCH 06/14] Update PriceService.java --- .../src/main/java/com/swdc/server/service/PriceService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 6300f54..92a09f9 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -56,9 +56,9 @@ public Price getProductDetails(String platform, String category_name, String pro .map(parts -> Map.of(parts[0], Integer.parseInt(parts[1]))) // 날짜와 가격을 Map으로 변환 .collect(Collectors.toList()); // 모든 맵을 리스트로 수집 } catch (FileNotFoundException e) { - System.err.println("File not found: " + productPath); + System.err.println("File not found: " + productPath + ". Error: " + e.getMessage()); } catch (IOException e) { - System.err.println("Error reading file: " + productPath); + System.err.println("Error reading file: " + productPath + ". Error: " + e.getMessage()); } Price priceInfo = Price.builder() @@ -106,4 +106,4 @@ public Price getProductDetailsWithoutCategory(String platform, String product_id return priceInfo; } -} \ No newline at end of file +} From f1c71edef63fcf1187b687126d08d7e8a58559bb Mon Sep 17 00:00:00 2001 From: SangYeong Park <107484383+Imsyp@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:03:59 +0900 Subject: [PATCH 07/14] Update PriceService.java --- server/src/main/java/com/swdc/server/service/PriceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 92a09f9..951d4a0 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -46,7 +46,7 @@ public class PriceService { */ public Price getProductDetails(String platform, String category_name, String product_id) { Path fileSystemPath = Paths.get(BASE_PATH); - Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id); + Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id + ".txt"); List> prices = new ArrayList<>(); From 4c5c2e323141d14a589162c92a02fc11cae6a606 Mon Sep 17 00:00:00 2001 From: hyejiyu Date: Sat, 21 Sep 2024 20:37:46 +0900 Subject: [PATCH 08/14] [In Progress] add Sending Email Configs... --- airflow/dag.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/airflow/dag.py b/airflow/dag.py index 04d73b4..fbe91c2 100644 --- a/airflow/dag.py +++ b/airflow/dag.py @@ -30,11 +30,13 @@ def send_post_request(categoryId): # DAG의 기본 설정 default_args = { - 'owner': 'khuda', # DAG 소유자 - 'depends_on_past': False, # 이전 DAG 실패 여부에 의존하지 않음 - 'email_on_failure': False, # 실패 시 이메일 보내기 여부 - 'email_on_retry': False, # 재시도 시 이메일 보내기 여부 - 'retries': 1, # 실패 시 재시도 횟수 + 'owner': 'khuda', # DAG 소유자 + 'depends_on_past': False, # 이전 DAG 실패 여부에 의존하지 않음 + 'email': ['dbgpwl34@gmail.com'], # 수신자 이메일 + "email_on_success": True, # 성공 시 이메일 전송 + 'email_on_failure': True, # 실패 시 이메일 전송 + 'email_on_retry': True, # 재시도 시 이메일 전송 + 'retries': 1, # 실패 시 재시도 횟수 'retry_delay': timedelta(minutes=5) # 재시도 간격 } @@ -44,7 +46,7 @@ def send_post_request(categoryId): default_args=default_args, # 기본 인자 설정 description='HomePlus Crawling', # DAG 설명 schedule_interval=timedelta(days=1), # 실행 주기 (매일 1회) - start_date=datetime(2024, 9, 18), # 시작 날짜 + start_date=datetime(2024, 9, 20), # 시작 날짜 catchup=False # 시작 날짜부터 현재까지의 미실행 작업 실행 여부 ) as dag: @@ -69,7 +71,7 @@ def send_post_request(categoryId): @task def send_post_request_HOMEPLUS_task(category_id): return send_post_request(category_id) - + category_ids = list(range(100001, 100078)) [run_consumer_task1, run_consumer_task2, run_consumer_task3, send_post_request_HOMEPLUS_task.expand(category_id=category_ids)] From 25c3e44d180c11891d60e136b2be013814c58e4e Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Sun, 22 Sep 2024 02:12:25 +0900 Subject: [PATCH 09/14] =?UTF-8?q?comment=20=EC=A3=BC=EC=84=9D=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 --- .../com/swdc/server/controller/PriceController.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/swdc/server/controller/PriceController.java b/server/src/main/java/com/swdc/server/controller/PriceController.java index 0ef5d13..cc39073 100644 --- a/server/src/main/java/com/swdc/server/controller/PriceController.java +++ b/server/src/main/java/com/swdc/server/controller/PriceController.java @@ -27,10 +27,8 @@ public class PriceController { * * 플랫폼 이름, 카테고리 이름, 상품 id를 이용하여 priceService의 getProductDetails를 호출 * - * encoded category_name을 decoded category_name으로 변환하여 priceService에 전달 - * (%EC%B1%84%EC%86%8C -> 채소) - * * 가격 정보를 담은 Price 객체(platform/category_name/product_id에 해당)를 반환 + * */ @GetMapping("{platform}/{product_id}/**") public Price getPriceInfo(@PathVariable String platform, HttpServletRequest request, @PathVariable String product_id) { @@ -44,6 +42,14 @@ public Price getPriceInfo(@PathVariable String platform, HttpServletRequest requ return priceService.getProductDetails(platform, category_name, product_id); } + /** + * + * 플랫폼 이름, 상품 id를 이용하여 priceService의 getProductDetailsWithoutCategory를 호출 + * + * 가격 정보를 담은 Price 객체(platform/category_name/product_id에 해당)를 반환 + * -> category 전수탐색을 통해 알맞은 category를 알아서 찾아냄 + * + */ @GetMapping("{platform}/{product_id}") public Price getPriceInfo(@PathVariable String platform, @PathVariable String product_id) { return priceService.getProductDetailsWithoutCategory(platform, product_id); From 7b15e237de30f454d3e558732389e12fce3b22fb Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Mon, 23 Sep 2024 22:42:36 +0900 Subject: [PATCH 10/14] delete commits --- .idea/.gitignore | 3 +++ .idea/.name | 1 + .idea/Dark-Pattern-Detection-SWDeveloperContest.iml | 9 +++++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ 5 files changed, 27 insertions(+) create mode 100644 .idea/.gitignore create mode 100644 .idea/.name create mode 100644 .idea/Dark-Pattern-Detection-SWDeveloperContest.iml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..26d3352 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,3 @@ +# Default ignored files +/shelf/ +/workspace.xml diff --git a/.idea/.name b/.idea/.name new file mode 100644 index 0000000..30ae24f --- /dev/null +++ b/.idea/.name @@ -0,0 +1 @@ +server_cicd.yml \ No newline at end of file diff --git a/.idea/Dark-Pattern-Detection-SWDeveloperContest.iml b/.idea/Dark-Pattern-Detection-SWDeveloperContest.iml new file mode 100644 index 0000000..d6ebd48 --- /dev/null +++ b/.idea/Dark-Pattern-Detection-SWDeveloperContest.iml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..2cbc986 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file From 4a8660a90ee0f20368f5738da185580a896044d4 Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Fri, 20 Sep 2024 21:44:34 +0900 Subject: [PATCH 11/14] feat: read '/' as '_' --- server/build/resources/main/application.properties | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/server/build/resources/main/application.properties b/server/build/resources/main/application.properties index 2d292fa..c6761ca 100644 --- a/server/build/resources/main/application.properties +++ b/server/build/resources/main/application.properties @@ -1 +1,2 @@ -spring.application.name=swdc \ No newline at end of file +spring.application.name=swdc +server.port=8090 \ No newline at end of file From d41c9c5f4e73f549cde957492bf0d645156e47e5 Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Sat, 21 Sep 2024 14:25:42 +0900 Subject: [PATCH 12/14] change base path --- .../src/main/java/com/swdc/server/service/PriceService.java | 4 ++-- server/src/main/resources/application.properties | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 951d4a0..4b736c0 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -34,7 +34,7 @@ public class PriceService { private static final Logger logger = LoggerFactory.getLogger(PriceService.class); - private static final String BASE_PATH = "/mnt/patturning"; + private static final String BASE_PATH = "/Users/sangyeong_park/CE/contest/file_system"; @Autowired private MongoTemplate mongoTemplate; @@ -46,7 +46,7 @@ public class PriceService { */ public Price getProductDetails(String platform, String category_name, String product_id) { Path fileSystemPath = Paths.get(BASE_PATH); - Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id + ".txt"); + Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id); List> prices = new ArrayList<>(); diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index 2d292fa..c6761ca 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -1 +1,2 @@ -spring.application.name=swdc \ No newline at end of file +spring.application.name=swdc +server.port=8090 \ No newline at end of file From 1edabbc3cd8bce173a8138462a17926c66151a90 Mon Sep 17 00:00:00 2001 From: SangYeong Park Date: Sat, 21 Sep 2024 14:35:02 +0900 Subject: [PATCH 13/14] fix application properties --- server/build/resources/main/application.properties | 3 +-- server/src/main/java/com/swdc/server/service/PriceService.java | 2 +- server/src/main/resources/application.properties | 3 +-- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/server/build/resources/main/application.properties b/server/build/resources/main/application.properties index c6761ca..2d292fa 100644 --- a/server/build/resources/main/application.properties +++ b/server/build/resources/main/application.properties @@ -1,2 +1 @@ -spring.application.name=swdc -server.port=8090 \ No newline at end of file +spring.application.name=swdc \ No newline at end of file diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 4b736c0..92a09f9 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -34,7 +34,7 @@ public class PriceService { private static final Logger logger = LoggerFactory.getLogger(PriceService.class); - private static final String BASE_PATH = "/Users/sangyeong_park/CE/contest/file_system"; + private static final String BASE_PATH = "/mnt/patturning"; @Autowired private MongoTemplate mongoTemplate; diff --git a/server/src/main/resources/application.properties b/server/src/main/resources/application.properties index c6761ca..2d292fa 100644 --- a/server/src/main/resources/application.properties +++ b/server/src/main/resources/application.properties @@ -1,2 +1 @@ -spring.application.name=swdc -server.port=8090 \ No newline at end of file +spring.application.name=swdc \ No newline at end of file From ceb77297fcdfaf988615feff047af722c04594ec Mon Sep 17 00:00:00 2001 From: SangYeong Park <107484383+Imsyp@users.noreply.github.com> Date: Sat, 21 Sep 2024 15:03:59 +0900 Subject: [PATCH 14/14] Update PriceService.java --- server/src/main/java/com/swdc/server/service/PriceService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/src/main/java/com/swdc/server/service/PriceService.java b/server/src/main/java/com/swdc/server/service/PriceService.java index 92a09f9..951d4a0 100644 --- a/server/src/main/java/com/swdc/server/service/PriceService.java +++ b/server/src/main/java/com/swdc/server/service/PriceService.java @@ -46,7 +46,7 @@ public class PriceService { */ public Price getProductDetails(String platform, String category_name, String product_id) { Path fileSystemPath = Paths.get(BASE_PATH); - Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id); + Path productPath = fileSystemPath.resolve(platform).resolve(category_name).resolve(product_id + ".txt"); List> prices = new ArrayList<>();