From 3b9194e549673428b806bb5adcbdb6647c270dd9 Mon Sep 17 00:00:00 2001
From: Jiwon Seo <134384128+seoiiwon@users.noreply.github.com>
Date: Sun, 10 Aug 2025 13:28:53 +0900
Subject: [PATCH 01/81] =?UTF-8?q?=F0=9F=93=9D=20Docs?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/ISSUE_TEMPLATE/bug-issue.md     | 25 +++++++++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature-issue.md | 20 ++++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/bug-issue.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature-issue.md

diff --git a/.github/ISSUE_TEMPLATE/bug-issue.md b/.github/ISSUE_TEMPLATE/bug-issue.md
new file mode 100644
index 0000000..aa9e088
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug-issue.md
@@ -0,0 +1,25 @@
+---
+name: BUG ISSUE
+about: 버그 관련 이슈
+title: "[BUG] "
+labels: "\U0001F41E Bug"
+assignees: ''
+
+---
+
+## 🐛 Description
+> 버그에 대해 간단하게 설명해주세요.
+
+
+
+## ✏️ Bug Occur
+> Given-When-Then 형식으로 서술해주세요.
+
+
+
+## 👀 Expected Result
+> 예상했던 정상 결과에 대해 설명해주세요.
+
+
+
+## 📢 Notes
diff --git a/.github/ISSUE_TEMPLATE/feature-issue.md b/.github/ISSUE_TEMPLATE/feature-issue.md
new file mode 100644
index 0000000..d4daa2e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature-issue.md
@@ -0,0 +1,20 @@
+---
+name: FEATURE ISSUE
+about: 기능 관련 이슈
+title: "[FEATURE]"
+labels: "✨ Feature"
+assignees: ''
+
+---
+
+## 🚀 Description
+> 작업 내용에 대해 간단하게 설명해주세요.
+
+
+
+## ✅ TODO
+- [ ] todo
+- [ ] todo
+
+
+## 📢 Notes

From 73eab86c56a6fcfc62141d103ab3a9e0535c6691 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 13:36:20 +0900
Subject: [PATCH 02/81] =?UTF-8?q?=F0=9F=93=9D=20Docs:=20"PR=20=ED=85=9C?=
 =?UTF-8?q?=ED=94=8C=EB=A6=BF=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GitHub Pull Request Template 추가
이슈번호, 내용, 이미지, 추가사항에 대해 작성

Related to: #1
---
 .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..3852adc
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,13 @@
+## 📌 Related Issue
+> #이슈번호
+
+
+## 🚀 Description
+> 작업 내용에 대해 간단하게 설명해주세요.
+
+
+## 📸 Screenshot
+
+
+## 📢 Notes
+> 리뷰어가 특별히 봐주었으면 하는 부분이 있다면 작성해주세요.
\ No newline at end of file

From f665042434a3a860dab0b88dbcc4fad9f2b310e0 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 14:06:38 +0900
Subject: [PATCH 03/81] =?UTF-8?q?=F0=9F=93=9D=20Docs:=20".gitignore=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

SpringBoot 프로젝트 관련 .gitignore 추가

Related to: #1
---
 .gitignore | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 .gitignore

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..c2065bc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,37 @@
+HELP.md
+.gradle
+build/
+!gradle/wrapper/gradle-wrapper.jar
+!**/src/main/**/build/
+!**/src/test/**/build/
+
+### STS ###
+.apt_generated
+.classpath
+.factorypath
+.project
+.settings
+.springBeans
+.sts4-cache
+bin/
+!**/src/main/**/bin/
+!**/src/test/**/bin/
+
+### IntelliJ IDEA ###
+.idea
+*.iws
+*.iml
+*.ipr
+out/
+!**/src/main/**/out/
+!**/src/test/**/out/
+
+### NetBeans ###
+/nbproject/private/
+/nbbuild/
+/dist/
+/nbdist/
+/.nb-gradle/
+
+### VS Code ###
+.vscode/

From 1175f24010a8c76a9097926e4f9eb65bb06ac77f Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 14:22:02 +0900
Subject: [PATCH 04/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"Spring?=
 =?UTF-8?q?=20Boot=20=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=20=EC=84=B8?=
 =?UTF-8?q?=ED=8C=85"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

start.spring.io 에서 프로젝트 생성
Gradle-Groovy, Java-21, Spring Boot 3.5.4로 진행
init DI: DevTools, Lombok, Spring Web, Spring Security, OAuth2 Client/Resource Server, JPA, MySQL Driver
JPA, MySQL DI는 주석처리 (DB 세팅이 되지 않아 문제 발생)

Related to: #1
---
 build.gradle                                  |  54 ++++
 gradle/wrapper/gradle-wrapper.jar             | Bin 0 -> 43764 bytes
 gradle/wrapper/gradle-wrapper.properties      |   7 +
 gradlew                                       | 251 ++++++++++++++++++
 gradlew.bat                                   |  94 +++++++
 settings.gradle                               |   1 +
 src/main/java/popcong/app/AppApplication.java |  13 +
 src/main/resources/application.properties     |   1 +
 .../java/popcong/app/AppApplicationTests.java |  13 +
 9 files changed, 434 insertions(+)
 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/popcong/app/AppApplication.java
 create mode 100644 src/main/resources/application.properties
 create mode 100644 src/test/java/popcong/app/AppApplicationTests.java

diff --git a/build.gradle b/build.gradle
new file mode 100644
index 0000000..5892227
--- /dev/null
+++ b/build.gradle
@@ -0,0 +1,54 @@
+plugins {
+	id 'java'
+	id 'org.springframework.boot' version '3.5.4'
+	id 'io.spring.dependency-management' version '1.1.7'
+}
+
+group = 'popcong'
+version = '0.0.1-SNAPSHOT'
+
+java {
+	toolchain {
+		languageVersion = JavaLanguageVersion.of(21)
+	}
+}
+
+configurations {
+	compileOnly {
+		extendsFrom annotationProcessor
+	}
+}
+
+repositories {
+	mavenCentral()
+}
+
+dependencies {
+	// Dev
+	developmentOnly 'org.springframework.boot:spring-boot-devtools'
+	annotationProcessor 'org.projectlombok:lombok'
+	compileOnly 'org.projectlombok:lombok'
+
+	// Web
+	implementation 'org.springframework.boot:spring-boot-starter-web'
+
+	// Security
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+	testImplementation 'org.springframework.security:spring-security-test'
+
+	// OAuth2
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
+	// Database
+//	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+//	runtimeOnly 'com.mysql:mysql-connector-j'
+
+	// Test
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+}
+
+tasks.named('test') {
+	useJUnitPlatform()
+}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000000000000000000000000000000000000..1b33c55baabb587c669f562ae36f953de2481846
GIT binary patch
literal 43764
zcma&OWmKeVvL#I6?i3D%6z=Zs?ofE*?rw#<YvCkbxVyW%yKCX@!|9$o-`u{_=j&YS
z`H?I0&zrGh@7NLXq=GaUI64S4G&BeZ2+`;H|6a%-Fd(v`DuT3<a$@u{lER{L%A%?&
z5FlUv`pUYdmg6ehSD(qsE;AF;KiFcDt!L*A-b#i=s_aS3@$IR6LZlP`VN@Cc&4u@8
zUd%O$VYz!}-qeNMuz&!^rwLcYTPd$&)9F!%%04Kal8N8y^leY{#+huHk1p>G$eqJB
ziT4y8-Y@s9rkH0Tz>ll(^xkcTl)CY?rS<gSMh9En?Vgv_y9?ZEjrCAh*V6R;w`-ev
zl#7dn9e|@&=-t`i-THVhx0m*m7W?S<o5#})7$4D>&9VNd66Yc)g^6)JcWaY(5$5gt
z8gr3SBXUTN;~cBgz&})qX%#!Fxom2Yau_`&8)+6aSN7YY+pS410rRUU*>J}qL0TnJ
zRxt*7QeUqTh8j)Q&iavh<}L+$Jqz))<`IfKussVk%%Ah-Ti?Eo0hQH!rK%K=#EAw0
zwq@@~XNUXRnv8$;zv<6rCRJ6fPD^hfrh;0K<JwE-P9|b;^L#U}45X2ingSgIx$t0w
z)V+kY*mtvJIMSC@hBjAyoQj=+$b!s{)`1w6nr$e&iGPjQ$qC^d-9|XvX|K)~=U>?n
z=p!u^3xOgWZ%f3+?+>H)9+w^$Tn1e;?UpVMJb!!;f)`6f&4|8mr+g)^@x>_rvnL0<
zvD0Hu_N>$(Li7|Jgu0mRh&MV+<}`~Wi*+avM01E)Jtg=)-vViQKax!GeDc!xv$^mL
z{#OVBA$U{(Zr8~Xm|cP@odkHC*1R8z6hcLY#N@3E-A8XEvpt066+3t9L_6Zg6j@9Q
zj$$%~yO-OS6PUVrM2s)(T4#6=JpI_@Uz+!6=GdyVU?`!F=d;8#ZB@(5g7$A0(`eqY
z8_i@3w$0*es5mrSjhW*qzrl!_LQWs4?VfLmo1Sd@Ztt53+etwzAT^8ow_*7Jp`Y|l
z*UgSEwvxq+FYO!O*aLf-PinZYne7Ib6ny3u>MjQz=((r3NTEeU4=-i0LBq3H-VJH<
z^>1RE3_JwrclUn9vb7HcGUaFRA0QHcnE;6)hnkp%lY1UII#WPAv?-;c?YH}LWB8Nl
z{sx-@Z;QxWh9fX8SxLZk8;kMFlGD3Jc^QZVL4nO)1I$zQwvwM&_!kW+LMf&lApv#<
zur|EyC|U@5OQuph$TC_ZU`{!vJp`13e9alaR0Dbn5ikLFH7>eIz4QbV|C=%7)F=qo
z_>M&5N)d)7G(A%c<lKH4^8Hp9b@dxXM-pP@q9T=A6O<Ug2$CU&jp%ugHpd_5=E*LQ
z3|0XI-?6$A#RO``@NO19`9M%OTwFds=!*lM^frbvhY`X2*t_pmCOA^C8ilSc0Xh@j
zKGB0;icTb-F?Z&?HaxJ#H(W_K)DcQGe;fLg=xT<e*TLcEsj9Jx4+WevW81(@``gb9
ztLZ=$S%MI2jmC$I#LW+x%`q2DagEFkpI#u3ct>>}UCrW!Ql_6_A{?R7&CL`;!KOb3
z8Z=$YkV-IF;c7zs{3-WDEFJzuakFbd*4LWd<_kBE8~BFcv}js_2OowRNzWCtCQ6&k
z{&~Me92$m*@e0ANcWKuz)?YjB*VoSTx??-3Cc0l2U!X^;Bv@m87eKHukAljrD54R+
zE;@_w4NPe1>3`i5Qy*3^E9x#VB6?}v=~qIprrrd5|DFkg;v5ixo0IsBmik8=Y;zv2
z%Bcf%NE$a44bk^`i4VwDLTbX=q@j9;JWT9JncQ!+Y%2&HHk@1~*L8-{ZpY?(<U(yK
zX>-a9J-1~<1ltr9i~D9`P{XTIFWA6IG8c4;6bFw*lzU-{+?b&%OcIoCiw00n>A1ra
zFPE$y@>ebbZlf(sN_iWBzQKDV<!UJ72G|`KiacUcsDc}BB~-4vL+Gp7t%iaxo{r68
zJ?RC6VAG9`S8y{_Yxg=lKKg0~%ntT<)gINU!!tDE#t^DXMv$n`L^;gW96JyKh}(%>
zmmaLX#zK!@ZdvCANfwV}9@2O&w)!5gSgQzHdk2Q`jG6KD7S+1R5&F)j6QTD^=hq&7
zHUW+r^da^%V(h(wonR(j?BOiC!;y=<Nr<L)(WX+R%k#*yH1@o;<Zej5qW$1oy%ORi
zw*o-Du{utPhvmHd+{&cZD182c2Co@Sq(G`LWiRYR>%nJvz?*aW&5E87qq;2z`EI(f
zBJNNSMFF9U{sR-af5{IY&AtoGcoG)Iq-S^v{7+t0>7N(KRoPj;+2N5;9o_nxIGjJ@
z7bYQK)bX)vEhy~VL%N6g^NE@D5VtV+Q8U2%{ji_=6+i^G%xeskEhH>Sqr194PJ$fB
zu1y^){?9Vkg(FY2h)3ZHrw0Z<@;(gd_dtF#6y_;Iwi{yX$?asr?0N0_B*CifEi7<6
zq`?OdQjCYbhVcg+7MSgIM|pJRu~`g?g3x?Tl+V}#$It`iD1j+!x+!;wS0+2e>#g?Z
z*EA^k7W{jO1r^K~cD#5pamp+o@8&yw6;%b|uiT?{Wa=4+9<}aXWUuL#ZwN1a;lQod
zW{pxWCYGXdEq9qAmvAB904}?97=re$>!I%wxPV#|f#@A*Y=qa%zHlDv^yWbR03%V0
zprLP+b(#fBqxI%F<U7v<Ri}drrj>iF*-n8HtH6$8f(P6!H3V^ysgd8de-N(@|K!A<
z^qP}jp(RaM9kQ(^K(U8O84?D)aU(g?1S8iWwe)gqpHCaFlJxb*ilr{KTnu4_@5{K-
z)n=CCeCrPHO0WHz)dDtkbZfUfVBd?53}K>C5*-wC4hpDN8cGk3lu-ypq+EYpb_2H;
z%vP4@&+c2p;thaTs$dc^1CDGlPG@A;yGR5@$UEqk6p58qpw#7lc<+W(WR;(vr(D>W
z#(K$vE#uBkT=*q&uaZwzz=P5mjiee6>!lV?c}QIX%ZdkO1dHg>Fa#xcGT6~}1*2m9
zkc7l3ItD6Ie~o_aFjI$Ri=C!8uF4!Ky7iG9QTrxVbsQroi|r)SAon#*B*{}TB-?=@
z8~jJs;_R2iDd!$+n$%X6FO&PYS{YhDAS+U2o4su9x~1+U3z7YN5o0qUK&|g^klZ6X
zj_vrM5SUTnz5`*}Hyts9ADwLu#x_L=nv$Z0`HqN`Zo=V>OQI)fh01n~*a%01%cx%0
z4LTFVjmW+ipVQv5rYcn3;d2o4qunWUY!p+?s~X~(ost@WR@r@EuDOSs8*MT4fiP>!
zkfo^!PWJJ1MHgKS2D_hc?Bs?isSDO61>ebl$U*9*QY(b=i&rp3@3GV@z>KzcZOxip
z^dzA~44;R~cnhWz7s$$v?_8y-k!DZys}Q?4IkSyR!)C0j$(Gm|t#e3|QAOFaV2}36
z?dPNY;@I=FaCwylc_;~kXlZsk$_eLkNb~TIl8QQ`mmH&$*zwwR8zHU*sId)rxHu*K
z;yZWa8UmCwju%aSNLwD5fBl^b0Ux1%q8YR*uG`53Mi<`5uA<ivoX#Y(ieK-lAtu4f
zF2re9qU41VXdc_#XWRG3A1YtJe+l(0rzo$B{}~<_EyMepDZmYM!wk99W#+nl#{6RY
z0`whH0Sh`*SYyo1$rzdws&H*N3K?fZub9yrW)Z8Vzxjs|3&)+(J&Nh`JIT?W;V(Tz
zL0lHZxcC*7(s#W2PTn5>^Dc6Ync)J3N7;zQ*<u6@Y&UTjsN0HAStvP+$%9&=bpK5+
z)+PneC8eL)5x8f?&OOqrnqHvqFfN<}q@g7?F>75)hf%a@{$H+%S?SGT)ks60)?6j$
zspl|4Ad6@%-r1t*$tT(en!gIXTUDcsj?28ZEzz)dH)SV3bZ+pjMaW0oc~rOPZP@g!
zb9E+ndeVO_<?rK9DaFm<PP6sRw&OaPk!0DHN{W(HhMdk&fz03%N{}wh4Iau8rop=L
zasSwE04c51rB}aL9G$0c?A)w4hr4<?dtR^1+21+b57~bsL>Ib9c_>{)`01^`ZS198
z)(t=+{Azi11$eu%aU7jbwuQrO`vLOixuh~%4z@mKr_O<Zd6~i5J})tO+{G$_*&%e5
zg3O+ta$Psgxh3MZ2C}$<Qp2r$vP8yQ{NkyWHgJGhemG7uxWRvL$@vQ%(|gLH6t{&(
z&tM-z;Ae~9tv>c;F%Uq01fA)^W&y+g16e?rkLhTxV!EqC%2}sx_1u7IBq|}Be&7WI
z4I<;1-9tJsI&pQIhj>FPkQV9{(m!wYYV@i5h?A0#BN2wqlEwNDIq06|^2oYVa7<~h
zI_OLan0Do*4R5P=a3H9`s5*><zFT1grh~4TfLTVf-v&oTgO_QvD$jyN8!Ml+({P$$
z-><mrqX};2-gz$ryStrCw<*||bu7fCOvZUZ_NPCW%;?6m52!_fLoi}0ZOJXzwCW_w
zbA~BH2pHXPo8aAAAn+S&1Z~w0$Q)Q95>xU}_PSztg`+2mv)|3nIy=5#Z$%+@tZnr>
zLcTI!Mxa`PY7%{;KW~!=;*t)R_sl<^b>eNO@w#fEt(tPMg_jpJpW$q_DoUlkY|uo>
z0-1{ouA#;t%spf*7VjkK&$QrvwUERKt^Sdo)5@?qAP)>}Y!h4(JQ!7{wIdkA+|)bv
z&8hBwoX4v|+fie}iTslaBX^i*TjwO}f{V)8*!dMmRPi%XAWc8<_IqK1jUsApk)+~R
zNFTCD-h>M5Y{qTQ&0#j@I@tmXGj%rzhTW5%Bkh&sSc=$Fv;M@1y!zvYG5P2(2|(&W
zlcbR1{--rJ&s!rB{G-sX5^PaM@3EqWVz_y9cwLR9xMig&9gq(voeI)W&{d6j1jh&<
zARXi&APWE1FQWh7eo<CXPEt%%S%pqk?EiR1+Q?DZ9tLF52fwF~*DmmN6U@5MDWiQu
z-i2!L85SA;_l|OB&q>Zj<!Jf}1X~)`iRF{_Wj`+Y?^k`zidtfAeaTBF2~*6~9dJoK
zpd-p-ZW1b`^R<yCul6^~P0P2P?JYSiGBJHv$*b&nxRAP9iw|xH-B0JxuydGyJw>uP
z;vdgX>zep^{{2%hem;e*gDJhK1Hj12nBLIJoL<=0+8SVEBx7!4Ea+hBY;A1gB<f~p
zZ0BTdYeQ#f1#ooyKaVIYKQ0Bvh@7>wvY<)tj~T=H`^?3>zeWWm|LAwo*S4Z%bDVUe
z6r)CH1H!(>OH#MXFJ2V(U(qxD{4Px2`8qfFLG+=a;B^~Te_Z!r3RO%Oc#ZAHKQxV5
zRYXxZ9T2A%NVJIu5Pu7!Mj>t%YDO$T@M=RR(~mi%sv(YXVl`yMLD;+WZ{vG9(@P#e
zMo}ZiK^7^h6TV%cG+;jhJ0s>h&VERs=tuZz^Tlu~%d{ZHtq6hX$V9h)Bw|jVCMudd
zwZ5l7In8NT)qEPGF$VSK<eY2{8;?IUDm2QDDl4gC>g&fb0%R2RnUnqa){)V(X(s0U
zkCdVZe6wy{+_WhZh3qLp245Y2RR$@g-!9PjJ&4~0cFSHMUn=>dapv)hy}|y91ZWTV
zCh=z*!S3_?`$&-eZ6xIXUq8RGl9oK0BJw*TdU6A`LJqX9eS3X@F)g$jLkBWFscPhR
z<VgCW){ry5c9vGHT*hnuTcpPlF;X)FuY1==?z!cl6;$1cjMSU)hw;=@y`LR#APf=T
zgC9ISC#h}gxY%6+EiEF_stYh!dmYne4uH37@w=)1I~`RJNZ`C|ZVF5|Jxef}ayhg%
z_T0##<>pCv8#KeAc^y>>Y$k^=r|K(DTC}T$0#jQBOwB#@`P6~*IuW_8JxCG}J4va{
zsZzt}tt+cv7=l&CEuVtjD6G2~_Meh%p4RGuY?hSt?(sreO_F}8r7Kp$qQdvCdZnDQ
zxzc*qchE*E2=WK)^oRNa>Ttj`fpvF-JZ5tu5>X1xw)J@1!IqWjq)ESBG?J|ez`-Tc
zi5a}GZx|w-h%5lNDE_3ho0hEXMoaofo#Z;$8|2;EDF&*L+e$u}K=u?pb;dv$SXeQM
zD-~7P0i_`Wk$#YP$=hw3UVU+=^@Kuy$>6?~gIXx636jh{PHly_a2xNYe1l60`|y!7
z(u%;ILuW0DDJ)2%y`Zc~hOALnj1~txJtcdD#o4BCT<c`C3s{Fa9nJ8f9aXHKr$OPM
zg|kC>68+8gZe`=^te6H_egxY#nZH&P*)hgYaoJ^qt<Ifn@*Qw*6a&7R$<m-yG(ctW
zUd2p=qK(#tQz-MJYkq(;De4^$<OcVv^<&qh7F!#6QZNMqxG;xHfrRZwgtC}ydIb8n
z+%@S?Set`=rrK+R`ycN~!fQswa)h~kmxu`vElJou2Is?=GU%N<69XZgo%~;_RUlkr
zAefA>mpeea`35Fw)cy!w@c#v6E29co8&D9CTCl%^GV|X;SpneSXzV~LXyRn-@K0Df
z{tK-nDWA!q38M1~`xUIt_(MO^R(yNY#9@es9RQb<k-%Zd#d<U>Y@Ia*xHhD&=k^T+
zJi@<Efq$RwgSrGpx~`%kr?H%qIhr11IbNi4yZU@QUBPvM!op`qN9(HbVX@kr!I|Sq
z2dlD61!FuSEbhkPO3Wfz3BE|V`G@#twDPc&>j2I|WcgW=PuAc>hs`(&CvgjL2a9Rx
zCbZyUpi8NWUOi@S%t+Su4|r&UoU|ze9SVe7p@f1GBkrjkkq)T}X%Qo1g!SQ{O{P?m
z-OfGyyWta+UC<kO6&rXO+i)KFQe2XV+qbCDEj$VcVCttsgF<kgv88w^t!uHbB+Rgk
zBz~A8L*{u93BcK8!_|&4JoY8o+$I9Z7ICvS4UQ(u_Zw%X;ue4ajwmA11T2AMK;K~q
ztDu9*93ND#TSdztlH2m`45h7@{dn>XH+-+(D^%kw#A1-U;?9129at7MeCCzC{DNgO
zeSqsV>W^NIfTO~4({c}KUiuoH8A*J!Cb0*sp*w-Bg@YfBIPZFH!M}C=S=S7PLLcIG
zs7K77g~W)~^|+mx9onzMm0qh(f~OsDT<zGyR(}~_oq|s3Gmth}>zVmRtz=aZTllgR
zGUn~_5hw_k&rll<4G=G+`^Xlnw;jNYDJz@bE?|r866F2hA9v0-8=JO3g}IHB#b`hy
zA42a0>{0L7CcabSD+F7?pGbS1KMvT{@1_@k!_+Ki|5~EMGt7T%u=79F)8xEiL5!EJ
zzuxQ`NBliCoJMJdwu|);zRCD<5Sf?Y>U$trQ-;xj6!s5&w=9E7)%pZ+1Nh&8nCCwM
zv5>Ket%I?cxr3vVva`YeR?dGxbG@pi{H#8@kFEf0Jq6~K4>kt26*bxv=P&jyE#e$|
zDJB_~i<Xq~nb8@S9L8s6ncG@^0W=JftLyPTLSr5sQ*gl%%*C=Z&yB;3n~YJ<=iS31
zdJr-DfbIF4L)RMldE&*CKpiD=6>mk^-z|o!2njF2hL*|7sHCnzluhJjwLQGDmC)Y9
zr9ZN`s)uCd^XDvn)VirMgW~qfn1~SaN^7vcX#K1<Nh7_a(#8cARE-AH23jr|$J4<r
zlIW36BE}$?*2in8W!L*L4!IW{ob03lV1pxflV^=nQe@&5WJ!3>G`==UGaDVVx$<t`
z%ZG^$ey=-ydeW?}rUwRXYv-SrTOeQT!Mftcw@rEz0h569l~}qT=8(>0BQnubhX|{e
z^i0}>k-;BP#Szk{cFjO{2x~LjK{^Upqd&<+03_iMLp0$<BzI;S_z9k!Q66iD){Kc4
zK?}$9@4|73IAIzoVBwOhK(!-LA$DOeQ?G-7U-!dDg7m^PBT<21@Sd41^tLCGW`RI*
z7VR4ZX72#cq#wHDlpKM*XB?p<@H*)Y-|-C1=-{#e`n=Ox{o+Col(Oj}uyWtXb~&CK
z_OTBHdn66|WoLgho6;{&gyWC!LN?@Vp+kb2*au$?_1R2qPNfRNx8CtT(yll<vQtVB
z&&%QGGlrH^p_>!6_$@TbX>8U-f*-w-ew1?`CtD_0y_Lo|PfKi52p?`5$Jzx0E8`M0
zNIb?#!K$mM4X%`Ry_yhG5k@*+n4||2!~*+&pYLh~{`~o(W|o64^NrjP?-1Lgu?iK^
zTX6u3?#$?R?N!{599vg>G8RGHw)Hx&=|g4599y}mXNpM{EPKKXB&+m?==R3GsIq?G
zL5fH={=zawB(sMlDBJ+{dgb)Vx3pu>L=mDV0{r1Qs{0Pn%TpopH{m(By4;{FBvi{I
z$}x!Iw~MJOL~&)p93SDIfP3x%ROjg}X{Sme#hiJ&Yk&a;iR}V|n%PriZBY8SX2*;6
z4hdb^&h;Xz%)BDACY5AUsV!($lib4>11UmcgXKWpzRL8r2Srl*9Y(1uBQsY&hO&uv
znDNff0tpHlLISam?o(lOp#CmFdH<6HmA0{UwfU#Y{8M+7od8b8|B|7ZYR9f<#+V<x
zEXFHNBAN>|ZSaCQvI$~es~g(Pv{2&m_rKSB2Q<kr%g_1^%Veb1sX#n<Z}zXNgS$>Q
zMvT}$?Ll>V+!9Xh5^iy3?UG;dF-zh~RL#++roOCsW^cZ&({6q|?Jt6`?S8=16Y{oH
zp50I7r1AC1(#{b`Aq5cw>ypNggHKM9vBx!W$eYIzD!4KbLsZGr2o8>g<@inmS3*>J
zx8oG((8f!ei|M@JZB`p7+n<<b>Q}?>h249<`7xJ?u}_n;Gq(&km#1ULN87CeTO~FY
zS_<lEORnOk;&2#(^=C#_&3&S5?1D#WxzR?KN=z;_R;CQs)!0hYG&6Y4RINi+Q~ofP
zE7r1;`@Y2Im$qmN`2udr1~C2{Fb^e@%e8<~3)A@c`FI5&20wLx1y61MdS=VlNy$P{
zW4NlAl7b)3UqR8w)-(-KL(LFi%f)d&XP^lqR1u%k*qD#fD6%d!v|qOm>Ty}0TgQhV
zOh3T7{{x&LSYGQfKR1PDIkP!WnfC1$l+fs@Di+d4O=eVKeF~2fq#1<8hEvpwuqcaH
z4A8u~r^gnY3u6}zj*RHjk{AHhrrDqaj?|6GaVJbV%o-nATw}ASFr!f`Oz|u_QPkR#
z0mDudY1dZRlk@TyQ?%Eti=$_WNFtLpSx9=S^be{wXINp%MU?a`F66LNU<<I=7-@Jg
zTLNhlJp(-E@b8OPXm^>c;0&ngifmP9i;bj6&hdGMW^Kf8e6ZDXbQD&$QAAMo;OQ)G
zW(qlHh;}!ZP)JKEjm$VZjTs@hk&4{?@+NADuYr<BCQBRUR6Oa9gNejJBgH2aoU1s~
ztQC~P$>r!R^cJzU{kGc1yB?;7mIyAW<oWTcl$+`*Lk|cT(3Feu)o_cjWUkr0fNG1j
znl&^L%pG{GmdOC|X_|A2!hNa=k5K9oPJA??GhknYoQid02%$?D38bW}OZZZ|mr~Yy
zfH$$cWUzJZ!FM1xBH$(>whbeA_l_lw-i<C}y@Ytc@7wd0o`2f*d3_1<tjra`DWQ=B
z_WU|PbXRU=f!Dm1yrLTcesrRsnYt1er}6t5R-defpkZTQED)%)VdF>DVi7wcFurf5
z#Uw)A@a9fOf{D}AWE%<`s1L_AwpZ?F!Vac$LYkp<#A!!`XKaDC{A%)~K#5z6>Hv@V
zBEqF(D5?@6r3Pwj$^krpPDCjB+UOszqUS;b2n>&iAFcw<*im2(b3|5u6SK!n9Sg4I
z0KLcwA6{Mq?p%t>aW0W!PQ>iUeYvNjdKYqII!CE7SsS&Rj)eIw-K4jtI?II+0IdGq
z2WT|L3RL?;GtGgt1LWfI4Ka`9dbZXc$TMJ~8#Juv@K^1RJN@yzdLS8$AJ(>g!U9`#
zx}qr7JWlU+&m)VG*Se;rGisutS%!6yybi%B`bv|9rjS(xOUIvbNz5qtvC$_JYY+c&
za*3*2$RUH8p%pSq>48xR)4qsp!Q7BEiJ*`^>^6INRbC@>+2q9?x(h0bpc>GaNFi$K
zPH$6!#(~{8@0QZk=)QnM#I=bDx5vTvjm$f4K}%*s+((H2>tUTf==$wqyoI`oxI7>C
z&>5fe)Yg)SmT)eA(|j@JYR1M%KixxC-Eceknf-;N=jJTwKvk#@|J^&5H0c+%KxHUI
z6<NTsIgR{TYR||exLTu(zN`_bWgeQwBG#`i4*(I5b=QFZn_^9t_~hHReHp&^Ewhym
zl$I9Rv<v**_8bRiYTvz|q_*=3ON&x|y@~u5wRUE>dQbwwVx3p?X<_VRVb2fStH?HH
zFR@Mp=qX%#L3XL)+$PXKV|o|#DpHAoqvj6uQKe@M-mnhCSou7Dj4YuO6^*V`m)1lf
z<mm4Xt-ji2xs~+<z?bUEEiN(Bp1WM7MWroLP*p-XZrFIGX~lMp;||6bKhm4yR2tUv
z^Z{p`U%4^tcoHfROP=5es_f)o`1xKq>;)@e%1!Qg$10w8uEmz{ENb$^%u}B;J7sDd
zump}onoD#!l=agcBR)iG!3AF0-63%@`<F(Jc&WhS)AJ*a^B2&Vv0h)-m)+IDD{x-5
z4OEWk1<<zOB02qc$+F+E38vwkSKXb+wojmy3>K9G(CzKrm$VJ{v7^O9Ps7Zej|3m=
zVXlR&yW6=Y%mD30G@|tf=yC7-#L!16Q=dq&@beWgaIL<l?P_Lzv{(7Q7fOeBG)_JK
z1W`2V(QsiFac;%V2-3GXg5J4rkOjwT7O_0_gY9$QkYW!E=e|uUdA13dd!~>40k0n%
z)QHrp2Jck#evLMM1RGt3WvQ936ZC9vEje0nFMfvmOHVI+&okB_K|l-;|4vW;qk>n~
z+|kk8#`K?x`q>`(f6A${wfw9Cx(^)~tX7<#TpxR#zYG2P+FY~mG{tnEkv~d6oUQA+
z&hNTL=~Y@rF`v-RZlts$nb$3(OL1&@Y11hhL9+zUb6)SP!;CD)^GUtUpCHBE`j1te
zAGud@miCVFLk$fjsrcpjsadP__yj9iEZUW{Ll<!3mjY9RIs{k;6$}slS-57U_~+oc
z`OdVx`#QbRESh&7^JVKqWt&*n+`NNC;#H$jRQN%4R+NFZ(h+Um+fe8cuTj_K4!vd(
z9rr%4kwoqLcV5ao)%e{C4_>7PPi<$R;m1o!&Xdl~R_v0;oDX2z^!&8}zNGA}iYG|k
zmehMd1%?R)u6R#<)B)1oe9TgYH5-CqUT8N7K-A-dm3hbm_W21p%8)H{<f;74D%Fg_
ztO7%x0qpGTuPz$lg?(Es{~VvD)V<W%bX&J<bv(NA5jCuN7uwF=oFgRvHbpwQZI-L|
zAc`TBzI~!Q7KLixCzgpFyxvIikN8b&B7Wkn;c!)MKIv}JG$eV{y3^3ugWbY+!fB*I
zReNk{bL}1sj6-`Os+xh=tG!_Ikj^(V71bC_GP#7p>O)xUlBVb+iUR}-v5dFaCyfSd
zC6Bd7=N4A@+Bna=!-l|*_(nWGDpoyU>nH=}IOrLfS+-d40&(Wo*dDB9nQiA2Tse$R
z;uq{`X7LLzP)%Y9aHa4YQ%H?htkWd3Owv&UYbr5NUDAH^<<uTbBd8`#8U(vD<=p1T
zB=BTumLd`jdk}Bv;k-*IRC97<B@gFV?1=rr*k^>l@Z0Cx%`N+B*i!!1u>D8%;Qt1$
zE5O0{-`9gdDxZ!`0m}ywH!;c{oBfL-(BH<&SQ~smbcobU!j49O^f4&IIYh~f+hK*M
zZwTp%{ZSAhMFj1qFaOA+3)p^gnXH^=)`NTYgTu!CLpEV2NF=~-`(}7p^Eof=@VUbd
z_9U|8qF7Rueg&$qpSSkN%%%DpbV?8E8ivu@ensI0toJ7Eas^jyFReQ1JeY9plb^{m
z&eQO)qPLZQ6O;FTr*aJq=$cMN)QlQO@G&%z?BKUs1&I^`lq>=QLODwa`(mFGC`0H<
zOlc*|N?B<J8H|EBCQ^D0;sPxbi)ypgHOjJBrD$pOA-{Pr{=+dSI{G;07*8R=SfU^E
zPr>5&!U6BuJvkL?s1&nsi$*5cCv7^j_*l&$-sBmRS<Lve>85UIrE--7eD8Gr3^+o?
zqG-Yl4S&E;>H>k^a0GdUI(|n1`ws@)1%sq2XBdK`mqrNq_b4N{#VpouCXLzNvjoFv
zo9wMQ6l0+FT+?%N(ka*;%m~(?338bu32v26!{r)|w8J`E<l8Lz7bgSK=GDu6AiUva
zcZL#pNTT9t@g@s;sDRR0<^@bj*Si?AcP1nXS1f@(@C<e9!U~s>L|t$}TA4q_FJRX5
zCPa{hc_I(7TGE#@rO-(!$1H3N-C0{R$J=yPCXCtGk{4>=*B56JdXU9cQVwB`6~cQZ
zf^q<RV!PDX6j+AE?17DD_9-P+5&f0MKOiNyAjo>K21x_d>X%dT!!<b>)CJQ3mlHA@
z{Prkgfs6=Tz%63$6Zr8CO0Ak3A)Cv#@BVKr&aiKG7RYxY$Yx>Bj#3gJk*~Ps-jc1l
z;4nltQwwT4@Z)}Pb!3xM?+EW0qEKA)sqzw~!C6wd^{03-9aGf3Jmt=}w-*!yXupLf
z;)>-7uvWN4Unn8b4kfIza-X=x*e4n5pU`HtgpFFd))s$C@#d>aUl3helLom+RYb&g
zI7A9GXLRZPl}iQS*d$Azxg-VgcUr*lpLnbPKU<Zg&@G3{h>V{QI|bsG{8bLG<%CF(
zMoS4pRDtLVYOWG^@ox^h8xL~afW_9DcE#^1eEC1SVSb1BfDi^@g?#f6e%v~Aw>@w-
zIY0k+2lGWNV|aA*e#`U3=+oBDmGeInfcL)>*!w|*;mWiKNG6wP6AW4-4imN!W)!hE
zA02~S1*@Q`fD*+qX@f3!2yJX&6FsEfPditB%TWo3=HA;T3o2IrjS@9SSxv%{{7&4_
zdS#r4OU41~GYMiib#z#O;zohNbhJknrPPZS6sN$%HB=jUnlCO_w5Gw5EeE@KV>soy
z2EZ?Y|4RQDDjt5y!WBlZ(8M)|HP<0YyG|D%RqD+K#e7-##o3IZxS^wQ5{Kbzb6h(i
z#(wZ|^ei>8`%ta*!2tJzwMv+IFHLF`zTU8E^Mu!R*45_=ccqI};Zbyxw@U%a#2}%f
zF>q?SrUa_a4H9l+uW8JHh2Oob>NyUwG=QH~-^ZebU*R@67DcXdz2{HVB4#@edz?B<
z5!rQH3O0>A&ylROO%G^fimV*LX7>!%re{_Sm6N>S{+GW1LCnGImHRoF@csnFzn@P0
zM=jld0z%oz;j=>c7mMwzq$B^2mae7NiG}%>(wtmsDXkWk{?BeMpTrIt3Mizq?vRsf
zi_WjNp+61uV(%gEU-Vf0;>~vcDhe(dzWdaf#4mH3o^v{0EWhj?E?$5v02sV@xL0l4
zX0_IMFtQ44PfWBbPYN#}qxa%=J%dlR{O!KyZvk^g5s?sTNycWYPJ^FK(nl3k?z-5t
z39#hKrdO7V(@!TU)LAPY&ngnZ1MzL<jwyInuL2dKP0?1+sPY@3ZOeFdEU}W0jxU(?
z;g`WWOJ%M`;{3ZWlXPk^8uN=&XMS71RE+Xkh9urM!3Jq=Anc?e<!Z1;k@k+kTwJB?
zW$CP1XF@Yek@UxIjhImUdF{YcYQR!@7x4E#j6M{h$5NBpb>EeEiZznn7e-jLCy8LO
zu^7_#z*%I-BjS#Pg-;zKWWqX-+Ly$T!4`vTe5ZOV0j?TJVA*2?*=82^GVlZIuH%9s
zXiV&(T(QGHHah=s&7e|6y?g+XxZGm<Q3>K<c%aSbhMpyV8%{}hN%xY_45G%cjsf_h
z)v&PcR81soW<?nGb~f)@P8$L}dbN~t<RA;o>55`wGV>@1U)Th&=JTgJq>4mI&Av2C
z)w+kRoj_dA!;SfTfkgMPO>7Dw6&1*Hi1q?54Yng`JO&q->^CX21^PrU^JU#CJ_qhV
zSG>afB%>2fx<~g8p=P8Yzxqc}s@>>{g7}F!;lCXvF#RV)^fyYb_)iKVCz1xEq=fJ|
z0a7DMCK*FuP=NM*5h;*D`R4y$6cpW-E&-i{v`x=Jbk_xSn@2T3q!3HoAOB`@5Vg6)
z{PW|@9o!e;v1jZ2{=Uw6S6o{g82x6g=k!)cFSC*oemHaVjg?VpEmtUuD2_J^A~$4*
z3O7HsbA6wxw{TP5Kk)(Vm?gKo+_}11vbo{Tp_5x79P~#F)ahQXT)tSH5;;14?s)On
zel1J>1x>+7;g1Iz2FRpnYz;sD0wG9Q!vuzE9yKi3@4a9Nh1!GGN?hA)!mZEnnHh&i
zf?<MZ@ks8)O>#ZEN2sFbf~kV;>K3UNj1&vFhc^sxgj8FCL4v>EOYL?2uuT`0eDH}R
zmtUJMxVrV5H{L53hu3#qaWLUa#5zY?f5ozIn|PkMW<hLvS%h?FOpA+kCaz@P<{$T5
ze76+ql;oUabl&kD7|`#Ah=w!|ypI%zmEJ7oBxq8FJm3;PWOC1j#@-%#fcn+y>NP%n
zWB5!B0LZB0kLw$k39=!akkE9Q>F4j+q434jB<oVEi1VGraixlK!6|rw{>4VmslQ;$
zKiO#FZ`p|dKS716jpcvR{QJkSNfDVhr2%~eHrW;fU45>>snr*S8Vik-5eN5k*c2Mp
zyxvX&_cFb<o;&c*VN<^T4iaHk2-5_uC@!h_V=c3*$wVr%<HP&&+b+4U`xuiKABUUb
zd$D?RJvpeB-dwqLd$AT!&ykm)6`=nJq@|z>B6lODXznHHT|rsURe2!swomtrqc~w5
zymTM8!w`1{04CBprR!_F{5LB+2_SOuZN{b*!J~1ZiPpP-M;);!ce!rOPDLtgR@Ie1
zPreuqm4!H)hYePcW1WZ0Fyaqe%l}F~Orr)~+;mkS&pOhP5Ebb`cnUt!X_QhP4_4p(
z8YKQCDKGIy>?WIFm3-}Br2-N`T&FOi?t)$hjphB9wOhBXU#Hb+zm&We_-O)s(wc`2
z8?VsvU;J>Ju7n}uUb3s1yPx_F*|FlAi=Ge=-kN?1;`~6szP%$3B0|8Sqp%ebM)F8v
zADFrbeT0cgE>M0DMV@_Ze*GHM>q}wWMzt|GYC%}r{OXRG3Ij&<+nx9;4jE${Fj_r*
z`{z1AW_6Myd)i6e0E-h&m{{CvzH=Xg!&(bLYgRMO_YVd8JU7W+7MuGWNE=4@OvP9+
zxi^vqS@5%+#gf*Z@RVyU9N1sO-(rY$24LGsg1>w>s6ST^@)|D9>cT50maXLUD{Fzf
zt~tp{OSTEKg3ZSQyQQ5r51){%=?xlZ54*t1;Ow)zLe3i?8tD8YyY^k%M)e`V*r+vL
zPqUf&m)U+zxps+NprxMHF{QSxv}>lE{JZETNk1&F+R~bp{_T$dbXL2UGnB|hgh*<T
zfaS#49D6ed16&J#R4HWCpZ{ob>p4h$clt#6;NO~>zuyY@C-MD@)JCc5XrYOt`wW7!
z_ti<LSkauY&7*=6L7=0&nnh|*#(opD7Lg8FC;GAUXJ8#cs$BQ+wq<g+K=*!NwLvrI
z?)RCqt;cls)Q6&{Nw50T<+1Lci46C{G0qFln{&dC*J~UBBn$XS0^YQvpUBzUD{WP`
zj{@51QLY25txBvi=hzKNB}*;eT1jNObp#`f&kO5nrViFM`=gM?9A+^xuPi84x91ay
zyvJ_uoGp2aU`}r<&$7!?$*|X$<eg_#G`{zu_Ar*A{=f{}o%vyOadC2XB7bZ^^v(c2
zfK0c<DvqWOul!j~DNCi`RiqP_r;2e|s#C4ah!4+lxN2`xKr{Wx-i7;|5tSxROpd{f
zD_5m#3;1|BaAc=X7!L#&4l*Ys2%~WZFBKzIxCf`Yh)Ax<$2d-+MYBq9%h{!PNujQd
z29KJ`0GX?_;ALIr8+A2l+?c?6Y_1)XTK5@slL(s3R~{;~Zj!wxM;0F#{_vV=1iShX
z#hP`Z2%_DG0CQ4-?&(MnP(2)>2hhZBMJNbn0O-uTxl_b6Hm313^fG@e;RrhIUK9@#
z+DHGv_Ow$%S8D%<X`BHRyr^%H-ZT65!3%w75qg^yd_%v~%CGG#yc5$p60DH6!Ge2R
zr}DRiAqzI>RB}`doJjJy*aOa5mGHVHz0e0>>O_%+^56?IkA5eN+L1BVCp4~m=1eeL
zb;#G!#^5G%6Mw}<v_>r1KnaKsLvJB%HZL)!3OxT{k$Yo-XrJ?|7{s4!H+S2o?N|^Z
z)+?IE9H7h~Vxn5hTis^3wHYuOU84+bWd)cUKuHapq=&}WV#OxHpLab`NpwHm8LmOo
zjri+!k;7j_?FP##CpM+pOVx*0wE<t!E{7HE!T?mGw4?Vb6{i-NR`qB3tA!5g`wMBJ
z3Bse=D(cND%|B=zPheYW(@GS%wDYK1oXF=JRMJ0EZBAjgnUd@lTqyX0Yq_Ub>xEex
z@`#)K<-ZrGyArK;a%Km`^+We|eT+#MygHOT6lXBmz`8|lyZOwL1+b+?Z$0OhMEp3R
z&J=iRERpv~TC=p2-BYLC<?xE5Gxo#UJ}=%zB_T&^J-o1uXBc_svI%4iOD81`D=)oU
zivY;@_DNJP1{#+_V+7th;kx3$JoU4A1C1f{;&ZT6#Lt)KYG}j8f$)_p!^7}(3>*?4
zxvPs9V@g=JT0>zky5Poj=fW_M!c)Xxz1<=&_ZcL=LMZJqlnO1P^xwGGW*Z+yTBvbV
z-IFe6;(k1@$1;tS>{%pXZ_7w+i?N4A2=TXnGf=YhePg8bH8M|Lk<trxeRKB}%OAdV
zF?Siu2Aejr$DUT_(7^jK0Nj)3cm>-->+w8Y+FjZ;L=wSGwxfA`gqSn)f(XNuSm>6Y
z@|#e-)I(PQ^G@N`%|_DZSb4_pkaEF0!-nqY+t#pyA>{9^*I-zw4SYA1_z2Bs$<h)!
zpv38fsXDZM_X@INe56j?k@)tNMkFMj8cTQJ$X4r5v(BGg-1{&C`!Yj_Y<k0!?}aJf
z#JGJ1@OqW;BxgeF9$hm=6!m{keCJ@#?tE&!@yuq7*#L|@YvJ%;)gr|jBY}SWL-&Cs
zQ!mw@OlbIdG3(#EkpBl8{(}OI{;!?2|G|c<E@-M)?=A^0GshZcISK-#B2ue(IIA-_
z9w4il;AwRdi8#d}!((z>XGUZbGA;VeMo%CezHK0lO={L%G)dI-+8w?r9iexdoB{?l
zbJ}C?huIhWXBVs7oo{!$lOTlvCLZ_KN1N+XJGuG$rh<^eUQIqcI7^pmqhBSaOKNRq
zrx~w^?9C?*&rNwP_SPYmo;J-#!G|{`$JZK7DxsM3N^8iR4vvn>E4MU&Oe1DKJvLc~
zCT<I_aNTBA2AT={UaDBvY;L-F;-3x<CQR6iPd<;QAXotz)uYh^wpe7Q(93c}igqgN
zdobfHsIDr5`_CmhG$qMdxn8KR@Pn@N-mHKUHKOX&)%`SbV9fR}9n{?>>KLZ1;t@My
zRj_2<UYRwO^~^d=O?@mH&b9sI#vdWBJxpt83?Z0j-W8qx2-hK5d34-C4sp4|jBBWk
ze>hI^61T&LIz)S!+AQIV23n1>ng+LUvzv;xu!4;wpqb#EZz;F)BLUzT;8UA1x*6vJ
zicB!3Mj03s*kGV{g`fpC?V^s(=JG-k1EMHbkdP4P*1^8p_TqO|;!Zr%GuP$8KLxuf
z=pv*H;kzd;P|2`JmBt~h6|GxdU~@weK5O=X&5~w$HpfO}@l-T7@vTCxVOwCkoPQv8
z@aV_)I5HQtfs7^X=C03zYmH4m0S!V@JINm6#(JmZRHBD?T!m^DdiZJrhKpBcur2u1
zf9e4%k$$vcFopK5!CC`;ww(CKL~}mlxK_Pv!cOsFgVkNIghA2Au@)t6;Y3*2gK=5d
z?|@1a)-(sQ%uFOmJ7v2iG&l&m^u&^6DJM#XzCrF%r>{2XKyxLD2rgWBD;i(!e4<I4
ztQMCn++p-JQL#X;e0_*gCd!zJZkgSoi4d`Mjp8@2dGE6jg-6iGK%B`{ImPc{6)xtl
z-JQzUC3!Dy-wa_^6Du~LdJPu6AAg3EXnK*dDw$y>InDQBDg==^z;AzT2z~OmV0!?Z
z0S9pX$+E;w3WN;v&NYT=+G8hf=6w0E1$0AOr61}eOvE8W1jX%>&Mjo7&!ulawgzLH
zbcb+IF(s^3aj12WSi#pzIpijJJzkP?J<Q+8aE479sW}w;?buYie;*-X{oX07nvC=A
z=<iVI7X^e2cQ}P!soX-4VR!VRV$Z_U+ZTj4TebMRB2^3cM!DhJ-HMZL2+)kbATc-$
z5OVijFU;ogcZNLP!4a`?jVcxKY0kz`E!3Q1tX<M~bkPPol_}bsXqTnZ-hn%iHu;2(
z)25L;0vU356xqEa<YRnd@OE}h>zRawnxmNDSUR#7!29vHULCE<3Aa#be}ie~d|!V+
z%l~s9Odo$G&fH!t!+`rUT0T9DulF!Yq&BfQWFZV1L9D($r4H(}Gnf6k3^wa7g5|Ws
zj7%d`!3(0bb55yhC6@Q{?H|2os{_F%o=;-h{@Yyyn*V7?{s%Grvpe!H^kl6tF4Zf5
z{Jv1~yZ*iIWL_9C*8pBMQArfJJ0d9Df6Kl#wa}7Xa#<FZ_+HQp4vCoJ5ri+1gVyba
zY3!kPbL`K<<RGRmSQ%Vf<RJSvc_;O}@63?xQ_11Q6P0xE%8<6Hd8`o%qwR34Q=fre
zi@=>Ef_5B7=X}DzbQXVPfCwTO@9+@;A^Ti6il_C>g?A-GFwA0#U;t4;wOm-4oS})h
z5&on>NAu67O?YCQr%7XIzY%LS4bha9*e*4bU4{lGCUmO2UQ2U)QOqClLo61Kx~3dI
zmV3*(P6F_Tr-oP%x!0kTnnT?Ep5j;_IQ^pTRp=e8dmJtI4YgWd0}+b2=ATkOhgpXe
z;jmw+FBLE}UIs4!&HflFr4)vMFOJ19W4f2^W(=2)F%TAL)+=F>IE$=e=@j-*bFLSg
z)wf|uFQu+!=N-UzSef<j70eWG|Bw@9vuGvdPa9eGdH%he{7X~I+~#v5(FR~eZ({zr
z3atQeGE;E?xEMP)0<471j14V~9sVVF&dOSjvtsD)Y;17`V+FbSm^R^>62u0-C8Zc7
zo6@F)c+nZA{H|+~7i$DCU0pL{0Ye|fKLuV^w!0Y^tT$isu%i1Iw&N|tX3kwFKJN(M
zXS`k9js66o$r)x?TWL}Kxl`wUDUpwFx(w4Yk%49;$sgVvT~n8AgfG~HUcDt1TRo^s
zdla@6heJB@<NR79jI)Sv0d=ENlvCW(+?-E?L$ssjovwpB)DTo9X7RwBdWJzNC{_^%
zwS_J}S37XAU9?j7G}QU<H_U*7xiJ`aD77LDmPIQ3o5Hmm%`3&cP$AEKtI@Ts-Fhpn
z`$X@q7@eF1m~rqM(i7K%VOH?_<XH&u6yyMQNw}*hfnz3lpQk}#^Vz~ob8*tLJP>JV
z!vK;BUMznhzGK6PVtj0)GB=zT<IjLD<U#t9yeP$Zfm)|X%b=ZIkrBG_wgAB$rzkH2
z<1oX4J6VSjLjcV@j}%5P@WBw5mriS^(N6+Qk-;lUn6no!bM-BTSE_n$j@TCCUhAE*
z#)H84G5D*`xl5aX#4$^OE*qmXhVh8>v6)Q9Yt@l#fv7>wKovLobMV-+(8)NJmyF8R
zcB|_K7=FJGGn^X@JdFaat0uhKjp3>k#^&xE_}6NYNG?kgTp>2Iu?ElUjt4~E-?`Du
z?mDCS9wbuS%fU?5BU@Ijx>1HG*N?gIP+<~xE4u=>H`8o((cS5M6@_OK%jSjFHirQK
zN9@~NXFx*jS{<|bgSpC|SAnA@I)+GB=2W|JJChLI_mx+-J(mS<m?-TB<6Nz%8Hwzd
z?CB=0evDUzZui$A1)C{rgQdm%QAh9Cx}di4)oKcP04Dq%QZKlS2X@8uIa1HyQRjYi
zm2GHOJs<A&7V?A6X@r6OY<&mL_7L*!PlJ{E=%_9D>J!b)uUom6nH0#2^(L@JBlV#t
zLl?j54s`Y3vE^c_3^Hl0TGu*tw_n?@HyO@ZrENxA+^!)OvUX28gDSF*xFtQzM$A+O
zCG=n#6~r|3zt=<qZz2Ec*etR#lzjQ@;br`-j}`py1o_`n&C1r$^0Q@3|9Q>8%GuG}
z<#VCZ%2?3Q(Ad#Y7GMJ~{U3>E{5e@z6+rgZLX{Cxk^p-7dip^d29;2N1_mm4QkASo
z-L`GWWPCq$uCo;X_BmGIpJFBlhl<8~EG{vOD1o|X$aB9KPhWO_cKiU*$HWEgtf=fn
zsO%9bp<GsMA}q0Q!Y|=THz$G1T%{Nl?`t9vo<U1MJ0@WzV!bmy=zXhZ$!h5Rfn)6O
z^>~D2c@?*K9jVN@_vhR03>M_8h!_~%aN!Cnr?s-!;U3SVfmhRwk11A^8Ns`@KeE}+
zN$H}a1U6E;*j5&~Og!xHdfK5M<~xka)x-0N<vTH$BZ<0`r@@8=Lodqa#!_?w!uogG
z6UJ7g)SaY<`QacDpb;S}Cp!}Q0LRm^fbVrH&{JQJjIWu1XbGOrnif=J1ziINhbtn7
z_Oe5LQ{4;L5qe!;bm3T3Rb8sW7nszh&@^5;!7HU}Pe#5hfa8#RQNd5`9nX70DAM*`
z(W>)K_&e7AjMz`toDzasH+^1bZlC!n()crk9kg@$(Y{wdKvbuUd04N^8}t1iOgsKF
zGa%%XWx@WoVaNC1!|&{5ZbkopFre-Lu(LCE5HWZBoE#W@er9W<>R=^oYxBvypN#x3
zq#LC8&q)GFP=5^-bpHj?LW=)-g+3_)Ylps!3<C}hi+6^cZ6jE1ZTj+Z2i6nOJ8YH|
zaabkUJH;*y1gqH&X~HnC;{@-+nAgYEKD94G8G{!e&ziM2yoWYk>^YQ{9~O9&K)xgy
zMkCWaApU-MI~e^cV{Je75Qr7eF%&_H)BvfyKL=gIA>;OSq(<D<(NV{W$5DHhYY_>y
z052BFz3E(Prg~09>|_Z@!qj}@;8yxnw+#Ej0?Rk<&#1y}4ghbD569B{9hSFr*^ygZ
zr6j7P#gtZh6tMk6?4V$*Jgz+#&ug;yOr>=qdI#9U&^am2qoh4Jy}H2%a|#Fs{E(5r
z%!ijh;VuGA6)W)cJZx+;9Bp1LMUzN~x_8lQ#D3+sL{be-Jyeo@@dv7XguJ&S5vrH`
z>QxOMWn7N-T<n9;DXDyyePE0UiuZb3JGNp$lAhQ~X-kNU1*6=sH}s~FXJN-8c;lZs
z7HBLf-e&8qlhuKLu(^X1^j_<4k9W!j)|_=T*7%#dQKXFe{b<A{XekMUEnLIS(63na
zzInu29ME_T?nj$zv5aE0A=sV3LW;)u{QrV@Zy06%e@vYQR22_;K4Fvhx3HoA@33+G
zCs62xY;B!Bu>!D@1(@4>ZlL^y5>m#0!HKovs12GRav4z!>p(1~<W`Ga6-lK!B5@6B
z-xpH3&o#px-=@03vpbI3+S1f&&TrR5USODX-|V-*9w|gtzkESWF?V)WbsiskAk^#p
z!ZDx|gp`s(4|Oqvat!CPd&@GPP?vsEQWjNUMwOB@{|n;5Diw6pPKsz&c>xok8+_{|
z#Ae4{9#NLh#Vj2&JuIn5$d6t@__`o}umFo(n0QxUtd2GKCyE+erwXY?`cm*h&^9*8
zJ+8x6fRZI-e$CRygofIQN^dWysCxgkyr{(_oBwwSRxZora1(%(aC!5BTtj^+YuevI
zx?)H#(xlALUp6QJ!=l9N__$cxBZ5p&7;qD3PsXRFVd<({Kh+mShFWJNpy`N@ab7?9
zv5=klvCJ4bx|-pvOO2-+G)6O?$&)ncA#Urze2rlBfp#htudhx-NeRnJ@u%^_bfw4o
z4|{b8SkPV3b>Wera1W(+N@p9H>dc6{cnkh-sgr?e%(YkWvK+0YXVwk0=d`)}*47*B
z5JGkEdVix!w7-<%r0JF~`ZMMPe;f0EQHuYHxya`puazyph*ZSb1mJAt^k4549BfS;
zK7~T&lRb=W{s&t`DJ$B}s-eH1&&-wEOH1KWsKn0a(ZI+G!v&W4A*cl>qAvUv6pbUR
z#(f#EKV8~hk&8oayBz4vaswc(?q<a;C|S=8pd~bXu$*aw<)wp+CwqNTN9!T?p;yPx
z*SniakmO6wURNZ7GWCm8Ya45rO|}%-Qp1UKwW-rqg3n8~^mm|I3fi#pmkLuRDIwoW
zsmsb4&VvpdLOg-L*k9y+559a?-#1gIiddL&?-@Bcy~$j<p+I(V|6hE)Q*>w1vn`yC
zZQDl2PCB-&Uu@g9ZQHhO+v(W0bNig{-k0;;`+wM@#@J)8r?qOYs#&vUna8ILxN7S{
zp1s41KnR8miQJtJtOr|+qk}wrLt+N*z#5o`TmD1)E&QD(Vh&p<CN>jZJ_J*0!8dy_
z>^=@v=J)C`x&gjqAYu`}t^S=DFCtc0MkBU2zf|69?xW`Ck~(6zLD)gSE{7n~6w8j_
zoH&~$ED2k5-yRa0!<lv8j}}xh*FvhnF1Y<Gf~b6=&rsjF@~p_JYoQ#L?BQP}dHq15
zWCkltOfk{W5GW85Ogs_nL~tiudBBRFKjRUe{@6zCS_V?=zFo1DBO;p+S8s>r8fMRy
z;QjBYUaUnpd}mf%iVFPR%Dg9!d>g`01m~>2s))`W|5!kc+_&Y>wD@@C9%>-lE`WB0
zOIf%FVD^cj#2hCkFgi-fgzIfOi+ya)MZK@IZhHT5FVEaSbv-oDDs0W)pA0&^nM0TW
zmgJmd7b1R7b0a`UwWJYZXp4AJPteYLH>@M|xZFKwm!t3D3&q~av?i<Ag?bba16@IS
zHUOCdhda!e?bJ5*J3Y%j(81eUmutb(EchCFupe9}n&AMTHI_+DfPR)GI#KjHpOoBI
z5Gu<|<UZl+PkBh-W4ClAZU`l?G`f~9|6u+icbWk=N7hFF<D&3Bl*%;CZ7yaBhFcnr
z_a|=;)pyWfZ(;I0^YdllR-qm=v)11do16ZvL2c0&8&|F5M-*i!_H3CSKL^H4a$oAq
zoxw95T9aeyvlB|=#ZC^_NJ!tIwI^M9bF|#O#J>)WvAKHE{RqpD{{%OhYkK?47}+}`
zrR2(Iv9bhVa;cDzJ%6ntcSbx7v7J@Y4x&+eWSKZ*eR7_=CVIUSB$^lfYe@g+p|LD{
zPSpQmxx@b$%d!05|H}WzBT4_cq?@~dvy<7s&QWtieJ9)hd4)$SZz}#H2<n7tNkOV1
z4dGzRFA8e?>UTi$CkFWW|I)v_-NjuH!VypONC=1`A=rm_jfzQ8Fu~1r8i{q-+S_j$
z#u^t&Xnfi5tZtl@^!fUJhx@~Cg0*vXMK}D{>|$#T*+mj(J_@c{jXBF|rm4-8%Z2o!
z2z0o(4%8KljCm^>6HDK!{jI7p+RAPcty_~GZ~R_+=+UzZ0qzOwD=;YeZt*?3%UGdr
z`c|BPE;yUbnyARUl&XWSNJ<+uRt%!xPF&K;(l$^JcA_CMH6)FZt{>6ah$|(9$2fc~
z=CD00uHM{qv;{Zk9FR0~u|3|Eiqv9?z2#^GqylT5>6JNZwKqKBzzQpKU2_pmtD;CT
zi%Ktau!Y2Tldfu&b0UgmF(SSBID)15*r08eoUe#bT_K-G4VecJL2Pa=6D1K6({zj6
za(2Z{r!FY5W^y{qZ}08+h9f>EKd&PN90f}S<lY>c0ejf%kB4+f#T8Q1=Pj=~#pi$U
zp#5rMR%W25>k?<$;$x72pkLibu1N|jX4cWjD3q^Pk3js!uK6h7!dlvw24crL|MZs_
zb%Y%?Fyp0bY0HkG^XyS76Ts*|Giw{31LR~+WU5NejqfPr73Rp!xQ1mLgq@mdWncLy
z%8}|nzS4P&`^;zAR-&nm5f;D-%yNQPwq4N7&yULM8bkttkD)hVU>h>t47`{8?n2&4
zjEfL}UEagLUYwdx0sB2QXGeRmL?sZ%J!XM`$@ODc2!y|2#7hys=b$LrGbvvjx`Iqi
z&RDDm3YBrlKhl`O@%%&rhLWZ*ABFz2n<MWYz-RUtKMwMUqMt-GyQl@$O;c9*!K~Rl
z-w}`_$>Hu7k~3@e4)kO3%$=?GEFUcCF=6-1n!x^vmu+Ai*amgXH+Rknl6U>#9w;A}
zn2xanZSDu`4%%x}+~FG{Wbi1jo@wq<ZmB717T<ta0(G%F$g_)puW#{-gzhq|8#wv@
zEAoBdoShv1yY7(wBioATKReX_2yBYgpuBKZuzq@t*txfDh}K*Di<@GI^4nb&H(C4z
z69GgJM43hObSvZ6lO`G4>Bc5(5Xl~d0KW(^Iu(U3>WB@<Z5H7?3v)CC;X7fG;SWCf
zy8<6u6ZUOV%S*Y3N!#AHo|m2j@70eT!&&~<-+s;<lXi!@{W&8bXdseKX_oa7B@w53
zBHkj(awSVa2IU>-(&vn_PJt9{1`e9Iic@+{VPc`vP776L*viP{wYB2Iff8hB%E3|o
zGMOu)tJX!`qJ}ZPzq7>=`*9TmETN7xwU;^AmFZ-ckZjV5B2T09pYliaqGFY|X#E-8
z20b>y?(r-Fn5*WZ-GsK}4WM>@TTqsxvSYWL6>18q8Q`~JO1{vLND2wg@58OaU!EvT
z1|o+f1mVXz2EKAbL!Q=QWQKDZpV|jznuJ<tYNNoap&N{uS8a_zBs&dE>}@-)1&cdo
z^&~b4Mx{*1gurlH;Vh<Pn4KysHk|=SYZZ1dZdH=E=d@s|;|z)@=#bQ^@3{k?S3Hnr
zX_?iGliVmy5sA62^Ate%IE<rJlxS*UMpRn9d#i^W0cb@y2O9(%c>k5g_cM&6LOHS2
zRkLfO#HabR1JD4Vc2t828dCUG#DL}f5QDSBg?o)IYYi@_xVwR2w_ntlpAW0NWk$F1
z$If?*lP&Ka1oWfl!)1c3fl`g*lMW3JOn#)R1+tfwrs`aiFUgz3;XIJ>{QFxLCkK30
zNS-)#DON3yb!7LBHQJ$)4y%TN82DC2-9tOIqzhZ27@WY^<6}vXCWcR5iN{LN8{0u9
zNXayqD=G|e?O^*ms*4P?G%o@J1tN9_76e}E#66mr89%W_&w4n66~R;X_vWD(oArwj
z4CpY`)_mH2FvDuxgT+akffhX0b_slJJ*?Jn3O3~moqu2Fs1oL*>7m=oVek2bnprnW
zixkaIFU%+3XhNA@@9hyhFwqsH2bM|`P?G>i<-gy>NflhrN{$9?LZ1ynSE_Mj0rADF
zhOz4FnK}wpL<E5S%bk;<_YM|zN)6Odj=s9IFm70~oT9*2M90&mdd1}jloKyX>mQuV
zgO4_Oz9GBu_NN>cPLA=`SP^$gxAnj;WjJnBi%Q1zg`*^cG;Q)#3Gv@c^j6L{arv>-
zAW%8WrSAVY1sj$=umcAf#ZgC8UGZGoamK}hR7j6}i8#np8ruUlvgQ$j+AQglFsQQq
zOjyHf22pxh9+h#n$21&$h?<m}C**mjEbK}U6*-H=*?~P<k%4YtPj%^mGy2|WI_l)D
z4XncW<5HU%TGsxxBh`SdfYrD^WayR((yUya=$IDAhu(ZE^A(oZ?S5<t984RWMwFi7
zqrYs^oT<3#A9r08IXzul4KkddhDp2P>2uq0>C9P?P=<d@7_L!Qg~Rn03}E|#%b9vL
zOx~!}ZHG65!djIu%4~Gp4!DO#2KP-1mGt(7tvB+n2f4F>Juw0|;oE~c$H{#RGfa>|
zj)Iv&uOnaf@foiBJ}_;zyPHcZt1U~nOcNB{)og8Btv+;f@PIT*xz$x!G?u0Di$lo7
zOugtQ$Wx|C($fyJTZE1<oh60v#3Ol$+Bb7DKr_o1`VSwY2JFNKATWV{>JvR~i7LP{
zbdIwqYghQAJi9p}V&$=*2Azev$6K@pyblphgpv8^9bN!?V}{BkC!o#bl&AP!3DAjM
zmWFsvn2fKWCfjcAQmE+=c3Y7j@#7|{;;0f~PIodmq*;W9Fiak|gil6$w3%b_Pr6K_
zJEG@&!J%DgBZJDCMn^7mk`JV0&l07Bt`1ymM|;a)MOWz*bh<tL5GbhQ;9|g3@34F{
zGtLov`|T$cSqh#RS;N*v?A-X`ued_<Ip_%ZlMd(!H~kn?#1(7>2#d{i?SDe9IcHs7
zjCrnyQ*Y5GzIt}>`bD91o#~5H?4_nckAgotN{2%!?wsSl|LVmJht$uhGa+HiH>;av
z8c?mcMYM7;mvWr6noUR{)gE!=i7cZUY7e;HXa221KkRoc2UB>s$Y(k%NzTSEr>W(u
z<(4mcc)4rB_&bPzX*1?*ra%V<J((n?Vrk|-pdzEONVhIss_4|XNG8@~?;$z1`sk{-
z_eIGLvq65it;k;@B%CbFB2!C1k3F-(AyNEoSULpx#FO3i(0JL0G{L7$`bn&%ksp7^
zxnFA*FgG1nLfRhmR~{IJsqvNDRDrQT2>F}P1nwiP5cykJ&W{!OTlz&Td0pOkVp+wc
z@k=-Hg=()hNg=Q!Ub%`BONH<U#%O5@_k;aYhjfJBEXJmI2;COdBh$G!5oGHW?S*G$
zf#*1%q7cT|prELhiE({B?pP9M!Aq<zNL32T@D)S<LtdKaPn!$26v<U$8)aa!Qd?Ah
zp$#-EtgAk=Hz<~D0TJ?9)&N%sESs~8KJy@!c+~@C%F-rgJhx@w6P9-S$LYFK^C;oB
z8QW+|RRe30Hf3d1^yM~pc;$JFq2-r-ldPd<QMV0pr$y{RM)K%<e19_v+Y7PNK?m&%
zT~Ig)fHm4qSbQw6H+z0Z+!UPMYJ9g?rUte^<{B0}Q_|w%Tn$|NmusF8@_GHUIjq>{
z_=ZFgetj@)NvppAK2>8r!KAgi><!5;HN9jwV{MZ`YL5sQ$}aIi+m*cRLvGQ!n&)3l
z@6}XW%EJG?u1{TGGf$E^&=Zy?znegDy9&CBKRH{CBvxK{u?R4B!vowv8bgeWk%2PQ
z4R4u5a)xsg>#%*7;O-o9MOOfQjV-n@BX6;Xw;I`%HBkk20v`qoVd0)}L6_49y1IhR
z_OS}+eto}OPVRn*?UHC{eGyFU7JkPz!+gX4P>?h3QOwGS63fv4D1*no^6PveUeE5%
zlehjv_3_^j^C({a2&RSoVlOn71D8WwMu9@Nb@=E_>1R*ve3`#TF(NA0?d9IR_tm=P
zOP-x<pw+U9N#+bGG$p95t%l(mF})pxqA;7~5YP$&IV@Cqg|ZnW!oeTeX6u4@S+@)L
zB;GAtvWbM`ljxT3E4^)k%k6JubNbYk1rt({ep3<lryFs!t2Zb}-YZ>;gS*vtyE1Cm
zG0L?2nRUFj#aLr-R1fX*$sXhad)~xdA*=hF3zPZhha<2<ifj)Cxwo~vXzj;p?dV5p
z4G%UIR9j!J4==@Hu$atwPf^Z$?MFNB5cE5}vclk<PVlbxzd@?K;sXH_C?Fte<o{Gf
zqWix`Z({$gsH5^v>O$Ps+F07w*3#MTe?)T8|A!P!v+a|ot{|^$q(TX`35O{WI0RbU
zCj?hgOv=Z)xV?F`@HKI11IKtT^ocP78cqHU<ePNYVivU@$iVD4v*mcx?s~lWGOPQm
z%1~l=`^>!YS@cHI@{fPD?YXL)?sD~9thOAv4JM|K8OlQhPXgnevF=F7GKD2#sZW*d
za}ma31wLm81IZxX(W#A9mBvLZr|PoLnP>S4BhpK8{YV_}C|p<)4#yO{#ISbco92^3
zv&kCE(q9Wi;9%7>>PQ!zSkM%qqqLZW7O`VXvcj;WcJ`2~v?ZTYB@$Q&^CTfvy?1r^
z;<NESMud)0BQj2D=&7qE*VfJG!5M&~XQ{$Xlh%`o>Cdi+PTtmQwHX<SsT^n%-J~N3
zyE}DUc@-|y)HmKEtut??GCZ08c(uJ1RH_249<&<hJ(X7F^Ll1TrEi->_7Kz?r#1>D
zS5lWU(Mw_$B&`ZPmqxpIvK<~fbXq?x20k1~9az-Q!uR78mCgRj*eQ>zh3c$W<sN(?
zDGvf#TKQ+=EAVx6QY4w#*oi&V3s}SKTYY0BtixwNsOd@PorKUYksSgi%@NRCzc+?7
zk0+$XqkD>}>^+w^dIr-u{@s30J=)1zF8?Wn|H`GS<=>Om|DjzC{}Jt?{!fSJe*@$H
zg>wFnlT)k#<ArP7%y0V4*qC@llbJ+cY%HPGY2E-u7uTYtn4z}Wl-a}rXZ(>T?LslW
zu$^7Uy~$SQ21cE?3Ijl+bLfuH^U5P^$@~*UY#|_`uvAIe(+wD2eF}z_y!pvomuVO;
zS^9fbdv)pcm-B@CW|Upm<7s|0+$@@<&*>$a{aW+oJ%f+VMO<#wa)7n|JL5egEgoBv
zl$BY(NQjE0#*nv=!kMnp&{2Le#30b)Ql2e!VkPLK*+{jv77H7)xG7&=aPHL7LK9ER
z5lfHxBI5O{-3S?GU4X6$yVk>lFn;ApnwZybdC-GAvaznGW-lScIls-P?Km2mF>%B2
zkcrXTk+__hj-3f48U%|jX9*|Ps41U_cd>2QW81Lz9}%`mTDIhE)jYI$q$ma7Y-`>%
z8=u+Oftgcj%~TU}3nP8&h7k+}$D-CCgS~wtWvM|UU77r^pUw3YCV80Ou*+bH0!mf0
zxzUq4ed6y>oYFz7+l18PGGzhB^pqSt)si=9M>~0(Bx9*5r~W7sa#w+_1TSj3Jn9mW
zMuG9BxN=}4645Cpa#SVKjFst;9UUY@O<|wpnZk$kE+to^4!?0@?Cwr3(>!NjYbu?x
z1!U-?0_O?k!NdM^-rIQ8p)%?M+2xkhltt*|l=%z2WFJhme7*2xD~@zk#`dQR$6Lmd
zb3LOD4fdt$Cq>?1<%&Y^wTWX=eHQ49Xl_<VMA5Fa@n0dk{QZhV5lk|{5SEsw$jPdU
z#nQ>lFUA(YQYHGHhd}@!VpYHHm=(1-O=yfK#kKe|2Xc*9<S;k$Lb`9XJZE>}?BDFN
zD7FJM-AjVi)T~OG)hpSWqH>vlb41V#^G2B_EvYlWhDB{Z;Q9-0)ja(O+By`31=biA
zG&Fs#5!%_mHi|E4Nm$;vVQ!*>=_F;ZC=1DTPB#CICS5fL2T3XmzyHu?bI;m7D4@#;
ztr~;dGYwb?m^VebuULtS4lkC_7>KCS)F@)0OdxZIFZp@FM_pHnJes8YOvwB|++#G(
z&dm*OP^cz95Wi15vh`Q+yB>R{8zqEhz5of>Po$9LNE{xS<)lg2*roP*sQ}3r3t<};
zPbDl{lk{pox~2(XY5=qg0z!W-x^PJ`VVtz$git7?)!h>`91&&hESZy1KCJ2nS^yMH
z!=Q$eTyRi68rKxdDsdt+%J_&lapa{ds^HV9Ngp^YDvtq&-Xp}60B_w@Ma>_1TTC;^
zpbe!#gH}#fFLkNo#|`jcn?5LeUYto%==XBk6Ik0kc4$6Z+L3x^4=M6OI1=z5u#M%0
z0E`kevJE<LhoU57#IA4~)w5}*NogHTS;X7|h4dZZBN@fD3S$VO8tGP|%1zbj7WmDo
z0R`gXIGqi|7*CpR8IJMZ8Nwjz^lvy|b!dMnI%wIWmT7VFD<gPf*9C6nj==BiaROQd
z!;i~O<&NwfItv9O@Kvz5mog`s?$q+L<^X;7${kyyOS|jwC$wkdj!bi@TUuF5L)$cX
zMxk~vpKFCP??-~+BD3|H#U*CVTydM9@gmZpOmm|kWhJyF4fRkDKJgdTIfzps5o)pz
zrtMg(kmmv|ehbaL=sCRnSmn9Uv%)eIbIbOo9MrB+DS}c6&@GCzb6q9f=fcq?X}fR2
zPu60%movB7G;U~o02@|dw%q(6HLq~4NrE6zuq;zB;Gr$W2U2}Zj43(-h(j%#zhD8A
z7rHt~@T10@Prh`{^fqBZ8g;cQ6(3`3X`U)6#Hxlt%kJh}&vf1DOT$C)k1u@ss(7k+
z=L@b>pJjvvN>+g`?gtnbo$@p4VumliZV3Z%CfXXB&wPS^5C+7of2tyVkMwNWBiTE2
z8CdPu3i{*vR-I(NY5syRR}I1TJOV@DJy-Xmvxn^IInF>Tx2e)eE9jVSz69$6T`<ec
zlID!#w}wrx&@7BiZzQn3JxyA(oA<AEOV0BE$`iZNXJOSL-7P8pI;ky$_zD=zd=TKh
z(c$m8{nFyF_4x5HzmIZBew5-yVv`~nmV))G_qtRcdh81BQ{S|iOnOO6`uM2G_YWyl
z0?@u%We<fWa+`VIQUxI)<Kf(3Skf=LFWI<P-9v=MI`-~Ii21QDao?c&ITAuT^yQ0U
z{zb7M6F@@~JS#kzGfMZMuJyw=Tox&#R$8Fyw;z#ielHBo7YGyfnN8swhTB=x+^rB|
zz_FH7#PO;4Xg6(m&OVV#QcIEQS<<@7sWy2=#Tl5sgK1!@v8u95qZlP>M9-&om!T+I
znia!ZWJRB28o<?tgK1VsFie_eEEw36g5mbotA>_srWlAxtz4VVft8)cYloIoVF=pL
zugnk@vFLXQ_^7;%hn9x;Vq?lzg7%CQR^c#S)O<ljma6ec*xm>c-8d=q_!2ZVH764V
z!wDKSgP}BrV<?jcdJgkEf-J*#!LA4ASTjB)`ay^yEEt1U;P4eL@*B}+JT_Bk_ZH;O
z!9T2ZZ;ISzuDc5yJ|tMm<ZwHDp(%s`1u+eWK1-2n9ud||f@YUHX5=xTd4-X#MFTDm
z5nQpoDBUj-;&P=>V6SfCLZnYe-7f;igDs9t+K*rbMAKsp9L$Kh<6Z;e7;xxced<XP
zVo%9V$_ySaa)p<v<w4SkV6(owfPcoZwz*h;vAcq&g9oq?upG^7b1tyAL5y|`T;_1>
z<TXUUWQJYkDMbY;wmqgJW@`z!d}K!30mlif%Hg{_3WEz<Hx}6Yq#}X4(bGhy#Tzui
z;(e8b#q5ftQWs@RgeMob62T;kKXq&M2GbM!S<36R+emL-{G6LqyTecRe6wH)G@gmX
z1OeIi>n=FGY<}CUz31a2G}$Q(`_r~75PzM4l_({Hg&b@d8&jC}B?2<+ed`f#qMEWi
z`gm!STV9E4sLaQX+sp5Nu9*;9g12naf5?=P9p@H@f}dxYprH+3ju)uDFt^V{G0APn
zS;16Dk{*fm6&BCg#2vo?7cbkkI4R`S9SSEJ=#KBk3rl69SxnCnS#{*$!^T<a5W&b;
z4V99((J~*x)Rx_H9|P_5`uS!Y$Gxb5LQ+0e%aE-{jw{OyAtE6Aq!IHxl1|S$-Cu?B
zx9C1P%Kp4h1B)+`al$6$R*~b3Jo#@Qdm&gjg|Ov%YGdYb`=U+2D`u}q+L0<|xx(IN
zJpAwWjBFRNqodaKqhF3_BsBUl35}Y)JDC!{>9UUmO#&XXKjHKBqLdt^3yVvu8yn|{
zZ#%1CP)8t-PAz(+_g?xyq;C2<9<5Yy<~C74Iw(y>uUL$+$mp(DRcCWbCKiGCZw@?_
zdomfp+C5xt;j5L@VfhF*xvZdXwA5pcdsG>G<8II-|1dhAgzS&K<sojZQd=y4ed-H1
z7O7v&Z6mO?kb`qAme`O%PVrs04f~IwqPNFBfB-`*#&EBh$NP8VE58|j#+~Nmp!VXU
z)1f-_f0iFxE;p2EP>Arcb0BD4ZZ#WfiEY{hkCq5%z9@f|!EwTm;UEjKJsUo696V>h
zy##eXYX}GUu%t{Gql8vVZKkNhQeQ4C%n|RmxL4ee5$cgwlU+?V7a?(jI<vY=MZkag
z#_-?xEBW}J1+0VEyji3(S{uz^OBd&;(vw0jO<X5WhqR#el-)0Wl5Nsd(cmt{Cd4<}
z)eg?yswpSDRsOaRVsa7RtL@Jy7qXAK1Nh9$e5CPHBcI+gpOQwwZp7NIUtn_0<QBEj
zq_V|Rlr|y#?T=bAIZUvxWDPTRa?{ou>#&3wid+Kz5+x^G!bb#$q>QpR#BZ}Xo5UW^
zD&I`;?(a}Oys7-`I^|AkN?{XLZNa{@27Dv^s4pGowuyhHuXc<Jd`?qDC_yZB!z3?>
zuctKG2x0{WCvg_sGN^n9myJ}&FXyGmUQnW7fR$=bj$AHR88-q$D!*8MNB{YvTTEyS
zn22f@WMdvg5~o_2wkjItJN@?mDZ9UUlat2zCh(zVE=dGi$rjXF7&}*sxac^%HFD`Y
zTM5D3u5x**{bW!68DL1A!s&$2XG@ytB~dX-?BF9U@XZABO`a|LM1X3HWCllgl0+uL
z<Duh>04S*PX$%|^WAq%jkzp~%9HyYIF{Ym?k)j3nMwPZ=hlCg9!G+t>tf0o|J2%t1
ztC+`((dUplgm3`+0JN~}&FRRJ3?l*>Y&TfjS>!ShS`*MwO{WIbAZR#<%M|4c4^dY8
z{Rh;-!qhY=dz5JthbWoovLY~jNaw>%tS4gHVlt5epV8ekXm#==Po$)}mh^u*<i{Fn
zABDzg*Hq`EFv=B^gUXHI&qE-YHeD7ODlb)V+q5-_V8iZ;xM=v^`}$)t$S!jTvc7nz
zD3_s~U}>cE>q7*kvX&gq)(AHoItMYH6^s6f(deNw%}1=7O~bTHSj1rm<NrQ-o!APR
zT)+k^%z5H1kYa~`6YnU8J@RIzl;fo-e2L_q7tI8Q@0PYuEEm+&axheYCX>2|Cq+3M
z93djjdomWCTCYu!3Slx2bZVy#CWDozNedIHbqa<Iqc%rT8Z|nXj$knDa2B(vWR+KT
z)YF=*`9rLuoukPGLZfD+#zu*JOvdg&3;oUlm^>|otsUl+ut?>a;}OqPfQA05Yim_2
zs@^BjPoFHOYNc6VbNaR5QZfSMh2S*`BGwcHMM(1@w{-4jVqE8Eu0Bi%d!E*^Rj?cR
z7qgxkINXZR)K^=fh{pc0DCKtrydVbVILI>@Y0!<nrt`C<NKl}CQ5p!6a5p96f{OH0
z@HuuG?)@b+*%BA$ttJUF{D50?JzP7yl>Jm>x-xM!gu%deh<qO{Bg{B$oy;WYJF_S?
zBJ;inff0?SMQz(4CyeC>m?cC6ok_msDVA*J#{75%4IZt}X|tIVPReZS#aCvuHkZxc
zHVMtUhT(wp09+w9j9eRqz~LtuSNi2rQx_QgQ(}jBt7NqyT&ma61ldD(s9x%@q~PQl
zp6N*?=N$BtvjQ_xIT{+vhb1>{pM0Arde0!X-y))A4znDrVx8yrP3B1(7bKPE5jR@5
zwpzwT4cu~_qUG#zYMZ_!2Tkl9zP>M%cy>9Y(@&VoB84#%>amTAH{(hL4cDYt!^{8L
z645F>BWO6QaFJ-{C-i|-d%j7#&7)$X7pv#%9J6d<LuBVRA0B5EIxLf7Vi!LO^wq|0
zaEo8~1z#A0w|!nn9vMpxyf$u-d-=y7LB&Ilc(OTWUOtW{x)2l5qZTpkz|LRC(oO5W
z)pK$<WPS3+<!4U5?)!OovrB73bVy9``@UDJzQF7GdpYI)S|R%_1AVo?X<j)1EWh5p
za(XD@Vt~#*&=vm>a#9F<HFzRhoeVw}cA6vk`5OG{6e}~x@<GQd{^3Id#wHwuE_$YM
ze;>B5KyDhkA+~)G0^87!^}AP>XaCSScr;kL;Z%RSP<WTg@yRXa5AQA|a?1I3$np{q
zux0~%6%a5mgzD6g7i-=L>D2CgoJ;gpYT5&6NUK$86$T?jRH=w8nI9Z534O?5fk{kd
z`(-t$8W|#$3>xoMfXvV^-A(Q~$8SKDE^!T;J+rQXP71XZ(kCCbP%bAQ1|%$%Ov9_a
zyC`QP3uPvFoBqr_+$HenHklqyIr>PU_Fk5$2C+0eYy^~7U&(!B&&P2%7#mBUhM!z>
z_B$Ko?{Pf6?)gpYs~N*y%-3!1>o-4;@1Z<T7SABeyANF59*;d}{thg|BJ$2!74z=W
zPh#LV{@J4R;hVDd^x9$^$>z9VQHh)j5U1aL-Hyu@<lEsJ*>1d?X;jtDBNk*vMXPn@
z+u@wxHN*{uHR!*g*4Xo&w;5A+=Pf9w#PeZ^x@UD?iQ&${K2c}U<e!-=D8wZ=@<;J1
zv&>QgLRik-rKM#Y5rdDphdcNTF~cCX&9ViRP}`>L<z$&?1>)QA4zNXeG)KXFzSDa6
zd^St;inY6J_i=5mcGTx4_^Ys`M3l%Q==f<P)@-FgjtZ8}=wq6515Lx{bA#E-kNy05
z_W<JF!!S#LbrRbjn<XQe!>>{8S1LEHn{y(kbxn5g1ezt4CELqy)~TV6{;VW>O9?5^
ztcoxHRa0jQY7>wwHWcxA-BCwzsP>63Kt&3fy*n#Cha687CQurXaRQnf5wc9o8v7Rw
zNwGr2fac;Wr-Ldehn7tF^(-gPJwPt@VR1f;AmKgxN&YPL;j=0^xKM{!wuU|^mh3NE
z<j^WbT|M5_%me#P$ug0?Tt?t%YjqMb=E+GRaO-zoY%hgitgrmg#~#)7@$Z4lQkBof
zq*z}cX|0R>y35quf}MeL!PU;|{OW_x$TBothLylT-J>_x6p}B_jW1L>k)ps6n%7Rh
z96mPkJIM0QFNYUM2H}YF5bs%@Chs6#pEnloQhEl?J-)es!(SoJpEPoMTdgA14-#mC
zghayD-DJWtUu`TD8?4mR)w5E`^EHbsz2EjH5aQLYRcF{l7_Q5?CEEvzDo(zjh|BKg
z3aJl_n#j&eFHsUw4~lxqnr!6NL*se)6H=A+T1e3xUJGQrd}oSPwSy5+$tt{2t<j$M
zij$>5J5@(lF<gGl)!2zGkjc|}Ih}H7&aelsMY59|{IgO>xl43amsARG74iyNC}uuS
zd2$=(r6RdamdGx^eatX@F2D8?U23tDpR+Os?0Gq2&^dF+$9wiWf?=mDWfjo4LfRwL
zI#SRV9iSz>XCSgEj!cW&9H-njJopYiYuq|2w<5R2!nZ27DyvU4UDrHpoNQZiGPkp@
z1$h4H46Zn~eqdj$pWrv;*t!rTYTfZ1_bdkZmVVIRC21YeU$iS-*XMNK`#p8Z_DJx|
zk3Jssf^XP7v0X?MWFO{rACltn$^~q(M9rMYoVxG$15N;nP)A98k^m3C<GDbV)SP1X
zN8D-CWOO?+70Fz}+($|kiPADnj|6nClsWepAUcOC!rsD^8CRBh12G((-8Bg*+`y)#
z_!1brR{1`A9G$~g@MR7_fw3$Eo$Ex?0B0=Vq^c-+h7c_KN%^8HNtJU|F}pGNJX=j^
z%-s(=i_yXfzc4cUW!~Zhvf7?cJe8wYDwRvOU^1&#9!2!Jx#p;82Cd+!CX(v%ya=ua
z&#9e8WV&XsX`WSDt!+mtQyW1svNJ+++p>Jx8>6}NrUd@wp-E#$Q0uUDQT5GoiK_R{
z<{`g;8s>UFLpbga#DAf%qbfi`WN1J@6IA~R!YBT}qp%V-j!ybkR{uY0X|x)gmzE0J
z&)=eHPjBxJvrZSOmt|)hC+kI<z!anrJtt}E;wb0BAh=1(`-~pCahmbT4u3*wVq!?*
zvduV#_=o~v7xVn6J0g&f0Hr?yPLS{le?(AG<K1Uu8cKB7R{t{a-fYD_IM06NI=*;)
z?hXQ>M<xSr(sx=tB}i3tM(>I;qgOnuL3mbNR0g^<%|>9x7>{}>a2qYSZAGPt4it?8
zNcLc!Gy0>$jaU?}ZWxK78hbhzE+etM`67*-*x4DN>1_&{@5t7_c*n(qz>&K{Y?10s
zXsw2&nQev#SUSd|D8w<M8O%9q^urm9Y$|$`gAwPrE{%B1YMO{k`e3>7ZD2>E<%g^;
zV{yE_O}gq?Q|zL|jdqB^z<?9kF*Bn^!jNFtbGEztVY#4rfSHfX7V3$k1-Q|rM-EJ;
z%&qdRMO}xK^A<*AM2!GL@YwMW)jdru;nohB#_UYK34a)Cp){aOgV8W3Cmrl7xyR!*
zabj_|P?@twnk%);m7o|%s(Dp8uu_rG)aO!0<7Zf`$8{t>cx7vo(^})QW?QKacx$yR
zhG|XH|8$vDZNIfuxr-sYFR{^csEI*IM#_gd;9*C+SysUFejP0{{z7@P?1+&_o6=<l
z+hXmig>7V|EJLQun^XEMS)w(=@eMi5&bbH*a0f;iC~2J74V2DZIlLUHD&>mlug5+v
z6xBN~8-ovZylyH&gG#ptYsNlT?-tzOh%V#Y33zlsJ{AIju`CjIgf$@gr8}JugRq^c
zAVQ3;&uGaVlVw}SUSWnTkH_6DISN&k2QLMBe9YU=sA+WiX@z)FoSYX`^k@B!j;ZeC
zf&**P?HQG6Rk98hZ*ozn6iS-dG}V>jQhb3?4NJB*2F?6N7Nd;EOOo;xR7acylLaLy
z9)^lykX39d@8@I~iEVar4jmjjLWhR0d=EB@%I;FZM$rykBNN~jf>#WbH4U{MqhhF6
zU??@fSO~4EbU4MaeQ_UXQcFyO*Rae|VAPLYMJEU`Q_Q_%s2*>$#S^)&7er+&`9L=1
z4q4ao07Z2Vsa%(nP!kJ590YmvrWg+YrgXYs_lv&B5EcoD`%uL79WyYA$0>>qi6ov7
z%`ia~J^_l{<JBej0fO$Yv8rA?V|&@kyd|xT#kIJovz1XSo1abjiXk&)rfi*>p39EY
zv>>b}Qs8vxsu&<GQ^G}1jOPk09l!@YL+3&&XfCaZ0-XRXV$w9bz97m?Iii7ZB#BP~
z@lmfaNG`vEAz~J^oH&$_0d_HB*iZJ#a?#1+iLE$s@3s}UkLD#hcoYR<LxPI!ii?G~
zul2;~m9wfN!1;Rx9ZYS(T|GuZzlkcGdPIFQ1B-&YW*{}<PDEP<9*?Vb_uovpirTAV
z6R}aXx+=`oeJ<e9G~8F}<NH21)X^|J_{<_Rj~?zNatevf=(h4O;2-CE53o{%Vigri
z7&H~?p7Gxc!*z`^eV*zP&^9GwagungxA(Stsu6BnM8<TqSgF9cm7Deu1n;d-U5*bD
zqpoe(R((1e%Cklh0XN7M+|TzhDJv_qls>WcXEt8B#FD%L%Z<jt+XRtoqGe=@evm9j
z?ObAkx%_<y>pcVtY!rqVTHe;$p9rbb5O{^rFMB>auLn-^;s+-&P1#h~mf~YLg$8M9
zZ4#87;e-Y6x6Q<!N=`gsNGbP-?wQLTnhm9+QJMM6B}5m?gHE#R?JMfKOdu5NXJQS_
z^oDjb$Y8NYoRk{kJ_URBJVf$sF4K~Kk<sL!mtyFr;_cTIADcqN>O<{McUzhy(%*6|
z)`D~A(TJ$>+0H+mct(jfgL4x%^oC^T#u(bL)`E2tBI#V1kSikAWmOOYrO~#-cc_8!
zCe|@1&mN2{*ceeiBldHCdrURk4>V}79_*TVP3aCyV*5n@jiNbOm+~EQ_}1#->_tI@
zqXv+jj2#8xJtW508rzFrYcJxoek@iW6SR@1%a%Bux&;>25%`j3UI`0DaUr7l79`B1
zqqUARhW1^h6<V;26}8^Bh_aq%TLnuUpir>=)6?;@v>xrZNM;t}{yY3P@|L}ey@gG(
z9r{}WoYN(9TW&dE2dEJIXkyHA4&pU6<mJxRq4sY?@a1<<#E*PY8IcPtji??k?`mrb
zfMiD>ki=rx&l2{DLGbVmg4%3Dlfvn!GB>EVaY_%3+Df{fBiqJV>~Xf8A0aqUjgpa}
zoF8YXO&^_x*Ej}nw-$-F@(ddB>%RWoPUj?p8U{t0=n>gAI83y<9Ce@Q#3&(soJ{64
z37@Vij1}5fmzAuIUnXX`EYe;!H-yTVTmhAy;y8VZeB#vD{vw9~P#DiFiKQ|kWwGFZ
z=jK;JX*A;J<!9tCfquV#9MkYGc3&{t)_3%&(p%7`J5I1-j76ixN~B2o>r{<qPy5U5
z*f|*=`>#x?n8XUOLS;C%f|zj-7vXtlf_DtP7bp<R#-CeeXdtM?awhi7{-QzlvWObt
zCCOV$#(uv)sWP-i&7^CLo6|n)7ZJk^-H1yTYB3hN*-@OTOFZ6=bC-$JF=h+G%&9%;
z8jrt)RN99tDng6m!5vx)CM4r{RUWe%1yz(84z&ZRKQ-`}^jPM_8OCt&q(=V;%nUVT
z&D1?zW`!$3wTQYlnH(5~IIPHH=*|f;SXvxo$!;dj+c5WpkO;Rai^~v*pa&;Pz4C%1
zE;A?X7$hu6Nh^A^|FWBZXOhmxc!A!xFz*dLt=i~&f7%JaD=XXdH-F-mKil-j+8Mx0
zV-4bb@&A#Ok8VHn4&IcYkZ{#i;|_T9Z`lx#meTKsJO^&p5h_c)96*g>urBeX%Hjwr
z4lI-2TdFpzkjgiv!8Vfv`=SP+s=^i3+N~1ELNWUbH|ytVu>EyPN_3(4TM^QE1swRo
zoV7Y_g)a>28+hZG0e7g%@2^s>pzR4^fzR-El}ARTmtu!zjZLuX%>#OoU3}|rFjJg}
zQ2TmaygxJ#sbHVyiA5KE+yH0LREW<FM7|F@$NEkUhSkZ)n?9>r%^C*yR|@gM$nK2P
zo}M}PV0v))uJh&33N>#aU376@ZH79u(Yw`EQ2hM3SJs9f99+cO6_pNW$j$L-CtAfe
zYfM)ccwD!P%LiBk!eCD?fHCGvgMQ%Q2oT_gmf?OY=A>&PaZQOq4eT=lwbaf}33LCH
zFD|)lu{K7$8n9gX#w4~URjZxWm@wlH%oL#G|I~Fb-v^0L0TWu+`B+ZG!yII)w05DU
z<hE1!p8TuHu`i;Fr>>GO?n(TN+B=>HdxVDSlIH76pta$_LhbBg;eZ`M7OGcqt||qi
zogS72W1IN%=)5JCyOHWoFP7pOFK0L*OAh=i%&VW&4^LF@R;+K)t^S!96?}^+5QBIs
zjJNTCh)?)4k^<uG<<N(}UuzxBE<H+4OaN293o4tZVnN&1;xZ#Cd5JKUv5chjW(4SH
zes<xmS{DmT;bS>H^g1&jc>gysM`y^8Rm3qsvkr$9AeWwYpa$b22=yAd1t<<I&`Cmm
zIHT1yC+IVJS82#IJS`kxr#)9Hh!6Oab#8dR8T~J)uu6jNoER#w4_DCDN<|)Zo%lc@
zc98A7*+H7e-JSeRD!VrP_pFc(g<_)nV`4}my|LJxwxo1WW}nBNsrlMf$^(J5M;hYJ
zuP9bwanuPRC;8F%GVzi1GWAi$f*{RDyg8L}SzTrUO1URZHG(riH4=r4SEDM0h5CJ{
zav#+`zD;tWa=1AGz|bP)(TJJyNK~)3(7o?oPk_h}kxJUD+cmu89DO1B0$Q)VKs>*{
zaowSEFP+{y?Ob}8&cwfqoy4Pb9IA~VnM3u!trIK$&&0Op#Ql4j>(EW?UNUv#*iH1$
z^j>+W{afcd`{e&`-A{g}{JnIzYib)!T56IT@YEs{4|`sMpW3c8@UCoIJv`XsAw!XC
z34|Il<X<2(SEMo@P#Ib=M*k}Mfi%K`v{TIxi5k|l%MKv28bV1O{iJsKVbm9kq)vuE
z!Q5fx*8pip+n`lzDP9|>$LpW}CIHFC5e*)}00I5{%OL*WZRGzC0?_}-9{#ue?-ug^
zLE|uv-~6xnSs_2_&CN9{9vyc!Xgtn36_g^wI0C4s0s^;8+p?|mm;Odt3`2ZjwtK;l
zfd6j)*Fr<W8k_ojJC+mQ;RpN$vN8bd*8lA_+v=3T+EUzdaNW+kTG=8DS1dLzNmz?a
zK(DtEPiz{>#53>C6Y8(N5?$H0ma;BCF3HCjUs7rpb2Kf*x3Xcj#O8mvs#&33i+McX
zQpBxD8!O{5Y8D&0*QjD=Yhl9%M0)&_vk}bmN_Ud^BPN;H=U^bn&(csl-pkA+GyY0Z
zKV7sU_4n;}uR78ouo8O%g*V;79KY?3d>k6%gpcmQsKk&@Vkw9yna_3asGt`0Hmj59
z%0yiF*`jXhByBI9QsD=+>big5{)BGe&+U2gAARGe3ID)xrid~QN_{I>k}@tzL!Md_
z&=7>TWciblF@EMC3t4-WX{?!m!G6$M$1S?NzF*2KHMP3Go4=#ZHkeIv{eEd;s-yD#
z_jU^Ba06TZqvV|Yd;Z_sN%$X=!T+&?#p+OQIHS%!LO`Hx0q_Y0MyGYFNoM{W;&@0@
zLM^!X4KhdtsET5G<0+|q0oqV&#x58MW~-7LW9Bg}=E$YtNh1#1D^6Mz(V9?2g~I1(
zoz9Cz=8Hw98zVLwC2AQvp@pBeKyidn6Xu0-1SY1((^Hu*-!HxFUPs)yJ+i`^BC>PC
zjwd0mygOVK#d2pRC9LxqGc6;Ui>f{YW9Bvb>33bp^NcnZoH~w9(lM5@JiIlfa-6|k
ziy31UoMN%fvQfhi8^T+=yrP{QEyb-jK~>$A4SZT-N56NYEbpvO&yUme&pWKs3^94D
zH{oXnUTb3T@H+RgzML*lejx`WAyw*?K7B-I(VJx($2!NXYm%3`=F~TbLv3H<{>D?A
zJo-FDYdSA-(Y%;4KUP2SpHKAIcv9-ld(UEJE7=TKp|Gryn;72?0LHqAN^fk6%8PCW
z{g_-t)G5uCIf0I`*F0ZNl)Z>))MaLMpXgqWgj-y;R+@A+AzDjsTqw2Mo9ULKA3c70
z!7SOkMtZb+MStH>9MnvNV0G;pwSW9HgP+`tg}e{ij0H6Zt5zJ7iw<z{CGhwt*T`R9
z!Ym@Bvn3>`hEnvye!Xb<H)%Giccni&L%Z4iVx>A@!~#%vIkzowCOvq5I5@$3wt<wY
z(AfEf9?71%$rnQP;Uew&;gE3vX#wA=c0~r^3UTJr5m=oE4XsLWQL4%z%x}q2Ljw0K
zAIGMYDVTXmFF>c*w2R$7!$*?}vg4;eDyJ_1=ixJuEp3pUS27W<m@sOm7gPY<tOQ%Y
z8Fj1Ak<Ym0WA)t~xFnG6g@3us(<&8fZRz02Z>?qq(P^8$_lU!mRChT}ctvZz4p!X^
zOSp|JOAi~f?UkwH#9k{0smZ7-#=lK6X3OFEMl7%)WIcHb=#ZN$L=aD`#DZKOG4p4r
zwlQ~XDZ`R-RbF&hZZhu3(67kggsM-F4Y_tI^PH8<D>PMJRcs7NS9ogF+?bZB*fcpJ
z=LTM4W=N9yepVvTj&Hu~0?*vR1HgtEvf8w%Q;U0^`2@e8{SwgX5d(cQ|1(!|i$km!
zvY03MK}j`sff;*-%mN~ST>xU$6Bu?*Hm%l@0dk;j@%>}jsgDcQ)Hn*UfuThz9(ww_
zasV`rSrp_^bp-0sx>i35FzJwA!d6cZ5#5#nr@GcPEjNnFHIrtUYm1^Z$;{d&{hQV9
z6EfFHaIS}46p^5I-D_EcwwzUUuO}mqRh&T7r9sfw`)G^Q%oHxEs~+XoM?8e*{-&!7
z7$m$lg9t9KP92<UgCqYbOw_7v)EO?RAtX<lR>82eke608^Q2E%H-xm|oJ8=*SyEo}
z@&;TQ3K)jgspgKHyGiKVMCz>xmC=H5Fy3!=TP)-R3|&1S-B)!6q50wfLHKM@7Bq6E
z44CY%G;GY>tC<B-%X`eBMb63jz(<fQ0$dN^eXMc@Hc+W2@UyE&_>`~yh!qv~YdXw!
zSkquvYNs6k1r7>Eza?Vkkxo6XRS$W7EzL&A`o>=$HXgBp{L(i^$}t`NcnAxzbH8Ht
z2!;`bhKIh`f<Dk|>1hIFcI5bHI=ueKdzmB9)!z$s-BT4ItyY|NaA_+o=jO%MU5as9
zc2)aLP>N%u>wlaXTK!p)r?+~)L+0eCGb5{8WIk7K52$nufnQ+m8YF+GQc&{^(zh-$
z#wyWV*Zh@d!b(WwXqvfhQX)^aoHTBkc;4ossV3&Ut*k>AI|m+{#kh4B!`3*<)EJVj
zwrxK>99v^k4&Y&`Awm>|exo}NvewV%E+@vOc>5>%H#BK9uaE<wQLfEe781DIoSq&B
z$<!shY*nTTuY@U$uLh_wv8IWobiE1~q&*qys10OT(e+LrbfM30;l!l7DI~8>2$vje
zWYM5fKuOTtn96B_2~~!xJPIcXF>E_;yO8AwpJ4)V`Hht#wbO3Ung~@c%%=FX4)q+9
z99#>VC2!4l`~0WHs9FI$Nz+abUq<F2q0Oe*OxoE=hf9Q2JG9z+0|-dKo<BOm5#DkT
zY?1Yz%YxB6VD;_H6r<?H{me`<|K!v?35)DDU${(w6oIJBu|eHDz535F$OqUv=-_>#
zz`Of97})Su=^rGp2S$)7N3rQCj#0%2YO<<Rudy^r6*V=~j)|?KRhiVrth~7{1M^yq
zv5S^RdZ)A!tQ24S9Um29pN^2Qfd`{r;|otm5ByGIApXhXNz+rV(~+gwj-&8kBA!eF
z-(a8QVP80R<M<WN{Ntir9}sL3yU@7nfJbDA%ac=M#K{COme6M+tpn2-Rcfj<AYYi}
zl0swS-3LIx^?Obkl;k&?Hy~f_)b-V9$?fS)sqB~C>R&p>$<#lgXcUj=4H_{oAYiT3
z44*xDn-$wEzRw7#@6aD)EGO$0{!C5Z^7#yl1o;k0P<Ae=^8Yk}Hl30ur)Cw~W^?Cq
z8!Ufd0p-qlx!<^U+<}Ksfj?v?WxaW|53?v;(CrfO@<!xiU}vePsaW~G(bNsI)P$#P
z1#!R@e%~o?Sa-We>hN=aVUQu~eTQ^Xy{z8Ow6tk83<ciVMi==PdkHaM198%vfFEs>
z4{5xe%(hx)%nD&|e*6sTWH`4W&U!Jae<Xf%va1l3!R~(q@zLmWIy*A)b*by5x3743
zcnCo(Ia~N4Rav(eVBA&Oyal#{KcM~yE-}&rDe8`bPPF;`8)N#VqKu2^v&7Zvrt&TV
zqBrZtYlRbFgTOFn;=@jv5}rqlTJI$=pwqxqE7@j1mPM+nf^T@l`&9sS-np{3XS6IL
zl_-JRrrAVUpi!0HOM8aV`l~=(ChKf!fdnq7L+@(~*F}?Jg@%}v%@6q2?R*)RWLpVn
zFVIb@+@$8dddszZ8j)(>#U4TnICheJmsw{l|CH<U)MXaa1vWx84|p+i*9$*-a?j7K
z5^=6T=F0%4#lguHlNFr0A@FD@3Sv3|>?UA{a6?2GNgpZLyzU2UlFu1ZVwl<wWB8B!
zkcb$F)46a>ALmh_DOs03J^C<PefG<mKW`C}W(h44Dz}tUUP<#FnIYiPAiZ;MiqSnJ
z(vw08EN3km7$Nax$`gvX$q9TPABdosWw3{(DQ-%t@b)lMB$oIZrCVK(L)(4BMIU%s
zK>jh1im`E3?9&zvNmg(MuMw&0^Lu$(#CJ*q6DjlKsY-RMJ^8yIY|{SQZ*9~CH|u9L
z`R78^r=EbbR*_>5?-)I+$6i}G)%mN(`!X72KaV(MNUP7Nv3MS9S|Pe!%N2AeOt5zG
zVJ;jI4HZ$W->Ai_4X+`9c(~m=@ek*m`ZQbv3ryI-AD#AH=`x$~WeW~M{Js57(K7(v
ze5`};LG|%C_tmd>bkufMWmAo&B+DT9ZV~h(4jg0>^aeAqL`PEUzJJtI8W1M!bQWpv
zvN(d}E1@nlYa!L!!A*RN!(Q3F%J?5PvQ0udu?q-T)j3JKV~NL>KRb~w-lWc685uS6
z=S#aR&B8Sc8>cGJ!!--<lgNB<P5x{t=;07`Mfg_@W<}zz_;d>?kwsJTUUm`Jk?7`H
z7PrO~xgBrSW2_tTlCq1LH8*!o?pj?qxy8}(=r_;G18POrFh#;buWR0qU24+XUaVZ0
z?(sXcr@-YqvkCmHr{U2oPogHL{r#3r49TeR<{SJX1pcUqyWPrkYz^X8#QW~?F)R5i
z>p^!i<;qM8Nf{-fd6!_&V*e_9qP6q(s<--&1Ttj01<CUlJEmns=j(hTfIEjLq{7G;
zb$V_jf7wT+-|>j0w>bXY7y1W*%Auu&p|XSOH=)V7Bd4fUKh&T1)@cvqhuD-d=?w}O
zjI%i(f|thk0Go*!d7D%0^ztBfE*V=(ZIN84f5HU}T9?ulmEYzT5usi=DeuI*d|;M~
zp_=Cx^!4k#=m_qSPBr5EK~E?3J{dWWPH&oCcNepYVqL?nh4D5ynfWip$m*YlZ8r^Z
zuFEUL-nW!3qjRCLIWPT0x)FDL7>Yt7@8dA?R2kF@WE>ysMY+)lTsgNM#3VbXVGL}F
z1O(>q>2a+_`6r5Xv$NZAnp=Kgnr3)cL(^=8ypEeOf3q8(HGe@7Tt59;yFl||w|mnO
zHDxg2G3z8=(6wjj9kbcEY<CqxZC&rni56zJ3N<u6y%)K62XN>@Z0iOd7Gq5GiPS5%
z*sF1J<#daxDV2Z8H>wxOF<;yKzMeTaSOp_|XkS9Sfn6Mpe9UBi1cS<A0OTcmmH*}D
za(;+Za-v1=71cEvuPs_*UVL1Rv(5N!6W5h;!|8_kd}7qpxLd7MV(-P0OU{18{+8SJ
z8r1`(=yoAdE&5-jodr}>TieGG5$O;ZLIIJ60Y>SN4vC?=yE_CWlo(<FX^@ZxL1_s|
zkq`w$LILRkMUWb#L;PmE_kD@WMc(y2YYl77S*+)O_Bs2^+2`5&{C}_Nx<z;ivaqJB
zv~;bj?1y4mMm25Y93I!1d-E>EEE$e4j?z&^FM%kNmRtlbEL^dPPgvs9sbK5fGw*r@
z+!EU@u$T8!nZh?Fdf_qk$VuHk^yVw`h`_#KoS*N%epIIOfQUy_&V}VWDGp3tplMbf
z5Se1sJUC$7N0F1-9jdV2mmGK{-}fu|Nv;12jDy0<-kf^AmkDnu6<rifu5C-urlXg*
z2ht@@?+<IftI`}x?FiV&E6#n+PRT}1EZ7G`<+G74VuHSb;w^*>j~TPWOgy1MT68|D
z=4=50jVbUKdKaQgD`eWGr3I&<zn=23w>^<6uhkjz$YwItY8%Y<irZgehf1~#kp-`9
zk+wG)Oaw2BO4MBW(N2dI5UT7cy-w2plXSk1yE8>p9{z4-{6g{73<_b*@XJ4Nm3-3z
z?BW3{aY_ccRjb@W1)i5nLg|7BnWS!B`_Uo9CWaE`Ij327QH?i)9A}4Ug4wmxVVa^b
z-4+m%-wwOl7cKH7+=x&nrCrbEC)Q$fpg&V83#uEH;C=GNMz`ps@^RxK%T*8%OPnC`
z{WO~J%nxYJ`x|N%?&i7?;{_8t^jM&=50HlaOQj8fS}_`moH$c;vI<|cruPFnpT8yU
zS<SnYllwaIX8yW+Uvabc>%rPOCUSd5Zdb(zwk`hqwTQn)*&n)uYsP*F_(~xEWq}C=
zv30kFmZFwJZ@ELVX3?$dXQh|icO7UrL*_5G=I^xXjImz`ZPp>?g#tf(ej~<j-UyK2
zK`^DfuATKfO?~?Fw1Sh>KaIU0algsG!IS09;>?MvqGg#c{i+}qY|{P8W~O%#>|gFd
z<1dr$-oxyRGN17yZo1OwLnzwYs0|;IS_nymNB0IlSzPQ%-r`?T=;_XQ^~&#}b|AB}
zkNbN5uB?-sUB-T5Q<h%+F4XaoVTX&wB3cvd65F)b9rkyjUKMP#t+sJh)bxhAPK$E9
z*(8l-SJM~C9(DHV8<lF?DQRET{IEUV=D|-;m8Sxu*{Pl(f;@6^TaRuDZR9gF@NLlL
z)^#s<Km{SV!y7<XIR}}EZT2A;$*1g0l%EYzzAHeSve8`4{1HS4s%6B_o0ps9G2-5O
z3+0Z$P{@$U;Dptf576W0ptfEPlPG^UOh|U``?lh~f^or1wGqG_68TYbbLZQ*xSw(Q
z$*5aFu0k{D)y)d!e(5!Y&wW1<dz#=zMyV*I2a{U{1o>Llg%Uk3)uHB;>VIzGe9_J9
zaeISkQ<SKLnCL>m!v(9d(0ML^b9fR^sfHFlH?7Mvddt37OuR{|O0{uv)(&-6<87W4
zyO>s!=cPgP3O&7xxU5<dzCdcGt`Pn0>DlIPw_o3O>6o6Qb?JWs3qw#p3sBc3g$?Dx
zi(6D+DYgV;GrUis-CL%Qe{nvZnwaVXmbhH(|GFh|Q)k=1uvA$I@1DXI7bKlQ@8D6P
zS?(*?><>)G49q0wr;NajpxP4W2G)kHl6^=Z>hrNEI4Mwd_$O6$1dXF;Q#hE(-eeW6
zz03GJF%Wl?HO=_ztv5*zRlcU~{+{k%#N59mgm~eK>P!QZ6E?#Cu^2)+K8m@ySvZ*5
z|HDT}BkF@3!l(0%75G=1u2hETXEj!^1Z$!)!lyGXlWD!_vqGE$Z)#cUVBqlORW>0^
zDjyVTxwKHKG|0}j-`;!R-p<Cs1r)PkGkC@4F&QNxfNK~7OpX1UPqRf#l3chP3B%iP
zv@pGoOxOA?81%1m#>>}qQfBl(?($7pP<+Y8QE#M8SCDq~k<+>Q^Zf@cT_WdX3~BSe
z+|KK|7OL5Hm5(NFP~j>Ct3*$wi0n0!xl=(C61<AJZt=0$Q{-#XQMAgic3yGtVtlsP
z&);npS&fT}zK2~7$O16nI?Y__e1^-0UhHO}?(ur6%yW%MSxVdK_TI`aC%R#&$U*@A
z6TC{35V09(6AG<$Y;kzss!8fDd+kNlsLFf$=;K3^qPW$~d%qoI7C?IYbcphr?U^Mu
z_S1h75XLbGA2@d#3pb<z;2jf3^M9U*NOe7}s~W@yin5$8S9ImF;#qibp)_=o1??CP
zpHx|fQAo-j-+vwVPWBcknf!x7Ca~(cFI=V)e|LCD7*btiLG80PKH2+#W|@c`^Foqk
z@w@KNNlr#RHCq`EUhPvhGYJJV;!^?5{UW~BmNP7h+Y4C|o4tDsQ`aAuZkiu1gsKtH
zAwgY4xj;7#i+D)+tOl#0eZyNeB|0-lgtNV4r#jhAc{!okI@agT?xqLjwmNk1P9bh_
z8IvRhJq()>`q&cec@<!+RWJv>mFlH(sy%+RH<=s)8aAPN`SfJdkAQjdv82G5iRdv8
zh{9wHUZaniSEpslXl^_ODh}mypC?b*9FzLjb~H@3DFSe;<Xeo!)_qiLyl&}7SS<|Z
z$7zCy0_!`TIqA;pEGvQ}Q#L5vgEQxs@;?En8%V{_mIPY(+Iz?0PuzjwH`E-`gYkl+
z3tk>D(A-K3t3eOTB(m~I6C;(-lKAvit(70k`%@+O*Ztdz;}|_TS~B?Tpmi=QKC^m_
z2YpEaT3iiz*;T~ap1yiA)a<v=fFY!0J-iVq`wP`c1ZpO`<cbuDGhrAL8vc7A(cwt_
zr?p!7s$6XzIL~qe>`dKMwu`^UhIUeltNQ1Yjo=q@<rZq>bI@&3zH?rVUg=IxLy-ni
zyxDu%-Fr{H6owTjZU2O5>nDb=q&Jz_TjeSq%!2m40x&U6w~GQ({quPL73IsJS;f`$
zsuhioqCBj(gJ>2hoo)Gou7(WP*p<K-`aZAKt~Xi?a1bd?%iJW1bA)kHsy(*!YJEQ2
z*hpMA!`U$l=XYdX0B($A7pgY5MI>X)f=Y=!=k!&1K?EYY%jJ~X&DnK{^saPQK<1BJ
z_A`_{%ZozcB(3w$z^To^6d|XuT@=X~wtW!+{4ID@N{AB~J6AL5vuY>JwvWCNFKsKh
zd}@>q@_WV#QZ&UJ0#?X(pXR!oyXOEG3rqzHbCzGLONDb042i$})fM@XF)uSP(DHUc
z^&{|$*xe{cs?Gp8=B%RY3L7#$ve$?TWh>MZdxF1zH1v}1z+$Ov#G7?%D)bBCyDe*%
zSeKSpETC2V1){II>@UwJi>4uBN+iAx+82E~gb|Cr&8E^i&)A!uv-g?jzH99wU}8+#
z$nh>yvb;TwZmS@7LrvuCu_d<XRXDa!Gbq)^KZ=aXEKRuN=9gL9?Mk<b;N%X$QnmGQ
z!V(i6UaA6ExRK|9+&X&jon3ln+qY~Y<2$sg*CvI#gr%5d=Sr)~V@J_H&}#}rvJu;9
z7n?X(V{fv`RfNCXCemNOq5D9lFDfMdz6kpFZz0=x2bR%vw;?<uEp2zxnrU|#uEedQ
zjU4>0-WxFNI&C7%sWuTL%YU!l|I1{|->=dlOeHOCtUO#zkS3ESO8LHV4hTdQL5EdV
zuWD33fFPH}HPrW^s$Qn1Xgp&AT6<-He{{4%eIu3rN=iK|9mURdKXfB&Q?qGok%!cs
ze53UP{Z!TO-Y@q2;;k2avA3`lm4OoN4@S*k=UA)7H;qZ`d8`XaYFCv?Ba+uGW@r5v
z&&{nf(24WSBOhc7!qF^@0cz;XcUynNaj6w2349;s!K{<Bk=yM?{Nl4a^NS$e+uz^`
z!P!$mDtYg?@RC{Hv6$5r$?<vjxL+J<*%{k!@nP4o{5CB^O@Mk3FxV@<SX%@_RRJfd
z#wvDU$s5d78d}}|{=|ZpyXuBKZex`dhZhE#(mX$ySv^73yIoE5R%5S{C{tH(VOKl)
z5Fy55wK@x@+TP9+lH8G*t6s*au<-}USPYXcPnU7IpQA~SKE={V(dh(GaHCFaxsG?X
z-Il-FOv1tSbFo<8Ot+Oz^e#rk6E!JzwK#_=`jH`$2r9xkqXdo5`n0`Q!>KVqs5yS{
z7VubS`2OzT^5#1~6Tt^RTvt9-<G;BCZ;iY#7l?@(s93mtfI~e75G@Pvyo8}War;6r
zP>J|D2F>y~>2;jeF>g`hx5l%B3H=aLExQihuYngzlnBTYOTHJQMzl>kwqN5JYs)Ej
zblA@ntkUS~xi+}y6|(81helS}Q~&VB3<aT~$d{<J&7H_if0FXVa@xV`K`}#=OYP|<
zff9%nYDA;3kQC9msk%+tNK)gL?Wi^)!D$<z)a{Y$k>7qyV|S3Y=><^1wh%msQM?fz
z<58MX(=|PSUKCF#)dbhR<COJ<7gs9#+F-ENRZlYPNn3F`pQo5{W2w^<?o1T+EfG&K
z`%0T1AXfB_DG~%z?O$AHv`hspw0*m7(;;EKgX$aRM6hET@{Q(eu*|jnELP$9DH~6p
z{@0u(+u4B}wKL&(=^pJ*ukFVO3V)sA*YX*8O<g}TfY*e>%D&xgCD?$aR0qen+wpp6
zst}vX18!Be96TD??j1HsHTUx(a&@F?=gT`Q$oJFFyrh^;zgz!(NlAHGn0cJy@us=w
zNhC#l5G;H}+>49Nsh12=ZPO2r*2OBQe5kpb&1?*PIBFitK8}FUfb~S-#hKfF0o#&d
z#3aPkB$9scYku&kA6{0xHnBV#&Wei5J>5T-XX-gUXEPo+9b7WL=*XESc(3BshL`aj
zXp}QIp*40}oWJt*l043e8_5;<!2`Mh0}VYS?Br>H5PI5c)U&IEw5dF(4zjX0y_lk9
zAp@!mK<uj$Y-|fNS9xMeCQ>>WUqHo)-jop=DoK>&n<uy#XsU4uc6tQ*^!eDWy_p?!
z4v0cmeEFJ8NQLcr#}2y=4Cew^NlLXYUfIiBA?X%*iOi;;>o>kAD=^qIE7qis&_*4~
z6q^EF$D@R~3_xseCG>Ikb6Gfofb$g|75PPyyZN&<ARv=9zalALN(F$>tiRxqovo_k
zO|HA|sgy#B<32gyU9x^&)H$1jvw@qp+1b(eGAb)O%O!&pyX@^nQd^9BQ4{(F8<}|A
zhF&)xus<tn!{(iZmRcBkfs}lTjp2X}SPKhQY*bgU&2Y)(#+Ue8-enYi)1rO3k~Bgb
zsM>QhtoXOOhic=8#Xtt5&slLia3c*a?dIeczyTbC#>FTfiLST57nc3@Y#v_Eg#VUv
zT8cKH#f3=1PNj!Oroz_MAR*pow%Y0*6YCYmUy^7`^r|j23Q~^*TW#cU7CHf0eAD_0
zEWEVddxFgQ7=!nEBQ|ibaScslvhuUk^*%b#QUNrEB{3PG@uTxNwW}Bs4$nS9wc(~O
zG7Iq>aMsYkcr!9#A;HNsJrwTDYkK8ikdj{M;N$sN6BqJ<8~z>T20{J8Z2rRUuH7~3
z=tgS`AgxbBOMg87UT4L<NLb1*yjVIU4>wge`*Y=01Dvk><aFJQ?2huuuCkqUCh{~$
z-0grkKUa(H@3zgD9vn~N&0HDe-a`aGjVd(;-MALdsn}<#s1V5IKnxa{nZgIaD1YE7
z!6+5!E{kwMJoAb0(&f}8MsAN?8(5FI!2iCg$cDO4kwcXXAaF~<LgMM;VJKk?`O+$d
z8N(eW6&np})C3c4vBWJ|Xj-&_@KU^2R`{CHWr-<tDT!fd5lC2$&rCBd2W<GpMZGyH
z=57|+Pn}P>)^{Iu+<RlA`GGS?pt2|y{yb%#H1bWxg5!ZW>n6fuVX4%}>?3czOGR$0
zpp*wp>bsFFSV`V;r_m+TZns$ZprIi`OUMhe^cLE$2O+pP3nP!YB$ry}2THx2QJs3<
za1;>d-AggCarrQ>&Z!d@;mW+!q6eXhb&`GbzUDSxpl8AJ#Cm#tuc)_xh(2NV=5XMs
zrf_ozRYO$NkC=pKFX5OH8v1>0i9Z$ec`~Mf+_jQ68spn(CJwclDhEEkH2Qw;${J<X
zqU7Wf_d3kohDBPUMl{y1l2awc-BQ}NsIqSi3-oDx1yHajUG$UJib1R`9N&KQ+QNGd
z47D88;mHhtNeA7%xT>$clv__nUjn5jA0wCLEnu1j;v!0vB>Ri6m9`;R{JMS%^)4FC
zU0Z44+u$I$w=Bj|iu4DT5h~sS`C*zbmX?@-crY}E+hy>}2~C0Nn(EKk@5^qO4@l@!
z6O0lr%tzGC`D^)8xU3FnMZVm0kX1sBWhaQyzVoXFWwr%Ny?=2M{5s#5i7fTu3gEkG
zc{(Pr$v=;`Y#&`y*J}#M9ux>0?xu!`$9cUKm#Bdd_&S#LPTS?ZPV6<oj?$TfFXi^d
z)%H0W@kZ{7hp+-A*%sGsgIh1wwo5cw*${t-j0HT>zN6>W6JTS~-LfjL{mB=b(KMk3
z2HjBSlJeyUVqDd=Mt!=hpYsvby2GL&3~zm;0{^nZJq+4vb?5HH4wufvr}IX42sHeK
zm@x?HN$8TsTavXs)tLDFJtY9b)y~Tl@7z4^I8oUQq4JckH@~CVQ;FoK(+e0XAM>1O
z(ei}h?)JQp>)d=6ng-BZF1Z5hsAKW@mXq+hU?r8I(*%`tnIIOXw7V6ZK(T9RFJJe@
zZS!aC+p)Gf2Ujc=a6hx4!A1Th%YH!Lb^xpI<Vt$m*C~?=DQ%@%azgK4)CA2i>!Eu`
zmJO{9rw){B1Ql18d%F%da+Tbu1()?o(zT7StYqK6_w`e+fjXq5L^y<n=SigFvwX0$
zwE+2zs!zmtFVr#up}!ErzRMUWA+)m^i2GGL4ssZH0hJhq7zG0Zfek{TK`E=rp_<1<
zL1|({K_NigwT=f^N?nXiR#BQmK~_RaQB6ui{Spe|G4-Em5^eAny%F2v5g+1XX+Vf-
z*MHN1#S~?wrPS2f!P5Vl3bh4o@&-c08S%M!EY&6=m6NL#ht+SNAPzHo8;&CsBLrIA
z!vW!+im=4Da6V<Qda~vA<|SZ9#GU*FVt|Y+Zyd%$g0pl^g_4|1ZdY_USr3uC8c|h2
zGBXZCp6IOPf8puq#4Hj1+<ytVofvbURJwEruZ<ni1Oo(Z1<9j73<AJ8l*BD8om>(0
z09QA6H4oFj59c2wR~{~>jUoDzDdKz}5#onYPJRwa`SUO)Pd4)?(ENBaFVLJr6Kvz=
zhTtXqbx09C1z~~iZt;g^9_2nCZ{};-b4dQJbv8HsWHXPVg^@(*!@xycp#R?a|L!+`
zY5w))JWV`Gls(=}shH0#r*;~>_+-P5Qc978+QUd>J%`fyn{*TsiG-dWMiJXNgwBaT
zJ=wgYFt+1ACW)XwtNx)Q9tA2LPoB&DkL16P)ERWQlY4%Y`-5aM9mZ{eKPUgI!~J3Z
zkMd5A_p&v?V-o-6TUa8BndiX?ooviev<A`@|1b<i&QSWFX(}gmkFpt%;EuyE5Id&(
z|G{{i6g>(DKw=*bBVOW|=zps9=Yl|-R5@yJe*BPzN}a0mUsLn{4LfjB_oxpv(mwq#
zSY*%E{iB)sNvWfzg-B!R!|+x(Q|b@>{-~cFvdDHA{F<lcJ%<6}$$dZiwkFaU?=bFa
zpP})0CE^sHypsY)7jz?E`aFz%hf@Xqvxxg7UF2lqqf3jAA02`FXC^*lb@)k*qtmU(
zMaqYP>2sFGA5QGiIWy#3?P2JIpPKg6ncI^)dvqe`_|N=8<f&QDnteN&{Aei{IhS-8
z_ED!NKgZ0{Ns*()vE!$-Bkoj@bJUnmY8-u-L6+GLgCglHjejY+Da&6%jAW5dLNq7@
Mi07c5C&+LA2gVWY(f|Me

literal 0
HcmV?d00001

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..d4081da
--- /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.14.3-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..23d15a9
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,251 @@
+#!/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\n' "$PWD" ) || exit
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD=maximum
+
+warn () {
+    echo "$*"
+} >&2
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+} >&2
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
+esac
+
+CLASSPATH="\\\"\\\""
+
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD=$JAVA_HOME/jre/sh/java
+    else
+        JAVACMD=$JAVA_HOME/bin/java
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+fi
+
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
+      max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        MAX_FD=$( ulimit -H -n ) ||
+            warn "Could not query maximum file descriptor limit"
+    esac
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
+      *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
+fi
+
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        -jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
+        "$@"
+
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..5eed7ee
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,94 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
+
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if %ERRORLEVEL% equ 0 goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto execute
+
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
+
+goto fail
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=
+
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
+
+:end
+@rem End local scope for the variables with windows NT shell
+if %ERRORLEVEL% equ 0 goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..0cdaa80
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1 @@
+rootProject.name = 'app'
diff --git a/src/main/java/popcong/app/AppApplication.java b/src/main/java/popcong/app/AppApplication.java
new file mode 100644
index 0000000..0ef32ba
--- /dev/null
+++ b/src/main/java/popcong/app/AppApplication.java
@@ -0,0 +1,13 @@
+package popcong.app;
+
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+
+@SpringBootApplication
+public class AppApplication {
+
+	public static void main(String[] args) {
+		SpringApplication.run(AppApplication.class, args);
+	}
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
new file mode 100644
index 0000000..1e6ca6c
--- /dev/null
+++ b/src/main/resources/application.properties
@@ -0,0 +1 @@
+spring.application.name=app
diff --git a/src/test/java/popcong/app/AppApplicationTests.java b/src/test/java/popcong/app/AppApplicationTests.java
new file mode 100644
index 0000000..c39cc47
--- /dev/null
+++ b/src/test/java/popcong/app/AppApplicationTests.java
@@ -0,0 +1,13 @@
+package popcong.app;
+
+import org.junit.jupiter.api.Test;
+import org.springframework.boot.test.context.SpringBootTest;
+
+@SpringBootTest
+class AppApplicationTests {
+
+	@Test
+	void contextLoads() {
+	}
+
+}

From d25898d5fd980528c6945d1e032bbaaa961ad8ce Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 15:27:50 +0900
Subject: [PATCH 05/81] =?UTF-8?q?=F0=9F=93=9D=20Docs:=20".gitignore=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

서버 실행 시 생성되는 generated
application 관련 파일,
apple 관련 파일 추가

related to: #1
---
 .gitignore | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/.gitignore b/.gitignore
index c2065bc..a5ca698 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,8 @@ build/
 !gradle/wrapper/gradle-wrapper.jar
 !**/src/main/**/build/
 !**/src/test/**/build/
+src/main/generated/
+build/generated/
 
 ### STS ###
 .apt_generated
@@ -35,3 +37,14 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### apple ###
+.DS_Store
+._.DS_Store
+**/.DS_Store
+**/._.DS_Store
+
+### yml ###
+src/main/resources/application-local.yml
+src/main/resources/application-prod.yml
+src/main/resources/application-secret.yml
\ No newline at end of file

From d3e3903937e06f1aec6bfa20192a453701a6deb3 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 16:56:37 +0900
Subject: [PATCH 06/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"applicat?=
 =?UTF-8?q?ion.yml=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

spring, jpa / port, datasource,healthCheck, logging 관련 설정 추가

related to: #1
---
 src/main/resources/application.properties |  1 -
 src/main/resources/application.yml        | 12 ++++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 delete mode 100644 src/main/resources/application.properties
 create mode 100644 src/main/resources/application.yml

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
deleted file mode 100644
index 1e6ca6c..0000000
--- a/src/main/resources/application.properties
+++ /dev/null
@@ -1 +0,0 @@
-spring.application.name=app
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
new file mode 100644
index 0000000..7c58cc4
--- /dev/null
+++ b/src/main/resources/application.yml
@@ -0,0 +1,12 @@
+spring:
+  profiles:
+    include: secret
+
+  jpa:
+    hibernate:
+      ddl-auto: create # 추후 update로 수정
+    properties:
+      hibernate:
+        format_sql: true
+        show_sql: true
+    open-in-view: false
\ No newline at end of file

From 62ad8870fe9ffca08ecac681bb8ff745c1779a92 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 16:57:28 +0900
Subject: [PATCH 07/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"Gradle?=
 =?UTF-8?q?=20DI=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Database 관련 주석처리 제거
spring-boot-starter-actuator 추가

related to: #1
---
 build.gradle | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 5892227..0420853 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,12 +41,15 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
 
 	// Database
-//	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-//	runtimeOnly 'com.mysql:mysql-connector-j'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	runtimeOnly 'com.mysql:mysql-connector-j'
 
 	// Test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	// HealthCheck
+	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 }
 
 tasks.named('test') {

From fa09bf4902552ba6831b4ee2ea998d71fd9036b9 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 17:11:36 +0900
Subject: [PATCH 08/81] =?UTF-8?q?=E2=9C=85=20Test:=20"Database=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BaseTest로 local에서 공통적으로 활용될 어노테이션 세팅
DatabaseConnectionTest로 DB 연결, 정보 확인 테스트

related to: #1
---
 src/test/java/popcong/app/BaseTest.java       | 11 +++++
 .../app/database/DatabaseConnectionTest.java  | 46 +++++++++++++++++++
 2 files changed, 57 insertions(+)
 create mode 100644 src/test/java/popcong/app/BaseTest.java
 create mode 100644 src/test/java/popcong/app/database/DatabaseConnectionTest.java

diff --git a/src/test/java/popcong/app/BaseTest.java b/src/test/java/popcong/app/BaseTest.java
new file mode 100644
index 0000000..1a9e8af
--- /dev/null
+++ b/src/test/java/popcong/app/BaseTest.java
@@ -0,0 +1,11 @@
+package popcong.app;
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.annotation.Transactional;
+
+@SpringBootTest
+@Transactional
+@ActiveProfiles({"local", "secret"})
+public abstract class BaseTest {
+}
\ No newline at end of file
diff --git a/src/test/java/popcong/app/database/DatabaseConnectionTest.java b/src/test/java/popcong/app/database/DatabaseConnectionTest.java
new file mode 100644
index 0000000..06b8291
--- /dev/null
+++ b/src/test/java/popcong/app/database/DatabaseConnectionTest.java
@@ -0,0 +1,46 @@
+package popcong.app.database;
+
+import jakarta.persistence.EntityManager;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import popcong.app.BaseTest;
+
+public class DatabaseConnectionTest extends BaseTest {
+
+    @Autowired
+    private EntityManager entityManager;
+
+    /**
+     * DB 연결 테스트
+     */
+    @Test
+    void databaseConnectionTest() {
+        Object result = entityManager
+                .createNativeQuery("SELECT 'JPA Connection OK' as message")
+                .getSingleResult();
+
+        Assertions.assertNotNull(result);
+        Assertions.assertEquals("JPA Connection OK", result);
+        System.out.println("JPA Connection OK: " + result);
+    }
+
+    /**
+     * DB 정보 확인 (DB 이름 + 버전)
+     */
+    @Test
+    void databaseInfoTest() {
+        Object dbName = entityManager
+                .createNativeQuery("SELECT DATABASE() as current_db")
+                .getSingleResult();
+
+        Object version = entityManager
+                .createNativeQuery("SELECT VERSION() as db_version")
+                .getSingleResult();
+
+        System.out.println("Current Database & version: " + dbName + version);
+
+        Assertions.assertNotNull(dbName);
+        Assertions.assertNotNull(version);
+    }
+}
\ No newline at end of file

From fa735301caed791f0fe9153525c053adbd6da821 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 19:16:52 +0900
Subject: [PATCH 09/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"Gradle?=
 =?UTF-8?q?=20DI=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

spring-boot-configuration-processor, springdoc-openapi-starter-webmvc-ui 추가

related to: #1
---
 build.gradle | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/build.gradle b/build.gradle
index 0420853..ac55fb4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -28,6 +28,7 @@ dependencies {
 	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	annotationProcessor 'org.projectlombok:lombok'
 	compileOnly 'org.projectlombok:lombok'
+	annotationProcessor 'org.springframework.boot:spring-boot-configuration-processor'
 
 	// Web
 	implementation 'org.springframework.boot:spring-boot-starter-web'
@@ -50,6 +51,9 @@ dependencies {
 
 	// HealthCheck
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
+
+	// Springdoc
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 }
 
 tasks.named('test') {

From 3fd022be208b69433cc74de34e5fed60ee635732 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 19:42:15 +0900
Subject: [PATCH 10/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"swagger,?=
 =?UTF-8?q?=20spring=20security=20=EA=B8=B0=EB=B3=B8=20=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Springdoc openapi로 swagger 세팅
SpringSecurity authorizeHttpRequest 관련 path 허용 설정

related to: #1
---
 src/main/java/popcong/app/AppApplication.java |  3 ++
 .../infra/config/security/SecurityConfig.java | 37 +++++++++++++++++++
 .../config/security/SecurityProperties.java   | 21 +++++++++++
 3 files changed, 61 insertions(+)
 create mode 100644 src/main/java/popcong/app/infra/config/security/SecurityConfig.java
 create mode 100644 src/main/java/popcong/app/infra/config/security/SecurityProperties.java

diff --git a/src/main/java/popcong/app/AppApplication.java b/src/main/java/popcong/app/AppApplication.java
index 0ef32ba..18ac09e 100644
--- a/src/main/java/popcong/app/AppApplication.java
+++ b/src/main/java/popcong/app/AppApplication.java
@@ -2,8 +2,11 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import popcong.app.infra.config.security.SecurityProperties;
 
 @SpringBootApplication
+@EnableConfigurationProperties(SecurityProperties.class)
 public class AppApplication {
 
 	public static void main(String[] args) {
diff --git a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
new file mode 100644
index 0000000..83a62ca
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
@@ -0,0 +1,37 @@
+package popcong.app.infra.config.security;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.web.SecurityFilterChain;
+
+@Configuration
+@EnableWebSecurity
+@RequiredArgsConstructor
+public class SecurityConfig {
+
+    private final SecurityProperties securityProperties;
+
+    /**
+     * SpringSecurity 보안 규칙 설정
+     * CSRF 비활성화
+     * SecurityProperties의 path 접근 허용 (permit-all)
+     */
+    @Bean
+    public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
+        http
+                .csrf(AbstractHttpConfigurer::disable)
+                .authorizeHttpRequests(authorizeRequests ->
+                        authorizeRequests
+                                .requestMatchers(securityProperties.getPermitAll().toArray(new String[0]))
+                                .permitAll()
+                                .anyRequest()
+                                .authenticated()
+                );
+
+        return http.build();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/infra/config/security/SecurityProperties.java b/src/main/java/popcong/app/infra/config/security/SecurityProperties.java
new file mode 100644
index 0000000..b725cd0
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/security/SecurityProperties.java
@@ -0,0 +1,21 @@
+package popcong.app.infra.config.security;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "security.path")
+public class SecurityProperties {
+
+    /**
+     * Spring Security 허용 path 관리
+     */
+    private List<String> permitAll = new ArrayList<>();
+}

From edb9dee19374bc9b247c19d47230837c3c2b3037 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 20:04:21 +0900
Subject: [PATCH 11/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"CORS=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

http://localhost:8080, 3000포트까지 허용,
GET/POST/PATCH/PUT/DELETE 허용
모든 Header 허용
SpringSecurity cors관련 내용 추가

related to: #1
---
 .../app/infra/config/cors/CorsConfig.java     | 25 ++++++++++++++++++
 .../app/infra/config/cors/CorsProperties.java | 26 +++++++++++++++++++
 .../infra/config/security/SecurityConfig.java |  1 +
 3 files changed, 52 insertions(+)
 create mode 100644 src/main/java/popcong/app/infra/config/cors/CorsConfig.java
 create mode 100644 src/main/java/popcong/app/infra/config/cors/CorsProperties.java

diff --git a/src/main/java/popcong/app/infra/config/cors/CorsConfig.java b/src/main/java/popcong/app/infra/config/cors/CorsConfig.java
new file mode 100644
index 0000000..1cc6dd8
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/cors/CorsConfig.java
@@ -0,0 +1,25 @@
+package popcong.app.infra.config.cors;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.config.annotation.CorsRegistry;
+import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
+
+@Configuration
+@EnableConfigurationProperties(CorsProperties.class)
+@RequiredArgsConstructor
+public class CorsConfig implements WebMvcConfigurer {
+
+    private final CorsProperties corsProperties;
+
+    @Override
+    public void addCorsMappings(CorsRegistry registry) {
+        registry.addMapping("/**")
+                .allowedOrigins(corsProperties.getAllowedOrigins().toArray(new String[0]))
+                .allowedMethods(corsProperties.getAllowedMethods().toArray(new String[0]))
+                .allowedHeaders("*")
+                .allowCredentials(true)
+                .maxAge(3600);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/infra/config/cors/CorsProperties.java b/src/main/java/popcong/app/infra/config/cors/CorsProperties.java
new file mode 100644
index 0000000..4e3cf54
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/cors/CorsProperties.java
@@ -0,0 +1,26 @@
+package popcong.app.infra.config.cors;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "cors")
+public class CorsProperties {
+
+    /**
+     * 허용된 Origins
+     */
+    private List<String> allowedOrigins = new ArrayList<>();
+
+    /**
+     * 허용된 HTTP Methods
+     */
+    private List<String> allowedMethods = new ArrayList<>();
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
index 83a62ca..c328e50 100644
--- a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
+++ b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
@@ -24,6 +24,7 @@ public class SecurityConfig {
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
                 .csrf(AbstractHttpConfigurer::disable)
+                .cors(AbstractHttpConfigurer::disable)
                 .authorizeHttpRequests(authorizeRequests ->
                         authorizeRequests
                                 .requestMatchers(securityProperties.getPermitAll().toArray(new String[0]))

From 5f022486bc225aa16df1289153b0d210e77ed0fa Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 20:41:28 +0900
Subject: [PATCH 12/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=ED=8F=AC=EB=A7=B7=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

예외 포맷 작성
ErrorCode 구현체를 error에 추가하여 작성

related to: #3
---
 .../app/global/exception/ErrorCode.java       | 22 +++++++++++++++
 .../exception/error/CommonErrorCode.java      | 27 +++++++++++++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 src/main/java/popcong/app/global/exception/ErrorCode.java
 create mode 100644 src/main/java/popcong/app/global/exception/error/CommonErrorCode.java

diff --git a/src/main/java/popcong/app/global/exception/ErrorCode.java b/src/main/java/popcong/app/global/exception/ErrorCode.java
new file mode 100644
index 0000000..90253d4
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/ErrorCode.java
@@ -0,0 +1,22 @@
+package popcong.app.global.exception;
+
+import org.springframework.http.HttpStatus;
+
+public interface ErrorCode {
+    int getHttpStatus();
+    String getCode();
+    String getMessage();
+
+    default HttpStatus getHttpStatusEnum() {
+        return HttpStatus.valueOf(getHttpStatus());
+    }
+
+    default void validate() {
+        if (getHttpStatus() < 100 || getHttpStatus() > 599) {
+            throw new IllegalArgumentException("Invalid HTTP status: " + getHttpStatus());
+        }
+        if (getCode() == null || getCode().trim().isEmpty()) {
+            throw new IllegalArgumentException("Error code cannot be null or empty");
+        }
+    }
+}
diff --git a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
new file mode 100644
index 0000000..2a93a56
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
@@ -0,0 +1,27 @@
+package popcong.app.global.exception.error;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import popcong.app.global.exception.ErrorCode;
+
+@Getter
+@RequiredArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum CommonErrorCode implements ErrorCode {
+
+    // 4XX
+    INVALID_TYPE_VALUE(HttpStatus.BAD_REQUEST.value(), "C4001", "Invalid Type Value"),
+    INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST.value(), "C4002", "Invalid Input Value"),
+    ENTITY_NOT_FOUND(HttpStatus.BAD_REQUEST.value(), "C4003", "Entity Not Found"),
+    METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED.value(), "C4004", "Invalid Http Method"),
+
+    // 5XX
+    INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), "C5001", "Internal Server Error");
+
+
+    private final int httpStatus;
+    private final String code;
+    private final String message;
+}

From 3be405e3a4ccb92fbcdd352ec03536ba5e451b7a Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 21:21:11 +0900
Subject: [PATCH 13/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"ErrorRes?=
 =?UTF-8?q?ponse=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

API 예외처리 응답 포맷 작성

related to: #3
---
 .../app/global/exception/ErrorResponse.java   | 59 +++++++++++++++++++
 .../app/global/exception/FieldError.java      | 54 +++++++++++++++++
 2 files changed, 113 insertions(+)
 create mode 100644 src/main/java/popcong/app/global/exception/ErrorResponse.java
 create mode 100644 src/main/java/popcong/app/global/exception/FieldError.java

diff --git a/src/main/java/popcong/app/global/exception/ErrorResponse.java b/src/main/java/popcong/app/global/exception/ErrorResponse.java
new file mode 100644
index 0000000..08c46d5
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/ErrorResponse.java
@@ -0,0 +1,59 @@
+package popcong.app.global.exception;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import popcong.app.global.exception.error.CommonErrorCode;
+
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.List;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class ErrorResponse {
+
+    private int httpStatus;
+    private String code;
+    private String message;
+    private final LocalDateTime timestamp = LocalDateTime.now();
+    private List<FieldError> fieldErrors;
+
+    private ErrorResponse(final ErrorCode errorCode) {
+        errorCode.validate();
+        this.httpStatus = errorCode.getHttpStatus();
+        this.code = errorCode.getCode();
+        this.message = errorCode.getMessage();
+        this.fieldErrors = new ArrayList<>();
+    }
+
+    private ErrorResponse(final ErrorCode errorCode, final List<FieldError> fieldErrors) {
+        errorCode.validate();
+        this.httpStatus = errorCode.getHttpStatus();
+        this.code = errorCode.getCode();
+        this.message = errorCode.getMessage();
+        this.fieldErrors = fieldErrors != null ? new ArrayList<>(fieldErrors) : new ArrayList<>();
+    }
+
+    public static ErrorResponse of(final ErrorCode errorCode) {
+        return new ErrorResponse(errorCode);
+    }
+
+    public static ErrorResponse of(final ErrorCode errorCode, final List<FieldError> fieldErrors) {
+        return new ErrorResponse(errorCode, fieldErrors);
+    }
+
+    public static ErrorResponse of(final ErrorCode errorCode, final BindingResult bindingResult) {
+        return new ErrorResponse(errorCode, FieldError.of(bindingResult));
+    }
+
+    public static ErrorResponse of(MethodArgumentTypeMismatchException e) {
+        final String value = e.getValue() == null ? "" : e.getValue().toString();
+        final List<FieldError> fieldErrors = new ArrayList<>();
+        return new ErrorResponse(CommonErrorCode.INVALID_INPUT_VALUE, fieldErrors);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/global/exception/FieldError.java b/src/main/java/popcong/app/global/exception/FieldError.java
new file mode 100644
index 0000000..d4cd8ff
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/FieldError.java
@@ -0,0 +1,54 @@
+package popcong.app.global.exception;
+
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.springframework.validation.BindingResult;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Getter
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class FieldError {
+
+    private String field;
+    private String value;
+    private String reason;
+
+    public static List<FieldError> of(
+            final String field,
+            final String value,
+            final String reason
+    ) {
+        List<FieldError> fieldErrors = new ArrayList<>();
+        fieldErrors.add(new FieldError(
+                field != null ? field : "unknown",
+                value != null ? value : "null",
+                reason != null ? reason : "validation failed"
+        ));
+        return fieldErrors;
+    }
+
+    public static List<FieldError> of(
+            final BindingResult bindingResult
+    ) {
+        if (bindingResult == null || bindingResult.hasFieldErrors()) {
+            return new ArrayList<>();
+        }
+
+        final List<org.springframework.validation.FieldError>  fieldErrors = bindingResult.getFieldErrors();
+
+        return fieldErrors
+                .stream()
+                .map(error -> new FieldError(
+                        error.getField(),
+                        error.getRejectedValue() == null ? "" : error.getRejectedValue().toString(),
+                        error.getDefaultMessage() != null ? error.getDefaultMessage() : "validation failed"
+                ))
+                .collect(Collectors.toList());
+    }
+}
\ No newline at end of file

From 75bc71f8688d6f4e6da54702d7208ccce4b67467 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 21:42:39 +0900
Subject: [PATCH 14/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"?=
 =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=EC=98=88=EC=99=B8=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC,=20=ED=95=B8=EB=93=A4=EB=9F=AC=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

BusinessException, ExceptionHandlerAdvice 작성

related to: #3
---
 .../exception/ExceptionHandlerAdvice.java     | 90 +++++++++++++++++++
 .../exception/custom/BusinessException.java   | 39 ++++++++
 2 files changed, 129 insertions(+)
 create mode 100644 src/main/java/popcong/app/global/exception/ExceptionHandlerAdvice.java
 create mode 100644 src/main/java/popcong/app/global/exception/custom/BusinessException.java

diff --git a/src/main/java/popcong/app/global/exception/ExceptionHandlerAdvice.java b/src/main/java/popcong/app/global/exception/ExceptionHandlerAdvice.java
new file mode 100644
index 0000000..4751d09
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/ExceptionHandlerAdvice.java
@@ -0,0 +1,90 @@
+package popcong.app.global.exception;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+import org.springframework.web.method.annotation.MethodArgumentTypeMismatchException;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.CommonErrorCode;
+
+@Slf4j
+@RestControllerAdvice
+public class ExceptionHandlerAdvice {
+
+    private ResponseEntity<ErrorResponse> createErrorResponse(ErrorCode errorCode) {
+        final ErrorResponse response = ErrorResponse.of(errorCode);
+        return new ResponseEntity<>(response, HttpStatus.valueOf(errorCode.getHttpStatus()));
+    }
+
+    private ResponseEntity<ErrorResponse> createErrorResponse(ErrorResponse errorResponse) {
+        return new ResponseEntity<>(errorResponse, HttpStatus.valueOf(errorResponse.getHttpStatus()));
+    }
+
+    // 📝 business logic error exception
+    @ExceptionHandler(BusinessException.class)
+    protected ResponseEntity<ErrorResponse> handleBusinessException(
+            BusinessException e
+    ) {
+        log.warn("handleInternalLogicException(BusinessException)", e);
+        final ErrorCode code = e.getErrorCode();
+        return createErrorResponse(code);
+    }
+
+
+    // binding error exception caused by @Valid or @Validated
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    protected ResponseEntity<ErrorResponse> handleMethodArgumentNotValidException(
+            MethodArgumentNotValidException e
+    ) {
+        log.warn("handleMethodArgumentNotValidException", e);
+        final ErrorResponse response = ErrorResponse.of(
+                CommonErrorCode.INVALID_INPUT_VALUE,
+                e.getBindingResult()
+        );
+        return createErrorResponse(response);
+    }
+
+
+    // error exception when binding fails due to mismatch in enum type
+    @ExceptionHandler(MethodArgumentTypeMismatchException.class)
+    protected ResponseEntity<ErrorResponse> handleMethodArgumentTypeMismatchException(
+            MethodArgumentTypeMismatchException e
+    ) {
+        log.warn("handleMethodArgumentTypeMismatchException", e);
+        final ErrorResponse response = ErrorResponse.of(e);
+        return createErrorResponse(response);
+    }
+
+
+    // error exception when using an unsupported HTTP method
+    @ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+    protected ResponseEntity<ErrorResponse> handleHttpRequestMethodNotSupportedException(
+            HttpRequestMethodNotSupportedException e
+    ) {
+        log.warn("handleHttpRequestMethodNotSupportedException", e);
+        return createErrorResponse(CommonErrorCode.METHOD_NOT_ALLOWED);
+    }
+
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    protected ResponseEntity<ErrorResponse> handleIllegalArgumentException(
+            IllegalArgumentException e
+    ) {
+        log.warn("handleIllegalArgumentException", e);
+        return createErrorResponse(CommonErrorCode.INVALID_INPUT_VALUE);
+    }
+
+
+    // rest error exception ...
+    @ExceptionHandler(Exception.class)
+    protected ResponseEntity<ErrorResponse> handleException(
+            Exception e
+    ) {
+        log.error("handleException - Unexpected error occurred", e);
+        return createErrorResponse(CommonErrorCode.INTERNAL_SERVER_ERROR);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/global/exception/custom/BusinessException.java b/src/main/java/popcong/app/global/exception/custom/BusinessException.java
new file mode 100644
index 0000000..ae4852e
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/custom/BusinessException.java
@@ -0,0 +1,39 @@
+package popcong.app.global.exception.custom;
+
+import lombok.Getter;
+import org.springframework.http.HttpStatus;
+import popcong.app.global.exception.ErrorCode;
+
+@Getter
+public class BusinessException extends RuntimeException {
+
+    private final ErrorCode errorCode;
+
+    public BusinessException(String message, ErrorCode errorCode) {
+        super(message);
+        if (errorCode == null) {
+            throw new IllegalArgumentException("errorCode cannot be null");
+        }
+        errorCode.validate();
+        this.errorCode = errorCode;
+    }
+
+    private BusinessException(ErrorCode errorCode) {
+        super(errorCode != null ? errorCode.getMessage() : "Business Exception");
+
+        if (errorCode == null) {
+            throw new IllegalArgumentException("errorCode cannot be null");
+        }
+
+        errorCode.validate();
+        this.errorCode = errorCode;
+    }
+
+    public int getStatusCode() {
+        return errorCode.getHttpStatus();
+    }
+
+    public HttpStatus getHttpStatus() {
+        return errorCode.getHttpStatusEnum();
+    }
+}

From a6899deba1f9bc4242e57d8b6850083e93de893e Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 10 Aug 2025 21:47:10 +0900
Subject: [PATCH 15/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"?=
 =?UTF-8?q?=EC=9D=91=EB=8B=B5=20=ED=85=9C=ED=94=8C=EB=A6=BF=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ResponseDto 작성

related to: #3
---
 .../popcong/app/global/dto/ResponseDto.java   | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 src/main/java/popcong/app/global/dto/ResponseDto.java

diff --git a/src/main/java/popcong/app/global/dto/ResponseDto.java b/src/main/java/popcong/app/global/dto/ResponseDto.java
new file mode 100644
index 0000000..5beead4
--- /dev/null
+++ b/src/main/java/popcong/app/global/dto/ResponseDto.java
@@ -0,0 +1,39 @@
+package popcong.app.global.dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import org.springframework.http.HttpStatusCode;
+
+@Getter
+@AllArgsConstructor
+public class ResponseDto<T> {
+
+    private final String statusCode;
+    private final String message;
+    private final T data;
+
+    // data -> X
+    public static <T> ResponseDto<T> res(
+            final HttpStatusCode statusCode,
+            final String message
+    ) {
+        return new ResponseDto<>(
+                String.valueOf(statusCode.value()),
+                message,
+                null
+        );
+    }
+
+    // data -> O
+    public static <T> ResponseDto<T> res(
+            final HttpStatusCode statusCode,
+            final String message,
+            final T data
+    ) {
+        return new ResponseDto<>(
+                String.valueOf(statusCode.value()),
+                message,
+                data
+        );
+    }
+}
\ No newline at end of file

From 2778dd5436da9ddb4e38ed919e8cf60cec4c33b9 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Tue, 12 Aug 2025 20:07:13 +0900
Subject: [PATCH 16/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"DI=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

JWT, ModelMapper, Validation 관련 DI 추가

related to: #5
---
 build.gradle | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/build.gradle b/build.gradle
index ac55fb4..13fa1d7 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,6 +37,11 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-security'
 	testImplementation 'org.springframework.security:spring-security-test'
 
+	// JWT
+	implementation 'io.jsonwebtoken:jjwt-api:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-impl:0.11.5'
+	implementation 'io.jsonwebtoken:jjwt-jackson:0.11.5'
+
 	// OAuth2
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
 	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
@@ -54,6 +59,12 @@ dependencies {
 
 	// Springdoc
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
+
+	// ModelMapper
+	implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.4.2'
+
+	// Validation
+	implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0'
 }
 
 tasks.named('test') {

From 631c5a3a308086e29d326702f5f85502643a7fda Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Tue, 12 Aug 2025 20:10:52 +0900
Subject: [PATCH 17/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"DI=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ModelMapper, Validation 관련 DI 입력 포맷 수정

related to: #5
---
 build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build.gradle b/build.gradle
index 13fa1d7..4cc6fa9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -61,10 +61,10 @@ dependencies {
 	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
 
 	// ModelMapper
-	implementation group: 'org.modelmapper', name: 'modelmapper', version: '2.4.2'
+	implementation 'org.modelmapper:modelmapper:2.4.2'
 
 	// Validation
-	implementation group: 'jakarta.validation', name: 'jakarta.validation-api', version: '3.1.0'
+	implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
 }
 
 tasks.named('test') {

From 4261b7d15288e830732cae09a3d2b8962bb9632c Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 12:14:30 +0900
Subject: [PATCH 18/81] =?UTF-8?q?=E2=9C=A8=20feature:=20"entity,=20model?=
 =?UTF-8?q?=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

User 모델,
Provider, Role, UserRole 작성,
User JPA entity 작성

related to: #5
---
 .../user/entity/UserJpaEntity.java            | 61 +++++++++++++++++++
 .../app/domain/user/model/Provider.java       |  5 ++
 .../popcong/app/domain/user/model/Role.java   |  6 ++
 .../popcong/app/domain/user/model/User.java   | 22 +++++++
 .../app/domain/user/model/UserRole.java       |  7 +++
 5 files changed, 101 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/Provider.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/Role.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/User.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/UserRole.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
new file mode 100644
index 0000000..e650310
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
@@ -0,0 +1,61 @@
+package popcong.app.adapter.out.persistence.user.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.domain.user.model.Provider;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.UserRole;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "USER")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "provider", nullable = false)
+    private Provider provider;
+
+    @Column(name = "providerId", nullable = false, unique = true, length = 50)
+    private String providerId;
+
+    @Column(name = "email", nullable = false, unique = true, length = 50)
+    private String email;
+
+    @Column(name = "name", nullable = false, length = 10)
+    private String name;
+
+    @Column(name = "profileImageUrl")
+    private String profileImageUrl;
+
+    @Column(name = "introduction", length = 1000)
+    private String introduction;
+
+    @Builder.Default
+    @Enumerated(EnumType.STRING)
+    @Column(name = "role", nullable = false)
+    private Role role = Role.ROLE_USER;
+
+    @Builder.Default
+    @Enumerated(EnumType.STRING)
+    @Column(name = "userRole", nullable = false)
+    private UserRole userRole = UserRole.GUEST;
+
+    @Builder.Default
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt =  LocalDateTime.now();
+
+    @Column(name = "deletedAt")
+    private LocalDateTime deletedAt;
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/user/model/Provider.java b/src/main/java/popcong/app/domain/user/model/Provider.java
new file mode 100644
index 0000000..803cb72
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/Provider.java
@@ -0,0 +1,5 @@
+package popcong.app.domain.user.model;
+
+public enum Provider {
+    kakao
+}
diff --git a/src/main/java/popcong/app/domain/user/model/Role.java b/src/main/java/popcong/app/domain/user/model/Role.java
new file mode 100644
index 0000000..87364d9
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/Role.java
@@ -0,0 +1,6 @@
+package popcong.app.domain.user.model;
+
+public enum Role {
+    ROLE_USER,
+    ROLE_ADMIN
+}
diff --git a/src/main/java/popcong/app/domain/user/model/User.java b/src/main/java/popcong/app/domain/user/model/User.java
new file mode 100644
index 0000000..b471fb6
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/User.java
@@ -0,0 +1,22 @@
+package popcong.app.domain.user.model;
+
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@Builder
+public class User {
+    private final Long id;
+    private final Provider provider; // 소셜로그인 제공자
+    private final String providerId; // 소셜로그인에서 제공받은 ID
+    private final String email; // 소셜로그인 email
+    private final String name;
+    private final String profileImageUrl;
+    private final String introduction;
+    private final Role role; // user-admin
+    private final UserRole userRole; // guest-host
+    private final LocalDateTime createdAt;
+    private final LocalDateTime deletedAt;
+}
diff --git a/src/main/java/popcong/app/domain/user/model/UserRole.java b/src/main/java/popcong/app/domain/user/model/UserRole.java
new file mode 100644
index 0000000..d03a7af
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/UserRole.java
@@ -0,0 +1,7 @@
+package popcong.app.domain.user.model;
+
+public enum UserRole {
+    GUEST, // 일반 사용자 (임차인)
+    PENDING, // 호스트 신청 서류 제출자
+    HOST // 호스트 (임대인)
+}

From 8a3daebc34afed23010e24fe7017eed41d8b7484 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 12:22:08 +0900
Subject: [PATCH 19/81] =?UTF-8?q?=F0=9F=94=A8=20fix:=20"model=20class=20->?=
 =?UTF-8?q?=20record=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

기존에 class와 Getter, Builder로 작성된 model을 record로 수정함

related to: #5
---
 .../popcong/app/domain/user/model/User.java   | 31 ++++++++-----------
 1 file changed, 13 insertions(+), 18 deletions(-)

diff --git a/src/main/java/popcong/app/domain/user/model/User.java b/src/main/java/popcong/app/domain/user/model/User.java
index b471fb6..56c9cb4 100644
--- a/src/main/java/popcong/app/domain/user/model/User.java
+++ b/src/main/java/popcong/app/domain/user/model/User.java
@@ -1,22 +1,17 @@
 package popcong.app.domain.user.model;
 
-import lombok.Builder;
-import lombok.Getter;
-
 import java.time.LocalDateTime;
 
-@Getter
-@Builder
-public class User {
-    private final Long id;
-    private final Provider provider; // 소셜로그인 제공자
-    private final String providerId; // 소셜로그인에서 제공받은 ID
-    private final String email; // 소셜로그인 email
-    private final String name;
-    private final String profileImageUrl;
-    private final String introduction;
-    private final Role role; // user-admin
-    private final UserRole userRole; // guest-host
-    private final LocalDateTime createdAt;
-    private final LocalDateTime deletedAt;
-}
+public record User (
+    Long id,
+    Provider provider, // 소셜로그인 제공자
+    String providerId, // 소셜로그인에서 제공받은 ID
+    String email, // 소셜로그인 email
+    String name,
+    String profileImageUrl,
+    String introduction,
+    Role role, // user-admin
+    UserRole userRole, // guest-host
+    LocalDateTime createdAt,
+    LocalDateTime deletedAt
+) {}

From 40a8fce5066fc8c168605102ab9b0bc676ad3b91 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 12:57:40 +0900
Subject: [PATCH 20/81] =?UTF-8?q?=E2=9C=A8=20feature:=20"=EC=9D=B8?=
 =?UTF-8?q?=EC=A6=9D=20=EA=B4=80=EB=A0=A8=20model,=20interface=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

토큰 생성 사용자 정보 모델 AuthInfo,
토큰 생성 비지니스 로직 인터페이스 TokenGenerateUseCase 작성

related to: #5
---
 .../app/domain/auth/model/AuthInfo.java       | 23 +++++++++++++++++++
 .../auth/port/in/TokenGenerateUseCase.java    |  7 ++++++
 2 files changed, 30 insertions(+)
 create mode 100644 src/main/java/popcong/app/domain/auth/model/AuthInfo.java
 create mode 100644 src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java

diff --git a/src/main/java/popcong/app/domain/auth/model/AuthInfo.java b/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
new file mode 100644
index 0000000..a06898f
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
@@ -0,0 +1,23 @@
+package popcong.app.domain.auth.model;
+
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+
+public record AuthInfo(
+        Long id,
+        String providerId,
+        String email,
+        Role role,
+        UserRole userRole
+) {
+    public static AuthInfo from(User user) {
+        return new AuthInfo(
+                user.id(),
+                user.providerId(),
+                user.email(),
+                user.role(),
+                user.userRole()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java b/src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java
new file mode 100644
index 0000000..3c28d45
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java
@@ -0,0 +1,7 @@
+package popcong.app.domain.auth.port.in;
+
+import popcong.app.domain.auth.model.AuthInfo;
+
+public interface TokenGenerateUseCase {
+    String generateToken(AuthInfo authInfo);
+}
\ No newline at end of file

From f139e63a00a48b6a57d8bd85a8cca1451c36e9bd Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 12:58:45 +0900
Subject: [PATCH 21/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20setting:=20"?=
 =?UTF-8?q?=ED=86=A0=ED=81=B0=20=EA=B8=B0=EB=B3=B8=20=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

jwt secret key와 유효기간 관련 기본 설정 작성

related to: #5
---
 .../app/infra/config/jwt/JwtConfig.java       | 22 ++++++++++++++++++
 .../app/infra/config/jwt/JwtProperties.java   | 23 +++++++++++++++++++
 2 files changed, 45 insertions(+)
 create mode 100644 src/main/java/popcong/app/infra/config/jwt/JwtConfig.java
 create mode 100644 src/main/java/popcong/app/infra/config/jwt/JwtProperties.java

diff --git a/src/main/java/popcong/app/infra/config/jwt/JwtConfig.java b/src/main/java/popcong/app/infra/config/jwt/JwtConfig.java
new file mode 100644
index 0000000..d133b70
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/jwt/JwtConfig.java
@@ -0,0 +1,22 @@
+package popcong.app.infra.config.jwt;
+
+import io.jsonwebtoken.io.Decoders;
+import io.jsonwebtoken.security.Keys;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import javax.crypto.SecretKey;
+
+@Configuration
+@RequiredArgsConstructor
+public class JwtConfig {
+
+    private final JwtProperties jwtProperties;
+
+    @Bean
+    public SecretKey secretKey() {
+        byte[] keyBytes = Decoders.BASE64.decode(jwtProperties.getSecret());
+        return Keys.hmacShaKeyFor(keyBytes);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/infra/config/jwt/JwtProperties.java b/src/main/java/popcong/app/infra/config/jwt/JwtProperties.java
new file mode 100644
index 0000000..7547d92
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/jwt/JwtProperties.java
@@ -0,0 +1,23 @@
+package popcong.app.infra.config.jwt;
+
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "jwt")
+public class JwtProperties {
+
+    private String secret;
+    private ExpirationTime expirationTime;
+
+    @Getter
+    @Setter
+    public static class ExpirationTime {
+        private Long accessToken;
+        private Long refreshToken;
+    }
+}

From a4ea8c0329168d1ff3b4a2106367abd5d9ea9b3b Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 14:26:01 +0900
Subject: [PATCH 22/81] =?UTF-8?q?=E2=9C=A8=20feature:=20"=ED=86=A0?=
 =?UTF-8?q?=ED=81=B0=20=EC=83=9D=EC=84=B1=20=EB=B9=84=EC=A7=80=EB=8B=88?=
 =?UTF-8?q?=EC=8A=A4=20=EB=A1=9C=EC=A7=81=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AuthInfo를 id, email, role로 수정,
AuthInfo의 모든 정보로 accessToken 생성 로직 작성,
사용자 id와 role로 refreshToken 생성 로직 작성

related to: #5
---
 .../service/AccessTokenGenerateService.java   | 40 +++++++++++++++++++
 .../service/RefreshTokenGenerateService.java  | 39 ++++++++++++++++++
 .../app/domain/auth/model/AuthInfo.java       |  9 +----
 3 files changed, 81 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java
 create mode 100644 src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java

diff --git a/src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java b/src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java
new file mode 100644
index 0000000..f4e0f5c
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java
@@ -0,0 +1,40 @@
+package popcong.app.application.auth.service;
+
+import io.jsonwebtoken.Jwts;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import popcong.app.domain.auth.model.AuthInfo;
+import popcong.app.domain.auth.port.in.TokenGenerateUseCase;
+import popcong.app.infra.config.jwt.JwtProperties;
+
+import javax.crypto.SecretKey;
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+public class AccessTokenGenerateService implements TokenGenerateUseCase {
+
+    private final JwtProperties jwtProperties;
+    private final SecretKey secretKey;
+
+    /**
+     * AuthInfo의 사용자 id, providerId, email, role, userRole로 Access Token 생성
+     * @param authInfo
+     * @return accessToken 발급
+     */
+    @Override
+    public String generateToken(AuthInfo authInfo) {
+        Date now = new Date();
+        Long expiration = jwtProperties.getExpirationTime().getAccessToken();
+
+        return Jwts.builder()
+                .setSubject(authInfo.id().toString())
+                .claim("email", authInfo.email())
+                .claim("role", authInfo.role())
+                .claim("tokenType", "ACCESS")
+                .setIssuedAt(now)
+                .setExpiration(new Date(now.getTime() + expiration))
+                .signWith(secretKey)
+                .compact();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java b/src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java
new file mode 100644
index 0000000..558def2
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java
@@ -0,0 +1,39 @@
+package popcong.app.application.auth.service;
+
+import io.jsonwebtoken.Jwts;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import popcong.app.domain.auth.model.AuthInfo;
+import popcong.app.domain.auth.port.in.TokenGenerateUseCase;
+import popcong.app.infra.config.jwt.JwtProperties;
+
+import javax.crypto.SecretKey;
+import java.util.Date;
+
+@Service
+@RequiredArgsConstructor
+public class RefreshTokenGenerateService implements TokenGenerateUseCase {
+
+    private final JwtProperties jwtProperties;
+    private final SecretKey secretKey;
+
+    /**
+     * AuthInfo의 사용자 id로 Refresh Token 생성
+     * @param authInfo
+     * @return refreshToken 발급
+     */
+    @Override
+    public String generateToken(AuthInfo authInfo) {
+        Date now = new Date();
+        Long expiration = jwtProperties.getExpirationTime().getRefreshToken();
+
+        return Jwts.builder()
+                .setSubject(authInfo.id().toString())
+                .claim("role",  authInfo.role())
+                .claim("tokenType", "REFRESH")
+                .setIssuedAt(now)
+                .setExpiration(new Date(now.getTime() + expiration))
+                .signWith(secretKey)
+                .compact();
+    }
+}
diff --git a/src/main/java/popcong/app/domain/auth/model/AuthInfo.java b/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
index a06898f..3fd544a 100644
--- a/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
+++ b/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
@@ -2,22 +2,17 @@
 
 import popcong.app.domain.user.model.Role;
 import popcong.app.domain.user.model.User;
-import popcong.app.domain.user.model.UserRole;
 
 public record AuthInfo(
         Long id,
-        String providerId,
         String email,
-        Role role,
-        UserRole userRole
+        Role role
 ) {
     public static AuthInfo from(User user) {
         return new AuthInfo(
                 user.id(),
-                user.providerId(),
                 user.email(),
-                user.role(),
-                user.userRole()
+                user.role()
         );
     }
 }
\ No newline at end of file

From 4e62b041a227a572d0a0d10812a7102331edbedf Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 15:17:41 +0900
Subject: [PATCH 23/81] =?UTF-8?q?=E2=9C=A8=20feature:=20"JWT=20=EC=9C=A0?=
 =?UTF-8?q?=ED=8B=B8=EB=A6=AC=ED=8B=B0=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JWT 유틸리티 작성
토큰 생성, 유효성 검증, Claims 추출, 인증 정보 추출

related to: #5
---
 .../popcong/app/adapter/out/jwt/JwtUtils.java | 97 +++++++++++++++++++
 1 file changed, 97 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java

diff --git a/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java b/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
new file mode 100644
index 0000000..c1369ae
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
@@ -0,0 +1,97 @@
+package popcong.app.adapter.out.jwt;
+
+import io.jsonwebtoken.*;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Qualifier;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.stereotype.Component;
+import popcong.app.domain.auth.model.AuthInfo;
+import popcong.app.domain.auth.port.in.TokenGenerateUseCase;
+
+import javax.crypto.SecretKey;
+import java.util.Collections;
+
+@Slf4j
+@Component
+public class JwtUtils {
+
+    private final SecretKey secretKey;
+    public final TokenGenerateUseCase accessTokenGenerateService;
+    public final TokenGenerateUseCase refreshTokenGenerateService;
+
+    public JwtUtils(
+            SecretKey secretKey,
+            @Qualifier("accessTokenGenerateService") TokenGenerateUseCase accessTokenGenerateService,
+            @Qualifier("refreshTokenGenerateService")  TokenGenerateUseCase refreshTokenGenerateService
+    ) {
+        this.secretKey = secretKey;
+        this.accessTokenGenerateService = accessTokenGenerateService;
+        this.refreshTokenGenerateService = refreshTokenGenerateService;
+    }
+
+    // Access Tokne 생성
+    public String generateAccessToken(AuthInfo authInfo) {
+        return accessTokenGenerateService.generateToken(authInfo);
+    }
+
+    // Refresh Token 생성
+    public String generateRefreshToken(AuthInfo authInfo) {
+        return refreshTokenGenerateService.generateToken(authInfo);
+    }
+
+    // Token 유효성 검증
+    public boolean validateToken(String token) {
+        try {
+            Jwts.parserBuilder()
+                    .setSigningKey(secretKey)
+                    .build()
+                    .parseClaimsJws(token);
+
+            return true;
+        } catch (SecurityException | MalformedJwtException e) {
+            log.info("잘못된 JWT 서명입니다.");
+        } catch (ExpiredJwtException e) {
+            log.info("만료된 JWT 서명입니다.");
+        } catch (UnsupportedJwtException e) {
+            log.info("지원되지 않는 JWT 토큰입니다.");
+        } catch (IllegalArgumentException e) {
+            log.info("JWT 토큰이 잘못되었습니다.");
+        }
+
+        return false;
+    }
+
+    // JWT Claims 추출
+    private Claims getClaimsFromToken(String accessToken) {
+        try {
+            return Jwts.parserBuilder()
+                    .setSigningKey(secretKey)
+                    .build()
+                    .parseClaimsJws(accessToken)
+                    .getBody();
+        } catch (ExpiredJwtException e) {
+            return e.getClaims();
+        }
+    }
+
+    // Access Token에서 인증 정보 추출
+    public Authentication getAuthentication(String accessToken) {
+        Claims claims = getClaimsFromToken(accessToken);
+        String role = claims.get("role", String.class);
+
+        User principal = new User(
+                claims.getSubject(),
+                "",
+                Collections.singleton(new SimpleGrantedAuthority(role))
+        );
+
+        return new UsernamePasswordAuthenticationToken(
+                principal,
+                accessToken,
+                principal.getAuthorities()
+        );
+    }
+}

From 4a4dd7b12c04ef9c0967955414a0260d06b96d0b Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 15:38:44 +0900
Subject: [PATCH 24/81] =?UTF-8?q?=E2=9C=A8=20feature:=20"JWT=20=EA=B2=80?=
 =?UTF-8?q?=EC=A6=9D,=20=EC=9D=B8=EC=A6=9D=EC=83=81=ED=83=9C=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=20=EB=B9=84=EC=A7=80=EB=8B=88=EC=8A=A4=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

JwtFilter로 JWT 추출 및 검증과 인증 로직 작성

related to: #5
---
 .../popcong/app/adapter/in/jwt/JwtFilter.java | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java

diff --git a/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java b/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
new file mode 100644
index 0000000..de26bf1
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
@@ -0,0 +1,54 @@
+package popcong.app.adapter.in.jwt;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.validation.constraints.NotNull;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
+import org.springframework.web.filter.OncePerRequestFilter;
+import popcong.app.adapter.out.jwt.JwtUtils;
+
+import java.io.IOException;
+
+@Component
+@RequiredArgsConstructor
+public class JwtFilter extends OncePerRequestFilter {
+
+    private final JwtUtils jwtUtils;
+    public static final String AUTHORIZATION_HEADER = "Authorization";
+    public static final String BEARER_PREFIX = "Bearer ";
+
+    /**
+     * JWT 유효성 검증 및 인증 설정
+     */
+    @Override
+    protected void doFilterInternal(
+            @NotNull HttpServletRequest request,
+            @NotNull HttpServletResponse response,
+            @NotNull FilterChain filterChain
+    ) throws ServletException, IOException {
+
+        String jwt = resolveToken(request);
+
+        if (StringUtils.hasText(jwt) && jwtUtils.validateToken(jwt)) {
+            Authentication authentication = jwtUtils.getAuthentication(jwt);
+            SecurityContextHolder.getContext().setAuthentication(authentication);
+        }
+        filterChain.doFilter(request, response);
+    }
+
+    // Bearer Token에서 JWT 추출
+    private String resolveToken(HttpServletRequest request) {
+        String bearerToken = request.getHeader(AUTHORIZATION_HEADER);
+        if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(BEARER_PREFIX)) {
+            return bearerToken.substring(7);
+        }
+        return null;
+    }
+}
\ No newline at end of file

From 51ed6a4958bdfae0d35a946bbaf8e0e29840f610 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 16:04:33 +0900
Subject: [PATCH 25/81] =?UTF-8?q?=E2=9C=A8=20feature:=20"Security=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EC=97=90=EB=9F=AC=20=ED=95=B8=EB=93=A4?=
 =?UTF-8?q?=EB=9F=AC=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AuthErrorCode 추가,
Security 관련 에러 핸들러 추상 클래스 작성,
인증, 인가 에러 핸들러 작성

related to: #5
---
 .../AbstractSecurityFailureHandler.java       | 28 +++++++++++++++
 .../handler/AuthenticationFailureHandler.java | 32 +++++++++++++++++
 .../handler/AuthorizationFailureHandler.java  | 35 +++++++++++++++++++
 .../global/exception/error/AuthErrorCode.java | 27 ++++++++++++++
 4 files changed, 122 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/handler/AbstractSecurityFailureHandler.java
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/handler/AuthenticationFailureHandler.java
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/handler/AuthorizationFailureHandler.java
 create mode 100644 src/main/java/popcong/app/global/exception/error/AuthErrorCode.java

diff --git a/src/main/java/popcong/app/adapter/in/jwt/handler/AbstractSecurityFailureHandler.java b/src/main/java/popcong/app/adapter/in/jwt/handler/AbstractSecurityFailureHandler.java
new file mode 100644
index 0000000..c723296
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/handler/AbstractSecurityFailureHandler.java
@@ -0,0 +1,28 @@
+package popcong.app.adapter.in.jwt.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.MediaType;
+import popcong.app.global.exception.ErrorResponse;
+
+import java.io.IOException;
+
+/**
+ * 보안 예외 응답 공통 처리
+ */
+@RequiredArgsConstructor
+public abstract class AbstractSecurityFailureHandler {
+
+    private final ObjectMapper objectMapper;
+
+    protected void writeErrorResponse(
+            HttpServletResponse response,
+            ErrorResponse errorResponse
+    ) throws IOException {
+        response.setStatus(errorResponse.getHttpStatus());
+        response.setContentType(MediaType.APPLICATION_JSON_VALUE);
+        response.setCharacterEncoding("UTF-8");
+        objectMapper.writeValue(response.getWriter(), errorResponse);
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/in/jwt/handler/AuthenticationFailureHandler.java b/src/main/java/popcong/app/adapter/in/jwt/handler/AuthenticationFailureHandler.java
new file mode 100644
index 0000000..829d4b5
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/handler/AuthenticationFailureHandler.java
@@ -0,0 +1,32 @@
+package popcong.app.adapter.in.jwt.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.web.AuthenticationEntryPoint;
+import org.springframework.stereotype.Component;
+import popcong.app.global.exception.ErrorResponse;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+import java.io.IOException;
+
+/**
+ * 인증(Authentication) 실패 처리 (401)
+ */
+@Component
+public class AuthenticationFailureHandler extends AbstractSecurityFailureHandler implements AuthenticationEntryPoint {
+
+    public AuthenticationFailureHandler(ObjectMapper objectMapper) {
+        super(objectMapper);
+    }
+
+    @Override
+    public void commence(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AuthenticationException authException
+    ) throws IOException {
+        writeErrorResponse(response, ErrorResponse.of(AuthErrorCode.UNAUTHORIZED));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/in/jwt/handler/AuthorizationFailureHandler.java b/src/main/java/popcong/app/adapter/in/jwt/handler/AuthorizationFailureHandler.java
new file mode 100644
index 0000000..67f02c3
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/handler/AuthorizationFailureHandler.java
@@ -0,0 +1,35 @@
+package popcong.app.adapter.in.jwt.handler;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.web.access.AccessDeniedHandler;
+import org.springframework.stereotype.Component;
+import popcong.app.global.exception.ErrorResponse;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+import java.io.IOException;
+
+/**
+ * 인가(Authorization) 실패 처리 (403)
+ */
+@Slf4j
+@Component
+public class AuthorizationFailureHandler extends AuthenticationFailureHandler implements AccessDeniedHandler {
+
+    public AuthorizationFailureHandler(ObjectMapper objectMapper) {
+        super(objectMapper);
+    }
+
+    @Override
+    public void handle(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            AccessDeniedException accessDeniedException
+    ) throws IOException {
+        log.error("No Authorities", accessDeniedException);
+        writeErrorResponse(response, ErrorResponse.of(AuthErrorCode.ACCESS_DENIED));
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java b/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java
new file mode 100644
index 0000000..b28c732
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java
@@ -0,0 +1,27 @@
+package popcong.app.global.exception.error;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import popcong.app.global.exception.ErrorCode;
+
+@Getter
+@RequiredArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum AuthErrorCode implements ErrorCode {
+
+    // 400
+    UNSUPPORTED_SOCIAL_LOGIN(HttpStatus.BAD_REQUEST.value(), "A4001", "지원하지 않는 소셜 로그인입니다."),
+    INVALID_KAKAO_RESPONSE(HttpStatus.BAD_REQUEST.value(), "A4002", "카카오 응답 형식이 유효하지 않습니다."),
+
+    // 401
+    UNAUTHORIZED(HttpStatus.UNAUTHORIZED.value(),"A4011", "인증되지 않은 사용자압니다."),
+
+    // 403
+    ACCESS_DENIED(HttpStatus.FORBIDDEN.value(), "A4031", "접근 권한이 없습니다.");
+
+    private final int httpStatus;
+    private final String code;
+    private final String message;
+}

From 9592eb1dde99e5347a1f35b64b22e9422f22285c Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 16:14:23 +0900
Subject: [PATCH 26/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"SpringSe?=
 =?UTF-8?q?curity=20=EC=9E=AC=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SpringSecurity 관련 재설정

related to: #5
---
 .../infra/config/security/SecurityConfig.java | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
index c328e50..890060b 100644
--- a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
+++ b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
@@ -6,7 +6,12 @@
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
+import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import popcong.app.adapter.in.jwt.JwtFilter;
+import popcong.app.adapter.in.jwt.handler.AuthenticationFailureHandler;
+import popcong.app.adapter.in.jwt.handler.AuthorizationFailureHandler;
 
 @Configuration
 @EnableWebSecurity
@@ -15,6 +20,11 @@ public class SecurityConfig {
 
     private final SecurityProperties securityProperties;
 
+    private final JwtFilter jwtFilter;
+
+    private final AuthenticationFailureHandler authenticationFailureHandler;
+    private final AuthorizationFailureHandler authorizationFailureHandler;
+
     /**
      * SpringSecurity 보안 규칙 설정
      * CSRF 비활성화
@@ -25,12 +35,26 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
         http
                 .csrf(AbstractHttpConfigurer::disable)
                 .cors(AbstractHttpConfigurer::disable)
+                .httpBasic(AbstractHttpConfigurer::disable)
+                .formLogin(AbstractHttpConfigurer::disable)
+                // STATELESS로 세션 관리
+                .sessionManagement(session ->
+                        session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                )
+                // 필터 체인에 커스텀 필터 추가
+                .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
+                // 요청 별 접근 권한 설정
                 .authorizeHttpRequests(authorizeRequests ->
                         authorizeRequests
                                 .requestMatchers(securityProperties.getPermitAll().toArray(new String[0]))
                                 .permitAll()
                                 .anyRequest()
                                 .authenticated()
+                )
+                // security exception 핸들러
+                .exceptionHandling(exceptions ->
+                        exceptions.authenticationEntryPoint(authenticationFailureHandler)
+                                .accessDeniedHandler(authorizationFailureHandler)
                 );
 
         return http.build();

From e5848c5ac9bf45d8953381452a38bba25655313e Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 16:44:13 +0900
Subject: [PATCH 27/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=86=8C?=
 =?UTF-8?q?=EC=85=9C=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?model,=20interface=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

소셜로그인 관련 model 작성 - OAuth2SignInCommand
소셜로그인 관련 port, 인터페이스 작성 - OAuth2UserInfoPort, OAuth2SignInUseCase
사용자 조회 및 저장 port 작성 - LoadUserPort, SaveUserPort

related to: #5
---
 .../app/domain/auth/model/OAuth2SignInCommand.java   |  9 +++++++++
 .../app/domain/auth/port/in/OAuth2SignInUseCase.java |  9 +++++++++
 .../app/domain/auth/port/out/OAuth2UserInfoPort.java | 12 ++++++++++++
 .../app/domain/user/port/out/LoadUserPort.java       |  9 +++++++++
 .../app/domain/user/port/out/SaveUserPort.java       |  7 +++++++
 5 files changed, 46 insertions(+)
 create mode 100644 src/main/java/popcong/app/domain/auth/model/OAuth2SignInCommand.java
 create mode 100644 src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
 create mode 100644 src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java
 create mode 100644 src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java
 create mode 100644 src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java

diff --git a/src/main/java/popcong/app/domain/auth/model/OAuth2SignInCommand.java b/src/main/java/popcong/app/domain/auth/model/OAuth2SignInCommand.java
new file mode 100644
index 0000000..13543d8
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/model/OAuth2SignInCommand.java
@@ -0,0 +1,9 @@
+package popcong.app.domain.auth.model;
+
+import popcong.app.domain.user.model.Provider;
+
+public record OAuth2SignInCommand(
+        Provider provider,
+        String providerId,
+        String email
+) {}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
new file mode 100644
index 0000000..c1c5593
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
@@ -0,0 +1,9 @@
+package popcong.app.domain.auth.port.in;
+
+import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.domain.user.model.User;
+
+// 로그인(사용자 인증 후 토큰 발급) 인터페이스
+public interface OAuth2SignInUseCase {
+    User signIn(OAuth2SignInCommand command);
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java b/src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java
new file mode 100644
index 0000000..02a7dad
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java
@@ -0,0 +1,12 @@
+package popcong.app.domain.auth.port.out;
+
+import popcong.app.domain.user.model.Provider;
+
+/**
+ * 카카오에서 제공하는 attributes 에서 정보 가져오기
+ */
+public interface OAuth2UserInfoPort {
+    Provider getProvider();
+    String getProviderId();
+    String getEmail();
+}
diff --git a/src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java b/src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java
new file mode 100644
index 0000000..3cc2bfd
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java
@@ -0,0 +1,9 @@
+package popcong.app.domain.user.port.out;
+
+import popcong.app.domain.user.model.User;
+
+import java.util.Optional;
+
+public interface LoadUserPort {
+    Optional<User> loadUserByEmail(String email);
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java b/src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java
new file mode 100644
index 0000000..b779f41
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java
@@ -0,0 +1,7 @@
+package popcong.app.domain.user.port.out;
+
+import popcong.app.domain.user.model.User;
+
+public interface SaveUserPort {
+    User saveUser(User user);
+}

From 773bc9bc73f42c2cc8ac2eb6284846c3431f1d86 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 18:44:07 +0900
Subject: [PATCH 28/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EB=B9=84=EC=A7=80=EB=8B=88=EC=8A=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EC=A7=81=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

로그인(회원가입) 비지니스 로직 작성
email 조회 후, 조회 결과가 없는 경우 save

related to: #5
---
 .../auth/service/OAuth2SignInService.java     | 46 +++++++++++++++++++
 .../app/domain/auth/model/SignUpCommand.java  |  8 ++++
 .../auth/port/in/OAuth2SignInUseCase.java     |  3 +-
 3 files changed, 56 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
 create mode 100644 src/main/java/popcong/app/domain/auth/model/SignUpCommand.java

diff --git a/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java b/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
new file mode 100644
index 0000000..603a296
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
@@ -0,0 +1,46 @@
+package popcong.app.application.auth.service;
+
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.domain.auth.model.SignUpCommand;
+import popcong.app.domain.auth.port.in.OAuth2SignInUseCase;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+import popcong.app.domain.user.port.out.LoadUserPort;
+import popcong.app.domain.user.port.out.SaveUserPort;
+
+import java.time.LocalDateTime;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class OAuth2SignInService implements OAuth2SignInUseCase {
+
+    private final LoadUserPort loadUserPort;
+    private final SaveUserPort saveUserPort;
+
+    @Override
+    public User signIn(OAuth2SignInCommand oAuth2Info, SignUpCommand userInfo) {
+        return loadUserPort.loadUserByEmail(oAuth2Info.email())
+                .orElseGet(() -> {
+                    User newUser = new User(
+                            null,
+                            oAuth2Info.provider(),
+                            oAuth2Info.providerId(),
+                            oAuth2Info.email(),
+                            userInfo.name(),
+                            userInfo.profileImageUrl(),
+                            userInfo.introduction(),
+                            Role.ROLE_USER,
+                            UserRole.GUEST,
+                            LocalDateTime.now(),
+                            null
+                    );
+                    return saveUserPort.saveUser(newUser);
+                });
+    }
+}
diff --git a/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java b/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java
new file mode 100644
index 0000000..eb58ec5
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java
@@ -0,0 +1,8 @@
+package popcong.app.domain.auth.model;
+
+public record SignUpCommand (
+        String name,
+        String introduction,
+        String profileImageUrl,
+        Boolean userRole
+) {}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
index c1c5593..acb3131 100644
--- a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
+++ b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
@@ -1,9 +1,10 @@
 package popcong.app.domain.auth.port.in;
 
 import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.domain.auth.model.SignUpCommand;
 import popcong.app.domain.user.model.User;
 
 // 로그인(사용자 인증 후 토큰 발급) 인터페이스
 public interface OAuth2SignInUseCase {
-    User signIn(OAuth2SignInCommand command);
+    User signIn(OAuth2SignInCommand oAuth2SignInCommand, SignUpCommand signUpCommand);
 }
\ No newline at end of file

From dafc9141c9f2595929dee1253d27b4193ef30e93 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 18:54:46 +0900
Subject: [PATCH 29/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EA=B4=80=EB=A0=A8=20repository=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

toDomain, toEntity Mapper 작성,
이메일 조회, 사용자 저장 repository 작성

related to: #5
---
 .../persistence/user/Mapper/UserMapper.java   | 43 +++++++++++++++++++
 .../user/repository/UserAdapter.java          | 31 +++++++++++++
 .../user/repository/UserJpaRepository.java    | 10 +++++
 3 files changed, 84 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java b/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java
new file mode 100644
index 0000000..964c80c
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java
@@ -0,0 +1,43 @@
+package popcong.app.adapter.out.persistence.user.Mapper;
+
+import org.springframework.stereotype.Component;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+import popcong.app.domain.user.model.User;
+
+@Component
+public class UserMapper {
+
+    // Entity -> Domain
+    public User toDomain(UserJpaEntity entity) {
+        return new User(
+                entity.getId(),
+                entity.getProvider(),
+                entity.getProviderId(),
+                entity.getEmail(),
+                entity.getName(),
+                entity.getProfileImageUrl(),
+                entity.getIntroduction(),
+                entity.getRole(),
+                entity.getUserRole(),
+                entity.getCreatedAt(),
+                entity.getDeletedAt()
+        );
+    }
+
+    // Domain -> Entity
+    public UserJpaEntity toEntity(User domain) {
+        return UserJpaEntity.builder()
+                .id(domain.id())
+                .provider(domain.provider())
+                .providerId(domain.providerId())
+                .email(domain.email())
+                .name(domain.name())
+                .profileImageUrl(domain.profileImageUrl())
+                .introduction(domain.introduction())
+                .role(domain.role())
+                .userRole(domain.userRole())
+                .createdAt(domain.createdAt())
+                .deletedAt(domain.deletedAt())
+                .build();
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
new file mode 100644
index 0000000..4117e20
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
@@ -0,0 +1,31 @@
+package popcong.app.adapter.out.persistence.user.repository;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import popcong.app.adapter.out.persistence.user.Mapper.UserMapper;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.port.out.LoadUserPort;
+import popcong.app.domain.user.port.out.SaveUserPort;
+
+import java.util.Optional;
+
+@Repository
+@RequiredArgsConstructor
+public class UserAdapter implements LoadUserPort, SaveUserPort {
+
+    private final UserJpaRepository userJpaRepository;
+    private final UserMapper userMapper;
+
+    @Override
+    public Optional<User> loadUserByEmail(String email) {
+        return userJpaRepository.findByEmail(email)
+                .map(userMapper::toDomain);
+    }
+
+    @Override
+    public User saveUser(User user) {
+        UserJpaEntity entity = userJpaRepository.save(userMapper.toEntity(user));
+        return userMapper.toDomain(entity);
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java
new file mode 100644
index 0000000..e86e68d
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java
@@ -0,0 +1,10 @@
+package popcong.app.adapter.out.persistence.user.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+
+import java.util.Optional;
+
+public interface UserJpaRepository extends JpaRepository<UserJpaEntity, Long> {
+    Optional<UserJpaEntity> findByEmail(String email);
+}

From 45ed2534fe3bbd7e62770218b1e6eaf54810eafa Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 19:13:04 +0900
Subject: [PATCH 30/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"kakao=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20=EA=B5=AC=ED=98=84=EC=B2=B4=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

providerId는 'kakao' 문자열을 앞에 추가,
getProvider, getEmail 인터페이스 구현체 작성,
BusinessException public 수정

related to: #5
---
 .../out/oauth/KakaoOAuth2UserInfo.java        | 40 +++++++++++++++++++
 .../out/oauth/OAuthUserInfoFactory.java       | 19 +++++++++
 .../exception/custom/BusinessException.java   |  2 +-
 3 files changed, 60 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java
 create mode 100644 src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java

diff --git a/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java b/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java
new file mode 100644
index 0000000..147e6c9
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java
@@ -0,0 +1,40 @@
+package popcong.app.adapter.out.oauth;
+
+import popcong.app.domain.auth.port.out.OAuth2UserInfoPort;
+import popcong.app.domain.user.model.Provider;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+import java.util.Map;
+
+public class KakaoOAuth2UserInfo implements OAuth2UserInfoPort {
+
+    private final Map<String, Object> attributes;
+
+    public KakaoOAuth2UserInfo(Map<String, Object> attributes) {
+        this.attributes = attributes;
+    }
+
+    @Override
+    public String getProviderId() {
+        return Provider.kakao + attributes.get("id").toString();
+    }
+
+    @Override
+    public Provider getProvider() {
+        return Provider.kakao;
+    }
+
+    @Override
+    public String getEmail() {
+        Object kakaoAccountObject = attributes.get("kakao_account");
+
+        if (!(kakaoAccountObject instanceof Map)) {
+            throw new BusinessException(AuthErrorCode.INVALID_KAKAO_RESPONSE);
+        }
+
+        Map<String, Object> kakaoAccount = (Map<String, Object>) kakaoAccountObject;
+
+        return (String) kakaoAccount.get("email");
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java b/src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java
new file mode 100644
index 0000000..7809221
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java
@@ -0,0 +1,19 @@
+package popcong.app.adapter.out.oauth;
+
+import lombok.Getter;
+import popcong.app.domain.user.model.Provider;
+
+import java.util.Map;
+
+@Getter
+public class OAuthUserInfoFactory {
+
+    public static OAuthUserInfoFactory of(
+            String registrationId,
+            Map<String, Object> attributes
+    ) {
+        if (Provider.kakao.toString().equals(registrationId)) {
+            return new Kakao
+        }
+    }
+}
diff --git a/src/main/java/popcong/app/global/exception/custom/BusinessException.java b/src/main/java/popcong/app/global/exception/custom/BusinessException.java
index ae4852e..6f56f4b 100644
--- a/src/main/java/popcong/app/global/exception/custom/BusinessException.java
+++ b/src/main/java/popcong/app/global/exception/custom/BusinessException.java
@@ -18,7 +18,7 @@ public BusinessException(String message, ErrorCode errorCode) {
         this.errorCode = errorCode;
     }
 
-    private BusinessException(ErrorCode errorCode) {
+    public BusinessException(ErrorCode errorCode) {
         super(errorCode != null ? errorCode.getMessage() : "Business Exception");
 
         if (errorCode == null) {

From 144fd029ceb446c0331f42687939c4297d69c043 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 19:17:07 +0900
Subject: [PATCH 31/81] =?UTF-8?q?=F0=9F=94=A8=20fix:=20"OAuth2UserInfoFact?=
 =?UTF-8?q?ory=20=EC=BD=94=EB=93=9C=20=EB=88=84=EB=9D=BD=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

OAuth2UserInfoFactory 오류 해결

related to: #5
---
 .../out/oauth/OAuth2UserInfoFactory.java      | 26 +++++++++++++++++++
 .../out/oauth/OAuthUserInfoFactory.java       | 19 --------------
 2 files changed, 26 insertions(+), 19 deletions(-)
 create mode 100644 src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java
 delete mode 100644 src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java

diff --git a/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java b/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java
new file mode 100644
index 0000000..c737d34
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java
@@ -0,0 +1,26 @@
+package popcong.app.adapter.out.oauth;
+
+import lombok.Getter;
+import popcong.app.domain.auth.port.out.OAuth2UserInfoPort;
+import popcong.app.domain.user.model.Provider;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+import java.util.Map;
+
+@Getter
+public class OAuth2UserInfoFactory {
+
+    public static OAuth2UserInfoPort of(
+            String registrationId,
+            Map<String, Object> attributes
+    ) {
+        if (Provider.kakao.toString().equals(registrationId)) {
+            return new KakaoOAuth2UserInfo(attributes);
+        }
+
+        // google, naver, apple 확장 가능
+
+        throw new BusinessException(AuthErrorCode.UNSUPPORTED_SOCIAL_LOGIN);
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java b/src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java
deleted file mode 100644
index 7809221..0000000
--- a/src/main/java/popcong/app/adapter/out/oauth/OAuthUserInfoFactory.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package popcong.app.adapter.out.oauth;
-
-import lombok.Getter;
-import popcong.app.domain.user.model.Provider;
-
-import java.util.Map;
-
-@Getter
-public class OAuthUserInfoFactory {
-
-    public static OAuthUserInfoFactory of(
-            String registrationId,
-            Map<String, Object> attributes
-    ) {
-        if (Provider.kakao.toString().equals(registrationId)) {
-            return new Kakao
-        }
-    }
-}

From 8b3cd3711b0b3818438fa17d1c1d5d491a95be10 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 19:40:49 +0900
Subject: [PATCH 32/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"oauth2=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20CustomUserDetails=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

CustomUserDetails 작성

related to: #5
---
 .../app/adapter/in/jwt/CustomUserDetails.java | 81 +++++++++++++++++++
 1 file changed, 81 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/CustomUserDetails.java

diff --git a/src/main/java/popcong/app/adapter/in/jwt/CustomUserDetails.java b/src/main/java/popcong/app/adapter/in/jwt/CustomUserDetails.java
new file mode 100644
index 0000000..9a76da6
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/CustomUserDetails.java
@@ -0,0 +1,81 @@
+package popcong.app.adapter.in.jwt;
+
+import lombok.Getter;
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import popcong.app.domain.user.model.User;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Map;
+
+@Getter
+public class CustomUserDetails implements UserDetails, OAuth2User {
+
+    private final User user;
+    private Map<String, Object> attributes;
+
+    public CustomUserDetails(
+            User user,
+            Map<String, Object> attributes
+    ) {
+        this.user = user;
+        this.attributes = attributes;
+    }
+
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return Collections.singleton(new SimpleGrantedAuthority(user.role().name()));
+    }
+
+    /**
+     * UserDetails 인터페이스 구현
+     */
+    @Override
+    public String getUsername() {
+        return user.email();
+    }
+
+    @Override
+    public String getPassword() {
+        return null;
+    }
+
+    @Override
+    public boolean isAccountNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isAccountNonLocked() {
+        return true;
+    }
+
+    @Override
+    public boolean isCredentialsNonExpired() {
+        return true;
+    }
+
+    @Override
+    public boolean isEnabled() {
+        return true;
+    }
+
+    /**
+     * OAuth2User 인터페이스 구현
+     */
+    @Override
+    public Map<String, Object> getAttributes() {
+        return attributes;
+    }
+
+    @Override
+    public String getName() {
+        return user.name();
+    }
+
+
+}

From 46097ab48aaf2595e520518a24c1d7238ebc1cde Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 20:07:08 +0900
Subject: [PATCH 33/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"oauth2=20?=
 =?UTF-8?q?=EC=84=B1=EA=B3=B5=20=ED=95=B8=EB=93=A4=EB=9F=AC=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OAuth2SuccessHandler 작성

related to: #5
---
 .../in/jwt/handler/OAuth2SuccessHandler.java  | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java

diff --git a/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java b/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
new file mode 100644
index 0000000..aa11b2d
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
@@ -0,0 +1,58 @@
+package popcong.app.adapter.in.jwt.handler;
+
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
+import org.springframework.stereotype.Component;
+import org.springframework.web.util.UriComponentsBuilder;
+import popcong.app.adapter.in.jwt.CustomUserDetails;
+import popcong.app.adapter.out.jwt.JwtUtils;
+import popcong.app.domain.auth.model.AuthInfo;
+import popcong.app.domain.user.model.User;
+
+import java.io.IOException;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
+
+    private final JwtUtils jwtUtils;
+
+    @Override
+    public void onAuthenticationSuccess(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            Authentication authentication
+    ) throws ServletException, IOException {
+
+        // 사용자 정보 불러오기
+        CustomUserDetails customUserDetails = (CustomUserDetails) authentication.getPrincipal();
+        User user = customUserDetails.getUser();
+
+        // AuthInfo 생성
+        AuthInfo authInfo = AuthInfo.from(user);
+
+        // JWT 발급
+        String accessToken = jwtUtils.generateAccessToken(authInfo);
+        String refreshToken = jwtUtils.generateRefreshToken(authInfo);
+
+        log.info("로그인 성공");
+        log.info("accessToken: {}", accessToken);
+        log.info("refreshToken: {}", refreshToken);
+
+        // RedirectUrl 생성 (frontend)
+        String redirectUrl = UriComponentsBuilder.fromUriString("http://localhost:8080/swagger-ui.html")
+                .queryParam("accessToken", accessToken)
+                .queryParam("refreshToken", refreshToken)
+                .build()
+                .toUriString();
+
+        // redirect
+        getRedirectStrategy().sendRedirect(request, response, redirectUrl);
+    }
+}
\ No newline at end of file

From 9fb2e7930038b5dc644a525ca9acf0eb43317175 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 20:27:10 +0900
Subject: [PATCH 34/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=9D=B8?=
 =?UTF-8?q?=EC=A6=9D=20=EA=B4=80=EB=A0=A8=20service,=20interface=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

signIn은 stash 정도만, signUp에서 사용자 저장할 수 있도록 분기

related to: #5
---
 .../auth/service/OAuth2SignInService.java     | 18 +++-----
 .../auth/service/OAuth2SignUpService.java     | 46 +++++++++++++++++++
 .../app/domain/auth/model/SignUpCommand.java  |  2 +-
 .../auth/port/in/OAuth2SignInUseCase.java     |  3 +-
 .../auth/port/in/OAuth2SignUpUseCase.java     |  9 ++++
 5 files changed, 64 insertions(+), 14 deletions(-)
 create mode 100644 src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java
 create mode 100644 src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java

diff --git a/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java b/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
index 603a296..1d965c3 100644
--- a/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
+++ b/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
@@ -2,18 +2,14 @@
 
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import popcong.app.domain.auth.model.OAuth2SignInCommand;
-import popcong.app.domain.auth.model.SignUpCommand;
 import popcong.app.domain.auth.port.in.OAuth2SignInUseCase;
 import popcong.app.domain.user.model.Role;
 import popcong.app.domain.user.model.User;
 import popcong.app.domain.user.model.UserRole;
 import popcong.app.domain.user.port.out.LoadUserPort;
-import popcong.app.domain.user.port.out.SaveUserPort;
 
-import java.time.LocalDateTime;
 
 @Service
 @Transactional
@@ -21,26 +17,24 @@
 public class OAuth2SignInService implements OAuth2SignInUseCase {
 
     private final LoadUserPort loadUserPort;
-    private final SaveUserPort saveUserPort;
 
     @Override
-    public User signIn(OAuth2SignInCommand oAuth2Info, SignUpCommand userInfo) {
+    public User signIn(OAuth2SignInCommand oAuth2Info) {
         return loadUserPort.loadUserByEmail(oAuth2Info.email())
                 .orElseGet(() -> {
-                    User newUser = new User(
+                    return new User(
                             null,
                             oAuth2Info.provider(),
                             oAuth2Info.providerId(),
                             oAuth2Info.email(),
-                            userInfo.name(),
-                            userInfo.profileImageUrl(),
-                            userInfo.introduction(),
+                            "GUEST",
+                            null,
+                            null,
                             Role.ROLE_USER,
                             UserRole.GUEST,
-                            LocalDateTime.now(),
+                            null,
                             null
                     );
-                    return saveUserPort.saveUser(newUser);
                 });
     }
 }
diff --git a/src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java b/src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java
new file mode 100644
index 0000000..e6d58de
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java
@@ -0,0 +1,46 @@
+package popcong.app.application.auth.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.domain.auth.model.SignUpCommand;
+import popcong.app.domain.auth.port.in.OAuth2SignUpUseCase;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+import popcong.app.domain.user.port.out.LoadUserPort;
+import popcong.app.domain.user.port.out.SaveUserPort;
+
+import java.time.LocalDateTime;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class OAuth2SignUpService implements OAuth2SignUpUseCase {
+
+    private final SaveUserPort saveUserPort;
+    private final LoadUserPort loadUserPort;
+
+    @Override
+    public User signUp(OAuth2SignInCommand oAuth2Info, SignUpCommand userInfo) {
+        if (loadUserPort.loadUserByEmail(oAuth2Info.email()).isPresent()) {
+            throw new IllegalArgumentException("이미 가입된 이메일입니다.");
+        }
+
+        User newUser = new User(
+                null,
+                oAuth2Info.provider(),
+                oAuth2Info.providerId(),
+                oAuth2Info.email(),
+                userInfo.name(),
+                userInfo.profileImageUrl(),
+                userInfo.introduction(),
+                Role.ROLE_USER,
+                (userInfo.isUploaded()) ? UserRole.PENDING : UserRole.GUEST,
+                LocalDateTime.now(),
+                null
+        );
+        return saveUserPort.saveUser(newUser);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java b/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java
index eb58ec5..ff9e3e2 100644
--- a/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java
+++ b/src/main/java/popcong/app/domain/auth/model/SignUpCommand.java
@@ -4,5 +4,5 @@ public record SignUpCommand (
         String name,
         String introduction,
         String profileImageUrl,
-        Boolean userRole
+        Boolean isUploaded
 ) {}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
index acb3131..938f21e 100644
--- a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
+++ b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
@@ -6,5 +6,6 @@
 
 // 로그인(사용자 인증 후 토큰 발급) 인터페이스
 public interface OAuth2SignInUseCase {
-    User signIn(OAuth2SignInCommand oAuth2SignInCommand, SignUpCommand signUpCommand);
+    // 카카오 정보만으로 로그인 및 기본 사용자 생성
+    User signIn(OAuth2SignInCommand oAuth2SignInCommand);
 }
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java
new file mode 100644
index 0000000..c4bbabd
--- /dev/null
+++ b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java
@@ -0,0 +1,9 @@
+package popcong.app.domain.auth.port.in;
+
+import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.domain.auth.model.SignUpCommand;
+import popcong.app.domain.user.model.User;
+
+public interface OAuth2SignUpUseCase {
+    User signUp(OAuth2SignInCommand oAuth2SignInCommand, SignUpCommand signUpCommand);
+}

From a1db47dec34b2f700258415e747fe5ff9d981ee5 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Wed, 13 Aug 2025 20:28:15 +0900
Subject: [PATCH 35/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"OAuth2?=
 =?UTF-8?q?=20=EA=B4=80=EB=A0=A8=20=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SecurityConfig 에서 oauth2 관련 핸들러, 서비스 추가

related to: #5
---
 .../app/infra/config/security/SecurityConfig.java     | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
index 890060b..e37c78b 100644
--- a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
+++ b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
@@ -9,9 +9,11 @@
 import org.springframework.security.config.http.SessionCreationPolicy;
 import org.springframework.security.web.SecurityFilterChain;
 import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+import popcong.app.adapter.in.jwt.CustomOAuth2UserService;
 import popcong.app.adapter.in.jwt.JwtFilter;
 import popcong.app.adapter.in.jwt.handler.AuthenticationFailureHandler;
 import popcong.app.adapter.in.jwt.handler.AuthorizationFailureHandler;
+import popcong.app.adapter.in.jwt.handler.OAuth2SuccessHandler;
 
 @Configuration
 @EnableWebSecurity
@@ -25,6 +27,9 @@ public class SecurityConfig {
     private final AuthenticationFailureHandler authenticationFailureHandler;
     private final AuthorizationFailureHandler authorizationFailureHandler;
 
+    private final CustomOAuth2UserService customOAuth2UserService;
+    private final OAuth2SuccessHandler oAuth2SuccessHandler;
+
     /**
      * SpringSecurity 보안 규칙 설정
      * CSRF 비활성화
@@ -55,7 +60,13 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .exceptionHandling(exceptions ->
                         exceptions.authenticationEntryPoint(authenticationFailureHandler)
                                 .accessDeniedHandler(authorizationFailureHandler)
+                )
+                .oauth2Login(oauth2 ->
+                        oauth2.userInfoEndpoint(userInfo ->
+                                userInfo.userService(customOAuth2UserService)
+                        ).successHandler(oAuth2SuccessHandler)
                 );
+        ;
 
         return http.build();
     }

From 50b9a6b7c60ec8c047ea5e3fac950cc2b17f246d Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Thu, 14 Aug 2025 02:09:03 +0900
Subject: [PATCH 36/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"enum=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

각 테이블에 있는 enum 생성

related to: #6
---
 .../popcong/app/domain/image/model/ImageableType.java    | 7 +++++++
 .../java/popcong/app/domain/space/model/PopupStatus.java | 9 +++++++++
 .../java/popcong/app/domain/space/model/PopupType.java   | 9 +++++++++
 .../app/domain/space/model/ReservationStatus.java        | 8 ++++++++
 .../app/domain/space/model/SpaceApplicationType.java     | 6 ++++++
 .../java/popcong/app/domain/space/model/SpaceType.java   | 8 ++++++++
 src/main/java/popcong/app/domain/space/model/Status.java | 6 ++++++
 .../popcong/app/domain/user/model/NotificationType.java  | 8 ++++++++
 .../java/popcong/app/domain/user/model/Provider.java     | 5 +++++
 src/main/java/popcong/app/domain/user/model/Role.java    | 6 ++++++
 .../java/popcong/app/domain/user/model/UserRole.java     | 7 +++++++
 11 files changed, 79 insertions(+)
 create mode 100644 src/main/java/popcong/app/domain/image/model/ImageableType.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/PopupStatus.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/PopupType.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/ReservationStatus.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/SpaceApplicationType.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/SpaceType.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/Status.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/NotificationType.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/Provider.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/Role.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/UserRole.java

diff --git a/src/main/java/popcong/app/domain/image/model/ImageableType.java b/src/main/java/popcong/app/domain/image/model/ImageableType.java
new file mode 100644
index 0000000..6ce17b0
--- /dev/null
+++ b/src/main/java/popcong/app/domain/image/model/ImageableType.java
@@ -0,0 +1,7 @@
+package popcong.app.domain.image.model;
+
+public enum ImageableType {
+    PROFILE,
+    SPACE,
+    POPUP
+}
diff --git a/src/main/java/popcong/app/domain/space/model/PopupStatus.java b/src/main/java/popcong/app/domain/space/model/PopupStatus.java
new file mode 100644
index 0000000..bb48584
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/PopupStatus.java
@@ -0,0 +1,9 @@
+package popcong.app.domain.space.model;
+
+public enum PopupStatus {
+    PREPARING, // 시작 전
+    IN_PROGRESS, // 진행중
+    HOLIDAY, // 휴무
+    DONE, // 종료
+    CANCELED // 취소
+}
diff --git a/src/main/java/popcong/app/domain/space/model/PopupType.java b/src/main/java/popcong/app/domain/space/model/PopupType.java
new file mode 100644
index 0000000..096e3e4
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/PopupType.java
@@ -0,0 +1,9 @@
+package popcong.app.domain.space.model;
+
+public enum PopupType {
+    POPUP_STORE, // 팝업스토어
+    EXHIBITION, // 전시
+    PERFORMANCE, // 공연
+    EVENT, // 행사
+    EDUCATION // 교육
+}
diff --git a/src/main/java/popcong/app/domain/space/model/ReservationStatus.java b/src/main/java/popcong/app/domain/space/model/ReservationStatus.java
new file mode 100644
index 0000000..c75f2ea
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/ReservationStatus.java
@@ -0,0 +1,8 @@
+package popcong.app.domain.space.model;
+
+public enum ReservationStatus {
+    BOOKING, // 예약중
+    IN_PROGRESS, // 진행중
+    DONE, // 완료
+    CANCELLED, // 취소
+}
diff --git a/src/main/java/popcong/app/domain/space/model/SpaceApplicationType.java b/src/main/java/popcong/app/domain/space/model/SpaceApplicationType.java
new file mode 100644
index 0000000..85f3223
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/SpaceApplicationType.java
@@ -0,0 +1,6 @@
+package popcong.app.domain.space.model;
+
+public enum SpaceApplicationType {
+    COMMERCIAL, // 근린생활시설
+    FACILITIES // 상업시설
+}
diff --git a/src/main/java/popcong/app/domain/space/model/SpaceType.java b/src/main/java/popcong/app/domain/space/model/SpaceType.java
new file mode 100644
index 0000000..69ed4ee
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/SpaceType.java
@@ -0,0 +1,8 @@
+package popcong.app.domain.space.model;
+
+public enum SpaceType {
+    BUILDING, // 상가
+    WHOLE, // 단독
+    PLACE // 부지
+
+}
diff --git a/src/main/java/popcong/app/domain/space/model/Status.java b/src/main/java/popcong/app/domain/space/model/Status.java
new file mode 100644
index 0000000..4870ae9
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/Status.java
@@ -0,0 +1,6 @@
+package popcong.app.domain.space.model;
+
+public enum Status {
+    AVAILABLE,
+    RESERVED
+}
diff --git a/src/main/java/popcong/app/domain/user/model/NotificationType.java b/src/main/java/popcong/app/domain/user/model/NotificationType.java
new file mode 100644
index 0000000..a727dcf
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/NotificationType.java
@@ -0,0 +1,8 @@
+package popcong.app.domain.user.model;
+
+public enum NotificationType {
+    CHAT,
+    RESERVATION,
+    NORMAL,
+    REVIEW
+}
diff --git a/src/main/java/popcong/app/domain/user/model/Provider.java b/src/main/java/popcong/app/domain/user/model/Provider.java
new file mode 100644
index 0000000..9400771
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/Provider.java
@@ -0,0 +1,5 @@
+package popcong.app.domain.user.model;
+
+public enum Provider {
+    KAKAO
+}
diff --git a/src/main/java/popcong/app/domain/user/model/Role.java b/src/main/java/popcong/app/domain/user/model/Role.java
new file mode 100644
index 0000000..87364d9
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/Role.java
@@ -0,0 +1,6 @@
+package popcong.app.domain.user.model;
+
+public enum Role {
+    ROLE_USER,
+    ROLE_ADMIN
+}
diff --git a/src/main/java/popcong/app/domain/user/model/UserRole.java b/src/main/java/popcong/app/domain/user/model/UserRole.java
new file mode 100644
index 0000000..6745d05
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/UserRole.java
@@ -0,0 +1,7 @@
+package popcong.app.domain.user.model;
+
+public enum UserRole {
+    GUEST,
+    HOST,
+    PENDING
+}

From b8600d748981da27d66434b80c15b46f241157ad Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Thu, 14 Aug 2025 02:16:00 +0900
Subject: [PATCH 37/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=97=94?=
 =?UTF-8?q?=ED=8B=B0=ED=8B=B0=20=EC=83=9D=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

각 테이블 엔티티 작성

related to: #6
---
 .../chat/entity/ChatJpaEntity.java            | 47 ++++++++++
 .../image/entity/ImageJpaEntity.java          | 42 +++++++++
 .../space/entity/PopupJpaEntity.java          | 59 ++++++++++++
 .../space/entity/ReservationJpaEntity.java    | 48 ++++++++++
 .../entity/ReservationReviewJpaEntity.java    | 37 ++++++++
 .../space/entity/SpaceJpaEntity.java          | 91 +++++++++++++++++++
 .../user/entity/NotificationJpaEntity.java    | 53 +++++++++++
 .../user/entity/WishlistJpaEntity.java        | 39 ++++++++
 8 files changed, 416 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/chat/entity/ChatJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/image/entity/ImageJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/entity/PopupJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationReviewJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/entity/NotificationJpaEntity.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/entity/WishlistJpaEntity.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/chat/entity/ChatJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/chat/entity/ChatJpaEntity.java
new file mode 100644
index 0000000..173edd0
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/chat/entity/ChatJpaEntity.java
@@ -0,0 +1,47 @@
+package popcong.app.adapter.out.persistence.chat.entity;
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "CHAT")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ChatJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "chatId", nullable = false)
+    private Long chatId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "guestId", nullable = false)
+    private UserJpaEntity guest;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "hostId", nullable = false)
+    private UserJpaEntity host;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "spaceId", nullable = false)
+    private SpaceJpaEntity space;
+
+    @Builder.Default
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(name = "lastMessageAt", nullable = false)
+    private LocalDateTime lastMessageAt;
+
+    @Column(name = "lastReadAt", nullable = false)
+    private LocalDateTime lastReadAt;
+
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/image/entity/ImageJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/image/entity/ImageJpaEntity.java
new file mode 100644
index 0000000..8e3fb89
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/image/entity/ImageJpaEntity.java
@@ -0,0 +1,42 @@
+package popcong.app.adapter.out.persistence.image.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.domain.image.model.ImageableType;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "IMAGE")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class ImageJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "imageId", nullable = false)
+    private Long imageId;
+
+    @Column(name = "imageUrl", nullable = false, length = 1000)
+    private String imageUrl;
+
+    @Column(name = "saveOrder", nullable = false)
+    private Integer saveOrder;
+
+    @Builder.Default
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt = LocalDateTime.now();
+
+    @Column(name = "imageableId", nullable = false)
+    private Long imageableId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "imageableType", nullable = false)
+    private ImageableType imageableType;
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/entity/PopupJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/space/entity/PopupJpaEntity.java
new file mode 100644
index 0000000..3fe3554
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/entity/PopupJpaEntity.java
@@ -0,0 +1,59 @@
+package popcong.app.adapter.out.persistence.space.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.domain.space.model.PopupStatus;
+import popcong.app.domain.space.model.PopupType;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "POPUP")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class PopupJpaEntity {
+
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "popupId", nullable = false)
+    private Long popupId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "reservationId", nullable = false)
+    private ReservationJpaEntity reservation;
+
+    @Column(name = "name", nullable = false, length = 100)
+    private String name;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "popupStatus", nullable = false)
+    private PopupStatus popupStatus;
+
+    @Column(name = "address", nullable = false, length = 100)
+    private String address;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "popupType", nullable = false)
+    private PopupType popupType;
+
+    @Builder.Default
+    @Column(name = "price", nullable = false)
+    private Integer price = 0;
+
+    @Column(name = "startDate", nullable = false)
+    private LocalDateTime startDate;
+
+    @Column(name = "endDate", nullable = false)
+    private LocalDateTime endDate;
+
+    @Builder.Default
+    @Column(name = "views", nullable = false)
+    private Integer views = 0;
+}
+
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationJpaEntity.java
new file mode 100644
index 0000000..2f55f30
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationJpaEntity.java
@@ -0,0 +1,48 @@
+package popcong.app.adapter.out.persistence.space.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+import popcong.app.domain.space.model.ReservationStatus;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "RESERVATION")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReservationJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "reservationId")
+    private Long reservationId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", nullable = false)
+    private UserJpaEntity user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "spaceId", nullable = false)
+    private SpaceJpaEntity space;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "reservationStatus", nullable = false)
+    private ReservationStatus reservationStatus;
+
+    @Column(name = "startDate", nullable = false)
+    private LocalDateTime startDate;
+
+    @Column(name = "endDate", nullable = false)
+    private LocalDateTime endDate;
+
+    @Column(name = "deposit", nullable = false)
+    private Integer deposit;
+
+    @Column(name = "totalRentalFee", nullable = false)
+    private Integer totalRentalFee;
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationReviewJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationReviewJpaEntity.java
new file mode 100644
index 0000000..d1440d1
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/entity/ReservationReviewJpaEntity.java
@@ -0,0 +1,37 @@
+package popcong.app.adapter.out.persistence.space.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.adapter.out.persistence.space.entity.ReservationJpaEntity;
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "RESERVATION_REVIEW")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class ReservationReviewJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "reservationReviewId", nullable = false)
+    private Long reservationReviewId;
+
+    @OneToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "reservationId", nullable = false)
+    private ReservationJpaEntity reservation;
+
+    @Builder.Default
+    @Column(name = "rating", nullable = false)
+    private Double rating =0.0;
+
+    @Column(name = "description", columnDefinition = "TEXT")
+    private String description;
+
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt;
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java
new file mode 100644
index 0000000..d60b271
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java
@@ -0,0 +1,91 @@
+package popcong.app.adapter.out.persistence.space.entity;
+
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+import popcong.app.domain.space.model.PopupType;
+import popcong.app.domain.space.model.SpaceApplicationType;
+import popcong.app.domain.space.model.SpaceType;
+import popcong.app.domain.space.model.Status;
+
+
+@Entity
+@Table(name = "SPACE")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class SpaceJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "spaceId")
+    private Long spaceId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", nullable = false)
+    private UserJpaEntity user;
+
+    @Column(name = "spaceName", nullable = false, length = 50)
+    private String spaceName;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "spaceType", nullable = false)
+    private SpaceType spaceType;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "spaceApplicationType", nullable = false)
+    private SpaceApplicationType spaceApplicationType; // 공간 유형
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "spaceRentalType", nullable = false)
+    private PopupType spaceRentalType;
+
+    @Builder.Default
+    @Column(name = "imageCount", nullable = false)
+    private Integer imageCount = 0;
+
+    @Column(name = "description", nullable = false, columnDefinition = "TEXT")
+    private String description;
+
+    @Builder.Default
+    @Column(name = "deposit", nullable = false)
+    private Integer deposit = 0;
+
+    @Builder.Default
+    @Column(name = "rentalFee", nullable = false)
+    private Integer rentalFee = 0;
+
+    @Column(name = "floor")
+    private Integer floor;
+
+    @Column(name = "area", nullable = false)
+    private Double area;
+
+    @Builder.Default
+    @Column(name = "rating", nullable = false)
+    private Double rating = 0.0;
+
+    @Column(name = "address", nullable = false, length = 50)
+    private String address;
+
+    @Column(name = "latitude", nullable = false)
+    private Double latitude;
+
+    @Column(name = "longitude", nullable = false)
+    private Double longitude;
+
+    @Builder.Default
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", nullable = false)
+    private Status status = Status.AVAILABLE;
+
+    @Builder.Default
+    @Column(name = "views", nullable = false)
+    private Integer views = 0;
+}
+
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/NotificationJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/NotificationJpaEntity.java
new file mode 100644
index 0000000..3dcbb37
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/NotificationJpaEntity.java
@@ -0,0 +1,53 @@
+package popcong.app.adapter.out.persistence.user.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
+import popcong.app.domain.user.model.NotificationType;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "NOTIFICATION")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+
+public class NotificationJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "notificationId", nullable = false)
+    private Long notificationId;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", nullable = false)
+    private UserJpaEntity user;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "spaceId", nullable = false)
+    private SpaceJpaEntity space;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "notificationType", nullable = false)
+    private NotificationType notificationType;
+
+    @Column(name = "message", nullable = false, length = 225)
+    private String message;
+
+    @Column(name = "url", nullable = false, length = 225)
+    private String url;
+
+    @Builder.Default
+    @Column(name = "isRead", nullable = false)
+    private Boolean isRead = false;
+
+    @Builder.Default
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt = LocalDateTime.now();
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/WishlistJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/WishlistJpaEntity.java
new file mode 100644
index 0000000..390e4f8
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/WishlistJpaEntity.java
@@ -0,0 +1,39 @@
+package popcong.app.adapter.out.persistence.user.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "WISHLIST")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class WishlistJpaEntity {
+
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long wishlistId;
+
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "userId", nullable = false)
+    private UserJpaEntity user;
+
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "spaceId", nullable = false)
+    private SpaceJpaEntity space;
+
+
+    @Builder.Default
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt = LocalDateTime.now();
+}

From d610a3dc4b3f7a964174576ba78ff99c20989e2c Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Thu, 14 Aug 2025 02:16:33 +0900
Subject: [PATCH 38/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"User=20=EC=97=94?=
 =?UTF-8?q?=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

User 엔티티 추가

related to: #6
---
 .../user/entity/UserJpaEntity.java            | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
new file mode 100644
index 0000000..20d407b
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
@@ -0,0 +1,62 @@
+package popcong.app.adapter.out.persistence.user.entity;
+
+import jakarta.persistence.*;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import popcong.app.domain.user.model.Provider;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.UserRole;
+
+import java.time.LocalDateTime;
+
+@Entity
+@Table(name = "USER")
+@Getter
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+public class UserJpaEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Column(name = "usertId", nullable = false)
+    private Long userId;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "provider", nullable = false)
+    private Provider provider;
+
+    @Column(name = "providerId", nullable = false, unique = true, length = 50)
+    private String providerId;
+
+    @Column(name = "email", nullable = false, unique = true, length = 50)
+    private String email;
+
+    @Column(name = "name", nullable = false, length = 10)
+    private String name;
+
+    @Column(name = "profileImageUrl")
+    private String profileImageUrl;
+
+    @Column(name = "introduction", length = 1000)
+    private String introduction;
+
+    @Builder.Default
+    @Enumerated(EnumType.STRING)
+    @Column(name = "role", nullable = false)
+    private Role role = Role.ROLE_USER;
+
+    @Builder.Default
+    @Enumerated(EnumType.STRING)
+    @Column(name = "userRole", nullable = false)
+    private UserRole userRole = UserRole.GUEST;
+
+    @Builder.Default
+    @Column(name = "createdAt", nullable = false)
+    private LocalDateTime createdAt =  LocalDateTime.now();
+
+    @Column(name = "deletedAt")
+    private LocalDateTime deletedAt;
+}
\ No newline at end of file

From 53515343e8ba2d48bcd9194650a6b66b34addb42 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Thu, 14 Aug 2025 02:56:44 +0900
Subject: [PATCH 39/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"model=20=EC=83=9D?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

각 테이블 model 생성

related to: #6
---
 .../popcong/app/domain/chat/model/Chat.java   | 14 ++++++++++
 .../popcong/app/domain/image/model/Image.java | 13 ++++++++++
 .../popcong/app/domain/space/model/Popup.java | 17 ++++++++++++
 .../app/domain/space/model/Reservation.java   | 17 ++++++++++++
 .../domain/space/model/ReservationReview.java | 12 +++++++++
 .../popcong/app/domain/space/model/Space.java | 26 +++++++++++++++++++
 .../app/domain/user/model/Notification.java   | 14 ++++++++++
 .../popcong/app/domain/user/model/User.java   | 18 +++++++++++++
 .../app/domain/user/model/Wishlist.java       | 11 ++++++++
 9 files changed, 142 insertions(+)
 create mode 100644 src/main/java/popcong/app/domain/chat/model/Chat.java
 create mode 100644 src/main/java/popcong/app/domain/image/model/Image.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/Popup.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/Reservation.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/ReservationReview.java
 create mode 100644 src/main/java/popcong/app/domain/space/model/Space.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/Notification.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/User.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/Wishlist.java

diff --git a/src/main/java/popcong/app/domain/chat/model/Chat.java b/src/main/java/popcong/app/domain/chat/model/Chat.java
new file mode 100644
index 0000000..e997e55
--- /dev/null
+++ b/src/main/java/popcong/app/domain/chat/model/Chat.java
@@ -0,0 +1,14 @@
+package popcong.app.domain.chat.model;
+
+import java.time.LocalDateTime;
+
+public record Chat(
+        Long chatId,
+        Long guestId,
+        Long hostId,
+        Long spaceId,
+        LocalDateTime createdAt,
+        LocalDateTime lastMessageAt,
+        LocalDateTime lastReadAt
+) {
+}
diff --git a/src/main/java/popcong/app/domain/image/model/Image.java b/src/main/java/popcong/app/domain/image/model/Image.java
new file mode 100644
index 0000000..41dff5c
--- /dev/null
+++ b/src/main/java/popcong/app/domain/image/model/Image.java
@@ -0,0 +1,13 @@
+package popcong.app.domain.image.model;
+
+import java.time.LocalDateTime;
+
+public record Image(
+        Long imageId,
+        String imageUrl,
+        Integer saveOrder,//저장순서
+        Long imageableId, //이미지가 연결된 대상의 ID
+        ImageableType imageableType, //이미지가 연결된 테이블 타입
+        LocalDateTime createdAt //저장일시
+) {
+}
diff --git a/src/main/java/popcong/app/domain/space/model/Popup.java b/src/main/java/popcong/app/domain/space/model/Popup.java
new file mode 100644
index 0000000..11836c5
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/Popup.java
@@ -0,0 +1,17 @@
+package popcong.app.domain.space.model;
+
+import java.time.LocalDateTime;
+
+public record Popup(
+        Long popupId,
+        Long reservationId,
+        String name,
+        PopupStatus popupStatus,
+        String address,
+        PopupType popupType,
+        Integer price,
+        LocalDateTime startDate,
+        LocalDateTime endDate,
+        Integer views
+) {
+}
diff --git a/src/main/java/popcong/app/domain/space/model/Reservation.java b/src/main/java/popcong/app/domain/space/model/Reservation.java
new file mode 100644
index 0000000..b6845cf
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/Reservation.java
@@ -0,0 +1,17 @@
+package popcong.app.domain.space.model;
+
+import java.time.LocalDateTime;
+
+public record Reservation(
+        Long reservationId,
+        Long userId,
+        Long spaceId,
+        LocalDateTime reservationDate, //예약 확정 날짜
+        LocalDateTime startTime, //사용 시작 날짜
+        LocalDateTime endTime, //사용 종료 날짜
+        ReservationStatus status,
+        Integer totalRentalFee, //대여료
+        Integer Deposit //보증금
+
+) {
+}
diff --git a/src/main/java/popcong/app/domain/space/model/ReservationReview.java b/src/main/java/popcong/app/domain/space/model/ReservationReview.java
new file mode 100644
index 0000000..92d7b5c
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/ReservationReview.java
@@ -0,0 +1,12 @@
+package popcong.app.domain.space.model;
+
+import java.time.LocalDateTime;
+
+public record ReservationReview(
+        Long reservationReviewId,
+        Long reservationId,
+        Double rating,
+        String description,
+        LocalDateTime createdAt
+) {
+}
diff --git a/src/main/java/popcong/app/domain/space/model/Space.java b/src/main/java/popcong/app/domain/space/model/Space.java
new file mode 100644
index 0000000..ebd7391
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/Space.java
@@ -0,0 +1,26 @@
+package popcong.app.domain.space.model;
+
+import java.time.LocalDateTime;
+
+public record Space(
+        Long spaceId,
+        Long userId,
+        String spaceName,
+        SpaceType spaceType,
+        SpaceApplicationType spaceApplicationType,
+        PopupType spaceRentalType,
+        Integer imageCount,
+        String description,
+        Integer deposit,
+        Integer rentalFee,
+        Integer floor,
+        Double area,
+        Double rating,
+        String address,
+        Double latitude,
+        Double longitude,
+        Status status,
+        Integer views,
+        LocalDateTime createdAt
+) {
+}
diff --git a/src/main/java/popcong/app/domain/user/model/Notification.java b/src/main/java/popcong/app/domain/user/model/Notification.java
new file mode 100644
index 0000000..f4bf718
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/Notification.java
@@ -0,0 +1,14 @@
+package popcong.app.domain.user.model;
+
+import java.time.LocalDateTime;
+
+public record Notification(
+        Long notificationId,
+        Long userId,
+        NotificationType notificationType,
+        String message,
+        String url,
+        boolean isRead,
+        LocalDateTime createdAt
+) {
+}
diff --git a/src/main/java/popcong/app/domain/user/model/User.java b/src/main/java/popcong/app/domain/user/model/User.java
new file mode 100644
index 0000000..6d3ac62
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/User.java
@@ -0,0 +1,18 @@
+package popcong.app.domain.user.model;
+
+import java.time.LocalDateTime;
+
+public record User(
+        Long id,
+        Provider provider, //소셜로그인 제공자
+        String providerId, //소셜로그인에서 제공받은 ID
+        String email, //소셜로그인 email
+        String name,
+        String profileImageUrl,
+        String introduction,
+        Role role, //user-admin
+        UserRole userRole, //guest-host
+        LocalDateTime createdAt,
+        LocalDateTime deletedAt
+) {
+}
diff --git a/src/main/java/popcong/app/domain/user/model/Wishlist.java b/src/main/java/popcong/app/domain/user/model/Wishlist.java
new file mode 100644
index 0000000..4a221b1
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/Wishlist.java
@@ -0,0 +1,11 @@
+package popcong.app.domain.user.model;
+
+import java.time.LocalDateTime;
+
+public record Wishlist(
+        Long wishlistId,
+        Long userId,
+        Long spaceId,
+        LocalDateTime createdAt //위시생성일
+) {
+}

From 172e98ee2ff2f9d93e619a1f4d2229bfc0a5f527 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Thu, 14 Aug 2025 03:06:57 +0900
Subject: [PATCH 40/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"location=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

Space에 location 추가

related to: #6
---
 .../adapter/out/persistence/space/entity/SpaceJpaEntity.java   | 3 +++
 src/main/java/popcong/app/domain/space/model/Space.java        | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java
index d60b271..a38fd9e 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/entity/SpaceJpaEntity.java
@@ -73,6 +73,9 @@ public class SpaceJpaEntity {
     @Column(name = "address", nullable = false, length = 50)
     private String address;
 
+    @Column(name = "location", length = 30)
+    private String location;
+
     @Column(name = "latitude", nullable = false)
     private Double latitude;
 
diff --git a/src/main/java/popcong/app/domain/space/model/Space.java b/src/main/java/popcong/app/domain/space/model/Space.java
index ebd7391..5cc0dbb 100644
--- a/src/main/java/popcong/app/domain/space/model/Space.java
+++ b/src/main/java/popcong/app/domain/space/model/Space.java
@@ -17,6 +17,7 @@ public record Space(
         Double area,
         Double rating,
         String address,
+        String location,
         Double latitude,
         Double longitude,
         Status status,

From dd3197c70cf829e64df7471602b9ce3e1fbcd3de Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:31:03 +0900
Subject: [PATCH 41/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"=EC=A4=91=EB=B3=B5?=
 =?UTF-8?q?=20=EB=82=B4=EC=9A=A9=20=EC=A0=9C=EA=B1=B0=20=EB=B0=8F=20?=
 =?UTF-8?q?=ED=86=B5=ED=95=A9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

OAuth2 관련 Service -> AuthService

related to: #5
---
 .../application/auth/service/AuthService.java | 47 +++++++++++++++++++
 .../auth/service/OAuth2SignInService.java     | 40 ----------------
 .../auth/service/OAuth2SignUpService.java     | 46 ------------------
 .../auth/port/in/OAuth2SignUpUseCase.java     |  9 ----
 4 files changed, 47 insertions(+), 95 deletions(-)
 create mode 100644 src/main/java/popcong/app/application/auth/service/AuthService.java
 delete mode 100644 src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
 delete mode 100644 src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java
 delete mode 100644 src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java

diff --git a/src/main/java/popcong/app/application/auth/service/AuthService.java b/src/main/java/popcong/app/application/auth/service/AuthService.java
new file mode 100644
index 0000000..1cff9f6
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/service/AuthService.java
@@ -0,0 +1,47 @@
+package popcong.app.application.auth.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import popcong.app.adapter.out.jwt.JwtUtils;
+import popcong.app.application.auth.port.in.OAuth2SignInUseCase;
+import popcong.app.application.user.port.out.LoadUserPort;
+import popcong.app.application.user.port.out.SaveUserPort;
+import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+
+import java.time.LocalDateTime;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class AuthService implements OAuth2SignInUseCase {
+
+    private final LoadUserPort loadUserPort;
+    private final SaveUserPort saveUserPort;
+
+    private final JwtUtils jwtUtils;
+
+    @Override
+    public User findOrCreateUser(OAuth2SignInCommand command) {
+        return loadUserPort.loadUserByEmail(command.email())
+                .orElseGet(() -> {
+                    User newUser = new User(
+                            null,
+                            command.provider(),
+                            command.providerId(),
+                            command.email(),
+                            "GUEST",
+                            null,
+                            null,
+                            Role.ROLE_USER,
+                            UserRole.GUEST,
+                            LocalDateTime.now(),
+                            null
+                    );
+                    return saveUserPort.saveUser(newUser);
+                });
+    }
+}
diff --git a/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java b/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
deleted file mode 100644
index 1d965c3..0000000
--- a/src/main/java/popcong/app/application/auth/service/OAuth2SignInService.java
+++ /dev/null
@@ -1,40 +0,0 @@
-package popcong.app.application.auth.service;
-
-import jakarta.transaction.Transactional;
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import popcong.app.domain.auth.model.OAuth2SignInCommand;
-import popcong.app.domain.auth.port.in.OAuth2SignInUseCase;
-import popcong.app.domain.user.model.Role;
-import popcong.app.domain.user.model.User;
-import popcong.app.domain.user.model.UserRole;
-import popcong.app.domain.user.port.out.LoadUserPort;
-
-
-@Service
-@Transactional
-@RequiredArgsConstructor
-public class OAuth2SignInService implements OAuth2SignInUseCase {
-
-    private final LoadUserPort loadUserPort;
-
-    @Override
-    public User signIn(OAuth2SignInCommand oAuth2Info) {
-        return loadUserPort.loadUserByEmail(oAuth2Info.email())
-                .orElseGet(() -> {
-                    return new User(
-                            null,
-                            oAuth2Info.provider(),
-                            oAuth2Info.providerId(),
-                            oAuth2Info.email(),
-                            "GUEST",
-                            null,
-                            null,
-                            Role.ROLE_USER,
-                            UserRole.GUEST,
-                            null,
-                            null
-                    );
-                });
-    }
-}
diff --git a/src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java b/src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java
deleted file mode 100644
index e6d58de..0000000
--- a/src/main/java/popcong/app/application/auth/service/OAuth2SignUpService.java
+++ /dev/null
@@ -1,46 +0,0 @@
-package popcong.app.application.auth.service;
-
-import lombok.RequiredArgsConstructor;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import popcong.app.domain.auth.model.OAuth2SignInCommand;
-import popcong.app.domain.auth.model.SignUpCommand;
-import popcong.app.domain.auth.port.in.OAuth2SignUpUseCase;
-import popcong.app.domain.user.model.Role;
-import popcong.app.domain.user.model.User;
-import popcong.app.domain.user.model.UserRole;
-import popcong.app.domain.user.port.out.LoadUserPort;
-import popcong.app.domain.user.port.out.SaveUserPort;
-
-import java.time.LocalDateTime;
-
-@Service
-@Transactional
-@RequiredArgsConstructor
-public class OAuth2SignUpService implements OAuth2SignUpUseCase {
-
-    private final SaveUserPort saveUserPort;
-    private final LoadUserPort loadUserPort;
-
-    @Override
-    public User signUp(OAuth2SignInCommand oAuth2Info, SignUpCommand userInfo) {
-        if (loadUserPort.loadUserByEmail(oAuth2Info.email()).isPresent()) {
-            throw new IllegalArgumentException("이미 가입된 이메일입니다.");
-        }
-
-        User newUser = new User(
-                null,
-                oAuth2Info.provider(),
-                oAuth2Info.providerId(),
-                oAuth2Info.email(),
-                userInfo.name(),
-                userInfo.profileImageUrl(),
-                userInfo.introduction(),
-                Role.ROLE_USER,
-                (userInfo.isUploaded()) ? UserRole.PENDING : UserRole.GUEST,
-                LocalDateTime.now(),
-                null
-        );
-        return saveUserPort.saveUser(newUser);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java b/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java
deleted file mode 100644
index c4bbabd..0000000
--- a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignUpUseCase.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package popcong.app.domain.auth.port.in;
-
-import popcong.app.domain.auth.model.OAuth2SignInCommand;
-import popcong.app.domain.auth.model.SignUpCommand;
-import popcong.app.domain.user.model.User;
-
-public interface OAuth2SignUpUseCase {
-    User signUp(OAuth2SignInCommand oAuth2SignInCommand, SignUpCommand signUpCommand);
-}

From c71671e47280e6197792be1dcec4b776f2796c6d Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:32:10 +0900
Subject: [PATCH 42/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"=EA=B2=BD=EB=A1=9C?=
 =?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

port, usecase -> application으로 이동

related to: #5
---
 .../auth/port/in/OAuth2SignInUseCase.java                    | 5 ++---
 .../auth/port/in/TokenGenerateUseCase.java                   | 2 +-
 .../auth/port/out/OAuth2UserInfoPort.java                    | 2 +-
 .../auth/service/{ => token}/AccessTokenGenerateService.java | 4 ++--
 .../service/{ => token}/RefreshTokenGenerateService.java     | 4 ++--
 .../{domain => application}/user/port/out/LoadUserPort.java  | 2 +-
 .../{domain => application}/user/port/out/SaveUserPort.java  | 2 +-
 7 files changed, 10 insertions(+), 11 deletions(-)
 rename src/main/java/popcong/app/{domain => application}/auth/port/in/OAuth2SignInUseCase.java (64%)
 rename src/main/java/popcong/app/{domain => application}/auth/port/in/TokenGenerateUseCase.java (74%)
 rename src/main/java/popcong/app/{domain => application}/auth/port/out/OAuth2UserInfoPort.java (83%)
 rename src/main/java/popcong/app/application/auth/service/{ => token}/AccessTokenGenerateService.java (91%)
 rename src/main/java/popcong/app/application/auth/service/{ => token}/RefreshTokenGenerateService.java (90%)
 rename src/main/java/popcong/app/{domain => application}/user/port/out/LoadUserPort.java (76%)
 rename src/main/java/popcong/app/{domain => application}/user/port/out/SaveUserPort.java (69%)

diff --git a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java b/src/main/java/popcong/app/application/auth/port/in/OAuth2SignInUseCase.java
similarity index 64%
rename from src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
rename to src/main/java/popcong/app/application/auth/port/in/OAuth2SignInUseCase.java
index 938f21e..953af30 100644
--- a/src/main/java/popcong/app/domain/auth/port/in/OAuth2SignInUseCase.java
+++ b/src/main/java/popcong/app/application/auth/port/in/OAuth2SignInUseCase.java
@@ -1,11 +1,10 @@
-package popcong.app.domain.auth.port.in;
+package popcong.app.application.auth.port.in;
 
 import popcong.app.domain.auth.model.OAuth2SignInCommand;
-import popcong.app.domain.auth.model.SignUpCommand;
 import popcong.app.domain.user.model.User;
 
 // 로그인(사용자 인증 후 토큰 발급) 인터페이스
 public interface OAuth2SignInUseCase {
     // 카카오 정보만으로 로그인 및 기본 사용자 생성
-    User signIn(OAuth2SignInCommand oAuth2SignInCommand);
+    User findOrCreateUser(OAuth2SignInCommand oAuth2SignInCommand);
 }
\ No newline at end of file
diff --git a/src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java b/src/main/java/popcong/app/application/auth/port/in/TokenGenerateUseCase.java
similarity index 74%
rename from src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java
rename to src/main/java/popcong/app/application/auth/port/in/TokenGenerateUseCase.java
index 3c28d45..103531a 100644
--- a/src/main/java/popcong/app/domain/auth/port/in/TokenGenerateUseCase.java
+++ b/src/main/java/popcong/app/application/auth/port/in/TokenGenerateUseCase.java
@@ -1,4 +1,4 @@
-package popcong.app.domain.auth.port.in;
+package popcong.app.application.auth.port.in;
 
 import popcong.app.domain.auth.model.AuthInfo;
 
diff --git a/src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java b/src/main/java/popcong/app/application/auth/port/out/OAuth2UserInfoPort.java
similarity index 83%
rename from src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java
rename to src/main/java/popcong/app/application/auth/port/out/OAuth2UserInfoPort.java
index 02a7dad..8035f7b 100644
--- a/src/main/java/popcong/app/domain/auth/port/out/OAuth2UserInfoPort.java
+++ b/src/main/java/popcong/app/application/auth/port/out/OAuth2UserInfoPort.java
@@ -1,4 +1,4 @@
-package popcong.app.domain.auth.port.out;
+package popcong.app.application.auth.port.out;
 
 import popcong.app.domain.user.model.Provider;
 
diff --git a/src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java b/src/main/java/popcong/app/application/auth/service/token/AccessTokenGenerateService.java
similarity index 91%
rename from src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java
rename to src/main/java/popcong/app/application/auth/service/token/AccessTokenGenerateService.java
index f4e0f5c..e9ae687 100644
--- a/src/main/java/popcong/app/application/auth/service/AccessTokenGenerateService.java
+++ b/src/main/java/popcong/app/application/auth/service/token/AccessTokenGenerateService.java
@@ -1,10 +1,10 @@
-package popcong.app.application.auth.service;
+package popcong.app.application.auth.service.token;
 
 import io.jsonwebtoken.Jwts;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import popcong.app.domain.auth.model.AuthInfo;
-import popcong.app.domain.auth.port.in.TokenGenerateUseCase;
+import popcong.app.application.auth.port.in.TokenGenerateUseCase;
 import popcong.app.infra.config.jwt.JwtProperties;
 
 import javax.crypto.SecretKey;
diff --git a/src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java b/src/main/java/popcong/app/application/auth/service/token/RefreshTokenGenerateService.java
similarity index 90%
rename from src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java
rename to src/main/java/popcong/app/application/auth/service/token/RefreshTokenGenerateService.java
index 558def2..faf1986 100644
--- a/src/main/java/popcong/app/application/auth/service/RefreshTokenGenerateService.java
+++ b/src/main/java/popcong/app/application/auth/service/token/RefreshTokenGenerateService.java
@@ -1,10 +1,10 @@
-package popcong.app.application.auth.service;
+package popcong.app.application.auth.service.token;
 
 import io.jsonwebtoken.Jwts;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import popcong.app.domain.auth.model.AuthInfo;
-import popcong.app.domain.auth.port.in.TokenGenerateUseCase;
+import popcong.app.application.auth.port.in.TokenGenerateUseCase;
 import popcong.app.infra.config.jwt.JwtProperties;
 
 import javax.crypto.SecretKey;
diff --git a/src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java b/src/main/java/popcong/app/application/user/port/out/LoadUserPort.java
similarity index 76%
rename from src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java
rename to src/main/java/popcong/app/application/user/port/out/LoadUserPort.java
index 3cc2bfd..960d727 100644
--- a/src/main/java/popcong/app/domain/user/port/out/LoadUserPort.java
+++ b/src/main/java/popcong/app/application/user/port/out/LoadUserPort.java
@@ -1,4 +1,4 @@
-package popcong.app.domain.user.port.out;
+package popcong.app.application.user.port.out;
 
 import popcong.app.domain.user.model.User;
 
diff --git a/src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java b/src/main/java/popcong/app/application/user/port/out/SaveUserPort.java
similarity index 69%
rename from src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java
rename to src/main/java/popcong/app/application/user/port/out/SaveUserPort.java
index b779f41..9bd66ad 100644
--- a/src/main/java/popcong/app/domain/user/port/out/SaveUserPort.java
+++ b/src/main/java/popcong/app/application/user/port/out/SaveUserPort.java
@@ -1,4 +1,4 @@
-package popcong.app.domain.user.port.out;
+package popcong.app.application.user.port.out;
 
 import popcong.app.domain.user.model.User;
 

From 3ca234cf6390f41cb11699c618a3e040fabc7b1a Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:33:53 +0900
Subject: [PATCH 43/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"gradle=20springdoc?=
 =?UTF-8?q?=20di=20=EB=B2=84=EC=A0=84=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

springdoc 2.6.0 -> 2.7.0 수정

related to: #5
---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 4cc6fa9..78e653b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -58,7 +58,7 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
 	// Springdoc
-	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.6.0'
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
 
 	// ModelMapper
 	implementation 'org.modelmapper:modelmapper:2.4.2'

From 5259b6f7c35d1485e2a05b6d00c440aad1924a75 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:35:25 +0900
Subject: [PATCH 44/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=B9=B4?=
 =?UTF-8?q?=EC=B9=B4=EC=98=A4=20=EC=86=8C=EC=85=9C=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8=20=EA=B5=AC=ED=98=84"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

인증 정보 받아서 토큰 생성 후
redirect 시 쿠키에 토큰 저장하는 방식으로 진행

related to: #5
---
 .../in/jwt/CustomOAuth2UserService.java       |  49 +++++++
 .../popcong/app/adapter/in/jwt/JwtFilter.java |  15 ++
 .../in/jwt/handler/OAuth2SuccessHandler.java  | 134 ++++++++++++++++--
 .../popcong/app/adapter/out/jwt/JwtUtils.java |   2 +-
 .../out/oauth/KakaoOAuth2UserInfo.java        |   4 +-
 .../out/oauth/OAuth2UserInfoFactory.java      |   2 +-
 .../user/entity/UserJpaEntity.java            |   1 +
 .../user/repository/UserAdapter.java          |   4 +-
 .../popcong/app/domain/user/model/User.java   |  24 +++-
 .../popcong/app/global/dto/ResponseDto.java   |  23 ++-
 .../infra/config/security/SecurityConfig.java |  15 +-
 .../security/SignInRedirectCaptureFilter.java |  53 +++++++
 12 files changed, 284 insertions(+), 42 deletions(-)
 create mode 100644 src/main/java/popcong/app/adapter/in/jwt/CustomOAuth2UserService.java
 create mode 100644 src/main/java/popcong/app/infra/config/security/SignInRedirectCaptureFilter.java

diff --git a/src/main/java/popcong/app/adapter/in/jwt/CustomOAuth2UserService.java b/src/main/java/popcong/app/adapter/in/jwt/CustomOAuth2UserService.java
new file mode 100644
index 0000000..b5cb54e
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/jwt/CustomOAuth2UserService.java
@@ -0,0 +1,49 @@
+package popcong.app.adapter.in.jwt;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.security.oauth2.client.userinfo.DefaultOAuth2UserService;
+import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
+import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.stereotype.Service;
+import popcong.app.adapter.out.oauth.OAuth2UserInfoFactory;
+import popcong.app.domain.auth.model.OAuth2SignInCommand;
+import popcong.app.application.auth.port.in.OAuth2SignInUseCase;
+import popcong.app.application.auth.port.out.OAuth2UserInfoPort;
+import popcong.app.domain.user.model.User;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class CustomOAuth2UserService extends DefaultOAuth2UserService {
+
+    private final OAuth2SignInUseCase oAuth2SignInUseCase;
+
+    // 카카오 응답 시 User 매핑
+    @Override
+    public OAuth2User loadUser(OAuth2UserRequest request) throws OAuth2AuthenticationException {
+        log.debug("CustomOAuth2UserService loadUser");
+
+        OAuth2User oAuth2User = super.loadUser(request);
+        log.debug("kakao 응답 : {}", oAuth2User.getAttributes());
+
+        String registrationId = request.getClientRegistration().getRegistrationId();
+
+        // OAuth2UserInfoFactory로 사용자 객체 변환
+        OAuth2UserInfoPort userInfo = OAuth2UserInfoFactory.of(registrationId, oAuth2User.getAttributes());
+
+        log.debug("email = {}, providerId = {}", userInfo.getEmail(), userInfo.getProviderId());
+
+        // command 객체로 변환
+        OAuth2SignInCommand command = new OAuth2SignInCommand(
+                userInfo.getProvider(),
+                userInfo.getProviderId(),
+                userInfo.getEmail()
+        );
+
+        User user = oAuth2SignInUseCase.findOrCreateUser(command);
+
+        return new CustomUserDetails(user, oAuth2User.getAttributes());
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java b/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
index de26bf1..a228778 100644
--- a/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
+++ b/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
@@ -15,6 +15,7 @@
 import popcong.app.adapter.out.jwt.JwtUtils;
 
 import java.io.IOException;
+import java.util.List;
 
 @Component
 @RequiredArgsConstructor
@@ -24,6 +25,20 @@ public class JwtFilter extends OncePerRequestFilter {
     public static final String AUTHORIZATION_HEADER = "Authorization";
     public static final String BEARER_PREFIX = "Bearer ";
 
+    private static final List<String> WHITE_LIST = List.of(
+            "/oauth2/",
+            "/login/oauth2/",
+            "/swagger-ui/",
+            "/v3/api-docs/",
+            "/swagger-ui.html"
+    );
+
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) {
+        String uri = request.getRequestURI();
+        return WHITE_LIST.stream().anyMatch(uri::startsWith);
+    }
+
     /**
      * JWT 유효성 검증 및 인증 설정
      */
diff --git a/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java b/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
index aa11b2d..03c20a6 100644
--- a/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
+++ b/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
@@ -1,20 +1,30 @@
 package popcong.app.adapter.in.jwt.handler;
 
-import jakarta.servlet.ServletException;
+import jakarta.servlet.http.Cookie;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseCookie;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
-import org.springframework.web.util.UriComponentsBuilder;
 import popcong.app.adapter.in.jwt.CustomUserDetails;
 import popcong.app.adapter.out.jwt.JwtUtils;
 import popcong.app.domain.auth.model.AuthInfo;
 import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+import popcong.app.infra.config.cors.CorsProperties;
 
 import java.io.IOException;
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Optional;
+
+//import static popcong.app.infra.config.security.SignInRedirectCaptureFilter.ALLOW_LIST;
 
 @Slf4j
 @Component
@@ -23,36 +33,132 @@ public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler
 
     private final JwtUtils jwtUtils;
 
+    private final CorsProperties corsProperties;
+
+    @Value("${app.frontend.base-url}")
+    private String frontendBaseUrl;
+
+    @Value("${app.frontend.path.main}")
+    private String mainPath;
+
+    @Value("${app.frontend.path.signup}")
+    private String signupPath;
+
+    @Value("${app.cookie.domain}")
+    private String cookieDomain;
+    @Value("${app.cookie.secure}")
+    private boolean cookieSecure;
+    @Value("${app.cookie.same-site}")
+    private String cookieSameSite;
+    @Value("${app.cookie.access.name}")
+    private String accessCookieName;
+    @Value("${app.cookie.access.path}")
+    private String accessCookiePath;
+    @Value("${app.cookie.access.max-age}")
+    private long accessCookieMaxAge;
+    @Value("${app.cookie.refresh.name}")
+    private String refreshCookieName;
+    @Value("${app.cookie.refresh.path}")
+    private String refreshCookiePath;
+    @Value("${app.cookie.refresh.max-age}")
+    private long refreshCookieMaxAge;
+
+
     @Override
     public void onAuthenticationSuccess(
             HttpServletRequest request,
             HttpServletResponse response,
             Authentication authentication
-    ) throws ServletException, IOException {
+    ) throws IOException {
 
         // 사용자 정보 불러오기
         CustomUserDetails customUserDetails = (CustomUserDetails) authentication.getPrincipal();
         User user = customUserDetails.getUser();
 
-        // AuthInfo 생성
+        // 토큰 발급
         AuthInfo authInfo = AuthInfo.from(user);
-
-        // JWT 발급
         String accessToken = jwtUtils.generateAccessToken(authInfo);
         String refreshToken = jwtUtils.generateRefreshToken(authInfo);
 
-        log.info("로그인 성공");
+        // 회원 여부 확인
+        boolean isRegistered = !UserRole.GUEST.equals(user.userRole());
+
+        log.info("OAuth2 로그인 처리 완료 - email: {}, isRegistered: {}", user.email(), isRegistered);
         log.info("accessToken: {}", accessToken);
         log.info("refreshToken: {}", refreshToken);
 
-        // RedirectUrl 생성 (frontend)
-        String redirectUrl = UriComponentsBuilder.fromUriString("http://localhost:8080/swagger-ui.html")
-                .queryParam("accessToken", accessToken)
-                .queryParam("refreshToken", refreshToken)
-                .build()
-                .toUriString();
+        // 레거시 이름(예전 소문자) 먼저 제거
+        removeCookie(response, "access_token", "/");
+        removeCookie(response, "refresh_token", "/");
+
+// 혹시 동일 이름이 다른 속성으로 남아있을 수 있으니 현행 이름도 한번 초기화
+        removeCookie(response, accessCookieName, accessCookiePath);
+        removeCookie(response, refreshCookieName, refreshCookiePath);
+
+// 현행 이름으로만 심기
+        addCookie(response, accessCookieName, accessToken, accessCookiePath, accessCookieMaxAge);
+        addCookie(response, refreshCookieName, refreshToken, refreshCookiePath, refreshCookieMaxAge);
+
+        String desired = readCookie(request, "login_redirect")
+                .or(() -> Optional.ofNullable(request.getParameter("redirect_uri")))
+                .or(() -> Optional.ofNullable(request.getHeader("Origin")))
+                .orElse(null);
+
+        String base = resolveAllowedBase(desired, frontendBaseUrl);
+        String redirectUrl = base + (isRegistered ? mainPath : signupPath);
 
-        // redirect
+        removeCookie(response, "login_redirect", "/");
+
+        log.info("리다이렉트 URL: {}", redirectUrl);
         getRedirectStrategy().sendRedirect(request, response, redirectUrl);
     }
+
+    private void addCookie(
+            HttpServletResponse response,
+            String name,
+            String value,
+            String path,
+            long maxAgeSeconds
+    ) {
+        ResponseCookie cookie = ResponseCookie.from(name, value)
+                .httpOnly(true)
+                .secure(cookieSecure)
+                .sameSite(cookieSameSite)
+                .domain(cookieDomain)
+                .path(path)
+                .maxAge(Duration.ofSeconds(maxAgeSeconds))
+                .build();
+
+        response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString());
+    }
+
+    private void removeCookie(HttpServletResponse response, String name, String path) {
+        ResponseCookie cookie = ResponseCookie.from(name, "")
+                .httpOnly(true)
+                .secure(cookieSecure)
+                .sameSite(cookieSameSite)
+                .domain(cookieDomain)
+                .path(path)
+                .maxAge(Duration.ZERO) // 삭제
+                .build();
+        response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString());
+    }
+
+    private Optional<String> readCookie(HttpServletRequest request, String name) {
+        Cookie[] cookies = request.getCookies();
+        if (cookies == null) return Optional.empty();
+        return Arrays.stream(cookies)
+                .filter(c -> name.equals(c.getName()))
+                .map(Cookie::getValue)
+                .findFirst();
+    }
+
+
+    private String resolveAllowedBase(String desired, String fallback) {
+        if (desired == null || desired.isBlank()) {
+            return fallback;
+        }
+        boolean allowed = corsProperties.getAllowedOrigins().stream().anyMatch(desired::startsWith);
+        return allowed ? desired : fallback;
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java b/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
index c1369ae..5941962 100644
--- a/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
+++ b/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
@@ -9,7 +9,7 @@
 import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Component;
 import popcong.app.domain.auth.model.AuthInfo;
-import popcong.app.domain.auth.port.in.TokenGenerateUseCase;
+import popcong.app.application.auth.port.in.TokenGenerateUseCase;
 
 import javax.crypto.SecretKey;
 import java.util.Collections;
diff --git a/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java b/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java
index 147e6c9..02ac373 100644
--- a/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java
+++ b/src/main/java/popcong/app/adapter/out/oauth/KakaoOAuth2UserInfo.java
@@ -1,6 +1,6 @@
 package popcong.app.adapter.out.oauth;
 
-import popcong.app.domain.auth.port.out.OAuth2UserInfoPort;
+import popcong.app.application.auth.port.out.OAuth2UserInfoPort;
 import popcong.app.domain.user.model.Provider;
 import popcong.app.global.exception.custom.BusinessException;
 import popcong.app.global.exception.error.AuthErrorCode;
@@ -17,7 +17,7 @@ public KakaoOAuth2UserInfo(Map<String, Object> attributes) {
 
     @Override
     public String getProviderId() {
-        return Provider.kakao + attributes.get("id").toString();
+        return attributes.get("id").toString();
     }
 
     @Override
diff --git a/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java b/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java
index c737d34..c581a14 100644
--- a/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java
+++ b/src/main/java/popcong/app/adapter/out/oauth/OAuth2UserInfoFactory.java
@@ -1,7 +1,7 @@
 package popcong.app.adapter.out.oauth;
 
 import lombok.Getter;
-import popcong.app.domain.auth.port.out.OAuth2UserInfoPort;
+import popcong.app.application.auth.port.out.OAuth2UserInfoPort;
 import popcong.app.domain.user.model.Provider;
 import popcong.app.global.exception.custom.BusinessException;
 import popcong.app.global.exception.error.AuthErrorCode;
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
index e650310..1adb1b4 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
@@ -20,6 +20,7 @@
 public class UserJpaEntity {
 
     @Id
+    @Column(name = "")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
index 4117e20..8ec2ac6 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
@@ -5,8 +5,8 @@
 import popcong.app.adapter.out.persistence.user.Mapper.UserMapper;
 import popcong.app.adapter.out.persistence.user.entity.UserJpaEntity;
 import popcong.app.domain.user.model.User;
-import popcong.app.domain.user.port.out.LoadUserPort;
-import popcong.app.domain.user.port.out.SaveUserPort;
+import popcong.app.application.user.port.out.LoadUserPort;
+import popcong.app.application.user.port.out.SaveUserPort;
 
 import java.util.Optional;
 
diff --git a/src/main/java/popcong/app/domain/user/model/User.java b/src/main/java/popcong/app/domain/user/model/User.java
index 56c9cb4..bc47708 100644
--- a/src/main/java/popcong/app/domain/user/model/User.java
+++ b/src/main/java/popcong/app/domain/user/model/User.java
@@ -14,4 +14,26 @@ public record User (
     UserRole userRole, // guest-host
     LocalDateTime createdAt,
     LocalDateTime deletedAt
-) {}
+) {
+    public User updateProfile(
+            String name,
+            String introduction,
+            String profileImageUrl,
+            UserRole userRole,
+            LocalDateTime createdAt
+    ) {
+        return new User(
+                this.id,
+                this.provider,
+                this.providerId,
+                this.email,
+                name,
+                profileImageUrl,
+                introduction,
+                this.role,
+                userRole,
+                createdAt,
+                this.deletedAt
+        );
+    }
+}
diff --git a/src/main/java/popcong/app/global/dto/ResponseDto.java b/src/main/java/popcong/app/global/dto/ResponseDto.java
index 5beead4..83aa152 100644
--- a/src/main/java/popcong/app/global/dto/ResponseDto.java
+++ b/src/main/java/popcong/app/global/dto/ResponseDto.java
@@ -1,37 +1,32 @@
 package popcong.app.global.dto;
 
-import lombok.AllArgsConstructor;
-import lombok.Getter;
 import org.springframework.http.HttpStatusCode;
 
-@Getter
-@AllArgsConstructor
-public class ResponseDto<T> {
-
-    private final String statusCode;
-    private final String message;
-    private final T data;
-
+public record ResponseDto<T>(
+        int statusCode,
+        String message,
+        T data
+) {
     // data -> X
-    public static <T> ResponseDto<T> res(
+    public static <T> ResponseDto<T> success(
             final HttpStatusCode statusCode,
             final String message
     ) {
         return new ResponseDto<>(
-                String.valueOf(statusCode.value()),
+                statusCode.value(),
                 message,
                 null
         );
     }
 
     // data -> O
-    public static <T> ResponseDto<T> res(
+    public static <T> ResponseDto<T> success(
             final HttpStatusCode statusCode,
             final String message,
             final T data
     ) {
         return new ResponseDto<>(
-                String.valueOf(statusCode.value()),
+                statusCode.value(),
                 message,
                 data
         );
diff --git a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
index e37c78b..a47ff60 100644
--- a/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
+++ b/src/main/java/popcong/app/infra/config/security/SecurityConfig.java
@@ -30,10 +30,10 @@ public class SecurityConfig {
     private final CustomOAuth2UserService customOAuth2UserService;
     private final OAuth2SuccessHandler oAuth2SuccessHandler;
 
+    private final SignInRedirectCaptureFilter signInRedirectCaptureFilter;
+
     /**
      * SpringSecurity 보안 규칙 설정
-     * CSRF 비활성화
-     * SecurityProperties의 path 접근 허용 (permit-all)
      */
     @Bean
     public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
@@ -42,10 +42,12 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                 .cors(AbstractHttpConfigurer::disable)
                 .httpBasic(AbstractHttpConfigurer::disable)
                 .formLogin(AbstractHttpConfigurer::disable)
-                // STATELESS로 세션 관리
+                // 세션 상태 필요 (oauth2)
                 .sessionManagement(session ->
-                        session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
+                        session.sessionCreationPolicy(SessionCreationPolicy.IF_REQUIRED)
                 )
+                // redirect 파라미터 쿠키 저장
+                .addFilterBefore(signInRedirectCaptureFilter, UsernamePasswordAuthenticationFilter.class)
                 // 필터 체인에 커스텀 필터 추가
                 .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
                 // 요청 별 접근 권한 설정
@@ -62,9 +64,8 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                                 .accessDeniedHandler(authorizationFailureHandler)
                 )
                 .oauth2Login(oauth2 ->
-                        oauth2.userInfoEndpoint(userInfo ->
-                                userInfo.userService(customOAuth2UserService)
-                        ).successHandler(oAuth2SuccessHandler)
+                        oauth2.userInfoEndpoint(userInfo -> userInfo.userService(customOAuth2UserService))
+                                .successHandler(oAuth2SuccessHandler)
                 );
         ;
 
diff --git a/src/main/java/popcong/app/infra/config/security/SignInRedirectCaptureFilter.java b/src/main/java/popcong/app/infra/config/security/SignInRedirectCaptureFilter.java
new file mode 100644
index 0000000..6e6ff2d
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/security/SignInRedirectCaptureFilter.java
@@ -0,0 +1,53 @@
+package popcong.app.infra.config.security;
+
+import jakarta.servlet.FilterChain;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.ResponseCookie;
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import java.io.IOException;
+import java.time.Duration;
+import java.util.Set;
+
+/**
+ * redirect 파라미터를 cookie로 보관
+ */
+@Slf4j
+@Component
+public class SignInRedirectCaptureFilter extends OncePerRequestFilter {
+
+    private static final Set<String> ALLOW_LIST = Set.of(
+            "http://localhost:3000",
+            "http://popcong.com" // 배포 도메인 (수정)
+    );
+
+    @Override
+    protected boolean shouldNotFilter(HttpServletRequest request) {
+        return !request.getRequestURI().startsWith("/oauth2/authorization");
+    }
+
+    @Override
+    protected void doFilterInternal(
+            HttpServletRequest request,
+            HttpServletResponse response,
+            FilterChain chain
+    ) throws ServletException, IOException {
+        String redirect = request.getParameter("redirect");
+        if (redirect == null && ALLOW_LIST.stream().anyMatch(redirect::startsWith)) {
+            ResponseCookie cookie = ResponseCookie.from("login_redirect", redirect)
+                    .httpOnly(true)
+                    .secure(false)
+                    .sameSite("Lax")
+                    .path("/")
+                    .maxAge(Duration.ofMinutes(5))
+                    .build();
+            response.addHeader(HttpHeaders.SET_COOKIE, cookie.toString());
+        }
+        chain.doFilter(request, response);
+    }
+}

From 5de3a0a2da6ab11b02b73cfb97d2dbfb375d393c Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:36:18 +0900
Subject: [PATCH 45/81] =?UTF-8?q?=E2=9C=85=20Test:=20"=EC=9D=B8=EC=A6=9D?=
 =?UTF-8?q?=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1=20=EB=B0=8F=20=ED=85=8C=EC=8A=A4=ED=8A=B8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

사용자, 토큰 생성 테스트 코드 작성

related to: #5
---
 src/test/java/popcong/app/auth/AuthTest.java | 65 ++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 src/test/java/popcong/app/auth/AuthTest.java

diff --git a/src/test/java/popcong/app/auth/AuthTest.java b/src/test/java/popcong/app/auth/AuthTest.java
new file mode 100644
index 0000000..a4ff8cc
--- /dev/null
+++ b/src/test/java/popcong/app/auth/AuthTest.java
@@ -0,0 +1,65 @@
+package popcong.app.auth;
+
+import org.junit.jupiter.api.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.ActiveProfiles;
+import org.springframework.transaction.annotation.Transactional;
+import popcong.app.adapter.out.jwt.JwtUtils;
+import popcong.app.application.user.port.out.SaveUserPort;
+import popcong.app.domain.auth.model.AuthInfo;
+import popcong.app.domain.user.model.Provider;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+
+import java.time.LocalDateTime;
+import java.util.UUID;
+
+@SpringBootTest
+@Transactional
+@ActiveProfiles("local")
+public class AuthTest {
+
+    private static final Logger log = LoggerFactory.getLogger(AuthTest.class);
+
+    @Autowired
+    private SaveUserPort saveUserPort;
+
+    @Autowired
+    private JwtUtils jwtUtils;
+
+    @Test
+    void generateUserAndTokens() {
+        String postfix = UUID.randomUUID().toString().substring(0, 8);
+        User user = new User(
+                null,
+                Provider.kakao,
+                postfix,
+                postfix + "@gmail.com",
+                "김팝콩",
+                null,
+                null,
+                Role.ROLE_USER,
+                UserRole.GUEST,
+                LocalDateTime.now(),
+                null
+        );
+
+        User saved = saveUserPort.saveUser(user);
+        log.info("테스트 사용자 생성: id={}, email={}", saved.id(), saved.email());
+
+        AuthInfo authInfo = AuthInfo.from(saved);
+        String accessToken = jwtUtils.generateAccessToken(authInfo);
+        String refreshToken = jwtUtils.generateRefreshToken(authInfo);
+
+        log.info("🔑 AccessToken : {}", accessToken);
+        log.info("🔑 RefreshToken : {}", refreshToken);
+
+        boolean valid = jwtUtils.validateToken(accessToken);
+        log.info("valid test : {}", valid);
+        assert valid;
+    }
+}

From 2dff036c93d514c07a54e65ffc1a1cc5dc14d76e Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:44:35 +0900
Subject: [PATCH 46/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"user=20id=20->=20u?=
 =?UTF-8?q?serId=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

다른 entity와 통일

related to: #5
---
 .../app/adapter/out/persistence/user/Mapper/UserMapper.java   | 4 ++--
 .../adapter/out/persistence/user/entity/UserJpaEntity.java    | 4 ++--
 src/main/java/popcong/app/domain/auth/model/AuthInfo.java     | 2 +-
 src/main/java/popcong/app/domain/user/model/User.java         | 4 ++--
 src/test/java/popcong/app/auth/AuthTest.java                  | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java b/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java
index 964c80c..7477306 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/Mapper/UserMapper.java
@@ -10,7 +10,7 @@ public class UserMapper {
     // Entity -> Domain
     public User toDomain(UserJpaEntity entity) {
         return new User(
-                entity.getId(),
+                entity.getUserId(),
                 entity.getProvider(),
                 entity.getProviderId(),
                 entity.getEmail(),
@@ -27,7 +27,7 @@ public User toDomain(UserJpaEntity entity) {
     // Domain -> Entity
     public UserJpaEntity toEntity(User domain) {
         return UserJpaEntity.builder()
-                .id(domain.id())
+                .userId(domain.userId())
                 .provider(domain.provider())
                 .providerId(domain.providerId())
                 .email(domain.email())
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
index 1adb1b4..20d407b 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
@@ -20,9 +20,9 @@
 public class UserJpaEntity {
 
     @Id
-    @Column(name = "")
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
+    @Column(name = "usertId", nullable = false)
+    private Long userId;
 
     @Enumerated(EnumType.STRING)
     @Column(name = "provider", nullable = false)
diff --git a/src/main/java/popcong/app/domain/auth/model/AuthInfo.java b/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
index 3fd544a..7ef658f 100644
--- a/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
+++ b/src/main/java/popcong/app/domain/auth/model/AuthInfo.java
@@ -10,7 +10,7 @@ public record AuthInfo(
 ) {
     public static AuthInfo from(User user) {
         return new AuthInfo(
-                user.id(),
+                user.userId(),
                 user.email(),
                 user.role()
         );
diff --git a/src/main/java/popcong/app/domain/user/model/User.java b/src/main/java/popcong/app/domain/user/model/User.java
index bc47708..cf353a3 100644
--- a/src/main/java/popcong/app/domain/user/model/User.java
+++ b/src/main/java/popcong/app/domain/user/model/User.java
@@ -3,7 +3,7 @@
 import java.time.LocalDateTime;
 
 public record User (
-    Long id,
+    Long userId,
     Provider provider, // 소셜로그인 제공자
     String providerId, // 소셜로그인에서 제공받은 ID
     String email, // 소셜로그인 email
@@ -23,7 +23,7 @@ public User updateProfile(
             LocalDateTime createdAt
     ) {
         return new User(
-                this.id,
+                this.userId,
                 this.provider,
                 this.providerId,
                 this.email,
diff --git a/src/test/java/popcong/app/auth/AuthTest.java b/src/test/java/popcong/app/auth/AuthTest.java
index a4ff8cc..3507c08 100644
--- a/src/test/java/popcong/app/auth/AuthTest.java
+++ b/src/test/java/popcong/app/auth/AuthTest.java
@@ -49,7 +49,7 @@ void generateUserAndTokens() {
         );
 
         User saved = saveUserPort.saveUser(user);
-        log.info("테스트 사용자 생성: id={}, email={}", saved.id(), saved.email());
+        log.info("테스트 사용자 생성: id={}, email={}", saved.userId(), saved.email());
 
         AuthInfo authInfo = AuthInfo.from(saved);
         String accessToken = jwtUtils.generateAccessToken(authInfo);

From af3b0d5cf1c339257e286b1be01b88007095321d Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 16:47:21 +0900
Subject: [PATCH 47/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"UserRole=20general?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GUEST, GENERAL로 일반 유저 분기

related to: #5
---
 src/main/java/popcong/app/domain/user/model/UserRole.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/popcong/app/domain/user/model/UserRole.java b/src/main/java/popcong/app/domain/user/model/UserRole.java
index d03a7af..639a8b1 100644
--- a/src/main/java/popcong/app/domain/user/model/UserRole.java
+++ b/src/main/java/popcong/app/domain/user/model/UserRole.java
@@ -1,7 +1,8 @@
 package popcong.app.domain.user.model;
 
 public enum UserRole {
-    GUEST, // 일반 사용자 (임차인)
+    GUEST, // 회원 정보가 등록되지 않은 사용자
+    GENERAL, // 일반 사용자 (임차인)
     PENDING, // 호스트 신청 서류 제출자
     HOST // 호스트 (임대인)
 }

From b38c37680ec42b143138c3f0bef5a5071c28e538 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 18:25:23 +0900
Subject: [PATCH 48/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"loadUserById=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

사용자 id로 조회 repository 로직 작성

related to: #10
---
 .../out/persistence/user/repository/UserAdapter.java        | 6 ++++++
 .../out/persistence/user/repository/UserJpaRepository.java  | 1 +
 .../popcong/app/application/user/port/out/LoadUserPort.java | 1 +
 3 files changed, 8 insertions(+)

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
index 8ec2ac6..0bf1a1e 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserAdapter.java
@@ -23,6 +23,12 @@ public Optional<User> loadUserByEmail(String email) {
                 .map(userMapper::toDomain);
     }
 
+    @Override
+    public Optional<User> loadUserById(Long id) {
+        return userJpaRepository.findById(id)
+                .map(userMapper::toDomain);
+    }
+
     @Override
     public User saveUser(User user) {
         UserJpaEntity entity = userJpaRepository.save(userMapper.toEntity(user));
diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java
index e86e68d..f824fbf 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/repository/UserJpaRepository.java
@@ -7,4 +7,5 @@
 
 public interface UserJpaRepository extends JpaRepository<UserJpaEntity, Long> {
     Optional<UserJpaEntity> findByEmail(String email);
+    Optional<UserJpaEntity> findById(Long id);
 }
diff --git a/src/main/java/popcong/app/application/user/port/out/LoadUserPort.java b/src/main/java/popcong/app/application/user/port/out/LoadUserPort.java
index 960d727..65b3c7e 100644
--- a/src/main/java/popcong/app/application/user/port/out/LoadUserPort.java
+++ b/src/main/java/popcong/app/application/user/port/out/LoadUserPort.java
@@ -6,4 +6,5 @@
 
 public interface LoadUserPort {
     Optional<User> loadUserByEmail(String email);
+    Optional<User> loadUserById(Long id);
 }
\ No newline at end of file

From b423f1c76d0c75dfc75e2fd7034dbbe788078202 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 19:09:23 +0900
Subject: [PATCH 49/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"ddl-auto?=
 =?UTF-8?q?=20update=EB=A1=9C=20=EA=B3=A0=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

application.yml ddl-auto update로 고정

related to: #10
---
 src/main/resources/application.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index 7c58cc4..fa61925 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -4,7 +4,7 @@ spring:
 
   jpa:
     hibernate:
-      ddl-auto: create # 추후 update로 수정
+      ddl-auto: update # 필요시 create
     properties:
       hibernate:
         format_sql: true

From 7ee38474f40b5cbcc0dea0000657f8c53a3d1c82 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 19:10:47 +0900
Subject: [PATCH 50/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"jwt=20=EC=9C=A0?=
 =?UTF-8?q?=EC=A0=80=20=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

jwt를 받아서 유저 조회할 수 있도록 로직 작성

related to: #10
---
 .../popcong/app/adapter/in/jwt/JwtFilter.java |  3 +-
 .../app/adapter/in/user/UserController.java   | 38 +++++++++++++++++++
 .../popcong/app/adapter/out/jwt/JwtUtils.java | 19 +++++++++-
 .../user/dto/response/UserResponseDto.java    | 38 +++++++++++++++++++
 4 files changed, 96 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/popcong/app/adapter/in/user/UserController.java
 create mode 100644 src/main/java/popcong/app/application/user/dto/response/UserResponseDto.java

diff --git a/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java b/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
index a228778..4225c28 100644
--- a/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
+++ b/src/main/java/popcong/app/adapter/in/jwt/JwtFilter.java
@@ -52,7 +52,8 @@ protected void doFilterInternal(
         String jwt = resolveToken(request);
 
         if (StringUtils.hasText(jwt) && jwtUtils.validateToken(jwt)) {
-            Authentication authentication = jwtUtils.getAuthentication(jwt);
+//            Authentication authentication = jwtUtils.getAuthentication(jwt);
+            Authentication authentication = jwtUtils.authentication(jwt);
             SecurityContextHolder.getContext().setAuthentication(authentication);
         }
         filterChain.doFilter(request, response);
diff --git a/src/main/java/popcong/app/adapter/in/user/UserController.java b/src/main/java/popcong/app/adapter/in/user/UserController.java
new file mode 100644
index 0000000..f5a2f4c
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/user/UserController.java
@@ -0,0 +1,38 @@
+package popcong.app.adapter.in.user;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+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;
+import popcong.app.application.user.dto.response.UserResponseDto;
+import popcong.app.domain.user.model.User;
+import popcong.app.global.dto.ResponseDto;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/user")
+public class UserController {
+
+    @GetMapping("/me")
+    public ResponseDto<UserResponseDto> getUserInfo(@AuthenticationPrincipal User user) {
+        if (user == null) {
+            throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
+        }
+
+        log.info("사용자 조회 성공 : userId = {}, providerId = {}, email = {}", user.userId(), user.providerId(), user.email());
+
+        UserResponseDto result = UserResponseDto.from(user);
+
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "사용자 조회 성공",
+                result
+        );
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java b/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
index 5941962..ce90aaf 100644
--- a/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
+++ b/src/main/java/popcong/app/adapter/out/jwt/JwtUtils.java
@@ -8,11 +8,13 @@
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 import org.springframework.security.core.userdetails.User;
 import org.springframework.stereotype.Component;
+import popcong.app.application.user.port.out.LoadUserPort;
 import popcong.app.domain.auth.model.AuthInfo;
 import popcong.app.application.auth.port.in.TokenGenerateUseCase;
 
 import javax.crypto.SecretKey;
 import java.util.Collections;
+import java.util.List;
 
 @Slf4j
 @Component
@@ -21,15 +23,17 @@ public class JwtUtils {
     private final SecretKey secretKey;
     public final TokenGenerateUseCase accessTokenGenerateService;
     public final TokenGenerateUseCase refreshTokenGenerateService;
+    private final LoadUserPort loadUserPort;
 
     public JwtUtils(
             SecretKey secretKey,
             @Qualifier("accessTokenGenerateService") TokenGenerateUseCase accessTokenGenerateService,
-            @Qualifier("refreshTokenGenerateService")  TokenGenerateUseCase refreshTokenGenerateService
+            @Qualifier("refreshTokenGenerateService")  TokenGenerateUseCase refreshTokenGenerateService, LoadUserPort loadUserPort
     ) {
         this.secretKey = secretKey;
         this.accessTokenGenerateService = accessTokenGenerateService;
         this.refreshTokenGenerateService = refreshTokenGenerateService;
+        this.loadUserPort = loadUserPort;
     }
 
     // Access Tokne 생성
@@ -77,6 +81,19 @@ private Claims getClaimsFromToken(String accessToken) {
         }
     }
 
+    // jwt로 사용자 추출
+    public Authentication authentication(String accessToken) {
+        Claims claims = getClaimsFromToken(accessToken);
+        Long userId = Long.valueOf(claims.getSubject());
+        String role = claims.get("role", String.class);
+        var authorities = List.of(new SimpleGrantedAuthority(role != null ? role : "ROLE_USER"));
+
+        popcong.app.domain.user.model.User user = loadUserPort.loadUserById(userId)
+                .orElseThrow(() -> new IllegalArgumentException("사용자를 찾을 수 없습니다. : " + userId));
+
+        return new UsernamePasswordAuthenticationToken(user, accessToken, authorities);
+    }
+
     // Access Token에서 인증 정보 추출
     public Authentication getAuthentication(String accessToken) {
         Claims claims = getClaimsFromToken(accessToken);
diff --git a/src/main/java/popcong/app/application/user/dto/response/UserResponseDto.java b/src/main/java/popcong/app/application/user/dto/response/UserResponseDto.java
new file mode 100644
index 0000000..8aac2f3
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/dto/response/UserResponseDto.java
@@ -0,0 +1,38 @@
+package popcong.app.application.user.dto.response;
+
+import popcong.app.domain.user.model.Provider;
+import popcong.app.domain.user.model.Role;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+
+import java.time.LocalDateTime;
+
+public record UserResponseDto(
+        Long userId,
+        Provider provider,
+        String providerId,
+        String email,
+        String name,
+        String profileImageUrl,
+        String introduction,
+        Role role,
+        UserRole userRole,
+        LocalDateTime createdAt,
+        LocalDateTime deletedAt
+) {
+    public static UserResponseDto from(User user) {
+        return new UserResponseDto(
+                user.userId(),
+                user.provider(),
+                user.providerId(),
+                user.email(),
+                user.name(),
+                user.profileImageUrl(),
+                user.introduction(),
+                user.role(),
+                user.userRole(),
+                user.createdAt(),
+                user.deletedAt()
+        );
+    }
+}

From 8d6a1e0d6c01b8ad86910abb51a5dffbda0e6193 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 19:11:41 +0900
Subject: [PATCH 51/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"db?=
 =?UTF-8?q?=EC=97=90=20=EC=A0=80=EC=9E=A5=EB=90=98=EC=A7=80=20=EC=95=8A?=
 =?UTF-8?q?=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

테스트 코드로 생성된 유저가 DB에 저장될 수 있도록 Transactional 제거

related to: #10
---
 src/test/java/popcong/app/auth/AuthTest.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/test/java/popcong/app/auth/AuthTest.java b/src/test/java/popcong/app/auth/AuthTest.java
index 3507c08..047af1c 100644
--- a/src/test/java/popcong/app/auth/AuthTest.java
+++ b/src/test/java/popcong/app/auth/AuthTest.java
@@ -19,7 +19,6 @@
 import java.util.UUID;
 
 @SpringBootTest
-@Transactional
 @ActiveProfiles("local")
 public class AuthTest {
 

From 286eb0f1ecf4e92d699ed288e2b019a5363dd28d Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 20:48:33 +0900
Subject: [PATCH 52/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"dto=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MarkerComponentDto로 나누고 MarkerListResponseDto로 List 응답,
CurrentUserLocationRequestDto 로 유저 현 위치 받도록 함

related to: #12
---
 .../request/CurrentUserLocationRequestDto.java   |  7 +++++++
 .../space/response/MarkerComponentDto.java       | 16 ++++++++++++++++
 .../space/response/MarkerListResponseDto.java    |  7 +++++++
 3 files changed, 30 insertions(+)
 create mode 100644 src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java
 create mode 100644 src/main/java/popcong/app/application/space/response/MarkerComponentDto.java
 create mode 100644 src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java

diff --git a/src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java b/src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java
new file mode 100644
index 0000000..e8421fb
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java
@@ -0,0 +1,7 @@
+package popcong.app.application.space.request;
+
+public record CurrentUserLocationRequestDto(
+        Double latitude,
+        Double longitude
+) {
+}
diff --git a/src/main/java/popcong/app/application/space/response/MarkerComponentDto.java b/src/main/java/popcong/app/application/space/response/MarkerComponentDto.java
new file mode 100644
index 0000000..c7d1d15
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/response/MarkerComponentDto.java
@@ -0,0 +1,16 @@
+package popcong.app.application.space.response;
+
+public record MarkerComponentDto(
+        Long spaceId,
+        Double latitude, // 위도
+        Double longitude, // 경도
+        String spaceName, // 공간 이름
+        String coverImageUrl, // 대표이미지 경로
+        Integer rentalFee, // 대여료
+        String address, // 주소
+        Integer floor, // 층수
+        Double rating, // 공간 평점
+        Integer reviewCount, // 공간 후기 수
+        Double distance // 현위치와의 거리
+) {
+}
diff --git a/src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java b/src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java
new file mode 100644
index 0000000..7e9ed7f
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java
@@ -0,0 +1,7 @@
+package popcong.app.application.space.response;
+
+import java.util.List;
+
+public record MarkerListResponseDto(
+        List<MarkerComponentDto> markers
+) {}
\ No newline at end of file

From 0e3b89220fa3c4213ceb6d0e89d6ed0875ed167c Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 20:49:03 +0900
Subject: [PATCH 53/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"error=20code=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

space 관련 오류 코드 관리

related to: #12
---
 .../exception/error/CommonErrorCode.java      |  6 ++++--
 .../exception/error/SpaceErrorCode.java       | 20 +++++++++++++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java

diff --git a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
index 2a93a56..d625d2e 100644
--- a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
+++ b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
@@ -11,11 +11,13 @@
 @JsonFormat(shape = JsonFormat.Shape.OBJECT)
 public enum CommonErrorCode implements ErrorCode {
 
-    // 4XX
+    // 400
     INVALID_TYPE_VALUE(HttpStatus.BAD_REQUEST.value(), "C4001", "Invalid Type Value"),
     INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST.value(), "C4002", "Invalid Input Value"),
     ENTITY_NOT_FOUND(HttpStatus.BAD_REQUEST.value(), "C4003", "Entity Not Found"),
-    METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED.value(), "C4004", "Invalid Http Method"),
+
+    // 405
+    METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED.value(), "C4054", "Invalid Http Method"),
 
     // 5XX
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), "C5001", "Internal Server Error");
diff --git a/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java b/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
new file mode 100644
index 0000000..e9a5015
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
@@ -0,0 +1,20 @@
+package popcong.app.global.exception.error;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import popcong.app.global.exception.ErrorCode;
+
+@Getter
+@RequiredArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum SpaceErrorCode implements ErrorCode {
+
+    // 400
+    INVALID_PRICE_ERROR(HttpStatus.BAD_REQUEST.value(), "S4001", "금액 범위가 잘못되었습니다.");
+
+    private final int httpStatus;
+    private final String code;
+    private final String message;
+}

From 216b0bad687fc4b3078fa0605a5d670132d32b4e Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 20:49:31 +0900
Subject: [PATCH 54/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=A0=95?=
 =?UTF-8?q?=EB=A0=AC=20=ED=83=80=EC=9E=85=20Enum=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

인기순, 가까운순, 리뷰 많은 순으로 분기

related to: #12
---
 .../java/popcong/app/domain/space/model/SpaceSortType.java | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/main/java/popcong/app/domain/space/model/SpaceSortType.java

diff --git a/src/main/java/popcong/app/domain/space/model/SpaceSortType.java b/src/main/java/popcong/app/domain/space/model/SpaceSortType.java
new file mode 100644
index 0000000..67914f1
--- /dev/null
+++ b/src/main/java/popcong/app/domain/space/model/SpaceSortType.java
@@ -0,0 +1,7 @@
+package popcong.app.domain.space.model;
+
+public enum SpaceSortType {
+    MOST_POPULAR,
+    NEAREST,
+    MOST_REVIEWS
+}

From 634a9e566cfb2dd4fc53a7cf6fb3901c3f70e508 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Thu, 14 Aug 2025 20:55:55 +0900
Subject: [PATCH 55/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"dto=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

space 안의 dto 디렉터리로 이동

related to: #12
---
 .../space/{ => dto}/request/CurrentUserLocationRequestDto.java  | 2 +-
 .../space/{ => dto}/response/MarkerComponentDto.java            | 2 +-
 .../space/{ => dto}/response/MarkerListResponseDto.java         | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename src/main/java/popcong/app/application/space/{ => dto}/request/CurrentUserLocationRequestDto.java (66%)
 rename src/main/java/popcong/app/application/space/{ => dto}/response/MarkerComponentDto.java (90%)
 rename src/main/java/popcong/app/application/space/{ => dto}/response/MarkerListResponseDto.java (67%)

diff --git a/src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java b/src/main/java/popcong/app/application/space/dto/request/CurrentUserLocationRequestDto.java
similarity index 66%
rename from src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java
rename to src/main/java/popcong/app/application/space/dto/request/CurrentUserLocationRequestDto.java
index e8421fb..56ae721 100644
--- a/src/main/java/popcong/app/application/space/request/CurrentUserLocationRequestDto.java
+++ b/src/main/java/popcong/app/application/space/dto/request/CurrentUserLocationRequestDto.java
@@ -1,4 +1,4 @@
-package popcong.app.application.space.request;
+package popcong.app.application.space.dto.request;
 
 public record CurrentUserLocationRequestDto(
         Double latitude,
diff --git a/src/main/java/popcong/app/application/space/response/MarkerComponentDto.java b/src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java
similarity index 90%
rename from src/main/java/popcong/app/application/space/response/MarkerComponentDto.java
rename to src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java
index c7d1d15..2ce2376 100644
--- a/src/main/java/popcong/app/application/space/response/MarkerComponentDto.java
+++ b/src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java
@@ -1,4 +1,4 @@
-package popcong.app.application.space.response;
+package popcong.app.application.space.dto.response;
 
 public record MarkerComponentDto(
         Long spaceId,
diff --git a/src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java b/src/main/java/popcong/app/application/space/dto/response/MarkerListResponseDto.java
similarity index 67%
rename from src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java
rename to src/main/java/popcong/app/application/space/dto/response/MarkerListResponseDto.java
index 7e9ed7f..a34df90 100644
--- a/src/main/java/popcong/app/application/space/response/MarkerListResponseDto.java
+++ b/src/main/java/popcong/app/application/space/dto/response/MarkerListResponseDto.java
@@ -1,4 +1,4 @@
-package popcong.app.application.space.response;
+package popcong.app.application.space.dto.response;
 
 import java.util.List;
 

From 1251cb643963d06021a8ad3e8f8f4ff005369c59 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Fri, 15 Aug 2025 00:16:20 +0900
Subject: [PATCH 56/81] =?UTF-8?q?=E2=9C=A8=20Fix=20:=20"=EC=98=A4=ED=83=80?=
 =?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

usertId -> userId로 컬럼명 오타 수정

related to: #9
---
 .../app/adapter/out/persistence/user/entity/UserJpaEntity.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
index 20d407b..890551c 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
@@ -21,7 +21,7 @@ public class UserJpaEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "usertId", nullable = false)
+    @Column(name = "userId", nullable = false)
     private Long userId;
 
     @Enumerated(EnumType.STRING)

From 32bd9d828c2388279eb3a3f2d1803a808393a4a6 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Fri, 15 Aug 2025 03:18:34 +0900
Subject: [PATCH 57/81] =?UTF-8?q?=E2=9C=A8=20Feature=20:=20"MyPopups=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

사용자별 팝업 목록 조회 메서드 추가

related to: #9
---
 .../space/LoadMyPopupsPersistenceAdapter.java | 37 +++++++++++++++++++
 .../space/repository/PopupJpaRepository.java  | 17 +++++++++
 .../user/port/out/LoadMyPopupsPort.java       | 10 +++++
 3 files changed, 64 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
 create mode 100644 src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
new file mode 100644
index 0000000..dd89db4
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
@@ -0,0 +1,37 @@
+package popcong.app.adapter.out.persistence.space;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
+import org.springframework.stereotype.Repository;
+
+import popcong.app.adapter.out.persistence.space.entity.PopupJpaEntity;
+import popcong.app.adapter.out.persistence.space.mapper.PopupEntityMapper;
+import popcong.app.adapter.out.persistence.space.repository.PopupJpaRepository;
+import popcong.app.application.space.dto.response.MyPopupItemResponseDto;
+import popcong.app.application.user.port.out.LoadMyPopupsPort;
+
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class LoadMyPopupsPersistenceAdapter implements LoadMyPopupsPort {
+
+    private final PopupJpaRepository popupJpaRepository;
+
+    @Override
+    public List<MyPopupItemResponseDto> findMyPopups(Long userId, int limit, int offset) {
+        int safeLimit  = (limit <= 0) ? 5 : limit;
+        int safeOffset = Math.max(offset, 0);
+        int page = safeOffset / safeLimit;
+
+        Pageable pageable = PageRequest.of(page, safeLimit);   // 정렬은 메서드명에 포함
+
+        List<PopupJpaEntity> rows =
+                popupJpaRepository.findByReservationUserUserIdOrderByStartDateDesc(userId, pageable);
+
+        return rows.stream()
+                .map(PopupEntityMapper::toMyPopupItemResponseDto)
+                .toList();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
new file mode 100644
index 0000000..1589840
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
@@ -0,0 +1,17 @@
+package popcong.app.adapter.out.persistence.space.repository;
+
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
+import org.springframework.data.jpa.repository.JpaRepository;
+import popcong.app.adapter.out.persistence.space.entity.PopupJpaEntity;
+
+import java.util.List;
+
+public interface PopupJpaRepository extends JpaRepository<PopupJpaEntity, Long> {
+
+
+     // 사용자별 팝업 목록 조회 (최신 시작일 내림차순)
+    @EntityGraph(attributePaths = {"reservation", "reservation.space"}) //fetch 지정하여 추가쿼리 막음
+    List<PopupJpaEntity> findByReservationUserUserIdOrderByStartDateDesc(Long userId, Pageable pageable);
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java b/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java
new file mode 100644
index 0000000..514d1f5
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java
@@ -0,0 +1,10 @@
+package popcong.app.application.user.port.out;
+
+import popcong.app.application.space.dto.response.MyPopupItemResponseDto;
+
+import java.util.List;
+
+public interface LoadMyPopupsPort {
+    List<MyPopupItemResponseDto> findMyPopups(Long userId, int limit, int offset);
+    //limit,offset -> 페이징
+}

From 89db3e32b67a5bfa3aaf981dd2a66cd658d1c9d5 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Fri, 15 Aug 2025 03:19:36 +0900
Subject: [PATCH 58/81] =?UTF-8?q?=E2=9C=A8=20Feature=20:=20"MyPopups=20?=
 =?UTF-8?q?=EC=9D=91=EB=8B=B5=20DTO=20,=20mapper=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Entity -> DTO 변환 로직 구현

related to: #9
---
 .../space/mapper/PopupEntityMapper.java       | 38 +++++++++++++++++++
 .../dto/response/MyPopupItemResponseDto.java  | 30 +++++++++++++++
 .../dto/response/SpaceInfoResponseDto.java    | 13 +++++++
 3 files changed, 81 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/mapper/PopupEntityMapper.java
 create mode 100644 src/main/java/popcong/app/application/space/dto/response/MyPopupItemResponseDto.java
 create mode 100644 src/main/java/popcong/app/application/space/dto/response/SpaceInfoResponseDto.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/PopupEntityMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/PopupEntityMapper.java
new file mode 100644
index 0000000..2307c32
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/PopupEntityMapper.java
@@ -0,0 +1,38 @@
+package popcong.app.adapter.out.persistence.space.mapper;
+
+import popcong.app.adapter.out.persistence.space.entity.PopupJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.ReservationJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+import popcong.app.application.space.dto.response.MyPopupItemResponseDto;
+import popcong.app.application.space.dto.response.SpaceInfoResponseDto;
+
+public final class PopupEntityMapper {
+    private PopupEntityMapper() {} // 유틸클래스(인스턴스 생성 방지)
+
+    public static MyPopupItemResponseDto toMyPopupItemResponseDto(PopupJpaEntity popup) {
+        //팝업이 속한 예약 엔티티 가져오기
+        ReservationJpaEntity r = popup.getReservation();
+        //예약 O -> 예약이 속한 공간 엔티티 가져오기
+        SpaceJpaEntity s = (r != null) ? r.getSpace() : null;
+
+        //MyPopupItemResponseDto 생성
+        return new MyPopupItemResponseDto(
+                SpaceInfoResponseDto.of( //공간정보 부분 생성
+                        (s != null) ? s.getSpaceId() : null, //공간 ID
+                        (s != null) ? s.getSpaceName() : null,     // 공간 이름
+                        (s != null && s.getFloor() != null)
+                                ? String.valueOf(s.getFloor())
+                                : null,
+                        //층 O -> String 으로 변환
+                        (popup.getAddress() != null) //팝업 주소 O -> 사용, 팝업 주소 X -> 공간 주소 사용
+                                ? popup.getAddress()
+                                : (s != null ? s.getAddress() : null)
+                ),
+                popup.getPopupId(),
+                popup.getName(),
+                popup.getPopupStatus(),
+                popup.getStartDate().toLocalDate(),
+                popup.getEndDate().toLocalDate()
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/space/dto/response/MyPopupItemResponseDto.java b/src/main/java/popcong/app/application/space/dto/response/MyPopupItemResponseDto.java
new file mode 100644
index 0000000..5f3d1e8
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/dto/response/MyPopupItemResponseDto.java
@@ -0,0 +1,30 @@
+package popcong.app.application.space.dto.response;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import popcong.app.domain.space.model.PopupStatus;
+
+
+import java.time.LocalDate;
+
+//외부 응답 전용 Dto
+@JsonInclude(JsonInclude.Include.NON_NULL) // 값이 Null인 필드를 응답에서 제외
+public record MyPopupItemResponseDto(
+        SpaceInfoResponseDto spaceInfo,
+        Long popupId,
+        String name,          // 팝업명
+        PopupStatus popupStatus,
+        LocalDate startDate,
+        LocalDate endDate
+
+){
+    public static MyPopupItemResponseDto of(
+            Long spaceId, String spaceName, String floor, String address,
+            Long popupId, String name, PopupStatus status,
+            LocalDate startDate, LocalDate endDate
+    ) {
+        return new MyPopupItemResponseDto(
+                SpaceInfoResponseDto.of(spaceId, spaceName, floor, address),
+                popupId, name, status, startDate, endDate
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/space/dto/response/SpaceInfoResponseDto.java b/src/main/java/popcong/app/application/space/dto/response/SpaceInfoResponseDto.java
new file mode 100644
index 0000000..d8334a8
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/dto/response/SpaceInfoResponseDto.java
@@ -0,0 +1,13 @@
+package popcong.app.application.space.dto.response;
+
+public record SpaceInfoResponseDto(
+        Long spaceId,
+        String spaceName,
+        String floor,
+        String address
+) {
+    public static SpaceInfoResponseDto of(
+            Long spaceId, String spaceName,String floor ,String address) {
+        return new SpaceInfoResponseDto(spaceId, spaceName,floor, address);
+    }
+}

From e19cde8b248b72adc97fdb99a74448618c071373 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Fri, 15 Aug 2025 03:20:46 +0900
Subject: [PATCH 59/81] =?UTF-8?q?=E2=9C=A8=20Feature=20:=20"=ED=99=88=20?=
 =?UTF-8?q?=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20API=EC=97=90=20MyPopu?=
 =?UTF-8?q?ps=20=ED=8F=AC=ED=95=A8"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

홈 정보 API에 MyPopups을 포함시킴

related to: #9
---
 .../app/adapter/in/user/HomeController.java   | 47 +++++++++++++++++++
 .../dto/response/HomeUserResponseDto.java     | 16 +++++++
 .../dto/response/UserInfoResponseDto.java     |  9 ++++
 .../user/port/in/GetHomeInfoUseCase.java      |  7 +++
 .../user/service/HomeInfoService.java         | 42 +++++++++++++++++
 5 files changed, 121 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/in/user/HomeController.java
 create mode 100644 src/main/java/popcong/app/application/user/dto/response/HomeUserResponseDto.java
 create mode 100644 src/main/java/popcong/app/application/user/dto/response/UserInfoResponseDto.java
 create mode 100644 src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java
 create mode 100644 src/main/java/popcong/app/application/user/service/HomeInfoService.java

diff --git a/src/main/java/popcong/app/adapter/in/user/HomeController.java b/src/main/java/popcong/app/adapter/in/user/HomeController.java
new file mode 100644
index 0000000..35114ec
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/user/HomeController.java
@@ -0,0 +1,47 @@
+package popcong.app.adapter.in.user;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+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.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+import popcong.app.application.user.dto.response.HomeUserResponseDto;
+import popcong.app.application.user.port.in.GetHomeInfoUseCase;
+import popcong.app.domain.user.model.User;
+import popcong.app.global.dto.ResponseDto;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/popup/home")
+public class HomeController {
+
+    private final GetHomeInfoUseCase getHomeInfoUseCase;
+
+    @GetMapping("/me")
+    public ResponseDto<HomeUserResponseDto> getHomeInfo(
+            @AuthenticationPrincipal User user,
+            @RequestParam(defaultValue = "5") int limit,
+            @RequestParam(defaultValue = "0") int offset
+    ) {
+        if (user == null) {
+            throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
+        }
+
+        HomeUserResponseDto result =
+                getHomeInfoUseCase.getMyHomeInfo(user.userId(), limit, offset);
+
+        log.info("홈 정보 조회 성공 : userId={}", user.userId());
+
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "홈 정보 조회 성공",
+                result
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/user/dto/response/HomeUserResponseDto.java b/src/main/java/popcong/app/application/user/dto/response/HomeUserResponseDto.java
new file mode 100644
index 0000000..a00ce7a
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/dto/response/HomeUserResponseDto.java
@@ -0,0 +1,16 @@
+package popcong.app.application.user.dto.response;
+
+import popcong.app.application.space.dto.response.MyPopupItemResponseDto;
+import java.util.List;
+
+public record HomeUserResponseDto(
+        UserInfoResponseDto userInfo,
+        List<MyPopupItemResponseDto> myPopups
+) {
+    public static HomeUserResponseDto from(UserResponseDto user, List<MyPopupItemResponseDto> popups) {
+        return new HomeUserResponseDto(
+                UserInfoResponseDto.from(user),
+                popups
+        );
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/user/dto/response/UserInfoResponseDto.java b/src/main/java/popcong/app/application/user/dto/response/UserInfoResponseDto.java
new file mode 100644
index 0000000..ffa6df7
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/dto/response/UserInfoResponseDto.java
@@ -0,0 +1,9 @@
+package popcong.app.application.user.dto.response;
+
+public record UserInfoResponseDto(
+        String name
+) {
+    public static UserInfoResponseDto from(UserResponseDto user) {
+        return new UserInfoResponseDto(user.name());
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java b/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java
new file mode 100644
index 0000000..714e683
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java
@@ -0,0 +1,7 @@
+package popcong.app.application.user.port.in;
+
+import popcong.app.application.user.dto.response.HomeUserResponseDto;
+
+public interface GetHomeInfoUseCase {
+    HomeUserResponseDto getMyHomeInfo(Long userId, int limit, int offset);
+}
diff --git a/src/main/java/popcong/app/application/user/service/HomeInfoService.java b/src/main/java/popcong/app/application/user/service/HomeInfoService.java
new file mode 100644
index 0000000..6e6cad8
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/service/HomeInfoService.java
@@ -0,0 +1,42 @@
+package popcong.app.application.user.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import org.springframework.transaction.annotation.Transactional;
+import popcong.app.application.user.dto.response.HomeUserResponseDto;
+import popcong.app.application.user.dto.response.UserResponseDto;
+import popcong.app.application.user.port.in.GetHomeInfoUseCase;
+import popcong.app.application.user.port.out.LoadMyPopupsPort;
+import popcong.app.application.user.port.out.LoadUserPort;
+import popcong.app.application.space.dto.response.MyPopupItemResponseDto;
+import popcong.app.domain.user.model.User;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class HomeInfoService implements GetHomeInfoUseCase {
+
+    private final LoadUserPort loadUserPort;
+    private final LoadMyPopupsPort loadMyPopupsPort;
+
+    @Override
+    @Transactional(readOnly = true)
+    public HomeUserResponseDto getMyHomeInfo(Long userId, int limit, int offset) {
+        // 사용자 조회 (없으면 예외)
+        User user = loadUserPort.loadUserById(userId)
+                .orElseThrow(() -> new BusinessException(AuthErrorCode.UNAUTHORIZED));
+
+        // 내 팝업 조회
+        List<MyPopupItemResponseDto> myPopups =
+                loadMyPopupsPort.findMyPopups(userId, limit, offset);
+
+        // 응답 DTO 조합
+        return HomeUserResponseDto.from(UserResponseDto.from(user), myPopups);
+    }
+
+}
+

From c37ddd695e8526fb22943c2c76b441d9acf658a1 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Fri, 15 Aug 2025 14:01:29 +0900
Subject: [PATCH 60/81] =?UTF-8?q?=F0=9F=94=A8=20Feature=20:=20"=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=95=20=EC=A0=9C=EA=B1=B0"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

페이징 기능 제거

related to: #9
---
 .../popcong/app/adapter/in/user/HomeController.java  |  6 ++----
 .../space/LoadMyPopupsPersistenceAdapter.java        | 12 +++---------
 .../space/repository/PopupJpaRepository.java         |  2 +-
 .../application/user/port/in/GetHomeInfoUseCase.java |  2 +-
 .../application/user/port/out/LoadMyPopupsPort.java  |  3 +--
 .../application/user/service/HomeInfoService.java    |  4 ++--
 6 files changed, 10 insertions(+), 19 deletions(-)

diff --git a/src/main/java/popcong/app/adapter/in/user/HomeController.java b/src/main/java/popcong/app/adapter/in/user/HomeController.java
index 35114ec..5210aef 100644
--- a/src/main/java/popcong/app/adapter/in/user/HomeController.java
+++ b/src/main/java/popcong/app/adapter/in/user/HomeController.java
@@ -25,16 +25,14 @@ public class HomeController {
 
     @GetMapping("/me")
     public ResponseDto<HomeUserResponseDto> getHomeInfo(
-            @AuthenticationPrincipal User user,
-            @RequestParam(defaultValue = "5") int limit,
-            @RequestParam(defaultValue = "0") int offset
+            @AuthenticationPrincipal User user
     ) {
         if (user == null) {
             throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
         }
 
         HomeUserResponseDto result =
-                getHomeInfoUseCase.getMyHomeInfo(user.userId(), limit, offset);
+                getHomeInfoUseCase.getMyHomeInfo(user.userId());
 
         log.info("홈 정보 조회 성공 : userId={}", user.userId());
 
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
index dd89db4..5e61620 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
@@ -1,8 +1,7 @@
 package popcong.app.adapter.out.persistence.space;
 
 import lombok.RequiredArgsConstructor;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
+
 import org.springframework.stereotype.Repository;
 
 import popcong.app.adapter.out.persistence.space.entity.PopupJpaEntity;
@@ -20,15 +19,10 @@ public class LoadMyPopupsPersistenceAdapter implements LoadMyPopupsPort {
     private final PopupJpaRepository popupJpaRepository;
 
     @Override
-    public List<MyPopupItemResponseDto> findMyPopups(Long userId, int limit, int offset) {
-        int safeLimit  = (limit <= 0) ? 5 : limit;
-        int safeOffset = Math.max(offset, 0);
-        int page = safeOffset / safeLimit;
-
-        Pageable pageable = PageRequest.of(page, safeLimit);   // 정렬은 메서드명에 포함
+    public List<MyPopupItemResponseDto> findMyPopups(Long userId) {
 
         List<PopupJpaEntity> rows =
-                popupJpaRepository.findByReservationUserUserIdOrderByStartDateDesc(userId, pageable);
+                popupJpaRepository.findByReservationUserUserIdOrderByStartDateDesc(userId);
 
         return rows.stream()
                 .map(PopupEntityMapper::toMyPopupItemResponseDto)
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
index 1589840..ecc028c 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
@@ -13,5 +13,5 @@ public interface PopupJpaRepository extends JpaRepository<PopupJpaEntity, Long>
 
      // 사용자별 팝업 목록 조회 (최신 시작일 내림차순)
     @EntityGraph(attributePaths = {"reservation", "reservation.space"}) //fetch 지정하여 추가쿼리 막음
-    List<PopupJpaEntity> findByReservationUserUserIdOrderByStartDateDesc(Long userId, Pageable pageable);
+    List<PopupJpaEntity> findByReservationUserUserIdOrderByStartDateDesc(Long userId);
 }
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java b/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java
index 714e683..df9578c 100644
--- a/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java
+++ b/src/main/java/popcong/app/application/user/port/in/GetHomeInfoUseCase.java
@@ -3,5 +3,5 @@
 import popcong.app.application.user.dto.response.HomeUserResponseDto;
 
 public interface GetHomeInfoUseCase {
-    HomeUserResponseDto getMyHomeInfo(Long userId, int limit, int offset);
+    HomeUserResponseDto getMyHomeInfo(Long userId);
 }
diff --git a/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java b/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java
index 514d1f5..5a4a28f 100644
--- a/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java
+++ b/src/main/java/popcong/app/application/user/port/out/LoadMyPopupsPort.java
@@ -5,6 +5,5 @@
 import java.util.List;
 
 public interface LoadMyPopupsPort {
-    List<MyPopupItemResponseDto> findMyPopups(Long userId, int limit, int offset);
-    //limit,offset -> 페이징
+    List<MyPopupItemResponseDto> findMyPopups(Long userId);
 }
diff --git a/src/main/java/popcong/app/application/user/service/HomeInfoService.java b/src/main/java/popcong/app/application/user/service/HomeInfoService.java
index 6e6cad8..7b336c4 100644
--- a/src/main/java/popcong/app/application/user/service/HomeInfoService.java
+++ b/src/main/java/popcong/app/application/user/service/HomeInfoService.java
@@ -25,14 +25,14 @@ public class HomeInfoService implements GetHomeInfoUseCase {
 
     @Override
     @Transactional(readOnly = true)
-    public HomeUserResponseDto getMyHomeInfo(Long userId, int limit, int offset) {
+    public HomeUserResponseDto getMyHomeInfo(Long userId) {
         // 사용자 조회 (없으면 예외)
         User user = loadUserPort.loadUserById(userId)
                 .orElseThrow(() -> new BusinessException(AuthErrorCode.UNAUTHORIZED));
 
         // 내 팝업 조회
         List<MyPopupItemResponseDto> myPopups =
-                loadMyPopupsPort.findMyPopups(userId, limit, offset);
+                loadMyPopupsPort.findMyPopups(userId);
 
         // 응답 DTO 조합
         return HomeUserResponseDto.from(UserResponseDto.from(user), myPopups);

From c04accee096615972b3b88cb0b350bd407104b1a Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Fri, 15 Aug 2025 15:28:00 +0900
Subject: [PATCH 61/81] =?UTF-8?q?=F0=9F=94=A8=20Feature=20:=20"=ED=8C=9D?=
 =?UTF-8?q?=EC=97=85=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=98=A4=EB=A6=84?=
 =?UTF-8?q?=EC=B0=A8=EC=88=9C=20=EC=A0=95=EB=A0=AC"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

MyPopups 시작일이 가까운날부터 나올 수 있도록 오름차순 정렬

related to: #9
---
 .../space/LoadMyPopupsPersistenceAdapter.java            | 2 +-
 .../persistence/space/repository/PopupJpaRepository.java | 9 +++------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
index 5e61620..4100c40 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/LoadMyPopupsPersistenceAdapter.java
@@ -22,7 +22,7 @@ public class LoadMyPopupsPersistenceAdapter implements LoadMyPopupsPort {
     public List<MyPopupItemResponseDto> findMyPopups(Long userId) {
 
         List<PopupJpaEntity> rows =
-                popupJpaRepository.findByReservationUserUserIdOrderByStartDateDesc(userId);
+                popupJpaRepository.findByReservationUserUserIdOrderByStartDateAsc(userId);
 
         return rows.stream()
                 .map(PopupEntityMapper::toMyPopupItemResponseDto)
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
index ecc028c..51fdb74 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/PopupJpaRepository.java
@@ -1,7 +1,5 @@
 package popcong.app.adapter.out.persistence.space.repository;
 
-
-import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import popcong.app.adapter.out.persistence.space.entity.PopupJpaEntity;
@@ -10,8 +8,7 @@
 
 public interface PopupJpaRepository extends JpaRepository<PopupJpaEntity, Long> {
 
-
-     // 사용자별 팝업 목록 조회 (최신 시작일 내림차순)
-    @EntityGraph(attributePaths = {"reservation", "reservation.space"}) //fetch 지정하여 추가쿼리 막음
-    List<PopupJpaEntity> findByReservationUserUserIdOrderByStartDateDesc(Long userId);
+    // 사용자별 팝업 목록 조회 (시작일 오름차순)
+    @EntityGraph(attributePaths = {"reservation", "reservation.space"}) // N+1 방지
+    List<PopupJpaEntity> findByReservationUserUserIdOrderByStartDateAsc(Long userId);
 }
\ No newline at end of file

From 6394e1bf5d37eda9307a5e25e37ce4de6b085c5c Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 22:46:44 +0900
Subject: [PATCH 62/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"QueryDSL?=
 =?UTF-8?q?=20DI=20=EC=A3=BC=EC=9E=85"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QueryDSL 관련 DI 주입

related to: #12
---
 build.gradle | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/build.gradle b/build.gradle
index 78e653b..1fb9633 100644
--- a/build.gradle
+++ b/build.gradle
@@ -50,6 +50,12 @@ dependencies {
 	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	runtimeOnly 'com.mysql:mysql-connector-j'
 
+	// QueryDSL
+	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+	annotationProcessor 'com.querydsl:querydsl-apt:5.0.0:jakarta'
+	annotationProcessor 'jakarta.annotation:jakarta.annotation-api:2.1.1'
+	annotationProcessor 'jakarta.persistence:jakarta.persistence-api:3.1.0'
+
 	// Test
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
@@ -67,6 +73,24 @@ dependencies {
 	implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
 }
 
+// Q타입 엔티티가 생성될 경로
+def generated = 'src/main/generated'
+
+
+// compile시 Q타입 경로에 파일 생성
+tasks.withType(JavaCompile).configureEach {
+	options.generatedSourceOutputDirectory.set(file(generated))
+}
+
+sourceSets {
+	main.java.srcDirs += [ generated ]
+}
+
+// clean 시 Q타입 삭제
+clean {
+	delete file(generated)
+}
+
 tasks.named('test') {
 	useJUnitPlatform()
 }

From b7a4150ce0d75931ea3ad4a43c5ccd798f7a27bb Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 22:48:13 +0900
Subject: [PATCH 63/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=84=B0=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

UserJpaEntity usert_id -> user_id,
Space views 추가

related to: #12
---
 .../adapter/out/persistence/user/entity/UserJpaEntity.java   | 2 +-
 src/main/java/popcong/app/domain/space/model/Space.java      | 5 +----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
index 20d407b..890551c 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/user/entity/UserJpaEntity.java
@@ -21,7 +21,7 @@ public class UserJpaEntity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
-    @Column(name = "usertId", nullable = false)
+    @Column(name = "userId", nullable = false)
     private Long userId;
 
     @Enumerated(EnumType.STRING)
diff --git a/src/main/java/popcong/app/domain/space/model/Space.java b/src/main/java/popcong/app/domain/space/model/Space.java
index 5cc0dbb..235bce3 100644
--- a/src/main/java/popcong/app/domain/space/model/Space.java
+++ b/src/main/java/popcong/app/domain/space/model/Space.java
@@ -1,7 +1,5 @@
 package popcong.app.domain.space.model;
 
-import java.time.LocalDateTime;
-
 public record Space(
         Long spaceId,
         Long userId,
@@ -21,7 +19,6 @@ public record Space(
         Double latitude,
         Double longitude,
         Status status,
-        Integer views,
-        LocalDateTime createdAt
+        Integer views
 ) {
 }

From 8a9fe31c66c56fd2b5f60432b80517f3af846542 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 22:49:37 +0900
Subject: [PATCH 64/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=9D=B8?=
 =?UTF-8?q?=ED=84=B0=ED=8E=98=EC=9D=B4=EC=8A=A4=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

SpaceMapQueryPort, SpaceMapQueryUseCase 작성

related to: #12
---
 .../space/port/in/SpaceMapQueryUseCase.java   | 20 ++++++++++++++++
 .../space/port/out/SpaceMapQueryPort.java     | 23 +++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
 create mode 100644 src/main/java/popcong/app/application/space/port/out/SpaceMapQueryPort.java

diff --git a/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java b/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
new file mode 100644
index 0000000..748c49e
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
@@ -0,0 +1,20 @@
+package popcong.app.application.space.port.in;
+
+import popcong.app.domain.space.model.Space;
+import popcong.app.domain.space.model.SpaceSortType;
+
+import java.util.List;
+
+public interface SpaceMapQueryUseCase {
+    List<Space> getSpaceMarkersInDisplayWithFilters(
+            Double nwLat,
+            Double nwLng,
+            Double seLat,
+            Double seLng,
+            Integer minAmount,
+            Integer maxAmount,
+            Integer floor,
+            Double rating,
+            SpaceSortType sortType
+    );
+}
diff --git a/src/main/java/popcong/app/application/space/port/out/SpaceMapQueryPort.java b/src/main/java/popcong/app/application/space/port/out/SpaceMapQueryPort.java
new file mode 100644
index 0000000..1cfc91f
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/port/out/SpaceMapQueryPort.java
@@ -0,0 +1,23 @@
+package popcong.app.application.space.port.out;
+
+import popcong.app.domain.space.model.Space;
+import popcong.app.domain.space.model.SpaceSortType;
+
+import java.util.List;
+
+// 지도 안의 마커 조건부 query 레포지토리
+public interface SpaceMapQueryPort {
+    List<Space> findSpacesInDisplayWithFilters(
+            Double nwLat,
+            Double nwLng,
+            Double seLat,
+            Double seLng,
+            Integer minAmount,
+            Integer maxAmount,
+            Integer floor,
+            Double rating,
+            SpaceSortType sortType
+//            Integer limit,
+//            Integer offset
+    );
+}
\ No newline at end of file

From f1326b59d53f507338dade1ce9d1595e927e5895 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 22:50:20 +0900
Subject: [PATCH 65/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"Mapper=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Entity -> Domain, Domain -> Dto 매퍼 작성

related to: #12
---
 .../persistence/space/mapper/SpaceMapper.java | 33 +++++++++++++++++++
 .../space/mapper/SpaceMarkerMapper.java       | 25 ++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMapper.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMapper.java
new file mode 100644
index 0000000..50cf735
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMapper.java
@@ -0,0 +1,33 @@
+package popcong.app.adapter.out.persistence.space.mapper;
+
+import org.springframework.stereotype.Component;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+import popcong.app.domain.space.model.Space;
+
+@Component
+public class SpaceMapper {
+
+    public Space toDomain(SpaceJpaEntity entity) {
+        return new Space(
+                entity.getSpaceId(),
+                entity.getUser().getUserId(),
+                entity.getSpaceName(),
+                entity.getSpaceType(),
+                entity.getSpaceApplicationType(),
+                entity.getSpaceRentalType(),
+                entity.getImageCount(),
+                entity.getDescription(),
+                entity.getDeposit(),
+                entity.getRentalFee(),
+                entity.getFloor(),
+                entity.getArea(),
+                entity.getRating(),
+                entity.getAddress(),
+                entity.getLocation(),
+                entity.getLatitude(),
+                entity.getLongitude(),
+                entity.getStatus(),
+                entity.getViews()
+        );
+    }
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
new file mode 100644
index 0000000..18b1fb1
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
@@ -0,0 +1,25 @@
+package popcong.app.adapter.out.persistence.space.mapper;
+
+import org.springframework.stereotype.Component;
+import popcong.app.application.space.dto.response.MarkerComponentDto;
+import popcong.app.domain.space.model.Space;
+
+@Component
+public class SpaceMarkerMapper {
+
+    public MarkerComponentDto toMarkerDto(Space space) {
+        return new MarkerComponentDto(
+                space.spaceId(),
+                space.latitude(),
+                space.longitude(),
+                space.spaceName(),
+                null,
+                space.rentalFee(),
+                space.address(),
+                space.floor(),
+                space.rating(),
+                0,
+                null
+        );
+    }
+}

From cc137505ad567d6a61d65f3dd66afb74e934c457 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 22:51:24 +0900
Subject: [PATCH 66/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EB=82=B4?=
 =?UTF-8?q?=EB=B6=80=20=EB=B9=84=EC=A7=80=EB=8B=88=EC=8A=A4=20=EB=A1=9C?=
 =?UTF-8?q?=EC=A7=81=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

QueryDSL 관련 설정 및 적용,
Repository, Service로 QueryParameter 처리 로직 작성

related to: #12
---
 .../space/repository/SpaceJpaRepository.java  |  8 ++
 .../repository/SpaceMapQueryAdapter.java      | 88 +++++++++++++++++++
 .../space/service/SpaceMapQueryService.java   | 42 +++++++++
 .../exception/error/SpaceErrorCode.java       |  4 +-
 .../app/infra/config/jpa/QuerydslConfig.java  | 15 ++++
 5 files changed, 156 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceJpaRepository.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java
 create mode 100644 src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
 create mode 100644 src/main/java/popcong/app/infra/config/jpa/QuerydslConfig.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceJpaRepository.java
new file mode 100644
index 0000000..36013a5
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceJpaRepository.java
@@ -0,0 +1,8 @@
+package popcong.app.adapter.out.persistence.space.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+
+public interface SpaceJpaRepository extends JpaRepository<SpaceJpaEntity, Long>, JpaSpecificationExecutor<SpaceJpaEntity> {
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java
new file mode 100644
index 0000000..4f71395
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java
@@ -0,0 +1,88 @@
+package popcong.app.adapter.out.persistence.space.repository;
+
+import com.querydsl.core.types.dsl.BooleanExpression;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import popcong.app.adapter.out.persistence.space.entity.QReservationJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.QReservationReviewJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.QSpaceJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.SpaceJpaEntity;
+import popcong.app.adapter.out.persistence.space.mapper.SpaceMapper;
+import popcong.app.application.space.port.out.SpaceMapQueryPort;
+import popcong.app.domain.space.model.Space;
+import popcong.app.domain.space.model.SpaceSortType;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.SpaceErrorCode;
+
+import java.util.List;
+
+@Repository
+@RequiredArgsConstructor
+public class SpaceMapQueryAdapter implements SpaceMapQueryPort {
+
+//    private final EntityManager entityManager;
+    private final JPAQueryFactory jpaQueryFactory;
+    private final SpaceMapper spaceMapper;
+
+    @Override
+    public List<Space> findSpacesInDisplayWithFilters(
+            Double nwLat,
+            Double nwLng,
+            Double seLat,
+            Double seLng,
+            Integer minAmount,
+            Integer maxAmount,
+            Integer floor,
+            Double rating,
+            SpaceSortType sortType
+    ) {
+
+        if (nwLat == null || nwLng == null || seLat == null || seLng == null) {
+            throw new BusinessException(SpaceErrorCode.INVALID_BOUDING_BOX);
+        }
+
+        // 박스 정규화
+        double minLat = Math.min(nwLat, seLat);
+        double maxLat = Math.max(nwLat, seLat);
+        double minLng = Math.min(nwLng, seLng);
+        double maxLng = Math.max(nwLng, seLng);
+
+        QSpaceJpaEntity s = QSpaceJpaEntity.spaceJpaEntity;
+        QReservationJpaEntity r = QReservationJpaEntity.reservationJpaEntity;
+        QReservationReviewJpaEntity rr = QReservationReviewJpaEntity.reservationReviewJpaEntity;
+
+        BooleanExpression inBox = s.latitude.between(minLat, maxLat).and(s.longitude.between(minLng, maxLng));
+        BooleanExpression feeMin = (minAmount != null) ? s.rentalFee.goe(minAmount) : null;
+        BooleanExpression feeMax = (maxAmount != null) ? s.rentalFee.loe(maxAmount) : null;
+        BooleanExpression floorEq = (floor != null) ? s.floor.eq(floor) : null;
+        BooleanExpression ratingGe = (rating != null) ? s.rating.goe(rating) : null;
+
+        if (sortType == null) {
+            sortType = SpaceSortType.MOST_POPULAR;
+        }
+
+        List<SpaceJpaEntity> entities = switch (sortType) {
+            case MOST_POPULAR -> jpaQueryFactory.selectFrom(s)
+                    .where(inBox, feeMin, feeMax, floorEq, ratingGe)
+                    .orderBy(s.views.desc(), s.spaceId.asc())
+                    .fetch();
+
+            case NEAREST -> jpaQueryFactory.selectFrom(s)
+                    .where(inBox, feeMin, feeMax, floorEq, ratingGe)
+                    .orderBy(s.spaceId.asc()) // id 순으로 진행 (임시)
+                    .fetch();
+
+            case MOST_REVIEWS -> jpaQueryFactory.selectFrom(s)
+                    .leftJoin(r).on(r.space.eq(s))
+                    .leftJoin(rr).on(rr.reservation.eq(r))
+                    .where(inBox, feeMin, feeMax, floorEq, ratingGe)
+                    .groupBy(s.spaceId)
+                    .orderBy(rr.reservationReviewId.count().desc(), s.spaceId.asc())
+                    .fetch();
+        };
+
+        return entities.stream().map(spaceMapper::toDomain).toList();
+    }
+}
diff --git a/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java b/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
new file mode 100644
index 0000000..37b507d
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
@@ -0,0 +1,42 @@
+package popcong.app.application.space.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import popcong.app.application.space.port.in.SpaceMapQueryUseCase;
+import popcong.app.application.space.port.out.SpaceMapQueryPort;
+import popcong.app.domain.space.model.Space;
+import popcong.app.domain.space.model.SpaceSortType;
+
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class SpaceMapQueryService implements SpaceMapQueryUseCase {
+
+    private final SpaceMapQueryPort spaceMapQueryPort;
+
+    @Override
+    public List<Space> getSpaceMarkersInDisplayWithFilters(
+            Double nwLat,
+            Double nwLng,
+            Double seLat,
+            Double seLng,
+            Integer minAmount,
+            Integer maxAmount,
+            Integer floor,
+            Double rating,
+            SpaceSortType sortType
+    ) {
+        return spaceMapQueryPort.findSpacesInDisplayWithFilters(
+                nwLat,
+                nwLng,
+                seLat,
+                seLng,
+                minAmount,
+                maxAmount,
+                floor,
+                rating,
+                sortType
+        );
+    }
+}
diff --git a/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java b/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
index e9a5015..ad8f620 100644
--- a/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
+++ b/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
@@ -12,7 +12,9 @@
 public enum SpaceErrorCode implements ErrorCode {
 
     // 400
-    INVALID_PRICE_ERROR(HttpStatus.BAD_REQUEST.value(), "S4001", "금액 범위가 잘못되었습니다.");
+    INVALID_PRICE_ERROR(HttpStatus.BAD_REQUEST.value(), "S4001", "금액 범위가 잘못되었습니다."),
+    UNSUPPORTED_SORT_TYPE(HttpStatus.BAD_REQUEST.value(), "S4002", "지원하지 않는 정렬 타입입니다."),
+    INVALID_BOUDING_BOX(HttpStatus.BAD_REQUEST.value(), "S4003", "탐색 범위가 잘못됐습니다."),;
 
     private final int httpStatus;
     private final String code;
diff --git a/src/main/java/popcong/app/infra/config/jpa/QuerydslConfig.java b/src/main/java/popcong/app/infra/config/jpa/QuerydslConfig.java
new file mode 100644
index 0000000..8bd346a
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/jpa/QuerydslConfig.java
@@ -0,0 +1,15 @@
+package popcong.app.infra.config.jpa;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import jakarta.persistence.EntityManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuerydslConfig {
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory(EntityManager entityManager) {
+        return new JPAQueryFactory(entityManager);
+    }
+}
\ No newline at end of file

From 39150b0b9abb2ca998fecdc80e146942bfd838f7 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 22:52:12 +0900
Subject: [PATCH 67/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"Controller=20?=
 =?UTF-8?q?=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

마커 불러오는 API 컨트롤러 작성

related to: #12
---
 .../app/adapter/in/space/SpaceController.java | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 src/main/java/popcong/app/adapter/in/space/SpaceController.java

diff --git a/src/main/java/popcong/app/adapter/in/space/SpaceController.java b/src/main/java/popcong/app/adapter/in/space/SpaceController.java
new file mode 100644
index 0000000..ecdfb14
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/space/SpaceController.java
@@ -0,0 +1,63 @@
+package popcong.app.adapter.in.space;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.*;
+import popcong.app.adapter.out.persistence.space.mapper.SpaceMarkerMapper;
+import popcong.app.application.space.dto.request.CurrentUserLocationRequestDto;
+import popcong.app.application.space.dto.response.MarkerComponentDto;
+import popcong.app.application.space.dto.response.MarkerListResponseDto;
+import popcong.app.application.space.port.in.SpaceMapQueryUseCase;
+import popcong.app.domain.space.model.Space;
+import popcong.app.domain.space.model.SpaceSortType;
+import popcong.app.global.dto.ResponseDto;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.SpaceErrorCode;
+
+import java.util.List;
+
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/popup/space")
+public class SpaceController {
+
+    private final SpaceMapQueryUseCase spaceMapQueryUseCase;
+    private final SpaceMarkerMapper spaceMarkerMapper;
+
+    @GetMapping("/markers")
+    public ResponseDto<MarkerListResponseDto> getMarkers(
+            @RequestBody CurrentUserLocationRequestDto request,
+            @RequestParam(name = "nw-lat") Double nwLat,
+            @RequestParam(name = "nw-lng") Double nwLng,
+            @RequestParam(name = "se-lat") Double seLat,
+            @RequestParam(name = "se-lng") Double seLng,
+            @RequestParam(name = "min-amount", required = false) Integer minAmount,
+            @RequestParam(name = "max-amount", required = false) Integer maxAmount,
+            @RequestParam(name = "floor", required = false) Integer floor,
+            @RequestParam(name = "rating", required = false) Double rating,
+            @RequestParam(name = "sort", defaultValue = "MOST_POPULAR") SpaceSortType sort
+    ){
+        if (minAmount != null && maxAmount != null && minAmount > maxAmount) {
+            throw new BusinessException(SpaceErrorCode.INVALID_PRICE_ERROR);
+        }
+
+        List<Space> spaces = spaceMapQueryUseCase.getSpaceMarkersInDisplayWithFilters(
+                nwLat, nwLng, seLat, seLng,
+                minAmount, maxAmount, floor, rating, sort
+        );
+
+        List<MarkerComponentDto> markers = spaces.stream()
+                .map(spaceMarkerMapper::toMarkerDto)
+                .toList();
+
+        MarkerListResponseDto result = new MarkerListResponseDto(markers);
+
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "마커 조회 성공",
+                result
+        );
+    }
+}

From 2c03b19d1e284c4e7ceba41501cba6f109cf960a Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 23:43:35 +0900
Subject: [PATCH 68/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"CoverImage=20?=
 =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

대표 이미지 조회 추가 & 없는 경우 null

related to: #12
---
 .../image/mapper/CoverImageMapper.java        | 12 ++++++++++
 .../image/repository/ImageJpaRepository.java  | 14 ++++++++++++
 .../space/mapper/SpaceMarkerMapper.java       | 12 +++++++++-
 .../image/service/ImageQueryService.java      | 22 +++++++++++++++++++
 4 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/image/mapper/CoverImageMapper.java
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java
 create mode 100644 src/main/java/popcong/app/application/image/service/ImageQueryService.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/image/mapper/CoverImageMapper.java b/src/main/java/popcong/app/adapter/out/persistence/image/mapper/CoverImageMapper.java
new file mode 100644
index 0000000..bbb73da
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/image/mapper/CoverImageMapper.java
@@ -0,0 +1,12 @@
+package popcong.app.adapter.out.persistence.image.mapper;
+
+import org.springframework.stereotype.Component;
+import popcong.app.adapter.out.persistence.image.entity.ImageJpaEntity;
+
+@Component
+public class CoverImageMapper {
+
+    public String toCoverImageUrlDto(ImageJpaEntity imageJpaEntity) {
+        return imageJpaEntity.getImageUrl();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java
new file mode 100644
index 0000000..2cad725
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java
@@ -0,0 +1,14 @@
+package popcong.app.adapter.out.persistence.image.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import popcong.app.adapter.out.persistence.image.entity.ImageJpaEntity;
+import popcong.app.domain.image.model.ImageableType;
+
+import java.util.Optional;
+
+public interface ImageJpaRepository extends JpaRepository<ImageJpaEntity, Long> {
+
+    Optional<ImageJpaEntity> findByImageableTypeAndImageableIdAndSaveOrder(
+            ImageableType imageableType, Long imageableId, Integer saveOrder
+    );
+}
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
index 18b1fb1..26543cc 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
@@ -1,19 +1,29 @@
 package popcong.app.adapter.out.persistence.space.mapper;
 
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
+import popcong.app.application.image.service.ImageQueryService;
 import popcong.app.application.space.dto.response.MarkerComponentDto;
+import popcong.app.domain.image.model.ImageableType;
 import popcong.app.domain.space.model.Space;
 
 @Component
+@RequiredArgsConstructor
 public class SpaceMarkerMapper {
 
+    private final ImageQueryService imageQueryService;
+
     public MarkerComponentDto toMarkerDto(Space space) {
+
+        String coverImageUrl = imageQueryService.getCoverImageUrl(ImageableType.SPACE, space.spaceId());
+
+
         return new MarkerComponentDto(
                 space.spaceId(),
                 space.latitude(),
                 space.longitude(),
                 space.spaceName(),
-                null,
+                coverImageUrl,
                 space.rentalFee(),
                 space.address(),
                 space.floor(),
diff --git a/src/main/java/popcong/app/application/image/service/ImageQueryService.java b/src/main/java/popcong/app/application/image/service/ImageQueryService.java
new file mode 100644
index 0000000..fb35165
--- /dev/null
+++ b/src/main/java/popcong/app/application/image/service/ImageQueryService.java
@@ -0,0 +1,22 @@
+package popcong.app.application.image.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import popcong.app.adapter.out.persistence.image.mapper.CoverImageMapper;
+import popcong.app.adapter.out.persistence.image.repository.ImageJpaRepository;
+import popcong.app.domain.image.model.ImageableType;
+
+@Service
+@RequiredArgsConstructor
+public class ImageQueryService {
+
+    private final ImageJpaRepository imageJpaRepository;
+    private final CoverImageMapper coverImageMapper;
+
+    public String getCoverImageUrl(ImageableType imageableType, Long imageableId) {
+        return imageJpaRepository
+                .findByImageableTypeAndImageableIdAndSaveOrder(imageableType, imageableId, 1)
+                .map(coverImageMapper::toCoverImageUrlDto)
+                .orElse(null);
+    }
+}

From 72403b8892b7867028e80cf353c930eb47a31052 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Fri, 15 Aug 2025 23:51:48 +0900
Subject: [PATCH 69/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"=EC=9D=B4=EB=AF=B8?=
 =?UTF-8?q?=EC=A7=80=20=EC=A1=B0=ED=9A=8C=20=EA=B4=80=EB=A0=A8=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

interface, 구현체로 분리

related to: #12
---
 .../out/persistence/space/mapper/SpaceMarkerMapper.java    | 4 ++--
 .../app/application/image/port/in/ImageQueryUseCase.java   | 7 +++++++
 .../app/application/image/service/ImageQueryService.java   | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/popcong/app/application/image/port/in/ImageQueryUseCase.java

diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
index 26543cc..5f8aa97 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
@@ -2,7 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
-import popcong.app.application.image.service.ImageQueryService;
+import popcong.app.application.image.port.in.ImageQueryUseCase;
 import popcong.app.application.space.dto.response.MarkerComponentDto;
 import popcong.app.domain.image.model.ImageableType;
 import popcong.app.domain.space.model.Space;
@@ -11,7 +11,7 @@
 @RequiredArgsConstructor
 public class SpaceMarkerMapper {
 
-    private final ImageQueryService imageQueryService;
+    private final ImageQueryUseCase imageQueryService;
 
     public MarkerComponentDto toMarkerDto(Space space) {
 
diff --git a/src/main/java/popcong/app/application/image/port/in/ImageQueryUseCase.java b/src/main/java/popcong/app/application/image/port/in/ImageQueryUseCase.java
new file mode 100644
index 0000000..b8ba00b
--- /dev/null
+++ b/src/main/java/popcong/app/application/image/port/in/ImageQueryUseCase.java
@@ -0,0 +1,7 @@
+package popcong.app.application.image.port.in;
+
+import popcong.app.domain.image.model.ImageableType;
+
+public interface ImageQueryUseCase {
+    String getCoverImageUrl(ImageableType imageableType, Long imageableId);
+}
diff --git a/src/main/java/popcong/app/application/image/service/ImageQueryService.java b/src/main/java/popcong/app/application/image/service/ImageQueryService.java
index fb35165..18ab06f 100644
--- a/src/main/java/popcong/app/application/image/service/ImageQueryService.java
+++ b/src/main/java/popcong/app/application/image/service/ImageQueryService.java
@@ -4,11 +4,12 @@
 import org.springframework.stereotype.Service;
 import popcong.app.adapter.out.persistence.image.mapper.CoverImageMapper;
 import popcong.app.adapter.out.persistence.image.repository.ImageJpaRepository;
+import popcong.app.application.image.port.in.ImageQueryUseCase;
 import popcong.app.domain.image.model.ImageableType;
 
 @Service
 @RequiredArgsConstructor
-public class ImageQueryService {
+public class ImageQueryService implements ImageQueryUseCase {
 
     private final ImageJpaRepository imageJpaRepository;
     private final CoverImageMapper coverImageMapper;

From 99bedbb55f5272c6a3e625f5d8b6c9979868f1e9 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sat, 16 Aug 2025 01:03:32 +0900
Subject: [PATCH 70/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EA=B1=B0?=
 =?UTF-8?q?=EB=A6=AC=20=EC=B8=A1=EC=A0=95=20=EB=B0=8F=20=ED=9B=84=EA=B8=B0?=
 =?UTF-8?q?=20=EC=88=98=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

거리 측정 및 후기 수 로직 추가

related to: #12
---
 .../app/adapter/in/space/SpaceController.java | 14 +++-
 .../space/mapper/SpaceMarkerMapper.java       | 19 ++++--
 .../repository/ReviewCountQueryAdapter.java   | 68 +++++++++++++++++++
 .../image/port/in/GeoDistanceUseCase.java     |  5 ++
 .../image/service/GeoDistanceService.java     | 35 ++++++++++
 .../dto/response/MarkerComponentDto.java      |  2 +-
 .../dto/response/SpaceReviewCountDto.java     |  6 ++
 .../space/port/in/SpaceMapQueryUseCase.java   |  3 +
 .../space/port/out/ReviewCountQueryPort.java  | 12 ++++
 .../space/service/SpaceMapQueryService.java   | 12 ++++
 .../exception/error/SpaceErrorCode.java       |  3 +-
 11 files changed, 171 insertions(+), 8 deletions(-)
 create mode 100644 src/main/java/popcong/app/adapter/out/persistence/space/repository/ReviewCountQueryAdapter.java
 create mode 100644 src/main/java/popcong/app/application/image/port/in/GeoDistanceUseCase.java
 create mode 100644 src/main/java/popcong/app/application/image/service/GeoDistanceService.java
 create mode 100644 src/main/java/popcong/app/application/space/dto/response/SpaceReviewCountDto.java
 create mode 100644 src/main/java/popcong/app/application/space/port/out/ReviewCountQueryPort.java

diff --git a/src/main/java/popcong/app/adapter/in/space/SpaceController.java b/src/main/java/popcong/app/adapter/in/space/SpaceController.java
index ecdfb14..1ec507c 100644
--- a/src/main/java/popcong/app/adapter/in/space/SpaceController.java
+++ b/src/main/java/popcong/app/adapter/in/space/SpaceController.java
@@ -16,6 +16,7 @@
 import popcong.app.global.exception.error.SpaceErrorCode;
 
 import java.util.List;
+import java.util.Map;
 
 @Slf4j
 @RestController
@@ -39,17 +40,28 @@ public ResponseDto<MarkerListResponseDto> getMarkers(
             @RequestParam(name = "rating", required = false) Double rating,
             @RequestParam(name = "sort", defaultValue = "MOST_POPULAR") SpaceSortType sort
     ){
+        if (request == null) {
+            throw new BusinessException(SpaceErrorCode.USER_LOCATION_REQUIRED);
+        }
+
         if (minAmount != null && maxAmount != null && minAmount > maxAmount) {
             throw new BusinessException(SpaceErrorCode.INVALID_PRICE_ERROR);
         }
 
+        Double userLat = (request != null) ? request.latitude()  : null;
+        Double userLng = (request != null) ? request.longitude() : null;
+
         List<Space> spaces = spaceMapQueryUseCase.getSpaceMarkersInDisplayWithFilters(
                 nwLat, nwLng, seLat, seLng,
                 minAmount, maxAmount, floor, rating, sort
         );
 
+        Map<Long, Long> reviewCounts = spaceMapQueryUseCase.getReviewCountsFor(spaces);
+
         List<MarkerComponentDto> markers = spaces.stream()
-                .map(spaceMarkerMapper::toMarkerDto)
+                .map(space -> spaceMarkerMapper.toMarkerDto(
+                        space, userLat, userLng, reviewCounts.getOrDefault(space.spaceId(), 0L).intValue()
+                ))
                 .toList();
 
         MarkerListResponseDto result = new MarkerListResponseDto(markers);
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
index 5f8aa97..795cb1b 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
@@ -2,6 +2,7 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
+import popcong.app.application.image.port.in.GeoDistanceUseCase;
 import popcong.app.application.image.port.in.ImageQueryUseCase;
 import popcong.app.application.space.dto.response.MarkerComponentDto;
 import popcong.app.domain.image.model.ImageableType;
@@ -11,12 +12,20 @@
 @RequiredArgsConstructor
 public class SpaceMarkerMapper {
 
-    private final ImageQueryUseCase imageQueryService;
+    private final ImageQueryUseCase imageQueryUseCase;
+    private final GeoDistanceUseCase geoDistanceUseCase;
 
-    public MarkerComponentDto toMarkerDto(Space space) {
+    public MarkerComponentDto toMarkerDto(Space space, Double userLat, Double userLng) {
+        return toMarkerDto(space, userLat, userLng, 0);
+    }
+
+    public MarkerComponentDto toMarkerDto(Space space, Double userLat, Double userLng, int reviewCount) {
 
-        String coverImageUrl = imageQueryService.getCoverImageUrl(ImageableType.SPACE, space.spaceId());
+        String coverImageUrl = imageQueryUseCase.getCoverImageUrl(ImageableType.SPACE, space.spaceId());
 
+        Long straightDistance = geoDistanceUseCase.getStraightDistance(
+                userLat, userLng, space.latitude(), space.longitude()
+        );
 
         return new MarkerComponentDto(
                 space.spaceId(),
@@ -28,8 +37,8 @@ public MarkerComponentDto toMarkerDto(Space space) {
                 space.address(),
                 space.floor(),
                 space.rating(),
-                0,
-                null
+                reviewCount,
+                straightDistance
         );
     }
 }
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/ReviewCountQueryAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/ReviewCountQueryAdapter.java
new file mode 100644
index 0000000..b79244d
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/ReviewCountQueryAdapter.java
@@ -0,0 +1,68 @@
+package popcong.app.adapter.out.persistence.space.repository;
+
+import com.querydsl.core.Tuple;
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Repository;
+import popcong.app.adapter.out.persistence.space.entity.QReservationJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.QReservationReviewJpaEntity;
+import popcong.app.adapter.out.persistence.space.entity.QSpaceJpaEntity;
+import popcong.app.application.space.port.out.ReviewCountQueryPort;
+
+import java.util.*;
+
+@Repository
+@RequiredArgsConstructor
+public class ReviewCountQueryAdapter implements ReviewCountQueryPort {
+
+    private final JPAQueryFactory jpaQueryFactory;
+
+    @Override
+    public Long countBySpaceId(long spaceId) {
+        QReservationReviewJpaEntity rr = QReservationReviewJpaEntity.reservationReviewJpaEntity;
+        QReservationJpaEntity r = QReservationJpaEntity.reservationJpaEntity;
+        QSpaceJpaEntity s =  QSpaceJpaEntity.spaceJpaEntity;
+
+        Long count = jpaQueryFactory
+                .select(rr.count())
+                .from(rr)
+                .join(rr.reservation, r)
+                .join(r.space, s)
+                .where(s.spaceId.eq(spaceId))
+                .fetchOne();
+
+        return count != null ? count : 0;
+    }
+
+    @Override
+    public Map<Long, Long> countBySpaceIds(Collection<Long> spaceIds) {
+        if (spaceIds == null || spaceIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+
+        QReservationReviewJpaEntity rr = QReservationReviewJpaEntity.reservationReviewJpaEntity;
+        QReservationJpaEntity r = QReservationJpaEntity.reservationJpaEntity;
+        QSpaceJpaEntity s =  QSpaceJpaEntity.spaceJpaEntity;
+
+        List<Tuple> rows = jpaQueryFactory
+                .select(s.spaceId, rr.count())
+                .from(rr)
+                .join(rr.reservation, r)
+                .join(r.space, s)
+                .where(s.spaceId.in(spaceIds))
+                .groupBy(s.spaceId)
+                .fetch();
+
+        Map<Long, Long> map = new HashMap<>();
+
+        for (Tuple t : rows) {
+            map.put(t.get(s.spaceId), t.get(rr.count()));
+        }
+
+        for (Long id : spaceIds) {
+            map.putIfAbsent(id, 0L);
+        }
+
+        return map;
+    }
+}
diff --git a/src/main/java/popcong/app/application/image/port/in/GeoDistanceUseCase.java b/src/main/java/popcong/app/application/image/port/in/GeoDistanceUseCase.java
new file mode 100644
index 0000000..9ff7e43
--- /dev/null
+++ b/src/main/java/popcong/app/application/image/port/in/GeoDistanceUseCase.java
@@ -0,0 +1,5 @@
+package popcong.app.application.image.port.in;
+
+public interface GeoDistanceUseCase {
+    Long getStraightDistance(Double lat1, Double lng1, Double lat2, Double lng2);
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/image/service/GeoDistanceService.java b/src/main/java/popcong/app/application/image/service/GeoDistanceService.java
new file mode 100644
index 0000000..bbfd71f
--- /dev/null
+++ b/src/main/java/popcong/app/application/image/service/GeoDistanceService.java
@@ -0,0 +1,35 @@
+package popcong.app.application.image.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import popcong.app.application.image.port.in.GeoDistanceUseCase;
+
+@Service
+@RequiredArgsConstructor
+public class GeoDistanceService implements GeoDistanceUseCase {
+
+    private static final double EARTH_RADIUS_M = 6371000.0; // 지구 반지름 (m)
+
+    // (lat1, lng1)과 (lat2, lng2) 사이 거리 계산 후 반올림 정수 값 반환
+    public Long getStraightDistance(Double lat1, Double lng1, Double lat2, Double lng2) {
+
+        if (lat1 == null || lng1 == null || lat2 == null || lng2 == null) {
+            return null;
+        }
+
+        double rLat1 = Math.toRadians(lat1);
+        double rLat2 = Math.toRadians(lat2);
+        double dLat  = Math.toRadians(lat2 - lat1);
+        double dLon  = Math.toRadians(lng2 - lng1);
+
+        double a = Math.sin(dLat / 2) * Math.sin(dLat / 2)
+                + Math.cos(rLat1) * Math.cos(rLat2)
+                * Math.sin(dLon / 2) * Math.sin(dLon / 2);
+
+        double c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+
+        Long distance = Math.round(EARTH_RADIUS_M * c);;
+
+        return distance;
+    }
+}
diff --git a/src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java b/src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java
index 2ce2376..8e464cc 100644
--- a/src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java
+++ b/src/main/java/popcong/app/application/space/dto/response/MarkerComponentDto.java
@@ -11,6 +11,6 @@ public record MarkerComponentDto(
         Integer floor, // 층수
         Double rating, // 공간 평점
         Integer reviewCount, // 공간 후기 수
-        Double distance // 현위치와의 거리
+        Long distance // 현위치와의 거리
 ) {
 }
diff --git a/src/main/java/popcong/app/application/space/dto/response/SpaceReviewCountDto.java b/src/main/java/popcong/app/application/space/dto/response/SpaceReviewCountDto.java
new file mode 100644
index 0000000..03ca858
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/dto/response/SpaceReviewCountDto.java
@@ -0,0 +1,6 @@
+package popcong.app.application.space.dto.response;
+
+public record SpaceReviewCountDto(
+
+) {
+}
diff --git a/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java b/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
index 748c49e..25b2e3b 100644
--- a/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
+++ b/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
@@ -4,6 +4,7 @@
 import popcong.app.domain.space.model.SpaceSortType;
 
 import java.util.List;
+import java.util.Map;
 
 public interface SpaceMapQueryUseCase {
     List<Space> getSpaceMarkersInDisplayWithFilters(
@@ -17,4 +18,6 @@ List<Space> getSpaceMarkersInDisplayWithFilters(
             Double rating,
             SpaceSortType sortType
     );
+
+    Map<Long, Long> getReviewCountsFor(List<Space> spaces);
 }
diff --git a/src/main/java/popcong/app/application/space/port/out/ReviewCountQueryPort.java b/src/main/java/popcong/app/application/space/port/out/ReviewCountQueryPort.java
new file mode 100644
index 0000000..fc95bbe
--- /dev/null
+++ b/src/main/java/popcong/app/application/space/port/out/ReviewCountQueryPort.java
@@ -0,0 +1,12 @@
+package popcong.app.application.space.port.out;
+
+import java.util.Collection;
+import java.util.Map;
+
+public interface ReviewCountQueryPort {
+    // 리뷰 수 구하기
+    Long countBySpaceId(long spaceId);
+
+    // 여러 공간의 리뷰 수 한 번에 구하기
+    Map<Long, Long> countBySpaceIds(Collection<Long> spaceIds);
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java b/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
index 37b507d..c16ff19 100644
--- a/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
+++ b/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
@@ -3,17 +3,20 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import popcong.app.application.space.port.in.SpaceMapQueryUseCase;
+import popcong.app.application.space.port.out.ReviewCountQueryPort;
 import popcong.app.application.space.port.out.SpaceMapQueryPort;
 import popcong.app.domain.space.model.Space;
 import popcong.app.domain.space.model.SpaceSortType;
 
 import java.util.List;
+import java.util.Map;
 
 @Service
 @RequiredArgsConstructor
 public class SpaceMapQueryService implements SpaceMapQueryUseCase {
 
     private final SpaceMapQueryPort spaceMapQueryPort;
+    private final ReviewCountQueryPort reviewCountQueryPort;
 
     @Override
     public List<Space> getSpaceMarkersInDisplayWithFilters(
@@ -39,4 +42,13 @@ public List<Space> getSpaceMarkersInDisplayWithFilters(
                 sortType
         );
     }
+
+    // 집계 후 Mapper에 전달하기 위함
+    public Map<Long, Long> getReviewCountsFor(List<Space> spaces) {
+        var ids = spaces.stream()
+                .map(Space::spaceId)
+                .toList();
+
+        return reviewCountQueryPort.countBySpaceIds(ids);
+    }
 }
diff --git a/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java b/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
index ad8f620..3d4340b 100644
--- a/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
+++ b/src/main/java/popcong/app/global/exception/error/SpaceErrorCode.java
@@ -14,7 +14,8 @@ public enum SpaceErrorCode implements ErrorCode {
     // 400
     INVALID_PRICE_ERROR(HttpStatus.BAD_REQUEST.value(), "S4001", "금액 범위가 잘못되었습니다."),
     UNSUPPORTED_SORT_TYPE(HttpStatus.BAD_REQUEST.value(), "S4002", "지원하지 않는 정렬 타입입니다."),
-    INVALID_BOUDING_BOX(HttpStatus.BAD_REQUEST.value(), "S4003", "탐색 범위가 잘못됐습니다."),;
+    INVALID_BOUDING_BOX(HttpStatus.BAD_REQUEST.value(), "S4003", "탐색 범위가 잘못됐습니다."),
+    USER_LOCATION_REQUIRED(HttpStatus.BAD_REQUEST.value(), "S4004", "사용자의 현재 위치 정보가 필요합니다.");
 
     private final int httpStatus;
     private final String code;

From f8fe6c9e49981400b92a74304bc2aaf8a9cbeced Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sat, 16 Aug 2025 01:41:48 +0900
Subject: [PATCH 71/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"=EC=A0=95?=
 =?UTF-8?q?=EB=A0=AC=20=EB=B0=A9=EC=8B=9D=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

가까운 순, 리뷰 많은 순 정렬 추가 및 리팩토링

related to: #12
---
 .../app/adapter/in/space/SpaceController.java | 15 +---
 .../space/mapper/SpaceMarkerMapper.java       | 12 +--
 .../repository/SpaceMapQueryAdapter.java      | 24 ++----
 .../space/port/in/SpaceMapQueryUseCase.java   | 15 ++++
 .../space/service/SpaceMapQueryService.java   | 82 ++++++++++++++++++-
 5 files changed, 106 insertions(+), 42 deletions(-)

diff --git a/src/main/java/popcong/app/adapter/in/space/SpaceController.java b/src/main/java/popcong/app/adapter/in/space/SpaceController.java
index 1ec507c..2d68d9e 100644
--- a/src/main/java/popcong/app/adapter/in/space/SpaceController.java
+++ b/src/main/java/popcong/app/adapter/in/space/SpaceController.java
@@ -6,17 +6,13 @@
 import org.springframework.web.bind.annotation.*;
 import popcong.app.adapter.out.persistence.space.mapper.SpaceMarkerMapper;
 import popcong.app.application.space.dto.request.CurrentUserLocationRequestDto;
-import popcong.app.application.space.dto.response.MarkerComponentDto;
 import popcong.app.application.space.dto.response.MarkerListResponseDto;
 import popcong.app.application.space.port.in.SpaceMapQueryUseCase;
-import popcong.app.domain.space.model.Space;
 import popcong.app.domain.space.model.SpaceSortType;
 import popcong.app.global.dto.ResponseDto;
 import popcong.app.global.exception.custom.BusinessException;
 import popcong.app.global.exception.error.SpaceErrorCode;
 
-import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @RestController
@@ -51,19 +47,12 @@ public ResponseDto<MarkerListResponseDto> getMarkers(
         Double userLat = (request != null) ? request.latitude()  : null;
         Double userLng = (request != null) ? request.longitude() : null;
 
-        List<Space> spaces = spaceMapQueryUseCase.getSpaceMarkersInDisplayWithFilters(
+        var markers = spaceMapQueryUseCase.getMarkerInDisplayWithFilters(
+                userLat, userLng,
                 nwLat, nwLng, seLat, seLng,
                 minAmount, maxAmount, floor, rating, sort
         );
 
-        Map<Long, Long> reviewCounts = spaceMapQueryUseCase.getReviewCountsFor(spaces);
-
-        List<MarkerComponentDto> markers = spaces.stream()
-                .map(space -> spaceMarkerMapper.toMarkerDto(
-                        space, userLat, userLng, reviewCounts.getOrDefault(space.spaceId(), 0L).intValue()
-                ))
-                .toList();
-
         MarkerListResponseDto result = new MarkerListResponseDto(markers);
 
         return new ResponseDto<>(
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
index 795cb1b..d2ed328 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/mapper/SpaceMarkerMapper.java
@@ -2,7 +2,6 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Component;
-import popcong.app.application.image.port.in.GeoDistanceUseCase;
 import popcong.app.application.image.port.in.ImageQueryUseCase;
 import popcong.app.application.space.dto.response.MarkerComponentDto;
 import popcong.app.domain.image.model.ImageableType;
@@ -13,20 +12,11 @@
 public class SpaceMarkerMapper {
 
     private final ImageQueryUseCase imageQueryUseCase;
-    private final GeoDistanceUseCase geoDistanceUseCase;
 
-    public MarkerComponentDto toMarkerDto(Space space, Double userLat, Double userLng) {
-        return toMarkerDto(space, userLat, userLng, 0);
-    }
-
-    public MarkerComponentDto toMarkerDto(Space space, Double userLat, Double userLng, int reviewCount) {
+    public MarkerComponentDto toMarkerDto(Space space, Long straightDistance, int reviewCount) {
 
         String coverImageUrl = imageQueryUseCase.getCoverImageUrl(ImageableType.SPACE, space.spaceId());
 
-        Long straightDistance = geoDistanceUseCase.getStraightDistance(
-                userLat, userLng, space.latitude(), space.longitude()
-        );
-
         return new MarkerComponentDto(
                 space.spaceId(),
                 space.latitude(),
diff --git a/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java b/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java
index 4f71395..b1fb608 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/space/repository/SpaceMapQueryAdapter.java
@@ -50,14 +50,14 @@ public List<Space> findSpacesInDisplayWithFilters(
         double maxLng = Math.max(nwLng, seLng);
 
         QSpaceJpaEntity s = QSpaceJpaEntity.spaceJpaEntity;
-        QReservationJpaEntity r = QReservationJpaEntity.reservationJpaEntity;
-        QReservationReviewJpaEntity rr = QReservationReviewJpaEntity.reservationReviewJpaEntity;
+//        QReservationJpaEntity r = QReservationJpaEntity.reservationJpaEntity;
+//        QReservationReviewJpaEntity rr = QReservationReviewJpaEntity.reservationReviewJpaEntity;
 
         BooleanExpression inBox = s.latitude.between(minLat, maxLat).and(s.longitude.between(minLng, maxLng));
         BooleanExpression feeMin = (minAmount != null) ? s.rentalFee.goe(minAmount) : null;
         BooleanExpression feeMax = (maxAmount != null) ? s.rentalFee.loe(maxAmount) : null;
         BooleanExpression floorEq = (floor != null) ? s.floor.eq(floor) : null;
-        BooleanExpression ratingGe = (rating != null) ? s.rating.goe(rating) : null;
+        BooleanExpression ratingG = (rating != null) ? s.rating.goe(rating) : null;
 
         if (sortType == null) {
             sortType = SpaceSortType.MOST_POPULAR;
@@ -65,21 +65,13 @@ public List<Space> findSpacesInDisplayWithFilters(
 
         List<SpaceJpaEntity> entities = switch (sortType) {
             case MOST_POPULAR -> jpaQueryFactory.selectFrom(s)
-                    .where(inBox, feeMin, feeMax, floorEq, ratingGe)
+                    .where(inBox, feeMin, feeMax, floorEq, ratingG)
                     .orderBy(s.views.desc(), s.spaceId.asc())
                     .fetch();
-
-            case NEAREST -> jpaQueryFactory.selectFrom(s)
-                    .where(inBox, feeMin, feeMax, floorEq, ratingGe)
-                    .orderBy(s.spaceId.asc()) // id 순으로 진행 (임시)
-                    .fetch();
-
-            case MOST_REVIEWS -> jpaQueryFactory.selectFrom(s)
-                    .leftJoin(r).on(r.space.eq(s))
-                    .leftJoin(rr).on(rr.reservation.eq(r))
-                    .where(inBox, feeMin, feeMax, floorEq, ratingGe)
-                    .groupBy(s.spaceId)
-                    .orderBy(rr.reservationReviewId.count().desc(), s.spaceId.asc())
+            case NEAREST, MOST_REVIEWS -> jpaQueryFactory
+                    .selectFrom(s)
+                    .where(inBox, feeMin, feeMax, floorEq, ratingG)
+                    .orderBy(s.spaceId.asc())
                     .fetch();
         };
 
diff --git a/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java b/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
index 25b2e3b..b85213c 100644
--- a/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
+++ b/src/main/java/popcong/app/application/space/port/in/SpaceMapQueryUseCase.java
@@ -1,5 +1,6 @@
 package popcong.app.application.space.port.in;
 
+import popcong.app.application.space.dto.response.MarkerComponentDto;
 import popcong.app.domain.space.model.Space;
 import popcong.app.domain.space.model.SpaceSortType;
 
@@ -20,4 +21,18 @@ List<Space> getSpaceMarkersInDisplayWithFilters(
     );
 
     Map<Long, Long> getReviewCountsFor(List<Space> spaces);
+
+    List<MarkerComponentDto> getMarkerInDisplayWithFilters(
+            Double userLat,
+            Double userLng,
+            Double nwLat,
+            Double nwLng,
+            Double seLat,
+            Double seLng,
+            Integer minAmount,
+            Integer maxAmount,
+            Integer floor,
+            Double rating,
+            SpaceSortType sortType
+    );
 }
diff --git a/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java b/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
index c16ff19..7092d13 100644
--- a/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
+++ b/src/main/java/popcong/app/application/space/service/SpaceMapQueryService.java
@@ -2,14 +2,16 @@
 
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import popcong.app.adapter.out.persistence.space.mapper.SpaceMarkerMapper;
+import popcong.app.application.image.port.in.GeoDistanceUseCase;
+import popcong.app.application.space.dto.response.MarkerComponentDto;
 import popcong.app.application.space.port.in.SpaceMapQueryUseCase;
 import popcong.app.application.space.port.out.ReviewCountQueryPort;
 import popcong.app.application.space.port.out.SpaceMapQueryPort;
 import popcong.app.domain.space.model.Space;
 import popcong.app.domain.space.model.SpaceSortType;
 
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Service
 @RequiredArgsConstructor
@@ -17,6 +19,8 @@ public class SpaceMapQueryService implements SpaceMapQueryUseCase {
 
     private final SpaceMapQueryPort spaceMapQueryPort;
     private final ReviewCountQueryPort reviewCountQueryPort;
+    private final GeoDistanceUseCase geoDistanceUseCase;   // ← 서비스에서만 사용
+    private final SpaceMarkerMapper spaceMarkerMapper;
 
     @Override
     public List<Space> getSpaceMarkersInDisplayWithFilters(
@@ -51,4 +55,78 @@ public Map<Long, Long> getReviewCountsFor(List<Space> spaces) {
 
         return reviewCountQueryPort.countBySpaceIds(ids);
     }
+
+    @Override
+    public List<MarkerComponentDto> getMarkerInDisplayWithFilters(
+            Double userLat,
+            Double userLng,
+            Double nwLat,
+            Double nwLng,
+            Double seLat,
+            Double seLng,
+            Integer minAmount,
+            Integer maxAmount,
+            Integer floor,
+            Double rating,
+            SpaceSortType sortType
+    ) {
+        // 공간 목록 조회
+        List<Space> spaces = getSpaceMarkersInDisplayWithFilters(
+                nwLat, nwLng, seLat, seLng,
+                minAmount, maxAmount, floor, rating, sortType
+        );
+
+        if (spaces.isEmpty()) return List.of();
+
+        // 리뷰 집계
+        Map<Long, Long> reviewCounts = getReviewCountsFor(spaces);
+        if (spaces.isEmpty()) return List.of();
+
+        // 거리 계산
+        Map<Long, Long> distances = new HashMap<>();
+        boolean hasUserLocation = (userLat != null && userLng != null);
+        for (Space s : spaces) {
+            Long d = hasUserLocation
+                    ? geoDistanceUseCase.getStraightDistance(userLat, userLng, s.latitude(), s.longitude())
+                    : null; // 위치 없으면 null
+            distances.put(s.spaceId(), d);
+        }
+
+        Map<Long, Long> distancesForSort = new HashMap<>();
+        for (Space s : spaces) {
+            Long d = distances.get(s.spaceId());
+            distancesForSort.put(s.spaceId(), (d != null) ? d : Long.MAX_VALUE);
+        }
+
+        // 정렬
+        Comparator<Space> byIdAsc       = Comparator.comparing(Space::spaceId);
+        Comparator<Space> byViewsDesc    = Comparator.comparing(Space::views).reversed();
+        Comparator<Space> byReviewsDesc  = Comparator.<Space, Long>comparing(s -> reviewCounts.getOrDefault(s.spaceId(), 0L)).reversed();
+        Comparator<Space> byDistanceAsc  = Comparator.comparing(s -> distancesForSort.getOrDefault(s.spaceId(), Long.MAX_VALUE));
+
+        List<Space> sorted = new ArrayList<>(spaces);
+
+        SpaceSortType st = (sortType != null) ? sortType : SpaceSortType.MOST_POPULAR;
+        switch (st) {
+            case MOST_POPULAR -> sorted.sort(byViewsDesc.thenComparing(byIdAsc));
+
+            case NEAREST -> {
+                if (!hasUserLocation) {
+                    sorted.sort(byViewsDesc.thenComparing(byIdAsc));
+                } else {
+                    sorted.sort(byDistanceAsc.thenComparing(byIdAsc));
+                }
+            }
+
+            case MOST_REVIEWS -> sorted.sort(byReviewsDesc.thenComparing(byDistanceAsc).thenComparing(byIdAsc));
+        }
+
+        return sorted.stream()
+                .map(s -> spaceMarkerMapper.toMarkerDto(
+                        s,
+                        distances.get(s.spaceId()),
+                        reviewCounts.getOrDefault(s.spaceId(), 0L).intValue()
+                ))
+                .toList();
+    }
 }

From 814182235ab8cd82f7744ca5bc34ed47f01c7219 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sat, 16 Aug 2025 16:59:33 +0900
Subject: [PATCH 72/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"GCP=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GCP 설정 후 id, json key 등 관리

related to: #16
---
 .gitignore                                      |  5 ++++-
 build.gradle                                    |  8 ++++++++
 .../app/infra/config/gcp/GcpApiProperties.java  | 17 +++++++++++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java

diff --git a/.gitignore b/.gitignore
index a5ca698..13b5f20 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,4 +47,7 @@ out/
 ### yml ###
 src/main/resources/application-local.yml
 src/main/resources/application-prod.yml
-src/main/resources/application-secret.yml
\ No newline at end of file
+src/main/resources/application-secret.yml
+
+### GCP ###
+src/main/resources/popcong-c9addd5f509d.json
\ No newline at end of file
diff --git a/build.gradle b/build.gradle
index 78e653b..f5be1c1 100644
--- a/build.gradle
+++ b/build.gradle
@@ -65,6 +65,14 @@ dependencies {
 
 	// Validation
 	implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
+
+	// GCP (Google Drive)
+	implementation 'com.google.guava:guava:32.1.0-jre'
+	implementation 'com.google.http-client:google-http-client:1.41.8'
+	implementation 'com.google.http-client:google-http-client-jackson2:1.41.8'
+	implementation 'com.google.api-client:google-api-client:2.7.2' // Google API Client
+	implementation 'com.google.apis:google-api-services-drive:v3-rev20250511-2.0.0' // Google Drive
+	implementation 'com.google.auth:google-auth-library-oauth2-http:1.20.0' // Google Auth
 }
 
 tasks.named('test') {
diff --git a/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java b/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java
new file mode 100644
index 0000000..a1904e9
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java
@@ -0,0 +1,17 @@
+package popcong.app.infra.config.gcp;
+
+import jakarta.annotation.PostConstruct;
+import lombok.Getter;
+import lombok.Setter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.stereotype.Component;
+
+@Getter
+@Setter
+@Component
+@ConfigurationProperties(prefix = "google")
+public class GcpApiProperties {
+
+    private String hostDriveId;
+    private String guestDriveId;
+}

From e071521609ee9611bafd928b309593f6657f7fc7 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sat, 16 Aug 2025 17:15:57 +0900
Subject: [PATCH 73/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"GCP=20?=
 =?UTF-8?q?=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Properties 수정 및 Config 작성

related to: #16
---
 .../app/infra/config/gcp/GcpApiConfig.java    | 41 +++++++++++++++++++
 .../infra/config/gcp/GcpApiProperties.java    |  3 ++
 2 files changed, 44 insertions(+)
 create mode 100644 src/main/java/popcong/app/infra/config/gcp/GcpApiConfig.java

diff --git a/src/main/java/popcong/app/infra/config/gcp/GcpApiConfig.java b/src/main/java/popcong/app/infra/config/gcp/GcpApiConfig.java
new file mode 100644
index 0000000..3f18a50
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/gcp/GcpApiConfig.java
@@ -0,0 +1,41 @@
+package popcong.app.infra.config.gcp;
+
+import com.google.api.client.json.gson.GsonFactory;
+import com.google.api.services.drive.Drive;
+import com.google.api.services.drive.DriveScopes;
+import com.google.auth.http.HttpCredentialsAdapter;
+import com.google.auth.oauth2.ServiceAccountCredentials;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.io.ClassPathResource;
+import com.google.api.client.googleapis.javanet.GoogleNetHttpTransport;
+
+import java.io.IOException;
+import java.security.GeneralSecurityException;
+import java.util.List;
+
+@Configuration
+@RequiredArgsConstructor
+public class GcpApiConfig {
+
+    private final GcpApiProperties gcpApiProperties;
+
+    @Bean
+    public Drive googleDrive() throws IOException, GeneralSecurityException {
+        var gsonFactory = GsonFactory.getDefaultInstance();
+
+        var credentials = ServiceAccountCredentials.fromStream(
+                new ClassPathResource("popcong-c9addd5f509d.json")
+                        .getInputStream()
+        ).createScoped(
+                List.of(DriveScopes.DRIVE_FILE, DriveScopes.DRIVE_METADATA)
+        );
+
+        return new Drive.Builder(
+                GoogleNetHttpTransport.newTrustedTransport(),
+                gsonFactory,
+                new HttpCredentialsAdapter(credentials)
+        ).setApplicationName("popcong").build();
+    }
+}
diff --git a/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java b/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java
index a1904e9..2a23614 100644
--- a/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java
+++ b/src/main/java/popcong/app/infra/config/gcp/GcpApiProperties.java
@@ -14,4 +14,7 @@ public class GcpApiProperties {
 
     private String hostDriveId;
     private String guestDriveId;
+
+    private String hostRootDriveName;
+    private String guestRootDriveName;
 }

From 2ea1ff917a35ad69a30711f0b80b32e4c8daecfc Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sat, 16 Aug 2025 18:41:59 +0900
Subject: [PATCH 74/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"Google=20Drive=20?=
 =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20=EB=A1=9C=EC=A7=81=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Google Drive 업로드 로직 작성,
회원가입 시 분기 enum 설정

related to: #16
---
 .../port/in/GoogleDriveSubmitUseCase.java     |  17 +++
 .../service/GoogleDriveSubmitService.java     | 125 ++++++++++++++++++
 .../app/domain/user/model/SignUpUserType.java |   5 +
 3 files changed, 147 insertions(+)
 create mode 100644 src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java
 create mode 100644 src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/SignUpUserType.java

diff --git a/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java b/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java
new file mode 100644
index 0000000..2bb5767
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java
@@ -0,0 +1,17 @@
+package popcong.app.application.auth.port.in;
+
+import popcong.app.domain.user.model.SignUpUserType;
+import popcong.app.domain.user.model.UserRole;
+
+import java.io.InputStream;
+
+public interface GoogleDriveSubmitUseCase {
+    String submitUserDocs(
+            SignUpUserType userRole,
+            Long userId,
+            String email,
+            String filename,
+            InputStream content,
+            String fileFormatType
+    );
+}
diff --git a/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java b/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java
new file mode 100644
index 0000000..c0c5f39
--- /dev/null
+++ b/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java
@@ -0,0 +1,125 @@
+package popcong.app.application.auth.service;
+
+import com.google.api.client.http.InputStreamContent;
+import com.google.api.services.drive.Drive;
+import com.google.api.services.drive.model.File;
+import com.google.api.services.drive.model.FileList;
+import jakarta.transaction.Transactional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import popcong.app.application.auth.port.in.GoogleDriveSubmitUseCase;
+import popcong.app.domain.user.model.SignUpUserType;
+import popcong.app.infra.config.gcp.GcpApiProperties;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.List;
+import java.util.Objects;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class GoogleDriveSubmitService implements GoogleDriveSubmitUseCase {
+
+    private Drive drive;
+    private GcpApiProperties gcpApiProperties;
+
+    @Override
+    public String submitUserDocs(
+            SignUpUserType userType, // GUEST, HOST
+            Long userId,
+            String email,
+            String filename,
+            InputStream content,
+            String fileFormatType // nullable
+    ) {
+        try {
+            // drive id, name 가져오기
+            String rootDriveId = getDriveId(userType);
+
+            // drive 이름 생성
+            String userDriveName = userId + "_" + sanitize(email);
+
+            String userDriveId = setUserDriveUnderRoot(rootDriveId, userDriveName);
+
+            return uploadFile(userDriveId, filename, content, safeMime(fileFormatType));
+        } catch (IOException e) {
+            throw new RuntimeException("Google Drive 업로드 실패", e);
+        }
+    }
+
+
+    // 유저 타입에 따라 다른 Google Drive ID 가져오기
+    private String getDriveId(SignUpUserType userType) {
+        return (Objects.equals(userType, SignUpUserType.GUEST))
+                ? gcpApiProperties.getGuestDriveId() : gcpApiProperties.getHostDriveId();
+    }
+
+    private String setUserDriveUnderRoot(
+            String rootDriveId,
+            String folderName
+    ) throws IOException {
+        String q = "mimeType='application/vnd.google-apps.folder' " +
+                "and name='" + escape(folderName) + "' " +
+                "and '" + rootDriveId + "' in parents " +
+                "and trashed=false";
+
+        FileList fileList = drive.files().list()
+                .setQ(q)
+                .setSupportsAllDrives(true)
+                .setIncludeItemsFromAllDrives(true)
+                .setSpaces("drive")
+                .setFields("files(id)")
+                .execute();
+
+        if (fileList.getFiles() != null && !fileList.getFiles().isEmpty()) {
+            return fileList.getFiles().get(0).getId();
+        }
+
+        File meta = new File();
+        meta.setName(folderName);
+        meta.setMimeType("application/vnd.google-apps.folder");
+        meta.setParents(List.of(rootDriveId));
+
+        File createdFile = drive.files().create(meta)
+                .setSupportsAllDrives(true)
+                .setFields("id")
+                .execute();
+
+        return createdFile.getId();
+    }
+
+    // 파일 업로드
+    private String uploadFile(
+            String parentDriveId,
+            String fileName,
+            InputStream content,
+            String fileFormatType
+    ) throws IOException {
+        File file = new File();
+        file.setName(fileName);
+        file.setParents(List.of(parentDriveId));
+
+        var media = new InputStreamContent(fileFormatType, content);
+
+        File created = drive.files().create(file, media)
+                .setSupportsAllDrives(true)
+                .setFields("id")
+                .execute();
+
+        return created.getId();
+    }
+
+    // ===== 파일명 형식 관련 valid 처리 =====
+    private static String safeMime(String mime) {
+        return (mime == null || mime.isBlank()) ? "application/octet-stream" : mime;
+    }
+
+    private static String sanitize(String s) {
+        return s.replaceAll("[\\\\/:*?\"<>|#\\[\\]]", "_").trim();
+    }
+
+    private static String escape(String s) {
+        return s.replace("'", "\\'");
+    }
+}
diff --git a/src/main/java/popcong/app/domain/user/model/SignUpUserType.java b/src/main/java/popcong/app/domain/user/model/SignUpUserType.java
new file mode 100644
index 0000000..eb11201
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/SignUpUserType.java
@@ -0,0 +1,5 @@
+package popcong.app.domain.user.model;
+
+public enum SignUpUserType {
+    GUEST, HOST
+}

From 41bfdb86935b598784d28075ee299f25f8c9e515 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sat, 16 Aug 2025 23:09:50 +0900
Subject: [PATCH 75/81] =?UTF-8?q?=E2=9C=A8=20Feature:=20"Google=20Drive=20?=
 =?UTF-8?q?=EC=97=85=EB=A1=9C=EB=93=9C=20API=20=EC=9E=91=EC=84=B1"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Google Drive API 구현 완료

related to: #16
---
 .../app/adapter/in/user/UserController.java   | 110 +++++++++++++++++-
 .../port/in/GoogleDriveSubmitUseCase.java     |  10 +-
 .../service/GoogleDriveSubmitService.java     |  47 ++++++--
 .../user/port/in/UserInfoUseCase.java         |  10 ++
 .../user/service/UserInfoService.java         |  53 +++++++++
 .../app/domain/user/model/DocumentType.java   |   5 +
 .../app/domain/user/model/UploadItem.java     |   8 ++
 .../popcong/app/domain/user/model/User.java   |  16 +--
 .../global/exception/error/AuthErrorCode.java |   5 +-
 .../exception/error/CommonErrorCode.java      |   1 +
 10 files changed, 232 insertions(+), 33 deletions(-)
 create mode 100644 src/main/java/popcong/app/application/user/port/in/UserInfoUseCase.java
 create mode 100644 src/main/java/popcong/app/application/user/service/UserInfoService.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/DocumentType.java
 create mode 100644 src/main/java/popcong/app/domain/user/model/UploadItem.java

diff --git a/src/main/java/popcong/app/adapter/in/user/UserController.java b/src/main/java/popcong/app/adapter/in/user/UserController.java
index f5a2f4c..c83b128 100644
--- a/src/main/java/popcong/app/adapter/in/user/UserController.java
+++ b/src/main/java/popcong/app/adapter/in/user/UserController.java
@@ -3,15 +3,24 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
 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;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import popcong.app.application.auth.port.in.GoogleDriveSubmitUseCase;
 import popcong.app.application.user.dto.response.UserResponseDto;
+import popcong.app.application.user.port.in.UserInfoUseCase;
+import popcong.app.domain.user.model.DocumentType;
+import popcong.app.domain.user.model.SignUpUserType;
+import popcong.app.domain.user.model.UploadItem;
 import popcong.app.domain.user.model.User;
 import popcong.app.global.dto.ResponseDto;
 import popcong.app.global.exception.custom.BusinessException;
 import popcong.app.global.exception.error.AuthErrorCode;
+import popcong.app.global.exception.error.CommonErrorCode;
+
+import java.util.ArrayList;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -19,6 +28,101 @@
 @RequestMapping("/api/v1/user")
 public class UserController {
 
+    private final GoogleDriveSubmitUseCase googleDriveSubmitUseCase;
+    private final UserInfoUseCase userInfoUseCase;
+
+
+    /**
+     * GUEST 파일 업로드 API
+     */
+    @PostMapping(value = "/my/guest/upload-files", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseDto<?> uploadGuestFiles(
+            @AuthenticationPrincipal User user,
+            @RequestPart(value = "copyOfIdentification") MultipartFile copyOfIdentification,
+            @RequestPart(value = "businessLicense", required = false) MultipartFile businessLicense
+    ) {
+        if (user == null) {
+            throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
+        }
+
+        if (copyOfIdentification.isEmpty()) {
+            throw new BusinessException(CommonErrorCode.NO_REQUIRED_FILES);
+        }
+
+        // 리스트에 업로드 파일 추가
+        List<UploadItem> items = new ArrayList<>();
+        items.add(new UploadItem(DocumentType.COPY_OF_IDENTIFICATION, copyOfIdentification));
+
+        if (businessLicense != null && !businessLicense.isEmpty()) {
+            items.add(new UploadItem(DocumentType.BUSINESS_LICENSE, businessLicense));
+        }
+
+        // 업로드
+        List<String> fileIds = googleDriveSubmitUseCase.submitUserDocs(
+                SignUpUserType.GUEST,
+                user.userId(),
+                user.email(),
+                items
+        );
+
+        userInfoUseCase.updateUserRoleToGeneral(user.userId());
+
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "게스트 파일 업로드 완료",
+                null
+        );
+    }
+
+
+    /**
+     * HOST 파일 업로드 API
+     */
+    @PostMapping(value = "/my/host/upload-files", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseDto<?> uploadHostFiles(
+            @AuthenticationPrincipal User user,
+            @RequestPart(value = "copyOfIdentification") MultipartFile copyOfIdentification,
+            @RequestPart(value = "buildingRegister") MultipartFile buildingRegister,
+            @RequestPart(value = "leaseAgreement") MultipartFile leaseAgreement,
+            @RequestPart(value = "copyOfBankBook", required = false) MultipartFile copyOfBankBook
+    ) {
+        if (user == null) {
+            throw new BusinessException(AuthErrorCode.UNAUTHORIZED);
+        }
+
+        if (copyOfIdentification.isEmpty() || buildingRegister == null || leaseAgreement == null) {
+            throw new BusinessException(CommonErrorCode.NO_REQUIRED_FILES);
+        }
+
+        // 리스트에 업로드 파일 추가
+        List<UploadItem> items = new ArrayList<>();
+        items.add(new UploadItem(DocumentType.COPY_OF_IDENTIFICATION, copyOfIdentification));
+        items.add(new UploadItem(DocumentType.BUILDING_REGISTER, buildingRegister));
+        items.add(new UploadItem(DocumentType.LEASE_AGREEMENT, leaseAgreement));
+
+
+        if (copyOfBankBook != null && !copyOfBankBook.isEmpty()) {
+            items.add(new UploadItem(DocumentType.COPY_OF_BANKBOOK, copyOfBankBook));
+        }
+
+        // 업로드
+        List<String> fileIds = googleDriveSubmitUseCase.submitUserDocs(
+                SignUpUserType.HOST,
+                user.userId(),
+                user.email(),
+                items
+        );
+
+        userInfoUseCase.updateUserRoleToPending(user.userId());
+
+        return new ResponseDto<>(
+                HttpStatus.OK.value(),
+                "호스트 파일 업로드 완료",
+                null
+        );
+    }
+
+
     @GetMapping("/me")
     public ResponseDto<UserResponseDto> getUserInfo(@AuthenticationPrincipal User user) {
         if (user == null) {
diff --git a/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java b/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java
index 2bb5767..bafa95e 100644
--- a/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java
+++ b/src/main/java/popcong/app/application/auth/port/in/GoogleDriveSubmitUseCase.java
@@ -1,17 +1,15 @@
 package popcong.app.application.auth.port.in;
 
 import popcong.app.domain.user.model.SignUpUserType;
-import popcong.app.domain.user.model.UserRole;
+import popcong.app.domain.user.model.UploadItem;
 
-import java.io.InputStream;
+import java.util.List;
 
 public interface GoogleDriveSubmitUseCase {
-    String submitUserDocs(
+    List<String> submitUserDocs(
             SignUpUserType userRole,
             Long userId,
             String email,
-            String filename,
-            InputStream content,
-            String fileFormatType
+            List<UploadItem> items
     );
 }
diff --git a/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java b/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java
index c0c5f39..57641b6 100644
--- a/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java
+++ b/src/main/java/popcong/app/application/auth/service/GoogleDriveSubmitService.java
@@ -6,32 +6,35 @@
 import com.google.api.services.drive.model.FileList;
 import jakarta.transaction.Transactional;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 import popcong.app.application.auth.port.in.GoogleDriveSubmitUseCase;
 import popcong.app.domain.user.model.SignUpUserType;
+import popcong.app.domain.user.model.UploadItem;
 import popcong.app.infra.config.gcp.GcpApiProperties;
 
 import java.io.IOException;
 import java.io.InputStream;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
+@Slf4j
 @Service
 @Transactional
 @RequiredArgsConstructor
 public class GoogleDriveSubmitService implements GoogleDriveSubmitUseCase {
 
-    private Drive drive;
-    private GcpApiProperties gcpApiProperties;
+    private final Drive drive;
+    private final GcpApiProperties gcpApiProperties;
 
     @Override
-    public String submitUserDocs(
+    public List<String> submitUserDocs(
             SignUpUserType userType, // GUEST, HOST
             Long userId,
             String email,
-            String filename,
-            InputStream content,
-            String fileFormatType // nullable
+            List<UploadItem> items
     ) {
         try {
             // drive id, name 가져오기
@@ -40,16 +43,36 @@ public String submitUserDocs(
             // drive 이름 생성
             String userDriveName = userId + "_" + sanitize(email);
 
-            String userDriveId = setUserDriveUnderRoot(rootDriveId, userDriveName);
+            // 드라이브 보장
+            String userFolderId = setUserDriveUnderRoot(rootDriveId, userDriveName);
+
+            List<String> ids = new ArrayList<>();
+            for (UploadItem item : items) {
+                MultipartFile multipartFile = item.file();
+
+                // 파일명에 타입 추가
+                String prefixedName = item.type().name().toLowerCase() + "_" + multipartFile.getOriginalFilename();
 
-            return uploadFile(userDriveId, filename, content, safeMime(fileFormatType));
+                try (InputStream inputStream = multipartFile.getInputStream()) {
+
+                    String id = uploadFile(
+                            userFolderId,
+                            prefixedName,
+                            inputStream,
+                            safeMime(multipartFile.getContentType())
+                    );
+                    ids.add(id);
+                }
+            }
+
+            return ids;
         } catch (IOException e) {
             throw new RuntimeException("Google Drive 업로드 실패", e);
         }
     }
 
 
-    // 유저 타입에 따라 다른 Google Drive ID 가져오기
+    // 유저 타입에 따라 다른 Google Drive ID 가져오기 (폴더 보장)
     private String getDriveId(SignUpUserType userType) {
         return (Objects.equals(userType, SignUpUserType.GUEST))
                 ? gcpApiProperties.getGuestDriveId() : gcpApiProperties.getHostDriveId();
@@ -91,20 +114,20 @@ private String setUserDriveUnderRoot(
 
     // 파일 업로드
     private String uploadFile(
-            String parentDriveId,
+            String parentFolderId,
             String fileName,
             InputStream content,
             String fileFormatType
     ) throws IOException {
         File file = new File();
         file.setName(fileName);
-        file.setParents(List.of(parentDriveId));
+        file.setParents(List.of(parentFolderId));
 
         var media = new InputStreamContent(fileFormatType, content);
 
         File created = drive.files().create(file, media)
                 .setSupportsAllDrives(true)
-                .setFields("id")
+                .setFields("id, parents")
                 .execute();
 
         return created.getId();
diff --git a/src/main/java/popcong/app/application/user/port/in/UserInfoUseCase.java b/src/main/java/popcong/app/application/user/port/in/UserInfoUseCase.java
new file mode 100644
index 0000000..a364c21
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/port/in/UserInfoUseCase.java
@@ -0,0 +1,10 @@
+package popcong.app.application.user.port.in;
+
+import popcong.app.domain.user.model.User;
+
+public interface UserInfoUseCase {
+    User updateUserRoleToGeneral(Long userId);
+    User updateUserRoleToGuest(Long userId);
+    User updateUserRoleToPending(Long userId);
+    User updateUserRoleToHost(Long userId);
+}
diff --git a/src/main/java/popcong/app/application/user/service/UserInfoService.java b/src/main/java/popcong/app/application/user/service/UserInfoService.java
new file mode 100644
index 0000000..b2d2ddc
--- /dev/null
+++ b/src/main/java/popcong/app/application/user/service/UserInfoService.java
@@ -0,0 +1,53 @@
+package popcong.app.application.user.service;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import popcong.app.application.user.port.in.UserInfoUseCase;
+import popcong.app.application.user.port.out.LoadUserPort;
+import popcong.app.application.user.port.out.SaveUserPort;
+import popcong.app.domain.user.model.User;
+import popcong.app.domain.user.model.UserRole;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.AuthErrorCode;
+
+@Service
+@Transactional
+@RequiredArgsConstructor
+public class UserInfoService implements UserInfoUseCase {
+
+    private final LoadUserPort loadUserPort;
+    private final SaveUserPort saveUserPort;
+
+    // Guest 유저로 복귀
+    public User updateUserRoleToGuest(Long userId) {
+        User user = loadUserPort.loadUserById(userId)
+                .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
+        User updated = user.withUserRole(UserRole.GUEST);
+        return saveUserPort.saveUser(updated);
+    };
+
+    // 일반 유저로 변경
+    public User updateUserRoleToGeneral(Long userId) {
+        User user = loadUserPort.loadUserById(userId)
+                .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
+        User updated = user.withUserRole(UserRole.GENERAL);
+        return saveUserPort.saveUser(updated);
+    };
+
+    // 호스트 인증 대기로 변경
+    public User updateUserRoleToPending(Long userId) {
+        User user = loadUserPort.loadUserById(userId)
+                .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
+        User updated = user.withUserRole(UserRole.PENDING);
+        return saveUserPort.saveUser(updated);
+    };
+
+    // Host 유저로 변경
+    public User updateUserRoleToHost(Long userId) {
+        User user = loadUserPort.loadUserById(userId)
+                .orElseThrow(() -> new BusinessException(AuthErrorCode.USER_NOT_FOUND));
+        User updated = user.withUserRole(UserRole.HOST);
+        return saveUserPort.saveUser(updated);
+    };
+}
diff --git a/src/main/java/popcong/app/domain/user/model/DocumentType.java b/src/main/java/popcong/app/domain/user/model/DocumentType.java
new file mode 100644
index 0000000..4bc9ac1
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/DocumentType.java
@@ -0,0 +1,5 @@
+package popcong.app.domain.user.model;
+
+public enum DocumentType {
+    COPY_OF_IDENTIFICATION, BUSINESS_LICENSE, BUILDING_REGISTER, LEASE_AGREEMENT, COPY_OF_BANKBOOK
+}
diff --git a/src/main/java/popcong/app/domain/user/model/UploadItem.java b/src/main/java/popcong/app/domain/user/model/UploadItem.java
new file mode 100644
index 0000000..2a1e8f3
--- /dev/null
+++ b/src/main/java/popcong/app/domain/user/model/UploadItem.java
@@ -0,0 +1,8 @@
+package popcong.app.domain.user.model;
+
+import org.springframework.web.multipart.MultipartFile;
+
+public record UploadItem(
+        DocumentType type,
+        MultipartFile file
+) {}
diff --git a/src/main/java/popcong/app/domain/user/model/User.java b/src/main/java/popcong/app/domain/user/model/User.java
index cf353a3..230a450 100644
--- a/src/main/java/popcong/app/domain/user/model/User.java
+++ b/src/main/java/popcong/app/domain/user/model/User.java
@@ -15,24 +15,18 @@ public record User (
     LocalDateTime createdAt,
     LocalDateTime deletedAt
 ) {
-    public User updateProfile(
-            String name,
-            String introduction,
-            String profileImageUrl,
-            UserRole userRole,
-            LocalDateTime createdAt
-    ) {
+    public User withUserRole(UserRole userRole) {
         return new User(
                 this.userId,
                 this.provider,
                 this.providerId,
                 this.email,
-                name,
-                profileImageUrl,
-                introduction,
+                this.name,
+                this.profileImageUrl,
+                this.introduction,
                 this.role,
                 userRole,
-                createdAt,
+                this.createdAt,
                 this.deletedAt
         );
     }
diff --git a/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java b/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java
index b28c732..30aebb0 100644
--- a/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java
+++ b/src/main/java/popcong/app/global/exception/error/AuthErrorCode.java
@@ -19,7 +19,10 @@ public enum AuthErrorCode implements ErrorCode {
     UNAUTHORIZED(HttpStatus.UNAUTHORIZED.value(),"A4011", "인증되지 않은 사용자압니다."),
 
     // 403
-    ACCESS_DENIED(HttpStatus.FORBIDDEN.value(), "A4031", "접근 권한이 없습니다.");
+    ACCESS_DENIED(HttpStatus.FORBIDDEN.value(), "A4031", "접근 권한이 없습니다."),
+
+    // 404
+    USER_NOT_FOUND(HttpStatus.NOT_FOUND.value(), "A4041", "사용자를 찾을 수 없습니다."),;
 
     private final int httpStatus;
     private final String code;
diff --git a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
index 2a93a56..03c179d 100644
--- a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
+++ b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
@@ -16,6 +16,7 @@ public enum CommonErrorCode implements ErrorCode {
     INVALID_INPUT_VALUE(HttpStatus.BAD_REQUEST.value(), "C4002", "Invalid Input Value"),
     ENTITY_NOT_FOUND(HttpStatus.BAD_REQUEST.value(), "C4003", "Entity Not Found"),
     METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED.value(), "C4004", "Invalid Http Method"),
+    NO_REQUIRED_FILES(HttpStatus.BAD_REQUEST.value(), "C4005", "필수 제출 파일이 누락되었습니다."),
 
     // 5XX
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), "C5001", "Internal Server Error");

From f9c69a8015a7d190e7a1b5bd5d970974ba669e28 Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Sun, 17 Aug 2025 04:07:14 +0900
Subject: [PATCH 76/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting=20:=20"S3=20?=
 =?UTF-8?q?=EC=97=B0=EB=8F=99=20=EC=84=B8=ED=8C=85"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

S3연동에 필요한 의존성 추가

related to: #17
---
 build.gradle                       | 6 ++++++
 src/main/resources/application.yml | 9 ++++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 1fb9633..30da0aa 100644
--- a/build.gradle
+++ b/build.gradle
@@ -71,6 +71,12 @@ dependencies {
 
 	// Validation
 	implementation 'jakarta.validation:jakarta.validation-api:3.1.0'
+
+	//AWS
+	implementation platform('com.amazonaws:aws-java-sdk-bom:1.12.700')
+	implementation 'com.amazonaws:aws-java-sdk-s3'   // S3
+	implementation 'com.amazonaws:aws-java-sdk-sts'
+
 }
 
 // Q타입 엔티티가 생성될 경로
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fa61925..ae72b98 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -9,4 +9,11 @@ spring:
       hibernate:
         format_sql: true
         show_sql: true
-    open-in-view: false
\ No newline at end of file
+    open-in-view: false
+
+cloud:
+  aws:
+    profile: dev
+    region: us-east-2     # 버킷 리전
+    s3:
+      bucket: popcongbucket

From c4ee50f3e66f2975780d032fcd795da792d9b94f Mon Sep 17 00:00:00 2001
From: chanition <chanyeong1206@gmail.com>
Date: Sun, 17 Aug 2025 04:08:08 +0900
Subject: [PATCH 77/81] =?UTF-8?q?=E2=9C=A8=EF=B8=8F=20Feature=20:=20"AWS?=
 =?UTF-8?q?=20S3=20=EC=9D=B4=EB=AF=B8=EC=A7=80=20=EC=97=85=EB=A1=9C?=
 =?UTF-8?q?=EB=93=9C=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

AWS S3 popcongbucket에 이미지 업로드 기능 추가

related to: #17
---
 .../app/adapter/in/image/ImageController.java | 42 +++++++++
 .../image/repository/ImageJpaRepository.java  |  7 +-
 .../image/service/ImageService.java           | 88 +++++++++++++++++++
 .../application/image/service/S3Service.java  | 73 +++++++++++++++
 .../exception/error/ImageS3ErrorCode.java     | 29 ++++++
 .../popcong/app/infra/config/s3/S3Config.java | 70 +++++++++++++++
 6 files changed, 308 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/popcong/app/adapter/in/image/ImageController.java
 create mode 100644 src/main/java/popcong/app/application/image/service/ImageService.java
 create mode 100644 src/main/java/popcong/app/application/image/service/S3Service.java
 create mode 100644 src/main/java/popcong/app/global/exception/error/ImageS3ErrorCode.java
 create mode 100644 src/main/java/popcong/app/infra/config/s3/S3Config.java

diff --git a/src/main/java/popcong/app/adapter/in/image/ImageController.java b/src/main/java/popcong/app/adapter/in/image/ImageController.java
new file mode 100644
index 0000000..cdab709
--- /dev/null
+++ b/src/main/java/popcong/app/adapter/in/image/ImageController.java
@@ -0,0 +1,42 @@
+package popcong.app.adapter.in.image;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import popcong.app.adapter.out.persistence.image.entity.ImageJpaEntity;
+import popcong.app.application.image.service.ImageService;
+import popcong.app.domain.image.model.ImageableType;
+import popcong.app.global.dto.ResponseDto;
+
+import java.util.List;
+@Slf4j
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/api/v1/images")
+public class ImageController {
+    private final ImageService imageService;
+
+    @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
+    public ResponseDto<ImageJpaEntity> upload(
+            @RequestParam("imageableId") Long imageableId,
+            @RequestParam("imageableType") ImageableType imageableType,
+            @RequestParam("saveOrder") Integer saveOrder,
+            @RequestPart("file") MultipartFile file
+    ) {
+        ImageJpaEntity saved = imageService.upload(imageableType,imageableId,saveOrder, file);
+        return new ResponseDto<>(HttpStatus.CREATED.value(), "이미지 업로드 성공", saved);
+    }
+
+    @GetMapping
+    public ResponseDto<List<ImageJpaEntity>> list(
+            @RequestParam("imageableId") Long imageableId,
+            @RequestParam("imageableType") ImageableType imageableType
+    ) {
+        List<ImageJpaEntity> images = imageService.list(imageableId, imageableType);
+        return new ResponseDto<>(HttpStatus.OK.value(), "이미지 목록 조회 성공", images);
+    }
+
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java b/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java
index 2cad725..7c46da6 100644
--- a/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java
+++ b/src/main/java/popcong/app/adapter/out/persistence/image/repository/ImageJpaRepository.java
@@ -4,6 +4,7 @@
 import popcong.app.adapter.out.persistence.image.entity.ImageJpaEntity;
 import popcong.app.domain.image.model.ImageableType;
 
+import java.util.List;
 import java.util.Optional;
 
 public interface ImageJpaRepository extends JpaRepository<ImageJpaEntity, Long> {
@@ -11,4 +12,8 @@ public interface ImageJpaRepository extends JpaRepository<ImageJpaEntity, Long>
     Optional<ImageJpaEntity> findByImageableTypeAndImageableIdAndSaveOrder(
             ImageableType imageableType, Long imageableId, Integer saveOrder
     );
-}
+
+    List<ImageJpaEntity> findByImageableIdAndImageableTypeOrderBySaveOrderAsc(
+            Long imageableId, ImageableType imageableType
+    );
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/image/service/ImageService.java b/src/main/java/popcong/app/application/image/service/ImageService.java
new file mode 100644
index 0000000..d0192fb
--- /dev/null
+++ b/src/main/java/popcong/app/application/image/service/ImageService.java
@@ -0,0 +1,88 @@
+package popcong.app.application.image.service;
+
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import popcong.app.adapter.out.persistence.image.entity.ImageJpaEntity;
+import popcong.app.adapter.out.persistence.image.repository.ImageJpaRepository;
+import popcong.app.domain.image.model.ImageableType;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.ImageS3ErrorCode;
+
+import java.util.List;
+import java.util.Locale;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class ImageService {
+
+    private final S3Service s3Service;  // S3 업로드 담당
+    private final ImageJpaRepository imageRepository; // Image 테이블 JPA
+
+    /** 업로드 + DB 저장 */
+    public ImageJpaEntity upload(
+                                 ImageableType imageableType,
+                                 Long imageableId,
+                                 int saveOrder,
+                                 MultipartFile file) {
+
+        if (file == null || file.isEmpty()) {
+            throw new BusinessException(ImageS3ErrorCode.FILE_NOT_FOUND);
+        }
+
+        // 키 생성 (profile/123/0.jpg)
+        String key = buildKey(imageableType, imageableId, saveOrder, file);
+
+        // S3 업로드 후 URL 반환
+        String url = s3Service.uploadFile(key, file);
+
+        // DB에 저장 (있으면 업데이트, 없으면 새로 생성)
+        ImageJpaEntity entity = imageRepository
+                .findByImageableTypeAndImageableIdAndSaveOrder(imageableType, imageableId, Integer.valueOf(saveOrder))
+                .map(existing -> ImageJpaEntity.builder()
+                        .imageId(existing.getImageId())
+                        .imageUrl(url)
+                        .saveOrder(saveOrder)
+                        .imageableId(imageableId)
+                        .imageableType(imageableType)
+                        .build()
+                )
+                .orElseGet(() -> ImageJpaEntity.builder()
+                        .imageUrl(url)
+                        .saveOrder(saveOrder)
+                        .imageableId(imageableId)
+                        .imageableType(imageableType)
+                        .build()
+                );
+
+        return imageRepository.save(entity);
+    }
+
+    /** 목록 조회 */
+    public List<ImageJpaEntity> list(Long imageableId, ImageableType imageableType) {
+        return imageRepository.findByImageableIdAndImageableTypeOrderBySaveOrderAsc(
+                imageableId, imageableType
+        );
+    }
+
+    // 내부 유틸
+
+    private String buildKey(ImageableType type, Long imageableId, int saveOrder, MultipartFile file) {
+        String prefix = type.name().toLowerCase(Locale.ROOT);
+        String ext = guessExt(file);
+        return prefix + "/" + imageableId + "/" + saveOrder + "." + ext;
+    }
+
+    private String guessExt(MultipartFile file) {
+        String name = file.getOriginalFilename();
+        if (name != null) {
+            int dot = name.lastIndexOf('.');
+            if (dot > -1 && dot < name.length() - 1) {
+                return name.substring(dot + 1).toLowerCase(Locale.ROOT);
+            }
+        }
+        return "jpg";
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/application/image/service/S3Service.java b/src/main/java/popcong/app/application/image/service/S3Service.java
new file mode 100644
index 0000000..5be44ae
--- /dev/null
+++ b/src/main/java/popcong/app/application/image/service/S3Service.java
@@ -0,0 +1,73 @@
+
+package popcong.app.application.image.service;
+
+import com.amazonaws.AmazonServiceException;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.model.ObjectMetadata;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+import popcong.app.global.exception.custom.BusinessException;
+import popcong.app.global.exception.error.ImageS3ErrorCode;
+
+import java.io.IOException;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class S3Service {
+
+    private final AmazonS3 amazonS3;
+
+    @Value("${cloud.aws.s3.bucket}")
+    private String bucket;
+
+
+    // 성공 시 S3 URL 반환
+    public String uploadFile(String key, MultipartFile file) {
+
+        // 입력 검증
+        if (file == null || file.isEmpty()) {
+            throw new BusinessException(ImageS3ErrorCode.FILE_NOT_FOUND);
+        }
+        try {
+            //메타 데이터 설정
+            ObjectMetadata md = new ObjectMetadata();
+            md.setContentLength(file.getSize()); // S3가 스트림을 읽을 크기
+            if (file.getContentType() != null) { //브라우저/클라이언트가 파일을 다룰때 도움
+                md.setContentType(file.getContentType()); //다운로드 표시에 유용한 헤더
+            }
+
+            // 로그확인
+            log.info("[S3 PUT] bucket={}, key={}, size={}, contentType={}",
+                    bucket, key, file.getSize(), file.getContentType());
+
+            //key "버킷 내부 경로/파일명", 호출자가 key를 만들어 넘김 -> 서비스는 업로드만 담당
+            amazonS3.putObject(bucket, key, file.getInputStream(), md);
+            return amazonS3.getUrl(bucket, key).toString(); //getUrl -> 저장 위치 식별자로 씀
+
+        } catch (IOException e) {
+            log.warn("S3 upload IOException (key={}): {}", key, e.getMessage(), e);
+            throw new BusinessException(ImageS3ErrorCode.FILE_UPLOAD_ERROR);
+
+        } catch (AmazonServiceException e) {
+            //S3가 HTTP 오류로 응답한 경우
+            int status = e.getStatusCode();
+            log.warn("S3 upload failed: status={}, awsCode={}, msg={}",
+                    status, e.getErrorCode(), e.getMessage(), e);
+
+            if (status == 403) throw new BusinessException(ImageS3ErrorCode.STORAGE_ACCESS_DENIED); //권한 없음
+            if (status == 404) throw new BusinessException(ImageS3ErrorCode.FILE_NOT_FOUND); // 파일 없음
+            if (status == 413) throw new BusinessException(ImageS3ErrorCode.FILE_TOO_LARGE); //용량
+
+            throw new BusinessException(ImageS3ErrorCode.FILE_UPLOAD_ERROR);
+
+        } catch (RuntimeException e) { //네트워크 문제등을 포함한 대부분 런타임 문제
+        log.warn("S3 client/runtime error (key={}): {}", key, e.getMessage(), e);
+        throw new BusinessException(ImageS3ErrorCode.FILE_UPLOAD_ERROR);
+
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/popcong/app/global/exception/error/ImageS3ErrorCode.java b/src/main/java/popcong/app/global/exception/error/ImageS3ErrorCode.java
new file mode 100644
index 0000000..a7ad708
--- /dev/null
+++ b/src/main/java/popcong/app/global/exception/error/ImageS3ErrorCode.java
@@ -0,0 +1,29 @@
+package popcong.app.global.exception.error;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import popcong.app.global.exception.ErrorCode;
+
+@Getter
+@RequiredArgsConstructor
+@JsonFormat(shape = JsonFormat.Shape.OBJECT)
+public enum ImageS3ErrorCode implements ErrorCode {
+
+    //4xx
+    FILE_NOT_FOUND        (HttpStatus.NOT_FOUND.value(),           "IMG4040", "요청한 파일을 찾을 수 없습니다."),
+    FILE_TOO_LARGE        (HttpStatus.PAYLOAD_TOO_LARGE.value(),   "IMG4130", "파일 크기 제한을 초과했습니다."),
+    STORAGE_ACCESS_DENIED (HttpStatus.FORBIDDEN.value(),           "IMG4030", "스토리지 접근 권한이 없습니다."),
+    INVALID_CONTENT_TYPE  (HttpStatus.BAD_REQUEST.value(),         "IMG4001", "지원하지 않는 콘텐츠 타입입니다."),
+
+    // 5xx
+    FILE_UPLOAD_ERROR     (HttpStatus.INTERNAL_SERVER_ERROR.value(),"IMG5001", "파일 업로드 중 오류가 발생했습니다."),
+    FILE_DOWNLOAD_ERROR   (HttpStatus.INTERNAL_SERVER_ERROR.value(),"IMG5002", "파일 다운로드 중 오류가 발생했습니다."),
+    FILE_DELETE_ERROR     (HttpStatus.INTERNAL_SERVER_ERROR.value(),"IMG5003", "파일 삭제 중 오류가 발생했습니다.");
+
+    private final int httpStatus;
+    private final String code;
+    private final String message;
+}
diff --git a/src/main/java/popcong/app/infra/config/s3/S3Config.java b/src/main/java/popcong/app/infra/config/s3/S3Config.java
new file mode 100644
index 0000000..313c2ab
--- /dev/null
+++ b/src/main/java/popcong/app/infra/config/s3/S3Config.java
@@ -0,0 +1,70 @@
+package popcong.app.infra.config.s3;
+
+import com.amazonaws.auth.AWSCredentialsProvider;
+import com.amazonaws.auth.DefaultAWSCredentialsProviderChain;
+import com.amazonaws.auth.profile.ProfileCredentialsProvider;
+import com.amazonaws.regions.Regions;
+import com.amazonaws.services.s3.AmazonS3;
+import com.amazonaws.services.s3.AmazonS3ClientBuilder;
+import com.amazonaws.services.securitytoken.AWSSecurityTokenService;
+import com.amazonaws.services.securitytoken.AWSSecurityTokenServiceClientBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.ApplicationRunner;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.Primary;
+import org.springframework.core.annotation.Order;
+
+@Slf4j
+@Configuration
+public class S3Config {
+
+    @Value("${cloud.aws.region:us-east-2}")
+    private String region;
+
+    @Bean
+    public AWSCredentialsProvider awsCredentialsProvider(
+            @Value("${cloud.aws.profile:}") String profile) {
+        log.info("[S3] Using profile='{}', region='{}'", profile, region);
+        return (profile != null && !profile.isBlank())
+                ? new ProfileCredentialsProvider(profile)
+                : DefaultAWSCredentialsProviderChain.getInstance();
+    }
+
+    @Bean
+    @Primary
+    public AmazonS3 amazonS3(AWSCredentialsProvider creds) {
+        log.info("[S3] Creds provider = {}", creds.getClass().getSimpleName());
+        return AmazonS3ClientBuilder.standard()
+                .withRegion(Regions.fromName(region))
+                .withCredentials(creds)
+                .withForceGlobalBucketAccessEnabled(true)
+                .build();
+    }
+
+    @Bean
+    public AWSSecurityTokenService sts(AWSCredentialsProvider creds) {
+        return AWSSecurityTokenServiceClientBuilder.standard()
+                .withRegion(Regions.fromName(region))
+                .withCredentials(creds)
+                .build();
+    }
+
+    // 앱 기동 후 한 번만 실행되며, 현재 STS 호출 주체를 로깅
+    @Bean
+    @Order(0)
+    public ApplicationRunner logCaller(AWSSecurityTokenService sts) {
+        return args -> {
+            try {
+                var me = sts.getCallerIdentity(
+                        new com.amazonaws.services.securitytoken.model.GetCallerIdentityRequest());
+                log.info("AWS caller identity: account={}, arn={}, userId={}",
+                        me.getAccount(), me.getArn(), me.getUserId());
+            } catch (Exception e) {
+                log.error("Failed to resolve AWS caller identity.", e);
+            }
+        };
+
+    }
+}
\ No newline at end of file

From 038b7f6159b5d7cefd50651800d9f20ea6cd177d Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 17 Aug 2025 16:30:39 +0900
Subject: [PATCH 78/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"=EC=B9=B4=EC=B9=B4?=
 =?UTF-8?q?=EC=98=A4=20=EC=9D=B8=EC=A6=9D=20=EA=B4=80=EB=A0=A8=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

redirect 관련 내용 수정

related to: #19
---
 .../in/jwt/handler/OAuth2SuccessHandler.java      | 15 +++++++--------
 .../global/exception/error/CommonErrorCode.java   |  3 ---
 src/main/resources/application.yml                | 11 +----------
 3 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java b/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
index 03c20a6..ea45c3e 100644
--- a/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
+++ b/src/main/java/popcong/app/adapter/in/jwt/handler/OAuth2SuccessHandler.java
@@ -21,7 +21,6 @@
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Arrays;
-import java.util.List;
 import java.util.Optional;
 
 //import static popcong.app.infra.config.security.SignInRedirectCaptureFilter.ALLOW_LIST;
@@ -39,10 +38,9 @@ public class OAuth2SuccessHandler extends SimpleUrlAuthenticationSuccessHandler
     private String frontendBaseUrl;
 
     @Value("${app.frontend.path.main}")
-    private String mainPath;
-
+    private String mainPath; // home
     @Value("${app.frontend.path.signup}")
-    private String signupPath;
+    private String signupPath; // signup
 
     @Value("${app.cookie.domain}")
     private String cookieDomain;
@@ -87,18 +85,19 @@ public void onAuthenticationSuccess(
         log.info("accessToken: {}", accessToken);
         log.info("refreshToken: {}", refreshToken);
 
-        // 레거시 이름(예전 소문자) 먼저 제거
+        // 이름 모두 제거
         removeCookie(response, "access_token", "/");
         removeCookie(response, "refresh_token", "/");
-
-// 혹시 동일 이름이 다른 속성으로 남아있을 수 있으니 현행 이름도 한번 초기화
         removeCookie(response, accessCookieName, accessCookiePath);
         removeCookie(response, refreshCookieName, refreshCookiePath);
 
-// 현행 이름으로만 심기
+        // 현재 이름으로만 심기
         addCookie(response, accessCookieName, accessToken, accessCookiePath, accessCookieMaxAge);
         addCookie(response, refreshCookieName, refreshToken, refreshCookiePath, refreshCookieMaxAge);
 
+        response.setHeader("Cache-Control", "no-store");
+        response.setHeader("Pragma", "no-cache");
+
         String desired = readCookie(request, "login_redirect")
                 .or(() -> Optional.ofNullable(request.getParameter("redirect_uri")))
                 .or(() -> Optional.ofNullable(request.getHeader("Origin")))
diff --git a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
index 70323b5..7765734 100644
--- a/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
+++ b/src/main/java/popcong/app/global/exception/error/CommonErrorCode.java
@@ -18,9 +18,6 @@ public enum CommonErrorCode implements ErrorCode {
     METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED.value(), "C4004", "Invalid Http Method"),
     NO_REQUIRED_FILES(HttpStatus.BAD_REQUEST.value(), "C4005", "필수 제출 파일이 누락되었습니다."),
 
-    // 405
-    METHOD_NOT_ALLOWED(HttpStatus.METHOD_NOT_ALLOWED.value(), "C4054", "Invalid Http Method"),
-
     // 5XX
     INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR.value(), "C5001", "Internal Server Error");
 
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index fa61925..bb6e2a8 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,12 +1,3 @@
 spring:
   profiles:
-    include: secret
-
-  jpa:
-    hibernate:
-      ddl-auto: update # 필요시 create
-    properties:
-      hibernate:
-        format_sql: true
-        show_sql: true
-    open-in-view: false
\ No newline at end of file
+    include: secret
\ No newline at end of file

From e0616b9ae7ebb75547afbc13b7d69298e8b5614b Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 17 Aug 2025 16:31:37 +0900
Subject: [PATCH 79/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"docker?=
 =?UTF-8?q?=20=EC=84=B8=ED=8C=85=20=EB=B0=8F=20=EB=B0=B0=ED=8F=AC"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

docker / AWS EC2, ECR, RDS 관련 세팅 후 배포

related to: #19
---
 .dockerignore |  9 ++++++++
 Dockerfile    | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 66 insertions(+)
 create mode 100644 .dockerignore
 create mode 100644 Dockerfile

diff --git a/.dockerignore b/.dockerignore
new file mode 100644
index 0000000..bb89c4d
--- /dev/null
+++ b/.dockerignore
@@ -0,0 +1,9 @@
+.git
+.gitignore
+.gradle
+build
+out
+**/node_modules
+**/.idea
+**/*.iml
+**/.DS_Store
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..68e9327
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,57 @@
+# amazoncorretto:21-alpine 이미지를 베이스로 사용 / 컨테이너 내부 작업 디렉토리는 app으로 함
+FROM amazoncorretto:21-alpine AS builder
+WORKDIR /app
+
+# Gradle 캐시 최적화를 위한 복사
+COPY gradlew gradle.properties* settings.gradle* build.gradle* /app/
+COPY gradle /app/gradle
+
+# Gradle Wrapper 실행 권한 부여 및 버전 확인
+RUN chmod +x gradlew && ./gradlew --version
+
+# 실제 소스코드 복사
+COPY . /app
+
+# 이미지 빌드
+RUN ./gradlew clean bootJar -x test
+
+# Spring Boot layertools로 레이어 추출
+RUN java -Djarmode=layertools -jar $(find build/libs -name "*.jar" | head -n 1) extract --destination /app/layers
+
+# Runtime
+# 런타임에서도 같은 openjdk 이미지 사용
+FROM amazoncorretto:21-alpine
+
+# 일반 사용자로 실행
+RUN addgroup -S popcong && adduser -S popcong -G popcong -u 1001
+
+# 런타임 작업 디렉토리 지정
+WORKDIR /app
+
+# Spring Boot layertools 사용한 경우 설정하는 부분
+# 의존성 레이어
+COPY --from=builder /app/layers/dependencies/ ./
+# Spring Boot 런처 레이어
+COPY --from=builder /app/layers/spring-boot-loader/ ./
+# 스냅샷 의존성 레이어
+COPY --from=builder /app/layers/snapshot-dependencies/ ./
+# 애플리케이션 코드 레이어: 가장 자주 바뀌는 부분
+COPY --from=builder /app/layers/application/ ./
+
+# 한국 환경 기본 환경변수 설정
+ENV TZ=Asia/Seoul \
+    LANG=ko_KR.UTF-8 \
+    LANGUAGE=ko_KR:ko:en \
+    LC_ALL=ko_KR.UTF-8 \
+    SPRING_PROFILES_ACTIVE=prod \
+    SERVER_PORT=8080 \
+    JAVA_OPTS="-XX:MaxRAMPercentage=75 -XX:InitialRAMPercentage=50 -Dfile.encoding=UTF-8 -Duser.timezone=Asia/Seoul"
+
+# 컨테이너에서 노출할 포트
+EXPOSE 8080
+
+# root가 아닌 spring 사용자로 실행
+USER popcong
+
+# JarLauncher로 레이어 디렉토리 구조에 맞춰 앱 부팅 (Spring Boot layertools 사용한 경우)
+ENTRYPOINT ["sh","-c","java $JAVA_OPTS -cp /app org.springframework.boot.loader.launch.JarLauncher"]
\ No newline at end of file

From 469252834f8d80a433485adad1c1208d4d76a8c9 Mon Sep 17 00:00:00 2001
From: seoiiwon <wldnjstj99@gmail.com>
Date: Sun, 17 Aug 2025 16:37:06 +0900
Subject: [PATCH 80/81] =?UTF-8?q?=E2=9A=99=EF=B8=8F=20Setting:=20"Github?=
 =?UTF-8?q?=20Actions=20=EC=84=A4=EC=A0=95"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Github Actions 배포 자동화 설정

related to: #19
---
 .github/workflows/release-deploy.yml | 87 ++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 .github/workflows/release-deploy.yml

diff --git a/.github/workflows/release-deploy.yml b/.github/workflows/release-deploy.yml
new file mode 100644
index 0000000..761ffc8
--- /dev/null
+++ b/.github/workflows/release-deploy.yml
@@ -0,0 +1,87 @@
+name: Release Deploy
+
+on:
+  push:
+    branches: ["release"]
+  workflow_dispatch: {}
+
+env:
+  AWS_REGION: us-west-2
+  ACCOUNT_ID: 590184104064
+  ECR_REPOSITORY: popcong-server
+  REGISTRY: ${{ env.ACCOUNT_ID }}.dkr.ecr.${{ env.AWS_REGION }}.amazonaws.com
+  IMAGE_TAG: ${{ github.sha }}
+
+concurrency:
+  group: release-deploy
+  cancel-in-progress: true
+
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    permissions:
+      id-token: write
+      contents: read
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Configure AWS credentials
+        uses: aws-actions/configure-aws-credentials@v4
+        with:
+          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
+          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
+          aws-region: ${{ env.AWS_REGION }}
+
+      - name: Login to Amazon ECR
+        uses: aws-actions/amazon-ecr-login@v2
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build & Push (linux/amd64)
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64
+          push: true
+          context: .
+          file: ./Dockerfile
+          tags: |
+            ${{ env.REGISTRY }}/${{ env.ECR_REPOSITORY }}:${{ env.IMAGE_TAG }}
+            ${{ env.REGISTRY }}/${{ env.ECR_REPOSITORY }}:latest
+
+  deploy:
+    needs: build-and-push
+    runs-on: ubuntu-latest
+    timeout-minutes: 15
+
+    steps:
+      - name: Connect & Deploy on EC2
+        uses: appleboy/ssh-action@v1.2.0
+        with:
+          host: ${{ secrets.EC2_HOST }}
+          username: ${{ secrets.EC2_USER }}
+          key: ${{ secrets.EC2_SSH_KEY }}
+          script: |
+            set -euo pipefail
+
+            AWS_REGION="${{ env.AWS_REGION }}"
+            ACCOUNT_ID="${{ env.ACCOUNT_ID }}"
+            REGISTRY="${ACCOUNT_ID}.dkr.ecr.${AWS_REGION}.amazonaws.com"
+
+            echo "[EC2] ECR 로그인"
+            aws ecr get-login-password --region "$AWS_REGION" | docker login --username AWS --password-stdin "$REGISTRY"
+
+            echo "[EC2] 디렉토리 이동"
+            cd ~/popcong
+
+            echo "[EC2] 최신 이미지 Pull"
+            docker compose pull
+
+            echo "[EC2] 재기동"
+            docker compose up -d --remove-orphans
+
+            echo "[EC2] 상태 확인"
+            docker compose ps
+            docker ps
\ No newline at end of file

From d414237312ee34e5e4d63c5d031be0a5519a11d6 Mon Sep 17 00:00:00 2001
From: Jiwon Seo <134384128+seoiiwon@users.noreply.github.com>
Date: Sun, 17 Aug 2025 17:09:17 +0900
Subject: [PATCH 81/81] =?UTF-8?q?=F0=9F=94=A8=20Fix:=20"application.yml=20?=
 =?UTF-8?q?=EB=88=84=EB=9D=BD"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.yml | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index bb6e2a8..2c09067 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -1,3 +1,10 @@
 spring:
   profiles:
-    include: secret
\ No newline at end of file
+    include: secret
+    
+cloud:
+  aws:
+    profile: dev
+    region: us-east-2
+    s3:
+      bucket: popcongbucket