From 1f3a113d93646cc33fa3af0ff26be0672e596572 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 15 Jul 2024 20:47:20 +0900 Subject: [PATCH 001/348] =?UTF-8?q?chore:=20CI=EB=A5=BC=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20YML=20=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 48 ++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 .github/workflows/backend-ci.yml diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml new file mode 100644 index 000000000..3e5dfa8d4 --- /dev/null +++ b/.github/workflows/backend-ci.yml @@ -0,0 +1,48 @@ +name: backend-ci + +on: + pull_request: + branches: [ "main", "develop" ] + paths: 'backend/**' + +jobs: + build: + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + with: + gradle-version: 8.8 + + - name: Gradle Caching + uses: actions/cache@v3 + with: + path: | + ~/.gradle/caches + ~/.gradle/wrapper + key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} + restore-keys: | + ${{ runner.os }}-gradle- + + - name: Grant execute permission for gradlew + run: chmod +x gradlew + + - name: Build with Gradle + run: ./gradlew build + + + + + From b9d02e58b10c3f75702a690e341ddb2c16eae93f Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 15 Jul 2024 21:47:33 +0900 Subject: [PATCH 002/348] =?UTF-8?q?chore:=20CI=20=EB=A3=A8=ED=8A=B8=20?= =?UTF-8?q?=EB=94=94=EB=A0=89=ED=86=A0=EB=A6=AC=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 3e5dfa8d4..ad21d7d32 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -5,6 +5,9 @@ on: branches: [ "main", "develop" ] paths: 'backend/**' +defaults: + run: + working-directory: backend/banggood jobs: build: runs-on: ubuntu-latest @@ -26,6 +29,9 @@ jobs: with: gradle-version: 8.8 + - name: Grant execute permission for gradlew + run: chmod +x gradlew + - name: Gradle Caching uses: actions/cache@v3 with: @@ -36,12 +42,8 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - - name: Grant execute permission for gradlew - run: chmod +x gradlew - - name: Build with Gradle run: ./gradlew build - From 71e28083b790559a4eff6fe3f5024c8c43d060f1 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 19 Jul 2024 16:42:02 +0900 Subject: [PATCH 003/348] =?UTF-8?q?chore:=20ci=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index ad21d7d32..6d271a3af 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -32,19 +32,6 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew - - name: Gradle Caching - uses: actions/cache@v3 - with: - path: | - ~/.gradle/caches - ~/.gradle/wrapper - key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }} - restore-keys: | - ${{ runner.os }}-gradle- - - name: Build with Gradle - run: ./gradlew build - - + run: ./gradlew clean build - From 1c0e58dfd18240a4547c2dc641a63e195131d0b4 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 19 Jul 2024 16:47:45 +0900 Subject: [PATCH 004/348] =?UTF-8?q?chore:=20cd=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 81 ++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 .github/workflows/backend-cd.yml diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml new file mode 100644 index 000000000..bfa157e1c --- /dev/null +++ b/.github/workflows/backend-cd.yml @@ -0,0 +1,81 @@ +name: Java CD with Gradle + +on: + pull_request: + branches: [ "main", "develop" ] + types: [closed] + +jobs: + build: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + with: + gradle-version: 8.8 + + - name: Grant execute permission for gradlew + run: chmod +x backend/banggood/gradlew + + - name: Build with Gradle + run: ./gradlew clean build + working-directory: backend/banggood + + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + working-directory: backend/banggood + name: bang-ggood-be-develop-jar + path: ./**/*.jar + + deploy: + needs: build + runs-on: bang-ggood + steps: + - name: change permission + run: | + sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-bang-ggood + + - name: Download build artifact + uses: actions/download-artifact@v3 + with: + name: bang-ggood-be-develop-jar + + - name: Check if room-esc server is running on port 8080 + id: check-server-on-port + run: | + echo "Checking if port 8080 is in use..." + PID=$(lsof -t -i:8080 || true) + echo "PID=$PID" + if [ -n "$PID" ]; then + echo "server_running=true" >> $GITHUB_ENV + echo "PID=$PID" >> $GITHUB_ENV + else + echo "server_running=false" >> $GITHUB_ENV + fi + + - name: Stop server if running + if: env.server_running == 'true' + run: | + echo "Stopping server running on port 8080..." + kill -9 $PID + echo "Preivous running Server stopped." + + - name: Start server + run: | + sudo nohup java -jar ./backend/banggood/build/libs/*SNAPSHOT.jar & + echo "Lastest Backend API Server started." + From 779471f204f3835e847d2b01c07d1bfc6f346cf1 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:06:01 +0900 Subject: [PATCH 005/348] =?UTF-8?q?chore:=20ci=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 6d271a3af..901182d51 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -2,7 +2,7 @@ name: backend-ci on: pull_request: - branches: [ "main", "develop" ] + branches: [ "main", "dev" ] paths: 'backend/**' defaults: From 38b9f8917b803afffc888b73785bb6e153411002 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 19 Jul 2024 17:06:25 +0900 Subject: [PATCH 006/348] =?UTF-8?q?chore:=20cd=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20=EB=AA=85=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index bfa157e1c..44feaef88 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -2,7 +2,7 @@ name: Java CD with Gradle on: pull_request: - branches: [ "main", "develop" ] + branches: [ "main", "dev" ] types: [closed] jobs: From 0bc0dc1e6d507f61a5c8320dda3f9a808fed3665 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Fri, 19 Jul 2024 17:19:09 +0900 Subject: [PATCH 007/348] =?UTF-8?q?chore:=20=EC=8A=A4=ED=94=84=EB=A7=81?= =?UTF-8?q?=EB=B6=80=ED=8A=B8=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/.gitignore | 37 +++ backend/bang-ggood/build.gradle | 30 +++ .../gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 43453 bytes .../gradle/wrapper/gradle-wrapper.properties | 7 + backend/bang-ggood/gradlew | 249 ++++++++++++++++++ backend/bang-ggood/gradlew.bat | 92 +++++++ backend/bang-ggood/settings.gradle | 1 + .../main/java/com/bang_ggood/Application.java | 13 + .../src/main/resources/application.properties | 1 + .../java/com/bang_ggood/ApplicationTests.java | 13 + 10 files changed, 443 insertions(+) create mode 100644 backend/bang-ggood/.gitignore create mode 100644 backend/bang-ggood/build.gradle create mode 100644 backend/bang-ggood/gradle/wrapper/gradle-wrapper.jar create mode 100644 backend/bang-ggood/gradle/wrapper/gradle-wrapper.properties create mode 100644 backend/bang-ggood/gradlew create mode 100644 backend/bang-ggood/gradlew.bat create mode 100644 backend/bang-ggood/settings.gradle create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/Application.java create mode 100644 backend/bang-ggood/src/main/resources/application.properties create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java diff --git a/backend/bang-ggood/.gitignore b/backend/bang-ggood/.gitignore new file mode 100644 index 000000000..c2065bc26 --- /dev/null +++ b/backend/bang-ggood/.gitignore @@ -0,0 +1,37 @@ +HELP.md +.gradle +build/ +!gradle/wrapper/gradle-wrapper.jar +!**/src/main/**/build/ +!**/src/test/**/build/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +### VS Code ### +.vscode/ diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle new file mode 100644 index 000000000..b637ca098 --- /dev/null +++ b/backend/bang-ggood/build.gradle @@ -0,0 +1,30 @@ +plugins { + id 'java' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' +} + +group = 'com.bang-ggood' +version = '0.0.1-SNAPSHOT' + +java { + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } +} + +repositories { + mavenCentral() +} + +dependencies { + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + runtimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' +} + +tasks.named('test') { + useJUnitPlatform() +} diff --git a/backend/bang-ggood/gradle/wrapper/gradle-wrapper.jar b/backend/bang-ggood/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..e6441136f3d4ba8a0da8d277868979cfbc8ad796 GIT binary patch literal 43453 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 yu?e%!_ptzGB|8GrCfu%p?(_ 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
NnX)EH+Nua)3Y(c z&{(nX_ht=QbJ%DzAya}!&uNu!4V0xI)QE$SY__m)SAKcN0P(&JcoK*Lxr@P zY&P=}&B3*UWNlc|&$Oh{BEqwK2+N2U$4WB7Fd|aIal`FGANUa9E-O)!gV`((ZGCc$ zBJA|FFrlg~9OBp#f7aHodCe{6= zay$6vN~zj1ddMZ9gQ4p32(7wD?(dE>KA2;SOzXRmPBiBc6g`eOsy+pVcHu=;Yd8@{ zSGgXf@%sKKQz~;!J;|2fC@emm#^_rnO0esEn^QxXgJYd`#FPWOUU5b;9eMAF zZhfiZb|gk8aJIw*YLp4!*(=3l8Cp{(%p?ho22*vN9+5NLV0TTazNY$B5L6UKUrd$n zjbX%#m7&F#U?QNOBXkiiWB*_tk+H?N3`vg;1F-I+83{M2!8<^nydGr5XX}tC!10&e z7D36bLaB56WrjL&HiiMVtpff|K%|*{t*ltt^5ood{FOG0<>k&1h95qPio)2`eL${YAGIx(b4VN*~nKn6E~SIQUuRH zQ+5zP6jfnP$S0iJ@~t!Ai3o`X7biohli;E zT#yXyl{bojG@-TGZzpdVDXhbmF%F9+-^YSIv|MT1l3j zrxOFq>gd2%U}?6}8mIj?M zc077Zc9fq(-)4+gXv?Az26IO6eV`RAJz8e3)SC7~>%rlzDwySVx*q$ygTR5kW2ds- z!HBgcq0KON9*8Ff$X0wOq$`T7ml(@TF)VeoF}x1OttjuVHn3~sHrMB++}f7f9H%@f z=|kP_?#+fve@{0MlbkC9tyvQ_R?lRdRJ@$qcB(8*jyMyeME5ns6ypVI1Xm*Zr{DuS zZ!1)rQfa89c~;l~VkCiHI|PCBd`S*2RLNQM8!g9L6?n`^evQNEwfO@&JJRme+uopQX0%Jo zgd5G&#&{nX{o?TQwQvF1<^Cg3?2co;_06=~Hcb6~4XWpNFL!WU{+CK;>gH%|BLOh7@!hsa(>pNDAmpcuVO-?;Bic17R}^|6@8DahH)G z!EmhsfunLL|3b=M0MeK2vqZ|OqUqS8npxwge$w-4pFVXFq$_EKrZY?BuP@Az@(k`L z`ViQBSk`y+YwRT;&W| z2e3UfkCo^uTA4}Qmmtqs+nk#gNr2W4 zTH%hhErhB)pkXR{B!q5P3-OM+M;qu~f>}IjtF%>w{~K-0*jPVLl?Chz&zIdxp}bjx zStp&Iufr58FTQ36AHU)0+CmvaOpKF;W@sMTFpJ`j;3d)J_$tNQI^c<^1o<49Z(~K> z;EZTBaVT%14(bFw2ob@?JLQ2@(1pCdg3S%E4*dJ}dA*v}_a4_P(a`cHnBFJxNobAv zf&Zl-Yt*lhn-wjZsq<9v-IsXxAxMZ58C@e0!rzhJ+D@9^3~?~yllY^s$?&oNwyH!#~6x4gUrfxplCvK#!f z$viuszW>MFEcFL?>ux*((!L$;R?xc*myjRIjgnQX79@UPD$6Dz0jutM@7h_pq z0Zr)#O<^y_K6jfY^X%A-ip>P%3saX{!v;fxT-*0C_j4=UMH+Xth(XVkVGiiKE#f)q z%Jp=JT)uy{&}Iq2E*xr4YsJ5>w^=#-mRZ4vPXpI6q~1aFwi+lQcimO45V-JXP;>(Q zo={U`{=_JF`EQj87Wf}{Qy35s8r1*9Mxg({CvOt}?Vh9d&(}iI-quvs-rm~P;eRA@ zG5?1HO}puruc@S{YNAF3vmUc2B4!k*yi))<5BQmvd3tr}cIs#9)*AX>t`=~{f#Uz0 z0&Nk!7sSZwJe}=)-R^$0{yeS!V`Dh7w{w5rZ9ir!Z7Cd7dwZcK;BT#V0bzTt>;@Cl z#|#A!-IL6CZ@eHH!CG>OO8!%G8&8t4)Ro@}USB*k>oEUo0LsljsJ-%5Mo^MJF2I8- z#v7a5VdJ-Cd%(a+y6QwTmi+?f8Nxtm{g-+WGL>t;s#epv7ug>inqimZCVm!uT5Pf6 ziEgQt7^%xJf#!aPWbuC_3Nxfb&CFbQy!(8ANpkWLI4oSnH?Q3f?0k1t$3d+lkQs{~(>06l&v|MpcFsyAv zin6N!-;pggosR*vV=DO(#+}4ps|5$`udE%Kdmp?G7B#y%H`R|i8skKOd9Xzx8xgR$>Zo2R2Ytktq^w#ul4uicxW#{ zFjG_RNlBroV_n;a7U(KIpcp*{M~e~@>Q#Av90Jc5v%0c>egEdY4v3%|K1XvB{O_8G zkTWLC>OZKf;XguMH2-Pw{BKbFzaY;4v2seZV0>^7Q~d4O=AwaPhP3h|!hw5aqOtT@ z!SNz}$of**Bl3TK209@F=Tn1+mgZa8yh(Png%Zd6Mt}^NSjy)etQrF zme*llAW=N_8R*O~d2!apJnF%(JcN??=`$qs3Y+~xs>L9x`0^NIn!8mMRFA_tg`etw z3k{9JAjnl@ygIiJcNHTy02GMAvBVqEss&t2<2mnw!; zU`J)0>lWiqVqo|ex7!+@0i>B~BSU1A_0w#Ee+2pJx0BFiZ7RDHEvE*ptc9md(B{&+ zKE>TM)+Pd>HEmdJao7U@S>nL(qq*A)#eLOuIfAS@j`_sK0UEY6OAJJ-kOrHG zjHx`g!9j*_jRcJ%>CE9K2MVf?BUZKFHY?EpV6ai7sET-tqk=nDFh-(65rhjtlKEY% z@G&cQ<5BKatfdA1FKuB=i>CCC5(|9TMW%K~GbA4}80I5%B}(gck#Wlq@$nO3%@QP_ z8nvPkJFa|znk>V92cA!K1rKtr)skHEJD;k8P|R8RkCq1Rh^&}Evwa4BUJz2f!2=MH zo4j8Y$YL2313}H~F7@J7mh>u%556Hw0VUOz-Un@ZASCL)y8}4XXS`t1AC*^>PLwIc zUQok5PFS=*#)Z!3JZN&eZ6ZDP^-c@StY*t20JhCnbMxXf=LK#;`4KHEqMZ-Ly9KsS zI2VUJGY&PmdbM+iT)zek)#Qc#_i4uH43 z@T5SZBrhNCiK~~esjsO9!qBpaWK<`>!-`b71Y5ReXQ4AJU~T2Njri1CEp5oKw;Lnm)-Y@Z3sEY}XIgSy%xo=uek(kAAH5MsV$V3uTUsoTzxp_rF=tx zV07vlJNKtJhCu`b}*#m&5LV4TAE&%KtHViDAdv#c^x`J7bg z&N;#I2GkF@SIGht6p-V}`!F_~lCXjl1BdTLIjD2hH$J^YFN`7f{Q?OHPFEM$65^!u zNwkelo*5+$ZT|oQ%o%;rBX$+?xhvjb)SHgNHE_yP%wYkkvXHS{Bf$OiKJ5d1gI0j< zF6N}Aq=(WDo(J{e-uOecxPD>XZ@|u-tgTR<972`q8;&ZD!cep^@B5CaqFz|oU!iFj zU0;6fQX&~15E53EW&w1s9gQQ~Zk16X%6 zjG`j0yq}4deX2?Tr(03kg>C(!7a|b9qFI?jcE^Y>-VhudI@&LI6Qa}WQ>4H_!UVyF z((cm&!3gmq@;BD#5P~0;_2qgZhtJS|>WdtjY=q zLnHH~Fm!cxw|Z?Vw8*~?I$g#9j&uvgm7vPr#&iZgPP~v~BI4jOv;*OQ?jYJtzO<^y z7-#C={r7CO810!^s(MT!@@Vz_SVU)7VBi(e1%1rvS!?PTa}Uv`J!EP3s6Y!xUgM^8 z4f!fq<3Wer_#;u!5ECZ|^c1{|q_lh3m^9|nsMR1#Qm|?4Yp5~|er2?W^7~cl;_r4WSme_o68J9p03~Hc%X#VcX!xAu%1`R!dfGJCp zV*&m47>s^%Ib0~-2f$6oSgn3jg8m%UA;ArcdcRyM5;}|r;)?a^D*lel5C`V5G=c~k zy*w_&BfySOxE!(~PI$*dwG><+-%KT5p?whOUMA*k<9*gi#T{h3DAxzAPxN&Xws8o9Cp*`PA5>d9*Z-ynV# z9yY*1WR^D8|C%I@vo+d8r^pjJ$>eo|j>XiLWvTWLl(^;JHCsoPgem6PvegHb-OTf| zvTgsHSa;BkbG=(NgPO|CZu9gUCGr$8*EoH2_Z#^BnxF0yM~t`|9ws_xZ8X8iZYqh! zAh;HXJ)3P&)Q0(&F>!LN0g#bdbis-cQxyGn9Qgh`q+~49Fqd2epikEUw9caM%V6WgP)532RMRW}8gNS%V%Hx7apSz}tn@bQy!<=lbhmAH=FsMD?leawbnP5BWM0 z5{)@EEIYMu5;u)!+HQWhQ;D3_Cm_NADNeb-f56}<{41aYq8p4=93d=-=q0Yx#knGYfXVt z+kMxlus}t2T5FEyCN~!}90O_X@@PQpuy;kuGz@bWft%diBTx?d)_xWd_-(!LmVrh**oKg!1CNF&LX4{*j|) zIvjCR0I2UUuuEXh<9}oT_zT#jOrJAHNLFT~Ilh9hGJPI1<5`C-WA{tUYlyMeoy!+U zhA#=p!u1R7DNg9u4|QfED-2TuKI}>p#2P9--z;Bbf4Op*;Q9LCbO&aL2i<0O$ByoI z!9;Ght733FC>Pz>$_mw(F`zU?`m@>gE`9_p*=7o=7av`-&ifU(^)UU`Kg3Kw`h9-1 z6`e6+im=|m2v`pN(2dE%%n8YyQz;#3Q-|x`91z?gj68cMrHl}C25|6(_dIGk*8cA3 zRHB|Nwv{@sP4W+YZM)VKI>RlB`n=Oj~Rzx~M+Khz$N$45rLn6k1nvvD^&HtsMA4`s=MmuOJID@$s8Ph4E zAmSV^+s-z8cfv~Yd(40Sh4JG#F~aB>WFoX7ykaOr3JaJ&Lb49=B8Vk-SQT9%7TYhv z?-Pprt{|=Y5ZQ1?od|A<_IJU93|l4oAfBm?3-wk{O<8ea+`}u%(kub(LFo2zFtd?4 zwpN|2mBNywv+d^y_8#<$r>*5+$wRTCygFLcrwT(qc^n&@9r+}Kd_u@Ithz(6Qb4}A zWo_HdBj#V$VE#l6pD0a=NfB0l^6W^g`vm^sta>Tly?$E&{F?TTX~DsKF~poFfmN%2 z4x`Dc{u{Lkqz&y!33;X}weD}&;7p>xiI&ZUb1H9iD25a(gI|`|;G^NwJPv=1S5e)j z;U;`?n}jnY6rA{V^ zxTd{bK)Gi^odL3l989DQlN+Zs39Xe&otGeY(b5>rlIqfc7Ap4}EC?j<{M=hlH{1+d zw|c}}yx88_xQr`{98Z!d^FNH77=u(p-L{W6RvIn40f-BldeF-YD>p6#)(Qzf)lfZj z?3wAMtPPp>vMehkT`3gToPd%|D8~4`5WK{`#+}{L{jRUMt zrFz+O$C7y8$M&E4@+p+oV5c%uYzbqd2Y%SSgYy#xh4G3hQv>V*BnuKQhBa#=oZB~w{azUB+q%bRe_R^ z>fHBilnRTUfaJ201czL8^~Ix#+qOHSO)A|xWLqOxB$dT2W~)e-r9;bm=;p;RjYahB z*1hegN(VKK+ztr~h1}YP@6cfj{e#|sS`;3tJhIJK=tVJ-*h-5y9n*&cYCSdg#EHE# zSIx=r#qOaLJoVVf6v;(okg6?*L_55atl^W(gm^yjR?$GplNP>BZsBYEf_>wM0Lc;T zhf&gpzOWNxS>m+mN92N0{;4uw`P+9^*|-1~$uXpggj4- z^SFc4`uzj2OwdEVT@}Q`(^EcQ_5(ZtXTql*yGzdS&vrS_w>~~ra|Nb5abwf}Y!uq6R5f&6g2ge~2p(%c< z@O)cz%%rr4*cRJ5f`n@lvHNk@lE1a*96Kw6lJ~B-XfJW%?&-y?;E&?1AacU@`N`!O z6}V>8^%RZ7SQnZ-z$(jsX`amu*5Fj8g!3RTRwK^`2_QHe;_2y_n|6gSaGyPmI#kA0sYV<_qOZc#-2BO%hX)f$s-Z3xlI!ub z^;3ru11DA`4heAu%}HIXo&ctujzE2!6DIGE{?Zs>2}J+p&C$rc7gJC35gxhflorvsb%sGOxpuWhF)dL_&7&Z99=5M0b~Qa;Mo!j&Ti_kXW!86N%n= zSC@6Lw>UQ__F&+&Rzv?gscwAz8IP!n63>SP)^62(HK98nGjLY2*e^OwOq`3O|C92? z;TVhZ2SK%9AGW4ZavTB9?)mUbOoF`V7S=XM;#3EUpR+^oHtdV!GK^nXzCu>tpR|89 zdD{fnvCaN^^LL%amZ^}-E+214g&^56rpdc@yv0b<3}Ys?)f|fXN4oHf$six)-@<;W&&_kj z-B}M5U*1sb4)77aR=@%I?|Wkn-QJVuA96an25;~!gq(g1@O-5VGo7y&E_srxL6ZfS z*R%$gR}dyONgju*D&?geiSj7SZ@ftyA|}(*Y4KbvU!YLsi1EDQQCnb+-cM=K1io78o!v*);o<XwjaQH%)uIP&Zm?)Nfbfn;jIr z)d#!$gOe3QHp}2NBak@yYv3m(CPKkwI|{;d=gi552u?xj9ObCU^DJFQp4t4e1tPzM zvsRIGZ6VF+{6PvqsplMZWhz10YwS={?`~O0Ec$`-!klNUYtzWA^f9m7tkEzCy<_nS z=&<(awFeZvt51>@o_~>PLs05CY)$;}Oo$VDO)?l-{CS1Co=nxjqben*O1BR>#9`0^ zkwk^k-wcLCLGh|XLjdWv0_Hg54B&OzCE^3NCP}~OajK-LuRW53CkV~Su0U>zN%yQP zH8UH#W5P3-!ToO-2k&)}nFe`t+mdqCxxAHgcifup^gKpMObbox9LFK;LP3}0dP-UW z?Zo*^nrQ6*$FtZ(>kLCc2LY*|{!dUn$^RW~m9leoF|@Jy|M5p-G~j%+P0_#orRKf8 zvuu5<*XO!B?1E}-*SY~MOa$6c%2cM+xa8}_8x*aVn~57v&W(0mqN1W`5a7*VN{SUH zXz98DDyCnX2EPl-`Lesf`=AQT%YSDb`$%;(jUTrNen$NPJrlpPDP}prI>Ml!r6bCT;mjsg@X^#&<}CGf0JtR{Ecwd&)2zuhr#nqdgHj+g2n}GK9CHuwO zk>oZxy{vcOL)$8-}L^iVfJHAGfwN$prHjYV0ju}8%jWquw>}_W6j~m<}Jf!G?~r5&Rx)!9JNX!ts#SGe2HzobV5); zpj@&`cNcO&q+%*<%D7za|?m5qlmFK$=MJ_iv{aRs+BGVrs)98BlN^nMr{V_fcl_;jkzRju+c-y?gqBC_@J0dFLq-D9@VN&-`R9U;nv$Hg?>$oe4N&Ht$V_(JR3TG^! zzJsbQbi zFE6-{#9{G{+Z}ww!ycl*7rRdmU#_&|DqPfX3CR1I{Kk;bHwF6jh0opI`UV2W{*|nn zf_Y@%wW6APb&9RrbEN=PQRBEpM(N1w`81s=(xQj6 z-eO0k9=Al|>Ej|Mw&G`%q8e$2xVz1v4DXAi8G};R$y)ww638Y=9y$ZYFDM$}vzusg zUf+~BPX>(SjA|tgaFZr_e0{)+z9i6G#lgt=F_n$d=beAt0Sa0a7>z-?vcjl3e+W}+ z1&9=|vC=$co}-Zh*%3588G?v&U7%N1Qf-wNWJ)(v`iO5KHSkC5&g7CrKu8V}uQGcfcz zmBz#Lbqwqy#Z~UzHgOQ;Q-rPxrRNvl(&u6ts4~0=KkeS;zqURz%!-ERppmd%0v>iRlEf+H$yl{_8TMJzo0 z>n)`On|7=WQdsqhXI?#V{>+~}qt-cQbokEbgwV3QvSP7&hK4R{Z{aGHVS3;+h{|Hz z6$Js}_AJr383c_+6sNR|$qu6dqHXQTc6?(XWPCVZv=)D#6_;D_8P-=zOGEN5&?~8S zl5jQ?NL$c%O)*bOohdNwGIKM#jSAC?BVY={@A#c9GmX0=T(0G}xs`-%f3r=m6-cpK z!%waekyAvm9C3%>sixdZj+I(wQlbB4wv9xKI*T13DYG^T%}zZYJ|0$Oj^YtY+d$V$ zAVudSc-)FMl|54n=N{BnZTM|!>=bhaja?o7s+v1*U$!v!qQ%`T-6fBvmdPbVmro&d zk07TOp*KuxRUSTLRrBj{mjsnF8`d}rMViY8j`jo~Hp$fkv9F_g(jUo#Arp;Xw0M$~ zRIN!B22~$kx;QYmOkos@%|5k)!QypDMVe}1M9tZfkpXKGOxvKXB!=lo`p?|R1l=tA zp(1}c6T3Fwj_CPJwVsYtgeRKg?9?}%oRq0F+r+kdB=bFUdVDRPa;E~~>2$w}>O>v=?|e>#(-Lyx?nbg=ckJ#5U6;RT zNvHhXk$P}m9wSvFyU3}=7!y?Y z=fg$PbV8d7g25&-jOcs{%}wTDKm>!Vk);&rr;O1nvO0VrU&Q?TtYVU=ir`te8SLlS zKSNmV=+vF|ATGg`4$N1uS|n??f}C_4Sz!f|4Ly8#yTW-FBfvS48Tef|-46C(wEO_%pPhUC5$-~Y?!0vFZ^Gu`x=m7X99_?C-`|h zfmMM&Y@zdfitA@KPw4Mc(YHcY1)3*1xvW9V-r4n-9ZuBpFcf{yz+SR{ zo$ZSU_|fgwF~aakGr(9Be`~A|3)B=9`$M-TWKipq-NqRDRQc}ABo*s_5kV%doIX7LRLRau_gd@Rd_aLFXGSU+U?uAqh z8qusWWcvgQ&wu{|sRXmv?sl=xc<$6AR$+cl& zFNh5q1~kffG{3lDUdvEZu5c(aAG~+64FxdlfwY^*;JSS|m~CJusvi-!$XR`6@XtY2 znDHSz7}_Bx7zGq-^5{stTRy|I@N=>*y$zz>m^}^{d&~h;0kYiq8<^Wq7Dz0w31ShO^~LUfW6rfitR0(=3;Uue`Y%y@ex#eKPOW zO~V?)M#AeHB2kovn1v=n^D?2{2jhIQd9t|_Q+c|ZFaWt+r&#yrOu-!4pXAJuxM+Cx z*H&>eZ0v8Y`t}8{TV6smOj=__gFC=eah)mZt9gwz>>W$!>b3O;Rm^Ig*POZP8Rl0f zT~o=Nu1J|lO>}xX&#P58%Yl z83`HRs5#32Qm9mdCrMlV|NKNC+Z~ z9OB8xk5HJ>gBLi+m@(pvpw)1(OaVJKs*$Ou#@Knd#bk+V@y;YXT?)4eP9E5{J%KGtYinNYJUH9PU3A}66c>Xn zZ{Bn0<;8$WCOAL$^NqTjwM?5d=RHgw3!72WRo0c;+houoUA@HWLZM;^U$&sycWrFd zE7ekt9;kb0`lps{>R(}YnXlyGY}5pPd9zBpgXeJTY_jwaJGSJQC#-KJqmh-;ad&F- z-Y)E>!&`Rz!HtCz>%yOJ|v(u7P*I$jqEY3}(Z-orn4 zlI?CYKNl`6I){#2P1h)y(6?i;^z`N3bxTV%wNvQW+eu|x=kbj~s8rhCR*0H=iGkSj zk23lr9kr|p7#qKL=UjgO`@UnvzU)`&fI>1Qs7ubq{@+lK{hH* zvl6eSb9%yngRn^T<;jG1SVa)eA>T^XX=yUS@NCKpk?ovCW1D@!=@kn;l_BrG;hOTC z6K&H{<8K#dI(A+zw-MWxS+~{g$tI7|SfP$EYKxA}LlVO^sT#Oby^grkdZ^^lA}uEF zBSj$weBJG{+Bh@Yffzsw=HyChS(dtLE3i*}Zj@~!_T-Ay7z=B)+*~3|?w`Zd)Co2t zC&4DyB!o&YgSw+fJn6`sn$e)29`kUwAc+1MND7YjV%lO;H2}fNy>hD#=gT ze+-aFNpyKIoXY~Vq-}OWPBe?Rfu^{ps8>Xy%42r@RV#*QV~P83jdlFNgkPN=T|Kt7 zV*M`Rh*30&AWlb$;ae130e@}Tqi3zx2^JQHpM>j$6x`#{mu%tZlwx9Gj@Hc92IuY* zarmT|*d0E~vt6<+r?W^UW0&#U&)8B6+1+;k^2|FWBRP9?C4Rk)HAh&=AS8FS|NQaZ z2j!iZ)nbEyg4ZTp-zHwVlfLC~tXIrv(xrP8PAtR{*c;T24ycA-;auWsya-!kF~CWZ zw_uZ|%urXgUbc@x=L=_g@QJ@m#5beS@6W195Hn7>_}z@Xt{DIEA`A&V82bc^#!q8$ zFh?z_Vn|ozJ;NPd^5uu(9tspo8t%&-U9Ckay-s@DnM*R5rtu|4)~e)`z0P-sy?)kc zs_k&J@0&0!q4~%cKL)2l;N*T&0;mqX5T{Qy60%JtKTQZ-xb%KOcgqwJmb%MOOKk7N zgq})R_6**{8A|6H?fO+2`#QU)p$Ei2&nbj6TpLSIT^D$|`TcSeh+)}VMb}LmvZ{O| ze*1IdCt3+yhdYVxcM)Q_V0bIXLgr6~%JS<<&dxIgfL=Vnx4YHuU@I34JXA|+$_S3~ zy~X#gO_X!cSs^XM{yzDGNM>?v(+sF#<0;AH^YrE8smx<36bUsHbN#y57K8WEu(`qHvQ6cAZPo=J5C(lSmUCZ57Rj6cx!e^rfaI5%w}unz}4 zoX=nt)FVNV%QDJH`o!u9olLD4O5fl)xp+#RloZlaA92o3x4->?rB4`gS$;WO{R;Z3>cG3IgFX2EA?PK^M}@%1%A;?f6}s&CV$cIyEr#q5;yHdNZ9h{| z-=dX+a5elJoDo?Eq&Og!nN6A)5yYpnGEp}?=!C-V)(*~z-+?kY1Q7qs#Rsy%hu_60rdbB+QQNr?S1 z?;xtjUv|*E3}HmuNyB9aFL5H~3Ho0UsmuMZELp1a#CA1g`P{-mT?BchuLEtK}!QZ=3AWakRu~?f9V~3F;TV`5%9Pcs_$gq&CcU}r8gOO zC2&SWPsSG{&o-LIGTBqp6SLQZPvYKp$$7L4WRRZ0BR$Kf0I0SCFkqveCp@f)o8W)! z$%7D1R`&j7W9Q9CGus_)b%+B#J2G;l*FLz#s$hw{BHS~WNLODV#(!u_2Pe&tMsq={ zdm7>_WecWF#D=?eMjLj=-_z`aHMZ=3_-&E8;ibPmM}61i6J3is*=dKf%HC>=xbj4$ zS|Q-hWQ8T5mWde6h@;mS+?k=89?1FU<%qH9B(l&O>k|u_aD|DY*@~(`_pb|B#rJ&g zR0(~(68fpUPz6TdS@4JT5MOPrqDh5_H(eX1$P2SQrkvN8sTxwV>l0)Qq z0pzTuvtEAKRDkKGhhv^jk%|HQ1DdF%5oKq5BS>szk-CIke{%js?~%@$uaN3^Uz6Wf z_iyx{bZ(;9y4X&>LPV=L=d+A}7I4GkK0c1Xts{rrW1Q7apHf-))`BgC^0^F(>At1* za@e7{lq%yAkn*NH8Q1{@{lKhRg*^TfGvv!Sn*ed*x@6>M%aaqySxR|oNadYt1mpUZ z6H(rupHYf&Z z29$5g#|0MX#aR6TZ$@eGxxABRKakDYtD%5BmKp;HbG_ZbT+=81E&=XRk6m_3t9PvD zr5Cqy(v?gHcYvYvXkNH@S#Po~q(_7MOuCAB8G$a9BC##gw^5mW16cML=T=ERL7wsk zzNEayTG?mtB=x*wc@ifBCJ|irFVMOvH)AFRW8WE~U()QT=HBCe@s$dA9O!@`zAAT) zaOZ7l6vyR+Nk_OOF!ZlZmjoImKh)dxFbbR~z(cMhfeX1l7S_`;h|v3gI}n9$sSQ>+3@AFAy9=B_y$)q;Wdl|C-X|VV3w8 z2S#>|5dGA8^9%Bu&fhmVRrTX>Z7{~3V&0UpJNEl0=N32euvDGCJ>#6dUSi&PxFW*s zS`}TB>?}H(T2lxBJ!V#2taV;q%zd6fOr=SGHpoSG*4PDaiG0pdb5`jelVipkEk%FV zThLc@Hc_AL1#D&T4D=w@UezYNJ%0=f3iVRuVL5H?eeZM}4W*bomebEU@e2d`M<~uW zf#Bugwf`VezG|^Qbt6R_=U0}|=k;mIIakz99*>FrsQR{0aQRP6ko?5<7bkDN8evZ& zB@_KqQG?ErKL=1*ZM9_5?Pq%lcS4uLSzN(Mr5=t6xHLS~Ym`UgM@D&VNu8e?_=nSFtF$u@hpPSmI4Vo_t&v?>$~K4y(O~Rb*(MFy_igM7 z*~yYUyR6yQgzWnWMUgDov!!g=lInM+=lOmOk4L`O?{i&qxy&D*_qorRbDwj6?)!ef z#JLd7F6Z2I$S0iYI={rZNk*<{HtIl^mx=h>Cim*04K4+Z4IJtd*-)%6XV2(MCscPiw_a+y*?BKbTS@BZ3AUao^%Zi#PhoY9Vib4N>SE%4>=Jco0v zH_Miey{E;FkdlZSq)e<{`+S3W=*ttvD#hB8w=|2aV*D=yOV}(&p%0LbEWH$&@$X3x~CiF-?ejQ*N+-M zc8zT@3iwkdRT2t(XS`d7`tJQAjRmKAhiw{WOqpuvFp`i@Q@!KMhwKgsA}%@sw8Xo5Y=F zhRJZg)O4uqNWj?V&&vth*H#je6T}}p_<>!Dr#89q@uSjWv~JuW(>FqoJ5^ho0%K?E z9?x_Q;kmcsQ@5=}z@tdljMSt9-Z3xn$k)kEjK|qXS>EfuDmu(Z8|(W?gY6-l z@R_#M8=vxKMAoi&PwnaIYw2COJM@atcgfr=zK1bvjW?9B`-+Voe$Q+H$j!1$Tjn+* z&LY<%)L@;zhnJlB^Og6I&BOR-m?{IW;tyYC%FZ!&Z>kGjHJ6cqM-F z&19n+e1=9AH1VrVeHrIzqlC`w9=*zfmrerF?JMzO&|Mmv;!4DKc(sp+jy^Dx?(8>1 zH&yS_4yL7m&GWX~mdfgH*AB4{CKo;+egw=PrvkTaoBU+P-4u?E|&!c z)DKc;>$$B6u*Zr1SjUh2)FeuWLWHl5TH(UHWkf zLs>7px!c5n;rbe^lO@qlYLzlDVp(z?6rPZel=YB)Uv&n!2{+Mb$-vQl=xKw( zve&>xYx+jW_NJh!FV||r?;hdP*jOXYcLCp>DOtJ?2S^)DkM{{Eb zS$!L$e_o0(^}n3tA1R3-$SNvgBq;DOEo}fNc|tB%%#g4RA3{|euq)p+xd3I8^4E&m zFrD%}nvG^HUAIKe9_{tXB;tl|G<%>yk6R;8L2)KUJw4yHJXUOPM>(-+jxq4R;z8H#>rnJy*)8N+$wA$^F zN+H*3t)eFEgxLw+Nw3};4WV$qj&_D`%ADV2%r zJCPCo%{=z7;`F98(us5JnT(G@sKTZ^;2FVitXyLe-S5(hV&Ium+1pIUB(CZ#h|g)u zSLJJ<@HgrDiA-}V_6B^x1>c9B6%~847JkQ!^KLZ2skm;q*edo;UA)~?SghG8;QbHh z_6M;ouo_1rq9=x$<`Y@EA{C%6-pEV}B(1#sDoe_e1s3^Y>n#1Sw;N|}8D|s|VPd+g z-_$QhCz`vLxxrVMx3ape1xu3*wjx=yKSlM~nFgkNWb4?DDr*!?U)L_VeffF<+!j|b zZ$Wn2$TDv3C3V@BHpSgv3JUif8%hk%OsGZ=OxH@8&4`bbf$`aAMchl^qN>Eyu3JH} z9-S!x8-s4fE=lad%Pkp8hAs~u?|uRnL48O|;*DEU! zuS0{cpk%1E0nc__2%;apFsTm0bKtd&A0~S3Cj^?72-*Owk3V!ZG*PswDfS~}2<8le z5+W^`Y(&R)yVF*tU_s!XMcJS`;(Tr`J0%>p=Z&InR%D3@KEzzI+-2)HK zuoNZ&o=wUC&+*?ofPb0a(E6(<2Amd6%uSu_^-<1?hsxs~0K5^f(LsGqgEF^+0_H=uNk9S0bb!|O8d?m5gQjUKevPaO+*VfSn^2892K~%crWM8+6 z25@V?Y@J<9w%@NXh-2!}SK_(X)O4AM1-WTg>sj1{lj5@=q&dxE^9xng1_z9w9DK>| z6Iybcd0e zyi;Ew!KBRIfGPGytQ6}z}MeXCfLY0?9%RiyagSp_D1?N&c{ zyo>VbJ4Gy`@Fv+5cKgUgs~na$>BV{*em7PU3%lloy_aEovR+J7TfQKh8BJXyL6|P8un-Jnq(ghd!_HEOh$zlv2$~y3krgeH;9zC}V3f`uDtW(%mT#944DQa~^8ZI+zAUu4U(j0YcDfKR$bK#gvn_{JZ>|gZ5+)u?T$w7Q%F^;!Wk?G z(le7r!ufT*cxS}PR6hIVtXa)i`d$-_1KkyBU>qmgz-=T};uxx&sKgv48akIWQ89F{ z0XiY?WM^~;|T8zBOr zs#zuOONzH?svv*jokd5SK8wG>+yMC)LYL|vLqm^PMHcT=`}V$=nIRHe2?h)8WQa6O zPAU}d`1y(>kZiP~Gr=mtJLMu`i<2CspL|q2DqAgAD^7*$xzM`PU4^ga`ilE134XBQ z99P(LhHU@7qvl9Yzg$M`+dlS=x^(m-_3t|h>S}E0bcFMn=C|KamQ)=w2^e)35p`zY zRV8X?d;s^>Cof2SPR&nP3E+-LCkS0J$H!eh8~k0qo$}00b=7!H_I2O+Ro@3O$nPdm ztmbOO^B+IHzQ5w>@@@J4cKw5&^_w6s!s=H%&byAbUtczPQ7}wfTqxxtQNfn*u73Qw zGuWsrky_ajPx-5`R<)6xHf>C(oqGf_Fw|-U*GfS?xLML$kv;h_pZ@Kk$y0X(S+K80 z6^|z)*`5VUkawg}=z`S;VhZhxyDfrE0$(PMurAxl~<>lfZa>JZ288ULK7D` zl9|#L^JL}Y$j*j`0-K6kH#?bRmg#5L3iB4Z)%iF@SqT+Lp|{i`m%R-|ZE94Np7Pa5 zCqC^V3}B(FR340pmF*qaa}M}+h6}mqE~7Sh!9bDv9YRT|>vBNAqv09zXHMlcuhKD| zcjjA(b*XCIwJ33?CB!+;{)vX@9xns_b-VO{i0y?}{!sdXj1GM8+$#v>W7nw;+O_9B z_{4L;C6ol?(?W0<6taGEn1^uG=?Q3i29sE`RfYCaV$3DKc_;?HsL?D_fSYg}SuO5U zOB_f4^vZ_x%o`5|C@9C5+o=mFy@au{s)sKw!UgC&L35aH(sgDxRE2De%(%OT=VUdN ziVLEmdOvJ&5*tCMKRyXctCwQu_RH%;m*$YK&m;jtbdH#Ak~13T1^f89tn`A%QEHWs~jnY~E}p_Z$XC z=?YXLCkzVSK+Id`xZYTegb@W8_baLt-Fq`Tv|=)JPbFsKRm)4UW;yT+J`<)%#ue9DPOkje)YF2fsCilK9MIIK>p*`fkoD5nGfmLwt)!KOT+> zOFq*VZktDDyM3P5UOg`~XL#cbzC}eL%qMB=Q5$d89MKuN#$6|4gx_Jt0Gfn8w&q}%lq4QU%6#jT*MRT% zrLz~C8FYKHawn-EQWN1B75O&quS+Z81(zN)G>~vN8VwC+e+y(`>HcxC{MrJ;H1Z4k zZWuv$w_F0-Ub%MVcpIc){4PGL^I7M{>;hS?;eH!;gmcOE66z3;Z1Phqo(t zVP(Hg6q#0gIKgsg7L7WE!{Y#1nI(45tx2{$34dDd#!Z0NIyrm)HOn5W#7;f4pQci# zDW!FI(g4e668kI9{2+mLwB+=#9bfqgX%!B34V-$wwSN(_cm*^{y0jQtv*4}eO^sOV z*9xoNvX)c9isB}Tgx&ZRjp3kwhTVK?r9;n!x>^XYT z@Q^7zp{rkIs{2mUSE^2!Gf6$6;j~&4=-0cSJJDizZp6LTe8b45;{AKM%v99}{{FfC zz709%u0mC=1KXTo(=TqmZQ;c?$M3z(!xah>aywrj40sc2y3rKFw4jCq+Y+u=CH@_V zxz|qeTwa>+<|H%8Dz5u>ZI5MmjTFwXS-Fv!TDd*`>3{krWoNVx$<133`(ftS?ZPyY z&4@ah^3^i`vL$BZa>O|Nt?ucewzsF)0zX3qmM^|waXr=T0pfIb0*$AwU=?Ipl|1Y; z*Pk6{C-p4MY;j@IJ|DW>QHZQJcp;Z~?8(Q+Kk3^0qJ}SCk^*n4W zu9ZFwLHUx-$6xvaQ)SUQcYd6fF8&x)V`1bIuX@>{mE$b|Yd(qomn3;bPwnDUc0F=; zh*6_((%bqAYQWQ~odER?h>1mkL4kpb3s7`0m@rDKGU*oyF)$j~Ffd4fXV$?`f~rHf zB%Y)@5SXZvfwm10RY5X?TEo)PK_`L6qgBp=#>fO49$D zDq8Ozj0q6213tV5Qq=;fZ0$|KroY{Dz=l@lU^J)?Ko@ti20TRplXzphBi>XGx4bou zEWrkNjz0t5j!_ke{g5I#PUlEU$Km8g8TE|XK=MkU@PT4T><2OVamoK;wJ}3X0L$vX zgd7gNa359*nc)R-0!`2X@FOTB`+oETOPc=ubp5R)VQgY+5BTZZJ2?9QwnO=dnulIUF3gFn;BODC2)65)HeVd%t86sL7Rv^Y+nbn+&l z6BAJY(ETvwI)Ts$aiE8rht4KD*qNyE{8{x6R|%akbTBzw;2+6Echkt+W+`u^XX z_z&x%n '} + 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/backend/bang-ggood/gradlew.bat b/backend/bang-ggood/gradlew.bat new file mode 100644 index 000000000..7101f8e46 --- /dev/null +++ b/backend/bang-ggood/gradlew.bat @@ -0,0 +1,92 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/backend/bang-ggood/settings.gradle b/backend/bang-ggood/settings.gradle new file mode 100644 index 000000000..3916b736c --- /dev/null +++ b/backend/bang-ggood/settings.gradle @@ -0,0 +1 @@ +rootProject.name = 'bang-ggood' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java new file mode 100644 index 000000000..bdb1121a9 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java @@ -0,0 +1,13 @@ +package com.bang_ggood; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +@SpringBootApplication +public class Application { + + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } + +} diff --git a/backend/bang-ggood/src/main/resources/application.properties b/backend/bang-ggood/src/main/resources/application.properties new file mode 100644 index 000000000..2109a440d --- /dev/null +++ b/backend/bang-ggood/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=demo diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java b/backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java new file mode 100644 index 000000000..1d893d033 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java @@ -0,0 +1,13 @@ +package com.bang_ggood; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ApplicationTests { + + @Test + void contextLoads() { + } + +} From 662ad3b728cb8b81f81884add9efa5196c946ecf Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 19 Jul 2024 18:31:29 +0900 Subject: [PATCH 008/348] =?UTF-8?q?chore:=20cd=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 28 ++++------------------------ 1 file changed, 4 insertions(+), 24 deletions(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 44feaef88..1f1c4e291 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -2,7 +2,7 @@ name: Java CD with Gradle on: pull_request: - branches: [ "main", "dev" ] + branches: [ "main", "dev", "dev-fe", "dev-be" ] types: [closed] jobs: @@ -54,28 +54,8 @@ jobs: with: name: bang-ggood-be-develop-jar - - name: Check if room-esc server is running on port 8080 - id: check-server-on-port - run: | - echo "Checking if port 8080 is in use..." - PID=$(lsof -t -i:8080 || true) - echo "PID=$PID" - if [ -n "$PID" ]; then - echo "server_running=true" >> $GITHUB_ENV - echo "PID=$PID" >> $GITHUB_ENV - else - echo "server_running=false" >> $GITHUB_ENV - fi - - - name: Stop server if running - if: env.server_running == 'true' - run: | - echo "Stopping server running on port 8080..." - kill -9 $PID - echo "Preivous running Server stopped." + - name: Turn off the server 8080 if runs + run: sudo fuser -k -n tcp 8080 || true - name: Start server - run: | - sudo nohup java -jar ./backend/banggood/build/libs/*SNAPSHOT.jar & - echo "Lastest Backend API Server started." - + run: sudo nohup java -jar ./backend/banggood/build/libs/*SNAPSHOT.jar & From 1428a8b7a3caad4d12f6237405a717f37972ae77 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 19 Jul 2024 18:37:57 +0900 Subject: [PATCH 009/348] =?UTF-8?q?chore:=20ci=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 901182d51..c98df39d8 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -2,7 +2,7 @@ name: backend-ci on: pull_request: - branches: [ "main", "dev" ] + branches: [ "main", "dev", "dev-fe", "dev-be" ] paths: 'backend/**' defaults: From 7cc68183af0df8c92db2e580dd1a3ad71f2c7574 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sun, 21 Jul 2024 15:48:25 +0900 Subject: [PATCH 010/348] =?UTF-8?q?chore:=20h2=20=EB=8D=B0=EC=9D=B4?= =?UTF-8?q?=ED=84=B0=EB=B2=A0=EC=9D=B4=EC=8A=A4=20=EC=97=B0=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .idea/.gitignore | 8 ++++++++ .idea/2024-bang-ggood.iml | 12 ++++++++++++ .idea/misc.xml | 6 ++++++ .idea/modules.xml | 8 ++++++++ .idea/vcs.xml | 6 ++++++ backend/bang-ggood/.gitignore | 1 + .../src/main/resources/application.properties | 1 - .../bang-ggood/src/main/resources/application.yml | 9 +++++++++ 8 files changed, 50 insertions(+), 1 deletion(-) create mode 100644 .idea/.gitignore create mode 100644 .idea/2024-bang-ggood.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml delete mode 100644 backend/bang-ggood/src/main/resources/application.properties create mode 100644 backend/bang-ggood/src/main/resources/application.yml diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 000000000..13566b81b --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/2024-bang-ggood.iml b/.idea/2024-bang-ggood.iml new file mode 100644 index 000000000..5e125a0d5 --- /dev/null +++ b/.idea/2024-bang-ggood.iml @@ -0,0 +1,12 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 000000000..639900d13 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 000000000..35e2d536f --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 000000000..35eb1ddfb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/backend/bang-ggood/.gitignore b/backend/bang-ggood/.gitignore index c2065bc26..06da7f656 100644 --- a/backend/bang-ggood/.gitignore +++ b/backend/bang-ggood/.gitignore @@ -18,6 +18,7 @@ bin/ !**/src/test/**/bin/ ### IntelliJ IDEA ### +src/main/resources/application.yml .idea *.iws *.iml diff --git a/backend/bang-ggood/src/main/resources/application.properties b/backend/bang-ggood/src/main/resources/application.properties deleted file mode 100644 index 2109a440d..000000000 --- a/backend/bang-ggood/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=demo diff --git a/backend/bang-ggood/src/main/resources/application.yml b/backend/bang-ggood/src/main/resources/application.yml new file mode 100644 index 000000000..59eb8f6dc --- /dev/null +++ b/backend/bang-ggood/src/main/resources/application.yml @@ -0,0 +1,9 @@ +spring: + h2: + console: + enabled: true + datasource: + url: jdbc:h2:mem:database + username: bang-ggood + password: 608bang-ggood-dev + driverClassName: org.h2.Driver From d679c244a2eacc12629f379e4f2e1f3915793875 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sun, 21 Jul 2024 16:50:35 +0900 Subject: [PATCH 011/348] =?UTF-8?q?chore:=20=EC=98=88=EC=99=B8=20=EC=B2=98?= =?UTF-8?q?=EB=A6=AC=20=EB=B0=8F=20=EC=9D=91=EB=8B=B5=20=EA=B0=9D=EC=B2=B4?= =?UTF-8?q?=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../exception/BangggoodException.java | 21 ++++++++++++++++ .../bang_ggood/exception/ExceptionCode.java | 24 +++++++++++++++++++ .../exception/ExceptionResponse.java | 4 ++++ .../exception/GlobalExceptionHandler.java | 21 ++++++++++++++++ 4 files changed, 70 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/exception/BangggoodException.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/BangggoodException.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/BangggoodException.java new file mode 100644 index 000000000..bf9a52028 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/BangggoodException.java @@ -0,0 +1,21 @@ +package com.bang_ggood.exception; + +import org.springframework.http.HttpStatusCode; + +public class BangggoodException extends RuntimeException { + + private final ExceptionCode exceptionCode; + + public BangggoodException(ExceptionCode exceptionCode) { + this.exceptionCode = exceptionCode; + } + + @Override + public String getMessage() { + return exceptionCode.getMessage(); + } + + public HttpStatusCode getHttpStatusCode() { + return exceptionCode.getHttpStatus(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java new file mode 100644 index 000000000..51ddfe69b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -0,0 +1,24 @@ +package com.bang_ggood.exception; + +import org.springframework.http.HttpStatus; + +public enum ExceptionCode { + + INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."); + + private final HttpStatus httpStatus; + private final String message; + + ExceptionCode(HttpStatus httpStatus, String message) { + this.httpStatus = httpStatus; + this.message = message; + } + + public HttpStatus getHttpStatus() { + return httpStatus; + } + + public String getMessage() { + return message; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java new file mode 100644 index 000000000..bc85a8e72 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java @@ -0,0 +1,4 @@ +package com.bang_ggood.exception; + +public record ExceptionResponse(String httpMethod, String path, String message) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java new file mode 100644 index 000000000..4b0aa0f40 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -0,0 +1,21 @@ +package com.bang_ggood.exception; + +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.RestControllerAdvice; + +@RestControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(BangggoodException.class) + public ResponseEntity handleBangggoodException(BangggoodException exception, HttpServletRequest request) { + ExceptionResponse response = new ExceptionResponse( + request.getMethod(), + request.getRequestURI(), + exception.getMessage()); + return ResponseEntity.status(exception.getHttpStatusCode()) + .body(response); + } + +} From 2d9ea6c3ef52e9eec751697b8cbf194b59d58b6b Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sun, 21 Jul 2024 17:12:18 +0900 Subject: [PATCH 012/348] =?UTF-8?q?chore:=20swagger=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- backend/bang-ggood/build.gradle | 1 + .../com/bang_ggood/config/SwaggerConfig.java | 23 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/config/SwaggerConfig.java diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index b637ca098..8c12e928b 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -20,6 +20,7 @@ repositories { dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/SwaggerConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/SwaggerConfig.java new file mode 100644 index 000000000..7db951f92 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/SwaggerConfig.java @@ -0,0 +1,23 @@ +package com.bang_ggood.config; + +import io.swagger.v3.oas.models.Components; +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class SwaggerConfig { + + @Bean + public OpenAPI openAPI() { + return new OpenAPI() + .components(new Components()) + .info(apiInfo()); + } + + private Info apiInfo() { + return new Info() + .title("방끗 API 문서"); + } +} From dfa3a11474fdc03a94b65821508ff0bbabad4e13 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sun, 21 Jul 2024 18:01:26 +0900 Subject: [PATCH 013/348] =?UTF-8?q?chore:=20BaseEntity=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 Co-authored-by: tsulocalize --- .../main/java/com/bang_ggood/Application.java | 2 + .../main/java/com/bang_ggood/BaseEntity.java | 27 +++++++ .../java/com/bang_ggood/ApplicationTests.java | 13 --- .../java/com/bang_ggood/JpaAuditingTest.java | 79 +++++++++++++++++++ .../java/com/bang_ggood/TestRepository.java | 9 +++ 5 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/TestRepository.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java index bdb1121a9..d6f4ca2d1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java @@ -2,7 +2,9 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.data.jpa.repository.config.EnableJpaAuditing; +@EnableJpaAuditing @SpringBootApplication public class Application { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java new file mode 100644 index 000000000..e97c6b62c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java @@ -0,0 +1,27 @@ +package com.bang_ggood; + +import jakarta.persistence.EntityListeners; +import jakarta.persistence.MappedSuperclass; +import org.springframework.data.annotation.CreatedDate; +import org.springframework.data.annotation.LastModifiedDate; +import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import java.time.LocalDateTime; + +@MappedSuperclass +@EntityListeners(AuditingEntityListener.class) +public abstract class BaseEntity { + + @CreatedDate + private LocalDateTime createdAt; + + @LastModifiedDate + private LocalDateTime modifiedAt; + + public LocalDateTime getCreatedAt() { + return createdAt; + } + + public LocalDateTime getModifiedAt() { + return modifiedAt; + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java b/backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java deleted file mode 100644 index 1d893d033..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/ApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bang_ggood; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class ApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java new file mode 100644 index 000000000..a484db970 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java @@ -0,0 +1,79 @@ +package com.bang_ggood; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.annotation.DirtiesContext; +import java.time.LocalDateTime; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) +class JpaAuditingTest { + + @Autowired + private TestRepository testRepository; + + @DisplayName("JPA Auditing 성공") + @Test + void jpaAuditing() { + // given + TestEntity testEntity = new TestEntity("방끗"); + + // when + TestEntity savedEntity = testRepository.save(testEntity); + + // then + assertAll( + () -> assertThat(savedEntity.getCreatedAt()).isBefore(LocalDateTime.now()), + () -> assertThat(savedEntity.getModifiedAt()).isBefore(LocalDateTime.now()) + ); + } + + @DisplayName("JPA Auditing 성공 : Entity 값 변경 시 수정 시간이 modifiedAt에 반영된다.") + @Test + void jpaAuditing_modifyEntity() { + // given + TestEntity testEntity = new TestEntity("방끗"); + TestEntity savedEntity = testRepository.save(testEntity); + + // when + savedEntity.setName("방방이"); + TestEntity updatedEntity = testRepository.save(savedEntity); + + // then + assertAll( + () -> assertThat(savedEntity.getCreatedAt()).isEqualTo(updatedEntity.getCreatedAt()), + () -> assertThat(savedEntity.getModifiedAt()).isBefore(updatedEntity.getModifiedAt()) + ); + } + + @Entity + static class TestEntity extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + protected TestEntity() { + } + + public TestEntity(String name) { + this.name = name; + } + + public void setName(String name) { + this.name = name; + } + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/TestRepository.java b/backend/bang-ggood/src/test/java/com/bang_ggood/TestRepository.java new file mode 100644 index 000000000..17f3ababf --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/TestRepository.java @@ -0,0 +1,9 @@ +package com.bang_ggood; + +import com.bang_ggood.JpaAuditingTest.TestEntity; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface TestRepository extends JpaRepository { +} From cd62673ba3ac4fc53abb5816087536d64806a30f Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sun, 21 Jul 2024 19:25:08 +0900 Subject: [PATCH 014/348] =?UTF-8?q?chore:=20RuntimeException=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=EC=B2=98=EB=A6=AC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../bang_ggood/exception/GlobalExceptionHandler.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java index 4b0aa0f40..732aabde0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -1,6 +1,7 @@ package com.bang_ggood.exception; import jakarta.servlet.http.HttpServletRequest; +import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -18,4 +19,13 @@ public ResponseEntity handleBangggoodException(BangggoodExcep .body(response); } + @ExceptionHandler(RuntimeException.class) + public ResponseEntity handleRuntimeException(HttpServletRequest request) { + ExceptionResponse response = new ExceptionResponse( + request.getMethod(), + request.getRequestURI(), + "예상치 못한 서버에러가 발생했습니다."); + return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) + .body(response); + } } From a2ff2a2b0404fbafcc1531b090e882d6e55893db Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Sun, 21 Jul 2024 23:27:26 +0900 Subject: [PATCH 015/348] =?UTF-8?q?fix:=20gitignore=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/application.yml | 9 --------- 1 file changed, 9 deletions(-) delete mode 100644 backend/bang-ggood/src/main/resources/application.yml diff --git a/backend/bang-ggood/src/main/resources/application.yml b/backend/bang-ggood/src/main/resources/application.yml deleted file mode 100644 index 59eb8f6dc..000000000 --- a/backend/bang-ggood/src/main/resources/application.yml +++ /dev/null @@ -1,9 +0,0 @@ -spring: - h2: - console: - enabled: true - datasource: - url: jdbc:h2:mem:database - username: bang-ggood - password: 608bang-ggood-dev - driverClassName: org.h2.Driver From d76666bbd5e93da2cba53272b3c67766daf92f64 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 22 Jul 2024 12:59:49 +0900 Subject: [PATCH 016/348] =?UTF-8?q?chore:=20cd=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 1f1c4e291..b36c2fee9 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -28,16 +28,16 @@ jobs: gradle-version: 8.8 - name: Grant execute permission for gradlew - run: chmod +x backend/banggood/gradlew + run: chmod +x backend/bang-ggood/gradlew - name: Build with Gradle run: ./gradlew clean build - working-directory: backend/banggood + working-directory: backend/bang-ggood - name: Upload build artifact uses: actions/upload-artifact@v3 with: - working-directory: backend/banggood + working-directory: backend/bang-ggood name: bang-ggood-be-develop-jar path: ./**/*.jar From 71bdf330272331ab40189879b8ece3f043e6549b Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 22 Jul 2024 13:00:29 +0900 Subject: [PATCH 017/348] =?UTF-8?q?chore:=20ci=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index c98df39d8..9765d4c3f 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -7,7 +7,7 @@ on: defaults: run: - working-directory: backend/banggood + working-directory: backend/bang-ggood jobs: build: runs-on: ubuntu-latest From 6679f181a7fe1c68d308035e477105ac24f817e5 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:42:49 +0900 Subject: [PATCH 018/348] =?UTF-8?q?chore:=20ci=EC=97=90=20dev-fe=20?= =?UTF-8?q?=EB=B8=8C=EB=9E=9C=EC=B9=98=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 9765d4c3f..f04c9ad9f 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -2,7 +2,7 @@ name: backend-ci on: pull_request: - branches: [ "main", "dev", "dev-fe", "dev-be" ] + branches: [ "main", "dev", "dev-be" ] paths: 'backend/**' defaults: From f24e5574b0645940c3bd695b4a869ba18650b3e5 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 22 Jul 2024 13:45:11 +0900 Subject: [PATCH 019/348] =?UTF-8?q?chore:=20cd=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20dev=EB=A7=8C=20=EC=A0=81=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index b36c2fee9..8e6a34228 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -1,8 +1,8 @@ -name: Java CD with Gradle +name: backend-cd on: pull_request: - branches: [ "main", "dev", "dev-fe", "dev-be" ] + branches: [ "dev" ] types: [closed] jobs: @@ -46,8 +46,7 @@ jobs: runs-on: bang-ggood steps: - name: change permission - run: | - sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-bang-ggood + run: sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-bang-ggood - name: Download build artifact uses: actions/download-artifact@v3 From fb752dd1b7559f64110518fc2e3b898f2601cc5f Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 22 Jul 2024 14:01:47 +0900 Subject: [PATCH 020/348] =?UTF-8?q?chore:=20cd=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=ED=94=84=EB=A1=9C=EC=A0=9D=ED=8A=B8=EB=AA=85=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 8e6a34228..a491a5f0e 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -57,4 +57,4 @@ jobs: run: sudo fuser -k -n tcp 8080 || true - name: Start server - run: sudo nohup java -jar ./backend/banggood/build/libs/*SNAPSHOT.jar & + run: sudo nohup java -jar ./backend/bang-ggood/build/libs/*SNAPSHOT.jar & From 4b566b7728b90dd9aff3b340f9a2454a859eb1d5 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:59:24 +0900 Subject: [PATCH 021/348] =?UTF-8?q?feat:=20Room=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=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 --- .../java/com/bang_ggood/room/domain/Room.java | 75 +++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java new file mode 100644 index 000000000..bd08c30c5 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -0,0 +1,75 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import java.util.Objects; + +@Entity +public class Room extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private Integer floor; + + private String station; + + private Integer walkingTime; + + protected Room() { + } + + public Long getId() { + return id; + } + + public String getName() { + return name; + } + + public Integer getFloor() { + return floor; + } + + public String getStation() { + return station; + } + + public Integer getWalkingTime() { + return walkingTime; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Room room = (Room) o; + return Objects.equals(id, room.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Room{" + + "id=" + id + + ", name='" + name + '\'' + + ", floor=" + floor + + ", station='" + station + '\'' + + ", walkingTime=" + walkingTime + + '}'; + } +} From 099b2e8377b6fe7a8ef13900be82b6d2aed51222 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 14:59:32 +0900 Subject: [PATCH 022/348] =?UTF-8?q?feat:=20User=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=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 --- .../java/com/bang_ggood/user/domain/User.java | 47 +++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java new file mode 100644 index 000000000..31a42f63e --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -0,0 +1,47 @@ +package com.bang_ggood.user.domain; + +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import java.util.Objects; + +@Entity +public class User { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String name; + + protected User() { + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(id, user.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "User{" + + "id=" + id + + ", name='" + name + '\'' + + '}'; + } +} From 6f8eb4e4ebd399525f8daabb222e9bb6f78e59e3 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 15:07:54 +0900 Subject: [PATCH 023/348] =?UTF-8?q?feat:=20Checklist=20=EC=97=94=ED=8B=B0?= =?UTF-8?q?=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 --- .../checklist/domain/Checklist.java | 98 +++++++++++++++++++ 1 file changed, 98 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java new file mode 100644 index 000000000..c8978c7b6 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -0,0 +1,98 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.user.domain.User; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToOne; +import java.util.Objects; + +@Entity +public class Checklist { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(nullable = false) + private User user; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(nullable = false) + private Room room; + + private Integer deposit; + + private Integer rent; + + private Integer contractTerm; + + private String realEstate; + + protected Checklist() { + } + + public Long getId() { + return id; + } + + public User getUser() { + return user; + } + + public Room getRoom() { + return room; + } + + public Integer getDeposit() { + return deposit; + } + + public Integer getRent() { + return rent; + } + + public Integer getContractTerm() { + return contractTerm; + } + + public String getRealEstate() { + return realEstate; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + Checklist checklist = (Checklist) o; + return Objects.equals(id, checklist.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Checklist{" + + "id=" + id + + ", user=" + user + + ", room=" + room + + ", deposit=" + deposit + + ", rent=" + rent + + ", contractTerm=" + contractTerm + + ", realEstate='" + realEstate + '\'' + + '}'; + } +} From cc162ba6000c76951301ae4c67b4d24fde0036b0 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Mon, 22 Jul 2024 15:21:39 +0900 Subject: [PATCH 024/348] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../controller/CategoryController.java | 22 +++++++++++++++ .../bang_ggood/category/domain/Category.java | 28 +++++++++++++++++++ .../category/dto/CategoriesReadResponse.java | 6 ++++ .../category/dto/CategoryReadResponse.java | 10 +++++++ .../category/service/CategoryService.java | 19 +++++++++++++ .../category/service/CategoryServiceTest.java | 28 +++++++++++++++++++ 6 files changed, 113 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java new file mode 100644 index 000000000..91800937d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -0,0 +1,22 @@ +package com.bang_ggood.category.controller; + +import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.service.CategoryService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CategoryController { + + private final CategoryService categoryService; + + public CategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } + + @GetMapping("/categories") + public ResponseEntity readCategories() { + return ResponseEntity.ok(categoryService.readCategories()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java new file mode 100644 index 000000000..eb04b3e9b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -0,0 +1,28 @@ +package com.bang_ggood.category.domain; + +public enum Category { + + CLEAN(1, "청결"), + ROOM_CONDITION(2, "방 컨디션"), + AMENITY(3, "편의시설"), + OPTION(4, "옵션"), + ENVIRONMENT(5, "주거환경"), + SECURITY(6, "보안"), + ECONOMIC(7, "경제적"); + + private final Integer id; + private final String description; + + Category(Integer id, String description) { + this.id = id; + this.description = description; + } + + public Integer getId() { + return id; + } + + public String getDescription() { + return description; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java new file mode 100644 index 000000000..6351eb75f --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.category.dto; + +import java.util.List; + +public record CategoriesReadResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java new file mode 100644 index 000000000..b796b96b6 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.category.dto; + +import com.bang_ggood.category.domain.Category; + +public record CategoryReadResponse(Integer categoryId, String categoryName) { + + public static CategoryReadResponse from(Category category) { + return new CategoryReadResponse(category.getId(), category.getDescription()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java new file mode 100644 index 000000000..5bcd37c85 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -0,0 +1,19 @@ +package com.bang_ggood.category.service; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryReadResponse; +import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; + +@Service +public class CategoryService { + + public CategoriesReadResponse readCategories() { + List categoryReadResponses = Arrays.stream(Category.values()) + .map(CategoryReadResponse::from) + .toList(); + return new CategoriesReadResponse(categoryReadResponses); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java new file mode 100644 index 000000000..c4155d48b --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -0,0 +1,28 @@ +package com.bang_ggood.category.service; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.CategoriesReadResponse; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; + +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +class CategoryServiceTest { + + @Autowired + private CategoryService categoryService; + + @DisplayName("카테고리 조회 성공") + @Test + void readCategories() { + // given & when + CategoriesReadResponse categoriesReadResponse = categoryService.readCategories(); + + // then + Assertions.assertThat(categoriesReadResponse.categories()) + .hasSize(Category.values().length); + } +} From 256889a67cfaaf8e15a967270ada7886c6204558 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:04:54 +0900 Subject: [PATCH 025/348] =?UTF-8?q?feat:=20BaseEntity=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 3 ++- .../src/main/java/com/bang_ggood/user/domain/User.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index c8978c7b6..758b34fef 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -1,5 +1,6 @@ package com.bang_ggood.checklist.domain; +import com.bang_ggood.BaseEntity; import com.bang_ggood.room.domain.Room; import com.bang_ggood.user.domain.User; import jakarta.persistence.Entity; @@ -13,7 +14,7 @@ import java.util.Objects; @Entity -public class Checklist { +public class Checklist extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index 31a42f63e..ed2f02a94 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -1,5 +1,6 @@ package com.bang_ggood.user.domain; +import com.bang_ggood.BaseEntity; import jakarta.persistence.Column; import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; @@ -8,7 +9,7 @@ import java.util.Objects; @Entity -public class User { +public class User extends BaseEntity { @Id @GeneratedValue(strategy = GenerationType.IDENTITY) From a1bd2da8d67af9ff8a7a7be1f047f30017e58c96 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:05:20 +0900 Subject: [PATCH 026/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=98=B5=EC=85=98=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/domain/ChecklistOption.java | 68 +++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java new file mode 100644 index 000000000..84fd24f80 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java @@ -0,0 +1,68 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.OneToOne; +import java.util.Objects; + +@Entity +public class ChecklistOption extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToOne(fetch = FetchType.LAZY) + @JoinColumn(nullable = false) + private Checklist checklist; + + @Column(nullable = false) + private Integer optionId; + + protected ChecklistOption() { + } + + public Long getId() { + return id; + } + + public Checklist getChecklist() { + return checklist; + } + + public Integer getOptionId() { + return optionId; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChecklistOption that = (ChecklistOption) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "ChecklistOption{" + + "id=" + id + + ", checklist=" + checklist + + ", optionId=" + optionId + + '}'; + } +} From 6c4e9ce7beddecaaad14910e9f986a8cf958d468 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 16:05:41 +0900 Subject: [PATCH 027/348] =?UTF-8?q?feat:=20=EC=98=B5=EC=85=98=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/checklist/domain/Option.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java new file mode 100644 index 000000000..0fe40718d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -0,0 +1,26 @@ +package com.bang_ggood.checklist.domain; + +public enum Option { + AIR_CONDITIONER(1, "에어컨"), + SINK(2, "싱크대"), + REFRIGERATOR(3, "냉장고"), + WASHING_MACHINE(4, "세탁기"), + MICROWAVE_OVEN(5, "전자레인지"), + TV(6, "TV"), + DRYER(7, "건조기"), + INTERNET(8, "인터넷"), + GAS_STOVE(9, "가스레인지/인덕션"), + ELEVATOR(10, "엘리베이터"), + BED(11, "침대"), + DESK(12, "책상"), + CLOSET(13, "옷장"), + SHOE_RACK(14, "신발장"); + + private Integer id; + private String name; + + Option(Integer id, String name) { + this.id = id; + this.name = name; + } +} From 617e5b061cd7eb8cbf5e6bce42f30ec13f29b85b Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Mon, 22 Jul 2024 17:28:22 +0900 Subject: [PATCH 028/348] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=9A=B0=EC=84=A0=EC=88=9C=EC=9C=84=20=EC=83=9D?= =?UTF-8?q?=EC=84=B1=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../controller/CategoryController.java | 9 +++++ .../category/domain/CategoryPriority.java | 33 +++++++++++++++++++ .../dto/CategoryPriorityCreateRequest.java | 6 ++++ .../CategoryPriorityRepository.java | 9 +++++ .../category/service/CategoryService.java | 26 +++++++++++++++ .../bang_ggood/exception/ExceptionCode.java | 4 ++- .../java/com/bang_ggood/user/domain/User.java | 28 ++++++++++++++++ .../user/repository/UserRepository.java | 15 +++++++++ .../bang-ggood/src/main/resources/data.sql | 2 ++ .../bang-ggood/src/main/resources/schema.sql | 19 +++++++++++ .../category/service/CategoryServiceTest.java | 26 +++++++++++++-- 11 files changed, 174 insertions(+), 3 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java create mode 100644 backend/bang-ggood/src/main/resources/data.sql create mode 100644 backend/bang-ggood/src/main/resources/schema.sql diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index 91800937d..b2c2e62d0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,9 +1,12 @@ package com.bang_ggood.category.controller; import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import com.bang_ggood.category.service.CategoryService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController @@ -15,6 +18,12 @@ public CategoryController(CategoryService categoryService) { this.categoryService = categoryService; } + @PostMapping("/categories/priority") + public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { + categoryService.createCategoriesPriority(request); + return ResponseEntity.noContent().build(); + } + @GetMapping("/categories") public ResponseEntity readCategories() { return ResponseEntity.ok(categoryService.readCategories()); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java new file mode 100644 index 000000000..2ae157565 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java @@ -0,0 +1,33 @@ +package com.bang_ggood.category.domain; + +import com.bang_ggood.BaseEntity; +import com.bang_ggood.user.domain.User; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; + +@Entity +public class CategoryPriority extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(name = "category_id") + private Integer categoryId; + + @ManyToOne(fetch = FetchType.LAZY) + private User user; + + protected CategoryPriority() { + } + + public CategoryPriority(Integer categoryId, User user) { + this.categoryId = categoryId; + this.user = user; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java new file mode 100644 index 000000000..543324b60 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.category.dto; + +import java.util.List; + +public record CategoryPriorityCreateRequest(List categoryIds) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java new file mode 100644 index 000000000..68f5da229 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java @@ -0,0 +1,9 @@ +package com.bang_ggood.category.repository; + +import com.bang_ggood.category.domain.CategoryPriority; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface CategoryPriorityRepository extends JpaRepository { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index 5bcd37c85..5ea8495dc 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -1,19 +1,45 @@ package com.bang_ggood.category.service; import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.domain.CategoryPriority; import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.CategoryReadResponse; +import com.bang_ggood.category.repository.CategoryPriorityRepository; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; @Service public class CategoryService { + private final CategoryPriorityRepository categoryPriorityRepository; + private final UserRepository userRepository; + + public CategoryService(CategoryPriorityRepository categoryPriorityRepository, UserRepository userRepository) { + this.categoryPriorityRepository = categoryPriorityRepository; + this.userRepository = userRepository; + } + + @Transactional + public void createCategoriesPriority(CategoryPriorityCreateRequest request) { + User user = userRepository.getUserById(1L); + List categoryPriorities = request.categoryIds().stream() + .map(id -> new CategoryPriority(id, user)) + .toList(); + + categoryPriorityRepository.saveAll(categoryPriorities); + } + public CategoriesReadResponse readCategories() { List categoryReadResponses = Arrays.stream(Category.values()) .map(CategoryReadResponse::from) .toList(); return new CategoriesReadResponse(categoryReadResponses); } + + } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 51ddfe69b..9b8c71094 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -4,7 +4,9 @@ public enum ExceptionCode { - INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."); + INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."), + USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), + ; private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java new file mode 100644 index 000000000..bd0d4df01 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -0,0 +1,28 @@ +package com.bang_ggood.user.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Column; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.Table; + +@Table(name = "users") +@Entity +public class User extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @Column(nullable = false) + private String name; + + protected User() { + } + + public User(String name) { + this.name = name; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java new file mode 100644 index 000000000..96b32288e --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java @@ -0,0 +1,15 @@ +package com.bang_ggood.user.repository; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface UserRepository extends JpaRepository { + + default User getUserById(Long id) { + return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); + } +} diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql new file mode 100644 index 000000000..31aaed9e4 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -0,0 +1,2 @@ +INSERT INTO users(id, name, created_at, modified_at) +VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql new file mode 100644 index 000000000..a318875f2 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -0,0 +1,19 @@ +CREATE TABLE users +( + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id) +); + +CREATE TABLE category_priority +( + id bigint generated by default as identity, + category_id tinyint not null, + user_id bigint not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id), + foreign key (user_id) references users +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index c4155d48b..7bd9243d8 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -1,13 +1,19 @@ package com.bang_ggood.category.service; -import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import java.util.List; + +import static com.bang_ggood.category.domain.Category.AMENITY; +import static com.bang_ggood.category.domain.Category.CLEAN; +import static com.bang_ggood.category.domain.Category.ECONOMIC; +import static com.bang_ggood.category.domain.Category.values; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) class CategoryServiceTest { @@ -15,6 +21,22 @@ class CategoryServiceTest { @Autowired private CategoryService categoryService; + @DisplayName("카테고리 우선순위 생성 성공") + @Test + void createCategoriesPriority() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( + CLEAN.getId(), + AMENITY.getId(), + ECONOMIC.getId() + )); + + // when & then + Assertions.assertThatCode(() -> categoryService.createCategoriesPriority(request)) + .doesNotThrowAnyException(); + // TODO: 추후 예외 처리 예정 + } + @DisplayName("카테고리 조회 성공") @Test void readCategories() { @@ -23,6 +45,6 @@ void readCategories() { // then Assertions.assertThat(categoriesReadResponse.categories()) - .hasSize(Category.values().length); + .hasSize(values().length); } } From c450d90d888a1e007005ac525d972f0d6c0a01e3 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:44:42 +0900 Subject: [PATCH 029/348] =?UTF-8?q?feat:=20=EB=8F=84=EB=A9=94=EC=9D=B8=20?= =?UTF-8?q?=EC=83=9D=EC=84=B1=EC=9E=90=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/checklist/domain/Checklist.java | 18 ++++++++++++++++++ .../checklist/domain/ChecklistOption.java | 5 +++++ .../java/com/bang_ggood/room/domain/Room.java | 7 +++++++ .../java/com/bang_ggood/user/domain/User.java | 7 +++++++ 4 files changed, 37 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 758b34fef..7e950de82 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -36,6 +36,24 @@ public class Checklist extends BaseEntity { private String realEstate; + public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { + this.user = null; + this.room = null; + this.deposit = deposit; + this.rent = rent; + this.contractTerm = contractTerm; + this.realEstate = realEstate; + } + + public Checklist(User user, Room room, Integer deposit, Integer rent, Integer contractTerm, String realEstate) { + this.user = user; + this.room = room; + this.deposit = deposit; + this.rent = rent; + this.contractTerm = contractTerm; + this.realEstate = realEstate; + } + protected Checklist() { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java index 84fd24f80..894af3a11 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java @@ -25,6 +25,11 @@ public class ChecklistOption extends BaseEntity { @Column(nullable = false) private Integer optionId; + public ChecklistOption(Checklist checklist, Integer optionId) { + this.checklist = checklist; + this.optionId = optionId; + } + protected ChecklistOption() { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index bd08c30c5..10f5cdd0c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -25,6 +25,13 @@ public class Room extends BaseEntity { protected Room() { } + public Room(String name, Integer floor, String station, Integer walkingTime) { + this.name = name; + this.floor = floor; + this.station = station; + this.walkingTime = walkingTime; + } + public Long getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index ed2f02a94..bc1d23c9e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -6,8 +6,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.Objects; +@Table(name = "users") @Entity public class User extends BaseEntity { @@ -18,6 +20,11 @@ public class User extends BaseEntity { @Column(nullable = false) private String name; + public User(Long id, String name) { + this.id = id; + this.name = name; + } + protected User() { } From 45241b77a79df58b4b5e84c621586e72a26b4ab6 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:45:14 +0900 Subject: [PATCH 030/348] =?UTF-8?q?feat:=20ChecklistQuestion=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 --- .../checklist/domain/ChecklistQuestion.java | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java new file mode 100644 index 000000000..33e88859f --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -0,0 +1,69 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.ManyToOne; +import java.util.Objects; + +@Entity +public class ChecklistQuestion extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + @JoinColumn(nullable = false) + private Checklist checklist; + + private Long questionId; + + private Integer answer; + + protected ChecklistQuestion() { + } + + public Checklist getChecklist() { + return checklist; + } + + public Long getQuestionId() { + return questionId; + } + + public Integer getAnswer() { + return answer; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChecklistQuestion that = (ChecklistQuestion) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "ChecklistQuestion{" + + "id=" + id + + ", checklist=" + checklist + + ", questionId=" + questionId + + ", answer=" + answer + + '}'; + } +} From be220e7ae1d04349ef54386dd46a0f8ffdf5d365 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:45:35 +0900 Subject: [PATCH 031/348] =?UTF-8?q?feat:=20option=20id=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=20=EC=97=AC=EB=B6=80=20=ED=99=95=EC=9D=B8=20=ED=95=A8?= =?UTF-8?q?=EC=88=98=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/checklist/domain/Option.java | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index 0fe40718d..cb508f9ff 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -1,5 +1,7 @@ package com.bang_ggood.checklist.domain; +import java.util.Arrays; + public enum Option { AIR_CONDITIONER(1, "에어컨"), SINK(2, "싱크대"), @@ -23,4 +25,9 @@ public enum Option { this.id = id; this.name = name; } + + public static boolean contains(Integer id) { + return Arrays.stream(Option.values()) + .anyMatch(option -> option.id.equals(id)); + } } From 13841a1bd773c79832099f2ded222d33dddd0545 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:46:29 +0900 Subject: [PATCH 032/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=83=9D=EC=84=B1=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20DTO=EB=93=A4=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/dto/ChecklistCreateRequest.java | 16 ++++++++++++++++ .../bang_ggood/checklist/dto/ChecklistInfo.java | 4 ++++ .../checklist/dto/QuestionCreateRequest.java | 6 ++++++ .../checklist/dto/QuestionsCreateRequest.java | 6 ++++++ .../bang_ggood/room/dto/RoomCreateRequest.java | 13 +++++++++++++ 5 files changed, 45 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java new file mode 100644 index 000000000..1f692e44e --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java @@ -0,0 +1,16 @@ +package com.bang_ggood.checklist.dto; + +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.dto.RoomCreateRequest; +import java.util.List; + +public record ChecklistCreateRequest(RoomCreateRequest room, List options, QuestionsCreateRequest questions) { + + public Room toRoomEntity() { + return room.toRoomEntity(); + } + + public ChecklistInfo toChecklistInfo() { + return new ChecklistInfo(room.deposit(), room.rent(), room.contractTerm(), room.realEstate()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java new file mode 100644 index 000000000..b3ba6dd31 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java @@ -0,0 +1,4 @@ +package com.bang_ggood.checklist.dto; + +public record ChecklistInfo(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java new file mode 100644 index 000000000..26beec952 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto; + +import jakarta.validation.constraints.NotNull; + +public record QuestionCreateRequest(@NotNull Integer questionId, String answer) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java new file mode 100644 index 000000000..67b3f7d1c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto; + +import java.util.List; + +public record QuestionsCreateRequest(List questions) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java new file mode 100644 index 000000000..c334e2d76 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java @@ -0,0 +1,13 @@ +package com.bang_ggood.room.dto; + +import com.bang_ggood.room.domain.Room; +import jakarta.validation.constraints.NotNull; + +public record RoomCreateRequest(@NotNull(message = "방 이름이 존재하지 않습니다.") String name, + Integer deposit, Integer rent, Integer contractTerm, + Integer floor, String station, Integer walkingTime, String realEstate) { + + public Room toRoomEntity() { + return new Room(name, floor, station, walkingTime); + } +} From f9f439449e71543c9221f4d512b9d49eb592de29 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 22 Jul 2024 17:47:01 +0900 Subject: [PATCH 033/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=83=9D=EC=84=B1=EC=9D=84=20=EC=9C=84?= =?UTF-8?q?=ED=95=9C=20Repository=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/repository/ChecklistOptionRepository.java | 7 +++++++ .../checklist/repository/ChecklistRepository.java | 8 ++++++++ .../com/bang_ggood/room/repository/RoomRepository.java | 7 +++++++ 3 files changed, 22 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java new file mode 100644 index 000000000..8ed6404d4 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.ChecklistOption; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ChecklistOptionRepository extends JpaRepository { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java new file mode 100644 index 000000000..25afb320f --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -0,0 +1,8 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.Checklist; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +public interface ChecklistRepository extends JpaRepository { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java new file mode 100644 index 000000000..4818c8a1c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java @@ -0,0 +1,7 @@ +package com.bang_ggood.room.repository; + +import com.bang_ggood.room.domain.Room; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface RoomRepository extends JpaRepository { +} From dcc317aa8be663527dd5e346b2581045915206dc Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 10:24:49 +0900 Subject: [PATCH 034/348] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=9A=B0=EC=84=A0=EC=88=9C=EC=9C=84=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=EA=B4=80=EB=A0=A8=20=EA=B2=80=EC=A6=9D=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/category/domain/Category.java | 7 ++ .../category/service/CategoryService.java | 34 +++++++++- .../bang_ggood/exception/ExceptionCode.java | 3 + .../java/com/bang_ggood/JpaAuditingTest.java | 4 ++ .../category/service/CategoryServiceTest.java | 66 +++++++++++++++++-- .../src/test/resources/application-test.yml | 20 ++++++ .../src/test/resources/data-test.sql | 2 + .../src/test/resources/schema-test.sql | 30 +++++++++ 8 files changed, 160 insertions(+), 6 deletions(-) create mode 100644 backend/bang-ggood/src/test/resources/application-test.yml create mode 100644 backend/bang-ggood/src/test/resources/data-test.sql create mode 100644 backend/bang-ggood/src/test/resources/schema-test.sql diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index eb04b3e9b..5cd1ea368 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,5 +1,7 @@ package com.bang_ggood.category.domain; +import java.util.Arrays; + public enum Category { CLEAN(1, "청결"), @@ -18,6 +20,11 @@ public enum Category { this.description = description; } + public static boolean contains(Integer id) { + return Arrays.stream(values()) + .anyMatch(category -> category.id.equals(id)); + } + public Integer getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index 5ea8495dc..c588d7bff 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -6,16 +6,24 @@ import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.CategoryReadResponse; import com.bang_ggood.category.repository.CategoryPriorityRepository; +import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; +import java.util.Set; + +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; @Service public class CategoryService { + private static final int MAX_CATEGORY_PRIORITY_COUNT = 3; + private final CategoryPriorityRepository categoryPriorityRepository; private final UserRepository userRepository; @@ -26,6 +34,10 @@ public CategoryService(CategoryPriorityRepository categoryPriorityRepository, Us @Transactional public void createCategoriesPriority(CategoryPriorityCreateRequest request) { + validateDuplication(request); + validateCategoryCount(request); + validateCategoryId(request); + User user = userRepository.getUserById(1L); List categoryPriorities = request.categoryIds().stream() .map(id -> new CategoryPriority(id, user)) @@ -34,12 +46,30 @@ public void createCategoriesPriority(CategoryPriorityCreateRequest request) { categoryPriorityRepository.saveAll(categoryPriorities); } + private void validateDuplication(CategoryPriorityCreateRequest request) { + if (request.categoryIds().size() != Set.copyOf(request.categoryIds()).size()) { + throw new BangggoodException(CATEGORY_DUPLICATED); + } + } + + private void validateCategoryCount(CategoryPriorityCreateRequest request) { + if (request.categoryIds().size() > MAX_CATEGORY_PRIORITY_COUNT) { + throw new BangggoodException(CATEGORY_PRIORITY_INVALID_COUNT); + } + } + + private void validateCategoryId(CategoryPriorityCreateRequest request) { + for (Integer id : request.categoryIds()) { + if (!Category.contains(id)) { + throw new BangggoodException(CATEGORY_NOT_FOUND); + } + } + } + public CategoriesReadResponse readCategories() { List categoryReadResponses = Arrays.stream(Category.values()) .map(CategoryReadResponse::from) .toList(); return new CategoriesReadResponse(categoryReadResponses); } - - } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 9b8c71094..6caa1dcb0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -6,6 +6,9 @@ public enum ExceptionCode { INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."), USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), + CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), + CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), + CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), ; private final HttpStatus httpStatus; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java index a484db970..0c2a36487 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java @@ -4,17 +4,20 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.annotation.DirtiesContext; +import org.springframework.test.context.ActiveProfiles; import java.time.LocalDateTime; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; +@ActiveProfiles("test") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) class JpaAuditingTest { @@ -56,6 +59,7 @@ void jpaAuditing_modifyEntity() { ); } + @Table(name = "test_entity") @Entity static class TestEntity extends BaseEntity { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index 7bd9243d8..3af2f0171 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -2,20 +2,29 @@ import com.bang_ggood.category.dto.CategoriesReadResponse; import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; -import org.assertj.core.api.Assertions; +import com.bang_ggood.exception.BangggoodException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.context.ActiveProfiles; import java.util.List; import static com.bang_ggood.category.domain.Category.AMENITY; import static com.bang_ggood.category.domain.Category.CLEAN; import static com.bang_ggood.category.domain.Category.ECONOMIC; +import static com.bang_ggood.category.domain.Category.SECURITY; import static com.bang_ggood.category.domain.Category.values; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@ActiveProfiles("test") class CategoryServiceTest { @Autowired @@ -32,9 +41,58 @@ void createCategoriesPriority() { )); // when & then - Assertions.assertThatCode(() -> categoryService.createCategoriesPriority(request)) + assertThatCode(() -> categoryService.createCategoriesPriority(request)) .doesNotThrowAnyException(); - // TODO: 추후 예외 처리 예정 + // TODO: 추후 우선순위 조회 API로 예외 검증 + } + + @DisplayName("카테고리 우선순위 생성 실패 : 카테고리 개수가 유효하지 않을 때") + @Test + void createCategoriesPriority_invalidCount_exception() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( + CLEAN.getId(), + AMENITY.getId(), + ECONOMIC.getId(), + SECURITY.getId() + )); + + // when & then + assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); + } + + @DisplayName("카테고리 우선순위 생성 실패 : 카테고리가 존재하지 않을 때") + @Test + void createCategoriesPriority_notFound_exception() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( + CLEAN.getId(), + AMENITY.getId(), + 0 + )); + + // when & then + assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(CATEGORY_NOT_FOUND.getMessage()); + } + + @DisplayName("카테고리 우선순위 생성 실패 : 중복된 카테고리가 존재할 때") + @Test + void createCategoriesPriority_duplicated_exception() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( + CLEAN.getId(), + AMENITY.getId(), + AMENITY.getId() + )); + + // when & then + assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(CATEGORY_DUPLICATED.getMessage()); } @DisplayName("카테고리 조회 성공") @@ -44,7 +102,7 @@ void readCategories() { CategoriesReadResponse categoriesReadResponse = categoryService.readCategories(); // then - Assertions.assertThat(categoriesReadResponse.categories()) + assertThat(categoriesReadResponse.categories()) .hasSize(values().length); } } diff --git a/backend/bang-ggood/src/test/resources/application-test.yml b/backend/bang-ggood/src/test/resources/application-test.yml new file mode 100644 index 000000000..ded52afaa --- /dev/null +++ b/backend/bang-ggood/src/test/resources/application-test.yml @@ -0,0 +1,20 @@ +spring: + h2: + console: + enabled: true + datasource: + url: jdbc:h2:mem:database + username: bang-ggood + password: 608bang-ggood-dev + driverClassName: org.h2.Driver + jpa: + defer-datasource-initialization: true + open-in-view: false + show-sql: true + hibernate: + ddl-auto: none + + sql: + init: + schema-locations: classpath:schema-test.sql + data-locations: classpath:data-test.sql diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql new file mode 100644 index 000000000..31aaed9e4 --- /dev/null +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -0,0 +1,2 @@ +INSERT INTO users(id, name, created_at, modified_at) +VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql new file mode 100644 index 000000000..a4583caf7 --- /dev/null +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -0,0 +1,30 @@ +CREATE TABLE if not exists users +( + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id) +); + +CREATE TABLE if not exists category_priority +( + id bigint generated by default as identity, + category_id tinyint not null, + user_id bigint not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id), + foreign key (user_id) references users +); + + +CREATE TABLE test_entity +( + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id) +); + From 9b94b48956b6b9a4946834caba9ad8bb9b0cb755 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 10:26:40 +0900 Subject: [PATCH 035/348] =?UTF-8?q?refactor:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20id=20=ED=83=80=EC=9E=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/category/domain/Category.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index eb04b3e9b..91f278674 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -10,15 +10,15 @@ public enum Category { SECURITY(6, "보안"), ECONOMIC(7, "경제적"); - private final Integer id; + private final int id; private final String description; - Category(Integer id, String description) { + Category(int id, String description) { this.id = id; this.description = description; } - public Integer getId() { + public int getId() { return id; } From a63b7273fb09a6e8b24acd783a51726aa62975a9 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 13:29:32 +0900 Subject: [PATCH 036/348] =?UTF-8?q?refactor:=20IntegrationTestSupport=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/.gitignore | 1 + .../bang_ggood/IntegrationTestSupport.java | 11 ++++++++++ .../java/com/bang_ggood/JpaAuditingTest.java | 9 +-------- .../category/service/CategoryServiceTest.java | 8 ++------ .../src/test/resources/application-test.yml | 20 ------------------- 5 files changed, 15 insertions(+), 34 deletions(-) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java delete mode 100644 backend/bang-ggood/src/test/resources/application-test.yml diff --git a/backend/bang-ggood/.gitignore b/backend/bang-ggood/.gitignore index 06da7f656..cb8bf25be 100644 --- a/backend/bang-ggood/.gitignore +++ b/backend/bang-ggood/.gitignore @@ -19,6 +19,7 @@ bin/ ### IntelliJ IDEA ### src/main/resources/application.yml +src/test/resources/application-test.yml .idea *.iws *.iml diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java b/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java new file mode 100644 index 000000000..903186620 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java @@ -0,0 +1,11 @@ +package com.bang_ggood; + + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.context.ActiveProfiles; + +@ActiveProfiles("test") +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +public abstract class IntegrationTestSupport { +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java index 0c2a36487..f2b231d7c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java @@ -8,19 +8,12 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.annotation.DirtiesContext; -import org.springframework.test.context.ActiveProfiles; import java.time.LocalDateTime; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -@ActiveProfiles("test") -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) -class JpaAuditingTest { +class JpaAuditingTest extends IntegrationTestSupport{ @Autowired private TestRepository testRepository; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index 3af2f0171..5ed9a9f46 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -1,14 +1,12 @@ package com.bang_ggood.category.service; +import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.category.dto.CategoriesReadResponse; import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import com.bang_ggood.exception.BangggoodException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; -import org.springframework.test.context.ActiveProfiles; import java.util.List; import static com.bang_ggood.category.domain.Category.AMENITY; @@ -23,9 +21,7 @@ import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -@ActiveProfiles("test") -class CategoryServiceTest { +class CategoryServiceTest extends IntegrationTestSupport { @Autowired private CategoryService categoryService; diff --git a/backend/bang-ggood/src/test/resources/application-test.yml b/backend/bang-ggood/src/test/resources/application-test.yml deleted file mode 100644 index ded52afaa..000000000 --- a/backend/bang-ggood/src/test/resources/application-test.yml +++ /dev/null @@ -1,20 +0,0 @@ -spring: - h2: - console: - enabled: true - datasource: - url: jdbc:h2:mem:database - username: bang-ggood - password: 608bang-ggood-dev - driverClassName: org.h2.Driver - jpa: - defer-datasource-initialization: true - open-in-view: false - show-sql: true - hibernate: - ddl-auto: none - - sql: - init: - schema-locations: classpath:schema-test.sql - data-locations: classpath:data-test.sql From 23145e64698efa6e23ce4dd3cf75feacc5105534 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 13:43:15 +0900 Subject: [PATCH 037/348] =?UTF-8?q?fix:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=95=84=EC=9D=B4=EB=94=94=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EC=9D=B8=ED=95=9C=20?= =?UTF-8?q?=EB=AC=B8=EB=B2=95=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../src/main/java/com/bang_ggood/category/domain/Category.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 17de1441a..58386358b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -22,7 +22,7 @@ public enum Category { public static boolean contains(Integer id) { return Arrays.stream(values()) - .anyMatch(category -> category.id.equals(id)); + .anyMatch(category -> category.id == id); } public int getId() { From 5d350ba9b49c3b45af367b1e9c51d6cf3272a882 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:47:22 +0900 Subject: [PATCH 038/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EB=AA=A9=EB=A1=9D=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/domain/Question.java | 26 +++++++ .../checklist/domain/QuestionList.java | 73 +++++++++++++++++++ 2 files changed, 99 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java new file mode 100644 index 000000000..82122da2d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -0,0 +1,26 @@ +package com.bang_ggood.checklist.domain; + +public class Question { + + private final int categoryId; + private final String title; + private final String subtitle; + + public Question(int categoryId, String title, String subtitle) { + this.categoryId = categoryId; + this.title = title; + this.subtitle = subtitle; + } + + public int getCategoryId() { + return categoryId; + } + + public String getTitle() { + return title; + } + + public String getSubtitle() { + return subtitle; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java new file mode 100644 index 000000000..9cf914f1d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java @@ -0,0 +1,73 @@ +package com.bang_ggood.checklist.domain; + +import java.util.HashMap; +import java.util.Map; + +public class QuestionList { + + public Map questions; + + public QuestionList() { + questions = new HashMap<>(); + initClean(); + initRoomCondition(); + initAmenity(); + initOption(); + initEnvironment(); + initSecurity(); + initEconomic(); + } + + private void initClean() { + questions.put(1, new Question(1, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.")); + questions.put(2, new Question(1, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.")); + questions.put(3, new Question(1, "에어컨 내부는 깨끗한가요?", null)); + questions.put(4, new Question(1, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.")); + questions.put(5, new Question(1, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.")); + } + + private void initRoomCondition() { + questions.put(6, new Question(2, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.")); + questions.put(7, new Question(2, "온수가 잘 나오나요?", null)); + questions.put(8, new Question(2, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null)); + questions.put(9, new Question(2, "보일러가 잘 동작하나요?", null)); + questions.put(10, new Question(2, "콘센트 위치와 갯수가 적절한가요?", null)); + questions.put(11, new Question(2, "벽지 상태가 양호한가요?", null)); + } + + private void initAmenity() { + questions.put(12, new Question(3, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null)); + questions.put(13, new Question(3, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null)); + questions.put(14, new Question(3, "병원이나 약국이 가까운 곳에 있나요?", null)); + } + + private void initOption() { + questions.put(15, new Question(4, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.")); + questions.put(16, new Question(4, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null)); + } + + private void initEnvironment() { + questions.put(17, new Question(5, "햇빛이 잘 들어오나요?", null)); + questions.put(18, new Question(5, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.")); + questions.put(19, new Question(5, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.")); + questions.put(20, new Question(5, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.")); + questions.put(21, new Question(5, "1층에 음식점이 있지는 않나요?", null)); + questions.put(22, new Question(5, "집가는 길이 언덕이진 않나요?", null)); + } + + private void initSecurity() { + questions.put(23, new Question(6, "출입구와 복도에 CCTV가 설치되어 있나요?", null)); + questions.put(24, new Question(6, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null)); + questions.put(25, new Question(6, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null)); + questions.put(26, new Question(6, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null)); + questions.put(27, new Question(6, "주변 도로가 밤에도 충분히 밝은가요?", null)); + questions.put(28, new Question(6, "화면이 달린 인터폰이 제공되나요?", null)); + questions.put(29, new Question(6, "옆 건물에서 잘 보이는 구조는 아닌가요?", null)); + questions.put(30, new Question(6, "관리자분이 함께 상주하시나요?", null)); + } + + private void initEconomic() { + questions.put(31, new Question(7, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.")); + questions.put(32, new Question(7, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.")); + } +} From 90970c30eaaa6f7b0b032195a7f428643cd54c13 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:47:57 +0900 Subject: [PATCH 039/348] =?UTF-8?q?style:=20=EC=98=B5=EC=85=98=20=EC=A4=91?= =?UTF-8?q?=EC=9A=94=ED=95=9C=20=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/domain/Option.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index cb508f9ff..fde66fc38 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -4,19 +4,19 @@ public enum Option { AIR_CONDITIONER(1, "에어컨"), - SINK(2, "싱크대"), - REFRIGERATOR(3, "냉장고"), + REFRIGERATOR(2, "냉장고"), + MICROWAVE_OVEN(3, "전자레인지"), WASHING_MACHINE(4, "세탁기"), - MICROWAVE_OVEN(5, "전자레인지"), - TV(6, "TV"), - DRYER(7, "건조기"), - INTERNET(8, "인터넷"), - GAS_STOVE(9, "가스레인지/인덕션"), - ELEVATOR(10, "엘리베이터"), - BED(11, "침대"), - DESK(12, "책상"), - CLOSET(13, "옷장"), - SHOE_RACK(14, "신발장"); + SINK(5, "싱크대"), + GAS_STOVE(6, "가스레인지/인덕션"), + INTERNET(7, "인터넷"), + BED(8, "침대"), + DESK(9, "책상"), + CLOSET(10, "옷장"), + SHOE_RACK(11, "신발장"), + ELEVATOR(12, "엘리베이터"), + DRYER(13, "건조기"), + TV(14, "TV"); private Integer id; private String name; From 468ad5fcd89e2db4cfb28502b7ca477d37930e31 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:54:12 +0900 Subject: [PATCH 040/348] =?UTF-8?q?feat:=20=EB=A3=B8=20=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=EC=97=90=20=EC=A3=BC=EC=86=8C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../src/main/java/com/bang_ggood/room/domain/Room.java | 10 +++++++++- .../com/bang_ggood/room/dto/RoomCreateRequest.java | 6 +++--- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 10f5cdd0c..4f69a535f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -18,6 +18,8 @@ public class Room extends BaseEntity { private Integer floor; + private String address; + private String station; private Integer walkingTime; @@ -25,9 +27,10 @@ public class Room extends BaseEntity { protected Room() { } - public Room(String name, Integer floor, String station, Integer walkingTime) { + public Room(String name, Integer floor, String address, String station, Integer walkingTime) { this.name = name; this.floor = floor; + this.address = address; this.station = station; this.walkingTime = walkingTime; } @@ -44,6 +47,10 @@ public Integer getFloor() { return floor; } + public String getAddress() { + return address; + } + public String getStation() { return station; } @@ -75,6 +82,7 @@ public String toString() { "id=" + id + ", name='" + name + '\'' + ", floor=" + floor + + ", address='" + address + '\'' + ", station='" + station + '\'' + ", walkingTime=" + walkingTime + '}'; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java index c334e2d76..8837cc721 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java @@ -4,10 +4,10 @@ import jakarta.validation.constraints.NotNull; public record RoomCreateRequest(@NotNull(message = "방 이름이 존재하지 않습니다.") String name, - Integer deposit, Integer rent, Integer contractTerm, - Integer floor, String station, Integer walkingTime, String realEstate) { + Integer deposit, Integer rent, Integer contractTerm, Integer floor, + String address, String station, Integer walkingTime, String realEstate) { public Room toRoomEntity() { - return new Room(name, floor, station, walkingTime); + return new Room(name, floor, address, station, walkingTime); } } From 4384dafd6a6b989d14d8834fd7e0ad95206f0d01 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 23 Jul 2024 13:58:16 +0900 Subject: [PATCH 041/348] =?UTF-8?q?feat:=20yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=ED=95=98=EB=8A=94=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index f04c9ad9f..7b37e809d 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -31,6 +31,14 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x gradlew + + - name: Write application.yml + env: + APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} + run: | + echo "${APPLICATION_YML}" > src/main/resources/application.yml + echo "${APPLICATION_TEST_YML}" > src/test/resources/application-test.yml - name: Build with Gradle run: ./gradlew clean build From 91863def5443f17ed6921253e2989604e287fac5 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:07:52 +0900 Subject: [PATCH 042/348] =?UTF-8?q?feat:=20yml=20=ED=8C=8C=EC=9D=BC=20?= =?UTF-8?q?=EC=9E=91=EC=84=B1=ED=95=98=EB=8A=94=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index a491a5f0e..1474cd71c 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -30,6 +30,14 @@ jobs: - name: Grant execute permission for gradlew run: chmod +x backend/bang-ggood/gradlew + - name: Write application.yml + env: + APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} + run: | + echo "${APPLICATION_YML}" > src/main/resources/application.yml + echo "${APPLICATION_TEST_YML}" > src/test/resources/application-test.yml + - name: Build with Gradle run: ./gradlew clean build working-directory: backend/bang-ggood From 20e933e6527b595753911550ca31649915a74114 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 14:32:43 +0900 Subject: [PATCH 043/348] =?UTF-8?q?feat:=20Cors=EA=B4=80=EB=A0=A8=20?= =?UTF-8?q?=EC=84=A4=EC=A0=95=ED=8C=8C=EC=9D=BC=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../com/bang_ggood/config/CorsConfig.java | 26 +++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java new file mode 100644 index 000000000..9aabc6bb3 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java @@ -0,0 +1,26 @@ +package com.bang_ggood.config; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.cors.CorsConfiguration; +import org.springframework.web.cors.CorsConfigurationSource; +import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import java.util.List; + +@Configuration +public class CorsConfig { + + @Bean + public CorsConfigurationSource corsConfigurationSource() { + CorsConfiguration configuration = new CorsConfiguration(); + configuration.addAllowedOrigin("*"); + configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); + configuration.addAllowedHeader("*"); + configuration.setAllowCredentials(true); + + UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); + source.registerCorsConfiguration("/**", configuration); + + return source; + } +} From 241ec7426c18dda3fcdff4745b9f6c421ff301d3 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 16:32:36 +0900 Subject: [PATCH 044/348] =?UTF-8?q?refactor:=20id=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD(Integer=20->=20int)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../com/bang_ggood/category/controller/CategoryController.java | 1 + .../src/main/java/com/bang_ggood/category/domain/Category.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index b2c2e62d0..bfc0669b2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -20,6 +20,7 @@ public CategoryController(CategoryService categoryService) { @PostMapping("/categories/priority") public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { + // TODO: List 요소 null check 필요 categoryService.createCategoriesPriority(request); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 58386358b..14f547670 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -20,7 +20,7 @@ public enum Category { this.description = description; } - public static boolean contains(Integer id) { + public static boolean contains(int id) { return Arrays.stream(values()) .anyMatch(category -> category.id == id); } From 65c314204d7862ebe390adf73f82daf5685abbfe Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 16:33:24 +0900 Subject: [PATCH 045/348] =?UTF-8?q?refactor:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20@Repository=20=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EC=85=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../category/repository/CategoryPriorityRepository.java | 2 -- .../java/com/bang_ggood/user/repository/UserRepository.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java index 68f5da229..d37dda882 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java @@ -2,8 +2,6 @@ import com.bang_ggood.category.domain.CategoryPriority; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -@Repository public interface CategoryPriorityRepository extends JpaRepository { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java index 96b32288e..65cadda49 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java @@ -4,9 +4,7 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; -@Repository public interface UserRepository extends JpaRepository { default User getUserById(Long id) { From d1f610acda8e185614ca82c74286fc5970628ff3 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 23 Jul 2024 16:34:05 +0900 Subject: [PATCH 046/348] =?UTF-8?q?feat:=20domain=20equals,=20hashcode,=20?= =?UTF-8?q?toString=20=EB=A9=94=EC=84=9C=EB=93=9C=20=EC=9E=AC=EC=A0=95?= =?UTF-8?q?=EC=9D=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../category/domain/CategoryPriority.java | 29 ++++++++++++++++++- .../java/com/bang_ggood/user/domain/User.java | 26 +++++++++++++++++ 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java index 2ae157565..cdd36c60f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java @@ -9,6 +9,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import java.util.Objects; @Entity public class CategoryPriority extends BaseEntity { @@ -17,7 +18,7 @@ public class CategoryPriority extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(name = "category_id") + @Column(nullable = false) private Integer categoryId; @ManyToOne(fetch = FetchType.LAZY) @@ -30,4 +31,30 @@ public CategoryPriority(Integer categoryId, User user) { this.categoryId = categoryId; this.user = user; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + CategoryPriority that = (CategoryPriority) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hash(id); + } + + @Override + public String toString() { + return "CategoryPriority{" + + "id=" + id + + ", categoryId=" + categoryId + + ", user=" + user + + '}'; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index bd0d4df01..a5796317c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -7,6 +7,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import java.util.Objects; @Table(name = "users") @Entity @@ -25,4 +26,29 @@ protected User() { public User(String name) { this.name = name; } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + User user = (User) o; + return Objects.equals(id, user.id); + } + + @Override + public int hashCode() { + return Objects.hash(id); + } + + @Override + public String toString() { + return "User{" + + "id=" + id + + ", name='" + name + '\'' + + '}'; + } } From 96965b0680d559e323b904a81017dcd7df2bbe6b Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:44:35 +0900 Subject: [PATCH 047/348] =?UTF-8?q?feat:=20=EC=B4=88=EA=B8=B0=20schema,=20?= =?UTF-8?q?data=20sql=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang-ggood/src/main/resources/data.sql | 2 + .../bang-ggood/src/main/resources/schema.sql | 64 +++++++++++++++++++ 2 files changed, 66 insertions(+) create mode 100644 backend/bang-ggood/src/main/resources/data.sql create mode 100644 backend/bang-ggood/src/main/resources/schema.sql diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql new file mode 100644 index 000000000..73a63e361 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -0,0 +1,2 @@ +INSERT INTO users(id, name, created_at, modified_at) +VALUES (1, '방끗', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql new file mode 100644 index 000000000..57263d373 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -0,0 +1,64 @@ +-- Drop tables if they exist +DROP TABLE IF EXISTS checklist CASCADE; +DROP TABLE IF EXISTS checklist_option CASCADE; +DROP TABLE IF EXISTS checklist_question CASCADE; +DROP TABLE IF EXISTS room CASCADE; +DROP TABLE IF EXISTS users CASCADE; + +-- Create tables +CREATE TABLE room +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + floor INTEGER, + walking_time INTEGER, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + address VARCHAR(255), + name VARCHAR(255), + station VARCHAR(255) +); + +CREATE TABLE users +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + name VARCHAR(255) NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6) +); + +CREATE TABLE checklist +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + contract_term INTEGER, + deposit INTEGER, + rent INTEGER, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + room_id BIGINT NOT NULL UNIQUE, + user_id BIGINT NOT NULL, + real_estate VARCHAR(255), + FOREIGN KEY (room_id) REFERENCES room (id), + FOREIGN KEY (user_id) REFERENCES users (id) +); + +CREATE TABLE checklist_option +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + option_id INTEGER NOT NULL, + checklist_id BIGINT NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + +CREATE TABLE checklist_question +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + question_id INTEGER NOT NULL, + checklist_id BIGINT NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + answer VARCHAR(255), + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + From 41bf35360c63c87f127c497aafa48848d4a3d949 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:45:44 +0900 Subject: [PATCH 048/348] =?UTF-8?q?feat:=20=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=EB=AA=85=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/domain/Checklist.java | 2 ++ .../checklist/domain/ChecklistOption.java | 6 ++++-- .../checklist/domain/ChecklistQuestion.java | 20 +++++++++++++++---- 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 7e950de82..c6b8a4d4b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -11,8 +11,10 @@ import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToOne; +import jakarta.persistence.Table; import java.util.Objects; +@Table(name = "checklist") @Entity public class Checklist extends BaseEntity { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java index 894af3a11..c3594c6b7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java @@ -8,9 +8,11 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; -import jakarta.persistence.OneToOne; +import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.Objects; +@Table(name = "checklist_option") @Entity public class ChecklistOption extends BaseEntity { @@ -18,7 +20,7 @@ public class ChecklistOption extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @OneToOne(fetch = FetchType.LAZY) + @ManyToOne(fetch = FetchType.LAZY) @JoinColumn(nullable = false) private Checklist checklist; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 33e88859f..45d828678 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -8,8 +8,10 @@ import jakarta.persistence.Id; import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; +import jakarta.persistence.Table; import java.util.Objects; +@Table(name = "checklist_question") @Entity public class ChecklistQuestion extends BaseEntity { @@ -21,22 +23,32 @@ public class ChecklistQuestion extends BaseEntity { @JoinColumn(nullable = false) private Checklist checklist; - private Long questionId; + private int questionId; - private Integer answer; + private String answer; + + public ChecklistQuestion(Checklist checklist, int questionId, String answer) { + this.checklist = checklist; + this.questionId = questionId; + this.answer = answer; + } protected ChecklistQuestion() { } + public Long getId() { + return id; + } + public Checklist getChecklist() { return checklist; } - public Long getQuestionId() { + public int getQuestionId() { return questionId; } - public Integer getAnswer() { + public String getAnswer() { return answer; } From cf81782532f0b92f37321c43262551da15603bbf Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:45:58 +0900 Subject: [PATCH 049/348] =?UTF-8?q?feat:=20Grade=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../java/com/bang_ggood/checklist/domain/Grade.java | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java new file mode 100644 index 000000000..25d3b49f4 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -0,0 +1,11 @@ +package com.bang_ggood.checklist.domain; + +public enum Grade { + + GOOD(3), + SOSO(2), + BAD(1); + + Grade(int score) { + } +} From d54aea2fbb7a5ac551f49f87159d59c5e66f40b6 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:46:36 +0900 Subject: [PATCH 050/348] =?UTF-8?q?feat(QuestionList):=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=20=ED=8F=AC=ED=95=A8=20=EC=97=AC=EB=B6=80=20=ED=99=95?= =?UTF-8?q?=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../java/com/bang_ggood/checklist/domain/QuestionList.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java index 9cf914f1d..a38a9f529 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java @@ -2,7 +2,9 @@ import java.util.HashMap; import java.util.Map; +import org.springframework.stereotype.Component; +@Component public class QuestionList { public Map questions; @@ -18,6 +20,10 @@ public QuestionList() { initEconomic(); } + public boolean contains(int questionId) { + return questions.containsKey(questionId); + } + private void initClean() { questions.put(1, new Question(1, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.")); questions.put(2, new Question(1, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.")); From 06e3e82935c0db6e6acc496aeb276894812eb20f Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:47:07 +0900 Subject: [PATCH 051/348] =?UTF-8?q?feat:=20API=20=ED=98=95=EC=8B=9D?= =?UTF-8?q?=EC=97=90=20=EB=94=B0=EB=A5=B8=20DTO=20=EA=B5=AC=EC=A1=B0=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/dto/ChecklistCreateRequest.java | 3 ++- .../bang_ggood/checklist/dto/QuestionsCreateRequest.java | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java index 1f692e44e..c53a19529 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java @@ -4,7 +4,8 @@ import com.bang_ggood.room.dto.RoomCreateRequest; import java.util.List; -public record ChecklistCreateRequest(RoomCreateRequest room, List options, QuestionsCreateRequest questions) { +public record ChecklistCreateRequest(RoomCreateRequest room, List options, + List questions) { public Room toRoomEntity() { return room.toRoomEntity(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java deleted file mode 100644 index 67b3f7d1c..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionsCreateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import java.util.List; - -public record QuestionsCreateRequest(List questions) { -} From 1dbcc8133c7cbce72d4409ae77a07a81d9011192 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:47:37 +0900 Subject: [PATCH 052/348] =?UTF-8?q?feat:=20ChecklistQuestion=20=EB=A0=88?= =?UTF-8?q?=ED=8F=AC=EC=A7=80=ED=86=A0=EB=A6=AC=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/repository/ChecklistQuestionRepository.java | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java new file mode 100644 index 000000000..771ecc025 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ChecklistQuestionRepository extends JpaRepository { +} From 1979f7cb87b720056821b9e3f26c16e477e6e951 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:49:33 +0900 Subject: [PATCH 053/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=80=EC=9E=A5=20=EC=8B=9C=20=EC=98=88?= =?UTF-8?q?=EC=99=B8=20=EC=B2=98=EB=A6=AC=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../com/bang_ggood/exception/ExceptionCode.java | 4 +++- .../exception/GlobalExceptionHandler.java | 13 +++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 51ddfe69b..db4967865 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -4,7 +4,9 @@ public enum ExceptionCode { - INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."); + INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."), + INVALID_OPTION_ID(HttpStatus.BAD_REQUEST, "잘못된 옵션 ID입니다."), + INVALID_QUESTION_ID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java index 732aabde0..fa25baa33 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -3,6 +3,7 @@ import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.MethodArgumentNotValidException; import org.springframework.web.bind.annotation.ExceptionHandler; import org.springframework.web.bind.annotation.RestControllerAdvice; @@ -28,4 +29,16 @@ public ResponseEntity handleRuntimeException(HttpServletReque return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR) .body(response); } + + @ExceptionHandler(MethodArgumentNotValidException.class) + public ResponseEntity handleMethodArgumentNotValidException( + MethodArgumentNotValidException exception, + HttpServletRequest request) { + ExceptionResponse response = new ExceptionResponse( + request.getMethod(), + request.getRequestURI(), + exception.getMessage()); + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(response); + } } From 80f44f062806d8c1c9812ec90ec0f8803deb49b3 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:49:52 +0900 Subject: [PATCH 054/348] =?UTF-8?q?feat(Room):=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EC=9D=B4=EB=A6=84=20=EC=A7=80=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../src/main/java/com/bang_ggood/room/domain/Room.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 4f69a535f..b6729e3f2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -5,8 +5,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import java.util.Objects; +@Table(name = "room") @Entity public class Room extends BaseEntity { From 8ca7bac8777c49cf3115e2932f7502cbadc443a0 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 16:50:16 +0900 Subject: [PATCH 055/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A0=80=EC=9E=A5=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../controller/ChecklistController.java | 26 ++++++ .../checklist/service/ChecklistService.java | 88 +++++++++++++++++++ 2 files changed, 114 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java new file mode 100644 index 000000000..d73b36b48 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -0,0 +1,26 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.service.ChecklistService; +import jakarta.validation.Valid; +import java.net.URI; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ChecklistController { + + private final ChecklistService checklistService; + + public ChecklistController(ChecklistService checklistService) { + this.checklistService = checklistService; + } + + @PostMapping("/checklists") + public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateRequest checklistCreateRequest) { + long checklistId = checklistService.createChecklist(checklistCreateRequest); + return ResponseEntity.created(URI.create("checklists/" + checklistId)).build(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java new file mode 100644 index 000000000..b80f65e57 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -0,0 +1,88 @@ +package com.bang_ggood.checklist.service; + +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistOption; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Option; +import com.bang_ggood.checklist.domain.QuestionList; +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.ChecklistInfo; +import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.repository.ChecklistOptionRepository; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.domain.User; +import java.util.List; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class ChecklistService { + + private final ChecklistRepository checklistRepository; + private final RoomRepository roomRepository; + private final ChecklistOptionRepository checklistOptionRepository; + private final ChecklistQuestionRepository checklistQuestionRepository; + private final QuestionList questionList; + + public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, + ChecklistOptionRepository checklistOptionRepository, + ChecklistQuestionRepository checklistQuestionRepository, QuestionList questionList) { + this.checklistRepository = checklistRepository; + this.roomRepository = roomRepository; + this.checklistOptionRepository = checklistOptionRepository; + this.checklistQuestionRepository = checklistQuestionRepository; + this.questionList = questionList; + } + + + @Transactional + public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { + Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); + ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); + Checklist checklist = new Checklist(new User(1L, "방끗"), room, checklistInfo.deposit(), checklistInfo.rent(), + checklistInfo.contractTerm(), checklistInfo.realEstate()); + checklistRepository.save(checklist); + createChecklistOptions(checklistCreateRequest, checklist); + createChecklistQuestions(checklistCreateRequest, checklist); + return checklist.getId(); + } + + private void createChecklistOptions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { + List options = checklistCreateRequest.options(); + validateOptions(options); + List checklistOptions = options.stream() + .map(option -> new ChecklistOption(checklist, option)) + .toList(); + checklistOptionRepository.saveAll(checklistOptions); + } + + private void validateOptions(List options) { + for (Integer option : options) { + if (!Option.contains(option)) { + throw new BangggoodException(ExceptionCode.INVALID_OPTION_ID); + } + } + } + + private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { + List questions = checklistCreateRequest.questions(); + for (QuestionCreateRequest questionCreateRequest : questions) { + Integer questionId = questionCreateRequest.questionId(); + validateQuestion(questionId); + ChecklistQuestion checklistQuestion = new ChecklistQuestion(checklist, questionId, + questionCreateRequest.answer()); + checklistQuestionRepository.save(checklistQuestion); + } + } + + private void validateQuestion(Integer questionId) { + if (!questionList.contains(questionId)) { + throw new BangggoodException(ExceptionCode.INVALID_QUESTION_ID); + } + } +} From d9ca7a75d13fe18011fc0190ccc6557c7fcaf111 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:20:18 +0900 Subject: [PATCH 056/348] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=ED=99=98=EA=B2=BD=20=EC=84=B8=ED=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../src/test/resources/data-test.sql | 2 + .../src/test/resources/schema-test.sql | 73 +++++++++++++++++++ 2 files changed, 75 insertions(+) create mode 100644 backend/bang-ggood/src/test/resources/data-test.sql create mode 100644 backend/bang-ggood/src/test/resources/schema-test.sql diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql new file mode 100644 index 000000000..73a63e361 --- /dev/null +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -0,0 +1,2 @@ +INSERT INTO users(id, name, created_at, modified_at) +VALUES (1, '방끗', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql new file mode 100644 index 000000000..789625ed9 --- /dev/null +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -0,0 +1,73 @@ +-- Drop tables if they exist +DROP TABLE IF EXISTS checklist CASCADE; +DROP TABLE IF EXISTS checklist_option CASCADE; +DROP TABLE IF EXISTS checklist_question CASCADE; +DROP TABLE IF EXISTS room CASCADE; +DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS test_entity CASCADE; + +-- Create tables +CREATE TABLE room +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + floor INTEGER, + walking_time INTEGER, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + address VARCHAR(255), + name VARCHAR(255), + station VARCHAR(255) +); + +CREATE TABLE users +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + name VARCHAR(255) NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6) +); + +CREATE TABLE checklist +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + contract_term INTEGER, + deposit INTEGER, + rent INTEGER, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + room_id BIGINT NOT NULL UNIQUE, + user_id BIGINT NOT NULL, + real_estate VARCHAR(255), + FOREIGN KEY (room_id) REFERENCES room (id), + FOREIGN KEY (user_id) REFERENCES users (id) +); + +CREATE TABLE checklist_option +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + option_id INTEGER NOT NULL, + checklist_id BIGINT NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + +CREATE TABLE checklist_question +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + question_id INTEGER NOT NULL, + checklist_id BIGINT NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + answer VARCHAR(255), + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + +CREATE TABLE test_entity +( + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id) +); From f2a791226e39606b0c7f6ec0e88b2e54687290e6 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:20:36 +0900 Subject: [PATCH 057/348] =?UTF-8?q?chore:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=9D=98=EC=A1=B4=EC=84=B1=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- backend/bang-ggood/build.gradle | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 8c12e928b..10607b275 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -21,8 +21,10 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-data-jpa' implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springframework.boot:spring-boot-starter-validation' runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'io.rest-assured:rest-assured:5.3.1' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } From 9e33ee4492dc25686659610828e01b7827f231b5 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:21:09 +0900 Subject: [PATCH 058/348] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EA=B8=B0=EB=B3=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../java/com/bang_ggood/AcceptanceTest.java | 24 ++++++++++ .../bang_ggood/IntegrationTestSupport.java | 10 ++++ .../java/com/bang_ggood/JpaAuditingTest.java | 4 ++ .../checklist/ChecklistFixture.java | 48 +++++++++++++++++++ .../java/com/bang_ggood/room/RoomFixture.java | 16 +++++++ 5 files changed, 102 insertions(+) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java new file mode 100644 index 000000000..74d1038fc --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java @@ -0,0 +1,24 @@ +package com.bang_ggood; + +import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.context.annotation.Import; +import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.jdbc.Sql; + +@ActiveProfiles("test") +@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) +@Sql(scripts = {"/schema-test.sql", "/data-test.sql"}) +public abstract class AcceptanceTest { + + @LocalServerPort + private int port; + + @BeforeEach + void setPort() { + RestAssured.port = port; + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java b/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java new file mode 100644 index 000000000..eec3fc800 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java @@ -0,0 +1,10 @@ +package com.bang_ggood; + +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.test.context.ActiveProfiles; + +@ActiveProfiles("test") +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +public abstract class IntegrationTestSupport { +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java index a484db970..129144be1 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java @@ -4,6 +4,7 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; +import jakarta.persistence.Table; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -11,10 +12,12 @@ import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.annotation.DirtiesContext; import java.time.LocalDateTime; +import org.springframework.test.context.ActiveProfiles; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; +@ActiveProfiles("test") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) class JpaAuditingTest { @@ -56,6 +59,7 @@ void jpaAuditing_modifyEntity() { ); } + @Table(name = "test_entity") @Entity static class TestEntity extends BaseEntity { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java new file mode 100644 index 000000000..211c1322c --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -0,0 +1,48 @@ +package com.bang_ggood.checklist; + +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.room.RoomFixture; +import java.util.List; + +public class ChecklistFixture { + + public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( + 1, "GOOD" + ); + + public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( + 2, "SOSO" + ); + + public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( + 3, "BAD" + ); + + public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( + 5, null + ); + + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( + null, null + ); + + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) + ); +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java new file mode 100644 index 000000000..942106964 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -0,0 +1,16 @@ +package com.bang_ggood.room; + +import com.bang_ggood.room.dto.RoomCreateRequest; + +public class RoomFixture { + + public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( + "방이름", 1000, 50, 12, 3, + "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사" + ); + + public static final RoomCreateRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomCreateRequest( + null, 1000, 50, 12, 3, + "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사" + ); +} From e3852799a783e81b79ae85df48832a426188ed4c Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:21:29 +0900 Subject: [PATCH 059/348] =?UTF-8?q?feat:=20=EC=A4=91=EC=B2=A9=20DTO=20?= =?UTF-8?q?=EA=B2=80=EC=A6=9D=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../com/bang_ggood/checklist/dto/ChecklistCreateRequest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java index c53a19529..246b1bb86 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java @@ -2,10 +2,11 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.dto.RoomCreateRequest; +import jakarta.validation.Valid; import java.util.List; -public record ChecklistCreateRequest(RoomCreateRequest room, List options, - List questions) { +public record ChecklistCreateRequest(@Valid RoomCreateRequest room, List options, + @Valid List questions) { public Room toRoomEntity() { return room.toRoomEntity(); From b626249c964629cc2c83d5c09f50bb7e7f420563 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:21:48 +0900 Subject: [PATCH 060/348] =?UTF-8?q?test:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=A9=20=EC=A0=95=EB=B3=B4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20E2E=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../controller/ChecklistE2ETest.java | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java new file mode 100644 index 000000000..16db766e3 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -0,0 +1,44 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.checklist.ChecklistFixture; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class ChecklistE2ETest extends AcceptanceTest { + + @DisplayName("체크리스트 방 정보 작성 성공") + @Test + void crateChecklist() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) + .when().post("/checklists") + .then().log().all() + .statusCode(201); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 방 이름을 넣지 않은 경우") + @Test + void crateChecklistNoRoomName() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) + .when().post("/checklists") + .then().log().all() + .statusCode(400); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 ID를 넣지 않은 경우") + @Test + void crateChecklistNoQuestionId() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) + .when().post("/checklists") + .then().log().all() + .statusCode(400); + } +} From ec990a70245c05b2704159bff9b087218b1d39a2 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:30:52 +0900 Subject: [PATCH 061/348] =?UTF-8?q?test:=20=EC=98=B5=EC=85=98=20=ED=8F=AC?= =?UTF-8?q?=ED=95=A8=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/domain/OptionTest.java | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java new file mode 100644 index 000000000..846ed5816 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java @@ -0,0 +1,21 @@ +package com.bang_ggood.checklist.domain; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class OptionTest { + + @DisplayName("옵션 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(Option.contains(1)).isTrue(); + } + + @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(Option.contains(15)).isFalse(); + } +} From af8962d3c273e6a55964149f9734cd31a5732843 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:31:02 +0900 Subject: [PATCH 062/348] =?UTF-8?q?test:=20=EC=A7=88=EB=AC=B8=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=ED=8F=AC=ED=95=A8=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/domain/QuestionListTest.java | 29 +++++++++++++++++++ 1 file changed, 29 insertions(+) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java new file mode 100644 index 000000000..0d93a0a97 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java @@ -0,0 +1,29 @@ +package com.bang_ggood.checklist.domain; + +import static org.assertj.core.api.Assertions.assertThat; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class QuestionListTest { + + private QuestionList questionList; + + @BeforeEach + void init() { + questionList = new QuestionList(); + } + + @DisplayName("질문 리스트 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(questionList.contains(1)).isTrue(); + } + + @DisplayName("질문 리스트 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(questionList.contains(100)).isFalse(); + } +} From bee4f57043799088b95e2a38d4a5cd77cc8be183 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:42:10 +0900 Subject: [PATCH 063/348] =?UTF-8?q?test:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=A9=20=EC=A0=95=EB=B3=B4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20=EC=84=9C=EB=B9=84=EC=8A=A4=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/ChecklistFixture.java | 10 +++++ .../service/ChecklistServiceTest.java | 38 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 211c1322c..26f4aab54 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -27,6 +27,10 @@ public class ChecklistFixture { null, null ); + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( + 9999, "SOSO" + ); + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), @@ -45,4 +49,10 @@ public class ChecklistFixture { List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java new file mode 100644 index 000000000..0a1085ca6 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -0,0 +1,38 @@ +package com.bang_ggood.checklist.service; + + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.exception.BangggoodException; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class ChecklistServiceTest extends IntegrationTestSupport { + + @Autowired + private ChecklistService checklistService; + + @DisplayName("체크리스트 방 정보 작성 성공") + @Test + void createChecklist() { + //given & when + long checklistId = checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //then + Assertions.assertThat(checklistId).isEqualTo(1); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") + @Test + void createChecklistNotValidQuestionId() { + //given & when & then + Assertions.assertThatThrownBy(() -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage("잘못된 질문 ID입니다."); + } +} From 8ce6fb91ac7f323ac2bcddaa61c00ab04bbfa4b5 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:42:37 +0900 Subject: [PATCH 064/348] =?UTF-8?q?style:=20=EC=BD=94=EB=93=9C=20=EC=9E=AC?= =?UTF-8?q?=EC=A0=95=EB=A0=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- backend/bang-ggood/build.gradle | 32 +++++++++---------- .../main/java/com/bang_ggood/Application.java | 6 ++-- .../main/java/com/bang_ggood/BaseEntity.java | 2 +- .../repository/ChecklistRepository.java | 1 - .../exception/GlobalExceptionHandler.java | 3 +- .../java/com/bang_ggood/AcceptanceTest.java | 2 -- .../java/com/bang_ggood/JpaAuditingTest.java | 8 ++--- .../service/ChecklistServiceTest.java | 4 +-- .../src/test/resources/schema-test.sql | 8 ++--- 9 files changed, 32 insertions(+), 34 deletions(-) diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 10607b275..543fff752 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -1,33 +1,33 @@ plugins { - id 'java' - id 'org.springframework.boot' version '3.3.2' - id 'io.spring.dependency-management' version '1.1.6' + id 'java' + id 'org.springframework.boot' version '3.3.2' + id 'io.spring.dependency-management' version '1.1.6' } group = 'com.bang-ggood' version = '0.0.1-SNAPSHOT' java { - toolchain { - languageVersion = JavaLanguageVersion.of(17) - } + toolchain { + languageVersion = JavaLanguageVersion.of(17) + } } repositories { - mavenCentral() + mavenCentral() } dependencies { - implementation 'org.springframework.boot:spring-boot-starter-data-jpa' - implementation 'org.springframework.boot:spring-boot-starter-web' - implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' - implementation 'org.springframework.boot:spring-boot-starter-validation' - runtimeOnly 'com.h2database:h2' - testImplementation 'org.springframework.boot:spring-boot-starter-test' - testImplementation 'io.rest-assured:rest-assured:5.3.1' - testRuntimeOnly 'org.junit.platform:junit-platform-launcher' + implementation 'org.springframework.boot:spring-boot-starter-data-jpa' + implementation 'org.springframework.boot:spring-boot-starter-web' + implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' + implementation 'org.springframework.boot:spring-boot-starter-validation' + runtimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' + testImplementation 'io.rest-assured:rest-assured:5.3.1' + testRuntimeOnly 'org.junit.platform:junit-platform-launcher' } tasks.named('test') { - useJUnitPlatform() + useJUnitPlatform() } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java index d6f4ca2d1..c6b0b749c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java @@ -8,8 +8,8 @@ @SpringBootApplication public class Application { - public static void main(String[] args) { - SpringApplication.run(Application.class, args); - } + public static void main(String[] args) { + SpringApplication.run(Application.class, args); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java index e97c6b62c..167f3c42c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java @@ -2,10 +2,10 @@ import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; +import java.time.LocalDateTime; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; -import java.time.LocalDateTime; @MappedSuperclass @EntityListeners(AuditingEntityListener.class) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 25afb320f..189bf3765 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -2,7 +2,6 @@ import com.bang_ggood.checklist.domain.Checklist; import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.stereotype.Repository; public interface ChecklistRepository extends JpaRepository { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java index fa25baa33..9ebbcc99f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -11,7 +11,8 @@ public class GlobalExceptionHandler { @ExceptionHandler(BangggoodException.class) - public ResponseEntity handleBangggoodException(BangggoodException exception, HttpServletRequest request) { + public ResponseEntity handleBangggoodException(BangggoodException exception, + HttpServletRequest request) { ExceptionResponse response = new ExceptionResponse( request.getMethod(), request.getRequestURI(), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java index 74d1038fc..b03d6c029 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java @@ -2,10 +2,8 @@ import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; -import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; -import org.springframework.context.annotation.Import; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.jdbc.Sql; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java index 129144be1..5ab054673 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java @@ -1,22 +1,22 @@ package com.bang_ggood; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.Table; +import java.time.LocalDateTime; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.annotation.DirtiesContext; -import java.time.LocalDateTime; import org.springframework.test.context.ActiveProfiles; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertAll; - @ActiveProfiles("test") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 0a1085ca6..f38e37afe 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -3,7 +3,6 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; import com.bang_ggood.exception.BangggoodException; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -31,7 +30,8 @@ void createChecklist() { @Test void createChecklistNotValidQuestionId() { //given & when & then - Assertions.assertThatThrownBy(() -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + Assertions.assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage("잘못된 질문 ID입니다."); } diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 789625ed9..0b93c1dfa 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -65,9 +65,9 @@ CREATE TABLE checklist_question CREATE TABLE test_entity ( - id bigint generated by default as identity, - name varchar(255) not null, - created_at TIMESTAMP not null, - modified_at TIMESTAMP not null, + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, primary key (id) ); From 24df1449d7db1b2c4b4b3bf8bde83eed0f6d23b6 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Tue, 23 Jul 2024 18:53:28 +0900 Subject: [PATCH 065/348] =?UTF-8?q?fix:=20merge=20=EC=B6=A9=EB=8F=8C=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../java/com/bang_ggood/checklist/service/ChecklistService.java | 2 +- .../src/main/java/com/bang_ggood/exception/ExceptionCode.java | 2 +- backend/bang-ggood/src/main/resources/data.sql | 2 +- backend/bang-ggood/src/test/resources/data-test.sql | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index b80f65e57..b74a9203c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -44,7 +44,7 @@ public ChecklistService(ChecklistRepository checklistRepository, RoomRepository public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); - Checklist checklist = new Checklist(new User(1L, "방끗"), room, checklistInfo.deposit(), checklistInfo.rent(), + Checklist checklist = new Checklist(new User(1L, "방방이"), room, checklistInfo.deposit(), checklistInfo.rent(), checklistInfo.contractTerm(), checklistInfo.realEstate()); checklistRepository.save(checklist); createChecklistOptions(checklistCreateRequest, checklist); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 9a89ddba0..c73cdb23a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -6,7 +6,7 @@ public enum ExceptionCode { INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."), INVALID_OPTION_ID(HttpStatus.BAD_REQUEST, "잘못된 옵션 ID입니다."), - INVALID_QUESTION_ID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."); + INVALID_QUESTION_ID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 73a63e361..31aaed9e4 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -1,2 +1,2 @@ INSERT INTO users(id, name, created_at, modified_at) -VALUES (1, '방끗', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); +VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index 73a63e361..31aaed9e4 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -1,2 +1,2 @@ INSERT INTO users(id, name, created_at, modified_at) -VALUES (1, '방끗', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); +VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); From 0aa98c06353b4b7da37a96dd84d752fe7f82bbab Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:01:14 +0900 Subject: [PATCH 066/348] =?UTF-8?q?refactor(Option):=20=EC=A0=91=EA=B7=BC?= =?UTF-8?q?=EC=A0=9C=EC=96=B4=EC=9E=90=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?Integer=EC=9D=84=20int=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../java/com/bang_ggood/checklist/domain/Option.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index fde66fc38..0eca5d189 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -3,6 +3,7 @@ import java.util.Arrays; public enum Option { + AIR_CONDITIONER(1, "에어컨"), REFRIGERATOR(2, "냉장고"), MICROWAVE_OVEN(3, "전자레인지"), @@ -18,16 +19,16 @@ public enum Option { DRYER(13, "건조기"), TV(14, "TV"); - private Integer id; - private String name; + private final int id; + private final String name; - Option(Integer id, String name) { + Option(int id, String name) { this.id = id; this.name = name; } - public static boolean contains(Integer id) { + public static boolean contains(int id) { return Arrays.stream(Option.values()) - .anyMatch(option -> option.id.equals(id)); + .anyMatch(option -> option.id == id); } } From 71e4c5370fd3942643c27afea01ea6138c1dbdd0 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:08:31 +0900 Subject: [PATCH 067/348] =?UTF-8?q?refactor(ChecklistService):=20=EB=B3=80?= =?UTF-8?q?=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistService.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index b74a9203c..d274848de 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -53,17 +53,17 @@ public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { } private void createChecklistOptions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - List options = checklistCreateRequest.options(); - validateOptions(options); - List checklistOptions = options.stream() + List optionIds = checklistCreateRequest.options(); + validateOptions(optionIds); + List checklistOptions = optionIds.stream() .map(option -> new ChecklistOption(checklist, option)) .toList(); checklistOptionRepository.saveAll(checklistOptions); } - private void validateOptions(List options) { - for (Integer option : options) { - if (!Option.contains(option)) { + private void validateOptions(List optionIds) { + for (Integer optionId : optionIds) { + if (!Option.contains(optionId)) { throw new BangggoodException(ExceptionCode.INVALID_OPTION_ID); } } From b48cd1a493443a3e694c17423534596537954e9f Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:13:02 +0900 Subject: [PATCH 068/348] =?UTF-8?q?test(ChecklistE2ETest):=20=EC=98=A4?= =?UTF-8?q?=ED=83=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/controller/ChecklistE2ETest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 16db766e3..75fd09cce 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -11,7 +11,7 @@ class ChecklistE2ETest extends AcceptanceTest { @DisplayName("체크리스트 방 정보 작성 성공") @Test - void crateChecklist() { + void createChecklist() { RestAssured.given().log().all() .contentType(ContentType.JSON) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) @@ -22,7 +22,7 @@ void crateChecklist() { @DisplayName("체크리스트 방 정보 작성 실패: 방 이름을 넣지 않은 경우") @Test - void crateChecklistNoRoomName() { + void createChecklistNoRoomName() { RestAssured.given().log().all() .contentType(ContentType.JSON) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) @@ -33,7 +33,7 @@ void crateChecklistNoRoomName() { @DisplayName("체크리스트 방 정보 작성 실패: 질문 ID를 넣지 않은 경우") @Test - void crateChecklistNoQuestionId() { + void createChecklistNoQuestionId() { RestAssured.given().log().all() .contentType(ContentType.JSON) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) From a65d8103163cceacd51f65e9319bb6b52e5e25c5 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:17:11 +0900 Subject: [PATCH 069/348] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EC=BB=A8=EB=B2=A4=EC=85=98=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../com/bang_ggood/checklist/controller/ChecklistE2ETest.java | 4 ++-- .../bang_ggood/checklist/service/ChecklistServiceTest.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 75fd09cce..cb658da64 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -22,7 +22,7 @@ void createChecklist() { @DisplayName("체크리스트 방 정보 작성 실패: 방 이름을 넣지 않은 경우") @Test - void createChecklistNoRoomName() { + void createChecklist_noRoomName_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) @@ -33,7 +33,7 @@ void createChecklistNoRoomName() { @DisplayName("체크리스트 방 정보 작성 실패: 질문 ID를 넣지 않은 경우") @Test - void createChecklistNoQuestionId() { + void createChecklist_noQuestionId_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index f38e37afe..bdb26a7c7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -28,7 +28,7 @@ void createChecklist() { @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") @Test - void createChecklistNotValidQuestionId() { + void createChecklist_invalidQuestionId_exception() { //given & when & then Assertions.assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) From 44694ef3dcc60787c3f868edb4ca968e3c5b36d4 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:20:37 +0900 Subject: [PATCH 070/348] =?UTF-8?q?test:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?= =?UTF-8?q?=EA=B0=92=20=EA=B2=AC=EA=B3=A0=ED=95=98=EA=B2=8C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../src/test/java/com/bang_ggood/IntegrationTestSupport.java | 2 ++ .../test/java/com/bang_ggood/checklist/domain/OptionTest.java | 2 +- .../java/com/bang_ggood/checklist/domain/QuestionListTest.java | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java b/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java index eec3fc800..c02b03a44 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/IntegrationTestSupport.java @@ -3,8 +3,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.test.context.ActiveProfiles; +import org.springframework.test.context.jdbc.Sql; @ActiveProfiles("test") @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +@Sql(scripts = {"/schema-test.sql", "/data-test.sql"}) public abstract class IntegrationTestSupport { } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java index 846ed5816..c9643e807 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java @@ -16,6 +16,6 @@ void contains_true() { @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") @Test void contains_false() { - assertThat(Option.contains(15)).isFalse(); + assertThat(Option.contains(9999)).isFalse(); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java index 0d93a0a97..a77435d1e 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java @@ -24,6 +24,6 @@ void contains_true() { @DisplayName("질문 리스트 포함 성공 : 포함하지 않는 경우") @Test void contains_false() { - assertThat(questionList.contains(100)).isFalse(); + assertThat(questionList.contains(9999)).isFalse(); } } From 6d9c9fcf74de1e5864464eedb47f16d2076cea69 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:21:37 +0900 Subject: [PATCH 071/348] =?UTF-8?q?test:=20=EC=A4=91=EB=B3=B5=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../com/bang_ggood/checklist/service/ChecklistServiceTest.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index bdb26a7c7..f82bff76a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -8,9 +8,7 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -@SpringBootTest class ChecklistServiceTest extends IntegrationTestSupport { @Autowired From fd384ebed9370cb0016cc1d024d51722cf8cbbc8 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:23:47 +0900 Subject: [PATCH 072/348] =?UTF-8?q?test:=20static=20import=20=EC=A0=81?= =?UTF-8?q?=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistServiceTest.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index f82bff76a..bd157b7c7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -1,10 +1,12 @@ package com.bang_ggood.checklist.service; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.exception.BangggoodException; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -21,14 +23,14 @@ void createChecklist() { long checklistId = checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST); //then - Assertions.assertThat(checklistId).isEqualTo(1); + assertThat(checklistId).isEqualTo(1); } @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") @Test void createChecklist_invalidQuestionId_exception() { //given & when & then - Assertions.assertThatThrownBy( + assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage("잘못된 질문 ID입니다."); From f2d17cbee15c6508451fa901bc267e666e738735 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:31:29 +0900 Subject: [PATCH 073/348] =?UTF-8?q?refactor:=20JoinColumn=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20nullable=20=EC=84=A4=EC=A0=95=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 2 -- .../java/com/bang_ggood/checklist/domain/ChecklistOption.java | 1 - .../java/com/bang_ggood/checklist/domain/ChecklistQuestion.java | 1 - 3 files changed, 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index c6b8a4d4b..61771df53 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -23,11 +23,9 @@ public class Checklist extends BaseEntity { private Long id; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(nullable = false) private User user; @OneToOne(fetch = FetchType.LAZY) - @JoinColumn(nullable = false) private Room room; private Integer deposit; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java index c3594c6b7..da24f71a3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java @@ -21,7 +21,6 @@ public class ChecklistOption extends BaseEntity { private Long id; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(nullable = false) private Checklist checklist; @Column(nullable = false) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 45d828678..79d297d2c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -20,7 +20,6 @@ public class ChecklistQuestion extends BaseEntity { private Long id; @ManyToOne(fetch = FetchType.LAZY) - @JoinColumn(nullable = false) private Checklist checklist; private int questionId; From d15d588bcef4a0b435a975bb9d8adb8ef152a2dc Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:33:32 +0900 Subject: [PATCH 074/348] =?UTF-8?q?refactor(Checklist):=20=EA=B8=B0?= =?UTF-8?q?=EB=B3=B8=20=EC=83=9D=EC=84=B1=EC=9E=90=20=ED=99=9C=EC=9A=A9?= =?UTF-8?q?=ED=95=B4=EC=84=9C=20=EC=83=9D=EC=84=B1=EC=9E=90=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../com/bang_ggood/checklist/domain/Checklist.java | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 61771df53..cbb74fcc5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToOne; import jakarta.persistence.Table; @@ -36,15 +35,6 @@ public class Checklist extends BaseEntity { private String realEstate; - public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { - this.user = null; - this.room = null; - this.deposit = deposit; - this.rent = rent; - this.contractTerm = contractTerm; - this.realEstate = realEstate; - } - public Checklist(User user, Room room, Integer deposit, Integer rent, Integer contractTerm, String realEstate) { this.user = user; this.room = room; @@ -54,6 +44,10 @@ public Checklist(User user, Room room, Integer deposit, Integer rent, Integer co this.realEstate = realEstate; } + public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { + this(null, null, deposit, rent, contractTerm, realEstate); + } + protected Checklist() { } From 1b3b8fa0a26018a6d1676232f39628c7ae796a23 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:34:18 +0900 Subject: [PATCH 075/348] =?UTF-8?q?refactor:=20URI=20=EB=AA=85=ED=99=95?= =?UTF-8?q?=ED=9E=88=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/controller/ChecklistController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index d73b36b48..7a80723cb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -21,6 +21,6 @@ public ChecklistController(ChecklistService checklistService) { @PostMapping("/checklists") public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateRequest checklistCreateRequest) { long checklistId = checklistService.createChecklist(checklistCreateRequest); - return ResponseEntity.created(URI.create("checklists/" + checklistId)).build(); + return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } } From 4dc0c8cfec5aab2771ee7247c803378e5e87ef4b Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 14:35:11 +0900 Subject: [PATCH 076/348] =?UTF-8?q?style:=20=EA=B0=80=EB=8F=85=EC=84=B1=20?= =?UTF-8?q?=EC=9E=88=EA=B2=8C=20=EC=BD=94=EB=93=9C=20=EA=B0=9C=ED=96=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../java/com/bang_ggood/checklist/service/ChecklistService.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index d274848de..eb9c47e67 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -43,10 +43,12 @@ public ChecklistService(ChecklistRepository checklistRepository, RoomRepository @Transactional public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); + ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); Checklist checklist = new Checklist(new User(1L, "방방이"), room, checklistInfo.deposit(), checklistInfo.rent(), checklistInfo.contractTerm(), checklistInfo.realEstate()); checklistRepository.save(checklist); + createChecklistOptions(checklistCreateRequest, checklist); createChecklistQuestions(checklistCreateRequest, checklist); return checklist.getId(); From 97d0979994231f6f984f00fbde1ea85b91bea44f Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 24 Jul 2024 14:51:13 +0900 Subject: [PATCH 077/348] =?UTF-8?q?feat:=20=EB=B1=83=EC=A7=80=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../com/bang_ggood/category/domain/Badge.java | 31 +++++++++++++++++++ .../bang_ggood/category/domain/Category.java | 18 ++++++----- 2 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java new file mode 100644 index 000000000..05645153f --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -0,0 +1,31 @@ +package com.bang_ggood.category.domain; + +public enum Badge { + + CLEAN("청결", "청결해요", "✨"), + ROOM_CONDITION("방 컨디션", "방 컨디션이 좋아요", "🏠"), + AMENITY("편의시설", "편의시설이 많아요", "🚇"), + OPTION("옵션", "옵션이 많아요", "🛋️"), + ENVIRONMENT("주거환경", "주거환경이 좋아요", "🌱"), + SECURITY("보안", "안전해요", "🔒"), + ECONOMIC("경제적", "경제적이에요", "💰") + ; + + private final String shortDescription; + private final String longDescription; + private final String emoji; + + Badge(String shortDescription, String longDescription, String emoji) { + this.shortDescription = shortDescription; + this.longDescription = longDescription; + this.emoji = emoji; + } + + public String getShortDescriptionWithEmoji() { + return this.emoji + this.shortDescription; + } + + public String getLongDescriptionWithEmoji() { + return this.emoji + this.longDescription; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 14f547670..1778a2d08 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -4,20 +4,22 @@ public enum Category { - CLEAN(1, "청결"), - ROOM_CONDITION(2, "방 컨디션"), - AMENITY(3, "편의시설"), - OPTION(4, "옵션"), - ENVIRONMENT(5, "주거환경"), - SECURITY(6, "보안"), - ECONOMIC(7, "경제적"); + CLEAN(1, "청결", Badge.CLEAN), + ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION), + AMENITY(3, "편의시설", Badge.AMENITY), + OPTION(4, "옵션", Badge.OPTION), + ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT), + SECURITY(6, "보안", Badge.SECURITY), + ECONOMIC(7, "경제적", Badge.ECONOMIC); private final int id; private final String description; + private final Badge badge; - Category(int id, String description) { + Category(int id, String description, Badge badge) { this.id = id; this.description = description; + this.badge = badge; } public static boolean contains(int id) { From 3e48abeefe4e3f234566cd5f2abaf8b1158b1aec Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:03:56 +0900 Subject: [PATCH 078/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=A9=20=EC=A0=95=EB=B3=B4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20=EA=B2=80=EC=A6=9D=20=EC=BD=94=EB=93=9C=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistService.java | 42 ++++++++++++++++--- .../bang_ggood/exception/ExceptionCode.java | 6 ++- .../checklist/ChecklistFixture.java | 18 ++++++++ .../service/ChecklistServiceTest.java | 30 +++++++++++++ 4 files changed, 89 insertions(+), 7 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index eb9c47e67..6c49b0de7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -16,7 +16,9 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; +import java.util.HashSet; import java.util.List; +import java.util.Set; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -64,27 +66,57 @@ private void createChecklistOptions(ChecklistCreateRequest checklistCreateReques } private void validateOptions(List optionIds) { + validateOptionDuplicate(optionIds); + validateOptionInvalid(optionIds); + } + + private void validateOptionDuplicate(List optionIds) { + Set set = new HashSet<>(); + optionIds.forEach(id -> { + if (!set.add(id)) { + throw new BangggoodException(ExceptionCode.OPTION_DUPLICATED); + } + }); + } + + private void validateOptionInvalid(List optionIds) { for (Integer optionId : optionIds) { if (!Option.contains(optionId)) { - throw new BangggoodException(ExceptionCode.INVALID_OPTION_ID); + throw new BangggoodException(ExceptionCode.INVALID_OPTION); } } } private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { List questions = checklistCreateRequest.questions(); + validateQuestion(questions); for (QuestionCreateRequest questionCreateRequest : questions) { Integer questionId = questionCreateRequest.questionId(); - validateQuestion(questionId); ChecklistQuestion checklistQuestion = new ChecklistQuestion(checklist, questionId, questionCreateRequest.answer()); checklistQuestionRepository.save(checklistQuestion); } } - private void validateQuestion(Integer questionId) { - if (!questionList.contains(questionId)) { - throw new BangggoodException(ExceptionCode.INVALID_QUESTION_ID); + private void validateQuestion(List questions) { + validateQuestionDuplicate(questions); + validateQuestionInvalid(questions); + } + + private void validateQuestionDuplicate(List questions) { + Set set = new HashSet<>(); + questions.forEach(question -> { + if (!set.add(question.questionId())) { + throw new BangggoodException(ExceptionCode.QUESTION_DUPLICATED); + } + }); + } + + private void validateQuestionInvalid(List questions) { + for (QuestionCreateRequest questionCreateRequest : questions) { + if (!questionList.contains(questionCreateRequest.questionId())) { + throw new BangggoodException(ExceptionCode.INVALID_QUESTION); + } } } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index c73cdb23a..33befed7f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -5,8 +5,10 @@ public enum ExceptionCode { INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."), - INVALID_OPTION_ID(HttpStatus.BAD_REQUEST, "잘못된 옵션 ID입니다."), - INVALID_QUESTION_ID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), + INVALID_OPTION(HttpStatus.BAD_REQUEST, "잘못된 옵션 ID입니다."), + OPTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 옵션이 존재합니다."), + INVALID_QUESTION(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), + QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 26f4aab54..bf62a9fb9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -55,4 +55,22 @@ public class ChecklistFixture { List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 9999), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index bd157b7c7..dc5ffdbae 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -35,4 +35,34 @@ void createChecklist_invalidQuestionId_exception() { .isInstanceOf(BangggoodException.class) .hasMessage("잘못된 질문 ID입니다."); } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 중복일 경우") + @Test + void createChecklist_duplicatedQuestionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage("중복된 질문이 존재합니다."); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 유효하지 않을 경우") + @Test + void createChecklist_invalidOptionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage("잘못된 옵션 ID입니다."); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 중복일 경우") + @Test + void createChecklist_duplicatedOptionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage("중복된 옵션이 존재합니다."); + } } From 0f66137433043e3b378b867b956ddc451ca8bdb7 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:20:55 +0900 Subject: [PATCH 079/348] =?UTF-8?q?feat:=20=EC=97=94=ED=8B=B0=ED=8B=B0?= =?UTF-8?q?=EC=97=90=20=EB=B6=88=ED=95=84=EC=9A=94=20Table=20=EC=96=B4?= =?UTF-8?q?=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 3 +-- .../java/com/bang_ggood/checklist/domain/ChecklistOption.java | 4 +--- .../com/bang_ggood/checklist/domain/ChecklistQuestion.java | 4 +--- .../src/main/java/com/bang_ggood/room/domain/Room.java | 2 -- 4 files changed, 3 insertions(+), 10 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index cbb74fcc5..d8d2eb177 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -10,10 +10,9 @@ import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; import jakarta.persistence.OneToOne; -import jakarta.persistence.Table; import java.util.Objects; -@Table(name = "checklist") + @Entity public class Checklist extends BaseEntity { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java index da24f71a3..8ce32723f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistOption.java @@ -7,12 +7,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; import java.util.Objects; -@Table(name = "checklist_option") + @Entity public class ChecklistOption extends BaseEntity { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 79d297d2c..b6639de37 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -6,12 +6,10 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.JoinColumn; import jakarta.persistence.ManyToOne; -import jakarta.persistence.Table; import java.util.Objects; -@Table(name = "checklist_question") + @Entity public class ChecklistQuestion extends BaseEntity { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index b6729e3f2..4f69a535f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -5,10 +5,8 @@ import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; -import jakarta.persistence.Table; import java.util.Objects; -@Table(name = "room") @Entity public class Room extends BaseEntity { From 2b22c5700935957d9702fd6f1cfc2723e2456907 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:48:42 +0900 Subject: [PATCH 080/348] =?UTF-8?q?test:=20hasMessage=20ExceptionCode=20?= =?UTF-8?q?=EC=82=AC=EC=9A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistServiceTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index dc5ffdbae..ed5c3359d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -7,6 +7,7 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -33,7 +34,7 @@ void createChecklist_invalidQuestionId_exception() { assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) - .hasMessage("잘못된 질문 ID입니다."); + .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); } @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 중복일 경우") @@ -43,7 +44,7 @@ void createChecklist_duplicatedQuestionId_exception() { assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) .isInstanceOf(BangggoodException.class) - .hasMessage("중복된 질문이 존재합니다."); + .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); } @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 유효하지 않을 경우") @@ -53,7 +54,7 @@ void createChecklist_invalidOptionId_exception() { assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) .isInstanceOf(BangggoodException.class) - .hasMessage("잘못된 옵션 ID입니다."); + .hasMessage(ExceptionCode.INVALID_OPTION.getMessage()); } @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 중복일 경우") @@ -63,6 +64,6 @@ void createChecklist_duplicatedOptionId_exception() { assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) .isInstanceOf(BangggoodException.class) - .hasMessage("중복된 옵션이 존재합니다."); + .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } } From 8fecebf2e785e9d2e90133cb3c2de9b177b309a5 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:49:24 +0900 Subject: [PATCH 081/348] refactor: QuestionList -> Questionlist Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../domain/{QuestionList.java => Questionlist.java} | 4 ++-- .../com/bang_ggood/checklist/service/ChecklistService.java | 6 +++--- .../domain/{QuestionListTest.java => QuestionlistTest.java} | 6 +++--- 3 files changed, 8 insertions(+), 8 deletions(-) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/{QuestionList.java => Questionlist.java} (98%) rename backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/{QuestionListTest.java => QuestionlistTest.java} (85%) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java similarity index 98% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java index a38a9f529..2d9fa19f5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/QuestionList.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java @@ -5,11 +5,11 @@ import org.springframework.stereotype.Component; @Component -public class QuestionList { +public class Questionlist { public Map questions; - public QuestionList() { + public Questionlist() { questions = new HashMap<>(); initClean(); initRoomCondition(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 6c49b0de7..d5ded2bda 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -4,7 +4,7 @@ import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.Option; -import com.bang_ggood.checklist.domain.QuestionList; +import com.bang_ggood.checklist.domain.Questionlist; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.ChecklistInfo; import com.bang_ggood.checklist.dto.QuestionCreateRequest; @@ -29,11 +29,11 @@ public class ChecklistService { private final RoomRepository roomRepository; private final ChecklistOptionRepository checklistOptionRepository; private final ChecklistQuestionRepository checklistQuestionRepository; - private final QuestionList questionList; + private final Questionlist questionList; public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, ChecklistOptionRepository checklistOptionRepository, - ChecklistQuestionRepository checklistQuestionRepository, QuestionList questionList) { + ChecklistQuestionRepository checklistQuestionRepository, Questionlist questionList) { this.checklistRepository = checklistRepository; this.roomRepository = roomRepository; this.checklistOptionRepository = checklistOptionRepository; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java similarity index 85% rename from backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java rename to backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java index a77435d1e..733b7d436 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionListTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java @@ -6,13 +6,13 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; -class QuestionListTest { +class QuestionlistTest { - private QuestionList questionList; + private Questionlist questionList; @BeforeEach void init() { - questionList = new QuestionList(); + questionList = new Questionlist(); } @DisplayName("질문 리스트 포함 성공: 포함하는 경우") From 58380b0b0d9498810638d5f34aea6c392c0bb2f5 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 15:52:11 +0900 Subject: [PATCH 082/348] =?UTF-8?q?refactor(Question):=20categoryId=20?= =?UTF-8?q?=ED=95=84=EB=93=9C=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/domain/Question.java | 8 +-- .../checklist/domain/Questionlist.java | 64 +++++++++---------- 2 files changed, 33 insertions(+), 39 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 82122da2d..0840637b4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -2,20 +2,14 @@ public class Question { - private final int categoryId; private final String title; private final String subtitle; - public Question(int categoryId, String title, String subtitle) { - this.categoryId = categoryId; + public Question(String title, String subtitle) { this.title = title; this.subtitle = subtitle; } - public int getCategoryId() { - return categoryId; - } - public String getTitle() { return title; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java index 2d9fa19f5..e08b23f61 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java @@ -25,55 +25,55 @@ public boolean contains(int questionId) { } private void initClean() { - questions.put(1, new Question(1, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.")); - questions.put(2, new Question(1, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.")); - questions.put(3, new Question(1, "에어컨 내부는 깨끗한가요?", null)); - questions.put(4, new Question(1, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.")); - questions.put(5, new Question(1, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.")); + questions.put(1, new Question("방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.")); + questions.put(2, new Question("방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.")); + questions.put(3, new Question("에어컨 내부는 깨끗한가요?", null)); + questions.put(4, new Question("벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.")); + questions.put(5, new Question("창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.")); } private void initRoomCondition() { - questions.put(6, new Question(2, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.")); - questions.put(7, new Question(2, "온수가 잘 나오나요?", null)); - questions.put(8, new Question(2, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null)); - questions.put(9, new Question(2, "보일러가 잘 동작하나요?", null)); - questions.put(10, new Question(2, "콘센트 위치와 갯수가 적절한가요?", null)); - questions.put(11, new Question(2, "벽지 상태가 양호한가요?", null)); + questions.put(6, new Question("수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.")); + questions.put(7, new Question("온수가 잘 나오나요?", null)); + questions.put(8, new Question("파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null)); + questions.put(9, new Question("보일러가 잘 동작하나요?", null)); + questions.put(10, new Question("콘센트 위치와 갯수가 적절한가요?", null)); + questions.put(11, new Question("벽지 상태가 양호한가요?", null)); } private void initAmenity() { - questions.put(12, new Question(3, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null)); - questions.put(13, new Question(3, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null)); - questions.put(14, new Question(3, "병원이나 약국이 가까운 곳에 있나요?", null)); + questions.put(12, new Question("지하철역과 버스 정류장이 가까운 곳에 있나요?", null)); + questions.put(13, new Question("편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null)); + questions.put(14, new Question("병원이나 약국이 가까운 곳에 있나요?", null)); } private void initOption() { - questions.put(15, new Question(4, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.")); - questions.put(16, new Question(4, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null)); + questions.put(15, new Question("옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.")); + questions.put(16, new Question("필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null)); } private void initEnvironment() { - questions.put(17, new Question(5, "햇빛이 잘 들어오나요?", null)); - questions.put(18, new Question(5, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.")); - questions.put(19, new Question(5, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.")); - questions.put(20, new Question(5, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.")); - questions.put(21, new Question(5, "1층에 음식점이 있지는 않나요?", null)); - questions.put(22, new Question(5, "집가는 길이 언덕이진 않나요?", null)); + questions.put(17, new Question("햇빛이 잘 들어오나요?", null)); + questions.put(18, new Question("환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.")); + questions.put(19, new Question("방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.")); + questions.put(20, new Question("주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.")); + questions.put(21, new Question("1층에 음식점이 있지는 않나요?", null)); + questions.put(22, new Question("집가는 길이 언덕이진 않나요?", null)); } private void initSecurity() { - questions.put(23, new Question(6, "출입구와 복도에 CCTV가 설치되어 있나요?", null)); - questions.put(24, new Question(6, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null)); - questions.put(25, new Question(6, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null)); - questions.put(26, new Question(6, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null)); - questions.put(27, new Question(6, "주변 도로가 밤에도 충분히 밝은가요?", null)); - questions.put(28, new Question(6, "화면이 달린 인터폰이 제공되나요?", null)); - questions.put(29, new Question(6, "옆 건물에서 잘 보이는 구조는 아닌가요?", null)); - questions.put(30, new Question(6, "관리자분이 함께 상주하시나요?", null)); + questions.put(23, new Question("출입구와 복도에 CCTV가 설치되어 있나요?", null)); + questions.put(24, new Question("집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null)); + questions.put(25, new Question("자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null)); + questions.put(26, new Question("화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null)); + questions.put(27, new Question("주변 도로가 밤에도 충분히 밝은가요?", null)); + questions.put(28, new Question("화면이 달린 인터폰이 제공되나요?", null)); + questions.put(29, new Question("옆 건물에서 잘 보이는 구조는 아닌가요?", null)); + questions.put(30, new Question("관리자분이 함께 상주하시나요?", null)); } private void initEconomic() { - questions.put(31, new Question(7, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.")); - questions.put(32, new Question(7, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.")); + questions.put(31, new Question("보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.")); + questions.put(32, new Question("교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.")); } } From ef373bdfb29c3e9d8c6ef6e67805ae9b73cf27c4 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:39:21 +0900 Subject: [PATCH 083/348] =?UTF-8?q?refactor:=20category=EC=97=90=20?= =?UTF-8?q?=EC=A7=88=EB=AC=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/category/domain/Category.java | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 14f547670..4edb649bd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,23 +1,26 @@ package com.bang_ggood.category.domain; import java.util.Arrays; +import java.util.List; public enum Category { - CLEAN(1, "청결"), - ROOM_CONDITION(2, "방 컨디션"), - AMENITY(3, "편의시설"), - OPTION(4, "옵션"), - ENVIRONMENT(5, "주거환경"), - SECURITY(6, "보안"), - ECONOMIC(7, "경제적"); + CLEAN(1, "청결", List.of(1, 2, 3, 4, 5)), + ROOM_CONDITION(2, "방 컨디션", List.of(6, 7, 8, 9, 10, 11)), + AMENITY(3, "편의시설", List.of(12, 13, 14)), + OPTION(4, "옵션", List.of(15, 16)), + ENVIRONMENT(5, "주거환경", List.of(17, 18, 19, 20, 21, 22)), + SECURITY(6, "보안", List.of(22, 23, 24, 25, 26, 27, 28, 29, 30)), + ECONOMIC(7, "경제적", List.of(31, 32)); private final int id; private final String description; + private final List questionIds; - Category(int id, String description) { + Category(int id, String description, List questionIds) { this.id = id; this.description = description; + this.questionIds = questionIds; } public static boolean contains(int id) { @@ -32,4 +35,8 @@ public int getId() { public String getDescription() { return description; } + + public List getQuestionIds() { + return questionIds; + } } From 356f7f4ed96feb7fe327d953f60f0af465828dfd Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:39:31 +0900 Subject: [PATCH 084/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?DTO=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/category/dto/CategoryQuestionsResponse.java | 7 +++++++ .../checklist/dto/ChecklistQuestionsResponse.java | 7 +++++++ .../com/bang_ggood/checklist/dto/QuestionResponse.java | 4 ++++ 3 files changed, 18 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java new file mode 100644 index 000000000..553223838 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.category.dto; + +import com.bang_ggood.checklist.dto.QuestionResponse; +import java.util.List; + +public record CategoryQuestionsResponse(Integer id, String categoryName, List questions) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java new file mode 100644 index 000000000..f04a230f9 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto; + +import com.bang_ggood.category.dto.CategoryQuestionsResponse; +import java.util.List; + +public record ChecklistQuestionsResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java new file mode 100644 index 000000000..d2b5184ff --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java @@ -0,0 +1,4 @@ +package com.bang_ggood.checklist.dto; + +public record QuestionResponse(Integer questionId, String title, String subtitle) { +} From 6af37c6ec7bdd5b7389c1799b8ecdcf810442012 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:39:55 +0900 Subject: [PATCH 085/348] =?UTF-8?q?refactor(Questionlist):=20=ED=95=84?= =?UTF-8?q?=EB=93=9C=20=EC=A0=91=EA=B7=BC=EC=A0=9C=EC=96=B4=EC=9E=90=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/checklist/domain/Questionlist.java | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java index e08b23f61..41ba9e861 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java @@ -1,5 +1,7 @@ package com.bang_ggood.checklist.domain; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import java.util.HashMap; import java.util.Map; import org.springframework.stereotype.Component; @@ -7,7 +9,7 @@ @Component public class Questionlist { - public Map questions; + private Map questions; public Questionlist() { questions = new HashMap<>(); @@ -76,4 +78,12 @@ private void initEconomic() { questions.put(31, new Question("보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.")); questions.put(32, new Question("교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.")); } + + public String getTitleByQuestionId(int questionId) { + return questions.get(questionId).getTitle(); + } + + public String getSubtitleByQuestionId(int questionId) { + return questions.get(questionId).getSubtitle(); + } } From 5f1a8571c7431a3846ed211103707329cdebdcbb Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:40:09 +0900 Subject: [PATCH 086/348] =?UTF-8?q?refactor:=20=EC=8A=A4=ED=82=A4=EB=A7=88?= =?UTF-8?q?=20=EC=9E=90=EB=A3=8C=ED=98=95=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- backend/bang-ggood/src/main/resources/schema.sql | 2 +- backend/bang-ggood/src/test/resources/schema-test.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 39833ee3d..f2dabe4f2 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -66,7 +66,7 @@ CREATE TABLE checklist_question CREATE TABLE category_priority ( id bigint generated by default as identity, - category_id tinyint not null, + category_id INTEGER not null, user_id bigint not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 2dfaae518..d660d5075 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -66,7 +66,7 @@ CREATE TABLE checklist_question CREATE TABLE if not exists category_priority ( id bigint generated by default as identity, - category_id tinyint not null, + category_id INTEGER not null, user_id bigint not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, From adfcd36508cfcbdb2bf1a0a368d94fd9e17c4d99 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:40:21 +0900 Subject: [PATCH 087/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../controller/ChecklistController.java | 7 ++++++ .../checklist/service/ChecklistService.java | 22 +++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 7a80723cb..aa8f51dd2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,10 +1,12 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; import com.bang_ggood.checklist.service.ChecklistService; import jakarta.validation.Valid; import java.net.URI; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -23,4 +25,9 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR long checklistId = checklistService.createChecklist(checklistCreateRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } + + @GetMapping("/checklists/questions") + public ResponseEntity readChecklistQuestions() { + return ResponseEntity.ok(checklistService.readChecklistQuestions()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index d5ded2bda..20ba26db6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -1,5 +1,7 @@ package com.bang_ggood.checklist.service; +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.CategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; @@ -7,7 +9,9 @@ import com.bang_ggood.checklist.domain.Questionlist; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.ChecklistInfo; +import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.QuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -16,6 +20,7 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; +import java.util.ArrayList; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -119,4 +124,21 @@ private void validateQuestionInvalid(List questions) { } } } + + public ChecklistQuestionsResponse readChecklistQuestions() { + List categoryQuestionsResponses = new ArrayList<>(); + for (Category category : Category.values()) { + List questionResponses = new ArrayList<>(); + for (Integer questionId : category.getQuestionIds()) { + QuestionResponse questionResponse = new QuestionResponse(questionId, + questionList.getTitleByQuestionId(questionId), + questionList.getSubtitleByQuestionId(questionId)); + questionResponses.add(questionResponse); + } + CategoryQuestionsResponse categoryQuestionsResponse = new CategoryQuestionsResponse(category.getId(), + category.getDescription(), questionResponses); + categoryQuestionsResponses.add(categoryQuestionsResponse); + } + return new ChecklistQuestionsResponse(categoryQuestionsResponses); + } } From 0268d7f6c8f877ea6c3ffc19497e737f3455b29c Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:44:26 +0900 Subject: [PATCH 088/348] =?UTF-8?q?refactor(ChecklistService):=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistService.java | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 20ba26db6..1ad52ad72 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -129,16 +129,20 @@ public ChecklistQuestionsResponse readChecklistQuestions() { List categoryQuestionsResponses = new ArrayList<>(); for (Category category : Category.values()) { List questionResponses = new ArrayList<>(); - for (Integer questionId : category.getQuestionIds()) { - QuestionResponse questionResponse = new QuestionResponse(questionId, - questionList.getTitleByQuestionId(questionId), - questionList.getSubtitleByQuestionId(questionId)); - questionResponses.add(questionResponse); - } - CategoryQuestionsResponse categoryQuestionsResponse = new CategoryQuestionsResponse(category.getId(), - category.getDescription(), questionResponses); + readChecklistQuestion(category, questionResponses); + + CategoryQuestionsResponse categoryQuestionsResponse = + new CategoryQuestionsResponse(category.getId(), category.getDescription(), questionResponses); categoryQuestionsResponses.add(categoryQuestionsResponse); } return new ChecklistQuestionsResponse(categoryQuestionsResponses); } + + private void readChecklistQuestion(Category category, List questionResponses) { + category.getQuestionIds().stream() + .map(questionId -> new QuestionResponse(questionId, + questionList.getTitleByQuestionId(questionId), + questionList.getSubtitleByQuestionId(questionId))) + .forEach(questionResponses::add); + } } From 8a46ba06bbe8b0c0d4883e8bf6f0727bc2734ac1 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:49:46 +0900 Subject: [PATCH 089/348] =?UTF-8?q?test:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?E2E=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistService.java | 2 +- .../checklist/controller/ChecklistE2ETest.java | 18 ++++++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 1ad52ad72..4d8744d78 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -130,7 +130,7 @@ public ChecklistQuestionsResponse readChecklistQuestions() { for (Category category : Category.values()) { List questionResponses = new ArrayList<>(); readChecklistQuestion(category, questionResponses); - + CategoryQuestionsResponse categoryQuestionsResponse = new CategoryQuestionsResponse(category.getId(), category.getDescription(), questionResponses); categoryQuestionsResponses.add(categoryQuestionsResponse); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index cb658da64..05c80eea7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,7 +1,11 @@ package com.bang_ggood.checklist.controller; +import static org.assertj.core.api.Assertions.assertThat; + import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.junit.jupiter.api.DisplayName; @@ -41,4 +45,18 @@ void createChecklist_noQuestionId_exception() { .then().log().all() .statusCode(400); } + + @DisplayName("체크리스트 질문 조회 성공") + @Test + void readChecklistQuestions() { + ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/checklists/questions") + .then().log().all() + .statusCode(200) + .extract() + .as(ChecklistQuestionsResponse.class); + + assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); + } } From 422e5409f324e20f4e6c2f6ad7615bebd900cea4 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:53:52 +0900 Subject: [PATCH 090/348] =?UTF-8?q?test:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/service/ChecklistServiceTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index ed5c3359d..f9428b552 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -5,7 +5,9 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import org.junit.jupiter.api.DisplayName; @@ -66,4 +68,14 @@ void createChecklist_duplicatedOptionId_exception() { .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } + + @DisplayName("체크리스트 질문 조회 성공") + @Test + void readChecklistQuestions() { + // given & when + ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(); + + // then + assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); + } } From e4a6be987a22d8aa42fa422f380bb93cb18dec77 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Wed, 24 Jul 2024 18:56:30 +0900 Subject: [PATCH 091/348] =?UTF-8?q?test:=20=EC=A7=88=EB=AC=B8=20=EC=A0=9C?= =?UTF-8?q?=EB=AA=A9,=20=EB=B6=80=EC=A0=9C=EB=AA=A9=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=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 Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../checklist/domain/QuestionlistTest.java | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java index 733b7d436..969470738 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java @@ -26,4 +26,18 @@ void contains_true() { void contains_false() { assertThat(questionList.contains(9999)).isFalse(); } + + @DisplayName("질문 제목 조회 성공") + @Test + void getTitle() { + assertThat(questionList.getTitleByQuestionId(1)) + .isEqualTo("방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?"); + } + + @DisplayName("질문 부제목 조회 성공") + @Test + void getSubtitle() { + assertThat(questionList.getSubtitleByQuestionId(1)) + .isEqualTo("천장, 벽면, 가구 뒤, 장판을 확인하세요."); + } } From 3ba8379423a965c2a92ecbff37b3f336faa672ff Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 24 Jul 2024 19:33:16 +0900 Subject: [PATCH 092/348] =?UTF-8?q?feat:=20=EB=B1=83=EC=A7=80=20=EC=84=A4?= =?UTF-8?q?=EB=AA=85=20=ED=8F=AC=EB=A7=B7=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../src/main/java/com/bang_ggood/category/domain/Badge.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java index 05645153f..a5ba44027 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -11,6 +11,8 @@ public enum Badge { ECONOMIC("경제적", "경제적이에요", "💰") ; + private static final String DESCRIPTION_FORMAT = "%s %s"; + private final String shortDescription; private final String longDescription; private final String emoji; @@ -22,10 +24,10 @@ public enum Badge { } public String getShortDescriptionWithEmoji() { - return this.emoji + this.shortDescription; + return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortDescription); } public String getLongDescriptionWithEmoji() { - return this.emoji + this.longDescription; + return String.format(DESCRIPTION_FORMAT, this.emoji, this.longDescription); } } From 0de41fc24926c34de05f020338fc47c530f19709 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 24 Jul 2024 23:35:04 +0900 Subject: [PATCH 093/348] =?UTF-8?q?feat:=20=EB=B1=83=EC=A7=80=20=EA=B8=B0?= =?UTF-8?q?=EB=8A=A5=20=EC=A4=91=EA=B0=84=20=EC=A0=80=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/category/domain/Category.java | 42 +++++++++++++++---- .../checklist/domain/Checklist.java | 9 ++++ .../bang_ggood/checklist/domain/Grade.java | 17 ++++++++ .../checklist/dto/BadgeResponse.java | 4 ++ .../dto/UserChecklistPreviewResponse.java | 10 +++++ .../dto/UserChecklistsPreviewResponse.java | 6 +++ .../repository/ChecklistRepository.java | 4 ++ .../checklist/service/ChecklistService.java | 31 +++++++++++++- 8 files changed, 113 insertions(+), 10 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 1778a2d08..9d85f84de 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,25 +1,30 @@ package com.bang_ggood.category.domain; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; import java.util.Arrays; +import java.util.List; public enum Category { - CLEAN(1, "청결", Badge.CLEAN), - ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION), - AMENITY(3, "편의시설", Badge.AMENITY), - OPTION(4, "옵션", Badge.OPTION), - ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT), - SECURITY(6, "보안", Badge.SECURITY), - ECONOMIC(7, "경제적", Badge.ECONOMIC); + CLEAN(1, "청결", Badge.CLEAN, List.of(1, 2, 3, 4, 5)), + ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION, List.of(6, 7, 8, 9, 10, 11)), + AMENITY(3, "편의시설", Badge.AMENITY, List.of(12, 13, 14)), + OPTION(4, "옵션", Badge.OPTION, List.of(15, 16)), + ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT, List.of(17, 18, 19, 20, 21, 22)), + SECURITY(6, "보안", Badge.SECURITY, List.of(22, 23, 24, 25, 26, 27, 28, 29, 30)), + ECONOMIC(7, "경제적", Badge.ECONOMIC, List.of(31, 32)); private final int id; private final String description; private final Badge badge; + private final List questionIds; - Category(int id, String description, Badge badge) { + Category(int id, String description, Badge badge, List questionIds) { this.id = id; this.description = description; this.badge = badge; + this.questionIds = questionIds; } public static boolean contains(int id) { @@ -34,4 +39,25 @@ public int getId() { public String getDescription() { return description; } + + public Badge getBadge() { return badge; } + + public static List getBadges(List questions) { + return Arrays.stream(values()) + .filter(category -> { + List questionIds = category.questionIds; + List categoryQuestions = questions.stream() + .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) + .toList(); + + int maxScore = Grade.calculateMaxScore(categoryQuestions.size()); + int score = categoryQuestions.stream() + .mapToInt(question -> Grade.getScore(question.getAnswer())) + .sum(); + + return (score / maxScore) * 100 >= 80; + }) + .map(Category::getBadge) + .toList(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index d8d2eb177..a50c2098c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -9,7 +9,9 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; +import jakarta.persistence.OneToMany; import jakarta.persistence.OneToOne; +import java.util.List; import java.util.Objects; @@ -34,6 +36,9 @@ public class Checklist extends BaseEntity { private String realEstate; + @OneToMany(mappedBy = "checklist_question") + private List questions; + public Checklist(User user, Room room, Integer deposit, Integer rent, Integer contractTerm, String realEstate) { this.user = user; this.room = room; @@ -78,6 +83,10 @@ public String getRealEstate() { return realEstate; } + public List getQuestions() { + return questions; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index 25d3b49f4..ec2cc11c1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -1,11 +1,28 @@ package com.bang_ggood.checklist.domain; +import java.util.Arrays; + public enum Grade { GOOD(3), SOSO(2), BAD(1); + private final int score; + Grade(int score) { + this.score = score; + } + + public static int calculateMaxScore(int size) { + return GOOD.score * size; + } + + public static int getScore(String answer) { + return Arrays.stream(values()) + .filter(grade -> grade.name().equals(answer)) + .findAny() + .get() + .score; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java new file mode 100644 index 000000000..e79da1cc0 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java @@ -0,0 +1,4 @@ +package com.bang_ggood.checklist.dto; + +public record BadgeResponse(String shortName, String longName) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java new file mode 100644 index 000000000..6b36d1388 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto; + +import java.time.LocalDateTime; +import java.util.List; + +public record UserChecklistPreviewResponse( + Long checklistId, String roomName, String address, + Integer deposit, Integer rent, LocalDateTime createdAt, + List badge) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java new file mode 100644 index 000000000..ab602984d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto; + +import java.util.List; + +public record UserChecklistsPreviewResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 189bf3765..1420528d5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -1,7 +1,11 @@ package com.bang_ggood.checklist.repository; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; public interface ChecklistRepository extends JpaRepository { + + List findByUser(User user); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index d5ded2bda..4420db11a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -1,13 +1,17 @@ package com.bang_ggood.checklist.service; +import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Questionlist; +import com.bang_ggood.checklist.dto.BadgeResponse; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.ChecklistInfo; import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -16,11 +20,11 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.HashSet; import java.util.List; import java.util.Set; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class ChecklistService { @@ -119,4 +123,27 @@ private void validateQuestionInvalid(List questions) { } } } + + public UserChecklistsPreviewResponse readUserChecklistsPreview() { + User user = new User(1L, "방방이"); + List checklists = checklistRepository.findByUser(user); + + List responses = checklists.stream() + .map(checklist -> new UserChecklistPreviewResponse( + checklist.getId(), + checklist.getRoom().getName(), + checklist.getRoom().getAddress(), + checklist.getDeposit(), + checklist.getRent(), + checklist.getCreatedAt(), + Category.getBadges(checklist.getQuestions()).stream() + .map(badge -> new BadgeResponse(badge.getShortDescriptionWithEmoji(), + badge.getLongDescriptionWithEmoji())) + .toList() + + )) + .toList(); + + return new UserChecklistsPreviewResponse(responses); + } } From b4b20ded9157fb2ed8b71ea697083c862536e892 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:25:03 +0900 Subject: [PATCH 094/348] =?UTF-8?q?refactor(ChecklistService):=20=EB=A9=94?= =?UTF-8?q?=EC=84=9C=EB=93=9C=20=EB=B0=98=ED=99=98=20=ED=83=80=EC=9E=85=20?= =?UTF-8?q?List=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/checklist/service/ChecklistService.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 4d8744d78..02df134fd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -128,21 +128,20 @@ private void validateQuestionInvalid(List questions) { public ChecklistQuestionsResponse readChecklistQuestions() { List categoryQuestionsResponses = new ArrayList<>(); for (Category category : Category.values()) { - List questionResponses = new ArrayList<>(); - readChecklistQuestion(category, questionResponses); - CategoryQuestionsResponse categoryQuestionsResponse = - new CategoryQuestionsResponse(category.getId(), category.getDescription(), questionResponses); + new CategoryQuestionsResponse(category.getId(), category.getDescription(), readChecklistQuestion(category)); categoryQuestionsResponses.add(categoryQuestionsResponse); } return new ChecklistQuestionsResponse(categoryQuestionsResponses); } - private void readChecklistQuestion(Category category, List questionResponses) { + private List readChecklistQuestion(Category category) { + List questionResponses = new ArrayList<>(); category.getQuestionIds().stream() .map(questionId -> new QuestionResponse(questionId, questionList.getTitleByQuestionId(questionId), questionList.getSubtitleByQuestionId(questionId))) .forEach(questionResponses::add); + return questionResponses; } } From bd3d8d660539b8d5aa2c0d1b27d7e48c7b80302c Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 10:32:51 +0900 Subject: [PATCH 095/348] =?UTF-8?q?refactor(Category):=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=20=EC=A0=80=EC=9E=A5=ED=95=98=EB=8A=94=20=EC=9E=90?= =?UTF-8?q?=EB=A3=8C=ED=98=95=20Set=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/category/domain/Category.java | 23 ++++++++++--------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 4edb649bd..2f66e2259 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,23 +1,24 @@ package com.bang_ggood.category.domain; import java.util.Arrays; -import java.util.List; +import java.util.LinkedHashSet; +import java.util.Set; public enum Category { - CLEAN(1, "청결", List.of(1, 2, 3, 4, 5)), - ROOM_CONDITION(2, "방 컨디션", List.of(6, 7, 8, 9, 10, 11)), - AMENITY(3, "편의시설", List.of(12, 13, 14)), - OPTION(4, "옵션", List.of(15, 16)), - ENVIRONMENT(5, "주거환경", List.of(17, 18, 19, 20, 21, 22)), - SECURITY(6, "보안", List.of(22, 23, 24, 25, 26, 27, 28, 29, 30)), - ECONOMIC(7, "경제적", List.of(31, 32)); + CLEAN(1, "청결", new LinkedHashSet<>(Set.of(1, 2, 3, 4, 5))), + ROOM_CONDITION(2, "방 컨디션", new LinkedHashSet<>(Set.of(6, 7, 8, 9, 10, 11))), + AMENITY(3, "편의시설", new LinkedHashSet<>(Set.of(12, 13, 14))), + OPTION(4, "옵션", new LinkedHashSet<>(Set.of(15, 16))), + ENVIRONMENT(5, "주거환경", new LinkedHashSet<>(Set.of(17, 18, 19, 20, 21, 22))), + SECURITY(6, "보안", new LinkedHashSet<>(Set.of(22, 23, 24, 25, 26, 27, 28, 29, 30))), + ECONOMIC(7, "경제적", new LinkedHashSet<>(Set.of(31, 32))); private final int id; private final String description; - private final List questionIds; + private final Set questionIds; - Category(int id, String description, List questionIds) { + Category(int id, String description, Set questionIds) { this.id = id; this.description = description; this.questionIds = questionIds; @@ -36,7 +37,7 @@ public String getDescription() { return description; } - public List getQuestionIds() { + public Set getQuestionIds() { return questionIds; } } From 61ff6bdbacf4e6fdb537535a1fa386fd4c8567e6 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Thu, 25 Jul 2024 10:57:20 +0900 Subject: [PATCH 096/348] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../bang_ggood/category/domain/Category.java | 6 ++- .../controller/ChecklistController.java | 9 +++- .../checklist/domain/Checklist.java | 8 +++- .../checklist/dto/BadgeResponse.java | 6 +++ .../dto/UserChecklistPreviewResponse.java | 12 +++++ .../checklist/service/ChecklistService.java | 22 ++++----- .../category/domain/CategoryTest.java | 48 +++++++++++++++++++ 7 files changed, 93 insertions(+), 18 deletions(-) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 9d85f84de..6e047b736 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -49,13 +49,15 @@ public static List getBadges(List questions) { List categoryQuestions = questions.stream() .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) .toList(); - + if (categoryQuestions.isEmpty()) { + return false; + } int maxScore = Grade.calculateMaxScore(categoryQuestions.size()); int score = categoryQuestions.stream() .mapToInt(question -> Grade.getScore(question.getAnswer())) .sum(); - return (score / maxScore) * 100 >= 80; + return (score * 100 / maxScore) >= 80; }) .map(Category::getBadge) .toList(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 7a80723cb..1681fae63 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,13 +1,15 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.service.ChecklistService; import jakarta.validation.Valid; -import java.net.URI; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.URI; @RestController public class ChecklistController { @@ -23,4 +25,9 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR long checklistId = checklistService.createChecklist(checklistCreateRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } + + @GetMapping("/checklists") + public ResponseEntity readUserChecklistsPreview() { + return ResponseEntity.ok(checklistService.readUserChecklistsPreview()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index a50c2098c..688d62afb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -63,8 +63,12 @@ public User getUser() { return user; } - public Room getRoom() { - return room; + public String getRoomName() { + return room.getName(); + } + + public String getRoomAddress() { + return room.getAddress(); } public Integer getDeposit() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java index e79da1cc0..fb5af75de 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java @@ -1,4 +1,10 @@ package com.bang_ggood.checklist.dto; +import com.bang_ggood.category.domain.Badge; + public record BadgeResponse(String shortName, String longName) { + + public static BadgeResponse from(Badge badge) { + return new BadgeResponse(badge.getShortDescriptionWithEmoji(), badge.getLongDescriptionWithEmoji()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java index 6b36d1388..8d83211e8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java @@ -1,5 +1,6 @@ package com.bang_ggood.checklist.dto; +import com.bang_ggood.checklist.domain.Checklist; import java.time.LocalDateTime; import java.util.List; @@ -7,4 +8,15 @@ public record UserChecklistPreviewResponse( Long checklistId, String roomName, String address, Integer deposit, Integer rent, LocalDateTime createdAt, List badge) { + + public static UserChecklistPreviewResponse of(Checklist checklist, List badges) { + return new UserChecklistPreviewResponse( + checklist.getId(), + checklist.getRoomName(), + checklist.getRoomAddress(), + checklist.getDeposit(), + checklist.getRent(), + checklist.getCreatedAt(), + badges); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 4420db11a..5905006cd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -129,21 +129,17 @@ public UserChecklistsPreviewResponse readUserChecklistsPreview() { List checklists = checklistRepository.findByUser(user); List responses = checklists.stream() - .map(checklist -> new UserChecklistPreviewResponse( - checklist.getId(), - checklist.getRoom().getName(), - checklist.getRoom().getAddress(), - checklist.getDeposit(), - checklist.getRent(), - checklist.getCreatedAt(), - Category.getBadges(checklist.getQuestions()).stream() - .map(badge -> new BadgeResponse(badge.getShortDescriptionWithEmoji(), - badge.getLongDescriptionWithEmoji())) - .toList() - - )) + .map(checklist -> UserChecklistPreviewResponse.of( + checklist, + createBadges(checklist.getQuestions()))) .toList(); return new UserChecklistsPreviewResponse(responses); } + + private List createBadges(List questions) { + return Category.getBadges(questions).stream() + .map(BadgeResponse::from) + .toList(); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java new file mode 100644 index 000000000..ee99c5e76 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java @@ -0,0 +1,48 @@ +package com.bang_ggood.category.domain; + +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import java.util.List; + +class CategoryTest { + + @DisplayName("뱃지 부여 : 카테고리 총점이 80점 이상일 때") + @Test + void getBadges() { + // given + + // 청결 + List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), + new ChecklistQuestion(null, 2, "GOOD"), + new ChecklistQuestion(null, 3, "GOOD"), + new ChecklistQuestion(null, 4, "SOSO"), + new ChecklistQuestion(null, 5, "BAD")); + + // when + List badges = Category.getBadges(questions); + + // then + Assertions.assertThat(badges).containsExactly(Badge.CLEAN); + } + + @DisplayName("뱃지 미부여 : 카테고리 총점이 80점 미만일 때") + @Test + void getBadges_NoBadges() { + // given + + // 청결 + List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), + new ChecklistQuestion(null, 2, "GOOD"), + new ChecklistQuestion(null, 3, "GOOD"), + new ChecklistQuestion(null, 4, "BAD"), + new ChecklistQuestion(null, 5, "BAD")); + + // when + List badges = Category.getBadges(questions); + + // then + Assertions.assertThat(badges).isEmpty(); + } +} From f44b0f4866ef271e7ff5fa676dfc4911fcd696ba Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Thu, 25 Jul 2024 11:18:11 +0900 Subject: [PATCH 097/348] =?UTF-8?q?fix:=20=EC=BD=94=EB=93=9C=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bang_ggood/category/domain/Category.java | 10 ++++++---- .../checklist/controller/ChecklistController.java | 1 + .../com/bang_ggood/checklist/domain/Checklist.java | 2 +- .../bang_ggood/checklist/service/ChecklistService.java | 10 ++++++---- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 006e4554f..990640370 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -4,6 +4,7 @@ import com.bang_ggood.checklist.domain.Grade; import java.util.Arrays; import java.util.LinkedHashSet; +import java.util.List; import java.util.Set; public enum Category { @@ -43,10 +44,14 @@ public String getDescription() { public Badge getBadge() { return badge; } + public Set getQuestionIds() { + return questionIds; + } + public static List getBadges(List questions) { return Arrays.stream(values()) .filter(category -> { - List questionIds = category.questionIds; + Set questionIds = category.questionIds; List categoryQuestions = questions.stream() .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) .toList(); @@ -62,8 +67,5 @@ public static List getBadges(List questions) { }) .map(Category::getBadge) .toList(); - - public Set getQuestionIds() { - return questionIds; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 07ef3559c..4bfe4c61a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -30,6 +30,7 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR @GetMapping("/checklists") public ResponseEntity readUserChecklistsPreview() { return ResponseEntity.ok(checklistService.readUserChecklistsPreview()); + } @GetMapping("/checklists/questions") public ResponseEntity readChecklistQuestions() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 688d62afb..6188cd8c5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -36,7 +36,7 @@ public class Checklist extends BaseEntity { private String realEstate; - @OneToMany(mappedBy = "checklist_question") + @OneToMany(mappedBy = "checklist") private List questions; public Checklist(User user, Room room, Integer deposit, Integer rent, Integer contractTerm, String realEstate) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index c1b60cc22..879fa5cec 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -12,9 +12,9 @@ import com.bang_ggood.checklist.dto.ChecklistInfo; import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.QuestionResponse; import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.dto.QuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -145,12 +145,14 @@ private List createBadges(List questions) { return Category.getBadges(questions).stream() .map(BadgeResponse::from) .toList(); - - public ChecklistQuestionsResponse readChecklistQuestions() { + } + + public ChecklistQuestionsResponse readChecklistQuestions () { List categoryQuestionsResponses = new ArrayList<>(); for (Category category : Category.values()) { CategoryQuestionsResponse categoryQuestionsResponse = - new CategoryQuestionsResponse(category.getId(), category.getDescription(), readChecklistQuestion(category)); + new CategoryQuestionsResponse(category.getId(), category.getDescription(), + readChecklistQuestion(category)); categoryQuestionsResponses.add(categoryQuestionsResponse); } return new ChecklistQuestionsResponse(categoryQuestionsResponses); From 943753ea09d1a0f2ff1f79d8d23951804d17121b Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Thu, 25 Jul 2024 15:42:21 +0900 Subject: [PATCH 098/348] =?UTF-8?q?feat:=20=EB=B0=A9=EB=B9=84=EA=B5=90=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/category/domain/Category.java | 51 ++++++++++-------- .../controller/ChecklistController.java | 10 +++- .../checklist/domain/Checklist.java | 6 +++ .../dto/CategoryScoreReadResponse.java | 6 +++ .../dto/ChecklistComparisonReadResponse.java | 29 ++++++++++ .../dto/ChecklistsComparisonReadResponse.java | 6 +++ .../repository/ChecklistOptionRepository.java | 3 ++ .../repository/ChecklistRepository.java | 1 + .../checklist/service/ChecklistService.java | 53 ++++++++++++++++++- .../exception/GlobalExceptionHandler.java | 3 +- .../category/domain/CategoryTest.java | 43 +++++++++++++-- 11 files changed, 184 insertions(+), 27 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 990640370..c9efda915 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -34,6 +34,36 @@ public static boolean contains(int id) { .anyMatch(category -> category.id == id); } + // 2. 뱃지 부여 + public static List getBadges(List questions) { + return Arrays.stream(values()) + .filter(category -> category.calculateTotalScore(questions) >= 80) + .map(Category::getBadge) + .toList(); + } + + // 1. 총점 : score * 100 / maxScore + public int calculateTotalScore(List questions) { + List filteredQuestions = filterQuestion(questions); + + if (filteredQuestions.isEmpty()) { + return 0; + } + + int maxScore = Grade.calculateMaxScore(filteredQuestions.size()); + int score = filteredQuestions.stream() + .mapToInt(question -> Grade.getScore(question.getAnswer())) + .sum(); + + return score * 100 / maxScore; + } + + private List filterQuestion(List questions) { + return questions.stream() + .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) + .toList(); + } + public int getId() { return id; } @@ -47,25 +77,4 @@ public String getDescription() { public Set getQuestionIds() { return questionIds; } - - public static List getBadges(List questions) { - return Arrays.stream(values()) - .filter(category -> { - Set questionIds = category.questionIds; - List categoryQuestions = questions.stream() - .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) - .toList(); - if (categoryQuestions.isEmpty()) { - return false; - } - int maxScore = Grade.calculateMaxScore(categoryQuestions.size()); - int score = categoryQuestions.stream() - .mapToInt(question -> Grade.getScore(question.getAnswer())) - .sum(); - - return (score * 100 / maxScore) >= 80; - }) - .map(Category::getBadge) - .toList(); - } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 4bfe4c61a..7e933e66b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,16 +1,19 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; +import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.service.ChecklistService; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.net.URI; +import java.util.List; @RestController public class ChecklistController { @@ -36,4 +39,9 @@ public ResponseEntity readUserChecklistsPreview() public ResponseEntity readChecklistQuestions() { return ResponseEntity.ok(checklistService.readChecklistQuestions()); } + + @GetMapping("/checklists/comparison") + public ResponseEntity readChecklistsComparison(@RequestParam("id")List checklistIds) { + return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 6188cd8c5..68120e8e1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -71,6 +71,12 @@ public String getRoomAddress() { return room.getAddress(); } + public Integer getRoomFloor() { return room.getFloor(); } + + public String getRoomStation() { return room.getStation(); } + + public Integer getRoomWalkingTime() { return room.getWalkingTime(); } + public Integer getDeposit() { return deposit; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java new file mode 100644 index 000000000..30278b78e --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto; + +public record CategoryScoreReadResponse( + Integer categoryId, String categoryName, Integer score +) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java new file mode 100644 index 000000000..b7669d06c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java @@ -0,0 +1,29 @@ +package com.bang_ggood.checklist.dto; + +import com.bang_ggood.checklist.domain.Checklist; +import java.util.List; + +public record ChecklistComparisonReadResponse( + Long checklistId, String roomName, String address, + Integer floor, Integer deposit, Integer rent, + Integer contractTerm, String station, Integer walkingTime, + Integer optionCount, Integer score, + List categories +) { + public static ChecklistComparisonReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, List categoryScores) { + return new ChecklistComparisonReadResponse( + checklist.getId(), + checklist.getRoomName(), + checklist.getRoomAddress(), + checklist.getRoomFloor(), + checklist.getDeposit(), + checklist.getRent(), + checklist.getContractTerm(), + checklist.getRoomStation(), + checklist.getRoomWalkingTime(), + checklistOptionCount, + checklistScore, + categoryScores + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java new file mode 100644 index 000000000..f9968c4bb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto; + +import java.util.List; + +public record ChecklistsComparisonReadResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 8ed6404d4..cff60ee03 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -1,7 +1,10 @@ package com.bang_ggood.checklist.repository; +import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import org.springframework.data.jpa.repository.JpaRepository; public interface ChecklistOptionRepository extends JpaRepository { + + Integer countByChecklist(Checklist checklist); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 1420528d5..97ad12149 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -8,4 +8,5 @@ public interface ChecklistRepository extends JpaRepository { List findByUser(User user); + List findByUserAndIdIn(User user, List checklistIds); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 879fa5cec..ca9345620 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -8,9 +8,12 @@ import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Questionlist; import com.bang_ggood.checklist.dto.BadgeResponse; +import com.bang_ggood.checklist.dto.CategoryScoreReadResponse; +import com.bang_ggood.checklist.dto.ChecklistComparisonReadResponse; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.ChecklistInfo; import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; import com.bang_ggood.checklist.dto.QuestionCreateRequest; import com.bang_ggood.checklist.dto.QuestionResponse; import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; @@ -26,6 +29,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; @@ -147,7 +151,7 @@ private List createBadges(List questions) { .toList(); } - public ChecklistQuestionsResponse readChecklistQuestions () { + public ChecklistQuestionsResponse readChecklistQuestions() { List categoryQuestionsResponses = new ArrayList<>(); for (Category category : Category.values()) { CategoryQuestionsResponse categoryQuestionsResponse = @@ -167,4 +171,51 @@ private List readChecklistQuestion(Category category) { .forEach(questionResponses::add); return questionResponses; } + + @Transactional + public ChecklistsComparisonReadResponse readChecklistsComparison(List checklistIds) { + User user = new User(1L, "방끗"); + + List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) + .stream() + .map(checklist -> { + // 카테고리별 총점 + List categoryScores = calculateCategoryScores(checklist); + + // 체크리스트 총점 + int checklistScore = calculateChecklistScore(categoryScores); + + // 옵션 개수 + int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); + + return ChecklistComparisonReadResponse.of( + checklist, checklistOptionCount, checklistScore, categoryScores);}) + .sorted(Comparator.comparing(ChecklistComparisonReadResponse::score).reversed()) + .toList(); + + return new ChecklistsComparisonReadResponse(responses); + } + + private List calculateCategoryScores(Checklist checklist) { + List categoryScores = new ArrayList<>(); + + for (Category category : Category.values()) { + int categoryScore = category.calculateTotalScore(checklist.getQuestions()); + if (categoryScore != 0) { + categoryScores.add(new CategoryScoreReadResponse( + category.getId(), + category.getDescription(), + categoryScore + )); + } + } + + return categoryScores; + } + + private int calculateChecklistScore(List categoryScores) { + return categoryScores.stream() + .mapToInt(CategoryScoreReadResponse::score) + .sum() / categoryScores.size(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java index 9ebbcc99f..4c62e8e8d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -22,7 +22,8 @@ public ResponseEntity handleBangggoodException(BangggoodExcep } @ExceptionHandler(RuntimeException.class) - public ResponseEntity handleRuntimeException(HttpServletRequest request) { + public ResponseEntity handleRuntimeException(RuntimeException runtimeException, HttpServletRequest request) { + runtimeException.printStackTrace(); ExceptionResponse response = new ExceptionResponse( request.getMethod(), request.getRequestURI(), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java index ee99c5e76..689b2b33f 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java @@ -1,11 +1,14 @@ package com.bang_ggood.category.domain; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import java.util.List; +import static com.bang_ggood.category.domain.Category.CLEAN; +import static com.bang_ggood.category.domain.Category.SECURITY; +import static org.assertj.core.api.Assertions.assertThat; + class CategoryTest { @DisplayName("뱃지 부여 : 카테고리 총점이 80점 이상일 때") @@ -24,7 +27,7 @@ void getBadges() { List badges = Category.getBadges(questions); // then - Assertions.assertThat(badges).containsExactly(Badge.CLEAN); + assertThat(badges).containsExactly(Badge.CLEAN); } @DisplayName("뱃지 미부여 : 카테고리 총점이 80점 미만일 때") @@ -43,6 +46,40 @@ void getBadges_NoBadges() { List badges = Category.getBadges(questions); // then - Assertions.assertThat(badges).isEmpty(); + assertThat(badges).isEmpty(); + } + + @DisplayName("카테고리 총점수 계산 성공") + @Test + void calculateTotalScore() { + // given + List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), + new ChecklistQuestion(null, 2, "GOOD"), + new ChecklistQuestion(null, 3, "GOOD"), + new ChecklistQuestion(null, 4, "BAD"), + new ChecklistQuestion(null, 5, "BAD")); + + // when + int totalScore = CLEAN.calculateTotalScore(questions); + + // then + assertThat(totalScore).isEqualTo(( 11 * 100 / 15)); + } + + @DisplayName("카테고리 총점수 계산 성공 : 해당 카테고리에 대한 답변이 없을 경우") + @Test + void calculateTotalScore_WhenCategoryDoesNotMatch() { + // given + List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), + new ChecklistQuestion(null, 2, "GOOD"), + new ChecklistQuestion(null, 3, "GOOD"), + new ChecklistQuestion(null, 4, "BAD"), + new ChecklistQuestion(null, 5, "BAD")); + + // when + int totalScore = SECURITY.calculateTotalScore(questions); + + // then + assertThat(totalScore).isZero(); } } From 1bff3c3e08274c6bf199975cfa65e797219a964c Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:44:19 +0900 Subject: [PATCH 099/348] =?UTF-8?q?feat(Category):=20=EC=A7=88=EB=AC=B8?= =?UTF-8?q?=EC=9D=B4=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=EC=97=90=20?= =?UTF-8?q?=EC=9E=88=EB=8A=94=EC=A7=80=20=ED=8C=90=EB=B3=84=ED=95=98?= =?UTF-8?q?=EB=8A=94=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../bang_ggood/category/domain/Category.java | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 3efa5ca37..4dba76db8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,5 +1,7 @@ package com.bang_ggood.category.domain; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; import java.util.LinkedHashSet; import java.util.Set; @@ -31,6 +33,19 @@ public static boolean contains(int id) { .anyMatch(category -> category.id == id); } + //TODO 테스트해야 함 + public boolean isQuestionIn(int questionId) { + return this.id == findIdByQuestionId(questionId); + } + + private int findIdByQuestionId(int questionId) { + return Arrays.stream(Category.values()) + .filter(category -> category.questionIds.contains(questionId)) + .mapToInt(category -> category.id) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); + } + public int getId() { return id; } @@ -39,6 +54,10 @@ public String getDescription() { return description; } + public Badge getBadge() { + return badge; + } + public Set getQuestionIds() { return questionIds; } From 7cbfcbbc2fe2b1c2ad0ed48c7601ee6cfccc6754 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:44:45 +0900 Subject: [PATCH 100/348] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20DTO=20=EC=83=9D=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../category/dto/CategoryQuestionsResponse.java | 2 +- .../dto/WrittenCategoryQuestionsResponse.java | 7 +++++++ .../checklist/dto/WrittenChecklistResponse.java | 8 ++++++++ .../checklist/dto/WrittenQuestionResponse.java | 4 ++++ .../bang_ggood/room/dto/WrittenRoomResponse.java | 13 +++++++++++++ 5 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java index 553223838..f6475df00 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java @@ -3,5 +3,5 @@ import com.bang_ggood.checklist.dto.QuestionResponse; import java.util.List; -public record CategoryQuestionsResponse(Integer id, String categoryName, List questions) { +public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java new file mode 100644 index 000000000..8dc76ef10 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.category.dto; + +import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import java.util.List; + +public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java new file mode 100644 index 000000000..dc32f6f29 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java @@ -0,0 +1,8 @@ +package com.bang_ggood.checklist.dto; + +import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; +import com.bang_ggood.room.dto.WrittenRoomResponse; +import java.util.List; + +public record WrittenChecklistResponse(WrittenRoomResponse room, List options, List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java new file mode 100644 index 000000000..4594ca044 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java @@ -0,0 +1,4 @@ +package com.bang_ggood.checklist.dto; + +public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java new file mode 100644 index 000000000..df878e737 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java @@ -0,0 +1,13 @@ +package com.bang_ggood.room.dto; + +import com.bang_ggood.room.domain.Room; + +public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, + String address, String station, Integer walkingTime, String realEstate) { + + public static WrittenRoomResponse of(Room room, Integer deposit, Integer rent, + Integer contractTerm, String realEstate) { + return new WrittenRoomResponse(room.getName(), deposit, rent, contractTerm, room.getFloor(), + room.getAddress(), room.getStation(), room.getWalkingTime(), realEstate); + } +} From feea5e5f22870aeca9c7992007c04ec94923dfe3 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 15:46:33 +0900 Subject: [PATCH 101/348] =?UTF-8?q?feat:=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../controller/ChecklistController.java | 9 ++++ .../repository/ChecklistOptionRepository.java | 4 ++ .../ChecklistQuestionRepository.java | 3 ++ .../repository/ChecklistRepository.java | 15 ++++++ .../checklist/service/ChecklistService.java | 50 +++++++++++++++++++ .../bang_ggood/exception/ExceptionCode.java | 1 + .../exception/GlobalExceptionHandler.java | 1 + 7 files changed, 83 insertions(+) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index aa8f51dd2..41a93a849 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,12 +1,15 @@ package com.bang_ggood.checklist.controller; +import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; import com.bang_ggood.checklist.dto.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; import com.bang_ggood.checklist.service.ChecklistService; import jakarta.validation.Valid; import java.net.URI; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -26,6 +29,12 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } + //TODO 테스트해야 함 + @GetMapping("/checklists/{id}") + public ResponseEntity readChecklistById(@PathVariable long id) { + return ResponseEntity.ok(checklistService.readChecklistById(id)); + } + @GetMapping("/checklists/questions") public ResponseEntity readChecklistQuestions() { return ResponseEntity.ok(checklistService.readChecklistQuestions()); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 8ed6404d4..3891aa8f0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -1,7 +1,11 @@ package com.bang_ggood.checklist.repository; import com.bang_ggood.checklist.domain.ChecklistOption; +import com.bang_ggood.checklist.domain.Option; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; public interface ChecklistOptionRepository extends JpaRepository { + + List findByChecklistId(long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java index 771ecc025..30b511028 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java @@ -1,7 +1,10 @@ package com.bang_ggood.checklist.repository; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; public interface ChecklistQuestionRepository extends JpaRepository { + + List findByChecklistId(long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 189bf3765..37fdd3325 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -1,7 +1,22 @@ package com.bang_ggood.checklist.repository; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Query; public interface ChecklistRepository extends JpaRepository { + + //TODO 테스트해야 함 + @Query("SELECT c FROM Checklist c " + + "JOIN FETCH Room r " + + "ON c.id = :id " + + "AND c.room.id = r.id") + Optional findById(long id); + + default Checklist getById(long id) { + return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 02df134fd..cf2438cf2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -2,6 +2,7 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.CategoryQuestionsResponse; +import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; @@ -12,18 +13,23 @@ import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.QuestionCreateRequest; import com.bang_ggood.checklist.dto.QuestionResponse; +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.WrittenQuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.dto.WrittenRoomResponse; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; +import java.util.stream.Collectors; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -144,4 +150,48 @@ private List readChecklistQuestion(Category category) { .forEach(questionResponses::add); return questionResponses; } + + //TODO 테스트해야 함 + @Transactional + public WrittenChecklistResponse readChecklistById(long id) { + Checklist checklist = checklistRepository.getById(id); + + WrittenRoomResponse writtenRoomResponse = WrittenRoomResponse.of(checklist.getRoom(), checklist.getDeposit(), + checklist.getRent(), checklist.getContractTerm(), checklist.getRealEstate()); + List optionIds = readOptionsByChecklistId(id); + List writtenCategoryQuestionsResponses = + readCategoryQuestionsByChecklistId(id); + + return new WrittenChecklistResponse(writtenRoomResponse, optionIds, writtenCategoryQuestionsResponses); + } + + private List readOptionsByChecklistId(long checklistId) { + return checklistOptionRepository.findByChecklistId(checklistId) + .stream() + .map(ChecklistOption::getOptionId) + .toList(); + } + + private List readCategoryQuestionsByChecklistId(long checklistId) { + List checklistQuestions = checklistQuestionRepository.findByChecklistId(checklistId); + return Arrays.stream(Category.values()) + .map(category -> readQuestionsByCategory(category, checklistQuestions)) + .collect(Collectors.toList()); + } + + private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category category, + List checklistQuestions) { + //TODO 리팩토링 필요 + List writtenQuestionResponses = new ArrayList<>(); + for (ChecklistQuestion checklistQuestion : checklistQuestions) { + int questionId = checklistQuestion.getQuestionId(); + if (category.isQuestionIn(questionId)) { + writtenQuestionResponses.add( + new WrittenQuestionResponse(questionId, questionList.getTitleByQuestionId(questionId), + questionList.getSubtitleByQuestionId(questionId), checklistQuestion.getAnswer())); + } + } + return new WrittenCategoryQuestionsResponse(category.getId(), category.getDescription(), + writtenQuestionResponses); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 33befed7f..60dc97194 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -13,6 +13,7 @@ public enum ExceptionCode { CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), + CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다.") ; private final HttpStatus httpStatus; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java index 9ebbcc99f..580367e09 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -21,6 +21,7 @@ public ResponseEntity handleBangggoodException(BangggoodExcep .body(response); } + //TODO 로깅해야함 @ExceptionHandler(RuntimeException.class) public ResponseEntity handleRuntimeException(HttpServletRequest request) { ExceptionResponse response = new ExceptionResponse( From 90f0d686d9f11ade33e20cda26c41ebdfb90f6dc Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:08:58 +0900 Subject: [PATCH 102/348] =?UTF-8?q?fix:=20merge=20=ED=9B=84=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-Authored-By: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> --- .../main/java/com/bang_ggood/category/domain/Category.java | 5 ++--- .../bang_ggood/checklist/controller/ChecklistController.java | 1 + .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 4 ++++ .../com/bang_ggood/checklist/service/ChecklistService.java | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 91c129fbd..487954297 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -48,6 +48,7 @@ private int findIdByQuestionId(int questionId) { .mapToInt(category -> category.id) .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); + } // 2. 뱃지 부여 public static List getBadges(List questions) { @@ -86,9 +87,7 @@ public int getId() { public String getDescription() { return description; } - - public Badge getBadge() { return badge; } - + public Badge getBadge() { return badge; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 17c1102f9..16ab92a96 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -38,6 +38,7 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR @GetMapping("/checklists/{id}") public ResponseEntity readChecklistById(@PathVariable long id) { return ResponseEntity.ok(checklistService.readChecklistById(id)); + } @GetMapping("/checklists") public ResponseEntity readUserChecklistsPreview() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 68120e8e1..9e4398906 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -63,6 +63,10 @@ public User getUser() { return user; } + public Room getRoom() { + return room; + } + public String getRoomName() { return room.getName(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index f17424a2d..10d32672a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -222,6 +222,7 @@ private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category catego } return new WrittenCategoryQuestionsResponse(category.getId(), category.getDescription(), writtenQuestionResponses); + } @Transactional public ChecklistsComparisonReadResponse readChecklistsComparison(List checklistIds) { From ae3fb1e95de30d39ca7dca32bec2e1f3b63e8059 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Thu, 25 Jul 2024 16:23:39 +0900 Subject: [PATCH 103/348] =?UTF-8?q?fix:=20=EB=A3=A8=ED=8A=B8=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 --- .github/workflows/backend-cd.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 1474cd71c..ab98dee21 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -35,8 +35,8 @@ jobs: APPLICATION_YML: ${{ secrets.APPLICATION_YML }} APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} run: | - echo "${APPLICATION_YML}" > src/main/resources/application.yml - echo "${APPLICATION_TEST_YML}" > src/test/resources/application-test.yml + echo "${APPLICATION_YML}" > backend/bang-ggood/src/main/resources/application.yml + echo "${APPLICATION_TEST_YML}" > backend/bang-ggood/src/test/resources/application-test.yml - name: Build with Gradle run: ./gradlew clean build From 16274c4f5466507023c1dcbc9021fe840c743333 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 25 Jul 2024 16:48:02 +0900 Subject: [PATCH 104/348] =?UTF-8?q?fix:=20corsFilter=20=EB=8F=84=EC=9E=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/config/CorsConfig.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java index 9aabc6bb3..0db234c72 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java @@ -6,14 +6,15 @@ import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; import java.util.List; +import org.springframework.web.filter.CorsFilter; @Configuration public class CorsConfig { @Bean - public CorsConfigurationSource corsConfigurationSource() { + public CorsFilter corsFilter() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.addAllowedOrigin("*"); + configuration.addAllowedOriginPattern("*"); configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); configuration.addAllowedHeader("*"); configuration.setAllowCredentials(true); @@ -21,6 +22,6 @@ public CorsConfigurationSource corsConfigurationSource() { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); source.registerCorsConfiguration("/**", configuration); - return source; + return new CorsFilter(source); } } From 963ebb54a3c3b22b779e8ba23a1ee5900ad312a9 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Thu, 25 Jul 2024 17:06:17 +0900 Subject: [PATCH 105/348] =?UTF-8?q?fix:=20null=20=EC=98=88=EC=99=B8?= =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=EB=B0=8F=20@Transactional=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bang_ggood/checklist/domain/Grade.java | 6 +++--- .../bang_ggood/checklist/service/ChecklistService.java | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index ec2cc11c1..0175b70c8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -18,11 +18,11 @@ public static int calculateMaxScore(int size) { return GOOD.score * size; } - public static int getScore(String answer) { + public static int getScore(String answer) { //TODO null 예외처리 return Arrays.stream(values()) .filter(grade -> grade.name().equals(answer)) + .map(grade -> grade.score) .findAny() - .get() - .score; + .orElse(0); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 10d32672a..b16f2d858 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -17,10 +17,10 @@ import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; import com.bang_ggood.checklist.dto.QuestionCreateRequest; import com.bang_ggood.checklist.dto.QuestionResponse; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.WrittenQuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -34,13 +34,11 @@ import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Comparator; @Service public class ChecklistService { @@ -140,6 +138,7 @@ private void validateQuestionInvalid(List questions) { } } + @Transactional public UserChecklistsPreviewResponse readUserChecklistsPreview() { User user = new User(1L, "방방이"); List checklists = checklistRepository.findByUser(user); @@ -159,6 +158,7 @@ private List createBadges(List questions) { .toList(); } + @Transactional public ChecklistQuestionsResponse readChecklistQuestions() { List categoryQuestionsResponses = new ArrayList<>(); for (Category category : Category.values()) { From 23444dfdf805d8dc9739e2ef696b5d46863069ba Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Thu, 25 Jul 2024 18:16:14 +0900 Subject: [PATCH 106/348] =?UTF-8?q?feat:=20cd=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=EC=97=90=20=EC=84=9C=EB=B2=84=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=20=ED=8C=8C=EC=9D=BC=20=EC=9C=84=EC=B9=98=20=EC=A7=80?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index ab98dee21..344562e11 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -65,4 +65,4 @@ jobs: run: sudo fuser -k -n tcp 8080 || true - name: Start server - run: sudo nohup java -jar ./backend/bang-ggood/build/libs/*SNAPSHOT.jar & + run: sudo nohup java -jar ./backend/bang-ggood/build/libs/*SNAPSHOT.jar > /home/ubuntu/actions-runner/server.log 2>&1 & From 6b90e6bb64326a931ac0187b60c7faef5606a8c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=ED=95=9C=ED=98=9C=EC=9D=B8?= Date: Fri, 26 Jul 2024 13:10:47 +0900 Subject: [PATCH 107/348] =?UTF-8?q?fix:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=A4=91=EB=B3=B5=20=EC=A7=88=EB=AC=B8=20=EC=A0=9C?= =?UTF-8?q?=EA=B1=B0=20=EB=B0=8F=20=EC=88=9C=EC=84=9C=20=EB=B3=B4=EC=9E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bang_ggood/category/domain/Category.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 487954297..d954f1274 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -12,13 +12,13 @@ public enum Category { - CLEAN(1, "청결", Badge.CLEAN, new LinkedHashSet<>(Set.of(1, 2, 3, 4, 5))), - ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION, new LinkedHashSet<>(Set.of(6, 7, 8, 9, 10, 11))), - AMENITY(3, "편의시설", Badge.AMENITY, new LinkedHashSet<>(Set.of(12, 13, 14))), - OPTION(4, "옵션", Badge.OPTION, new LinkedHashSet<>(Set.of(15, 16))), - ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT, new LinkedHashSet<>(Set.of(17, 18, 19, 20, 21, 22))), - SECURITY(6, "보안", Badge.SECURITY, new LinkedHashSet<>(Set.of(22, 23, 24, 25, 26, 27, 28, 29, 30))), - ECONOMIC(7, "경제적", Badge.ECONOMIC, new LinkedHashSet<>(Set.of(31, 32))); + CLEAN(1, "청결", Badge.CLEAN, new LinkedHashSet<>(List.of(1, 2, 3, 4, 5))), + ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION, new LinkedHashSet<>(List.of(6, 7, 8, 9, 10, 11))), + AMENITY(3, "편의시설", Badge.AMENITY, new LinkedHashSet<>(List.of(12, 13, 14))), + OPTION(4, "옵션", Badge.OPTION, new LinkedHashSet<>(List.of(15, 16))), + ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT, new LinkedHashSet<>(List.of(17, 18, 19, 20, 21, 22))), + SECURITY(6, "보안", Badge.SECURITY, new LinkedHashSet<>(List.of(23, 24, 25, 26, 27, 28, 29, 30))), + ECONOMIC(7, "경제적", Badge.ECONOMIC, new LinkedHashSet<>(List.of(31, 32))); private final int id; private final String description; From 0f0067d8ec6bfbf99fc6bfcaba08adb9bae8e270 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Mon, 29 Jul 2024 17:57:50 +0900 Subject: [PATCH 108/348] =?UTF-8?q?refactor:=20=EC=84=9C=EB=B9=84=EC=8A=A4?= =?UTF-8?q?,=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=ED=81=B4=EB=9E=98?= =?UTF-8?q?=EC=8A=A4=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 32 -- .../com/bang_ggood/category/domain/Badge.java | 23 +- .../bang_ggood/category/domain/Category.java | 86 ++---- .../category/dto/CategoryReadResponse.java | 2 +- .../category/service/CategoryService.java | 75 ----- .../controller/ChecklistController.java | 57 ---- .../checklist/domain/Checklist.java | 1 - .../checklist/domain/ChecklistQuestion.java | 27 +- .../checklist/domain/ChecklistScore.java | 34 +++ .../bang_ggood/checklist/domain/Grade.java | 23 +- .../bang_ggood/checklist/domain/Question.java | 82 +++++- .../checklist/domain/Questionlist.java | 89 ------ .../checklist/dto/BadgeResponse.java | 2 +- .../checklist/service/ChecklistService.java | 273 ------------------ .../bang_ggood/exception/ExceptionCode.java | 5 +- .../category/domain/CategoryTest.java | 85 ------ .../category/service/CategoryServiceTest.java | 104 ------- .../checklist/ChecklistFixture.java | 76 ----- .../controller/ChecklistE2ETest.java | 62 ---- .../checklist/domain/OptionTest.java | 21 -- .../checklist/domain/QuestionlistTest.java | 43 --- .../service/ChecklistServiceTest.java | 81 ------ 22 files changed, 183 insertions(+), 1100 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java deleted file mode 100644 index bfc0669b2..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.bang_ggood.category.controller; - -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; -import com.bang_ggood.category.service.CategoryService; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class CategoryController { - - private final CategoryService categoryService; - - public CategoryController(CategoryService categoryService) { - this.categoryService = categoryService; - } - - @PostMapping("/categories/priority") - public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { - // TODO: List 요소 null check 필요 - categoryService.createCategoriesPriority(request); - return ResponseEntity.noContent().build(); - } - - @GetMapping("/categories") - public ResponseEntity readCategories() { - return ResponseEntity.ok(categoryService.readCategories()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java index cf4200ac7..6df9cf822 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -8,25 +8,26 @@ public enum Badge { OPTION("옵션", "옵션이 많아요", "🛋️"), ENVIRONMENT("주거환경", "주거환경이 좋아요", "🌱"), SECURITY("보안", "안전해요", "🔒"), - ECONOMIC("경제적", "경제적이에요", "💰") + ECONOMIC("경제적", "경제적이에요", "💰"), + NONE("", "", "") ; - + private static final String DESCRIPTION_FORMAT = "%s %s"; - private final String shortDescription; - private final String longDescription; + private final String shortName; + private final String longName; private final String emoji; - Badge(String shortDescription, String longDescription, String emoji) { - this.shortDescription = shortDescription; - this.longDescription = longDescription; + Badge(String shortName, String longName, String emoji) { + this.shortName = shortName; + this.longName = longName; this.emoji = emoji; } - public String getShortDescriptionWithEmoji() { - return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortDescription); + public String getShortNameWithEmoji() { + return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortName); } - public String getLongDescriptionWithEmoji() { - return String.format(DESCRIPTION_FORMAT, this.emoji, this.longDescription); + public String getLongNameWithEmoji() { + return String.format(DESCRIPTION_FORMAT, this.emoji, this.longName); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index d954f1274..21f78a1c4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,35 +1,31 @@ package com.bang_ggood.category.domain; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.Grade; - import java.util.Arrays; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import static com.bang_ggood.category.domain.Badge.NONE; +import static com.bang_ggood.checklist.domain.ChecklistScore.calculateCategoryScore; + public enum Category { - CLEAN(1, "청결", Badge.CLEAN, new LinkedHashSet<>(List.of(1, 2, 3, 4, 5))), - ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION, new LinkedHashSet<>(List.of(6, 7, 8, 9, 10, 11))), - AMENITY(3, "편의시설", Badge.AMENITY, new LinkedHashSet<>(List.of(12, 13, 14))), - OPTION(4, "옵션", Badge.OPTION, new LinkedHashSet<>(List.of(15, 16))), - ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT, new LinkedHashSet<>(List.of(17, 18, 19, 20, 21, 22))), - SECURITY(6, "보안", Badge.SECURITY, new LinkedHashSet<>(List.of(23, 24, 25, 26, 27, 28, 29, 30))), - ECONOMIC(7, "경제적", Badge.ECONOMIC, new LinkedHashSet<>(List.of(31, 32))); + CLEAN(1, "청결", Badge.CLEAN), + ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION), + AMENITY(3, "편의시설", Badge.AMENITY), + OPTION(4, "옵션", Badge.OPTION), + ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT), + SECURITY(6, "보안", Badge.SECURITY), + ECONOMIC(7, "경제적", Badge.ECONOMIC); private final int id; - private final String description; + private final String name; private final Badge badge; - private final Set questionIds; - Category(int id, String description, Badge badge, Set questionIds) { + Category(int id, String name, Badge badge) { this.id = id; - this.description = description; + this.name = name; this.badge = badge; - this.questionIds = questionIds; } public static boolean contains(int id) { @@ -37,62 +33,20 @@ public static boolean contains(int id) { .anyMatch(category -> category.id == id); } - //TODO 테스트해야 함 - public boolean isQuestionIn(int questionId) { - return this.id == findIdByQuestionId(questionId); - } - - private int findIdByQuestionId(int questionId) { - return Arrays.stream(Category.values()) - .filter(category -> category.questionIds.contains(questionId)) - .mapToInt(category -> category.id) - .findFirst() - .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); - } - - // 2. 뱃지 부여 - public static List getBadges(List questions) { - return Arrays.stream(values()) - .filter(category -> category.calculateTotalScore(questions) >= 80) - .map(Category::getBadge) - .toList(); - } - - // 1. 총점 : score * 100 / maxScore - public int calculateTotalScore(List questions) { - List filteredQuestions = filterQuestion(questions); + public Badge provideBadge(List questions) { + int categoryScore = calculateCategoryScore(this, questions); - if (filteredQuestions.isEmpty()) { - return 0; + if (categoryScore >= 8) { + return this.badge; } - - int maxScore = Grade.calculateMaxScore(filteredQuestions.size()); - int score = filteredQuestions.stream() - .mapToInt(question -> Grade.getScore(question.getAnswer())) - .sum(); - - return score * 100 / maxScore; - } - - private List filterQuestion(List questions) { - return questions.stream() - .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) - .toList(); + return NONE; } public int getId() { return id; } - public String getDescription() { - return description; - } - - public Badge getBadge() { - return badge; - } - - public Set getQuestionIds() { - return questionIds; + public String getName() { + return name; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java index b796b96b6..ae234449b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java @@ -5,6 +5,6 @@ public record CategoryReadResponse(Integer categoryId, String categoryName) { public static CategoryReadResponse from(Category category) { - return new CategoryReadResponse(category.getId(), category.getDescription()); + return new CategoryReadResponse(category.getId(), category.getName()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java deleted file mode 100644 index c588d7bff..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.bang_ggood.category.service; - -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.domain.CategoryPriority; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.CategoryReadResponse; -import com.bang_ggood.category.repository.CategoryPriorityRepository; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.user.domain.User; -import com.bang_ggood.user.repository.UserRepository; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; - -@Service -public class CategoryService { - - private static final int MAX_CATEGORY_PRIORITY_COUNT = 3; - - private final CategoryPriorityRepository categoryPriorityRepository; - private final UserRepository userRepository; - - public CategoryService(CategoryPriorityRepository categoryPriorityRepository, UserRepository userRepository) { - this.categoryPriorityRepository = categoryPriorityRepository; - this.userRepository = userRepository; - } - - @Transactional - public void createCategoriesPriority(CategoryPriorityCreateRequest request) { - validateDuplication(request); - validateCategoryCount(request); - validateCategoryId(request); - - User user = userRepository.getUserById(1L); - List categoryPriorities = request.categoryIds().stream() - .map(id -> new CategoryPriority(id, user)) - .toList(); - - categoryPriorityRepository.saveAll(categoryPriorities); - } - - private void validateDuplication(CategoryPriorityCreateRequest request) { - if (request.categoryIds().size() != Set.copyOf(request.categoryIds()).size()) { - throw new BangggoodException(CATEGORY_DUPLICATED); - } - } - - private void validateCategoryCount(CategoryPriorityCreateRequest request) { - if (request.categoryIds().size() > MAX_CATEGORY_PRIORITY_COUNT) { - throw new BangggoodException(CATEGORY_PRIORITY_INVALID_COUNT); - } - } - - private void validateCategoryId(CategoryPriorityCreateRequest request) { - for (Integer id : request.categoryIds()) { - if (!Category.contains(id)) { - throw new BangggoodException(CATEGORY_NOT_FOUND); - } - } - } - - public CategoriesReadResponse readCategories() { - List categoryReadResponses = Arrays.stream(Category.values()) - .map(CategoryReadResponse::from) - .toList(); - return new CategoriesReadResponse(categoryReadResponses); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java deleted file mode 100644 index 16ab92a96..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.bang_ggood.checklist.controller; - -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.service.ChecklistService; - -import jakarta.validation.Valid; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PathVariable; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; -import org.springframework.web.bind.annotation.RestController; -import java.net.URI; -import java.util.List; - -@RestController -public class ChecklistController { - - private final ChecklistService checklistService; - - public ChecklistController(ChecklistService checklistService) { - this.checklistService = checklistService; - } - - @PostMapping("/checklists") - public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateRequest checklistCreateRequest) { - long checklistId = checklistService.createChecklist(checklistCreateRequest); - return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); - } - - //TODO 테스트해야 함 - @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@PathVariable long id) { - return ResponseEntity.ok(checklistService.readChecklistById(id)); - } - - @GetMapping("/checklists") - public ResponseEntity readUserChecklistsPreview() { - return ResponseEntity.ok(checklistService.readUserChecklistsPreview()); - } - - @GetMapping("/checklists/questions") - public ResponseEntity readChecklistQuestions() { - return ResponseEntity.ok(checklistService.readChecklistQuestions()); - } - - @GetMapping("/checklists/comparison") - public ResponseEntity readChecklistsComparison(@RequestParam("id")List checklistIds) { - return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 9e4398906..79011148c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Objects; - @Entity public class Checklist extends BaseEntity { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index b6639de37..642ebb8ac 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -2,6 +2,8 @@ import com.bang_ggood.BaseEntity; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -9,7 +11,6 @@ import jakarta.persistence.ManyToOne; import java.util.Objects; - @Entity public class ChecklistQuestion extends BaseEntity { @@ -20,14 +21,16 @@ public class ChecklistQuestion extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) private Checklist checklist; - private int questionId; + @Enumerated(EnumType.STRING) + private Question question; - private String answer; + @Enumerated(EnumType.STRING) + private Grade grade; - public ChecklistQuestion(Checklist checklist, int questionId, String answer) { + public ChecklistQuestion(Checklist checklist, Question question, Grade grade) { this.checklist = checklist; - this.questionId = questionId; - this.answer = answer; + this.question = question; + this.grade = grade; } protected ChecklistQuestion() { @@ -41,12 +44,12 @@ public Checklist getChecklist() { return checklist; } - public int getQuestionId() { - return questionId; + public Question getQuestion() { + return question; } - public String getAnswer() { - return answer; + public Grade getGrade() { + return grade; } @Override @@ -71,8 +74,8 @@ public String toString() { return "ChecklistQuestion{" + "id=" + id + ", checklist=" + checklist + - ", questionId=" + questionId + - ", answer=" + answer + + ", question=" + question + + ", grade=" + grade + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java new file mode 100644 index 000000000..67c31ba01 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java @@ -0,0 +1,34 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.category.domain.Category; +import java.util.List; + +public class ChecklistScore { + + public static int calculateTotalScore(List questions) { + if (questions.isEmpty()) { + return 0; + } + + int maxScore = Grade.calculateMaxScore(questions.size()); + int totalScore = Grade.calculateTotalScore(questions); + + return totalScore * 100 / maxScore; + } + + public static int calculateCategoryScore(Category category, List questions) { + List filteredQuestions = Question.filter(category, questions); + + if (filteredQuestions.isEmpty()) { + return 0; + } + + int maxScore = Grade.calculateMaxScore(filteredQuestions.size()); + int totalScore = Grade.calculateTotalScore(filteredQuestions); + + return totalScore * 10 / maxScore; + } + + private ChecklistScore() { + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index 0175b70c8..0905d06db 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -1,12 +1,16 @@ package com.bang_ggood.checklist.domain; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; +import java.util.List; public enum Grade { GOOD(3), SOSO(2), - BAD(1); + BAD(1), + ; private final int score; @@ -14,15 +18,20 @@ public enum Grade { this.score = score; } + public static Grade from(String grade) { + return Arrays.stream(Grade.values()) + .filter(value -> value.name().equals(grade)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.GRADE_INVALID)); + } + public static int calculateMaxScore(int size) { return GOOD.score * size; } - public static int getScore(String answer) { //TODO null 예외처리 - return Arrays.stream(values()) - .filter(grade -> grade.name().equals(answer)) - .map(grade -> grade.score) - .findAny() - .orElse(0); + public static int calculateTotalScore(List questions) { + return questions.stream() + .mapToInt(question -> question.getGrade().score) + .sum(); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 0840637b4..a569fc297 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -1,15 +1,93 @@ package com.bang_ggood.checklist.domain; -public class Question { +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; +import java.util.List; +public enum Question { + + CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요."), + CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요."), + CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null), + CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요."), + CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요."), + + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요."), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null), + ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null), + ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null), + + AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null), + AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null), + AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null), + + OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요."), + OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null), + + ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null), + ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요."), + ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요."), + ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요."), + ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null), + ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null), + + SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null), + SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null), + SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null), + SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null), + SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null), + SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null), + SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null), + SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null), + + ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요."), + ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요."); + + private final int id; + private final Category category; private final String title; private final String subtitle; - public Question(String title, String subtitle) { + + Question(int id, Category category, String title, String subtitle) { + this.id = id; + this.category = category; this.title = title; this.subtitle = subtitle; } + // TODO 테스트 필요 + public static List filter(Category category, List questions) { + return questions.stream() + .filter(question -> question.getQuestion().isCategory(category) && question.getGrade() != null) + .toList(); + } + + private boolean isCategory(Category category) { + return this.category == category; + } + + // TODO 테스트 필요 + public static Question findById(int id) { + return Arrays.stream(values()) + .filter(question -> question.id == id) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); + } + + public static boolean contains(int id) { + return Arrays.stream(values()) + .anyMatch(question -> question.getId() == id); + } + + public int getId() { + return id; + } + public String getTitle() { return title; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java deleted file mode 100644 index 41ba9e861..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import java.util.HashMap; -import java.util.Map; -import org.springframework.stereotype.Component; - -@Component -public class Questionlist { - - private Map questions; - - public Questionlist() { - questions = new HashMap<>(); - initClean(); - initRoomCondition(); - initAmenity(); - initOption(); - initEnvironment(); - initSecurity(); - initEconomic(); - } - - public boolean contains(int questionId) { - return questions.containsKey(questionId); - } - - private void initClean() { - questions.put(1, new Question("방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.")); - questions.put(2, new Question("방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.")); - questions.put(3, new Question("에어컨 내부는 깨끗한가요?", null)); - questions.put(4, new Question("벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.")); - questions.put(5, new Question("창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.")); - } - - private void initRoomCondition() { - questions.put(6, new Question("수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.")); - questions.put(7, new Question("온수가 잘 나오나요?", null)); - questions.put(8, new Question("파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null)); - questions.put(9, new Question("보일러가 잘 동작하나요?", null)); - questions.put(10, new Question("콘센트 위치와 갯수가 적절한가요?", null)); - questions.put(11, new Question("벽지 상태가 양호한가요?", null)); - } - - private void initAmenity() { - questions.put(12, new Question("지하철역과 버스 정류장이 가까운 곳에 있나요?", null)); - questions.put(13, new Question("편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null)); - questions.put(14, new Question("병원이나 약국이 가까운 곳에 있나요?", null)); - } - - private void initOption() { - questions.put(15, new Question("옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.")); - questions.put(16, new Question("필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null)); - } - - private void initEnvironment() { - questions.put(17, new Question("햇빛이 잘 들어오나요?", null)); - questions.put(18, new Question("환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.")); - questions.put(19, new Question("방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.")); - questions.put(20, new Question("주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.")); - questions.put(21, new Question("1층에 음식점이 있지는 않나요?", null)); - questions.put(22, new Question("집가는 길이 언덕이진 않나요?", null)); - } - - private void initSecurity() { - questions.put(23, new Question("출입구와 복도에 CCTV가 설치되어 있나요?", null)); - questions.put(24, new Question("집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null)); - questions.put(25, new Question("자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null)); - questions.put(26, new Question("화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null)); - questions.put(27, new Question("주변 도로가 밤에도 충분히 밝은가요?", null)); - questions.put(28, new Question("화면이 달린 인터폰이 제공되나요?", null)); - questions.put(29, new Question("옆 건물에서 잘 보이는 구조는 아닌가요?", null)); - questions.put(30, new Question("관리자분이 함께 상주하시나요?", null)); - } - - private void initEconomic() { - questions.put(31, new Question("보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.")); - questions.put(32, new Question("교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.")); - } - - public String getTitleByQuestionId(int questionId) { - return questions.get(questionId).getTitle(); - } - - public String getSubtitleByQuestionId(int questionId) { - return questions.get(questionId).getSubtitle(); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java index fb5af75de..e5c070c8f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java @@ -5,6 +5,6 @@ public record BadgeResponse(String shortName, String longName) { public static BadgeResponse from(Badge badge) { - return new BadgeResponse(badge.getShortDescriptionWithEmoji(), badge.getLongDescriptionWithEmoji()); + return new BadgeResponse(badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java deleted file mode 100644 index b16f2d858..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ /dev/null @@ -1,273 +0,0 @@ -package com.bang_ggood.checklist.service; - -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.dto.CategoryQuestionsResponse; -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; -import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.domain.ChecklistOption; -import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.Option; -import com.bang_ggood.checklist.domain.Questionlist; -import com.bang_ggood.checklist.dto.BadgeResponse; -import com.bang_ggood.checklist.dto.CategoryScoreReadResponse; -import com.bang_ggood.checklist.dto.ChecklistComparisonReadResponse; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.ChecklistInfo; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; -import com.bang_ggood.checklist.dto.QuestionResponse; -import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; -import com.bang_ggood.checklist.repository.ChecklistOptionRepository; -import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; -import com.bang_ggood.checklist.repository.ChecklistRepository; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.WrittenRoomResponse; -import com.bang_ggood.room.repository.RoomRepository; -import com.bang_ggood.user.domain.User; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; -import java.util.HashSet; -import java.util.List; -import java.util.Set; -import java.util.stream.Collectors; - -@Service -public class ChecklistService { - - private final ChecklistRepository checklistRepository; - private final RoomRepository roomRepository; - private final ChecklistOptionRepository checklistOptionRepository; - private final ChecklistQuestionRepository checklistQuestionRepository; - private final Questionlist questionList; - - public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, - ChecklistOptionRepository checklistOptionRepository, - ChecklistQuestionRepository checklistQuestionRepository, Questionlist questionList) { - this.checklistRepository = checklistRepository; - this.roomRepository = roomRepository; - this.checklistOptionRepository = checklistOptionRepository; - this.checklistQuestionRepository = checklistQuestionRepository; - this.questionList = questionList; - } - - - @Transactional - public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { - Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); - - ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); - Checklist checklist = new Checklist(new User(1L, "방방이"), room, checklistInfo.deposit(), checklistInfo.rent(), - checklistInfo.contractTerm(), checklistInfo.realEstate()); - checklistRepository.save(checklist); - - createChecklistOptions(checklistCreateRequest, checklist); - createChecklistQuestions(checklistCreateRequest, checklist); - return checklist.getId(); - } - - private void createChecklistOptions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - List optionIds = checklistCreateRequest.options(); - validateOptions(optionIds); - List checklistOptions = optionIds.stream() - .map(option -> new ChecklistOption(checklist, option)) - .toList(); - checklistOptionRepository.saveAll(checklistOptions); - } - - private void validateOptions(List optionIds) { - validateOptionDuplicate(optionIds); - validateOptionInvalid(optionIds); - } - - private void validateOptionDuplicate(List optionIds) { - Set set = new HashSet<>(); - optionIds.forEach(id -> { - if (!set.add(id)) { - throw new BangggoodException(ExceptionCode.OPTION_DUPLICATED); - } - }); - } - - private void validateOptionInvalid(List optionIds) { - for (Integer optionId : optionIds) { - if (!Option.contains(optionId)) { - throw new BangggoodException(ExceptionCode.INVALID_OPTION); - } - } - } - - private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - List questions = checklistCreateRequest.questions(); - validateQuestion(questions); - for (QuestionCreateRequest questionCreateRequest : questions) { - Integer questionId = questionCreateRequest.questionId(); - ChecklistQuestion checklistQuestion = new ChecklistQuestion(checklist, questionId, - questionCreateRequest.answer()); - checklistQuestionRepository.save(checklistQuestion); - } - } - - private void validateQuestion(List questions) { - validateQuestionDuplicate(questions); - validateQuestionInvalid(questions); - } - - private void validateQuestionDuplicate(List questions) { - Set set = new HashSet<>(); - questions.forEach(question -> { - if (!set.add(question.questionId())) { - throw new BangggoodException(ExceptionCode.QUESTION_DUPLICATED); - } - }); - } - - private void validateQuestionInvalid(List questions) { - for (QuestionCreateRequest questionCreateRequest : questions) { - if (!questionList.contains(questionCreateRequest.questionId())) { - throw new BangggoodException(ExceptionCode.INVALID_QUESTION); - } - } - } - - @Transactional - public UserChecklistsPreviewResponse readUserChecklistsPreview() { - User user = new User(1L, "방방이"); - List checklists = checklistRepository.findByUser(user); - - List responses = checklists.stream() - .map(checklist -> UserChecklistPreviewResponse.of( - checklist, - createBadges(checklist.getQuestions()))) - .toList(); - - return new UserChecklistsPreviewResponse(responses); - } - - private List createBadges(List questions) { - return Category.getBadges(questions).stream() - .map(BadgeResponse::from) - .toList(); - } - - @Transactional - public ChecklistQuestionsResponse readChecklistQuestions() { - List categoryQuestionsResponses = new ArrayList<>(); - for (Category category : Category.values()) { - CategoryQuestionsResponse categoryQuestionsResponse = - new CategoryQuestionsResponse(category.getId(), category.getDescription(), - readChecklistQuestion(category)); - categoryQuestionsResponses.add(categoryQuestionsResponse); - } - return new ChecklistQuestionsResponse(categoryQuestionsResponses); - } - - private List readChecklistQuestion(Category category) { - List questionResponses = new ArrayList<>(); - category.getQuestionIds().stream() - .map(questionId -> new QuestionResponse(questionId, - questionList.getTitleByQuestionId(questionId), - questionList.getSubtitleByQuestionId(questionId))) - .forEach(questionResponses::add); - return questionResponses; - } - - //TODO 테스트해야 함 - @Transactional - public WrittenChecklistResponse readChecklistById(long id) { - Checklist checklist = checklistRepository.getById(id); - - WrittenRoomResponse writtenRoomResponse = WrittenRoomResponse.of(checklist.getRoom(), checklist.getDeposit(), - checklist.getRent(), checklist.getContractTerm(), checklist.getRealEstate()); - List optionIds = readOptionsByChecklistId(id); - List writtenCategoryQuestionsResponses = - readCategoryQuestionsByChecklistId(id); - - return new WrittenChecklistResponse(writtenRoomResponse, optionIds, writtenCategoryQuestionsResponses); - } - - private List readOptionsByChecklistId(long checklistId) { - return checklistOptionRepository.findByChecklistId(checklistId) - .stream() - .map(ChecklistOption::getOptionId) - .toList(); - } - - private List readCategoryQuestionsByChecklistId(long checklistId) { - List checklistQuestions = checklistQuestionRepository.findByChecklistId(checklistId); - return Arrays.stream(Category.values()) - .map(category -> readQuestionsByCategory(category, checklistQuestions)) - .collect(Collectors.toList()); - } - - private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category category, - List checklistQuestions) { - //TODO 리팩토링 필요 - List writtenQuestionResponses = new ArrayList<>(); - for (ChecklistQuestion checklistQuestion : checklistQuestions) { - int questionId = checklistQuestion.getQuestionId(); - if (category.isQuestionIn(questionId)) { - writtenQuestionResponses.add( - new WrittenQuestionResponse(questionId, questionList.getTitleByQuestionId(questionId), - questionList.getSubtitleByQuestionId(questionId), checklistQuestion.getAnswer())); - } - } - return new WrittenCategoryQuestionsResponse(category.getId(), category.getDescription(), - writtenQuestionResponses); - } - - @Transactional - public ChecklistsComparisonReadResponse readChecklistsComparison(List checklistIds) { - User user = new User(1L, "방끗"); - - List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) - .stream() - .map(checklist -> { - // 카테고리별 총점 - List categoryScores = calculateCategoryScores(checklist); - - // 체크리스트 총점 - int checklistScore = calculateChecklistScore(categoryScores); - - // 옵션 개수 - int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); - - return ChecklistComparisonReadResponse.of( - checklist, checklistOptionCount, checklistScore, categoryScores);}) - .sorted(Comparator.comparing(ChecklistComparisonReadResponse::score).reversed()) - .toList(); - - return new ChecklistsComparisonReadResponse(responses); - } - - private List calculateCategoryScores(Checklist checklist) { - List categoryScores = new ArrayList<>(); - - for (Category category : Category.values()) { - int categoryScore = category.calculateTotalScore(checklist.getQuestions()); - if (categoryScore != 0) { - categoryScores.add(new CategoryScoreReadResponse( - category.getId(), - category.getDescription(), - categoryScore - )); - } - } - - return categoryScores; - } - - private int calculateChecklistScore(List categoryScores) { - return categoryScores.stream() - .mapToInt(CategoryScoreReadResponse::score) - .sum() / categoryScores.size(); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 60dc97194..548e694a5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -10,10 +10,13 @@ public enum ExceptionCode { INVALID_QUESTION(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), + + // Category CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), - CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다.") + CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), + GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다.") ; private final HttpStatus httpStatus; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java deleted file mode 100644 index 689b2b33f..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java +++ /dev/null @@ -1,85 +0,0 @@ -package com.bang_ggood.category.domain; - -import com.bang_ggood.checklist.domain.ChecklistQuestion; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import java.util.List; - -import static com.bang_ggood.category.domain.Category.CLEAN; -import static com.bang_ggood.category.domain.Category.SECURITY; -import static org.assertj.core.api.Assertions.assertThat; - -class CategoryTest { - - @DisplayName("뱃지 부여 : 카테고리 총점이 80점 이상일 때") - @Test - void getBadges() { - // given - - // 청결 - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "SOSO"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - List badges = Category.getBadges(questions); - - // then - assertThat(badges).containsExactly(Badge.CLEAN); - } - - @DisplayName("뱃지 미부여 : 카테고리 총점이 80점 미만일 때") - @Test - void getBadges_NoBadges() { - // given - - // 청결 - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "BAD"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - List badges = Category.getBadges(questions); - - // then - assertThat(badges).isEmpty(); - } - - @DisplayName("카테고리 총점수 계산 성공") - @Test - void calculateTotalScore() { - // given - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "BAD"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - int totalScore = CLEAN.calculateTotalScore(questions); - - // then - assertThat(totalScore).isEqualTo(( 11 * 100 / 15)); - } - - @DisplayName("카테고리 총점수 계산 성공 : 해당 카테고리에 대한 답변이 없을 경우") - @Test - void calculateTotalScore_WhenCategoryDoesNotMatch() { - // given - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "BAD"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - int totalScore = SECURITY.calculateTotalScore(questions); - - // then - assertThat(totalScore).isZero(); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java deleted file mode 100644 index 5ed9a9f46..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ /dev/null @@ -1,104 +0,0 @@ -package com.bang_ggood.category.service; - -import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; -import com.bang_ggood.exception.BangggoodException; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - -import static com.bang_ggood.category.domain.Category.AMENITY; -import static com.bang_ggood.category.domain.Category.CLEAN; -import static com.bang_ggood.category.domain.Category.ECONOMIC; -import static com.bang_ggood.category.domain.Category.SECURITY; -import static com.bang_ggood.category.domain.Category.values; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -class CategoryServiceTest extends IntegrationTestSupport { - - @Autowired - private CategoryService categoryService; - - @DisplayName("카테고리 우선순위 생성 성공") - @Test - void createCategoriesPriority() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - ECONOMIC.getId() - )); - - // when & then - assertThatCode(() -> categoryService.createCategoriesPriority(request)) - .doesNotThrowAnyException(); - // TODO: 추후 우선순위 조회 API로 예외 검증 - } - - @DisplayName("카테고리 우선순위 생성 실패 : 카테고리 개수가 유효하지 않을 때") - @Test - void createCategoriesPriority_invalidCount_exception() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - ECONOMIC.getId(), - SECURITY.getId() - )); - - // when & then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) - .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); - } - - @DisplayName("카테고리 우선순위 생성 실패 : 카테고리가 존재하지 않을 때") - @Test - void createCategoriesPriority_notFound_exception() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - 0 - )); - - // when & then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) - .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_NOT_FOUND.getMessage()); - } - - @DisplayName("카테고리 우선순위 생성 실패 : 중복된 카테고리가 존재할 때") - @Test - void createCategoriesPriority_duplicated_exception() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - AMENITY.getId() - )); - - // when & then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) - .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_DUPLICATED.getMessage()); - } - - @DisplayName("카테고리 조회 성공") - @Test - void readCategories() { - // given & when - CategoriesReadResponse categoriesReadResponse = categoryService.readCategories(); - - // then - assertThat(categoriesReadResponse.categories()) - .hasSize(values().length); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java deleted file mode 100644 index bf62a9fb9..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ /dev/null @@ -1,76 +0,0 @@ -package com.bang_ggood.checklist; - -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; -import com.bang_ggood.room.RoomFixture; -import java.util.List; - -public class ChecklistFixture { - - public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( - 1, "GOOD" - ); - - public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( - 2, "SOSO" - ); - - public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( - 3, "BAD" - ); - - public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( - 5, null - ); - - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( - null, null - ); - - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( - 9999, "SOSO" - ); - - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) - ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 5), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) - ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) - ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) - ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 9999), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) - ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) - ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) - ); -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java deleted file mode 100644 index 05c80eea7..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.bang_ggood.checklist.controller; - -import static org.assertj.core.api.Assertions.assertThat; - -import com.bang_ggood.AcceptanceTest; -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -class ChecklistE2ETest extends AcceptanceTest { - - @DisplayName("체크리스트 방 정보 작성 성공") - @Test - void createChecklist() { - RestAssured.given().log().all() - .contentType(ContentType.JSON) - .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) - .when().post("/checklists") - .then().log().all() - .statusCode(201); - } - - @DisplayName("체크리스트 방 정보 작성 실패: 방 이름을 넣지 않은 경우") - @Test - void createChecklist_noRoomName_exception() { - RestAssured.given().log().all() - .contentType(ContentType.JSON) - .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) - .when().post("/checklists") - .then().log().all() - .statusCode(400); - } - - @DisplayName("체크리스트 방 정보 작성 실패: 질문 ID를 넣지 않은 경우") - @Test - void createChecklist_noQuestionId_exception() { - RestAssured.given().log().all() - .contentType(ContentType.JSON) - .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) - .when().post("/checklists") - .then().log().all() - .statusCode(400); - } - - @DisplayName("체크리스트 질문 조회 성공") - @Test - void readChecklistQuestions() { - ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() - .contentType(ContentType.JSON) - .when().get("/checklists/questions") - .then().log().all() - .statusCode(200) - .extract() - .as(ChecklistQuestionsResponse.class); - - assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java deleted file mode 100644 index c9643e807..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -class OptionTest { - - @DisplayName("옵션 포함 성공: 포함하는 경우") - @Test - void contains_true() { - assertThat(Option.contains(1)).isTrue(); - } - - @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") - @Test - void contains_false() { - assertThat(Option.contains(9999)).isFalse(); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java deleted file mode 100644 index 969470738..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -class QuestionlistTest { - - private Questionlist questionList; - - @BeforeEach - void init() { - questionList = new Questionlist(); - } - - @DisplayName("질문 리스트 포함 성공: 포함하는 경우") - @Test - void contains_true() { - assertThat(questionList.contains(1)).isTrue(); - } - - @DisplayName("질문 리스트 포함 성공 : 포함하지 않는 경우") - @Test - void contains_false() { - assertThat(questionList.contains(9999)).isFalse(); - } - - @DisplayName("질문 제목 조회 성공") - @Test - void getTitle() { - assertThat(questionList.getTitleByQuestionId(1)) - .isEqualTo("방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?"); - } - - @DisplayName("질문 부제목 조회 성공") - @Test - void getSubtitle() { - assertThat(questionList.getSubtitleByQuestionId(1)) - .isEqualTo("천장, 벽면, 가구 뒤, 장판을 확인하세요."); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java deleted file mode 100644 index f9428b552..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ /dev/null @@ -1,81 +0,0 @@ -package com.bang_ggood.checklist.service; - - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; - -class ChecklistServiceTest extends IntegrationTestSupport { - - @Autowired - private ChecklistService checklistService; - - @DisplayName("체크리스트 방 정보 작성 성공") - @Test - void createChecklist() { - //given & when - long checklistId = checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST); - - //then - assertThat(checklistId).isEqualTo(1); - } - - @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") - @Test - void createChecklist_invalidQuestionId_exception() { - //given & when & then - assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); - } - - @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 중복일 경우") - @Test - void createChecklist_duplicatedQuestionId_exception() { - //given & when & then - assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); - } - - @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 유효하지 않을 경우") - @Test - void createChecklist_invalidOptionId_exception() { - //given & when & then - assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.INVALID_OPTION.getMessage()); - } - - @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 중복일 경우") - @Test - void createChecklist_duplicatedOptionId_exception() { - //given & when & then - assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); - } - - @DisplayName("체크리스트 질문 조회 성공") - @Test - void readChecklistQuestions() { - // given & when - ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(); - - // then - assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); - } -} From c93a6915581e8be05ee1af1f0a5aa510320a15b6 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:29:30 +0900 Subject: [PATCH 109/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=A9=20=EC=A0=95=EB=B3=B4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 26 ++++ .../checklist/service/ChecklistService.java | 132 ++++++++++++++++++ .../bang-ggood/src/main/resources/schema.sql | 15 +- .../checklist/ChecklistFixture.java | 86 ++++++++++++ .../controller/ChecklistE2ETest.java | 56 ++++++++ .../checklist/domain/OptionTest.java | 22 +++ .../service/ChecklistServiceTest.java | 78 +++++++++++ .../src/test/resources/schema-test.sql | 15 +- 8 files changed, 415 insertions(+), 15 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java new file mode 100644 index 000000000..7a80723cb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -0,0 +1,26 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.service.ChecklistService; +import jakarta.validation.Valid; +import java.net.URI; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ChecklistController { + + private final ChecklistService checklistService; + + public ChecklistController(ChecklistService checklistService) { + this.checklistService = checklistService; + } + + @PostMapping("/checklists") + public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateRequest checklistCreateRequest) { + long checklistId = checklistService.createChecklist(checklistCreateRequest); + return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java new file mode 100644 index 000000000..28a8730dc --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -0,0 +1,132 @@ +package com.bang_ggood.checklist.service; + +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistOption; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Option; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.ChecklistInfo; +import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.repository.ChecklistOptionRepository; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.domain.User; +import java.util.Arrays; +import java.util.HashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class ChecklistService { + + private final ChecklistRepository checklistRepository; + private final RoomRepository roomRepository; + private final ChecklistOptionRepository checklistOptionRepository; + private final ChecklistQuestionRepository checklistQuestionRepository; + + public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, + ChecklistOptionRepository checklistOptionRepository, + ChecklistQuestionRepository checklistQuestionRepository) { + this.checklistRepository = checklistRepository; + this.roomRepository = roomRepository; + this.checklistOptionRepository = checklistOptionRepository; + this.checklistQuestionRepository = checklistQuestionRepository; + } + + + @Transactional + public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { + Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); + + ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); + Checklist checklist = new Checklist(new User(1L, "방방이"), room, checklistInfo.deposit(), checklistInfo.rent(), + checklistInfo.contractTerm(), checklistInfo.realEstate()); + checklistRepository.save(checklist); + + createChecklistOptions(checklistCreateRequest, checklist); + createChecklistQuestions(checklistCreateRequest, checklist); + return checklist.getId(); + } + + private void createChecklistOptions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { + List optionIds = checklistCreateRequest.options(); + validateOptions(optionIds); + List checklistOptions = optionIds.stream() + .map(option -> new ChecklistOption(checklist, option)) + .toList(); + checklistOptionRepository.saveAll(checklistOptions); + } + + private void validateOptions(List optionIds) { + validateOptionDuplicate(optionIds); + validateOptionInvalid(optionIds); + } + + private void validateOptionDuplicate(List optionIds) { + Set set = new HashSet<>(); + optionIds.forEach(id -> { + if (!set.add(id)) { + throw new BangggoodException(ExceptionCode.OPTION_DUPLICATED); + } + }); + } + + private void validateOptionInvalid(List optionIds) { + for (Integer optionId : optionIds) { + if (!Option.contains(optionId)) { + throw new BangggoodException(ExceptionCode.INVALID_OPTION); + } + } + } + + private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { + validateQuestion(checklistCreateRequest.questions()); + Map existQuestions = checklistCreateRequest.questions() + .stream() + .collect(Collectors.toMap(QuestionCreateRequest::questionId, QuestionCreateRequest::answer)); + + List checklistQuestions = Arrays.stream(Question.values()) + .map(question -> { + int questionId = question.getId(); + return Optional.ofNullable(existQuestions.get(questionId)) + .map(answer -> new ChecklistQuestion(checklist, Question.findById(questionId), Grade.from(answer))) + .orElseGet(() -> new ChecklistQuestion(checklist, Question.findById(questionId), null)); + }) + .collect(Collectors.toList()); + + checklistQuestionRepository.saveAll(checklistQuestions); + } + + private void validateQuestion(List questions) { + validateQuestionDuplicate(questions); + validateQuestionInvalid(questions); + } + + private void validateQuestionDuplicate(List questions) { + Set set = new HashSet<>(); + questions.forEach(question -> { + if (!set.add(question.questionId())) { + throw new BangggoodException(ExceptionCode.QUESTION_DUPLICATED); + } + }); + } + + private void validateQuestionInvalid(List questions) { + for (QuestionCreateRequest questionCreateRequest : questions) { + if (!Question.contains(questionCreateRequest.questionId())) { + throw new BangggoodException(ExceptionCode.INVALID_QUESTION); + } + } + } +} diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f2dabe4f2..7a371d3ed 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS test_entity CASCADE; -- Create tables CREATE TABLE room @@ -54,15 +55,25 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); +CREATE TABLE test_entity +( + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id) +); + + CREATE TABLE category_priority ( id bigint generated by default as identity, diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java new file mode 100644 index 000000000..7d7f9a62d --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -0,0 +1,86 @@ +package com.bang_ggood.checklist; + +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.room.RoomFixture; +import java.util.List; + +public class ChecklistFixture { + + public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( + 1, "GOOD" + ); + + public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( + 2, "SOSO" + ); + + public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( + 3, "BAD" + ); + + public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( + 5, "GOOD" + ); + + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ANSWER = new QuestionCreateRequest( + 6, null + ); + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( + null, "GOOD" + ); + + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( + 9999, "SOSO" + ); + + + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 9999), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ANSWER = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ANSWER) + ); +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java new file mode 100644 index 000000000..28ac8fa98 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -0,0 +1,56 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.checklist.ChecklistFixture; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +public class ChecklistE2ETest extends AcceptanceTest { + + @DisplayName("체크리스트 방 정보 작성 성공") + @Test + void createChecklist() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) + .when().post("/checklists") + .then().log().all() + .statusCode(201); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 방 이름을 넣지 않은 경우") + @Test + void createChecklist_noRoomName_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) + .when().post("/checklists") + .then().log().all() + .statusCode(400); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 ID를 넣지 않은 경우") + @Test + void createChecklist_noQuestionId_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) + .when().post("/checklists") + .then().log().all() + .statusCode(400); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 답변을 넣지 않은 경우") + @Test + void createChecklist_noAnswer_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ANSWER) + .when().post("/checklists") + .then().log().all() + .statusCode(400); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java new file mode 100644 index 000000000..c6b5ecde0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java @@ -0,0 +1,22 @@ +package com.bang_ggood.checklist.domain; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class OptionTest { + + @DisplayName("옵션 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(Option.contains(1)).isTrue(); + } + + @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(Option.contains(9999)).isFalse(); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java new file mode 100644 index 000000000..b6673bd61 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -0,0 +1,78 @@ +package com.bang_ggood.checklist.service; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.*; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +class ChecklistServiceTest extends IntegrationTestSupport { + + @Autowired + private ChecklistService checklistService; + @Autowired + private ChecklistQuestionRepository checklistQuestionRepository; + + @DisplayName("체크리스트 방 정보 작성 성공") + @Test + void createChecklist() { + //given & when + long checklistId = checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //then + assertAll( + () -> assertThat(checklistId).isEqualTo(1), + () -> assertThat(checklistQuestionRepository.findByChecklistId(1).size()).isEqualTo(Question.values().length) + ); + + } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") + @Test + void createChecklist_invalidQuestionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 중복일 경우") + @Test + void createChecklist_duplicatedQuestionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 유효하지 않을 경우") + @Test + void createChecklist_invalidOptionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.INVALID_OPTION.getMessage()); + } + + @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 중복일 경우") + @Test + void createChecklist_duplicatedOptionId_exception() { + //given & when & then + assertThatThrownBy( + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); + } + +} diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index d660d5075..e35dcc7df 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -55,25 +55,14 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE if not exists category_priority -( - id bigint generated by default as identity, - category_id INTEGER not null, - user_id bigint not null, - created_at TIMESTAMP not null, - modified_at TIMESTAMP not null, - primary key (id), - foreign key (user_id) references users -); - CREATE TABLE test_entity ( From bb2de372b9ed05704f6566eb3c60c0854dfc74b7 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Mon, 29 Jul 2024 18:40:37 +0900 Subject: [PATCH 110/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CategoryQuestionsResponse.java | 7 -- .../CategoryPriorityCreateRequest.java | 2 +- .../CategoriesReadResponse.java | 2 +- .../response/CategoryQuestionsResponse.java | 12 +++ .../{ => response}/CategoryReadResponse.java | 2 +- .../WrittenCategoryQuestionsResponse.java | 4 +- .../controller/ChecklistController.java | 9 ++- .../bang_ggood/checklist/domain/Question.java | 11 +++ .../dto/ChecklistQuestionsResponse.java | 7 -- .../checklist/dto/QuestionResponse.java | 4 - .../{ => request}/ChecklistCreateRequest.java | 2 +- .../dto/{ => request}/ChecklistInfo.java | 2 +- .../{ => request}/QuestionCreateRequest.java | 2 +- .../dto/{ => response}/BadgeResponse.java | 2 +- .../CategoryScoreReadResponse.java | 2 +- .../ChecklistComparisonReadResponse.java | 2 +- .../response/ChecklistQuestionsResponse.java | 7 ++ .../ChecklistsComparisonReadResponse.java | 2 +- .../dto/response/QuestionResponse.java | 10 +++ .../UserChecklistPreviewResponse.java | 2 +- .../UserChecklistsPreviewResponse.java | 2 +- .../WrittenChecklistResponse.java | 4 +- .../WrittenQuestionResponse.java | 2 +- .../checklist/service/ChecklistService.java | 24 +++++- .../category/domain/CategoryTest.java | 7 ++ .../checklist/ChecklistFixture.java | 4 +- .../controller/ChecklistE2ETest.java | 18 +++++ .../checklist/domain/QuestionTest.java | 80 +++++++++++++++++++ .../service/ChecklistServiceTest.java | 12 +++ 29 files changed, 205 insertions(+), 41 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => request}/CategoryPriorityCreateRequest.java (68%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoriesReadResponse.java (69%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoryReadResponse.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/WrittenCategoryQuestionsResponse.java (57%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistCreateRequest.java (92%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistInfo.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/QuestionCreateRequest.java (74%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/BadgeResponse.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/CategoryScoreReadResponse.java (70%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistComparisonReadResponse.java (95%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistsComparisonReadResponse.java (72%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistPreviewResponse.java (93%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistsPreviewResponse.java (71%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/WrittenChecklistResponse.java (63%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/WrittenQuestionResponse.java (69%) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java deleted file mode 100644 index f6475df00..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.category.dto; - -import com.bang_ggood.checklist.dto.QuestionResponse; -import java.util.List; - -public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java similarity index 68% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java index 543324b60..d25bf384c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.request; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java index 6351eb75f..a94075923 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java new file mode 100644 index 000000000..1edcb6c49 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.category.dto.response; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.checklist.dto.response.QuestionResponse; +import java.util.List; + +public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { + + public static CategoryQuestionsResponse of(Category category, List questions) { + return new CategoryQuestionsResponse(category.getId(), category.getName(), questions); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java index ae234449b..19441adcd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import com.bang_ggood.category.domain.Category; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java similarity index 57% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java index 8dc76ef10..85f48af67 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java @@ -1,6 +1,6 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import java.util.List; public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 7a80723cb..6459752de 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,10 +1,12 @@ package com.bang_ggood.checklist.controller; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.service.ChecklistService; import jakarta.validation.Valid; import java.net.URI; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -23,4 +25,9 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR long checklistId = checklistService.createChecklist(checklistCreateRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } + + @GetMapping("/checklists/questions") + public ResponseEntity readChecklistQuestions() { + return ResponseEntity.ok(checklistService.readChecklistQuestions()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index a569fc297..e8a0d25d2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -5,6 +5,7 @@ import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; import java.util.List; +import java.util.stream.Collectors; public enum Question { @@ -67,6 +68,12 @@ public static List filter(Category category, List findQuestionsByCategory(Category category) { + return Arrays.stream(values()) + .filter(question -> question.getCategory().equals(category)) + .collect(Collectors.toList()); + } + private boolean isCategory(Category category) { return this.category == category; } @@ -95,4 +102,8 @@ public String getTitle() { public String getSubtitle() { return subtitle; } + + public Category getCategory() { + return category; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java deleted file mode 100644 index f04a230f9..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.CategoryQuestionsResponse; -import java.util.List; - -public record ChecklistQuestionsResponse(List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java deleted file mode 100644 index d2b5184ff..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bang_ggood.checklist.dto; - -public record QuestionResponse(Integer questionId, String title, String subtitle) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java similarity index 92% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java index 246b1bb86..0c415ff4f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.dto.RoomCreateRequest; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java index b3ba6dd31..bb61b2f7d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; public record ChecklistInfo(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java similarity index 74% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java index 26beec952..5b5388017 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index e5c070c8f..83d1f10cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.domain.Badge; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java similarity index 70% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java index 30278b78e..87e49f01b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record CategoryScoreReadResponse( Integer categoryId, String categoryName, Integer score diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java similarity index 95% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java index b7669d06c..746fc9566 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java new file mode 100644 index 000000000..c876b8d2b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; +import java.util.List; + +public record ChecklistQuestionsResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java similarity index 72% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java index f9968c4bb..00350edf0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java new file mode 100644 index 000000000..f1d5f5918 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.domain.Question; + +public record QuestionResponse(Integer questionId, String title, String subtitle) { + + public static QuestionResponse of(Question question) { + return new QuestionResponse(question.getId(), question.getTitle(), question.getSubtitle()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java similarity index 93% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 8d83211e8..27d90b50e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; import java.time.LocalDateTime; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java similarity index 71% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java index ab602984d..4149d6d83 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java similarity index 63% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java index dc32f6f29..8ff101494 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java @@ -1,6 +1,6 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; import com.bang_ggood.room.dto.WrittenRoomResponse; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java index 4594ca044..a218fa8a3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 28a8730dc..b4afad467 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -1,14 +1,18 @@ package com.bang_ggood.checklist.service; +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.ChecklistInfo; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistInfo; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.response.QuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -17,6 +21,7 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -108,6 +113,19 @@ private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequ checklistQuestionRepository.saveAll(checklistQuestions); } + @Transactional + public ChecklistQuestionsResponse readChecklistQuestions() { + List categoryQuestionsResponses = new ArrayList<>(); + for (Category category : Category.values()) { + List questionsByCategory = Question.findQuestionsByCategory(category) + .stream() + .map(QuestionResponse::of) + .toList(); + categoryQuestionsResponses.add(CategoryQuestionsResponse.of(category, questionsByCategory)); + } + return new ChecklistQuestionsResponse(categoryQuestionsResponses); + } + private void validateQuestion(List questions) { validateQuestionDuplicate(questions); validateQuestionInvalid(questions); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java new file mode 100644 index 000000000..0fd0c8591 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java @@ -0,0 +1,7 @@ +package com.bang_ggood.category.domain; + +import static org.junit.jupiter.api.Assertions.*; + +class CategoryTest { + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 7d7f9a62d..09b967c76 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -1,7 +1,7 @@ package com.bang_ggood.checklist; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; import com.bang_ggood.room.RoomFixture; import java.util.List; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 28ac8fa98..2a21e1d72 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,7 +1,11 @@ package com.bang_ggood.checklist.controller; +import static org.assertj.core.api.Assertions.assertThat; + import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.junit.jupiter.api.DisplayName; @@ -53,4 +57,18 @@ void createChecklist_noAnswer_exception() { .statusCode(400); } + @DisplayName("체크리스트 질문 조회 성공") + @Test + void readChecklistQuestions() { + ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/checklists/questions") + .then().log().all() + .statusCode(200) + .extract() + .as(ChecklistQuestionsResponse.class); + + assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); + } + } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java new file mode 100644 index 000000000..59ddbcc65 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -0,0 +1,80 @@ +package com.bang_ggood.checklist.domain; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.*; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class QuestionTest { + + @DisplayName("특정 카테고리의 질문 찾기 성공") + @Test + void findQuestionsByCategory() { + //given + Category category = Category.CLEAN; + + //when + List questions = Question.findQuestionsByCategory(category); + + //then + assertAll( + () -> assertThat(questions.size()).isEqualTo(5), + () -> assertThat(questions.get(0).getId()).isEqualTo(1) + ); + } + + @DisplayName("질문 아이디를 통해 질문 찾기 성공") + @Test + void findById() { + //given + int questionId = 1; + + //when + Question question = Question.findById(questionId); + + //then + assertAll( + () -> assertThat(question.getId()).isEqualTo(questionId), + () -> assertThat(question.getCategory()).isEqualTo(Category.CLEAN) + ); + } + + @DisplayName("질문 아이디를 통해 질문 찾기 실패 : 유효하지 않은 질문 아이디일 경우") + @Test + void findById_invalidQuestion_exception() { + //given + int questionId = 999; + + //when & then + assertThatThrownBy(() -> Question.findById(questionId)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); + } + + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함일 경우") + @Test + void contains_true() { + //given + int questionId = 1; + + //when & then + assertThat(Question.contains(questionId)).isTrue(); + } + + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함이 아닐 경우") + @Test + void contains_false() { + //given + int questionId = 999; + + //when & then + assertThat(Question.contains(questionId)).isFalse(); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index b6673bd61..e1fd0d9d9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -5,8 +5,10 @@ import static org.junit.jupiter.api.Assertions.*; import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; @@ -75,4 +77,14 @@ void createChecklist_duplicatedOptionId_exception() { .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } + @DisplayName("체크리스트 질문 조회 성공") + @Test + void readChecklistQuestions() { + // given & when + ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(); + + // then + assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); + } + } From 67f4c255e765c43f3cb54f66a21c2a6902f51490 Mon Sep 17 00:00:00 2001 From: tkdgur0906 Date: Mon, 29 Jul 2024 18:51:23 +0900 Subject: [PATCH 111/348] =?UTF-8?q?feat:=20=EC=9E=91=EC=84=B1=ED=95=9C=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/WrittenCategoryQuestionsResponse.java | 13 ++- .../controller/ChecklistController.java | 23 +++++ .../dto/WrittenQuestionResponse.java | 11 +++ .../repository/ChecklistRepository.java | 2 +- .../checklist/service/ChecklistService.java | 76 +++++++++++++++++ .../room/dto/WrittenRoomResponse.java | 10 +-- .../bang-ggood/src/main/resources/schema.sql | 20 +++-- .../checklist/ChecklistFixture.java | 85 +++++++++++++++++++ .../controller/ChecklistE2ETest.java | 45 ++++++++++ .../checklist/option/OptionTest.java | 22 +++++ .../service/ChecklistServiceTest.java | 53 ++++++++++++ .../java/com/bang_ggood/room/RoomFixture.java | 5 ++ .../src/test/resources/schema-test.sql | 8 +- 13 files changed, 357 insertions(+), 16 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java index 8dc76ef10..0af486f49 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java @@ -1,7 +1,18 @@ package com.bang_ggood.category.dto; +import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.dto.WrittenQuestionResponse; + import java.util.List; -public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { +public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, + List questions) { + + public static WrittenCategoryQuestionsResponse of(Category category, List questions) { + return new WrittenCategoryQuestionsResponse( + category.getId(), + category.getName(), + questions + ); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java new file mode 100644 index 000000000..8ed887633 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -0,0 +1,23 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.service.ChecklistService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ChecklistController { + + private final ChecklistService checklistService; + + public ChecklistController(ChecklistService checklistService) { + this.checklistService = checklistService; + } + + @GetMapping("/checklists/{id}") + public ResponseEntity readChecklistById(@PathVariable long id) { + return ResponseEntity.ok(checklistService.readChecklistById(id)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java index 4594ca044..544681b8c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java @@ -1,4 +1,15 @@ package com.bang_ggood.checklist.dto; +import com.bang_ggood.checklist.domain.ChecklistQuestion; + public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { + + public static WrittenQuestionResponse of(ChecklistQuestion checklistQuestion) { + return new WrittenQuestionResponse( + checklistQuestion.getQuestion().getId(), + checklistQuestion.getQuestion().getTitle(), + checklistQuestion.getQuestion().getSubtitle(), + checklistQuestion.getGrade().name() + ); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index ac123fa78..45f3cf4d1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -21,7 +21,7 @@ public interface ChecklistRepository extends JpaRepository { Optional findById(long id); default Checklist getById(long id) { - return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); + return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } List findByUser(User user); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java new file mode 100644 index 000000000..cc1084523 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -0,0 +1,76 @@ +package com.bang_ggood.checklist.service; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistOption; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.repository.ChecklistOptionRepository; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.room.dto.WrittenRoomResponse; +import com.bang_ggood.room.repository.RoomRepository; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; + +@Service +public class ChecklistService { + + private final ChecklistRepository checklistRepository; + private final RoomRepository roomRepository; + private final ChecklistOptionRepository checklistOptionRepository; + private final ChecklistQuestionRepository checklistQuestionRepository; + + public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, + ChecklistOptionRepository checklistOptionRepository, + ChecklistQuestionRepository checklistQuestionRepository) { + this.checklistRepository = checklistRepository; + this.roomRepository = roomRepository; + this.checklistOptionRepository = checklistOptionRepository; + this.checklistQuestionRepository = checklistQuestionRepository; + } + + @Transactional + public WrittenChecklistResponse readChecklistById(long id) { + Checklist checklist = checklistRepository.getById(id); + WrittenRoomResponse writtenRoomResponse = WrittenRoomResponse.of(checklist); + + List optionIds = readOptionsByChecklistId(id); + + List writtenCategoryQuestionsResponses = + readCategoryQuestionsByChecklistId(id); + + return new WrittenChecklistResponse(writtenRoomResponse, optionIds, writtenCategoryQuestionsResponses); + } + + private List readOptionsByChecklistId(long checklistId) { + return checklistOptionRepository.findByChecklistId(checklistId) + .stream() + .map(ChecklistOption::getOptionId) + .toList(); + } + + private List readCategoryQuestionsByChecklistId(long checklistId) { + List checklistQuestions = checklistQuestionRepository.findByChecklistId(checklistId); + return Arrays.stream(Category.values()) + .map(category -> readQuestionsByCategory(category, checklistQuestions)) + .collect(Collectors.toList()); + } + + private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category category, + List checklistQuestions) { + List writtenQuestionResponses = + Question.filter(category, checklistQuestions).stream() + .map(WrittenQuestionResponse::of) + .collect(Collectors.toList()); + + return WrittenCategoryQuestionsResponse.of(category, writtenQuestionResponses); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java index df878e737..2c1194a6f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java @@ -1,13 +1,13 @@ package com.bang_ggood.room.dto; -import com.bang_ggood.room.domain.Room; +import com.bang_ggood.checklist.domain.Checklist; public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, String address, String station, Integer walkingTime, String realEstate) { - public static WrittenRoomResponse of(Room room, Integer deposit, Integer rent, - Integer contractTerm, String realEstate) { - return new WrittenRoomResponse(room.getName(), deposit, rent, contractTerm, room.getFloor(), - room.getAddress(), room.getStation(), room.getWalkingTime(), realEstate); + public static WrittenRoomResponse of(Checklist checklist) { + return new WrittenRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), + checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), + checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); } } diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f2dabe4f2..b785458dc 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS test_entity CASCADE; -- Create tables CREATE TABLE room @@ -54,16 +55,15 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); - -CREATE TABLE category_priority +CREATE TABLE if not exists category_priority ( id bigint generated by default as identity, category_id INTEGER not null, @@ -72,4 +72,14 @@ CREATE TABLE category_priority modified_at TIMESTAMP not null, primary key (id), foreign key (user_id) references users -); + ); + + +CREATE TABLE test_entity +( + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, + primary key (id) +); \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java new file mode 100644 index 000000000..e560ed9d1 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -0,0 +1,85 @@ +package com.bang_ggood.checklist; + +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.dto.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.user.domain.User; + +import java.util.List; + +public class ChecklistFixture { + + public static final Checklist checklist = new Checklist( + new User(1L, "방방이"), + RoomFixture.ROOM, + 1000, 50, 12, "방끗공인중개사" + ); + + public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( + 1, "GOOD" + ); + + public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( + 2, "SOSO" + ); + + public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( + 3, "BAD" + ); + + public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( + 5, null + ); + + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( + null, null + ); + + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( + 9999, "SOSO" + ); + + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 9999), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) + ); +} \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java new file mode 100644 index 000000000..09813af26 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -0,0 +1,45 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; + +class ChecklistE2ETest extends AcceptanceTest { + + @Autowired + private ChecklistRepository checklistRepository; + @Autowired + private RoomRepository roomRepository; + + @DisplayName("작성된 체크리스트 조회 성공") + @Test + void readChecklistById() { + //체크리스트 저장 + roomRepository.save(RoomFixture.ROOM); + checklistRepository.save(ChecklistFixture.checklist); + + WrittenChecklistResponse writtenChecklistResponse = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/checklists/1") + .then().log().all() + .statusCode(200) + .extract() + .as(WrittenChecklistResponse.class); + + Assertions.assertAll( + () -> assertThat(writtenChecklistResponse.room().name()).isEqualTo("살기 좋은 방"), + () -> assertThat(writtenChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + ); + } +} \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java new file mode 100644 index 000000000..74ecde46f --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java @@ -0,0 +1,22 @@ +package com.bang_ggood.checklist.option; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.bang_ggood.checklist.domain.Option; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class OptionTest { + + @DisplayName("옵션 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(Option.contains(1)).isTrue(); + } + + @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(Option.contains(9999)).isFalse(); + } +} \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java new file mode 100644 index 000000000..55cf17b8f --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -0,0 +1,53 @@ +package com.bang_ggood.checklist.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ChecklistServiceTest extends IntegrationTestSupport { + + @Autowired + private ChecklistService checklistService; + @Autowired + private ChecklistRepository checklistRepository; + @Autowired + private RoomRepository roomRepository; + + @DisplayName("작성된 체크리스트 조회 성공") + @Test + void readChecklistById() { + // given + roomRepository.save(RoomFixture.ROOM); + checklistRepository.save(ChecklistFixture.checklist); + + // when + WrittenChecklistResponse writtenChecklistResponse = checklistService.readChecklistById(1L); + + // then + Assertions.assertAll( + () -> assertThat(writtenChecklistResponse.room().name()).isEqualTo("살기 좋은 방"), + () -> assertThat(writtenChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + ); + } + + @DisplayName("작성된 체크리스트 조회 실패 : 체크리스트가 존재하지 않는 id인 경우") + @Test + void readChecklistById_invalidChecklistId_exception() { + // given & when & then + assertThatThrownBy(() -> checklistService.readChecklistById(0)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } +} \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 942106964..de9b411ee 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -1,9 +1,14 @@ package com.bang_ggood.room; +import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.dto.RoomCreateRequest; public class RoomFixture { + public static final Room ROOM = new Room( + "살기 좋은 방", 3, "인천광역시 부평구", "잠실", 10 + ); + public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( "방이름", 1000, 50, 12, 3, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사" diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index d660d5075..b785458dc 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -55,11 +55,11 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); @@ -72,7 +72,7 @@ CREATE TABLE if not exists category_priority modified_at TIMESTAMP not null, primary key (id), foreign key (user_id) references users -); + ); CREATE TABLE test_entity @@ -82,4 +82,4 @@ CREATE TABLE test_entity created_at TIMESTAMP not null, modified_at TIMESTAMP not null, primary key (id) -); +); \ No newline at end of file From e99fa884fe171d475f575ec1786ad6f2fa4ff8f4 Mon Sep 17 00:00:00 2001 From: tsulocalize Date: Mon, 29 Jul 2024 19:38:31 +0900 Subject: [PATCH 112/348] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 22 ++++++++++++++++++ .../bang_ggood/category/domain/Category.java | 1 - .../category/service/CategoryService.java | 19 +++++++++++++++ .../category/service/CategoryServiceTest.java | 23 +++++++++++++++++++ 4 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java new file mode 100644 index 000000000..91800937d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -0,0 +1,22 @@ +package com.bang_ggood.category.controller; + +import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.service.CategoryService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class CategoryController { + + private final CategoryService categoryService; + + public CategoryController(CategoryService categoryService) { + this.categoryService = categoryService; + } + + @GetMapping("/categories") + public ResponseEntity readCategories() { + return ResponseEntity.ok(categoryService.readCategories()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 21f78a1c4..bd420386e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -3,7 +3,6 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; import java.util.Arrays; import java.util.List; -import java.util.Set; import static com.bang_ggood.category.domain.Badge.NONE; import static com.bang_ggood.checklist.domain.ChecklistScore.calculateCategoryScore; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java new file mode 100644 index 000000000..7765bc37d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -0,0 +1,19 @@ +package com.bang_ggood.category.service; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryReadResponse; +import org.springframework.stereotype.Service; +import java.util.Arrays; +import java.util.List; + +@Service +public class CategoryService { + + public CategoriesReadResponse readCategories() { + List categoryReadResponses = Arrays.stream(Category.values()) + .map(category -> new CategoryReadResponse(category.getId(), category.getName())) + .toList(); + return new CategoriesReadResponse(categoryReadResponses); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java new file mode 100644 index 000000000..3c1026455 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -0,0 +1,23 @@ +package com.bang_ggood.category.service; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.CategoriesReadResponse; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; + +class CategoryServiceTest { + + CategoryService categoryService = new CategoryService(); + + @DisplayName("카테고리 목록 조회 성공") + @Test + void readCategories() { + // given & when + CategoriesReadResponse response = categoryService.readCategories(); + + // then + assertThat(response.categories()).hasSize(Category.values().length); + } +} From d213fcf4f078567804cb096c0190d7b3af3ce556 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Mon, 29 Jul 2024 20:13:37 +0900 Subject: [PATCH 113/348] =?UTF-8?q?refactor:=20=EC=82=AC=EC=9A=A9=EC=9E=90?= =?UTF-8?q?=20=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 24 +++++ .../checklist/service/ChecklistService.java | 58 +++++++++++ .../bang-ggood/src/main/resources/schema.sql | 4 +- .../service/ChecklistServiceTest.java | 97 +++++++++++++++++++ .../src/test/resources/schema-test.sql | 4 +- 5 files changed, 183 insertions(+), 4 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java new file mode 100644 index 000000000..6cb1ac2cc --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -0,0 +1,24 @@ +package com.bang_ggood.checklist.controller; + +import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.user.domain.User; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ChecklistController { + + private final ChecklistService checklistService; + + public ChecklistController(ChecklistService checklistService) { + this.checklistService = checklistService; + } + + @GetMapping("/checklists") + public ResponseEntity readUserChecklistsPreview() { + User user = new User(1L, "방방이"); + return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java new file mode 100644 index 000000000..574120e64 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -0,0 +1,58 @@ +package com.bang_ggood.checklist.service; + +import com.bang_ggood.category.domain.Badge; +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.dto.BadgeResponse; +import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.repository.ChecklistOptionRepository; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.domain.User; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.Arrays; +import java.util.List; + +@Service +public class ChecklistService { + + private final ChecklistRepository checklistRepository; + private final RoomRepository roomRepository; + private final ChecklistOptionRepository checklistOptionRepository; + private final ChecklistQuestionRepository checklistQuestionRepository; + + public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, + ChecklistOptionRepository checklistOptionRepository, + ChecklistQuestionRepository checklistQuestionRepository) { + this.checklistRepository = checklistRepository; + this.roomRepository = roomRepository; + this.checklistOptionRepository = checklistOptionRepository; + this.checklistQuestionRepository = checklistQuestionRepository; + } + + @Transactional + public UserChecklistsPreviewResponse readUserChecklistsPreview(User user) { + List checklists = checklistRepository.findByUser(user); + List responses = checklists.stream() + .map(this::getChecklistPreview) + .toList(); + + return new UserChecklistsPreviewResponse(responses); + } + + private UserChecklistPreviewResponse getChecklistPreview(Checklist checklist) { + return UserChecklistPreviewResponse.of(checklist, createBadges(checklist.getQuestions())); + } + + private List createBadges(List questions) { + return Arrays.stream(Category.values()) + .map(category -> category.provideBadge(questions)) + .filter(badge -> badge != Badge.NONE) + .map(BadgeResponse::from) + .toList(); + } +} diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f2dabe4f2..de223b6ee 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -54,11 +54,11 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(22) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java new file mode 100644 index 000000000..0c2f774b7 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -0,0 +1,97 @@ +package com.bang_ggood.checklist.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.category.domain.Badge; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.BadgeResponse; +import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.domain.User; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +class ChecklistServiceTest extends IntegrationTestSupport { + + @Autowired + private ChecklistService checklistService; + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private RoomRepository roomRepository; + + @Autowired + private ChecklistQuestionRepository checklistQuestionRepository; + + @DisplayName("체크리스트 리스트 조회 성공") + @Test + void readUserChecklistsPreview() { + // given + User user = new User(1L, "방방이"); + Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist = createChecklist(user, room); + List questions = List.of( + new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_4, null), + new ChecklistQuestion(checklist, Question.CLEAN_5, null)); + + roomRepository.save(room); + checklistRepository.save(checklist); + checklistQuestionRepository.saveAll(questions); + + // when + UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); + + // then + UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); + Assertions.assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); + Assertions.assertThat(previewResponse1.badge()) + .containsExactlyInAnyOrder(new BadgeResponse( + Badge.CLEAN.getShortNameWithEmoji(), + Badge.CLEAN.getLongNameWithEmoji())); + } + + @DisplayName("체크리스트 리스트 조회 성공 : 뱃지가 존재하지 않을 때") + @Test + void readUserChecklistsPreview_NoBadge() { + // given + User user = new User(1L, "방방이"); + Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist = createChecklist(user, room); + List questions = List.of( + new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.BAD), + new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.BAD), + new ChecklistQuestion(checklist, Question.CLEAN_4, null), + new ChecklistQuestion(checklist, Question.CLEAN_5, null)); + + roomRepository.save(room); + checklistRepository.save(checklist); + checklistQuestionRepository.saveAll(questions); + + // when + UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); + + // then + UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); + Assertions.assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); + Assertions.assertThat(previewResponse1.badge()).isEmpty(); + } + + public static Checklist createChecklist(User user, Room room) { + return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); + } +} diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index d660d5075..fa3fcaf98 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -55,11 +55,11 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(22) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); From d8f8185ab4197345c7c05204e517b8f0ee6904d8 Mon Sep 17 00:00:00 2001 From: tsulocalize Date: Mon, 29 Jul 2024 20:20:05 +0900 Subject: [PATCH 114/348] =?UTF-8?q?feat:=20=EC=B9=B4=ED=85=8C=EA=B3=A0?= =?UTF-8?q?=EB=A6=AC=20=EC=9A=B0=EC=84=A0=EC=88=9C=EC=9C=84=20=EC=A0=80?= =?UTF-8?q?=EC=9E=A5=20API=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 9 +++ .../category/service/CategoryService.java | 56 +++++++++++++++++ .../category/service/CategoryServiceTest.java | 63 ++++++++++++++++++- 3 files changed, 126 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index 91800937d..b2c2e62d0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,9 +1,12 @@ package com.bang_ggood.category.controller; import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import com.bang_ggood.category.service.CategoryService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController @@ -15,6 +18,12 @@ public CategoryController(CategoryService categoryService) { this.categoryService = categoryService; } + @PostMapping("/categories/priority") + public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { + categoryService.createCategoriesPriority(request); + return ResponseEntity.noContent().build(); + } + @GetMapping("/categories") public ResponseEntity readCategories() { return ResponseEntity.ok(categoryService.readCategories()); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index 7765bc37d..06f551b5b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -1,15 +1,71 @@ package com.bang_ggood.category.service; import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.domain.CategoryPriority; import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.CategoryReadResponse; +import com.bang_ggood.category.repository.CategoryPriorityRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.List; +import java.util.Set; + +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; @Service public class CategoryService { + private static final int MAX_CATEGORY_PRIORITY = 3; + private final CategoryPriorityRepository categoryPriorityRepository; + + public CategoryService(CategoryPriorityRepository categoryPriorityRepository) { + this.categoryPriorityRepository = categoryPriorityRepository; + } + + @Transactional + public void createCategoriesPriority(CategoryPriorityCreateRequest request) { + User user = new User(1L, "방방이"); + validate(request); + List categoryPriorities = request.categoryIds().stream() + .map(id -> new CategoryPriority(id, user)) + .toList(); + categoryPriorityRepository.saveAll(categoryPriorities); + } + + private void validate(CategoryPriorityCreateRequest request) { + validateCategoryCount(request); + validateDuplication(request); + validateCategoryId(request); + } + + private void validateCategoryCount(CategoryPriorityCreateRequest request) { + if (request.categoryIds().size() > MAX_CATEGORY_PRIORITY) { + throw new BangggoodException(CATEGORY_PRIORITY_INVALID_COUNT); + } + } + + private void validateDuplication(CategoryPriorityCreateRequest request) { + int originalSize = request.categoryIds().size(); + int distinctSize = Set.copyOf(request.categoryIds()).size(); + if (originalSize != distinctSize) { + throw new BangggoodException(CATEGORY_DUPLICATED); + } + } + + private void validateCategoryId(CategoryPriorityCreateRequest request) { + request.categoryIds().stream() + .filter(id -> !Category.contains(id)) + .findAny() + .ifPresent(id -> { throw new BangggoodException(CATEGORY_NOT_FOUND); }); + } + public CategoriesReadResponse readCategories() { List categoryReadResponses = Arrays.stream(Category.values()) .map(category -> new CategoryReadResponse(category.getId(), category.getName())) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index 3c1026455..92c9c5d0c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -1,15 +1,74 @@ package com.bang_ggood.category.service; +import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.CategoriesReadResponse; +import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; +import com.bang_ggood.exception.BangggoodException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; +import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class CategoryServiceTest extends IntegrationTestSupport { -class CategoryServiceTest { + @Autowired + CategoryService categoryService; - CategoryService categoryService = new CategoryService(); + @DisplayName("카테고리 우선순위 저장 성공") + @Test + void createCategoriesPriority() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3)); + + // when && then + assertThatCode(() -> categoryService.createCategoriesPriority(request)) + .doesNotThrowAnyException(); + } + + @DisplayName("카테고리 우선순위 저장 실패 : 올바르지 않은 ID") + @Test + void createCategoriesPriority_invalidId_exception() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(999)); + + // when && then + assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(CATEGORY_NOT_FOUND.getMessage()); + } + + @DisplayName("카테고리 우선순위 저장 실패 : 최대 선택 개수 초과") + @Test + void createCategoriesPriority_overMaxCount_exception() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9)); + + // when && then + assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); + } + + @DisplayName("카테고리 우선순위 저장 실패 : 중복된 ID") + @Test + void createCategoriesPriority_duplication_exception() { + // given + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 1)); + + // when && then + assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(CATEGORY_DUPLICATED.getMessage()); + } @DisplayName("카테고리 목록 조회 성공") @Test From ea3c992cb3ebb64f3d3a2d1d5db9d2fa7c4abacf Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Mon, 29 Jul 2024 22:20:29 +0900 Subject: [PATCH 115/348] =?UTF-8?q?refactor:=20=EB=B0=A9=20=EB=B9=84?= =?UTF-8?q?=EA=B5=90=20=EA=B2=B0=EA=B3=BC=20API=20=EC=88=98=EC=A0=95=20?= =?UTF-8?q?=EB=B0=98=EC=98=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CategoryQuestionsResponse.java | 2 +- .../dto/WrittenCategoryQuestionsResponse.java | 2 +- .../controller/ChecklistController.java | 10 ++- .../dto/CategoryScoreReadResponse.java | 6 -- .../dto/ChecklistsComparisonReadResponse.java | 6 -- .../dto/UserChecklistsPreviewResponse.java | 6 -- .../{ => request}/ChecklistCreateRequest.java | 3 +- .../{ => request}/QuestionCreateRequest.java | 2 +- .../dto/{ => response}/BadgeResponse.java | 2 +- .../response/CategoryScoreReadResponse.java | 12 ++++ .../ChecklistQuestionsResponse.java | 2 +- .../ChecklistWithScoreReadResponse.java} | 8 +-- .../ChecklistsWithScoreReadResponse.java | 6 ++ .../dto/{ => response}/QuestionResponse.java | 2 +- .../UserChecklistPreviewResponse.java | 2 +- .../UserChecklistsPreviewResponse.java | 7 ++ .../WrittenChecklistResponse.java | 2 +- .../WrittenQuestionResponse.java | 2 +- .../repository/ChecklistRepository.java | 8 +-- .../checklist/service/ChecklistService.java | 66 +++++++++++++++++- .../bang_ggood/exception/ExceptionCode.java | 5 +- .../service/ChecklistServiceTest.java | 68 +++++++++++++++++-- 22 files changed, 184 insertions(+), 45 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistCreateRequest.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/QuestionCreateRequest.java (74%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/BadgeResponse.java (85%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistQuestionsResponse.java (78%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ChecklistComparisonReadResponse.java => response/ChecklistWithScoreReadResponse.java} (73%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/QuestionResponse.java (64%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistPreviewResponse.java (93%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/WrittenChecklistResponse.java (86%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/WrittenQuestionResponse.java (69%) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java index f6475df00..4309c8400 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java @@ -1,6 +1,6 @@ package com.bang_ggood.category.dto; -import com.bang_ggood.checklist.dto.QuestionResponse; +import com.bang_ggood.checklist.dto.response.QuestionResponse; import java.util.List; public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java index 8dc76ef10..3e5a1c335 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java @@ -1,6 +1,6 @@ package com.bang_ggood.category.dto; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import java.util.List; public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 6cb1ac2cc..75f9fa1d8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,11 +1,14 @@ package com.bang_ggood.checklist.controller; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.user.domain.User; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.util.List; @RestController public class ChecklistController { @@ -21,4 +24,9 @@ public ResponseEntity readUserChecklistsPreview() User user = new User(1L, "방방이"); return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); } + + @GetMapping("/checklists/comparison") + public ResponseEntity readChecklistsComparison(@RequestParam("id") List checklistIds) { + return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java deleted file mode 100644 index 30278b78e..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -public record CategoryScoreReadResponse( - Integer categoryId, String categoryName, Integer score -) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java deleted file mode 100644 index f9968c4bb..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import java.util.List; - -public record ChecklistsComparisonReadResponse(List checklists) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java deleted file mode 100644 index ab602984d..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import java.util.List; - -public record UserChecklistsPreviewResponse(List checklists) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java index 246b1bb86..fdc448846 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java @@ -1,5 +1,6 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; +import com.bang_ggood.checklist.dto.ChecklistInfo; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.dto.RoomCreateRequest; import jakarta.validation.Valid; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java similarity index 74% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java index 26beec952..5b5388017 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index e5c070c8f..83d1f10cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.domain.Badge; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java new file mode 100644 index 000000000..504b01b41 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.domain.Category; + +public record CategoryScoreReadResponse( + Integer categoryId, String categoryName, Integer score +) { + + public static CategoryScoreReadResponse of(Category category, int score) { + return new CategoryScoreReadResponse(category.getId(), category.getName(), score); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java similarity index 78% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java index f04a230f9..8c2cc48e1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.dto.CategoryQuestionsResponse; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java similarity index 73% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java index b7669d06c..a7d9aa1ba 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java @@ -1,17 +1,17 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; import java.util.List; -public record ChecklistComparisonReadResponse( +public record ChecklistWithScoreReadResponse( Long checklistId, String roomName, String address, Integer floor, Integer deposit, Integer rent, Integer contractTerm, String station, Integer walkingTime, Integer optionCount, Integer score, List categories ) { - public static ChecklistComparisonReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, List categoryScores) { - return new ChecklistComparisonReadResponse( + public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, List categoryScores) { + return new ChecklistWithScoreReadResponse( checklist.getId(), checklist.getRoomName(), checklist.getRoomAddress(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java new file mode 100644 index 000000000..d4f052f47 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto.response; + +import java.util.List; + +public record ChecklistsWithScoreReadResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java similarity index 64% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java index d2b5184ff..30591806f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record QuestionResponse(Integer questionId, String title, String subtitle) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java similarity index 93% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 8d83211e8..27d90b50e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; import java.time.LocalDateTime; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java new file mode 100644 index 000000000..aa3b8aaf0 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import java.util.List; + +public record UserChecklistsPreviewResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java similarity index 86% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java index dc32f6f29..241133996 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; import com.bang_ggood.room.dto.WrittenRoomResponse; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java index 4594ca044..a218fa8a3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index ac123fa78..d7711b97a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -4,12 +4,10 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; - -import java.util.Optional; -import java.util.List; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import java.util.List; +import java.util.Optional; public interface ChecklistRepository extends JpaRepository { @@ -27,4 +25,6 @@ default Checklist getById(long id) { List findByUser(User user); List findByUserAndIdIn(User user, List checklistIds); + + long countAllByIdIn(List ids); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 574120e64..e45861e35 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -4,17 +4,24 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.dto.BadgeResponse; -import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.domain.ChecklistScore; +import com.bang_ggood.checklist.dto.response.BadgeResponse; +import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; +import com.bang_ggood.checklist.dto.response.ChecklistWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; +import java.util.Comparator; import java.util.List; @Service @@ -55,4 +62,57 @@ private List createBadges(List questions) { .map(BadgeResponse::from) .toList(); } + + @Transactional + public ChecklistsWithScoreReadResponse readChecklistsComparison(List checklistIds) { + User user = new User(1L, "방끗"); + + validateChecklistComparison(checklistIds); + + List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) + .stream() + .map(this::getChecklistWithScore) + .sorted(Comparator.comparing(ChecklistWithScoreReadResponse::score).reversed()) + .toList(); + + return new ChecklistsWithScoreReadResponse(responses); + } + + private void validateChecklistComparison(List checklistIds) { + validateChecklistComparisonCount(checklistIds); + validateChecklist(checklistIds); + } + + private void validateChecklistComparisonCount(List checklistIds) { + if (checklistIds.size() > 3) { + throw new BangggoodException(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT); + } + } + + private void validateChecklist(List checklistIds) { + if (checklistRepository.countAllByIdIn(checklistIds) != checklistIds.size()) { + throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); + } + } + + + + private ChecklistWithScoreReadResponse getChecklistWithScore(Checklist checklist) { + List categoryScores = getCategoryScores(checklist.getQuestions()); + int checklistScore = getChecklistScore(checklist.getQuestions()); + int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); + + return ChecklistWithScoreReadResponse.of(checklist, checklistOptionCount, checklistScore, categoryScores); + } + + private List getCategoryScores(List questions) { + return Arrays.stream(Category.values()) + .map(category -> CategoryScoreReadResponse.of(category, ChecklistScore.calculateCategoryScore(category, questions))) + .filter(response -> response.score() != 0) + .toList(); + } + + private int getChecklistScore(List questions) { + return ChecklistScore.calculateTotalScore(questions); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 548e694a5..ce8a6dcb4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -15,8 +15,11 @@ public enum ExceptionCode { CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), + GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), + + // Checklist + CHECKLIST_COMPARISON_INVALID_COUNT(HttpStatus.BAD_REQUEST, "비교할 체크리스트 개수가 유효하지 않습니다."), CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), - GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다.") ; private final HttpStatus httpStatus; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 0c2f774b7..75300bf44 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -6,11 +6,14 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.BadgeResponse; -import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.dto.response.BadgeResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; @@ -68,7 +71,7 @@ void readUserChecklistsPreview() { @Test void readUserChecklistsPreview_NoBadge() { // given - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이"); //TODO 리팩토링 필요 Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); Checklist checklist = createChecklist(user, room); List questions = List.of( @@ -91,6 +94,63 @@ void readUserChecklistsPreview_NoBadge() { Assertions.assertThat(previewResponse1.badge()).isEmpty(); } + @DisplayName("체크리스트 비교 성공") + @Test + void readChecklistsComparison() { + // given + User user = new User(1L, "방방이"); + Room room1 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room2 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room3 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist1 = createChecklist(user, room1); + Checklist checklist2 = createChecklist(user, room2); + Checklist checklist3 = createChecklist(user, room3); + + roomRepository.saveAll(List.of(room1, room2, room3)); + List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + List checklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), checklists.get(2).getId()); + + // when + ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(checklistIds); + + // then + Assertions.assertThat(response.checklists()).hasSize(3); + } + + @DisplayName("체크리스트 비교 실패 : 아이디 개수가 유효하지 않을 때") + @Test + void readChecklistsComparison_invalidIdCount() { + // given + List invalidChecklistIds = List.of(1L, 2L, 3L, 4L); + + // when & then + Assertions.assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT.getMessage()); + } + + @DisplayName("체크리스트 비교 실패 : 유효하지 않은 체크리스트 id 존재") + @Test + void readChecklistsComparison_invalidId() { + // given + User user = new User(1L, "방방이"); + Room room1 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room2 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room3 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist1 = createChecklist(user, room1); + Checklist checklist2 = createChecklist(user, room2); + Checklist checklist3 = createChecklist(user, room3); + + roomRepository.saveAll(List.of(room1, room2, room3)); + List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + List invalidChecklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), checklists.get(2).getId() + 1); + + // when & then + Assertions.assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } + public static Checklist createChecklist(User user, Room room) { return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); } From 87ee8cd8fcdb017f2c812279125d9ac4c0693347 Mon Sep 17 00:00:00 2001 From: tkdgur0906 Date: Tue, 30 Jul 2024 10:51:28 +0900 Subject: [PATCH 116/348] =?UTF-8?q?refactor:=20request,=20response=20dto?= =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{ => request}/CategoryPriorityCreateRequest.java | 2 +- .../dto/{ => response}/CategoriesReadResponse.java | 2 +- .../dto/{ => response}/CategoryQuestionsResponse.java | 5 +++-- .../dto/{ => response}/CategoryReadResponse.java | 2 +- .../WrittenCategoryQuestionsResponse.java | 4 ++-- .../checklist/controller/ChecklistController.java | 2 +- .../checklist/dto/ChecklistQuestionsResponse.java | 7 ------- .../checklist/dto/WrittenChecklistResponse.java | 8 -------- .../dto/{ => request}/ChecklistCreateRequest.java | 5 +++-- .../checklist/dto/{ => request}/ChecklistInfo.java | 2 +- .../dto/{ => request}/QuestionCreateRequest.java | 2 +- .../checklist/dto/{ => response}/BadgeResponse.java | 2 +- .../dto/{ => response}/CategoryScoreReadResponse.java | 2 +- .../ChecklistComparisonReadResponse.java | 3 ++- .../dto/response/ChecklistQuestionsResponse.java | 8 ++++++++ .../ChecklistsComparisonReadResponse.java | 2 +- .../checklist/dto/{ => response}/QuestionResponse.java | 2 +- .../{ => response}/UserChecklistPreviewResponse.java | 3 ++- .../{ => response}/UserChecklistsPreviewResponse.java | 2 +- .../dto/response/WrittenChecklistResponse.java | 10 ++++++++++ .../dto/{ => response}/WrittenQuestionResponse.java | 2 +- .../bang_ggood/checklist/service/ChecklistService.java | 8 ++++---- .../room/dto/{ => request}/RoomCreateRequest.java | 2 +- .../room/dto/{ => response}/WrittenRoomResponse.java | 2 +- .../com/bang_ggood/checklist/ChecklistFixture.java | 4 ++-- .../checklist/controller/ChecklistE2ETest.java | 2 +- .../checklist/service/ChecklistServiceTest.java | 2 +- .../src/test/java/com/bang_ggood/room/RoomFixture.java | 2 +- 28 files changed, 53 insertions(+), 46 deletions(-) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => request}/CategoryPriorityCreateRequest.java (68%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoriesReadResponse.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoryQuestionsResponse.java (56%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoryReadResponse.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/WrittenCategoryQuestionsResponse.java (82%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistCreateRequest.java (82%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistInfo.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/QuestionCreateRequest.java (74%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/BadgeResponse.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/CategoryScoreReadResponse.java (70%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistComparisonReadResponse.java (95%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistsComparisonReadResponse.java (72%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/QuestionResponse.java (64%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistPreviewResponse.java (93%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistsPreviewResponse.java (71%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/WrittenQuestionResponse.java (92%) rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/{ => request}/RoomCreateRequest.java (92%) rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/{ => response}/WrittenRoomResponse.java (94%) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java similarity index 68% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java index 543324b60..d25bf384c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.request; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java index 6351eb75f..a94075923 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java similarity index 56% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java index f6475df00..ad6516860 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java @@ -1,6 +1,7 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; + +import com.bang_ggood.checklist.dto.response.QuestionResponse; -import com.bang_ggood.checklist.dto.QuestionResponse; import java.util.List; public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java index ae234449b..19441adcd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import com.bang_ggood.category.domain.Category; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java index 0af486f49..b139b519c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java @@ -1,7 +1,7 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import com.bang_ggood.category.domain.Category; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 8ed887633..67fe5f862 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,6 +1,6 @@ package com.bang_ggood.checklist.controller; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.service.ChecklistService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java deleted file mode 100644 index f04a230f9..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.CategoryQuestionsResponse; -import java.util.List; - -public record ChecklistQuestionsResponse(List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java deleted file mode 100644 index dc32f6f29..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.WrittenRoomResponse; -import java.util.List; - -public record WrittenChecklistResponse(WrittenRoomResponse room, List options, List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java index 246b1bb86..30b65634a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java @@ -1,8 +1,9 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomCreateRequest; import jakarta.validation.Valid; + import java.util.List; public record ChecklistCreateRequest(@Valid RoomCreateRequest room, List options, diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java index b3ba6dd31..bb61b2f7d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; public record ChecklistInfo(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java similarity index 74% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java index 26beec952..5b5388017 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index e5c070c8f..83d1f10cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.domain.Badge; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java similarity index 70% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java index 30278b78e..87e49f01b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record CategoryScoreReadResponse( Integer categoryId, String categoryName, Integer score diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java similarity index 95% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java index b7669d06c..3db2c83ba 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java @@ -1,6 +1,7 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; + import java.util.List; public record ChecklistComparisonReadResponse( diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java new file mode 100644 index 000000000..c64e01d51 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java @@ -0,0 +1,8 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; + +import java.util.List; + +public record ChecklistQuestionsResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java similarity index 72% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java index f9968c4bb..00350edf0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java similarity index 64% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java index d2b5184ff..30591806f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record QuestionResponse(Integer questionId, String title, String subtitle) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java similarity index 93% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 8d83211e8..15bbc6a93 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,6 +1,7 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; + import java.time.LocalDateTime; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java similarity index 71% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java index ab602984d..4149d6d83 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java new file mode 100644 index 000000000..c5b8c928d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; + +import java.util.List; + +public record WrittenChecklistResponse(WrittenRoomResponse room, List options, + List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java similarity index 92% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java index 544681b8c..34fc7ced8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.ChecklistQuestion; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index cc1084523..3192c60c4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -1,17 +1,17 @@ package com.bang_ggood.checklist.service; import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; -import com.bang_ggood.room.dto.WrittenRoomResponse; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; import com.bang_ggood.room.repository.RoomRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java similarity index 92% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java index 8837cc721..e49b936f0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.room.dto; +package com.bang_ggood.room.dto.request; import com.bang_ggood.room.domain.Room; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java similarity index 94% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java index 2c1194a6f..2a525a497 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.room.dto; +package com.bang_ggood.room.dto.response; import com.bang_ggood.checklist.domain.Checklist; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index e560ed9d1..80fd73c5c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -1,8 +1,8 @@ package com.bang_ggood.checklist; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.user.domain.User; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 09813af26..0db286481 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -2,7 +2,7 @@ import com.bang_ggood.AcceptanceTest; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 55cf17b8f..54b00eecb 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -2,7 +2,7 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index de9b411ee..c6b1299e7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -1,7 +1,7 @@ package com.bang_ggood.room; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomCreateRequest; public class RoomFixture { From 409698116819d10ad15ab6ae58cd58cfe123fa0b Mon Sep 17 00:00:00 2001 From: tsulocalize Date: Tue, 30 Jul 2024 10:52:19 +0900 Subject: [PATCH 117/348] =?UTF-8?q?refactor:=20DTO=20request/response=20pa?= =?UTF-8?q?ckage=20=EB=B6=84=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../category/controller/CategoryController.java | 4 ++-- .../dto/{ => request}/CategoryPriorityCreateRequest.java | 2 +- .../dto/{ => response}/CategoriesReadResponse.java | 2 +- .../dto/{ => response}/CategoryQuestionsResponse.java | 4 ++-- .../category/dto/{ => response}/CategoryReadResponse.java | 2 +- .../{ => response}/WrittenCategoryQuestionsResponse.java | 4 ++-- .../com/bang_ggood/category/service/CategoryService.java | 7 +++---- .../checklist/dto/ChecklistQuestionsResponse.java | 7 ------- .../checklist/dto/UserChecklistsPreviewResponse.java | 6 ------ .../checklist/dto/WrittenChecklistResponse.java | 8 -------- .../dto/{ => request}/ChecklistCreateRequest.java | 4 ++-- .../checklist/dto/{ => request}/ChecklistInfo.java | 2 +- .../dto/{ => request}/QuestionCreateRequest.java | 2 +- .../checklist/dto/{ => response}/BadgeResponse.java | 2 +- .../dto/{ => response}/CategoryScoreReadResponse.java | 2 +- .../{ => response}/ChecklistComparisonReadResponse.java | 2 +- .../dto/response/ChecklistQuestionsResponse.java | 7 +++++++ .../{ => response}/ChecklistsComparisonReadResponse.java | 3 ++- .../checklist/dto/{ => response}/QuestionResponse.java | 2 +- .../dto/{ => response}/UserChecklistPreviewResponse.java | 2 +- .../dto/response/UserChecklistsPreviewResponse.java | 7 +++++++ .../checklist/dto/response/WrittenChecklistResponse.java | 8 ++++++++ .../dto/{ => response}/WrittenQuestionResponse.java | 2 +- .../checklist/repository/ChecklistOptionRepository.java | 2 ++ .../room/dto/{ => request}/RoomCreateRequest.java | 2 +- .../room/dto/{ => response}/WrittenRoomResponse.java | 2 +- .../bang_ggood/category/service/CategoryServiceTest.java | 4 ++-- .../src/test/java/com/bang_ggood/room/RoomFixture.java | 2 +- 28 files changed, 53 insertions(+), 50 deletions(-) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => request}/CategoryPriorityCreateRequest.java (68%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoriesReadResponse.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoryQuestionsResponse.java (56%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoryReadResponse.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/WrittenCategoryQuestionsResponse.java (57%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistCreateRequest.java (82%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistInfo.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/QuestionCreateRequest.java (74%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/BadgeResponse.java (85%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/CategoryScoreReadResponse.java (70%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistComparisonReadResponse.java (95%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/ChecklistsComparisonReadResponse.java (50%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/QuestionResponse.java (64%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistPreviewResponse.java (93%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/WrittenQuestionResponse.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/{ => request}/RoomCreateRequest.java (92%) rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/{ => response}/WrittenRoomResponse.java (93%) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index b2c2e62d0..5e932d324 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,7 +1,7 @@ package com.bang_ggood.category.controller; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; +import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.service.CategoryService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java similarity index 68% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java index 543324b60..d25bf384c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.request; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java index 6351eb75f..a94075923 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java similarity index 56% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java index f6475df00..0b69d1f1a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java @@ -1,6 +1,6 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; -import com.bang_ggood.checklist.dto.QuestionResponse; +import com.bang_ggood.checklist.dto.response.QuestionResponse; import java.util.List; public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java index ae234449b..19441adcd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import com.bang_ggood.category.domain.Category; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java similarity index 57% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java index 8dc76ef10..85f48af67 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java @@ -1,6 +1,6 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import java.util.List; public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index 06f551b5b..56ac88147 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -2,12 +2,11 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.domain.CategoryPriority; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.CategoryReadResponse; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; +import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoryReadResponse; import com.bang_ggood.category.repository.CategoryPriorityRepository; import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java deleted file mode 100644 index f04a230f9..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.CategoryQuestionsResponse; -import java.util.List; - -public record ChecklistQuestionsResponse(List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java deleted file mode 100644 index ab602984d..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import java.util.List; - -public record UserChecklistsPreviewResponse(List checklists) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java deleted file mode 100644 index dc32f6f29..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.WrittenRoomResponse; -import java.util.List; - -public record WrittenChecklistResponse(WrittenRoomResponse room, List options, List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java index 246b1bb86..e925f748c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java @@ -1,7 +1,7 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomCreateRequest; import jakarta.validation.Valid; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java index b3ba6dd31..bb61b2f7d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; public record ChecklistInfo(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java similarity index 74% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java index 26beec952..5b5388017 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java similarity index 85% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index e5c070c8f..83d1f10cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.domain.Badge; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java similarity index 70% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java index 30278b78e..87e49f01b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record CategoryScoreReadResponse( Integer categoryId, String categoryName, Integer score diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java similarity index 95% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java index b7669d06c..746fc9566 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistComparisonReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java new file mode 100644 index 000000000..c876b8d2b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; +import java.util.List; + +public record ChecklistQuestionsResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java similarity index 50% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java index f9968c4bb..875c1f1fd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsComparisonReadResponse.java @@ -1,5 +1,6 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; +import com.bang_ggood.checklist.dto.response.ChecklistComparisonReadResponse; import java.util.List; public record ChecklistsComparisonReadResponse(List checklists) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java similarity index 64% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java index d2b5184ff..30591806f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record QuestionResponse(Integer questionId, String title, String subtitle) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java similarity index 93% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 8d83211e8..27d90b50e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; import java.time.LocalDateTime; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java new file mode 100644 index 000000000..aa3b8aaf0 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import java.util.List; + +public record UserChecklistsPreviewResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java new file mode 100644 index 000000000..941321467 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java @@ -0,0 +1,8 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; +import java.util.List; + +public record WrittenChecklistResponse(WrittenRoomResponse room, List options, List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java index 4594ca044..a218fa8a3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 82d321017..5b2f6b39c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -11,4 +11,6 @@ public interface ChecklistOptionRepository extends JpaRepository findByChecklistId(long checklistId); Integer countByChecklist(Checklist checklist); + + boolean existsIdIsIn(List ids); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java similarity index 92% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java index 8837cc721..e49b936f0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.room.dto; +package com.bang_ggood.room.dto.request; import com.bang_ggood.room.domain.Room; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java similarity index 93% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java index df878e737..bbd70b8ab 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.room.dto; +package com.bang_ggood.room.dto.response; import com.bang_ggood.room.domain.Room; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index 92c9c5d0c..fc581a063 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -2,8 +2,8 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; +import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.exception.BangggoodException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 942106964..c678c8390 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -1,6 +1,6 @@ package com.bang_ggood.room; -import com.bang_ggood.room.dto.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomCreateRequest; public class RoomFixture { From ae6498cb15850ae3e8abc42ab68231e301b86b83 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 30 Jul 2024 11:18:31 +0900 Subject: [PATCH 118/348] =?UTF-8?q?fix:=20=EB=A8=B8=EC=A7=80=20=ED=9B=84?= =?UTF-8?q?=20=EC=8B=A4=ED=8C=A8=ED=95=98=EB=8A=94=20=EC=BD=94=EB=93=9C=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 --- .../controller/ChecklistController.java | 8 ++++---- .../response/WrittenChecklistResponse.java | 2 +- .../repository/ChecklistRepository.java | 9 ++++----- .../checklist/service/ChecklistService.java | 19 +++++++++---------- .../dto/response/WrittenRoomResponse.java | 1 - .../controller/ChecklistE2ETest.java | 17 +++++++++-------- 6 files changed, 27 insertions(+), 29 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index adb1356e5..1d3b734e8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -2,16 +2,16 @@ import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.service.ChecklistService; import jakarta.validation.Valid; -import java.net.URI; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; +import java.net.URI; @RestController public class ChecklistController { @@ -34,7 +34,7 @@ public ResponseEntity readChecklistQuestions() { } @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@PathVariable long id) { + public ResponseEntity readChecklistById(@PathVariable("id") long id) { return ResponseEntity.ok(checklistService.readChecklistById(id)); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java index 8ff101494..941321467 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java @@ -1,7 +1,7 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.WrittenRoomResponse; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; import java.util.List; public record WrittenChecklistResponse(WrittenRoomResponse room, List options, List categories) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 45f3cf4d1..34860797a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -4,12 +4,11 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; - -import java.util.Optional; -import java.util.List; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; +import java.util.Optional; public interface ChecklistRepository extends JpaRepository { @@ -18,7 +17,7 @@ public interface ChecklistRepository extends JpaRepository { + "JOIN FETCH Room r " + "ON c.id = :id " + "AND c.room.id = r.id") - Optional findById(long id); + Optional findById(@Param("id") long id); default Checklist getById(long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 6518f7468..247e60333 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -2,6 +2,7 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; @@ -10,17 +11,22 @@ import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.request.ChecklistInfo; -import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.QuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; @@ -29,12 +35,6 @@ import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - -import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; -import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; @Service public class ChecklistService { @@ -53,7 +53,6 @@ public ChecklistService(ChecklistRepository checklistRepository, RoomRepository this.checklistQuestionRepository = checklistQuestionRepository; } - @Transactional public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); @@ -176,7 +175,7 @@ private List readCategoryQuestionsByChecklistI List checklistQuestions = checklistQuestionRepository.findByChecklistId(checklistId); return Arrays.stream(Category.values()) .map(category -> readQuestionsByCategory(category, checklistQuestions)) - .collect(Collectors.toList()); + .toList(); } private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category category, @@ -184,7 +183,7 @@ private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category catego List writtenQuestionResponses = Question.filter(category, checklistQuestions).stream() .map(WrittenQuestionResponse::of) - .collect(Collectors.toList()); + .toList(); return WrittenCategoryQuestionsResponse.of(category, writtenQuestionResponses); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java index 2a525a497..f3e859a54 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java @@ -4,7 +4,6 @@ public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, String address, String station, Integer walkingTime, String realEstate) { - public static WrittenRoomResponse of(Checklist checklist) { return new WrittenRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 93f64e4c0..f1b569ee8 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,22 +1,23 @@ package com.bang_ggood.checklist.controller; -import static org.assertj.core.api.Assertions.assertThat; - import com.bang_ggood.AcceptanceTest; import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import static org.assertj.core.api.Assertions.assertThat; + public class ChecklistE2ETest extends AcceptanceTest { @Autowired @@ -87,11 +88,11 @@ void readChecklistQuestions() { void readChecklistById() { //체크리스트 저장 roomRepository.save(RoomFixture.ROOM); - checklistRepository.save(ChecklistFixture.checklist); + Checklist saved = checklistRepository.save(ChecklistFixture.checklist); WrittenChecklistResponse writtenChecklistResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) - .when().get("/checklists/1") + .when().get("/checklists/" + saved.getId()) .then().log().all() .statusCode(200) .extract() From aa130adf2ce84362b085f18e9f7022fe7697856b Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 30 Jul 2024 11:30:54 +0900 Subject: [PATCH 119/348] =?UTF-8?q?fix:=20=EB=A8=B8=EC=A7=80=20=EC=8B=A4?= =?UTF-8?q?=ED=8C=A8=20=EC=8B=9C=20=EC=98=A4=EB=A5=98=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/repository/ChecklistOptionRepository.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 5b2f6b39c..73d20f711 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -2,15 +2,12 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; -import com.bang_ggood.checklist.domain.Option; -import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; public interface ChecklistOptionRepository extends JpaRepository { List findByChecklistId(long checklistId); Integer countByChecklist(Checklist checklist); - - boolean existsIdIsIn(List ids); } From d2bb55b2579052bf7afff251a5dfaff574636aa6 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 30 Jul 2024 11:48:36 +0900 Subject: [PATCH 120/348] =?UTF-8?q?[BE]=201=EC=B0=A8=20=EC=8A=A4=ED=94=84?= =?UTF-8?q?=EB=A6=B0=ED=8A=B8=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?= =?UTF-8?q?=EC=9D=84=20dev=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EC=97=90=20?= =?UTF-8?q?=EB=B0=98=EC=98=81=ED=95=9C=EB=8B=A4.=20(#176)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor: 서비스, 컨트롤러 클래스 삭제 * feat: 체크리스트 방 정보 작성 API 구현 * feat: 체크리스트 질문 조회 API 구현 * feat: 작성한 체크리스트 조회 API 구현 * feat: 카테고리 조회 API 구현 * refactor: 사용자 체크리스트 리스트 조회 API 수정 반영 * feat: 카테고리 우선순위 저장 API 구현 * refactor: 방 비교 결과 API 수정 반영 * refactor: request, response dto 패키지 분리 * refactor: DTO request/response package 분리 * fix: 머지 후 실패하는 코드 수정 * fix: 머지 실패 시 오류 해결 --------- Co-authored-by: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Co-authored-by: tkdgur0906 Co-authored-by: tsulocalize --- .../controller/CategoryController.java | 5 +- .../com/bang_ggood/category/domain/Badge.java | 23 +- .../bang_ggood/category/domain/Category.java | 87 ++----- .../dto/CategoryQuestionsResponse.java | 2 +- .../dto/WrittenCategoryQuestionsResponse.java | 2 +- .../CategoryPriorityCreateRequest.java | 2 +- .../CategoriesReadResponse.java | 2 +- .../response/CategoryQuestionsResponse.java | 12 + .../{ => response}/CategoryReadResponse.java | 4 +- .../WrittenCategoryQuestionsResponse.java | 17 ++ .../category/service/CategoryService.java | 51 ++-- .../controller/ChecklistController.java | 40 +-- .../checklist/domain/Checklist.java | 1 - .../checklist/domain/ChecklistQuestion.java | 27 +- .../checklist/domain/ChecklistScore.java | 34 +++ .../bang_ggood/checklist/domain/Grade.java | 23 +- .../bang_ggood/checklist/domain/Question.java | 93 ++++++- .../checklist/domain/Questionlist.java | 89 ------- .../dto/CategoryScoreReadResponse.java | 6 - .../dto/ChecklistQuestionsResponse.java | 7 - .../dto/ChecklistsComparisonReadResponse.java | 6 - .../checklist/dto/QuestionResponse.java | 4 - .../dto/UserChecklistsPreviewResponse.java | 6 - .../dto/WrittenChecklistResponse.java | 8 - .../dto/WrittenQuestionResponse.java | 4 - .../{ => request}/ChecklistCreateRequest.java | 4 +- .../dto/{ => request}/ChecklistInfo.java | 2 +- .../{ => request}/QuestionCreateRequest.java | 2 +- .../dto/{ => response}/BadgeResponse.java | 4 +- .../response/CategoryScoreReadResponse.java | 12 + .../response/ChecklistQuestionsResponse.java | 7 + .../ChecklistWithScoreReadResponse.java} | 9 +- .../ChecklistsWithScoreReadResponse.java | 6 + .../dto/response/QuestionResponse.java | 10 + .../UserChecklistPreviewResponse.java | 3 +- .../UserChecklistsPreviewResponse.java | 7 + .../response/WrittenChecklistResponse.java | 9 + .../dto/response/WrittenQuestionResponse.java | 15 ++ .../repository/ChecklistOptionRepository.java | 3 +- .../repository/ChecklistRepository.java | 19 +- .../checklist/service/ChecklistService.java | 238 +++++++++--------- .../bang_ggood/exception/ExceptionCode.java | 8 +- .../room/dto/WrittenRoomResponse.java | 13 - .../dto/{ => request}/RoomCreateRequest.java | 2 +- .../dto/response/WrittenRoomResponse.java | 12 + .../bang-ggood/src/main/resources/schema.sql | 4 +- .../category/domain/CategoryTest.java | 80 +----- .../category/service/CategoryServiceTest.java | 72 ++---- .../checklist/ChecklistFixture.java | 26 +- .../controller/ChecklistE2ETest.java | 52 +++- .../checklist/domain/OptionTest.java | 1 + .../checklist/domain/QuestionTest.java | 80 ++++++ .../checklist/domain/QuestionlistTest.java | 43 ---- .../checklist/option/OptionTest.java | 22 ++ .../service/ChecklistServiceTest.java | 195 +++++++++++++- .../java/com/bang_ggood/room/RoomFixture.java | 7 +- .../src/test/resources/schema-test.sql | 4 +- 57 files changed, 899 insertions(+), 627 deletions(-) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => request}/CategoryPriorityCreateRequest.java (68%) rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoriesReadResponse.java (69%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/{ => response}/CategoryReadResponse.java (81%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistCreateRequest.java (82%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/ChecklistInfo.java (69%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => request}/QuestionCreateRequest.java (74%) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/BadgeResponse.java (54%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ChecklistComparisonReadResponse.java => response/ChecklistWithScoreReadResponse.java} (73%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/{ => response}/UserChecklistPreviewResponse.java (93%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/{ => request}/RoomCreateRequest.java (92%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index bfc0669b2..5e932d324 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,7 +1,7 @@ package com.bang_ggood.category.controller; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; +import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.service.CategoryService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -20,7 +20,6 @@ public CategoryController(CategoryService categoryService) { @PostMapping("/categories/priority") public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { - // TODO: List 요소 null check 필요 categoryService.createCategoriesPriority(request); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java index cf4200ac7..6df9cf822 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -8,25 +8,26 @@ public enum Badge { OPTION("옵션", "옵션이 많아요", "🛋️"), ENVIRONMENT("주거환경", "주거환경이 좋아요", "🌱"), SECURITY("보안", "안전해요", "🔒"), - ECONOMIC("경제적", "경제적이에요", "💰") + ECONOMIC("경제적", "경제적이에요", "💰"), + NONE("", "", "") ; - + private static final String DESCRIPTION_FORMAT = "%s %s"; - private final String shortDescription; - private final String longDescription; + private final String shortName; + private final String longName; private final String emoji; - Badge(String shortDescription, String longDescription, String emoji) { - this.shortDescription = shortDescription; - this.longDescription = longDescription; + Badge(String shortName, String longName, String emoji) { + this.shortName = shortName; + this.longName = longName; this.emoji = emoji; } - public String getShortDescriptionWithEmoji() { - return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortDescription); + public String getShortNameWithEmoji() { + return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortName); } - public String getLongDescriptionWithEmoji() { - return String.format(DESCRIPTION_FORMAT, this.emoji, this.longDescription); + public String getLongNameWithEmoji() { + return String.format(DESCRIPTION_FORMAT, this.emoji, this.longName); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index d954f1274..bd420386e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,35 +1,30 @@ package com.bang_ggood.category.domain; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.Grade; - import java.util.Arrays; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Set; + +import static com.bang_ggood.category.domain.Badge.NONE; +import static com.bang_ggood.checklist.domain.ChecklistScore.calculateCategoryScore; public enum Category { - CLEAN(1, "청결", Badge.CLEAN, new LinkedHashSet<>(List.of(1, 2, 3, 4, 5))), - ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION, new LinkedHashSet<>(List.of(6, 7, 8, 9, 10, 11))), - AMENITY(3, "편의시설", Badge.AMENITY, new LinkedHashSet<>(List.of(12, 13, 14))), - OPTION(4, "옵션", Badge.OPTION, new LinkedHashSet<>(List.of(15, 16))), - ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT, new LinkedHashSet<>(List.of(17, 18, 19, 20, 21, 22))), - SECURITY(6, "보안", Badge.SECURITY, new LinkedHashSet<>(List.of(23, 24, 25, 26, 27, 28, 29, 30))), - ECONOMIC(7, "경제적", Badge.ECONOMIC, new LinkedHashSet<>(List.of(31, 32))); + CLEAN(1, "청결", Badge.CLEAN), + ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION), + AMENITY(3, "편의시설", Badge.AMENITY), + OPTION(4, "옵션", Badge.OPTION), + ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT), + SECURITY(6, "보안", Badge.SECURITY), + ECONOMIC(7, "경제적", Badge.ECONOMIC); private final int id; - private final String description; + private final String name; private final Badge badge; - private final Set questionIds; - Category(int id, String description, Badge badge, Set questionIds) { + Category(int id, String name, Badge badge) { this.id = id; - this.description = description; + this.name = name; this.badge = badge; - this.questionIds = questionIds; } public static boolean contains(int id) { @@ -37,62 +32,20 @@ public static boolean contains(int id) { .anyMatch(category -> category.id == id); } - //TODO 테스트해야 함 - public boolean isQuestionIn(int questionId) { - return this.id == findIdByQuestionId(questionId); - } - - private int findIdByQuestionId(int questionId) { - return Arrays.stream(Category.values()) - .filter(category -> category.questionIds.contains(questionId)) - .mapToInt(category -> category.id) - .findFirst() - .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); - } - - // 2. 뱃지 부여 - public static List getBadges(List questions) { - return Arrays.stream(values()) - .filter(category -> category.calculateTotalScore(questions) >= 80) - .map(Category::getBadge) - .toList(); - } - - // 1. 총점 : score * 100 / maxScore - public int calculateTotalScore(List questions) { - List filteredQuestions = filterQuestion(questions); + public Badge provideBadge(List questions) { + int categoryScore = calculateCategoryScore(this, questions); - if (filteredQuestions.isEmpty()) { - return 0; + if (categoryScore >= 8) { + return this.badge; } - - int maxScore = Grade.calculateMaxScore(filteredQuestions.size()); - int score = filteredQuestions.stream() - .mapToInt(question -> Grade.getScore(question.getAnswer())) - .sum(); - - return score * 100 / maxScore; - } - - private List filterQuestion(List questions) { - return questions.stream() - .filter(checklistQuestion -> questionIds.contains(checklistQuestion.getQuestionId())) - .toList(); + return NONE; } public int getId() { return id; } - public String getDescription() { - return description; - } - - public Badge getBadge() { - return badge; - } - - public Set getQuestionIds() { - return questionIds; + public String getName() { + return name; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java index f6475df00..4309c8400 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java @@ -1,6 +1,6 @@ package com.bang_ggood.category.dto; -import com.bang_ggood.checklist.dto.QuestionResponse; +import com.bang_ggood.checklist.dto.response.QuestionResponse; import java.util.List; public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java index 8dc76ef10..3e5a1c335 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java @@ -1,6 +1,6 @@ package com.bang_ggood.category.dto; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import java.util.List; public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java similarity index 68% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java index 543324b60..d25bf384c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryPriorityCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.request; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java index 6351eb75f..a94075923 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoriesReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java new file mode 100644 index 000000000..1edcb6c49 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryQuestionsResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.category.dto.response; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.checklist.dto.response.QuestionResponse; +import java.util.List; + +public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { + + public static CategoryQuestionsResponse of(Category category, List questions) { + return new CategoryQuestionsResponse(category.getId(), category.getName(), questions); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java similarity index 81% rename from backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java index b796b96b6..19441adcd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java @@ -1,10 +1,10 @@ -package com.bang_ggood.category.dto; +package com.bang_ggood.category.dto.response; import com.bang_ggood.category.domain.Category; public record CategoryReadResponse(Integer categoryId, String categoryName) { public static CategoryReadResponse from(Category category) { - return new CategoryReadResponse(category.getId(), category.getDescription()); + return new CategoryReadResponse(category.getId(), category.getName()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java new file mode 100644 index 000000000..30a1d94ff --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java @@ -0,0 +1,17 @@ +package com.bang_ggood.category.dto.response; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; +import java.util.List; + +public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, + List questions) { + + public static WrittenCategoryQuestionsResponse of(Category category, List questions) { + return new WrittenCategoryQuestionsResponse( + category.getId(), + category.getName(), + questions + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index c588d7bff..56ac88147 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -2,13 +2,12 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.domain.CategoryPriority; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.CategoryReadResponse; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; +import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoryReadResponse; import com.bang_ggood.category.repository.CategoryPriorityRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.user.domain.User; -import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; @@ -22,53 +21,53 @@ @Service public class CategoryService { - private static final int MAX_CATEGORY_PRIORITY_COUNT = 3; - + private static final int MAX_CATEGORY_PRIORITY = 3; private final CategoryPriorityRepository categoryPriorityRepository; - private final UserRepository userRepository; - public CategoryService(CategoryPriorityRepository categoryPriorityRepository, UserRepository userRepository) { + public CategoryService(CategoryPriorityRepository categoryPriorityRepository) { this.categoryPriorityRepository = categoryPriorityRepository; - this.userRepository = userRepository; } @Transactional public void createCategoriesPriority(CategoryPriorityCreateRequest request) { - validateDuplication(request); - validateCategoryCount(request); - validateCategoryId(request); - - User user = userRepository.getUserById(1L); + User user = new User(1L, "방방이"); + validate(request); List categoryPriorities = request.categoryIds().stream() .map(id -> new CategoryPriority(id, user)) .toList(); - categoryPriorityRepository.saveAll(categoryPriorities); } - private void validateDuplication(CategoryPriorityCreateRequest request) { - if (request.categoryIds().size() != Set.copyOf(request.categoryIds()).size()) { - throw new BangggoodException(CATEGORY_DUPLICATED); - } + private void validate(CategoryPriorityCreateRequest request) { + validateCategoryCount(request); + validateDuplication(request); + validateCategoryId(request); } private void validateCategoryCount(CategoryPriorityCreateRequest request) { - if (request.categoryIds().size() > MAX_CATEGORY_PRIORITY_COUNT) { + if (request.categoryIds().size() > MAX_CATEGORY_PRIORITY) { throw new BangggoodException(CATEGORY_PRIORITY_INVALID_COUNT); } } - private void validateCategoryId(CategoryPriorityCreateRequest request) { - for (Integer id : request.categoryIds()) { - if (!Category.contains(id)) { - throw new BangggoodException(CATEGORY_NOT_FOUND); - } + private void validateDuplication(CategoryPriorityCreateRequest request) { + int originalSize = request.categoryIds().size(); + int distinctSize = Set.copyOf(request.categoryIds()).size(); + if (originalSize != distinctSize) { + throw new BangggoodException(CATEGORY_DUPLICATED); } } + private void validateCategoryId(CategoryPriorityCreateRequest request) { + request.categoryIds().stream() + .filter(id -> !Category.contains(id)) + .findAny() + .ifPresent(id -> { throw new BangggoodException(CATEGORY_NOT_FOUND); }); + } + public CategoriesReadResponse readCategories() { List categoryReadResponses = Arrays.stream(Category.values()) - .map(CategoryReadResponse::from) + .map(category -> new CategoryReadResponse(category.getId(), category.getName())) .toList(); return new CategoriesReadResponse(categoryReadResponses); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 16ab92a96..e6f744736 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,22 +1,25 @@ package com.bang_ggood.checklist.controller; -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.service.ChecklistService; - import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.net.URI; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.user.domain.User; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; import java.util.List; @RestController @@ -34,24 +37,25 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateR return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } - //TODO 테스트해야 함 + @GetMapping("/checklists/questions") + public ResponseEntity readChecklistQuestions() { + return ResponseEntity.ok(checklistService.readChecklistQuestions()); + } + @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@PathVariable long id) { + public ResponseEntity readChecklistById(@PathVariable("id") long id) { return ResponseEntity.ok(checklistService.readChecklistById(id)); } - + @GetMapping("/checklists") public ResponseEntity readUserChecklistsPreview() { - return ResponseEntity.ok(checklistService.readUserChecklistsPreview()); - } - - @GetMapping("/checklists/questions") - public ResponseEntity readChecklistQuestions() { - return ResponseEntity.ok(checklistService.readChecklistQuestions()); + User user = new User(1L, "방방이"); + return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); } @GetMapping("/checklists/comparison") - public ResponseEntity readChecklistsComparison(@RequestParam("id")List checklistIds) { + public ResponseEntity readChecklistsComparison( + @RequestParam("id") List checklistIds) { return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 9e4398906..79011148c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.Objects; - @Entity public class Checklist extends BaseEntity { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index b6639de37..642ebb8ac 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -2,6 +2,8 @@ import com.bang_ggood.BaseEntity; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -9,7 +11,6 @@ import jakarta.persistence.ManyToOne; import java.util.Objects; - @Entity public class ChecklistQuestion extends BaseEntity { @@ -20,14 +21,16 @@ public class ChecklistQuestion extends BaseEntity { @ManyToOne(fetch = FetchType.LAZY) private Checklist checklist; - private int questionId; + @Enumerated(EnumType.STRING) + private Question question; - private String answer; + @Enumerated(EnumType.STRING) + private Grade grade; - public ChecklistQuestion(Checklist checklist, int questionId, String answer) { + public ChecklistQuestion(Checklist checklist, Question question, Grade grade) { this.checklist = checklist; - this.questionId = questionId; - this.answer = answer; + this.question = question; + this.grade = grade; } protected ChecklistQuestion() { @@ -41,12 +44,12 @@ public Checklist getChecklist() { return checklist; } - public int getQuestionId() { - return questionId; + public Question getQuestion() { + return question; } - public String getAnswer() { - return answer; + public Grade getGrade() { + return grade; } @Override @@ -71,8 +74,8 @@ public String toString() { return "ChecklistQuestion{" + "id=" + id + ", checklist=" + checklist + - ", questionId=" + questionId + - ", answer=" + answer + + ", question=" + question + + ", grade=" + grade + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java new file mode 100644 index 000000000..67c31ba01 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java @@ -0,0 +1,34 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.category.domain.Category; +import java.util.List; + +public class ChecklistScore { + + public static int calculateTotalScore(List questions) { + if (questions.isEmpty()) { + return 0; + } + + int maxScore = Grade.calculateMaxScore(questions.size()); + int totalScore = Grade.calculateTotalScore(questions); + + return totalScore * 100 / maxScore; + } + + public static int calculateCategoryScore(Category category, List questions) { + List filteredQuestions = Question.filter(category, questions); + + if (filteredQuestions.isEmpty()) { + return 0; + } + + int maxScore = Grade.calculateMaxScore(filteredQuestions.size()); + int totalScore = Grade.calculateTotalScore(filteredQuestions); + + return totalScore * 10 / maxScore; + } + + private ChecklistScore() { + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index 0175b70c8..0905d06db 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -1,12 +1,16 @@ package com.bang_ggood.checklist.domain; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; +import java.util.List; public enum Grade { GOOD(3), SOSO(2), - BAD(1); + BAD(1), + ; private final int score; @@ -14,15 +18,20 @@ public enum Grade { this.score = score; } + public static Grade from(String grade) { + return Arrays.stream(Grade.values()) + .filter(value -> value.name().equals(grade)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.GRADE_INVALID)); + } + public static int calculateMaxScore(int size) { return GOOD.score * size; } - public static int getScore(String answer) { //TODO null 예외처리 - return Arrays.stream(values()) - .filter(grade -> grade.name().equals(answer)) - .map(grade -> grade.score) - .findAny() - .orElse(0); + public static int calculateTotalScore(List questions) { + return questions.stream() + .mapToInt(question -> question.getGrade().score) + .sum(); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 0840637b4..e8a0d25d2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -1,15 +1,100 @@ package com.bang_ggood.checklist.domain; -public class Question { +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; +import java.util.List; +import java.util.stream.Collectors; +public enum Question { + + CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요."), + CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요."), + CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null), + CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요."), + CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요."), + + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요."), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null), + ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null), + ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null), + + AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null), + AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null), + AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null), + + OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요."), + OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null), + + ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null), + ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요."), + ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요."), + ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요."), + ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null), + ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null), + + SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null), + SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null), + SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null), + SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null), + SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null), + SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null), + SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null), + SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null), + + ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요."), + ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요."); + + private final int id; + private final Category category; private final String title; private final String subtitle; - public Question(String title, String subtitle) { + + Question(int id, Category category, String title, String subtitle) { + this.id = id; + this.category = category; this.title = title; this.subtitle = subtitle; } + // TODO 테스트 필요 + public static List filter(Category category, List questions) { + return questions.stream() + .filter(question -> question.getQuestion().isCategory(category) && question.getGrade() != null) + .toList(); + } + + public static List findQuestionsByCategory(Category category) { + return Arrays.stream(values()) + .filter(question -> question.getCategory().equals(category)) + .collect(Collectors.toList()); + } + + private boolean isCategory(Category category) { + return this.category == category; + } + + // TODO 테스트 필요 + public static Question findById(int id) { + return Arrays.stream(values()) + .filter(question -> question.id == id) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); + } + + public static boolean contains(int id) { + return Arrays.stream(values()) + .anyMatch(question -> question.getId() == id); + } + + public int getId() { + return id; + } + public String getTitle() { return title; } @@ -17,4 +102,8 @@ public String getTitle() { public String getSubtitle() { return subtitle; } + + public Category getCategory() { + return category; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java deleted file mode 100644 index 41ba9e861..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Questionlist.java +++ /dev/null @@ -1,89 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import java.util.HashMap; -import java.util.Map; -import org.springframework.stereotype.Component; - -@Component -public class Questionlist { - - private Map questions; - - public Questionlist() { - questions = new HashMap<>(); - initClean(); - initRoomCondition(); - initAmenity(); - initOption(); - initEnvironment(); - initSecurity(); - initEconomic(); - } - - public boolean contains(int questionId) { - return questions.containsKey(questionId); - } - - private void initClean() { - questions.put(1, new Question("방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.")); - questions.put(2, new Question("방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.")); - questions.put(3, new Question("에어컨 내부는 깨끗한가요?", null)); - questions.put(4, new Question("벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.")); - questions.put(5, new Question("창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.")); - } - - private void initRoomCondition() { - questions.put(6, new Question("수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.")); - questions.put(7, new Question("온수가 잘 나오나요?", null)); - questions.put(8, new Question("파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null)); - questions.put(9, new Question("보일러가 잘 동작하나요?", null)); - questions.put(10, new Question("콘센트 위치와 갯수가 적절한가요?", null)); - questions.put(11, new Question("벽지 상태가 양호한가요?", null)); - } - - private void initAmenity() { - questions.put(12, new Question("지하철역과 버스 정류장이 가까운 곳에 있나요?", null)); - questions.put(13, new Question("편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null)); - questions.put(14, new Question("병원이나 약국이 가까운 곳에 있나요?", null)); - } - - private void initOption() { - questions.put(15, new Question("옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.")); - questions.put(16, new Question("필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null)); - } - - private void initEnvironment() { - questions.put(17, new Question("햇빛이 잘 들어오나요?", null)); - questions.put(18, new Question("환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.")); - questions.put(19, new Question("방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.")); - questions.put(20, new Question("주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.")); - questions.put(21, new Question("1층에 음식점이 있지는 않나요?", null)); - questions.put(22, new Question("집가는 길이 언덕이진 않나요?", null)); - } - - private void initSecurity() { - questions.put(23, new Question("출입구와 복도에 CCTV가 설치되어 있나요?", null)); - questions.put(24, new Question("집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null)); - questions.put(25, new Question("자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null)); - questions.put(26, new Question("화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null)); - questions.put(27, new Question("주변 도로가 밤에도 충분히 밝은가요?", null)); - questions.put(28, new Question("화면이 달린 인터폰이 제공되나요?", null)); - questions.put(29, new Question("옆 건물에서 잘 보이는 구조는 아닌가요?", null)); - questions.put(30, new Question("관리자분이 함께 상주하시나요?", null)); - } - - private void initEconomic() { - questions.put(31, new Question("보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.")); - questions.put(32, new Question("교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.")); - } - - public String getTitleByQuestionId(int questionId) { - return questions.get(questionId).getTitle(); - } - - public String getSubtitleByQuestionId(int questionId) { - return questions.get(questionId).getSubtitle(); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java deleted file mode 100644 index 30278b78e..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/CategoryScoreReadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -public record CategoryScoreReadResponse( - Integer categoryId, String categoryName, Integer score -) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java deleted file mode 100644 index f04a230f9..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistQuestionsResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.CategoryQuestionsResponse; -import java.util.List; - -public record ChecklistQuestionsResponse(List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java deleted file mode 100644 index f9968c4bb..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistsComparisonReadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import java.util.List; - -public record ChecklistsComparisonReadResponse(List checklists) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java deleted file mode 100644 index d2b5184ff..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bang_ggood.checklist.dto; - -public record QuestionResponse(Integer questionId, String title, String subtitle) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java deleted file mode 100644 index ab602984d..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistsPreviewResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import java.util.List; - -public record UserChecklistsPreviewResponse(List checklists) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java deleted file mode 100644 index dc32f6f29..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenChecklistResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bang_ggood.checklist.dto; - -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.WrittenRoomResponse; -import java.util.List; - -public record WrittenChecklistResponse(WrittenRoomResponse room, List options, List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java deleted file mode 100644 index 4594ca044..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/WrittenQuestionResponse.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bang_ggood.checklist.dto; - -public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java index 246b1bb86..e925f748c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java @@ -1,7 +1,7 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomCreateRequest; import jakarta.validation.Valid; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java index b3ba6dd31..bb61b2f7d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistInfo.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; public record ChecklistInfo(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java similarity index 74% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java index 26beec952..5b5388017 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/QuestionCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.request; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java similarity index 54% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index fb5af75de..83d1f10cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -1,10 +1,10 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.category.domain.Badge; public record BadgeResponse(String shortName, String longName) { public static BadgeResponse from(Badge badge) { - return new BadgeResponse(badge.getShortDescriptionWithEmoji(), badge.getLongDescriptionWithEmoji()); + return new BadgeResponse(badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java new file mode 100644 index 000000000..504b01b41 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.domain.Category; + +public record CategoryScoreReadResponse( + Integer categoryId, String categoryName, Integer score +) { + + public static CategoryScoreReadResponse of(Category category, int score) { + return new CategoryScoreReadResponse(category.getId(), category.getName(), score); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java new file mode 100644 index 000000000..c876b8d2b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistQuestionsResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; +import java.util.List; + +public record ChecklistQuestionsResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java similarity index 73% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java index b7669d06c..44d06b250 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/ChecklistComparisonReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java @@ -1,17 +1,18 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; + import java.util.List; -public record ChecklistComparisonReadResponse( +public record ChecklistWithScoreReadResponse( Long checklistId, String roomName, String address, Integer floor, Integer deposit, Integer rent, Integer contractTerm, String station, Integer walkingTime, Integer optionCount, Integer score, List categories ) { - public static ChecklistComparisonReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, List categoryScores) { - return new ChecklistComparisonReadResponse( + public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, List categoryScores) { + return new ChecklistWithScoreReadResponse( checklist.getId(), checklist.getRoomName(), checklist.getRoomAddress(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java new file mode 100644 index 000000000..d4f052f47 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto.response; + +import java.util.List; + +public record ChecklistsWithScoreReadResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java new file mode 100644 index 000000000..f1d5f5918 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.domain.Question; + +public record QuestionResponse(Integer questionId, String title, String subtitle) { + + public static QuestionResponse of(Question question) { + return new QuestionResponse(question.getId(), question.getTitle(), question.getSubtitle()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java similarity index 93% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 8d83211e8..15bbc6a93 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,6 +1,7 @@ -package com.bang_ggood.checklist.dto; +package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; + import java.time.LocalDateTime; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java new file mode 100644 index 000000000..aa3b8aaf0 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import java.util.List; + +public record UserChecklistsPreviewResponse(List checklists) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java new file mode 100644 index 000000000..bdcfc70e1 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java @@ -0,0 +1,9 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; +import java.util.List; + +public record WrittenChecklistResponse(WrittenRoomResponse room, List options, + List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java new file mode 100644 index 000000000..34fc7ced8 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java @@ -0,0 +1,15 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.domain.ChecklistQuestion; + +public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { + + public static WrittenQuestionResponse of(ChecklistQuestion checklistQuestion) { + return new WrittenQuestionResponse( + checklistQuestion.getQuestion().getId(), + checklistQuestion.getQuestion().getTitle(), + checklistQuestion.getQuestion().getSubtitle(), + checklistQuestion.getGrade().name() + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 82d321017..73d20f711 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -2,9 +2,8 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; -import com.bang_ggood.checklist.domain.Option; -import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; public interface ChecklistOptionRepository extends JpaRepository { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index ac123fa78..ca1606c72 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -4,12 +4,13 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; - -import java.util.Optional; -import java.util.List; - import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; +import java.util.Optional; +import java.util.List; +import java.util.Optional; public interface ChecklistRepository extends JpaRepository { @@ -18,13 +19,15 @@ public interface ChecklistRepository extends JpaRepository { + "JOIN FETCH Room r " + "ON c.id = :id " + "AND c.room.id = r.id") - Optional findById(long id); + Optional findById(@Param("id") long id); default Checklist getById(long id) { - return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); + return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } - + List findByUser(User user); - + List findByUserAndIdIn(User user, List checklistIds); + + long countAllByIdIn(List ids); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index b16f2d858..502bb5d2c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -1,33 +1,36 @@ package com.bang_ggood.checklist.service; +import com.bang_ggood.category.domain.Badge; import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.dto.CategoryQuestionsResponse; -import com.bang_ggood.category.dto.WrittenCategoryQuestionsResponse; +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; +import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.ChecklistScore; +import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; -import com.bang_ggood.checklist.domain.Questionlist; -import com.bang_ggood.checklist.dto.BadgeResponse; -import com.bang_ggood.checklist.dto.CategoryScoreReadResponse; -import com.bang_ggood.checklist.dto.ChecklistComparisonReadResponse; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.ChecklistInfo; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.ChecklistsComparisonReadResponse; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; -import com.bang_ggood.checklist.dto.QuestionResponse; -import com.bang_ggood.checklist.dto.UserChecklistPreviewResponse; -import com.bang_ggood.checklist.dto.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.dto.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.WrittenQuestionResponse; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistInfo; +import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.response.BadgeResponse; +import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.ChecklistWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.QuestionResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.WrittenRoomResponse; +import com.bang_ggood.room.dto.response.WrittenRoomResponse; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; import org.springframework.stereotype.Service; @@ -37,6 +40,8 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; +import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -47,19 +52,16 @@ public class ChecklistService { private final RoomRepository roomRepository; private final ChecklistOptionRepository checklistOptionRepository; private final ChecklistQuestionRepository checklistQuestionRepository; - private final Questionlist questionList; public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, ChecklistOptionRepository checklistOptionRepository, - ChecklistQuestionRepository checklistQuestionRepository, Questionlist questionList) { + ChecklistQuestionRepository checklistQuestionRepository) { this.checklistRepository = checklistRepository; this.roomRepository = roomRepository; this.checklistOptionRepository = checklistOptionRepository; this.checklistQuestionRepository = checklistQuestionRepository; - this.questionList = questionList; } - @Transactional public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); @@ -106,14 +108,35 @@ private void validateOptionInvalid(List optionIds) { } private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - List questions = checklistCreateRequest.questions(); - validateQuestion(questions); - for (QuestionCreateRequest questionCreateRequest : questions) { - Integer questionId = questionCreateRequest.questionId(); - ChecklistQuestion checklistQuestion = new ChecklistQuestion(checklist, questionId, - questionCreateRequest.answer()); - checklistQuestionRepository.save(checklistQuestion); + validateQuestion(checklistCreateRequest.questions()); + Map existQuestions = checklistCreateRequest.questions() + .stream() + .collect(Collectors.toMap(QuestionCreateRequest::questionId, QuestionCreateRequest::answer)); + + List checklistQuestions = Arrays.stream(Question.values()) + .map(question -> { + int questionId = question.getId(); + return Optional.ofNullable(existQuestions.get(questionId)) + .map(answer -> new ChecklistQuestion(checklist, Question.findById(questionId), + Grade.from(answer))) + .orElseGet(() -> new ChecklistQuestion(checklist, Question.findById(questionId), null)); + }) + .collect(Collectors.toList()); + + checklistQuestionRepository.saveAll(checklistQuestions); + } + + @Transactional + public ChecklistQuestionsResponse readChecklistQuestions() { + List categoryQuestionsResponses = new ArrayList<>(); + for (Category category : Category.values()) { + List questionsByCategory = Question.findQuestionsByCategory(category) + .stream() + .map(QuestionResponse::of) + .toList(); + categoryQuestionsResponses.add(CategoryQuestionsResponse.of(category, questionsByCategory)); } + return new ChecklistQuestionsResponse(categoryQuestionsResponses); } private void validateQuestion(List questions) { @@ -132,62 +155,19 @@ private void validateQuestionDuplicate(List questions) { private void validateQuestionInvalid(List questions) { for (QuestionCreateRequest questionCreateRequest : questions) { - if (!questionList.contains(questionCreateRequest.questionId())) { + if (!Question.contains(questionCreateRequest.questionId())) { throw new BangggoodException(ExceptionCode.INVALID_QUESTION); } } } - @Transactional - public UserChecklistsPreviewResponse readUserChecklistsPreview() { - User user = new User(1L, "방방이"); - List checklists = checklistRepository.findByUser(user); - - List responses = checklists.stream() - .map(checklist -> UserChecklistPreviewResponse.of( - checklist, - createBadges(checklist.getQuestions()))) - .toList(); - - return new UserChecklistsPreviewResponse(responses); - } - - private List createBadges(List questions) { - return Category.getBadges(questions).stream() - .map(BadgeResponse::from) - .toList(); - } - - @Transactional - public ChecklistQuestionsResponse readChecklistQuestions() { - List categoryQuestionsResponses = new ArrayList<>(); - for (Category category : Category.values()) { - CategoryQuestionsResponse categoryQuestionsResponse = - new CategoryQuestionsResponse(category.getId(), category.getDescription(), - readChecklistQuestion(category)); - categoryQuestionsResponses.add(categoryQuestionsResponse); - } - return new ChecklistQuestionsResponse(categoryQuestionsResponses); - } - - private List readChecklistQuestion(Category category) { - List questionResponses = new ArrayList<>(); - category.getQuestionIds().stream() - .map(questionId -> new QuestionResponse(questionId, - questionList.getTitleByQuestionId(questionId), - questionList.getSubtitleByQuestionId(questionId))) - .forEach(questionResponses::add); - return questionResponses; - } - - //TODO 테스트해야 함 @Transactional public WrittenChecklistResponse readChecklistById(long id) { Checklist checklist = checklistRepository.getById(id); + WrittenRoomResponse writtenRoomResponse = WrittenRoomResponse.of(checklist); - WrittenRoomResponse writtenRoomResponse = WrittenRoomResponse.of(checklist.getRoom(), checklist.getDeposit(), - checklist.getRent(), checklist.getContractTerm(), checklist.getRealEstate()); List optionIds = readOptionsByChecklistId(id); + List writtenCategoryQuestionsResponses = readCategoryQuestionsByChecklistId(id); @@ -205,69 +185,91 @@ private List readCategoryQuestionsByChecklistI List checklistQuestions = checklistQuestionRepository.findByChecklistId(checklistId); return Arrays.stream(Category.values()) .map(category -> readQuestionsByCategory(category, checklistQuestions)) - .collect(Collectors.toList()); + .toList(); } private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category category, List checklistQuestions) { - //TODO 리팩토링 필요 - List writtenQuestionResponses = new ArrayList<>(); - for (ChecklistQuestion checklistQuestion : checklistQuestions) { - int questionId = checklistQuestion.getQuestionId(); - if (category.isQuestionIn(questionId)) { - writtenQuestionResponses.add( - new WrittenQuestionResponse(questionId, questionList.getTitleByQuestionId(questionId), - questionList.getSubtitleByQuestionId(questionId), checklistQuestion.getAnswer())); - } - } - return new WrittenCategoryQuestionsResponse(category.getId(), category.getDescription(), - writtenQuestionResponses); + List writtenQuestionResponses = + Question.filter(category, checklistQuestions).stream() + .map(WrittenQuestionResponse::of) + .toList(); + + return WrittenCategoryQuestionsResponse.of(category, writtenQuestionResponses); } @Transactional - public ChecklistsComparisonReadResponse readChecklistsComparison(List checklistIds) { - User user = new User(1L, "방끗"); + public UserChecklistsPreviewResponse readUserChecklistsPreview(User user) { + List checklists = checklistRepository.findByUser(user); + List responses = checklists.stream() + .map(this::getChecklistPreview) + .toList(); - List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) - .stream() - .map(checklist -> { - // 카테고리별 총점 - List categoryScores = calculateCategoryScores(checklist); + return new UserChecklistsPreviewResponse(responses); + } + + private UserChecklistPreviewResponse getChecklistPreview(Checklist checklist) { + return UserChecklistPreviewResponse.of(checklist, createBadges(checklist.getQuestions())); + } + + private List createBadges(List questions) { + return Arrays.stream(Category.values()) + .map(category -> category.provideBadge(questions)) + .filter(badge -> badge != Badge.NONE) + .map(BadgeResponse::from) + .toList(); + } - // 체크리스트 총점 - int checklistScore = calculateChecklistScore(categoryScores); + @Transactional + public ChecklistsWithScoreReadResponse readChecklistsComparison(List checklistIds) { + User user = new User(1L, "방끗"); - // 옵션 개수 - int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); + validateChecklistComparison(checklistIds); - return ChecklistComparisonReadResponse.of( - checklist, checklistOptionCount, checklistScore, categoryScores);}) - .sorted(Comparator.comparing(ChecklistComparisonReadResponse::score).reversed()) + List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) + .stream() + .map(this::getChecklistWithScore) + .sorted(Comparator.comparing(ChecklistWithScoreReadResponse::score).reversed()) .toList(); - return new ChecklistsComparisonReadResponse(responses); + return new ChecklistsWithScoreReadResponse(responses); } - private List calculateCategoryScores(Checklist checklist) { - List categoryScores = new ArrayList<>(); + private void validateChecklistComparison(List checklistIds) { + validateChecklistComparisonCount(checklistIds); + validateChecklist(checklistIds); + } - for (Category category : Category.values()) { - int categoryScore = category.calculateTotalScore(checklist.getQuestions()); - if (categoryScore != 0) { - categoryScores.add(new CategoryScoreReadResponse( - category.getId(), - category.getDescription(), - categoryScore - )); - } + private void validateChecklistComparisonCount(List checklistIds) { + if (checklistIds.size() > 3) { + throw new BangggoodException(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT); + } + } + + private void validateChecklist(List checklistIds) { + if (checklistRepository.countAllByIdIn(checklistIds) != checklistIds.size()) { + throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); } + } + + + private ChecklistWithScoreReadResponse getChecklistWithScore(Checklist checklist) { + List categoryScores = getCategoryScores(checklist.getQuestions()); + int checklistScore = getChecklistScore(checklist.getQuestions()); + int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); - return categoryScores; + return ChecklistWithScoreReadResponse.of(checklist, checklistOptionCount, checklistScore, categoryScores); + } + + private List getCategoryScores(List questions) { + return Arrays.stream(Category.values()) + .map(category -> CategoryScoreReadResponse.of(category, + ChecklistScore.calculateCategoryScore(category, questions))) + .filter(response -> response.score() != 0) + .toList(); } - private int calculateChecklistScore(List categoryScores) { - return categoryScores.stream() - .mapToInt(CategoryScoreReadResponse::score) - .sum() / categoryScores.size(); + private int getChecklistScore(List questions) { + return ChecklistScore.calculateTotalScore(questions); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 60dc97194..ce8a6dcb4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -10,10 +10,16 @@ public enum ExceptionCode { INVALID_QUESTION(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), + + // Category CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), - CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다.") + GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), + + // Checklist + CHECKLIST_COMPARISON_INVALID_COUNT(HttpStatus.BAD_REQUEST, "비교할 체크리스트 개수가 유효하지 않습니다."), + CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), ; private final HttpStatus httpStatus; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java deleted file mode 100644 index df878e737..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/WrittenRoomResponse.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.bang_ggood.room.dto; - -import com.bang_ggood.room.domain.Room; - -public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { - - public static WrittenRoomResponse of(Room room, Integer deposit, Integer rent, - Integer contractTerm, String realEstate) { - return new WrittenRoomResponse(room.getName(), deposit, rent, contractTerm, room.getFloor(), - room.getAddress(), room.getStation(), room.getWalkingTime(), realEstate); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java similarity index 92% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java index 8837cc721..e49b936f0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.room.dto; +package com.bang_ggood.room.dto.request; import com.bang_ggood.room.domain.Room; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java new file mode 100644 index 000000000..f3e859a54 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.room.dto.response; + +import com.bang_ggood.checklist.domain.Checklist; + +public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, + String address, String station, Integer walkingTime, String realEstate) { + public static WrittenRoomResponse of(Checklist checklist) { + return new WrittenRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), + checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), + checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); + } +} diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f2dabe4f2..d08a57ef6 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -54,11 +54,11 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java index 689b2b33f..0fd0c8591 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java @@ -1,85 +1,7 @@ package com.bang_ggood.category.domain; -import com.bang_ggood.checklist.domain.ChecklistQuestion; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import java.util.List; - -import static com.bang_ggood.category.domain.Category.CLEAN; -import static com.bang_ggood.category.domain.Category.SECURITY; -import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; class CategoryTest { - @DisplayName("뱃지 부여 : 카테고리 총점이 80점 이상일 때") - @Test - void getBadges() { - // given - - // 청결 - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "SOSO"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - List badges = Category.getBadges(questions); - - // then - assertThat(badges).containsExactly(Badge.CLEAN); - } - - @DisplayName("뱃지 미부여 : 카테고리 총점이 80점 미만일 때") - @Test - void getBadges_NoBadges() { - // given - - // 청결 - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "BAD"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - List badges = Category.getBadges(questions); - - // then - assertThat(badges).isEmpty(); - } - - @DisplayName("카테고리 총점수 계산 성공") - @Test - void calculateTotalScore() { - // given - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "BAD"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - int totalScore = CLEAN.calculateTotalScore(questions); - - // then - assertThat(totalScore).isEqualTo(( 11 * 100 / 15)); - } - - @DisplayName("카테고리 총점수 계산 성공 : 해당 카테고리에 대한 답변이 없을 경우") - @Test - void calculateTotalScore_WhenCategoryDoesNotMatch() { - // given - List questions = List.of(new ChecklistQuestion(null, 1, "GOOD"), - new ChecklistQuestion(null, 2, "GOOD"), - new ChecklistQuestion(null, 3, "GOOD"), - new ChecklistQuestion(null, 4, "BAD"), - new ChecklistQuestion(null, 5, "BAD")); - - // when - int totalScore = SECURITY.calculateTotalScore(questions); - - // then - assertThat(totalScore).isZero(); - } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index 5ed9a9f46..fc581a063 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -1,19 +1,16 @@ package com.bang_ggood.category.service; import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.category.dto.CategoriesReadResponse; -import com.bang_ggood.category.dto.CategoryPriorityCreateRequest; +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; +import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.exception.BangggoodException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; + import java.util.List; -import static com.bang_ggood.category.domain.Category.AMENITY; -import static com.bang_ggood.category.domain.Category.CLEAN; -import static com.bang_ggood.category.domain.Category.ECONOMIC; -import static com.bang_ggood.category.domain.Category.SECURITY; -import static com.bang_ggood.category.domain.Category.values; import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; @@ -24,81 +21,62 @@ class CategoryServiceTest extends IntegrationTestSupport { @Autowired - private CategoryService categoryService; + CategoryService categoryService; - @DisplayName("카테고리 우선순위 생성 성공") + @DisplayName("카테고리 우선순위 저장 성공") @Test void createCategoriesPriority() { // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - ECONOMIC.getId() - )); + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3)); - // when & then + // when && then assertThatCode(() -> categoryService.createCategoriesPriority(request)) .doesNotThrowAnyException(); - // TODO: 추후 우선순위 조회 API로 예외 검증 } - @DisplayName("카테고리 우선순위 생성 실패 : 카테고리 개수가 유효하지 않을 때") + @DisplayName("카테고리 우선순위 저장 실패 : 올바르지 않은 ID") @Test - void createCategoriesPriority_invalidCount_exception() { + void createCategoriesPriority_invalidId_exception() { // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - ECONOMIC.getId(), - SECURITY.getId() - )); + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(999)); - // when & then + // when && then assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); + .hasMessage(CATEGORY_NOT_FOUND.getMessage()); } - @DisplayName("카테고리 우선순위 생성 실패 : 카테고리가 존재하지 않을 때") + @DisplayName("카테고리 우선순위 저장 실패 : 최대 선택 개수 초과") @Test - void createCategoriesPriority_notFound_exception() { + void createCategoriesPriority_overMaxCount_exception() { // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - 0 - )); + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9)); - // when & then + // when && then assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_NOT_FOUND.getMessage()); + .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); } - @DisplayName("카테고리 우선순위 생성 실패 : 중복된 카테고리가 존재할 때") + @DisplayName("카테고리 우선순위 저장 실패 : 중복된 ID") @Test - void createCategoriesPriority_duplicated_exception() { + void createCategoriesPriority_duplication_exception() { // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of( - CLEAN.getId(), - AMENITY.getId(), - AMENITY.getId() - )); + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 1)); - // when & then + // when && then assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_DUPLICATED.getMessage()); } - @DisplayName("카테고리 조회 성공") + @DisplayName("카테고리 목록 조회 성공") @Test void readCategories() { // given & when - CategoriesReadResponse categoriesReadResponse = categoryService.readCategories(); + CategoriesReadResponse response = categoryService.readCategories(); // then - assertThat(categoriesReadResponse.categories()) - .hasSize(values().length); + assertThat(response.categories()).hasSize(Category.values().length); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index bf62a9fb9..00b87bbdd 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -1,12 +1,20 @@ package com.bang_ggood.checklist; -import com.bang_ggood.checklist.dto.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.QuestionCreateRequest; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.user.domain.User; import java.util.List; public class ChecklistFixture { + public static final Checklist checklist = new Checklist( + new User(1L, "방방이"), + RoomFixture.ROOM, + 1000, 50, 12, "방끗공인중개사" + ); + public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( 1, "GOOD" ); @@ -20,11 +28,14 @@ public class ChecklistFixture { ); public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( - 5, null + 5, "GOOD" ); + public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ANSWER = new QuestionCreateRequest( + 6, null + ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( - null, null + null, "GOOD" ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( @@ -32,6 +43,7 @@ public class ChecklistFixture { ); + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, @@ -73,4 +85,10 @@ public class ChecklistFixture { List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); + + public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ANSWER = new ChecklistCreateRequest( + RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ANSWER) + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 05c80eea7..f1b569ee8 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,17 +1,29 @@ package com.bang_ggood.checklist.controller; -import static org.assertj.core.api.Assertions.assertThat; - import com.bang_ggood.AcceptanceTest; import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ChecklistE2ETest extends AcceptanceTest { -class ChecklistE2ETest extends AcceptanceTest { + @Autowired + private ChecklistRepository checklistRepository; + @Autowired + private RoomRepository roomRepository; @DisplayName("체크리스트 방 정보 작성 성공") @Test @@ -46,6 +58,17 @@ void createChecklist_noQuestionId_exception() { .statusCode(400); } + @DisplayName("체크리스트 방 정보 작성 실패: 질문 답변을 넣지 않은 경우") + @Test + void createChecklist_noAnswer_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ANSWER) + .when().post("/checklists") + .then().log().all() + .statusCode(400); + } + @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { @@ -59,4 +82,25 @@ void readChecklistQuestions() { assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); } + + @DisplayName("작성된 체크리스트 조회 성공") + @Test + void readChecklistById() { + //체크리스트 저장 + roomRepository.save(RoomFixture.ROOM); + Checklist saved = checklistRepository.save(ChecklistFixture.checklist); + + WrittenChecklistResponse writtenChecklistResponse = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/checklists/" + saved.getId()) + .then().log().all() + .statusCode(200) + .extract() + .as(WrittenChecklistResponse.class); + + Assertions.assertAll( + () -> assertThat(writtenChecklistResponse.room().name()).isEqualTo("살기 좋은 방"), + () -> assertThat(writtenChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + ); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java index c9643e807..c6b5ecde0 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java @@ -1,6 +1,7 @@ package com.bang_ggood.checklist.domain; import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java new file mode 100644 index 000000000..59ddbcc65 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -0,0 +1,80 @@ +package com.bang_ggood.checklist.domain; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.*; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class QuestionTest { + + @DisplayName("특정 카테고리의 질문 찾기 성공") + @Test + void findQuestionsByCategory() { + //given + Category category = Category.CLEAN; + + //when + List questions = Question.findQuestionsByCategory(category); + + //then + assertAll( + () -> assertThat(questions.size()).isEqualTo(5), + () -> assertThat(questions.get(0).getId()).isEqualTo(1) + ); + } + + @DisplayName("질문 아이디를 통해 질문 찾기 성공") + @Test + void findById() { + //given + int questionId = 1; + + //when + Question question = Question.findById(questionId); + + //then + assertAll( + () -> assertThat(question.getId()).isEqualTo(questionId), + () -> assertThat(question.getCategory()).isEqualTo(Category.CLEAN) + ); + } + + @DisplayName("질문 아이디를 통해 질문 찾기 실패 : 유효하지 않은 질문 아이디일 경우") + @Test + void findById_invalidQuestion_exception() { + //given + int questionId = 999; + + //when & then + assertThatThrownBy(() -> Question.findById(questionId)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); + } + + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함일 경우") + @Test + void contains_true() { + //given + int questionId = 1; + + //when & then + assertThat(Question.contains(questionId)).isTrue(); + } + + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함이 아닐 경우") + @Test + void contains_false() { + //given + int questionId = 999; + + //when & then + assertThat(Question.contains(questionId)).isFalse(); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java deleted file mode 100644 index 969470738..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionlistTest.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import static org.assertj.core.api.Assertions.assertThat; - -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -class QuestionlistTest { - - private Questionlist questionList; - - @BeforeEach - void init() { - questionList = new Questionlist(); - } - - @DisplayName("질문 리스트 포함 성공: 포함하는 경우") - @Test - void contains_true() { - assertThat(questionList.contains(1)).isTrue(); - } - - @DisplayName("질문 리스트 포함 성공 : 포함하지 않는 경우") - @Test - void contains_false() { - assertThat(questionList.contains(9999)).isFalse(); - } - - @DisplayName("질문 제목 조회 성공") - @Test - void getTitle() { - assertThat(questionList.getTitleByQuestionId(1)) - .isEqualTo("방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?"); - } - - @DisplayName("질문 부제목 조회 성공") - @Test - void getSubtitle() { - assertThat(questionList.getSubtitleByQuestionId(1)) - .isEqualTo("천장, 벽면, 가구 뒤, 장판을 확인하세요."); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java new file mode 100644 index 000000000..74ecde46f --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java @@ -0,0 +1,22 @@ +package com.bang_ggood.checklist.option; + +import static org.assertj.core.api.Assertions.assertThat; + +import com.bang_ggood.checklist.domain.Option; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class OptionTest { + + @DisplayName("옵션 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(Option.contains(1)).isTrue(); + } + + @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(Option.contains(9999)).isFalse(); + } +} \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index f9428b552..a68f9a6a7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -1,24 +1,51 @@ package com.bang_ggood.checklist.service; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.category.domain.Badge; import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.dto.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.response.BadgeResponse; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; +import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.domain.User; +import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.junit.jupiter.api.Assertions.assertAll; class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private ChecklistService checklistService; + @Autowired + private ChecklistRepository checklistRepository; + @Autowired + private ChecklistQuestionRepository checklistQuestionRepository; + @Autowired + private RoomRepository roomRepository; + + @DisplayName("체크리스트 방 정보 작성 성공") @Test void createChecklist() { @@ -26,7 +53,12 @@ void createChecklist() { long checklistId = checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST); //then - assertThat(checklistId).isEqualTo(1); + assertAll( + () -> assertThat(checklistId).isEqualTo(1), + () -> assertThat(checklistQuestionRepository.findByChecklistId(1).size()).isEqualTo( + Question.values().length) + ); + } @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") @@ -34,7 +66,7 @@ void createChecklist() { void createChecklist_invalidQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); } @@ -44,7 +76,8 @@ void createChecklist_invalidQuestionId_exception() { void createChecklist_duplicatedQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) + () -> checklistService.createChecklist( + ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); } @@ -78,4 +111,150 @@ void readChecklistQuestions() { // then assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); } + + @DisplayName("작성된 체크리스트 조회 성공") + @Test + void readChecklistById() { + // given + roomRepository.save(RoomFixture.ROOM); + checklistRepository.save(ChecklistFixture.checklist); + + // when + WrittenChecklistResponse writtenChecklistResponse = checklistService.readChecklistById(1L); + + // then + Assertions.assertAll( + () -> assertThat(writtenChecklistResponse.room().name()).isEqualTo("살기 좋은 방"), + () -> assertThat(writtenChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + ); + } + + @DisplayName("작성된 체크리스트 조회 실패 : 체크리스트가 존재하지 않는 id인 경우") + @Test + void readChecklistById_invalidChecklistId_exception() { + // given & when & then + assertThatThrownBy(() -> checklistService.readChecklistById(0)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } + + @DisplayName("체크리스트 리스트 조회 성공") + @Test + void readUserChecklistsPreview() { + // given + User user = new User(1L, "방방이"); + Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist = createChecklist(user, room); + List questions = List.of( + new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_4, null), + new ChecklistQuestion(checklist, Question.CLEAN_5, null)); + + roomRepository.save(room); + checklistRepository.save(checklist); + checklistQuestionRepository.saveAll(questions); + + // when + UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); + + // then + UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); + assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); + assertThat(previewResponse1.badge()) + .containsExactlyInAnyOrder(new BadgeResponse( + Badge.CLEAN.getShortNameWithEmoji(), + Badge.CLEAN.getLongNameWithEmoji())); + } + + @DisplayName("체크리스트 리스트 조회 성공 : 뱃지가 존재하지 않을 때") + @Test + void readUserChecklistsPreview_NoBadge() { + // given + User user = new User(1L, "방방이"); //TODO 리팩토링 필요 + Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist = createChecklist(user, room); + List questions = List.of( + new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), + new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.BAD), + new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.BAD), + new ChecklistQuestion(checklist, Question.CLEAN_4, null), + new ChecklistQuestion(checklist, Question.CLEAN_5, null)); + + roomRepository.save(room); + checklistRepository.save(checklist); + checklistQuestionRepository.saveAll(questions); + + // when + UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); + + // then + UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); + assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); + assertThat(previewResponse1.badge()).isEmpty(); + } + + @DisplayName("체크리스트 비교 성공") + @Test + void readChecklistsComparison() { + // given + User user = new User(1L, "방방이"); + Room room1 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room2 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room3 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist1 = createChecklist(user, room1); + Checklist checklist2 = createChecklist(user, room2); + Checklist checklist3 = createChecklist(user, room3); + + roomRepository.saveAll(List.of(room1, room2, room3)); + List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + List checklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), + checklists.get(2).getId()); + + // when + ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(checklistIds); + + // then + assertThat(response.checklists()).hasSize(3); + } + + @DisplayName("체크리스트 비교 실패 : 아이디 개수가 유효하지 않을 때") + @Test + void readChecklistsComparison_invalidIdCount() { + // given + List invalidChecklistIds = List.of(1L, 2L, 3L, 4L); + + // when & then + assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT.getMessage()); + } + + @DisplayName("체크리스트 비교 실패 : 유효하지 않은 체크리스트 id 존재") + @Test + void readChecklistsComparison_invalidId() { + // given + User user = new User(1L, "방방이"); + Room room1 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room2 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room3 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Checklist checklist1 = createChecklist(user, room1); + Checklist checklist2 = createChecklist(user, room2); + Checklist checklist3 = createChecklist(user, room3); + + roomRepository.saveAll(List.of(room1, room2, room3)); + List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + List invalidChecklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), + checklists.get(2).getId() + 1); + + // when & then + assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } + + public static Checklist createChecklist(User user, Room room) { + return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 942106964..03f794b09 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -1,9 +1,14 @@ package com.bang_ggood.room; -import com.bang_ggood.room.dto.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomCreateRequest; +import com.bang_ggood.room.domain.Room; public class RoomFixture { + public static final Room ROOM = new Room( + "살기 좋은 방", 3, "인천광역시 부평구", "잠실", 10 + ); + public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( "방이름", 1000, 50, 12, 3, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사" diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index d660d5075..b3325d432 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -55,11 +55,11 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question_id INTEGER NOT NULL, + question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - answer VARCHAR(255), + grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); From 2469242c7ccd797cc70ced6e3041f2251db13248 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Thu, 1 Aug 2024 11:35:25 +0900 Subject: [PATCH 121/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=B0=A9=20=EC=A0=95=EB=B3=B4=20=EC=9E=91?= =?UTF-8?q?=EC=84=B1=20API=EC=97=90=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4=20(#1?= =?UTF-8?q?89)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/BaseEntity.java | 2 +- .../controller/CategoryController.java | 2 +- .../com/bang_ggood/category/domain/Badge.java | 3 +- .../dto/WrittenCategoryQuestionsResponse.java | 3 +- .../category/service/CategoryService.java | 6 +- .../controller/ChecklistController.java | 12 ++-- .../checklist/domain/Checklist.java | 12 +++- .../checklist/domain/ChecklistQuestion.java | 10 ++- .../checklist/domain/ChecklistScore.java | 6 +- .../bang_ggood/checklist/domain/Question.java | 24 ++++--- .../dto/request/QuestionCreateRequest.java | 2 +- .../ChecklistWithScoreReadResponse.java | 4 +- .../UserChecklistPreviewResponse.java | 1 - .../UserChecklistsPreviewResponse.java | 1 - .../ChecklistQuestionRepository.java | 2 +- .../repository/ChecklistRepository.java | 2 - .../checklist/service/ChecklistService.java | 25 +++----- .../com/bang_ggood/config/CorsConfig.java | 3 +- .../bang_ggood/exception/ExceptionCode.java | 27 +++++++- .../exception/GlobalExceptionHandler.java | 3 +- .../bang_ggood/room/domain/FloorLevel.java | 25 ++++++++ .../java/com/bang_ggood/room/domain/Room.java | 64 ++++++++++++++++--- .../com/bang_ggood/room/domain/Structure.java | 27 ++++++++ .../java/com/bang_ggood/room/domain/Type.java | 26 ++++++++ .../room/dto/request/RoomCreateRequest.java | 15 +++-- .../java/com/bang_ggood/user/domain/User.java | 2 +- .../bang-ggood/src/main/resources/schema.sql | 32 ++++++---- .../java/com/bang_ggood/JpaAuditingTest.java | 5 +- .../category/domain/CategoryTest.java | 2 - .../category/service/CategoryServiceTest.java | 3 +- .../checklist/ChecklistFixture.java | 21 ++---- .../controller/ChecklistE2ETest.java | 11 ---- .../checklist/domain/OptionTest.java | 5 +- .../checklist/domain/QuestionTest.java | 20 +++--- .../checklist/option/OptionTest.java | 6 +- .../service/ChecklistServiceTest.java | 37 +++++------ .../java/com/bang_ggood/room/RoomFixture.java | 18 ++++-- .../room/domain/FloorLevelTest.java | 35 ++++++++++ .../com/bang_ggood/room/domain/RoomTest.java | 25 ++++++++ .../bang_ggood/room/domain/StructureTest.java | 35 ++++++++++ .../com/bang_ggood/room/domain/TypeTest.java | 34 ++++++++++ .../src/test/resources/schema-test.sql | 43 ++++++++----- 42 files changed, 455 insertions(+), 186 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java index 167f3c42c..e97c6b62c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java @@ -2,10 +2,10 @@ import jakarta.persistence.EntityListeners; import jakarta.persistence.MappedSuperclass; -import java.time.LocalDateTime; import org.springframework.data.annotation.CreatedDate; import org.springframework.data.annotation.LastModifiedDate; import org.springframework.data.jpa.domain.support.AuditingEntityListener; +import java.time.LocalDateTime; @MappedSuperclass @EntityListeners(AuditingEntityListener.class) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index 5e932d324..810c07fc1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,7 +1,7 @@ package com.bang_ggood.category.controller; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.service.CategoryService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java index 6df9cf822..9cf21928c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -9,8 +9,7 @@ public enum Badge { ENVIRONMENT("주거환경", "주거환경이 좋아요", "🌱"), SECURITY("보안", "안전해요", "🔒"), ECONOMIC("경제적", "경제적이에요", "💰"), - NONE("", "", "") - ; + NONE("", "", ""); private static final String DESCRIPTION_FORMAT = "%s %s"; private final String shortName; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java index 3e5a1c335..9fe42adda 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java @@ -3,5 +3,6 @@ import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import java.util.List; -public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { +public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, + List questions) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index 56ac88147..fbabc62e0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -2,8 +2,8 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.domain.CategoryPriority; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.dto.response.CategoryReadResponse; import com.bang_ggood.category.repository.CategoryPriorityRepository; import com.bang_ggood.exception.BangggoodException; @@ -62,7 +62,9 @@ private void validateCategoryId(CategoryPriorityCreateRequest request) { request.categoryIds().stream() .filter(id -> !Category.contains(id)) .findAny() - .ifPresent(id -> { throw new BangggoodException(CATEGORY_NOT_FOUND); }); + .ifPresent(id -> { + throw new BangggoodException(CATEGORY_NOT_FOUND); + }); } public CategoriesReadResponse readCategories() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index e6f744736..680a862d9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -2,24 +2,20 @@ import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; -import java.net.URI; -import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; -import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.service.ChecklistService; -import com.bang_ggood.user.domain.User; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.net.URI; import java.util.List; @RestController diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 79011148c..91ab926ef 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -74,11 +74,17 @@ public String getRoomAddress() { return room.getAddress(); } - public Integer getRoomFloor() { return room.getFloor(); } + public Integer getRoomFloor() { + return room.getFloor(); + } - public String getRoomStation() { return room.getStation(); } + public String getRoomStation() { + return room.getStation(); + } - public Integer getRoomWalkingTime() { return room.getWalkingTime(); } + public Integer getRoomWalkingTime() { + return room.getWalkingTime(); + } public Integer getDeposit() { return deposit; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 642ebb8ac..481eea179 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -27,10 +27,13 @@ public class ChecklistQuestion extends BaseEntity { @Enumerated(EnumType.STRING) private Grade grade; - public ChecklistQuestion(Checklist checklist, Question question, Grade grade) { + private String memo; + + public ChecklistQuestion(Checklist checklist, Question question, Grade grade, String memo) { this.checklist = checklist; this.question = question; this.grade = grade; + this.memo = memo; } protected ChecklistQuestion() { @@ -52,6 +55,10 @@ public Grade getGrade() { return grade; } + public String getMemo() { + return memo; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -76,6 +83,7 @@ public String toString() { ", checklist=" + checklist + ", question=" + question + ", grade=" + grade + + ", memo='" + memo + '\'' + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java index 67c31ba01..9d3b3006a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java @@ -5,6 +5,9 @@ public class ChecklistScore { + private ChecklistScore() { + } + public static int calculateTotalScore(List questions) { if (questions.isEmpty()) { return 0; @@ -28,7 +31,4 @@ public static int calculateCategoryScore(Category category, List question.id == id) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.QUESTION_INVALID)); + } + public static List filter(Category category, List questions) { return questions.stream() .filter(question -> question.getQuestion().isCategory(category) && question.getGrade() != null) @@ -74,23 +80,15 @@ public static List findQuestionsByCategory(Category category) { .collect(Collectors.toList()); } - private boolean isCategory(Category category) { - return this.category == category; - } - - // TODO 테스트 필요 - public static Question findById(int id) { - return Arrays.stream(values()) - .filter(question -> question.id == id) - .findFirst() - .orElseThrow(() -> new BangggoodException(ExceptionCode.INVALID_QUESTION)); - } - public static boolean contains(int id) { return Arrays.stream(values()) .anyMatch(question -> question.getId() == id); } + private boolean isCategory(Category category) { + return this.category == category; + } + public int getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java index 5b5388017..2e6c8804c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java @@ -2,5 +2,5 @@ import jakarta.validation.constraints.NotNull; -public record QuestionCreateRequest(@NotNull Integer questionId, String answer) { +public record QuestionCreateRequest(@NotNull Integer questionId, String grade, String memo) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java index 44d06b250..c8d3e42dc 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java @@ -1,7 +1,6 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; - import java.util.List; public record ChecklistWithScoreReadResponse( @@ -11,7 +10,8 @@ public record ChecklistWithScoreReadResponse( Integer optionCount, Integer score, List categories ) { - public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, List categoryScores) { + public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, + List categoryScores) { return new ChecklistWithScoreReadResponse( checklist.getId(), checklist.getRoomName(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 15bbc6a93..27d90b50e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,7 +1,6 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; - import java.time.LocalDateTime; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java index aa3b8aaf0..4149d6d83 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistsPreviewResponse.java @@ -1,6 +1,5 @@ package com.bang_ggood.checklist.dto.response; -import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import java.util.List; public record UserChecklistsPreviewResponse(List checklists) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java index 30b511028..e6001c3e3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java @@ -1,8 +1,8 @@ package com.bang_ggood.checklist.repository; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.List; public interface ChecklistQuestionRepository extends JpaRepository { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index ca1606c72..5db92f517 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -9,8 +9,6 @@ import org.springframework.data.repository.query.Param; import java.util.List; import java.util.Optional; -import java.util.List; -import java.util.Optional; public interface ChecklistRepository extends JpaRepository { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 502bb5d2c..a203409d7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -40,8 +40,6 @@ import java.util.Comparator; import java.util.HashSet; import java.util.List; -import java.util.Map; -import java.util.Optional; import java.util.Set; import java.util.stream.Collectors; @@ -102,27 +100,20 @@ private void validateOptionDuplicate(List optionIds) { private void validateOptionInvalid(List optionIds) { for (Integer optionId : optionIds) { if (!Option.contains(optionId)) { - throw new BangggoodException(ExceptionCode.INVALID_OPTION); + throw new BangggoodException(ExceptionCode.OPTION_INVALID); } } } private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { validateQuestion(checklistCreateRequest.questions()); - Map existQuestions = checklistCreateRequest.questions() - .stream() - .collect(Collectors.toMap(QuestionCreateRequest::questionId, QuestionCreateRequest::answer)); - - List checklistQuestions = Arrays.stream(Question.values()) - .map(question -> { - int questionId = question.getId(); - return Optional.ofNullable(existQuestions.get(questionId)) - .map(answer -> new ChecklistQuestion(checklist, Question.findById(questionId), - Grade.from(answer))) - .orElseGet(() -> new ChecklistQuestion(checklist, Question.findById(questionId), null)); - }) + List checklistQuestions = checklistCreateRequest.questions().stream() + .map(question -> new ChecklistQuestion( + checklist, + Question.fromId(question.questionId()), + Grade.from(question.grade()), + question.memo())) .collect(Collectors.toList()); - checklistQuestionRepository.saveAll(checklistQuestions); } @@ -156,7 +147,7 @@ private void validateQuestionDuplicate(List questions) { private void validateQuestionInvalid(List questions) { for (QuestionCreateRequest questionCreateRequest : questions) { if (!Question.contains(questionCreateRequest.questionId())) { - throw new BangggoodException(ExceptionCode.INVALID_QUESTION); + throw new BangggoodException(ExceptionCode.QUESTION_INVALID); } } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java index 0db234c72..b9985f1d4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java @@ -3,10 +3,9 @@ import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; -import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; -import java.util.List; import org.springframework.web.filter.CorsFilter; +import java.util.List; @Configuration public class CorsConfig { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index ce8a6dcb4..6dff00f7d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -4,23 +4,44 @@ public enum ExceptionCode { + // 전체 INVALID_PARAMETER(HttpStatus.BAD_REQUEST, "잘못된 인자입니다."), - INVALID_OPTION(HttpStatus.BAD_REQUEST, "잘못된 옵션 ID입니다."), + + // Option + OPTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 옵션 ID입니다."), OPTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 옵션이 존재합니다."), - INVALID_QUESTION(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), + + // Question + QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), + + // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), // Category CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), + + // Grade GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), // Checklist CHECKLIST_COMPARISON_INVALID_COUNT(HttpStatus.BAD_REQUEST, "비교할 체크리스트 개수가 유효하지 않습니다."), CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), - ; + + // Type + TYPE_INVALID(HttpStatus.BAD_REQUEST, "타입이 유효하지 않습니다."), + + // FloorLevel + FLOOR_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "층 종류가 유효하지 않습니다."), + + // Structure + STRUCTURE_INVALID(HttpStatus.BAD_REQUEST, "방 구조가 유효하지 않습니다."), + + // Room + ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."); + private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java index f7dc1a6c5..7188ac05f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java @@ -23,7 +23,8 @@ public ResponseEntity handleBangggoodException(BangggoodExcep //TODO 로깅해야함 @ExceptionHandler(RuntimeException.class) - public ResponseEntity handleRuntimeException(RuntimeException runtimeException, HttpServletRequest request) { + public ResponseEntity handleRuntimeException(RuntimeException runtimeException, + HttpServletRequest request) { runtimeException.printStackTrace(); ExceptionResponse response = new ExceptionResponse( request.getMethod(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java new file mode 100644 index 000000000..cdc75b27b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java @@ -0,0 +1,25 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum FloorLevel { + + GROUND("지상"), + BASEMENT("반지하/지하"), + ROOFTOP("옥탑"); + + private final String name; + + FloorLevel(String name) { + this.name = name; + } + + public static FloorLevel from(String name) { + return Arrays.stream(FloorLevel.values()) + .filter(value -> value.name.equals(name)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.FLOOR_LEVEL_INVALID)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 4f69a535f..c9d1d9c62 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -1,7 +1,11 @@ package com.bang_ggood.room.domain; import com.bang_ggood.BaseEntity; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; import jakarta.persistence.Id; @@ -16,23 +20,40 @@ public class Room extends BaseEntity { private String name; - private Integer floor; + private String station; + + private Integer walkingTime; private String address; - private String station; + @Enumerated(EnumType.STRING) + private Type type; - private Integer walkingTime; + private Integer size; + + private Integer floor; + + @Enumerated(EnumType.STRING) + private FloorLevel floorLevel; + + @Enumerated(EnumType.STRING) + private Structure structure; protected Room() { } - public Room(String name, Integer floor, String address, String station, Integer walkingTime) { + public Room(String name, String station, Integer walkingTime, String address, Type type, Integer size, + Integer floor, FloorLevel floorLevel, Structure structure) { this.name = name; - this.floor = floor; - this.address = address; this.station = station; this.walkingTime = walkingTime; + this.address = address; + this.type = type; + this.size = size; + this.floor = floor; + this.floorLevel = floorLevel; + this.structure = structure; + validateFloorAndLevel(); } public Long getId() { @@ -59,6 +80,29 @@ public Integer getWalkingTime() { return walkingTime; } + public Type getType() { + return type; + } + + public Integer getSize() { + return size; + } + + public FloorLevel getFloorLevel() { + return floorLevel; + } + + public Structure getStructure() { + return structure; + } + + + private void validateFloorAndLevel() { + if (floorLevel != FloorLevel.GROUND && floor != null) { + throw new BangggoodException(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID); + } + } + @Override public boolean equals(Object o) { if (this == o) { @@ -81,10 +125,14 @@ public String toString() { return "Room{" + "id=" + id + ", name='" + name + '\'' + - ", floor=" + floor + - ", address='" + address + '\'' + ", station='" + station + '\'' + ", walkingTime=" + walkingTime + + ", address='" + address + '\'' + + ", type=" + type + + ", size=" + size + + ", floor=" + floor + + ", floorLevel=" + floorLevel + + ", structure=" + structure + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java new file mode 100644 index 000000000..3efa9fd82 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java @@ -0,0 +1,27 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum Structure { + + STUDIO("오픈형 원룸"), + DIVIDED("분리형 원룸"), + TWO_ROOM("투룸"), + THREE_ROOM_OR_MORE("쓰리룸 이상"), + DUPLEX("복층"); + + private final String name; + + Structure(String name) { + this.name = name; + } + + public static Structure from(String name) { + return Arrays.stream(Structure.values()) + .filter(value -> value.name.equals(name)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.STRUCTURE_INVALID)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java new file mode 100644 index 000000000..531926cfb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java @@ -0,0 +1,26 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum Type { + + VILLA("빌라"), + OFFICETEL("오피스텔"), + APARTMENT("아파트"), + OTHER("기타"); + + private final String name; + + Type(String name) { + this.name = name; + } + + public static Type from(String name) { + return Arrays.stream(Type.values()) + .filter(value -> value.name.equals(name)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.TYPE_INVALID)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java index e49b936f0..51b9774fa 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java @@ -1,13 +1,18 @@ package com.bang_ggood.room.dto.request; +import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; -import jakarta.validation.constraints.NotNull; +import com.bang_ggood.room.domain.Structure; +import com.bang_ggood.room.domain.Type; +import jakarta.validation.constraints.NotBlank; -public record RoomCreateRequest(@NotNull(message = "방 이름이 존재하지 않습니다.") String name, - Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { +public record RoomCreateRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, + Integer deposit, Integer rent, Integer contractTerm, String address, + String station, Integer walkingTime, String realEstate, + String type, String structure, Integer size, Integer floor, String floorLevel) { public Room toRoomEntity() { - return new Room(name, floor, address, station, walkingTime); + return new Room(roomName, station, walkingTime, address, + Type.from(type), size, floor, FloorLevel.from(floorLevel), Structure.from(structure)); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index 67bd71867..a7b90b10d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -28,7 +28,7 @@ public User(Long id, String name) { public User(String name) { this.name = name; } - + protected User() { } diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index d08a57ef6..9232e26dc 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -4,18 +4,25 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS category_priority CASCADE; -- Create tables CREATE TABLE room ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - floor INTEGER, + name VARCHAR(255), + station VARCHAR(255), walking_time INTEGER, - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), address VARCHAR(255), - name VARCHAR(255), - station VARCHAR(255) + type VARCHAR(255), + size INTEGER, + floor INTEGER, + floor_level VARCHAR(255), + structure VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6) + + ); CREATE TABLE users @@ -54,21 +61,22 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question VARCHAR(255) NOT NULL, - checklist_id BIGINT NOT NULL, + question VARCHAR(255) NOT NULL, + checklist_id BIGINT NOT NULL, + grade VARCHAR(255), + memo VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); CREATE TABLE category_priority ( - id bigint generated by default as identity, - category_id INTEGER not null, - user_id bigint not null, - created_at TIMESTAMP not null, + id bigint generated by default as identity, + category_id INTEGER not null, + user_id bigint not null, + created_at TIMESTAMP not null, modified_at TIMESTAMP not null, primary key (id), foreign key (user_id) references users diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java index 74ffa146e..6425cb9ab 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/JpaAuditingTest.java @@ -1,8 +1,5 @@ package com.bang_ggood; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertAll; - import jakarta.persistence.Entity; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -16,7 +13,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; -class JpaAuditingTest extends IntegrationTestSupport{ +class JpaAuditingTest extends IntegrationTestSupport { @Autowired private TestRepository testRepository; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java index 0fd0c8591..8f46cd3c5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java @@ -1,7 +1,5 @@ package com.bang_ggood.category.domain; -import static org.junit.jupiter.api.Assertions.*; - class CategoryTest { } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index fc581a063..b79398d39 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -2,13 +2,12 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; +import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.exception.BangggoodException; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; - import java.util.List; import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 00b87bbdd..18eb94109 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -16,34 +16,33 @@ public class ChecklistFixture { ); public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( - 1, "GOOD" + 1, "GOOD", "메모1" ); public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( - 2, "SOSO" + 2, "SOSO", null ); public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( - 3, "BAD" + 3, "BAD", "메모3" ); public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( - 5, "GOOD" + 5, "GOOD", null ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ANSWER = new QuestionCreateRequest( - 6, null + 6, null, "메모6" ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( - null, "GOOD" + null, "GOOD", "메모" ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( - 9999, "SOSO" + 9999, "SOSO", null ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, @@ -85,10 +84,4 @@ public class ChecklistFixture { List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ANSWER = new ChecklistCreateRequest( - RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), - List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, - QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ANSWER) - ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index f1b569ee8..a45b0b733 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -58,17 +58,6 @@ void createChecklist_noQuestionId_exception() { .statusCode(400); } - @DisplayName("체크리스트 방 정보 작성 실패: 질문 답변을 넣지 않은 경우") - @Test - void createChecklist_noAnswer_exception() { - RestAssured.given().log().all() - .contentType(ContentType.JSON) - .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ANSWER) - .when().post("/checklists") - .then().log().all() - .statusCode(400); - } - @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java index c6b5ecde0..b298e4276 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OptionTest.java @@ -1,11 +1,10 @@ package com.bang_ggood.checklist.domain; -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; - import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + class OptionTest { @DisplayName("옵션 포함 성공: 포함하는 경우") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java index 59ddbcc65..b7145cd9a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -1,15 +1,15 @@ package com.bang_ggood.checklist.domain; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.*; - import com.bang_ggood.category.domain.Category; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; -import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertAll; class QuestionTest { @@ -31,12 +31,12 @@ void findQuestionsByCategory() { @DisplayName("질문 아이디를 통해 질문 찾기 성공") @Test - void findById() { + void fromId() { //given int questionId = 1; //when - Question question = Question.findById(questionId); + Question question = Question.fromId(questionId); //then assertAll( @@ -47,14 +47,14 @@ void findById() { @DisplayName("질문 아이디를 통해 질문 찾기 실패 : 유효하지 않은 질문 아이디일 경우") @Test - void findById_invalidQuestion_exception() { + void fromId_invalidQuestion_exception() { //given int questionId = 999; //when & then - assertThatThrownBy(() -> Question.findById(questionId)) + assertThatThrownBy(() -> Question.fromId(questionId)) .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); + .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함일 경우") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java index 74ecde46f..01be9b078 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java @@ -1,11 +1,11 @@ package com.bang_ggood.checklist.option; -import static org.assertj.core.api.Assertions.assertThat; - import com.bang_ggood.checklist.domain.Option; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + class OptionTest { @DisplayName("옵션 포함 성공: 포함하는 경우") @@ -19,4 +19,4 @@ void contains_true() { void contains_false() { assertThat(Option.contains(9999)).isFalse(); } -} \ No newline at end of file +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index a68f9a6a7..0fa92c207 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -1,36 +1,24 @@ package com.bang_ggood.checklist.service; import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.category.domain.Badge; import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.Grade; -import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.response.BadgeResponse; +import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; -import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; -import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; -import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; -import com.bang_ggood.user.domain.User; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.assertj.core.api.Assertions.assertThatCode; import static org.junit.jupiter.api.Assertions.assertAll; class ChecklistServiceTest extends IntegrationTestSupport { @@ -40,8 +28,10 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private ChecklistRepository checklistRepository; + @Autowired private ChecklistQuestionRepository checklistQuestionRepository; + @Autowired private RoomRepository roomRepository; @@ -49,14 +39,17 @@ class ChecklistServiceTest extends IntegrationTestSupport { @DisplayName("체크리스트 방 정보 작성 성공") @Test void createChecklist() { - //given & when - long checklistId = checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST); + //given + ChecklistCreateRequest checklist = ChecklistFixture.CHECKLIST_CREATE_REQUEST; + + // when + long checklistId = checklistService.createChecklist(checklist); //then assertAll( () -> assertThat(checklistId).isEqualTo(1), () -> assertThat(checklistQuestionRepository.findByChecklistId(1).size()).isEqualTo( - Question.values().length) + checklist.questions().size()) ); } @@ -68,7 +61,7 @@ void createChecklist_invalidQuestionId_exception() { assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.INVALID_QUESTION.getMessage()); + .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 중복일 경우") @@ -89,7 +82,7 @@ void createChecklist_invalidOptionId_exception() { assertThatThrownBy( () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.INVALID_OPTION.getMessage()); + .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); } @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 중복일 경우") @@ -138,7 +131,7 @@ void readChecklistById_invalidChecklistId_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } - @DisplayName("체크리스트 리스트 조회 성공") + /*@DisplayName("체크리스트 리스트 조회 성공") @Test void readUserChecklistsPreview() { // given @@ -193,9 +186,9 @@ void readUserChecklistsPreview_NoBadge() { UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); assertThat(previewResponse1.badge()).isEmpty(); - } + }*/ - @DisplayName("체크리스트 비교 성공") + /*@DisplayName("체크리스트 비교 성공") @Test void readChecklistsComparison() { // given @@ -256,5 +249,5 @@ void readChecklistsComparison_invalidId() { public static Checklist createChecklist(User user, Room room) { return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); - } + }*/ } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 03f794b09..cdf20aa52 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -1,21 +1,27 @@ package com.bang_ggood.room; -import com.bang_ggood.room.dto.request.RoomCreateRequest; +import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.domain.Structure; +import com.bang_ggood.room.domain.Type; +import com.bang_ggood.room.dto.request.RoomCreateRequest; public class RoomFixture { public static final Room ROOM = new Room( - "살기 좋은 방", 3, "인천광역시 부평구", "잠실", 10 + "살기 좋은 방", "잠실", 10, "인천광역시 부평구", + Type.VILLA, 10, 5, FloorLevel.GROUND, Structure.TWO_ROOM ); public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( - "방이름", 1000, 50, 12, 3, - "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사" + "방이름", 1000, 50, 12, + "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", + "아파트", "분리형 원룸", 8, 4, "지상" ); public static final RoomCreateRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomCreateRequest( - null, 1000, 50, 12, 3, - "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사" + null, 1000, 50, 12, + "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", + "아파트", "분리형 원룸", 8, 4, "지상" ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java new file mode 100644 index 000000000..72c427cb5 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java @@ -0,0 +1,35 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class FloorLevelTest { + + @DisplayName("name으로 FloorLevel 생성 성공") + @Test + void from() { + // given + String name = "반지하/지하"; + + // when & then + assertThat(FloorLevel.from(name)).isEqualTo(FloorLevel.BASEMENT); + } + + @DisplayName("name으로 FloorLevel 생성 실패 : 해당하지 않는 이름일 경우") + @Test + void from_invalidFloorLevel_exception() { + // given + String name = "우주"; + + // when & then + assertThatThrownBy(() -> FloorLevel.from(name)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.FLOOR_LEVEL_INVALID.getMessage()); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java new file mode 100644 index 000000000..506a2da08 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java @@ -0,0 +1,25 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class RoomTest { + + @DisplayName("방 생성 실패: 방이 지상층이 아닌데 floor를 입력했을 경우") + @Test + void createChecklist_roomFloorAndLevelInvalid_exception() { + //given & when & then + assertThatThrownBy(() -> { + new Room( + "방이름", "잠실역", 12, "부산광역시 루터회관", Type.APARTMENT, 12, + 10, FloorLevel.BASEMENT, Structure.TWO_ROOM + ); + }) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java new file mode 100644 index 000000000..5ab73078e --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java @@ -0,0 +1,35 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class StructureTest { + + @DisplayName("name으로 Structure 생성 성공") + @Test + void from() { + // given + String name = "복층"; + + // when & then + assertThat(Structure.from(name)).isEqualTo(Structure.DUPLEX); + } + + @DisplayName("name으로 Structure 생성 실패 : 해당하지 않는 이름일 경우") + @Test + void from_invalidStructure_exception() { + // given + String name = "제제"; + + // when & then + assertThatThrownBy(() -> Structure.from(name)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.STRUCTURE_INVALID.getMessage()); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java new file mode 100644 index 000000000..297fe96c8 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java @@ -0,0 +1,34 @@ +package com.bang_ggood.room.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class TypeTest { + + @DisplayName("name으로 Type 생성 성공") + @Test + void from() { + // given + String name = "빌라"; + + // when & then + assertThat(Type.from(name)).isEqualTo(Type.VILLA); + } + + @DisplayName("name으로 Type 생성 실패 : 해당하지 않는 이름일 경우") + @Test + void from_invalidType_exception() { + // given + String name = "시소"; + + // when & then + assertThatThrownBy(() -> Type.from(name)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.TYPE_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index b3325d432..2e6e48886 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -4,19 +4,26 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS category_priority CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; -- Create tables CREATE TABLE room ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - floor INTEGER, + name VARCHAR(255), + station VARCHAR(255), walking_time INTEGER, - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), address VARCHAR(255), - name VARCHAR(255), - station VARCHAR(255) + type VARCHAR(255), + size INTEGER, + floor INTEGER, + floor_level VARCHAR(255), + structure VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6) + + ); CREATE TABLE users @@ -55,20 +62,22 @@ CREATE TABLE checklist_option CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question VARCHAR(255) NOT NULL, - checklist_id BIGINT NOT NULL, + question VARCHAR(255) NOT NULL, + checklist_id BIGINT NOT NULL, + grade VARCHAR(255), + memo VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - grade VARCHAR(255), FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE if not exists category_priority + +CREATE TABLE category_priority ( - id bigint generated by default as identity, - category_id INTEGER not null, - user_id bigint not null, - created_at TIMESTAMP not null, + id bigint generated by default as identity, + category_id INTEGER not null, + user_id bigint not null, + created_at TIMESTAMP not null, modified_at TIMESTAMP not null, primary key (id), foreign key (user_id) references users @@ -77,9 +86,9 @@ CREATE TABLE if not exists category_priority CREATE TABLE test_entity ( - id bigint generated by default as identity, - name varchar(255) not null, - created_at TIMESTAMP not null, - modified_at TIMESTAMP not null, + id bigint generated by default as identity, + name varchar(255) not null, + created_at TIMESTAMP not null, + modified_at TIMESTAMP not null, primary key (id) ); From 978e2a07f2f22fb24149da19c04f1c31e9f2b2f0 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Thu, 1 Aug 2024 15:47:03 +0900 Subject: [PATCH 122/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EC=97=90=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EC=B6=94=EA=B0=80=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=ED=95=9C=EB=8B=A4.=20(#192)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/CategoryQuestionsResponse.java | 7 - .../dto/WrittenCategoryQuestionsResponse.java | 8 - .../SelectedCategoryQuestionsResponse.java | 19 +++ .../WrittenCategoryQuestionsResponse.java | 17 -- .../controller/ChecklistController.java | 8 +- .../checklist/domain/ChecklistQuestion.java | 1 + .../bang_ggood/checklist/domain/Option.java | 15 ++ .../response/SelectedChecklistResponse.java | 10 ++ .../dto/response/SelectedOptionResponse.java | 10 ++ .../response/SelectedQuestionResponse.java | 17 ++ .../response/WrittenChecklistResponse.java | 9 -- .../dto/response/WrittenQuestionResponse.java | 15 -- .../checklist/service/ChecklistService.java | 45 +++--- .../bang_ggood/room/domain/FloorLevel.java | 4 + .../com/bang_ggood/room/domain/Structure.java | 8 +- .../java/com/bang_ggood/room/domain/Type.java | 4 + .../dto/response/SelectedRoomResponse.java | 12 ++ .../dto/response/WrittenRoomResponse.java | 12 -- .../checklist/ChecklistFixture.java | 3 +- .../controller/ChecklistE2ETest.java | 12 +- .../checklist/option/OptionTest.java | 22 --- .../service/ChecklistServiceTest.java | 150 +++++++++--------- .../java/com/bang_ggood/room/RoomFixture.java | 28 ++-- .../room/domain/FloorLevelTest.java | 1 - 24 files changed, 233 insertions(+), 204 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedOptionResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java deleted file mode 100644 index 4309c8400..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.category.dto; - -import com.bang_ggood.checklist.dto.response.QuestionResponse; -import java.util.List; - -public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java deleted file mode 100644 index 9fe42adda..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/WrittenCategoryQuestionsResponse.java +++ /dev/null @@ -1,8 +0,0 @@ -package com.bang_ggood.category.dto; - -import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; -import java.util.List; - -public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, - List questions) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java new file mode 100644 index 000000000..331ba2927 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java @@ -0,0 +1,19 @@ +package com.bang_ggood.category.dto.response; + +import com.bang_ggood.category.domain.Category; +import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; +import java.util.List; + +public record SelectedCategoryQuestionsResponse(Integer categoryId, String categoryName, Integer score, + List questions) { + + public static SelectedCategoryQuestionsResponse of(Category category, Integer score, + List questions) { + return new SelectedCategoryQuestionsResponse( + category.getId(), + category.getName(), + score, + questions + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java deleted file mode 100644 index 30a1d94ff..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bang_ggood.category.dto.response; - -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; -import java.util.List; - -public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, - List questions) { - - public static WrittenCategoryQuestionsResponse of(Category category, List questions) { - return new WrittenCategoryQuestionsResponse( - category.getId(), - category.getName(), - questions - ); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 680a862d9..dcca3f73f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -3,11 +3,13 @@ import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; +import java.net.URI; +import java.util.List; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; @@ -15,8 +17,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.net.URI; -import java.util.List; @RestController public class ChecklistController { @@ -39,7 +39,7 @@ public ResponseEntity readChecklistQuestions() { } @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@PathVariable("id") long id) { + public ResponseEntity readChecklistById(@PathVariable("id") long id) { return ResponseEntity.ok(checklistService.readChecklistById(id)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 481eea179..2bcbacdef 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -9,6 +9,7 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; + import java.util.Objects; @Entity diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index 0eca5d189..c0d3ea285 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -1,5 +1,7 @@ package com.bang_ggood.checklist.domain; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; public enum Option { @@ -31,4 +33,17 @@ public static boolean contains(int id) { return Arrays.stream(Option.values()) .anyMatch(option -> option.id == id); } + + public static Option fromId(int id) { + for (Option option : values()) { + if (option.id == id) { + return option; + } + } + throw new BangggoodException(ExceptionCode.OPTION_INVALID); + } + + public String getName() { + return name; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java new file mode 100644 index 000000000..0268c85bd --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; +import com.bang_ggood.room.dto.response.SelectedRoomResponse; + +import java.util.List; + +public record SelectedChecklistResponse(SelectedRoomResponse room, List options, + Integer score, List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedOptionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedOptionResponse.java new file mode 100644 index 000000000..48d754c47 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedOptionResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.domain.Option; + +public record SelectedOptionResponse(Integer optionId, String optionName) { + + public static SelectedOptionResponse of(int optionId) { + return new SelectedOptionResponse(optionId, Option.fromId(optionId).getName()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java new file mode 100644 index 000000000..7e3e3ead3 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -0,0 +1,17 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.domain.ChecklistQuestion; + +public record SelectedQuestionResponse(Integer questionId, String title, + String subtitle, String grade, String memo) { + + public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { + return new SelectedQuestionResponse( + checklistQuestion.getQuestion().getId(), + checklistQuestion.getQuestion().getTitle(), + checklistQuestion.getQuestion().getSubtitle(), + checklistQuestion.getGrade().name(), + checklistQuestion.getMemo() + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java deleted file mode 100644 index bdcfc70e1..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.response.WrittenRoomResponse; -import java.util.List; - -public record WrittenChecklistResponse(WrittenRoomResponse room, List options, - List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java deleted file mode 100644 index 34fc7ced8..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.checklist.domain.ChecklistQuestion; - -public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { - - public static WrittenQuestionResponse of(ChecklistQuestion checklistQuestion) { - return new WrittenQuestionResponse( - checklistQuestion.getQuestion().getId(), - checklistQuestion.getQuestion().getTitle(), - checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getGrade().name() - ); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index a203409d7..a5f1f3c36 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -3,7 +3,7 @@ import com.bang_ggood.category.domain.Badge; import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; -import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; +import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; @@ -20,21 +20,20 @@ import com.bang_ggood.checklist.dto.response.ChecklistWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.QuestionResponse; +import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; +import com.bang_ggood.checklist.dto.response.SelectedOptionResponse; +import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; -import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.response.WrittenRoomResponse; +import com.bang_ggood.room.dto.response.SelectedRoomResponse; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.util.ArrayList; import java.util.Arrays; import java.util.Comparator; @@ -42,6 +41,8 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service public class ChecklistService { @@ -153,40 +154,46 @@ private void validateQuestionInvalid(List questions) { } @Transactional - public WrittenChecklistResponse readChecklistById(long id) { + public SelectedChecklistResponse readChecklistById(long id) { Checklist checklist = checklistRepository.getById(id); - WrittenRoomResponse writtenRoomResponse = WrittenRoomResponse.of(checklist); + SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); - List optionIds = readOptionsByChecklistId(id); + List options = readOptionsByChecklistId(id); - List writtenCategoryQuestionsResponses = + List selectedCategoryQuestionsRespons = readCategoryQuestionsByChecklistId(id); - return new WrittenChecklistResponse(writtenRoomResponse, optionIds, writtenCategoryQuestionsResponses); + int checklistScore = ChecklistScore.calculateTotalScore(checklist.getQuestions()); + + return new SelectedChecklistResponse(selectedRoomResponse, options, checklistScore, + selectedCategoryQuestionsRespons); } - private List readOptionsByChecklistId(long checklistId) { + private List readOptionsByChecklistId(long checklistId) { return checklistOptionRepository.findByChecklistId(checklistId) .stream() - .map(ChecklistOption::getOptionId) + .map(checklistOption -> SelectedOptionResponse.of(checklistOption.getOptionId())) .toList(); } - private List readCategoryQuestionsByChecklistId(long checklistId) { + private List readCategoryQuestionsByChecklistId(long checklistId) { List checklistQuestions = checklistQuestionRepository.findByChecklistId(checklistId); + return Arrays.stream(Category.values()) .map(category -> readQuestionsByCategory(category, checklistQuestions)) .toList(); } - private WrittenCategoryQuestionsResponse readQuestionsByCategory(Category category, - List checklistQuestions) { - List writtenQuestionResponses = + private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category category, + List checklistQuestions) { + List selectedQuestionRespons = Question.filter(category, checklistQuestions).stream() - .map(WrittenQuestionResponse::of) + .map(SelectedQuestionResponse::of) .toList(); - return WrittenCategoryQuestionsResponse.of(category, writtenQuestionResponses); + int categoryScore = ChecklistScore.calculateCategoryScore(category, checklistQuestions); + + return SelectedCategoryQuestionsResponse.of(category, categoryScore, selectedQuestionRespons); } @Transactional diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java index cdc75b27b..a014d7584 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java @@ -22,4 +22,8 @@ public static FloorLevel from(String name) { .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.FLOOR_LEVEL_INVALID)); } + + public String getName() { + return name; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java index 3efa9fd82..f7274e6a3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java @@ -6,8 +6,8 @@ public enum Structure { - STUDIO("오픈형 원룸"), - DIVIDED("분리형 원룸"), + OPEN_ONE_ROOM("오픈형 원룸"), + DIVIDED_ONE_ROOM("분리형 원룸"), TWO_ROOM("투룸"), THREE_ROOM_OR_MORE("쓰리룸 이상"), DUPLEX("복층"); @@ -24,4 +24,8 @@ public static Structure from(String name) { .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.STRUCTURE_INVALID)); } + + public String getName() { + return name; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java index 531926cfb..be63b6e10 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java @@ -23,4 +23,8 @@ public static Type from(String name) { .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.TYPE_INVALID)); } + + public String getName() { + return name; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java new file mode 100644 index 000000000..65d30ec6d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.room.dto.response; + +import com.bang_ggood.checklist.domain.Checklist; + +public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, + String address, String station, Integer walkingTime, String realEstate) { + public static SelectedRoomResponse of(Checklist checklist) { + return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), + checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), + checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java deleted file mode 100644 index f3e859a54..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bang_ggood.room.dto.response; - -import com.bang_ggood.checklist.domain.Checklist; - -public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { - public static WrittenRoomResponse of(Checklist checklist) { - return new WrittenRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), - checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), - checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 18eb94109..dca95ec52 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -5,13 +5,14 @@ import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.user.domain.User; + import java.util.List; public class ChecklistFixture { public static final Checklist checklist = new Checklist( new User(1L, "방방이"), - RoomFixture.ROOM, + RoomFixture.ROOM_1, 1000, 50, 12, "방끗공인중개사" ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index a45b0b733..43067a4bc 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -5,7 +5,7 @@ import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; @@ -76,20 +76,20 @@ void readChecklistQuestions() { @Test void readChecklistById() { //체크리스트 저장 - roomRepository.save(RoomFixture.ROOM); + roomRepository.save(RoomFixture.ROOM_1); Checklist saved = checklistRepository.save(ChecklistFixture.checklist); - WrittenChecklistResponse writtenChecklistResponse = RestAssured.given().log().all() + SelectedChecklistResponse selectedChecklistResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) .when().get("/checklists/" + saved.getId()) .then().log().all() .statusCode(200) .extract() - .as(WrittenChecklistResponse.class); + .as(SelectedChecklistResponse.class); Assertions.assertAll( - () -> assertThat(writtenChecklistResponse.room().name()).isEqualTo("살기 좋은 방"), - () -> assertThat(writtenChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("살기 좋은 방"), + () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") ); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java deleted file mode 100644 index 01be9b078..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bang_ggood.checklist.option; - -import com.bang_ggood.checklist.domain.Option; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; - -class OptionTest { - - @DisplayName("옵션 포함 성공: 포함하는 경우") - @Test - void contains_true() { - assertThat(Option.contains(1)).isTrue(); - } - - @DisplayName("옵션 포함 성공 : 포함하지 않는 경우") - @Test - void contains_false() { - assertThat(Option.contains(9999)).isFalse(); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 0fa92c207..82010ce69 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -3,24 +3,30 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.WrittenChecklistResponse; +import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; -import org.junit.jupiter.api.Assertions; +import com.bang_ggood.user.domain.User; +import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; + class ChecklistServiceTest extends IntegrationTestSupport { @Autowired @@ -109,16 +115,16 @@ void readChecklistQuestions() { @Test void readChecklistById() { // given - roomRepository.save(RoomFixture.ROOM); + roomRepository.save(RoomFixture.ROOM_1); checklistRepository.save(ChecklistFixture.checklist); // when - WrittenChecklistResponse writtenChecklistResponse = checklistService.readChecklistById(1L); + SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(1L); // then - Assertions.assertAll( - () -> assertThat(writtenChecklistResponse.room().name()).isEqualTo("살기 좋은 방"), - () -> assertThat(writtenChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + assertAll( + () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("살기 좋은 방"), + () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") ); } @@ -131,71 +137,71 @@ void readChecklistById_invalidChecklistId_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } - /*@DisplayName("체크리스트 리스트 조회 성공") - @Test - void readUserChecklistsPreview() { - // given - User user = new User(1L, "방방이"); - Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); - Checklist checklist = createChecklist(user, room); - List questions = List.of( - new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), - new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.GOOD), - new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.GOOD), - new ChecklistQuestion(checklist, Question.CLEAN_4, null), - new ChecklistQuestion(checklist, Question.CLEAN_5, null)); - - roomRepository.save(room); - checklistRepository.save(checklist); - checklistQuestionRepository.saveAll(questions); - - // when - UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); - - // then - UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); - assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); - assertThat(previewResponse1.badge()) - .containsExactlyInAnyOrder(new BadgeResponse( - Badge.CLEAN.getShortNameWithEmoji(), - Badge.CLEAN.getLongNameWithEmoji())); - } - - @DisplayName("체크리스트 리스트 조회 성공 : 뱃지가 존재하지 않을 때") - @Test - void readUserChecklistsPreview_NoBadge() { - // given - User user = new User(1L, "방방이"); //TODO 리팩토링 필요 - Room room = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); - Checklist checklist = createChecklist(user, room); - List questions = List.of( - new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), - new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.BAD), - new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.BAD), - new ChecklistQuestion(checklist, Question.CLEAN_4, null), - new ChecklistQuestion(checklist, Question.CLEAN_5, null)); - - roomRepository.save(room); - checklistRepository.save(checklist); - checklistQuestionRepository.saveAll(questions); - - // when - UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); - - // then - UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); - assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); - assertThat(previewResponse1.badge()).isEmpty(); - }*/ - - /*@DisplayName("체크리스트 비교 성공") +// @DisplayName("체크리스트 리스트 조회 성공") +// @Test +// void readUserChecklistsPreview() { +// // given +// User user = new User(1L, "방방이"); +// Room room = RoomFixture.ROOM_1; +// Checklist checklist = createChecklist(user, room); +// List questions = List.of( +// new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_4, null), +// new ChecklistQuestion(checklist, Question.CLEAN_5, null)); +// +// roomRepository.save(room); +// checklistRepository.save(checklist); +// checklistQuestionRepository.saveAll(questions); +// +// // when +// UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); +// +// // then +// UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); +// assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); +// assertThat(previewResponse1.badge()) +// .containsExactlyInAnyOrder(new BadgeResponse( +// Badge.CLEAN.getShortNameWithEmoji(), +// Badge.CLEAN.getLongNameWithEmoji())); +// } +// +// @DisplayName("체크리스트 리스트 조회 성공 : 뱃지가 존재하지 않을 때") +// @Test +// void readUserChecklistsPreview_NoBadge() { +// // given +// User user = new User(1L, "방방이"); //TODO 리팩토링 필요 +// Room room = RoomFixture.ROOM_1; +// Checklist checklist = createChecklist(user, room); +// List questions = List.of( +// new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.BAD), +// new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.BAD), +// new ChecklistQuestion(checklist, Question.CLEAN_4, null), +// new ChecklistQuestion(checklist, Question.CLEAN_5, null)); +// +// roomRepository.save(room); +// checklistRepository.save(checklist); +// checklistQuestionRepository.saveAll(questions); +// +// // when +// UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); +// +// // then +// UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); +// assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); +// assertThat(previewResponse1.badge()).isEmpty(); +// } + + @DisplayName("체크리스트 비교 성공") @Test void readChecklistsComparison() { // given User user = new User(1L, "방방이"); - Room room1 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); - Room room2 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); - Room room3 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room1 = RoomFixture.ROOM_1; + Room room2 = RoomFixture.ROOM_2; + Room room3 = RoomFixture.ROOM_3; Checklist checklist1 = createChecklist(user, room1); Checklist checklist2 = createChecklist(user, room2); Checklist checklist3 = createChecklist(user, room3); @@ -229,9 +235,9 @@ void readChecklistsComparison_invalidIdCount() { void readChecklistsComparison_invalidId() { // given User user = new User(1L, "방방이"); - Room room1 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); - Room room2 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); - Room room3 = new Room("살기 좋은 방", 3, "서울시 도봉구", "잠실", 10); + Room room1 = RoomFixture.ROOM_1; + Room room2 = RoomFixture.ROOM_2; + Room room3 = RoomFixture.ROOM_3; Checklist checklist1 = createChecklist(user, room1); Checklist checklist2 = createChecklist(user, room2); Checklist checklist3 = createChecklist(user, room3); @@ -249,5 +255,5 @@ void readChecklistsComparison_invalidId() { public static Checklist createChecklist(User user, Room room) { return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); - }*/ + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index cdf20aa52..4bad52d8c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -8,20 +8,30 @@ public class RoomFixture { - public static final Room ROOM = new Room( - "살기 좋은 방", "잠실", 10, "인천광역시 부평구", - Type.VILLA, 10, 5, FloorLevel.GROUND, Structure.TWO_ROOM + public static final Room ROOM_1 = new Room( + "살기 좋은 방", "부개역", 10, "인천광역시 부평구", + Type.APARTMENT, 33, 3, FloorLevel.GROUND, Structure.TWO_ROOM + ); + + public static final Room ROOM_2 = new Room( + "살기 싫은 방", "대구역", 10, "대구광역시 중구", + Type.OFFICETEL, 44, null, FloorLevel.BASEMENT, Structure.DIVIDED_ONE_ROOM + ); + + public static final Room ROOM_3 = new Room( + "살기 애매한 방", "잠실역", 5, "서울특별시 송파구", + Type.VILLA, 55, null, FloorLevel.ROOFTOP, Structure.DUPLEX ); public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( - "방이름", 1000, 50, 12, - "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", - "아파트", "분리형 원룸", 8, 4, "지상" + "방이름", 1000, 50, 12, "부산광역시 루터회관", + "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), + Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() ); public static final RoomCreateRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomCreateRequest( - null, 1000, 50, 12, - "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", - "아파트", "분리형 원룸", 8, 4, "지상" + null, 1000, 50, 12, "부산광역시 루터회관", + "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), + Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java index 72c427cb5..43bffd34b 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java @@ -31,5 +31,4 @@ void from_invalidFloorLevel_exception() { .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.FLOOR_LEVEL_INVALID.getMessage()); } - } From ad439d0a628fac1f4b09fae9554a49dc4e361084 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Thu, 1 Aug 2024 16:36:04 +0900 Subject: [PATCH 123/348] =?UTF-8?q?[BE]=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EA=B5=AC=ED=98=84?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20=20(#191)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Co-authored-by: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Co-authored-by: tkdgur0906 Co-authored-by: tsulocalize --- .../main/java/com/bang_ggood/BaseEntity.java | 6 ++ .../controller/ChecklistController.java | 11 +++- .../domain/CustomChecklistQuestion.java | 46 +++++++++++++ .../request/CustomChecklistUpdateRequest.java | 6 ++ .../CustomChecklistQuestionRepository.java | 19 ++++++ .../checklist/service/ChecklistService.java | 65 +++++++++++++++---- .../bang_ggood/exception/ExceptionCode.java | 4 +- .../java/com/bang_ggood/user/domain/User.java | 4 ++ .../bang-ggood/src/main/resources/data.sql | 17 ++++- .../bang-ggood/src/main/resources/schema.sql | 43 ++++++++---- .../checklist/CustomChecklistFixture.java | 20 ++++++ .../controller/ChecklistE2ETest.java | 22 ++++++- .../service/ChecklistServiceTest.java | 62 +++++++++++++++++- .../src/test/resources/data-test.sql | 17 ++++- .../src/test/resources/schema-test.sql | 25 +++++-- 15 files changed, 327 insertions(+), 40 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/CustomChecklistQuestion.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/CustomChecklistUpdateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java index e97c6b62c..5e85375c5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java @@ -17,6 +17,8 @@ public abstract class BaseEntity { @LastModifiedDate private LocalDateTime modifiedAt; + private boolean deleted = false; + public LocalDateTime getCreatedAt() { return createdAt; } @@ -24,4 +26,8 @@ public LocalDateTime getCreatedAt() { public LocalDateTime getModifiedAt() { return modifiedAt; } + + public boolean isDeleted() { + return deleted; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index dcca3f73f..6553639c6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,6 +1,7 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; @@ -14,9 +15,11 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.RequestParam; + @RestController public class ChecklistController { @@ -54,4 +57,10 @@ public ResponseEntity readChecklistsComparison( @RequestParam("id") List checklistIds) { return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); } + + @PutMapping("/custom-checklist") + public ResponseEntity updateCustomChecklist(@RequestBody CustomChecklistUpdateRequest request) { + checklistService.updateCustomChecklist(request); + return ResponseEntity.noContent().build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/CustomChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/CustomChecklistQuestion.java new file mode 100644 index 000000000..ea6b03c29 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/CustomChecklistQuestion.java @@ -0,0 +1,46 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.BaseEntity; +import com.bang_ggood.user.domain.User; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; + +@Entity +public class CustomChecklistQuestion extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private User user; + + @Enumerated(EnumType.STRING) + private Question question; + + public CustomChecklistQuestion(User user, Question question) { + this.user = user; + this.question = question; + } + + protected CustomChecklistQuestion() { + } + + public Long getId() { + return id; + } + + public User getUser() { + return user; + } + + public Question getQuestion() { + return question; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/CustomChecklistUpdateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/CustomChecklistUpdateRequest.java new file mode 100644 index 000000000..666556356 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/CustomChecklistUpdateRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto.request; + +import java.util.List; + +public record CustomChecklistUpdateRequest(List questionIds) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java new file mode 100644 index 000000000..c2c94cd89 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java @@ -0,0 +1,19 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.user.domain.User; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; + +public interface CustomChecklistQuestionRepository extends JpaRepository { + + @Query("SELECT c FROM CustomChecklistQuestion c WHERE c.user.id = :#{#user.id} AND c.deleted = false " ) + List findByUser(@Param("user") User user); + + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Query("UPDATE CustomChecklistQuestion SET deleted = true WHERE user.id = :#{#user.id}") + void deleteAllByUser(@Param("user") User user); +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index a5f1f3c36..606e31301 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -8,11 +8,13 @@ import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.ChecklistScore; +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.request.ChecklistInfo; +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; import com.bang_ggood.checklist.dto.response.BadgeResponse; import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; @@ -28,21 +30,22 @@ import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.dto.response.SelectedRoomResponse; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; -import java.util.ArrayList; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; import java.util.Comparator; import java.util.HashSet; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; @Service public class ChecklistService { @@ -51,14 +54,17 @@ public class ChecklistService { private final RoomRepository roomRepository; private final ChecklistOptionRepository checklistOptionRepository; private final ChecklistQuestionRepository checklistQuestionRepository; + private final CustomChecklistQuestionRepository customChecklistQuestionRepository; public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, ChecklistOptionRepository checklistOptionRepository, - ChecklistQuestionRepository checklistQuestionRepository) { + ChecklistQuestionRepository checklistQuestionRepository, + CustomChecklistQuestionRepository customChecklistQuestionRepository) { this.checklistRepository = checklistRepository; this.roomRepository = roomRepository; this.checklistOptionRepository = checklistOptionRepository; this.checklistQuestionRepository = checklistQuestionRepository; + this.customChecklistQuestionRepository = customChecklistQuestionRepository; } @Transactional @@ -120,14 +126,21 @@ private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequ @Transactional public ChecklistQuestionsResponse readChecklistQuestions() { - List categoryQuestionsResponses = new ArrayList<>(); - for (Category category : Category.values()) { - List questionsByCategory = Question.findQuestionsByCategory(category) - .stream() - .map(QuestionResponse::of) - .toList(); - categoryQuestionsResponses.add(CategoryQuestionsResponse.of(category, questionsByCategory)); - } + User user = new User(1L, "방방이"); + List customChecklistQuestions = customChecklistQuestionRepository.findByUser(user); + + Map> categoryQuestions = customChecklistQuestions.stream() + .map(CustomChecklistQuestion::getQuestion) + .collect(Collectors.groupingBy(Question::getCategory)); + + List categoryQuestionsResponses = categoryQuestions.entrySet().stream() + .map(categoryQuestionEntry -> CategoryQuestionsResponse.of( + categoryQuestionEntry.getKey(), + categoryQuestionEntry.getValue().stream() + .map(QuestionResponse::of) + .toList())) + .toList(); + return new ChecklistQuestionsResponse(categoryQuestionsResponses); } @@ -270,4 +283,32 @@ private List getCategoryScores(List questions) { return ChecklistScore.calculateTotalScore(questions); } + + @Transactional + public void updateCustomChecklist(CustomChecklistUpdateRequest request) { + List questionIds = request.questionIds(); + validateCustomChecklistQuestionsIsNotEmpty(questionIds); + validateCustomChecklistQuestionsDuplication(questionIds); + + User user = new User(1L, "방방이"); + customChecklistQuestionRepository.deleteAllByUser(user); + + List customChecklistQuestions = questionIds.stream() + .map(Question::fromId) + .map(question -> new CustomChecklistQuestion(user, question)) + .toList(); + customChecklistQuestionRepository.saveAll(customChecklistQuestions); + } + + private void validateCustomChecklistQuestionsIsNotEmpty(List questionIds) { + if (questionIds.isEmpty()) { + throw new BangggoodException(ExceptionCode.CUSTOM_CHECKLIST_QUESTION_EMPTY); + } + } + + private void validateCustomChecklistQuestionsDuplication(List questionIds) { + if (questionIds.size() != Set.copyOf(questionIds).size()) { + throw new BangggoodException(ExceptionCode.QUESTION_DUPLICATED); + } + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 6dff00f7d..80c10e7ee 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -30,6 +30,9 @@ public enum ExceptionCode { CHECKLIST_COMPARISON_INVALID_COUNT(HttpStatus.BAD_REQUEST, "비교할 체크리스트 개수가 유효하지 않습니다."), CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), + // CustomChecklist + CUSTOM_CHECKLIST_QUESTION_EMPTY(HttpStatus.BAD_REQUEST, "커스텀 질문 개수가 유효하지 않습니다."), + // Type TYPE_INVALID(HttpStatus.BAD_REQUEST, "타입이 유효하지 않습니다."), @@ -42,7 +45,6 @@ public enum ExceptionCode { // Room ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."); - private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index a7b90b10d..0bb5c85b9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -32,6 +32,10 @@ public User(String name) { protected User() { } + public Long getId() { + return id; + } + @Override public boolean equals(Object o) { if (this == o) { diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 31aaed9e4..c08131483 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -1,2 +1,15 @@ -INSERT INTO users(id, name, created_at, modified_at) -VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); +INSERT INTO users(id, name, created_at, modified_at, deleted) +VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); + +INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) +VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 9232e26dc..f7456c8de 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -4,6 +4,7 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; +DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS category_priority CASCADE; -- Create tables @@ -20,9 +21,8 @@ CREATE TABLE room floor_level VARCHAR(255), structure VARCHAR(255), created_at TIMESTAMP(6), - modified_at TIMESTAMP(6) - - + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE users @@ -30,7 +30,8 @@ CREATE TABLE users id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, name VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), - modified_at TIMESTAMP(6) + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE checklist @@ -44,40 +45,54 @@ CREATE TABLE checklist room_id BIGINT NOT NULL UNIQUE, user_id BIGINT NOT NULL, real_estate VARCHAR(255), + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); -CREATE TABLE checklist_option +CREATE TABLE checklist_question ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - option_id INTEGER NOT NULL, - checklist_id BIGINT NOT NULL, + question VARCHAR(255) NOT NULL, + checklist_id BIGINT NOT NULL, + grade VARCHAR(255), + memo VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE checklist_question +CREATE TABLE checklist_option ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question VARCHAR(255) NOT NULL, - checklist_id BIGINT NOT NULL, - grade VARCHAR(255), - memo VARCHAR(255), + option_id INTEGER NOT NULL, + checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); - -CREATE TABLE category_priority +CREATE TABLE if not exists category_priority ( id bigint generated by default as identity, category_id INTEGER not null, user_id bigint not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, + deleted BOOLEAN, primary key (id), foreign key (user_id) references users ); + +CREATE TABLE custom_checklist_question +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (user_id) references users +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java new file mode 100644 index 000000000..b1ea113b0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java @@ -0,0 +1,20 @@ +package com.bang_ggood.checklist; + +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; +import java.util.ArrayList; +import java.util.List; + +public class CustomChecklistFixture { + + public static CustomChecklistUpdateRequest CUSTOM_CHECKLIST_UPDATE_REQUEST = + new CustomChecklistUpdateRequest(List.of(1, 3, 5, 7, 8, 11, 15, 30)); + + public static CustomChecklistUpdateRequest CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY = + new CustomChecklistUpdateRequest(new ArrayList<>()); + + public static CustomChecklistUpdateRequest CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED = + new CustomChecklistUpdateRequest(List.of(1, 1, 1)); + + public static CustomChecklistUpdateRequest CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID = + new CustomChecklistUpdateRequest(List.of(99999)); +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 43067a4bc..fdd116be9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -16,6 +16,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + import static org.assertj.core.api.Assertions.assertThat; public class ChecklistE2ETest extends AcceptanceTest { @@ -68,8 +72,8 @@ void readChecklistQuestions() { .statusCode(200) .extract() .as(ChecklistQuestionsResponse.class); - - assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); + // Category.OPTION does not have default question + assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); } @DisplayName("작성된 체크리스트 조회 성공") @@ -92,4 +96,18 @@ void readChecklistById() { () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") ); } + + @DisplayName("커스텀 체크리스트 업데이트 성공") + @Test + void updateCustomChecklist() { + Map> params = new HashMap<>(); + params.put("questionIds", List.of(1, 3, 5, 7, 9, 14, 21, 30)); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(params) + .when().put("/custom-checklist") + .then().log().all() + .statusCode(204); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 82010ce69..46aae9ed0 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -4,12 +4,14 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; @@ -21,6 +23,10 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; +import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; +import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; +import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -40,6 +46,8 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private RoomRepository roomRepository; + @Autowired + private CustomChecklistQuestionRepository customChecklistQuestionRepository; @DisplayName("체크리스트 방 정보 작성 성공") @@ -107,8 +115,8 @@ void readChecklistQuestions() { // given & when ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(); - // then - assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length); + // then // Category.OPTION does not have default question + assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); } @DisplayName("작성된 체크리스트 조회 성공") @@ -253,6 +261,56 @@ void readChecklistsComparison_invalidId() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + @DisplayName("커스텀 체크리스트 업데이트 성공") + @Test + void updateCustomChecklist() { + // given + CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST; + + // when + checklistService.updateCustomChecklist(request); + + // then + assertThat(customChecklistQuestionRepository.findByUser(new User(1L, "방방이"))) + .hasSize(request.questionIds().size()); + } + + @DisplayName("커스텀 체크리스트 업데이트 실패 : 선택한 질문 개수가 0개일 때") + @Test + void updateCustomChecklist_empty_exception() { + // given + CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; + + // when & then + assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CUSTOM_CHECKLIST_QUESTION_EMPTY.getMessage()); + } + + @DisplayName("커스텀 체크리스트 업데이트 실패 : 질문이 중복될 때") + @Test + void updateCustomChecklist_duplicatedQuestion_exception() { + // given + CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; + + // when & then + assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); + } + + @DisplayName("커스텀 체크리스트 업데이트 실패 : 질문 id가 유효하지 않을 때") + @Test + void updateCustomChecklist_invalidQuestionId_exception() { + // given + CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; + + // when & then + assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); + } + public static Checklist createChecklist(User user, Room room) { return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); } diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index 31aaed9e4..c08131483 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -1,2 +1,15 @@ -INSERT INTO users(id, name, created_at, modified_at) -VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42'); +INSERT INTO users(id, name, created_at, modified_at, deleted) +VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); + +INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) +VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 2e6e48886..ee70c75da 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -6,6 +6,7 @@ DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS category_priority CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; +DROP TABLE IF EXISTS custom_checklist_question CASCADE; -- Create tables CREATE TABLE room @@ -21,9 +22,8 @@ CREATE TABLE room floor_level VARCHAR(255), structure VARCHAR(255), created_at TIMESTAMP(6), - modified_at TIMESTAMP(6) - - + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE users @@ -31,7 +31,8 @@ CREATE TABLE users id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, name VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), - modified_at TIMESTAMP(6) + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE checklist @@ -45,6 +46,7 @@ CREATE TABLE checklist room_id BIGINT NOT NULL UNIQUE, user_id BIGINT NOT NULL, real_estate VARCHAR(255), + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); @@ -56,6 +58,7 @@ CREATE TABLE checklist_option checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); @@ -68,6 +71,7 @@ CREATE TABLE checklist_question memo VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); @@ -79,6 +83,7 @@ CREATE TABLE category_priority user_id bigint not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, + deleted BOOLEAN, primary key (id), foreign key (user_id) references users ); @@ -90,5 +95,17 @@ CREATE TABLE test_entity name varchar(255) not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, + deleted BOOLEAN, primary key (id) ); + +CREATE TABLE custom_checklist_question +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (user_id) references users +); From 85d69274389cff1dd03be48e652a89b61871948a Mon Sep 17 00:00:00 2001 From: Hyelim Choi <74346290+healim01@users.noreply.github.com> Date: Fri, 2 Aug 2024 14:34:00 +0900 Subject: [PATCH 124/348] =?UTF-8?q?docs:=20=EB=B0=A9=EB=81=97=20=EC=86=8C?= =?UTF-8?q?=EA=B0=9C=EA=B8=80=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 000000000..4f4badeb3 --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +# 방끗; 방 구하기 끗, 그래서 방긋 :) + +![방방이배너](https://github.com/user-attachments/assets/d8615115-6a82-444b-bbb4-2c03a554884e) + +새 출발을 위해 새집을 구해야 하는 당신! +방을 구한 경험과 지식이 부족한 자취 초보라면, 어떻게 방을 구해야 할지 막막할지도 몰라요. + +방을 보는 시간은 **단 10분!** + +“어디서부터 봐야 하지? 무엇을 봐야 되지?” +”내 눈에는 다 좋아보이는데?” +”방금 봤던 집들을 다 기억하기 힘든데.." + +**방끗**은 이런 고민하는 자취 초보들을 위해, +❗️ 방을 둘러볼 때 깜빡할 수 있는, 유심히 살펴봐야 할 것들을 **체크리스트**로 알려 드려요. +❗️ 여러분이 중요하게 생각하는 **질문만 모아**서 나만의 체크리스트를 만들 수 있어요. +❗️ 여러 방을 돌아보며 작성했던 체크리스트들을 비교하여 여러분에게 **최적의 방을 추천**해드려요. + +나만의 체크리스트로 최적의 방을 찾아 나가는 과정, 방끗이 함께할게요. +자취방에서 방긋 웃을 수 있게, 방끗을 사용해 보세요! ☺️ From bb116c9e98cf84c3b8ff1d252b20b82da4d40e57 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Fri, 2 Aug 2024 16:02:27 +0900 Subject: [PATCH 125/348] =?UTF-8?q?[BE]=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?= =?UTF-8?q?=EC=84=9C=EB=B2=84=EB=A1=9C=EB=B6=80=ED=84=B0=20=EC=82=AC?= =?UTF-8?q?=EC=9A=A9=EC=9E=90=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EA=B0=80?= =?UTF-8?q?=EC=A0=B8=EC=98=A8=EB=8B=A4.=20(#198)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/config/OauthClientConfig.java | 17 +++++ .../bang_ggood/exception/ExceptionCode.java | 5 +- .../bang_ggood/exception/OauthException.java | 16 +++++ .../{ => dto}/ExceptionResponse.java | 2 +- .../exception/dto/OauthExceptionResponse.java | 4 ++ .../GlobalExceptionHandler.java | 12 +++- .../handler/OauthClientExceptionHandler.java | 42 ++++++++++++ .../user/controller/UserController.java | 21 ++++++ .../user/dto/request/OauthLoginRequest.java | 4 ++ .../user/dto/request/OauthTokenRequest.java | 10 +++ .../dto/response/KakaoAccountResponse.java | 7 ++ .../user/dto/response/OauthInfoResponse.java | 7 ++ .../user/dto/response/OauthTokenResponse.java | 9 +++ .../user/dto/response/ProfileResponse.java | 7 ++ .../bang_ggood/user/service/OauthClient.java | 66 +++++++++++++++++++ .../bang_ggood/user/service/UserService.java | 18 +++++ 16 files changed, 244 insertions(+), 3 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/config/OauthClientConfig.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/exception/OauthException.java rename backend/bang-ggood/src/main/java/com/bang_ggood/exception/{ => dto}/ExceptionResponse.java (69%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/OauthExceptionResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{exception => handler}/GlobalExceptionHandler.java (80%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/handler/OauthClientExceptionHandler.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/OauthClientConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/OauthClientConfig.java new file mode 100644 index 000000000..8bde523e4 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/OauthClientConfig.java @@ -0,0 +1,17 @@ +package com.bang_ggood.config; + +import com.bang_ggood.handler.OauthClientExceptionHandler; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.client.RestClient; + +@Configuration +public class OauthClientConfig { + + @Bean + RestClient restClient(OauthClientExceptionHandler handler) { + return RestClient.builder() + .defaultStatusHandler(handler) + .build(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 80c10e7ee..b2da0ea4f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -43,7 +43,10 @@ public enum ExceptionCode { STRUCTURE_INVALID(HttpStatus.BAD_REQUEST, "방 구조가 유효하지 않습니다."), // Room - ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."); + ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."), + + // Auth + OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "토큰을 요청하는 과정에서 예상치 못한 예외가 발생했습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/OauthException.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/OauthException.java new file mode 100644 index 000000000..bc4d89314 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/OauthException.java @@ -0,0 +1,16 @@ +package com.bang_ggood.exception; + +import com.bang_ggood.exception.dto.OauthExceptionResponse; + +public class OauthException extends RuntimeException { + + private OauthExceptionResponse response; + + public OauthException(OauthExceptionResponse response) { + this.response = response; + } + + public OauthExceptionResponse getResponse() { + return response; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/ExceptionResponse.java similarity index 69% rename from backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/ExceptionResponse.java index bc85a8e72..f23bfa212 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/ExceptionResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.exception; +package com.bang_ggood.exception.dto; public record ExceptionResponse(String httpMethod, String path, String message) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/OauthExceptionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/OauthExceptionResponse.java new file mode 100644 index 000000000..cdfab8cdd --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/dto/OauthExceptionResponse.java @@ -0,0 +1,4 @@ +package com.bang_ggood.exception.dto; + +public record OauthExceptionResponse(String error, String error_description, String error_code) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java similarity index 80% rename from backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java index 7188ac05f..df30e69df 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java @@ -1,5 +1,9 @@ -package com.bang_ggood.exception; +package com.bang_ggood.handler; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.dto.ExceptionResponse; +import com.bang_ggood.exception.OauthException; +import com.bang_ggood.exception.dto.OauthExceptionResponse; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -45,4 +49,10 @@ public ResponseEntity handleMethodArgumentNotValidException( return ResponseEntity.status(HttpStatus.BAD_REQUEST) .body(response); } + + @ExceptionHandler(OauthException.class) + public ResponseEntity handleOauthException(OauthException exception) { + return ResponseEntity.status(HttpStatus.BAD_REQUEST) + .body(exception.getResponse()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/OauthClientExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/OauthClientExceptionHandler.java new file mode 100644 index 000000000..5ff363f20 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/OauthClientExceptionHandler.java @@ -0,0 +1,42 @@ +package com.bang_ggood.handler; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.exception.OauthException; +import com.bang_ggood.exception.dto.OauthExceptionResponse; +import com.fasterxml.jackson.databind.DeserializationFeature; +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.http.client.ClientHttpResponse; +import org.springframework.stereotype.Component; +import org.springframework.web.client.ResponseErrorHandler; +import java.io.IOException; + +@Component +public class OauthClientExceptionHandler implements ResponseErrorHandler { + + @Override + public boolean hasError(ClientHttpResponse response) { + try { + return response.getStatusCode().is4xxClientError(); + } catch (IOException exception) { + throw new BangggoodException(ExceptionCode.OAUTH_TOKEN_INTERNAL_EXCEPTION); + } + } + + @Override + public void handleError(ClientHttpResponse response) { + throw new OauthException(getResponseBody(response)); + } + + private OauthExceptionResponse getResponseBody(ClientHttpResponse response) { + try { + ObjectMapper objectMapper = new ObjectMapper(); + + return objectMapper + .configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false) + .readValue(response.getBody(), OauthExceptionResponse.class); + } catch (IOException exception) { + throw new BangggoodException(ExceptionCode.OAUTH_TOKEN_INTERNAL_EXCEPTION); + } + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java new file mode 100644 index 000000000..5704e1c5a --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java @@ -0,0 +1,21 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.user.dto.request.OauthLoginRequest; +import com.bang_ggood.user.service.UserService; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + + private final UserService userService; + + public UserController(UserService userService) { + this.userService = userService; + } + + @PostMapping("/oauth/login") + public void login(OauthLoginRequest request) { + userService.login(request); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java new file mode 100644 index 000000000..1ca5d7c1e --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java @@ -0,0 +1,4 @@ +package com.bang_ggood.user.dto.request; + +public record OauthLoginRequest(String code) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java new file mode 100644 index 000000000..9c9be194c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java @@ -0,0 +1,10 @@ +package com.bang_ggood.user.dto.request; + +public record OauthTokenRequest(String grantType, String clientId, + String redirectUri, String code, String clientSecret) { + + public static OauthTokenRequest of(String grantType, String clientId, + String redirectUri, String code, String clientSecret) { + return new OauthTokenRequest(grantType, clientId, redirectUri, code, clientSecret); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java new file mode 100644 index 000000000..7f974b5d5 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.user.dto.response; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public record KakaoAccountResponse(String email, String name, ProfileResponse profile) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java new file mode 100644 index 000000000..9491bff3a --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.user.dto.response; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public record OauthInfoResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java new file mode 100644 index 000000000..01875b77d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java @@ -0,0 +1,9 @@ +package com.bang_ggood.user.dto.response; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public record OauthTokenResponse(String token_type, String access_token, + String expires_in, String refresh_token, + String refresh_token_expires_in, String scope) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java new file mode 100644 index 000000000..93ef6877d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.user.dto.response; + +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public record ProfileResponse(String nickname, String thumbnail_image_url, String profile_image_url) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java new file mode 100644 index 000000000..4a97d848b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java @@ -0,0 +1,66 @@ +package com.bang_ggood.user.service; + +import com.bang_ggood.user.dto.request.OauthLoginRequest; +import com.bang_ggood.user.dto.response.OauthInfoResponse; +import com.bang_ggood.user.dto.response.OauthTokenResponse; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Component; +import org.springframework.util.LinkedMultiValueMap; +import org.springframework.util.MultiValueMap; +import org.springframework.web.client.RestClient; + +@Component +public class OauthClient { + + private final RestClient restClient; + private final String tokenRequestUri; + private final String userInfoRequestUri; + private final String grantType; + private final String clientId; + private final String clientSecret; + private final String redirectUri; + + public OauthClient( + RestClient restClient, + @Value("${kakao.token_post_uri}") String tokenRequestUri, + @Value("${kakao.user_get_uri}") String userInfoRequestUri, + @Value("${kakao.grant_type}") String grantType, + @Value("${kakao.client_id}") String clientId, + @Value("${kakao.redirect_uri}")String redirectUrl, + @Value("${kakao.client_secret}")String clientSecret) { + this.restClient = restClient; + this.tokenRequestUri = tokenRequestUri; + this.userInfoRequestUri = userInfoRequestUri; + this.grantType = grantType; + this.clientId = clientId; + this.redirectUri = redirectUrl; + this.clientSecret = clientSecret; + } + + public OauthInfoResponse requestOauthInfo(OauthLoginRequest request) { + OauthTokenResponse oauthTokenResponse = requestToken(request); + + return restClient.get() + .uri(userInfoRequestUri) + .header("Authorization", "Bearer " + oauthTokenResponse.access_token()) + .retrieve() + .body(OauthInfoResponse.class); + } + + private OauthTokenResponse requestToken(OauthLoginRequest request) { + MultiValueMap map = new LinkedMultiValueMap<>(); + map.add("grant_type", grantType); + map.add("client_id", clientId); + map.add("redirect_uri", redirectUri); + map.add("code", request.code()); + map.add("client_secret", clientSecret); + + return restClient.post() + .uri(tokenRequestUri) + .contentType(MediaType.APPLICATION_FORM_URLENCODED) + .body(map) + .retrieve() + .body(OauthTokenResponse.class); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java new file mode 100644 index 000000000..dc47bfde6 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java @@ -0,0 +1,18 @@ +package com.bang_ggood.user.service; + +import com.bang_ggood.user.dto.request.OauthLoginRequest; +import org.springframework.stereotype.Service; + +@Service +public class UserService { + + private final OauthClient oauthClient; + + public UserService(OauthClient oauthClient) { + this.oauthClient = oauthClient; + } + + public void login(OauthLoginRequest request) { + oauthClient.requestOauthInfo(request); + } +} From 53d4d5ec5f5f6b9f39915b9277d4133e7c369ea1 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Sun, 4 Aug 2024 22:55:34 -0700 Subject: [PATCH 126/348] =?UTF-8?q?[BE]=20=EB=B1=83=EC=A7=80=20=EC=95=84?= =?UTF-8?q?=EC=9D=B4=EB=94=94=EB=A5=BC=20=EC=B6=94=EA=B0=80=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20=20(#216)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../com/bang_ggood/category/domain/Badge.java | 24 ++++++++++++------- .../checklist/dto/response/BadgeResponse.java | 4 ++-- 2 files changed, 17 insertions(+), 11 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java index 9cf21928c..b592d2704 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -2,26 +2,32 @@ public enum Badge { - CLEAN("청결", "청결해요", "✨"), - ROOM_CONDITION("방 컨디션", "방 컨디션이 좋아요", "🏠"), - AMENITY("편의시설", "편의시설이 많아요", "🚇"), - OPTION("옵션", "옵션이 많아요", "🛋️"), - ENVIRONMENT("주거환경", "주거환경이 좋아요", "🌱"), - SECURITY("보안", "안전해요", "🔒"), - ECONOMIC("경제적", "경제적이에요", "💰"), - NONE("", "", ""); + CLEAN(1, "청결", "청결해요", "✨"), + ROOM_CONDITION(2, "방 컨디션", "방 컨디션이 좋아요", "🏠"), + AMENITY(3, "편의시설", "편의시설이 많아요", "🚇"), + OPTION(4, "옵션", "옵션이 많아요", "🛋️"), + ENVIRONMENT(5, "주거환경", "주거환경이 좋아요", "🌱"), + SECURITY(6, "보안", "안전해요", "🔒"), + ECONOMIC(7, "경제적", "경제적이에요", "💰"), + NONE(8, "", "", ""); private static final String DESCRIPTION_FORMAT = "%s %s"; + private final Integer id; private final String shortName; private final String longName; private final String emoji; - Badge(String shortName, String longName, String emoji) { + Badge(Integer id, String shortName, String longName, String emoji) { + this.id = id; this.shortName = shortName; this.longName = longName; this.emoji = emoji; } + public Integer getId() { + return id; + } + public String getShortNameWithEmoji() { return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortName); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index 83d1f10cf..3323080fe 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -2,9 +2,9 @@ import com.bang_ggood.category.domain.Badge; -public record BadgeResponse(String shortName, String longName) { +public record BadgeResponse(Integer badgeId, String shortName, String longName) { public static BadgeResponse from(Badge badge) { - return new BadgeResponse(badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); + return new BadgeResponse(badge.getId(), badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); } } From 0c0de9e76447b1a67bba1dfd6b8987b058ad72c7 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 5 Aug 2024 15:29:20 +0900 Subject: [PATCH 127/348] =?UTF-8?q?[BE]=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85/=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=ED=9B=84=20=ED=86=A0?= =?UTF-8?q?=ED=81=B0=EC=9D=84=20=EB=B0=98=ED=99=98=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?212)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/build.gradle | 4 ++ .../category/service/CategoryService.java | 2 +- .../controller/ChecklistController.java | 8 +-- .../checklist/service/ChecklistService.java | 8 +-- .../user/controller/UserController.java | 18 +++++- .../java/com/bang_ggood/user/domain/User.java | 20 +++++- .../user/dto/request/OauthLoginRequest.java | 4 +- .../user/dto/response/OauthInfoResponse.java | 5 ++ .../user/repository/UserRepository.java | 3 + .../com/bang_ggood/user/service/AuthUser.java | 10 +++ .../user/service/JwtTokenProvider.java | 46 ++++++++++++++ .../bang_ggood/user/service/UserService.java | 18 +++++- .../bang-ggood/src/main/resources/data.sql | 4 +- .../bang-ggood/src/main/resources/schema.sql | 1 + .../bang_ggood/AcceptanceMockTestSupport.java | 26 ++++++++ .../checklist/ChecklistFixture.java | 2 +- .../service/ChecklistServiceTest.java | 10 +-- .../java/com/bang_ggood/user/UserFixture.java | 20 ++++++ .../user/controller/LoginMockE2ETest.java | 35 +++++++++++ .../user/controller/UserE2ETest.java | 22 +++++++ .../user/service/JwtTokenProviderTest.java | 33 ++++++++++ .../user/service/UserServiceTest.java | 62 +++++++++++++++++++ .../src/test/resources/data-test.sql | 4 +- .../src/test/resources/schema-test.sql | 1 + 24 files changed, 338 insertions(+), 28 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 543fff752..bce95f210 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -22,7 +22,11 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'io.jsonwebtoken:jjwt-api:0.11.2' + implementation 'io.jsonwebtoken:jjwt-impl:0.11.2' + implementation 'io.jsonwebtoken:jjwt-gson:0.11.2' runtimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'io.rest-assured:rest-assured:5.3.1' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index a3cb2aba5..3674af29b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -33,7 +33,7 @@ public CategoryService(CategoryPriorityRepository categoryPriorityRepository) { @Transactional public void createCategoriesPriority(CategoryPriorityCreateRequest request) { - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); validate(request); List categoryPriorities = request.categoryIds().stream() .map(id -> new CategoryPriority(id, user)) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 6553639c6..b253163fb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -9,16 +9,16 @@ import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; -import java.net.URI; -import java.util.List; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import java.net.URI; +import java.util.List; @RestController @@ -48,7 +48,7 @@ public ResponseEntity readChecklistById(@PathVariable @GetMapping("/checklists") public ResponseEntity readUserChecklistsPreview() { - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 606e31301..f002af66c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -72,7 +72,7 @@ public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); - Checklist checklist = new Checklist(new User(1L, "방방이"), room, checklistInfo.deposit(), checklistInfo.rent(), + Checklist checklist = new Checklist(new User(1L, "방방이", "bang-ggood@gmail.com"), room, checklistInfo.deposit(), checklistInfo.rent(), checklistInfo.contractTerm(), checklistInfo.realEstate()); checklistRepository.save(checklist); @@ -126,7 +126,7 @@ private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequ @Transactional public ChecklistQuestionsResponse readChecklistQuestions() { - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); List customChecklistQuestions = customChecklistQuestionRepository.findByUser(user); Map> categoryQuestions = customChecklistQuestions.stream() @@ -233,7 +233,7 @@ private List createBadges(List questions) { @Transactional public ChecklistsWithScoreReadResponse readChecklistsComparison(List checklistIds) { - User user = new User(1L, "방끗"); + User user = new User(1L, "방끗", "bang-ggood@gmail.com"); validateChecklistComparison(checklistIds); @@ -290,7 +290,7 @@ public void updateCustomChecklist(CustomChecklistUpdateRequest request) { validateCustomChecklistQuestionsIsNotEmpty(questionIds); validateCustomChecklistQuestionsDuplication(questionIds); - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); customChecklistQuestionRepository.deleteAllByUser(user); List customChecklistQuestions = questionIds.stream() diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java index 5704e1c5a..bf94bbc94 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java @@ -2,12 +2,18 @@ import com.bang_ggood.user.dto.request.OauthLoginRequest; import com.bang_ggood.user.service.UserService; +import jakarta.validation.Valid; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; +import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @RestController public class UserController { + public static final String TOKEN_COOKIE_NAME = "token"; private final UserService userService; public UserController(UserService userService) { @@ -15,7 +21,15 @@ public UserController(UserService userService) { } @PostMapping("/oauth/login") - public void login(OauthLoginRequest request) { - userService.login(request); + public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { + String token = userService.login(request); + + ResponseCookie cookie = ResponseCookie + .from(TOKEN_COOKIE_NAME, token) + .httpOnly(true) + .path("/") + .build(); + + return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index 0bb5c85b9..56c355ed8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -20,13 +20,18 @@ public class User extends BaseEntity { @Column(nullable = false) private String name; - public User(Long id, String name) { - this.id = id; + @Column(nullable = false) + private String email; + + public User(String name, String email) { this.name = name; + this.email = email; } - public User(String name) { + public User(Long id, String name, String email) { // TODO 테스트용 + this.id = id; this.name = name; + this.email = email; } protected User() { @@ -36,6 +41,14 @@ public Long getId() { return id; } + public String getName() { + return name; + } + + public String getEmail() { + return email; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -58,6 +71,7 @@ public String toString() { return "User{" + "id=" + id + ", name='" + name + '\'' + + ", email='" + email + '\'' + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java index 1ca5d7c1e..c108d4d0a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java @@ -1,4 +1,6 @@ package com.bang_ggood.user.dto.request; -public record OauthLoginRequest(String code) { +import jakarta.validation.constraints.NotBlank; + +public record OauthLoginRequest(@NotBlank(message = "인가 코드가 존재하지 않습니다.") String code) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java index 9491bff3a..fd88506e8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java @@ -1,7 +1,12 @@ package com.bang_ggood.user.dto.response; +import com.bang_ggood.user.domain.User; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) public record OauthInfoResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { + + public User toUserEntity() { + return new User(kakao_account.name(), kakao_account.email()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java index 65cadda49..596d66744 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java @@ -4,10 +4,13 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; public interface UserRepository extends JpaRepository { default User getUserById(Long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); } + + Optional findByEmail(String email); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java new file mode 100644 index 000000000..caa622bf5 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java @@ -0,0 +1,10 @@ +package com.bang_ggood.user.service; + +import jakarta.validation.constraints.NotNull; + +public record AuthUser(@NotNull Long id) { + + public static AuthUser from(Long id) { + return new AuthUser(id); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java new file mode 100644 index 000000000..f94f450a9 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java @@ -0,0 +1,46 @@ +package com.bang_ggood.user.service; + +import com.bang_ggood.user.domain.User; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import java.util.Date; + +@Component +public class JwtTokenProvider { + + private final String secretKey; + private final int tokenExpirationMills; + + public JwtTokenProvider( + @Value("${jwt.secret-key}") String secretKey, + @Value("${jwt.expiration-millis}") int tokenExpirationMills) { + this.secretKey = secretKey; + this.tokenExpirationMills = tokenExpirationMills; + } + + public String createToken(User user) { + Date now = new Date(); + Date expiredDate = new Date(now.getTime() + tokenExpirationMills); + + return Jwts.builder() + .setSubject(user.getId().toString()) + .setIssuedAt(now) + .setExpiration(expiredDate) + .signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) + .compact(); + } + + public AuthUser resolveToken(String token) { + Claims claims = Jwts.parserBuilder() + .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) + .build() + .parseClaimsJws(token) + .getBody(); + + Long id = Long.valueOf(claims.getSubject()); + return AuthUser.from(id); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java index dc47bfde6..903b1dc75 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java @@ -1,18 +1,30 @@ package com.bang_ggood.user.service; +import com.bang_ggood.user.domain.User; import com.bang_ggood.user.dto.request.OauthLoginRequest; +import com.bang_ggood.user.dto.response.OauthInfoResponse; +import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; @Service public class UserService { private final OauthClient oauthClient; + private final JwtTokenProvider jwtTokenProvider; + private final UserRepository userRepository; - public UserService(OauthClient oauthClient) { + public UserService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository) { this.oauthClient = oauthClient; + this.jwtTokenProvider = jwtTokenProvider; + this.userRepository = userRepository; } - public void login(OauthLoginRequest request) { - oauthClient.requestOauthInfo(request); + public String login(OauthLoginRequest request) { + OauthInfoResponse oauthInfoResponse = oauthClient.requestOauthInfo(request); + + User user = userRepository.findByEmail(oauthInfoResponse.kakao_account().email()) + .orElseGet(() -> userRepository.save(oauthInfoResponse.toUserEntity())); + + return jwtTokenProvider.createToken(user); } } diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index c08131483..80cd9ff39 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -1,5 +1,5 @@ -INSERT INTO users(id, name, created_at, modified_at, deleted) -VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +INSERT INTO users(id, name, email, created_at, modified_at, deleted) +VALUES (1, '방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f7456c8de..17fcfeac9 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -29,6 +29,7 @@ CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, name VARCHAR(255) NOT NULL, + email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java new file mode 100644 index 000000000..ad615ba89 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java @@ -0,0 +1,26 @@ +package com.bang_ggood; + +import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.web.servlet.MockMvc; + +@AutoConfigureMockMvc +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +public abstract class AcceptanceMockTestSupport { + + @Autowired + protected MockMvc mockMvc; + + @LocalServerPort + protected int port; + + @BeforeEach + void setPort() { + RestAssured.port = port; + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index dca95ec52..33f83da46 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -11,7 +11,7 @@ public class ChecklistFixture { public static final Checklist checklist = new Checklist( - new User(1L, "방방이"), + new User(1L, "방방이", "bang-ggood@gmail.com"), RoomFixture.ROOM_1, 1000, 50, 12, "방끗공인중개사" ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 46aae9ed0..3e7ec4df5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -4,8 +4,8 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; @@ -18,10 +18,10 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.domain.User; -import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; @@ -206,7 +206,7 @@ void readChecklistById_invalidChecklistId_exception() { @Test void readChecklistsComparison() { // given - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); Room room1 = RoomFixture.ROOM_1; Room room2 = RoomFixture.ROOM_2; Room room3 = RoomFixture.ROOM_3; @@ -242,7 +242,7 @@ void readChecklistsComparison_invalidIdCount() { @Test void readChecklistsComparison_invalidId() { // given - User user = new User(1L, "방방이"); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); Room room1 = RoomFixture.ROOM_1; Room room2 = RoomFixture.ROOM_2; Room room3 = RoomFixture.ROOM_3; @@ -271,7 +271,7 @@ void updateCustomChecklist() { checklistService.updateCustomChecklist(request); // then - assertThat(customChecklistQuestionRepository.findByUser(new User(1L, "방방이"))) + assertThat(customChecklistQuestionRepository.findByUser(new User(1L, "방방이", "bang-ggood@gmail.com"))) .hasSize(request.questionIds().size()); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java new file mode 100644 index 000000000..83e48c0e5 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -0,0 +1,20 @@ +package com.bang_ggood.user; + +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.dto.response.KakaoAccountResponse; +import com.bang_ggood.user.dto.response.OauthInfoResponse; +import com.bang_ggood.user.dto.response.ProfileResponse; + +public class UserFixture { + + public static final User USER1 = new User("방방이", "bang-bang@gmail.com"); + public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); + public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoResponse("", "", + new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), + new ProfileResponse("", "",""))); + + public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER2 = new OauthInfoResponse("", "", + new KakaoAccountResponse(USER2.getEmail(), USER2.getName(), + new ProfileResponse("", "",""))); + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java new file mode 100644 index 000000000..61a70ac06 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java @@ -0,0 +1,35 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.AcceptanceMockTestSupport; +import com.bang_ggood.user.dto.request.OauthLoginRequest; +import com.bang_ggood.user.service.UserService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; + +import static org.mockito.ArgumentMatchers.any; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +class LoginMockE2ETest extends AcceptanceMockTestSupport { + + @MockBean + UserService userService; + + @DisplayName("로그인 성공") + @Test + void login() throws Exception { + String testToken = "testToken"; + Mockito.when(userService.login(any(OauthLoginRequest.class))).thenReturn(testToken); + + mockMvc.perform(post("/oauth/login") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"code\":\"code\"}")) + .andExpect(status().isOk()) + .andExpect(header().string(HttpHeaders.SET_COOKIE, "token=" + testToken + "; Path=/; HttpOnly")); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java new file mode 100644 index 000000000..929cb3023 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -0,0 +1,22 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.user.dto.request.OauthLoginRequest; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +class UserE2ETest extends AcceptanceTest { + + @DisplayName("로그인 실패 : 인가코드가 없는 경우") + @Test + void login_code_notBlank_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(new OauthLoginRequest("")) + .when().post("/oauth/login") + .then().log().all() + .statusCode(400); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java new file mode 100644 index 000000000..ed28534ca --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java @@ -0,0 +1,33 @@ +package com.bang_ggood.user.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static com.bang_ggood.user.UserFixture.USER1; + +class JwtTokenProviderTest extends IntegrationTestSupport { + + @Autowired + private JwtTokenProvider jwtTokenProvider; + @Autowired + private UserRepository userRepository; + + @DisplayName("토큰 생성 성공") + @Test + void createToken() { + // given + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + + // when + AuthUser authUser = jwtTokenProvider.resolveToken(token); + + // then + Assertions.assertThat(authUser.id()).isEqualTo(user.getId()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java new file mode 100644 index 000000000..8fac2eb5f --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java @@ -0,0 +1,62 @@ +package com.bang_ggood.user.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.dto.request.OauthLoginRequest; +import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.MockBean; + +import static com.bang_ggood.user.UserFixture.USER1; +import static com.bang_ggood.user.UserFixture.OAUTH_INFO_RESPONSE_USER1; +import static org.mockito.ArgumentMatchers.any; + +@ExtendWith(MockitoExtension.class) +class UserServiceTest extends IntegrationTestSupport { + + @MockBean + private OauthClient oauthClient; + + @Autowired + private UserService userService; + + @Autowired + private UserRepository userRepository; + + private static final OauthLoginRequest oauthLoginRequest = new OauthLoginRequest("testCode"); + + @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") + @Test + void login_signup() { + // given + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) + .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER2); + + // when + String token = userService.login(oauthLoginRequest); + + // then + Assertions.assertThat(token).isNotBlank(); + } + + @DisplayName("로그인 성공 : 존재하는 회원이면 데이터베이스에 새로운 유저를 추가하지않고 토큰을 바로 반환한다.") + @Test + void login() { + // given + userRepository.save(USER1); + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) + .thenReturn(OAUTH_INFO_RESPONSE_USER1); + + // when + String token = userService.login(oauthLoginRequest); + + // then + Assertions.assertThat(token).isNotBlank(); + } +} diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index c08131483..44bcaa2fc 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -1,5 +1,5 @@ -INSERT INTO users(id, name, created_at, modified_at, deleted) -VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +INSERT INTO users(name, email, created_at, modified_at, deleted) +VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index ee70c75da..4348b96c5 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -30,6 +30,7 @@ CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, name VARCHAR(255) NOT NULL, + email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN From 26ca0a8c0a31a551069fa08fbc623c0ac22be98d Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 5 Aug 2024 16:24:02 +0900 Subject: [PATCH 128/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=82=AD=EC=A0=9C=20API=EB=A5=BC=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4=20(#204)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 7 ++ .../bang_ggood/checklist/domain/Grade.java | 1 + .../repository/ChecklistRepository.java | 24 ++++- .../checklist/service/ChecklistService.java | 9 ++ .../checklist/ChecklistFixture.java | 5 +- .../controller/ChecklistE2ETest.java | 13 +++ .../checklist/domain/QuestionTest.java | 4 +- .../repository/ChecklistRepositoryTest.java | 87 +++++++++++++++++++ .../service/ChecklistServiceTest.java | 25 +++++- 9 files changed, 164 insertions(+), 11 deletions(-) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index b253163fb..62c0e8b63 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -10,6 +10,7 @@ import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -63,4 +64,10 @@ public ResponseEntity updateCustomChecklist(@RequestBody CustomChecklistUp checklistService.updateCustomChecklist(request); return ResponseEntity.noContent().build(); } + + @DeleteMapping("/checklists/{id}") + public ResponseEntity deleteChecklistById(@PathVariable("id") long id) { + checklistService.deleteChecklistById(id); + return ResponseEntity.noContent().build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index 0905d06db..bc2687d54 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -10,6 +10,7 @@ public enum Grade { GOOD(3), SOSO(2), BAD(1), + NONE(0) ; private final int score; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 5db92f517..364774a48 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -5,6 +5,7 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.List; @@ -12,20 +13,35 @@ public interface ChecklistRepository extends JpaRepository { - //TODO 테스트해야 함 @Query("SELECT c FROM Checklist c " - + "JOIN FETCH Room r " - + "ON c.id = :id " - + "AND c.room.id = r.id") + + "JOIN FETCH c.room r " + + "WHERE c.id = :id " + + "AND c.room.id = r.id " + + "AND c.deleted = false") Optional findById(@Param("id") long id); default Checklist getById(long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } + //TODO: 논리적 삭제 리팩토링 List findByUser(User user); + //TODO: 논리적 삭제 리팩토링 List findByUserAndIdIn(User user, List checklistIds); + //TODO: 논리적 삭제 리팩토링 long countAllByIdIn(List ids); + + @Query("SELECT COUNT(c) > 0 FROM Checklist c " + + "WHERE c.id = :id " + + "AND c.deleted = false") + boolean existsById(@Param("id") long id); + + @Modifying + @Query("UPDATE Checklist c " + + "SET c.deleted = true " + + "WHERE c.id = :id") + void deleteById(@Param("id") long id); + } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index f002af66c..c9bb2b9f9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -311,4 +311,13 @@ private void validateCustomChecklistQuestionsDuplication(List questionI throw new BangggoodException(ExceptionCode.QUESTION_DUPLICATED); } } + + @Transactional + public void deleteChecklistById(long id) { + // 사용자 검증 필요 + if (!checklistRepository.existsById(id)) { + throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); + } + checklistRepository.deleteById(id); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 33f83da46..59c36e5ce 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -32,11 +32,8 @@ public class ChecklistFixture { 5, "GOOD", null ); - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ANSWER = new QuestionCreateRequest( - 6, null, "메모6" - ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( - null, "GOOD", "메모" + null, "NONE", "메모" ); public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index fdd116be9..20d6ae769 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -110,4 +110,17 @@ void updateCustomChecklist() { .then().log().all() .statusCode(204); } + + @DisplayName("체크리스트 삭제 성공") + @Test + void deleteChecklistById() { + roomRepository.save(RoomFixture.ROOM_1); + Checklist saved = checklistRepository.save(ChecklistFixture.checklist); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().delete("/checklists/" + saved.getId()) + .then().log().all() + .statusCode(204); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java index b7145cd9a..f1547c18a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -57,7 +57,7 @@ void fromId_invalidQuestion_exception() { .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } - @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함일 경우") + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 성공 : 포함일 경우") @Test void contains_true() { //given @@ -67,7 +67,7 @@ void contains_true() { assertThat(Question.contains(questionId)).isTrue(); } - @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함이 아닐 경우") + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 성공 : 포함이 아닐 경우") @Test void contains_false() { //given diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java new file mode 100644 index 000000000..a39e07ff0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -0,0 +1,87 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertAll; + + +class ChecklistRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private RoomRepository roomRepository; + + @BeforeEach + void setUp() { + roomRepository.save(RoomFixture.ROOM_1); + } + + @DisplayName("아이디를 통해 체크리스트 갖고 오기 성공") + @Test + void findById() { + //given + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + //when + Checklist foundChecklist = checklistRepository.getById(savedChecklist.getId().longValue()); + + //then + assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.checklist.getId()); + } + + @DisplayName("아이디를 통해 체크리스트 갖고 오기 실패 : 해당하는 체크리스트가 없을 경우") + @Test + void findById_notFound_exception() { + assertThatThrownBy(() -> checklistRepository.getById(1)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } + + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") + @Test + void existsById_true() { + //given & when + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + //then + assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isTrue(); + } + + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하지 않는 경우") + @Test + void existsById_false() { + //given & when & then + assertThat(checklistRepository.existsById(1)).isFalse(); + } + + @DisplayName("체크리스트 삭제 성공") + @Test + void deleteById() { + //given + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + //when + checklistRepository.deleteById(savedChecklist.getId().longValue()); + + //then + assertAll( + () -> assertThat(checklistRepository.existsById(savedChecklist.getId())).isTrue(), + () -> assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isFalse() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 3e7ec4df5..b9ba1a89d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -46,10 +46,10 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private RoomRepository roomRepository; + @Autowired private CustomChecklistQuestionRepository customChecklistQuestionRepository; - @DisplayName("체크리스트 방 정보 작성 성공") @Test void createChecklist() { @@ -314,4 +314,27 @@ void updateCustomChecklist_invalidQuestionId_exception() { public static Checklist createChecklist(User user, Room room) { return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); } + + @DisplayName("체크리스트 삭제 성공") + @Test + void deleteChecklistById() { + // given + roomRepository.save(RoomFixture.ROOM_1); + Checklist checklist = checklistRepository.save(ChecklistFixture.checklist); + + // when + checklistService.deleteChecklistById(checklist.getId()); + + // then + assertThat(checklistRepository.existsById(checklist.getId().longValue())).isFalse(); + } + + @DisplayName("체크리스트 삭제 실패") + @Test + void deleteChecklistById_notFound_exception() { + // given & when & then + assertThatThrownBy(() -> checklistService.deleteChecklistById(-1)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } } From 1f810e659965b79c7f15c23a33191c126e51e7ef Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 5 Aug 2024 18:01:21 +0900 Subject: [PATCH 129/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95=20API=EB=A5=BC=20?= =?UTF-8?q?=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4.=20(#213)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 14 +- .../checklist/domain/Checklist.java | 9 ++ .../checklist/domain/ChecklistQuestion.java | 11 ++ ...eateRequest.java => ChecklistRequest.java} | 6 +- .../dto/request/QuestionCreateRequest.java | 6 - .../dto/request/QuestionRequest.java | 6 + .../repository/ChecklistOptionRepository.java | 18 ++- .../repository/ChecklistRepository.java | 3 +- .../checklist/service/ChecklistService.java | 92 ++++++++++--- .../bang_ggood/exception/ExceptionCode.java | 1 + .../java/com/bang_ggood/room/domain/Room.java | 12 ++ ...oomCreateRequest.java => RoomRequest.java} | 8 +- .../bang-ggood/src/main/resources/schema.sql | 2 +- .../checklist/ChecklistFixture.java | 104 ++++++++++++--- .../controller/ChecklistE2ETest.java | 58 ++++++++- .../domain/ChecklistQuestionTest.java | 34 +++++ .../checklist/domain/QuestionTest.java | 1 - .../ChecklistOptionRepositoryTest.java | 77 +++++++++++ .../service/ChecklistServiceTest.java | 123 ++++++++++++++++-- .../java/com/bang_ggood/room/RoomFixture.java | 12 +- .../java/com/bang_ggood/user/UserFixture.java | 2 +- 21 files changed, 528 insertions(+), 71 deletions(-) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/{ChecklistCreateRequest.java => ChecklistRequest.java} (61%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/{RoomCreateRequest.java => RoomRequest.java} (53%) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 62c0e8b63..db6586703 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,6 +1,6 @@ package com.bang_ggood.checklist.controller; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; @@ -32,8 +32,9 @@ public ChecklistController(ChecklistService checklistService) { } @PostMapping("/checklists") - public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateRequest checklistCreateRequest) { - long checklistId = checklistService.createChecklist(checklistCreateRequest); + public ResponseEntity createChecklist(@Valid @RequestBody ChecklistRequest checklistRequest) { + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + long checklistId = checklistService.createChecklist(user, checklistRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } @@ -59,6 +60,13 @@ public ResponseEntity readChecklistsComparison( return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); } + @PutMapping("/checklists/{id}") + public ResponseEntity updateChecklistById(@PathVariable("id") long id, @Valid @RequestBody ChecklistRequest checklistRequest) { + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + checklistService.updateChecklistById(user, id, checklistRequest); + return ResponseEntity.noContent().build(); + } + @PutMapping("/custom-checklist") public ResponseEntity updateCustomChecklist(@RequestBody CustomChecklistUpdateRequest request) { checklistService.updateCustomChecklist(request); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 91ab926ef..33c4adf8d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -54,6 +54,15 @@ public Checklist(Integer deposit, Integer rent, Integer contractTerm, String rea protected Checklist() { } + public void change(Checklist updateChecklist) { + this.user = updateChecklist.user; + this.room = updateChecklist.room; + this.deposit = updateChecklist.deposit; + this.rent = updateChecklist.rent; + this.contractTerm = updateChecklist.contractTerm; + this.realEstate = updateChecklist.realEstate; + } + public Long getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 2bcbacdef..997d6c448 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -40,6 +40,17 @@ public ChecklistQuestion(Checklist checklist, Question question, Grade grade, St protected ChecklistQuestion() { } + public void change(ChecklistQuestion checklistQuestion) { + this.checklist = checklistQuestion.checklist; + this.question = checklistQuestion.question; + this.grade = checklistQuestion.grade; + this.memo = checklistQuestion.memo; + } + + public boolean isDifferentQuestionId(ChecklistQuestion checklistQuestion) { + return this.question != checklistQuestion.question; + } + public Long getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java similarity index 61% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java index e925f748c..3b4d63841 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java @@ -1,12 +1,12 @@ package com.bang_ggood.checklist.dto.request; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.request.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomRequest; import jakarta.validation.Valid; import java.util.List; -public record ChecklistCreateRequest(@Valid RoomCreateRequest room, List options, - @Valid List questions) { +public record ChecklistRequest(@Valid RoomRequest room, List options, + @Valid List questions) { public Room toRoomEntity() { return room.toRoomEntity(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java deleted file mode 100644 index 2e6c8804c..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto.request; - -import jakarta.validation.constraints.NotNull; - -public record QuestionCreateRequest(@NotNull Integer questionId, String grade, String memo) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java new file mode 100644 index 000000000..1032d8955 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto.request; + +import jakarta.validation.constraints.NotNull; + +public record QuestionRequest(@NotNull(message = "질문 아이디가 존재하지 않습니다.") Integer questionId, String grade, String memo) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 73d20f711..f8d240790 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -3,11 +3,27 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.transaction.annotation.Transactional; import java.util.List; public interface ChecklistOptionRepository extends JpaRepository { - List findByChecklistId(long checklistId); + @Query("SELECT co FROM ChecklistOption co " + + "WHERE co.checklist.id = :checklistId " + + "AND co.deleted = false") + List findByChecklistId(Long checklistId); + @Query("SELECT COUNT(co) FROM ChecklistOption co " + + "WHERE co.checklist = :checklist " + + "AND co.deleted = false") Integer countByChecklist(Checklist checklist); + + @Modifying + @Transactional + @Query("UPDATE ChecklistOption co " + + "SET co.deleted = true " + + "WHERE co.checklist.id = :checklistId") + void deleteAllByChecklistId(Long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 364774a48..fb3f6150b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -15,11 +15,12 @@ public interface ChecklistRepository extends JpaRepository { @Query("SELECT c FROM Checklist c " + "JOIN FETCH c.room r " + + "LEFT JOIN FETCH c.questions q " + "WHERE c.id = :id " - + "AND c.room.id = r.id " + "AND c.deleted = false") Optional findById(@Param("id") long id); + default Checklist getById(long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index c9bb2b9f9..fc46b0dfa 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -12,10 +12,10 @@ import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.ChecklistInfo; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; -import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.dto.response.BadgeResponse; import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; @@ -46,6 +46,7 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.IntStream; @Service public class ChecklistService { @@ -68,21 +69,21 @@ public ChecklistService(ChecklistRepository checklistRepository, RoomRepository } @Transactional - public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { - Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); + public long createChecklist(User user, ChecklistRequest checklistRequest) { + Room room = roomRepository.save(checklistRequest.toRoomEntity()); - ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); - Checklist checklist = new Checklist(new User(1L, "방방이", "bang-ggood@gmail.com"), room, checklistInfo.deposit(), checklistInfo.rent(), + ChecklistInfo checklistInfo = checklistRequest.toChecklistInfo(); + Checklist checklist = new Checklist(user, room, checklistInfo.deposit(), checklistInfo.rent(), checklistInfo.contractTerm(), checklistInfo.realEstate()); checklistRepository.save(checklist); - createChecklistOptions(checklistCreateRequest, checklist); - createChecklistQuestions(checklistCreateRequest, checklist); + createChecklistOptions(checklistRequest, checklist); + createChecklistQuestions(checklistRequest, checklist); return checklist.getId(); } - private void createChecklistOptions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - List optionIds = checklistCreateRequest.options(); + private void createChecklistOptions(ChecklistRequest checklistRequest, Checklist checklist) { + List optionIds = checklistRequest.options(); validateOptions(optionIds); List checklistOptions = optionIds.stream() .map(option -> new ChecklistOption(checklist, option)) @@ -112,9 +113,9 @@ private void validateOptionInvalid(List optionIds) { } } - private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - validateQuestion(checklistCreateRequest.questions()); - List checklistQuestions = checklistCreateRequest.questions().stream() + private void createChecklistQuestions(ChecklistRequest checklistRequest, Checklist checklist) { + validateQuestion(checklistRequest.questions()); + List checklistQuestions = checklistRequest.questions().stream() .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), @@ -144,12 +145,12 @@ public ChecklistQuestionsResponse readChecklistQuestions() { return new ChecklistQuestionsResponse(categoryQuestionsResponses); } - private void validateQuestion(List questions) { + private void validateQuestion(List questions) { validateQuestionDuplicate(questions); validateQuestionInvalid(questions); } - private void validateQuestionDuplicate(List questions) { + private void validateQuestionDuplicate(List questions) { Set set = new HashSet<>(); questions.forEach(question -> { if (!set.add(question.questionId())) { @@ -158,9 +159,9 @@ private void validateQuestionDuplicate(List questions) { }); } - private void validateQuestionInvalid(List questions) { - for (QuestionCreateRequest questionCreateRequest : questions) { - if (!Question.contains(questionCreateRequest.questionId())) { + private void validateQuestionInvalid(List questions) { + for (QuestionRequest questionRequest : questions) { + if (!Question.contains(questionRequest.questionId())) { throw new BangggoodException(ExceptionCode.QUESTION_INVALID); } } @@ -284,6 +285,61 @@ private int getChecklistScore(List questions) { return ChecklistScore.calculateTotalScore(questions); } + @Transactional + public void updateChecklistById(User user, long id, ChecklistRequest checklistRequest) { + Checklist checklist = checklistRepository.getById(id); + + Room room = checklist.getRoom(); + room.change(checklistRequest.toRoomEntity()); + + ChecklistInfo checklistInfo = checklistRequest.toChecklistInfo(); + Checklist updateChecklist = new Checklist(user, room, checklistInfo.deposit(), checklistInfo.rent(), + checklistInfo.contractTerm(), checklistInfo.realEstate()); + checklist.change(updateChecklist); + + updateChecklistOptions(checklistRequest, checklist); + updateChecklistQuestions(checklistRequest, checklist); + } + + private void updateChecklistOptions(ChecklistRequest checklistRequest, Checklist checklist) { + List optionIds = checklistRequest.options(); + validateOptions(optionIds); + List checklistOptions = optionIds.stream() + .map(option -> new ChecklistOption(checklist, option)) + .toList(); + checklistOptionRepository.deleteAllByChecklistId(checklist.getId()); + checklistOptionRepository.saveAll(checklistOptions); + } + + private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checklist checklist) { + validateQuestion(checklistRequest.questions()); + + List questions = checklist.getQuestions(); + List updateQuestions = checklistRequest.questions().stream() + .map(question -> new ChecklistQuestion( + checklist, + Question.fromId(question.questionId()), + Grade.from(question.grade()), + question.memo())) + .toList(); + + validateSameQuestions(questions, updateQuestions); + IntStream.range(0, questions.size()) + .forEach(i -> questions.get(i).change(updateQuestions.get(i))); + } + + private void validateSameQuestions(List questions, List updateQuestions) { + if (questions.size() != updateQuestions.size()) { + throw new BangggoodException(ExceptionCode.QUESTION_DIFFERENT); + } + IntStream.range(0, questions.size()) + .filter(i -> questions.get(i).isDifferentQuestionId(updateQuestions.get(i))) + .findAny() + .ifPresent(i -> { + throw new BangggoodException(ExceptionCode.QUESTION_DIFFERENT); + }); + } + @Transactional public void updateCustomChecklist(CustomChecklistUpdateRequest request) { List questionIds = request.questionIds(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index b2da0ea4f..e161ecfbe 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -14,6 +14,7 @@ public enum ExceptionCode { // Question QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), + QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index c9d1d9c62..5d805654b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -56,6 +56,18 @@ public Room(String name, String station, Integer walkingTime, String address, Ty validateFloorAndLevel(); } + public void change(Room room) { + this.name = room.name; + this.station = room.station; + this.walkingTime = room.walkingTime; + this.address = room.address; + this.type = room.type; + this.size = room.size; + this.floor = room.floor; + this.floorLevel = room.floorLevel; + this.structure = room.structure; + } + public Long getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java similarity index 53% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java index 51b9774fa..5b82a6154 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java @@ -6,10 +6,10 @@ import com.bang_ggood.room.domain.Type; import jakarta.validation.constraints.NotBlank; -public record RoomCreateRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, - Integer deposit, Integer rent, Integer contractTerm, String address, - String station, Integer walkingTime, String realEstate, - String type, String structure, Integer size, Integer floor, String floorLevel) { +public record RoomRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, + Integer deposit, Integer rent, Integer contractTerm, String address, + String station, Integer walkingTime, String realEstate, + String type, String structure, Integer size, Integer floor, String floorLevel) { public Room toRoomEntity() { return new Room(roomName, station, walkingTime, address, diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 17fcfeac9..9efc8f521 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -75,7 +75,7 @@ CREATE TABLE checklist_option FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE if not exists category_priority +CREATE TABLE category_priority ( id bigint generated by default as identity, category_id INTEGER not null, diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 59c36e5ce..43ba15022 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -1,8 +1,11 @@ package com.bang_ggood.checklist; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; +import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.user.domain.User; @@ -16,70 +19,141 @@ public class ChecklistFixture { 1000, 50, 12, "방끗공인중개사" ); - public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( 1, "GOOD", "메모1" ); - public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_2_CREATE_REQUEST = new QuestionRequest( 2, "SOSO", null ); - public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_3_CREATE_REQUEST = new QuestionRequest( 3, "BAD", "메모3" ); - public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_4_CREATE_REQUEST = new QuestionRequest( + 4, "SOSO", null + ); + + public static final QuestionRequest QUESTION_5_CREATE_REQUEST = new QuestionRequest( 5, "GOOD", null ); - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_5_UPDATE_REQUEST = new QuestionRequest( + 5, "GOOD", "메모" + ); + + public static final QuestionRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionRequest( null, "NONE", "메모" ); - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionRequest( 9999, "SOSO", null ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_NO_ROOM_NAME = new ChecklistRequest( + RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_NO_QUESTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_INVALID_QUESTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 9999), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_INVALID_OPTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 4, 9999), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); + + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 4, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION_LENGTH = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_4_CREATE_REQUEST) + ); + + + public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( + checklist, Question.fromId(1), Grade.BAD, "메모" + ); + + public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( + checklist, Question.fromId(2), Grade.BAD, "메모" + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 20d6ae769..78e86679a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -7,8 +7,10 @@ import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; import io.restassured.RestAssured; import io.restassured.http.ContentType; import org.junit.jupiter.api.Assertions; @@ -21,11 +23,16 @@ import java.util.Map; import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.containsString; public class ChecklistE2ETest extends AcceptanceTest { + @Autowired + private ChecklistService checklistService; + @Autowired private ChecklistRepository checklistRepository; + @Autowired private RoomRepository roomRepository; @@ -79,24 +86,63 @@ void readChecklistQuestions() { @DisplayName("작성된 체크리스트 조회 성공") @Test void readChecklistById() { - //체크리스트 저장 - roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.checklist); + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); SelectedChecklistResponse selectedChecklistResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) - .when().get("/checklists/" + saved.getId()) + .when().get("/checklists/" + checklistId) .then().log().all() .statusCode(200) .extract() .as(SelectedChecklistResponse.class); Assertions.assertAll( - () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("살기 좋은 방"), - () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), + () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") ); } + @DisplayName("체크리스트 수정 성공") + @Test + void updateChecklist() { + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST) + .when().put("/checklists/" + checklistId) + .then().log().all() + .statusCode(204); + } + + @DisplayName("체크리스트 수정 실패: 방 이름을 넣지 않은 경우") + @Test + void updateChecklist_noRoomName_exception() { + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST_NO_ROOM_NAME) + .when().put("/checklists/" + checklistId) + .then().log().all() + .statusCode(400) + .body("message", containsString("방 이름이 존재하지 않습니다.")); + } + + @DisplayName("체크리스트 수정 실패: 질문 ID를 넣지 않은 경우") + @Test + void updateChecklist_noQuestionId_exception() { + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST_NO_QUESTION_ID) + .when().put("/checklists/" + checklistId) + .then().log().all() + .statusCode(400) + .body("message", containsString("질문 아이디가 존재하지 않습니다.")); + } + @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java new file mode 100644 index 000000000..a614e2ab0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java @@ -0,0 +1,34 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.checklist.ChecklistFixture; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +class ChecklistQuestionTest { + + @DisplayName("체크리스트 내에서 질문끼리 다른 id를 갖고 있는지 확인 성공 : 다른 id일 경우") + @Test + void isDifferentQuestionId_true() { + //given + ChecklistQuestion checklistQuestion1 = ChecklistFixture.CHECKLIST_QUESTION_1; + ChecklistQuestion checklistQuestion2 = ChecklistFixture.CHECKLIST_QUESTION_2; + + //when & then + assertThat(checklistQuestion1.isDifferentQuestionId(checklistQuestion2)).isTrue(); + } + + @DisplayName("체크리스트 내에서 질문끼리 다른 id를 갖고 있는지 확인 성공 : 같은 id일 경우") + @Test + void isDifferentQuestionId_false() { + //given + ChecklistQuestion checklistQuestion = ChecklistFixture.CHECKLIST_QUESTION_1; + ChecklistQuestion compareChecklistQuestion = ChecklistFixture.CHECKLIST_QUESTION_1; + + //when & then + assertThat(checklistQuestion.isDifferentQuestionId(compareChecklistQuestion)).isFalse(); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java index f1547c18a..c44780f98 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -76,5 +76,4 @@ void contains_false() { //when & then assertThat(Question.contains(questionId)).isFalse(); } - } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java new file mode 100644 index 000000000..0892b801e --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java @@ -0,0 +1,77 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistOption; +import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.user.UserFixture; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import java.util.List; + +import static org.assertj.core.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.*; + +class ChecklistOptionRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistService checklistService; + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private ChecklistOptionRepository checklistOptionRepository; + + private long checklistId; + + @BeforeEach + void setUp() { + checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + } + + @DisplayName("체크리스트 ID로 옵션 찾기 성공") + @Test + void findByChecklistId() { + // given & when + List checklistOptions = checklistOptionRepository.findByChecklistId(checklistId); + + // then + assertThat(checklistOptions) + .allSatisfy(option -> + assertThat(option.isDeleted()).isFalse() + ); + } + + @DisplayName("체크리스트 옵션 수 세기 성공") + @Test + void countByChecklist() { + // given & when + int optionCount = checklistOptionRepository.countByChecklist(checklistRepository.getById(checklistId)); + + // then + assertThat(optionCount).isEqualTo(ChecklistFixture.CHECKLIST_CREATE_REQUEST.options().size()); + + } + + @DisplayName("체크리스트 ID로 옵션 삭제 성공") + @Test + void deleteAllByChecklistId() { + // given + List checklistOptions = checklistOptionRepository.findByChecklistId(checklistId); + + // when + checklistOptionRepository.deleteAllByChecklistId(checklistId); + + // then + assertThat(checklistOptions) + .allSatisfy(option -> + assertThat(checklistOptionRepository.findById(option.getId()).get().isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index b9ba1a89d..b35cd45aa 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -4,11 +4,13 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; + import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; @@ -16,12 +18,16 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; +import java.sql.Struct; +import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; +import org.springframework.transaction.annotation.Transactional; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; @@ -50,14 +56,17 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private CustomChecklistQuestionRepository customChecklistQuestionRepository; + @Autowired + private ChecklistOptionRepository checklistOptionRepository; + @DisplayName("체크리스트 방 정보 작성 성공") @Test void createChecklist() { //given - ChecklistCreateRequest checklist = ChecklistFixture.CHECKLIST_CREATE_REQUEST; + ChecklistRequest checklist = ChecklistFixture.CHECKLIST_CREATE_REQUEST; // when - long checklistId = checklistService.createChecklist(checklist); + long checklistId = checklistService.createChecklist(UserFixture.USER1, checklist); //then assertAll( @@ -73,7 +82,7 @@ void createChecklist() { void createChecklist_invalidQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @@ -83,7 +92,7 @@ void createChecklist_invalidQuestionId_exception() { void createChecklist_duplicatedQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist( + () -> checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); @@ -94,7 +103,8 @@ void createChecklist_duplicatedQuestionId_exception() { void createChecklist_invalidOptionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); } @@ -104,7 +114,8 @@ void createChecklist_invalidOptionId_exception() { void createChecklist_duplicatedOptionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } @@ -261,6 +272,102 @@ void readChecklistsComparison_invalidId() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + @DisplayName("체크리스트 수정 성공") + @Test + void updateChecklistById() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when + checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST); + + //then + Checklist checklist = checklistRepository.getById(checklistId); + assertAll( + () -> assertThat(checklist.getRoom().getStructure()).isEqualTo(Structure.OPEN_ONE_ROOM), + () -> assertThat(checklistOptionRepository.findByChecklistId(checklistId).get(3).getOptionId()).isEqualTo(4), + () -> assertThat(checklist.getQuestions().get(3).getMemo()).isEqualTo("메모") + ); + } + + @DisplayName("체크리스트 수정 실패 : 질문 id가 유효하지 않을 경우") + @Test + void updateChecklistById_invalidQuestionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 질문 id가 중복일 경우") + @Test + void updateChecklistById_duplicatedQuestionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 옵션 id가 유효하지 않을 경우") + @Test + void updateChecklistById_invalidOptionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 옵션 id가 중복일 경우") + @Test + void updateChecklistById_duplicatedOptionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DUPLICATED_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 기존의 체크리스트와 질문 길이가 다를 경우") + @Test + void updateChecklistById_differentQuestionLength_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION_LENGTH)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 기존의 체크리스트와 질문이 다를 경우") + @Test + void createChecklist_differentQuestion_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); + } + @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 4bad52d8c..7461fe205 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -4,7 +4,7 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.domain.Type; -import com.bang_ggood.room.dto.request.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomRequest; public class RoomFixture { @@ -23,13 +23,19 @@ public class RoomFixture { Type.VILLA, 55, null, FloorLevel.ROOFTOP, Structure.DUPLEX ); - public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( + public static final RoomRequest ROOM_CREATE_REQUEST = new RoomRequest( "방이름", 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() ); - public static final RoomCreateRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomCreateRequest( + public static final RoomRequest ROOM_UPDATE_REQUEST = new RoomRequest( + "방이름", 1000, 50, 12, "부산광역시 루터회관", + "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), + Structure.OPEN_ONE_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() + ); + + public static final RoomRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomRequest( null, 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java index 83e48c0e5..d839907a5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -7,7 +7,7 @@ public class UserFixture { - public static final User USER1 = new User("방방이", "bang-bang@gmail.com"); + public static final User USER1 = new User(1L, "방방이", "bang-bang@gmail.com"); public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoResponse("", "", new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), From 9bd7f5b4593e3318c29c6c17852389d3cb91cb86 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 5 Aug 2024 19:07:07 +0900 Subject: [PATCH 130/348] =?UTF-8?q?[BE]=20=EB=B0=A9=20=EB=B9=84=EA=B5=90?= =?UTF-8?q?=20=EA=B2=B0=EA=B3=BC=20=EC=A1=B0=ED=9A=8C=20API=EC=97=90=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EC=B6=94=EA=B0=80=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=ED=95=9C=EB=8B=A4.=20(#215)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 2 - .../dto/CategoryQuestionsResponse.java | 8 -- .../WrittenCategoryQuestionsResponse.java | 17 --- .../category/service/CategoryService.java | 7 +- .../controller/ChecklistController.java | 3 +- .../checklist/domain/Checklist.java | 19 +++ .../checklist/domain/ChecklistRank.java | 15 +++ .../bang_ggood/checklist/domain/Grade.java | 3 +- .../ChecklistWithScoreReadResponse.java | 69 ++++++++--- .../UserChecklistPreviewResponse.java | 1 - .../response/WrittenChecklistResponse.java | 9 -- .../dto/response/WrittenQuestionResponse.java | 15 --- .../repository/ChecklistRepository.java | 14 ++- .../checklist/service/ChecklistService.java | 53 +++++--- .../bang_ggood/exception/ExceptionCode.java | 3 + .../handler/GlobalExceptionHandler.java | 2 +- .../dto/response/SelectedRoomResponse.java | 8 +- .../dto/response/WrittenRoomResponse.java | 12 -- .../bang_ggood/user/service/OauthClient.java | 4 +- .../bang-ggood/src/main/resources/schema.sql | 59 ++++++--- .../checklist/ChecklistFixture.java | 5 +- .../controller/ChecklistE2ETest.java | 1 - .../checklist/domain/ChecklistRankTest.java | 84 +++++++++++++ .../checklist/option/OptionTest.java | 4 +- .../repository/ChecklistRepositoryTest.java | 13 +- .../service/ChecklistServiceTest.java | 116 +++++++++++++----- .../java/com/bang_ggood/user/UserFixture.java | 6 +- .../user/service/UserServiceTest.java | 2 +- .../src/test/resources/schema-test.sql | 20 +-- 29 files changed, 383 insertions(+), 191 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index cbf7b1c39..810c07fc1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -2,8 +2,6 @@ import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.service.CategoryService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java deleted file mode 100644 index a9aa261e7..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ /dev/null @@ -1,8 +0,0 @@ - -package com.bang_ggood.category.dto; - -import com.bang_ggood.checklist.dto.response.QuestionResponse; -import java.util.List; - -public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java deleted file mode 100644 index 30a1d94ff..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bang_ggood.category.dto.response; - -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; -import java.util.List; - -public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, - List questions) { - - public static WrittenCategoryQuestionsResponse of(Category category, List questions) { - return new WrittenCategoryQuestionsResponse( - category.getId(), - category.getName(), - questions - ); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index 3674af29b..e57bbe62f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -5,9 +5,6 @@ import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.dto.response.CategoryReadResponse; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.response.CategoryReadResponse; import com.bang_ggood.category.repository.CategoryPriorityRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.user.domain.User; @@ -65,7 +62,9 @@ private void validateCategoryId(CategoryPriorityCreateRequest request) { request.categoryIds().stream() .filter(id -> !Category.contains(id)) .findAny() - .ifPresent(id -> { throw new BangggoodException(CATEGORY_NOT_FOUND); }); + .ifPresent(id -> { + throw new BangggoodException(CATEGORY_NOT_FOUND); + }); } public CategoriesReadResponse readCategories() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index db6586703..77378119f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -57,7 +57,8 @@ public ResponseEntity readUserChecklistsPreview() @GetMapping("/checklists/comparison") public ResponseEntity readChecklistsComparison( @RequestParam("id") List checklistIds) { - return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); + User user = new User(1L, "방끗", "bang-ggood@gmail.com"); + return ResponseEntity.ok(checklistService.readChecklistsComparison(user, checklistIds)); } @PutMapping("/checklists/{id}") diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 33c4adf8d..cc5cea5aa 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -1,7 +1,10 @@ package com.bang_ggood.checklist.domain; import com.bang_ggood.BaseEntity; +import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.domain.Structure; +import com.bang_ggood.room.domain.Type; import com.bang_ggood.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -95,6 +98,22 @@ public Integer getRoomWalkingTime() { return room.getWalkingTime(); } + public Type getRoomType() { + return room.getType(); + } + + public Integer getRoomSize() { + return room.getSize(); + } + + public FloorLevel getRoomFloorLevel() { + return room.getFloorLevel(); + } + + public Structure getRoomStructure() { + return room.getStructure(); + } + public Integer getDeposit() { return deposit; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java new file mode 100644 index 000000000..ec156c1dc --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java @@ -0,0 +1,15 @@ +package com.bang_ggood.checklist.domain; + +import java.util.List; + +public class ChecklistRank { + + private ChecklistRank() { + } + + public static int calculateRanks(int targetScore, List scores) { + return (int) scores.stream() + .filter(score -> score > targetScore) + .count() + 1; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index bc2687d54..4aeb3cfd6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -10,8 +10,7 @@ public enum Grade { GOOD(3), SOSO(2), BAD(1), - NONE(0) - ; + NONE(0); private final int score; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java index c8d3e42dc..6deab2414 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java @@ -1,30 +1,65 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.room.dto.response.SelectedRoomResponse; import java.util.List; -public record ChecklistWithScoreReadResponse( - Long checklistId, String roomName, String address, - Integer floor, Integer deposit, Integer rent, - Integer contractTerm, String station, Integer walkingTime, - Integer optionCount, Integer score, - List categories -) { - public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, +public class ChecklistWithScoreReadResponse { + + private final Long checklistId; + private final Integer score; + private final SelectedRoomResponse room; + private final List options; + private final List categories; + private Integer rank; + + public ChecklistWithScoreReadResponse(Long checklistId, Integer score, + SelectedRoomResponse room, List options, + List categories) { + this.checklistId = checklistId; + this.score = score; + this.room = room; + this.options = options; + this.categories = categories; + } + + public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistScore, + SelectedRoomResponse room, List options, List categoryScores) { return new ChecklistWithScoreReadResponse( checklist.getId(), - checklist.getRoomName(), - checklist.getRoomAddress(), - checklist.getRoomFloor(), - checklist.getDeposit(), - checklist.getRent(), - checklist.getContractTerm(), - checklist.getRoomStation(), - checklist.getRoomWalkingTime(), - checklistOptionCount, checklistScore, + room, + options, categoryScores ); } + + public void assignRank(int rank) { + this.rank = rank; + } + + public Long getChecklistId() { + return checklistId; + } + + public Integer getScore() { + return score; + } + + public SelectedRoomResponse getRoom() { + return room; + } + + public List getOptions() { + return options; + } + + public List getCategories() { + return categories; + } + + public Integer getRank() { + return rank; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 15bbc6a93..27d90b50e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,7 +1,6 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; - import java.time.LocalDateTime; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java deleted file mode 100644 index bdcfc70e1..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.response.WrittenRoomResponse; -import java.util.List; - -public record WrittenChecklistResponse(WrittenRoomResponse room, List options, - List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java deleted file mode 100644 index 34fc7ced8..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.checklist.domain.ChecklistQuestion; - -public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { - - public static WrittenQuestionResponse of(ChecklistQuestion checklistQuestion) { - return new WrittenQuestionResponse( - checklistQuestion.getQuestion().getId(), - checklistQuestion.getQuestion().getTitle(), - checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getGrade().name() - ); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index fb3f6150b..c2be695d8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -28,11 +28,14 @@ default Checklist getById(long id) { //TODO: 논리적 삭제 리팩토링 List findByUser(User user); - //TODO: 논리적 삭제 리팩토링 - List findByUserAndIdIn(User user, List checklistIds); - - //TODO: 논리적 삭제 리팩토링 - long countAllByIdIn(List ids); + @Query("SELECT c FROM Checklist c " + + "JOIN FETCH c.user u " + + "JOIN FETCH c.room r " + + "WHERE u = :user " + + "AND c.id IN :checklistIds " + + "AND c.deleted = false") + List findByUserAndIdIn(@Param("user") User user, + @Param("checklistIds") List checklistIds); @Query("SELECT COUNT(c) > 0 FROM Checklist c " + "WHERE c.id = :id " @@ -44,5 +47,4 @@ default Checklist getById(long id) { + "SET c.deleted = true " + "WHERE c.id = :id") void deleteById(@Param("id") long id); - } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index fc46b0dfa..d7eddd67c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -7,13 +7,14 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.ChecklistRank; import com.bang_ggood.checklist.domain.ChecklistScore; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.ChecklistInfo; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.dto.response.BadgeResponse; @@ -40,7 +41,6 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -174,13 +174,13 @@ public SelectedChecklistResponse readChecklistById(long id) { List options = readOptionsByChecklistId(id); - List selectedCategoryQuestionsRespons = + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); int checklistScore = ChecklistScore.calculateTotalScore(checklist.getQuestions()); return new SelectedChecklistResponse(selectedRoomResponse, options, checklistScore, - selectedCategoryQuestionsRespons); + selectedCategoryQuestionsResponse); } private List readOptionsByChecklistId(long checklistId) { @@ -200,14 +200,14 @@ private List readCategoryQuestionsByChecklist private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category category, List checklistQuestions) { - List selectedQuestionRespons = + List selectedQuestionResponse = Question.filter(category, checklistQuestions).stream() .map(SelectedQuestionResponse::of) .toList(); int categoryScore = ChecklistScore.calculateCategoryScore(category, checklistQuestions); - return SelectedCategoryQuestionsResponse.of(category, categoryScore, selectedQuestionRespons); + return SelectedCategoryQuestionsResponse.of(category, categoryScore, selectedQuestionResponse); } @Transactional @@ -233,23 +233,24 @@ private List createBadges(List questions) { } @Transactional - public ChecklistsWithScoreReadResponse readChecklistsComparison(List checklistIds) { - User user = new User(1L, "방끗", "bang-ggood@gmail.com"); + public ChecklistsWithScoreReadResponse readChecklistsComparison(User user, List checklistIds) { + List checklists = checklistRepository.findByUserAndIdIn(user, checklistIds); - validateChecklistComparison(checklistIds); + validateChecklistComparison(checklists, checklistIds); - List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) + List checklistsWithScore = checklists .stream() .map(this::getChecklistWithScore) - .sorted(Comparator.comparing(ChecklistWithScoreReadResponse::score).reversed()) .toList(); - return new ChecklistsWithScoreReadResponse(responses); + assignRanks(checklistsWithScore, getScores(checklistsWithScore)); + + return new ChecklistsWithScoreReadResponse(checklistsWithScore); } - private void validateChecklistComparison(List checklistIds) { + private void validateChecklistComparison(List userChecklists, List checklistIds) { validateChecklistComparisonCount(checklistIds); - validateChecklist(checklistIds); + validateUserChecklist(userChecklists, checklistIds); } private void validateChecklistComparisonCount(List checklistIds) { @@ -258,26 +259,25 @@ private void validateChecklistComparisonCount(List checklistIds) { } } - private void validateChecklist(List checklistIds) { - if (checklistRepository.countAllByIdIn(checklistIds) != checklistIds.size()) { + private void validateUserChecklist(List userChecklists, List checklistIds) { + if (userChecklists.size() != checklistIds.size()) { throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); } } - private ChecklistWithScoreReadResponse getChecklistWithScore(Checklist checklist) { List categoryScores = getCategoryScores(checklist.getQuestions()); int checklistScore = getChecklistScore(checklist.getQuestions()); - int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); + SelectedRoomResponse selectedRoom = SelectedRoomResponse.of(checklist); + List options = readOptionsByChecklistId(checklist.getId()); - return ChecklistWithScoreReadResponse.of(checklist, checklistOptionCount, checklistScore, categoryScores); + return ChecklistWithScoreReadResponse.of(checklist, checklistScore, selectedRoom, options, categoryScores); } private List getCategoryScores(List questions) { return Arrays.stream(Category.values()) .map(category -> CategoryScoreReadResponse.of(category, ChecklistScore.calculateCategoryScore(category, questions))) - .filter(response -> response.score() != 0) .toList(); } @@ -285,6 +285,19 @@ private int getChecklistScore(List questions) { return ChecklistScore.calculateTotalScore(questions); } + private List getScores(List checklistsWithScore) { + return checklistsWithScore.stream() + .map(ChecklistWithScoreReadResponse::getScore) + .toList(); + } + + private void assignRanks(List checklistsWithScore, List scores) { + checklistsWithScore + .forEach(checklistWithScore -> checklistWithScore.assignRank( + ChecklistRank.calculateRanks(checklistWithScore.getScore(), scores) + )); + } + @Transactional public void updateChecklistById(User user, long id, ChecklistRequest checklistRequest) { Checklist checklist = checklistRepository.getById(id); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index e161ecfbe..dd52a7140 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -46,6 +46,9 @@ public enum ExceptionCode { // Room ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."), + //Score + SCORE_NOT_DESCENDING_SORTED(HttpStatus.BAD_REQUEST, "정렬되지 않은 점수입니다."), + // Auth OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "토큰을 요청하는 과정에서 예상치 못한 예외가 발생했습니다."); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java index df30e69df..beefa5775 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ package com.bang_ggood.handler; import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.dto.ExceptionResponse; import com.bang_ggood.exception.OauthException; +import com.bang_ggood.exception.dto.ExceptionResponse; import com.bang_ggood.exception.dto.OauthExceptionResponse; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 65d30ec6d..2a06f5c77 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -3,10 +3,14 @@ import com.bang_ggood.checklist.domain.Checklist; public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { + String address, String station, Integer walkingTime, String realEstate, + String type, Integer size, String floorLevel, String structure) { + public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), - checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); + checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), + checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().name(), + checklist.getRoomStructure().name()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java deleted file mode 100644 index f3e859a54..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bang_ggood.room.dto.response; - -import com.bang_ggood.checklist.domain.Checklist; - -public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { - public static WrittenRoomResponse of(Checklist checklist) { - return new WrittenRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), - checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), - checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java index 4a97d848b..53d0110fd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java @@ -27,8 +27,8 @@ public OauthClient( @Value("${kakao.user_get_uri}") String userInfoRequestUri, @Value("${kakao.grant_type}") String grantType, @Value("${kakao.client_id}") String clientId, - @Value("${kakao.redirect_uri}")String redirectUrl, - @Value("${kakao.client_secret}")String clientSecret) { + @Value("${kakao.redirect_uri}") String redirectUrl, + @Value("${kakao.client_secret}") String clientSecret) { this.restClient = restClient; this.tokenRequestUri = tokenRequestUri; this.userInfoRequestUri = userInfoRequestUri; diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 9efc8f521..ff1b6edae 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -32,7 +32,7 @@ CREATE TABLE users email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - deleted BOOLEAN + deleted BOOLEAN ); CREATE TABLE checklist @@ -46,7 +46,7 @@ CREATE TABLE checklist room_id BIGINT NOT NULL UNIQUE, user_id BIGINT NOT NULL, real_estate VARCHAR(255), - deleted BOOLEAN, + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); @@ -77,23 +77,48 @@ CREATE TABLE checklist_option CREATE TABLE category_priority ( - id bigint generated by default as identity, - category_id INTEGER not null, - user_id bigint not null, - created_at TIMESTAMP not null, - modified_at TIMESTAMP not null, - deleted BOOLEAN, - primary key (id), - foreign key (user_id) references users -); + id + bigint + generated + by + default as + identity, + category_id + INTEGER + not + null, + user_id + bigint + not + null, + created_at + TIMESTAMP + not + null, + modified_at + TIMESTAMP + not + null, + deleted + BOOLEAN, + primary + key +( + id +), + foreign key +( + user_id +) references users + ); CREATE TABLE custom_checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - user_id BIGINT, - question VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (user_id) references users ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 43ba15022..f28472e7c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -7,14 +7,13 @@ import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.room.RoomFixture; -import com.bang_ggood.user.domain.User; - +import com.bang_ggood.user.UserFixture; import java.util.List; public class ChecklistFixture { public static final Checklist checklist = new Checklist( - new User(1L, "방방이", "bang-ggood@gmail.com"), + UserFixture.USER1, RoomFixture.ROOM_1, 1000, 50, 12, "방끗공인중개사" ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 78e86679a..39f76fb66 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -17,7 +17,6 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; - import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java new file mode 100644 index 000000000..a9964f0d9 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java @@ -0,0 +1,84 @@ +package com.bang_ggood.checklist.domain; + +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class ChecklistRankTest { + + @DisplayName("Score 에 대한 Rank 계산 성공 : 3명인 경우") + @Test + void calculateRanksByDescendingScores_threeScores() { + //give + List scores = List.of(5, 3, 1); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(3, scores)).isEqualTo(2), + () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(3) + ); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 2명인 경우") + @Test + void calculateRanksByDescendingScores_twoScores() { + //given + List scores = List.of(5, 3); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(3, scores)).isEqualTo(2) + ); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 1명인 경우") + @Test + void calculateRanksByDescendingScores_oneScores() { + //given + List scores = List.of(5); + + //when & then + assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 모두 점수가 같은 경우") + @Test + void calculateRanksByDescendingScores_allSameScore() { + //given + List scores = List.of(5, 5, 5); + + //when & then + assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 1등이 2명인 경우") + @Test + void calculateRanksByDescendingScores_bothRankOne() { + //given + List scores = List.of(5, 5, 1); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(3) + ); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 2등이 2명인 경우") + @Test + void calculateRanksByDescendingScores_BothRankTwo() { + //given + List scores = List.of(5, 1, 1); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(2) + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java index 74ecde46f..a524256c4 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java @@ -1,11 +1,11 @@ package com.bang_ggood.checklist.option; -import static org.assertj.core.api.Assertions.assertThat; - import com.bang_ggood.checklist.domain.Option; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + class OptionTest { @DisplayName("옵션 포함 성공: 포함하는 경우") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index a39e07ff0..aa5691f8c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -7,11 +7,12 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; -import org.assertj.core.api.Assertions; +import com.bang_ggood.user.UserFixture; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -52,6 +53,16 @@ void findById_notFound_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + @DisplayName("체크리스트 아이디 리스트 중 유저가 생성한 체크리스트 목록 갖고 오기 성공") + @Test + void findByUserAndIdIn() { + //given + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + assertThat(checklistRepository.findByUserAndIdIn(UserFixture.USER1, List.of(savedChecklist.getId()))) + .isEqualTo(List.of(savedChecklist)); + } + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") @Test void existsById_true() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index b35cd45aa..5b669767b 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -4,9 +4,11 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; - +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; @@ -22,12 +24,10 @@ import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; -import java.sql.Struct; -import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.transaction.annotation.Transactional; +import java.util.List; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; @@ -82,7 +82,8 @@ void createChecklist() { void createChecklist_invalidQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @@ -217,13 +218,13 @@ void readChecklistById_invalidChecklistId_exception() { @Test void readChecklistsComparison() { // given - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + User user1 = UserFixture.USER1; Room room1 = RoomFixture.ROOM_1; Room room2 = RoomFixture.ROOM_2; Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user, room1); - Checklist checklist2 = createChecklist(user, room2); - Checklist checklist3 = createChecklist(user, room3); + Checklist checklist1 = createChecklist(user1, room1); + Checklist checklist2 = createChecklist(user1, room2); + Checklist checklist3 = createChecklist(user1, room3); roomRepository.saveAll(List.of(room1, room2, room3)); List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); @@ -231,20 +232,53 @@ void readChecklistsComparison() { checklists.get(2).getId()); // when - ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(checklistIds); + ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(user1, checklistIds); // then assertThat(response.checklists()).hasSize(3); } + @DisplayName("체크리스트 비교 성공 : 순위가 정상적으로 계산된 경우") + @Test + void readChecklistsComparison_compareRank() { + // given + User user1 = UserFixture.USER1; + Room room1 = RoomFixture.ROOM_1; + Room room2 = RoomFixture.ROOM_2; + Room room3 = RoomFixture.ROOM_3; + Checklist checklist1 = createChecklist(user1, room1); + Checklist checklist2 = createChecklist(user1, room2); + Checklist checklist3 = createChecklist(user1, room3); + ChecklistQuestion checklistQuestion1 = new ChecklistQuestion(checklist1, Question.CLEAN_1, Grade.GOOD, null); + ChecklistQuestion checklistQuestion2 = new ChecklistQuestion(checklist2, Question.CLEAN_2, Grade.SOSO, null); + ChecklistQuestion checklistQuestion3 = new ChecklistQuestion(checklist3, Question.CLEAN_3, Grade.BAD, null); + + roomRepository.saveAll(List.of(room1, room2, room3)); + List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + checklistQuestionRepository.saveAll(List.of(checklistQuestion1, checklistQuestion2, checklistQuestion3)); + List checklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), + checklists.get(2).getId()); + + // when + ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(user1, checklistIds); + + // then + assertAll( + () -> assertThat(response.checklists().get(0).getRank()).isEqualTo(1), + () -> assertThat(response.checklists().get(1).getRank()).isEqualTo(2), + () -> assertThat(response.checklists().get(2).getRank()).isEqualTo(3) + ); + } + @DisplayName("체크리스트 비교 실패 : 아이디 개수가 유효하지 않을 때") @Test void readChecklistsComparison_invalidIdCount() { // given + User user1 = UserFixture.USER1; List invalidChecklistIds = List.of(1L, 2L, 3L, 4L); // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + assertThatCode(() -> checklistService.readChecklistsComparison(user1, invalidChecklistIds)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT.getMessage()); } @@ -253,13 +287,13 @@ void readChecklistsComparison_invalidIdCount() { @Test void readChecklistsComparison_invalidId() { // given - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + User user1 = UserFixture.USER1; Room room1 = RoomFixture.ROOM_1; Room room2 = RoomFixture.ROOM_2; Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user, room1); - Checklist checklist2 = createChecklist(user, room2); - Checklist checklist3 = createChecklist(user, room3); + Checklist checklist1 = createChecklist(user1, room1); + Checklist checklist2 = createChecklist(user1, room2); + Checklist checklist3 = createChecklist(user1, room3); roomRepository.saveAll(List.of(room1, room2, room3)); List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); @@ -267,7 +301,7 @@ void readChecklistsComparison_invalidId() { checklists.get(2).getId() + 1); // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + assertThatCode(() -> checklistService.readChecklistsComparison(user1, invalidChecklistIds)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } @@ -276,7 +310,8 @@ void readChecklistsComparison_invalidId() { @Test void updateChecklistById() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST); @@ -285,7 +320,8 @@ void updateChecklistById() { Checklist checklist = checklistRepository.getById(checklistId); assertAll( () -> assertThat(checklist.getRoom().getStructure()).isEqualTo(Structure.OPEN_ONE_ROOM), - () -> assertThat(checklistOptionRepository.findByChecklistId(checklistId).get(3).getOptionId()).isEqualTo(4), + () -> assertThat( + checklistOptionRepository.findByChecklistId(checklistId).get(3).getOptionId()).isEqualTo(4), () -> assertThat(checklist.getQuestions().get(3).getMemo()).isEqualTo("메모") ); } @@ -294,11 +330,13 @@ void updateChecklistById() { @Test void updateChecklistById_invalidQuestionId_exception() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when & then assertThatThrownBy( - () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_QUESTION_ID)) + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @@ -307,11 +345,13 @@ void updateChecklistById_invalidQuestionId_exception() { @Test void updateChecklistById_duplicatedQuestionId_exception() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when & then assertThatThrownBy( - () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); } @@ -320,11 +360,13 @@ void updateChecklistById_duplicatedQuestionId_exception() { @Test void updateChecklistById_invalidOptionId_exception() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when & then assertThatThrownBy( - () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_OPTION_ID)) + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_OPTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); } @@ -333,11 +375,13 @@ void updateChecklistById_invalidOptionId_exception() { @Test void updateChecklistById_duplicatedOptionId_exception() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when & then assertThatThrownBy( - () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DUPLICATED_OPTION_ID)) + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DUPLICATED_OPTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } @@ -346,11 +390,13 @@ void updateChecklistById_duplicatedOptionId_exception() { @Test void updateChecklistById_differentQuestionLength_exception() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when & then assertThatThrownBy( - () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION_LENGTH)) + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION_LENGTH)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); } @@ -359,11 +405,13 @@ void updateChecklistById_differentQuestionLength_exception() { @Test void createChecklist_differentQuestion_exception() { //given - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); //when & then assertThatThrownBy( - () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); } @@ -440,8 +488,8 @@ void deleteChecklistById() { @Test void deleteChecklistById_notFound_exception() { // given & when & then - assertThatThrownBy(() -> checklistService.deleteChecklistById(-1)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + assertThatThrownBy(() -> checklistService.deleteChecklistById(-1)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java index d839907a5..e764995a5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -8,13 +8,13 @@ public class UserFixture { public static final User USER1 = new User(1L, "방방이", "bang-bang@gmail.com"); - public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); + public static final User USER2 = new User(2L, "빵빵이", "bbang-bbang@gmail.com"); public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoResponse("", "", new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), - new ProfileResponse("", "",""))); + new ProfileResponse("", "", ""))); public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER2 = new OauthInfoResponse("", "", new KakaoAccountResponse(USER2.getEmail(), USER2.getName(), - new ProfileResponse("", "",""))); + new ProfileResponse("", "", ""))); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java index 8fac2eb5f..a34ecd82a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java @@ -13,8 +13,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; -import static com.bang_ggood.user.UserFixture.USER1; import static com.bang_ggood.user.UserFixture.OAUTH_INFO_RESPONSE_USER1; +import static com.bang_ggood.user.UserFixture.USER1; import static org.mockito.ArgumentMatchers.any; @ExtendWith(MockitoExtension.class) diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 4348b96c5..707e8fa8b 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -33,7 +33,7 @@ CREATE TABLE users email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - deleted BOOLEAN + deleted BOOLEAN ); CREATE TABLE checklist @@ -47,7 +47,7 @@ CREATE TABLE checklist room_id BIGINT NOT NULL UNIQUE, user_id BIGINT NOT NULL, real_estate VARCHAR(255), - deleted BOOLEAN, + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); @@ -84,7 +84,7 @@ CREATE TABLE category_priority user_id bigint not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, - deleted BOOLEAN, + deleted BOOLEAN, primary key (id), foreign key (user_id) references users ); @@ -96,17 +96,17 @@ CREATE TABLE test_entity name varchar(255) not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, - deleted BOOLEAN, + deleted BOOLEAN, primary key (id) ); CREATE TABLE custom_checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - user_id BIGINT, - question VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (user_id) references users ); From 11913baab2269432b709fee2b3c36148b2211b77 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Tue, 6 Aug 2024 12:09:50 +0900 Subject: [PATCH 131/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EC=97=90=20?= =?UTF-8?q?=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EC=B6=94=EA=B0=80=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=ED=95=9C=EB=8B=A4.=20(#219)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/controller/ChecklistController.java | 3 ++- .../java/com/bang_ggood/checklist/domain/Checklist.java | 2 +- .../java/com/bang_ggood/checklist/domain/Question.java | 7 +++++++ .../dto/response/SelectedChecklistResponse.java | 7 ++++--- .../checklist/repository/ChecklistOptionRepository.java | 9 +++++---- .../repository/ChecklistQuestionRepository.java | 7 ++++++- .../checklist/repository/ChecklistRepository.java | 1 - .../bang_ggood/checklist/service/ChecklistService.java | 8 ++++---- .../room/dto/response/SelectedRoomResponse.java | 4 ++-- .../checklist/service/ChecklistServiceTest.java | 4 ++-- 10 files changed, 33 insertions(+), 19 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 77378119f..5cd8e5cab 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -45,7 +45,8 @@ public ResponseEntity readChecklistQuestions() { @GetMapping("/checklists/{id}") public ResponseEntity readChecklistById(@PathVariable("id") long id) { - return ResponseEntity.ok(checklistService.readChecklistById(id)); + User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + return ResponseEntity.ok(checklistService.readChecklistById(user, id)); } @GetMapping("/checklists") diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index cc5cea5aa..6924df9d7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -163,4 +163,4 @@ public String toString() { ", realEstate='" + realEstate + '\'' + '}'; } -} +} \ No newline at end of file diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 88b1a7f77..574f4baea 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -74,6 +74,13 @@ public static List filter(Category category, List filterWithUnselectedGrade(Category category, + List questions) { + return questions.stream() + .filter(question -> question.getQuestion().isCategory(category)) + .toList(); + } + public static List findQuestionsByCategory(Category category) { return Arrays.stream(values()) .filter(question -> question.getCategory().equals(category)) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java index 0268c85bd..6fe53cb6c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java @@ -2,9 +2,10 @@ import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.room.dto.response.SelectedRoomResponse; - +import java.time.LocalDateTime; import java.util.List; -public record SelectedChecklistResponse(SelectedRoomResponse room, List options, - Integer score, List categories) { +public record SelectedChecklistResponse(Integer score, LocalDateTime createdAt, SelectedRoomResponse room, + List options, + List categories) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index f8d240790..4dd23c9da 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -5,15 +5,16 @@ import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; import java.util.List; public interface ChecklistOptionRepository extends JpaRepository { - @Query("SELECT co FROM ChecklistOption co " + - "WHERE co.checklist.id = :checklistId " + - "AND co.deleted = false") - List findByChecklistId(Long checklistId); + @Query("SELECT co FROM ChecklistOption co " + + "where co.checklist.id = :checklistId " + + "AND co.deleted = false") + List findByChecklistId(@Param("checklistId") long checklistId); @Query("SELECT COUNT(co) FROM ChecklistOption co " + "WHERE co.checklist = :checklist " + diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java index e6001c3e3..d4508608a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java @@ -3,8 +3,13 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ChecklistQuestionRepository extends JpaRepository { - List findByChecklistId(long checklistId); + @Query("SELECT cq FROM ChecklistQuestion cq " + + "WHERE cq.checklist.id = :checklistId " + + "AND cq.deleted = false") + List findByChecklistId(@Param("checklistId") long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index c2be695d8..75d98da0d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -20,7 +20,6 @@ public interface ChecklistRepository extends JpaRepository { + "AND c.deleted = false") Optional findById(@Param("id") long id); - default Checklist getById(long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index d7eddd67c..b733e849c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -168,7 +168,7 @@ private void validateQuestionInvalid(List questions) { } @Transactional - public SelectedChecklistResponse readChecklistById(long id) { + public SelectedChecklistResponse readChecklistById(User user, long id) { Checklist checklist = checklistRepository.getById(id); SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); @@ -179,8 +179,8 @@ public SelectedChecklistResponse readChecklistById(long id) { int checklistScore = ChecklistScore.calculateTotalScore(checklist.getQuestions()); - return new SelectedChecklistResponse(selectedRoomResponse, options, checklistScore, - selectedCategoryQuestionsResponse); + return new SelectedChecklistResponse(checklistScore, checklist.getCreatedAt(), selectedRoomResponse, + options, selectedCategoryQuestionsResponse); } private List readOptionsByChecklistId(long checklistId) { @@ -201,7 +201,7 @@ private List readCategoryQuestionsByChecklist private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category category, List checklistQuestions) { List selectedQuestionResponse = - Question.filter(category, checklistQuestions).stream() + Question.filterWithUnselectedGrade(category, checklistQuestions).stream() .map(SelectedQuestionResponse::of) .toList(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 2a06f5c77..3187303b7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -10,7 +10,7 @@ public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), - checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().name(), - checklist.getRoomStructure().name()); + checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), + checklist.getRoomStructure().getName()); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 5b669767b..d9e799910 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -139,7 +139,7 @@ void readChecklistById() { checklistRepository.save(ChecklistFixture.checklist); // when - SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(1L); + SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(UserFixture.USER1, 1L); // then assertAll( @@ -152,7 +152,7 @@ void readChecklistById() { @Test void readChecklistById_invalidChecklistId_exception() { // given & when & then - assertThatThrownBy(() -> checklistService.readChecklistById(0)) + assertThatThrownBy(() -> checklistService.readChecklistById(UserFixture.USER1, 0)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } From 18d1f2d3f302841dd4d4d5a8fbea447a0643b01a Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:20:21 +0900 Subject: [PATCH 132/348] =?UTF-8?q?[BE]=20=EC=9D=B8=EC=A6=9D=20=EB=A1=9C?= =?UTF-8?q?=EC=A7=81=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?218)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/auth/config/AuthPrincipal.java | 11 +++ .../config/AuthPrincipalArgumentResolver.java | 53 ++++++++++++ .../controller/AuthController.java} | 26 +++--- .../auth/controller/CookieProvider.java | 18 +++++ .../dto/request/OauthLoginRequest.java | 2 +- .../dto/request/OauthTokenRequest.java | 2 +- .../dto/response/KakaoAccountResponse.java | 2 +- .../dto/response/OauthInfoApiResponse.java} | 4 +- .../dto/response/OauthTokenResponse.java | 2 +- .../dto/response/ProfileResponse.java | 2 +- .../bang_ggood/auth/service/AuthService.java | 36 +++++++++ .../{user => auth}/service/AuthUser.java | 2 +- .../service/JwtTokenProvider.java | 29 ++++--- .../{user => auth}/service/OauthClient.java | 12 +-- .../controller/CategoryController.java | 8 +- .../category/service/CategoryService.java | 3 +- .../controller/ChecklistController.java | 1 - .../repository/ChecklistOptionRepository.java | 12 +-- .../repository/ChecklistRepository.java | 3 +- .../checklist/service/ChecklistService.java | 1 + .../com/bang_ggood/config/WebMvcConfig.java | 23 ++++++ .../bang_ggood/exception/ExceptionCode.java | 6 +- .../user/repository/UserRepository.java | 12 ++- .../bang_ggood/user/service/UserService.java | 30 ------- .../java/com/bang_ggood/AcceptanceTest.java | 30 ++++++- .../auth/controller/AuthE2ETest.java | 54 +++++++++++++ .../controller/LoginMockE2ETest.java | 10 +-- .../service/AuthServiceTest.java} | 15 ++-- .../auth/service/JwtTokenProviderTest.java | 81 +++++++++++++++++++ .../category/service/CategoryServiceTest.java | 22 ++++- .../controller/ChecklistE2ETest.java | 9 ++- .../ChecklistOptionRepositoryTest.java | 13 +-- .../repository/ChecklistRepositoryTest.java | 5 ++ .../service/ChecklistServiceTest.java | 13 +++ .../java/com/bang_ggood/user/UserFixture.java | 19 +++-- .../user/controller/UserE2ETest.java | 22 ----- .../UserRepositoryTest.java} | 18 ++--- 37 files changed, 459 insertions(+), 152 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{user/controller/UserController.java => auth/controller/AuthController.java} (50%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/request/OauthLoginRequest.java (80%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/request/OauthTokenRequest.java (91%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/response/KakaoAccountResponse.java (82%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user/dto/response/OauthInfoResponse.java => auth/dto/response/OauthInfoApiResponse.java} (63%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/response/OauthTokenResponse.java (88%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/response/ProfileResponse.java (83%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/service/AuthUser.java (82%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/service/JwtTokenProvider.java (57%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/service/OauthClient.java (86%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java rename backend/bang-ggood/src/test/java/com/bang_ggood/{user => auth}/controller/LoginMockE2ETest.java (83%) rename backend/bang-ggood/src/test/java/com/bang_ggood/{user/service/UserServiceTest.java => auth/service/AuthServiceTest.java} (79%) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java rename backend/bang-ggood/src/test/java/com/bang_ggood/user/{service/JwtTokenProviderTest.java => repository/UserRepositoryTest.java} (51%) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java new file mode 100644 index 000000000..72b096584 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java @@ -0,0 +1,11 @@ +package com.bang_ggood.auth.config; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface AuthPrincipal { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java new file mode 100644 index 000000000..d5cebc6a7 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java @@ -0,0 +1,53 @@ +package com.bang_ggood.auth.config; + +import com.bang_ggood.auth.controller.CookieProvider; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; +import java.util.Arrays; + +@Component +public class AuthPrincipalArgumentResolver implements HandlerMethodArgumentResolver { + + private final AuthService authService; + + public AuthPrincipalArgumentResolver(AuthService authService) { + this.authService = authService; + } + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return User.class.isAssignableFrom(parameter.getParameterType()) + && parameter.hasParameterAnnotation(AuthPrincipal.class); + } + + @Override + public User resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { + HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); + + if (request.getCookies() == null) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_COOKIE_EMPTY); + } + + String token = extractToken(request.getCookies()); + return authService.extractUser(token); + } + + private String extractToken(Cookie[] cookies) { + return Arrays.stream(cookies) + .filter(cookie -> cookie.getName().equals(CookieProvider.TOKEN_COOKIE_NAME)) + .findAny() + .map(Cookie::getValue) + .orElseThrow(() -> new BangggoodException(ExceptionCode.AUTHENTICATION_COOKIE_INVALID)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java similarity index 50% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index bf94bbc94..27a7ea02d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -1,7 +1,7 @@ -package com.bang_ggood.user.controller; +package com.bang_ggood.auth.controller; -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import com.bang_ggood.user.service.UserService; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; import jakarta.validation.Valid; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; @@ -11,24 +11,20 @@ import org.springframework.web.bind.annotation.RestController; @RestController -public class UserController { +public class AuthController { - public static final String TOKEN_COOKIE_NAME = "token"; - private final UserService userService; + private final AuthService authService; + private final CookieProvider cookieProvider; - public UserController(UserService userService) { - this.userService = userService; + public AuthController(AuthService authService, CookieProvider cookieProvider) { + this.authService = authService; + this.cookieProvider = cookieProvider; } @PostMapping("/oauth/login") public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { - String token = userService.login(request); - - ResponseCookie cookie = ResponseCookie - .from(TOKEN_COOKIE_NAME, token) - .httpOnly(true) - .path("/") - .build(); + String token = authService.login(request); + ResponseCookie cookie = cookieProvider.createCookie(token); return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java new file mode 100644 index 000000000..475626af7 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -0,0 +1,18 @@ +package com.bang_ggood.auth.controller; + +import org.springframework.http.ResponseCookie; +import org.springframework.stereotype.Component; + +@Component +public class CookieProvider { + + public static final String TOKEN_COOKIE_NAME = "token"; + + public ResponseCookie createCookie(String token) { + return ResponseCookie + .from(TOKEN_COOKIE_NAME, token) + .httpOnly(true) + .path("/") + .build(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java similarity index 80% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java index c108d4d0a..6123cb9d5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.request; +package com.bang_ggood.auth.dto.request; import jakarta.validation.constraints.NotBlank; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthTokenRequest.java similarity index 91% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthTokenRequest.java index 9c9be194c..c386463f3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthTokenRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.request; +package com.bang_ggood.auth.dto.request; public record OauthTokenRequest(String grantType, String clientId, String redirectUri, String code, String clientSecret) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/KakaoAccountResponse.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/KakaoAccountResponse.java index 7f974b5d5..bd086067f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/KakaoAccountResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java similarity index 63% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java index fd88506e8..92581638c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java @@ -1,10 +1,10 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.bang_ggood.user.domain.User; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; @JsonIgnoreProperties(ignoreUnknown = true) -public record OauthInfoResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { +public record OauthInfoApiResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { public User toUserEntity() { return new User(kakao_account.name(), kakao_account.email()); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthTokenResponse.java similarity index 88% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthTokenResponse.java index 01875b77d..f36551af9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthTokenResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/ProfileResponse.java similarity index 83% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/ProfileResponse.java index 93ef6877d..1151418ee 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/ProfileResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java new file mode 100644 index 000000000..872e06137 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -0,0 +1,36 @@ +package com.bang_ggood.auth.service; + +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.springframework.stereotype.Service; + +@Service +public class AuthService { + + private final OauthClient oauthClient; + private final JwtTokenProvider jwtTokenProvider; + private final UserRepository userRepository; + + public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository) { + this.oauthClient = oauthClient; + this.jwtTokenProvider = jwtTokenProvider; + this.userRepository = userRepository; + } + + public String login(OauthLoginRequest request) { + OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request); + + User user = userRepository.findByEmail(oauthInfoApiResponse.kakao_account().email()) + .orElseGet(() -> userRepository.save(oauthInfoApiResponse.toUserEntity())); + + return jwtTokenProvider.createToken(user); + } + + public User extractUser(String token) { + AuthUser authUser = jwtTokenProvider.resolveToken(token); + + return userRepository.getUserById(authUser.id()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java index caa622bf5..494c32666 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/AuthUser.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.service; +package com.bang_ggood.auth.service; import jakarta.validation.constraints.NotNull; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java similarity index 57% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java index f94f450a9..bb77f213c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/JwtTokenProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java @@ -1,7 +1,11 @@ -package com.bang_ggood.user.service; +package com.bang_ggood.auth.service; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; import org.springframework.beans.factory.annotation.Value; @@ -34,13 +38,20 @@ public String createToken(User user) { } public AuthUser resolveToken(String token) { - Claims claims = Jwts.parserBuilder() - .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) - .build() - .parseClaimsJws(token) - .getBody(); - - Long id = Long.valueOf(claims.getSubject()); - return AuthUser.from(id); + try { + Claims claims = Jwts.parserBuilder() + .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) + .build() + .parseClaimsJws(token) + .getBody(); + + Long id = Long.valueOf(claims.getSubject()); + return AuthUser.from(id); + + } catch (ExpiredJwtException exception) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED); + } catch (JwtException exception) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_INVALID); + } } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/OauthClient.java similarity index 86% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/OauthClient.java index 53d0110fd..10eef945c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/OauthClient.java @@ -1,8 +1,8 @@ -package com.bang_ggood.user.service; +package com.bang_ggood.auth.service; -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import com.bang_ggood.user.dto.response.OauthInfoResponse; -import com.bang_ggood.user.dto.response.OauthTokenResponse; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.auth.dto.response.OauthTokenResponse; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; @@ -38,14 +38,14 @@ public OauthClient( this.clientSecret = clientSecret; } - public OauthInfoResponse requestOauthInfo(OauthLoginRequest request) { + public OauthInfoApiResponse requestOauthInfo(OauthLoginRequest request) { OauthTokenResponse oauthTokenResponse = requestToken(request); return restClient.get() .uri(userInfoRequestUri) .header("Authorization", "Bearer " + oauthTokenResponse.access_token()) .retrieve() - .body(OauthInfoResponse.class); + .body(OauthInfoApiResponse.class); } private OauthTokenResponse requestToken(OauthLoginRequest request) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index 810c07fc1..51d4c121b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,8 +1,10 @@ package com.bang_ggood.category.controller; +import com.bang_ggood.auth.config.AuthPrincipal; import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.service.CategoryService; +import com.bang_ggood.user.domain.User; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -19,13 +21,13 @@ public CategoryController(CategoryService categoryService) { } @PostMapping("/categories/priority") - public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { - categoryService.createCategoriesPriority(request); + public ResponseEntity createCategoriesPriority(@AuthPrincipal User user, @RequestBody CategoryPriorityCreateRequest request) { + categoryService.createCategoriesPriority(user, request); return ResponseEntity.noContent().build(); } @GetMapping("/categories") - public ResponseEntity readCategories() { + public ResponseEntity readCategories(@AuthPrincipal User user) { return ResponseEntity.ok(categoryService.readCategories()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index e57bbe62f..9536c139b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -29,8 +29,7 @@ public CategoryService(CategoryPriorityRepository categoryPriorityRepository) { } @Transactional - public void createCategoriesPriority(CategoryPriorityCreateRequest request) { - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + public void createCategoriesPriority(User user, CategoryPriorityCreateRequest request) { validate(request); List categoryPriorities = request.categoryIds().stream() .map(id -> new CategoryPriority(id, user)) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 5cd8e5cab..e775b0268 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -21,7 +21,6 @@ import java.net.URI; import java.util.List; - @RestController public class ChecklistController { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 4dd23c9da..f72248f3f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -11,20 +11,20 @@ public interface ChecklistOptionRepository extends JpaRepository { - @Query("SELECT co FROM ChecklistOption co " - + "where co.checklist.id = :checklistId " - + "AND co.deleted = false") - List findByChecklistId(@Param("checklistId") long checklistId); + @Query("SELECT co FROM ChecklistOption co " + + "WHERE co.checklist.id = :checklistId " + + "AND co.deleted = false") + List findByChecklistId(@Param("checklistId") Long checklistId); @Query("SELECT COUNT(co) FROM ChecklistOption co " + "WHERE co.checklist = :checklist " + "AND co.deleted = false") - Integer countByChecklist(Checklist checklist); + Integer countByChecklist(@Param("checklist") Checklist checklist); @Modifying @Transactional @Query("UPDATE ChecklistOption co " + "SET co.deleted = true " + "WHERE co.checklist.id = :checklistId") - void deleteAllByChecklistId(Long checklistId); + void deleteAllByChecklistId(@Param("checklistId") Long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 75d98da0d..19e2551a0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -20,7 +20,8 @@ public interface ChecklistRepository extends JpaRepository { + "AND c.deleted = false") Optional findById(@Param("id") long id); - default Checklist getById(long id) { + + default Checklist getById(@Param("id") long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index b733e849c..2a00e9eb5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -278,6 +278,7 @@ private List getCategoryScores(List CategoryScoreReadResponse.of(category, ChecklistScore.calculateCategoryScore(category, questions))) + .filter(response -> response.score() != 0) .toList(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java new file mode 100644 index 000000000..b78195489 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java @@ -0,0 +1,23 @@ +package com.bang_ggood.config; + +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.auth.config.AuthPrincipalArgumentResolver; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.util.List; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + private final AuthService authService; + + public WebMvcConfig(AuthService authService) { + this.authService = authService; + } + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(new AuthPrincipalArgumentResolver(authService)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index dd52a7140..ec4d60865 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -50,7 +50,11 @@ public enum ExceptionCode { SCORE_NOT_DESCENDING_SORTED(HttpStatus.BAD_REQUEST, "정렬되지 않은 점수입니다."), // Auth - OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "토큰을 요청하는 과정에서 예상치 못한 예외가 발생했습니다."); + AUTHENTICATION_COOKIE_EMPTY(HttpStatus.UNAUTHORIZED, "인증 정보가 존재하지 않습니다."), + AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), + AUTHENTICATION_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), + AUTHENTICATION_TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "토큰 정보가 올바르지 않습니다."), + OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java index 596d66744..46587c089 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java @@ -4,6 +4,10 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.Optional; public interface UserRepository extends JpaRepository { @@ -12,5 +16,11 @@ default User getUserById(Long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); } - Optional findByEmail(String email); + @Query("SELECT u FROM User u WHERE u.email = :email and u.deleted = false ") + Optional findByEmail(@Param("email") String email); + + @Transactional + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Query("UPDATE User u SET u.deleted = true ") + void deleteByUser(@Param("user") User user); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java deleted file mode 100644 index 903b1dc75..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.bang_ggood.user.service; - -import com.bang_ggood.user.domain.User; -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import com.bang_ggood.user.dto.response.OauthInfoResponse; -import com.bang_ggood.user.repository.UserRepository; -import org.springframework.stereotype.Service; - -@Service -public class UserService { - - private final OauthClient oauthClient; - private final JwtTokenProvider jwtTokenProvider; - private final UserRepository userRepository; - - public UserService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository) { - this.oauthClient = oauthClient; - this.jwtTokenProvider = jwtTokenProvider; - this.userRepository = userRepository; - } - - public String login(OauthLoginRequest request) { - OauthInfoResponse oauthInfoResponse = oauthClient.requestOauthInfo(request); - - User user = userRepository.findByEmail(oauthInfoResponse.kakao_account().email()) - .orElseGet(() -> userRepository.save(oauthInfoResponse.toUserEntity())); - - return jwtTokenProvider.createToken(user); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java index b03d6c029..76252f737 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java @@ -1,22 +1,50 @@ package com.bang_ggood; +import com.bang_ggood.auth.controller.CookieProvider; +import com.bang_ggood.auth.service.JwtTokenProvider; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.ResponseCookie; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.jdbc.Sql; +import static com.bang_ggood.user.UserFixture.USER1; + @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Sql(scripts = {"/schema-test.sql", "/data-test.sql"}) public abstract class AcceptanceTest { + @Autowired + private JwtTokenProvider jwtTokenProvider; + @Autowired + private CookieProvider cookieProvider; + @Autowired + private UserRepository userRepository; + + protected ResponseCookie responseCookie; + @LocalServerPort private int port; @BeforeEach - void setPort() { + void setUp() { + setPort(); + setResponseCookie(); + } + + private void setPort() { RestAssured.port = port; } + + private void setResponseCookie() { + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + responseCookie = cookieProvider.createCookie(token); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java new file mode 100644 index 000000000..39776a0c1 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -0,0 +1,54 @@ +package com.bang_ggood.auth.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.exception.ExceptionCode; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.http.HttpHeaders; + +import static org.hamcrest.Matchers.containsString; + +class AuthE2ETest extends AcceptanceTest { + + @DisplayName("로그인 실패 : 인가코드가 없는 경우") + @Test + void login_code_notBlank_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(new OauthLoginRequest("")) + .when().post("/oauth/login") + .then().log().all() + .statusCode(400); + } + + @DisplayName("인증 실패 : 쿠키가 없는 경우") + @Test + void authentication_no_cookie_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, null)) + .when().post("/categories/priority") + .then().log().all() + .statusCode(401) + .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_EMPTY.getMessage())); + } + + @DisplayName("인증 실패 : 쿠키가 잘못된 형태로 들어간 경우") + @Test + void authentication_invalid_cookie_exception() { + String testToken = "token"; + String expectedCookie = "invalidToken=" + testToken + "; Path=/; HttpOnly"; + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, expectedCookie)) + .when().post("/categories/priority") + .then().log().all() + .statusCode(401) + .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_INVALID.getMessage())); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java similarity index 83% rename from backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java rename to backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java index 61a70ac06..b528d13ed 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/LoginMockE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java @@ -1,8 +1,8 @@ -package com.bang_ggood.user.controller; +package com.bang_ggood.auth.controller; import com.bang_ggood.AcceptanceMockTestSupport; -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import com.bang_ggood.user.service.UserService; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.Mockito; @@ -18,13 +18,13 @@ class LoginMockE2ETest extends AcceptanceMockTestSupport { @MockBean - UserService userService; + AuthService authService; @DisplayName("로그인 성공") @Test void login() throws Exception { String testToken = "testToken"; - Mockito.when(userService.login(any(OauthLoginRequest.class))).thenReturn(testToken); + Mockito.when(authService.login(any(OauthLoginRequest.class))).thenReturn(testToken); mockMvc.perform(post("/oauth/login") .contentType(MediaType.APPLICATION_JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java similarity index 79% rename from backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java rename to backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index a34ecd82a..128e22272 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/UserServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -1,8 +1,8 @@ -package com.bang_ggood.user.service; +package com.bang_ggood.auth.service; import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; import com.bang_ggood.user.UserFixture; -import com.bang_ggood.user.dto.request.OauthLoginRequest; import com.bang_ggood.user.repository.UserRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -13,18 +13,17 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.mock.mockito.MockBean; -import static com.bang_ggood.user.UserFixture.OAUTH_INFO_RESPONSE_USER1; import static com.bang_ggood.user.UserFixture.USER1; import static org.mockito.ArgumentMatchers.any; @ExtendWith(MockitoExtension.class) -class UserServiceTest extends IntegrationTestSupport { +class AuthServiceTest extends IntegrationTestSupport { @MockBean private OauthClient oauthClient; @Autowired - private UserService userService; + private AuthService authService; @Autowired private UserRepository userRepository; @@ -39,7 +38,7 @@ void login_signup() { .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER2); // when - String token = userService.login(oauthLoginRequest); + String token = authService.login(oauthLoginRequest); // then Assertions.assertThat(token).isNotBlank(); @@ -51,10 +50,10 @@ void login() { // given userRepository.save(USER1); Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) - .thenReturn(OAUTH_INFO_RESPONSE_USER1); + .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER1); // when - String token = userService.login(oauthLoginRequest); + String token = authService.login(oauthLoginRequest); // then Assertions.assertThat(token).isNotBlank(); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java new file mode 100644 index 000000000..fd8b760d7 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java @@ -0,0 +1,81 @@ +package com.bang_ggood.auth.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static com.bang_ggood.user.UserFixture.USER1; + +class JwtTokenProviderTest extends IntegrationTestSupport { + + @Autowired + private JwtTokenProvider jwtTokenProvider; + @Autowired + private UserRepository userRepository; + + @DisplayName("토큰 생성 성공") + @Test + void createToken() { + // given + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + + // when + AuthUser authUser = jwtTokenProvider.resolveToken(token); + + // then + Assertions.assertThat(authUser.id()).isEqualTo(user.getId()); + } + + @DisplayName("토큰 획인 실패 : 유효시간이 지난 경우") + @Test + void resolveToken_expiredTime_exception() { + // given + String JWT_SECRET_KEY = "A".repeat(32); + int JWT_ACCESS_TOKEN_EXPIRE_LENGTH = 1; + JwtTokenProvider expiredJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); + + User user = userRepository.save(USER1); + String token = expiredJwtTokenProvider.createToken(user); + + // when & then + Assertions.assertThatCode(() -> expiredJwtTokenProvider.resolveToken(token)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED.getMessage()); + } + + @DisplayName("토큰 확인 실패 : 시그니처가 잘못된 경우") + @Test + void resolveToken_invalidSignature_exception() { + // given + String JWT_SECRET_KEY = "A".repeat(32); + int JWT_ACCESS_TOKEN_EXPIRE_LENGTH = 1800000; + JwtTokenProvider invalidJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); + + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + + // when & then + Assertions.assertThatCode(() -> invalidJwtTokenProvider.resolveToken(token)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_INVALID.getMessage()); + } + + @DisplayName("토큰 확인 실패 : 토큰 형태가 잘못된 경우") + @Test + void resolveToken_invalidToken_exception() { + // given + String invalidToken = "malformed"; + + // when & then + Assertions.assertThatCode(() -> jwtTokenProvider.resolveToken(invalidToken)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index b79398d39..92148990f 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -5,6 +5,9 @@ import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -21,15 +24,20 @@ class CategoryServiceTest extends IntegrationTestSupport { @Autowired CategoryService categoryService; + @Autowired + UserRepository userRepository; @DisplayName("카테고리 우선순위 저장 성공") @Test void createCategoriesPriority() { // given + User user = UserFixture.USER1; + userRepository.save(user); + CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3)); // when && then - assertThatCode(() -> categoryService.createCategoriesPriority(request)) + assertThatCode(() -> categoryService.createCategoriesPriority(user, request)) .doesNotThrowAnyException(); } @@ -37,10 +45,12 @@ void createCategoriesPriority() { @Test void createCategoriesPriority_invalidId_exception() { // given + User user = UserFixture.USER1; + userRepository.save(user); CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(999)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(user, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_NOT_FOUND.getMessage()); } @@ -49,10 +59,12 @@ void createCategoriesPriority_invalidId_exception() { @Test void createCategoriesPriority_overMaxCount_exception() { // given + User user = UserFixture.USER1; + userRepository.save(user); CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(user, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); } @@ -61,10 +73,12 @@ void createCategoriesPriority_overMaxCount_exception() { @Test void createCategoriesPriority_duplication_exception() { // given + User user = UserFixture.USER1; + userRepository.save(user); CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 1)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(user, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_DUPLICATED.getMessage()); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 39f76fb66..a2ebced70 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -13,10 +13,12 @@ import com.bang_ggood.user.UserFixture; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import io.restassured.http.Header; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; import java.util.HashMap; import java.util.List; import java.util.Map; @@ -24,14 +26,12 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; -public class ChecklistE2ETest extends AcceptanceTest { +class ChecklistE2ETest extends AcceptanceTest { @Autowired private ChecklistService checklistService; - @Autowired private ChecklistRepository checklistRepository; - @Autowired private RoomRepository roomRepository; @@ -40,6 +40,7 @@ public class ChecklistE2ETest extends AcceptanceTest { void createChecklist() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) .when().post("/checklists") .then().log().all() @@ -51,6 +52,7 @@ void createChecklist() { void createChecklist_noRoomName_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) .when().post("/checklists") .then().log().all() @@ -62,6 +64,7 @@ void createChecklist_noRoomName_exception() { void createChecklist_noQuestionId_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) .when().post("/checklists") .then().log().all() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java index 0892b801e..5a17f0d67 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java @@ -2,20 +2,18 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.checklist.ChecklistFixture; -import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.user.UserFixture; -import org.assertj.core.api.Assertions; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; - import java.util.List; -import static org.assertj.core.api.Assertions.*; -import static org.junit.jupiter.api.Assertions.*; +import static org.assertj.core.api.Assertions.assertThat; class ChecklistOptionRepositoryTest extends IntegrationTestSupport { @@ -27,12 +25,15 @@ class ChecklistOptionRepositoryTest extends IntegrationTestSupport { @Autowired private ChecklistOptionRepository checklistOptionRepository; + @Autowired + private UserRepository userRepository; private long checklistId; @BeforeEach void setUp() { - checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + User user = userRepository.save(UserFixture.USER1); + checklistId = checklistService.createChecklist(user, ChecklistFixture.CHECKLIST_CREATE_REQUEST); } @DisplayName("체크리스트 ID로 옵션 찾기 성공") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index aa5691f8c..6dc208e92 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -8,6 +8,7 @@ import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -27,8 +28,12 @@ class ChecklistRepositoryTest extends IntegrationTestSupport { @Autowired private RoomRepository roomRepository; + @Autowired + private UserRepository userRepository; + @BeforeEach void setUp() { + userRepository.save(UserFixture.USER1); roomRepository.save(RoomFixture.ROOM_1); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index d9e799910..abde78c11 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -24,6 +24,8 @@ import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -59,6 +61,17 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private ChecklistOptionRepository checklistOptionRepository; + @Autowired + private UserRepository userRepository; + + @BeforeEach() + public void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + roomRepository.save(RoomFixture.ROOM_2); + roomRepository.save(RoomFixture.ROOM_3); + } + @DisplayName("체크리스트 방 정보 작성 성공") @Test void createChecklist() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java index e764995a5..c70164107 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -1,20 +1,19 @@ package com.bang_ggood.user; +import com.bang_ggood.auth.dto.response.KakaoAccountResponse; +import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.auth.dto.response.ProfileResponse; import com.bang_ggood.user.domain.User; -import com.bang_ggood.user.dto.response.KakaoAccountResponse; -import com.bang_ggood.user.dto.response.OauthInfoResponse; -import com.bang_ggood.user.dto.response.ProfileResponse; public class UserFixture { - public static final User USER1 = new User(1L, "방방이", "bang-bang@gmail.com"); - public static final User USER2 = new User(2L, "빵빵이", "bbang-bbang@gmail.com"); - public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoResponse("", "", + public static final User USER1 = new User("방방이", "bang-bang@gmail.com"); + public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); + public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoApiResponse("", "", new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), - new ProfileResponse("", "", ""))); + new ProfileResponse("", "",""))); - public static final OauthInfoResponse OAUTH_INFO_RESPONSE_USER2 = new OauthInfoResponse("", "", + public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER2 = new OauthInfoApiResponse("", "", new KakaoAccountResponse(USER2.getEmail(), USER2.getName(), - new ProfileResponse("", "", ""))); - + new ProfileResponse("", "",""))); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java deleted file mode 100644 index 929cb3023..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ /dev/null @@ -1,22 +0,0 @@ -package com.bang_ggood.user.controller; - -import com.bang_ggood.AcceptanceTest; -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import io.restassured.RestAssured; -import io.restassured.http.ContentType; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -class UserE2ETest extends AcceptanceTest { - - @DisplayName("로그인 실패 : 인가코드가 없는 경우") - @Test - void login_code_notBlank_exception() { - RestAssured.given().log().all() - .contentType(ContentType.JSON) - .body(new OauthLoginRequest("")) - .when().post("/oauth/login") - .then().log().all() - .statusCode(400); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java similarity index 51% rename from backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java rename to backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java index ed28534ca..62a3572d4 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/service/JwtTokenProviderTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java @@ -1,33 +1,31 @@ -package com.bang_ggood.user.service; +package com.bang_ggood.user.repository; import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.user.domain.User; -import com.bang_ggood.user.repository.UserRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Optional; import static com.bang_ggood.user.UserFixture.USER1; -class JwtTokenProviderTest extends IntegrationTestSupport { +class UserRepositoryTest extends IntegrationTestSupport { - @Autowired - private JwtTokenProvider jwtTokenProvider; @Autowired private UserRepository userRepository; - @DisplayName("토큰 생성 성공") + @DisplayName("유저 이메일 조회 성공 : 유저 삭제 후 유저를 조회하면(논리적 삭제) 조회되지 않는다.") @Test - void createToken() { + void findByEmail() { // given User user = userRepository.save(USER1); - String token = jwtTokenProvider.createToken(user); + userRepository.deleteByUser(user); // when - AuthUser authUser = jwtTokenProvider.resolveToken(token); + Optional findUser = userRepository.findByEmail(user.getEmail()); // then - Assertions.assertThat(authUser.id()).isEqualTo(user.getId()); + Assertions.assertThat(findUser).isEmpty(); } } From 86e2af8d1cf4cf52c34fe846abcf953c0d20be1b Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:26:33 +0900 Subject: [PATCH 133/348] =?UTF-8?q?[BE]=20API=EC=97=90=20=EC=9D=B8?= =?UTF-8?q?=EC=A6=9D=20=EB=A1=9C=EC=A7=81=EC=9D=84=20=EC=B6=94=EA=B0=80?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#236)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../main/java/com/bang_ggood/BaseEntity.java | 4 +++ .../controller/ChecklistController.java | 28 +++++++++---------- .../checklist/service/ChecklistService.java | 6 ++-- .../controller/ChecklistE2ETest.java | 20 +++++++++---- .../service/ChecklistServiceTest.java | 19 +++++++------ 5 files changed, 46 insertions(+), 31 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java index 5e85375c5..81182c068 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java @@ -27,6 +27,10 @@ public LocalDateTime getModifiedAt() { return modifiedAt; } + public void delete() { + this.deleted = true; + } + public boolean isDeleted() { return deleted; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index e775b0268..b156c5d5a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,5 +1,6 @@ package com.bang_ggood.checklist.controller; +import com.bang_ggood.auth.config.AuthPrincipal; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; @@ -21,6 +22,7 @@ import java.net.URI; import java.util.List; + @RestController public class ChecklistController { @@ -38,44 +40,42 @@ public ResponseEntity createChecklist(@Valid @RequestBody ChecklistRequest } @GetMapping("/checklists/questions") - public ResponseEntity readChecklistQuestions() { - return ResponseEntity.ok(checklistService.readChecklistQuestions()); + public ResponseEntity readChecklistQuestions(@AuthPrincipal User user) { + return ResponseEntity.ok(checklistService.readChecklistQuestions(user)); } @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@PathVariable("id") long id) { - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + public ResponseEntity readChecklistById(@AuthPrincipal User user, @PathVariable("id") long id) { return ResponseEntity.ok(checklistService.readChecklistById(user, id)); } @GetMapping("/checklists") - public ResponseEntity readUserChecklistsPreview() { - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + public ResponseEntity readUserChecklistsPreview(@AuthPrincipal User user) { return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); } @GetMapping("/checklists/comparison") - public ResponseEntity readChecklistsComparison( - @RequestParam("id") List checklistIds) { - User user = new User(1L, "방끗", "bang-ggood@gmail.com"); + public ResponseEntity readChecklistsComparison(@AuthPrincipal User user, @RequestParam("id") List checklistIds) { return ResponseEntity.ok(checklistService.readChecklistsComparison(user, checklistIds)); } @PutMapping("/checklists/{id}") - public ResponseEntity updateChecklistById(@PathVariable("id") long id, @Valid @RequestBody ChecklistRequest checklistRequest) { - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + public ResponseEntity updateChecklistById( + @AuthPrincipal User user, + @PathVariable("id") long id, + @Valid @RequestBody ChecklistRequest checklistRequest) { checklistService.updateChecklistById(user, id, checklistRequest); return ResponseEntity.noContent().build(); } @PutMapping("/custom-checklist") - public ResponseEntity updateCustomChecklist(@RequestBody CustomChecklistUpdateRequest request) { - checklistService.updateCustomChecklist(request); + public ResponseEntity updateCustomChecklist(@AuthPrincipal User user, @RequestBody CustomChecklistUpdateRequest request) { + checklistService.updateCustomChecklist(user, request); return ResponseEntity.noContent().build(); } @DeleteMapping("/checklists/{id}") - public ResponseEntity deleteChecklistById(@PathVariable("id") long id) { + public ResponseEntity deleteChecklistById(@AuthPrincipal User user, @PathVariable("id") long id) { checklistService.deleteChecklistById(id); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 2a00e9eb5..d8e941b31 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -126,8 +126,7 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli } @Transactional - public ChecklistQuestionsResponse readChecklistQuestions() { - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + public ChecklistQuestionsResponse readChecklistQuestions(User user) { List customChecklistQuestions = customChecklistQuestionRepository.findByUser(user); Map> categoryQuestions = customChecklistQuestions.stream() @@ -355,12 +354,11 @@ private void validateSameQuestions(List questions, List questionIds = request.questionIds(); validateCustomChecklistQuestionsIsNotEmpty(questionIds); validateCustomChecklistQuestionsDuplication(questionIds); - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); customChecklistQuestionRepository.deleteAllByUser(user); List customChecklistQuestions = questionIds.stream() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index a2ebced70..ba07d1c7b 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -4,13 +4,13 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; -import com.bang_ggood.user.UserFixture; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; @@ -23,6 +23,7 @@ import java.util.List; import java.util.Map; +import static com.bang_ggood.user.UserFixture.USER1; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; @@ -74,8 +75,11 @@ void createChecklist_noQuestionId_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { + checklistService.updateCustomChecklist(USER1, new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); + ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/questions") .then().log().all() .statusCode(200) @@ -88,10 +92,11 @@ void readChecklistQuestions() { @DisplayName("작성된 체크리스트 조회 성공") @Test void readChecklistById() { - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); SelectedChecklistResponse selectedChecklistResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/" + checklistId) .then().log().all() .statusCode(200) @@ -107,10 +112,11 @@ void readChecklistById() { @DisplayName("체크리스트 수정 성공") @Test void updateChecklist() { - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST) .when().put("/checklists/" + checklistId) .then().log().all() @@ -120,10 +126,11 @@ void updateChecklist() { @DisplayName("체크리스트 수정 실패: 방 이름을 넣지 않은 경우") @Test void updateChecklist_noRoomName_exception() { - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST_NO_ROOM_NAME) .when().put("/checklists/" + checklistId) .then().log().all() @@ -134,10 +141,11 @@ void updateChecklist_noRoomName_exception() { @DisplayName("체크리스트 수정 실패: 질문 ID를 넣지 않은 경우") @Test void updateChecklist_noQuestionId_exception() { - long checklistId = checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST_NO_QUESTION_ID) .when().put("/checklists/" + checklistId) .then().log().all() @@ -153,6 +161,7 @@ void updateCustomChecklist() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(params) .when().put("/custom-checklist") .then().log().all() @@ -167,6 +176,7 @@ void deleteChecklistById() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().delete("/checklists/" + saved.getId()) .then().log().all() .statusCode(204); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index abde78c11..4e14b8cbe 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -35,6 +35,7 @@ import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; +import static com.bang_ggood.user.UserFixture.USER1; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -137,8 +138,11 @@ void createChecklist_duplicatedOptionId_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { + // TODO : 유저 생성 시 default 질문을 DB에 저장하는 기능 추가 + checklistService.updateCustomChecklist(USER1, + new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); // given & when - ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(); + ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(USER1); // then // Category.OPTION does not have default question assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); @@ -287,11 +291,10 @@ void readChecklistsComparison_compareRank() { @Test void readChecklistsComparison_invalidIdCount() { // given - User user1 = UserFixture.USER1; List invalidChecklistIds = List.of(1L, 2L, 3L, 4L); // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(user1, invalidChecklistIds)) + assertThatCode(() -> checklistService.readChecklistsComparison(USER1, invalidChecklistIds)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT.getMessage()); } @@ -436,10 +439,10 @@ void updateCustomChecklist() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST; // when - checklistService.updateCustomChecklist(request); + checklistService.updateCustomChecklist(USER1, request); // then - assertThat(customChecklistQuestionRepository.findByUser(new User(1L, "방방이", "bang-ggood@gmail.com"))) + assertThat(customChecklistQuestionRepository.findByUser(USER1)) .hasSize(request.questionIds().size()); } @@ -450,7 +453,7 @@ void updateCustomChecklist_empty_exception() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; // when & then - assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + assertThatThrownBy(() -> checklistService.updateCustomChecklist(USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CUSTOM_CHECKLIST_QUESTION_EMPTY.getMessage()); } @@ -462,7 +465,7 @@ void updateCustomChecklist_duplicatedQuestion_exception() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; // when & then - assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + assertThatThrownBy(() -> checklistService.updateCustomChecklist(USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); } @@ -474,7 +477,7 @@ void updateCustomChecklist_invalidQuestionId_exception() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; // when & then - assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + assertThatThrownBy(() -> checklistService.updateCustomChecklist(USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } From 7f4a8bb73731a846a8dd00caf93ad2dfa5dc6e63 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:37:03 +0900 Subject: [PATCH 134/348] =?UTF-8?q?[BE]=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EB=94=94=ED=8F=B4=ED=8A=B8=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8?= =?UTF-8?q?=EB=93=A4=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?238)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: tsulocalize --- .../bang_ggood/auth/service/AuthService.java | 26 +++++- .../controller/ChecklistController.java | 1 - .../bang_ggood/checklist/domain/Question.java | 90 ++++++++++--------- .../category/service/CategoryServiceTest.java | 24 +++-- .../user/repository/UserRepositoryTest.java | 3 +- 5 files changed, 84 insertions(+), 60 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 872e06137..b541c285c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -2,9 +2,13 @@ import com.bang_ggood.auth.dto.request.OauthLoginRequest; import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; +import java.util.List; @Service public class AuthService { @@ -12,22 +16,40 @@ public class AuthService { private final OauthClient oauthClient; private final JwtTokenProvider jwtTokenProvider; private final UserRepository userRepository; + private final CustomChecklistQuestionRepository customChecklistQuestionRepository; - public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository) { + public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository, + CustomChecklistQuestionRepository customChecklistQuestionRepository) { this.oauthClient = oauthClient; this.jwtTokenProvider = jwtTokenProvider; this.userRepository = userRepository; + this.customChecklistQuestionRepository = customChecklistQuestionRepository; } public String login(OauthLoginRequest request) { OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request); User user = userRepository.findByEmail(oauthInfoApiResponse.kakao_account().email()) - .orElseGet(() -> userRepository.save(oauthInfoApiResponse.toUserEntity())); + .orElseGet(() -> signUp(oauthInfoApiResponse)); return jwtTokenProvider.createToken(user); } + private User signUp(OauthInfoApiResponse oauthInfoApiResponse) { + User user = userRepository.save(oauthInfoApiResponse.toUserEntity()); + createDefaultChecklistQuestions(user); + return user; + } + + private void createDefaultChecklistQuestions(User user) { //TODO 리팩토링 필요 + List checklistQuestions = Question.findDefaultQuestions() + .stream() + .map(question -> new CustomChecklistQuestion(user, question)) + .toList(); + + customChecklistQuestionRepository.saveAll(checklistQuestions); + } + public User extractUser(String token) { AuthUser authUser = jwtTokenProvider.resolveToken(token); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index b156c5d5a..4a0816b66 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -22,7 +22,6 @@ import java.net.URI; import java.util.List; - @RestController public class ChecklistController { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 574f4baea..43daeb5c6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -5,60 +5,60 @@ import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; public enum Question { - CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요."), - CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요."), - CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null), - CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요."), - CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요."), - - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요."), - ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null), - ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null), - ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null), - ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null), - ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null), - - AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null), - AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null), - AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null), - - OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요."), - OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null), - - ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null), - ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요."), - ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요."), - ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요."), - ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null), - ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null), - - SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null), - SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null), - SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null), - SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null), - SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null), - SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null), - SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null), - SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null), - - ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요."), - ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요."); + CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", true), + CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", false), + CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null, false), + CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.", true), + CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", false), + + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.", true), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null, true), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null, true), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, false), + ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null, false), + ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, false), + + AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null, true), + AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null, false), + AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null, false), + + OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.", false), + OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null, false), + + ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null, false), + ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.", true), + ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.", true), + ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", false), + ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null, false), + ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null, false), + + SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, true), + SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null, false), + SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null, true), + SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null, false), + SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null, false), + SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, false), + SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null, false), + SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null, false), + + ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.", true), + ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.", false); private final int id; private final Category category; private final String title; private final String subtitle; + private final boolean isDefault; - - Question(int id, Category category, String title, String subtitle) { + Question(int id, Category category, String title, String subtitle, boolean isDefault) { this.id = id; this.category = category; this.title = title; this.subtitle = subtitle; + this.isDefault = isDefault; } public static Question fromId(int id) { @@ -84,7 +84,13 @@ public static List filterWithUnselectedGrade(Category categor public static List findQuestionsByCategory(Category category) { return Arrays.stream(values()) .filter(question -> question.getCategory().equals(category)) - .collect(Collectors.toList()); + .toList(); + } + + public static List findDefaultQuestions() { + return Arrays.stream(values()) + .filter(question -> question.isDefault) + .toList(); } public static boolean contains(int id) { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index 92148990f..829362501 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -6,8 +6,8 @@ import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.user.UserFixture; -import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -27,17 +27,19 @@ class CategoryServiceTest extends IntegrationTestSupport { @Autowired UserRepository userRepository; + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + } + @DisplayName("카테고리 우선순위 저장 성공") @Test void createCategoriesPriority() { // given - User user = UserFixture.USER1; - userRepository.save(user); - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3)); // when && then - assertThatCode(() -> categoryService.createCategoriesPriority(user, request)) + assertThatCode(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .doesNotThrowAnyException(); } @@ -45,12 +47,10 @@ void createCategoriesPriority() { @Test void createCategoriesPriority_invalidId_exception() { // given - User user = UserFixture.USER1; - userRepository.save(user); CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(999)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(user, request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_NOT_FOUND.getMessage()); } @@ -59,12 +59,10 @@ void createCategoriesPriority_invalidId_exception() { @Test void createCategoriesPriority_overMaxCount_exception() { // given - User user = UserFixture.USER1; - userRepository.save(user); CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(user, request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); } @@ -73,12 +71,10 @@ void createCategoriesPriority_overMaxCount_exception() { @Test void createCategoriesPriority_duplication_exception() { // given - User user = UserFixture.USER1; - userRepository.save(user); CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 1)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(user, request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_DUPLICATED.getMessage()); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java index 62a3572d4..8fc328dfc 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java @@ -1,7 +1,8 @@ -package com.bang_ggood.user.repository; +package com.bang_ggood.user.service; import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; From a059778713ea19e734b9b608912f3415e7e66a76 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 6 Aug 2024 14:39:54 +0900 Subject: [PATCH 135/348] =?UTF-8?q?style:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/checklist/controller/ChecklistController.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 4a0816b66..64b3d2b8f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -32,8 +32,7 @@ public ChecklistController(ChecklistService checklistService) { } @PostMapping("/checklists") - public ResponseEntity createChecklist(@Valid @RequestBody ChecklistRequest checklistRequest) { - User user = new User(1L, "방방이", "bang-ggood@gmail.com"); + public ResponseEntity createChecklist(@AuthPrincipal User user, @Valid @RequestBody ChecklistRequest checklistRequest) { long checklistId = checklistService.createChecklist(user, checklistRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } From 6c0716cbd1d1d9ed0b769537a6ed841461cfcf6c Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 6 Aug 2024 14:44:16 +0900 Subject: [PATCH 136/348] =?UTF-8?q?dev-be=20=EB=B8=8C=EB=9E=9C=EC=B9=98?= =?UTF-8?q?=EC=99=80=20dev=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EB=A5=BC=20?= =?UTF-8?q?=ED=95=A9=EC=B9=9C=EB=8B=A4.=20(#242)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: tsulocalize Co-authored-by: gmuz1c Co-authored-by: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Co-authored-by: tsulocalize --- backend/bang-ggood/build.gradle | 4 + .../main/java/com/bang_ggood/BaseEntity.java | 4 + .../bang_ggood/auth/config/AuthPrincipal.java | 11 + .../config/AuthPrincipalArgumentResolver.java | 53 ++++ .../auth/controller/AuthController.java | 31 +++ .../auth/controller/CookieProvider.java | 18 ++ .../auth/dto/request/OauthLoginRequest.java | 6 + .../dto/request/OauthTokenRequest.java | 2 +- .../dto/response/KakaoAccountResponse.java | 2 +- .../dto/response/OauthInfoApiResponse.java | 12 + .../dto/response/OauthTokenResponse.java | 2 +- .../dto/response/ProfileResponse.java | 2 +- .../bang_ggood/auth/service/AuthService.java | 58 ++++ .../com/bang_ggood/auth/service/AuthUser.java | 10 + .../auth/service/JwtTokenProvider.java | 57 ++++ .../{user => auth}/service/OauthClient.java | 16 +- .../controller/CategoryController.java | 10 +- .../com/bang_ggood/category/domain/Badge.java | 24 +- .../dto/CategoryQuestionsResponse.java | 8 - .../WrittenCategoryQuestionsResponse.java | 17 -- .../category/service/CategoryService.java | 10 +- .../controller/ChecklistController.java | 50 ++-- .../checklist/domain/Checklist.java | 30 ++- .../checklist/domain/ChecklistQuestion.java | 11 + .../checklist/domain/ChecklistRank.java | 15 ++ .../bang_ggood/checklist/domain/Grade.java | 2 +- .../bang_ggood/checklist/domain/Question.java | 97 ++++--- ...eateRequest.java => ChecklistRequest.java} | 6 +- .../dto/request/QuestionCreateRequest.java | 6 - .../dto/request/QuestionRequest.java | 6 + .../checklist/dto/response/BadgeResponse.java | 4 +- .../ChecklistWithScoreReadResponse.java | 69 +++-- .../response/SelectedChecklistResponse.java | 7 +- .../UserChecklistPreviewResponse.java | 1 - .../response/WrittenChecklistResponse.java | 9 - .../dto/response/WrittenQuestionResponse.java | 15 -- .../repository/ChecklistOptionRepository.java | 21 +- .../ChecklistQuestionRepository.java | 7 +- .../repository/ChecklistRepository.java | 33 ++- .../checklist/service/ChecklistService.java | 163 +++++++++--- .../com/bang_ggood/config/WebMvcConfig.java | 23 ++ .../bang_ggood/exception/ExceptionCode.java | 10 +- .../handler/GlobalExceptionHandler.java | 2 +- .../java/com/bang_ggood/room/domain/Room.java | 12 + ...oomCreateRequest.java => RoomRequest.java} | 8 +- .../dto/response/SelectedRoomResponse.java | 8 +- .../dto/response/WrittenRoomResponse.java | 12 - .../user/controller/UserController.java | 21 -- .../java/com/bang_ggood/user/domain/User.java | 20 +- .../user/dto/request/OauthLoginRequest.java | 4 - .../user/dto/response/OauthInfoResponse.java | 7 - .../user/repository/UserRepository.java | 13 + .../bang_ggood/user/service/UserService.java | 18 -- .../bang-ggood/src/main/resources/data.sql | 4 +- .../bang-ggood/src/main/resources/schema.sql | 62 +++-- .../bang_ggood/AcceptanceMockTestSupport.java | 26 ++ .../java/com/bang_ggood/AcceptanceTest.java | 30 ++- .../auth/controller/AuthE2ETest.java | 54 ++++ .../auth/controller/LoginMockE2ETest.java | 35 +++ .../auth/service/AuthServiceTest.java | 61 +++++ .../auth/service/JwtTokenProviderTest.java | 81 ++++++ .../category/service/CategoryServiceTest.java | 18 +- .../checklist/ChecklistFixture.java | 112 ++++++-- .../controller/ChecklistE2ETest.java | 87 +++++- .../domain/ChecklistQuestionTest.java | 34 +++ .../checklist/domain/ChecklistRankTest.java | 84 ++++++ .../checklist/domain/QuestionTest.java | 5 +- .../checklist/option/OptionTest.java | 4 +- .../ChecklistOptionRepositoryTest.java | 78 ++++++ .../repository/ChecklistRepositoryTest.java | 103 ++++++++ .../service/ChecklistServiceTest.java | 248 ++++++++++++++++-- .../java/com/bang_ggood/room/RoomFixture.java | 12 +- .../java/com/bang_ggood/user/UserFixture.java | 19 ++ .../user/repository/UserRepositoryTest.java | 32 +++ .../src/test/resources/data-test.sql | 4 +- .../src/test/resources/schema-test.sql | 21 +- 76 files changed, 1879 insertions(+), 402 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/request/OauthTokenRequest.java (91%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/response/KakaoAccountResponse.java (82%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/response/OauthTokenResponse.java (88%) rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/dto/response/ProfileResponse.java (83%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java rename backend/bang-ggood/src/main/java/com/bang_ggood/{user => auth}/service/OauthClient.java (81%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/{ChecklistCreateRequest.java => ChecklistRequest.java} (61%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java rename backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/{RoomCreateRequest.java => RoomRequest.java} (53%) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 543fff752..bce95f210 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -22,7 +22,11 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'io.jsonwebtoken:jjwt-api:0.11.2' + implementation 'io.jsonwebtoken:jjwt-impl:0.11.2' + implementation 'io.jsonwebtoken:jjwt-gson:0.11.2' runtimeOnly 'com.h2database:h2' + testImplementation 'org.springframework.boot:spring-boot-starter-test' testImplementation 'io.rest-assured:rest-assured:5.3.1' testRuntimeOnly 'org.junit.platform:junit-platform-launcher' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java index 5e85375c5..81182c068 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/BaseEntity.java @@ -27,6 +27,10 @@ public LocalDateTime getModifiedAt() { return modifiedAt; } + public void delete() { + this.deleted = true; + } + public boolean isDeleted() { return deleted; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java new file mode 100644 index 000000000..72b096584 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipal.java @@ -0,0 +1,11 @@ +package com.bang_ggood.auth.config; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.PARAMETER) +@Retention(RetentionPolicy.RUNTIME) +public @interface AuthPrincipal { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java new file mode 100644 index 000000000..d5cebc6a7 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java @@ -0,0 +1,53 @@ +package com.bang_ggood.auth.config; + +import com.bang_ggood.auth.controller.CookieProvider; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import org.springframework.core.MethodParameter; +import org.springframework.stereotype.Component; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; +import java.util.Arrays; + +@Component +public class AuthPrincipalArgumentResolver implements HandlerMethodArgumentResolver { + + private final AuthService authService; + + public AuthPrincipalArgumentResolver(AuthService authService) { + this.authService = authService; + } + + @Override + public boolean supportsParameter(MethodParameter parameter) { + return User.class.isAssignableFrom(parameter.getParameterType()) + && parameter.hasParameterAnnotation(AuthPrincipal.class); + } + + @Override + public User resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, + NativeWebRequest webRequest, WebDataBinderFactory binderFactory) { + HttpServletRequest request = (HttpServletRequest) webRequest.getNativeRequest(); + + if (request.getCookies() == null) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_COOKIE_EMPTY); + } + + String token = extractToken(request.getCookies()); + return authService.extractUser(token); + } + + private String extractToken(Cookie[] cookies) { + return Arrays.stream(cookies) + .filter(cookie -> cookie.getName().equals(CookieProvider.TOKEN_COOKIE_NAME)) + .findAny() + .map(Cookie::getValue) + .orElseThrow(() -> new BangggoodException(ExceptionCode.AUTHENTICATION_COOKIE_INVALID)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java new file mode 100644 index 000000000..27a7ea02d --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -0,0 +1,31 @@ +package com.bang_ggood.auth.controller; + +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import jakarta.validation.Valid; +import org.springframework.http.HttpHeaders; +import org.springframework.http.ResponseCookie; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class AuthController { + + private final AuthService authService; + private final CookieProvider cookieProvider; + + public AuthController(AuthService authService, CookieProvider cookieProvider) { + this.authService = authService; + this.cookieProvider = cookieProvider; + } + + @PostMapping("/oauth/login") + public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { + String token = authService.login(request); + ResponseCookie cookie = cookieProvider.createCookie(token); + + return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java new file mode 100644 index 000000000..475626af7 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -0,0 +1,18 @@ +package com.bang_ggood.auth.controller; + +import org.springframework.http.ResponseCookie; +import org.springframework.stereotype.Component; + +@Component +public class CookieProvider { + + public static final String TOKEN_COOKIE_NAME = "token"; + + public ResponseCookie createCookie(String token) { + return ResponseCookie + .from(TOKEN_COOKIE_NAME, token) + .httpOnly(true) + .path("/") + .build(); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java new file mode 100644 index 000000000..6123cb9d5 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthLoginRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.auth.dto.request; + +import jakarta.validation.constraints.NotBlank; + +public record OauthLoginRequest(@NotBlank(message = "인가 코드가 존재하지 않습니다.") String code) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthTokenRequest.java similarity index 91% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthTokenRequest.java index 9c9be194c..c386463f3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthTokenRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/request/OauthTokenRequest.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.request; +package com.bang_ggood.auth.dto.request; public record OauthTokenRequest(String grantType, String clientId, String redirectUri, String code, String clientSecret) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/KakaoAccountResponse.java similarity index 82% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/KakaoAccountResponse.java index 7f974b5d5..bd086067f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/KakaoAccountResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/KakaoAccountResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java new file mode 100644 index 000000000..92581638c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java @@ -0,0 +1,12 @@ +package com.bang_ggood.auth.dto.response; + +import com.bang_ggood.user.domain.User; +import com.fasterxml.jackson.annotation.JsonIgnoreProperties; + +@JsonIgnoreProperties(ignoreUnknown = true) +public record OauthInfoApiResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { + + public User toUserEntity() { + return new User(kakao_account.name(), kakao_account.email()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthTokenResponse.java similarity index 88% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthTokenResponse.java index 01875b77d..f36551af9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthTokenResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthTokenResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/ProfileResponse.java similarity index 83% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/ProfileResponse.java index 93ef6877d..1151418ee 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/ProfileResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/ProfileResponse.java @@ -1,4 +1,4 @@ -package com.bang_ggood.user.dto.response; +package com.bang_ggood.auth.dto.response; import com.fasterxml.jackson.annotation.JsonIgnoreProperties; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java new file mode 100644 index 000000000..b541c285c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -0,0 +1,58 @@ +package com.bang_ggood.auth.service; + +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.springframework.stereotype.Service; +import java.util.List; + +@Service +public class AuthService { + + private final OauthClient oauthClient; + private final JwtTokenProvider jwtTokenProvider; + private final UserRepository userRepository; + private final CustomChecklistQuestionRepository customChecklistQuestionRepository; + + public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository, + CustomChecklistQuestionRepository customChecklistQuestionRepository) { + this.oauthClient = oauthClient; + this.jwtTokenProvider = jwtTokenProvider; + this.userRepository = userRepository; + this.customChecklistQuestionRepository = customChecklistQuestionRepository; + } + + public String login(OauthLoginRequest request) { + OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request); + + User user = userRepository.findByEmail(oauthInfoApiResponse.kakao_account().email()) + .orElseGet(() -> signUp(oauthInfoApiResponse)); + + return jwtTokenProvider.createToken(user); + } + + private User signUp(OauthInfoApiResponse oauthInfoApiResponse) { + User user = userRepository.save(oauthInfoApiResponse.toUserEntity()); + createDefaultChecklistQuestions(user); + return user; + } + + private void createDefaultChecklistQuestions(User user) { //TODO 리팩토링 필요 + List checklistQuestions = Question.findDefaultQuestions() + .stream() + .map(question -> new CustomChecklistQuestion(user, question)) + .toList(); + + customChecklistQuestionRepository.saveAll(checklistQuestions); + } + + public User extractUser(String token) { + AuthUser authUser = jwtTokenProvider.resolveToken(token); + + return userRepository.getUserById(authUser.id()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java new file mode 100644 index 000000000..494c32666 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthUser.java @@ -0,0 +1,10 @@ +package com.bang_ggood.auth.service; + +import jakarta.validation.constraints.NotNull; + +public record AuthUser(@NotNull Long id) { + + public static AuthUser from(Long id) { + return new AuthUser(id); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java new file mode 100644 index 000000000..bb77f213c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java @@ -0,0 +1,57 @@ +package com.bang_ggood.auth.service; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; +import io.jsonwebtoken.Claims; +import io.jsonwebtoken.ExpiredJwtException; +import io.jsonwebtoken.JwtException; +import io.jsonwebtoken.Jwts; +import io.jsonwebtoken.security.Keys; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.stereotype.Component; +import java.util.Date; + +@Component +public class JwtTokenProvider { + + private final String secretKey; + private final int tokenExpirationMills; + + public JwtTokenProvider( + @Value("${jwt.secret-key}") String secretKey, + @Value("${jwt.expiration-millis}") int tokenExpirationMills) { + this.secretKey = secretKey; + this.tokenExpirationMills = tokenExpirationMills; + } + + public String createToken(User user) { + Date now = new Date(); + Date expiredDate = new Date(now.getTime() + tokenExpirationMills); + + return Jwts.builder() + .setSubject(user.getId().toString()) + .setIssuedAt(now) + .setExpiration(expiredDate) + .signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) + .compact(); + } + + public AuthUser resolveToken(String token) { + try { + Claims claims = Jwts.parserBuilder() + .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) + .build() + .parseClaimsJws(token) + .getBody(); + + Long id = Long.valueOf(claims.getSubject()); + return AuthUser.from(id); + + } catch (ExpiredJwtException exception) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED); + } catch (JwtException exception) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_INVALID); + } + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/OauthClient.java similarity index 81% rename from backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/OauthClient.java index 4a97d848b..10eef945c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/OauthClient.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/OauthClient.java @@ -1,8 +1,8 @@ -package com.bang_ggood.user.service; +package com.bang_ggood.auth.service; -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import com.bang_ggood.user.dto.response.OauthInfoResponse; -import com.bang_ggood.user.dto.response.OauthTokenResponse; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.auth.dto.response.OauthTokenResponse; import org.springframework.beans.factory.annotation.Value; import org.springframework.http.MediaType; import org.springframework.stereotype.Component; @@ -27,8 +27,8 @@ public OauthClient( @Value("${kakao.user_get_uri}") String userInfoRequestUri, @Value("${kakao.grant_type}") String grantType, @Value("${kakao.client_id}") String clientId, - @Value("${kakao.redirect_uri}")String redirectUrl, - @Value("${kakao.client_secret}")String clientSecret) { + @Value("${kakao.redirect_uri}") String redirectUrl, + @Value("${kakao.client_secret}") String clientSecret) { this.restClient = restClient; this.tokenRequestUri = tokenRequestUri; this.userInfoRequestUri = userInfoRequestUri; @@ -38,14 +38,14 @@ public OauthClient( this.clientSecret = clientSecret; } - public OauthInfoResponse requestOauthInfo(OauthLoginRequest request) { + public OauthInfoApiResponse requestOauthInfo(OauthLoginRequest request) { OauthTokenResponse oauthTokenResponse = requestToken(request); return restClient.get() .uri(userInfoRequestUri) .header("Authorization", "Bearer " + oauthTokenResponse.access_token()) .retrieve() - .body(OauthInfoResponse.class); + .body(OauthInfoApiResponse.class); } private OauthTokenResponse requestToken(OauthLoginRequest request) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java index cbf7b1c39..51d4c121b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java @@ -1,10 +1,10 @@ package com.bang_ggood.category.controller; +import com.bang_ggood.auth.config.AuthPrincipal; import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.service.CategoryService; +import com.bang_ggood.user.domain.User; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; @@ -21,13 +21,13 @@ public CategoryController(CategoryService categoryService) { } @PostMapping("/categories/priority") - public ResponseEntity createCategoriesPriority(@RequestBody CategoryPriorityCreateRequest request) { - categoryService.createCategoriesPriority(request); + public ResponseEntity createCategoriesPriority(@AuthPrincipal User user, @RequestBody CategoryPriorityCreateRequest request) { + categoryService.createCategoriesPriority(user, request); return ResponseEntity.noContent().build(); } @GetMapping("/categories") - public ResponseEntity readCategories() { + public ResponseEntity readCategories(@AuthPrincipal User user) { return ResponseEntity.ok(categoryService.readCategories()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java index 9cf21928c..b592d2704 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java @@ -2,26 +2,32 @@ public enum Badge { - CLEAN("청결", "청결해요", "✨"), - ROOM_CONDITION("방 컨디션", "방 컨디션이 좋아요", "🏠"), - AMENITY("편의시설", "편의시설이 많아요", "🚇"), - OPTION("옵션", "옵션이 많아요", "🛋️"), - ENVIRONMENT("주거환경", "주거환경이 좋아요", "🌱"), - SECURITY("보안", "안전해요", "🔒"), - ECONOMIC("경제적", "경제적이에요", "💰"), - NONE("", "", ""); + CLEAN(1, "청결", "청결해요", "✨"), + ROOM_CONDITION(2, "방 컨디션", "방 컨디션이 좋아요", "🏠"), + AMENITY(3, "편의시설", "편의시설이 많아요", "🚇"), + OPTION(4, "옵션", "옵션이 많아요", "🛋️"), + ENVIRONMENT(5, "주거환경", "주거환경이 좋아요", "🌱"), + SECURITY(6, "보안", "안전해요", "🔒"), + ECONOMIC(7, "경제적", "경제적이에요", "💰"), + NONE(8, "", "", ""); private static final String DESCRIPTION_FORMAT = "%s %s"; + private final Integer id; private final String shortName; private final String longName; private final String emoji; - Badge(String shortName, String longName, String emoji) { + Badge(Integer id, String shortName, String longName, String emoji) { + this.id = id; this.shortName = shortName; this.longName = longName; this.emoji = emoji; } + public Integer getId() { + return id; + } + public String getShortNameWithEmoji() { return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortName); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java deleted file mode 100644 index a9aa261e7..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/CategoryQuestionsResponse.java +++ /dev/null @@ -1,8 +0,0 @@ - -package com.bang_ggood.category.dto; - -import com.bang_ggood.checklist.dto.response.QuestionResponse; -import java.util.List; - -public record CategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java deleted file mode 100644 index 30a1d94ff..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/WrittenCategoryQuestionsResponse.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.bang_ggood.category.dto.response; - -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.checklist.dto.response.WrittenQuestionResponse; -import java.util.List; - -public record WrittenCategoryQuestionsResponse(Integer categoryId, String categoryName, - List questions) { - - public static WrittenCategoryQuestionsResponse of(Category category, List questions) { - return new WrittenCategoryQuestionsResponse( - category.getId(), - category.getName(), - questions - ); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java index a3cb2aba5..9536c139b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java @@ -5,9 +5,6 @@ import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.category.dto.response.CategoryReadResponse; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.response.CategoryReadResponse; import com.bang_ggood.category.repository.CategoryPriorityRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.user.domain.User; @@ -32,8 +29,7 @@ public CategoryService(CategoryPriorityRepository categoryPriorityRepository) { } @Transactional - public void createCategoriesPriority(CategoryPriorityCreateRequest request) { - User user = new User(1L, "방방이"); + public void createCategoriesPriority(User user, CategoryPriorityCreateRequest request) { validate(request); List categoryPriorities = request.categoryIds().stream() .map(id -> new CategoryPriority(id, user)) @@ -65,7 +61,9 @@ private void validateCategoryId(CategoryPriorityCreateRequest request) { request.categoryIds().stream() .filter(id -> !Category.contains(id)) .findAny() - .ifPresent(id -> { throw new BangggoodException(CATEGORY_NOT_FOUND); }); + .ifPresent(id -> { + throw new BangggoodException(CATEGORY_NOT_FOUND); + }); } public CategoriesReadResponse readCategories() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 6553639c6..64b3d2b8f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -1,6 +1,7 @@ package com.bang_ggood.checklist.controller; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; +import com.bang_ggood.auth.config.AuthPrincipal; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; @@ -9,17 +10,17 @@ import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; -import java.net.URI; -import java.util.List; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RequestParam; - +import org.springframework.web.bind.annotation.RestController; +import java.net.URI; +import java.util.List; @RestController public class ChecklistController { @@ -31,36 +32,49 @@ public ChecklistController(ChecklistService checklistService) { } @PostMapping("/checklists") - public ResponseEntity createChecklist(@Valid @RequestBody ChecklistCreateRequest checklistCreateRequest) { - long checklistId = checklistService.createChecklist(checklistCreateRequest); + public ResponseEntity createChecklist(@AuthPrincipal User user, @Valid @RequestBody ChecklistRequest checklistRequest) { + long checklistId = checklistService.createChecklist(user, checklistRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } @GetMapping("/checklists/questions") - public ResponseEntity readChecklistQuestions() { - return ResponseEntity.ok(checklistService.readChecklistQuestions()); + public ResponseEntity readChecklistQuestions(@AuthPrincipal User user) { + return ResponseEntity.ok(checklistService.readChecklistQuestions(user)); } @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@PathVariable("id") long id) { - return ResponseEntity.ok(checklistService.readChecklistById(id)); + public ResponseEntity readChecklistById(@AuthPrincipal User user, @PathVariable("id") long id) { + return ResponseEntity.ok(checklistService.readChecklistById(user, id)); } @GetMapping("/checklists") - public ResponseEntity readUserChecklistsPreview() { - User user = new User(1L, "방방이"); + public ResponseEntity readUserChecklistsPreview(@AuthPrincipal User user) { return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); } @GetMapping("/checklists/comparison") - public ResponseEntity readChecklistsComparison( - @RequestParam("id") List checklistIds) { - return ResponseEntity.ok(checklistService.readChecklistsComparison(checklistIds)); + public ResponseEntity readChecklistsComparison(@AuthPrincipal User user, @RequestParam("id") List checklistIds) { + return ResponseEntity.ok(checklistService.readChecklistsComparison(user, checklistIds)); + } + + @PutMapping("/checklists/{id}") + public ResponseEntity updateChecklistById( + @AuthPrincipal User user, + @PathVariable("id") long id, + @Valid @RequestBody ChecklistRequest checklistRequest) { + checklistService.updateChecklistById(user, id, checklistRequest); + return ResponseEntity.noContent().build(); } @PutMapping("/custom-checklist") - public ResponseEntity updateCustomChecklist(@RequestBody CustomChecklistUpdateRequest request) { - checklistService.updateCustomChecklist(request); + public ResponseEntity updateCustomChecklist(@AuthPrincipal User user, @RequestBody CustomChecklistUpdateRequest request) { + checklistService.updateCustomChecklist(user, request); + return ResponseEntity.noContent().build(); + } + + @DeleteMapping("/checklists/{id}") + public ResponseEntity deleteChecklistById(@AuthPrincipal User user, @PathVariable("id") long id) { + checklistService.deleteChecklistById(id); return ResponseEntity.noContent().build(); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 91ab926ef..6924df9d7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -1,7 +1,10 @@ package com.bang_ggood.checklist.domain; import com.bang_ggood.BaseEntity; +import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.domain.Structure; +import com.bang_ggood.room.domain.Type; import com.bang_ggood.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.FetchType; @@ -54,6 +57,15 @@ public Checklist(Integer deposit, Integer rent, Integer contractTerm, String rea protected Checklist() { } + public void change(Checklist updateChecklist) { + this.user = updateChecklist.user; + this.room = updateChecklist.room; + this.deposit = updateChecklist.deposit; + this.rent = updateChecklist.rent; + this.contractTerm = updateChecklist.contractTerm; + this.realEstate = updateChecklist.realEstate; + } + public Long getId() { return id; } @@ -86,6 +98,22 @@ public Integer getRoomWalkingTime() { return room.getWalkingTime(); } + public Type getRoomType() { + return room.getType(); + } + + public Integer getRoomSize() { + return room.getSize(); + } + + public FloorLevel getRoomFloorLevel() { + return room.getFloorLevel(); + } + + public Structure getRoomStructure() { + return room.getStructure(); + } + public Integer getDeposit() { return deposit; } @@ -135,4 +163,4 @@ public String toString() { ", realEstate='" + realEstate + '\'' + '}'; } -} +} \ No newline at end of file diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 2bcbacdef..997d6c448 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -40,6 +40,17 @@ public ChecklistQuestion(Checklist checklist, Question question, Grade grade, St protected ChecklistQuestion() { } + public void change(ChecklistQuestion checklistQuestion) { + this.checklist = checklistQuestion.checklist; + this.question = checklistQuestion.question; + this.grade = checklistQuestion.grade; + this.memo = checklistQuestion.memo; + } + + public boolean isDifferentQuestionId(ChecklistQuestion checklistQuestion) { + return this.question != checklistQuestion.question; + } + public Long getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java new file mode 100644 index 000000000..ec156c1dc --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java @@ -0,0 +1,15 @@ +package com.bang_ggood.checklist.domain; + +import java.util.List; + +public class ChecklistRank { + + private ChecklistRank() { + } + + public static int calculateRanks(int targetScore, List scores) { + return (int) scores.stream() + .filter(score -> score > targetScore) + .count() + 1; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index 0905d06db..4aeb3cfd6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -10,7 +10,7 @@ public enum Grade { GOOD(3), SOSO(2), BAD(1), - ; + NONE(0); private final int score; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 88b1a7f77..43daeb5c6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -5,60 +5,60 @@ import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; import java.util.List; -import java.util.stream.Collectors; public enum Question { - CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요."), - CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요."), - CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null), - CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요."), - CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요."), - - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요."), - ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null), - ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null), - ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null), - ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null), - ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null), - - AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null), - AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null), - AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null), - - OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요."), - OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null), - - ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null), - ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요."), - ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요."), - ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요."), - ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null), - ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null), - - SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null), - SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null), - SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null), - SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null), - SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null), - SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null), - SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null), - SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null), - - ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요."), - ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요."); + CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", true), + CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", false), + CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null, false), + CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.", true), + CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", false), + + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.", true), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null, true), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null, true), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, false), + ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null, false), + ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, false), + + AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null, true), + AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null, false), + AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null, false), + + OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.", false), + OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null, false), + + ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null, false), + ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.", true), + ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.", true), + ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", false), + ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null, false), + ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null, false), + + SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, true), + SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null, false), + SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null, true), + SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null, false), + SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null, false), + SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, false), + SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null, false), + SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null, false), + + ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.", true), + ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.", false); private final int id; private final Category category; private final String title; private final String subtitle; + private final boolean isDefault; - - Question(int id, Category category, String title, String subtitle) { + Question(int id, Category category, String title, String subtitle, boolean isDefault) { this.id = id; this.category = category; this.title = title; this.subtitle = subtitle; + this.isDefault = isDefault; } public static Question fromId(int id) { @@ -74,10 +74,23 @@ public static List filter(Category category, List filterWithUnselectedGrade(Category category, + List questions) { + return questions.stream() + .filter(question -> question.getQuestion().isCategory(category)) + .toList(); + } + public static List findQuestionsByCategory(Category category) { return Arrays.stream(values()) .filter(question -> question.getCategory().equals(category)) - .collect(Collectors.toList()); + .toList(); + } + + public static List findDefaultQuestions() { + return Arrays.stream(values()) + .filter(question -> question.isDefault) + .toList(); } public static boolean contains(int id) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java similarity index 61% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java index e925f748c..3b4d63841 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java @@ -1,12 +1,12 @@ package com.bang_ggood.checklist.dto.request; import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.dto.request.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomRequest; import jakarta.validation.Valid; import java.util.List; -public record ChecklistCreateRequest(@Valid RoomCreateRequest room, List options, - @Valid List questions) { +public record ChecklistRequest(@Valid RoomRequest room, List options, + @Valid List questions) { public Room toRoomEntity() { return room.toRoomEntity(); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java deleted file mode 100644 index 2e6c8804c..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionCreateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto.request; - -import jakarta.validation.constraints.NotNull; - -public record QuestionCreateRequest(@NotNull Integer questionId, String grade, String memo) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java new file mode 100644 index 000000000..1032d8955 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto.request; + +import jakarta.validation.constraints.NotNull; + +public record QuestionRequest(@NotNull(message = "질문 아이디가 존재하지 않습니다.") Integer questionId, String grade, String memo) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java index 83d1f10cf..3323080fe 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java @@ -2,9 +2,9 @@ import com.bang_ggood.category.domain.Badge; -public record BadgeResponse(String shortName, String longName) { +public record BadgeResponse(Integer badgeId, String shortName, String longName) { public static BadgeResponse from(Badge badge) { - return new BadgeResponse(badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); + return new BadgeResponse(badge.getId(), badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java index c8d3e42dc..6deab2414 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java @@ -1,30 +1,65 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.room.dto.response.SelectedRoomResponse; import java.util.List; -public record ChecklistWithScoreReadResponse( - Long checklistId, String roomName, String address, - Integer floor, Integer deposit, Integer rent, - Integer contractTerm, String station, Integer walkingTime, - Integer optionCount, Integer score, - List categories -) { - public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistOptionCount, int checklistScore, +public class ChecklistWithScoreReadResponse { + + private final Long checklistId; + private final Integer score; + private final SelectedRoomResponse room; + private final List options; + private final List categories; + private Integer rank; + + public ChecklistWithScoreReadResponse(Long checklistId, Integer score, + SelectedRoomResponse room, List options, + List categories) { + this.checklistId = checklistId; + this.score = score; + this.room = room; + this.options = options; + this.categories = categories; + } + + public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistScore, + SelectedRoomResponse room, List options, List categoryScores) { return new ChecklistWithScoreReadResponse( checklist.getId(), - checklist.getRoomName(), - checklist.getRoomAddress(), - checklist.getRoomFloor(), - checklist.getDeposit(), - checklist.getRent(), - checklist.getContractTerm(), - checklist.getRoomStation(), - checklist.getRoomWalkingTime(), - checklistOptionCount, checklistScore, + room, + options, categoryScores ); } + + public void assignRank(int rank) { + this.rank = rank; + } + + public Long getChecklistId() { + return checklistId; + } + + public Integer getScore() { + return score; + } + + public SelectedRoomResponse getRoom() { + return room; + } + + public List getOptions() { + return options; + } + + public List getCategories() { + return categories; + } + + public Integer getRank() { + return rank; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java index 0268c85bd..6fe53cb6c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java @@ -2,9 +2,10 @@ import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.room.dto.response.SelectedRoomResponse; - +import java.time.LocalDateTime; import java.util.List; -public record SelectedChecklistResponse(SelectedRoomResponse room, List options, - Integer score, List categories) { +public record SelectedChecklistResponse(Integer score, LocalDateTime createdAt, SelectedRoomResponse room, + List options, + List categories) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 15bbc6a93..27d90b50e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -1,7 +1,6 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Checklist; - import java.time.LocalDateTime; import java.util.List; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java deleted file mode 100644 index bdcfc70e1..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenChecklistResponse.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.category.dto.response.WrittenCategoryQuestionsResponse; -import com.bang_ggood.room.dto.response.WrittenRoomResponse; -import java.util.List; - -public record WrittenChecklistResponse(WrittenRoomResponse room, List options, - List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java deleted file mode 100644 index 34fc7ced8..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/WrittenQuestionResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.checklist.domain.ChecklistQuestion; - -public record WrittenQuestionResponse(Integer questionId, String title, String subtitle, String answer) { - - public static WrittenQuestionResponse of(ChecklistQuestion checklistQuestion) { - return new WrittenQuestionResponse( - checklistQuestion.getQuestion().getId(), - checklistQuestion.getQuestion().getTitle(), - checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getGrade().name() - ); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index 73d20f711..f72248f3f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -3,11 +3,28 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; public interface ChecklistOptionRepository extends JpaRepository { - List findByChecklistId(long checklistId); + @Query("SELECT co FROM ChecklistOption co " + + "WHERE co.checklist.id = :checklistId " + + "AND co.deleted = false") + List findByChecklistId(@Param("checklistId") Long checklistId); - Integer countByChecklist(Checklist checklist); + @Query("SELECT COUNT(co) FROM ChecklistOption co " + + "WHERE co.checklist = :checklist " + + "AND co.deleted = false") + Integer countByChecklist(@Param("checklist") Checklist checklist); + + @Modifying + @Transactional + @Query("UPDATE ChecklistOption co " + + "SET co.deleted = true " + + "WHERE co.checklist.id = :checklistId") + void deleteAllByChecklistId(@Param("checklistId") Long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java index e6001c3e3..d4508608a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java @@ -3,8 +3,13 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; public interface ChecklistQuestionRepository extends JpaRepository { - List findByChecklistId(long checklistId); + @Query("SELECT cq FROM ChecklistQuestion cq " + + "WHERE cq.checklist.id = :checklistId " + + "AND cq.deleted = false") + List findByChecklistId(@Param("checklistId") long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 5db92f517..19e2551a0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -5,6 +5,7 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import java.util.List; @@ -12,20 +13,38 @@ public interface ChecklistRepository extends JpaRepository { - //TODO 테스트해야 함 @Query("SELECT c FROM Checklist c " - + "JOIN FETCH Room r " - + "ON c.id = :id " - + "AND c.room.id = r.id") + + "JOIN FETCH c.room r " + + "LEFT JOIN FETCH c.questions q " + + "WHERE c.id = :id " + + "AND c.deleted = false") Optional findById(@Param("id") long id); - default Checklist getById(long id) { + + default Checklist getById(@Param("id") long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } + //TODO: 논리적 삭제 리팩토링 List findByUser(User user); - List findByUserAndIdIn(User user, List checklistIds); + @Query("SELECT c FROM Checklist c " + + "JOIN FETCH c.user u " + + "JOIN FETCH c.room r " + + "WHERE u = :user " + + "AND c.id IN :checklistIds " + + "AND c.deleted = false") + List findByUserAndIdIn(@Param("user") User user, + @Param("checklistIds") List checklistIds); + + @Query("SELECT COUNT(c) > 0 FROM Checklist c " + + "WHERE c.id = :id " + + "AND c.deleted = false") + boolean existsById(@Param("id") long id); - long countAllByIdIn(List ids); + @Modifying + @Query("UPDATE Checklist c " + + "SET c.deleted = true " + + "WHERE c.id = :id") + void deleteById(@Param("id") long id); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 606e31301..d8e941b31 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -7,15 +7,16 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.ChecklistRank; import com.bang_ggood.checklist.domain.ChecklistScore; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.request.ChecklistInfo; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; -import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.dto.response.BadgeResponse; import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; @@ -40,12 +41,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.Arrays; -import java.util.Comparator; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; +import java.util.stream.IntStream; @Service public class ChecklistService { @@ -68,21 +69,21 @@ public ChecklistService(ChecklistRepository checklistRepository, RoomRepository } @Transactional - public long createChecklist(ChecklistCreateRequest checklistCreateRequest) { - Room room = roomRepository.save(checklistCreateRequest.toRoomEntity()); + public long createChecklist(User user, ChecklistRequest checklistRequest) { + Room room = roomRepository.save(checklistRequest.toRoomEntity()); - ChecklistInfo checklistInfo = checklistCreateRequest.toChecklistInfo(); - Checklist checklist = new Checklist(new User(1L, "방방이"), room, checklistInfo.deposit(), checklistInfo.rent(), + ChecklistInfo checklistInfo = checklistRequest.toChecklistInfo(); + Checklist checklist = new Checklist(user, room, checklistInfo.deposit(), checklistInfo.rent(), checklistInfo.contractTerm(), checklistInfo.realEstate()); checklistRepository.save(checklist); - createChecklistOptions(checklistCreateRequest, checklist); - createChecklistQuestions(checklistCreateRequest, checklist); + createChecklistOptions(checklistRequest, checklist); + createChecklistQuestions(checklistRequest, checklist); return checklist.getId(); } - private void createChecklistOptions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - List optionIds = checklistCreateRequest.options(); + private void createChecklistOptions(ChecklistRequest checklistRequest, Checklist checklist) { + List optionIds = checklistRequest.options(); validateOptions(optionIds); List checklistOptions = optionIds.stream() .map(option -> new ChecklistOption(checklist, option)) @@ -112,9 +113,9 @@ private void validateOptionInvalid(List optionIds) { } } - private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequest, Checklist checklist) { - validateQuestion(checklistCreateRequest.questions()); - List checklistQuestions = checklistCreateRequest.questions().stream() + private void createChecklistQuestions(ChecklistRequest checklistRequest, Checklist checklist) { + validateQuestion(checklistRequest.questions()); + List checklistQuestions = checklistRequest.questions().stream() .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), @@ -125,8 +126,7 @@ private void createChecklistQuestions(ChecklistCreateRequest checklistCreateRequ } @Transactional - public ChecklistQuestionsResponse readChecklistQuestions() { - User user = new User(1L, "방방이"); + public ChecklistQuestionsResponse readChecklistQuestions(User user) { List customChecklistQuestions = customChecklistQuestionRepository.findByUser(user); Map> categoryQuestions = customChecklistQuestions.stream() @@ -144,12 +144,12 @@ public ChecklistQuestionsResponse readChecklistQuestions() { return new ChecklistQuestionsResponse(categoryQuestionsResponses); } - private void validateQuestion(List questions) { + private void validateQuestion(List questions) { validateQuestionDuplicate(questions); validateQuestionInvalid(questions); } - private void validateQuestionDuplicate(List questions) { + private void validateQuestionDuplicate(List questions) { Set set = new HashSet<>(); questions.forEach(question -> { if (!set.add(question.questionId())) { @@ -158,28 +158,28 @@ private void validateQuestionDuplicate(List questions) { }); } - private void validateQuestionInvalid(List questions) { - for (QuestionCreateRequest questionCreateRequest : questions) { - if (!Question.contains(questionCreateRequest.questionId())) { + private void validateQuestionInvalid(List questions) { + for (QuestionRequest questionRequest : questions) { + if (!Question.contains(questionRequest.questionId())) { throw new BangggoodException(ExceptionCode.QUESTION_INVALID); } } } @Transactional - public SelectedChecklistResponse readChecklistById(long id) { + public SelectedChecklistResponse readChecklistById(User user, long id) { Checklist checklist = checklistRepository.getById(id); SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); List options = readOptionsByChecklistId(id); - List selectedCategoryQuestionsRespons = + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); int checklistScore = ChecklistScore.calculateTotalScore(checklist.getQuestions()); - return new SelectedChecklistResponse(selectedRoomResponse, options, checklistScore, - selectedCategoryQuestionsRespons); + return new SelectedChecklistResponse(checklistScore, checklist.getCreatedAt(), selectedRoomResponse, + options, selectedCategoryQuestionsResponse); } private List readOptionsByChecklistId(long checklistId) { @@ -199,14 +199,14 @@ private List readCategoryQuestionsByChecklist private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category category, List checklistQuestions) { - List selectedQuestionRespons = - Question.filter(category, checklistQuestions).stream() + List selectedQuestionResponse = + Question.filterWithUnselectedGrade(category, checklistQuestions).stream() .map(SelectedQuestionResponse::of) .toList(); int categoryScore = ChecklistScore.calculateCategoryScore(category, checklistQuestions); - return SelectedCategoryQuestionsResponse.of(category, categoryScore, selectedQuestionRespons); + return SelectedCategoryQuestionsResponse.of(category, categoryScore, selectedQuestionResponse); } @Transactional @@ -232,23 +232,24 @@ private List createBadges(List questions) { } @Transactional - public ChecklistsWithScoreReadResponse readChecklistsComparison(List checklistIds) { - User user = new User(1L, "방끗"); + public ChecklistsWithScoreReadResponse readChecklistsComparison(User user, List checklistIds) { + List checklists = checklistRepository.findByUserAndIdIn(user, checklistIds); - validateChecklistComparison(checklistIds); + validateChecklistComparison(checklists, checklistIds); - List responses = checklistRepository.findByUserAndIdIn(user, checklistIds) + List checklistsWithScore = checklists .stream() .map(this::getChecklistWithScore) - .sorted(Comparator.comparing(ChecklistWithScoreReadResponse::score).reversed()) .toList(); - return new ChecklistsWithScoreReadResponse(responses); + assignRanks(checklistsWithScore, getScores(checklistsWithScore)); + + return new ChecklistsWithScoreReadResponse(checklistsWithScore); } - private void validateChecklistComparison(List checklistIds) { + private void validateChecklistComparison(List userChecklists, List checklistIds) { validateChecklistComparisonCount(checklistIds); - validateChecklist(checklistIds); + validateUserChecklist(userChecklists, checklistIds); } private void validateChecklistComparisonCount(List checklistIds) { @@ -257,19 +258,19 @@ private void validateChecklistComparisonCount(List checklistIds) { } } - private void validateChecklist(List checklistIds) { - if (checklistRepository.countAllByIdIn(checklistIds) != checklistIds.size()) { + private void validateUserChecklist(List userChecklists, List checklistIds) { + if (userChecklists.size() != checklistIds.size()) { throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); } } - private ChecklistWithScoreReadResponse getChecklistWithScore(Checklist checklist) { List categoryScores = getCategoryScores(checklist.getQuestions()); int checklistScore = getChecklistScore(checklist.getQuestions()); - int checklistOptionCount = checklistOptionRepository.countByChecklist(checklist); + SelectedRoomResponse selectedRoom = SelectedRoomResponse.of(checklist); + List options = readOptionsByChecklistId(checklist.getId()); - return ChecklistWithScoreReadResponse.of(checklist, checklistOptionCount, checklistScore, categoryScores); + return ChecklistWithScoreReadResponse.of(checklist, checklistScore, selectedRoom, options, categoryScores); } private List getCategoryScores(List questions) { @@ -284,13 +285,80 @@ private int getChecklistScore(List questions) { return ChecklistScore.calculateTotalScore(questions); } + private List getScores(List checklistsWithScore) { + return checklistsWithScore.stream() + .map(ChecklistWithScoreReadResponse::getScore) + .toList(); + } + + private void assignRanks(List checklistsWithScore, List scores) { + checklistsWithScore + .forEach(checklistWithScore -> checklistWithScore.assignRank( + ChecklistRank.calculateRanks(checklistWithScore.getScore(), scores) + )); + } + + @Transactional + public void updateChecklistById(User user, long id, ChecklistRequest checklistRequest) { + Checklist checklist = checklistRepository.getById(id); + + Room room = checklist.getRoom(); + room.change(checklistRequest.toRoomEntity()); + + ChecklistInfo checklistInfo = checklistRequest.toChecklistInfo(); + Checklist updateChecklist = new Checklist(user, room, checklistInfo.deposit(), checklistInfo.rent(), + checklistInfo.contractTerm(), checklistInfo.realEstate()); + checklist.change(updateChecklist); + + updateChecklistOptions(checklistRequest, checklist); + updateChecklistQuestions(checklistRequest, checklist); + } + + private void updateChecklistOptions(ChecklistRequest checklistRequest, Checklist checklist) { + List optionIds = checklistRequest.options(); + validateOptions(optionIds); + List checklistOptions = optionIds.stream() + .map(option -> new ChecklistOption(checklist, option)) + .toList(); + checklistOptionRepository.deleteAllByChecklistId(checklist.getId()); + checklistOptionRepository.saveAll(checklistOptions); + } + + private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checklist checklist) { + validateQuestion(checklistRequest.questions()); + + List questions = checklist.getQuestions(); + List updateQuestions = checklistRequest.questions().stream() + .map(question -> new ChecklistQuestion( + checklist, + Question.fromId(question.questionId()), + Grade.from(question.grade()), + question.memo())) + .toList(); + + validateSameQuestions(questions, updateQuestions); + IntStream.range(0, questions.size()) + .forEach(i -> questions.get(i).change(updateQuestions.get(i))); + } + + private void validateSameQuestions(List questions, List updateQuestions) { + if (questions.size() != updateQuestions.size()) { + throw new BangggoodException(ExceptionCode.QUESTION_DIFFERENT); + } + IntStream.range(0, questions.size()) + .filter(i -> questions.get(i).isDifferentQuestionId(updateQuestions.get(i))) + .findAny() + .ifPresent(i -> { + throw new BangggoodException(ExceptionCode.QUESTION_DIFFERENT); + }); + } + @Transactional - public void updateCustomChecklist(CustomChecklistUpdateRequest request) { + public void updateCustomChecklist(User user, CustomChecklistUpdateRequest request) { List questionIds = request.questionIds(); validateCustomChecklistQuestionsIsNotEmpty(questionIds); validateCustomChecklistQuestionsDuplication(questionIds); - User user = new User(1L, "방방이"); customChecklistQuestionRepository.deleteAllByUser(user); List customChecklistQuestions = questionIds.stream() @@ -311,4 +379,13 @@ private void validateCustomChecklistQuestionsDuplication(List questionI throw new BangggoodException(ExceptionCode.QUESTION_DUPLICATED); } } + + @Transactional + public void deleteChecklistById(long id) { + // 사용자 검증 필요 + if (!checklistRepository.existsById(id)) { + throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); + } + checklistRepository.deleteById(id); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java new file mode 100644 index 000000000..b78195489 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java @@ -0,0 +1,23 @@ +package com.bang_ggood.config; + +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.auth.config.AuthPrincipalArgumentResolver; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import java.util.List; + +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + + private final AuthService authService; + + public WebMvcConfig(AuthService authService) { + this.authService = authService; + } + + @Override + public void addArgumentResolvers(List resolvers) { + resolvers.add(new AuthPrincipalArgumentResolver(authService)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index b2da0ea4f..ec4d60865 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -14,6 +14,7 @@ public enum ExceptionCode { // Question QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), + QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), @@ -45,8 +46,15 @@ public enum ExceptionCode { // Room ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."), + //Score + SCORE_NOT_DESCENDING_SORTED(HttpStatus.BAD_REQUEST, "정렬되지 않은 점수입니다."), + // Auth - OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "토큰을 요청하는 과정에서 예상치 못한 예외가 발생했습니다."); + AUTHENTICATION_COOKIE_EMPTY(HttpStatus.UNAUTHORIZED, "인증 정보가 존재하지 않습니다."), + AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), + AUTHENTICATION_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), + AUTHENTICATION_TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "토큰 정보가 올바르지 않습니다."), + OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java index df30e69df..beefa5775 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java @@ -1,8 +1,8 @@ package com.bang_ggood.handler; import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.dto.ExceptionResponse; import com.bang_ggood.exception.OauthException; +import com.bang_ggood.exception.dto.ExceptionResponse; import com.bang_ggood.exception.dto.OauthExceptionResponse; import jakarta.servlet.http.HttpServletRequest; import org.springframework.http.HttpStatus; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index c9d1d9c62..5d805654b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -56,6 +56,18 @@ public Room(String name, String station, Integer walkingTime, String address, Ty validateFloorAndLevel(); } + public void change(Room room) { + this.name = room.name; + this.station = room.station; + this.walkingTime = room.walkingTime; + this.address = room.address; + this.type = room.type; + this.size = room.size; + this.floor = room.floor; + this.floorLevel = room.floorLevel; + this.structure = room.structure; + } + public Long getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java similarity index 53% rename from backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java index 51b9774fa..5b82a6154 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java @@ -6,10 +6,10 @@ import com.bang_ggood.room.domain.Type; import jakarta.validation.constraints.NotBlank; -public record RoomCreateRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, - Integer deposit, Integer rent, Integer contractTerm, String address, - String station, Integer walkingTime, String realEstate, - String type, String structure, Integer size, Integer floor, String floorLevel) { +public record RoomRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, + Integer deposit, Integer rent, Integer contractTerm, String address, + String station, Integer walkingTime, String realEstate, + String type, String structure, Integer size, Integer floor, String floorLevel) { public Room toRoomEntity() { return new Room(roomName, station, walkingTime, address, diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 65d30ec6d..3187303b7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -3,10 +3,14 @@ import com.bang_ggood.checklist.domain.Checklist; public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { + String address, String station, Integer walkingTime, String realEstate, + String type, Integer size, String floorLevel, String structure) { + public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), - checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); + checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), + checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), + checklist.getRoomStructure().getName()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java deleted file mode 100644 index f3e859a54..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/WrittenRoomResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bang_ggood.room.dto.response; - -import com.bang_ggood.checklist.domain.Checklist; - -public record WrittenRoomResponse(String name, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate) { - public static WrittenRoomResponse of(Checklist checklist) { - return new WrittenRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), - checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), - checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java deleted file mode 100644 index 5704e1c5a..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java +++ /dev/null @@ -1,21 +0,0 @@ -package com.bang_ggood.user.controller; - -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import com.bang_ggood.user.service.UserService; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class UserController { - - private final UserService userService; - - public UserController(UserService userService) { - this.userService = userService; - } - - @PostMapping("/oauth/login") - public void login(OauthLoginRequest request) { - userService.login(request); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index 0bb5c85b9..56c355ed8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -20,13 +20,18 @@ public class User extends BaseEntity { @Column(nullable = false) private String name; - public User(Long id, String name) { - this.id = id; + @Column(nullable = false) + private String email; + + public User(String name, String email) { this.name = name; + this.email = email; } - public User(String name) { + public User(Long id, String name, String email) { // TODO 테스트용 + this.id = id; this.name = name; + this.email = email; } protected User() { @@ -36,6 +41,14 @@ public Long getId() { return id; } + public String getName() { + return name; + } + + public String getEmail() { + return email; + } + @Override public boolean equals(Object o) { if (this == o) { @@ -58,6 +71,7 @@ public String toString() { return "User{" + "id=" + id + ", name='" + name + '\'' + + ", email='" + email + '\'' + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java deleted file mode 100644 index 1ca5d7c1e..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/request/OauthLoginRequest.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bang_ggood.user.dto.request; - -public record OauthLoginRequest(String code) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java deleted file mode 100644 index 9491bff3a..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/response/OauthInfoResponse.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.user.dto.response; - -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; - -@JsonIgnoreProperties(ignoreUnknown = true) -public record OauthInfoResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java index 65cadda49..46587c089 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/repository/UserRepository.java @@ -4,10 +4,23 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.domain.User; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; +import java.util.Optional; public interface UserRepository extends JpaRepository { default User getUserById(Long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.USER_NOT_FOUND)); } + + @Query("SELECT u FROM User u WHERE u.email = :email and u.deleted = false ") + Optional findByEmail(@Param("email") String email); + + @Transactional + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Query("UPDATE User u SET u.deleted = true ") + void deleteByUser(@Param("user") User user); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java deleted file mode 100644 index dc47bfde6..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/service/UserService.java +++ /dev/null @@ -1,18 +0,0 @@ -package com.bang_ggood.user.service; - -import com.bang_ggood.user.dto.request.OauthLoginRequest; -import org.springframework.stereotype.Service; - -@Service -public class UserService { - - private final OauthClient oauthClient; - - public UserService(OauthClient oauthClient) { - this.oauthClient = oauthClient; - } - - public void login(OauthLoginRequest request) { - oauthClient.requestOauthInfo(request); - } -} diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index c08131483..80cd9ff39 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -1,5 +1,5 @@ -INSERT INTO users(id, name, created_at, modified_at, deleted) -VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +INSERT INTO users(id, name, email, created_at, modified_at, deleted) +VALUES (1, '방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f7456c8de..ff1b6edae 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -29,9 +29,10 @@ CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, name VARCHAR(255) NOT NULL, + email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - deleted BOOLEAN + deleted BOOLEAN ); CREATE TABLE checklist @@ -45,7 +46,7 @@ CREATE TABLE checklist room_id BIGINT NOT NULL UNIQUE, user_id BIGINT NOT NULL, real_estate VARCHAR(255), - deleted BOOLEAN, + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); @@ -74,25 +75,50 @@ CREATE TABLE checklist_option FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE if not exists category_priority +CREATE TABLE category_priority ( - id bigint generated by default as identity, - category_id INTEGER not null, - user_id bigint not null, - created_at TIMESTAMP not null, - modified_at TIMESTAMP not null, - deleted BOOLEAN, - primary key (id), - foreign key (user_id) references users -); + id + bigint + generated + by + default as + identity, + category_id + INTEGER + not + null, + user_id + bigint + not + null, + created_at + TIMESTAMP + not + null, + modified_at + TIMESTAMP + not + null, + deleted + BOOLEAN, + primary + key +( + id +), + foreign key +( + user_id +) references users + ); CREATE TABLE custom_checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - user_id BIGINT, - question VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (user_id) references users ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java new file mode 100644 index 000000000..ad615ba89 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java @@ -0,0 +1,26 @@ +package com.bang_ggood; + +import io.restassured.RestAssured; +import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; +import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.web.servlet.MockMvc; + +@AutoConfigureMockMvc +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +public abstract class AcceptanceMockTestSupport { + + @Autowired + protected MockMvc mockMvc; + + @LocalServerPort + protected int port; + + @BeforeEach + void setPort() { + RestAssured.port = port; + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java index b03d6c029..76252f737 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java @@ -1,22 +1,50 @@ package com.bang_ggood; +import com.bang_ggood.auth.controller.CookieProvider; +import com.bang_ggood.auth.service.JwtTokenProvider; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; import io.restassured.RestAssured; import org.junit.jupiter.api.BeforeEach; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.http.ResponseCookie; import org.springframework.test.context.ActiveProfiles; import org.springframework.test.context.jdbc.Sql; +import static com.bang_ggood.user.UserFixture.USER1; + @ActiveProfiles("test") @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) @Sql(scripts = {"/schema-test.sql", "/data-test.sql"}) public abstract class AcceptanceTest { + @Autowired + private JwtTokenProvider jwtTokenProvider; + @Autowired + private CookieProvider cookieProvider; + @Autowired + private UserRepository userRepository; + + protected ResponseCookie responseCookie; + @LocalServerPort private int port; @BeforeEach - void setPort() { + void setUp() { + setPort(); + setResponseCookie(); + } + + private void setPort() { RestAssured.port = port; } + + private void setResponseCookie() { + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + responseCookie = cookieProvider.createCookie(token); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java new file mode 100644 index 000000000..39776a0c1 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -0,0 +1,54 @@ +package com.bang_ggood.auth.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.exception.ExceptionCode; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.http.HttpHeaders; + +import static org.hamcrest.Matchers.containsString; + +class AuthE2ETest extends AcceptanceTest { + + @DisplayName("로그인 실패 : 인가코드가 없는 경우") + @Test + void login_code_notBlank_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(new OauthLoginRequest("")) + .when().post("/oauth/login") + .then().log().all() + .statusCode(400); + } + + @DisplayName("인증 실패 : 쿠키가 없는 경우") + @Test + void authentication_no_cookie_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, null)) + .when().post("/categories/priority") + .then().log().all() + .statusCode(401) + .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_EMPTY.getMessage())); + } + + @DisplayName("인증 실패 : 쿠키가 잘못된 형태로 들어간 경우") + @Test + void authentication_invalid_cookie_exception() { + String testToken = "token"; + String expectedCookie = "invalidToken=" + testToken + "; Path=/; HttpOnly"; + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, expectedCookie)) + .when().post("/categories/priority") + .then().log().all() + .statusCode(401) + .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_INVALID.getMessage())); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java new file mode 100644 index 000000000..b528d13ed --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java @@ -0,0 +1,35 @@ +package com.bang_ggood.auth.controller; + +import com.bang_ggood.AcceptanceMockTestSupport; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.mockito.Mockito; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.http.HttpHeaders; +import org.springframework.http.MediaType; + +import static org.mockito.ArgumentMatchers.any; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; + +class LoginMockE2ETest extends AcceptanceMockTestSupport { + + @MockBean + AuthService authService; + + @DisplayName("로그인 성공") + @Test + void login() throws Exception { + String testToken = "testToken"; + Mockito.when(authService.login(any(OauthLoginRequest.class))).thenReturn(testToken); + + mockMvc.perform(post("/oauth/login") + .contentType(MediaType.APPLICATION_JSON) + .content("{\"code\":\"code\"}")) + .andExpect(status().isOk()) + .andExpect(header().string(HttpHeaders.SET_COOKIE, "token=" + testToken + "; Path=/; HttpOnly")); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java new file mode 100644 index 000000000..128e22272 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -0,0 +1,61 @@ +package com.bang_ggood.auth.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.mock.mockito.MockBean; + +import static com.bang_ggood.user.UserFixture.USER1; +import static org.mockito.ArgumentMatchers.any; + +@ExtendWith(MockitoExtension.class) +class AuthServiceTest extends IntegrationTestSupport { + + @MockBean + private OauthClient oauthClient; + + @Autowired + private AuthService authService; + + @Autowired + private UserRepository userRepository; + + private static final OauthLoginRequest oauthLoginRequest = new OauthLoginRequest("testCode"); + + @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") + @Test + void login_signup() { + // given + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) + .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER2); + + // when + String token = authService.login(oauthLoginRequest); + + // then + Assertions.assertThat(token).isNotBlank(); + } + + @DisplayName("로그인 성공 : 존재하는 회원이면 데이터베이스에 새로운 유저를 추가하지않고 토큰을 바로 반환한다.") + @Test + void login() { + // given + userRepository.save(USER1); + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) + .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER1); + + // when + String token = authService.login(oauthLoginRequest); + + // then + Assertions.assertThat(token).isNotBlank(); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java new file mode 100644 index 000000000..fd8b760d7 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java @@ -0,0 +1,81 @@ +package com.bang_ggood.auth.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static com.bang_ggood.user.UserFixture.USER1; + +class JwtTokenProviderTest extends IntegrationTestSupport { + + @Autowired + private JwtTokenProvider jwtTokenProvider; + @Autowired + private UserRepository userRepository; + + @DisplayName("토큰 생성 성공") + @Test + void createToken() { + // given + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + + // when + AuthUser authUser = jwtTokenProvider.resolveToken(token); + + // then + Assertions.assertThat(authUser.id()).isEqualTo(user.getId()); + } + + @DisplayName("토큰 획인 실패 : 유효시간이 지난 경우") + @Test + void resolveToken_expiredTime_exception() { + // given + String JWT_SECRET_KEY = "A".repeat(32); + int JWT_ACCESS_TOKEN_EXPIRE_LENGTH = 1; + JwtTokenProvider expiredJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); + + User user = userRepository.save(USER1); + String token = expiredJwtTokenProvider.createToken(user); + + // when & then + Assertions.assertThatCode(() -> expiredJwtTokenProvider.resolveToken(token)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED.getMessage()); + } + + @DisplayName("토큰 확인 실패 : 시그니처가 잘못된 경우") + @Test + void resolveToken_invalidSignature_exception() { + // given + String JWT_SECRET_KEY = "A".repeat(32); + int JWT_ACCESS_TOKEN_EXPIRE_LENGTH = 1800000; + JwtTokenProvider invalidJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); + + User user = userRepository.save(USER1); + String token = jwtTokenProvider.createToken(user); + + // when & then + Assertions.assertThatCode(() -> invalidJwtTokenProvider.resolveToken(token)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_INVALID.getMessage()); + } + + @DisplayName("토큰 확인 실패 : 토큰 형태가 잘못된 경우") + @Test + void resolveToken_invalidToken_exception() { + // given + String invalidToken = "malformed"; + + // when & then + Assertions.assertThatCode(() -> jwtTokenProvider.resolveToken(invalidToken)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java index b79398d39..829362501 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java @@ -5,6 +5,9 @@ import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; import com.bang_ggood.category.dto.response.CategoriesReadResponse; import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -21,6 +24,13 @@ class CategoryServiceTest extends IntegrationTestSupport { @Autowired CategoryService categoryService; + @Autowired + UserRepository userRepository; + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + } @DisplayName("카테고리 우선순위 저장 성공") @Test @@ -29,7 +39,7 @@ void createCategoriesPriority() { CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3)); // when && then - assertThatCode(() -> categoryService.createCategoriesPriority(request)) + assertThatCode(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .doesNotThrowAnyException(); } @@ -40,7 +50,7 @@ void createCategoriesPriority_invalidId_exception() { CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(999)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_NOT_FOUND.getMessage()); } @@ -52,7 +62,7 @@ void createCategoriesPriority_overMaxCount_exception() { CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); } @@ -64,7 +74,7 @@ void createCategoriesPriority_duplication_exception() { CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 1)); // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(request)) + assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(CATEGORY_DUPLICATED.getMessage()); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index dca95ec52..f28472e7c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -1,88 +1,158 @@ package com.bang_ggood.checklist; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; -import com.bang_ggood.checklist.dto.request.QuestionCreateRequest; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; +import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.room.RoomFixture; -import com.bang_ggood.user.domain.User; - +import com.bang_ggood.user.UserFixture; import java.util.List; public class ChecklistFixture { public static final Checklist checklist = new Checklist( - new User(1L, "방방이"), + UserFixture.USER1, RoomFixture.ROOM_1, 1000, 50, 12, "방끗공인중개사" ); - public static final QuestionCreateRequest QUESTION_1_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( 1, "GOOD", "메모1" ); - public static final QuestionCreateRequest QUESTION_2_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_2_CREATE_REQUEST = new QuestionRequest( 2, "SOSO", null ); - public static final QuestionCreateRequest QUESTION_3_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_3_CREATE_REQUEST = new QuestionRequest( 3, "BAD", "메모3" ); - public static final QuestionCreateRequest QUESTION_5_CREATE_REQUEST = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_4_CREATE_REQUEST = new QuestionRequest( + 4, "SOSO", null + ); + + public static final QuestionRequest QUESTION_5_CREATE_REQUEST = new QuestionRequest( 5, "GOOD", null ); - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ANSWER = new QuestionCreateRequest( - 6, null, "메모6" + public static final QuestionRequest QUESTION_5_UPDATE_REQUEST = new QuestionRequest( + 5, "GOOD", "메모" ); - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionCreateRequest( - null, "GOOD", "메모" + + public static final QuestionRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionRequest( + null, "NONE", "메모" ); - public static final QuestionCreateRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionCreateRequest( + public static final QuestionRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionRequest( 9999, "SOSO", null ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_NO_ROOM_NAME = new ChecklistRequest( + RoomFixture.ROOM_CREATE_REQUEST_NO_ROOM_NAME, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_NO_QUESTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_NO_ID) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_INVALID_QUESTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_CREATE_REQUEST_INVALID_ID) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 9999), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_INVALID_OPTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 4, 9999), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 5), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) ); - public static final ChecklistCreateRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistCreateRequest( + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DUPLICATED_QUESTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistRequest( RoomFixture.ROOM_CREATE_REQUEST, List.of(1, 2, 3, 3), List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, QUESTION_3_CREATE_REQUEST, QUESTION_5_CREATE_REQUEST) ); + + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DUPLICATED_OPTION_ID = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 4, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_5_UPDATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION_LENGTH = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST) + ); + + public static final ChecklistRequest CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION = new ChecklistRequest( + RoomFixture.ROOM_UPDATE_REQUEST, List.of(1, 2, 3, 4), + List.of(QUESTION_1_CREATE_REQUEST, QUESTION_2_CREATE_REQUEST, + QUESTION_3_CREATE_REQUEST, QUESTION_4_CREATE_REQUEST) + ); + + + public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( + checklist, Question.fromId(1), Grade.BAD, "메모" + ); + + public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( + checklist, Question.fromId(2), Grade.BAD, "메모" + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index fdd116be9..ba07d1c7b 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -4,26 +4,33 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import io.restassured.http.Header; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; - +import org.springframework.http.HttpHeaders; import java.util.HashMap; import java.util.List; import java.util.Map; +import static com.bang_ggood.user.UserFixture.USER1; import static org.assertj.core.api.Assertions.assertThat; +import static org.hamcrest.Matchers.containsString; -public class ChecklistE2ETest extends AcceptanceTest { +class ChecklistE2ETest extends AcceptanceTest { + @Autowired + private ChecklistService checklistService; @Autowired private ChecklistRepository checklistRepository; @Autowired @@ -34,6 +41,7 @@ public class ChecklistE2ETest extends AcceptanceTest { void createChecklist() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) .when().post("/checklists") .then().log().all() @@ -45,6 +53,7 @@ void createChecklist() { void createChecklist_noRoomName_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) .when().post("/checklists") .then().log().all() @@ -56,6 +65,7 @@ void createChecklist_noRoomName_exception() { void createChecklist_noQuestionId_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) .when().post("/checklists") .then().log().all() @@ -65,8 +75,11 @@ void createChecklist_noQuestionId_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { + checklistService.updateCustomChecklist(USER1, new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); + ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/questions") .then().log().all() .statusCode(200) @@ -79,24 +92,67 @@ void readChecklistQuestions() { @DisplayName("작성된 체크리스트 조회 성공") @Test void readChecklistById() { - //체크리스트 저장 - roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.checklist); + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); SelectedChecklistResponse selectedChecklistResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) - .when().get("/checklists/" + saved.getId()) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().get("/checklists/" + checklistId) .then().log().all() .statusCode(200) .extract() .as(SelectedChecklistResponse.class); Assertions.assertAll( - () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("살기 좋은 방"), - () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("인천광역시 부평구") + () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), + () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") ); } + @DisplayName("체크리스트 수정 성공") + @Test + void updateChecklist() { + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST) + .when().put("/checklists/" + checklistId) + .then().log().all() + .statusCode(204); + } + + @DisplayName("체크리스트 수정 실패: 방 이름을 넣지 않은 경우") + @Test + void updateChecklist_noRoomName_exception() { + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST_NO_ROOM_NAME) + .when().put("/checklists/" + checklistId) + .then().log().all() + .statusCode(400) + .body("message", containsString("방 이름이 존재하지 않습니다.")); + } + + @DisplayName("체크리스트 수정 실패: 질문 ID를 넣지 않은 경우") + @Test + void updateChecklist_noQuestionId_exception() { + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(ChecklistFixture.CHECKLIST_UPDATE_REQUEST_NO_QUESTION_ID) + .when().put("/checklists/" + checklistId) + .then().log().all() + .statusCode(400) + .body("message", containsString("질문 아이디가 존재하지 않습니다.")); + } + @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { @@ -105,9 +161,24 @@ void updateCustomChecklist() { RestAssured.given().log().all() .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .body(params) .when().put("/custom-checklist") .then().log().all() .statusCode(204); } + + @DisplayName("체크리스트 삭제 성공") + @Test + void deleteChecklistById() { + roomRepository.save(RoomFixture.ROOM_1); + Checklist saved = checklistRepository.save(ChecklistFixture.checklist); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().delete("/checklists/" + saved.getId()) + .then().log().all() + .statusCode(204); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java new file mode 100644 index 000000000..a614e2ab0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java @@ -0,0 +1,34 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.checklist.ChecklistFixture; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.*; + +class ChecklistQuestionTest { + + @DisplayName("체크리스트 내에서 질문끼리 다른 id를 갖고 있는지 확인 성공 : 다른 id일 경우") + @Test + void isDifferentQuestionId_true() { + //given + ChecklistQuestion checklistQuestion1 = ChecklistFixture.CHECKLIST_QUESTION_1; + ChecklistQuestion checklistQuestion2 = ChecklistFixture.CHECKLIST_QUESTION_2; + + //when & then + assertThat(checklistQuestion1.isDifferentQuestionId(checklistQuestion2)).isTrue(); + } + + @DisplayName("체크리스트 내에서 질문끼리 다른 id를 갖고 있는지 확인 성공 : 같은 id일 경우") + @Test + void isDifferentQuestionId_false() { + //given + ChecklistQuestion checklistQuestion = ChecklistFixture.CHECKLIST_QUESTION_1; + ChecklistQuestion compareChecklistQuestion = ChecklistFixture.CHECKLIST_QUESTION_1; + + //when & then + assertThat(checklistQuestion.isDifferentQuestionId(compareChecklistQuestion)).isFalse(); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java new file mode 100644 index 000000000..a9964f0d9 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java @@ -0,0 +1,84 @@ +package com.bang_ggood.checklist.domain; + +import java.util.List; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class ChecklistRankTest { + + @DisplayName("Score 에 대한 Rank 계산 성공 : 3명인 경우") + @Test + void calculateRanksByDescendingScores_threeScores() { + //give + List scores = List.of(5, 3, 1); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(3, scores)).isEqualTo(2), + () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(3) + ); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 2명인 경우") + @Test + void calculateRanksByDescendingScores_twoScores() { + //given + List scores = List.of(5, 3); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(3, scores)).isEqualTo(2) + ); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 1명인 경우") + @Test + void calculateRanksByDescendingScores_oneScores() { + //given + List scores = List.of(5); + + //when & then + assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 모두 점수가 같은 경우") + @Test + void calculateRanksByDescendingScores_allSameScore() { + //given + List scores = List.of(5, 5, 5); + + //when & then + assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 1등이 2명인 경우") + @Test + void calculateRanksByDescendingScores_bothRankOne() { + //given + List scores = List.of(5, 5, 1); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(3) + ); + } + + @DisplayName("Score 에 대한 Rank 계산 성공 : 2등이 2명인 경우") + @Test + void calculateRanksByDescendingScores_BothRankTwo() { + //given + List scores = List.of(5, 1, 1); + + //when & then + assertAll( + () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), + () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(2) + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java index b7145cd9a..c44780f98 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -57,7 +57,7 @@ void fromId_invalidQuestion_exception() { .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } - @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함일 경우") + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 성공 : 포함일 경우") @Test void contains_true() { //given @@ -67,7 +67,7 @@ void contains_true() { assertThat(Question.contains(questionId)).isTrue(); } - @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 : 포함이 아닐 경우") + @DisplayName("질문 아이디를 통해 포함되어 있는지 확인 성공 : 포함이 아닐 경우") @Test void contains_false() { //given @@ -76,5 +76,4 @@ void contains_false() { //when & then assertThat(Question.contains(questionId)).isFalse(); } - } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java index 74ecde46f..a524256c4 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/option/OptionTest.java @@ -1,11 +1,11 @@ package com.bang_ggood.checklist.option; -import static org.assertj.core.api.Assertions.assertThat; - import com.bang_ggood.checklist.domain.Option; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import static org.assertj.core.api.Assertions.assertThat; + class OptionTest { @DisplayName("옵션 포함 성공: 포함하는 경우") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java new file mode 100644 index 000000000..5a17f0d67 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistOptionRepositoryTest.java @@ -0,0 +1,78 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.ChecklistOption; +import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; + +class ChecklistOptionRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistService checklistService; + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private ChecklistOptionRepository checklistOptionRepository; + @Autowired + private UserRepository userRepository; + + private long checklistId; + + @BeforeEach + void setUp() { + User user = userRepository.save(UserFixture.USER1); + checklistId = checklistService.createChecklist(user, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + } + + @DisplayName("체크리스트 ID로 옵션 찾기 성공") + @Test + void findByChecklistId() { + // given & when + List checklistOptions = checklistOptionRepository.findByChecklistId(checklistId); + + // then + assertThat(checklistOptions) + .allSatisfy(option -> + assertThat(option.isDeleted()).isFalse() + ); + } + + @DisplayName("체크리스트 옵션 수 세기 성공") + @Test + void countByChecklist() { + // given & when + int optionCount = checklistOptionRepository.countByChecklist(checklistRepository.getById(checklistId)); + + // then + assertThat(optionCount).isEqualTo(ChecklistFixture.CHECKLIST_CREATE_REQUEST.options().size()); + + } + + @DisplayName("체크리스트 ID로 옵션 삭제 성공") + @Test + void deleteAllByChecklistId() { + // given + List checklistOptions = checklistOptionRepository.findByChecklistId(checklistId); + + // when + checklistOptionRepository.deleteAllByChecklistId(checklistId); + + // then + assertThat(checklistOptions) + .allSatisfy(option -> + assertThat(checklistOptionRepository.findById(option.getId()).get().isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java new file mode 100644 index 000000000..6dc208e92 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -0,0 +1,103 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertAll; + + +class ChecklistRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private RoomRepository roomRepository; + + @Autowired + private UserRepository userRepository; + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + } + + @DisplayName("아이디를 통해 체크리스트 갖고 오기 성공") + @Test + void findById() { + //given + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + //when + Checklist foundChecklist = checklistRepository.getById(savedChecklist.getId().longValue()); + + //then + assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.checklist.getId()); + } + + @DisplayName("아이디를 통해 체크리스트 갖고 오기 실패 : 해당하는 체크리스트가 없을 경우") + @Test + void findById_notFound_exception() { + assertThatThrownBy(() -> checklistRepository.getById(1)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } + + @DisplayName("체크리스트 아이디 리스트 중 유저가 생성한 체크리스트 목록 갖고 오기 성공") + @Test + void findByUserAndIdIn() { + //given + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + assertThat(checklistRepository.findByUserAndIdIn(UserFixture.USER1, List.of(savedChecklist.getId()))) + .isEqualTo(List.of(savedChecklist)); + } + + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") + @Test + void existsById_true() { + //given & when + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + //then + assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isTrue(); + } + + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하지 않는 경우") + @Test + void existsById_false() { + //given & when & then + assertThat(checklistRepository.existsById(1)).isFalse(); + } + + @DisplayName("체크리스트 삭제 성공") + @Test + void deleteById() { + //given + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + + //when + checklistRepository.deleteById(savedChecklist.getId().longValue()); + + //then + assertAll( + () -> assertThat(checklistRepository.existsById(savedChecklist.getId())).isTrue(), + () -> assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isFalse() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 46aae9ed0..4e14b8cbe 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -4,11 +4,15 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; -import com.bang_ggood.checklist.dto.request.ChecklistCreateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; @@ -16,17 +20,22 @@ import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.domain.Room; +import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; -import java.util.List; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; +import static com.bang_ggood.user.UserFixture.USER1; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -46,18 +55,32 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private RoomRepository roomRepository; + @Autowired private CustomChecklistQuestionRepository customChecklistQuestionRepository; + @Autowired + private ChecklistOptionRepository checklistOptionRepository; + + @Autowired + private UserRepository userRepository; + + @BeforeEach() + public void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + roomRepository.save(RoomFixture.ROOM_2); + roomRepository.save(RoomFixture.ROOM_3); + } @DisplayName("체크리스트 방 정보 작성 성공") @Test void createChecklist() { //given - ChecklistCreateRequest checklist = ChecklistFixture.CHECKLIST_CREATE_REQUEST; + ChecklistRequest checklist = ChecklistFixture.CHECKLIST_CREATE_REQUEST; // when - long checklistId = checklistService.createChecklist(checklist); + long checklistId = checklistService.createChecklist(UserFixture.USER1, checklist); //then assertAll( @@ -73,7 +96,8 @@ void createChecklist() { void createChecklist_invalidQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @@ -83,7 +107,7 @@ void createChecklist_invalidQuestionId_exception() { void createChecklist_duplicatedQuestionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist( + () -> checklistService.createChecklist(UserFixture.USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); @@ -94,7 +118,8 @@ void createChecklist_duplicatedQuestionId_exception() { void createChecklist_invalidOptionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_INVALID_OPTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); } @@ -104,7 +129,8 @@ void createChecklist_invalidOptionId_exception() { void createChecklist_duplicatedOptionId_exception() { //given & when & then assertThatThrownBy( - () -> checklistService.createChecklist(ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) + () -> checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_OPTION_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } @@ -112,8 +138,11 @@ void createChecklist_duplicatedOptionId_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { + // TODO : 유저 생성 시 default 질문을 DB에 저장하는 기능 추가 + checklistService.updateCustomChecklist(USER1, + new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); // given & when - ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(); + ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(USER1); // then // Category.OPTION does not have default question assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); @@ -127,7 +156,7 @@ void readChecklistById() { checklistRepository.save(ChecklistFixture.checklist); // when - SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(1L); + SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(UserFixture.USER1, 1L); // then assertAll( @@ -140,7 +169,7 @@ void readChecklistById() { @Test void readChecklistById_invalidChecklistId_exception() { // given & when & then - assertThatThrownBy(() -> checklistService.readChecklistById(0)) + assertThatThrownBy(() -> checklistService.readChecklistById(UserFixture.USER1, 0)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } @@ -206,13 +235,13 @@ void readChecklistById_invalidChecklistId_exception() { @Test void readChecklistsComparison() { // given - User user = new User(1L, "방방이"); + User user1 = UserFixture.USER1; Room room1 = RoomFixture.ROOM_1; Room room2 = RoomFixture.ROOM_2; Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user, room1); - Checklist checklist2 = createChecklist(user, room2); - Checklist checklist3 = createChecklist(user, room3); + Checklist checklist1 = createChecklist(user1, room1); + Checklist checklist2 = createChecklist(user1, room2); + Checklist checklist3 = createChecklist(user1, room3); roomRepository.saveAll(List.of(room1, room2, room3)); List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); @@ -220,12 +249,44 @@ void readChecklistsComparison() { checklists.get(2).getId()); // when - ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(checklistIds); + ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(user1, checklistIds); // then assertThat(response.checklists()).hasSize(3); } + @DisplayName("체크리스트 비교 성공 : 순위가 정상적으로 계산된 경우") + @Test + void readChecklistsComparison_compareRank() { + // given + User user1 = UserFixture.USER1; + Room room1 = RoomFixture.ROOM_1; + Room room2 = RoomFixture.ROOM_2; + Room room3 = RoomFixture.ROOM_3; + Checklist checklist1 = createChecklist(user1, room1); + Checklist checklist2 = createChecklist(user1, room2); + Checklist checklist3 = createChecklist(user1, room3); + ChecklistQuestion checklistQuestion1 = new ChecklistQuestion(checklist1, Question.CLEAN_1, Grade.GOOD, null); + ChecklistQuestion checklistQuestion2 = new ChecklistQuestion(checklist2, Question.CLEAN_2, Grade.SOSO, null); + ChecklistQuestion checklistQuestion3 = new ChecklistQuestion(checklist3, Question.CLEAN_3, Grade.BAD, null); + + roomRepository.saveAll(List.of(room1, room2, room3)); + List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + checklistQuestionRepository.saveAll(List.of(checklistQuestion1, checklistQuestion2, checklistQuestion3)); + List checklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), + checklists.get(2).getId()); + + // when + ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(user1, checklistIds); + + // then + assertAll( + () -> assertThat(response.checklists().get(0).getRank()).isEqualTo(1), + () -> assertThat(response.checklists().get(1).getRank()).isEqualTo(2), + () -> assertThat(response.checklists().get(2).getRank()).isEqualTo(3) + ); + } + @DisplayName("체크리스트 비교 실패 : 아이디 개수가 유효하지 않을 때") @Test void readChecklistsComparison_invalidIdCount() { @@ -233,7 +294,7 @@ void readChecklistsComparison_invalidIdCount() { List invalidChecklistIds = List.of(1L, 2L, 3L, 4L); // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + assertThatCode(() -> checklistService.readChecklistsComparison(USER1, invalidChecklistIds)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT.getMessage()); } @@ -242,13 +303,13 @@ void readChecklistsComparison_invalidIdCount() { @Test void readChecklistsComparison_invalidId() { // given - User user = new User(1L, "방방이"); + User user1 = UserFixture.USER1; Room room1 = RoomFixture.ROOM_1; Room room2 = RoomFixture.ROOM_2; Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user, room1); - Checklist checklist2 = createChecklist(user, room2); - Checklist checklist3 = createChecklist(user, room3); + Checklist checklist1 = createChecklist(user1, room1); + Checklist checklist2 = createChecklist(user1, room2); + Checklist checklist3 = createChecklist(user1, room3); roomRepository.saveAll(List.of(room1, room2, room3)); List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); @@ -256,11 +317,121 @@ void readChecklistsComparison_invalidId() { checklists.get(2).getId() + 1); // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(invalidChecklistIds)) + assertThatCode(() -> checklistService.readChecklistsComparison(user1, invalidChecklistIds)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + @DisplayName("체크리스트 수정 성공") + @Test + void updateChecklistById() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when + checklistService.updateChecklistById(UserFixture.USER1, checklistId, ChecklistFixture.CHECKLIST_UPDATE_REQUEST); + + //then + Checklist checklist = checklistRepository.getById(checklistId); + assertAll( + () -> assertThat(checklist.getRoom().getStructure()).isEqualTo(Structure.OPEN_ONE_ROOM), + () -> assertThat( + checklistOptionRepository.findByChecklistId(checklistId).get(3).getOptionId()).isEqualTo(4), + () -> assertThat(checklist.getQuestions().get(3).getMemo()).isEqualTo("메모") + ); + } + + @DisplayName("체크리스트 수정 실패 : 질문 id가 유효하지 않을 경우") + @Test + void updateChecklistById_invalidQuestionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 질문 id가 중복일 경우") + @Test + void updateChecklistById_duplicatedQuestionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_CREATE_REQUEST_DUPLICATED_QUESTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 옵션 id가 유효하지 않을 경우") + @Test + void updateChecklistById_invalidOptionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_INVALID_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 옵션 id가 중복일 경우") + @Test + void updateChecklistById_duplicatedOptionId_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DUPLICATED_OPTION_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 기존의 체크리스트와 질문 길이가 다를 경우") + @Test + void updateChecklistById_differentQuestionLength_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION_LENGTH)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); + } + + @DisplayName("체크리스트 수정 실패 : 기존의 체크리스트와 질문이 다를 경우") + @Test + void createChecklist_differentQuestion_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER1, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); + } + @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { @@ -268,10 +439,10 @@ void updateCustomChecklist() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST; // when - checklistService.updateCustomChecklist(request); + checklistService.updateCustomChecklist(USER1, request); // then - assertThat(customChecklistQuestionRepository.findByUser(new User(1L, "방방이"))) + assertThat(customChecklistQuestionRepository.findByUser(USER1)) .hasSize(request.questionIds().size()); } @@ -282,7 +453,7 @@ void updateCustomChecklist_empty_exception() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; // when & then - assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + assertThatThrownBy(() -> checklistService.updateCustomChecklist(USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CUSTOM_CHECKLIST_QUESTION_EMPTY.getMessage()); } @@ -294,7 +465,7 @@ void updateCustomChecklist_duplicatedQuestion_exception() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; // when & then - assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + assertThatThrownBy(() -> checklistService.updateCustomChecklist(USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); } @@ -306,7 +477,7 @@ void updateCustomChecklist_invalidQuestionId_exception() { CustomChecklistUpdateRequest request = CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; // when & then - assertThatThrownBy(() -> checklistService.updateCustomChecklist(request)) + assertThatThrownBy(() -> checklistService.updateCustomChecklist(USER1, request)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } @@ -314,4 +485,27 @@ void updateCustomChecklist_invalidQuestionId_exception() { public static Checklist createChecklist(User user, Room room) { return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); } + + @DisplayName("체크리스트 삭제 성공") + @Test + void deleteChecklistById() { + // given + roomRepository.save(RoomFixture.ROOM_1); + Checklist checklist = checklistRepository.save(ChecklistFixture.checklist); + + // when + checklistService.deleteChecklistById(checklist.getId()); + + // then + assertThat(checklistRepository.existsById(checklist.getId().longValue())).isFalse(); + } + + @DisplayName("체크리스트 삭제 실패") + @Test + void deleteChecklistById_notFound_exception() { + // given & when & then + assertThatThrownBy(() -> checklistService.deleteChecklistById(-1)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 4bad52d8c..7461fe205 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -4,7 +4,7 @@ import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.domain.Type; -import com.bang_ggood.room.dto.request.RoomCreateRequest; +import com.bang_ggood.room.dto.request.RoomRequest; public class RoomFixture { @@ -23,13 +23,19 @@ public class RoomFixture { Type.VILLA, 55, null, FloorLevel.ROOFTOP, Structure.DUPLEX ); - public static final RoomCreateRequest ROOM_CREATE_REQUEST = new RoomCreateRequest( + public static final RoomRequest ROOM_CREATE_REQUEST = new RoomRequest( "방이름", 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() ); - public static final RoomCreateRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomCreateRequest( + public static final RoomRequest ROOM_UPDATE_REQUEST = new RoomRequest( + "방이름", 1000, 50, 12, "부산광역시 루터회관", + "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), + Structure.OPEN_ONE_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() + ); + + public static final RoomRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomRequest( null, 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java new file mode 100644 index 000000000..c70164107 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -0,0 +1,19 @@ +package com.bang_ggood.user; + +import com.bang_ggood.auth.dto.response.KakaoAccountResponse; +import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.auth.dto.response.ProfileResponse; +import com.bang_ggood.user.domain.User; + +public class UserFixture { + + public static final User USER1 = new User("방방이", "bang-bang@gmail.com"); + public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); + public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoApiResponse("", "", + new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), + new ProfileResponse("", "",""))); + + public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER2 = new OauthInfoApiResponse("", "", + new KakaoAccountResponse(USER2.getEmail(), USER2.getName(), + new ProfileResponse("", "",""))); +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java new file mode 100644 index 000000000..8fc328dfc --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/repository/UserRepositoryTest.java @@ -0,0 +1,32 @@ +package com.bang_ggood.user.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.Optional; + +import static com.bang_ggood.user.UserFixture.USER1; + +class UserRepositoryTest extends IntegrationTestSupport { + + @Autowired + private UserRepository userRepository; + + @DisplayName("유저 이메일 조회 성공 : 유저 삭제 후 유저를 조회하면(논리적 삭제) 조회되지 않는다.") + @Test + void findByEmail() { + // given + User user = userRepository.save(USER1); + userRepository.deleteByUser(user); + + // when + Optional findUser = userRepository.findByEmail(user.getEmail()); + + // then + Assertions.assertThat(findUser).isEmpty(); + } +} diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index c08131483..44bcaa2fc 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -1,5 +1,5 @@ -INSERT INTO users(id, name, created_at, modified_at, deleted) -VALUES (1, '방방이', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +INSERT INTO users(name, email, created_at, modified_at, deleted) +VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index ee70c75da..707e8fa8b 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -30,9 +30,10 @@ CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, name VARCHAR(255) NOT NULL, + email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), - deleted BOOLEAN + deleted BOOLEAN ); CREATE TABLE checklist @@ -46,7 +47,7 @@ CREATE TABLE checklist room_id BIGINT NOT NULL UNIQUE, user_id BIGINT NOT NULL, real_estate VARCHAR(255), - deleted BOOLEAN, + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); @@ -83,7 +84,7 @@ CREATE TABLE category_priority user_id bigint not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, - deleted BOOLEAN, + deleted BOOLEAN, primary key (id), foreign key (user_id) references users ); @@ -95,17 +96,17 @@ CREATE TABLE test_entity name varchar(255) not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, - deleted BOOLEAN, + deleted BOOLEAN, primary key (id) ); CREATE TABLE custom_checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - user_id BIGINT, - question VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (user_id) references users ); From 886ce55ed85634484ccce708040afbeb881fa729 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 6 Aug 2024 20:12:26 +0900 Subject: [PATCH 137/348] =?UTF-8?q?feat:=20User=20=EC=9D=B4=EB=A6=84=20nul?= =?UTF-8?q?lable?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/domain/User.java | 1 - backend/bang-ggood/src/main/resources/schema.sql | 2 +- backend/bang-ggood/src/test/resources/schema-test.sql | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index 56c355ed8..08f1c332c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -17,7 +17,6 @@ public class User extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false) private String name; @Column(nullable = false) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index ff1b6edae..ea33712cd 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -28,7 +28,7 @@ CREATE TABLE room CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - name VARCHAR(255) NOT NULL, + name VARCHAR(255), email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 707e8fa8b..8c40869f5 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -29,7 +29,7 @@ CREATE TABLE room CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - name VARCHAR(255) NOT NULL, + name VARCHAR(255), email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), From 6a217983deb25bf13f7a78aa75ff5e96a36286e2 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 6 Aug 2024 20:15:40 +0900 Subject: [PATCH 138/348] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EC=9D=B8=20API=20=EC=97=B0=EB=8F=99=EC=A4=91=20?= =?UTF-8?q?=EB=B0=9C=EC=83=9D=ED=95=9C=20=EC=98=A4=EB=A5=98=EB=A5=BC=20?= =?UTF-8?q?=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#247)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: tsulocalize Co-authored-by: gmuz1c Co-authored-by: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Co-authored-by: tsulocalize --- .../src/main/java/com/bang_ggood/user/domain/User.java | 1 - backend/bang-ggood/src/main/resources/schema.sql | 2 +- backend/bang-ggood/src/test/resources/schema-test.sql | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java index 56c355ed8..08f1c332c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/domain/User.java @@ -17,7 +17,6 @@ public class User extends BaseEntity { @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @Column(nullable = false) private String name; @Column(nullable = false) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index ff1b6edae..ea33712cd 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -28,7 +28,7 @@ CREATE TABLE room CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - name VARCHAR(255) NOT NULL, + name VARCHAR(255), email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 707e8fa8b..8c40869f5 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -29,7 +29,7 @@ CREATE TABLE room CREATE TABLE users ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - name VARCHAR(255) NOT NULL, + name VARCHAR(255), email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), From ef734a8bbebeab7760fa0fb3f8f433ab51c88203 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 7 Aug 2024 10:54:40 +0900 Subject: [PATCH 139/348] =?UTF-8?q?[BE]=20=EC=BF=A0=ED=82=A4=EC=84=A4?= =?UTF-8?q?=EC=A0=95=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?252)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/CookieProvider.java | 5 ++++ .../controller/ChecklistE2ETest.java | 10 +++++++ .../service/ChecklistServiceTest.java | 26 ++++++++++++++++++- 3 files changed, 40 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index 475626af7..21ac53e06 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -2,6 +2,7 @@ import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; +import java.time.Duration; @Component public class CookieProvider { @@ -11,7 +12,11 @@ public class CookieProvider { public ResponseCookie createCookie(String token) { return ResponseCookie .from(TOKEN_COOKIE_NAME, token) + .domain("localhost") .httpOnly(true) + .secure(true) + .sameSite("none") + .maxAge(Duration.ofHours(2)) .path("/") .build(); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index ba07d1c7b..2de0e0f8c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -89,6 +89,16 @@ void readChecklistQuestions() { assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); } + @DisplayName("커스텀 체크리스트 전체 조회 성공") + @Test + void readAllCustomChecklistQuestion() { + // given + + // when + + // then + } + @DisplayName("작성된 체크리스트 조회 성공") @Test void readChecklistById() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 4e14b8cbe..2e041337d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -5,12 +5,14 @@ import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; @@ -25,6 +27,7 @@ import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -174,6 +177,27 @@ void readChecklistById_invalidChecklistId_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + @DisplayName("커스텀 체크리스트 조회 성공") + @Test + void readCustomChecklistQuestions() { + // given + CustomChecklistQuestion question1 = new CustomChecklistQuestion(USER1, Question.CLEAN_5); + CustomChecklistQuestion question2 = new CustomChecklistQuestion(USER1, Question.AMENITY_12); + List questions = List.of(question1, question2); + customChecklistQuestionRepository.saveAll(questions); + + // when + CategoryCustomChecklistQuestionsResponse response = checklistService.readAllCustomChecklistQuestions(USER1); + + // then + long selectedCount = response.categories().stream() + .flatMap(category -> category.question().stream()) + .filter(CustomChecklistQuestionResponse::isSelected) + .count(); + + Assertions.assertThat(selectedCount).isEqualTo(questions.size()); + } + // @DisplayName("체크리스트 리스트 조회 성공") // @Test // void readUserChecklistsPreview() { @@ -442,7 +466,7 @@ void updateCustomChecklist() { checklistService.updateCustomChecklist(USER1, request); // then - assertThat(customChecklistQuestionRepository.findByUser(USER1)) + assertThat(customChecklistQuestionRepository.findAllByUser(USER1)) .hasSize(request.questionIds().size()); } From 92651cae0a1f22882d68fcf1b1fdf699d42f095d Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 7 Aug 2024 12:07:51 +0900 Subject: [PATCH 140/348] =?UTF-8?q?fix:=20=ED=86=A0=ED=81=B0=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=9C=BC=EB=A1=9C=20=EA=B9=A8=EC=A7=80=EB=8A=94=20?= =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20?= =?UTF-8?q?=EC=9E=98=EB=AA=BB=20=EB=93=A4=EC=96=B4=EA=B0=84=20=ED=8C=8C?= =?UTF-8?q?=EC=9D=BC=20=EC=82=AD=EC=A0=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomChecklistQuestionRepository.java | 2 +- .../checklist/service/ChecklistService.java | 2 +- .../auth/controller/LoginMockE2ETest.java | 3 ++- .../service/ChecklistServiceTest.java | 23 ------------------- 4 files changed, 4 insertions(+), 26 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java index c2c94cd89..0a9f9b3cb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java @@ -11,7 +11,7 @@ public interface CustomChecklistQuestionRepository extends JpaRepository { @Query("SELECT c FROM CustomChecklistQuestion c WHERE c.user.id = :#{#user.id} AND c.deleted = false " ) - List findByUser(@Param("user") User user); + List findAllByUser(@Param("user") User user); @Modifying(flushAutomatically = true, clearAutomatically = true) @Query("UPDATE CustomChecklistQuestion SET deleted = true WHERE user.id = :#{#user.id}") diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index d8e941b31..88612fe91 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -127,7 +127,7 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli @Transactional public ChecklistQuestionsResponse readChecklistQuestions(User user) { - List customChecklistQuestions = customChecklistQuestionRepository.findByUser(user); + List customChecklistQuestions = customChecklistQuestionRepository.findAllByUser(user); Map> categoryQuestions = customChecklistQuestions.stream() .map(CustomChecklistQuestion::getQuestion) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java index b528d13ed..7f118337e 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java @@ -10,6 +10,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; +import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; @@ -30,6 +31,6 @@ void login() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content("{\"code\":\"code\"}")) .andExpect(status().isOk()) - .andExpect(header().string(HttpHeaders.SET_COOKIE, "token=" + testToken + "; Path=/; HttpOnly")); + .andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("token=" + testToken))); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 2e041337d..ab23cef56 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -5,14 +5,12 @@ import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; -import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; @@ -27,7 +25,6 @@ import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -177,26 +174,6 @@ void readChecklistById_invalidChecklistId_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } - @DisplayName("커스텀 체크리스트 조회 성공") - @Test - void readCustomChecklistQuestions() { - // given - CustomChecklistQuestion question1 = new CustomChecklistQuestion(USER1, Question.CLEAN_5); - CustomChecklistQuestion question2 = new CustomChecklistQuestion(USER1, Question.AMENITY_12); - List questions = List.of(question1, question2); - customChecklistQuestionRepository.saveAll(questions); - - // when - CategoryCustomChecklistQuestionsResponse response = checklistService.readAllCustomChecklistQuestions(USER1); - - // then - long selectedCount = response.categories().stream() - .flatMap(category -> category.question().stream()) - .filter(CustomChecklistQuestionResponse::isSelected) - .count(); - - Assertions.assertThat(selectedCount).isEqualTo(questions.size()); - } // @DisplayName("체크리스트 리스트 조회 성공") // @Test From 87ec411ab0dca10553f3840975dba6237e5a5d6c Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:09:21 +0900 Subject: [PATCH 141/348] =?UTF-8?q?[BE]=20=EC=BF=A0=ED=82=A4=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD=EC=82=AC=ED=95=AD=EC=9D=84=20dev=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=EC=97=90=20=EB=B3=91=ED=95=A9=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?256)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: tsulocalize Co-authored-by: gmuz1c Co-authored-by: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Co-authored-by: tsulocalize --- .../com/bang_ggood/auth/controller/CookieProvider.java | 5 +++++ .../repository/CustomChecklistQuestionRepository.java | 2 +- .../bang_ggood/checklist/service/ChecklistService.java | 2 +- .../bang_ggood/auth/controller/LoginMockE2ETest.java | 3 ++- .../checklist/controller/ChecklistE2ETest.java | 10 ++++++++++ .../checklist/service/ChecklistServiceTest.java | 3 ++- 6 files changed, 21 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index 475626af7..21ac53e06 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -2,6 +2,7 @@ import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; +import java.time.Duration; @Component public class CookieProvider { @@ -11,7 +12,11 @@ public class CookieProvider { public ResponseCookie createCookie(String token) { return ResponseCookie .from(TOKEN_COOKIE_NAME, token) + .domain("localhost") .httpOnly(true) + .secure(true) + .sameSite("none") + .maxAge(Duration.ofHours(2)) .path("/") .build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java index c2c94cd89..0a9f9b3cb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java @@ -11,7 +11,7 @@ public interface CustomChecklistQuestionRepository extends JpaRepository { @Query("SELECT c FROM CustomChecklistQuestion c WHERE c.user.id = :#{#user.id} AND c.deleted = false " ) - List findByUser(@Param("user") User user); + List findAllByUser(@Param("user") User user); @Modifying(flushAutomatically = true, clearAutomatically = true) @Query("UPDATE CustomChecklistQuestion SET deleted = true WHERE user.id = :#{#user.id}") diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index d8e941b31..88612fe91 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -127,7 +127,7 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli @Transactional public ChecklistQuestionsResponse readChecklistQuestions(User user) { - List customChecklistQuestions = customChecklistQuestionRepository.findByUser(user); + List customChecklistQuestions = customChecklistQuestionRepository.findAllByUser(user); Map> categoryQuestions = customChecklistQuestions.stream() .map(CustomChecklistQuestion::getQuestion) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java index b528d13ed..7f118337e 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java @@ -10,6 +10,7 @@ import org.springframework.http.HttpHeaders; import org.springframework.http.MediaType; +import static org.hamcrest.Matchers.containsString; import static org.mockito.ArgumentMatchers.any; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.header; @@ -30,6 +31,6 @@ void login() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content("{\"code\":\"code\"}")) .andExpect(status().isOk()) - .andExpect(header().string(HttpHeaders.SET_COOKIE, "token=" + testToken + "; Path=/; HttpOnly")); + .andExpect(header().string(HttpHeaders.SET_COOKIE, containsString("token=" + testToken))); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index ba07d1c7b..2de0e0f8c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -89,6 +89,16 @@ void readChecklistQuestions() { assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); } + @DisplayName("커스텀 체크리스트 전체 조회 성공") + @Test + void readAllCustomChecklistQuestion() { + // given + + // when + + // then + } + @DisplayName("작성된 체크리스트 조회 성공") @Test void readChecklistById() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 4e14b8cbe..ab23cef56 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -174,6 +174,7 @@ void readChecklistById_invalidChecklistId_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + // @DisplayName("체크리스트 리스트 조회 성공") // @Test // void readUserChecklistsPreview() { @@ -442,7 +443,7 @@ void updateCustomChecklist() { checklistService.updateCustomChecklist(USER1, request); // then - assertThat(customChecklistQuestionRepository.findByUser(USER1)) + assertThat(customChecklistQuestionRepository.findAllByUser(USER1)) .hasSize(request.questionIds().size()); } From d8367d9bb91be41d6faf270c35b4d7f1a926098d Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 7 Aug 2024 12:23:27 +0900 Subject: [PATCH 142/348] =?UTF-8?q?[BE]=20=EC=BF=A0=ED=82=A4=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#257)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bang_ggood/auth/controller/CookieProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index 21ac53e06..454695339 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -15,7 +15,7 @@ public ResponseCookie createCookie(String token) { .domain("localhost") .httpOnly(true) .secure(true) - .sameSite("none") + .sameSite("None") .maxAge(Duration.ofHours(2)) .path("/") .build(); From ffea3794808fb1a4e6f61950c2b3681109d825a8 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Wed, 7 Aug 2024 14:52:13 +0900 Subject: [PATCH 143/348] =?UTF-8?q?=EB=B0=B0=ED=8F=AC=20=EC=8B=9C=20JVM=20?= =?UTF-8?q?timezone=EC=9D=84=20Asia/Seoul=EB=A1=9C=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-cd.yml index 344562e11..e8c880328 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-cd.yml @@ -65,4 +65,4 @@ jobs: run: sudo fuser -k -n tcp 8080 || true - name: Start server - run: sudo nohup java -jar ./backend/bang-ggood/build/libs/*SNAPSHOT.jar > /home/ubuntu/actions-runner/server.log 2>&1 & + run: sudo nohup java -jar -Duser.timezone=Asia/Seoul ./backend/bang-ggood/build/libs/*SNAPSHOT.jar > /home/ubuntu/actions-runner/server.log 2>&1 & From 67ea22cc3d904ffe7a2952c4a24d485bef065106 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 7 Aug 2024 15:45:46 +0900 Subject: [PATCH 144/348] =?UTF-8?q?[BE]=20=EC=BB=A4=EC=8A=A4=ED=85=80=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=EC=9D=84=20=EC=A0=84=EC=B2=B4=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#262)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 6 +++++ .../bang_ggood/checklist/domain/Question.java | 5 ++++ ...tegoryCustomChecklistQuestionResponse.java | 7 +++++ ...egoryCustomChecklistQuestionsResponse.java | 6 +++++ .../CustomChecklistQuestionResponse.java | 10 +++++++ .../checklist/service/ChecklistService.java | 26 +++++++++++++++++++ .../controller/ChecklistE2ETest.java | 14 ++++++---- .../service/ChecklistServiceTest.java | 25 ++++++++++++++++++ 8 files changed, 94 insertions(+), 5 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionsResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 64b3d2b8f..cac92d19b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -3,6 +3,7 @@ import com.bang_ggood.auth.config.AuthPrincipal; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; +import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; @@ -57,6 +58,11 @@ public ResponseEntity readChecklistsComparison( return ResponseEntity.ok(checklistService.readChecklistsComparison(user, checklistIds)); } + @GetMapping("/custom-checklist/all") + public ResponseEntity readAllCustomChecklistQuestions(@AuthPrincipal User user) { + return ResponseEntity.ok(checklistService.readAllCustomChecklistQuestions(user)); + } + @PutMapping("/checklists/{id}") public ResponseEntity updateChecklistById( @AuthPrincipal User user, diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 43daeb5c6..16457f6e1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -98,6 +98,11 @@ public static boolean contains(int id) { .anyMatch(question -> question.getId() == id); } + public boolean isSelected(List questions) { + return questions.stream() + .anyMatch(question -> question.getQuestion().id == this.id); + } + private boolean isCategory(Category category) { return this.category == category; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionResponse.java new file mode 100644 index 000000000..488a62cc8 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionResponse.java @@ -0,0 +1,7 @@ +package com.bang_ggood.checklist.dto.response; + +import java.util.List; + +public record CategoryCustomChecklistQuestionResponse(Integer categoryId, String categoryName, + List questions) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionsResponse.java new file mode 100644 index 000000000..f59f02fd6 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryCustomChecklistQuestionsResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.checklist.dto.response; + +import java.util.List; + +public record CategoryCustomChecklistQuestionsResponse(List categories) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java new file mode 100644 index 000000000..ec0e4026b --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.dto.response; + +import com.bang_ggood.checklist.domain.Question; + +public record CustomChecklistQuestionResponse(Integer questionId, String title, String subtitle, + boolean isSelected) { + public static CustomChecklistQuestionResponse of(Question question, boolean isSelected) { + return new CustomChecklistQuestionResponse(question.getId(), question.getTitle(), question.getSubtitle(), isSelected); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 88612fe91..11bc694ae 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -18,10 +18,13 @@ import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.dto.response.BadgeResponse; +import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionResponse; +import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.QuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.dto.response.SelectedOptionResponse; @@ -40,6 +43,7 @@ import com.bang_ggood.user.domain.User; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; import java.util.List; @@ -166,6 +170,28 @@ private void validateQuestionInvalid(List questions) { } } + @Transactional + public CategoryCustomChecklistQuestionsResponse readAllCustomChecklistQuestions(User user) { // TODO custom-checklist 도메인 분리 및 리팩토링 + List customChecklistQuestions = customChecklistQuestionRepository.findAllByUser(user); + List allCategoryCustomChecklistQuestions = getAllCategoryCustomChecklistQuestions(customChecklistQuestions); + + return new CategoryCustomChecklistQuestionsResponse(allCategoryCustomChecklistQuestions); + } + + private List getAllCategoryCustomChecklistQuestions(List customChecklistQuestions) { + List response = new ArrayList<>(); + + for (Category category : Category.values()) { + List categoryQuestions = Question.findQuestionsByCategory(category); + List questions = categoryQuestions.stream() + .map(question -> CustomChecklistQuestionResponse.of(question, question.isSelected(customChecklistQuestions))) + .toList(); + response.add(new CategoryCustomChecklistQuestionResponse(category.getId(), category.getName(), questions)); + } + + return response; + } + @Transactional public SelectedChecklistResponse readChecklistById(User user, long id) { Checklist checklist = checklistRepository.getById(id); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 2de0e0f8c..aa8d80e8a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -5,6 +5,7 @@ import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; +import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -92,11 +93,14 @@ void readChecklistQuestions() { @DisplayName("커스텀 체크리스트 전체 조회 성공") @Test void readAllCustomChecklistQuestion() { - // given - - // when - - // then + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().get("/custom-checklist/all") + .then().log().all() + .statusCode(200) + .extract() + .as(CategoryCustomChecklistQuestionsResponse.class); } @DisplayName("작성된 체크리스트 조회 성공") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index ab23cef56..a80f95f45 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -5,12 +5,15 @@ import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; +import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; +import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; @@ -25,6 +28,7 @@ import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -433,6 +437,27 @@ void createChecklist_differentQuestion_exception() { .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); } + @DisplayName("커스텀 체크리스트 조회 성공") + @Test + void readCustomChecklistQuestions() { + // given + CustomChecklistQuestion question1 = new CustomChecklistQuestion(USER1, Question.CLEAN_5); + CustomChecklistQuestion question2 = new CustomChecklistQuestion(USER1, Question.AMENITY_12); + List questions = List.of(question1, question2); + customChecklistQuestionRepository.saveAll(questions); + + // when + CategoryCustomChecklistQuestionsResponse response = checklistService.readAllCustomChecklistQuestions(USER1); + + // then + long selectedCount = response.categories().stream() + .flatMap(category -> category.questions().stream()) + .filter(CustomChecklistQuestionResponse::isSelected) + .count(); + + Assertions.assertThat(selectedCount).isEqualTo(questions.size()); + } + @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { From 8dacf383e08f3fba4ef9a220b68cee553de9ab03 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 7 Aug 2024 16:14:23 +0900 Subject: [PATCH 145/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=EB=A5=BC=20?= =?UTF-8?q?=EC=A0=80=EC=9E=A5=ED=95=98=EB=8A=94=20=EA=B3=BC=EC=A0=95?= =?UTF-8?q?=EC=97=90=EC=84=9C=20=EB=B0=9C=EC=83=9D=ED=95=98=EB=8A=94=20?= =?UTF-8?q?=EC=97=90=EB=9F=AC=EB=A5=BC=20=ED=95=B4=EA=B2=B0=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#267)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 80cd9ff39..44bcaa2fc 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -1,5 +1,5 @@ -INSERT INTO users(id, name, email, created_at, modified_at, deleted) -VALUES (1, '방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +INSERT INTO users(name, email, created_at, modified_at, deleted) +VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), From 08d46ea97d55d681b41e1e2585216f318b59b2ad Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 7 Aug 2024 17:33:11 +0900 Subject: [PATCH 146/348] =?UTF-8?q?fix:=20=EC=BF=A0=ED=82=A4=EC=9D=98=20do?= =?UTF-8?q?main=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 --- .../com/bang_ggood/auth/controller/CookieProvider.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index 454695339..edef0e8d9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -1,5 +1,6 @@ package com.bang_ggood.auth.controller; +import org.springframework.beans.factory.annotation.Value; import org.springframework.http.ResponseCookie; import org.springframework.stereotype.Component; import java.time.Duration; @@ -9,10 +10,16 @@ public class CookieProvider { public static final String TOKEN_COOKIE_NAME = "token"; + private final String domain; + + public CookieProvider(@Value("${domain}") String domain) { + this.domain = domain; + } + public ResponseCookie createCookie(String token) { return ResponseCookie .from(TOKEN_COOKIE_NAME, token) - .domain("localhost") + .domain(domain) .httpOnly(true) .secure(true) .sameSite("None") From 50d1f6216d15400d7c8a447c0eb94c0abd9bcdae Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Thu, 8 Aug 2024 13:40:43 +0900 Subject: [PATCH 147/348] =?UTF-8?q?[BE]=20=EC=82=AC=EC=9A=A9=EC=9E=90=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20API=EC=97=90=20=EB=85=BC=EB=A6=AC=EC=A0=81?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=EB=A5=BC=20=EC=A0=81=EC=9A=A9=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#263)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ChecklistRepository.java | 6 ++-- .../checklist/service/ChecklistService.java | 2 +- .../checklist/ChecklistFixture.java | 12 +++++-- .../controller/ChecklistE2ETest.java | 2 +- .../repository/ChecklistRepositoryTest.java | 31 ++++++++++++++++--- .../service/ChecklistServiceTest.java | 4 +-- 6 files changed, 43 insertions(+), 14 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 19e2551a0..de5d008fc 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -8,6 +8,7 @@ import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import java.util.Optional; @@ -25,8 +26,8 @@ default Checklist getById(@Param("id") long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } - //TODO: 논리적 삭제 리팩토링 - List findByUser(User user); + @Query("SELECT c FROM Checklist c WHERE c.deleted = false") + List findAllByUser(User user); @Query("SELECT c FROM Checklist c " + "JOIN FETCH c.user u " @@ -42,6 +43,7 @@ List findByUserAndIdIn(@Param("user") User user, + "AND c.deleted = false") boolean existsById(@Param("id") long id); + @Transactional @Modifying @Query("UPDATE Checklist c " + "SET c.deleted = true " diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 11bc694ae..9438d4cec 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -237,7 +237,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ @Transactional public UserChecklistsPreviewResponse readUserChecklistsPreview(User user) { - List checklists = checklistRepository.findByUser(user); + List checklists = checklistRepository.findAllByUser(user); List responses = checklists.stream() .map(this::getChecklistPreview) .toList(); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index f28472e7c..330cc00d5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -12,12 +12,18 @@ public class ChecklistFixture { - public static final Checklist checklist = new Checklist( + public static final Checklist CHECKLIST1 = new Checklist( UserFixture.USER1, RoomFixture.ROOM_1, 1000, 50, 12, "방끗공인중개사" ); + public static final Checklist CHECKLIST2 = new Checklist( + UserFixture.USER1, + RoomFixture.ROOM_2, + 1000, 50, 12, "방끗공인중개사" + ); + public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( 1, "GOOD", "메모1" ); @@ -149,10 +155,10 @@ public class ChecklistFixture { public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( - checklist, Question.fromId(1), Grade.BAD, "메모" + CHECKLIST1, Question.fromId(1), Grade.BAD, "메모" ); public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( - checklist, Question.fromId(2), Grade.BAD, "메모" + CHECKLIST1, Question.fromId(2), Grade.BAD, "메모" ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index aa8d80e8a..a56137aa6 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -186,7 +186,7 @@ void updateCustomChecklist() { @Test void deleteChecklistById() { roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.checklist); + Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1); RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index 6dc208e92..5b112ae66 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -9,10 +9,12 @@ import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.transaction.annotation.Transactional; import java.util.List; import static org.assertj.core.api.Assertions.assertThat; @@ -35,19 +37,20 @@ class ChecklistRepositoryTest extends IntegrationTestSupport { void setUp() { userRepository.save(UserFixture.USER1); roomRepository.save(RoomFixture.ROOM_1); + roomRepository.save(RoomFixture.ROOM_2); } @DisplayName("아이디를 통해 체크리스트 갖고 오기 성공") @Test void findById() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); //when Checklist foundChecklist = checklistRepository.getById(savedChecklist.getId().longValue()); //then - assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.checklist.getId()); + assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.CHECKLIST1.getId()); } @DisplayName("아이디를 통해 체크리스트 갖고 오기 실패 : 해당하는 체크리스트가 없을 경우") @@ -62,17 +65,35 @@ void findById_notFound_exception() { @Test void findByUserAndIdIn() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); assertThat(checklistRepository.findByUserAndIdIn(UserFixture.USER1, List.of(savedChecklist.getId()))) .isEqualTo(List.of(savedChecklist)); } + @Transactional + @DisplayName("체크리스트 리스트 조회 성공 : 논리적 삭제를 적용해서 체크리스트 리스트를 조회한다.") + @Test + void findAllByUser() { + // given + Checklist checklist1 = ChecklistFixture.CHECKLIST1; + Checklist checklist2 = ChecklistFixture.CHECKLIST2; + checklistRepository.saveAll(List.of(checklist1, checklist2)); + + checklistRepository.deleteById(checklist1.getId()); + + // when + List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + + // then + Assertions.assertThat(checklists).containsOnly(checklist2); + } + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") @Test void existsById_true() { //given & when - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); //then assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isTrue(); @@ -89,7 +110,7 @@ void existsById_false() { @Test void deleteById() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.checklist); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); //when checklistRepository.deleteById(savedChecklist.getId().longValue()); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index a80f95f45..3eac59eb5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -157,7 +157,7 @@ void readChecklistQuestions() { void readChecklistById() { // given roomRepository.save(RoomFixture.ROOM_1); - checklistRepository.save(ChecklistFixture.checklist); + checklistRepository.save(ChecklistFixture.CHECKLIST1); // when SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(UserFixture.USER1, 1L); @@ -517,7 +517,7 @@ public static Checklist createChecklist(User user, Room room) { void deleteChecklistById() { // given roomRepository.save(RoomFixture.ROOM_1); - Checklist checklist = checklistRepository.save(ChecklistFixture.checklist); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); // when checklistService.deleteChecklistById(checklist.getId()); From dbee830d9d8a988fe210fd433a389de0ebc51372 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Thu, 8 Aug 2024 16:40:53 +0900 Subject: [PATCH 148/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B9=85=20=EB=A0=88?= =?UTF-8?q?=EB=B2=A8=EC=97=90=20=EB=94=B0=EB=A5=B8=20=EB=A1=9C=EA=B7=B8?= =?UTF-8?q?=EB=A5=BC=20=EB=82=A8=EA=B8=B4=EB=8B=A4.=20(#272)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: shin-jisong <86762272+shin-jisong@users.noreply.github.com> --- backend/bang-ggood/build.gradle | 1 + .../main/java/com/bang_ggood/Application.java | 2 + .../handler/GlobalExceptionHandler.java | 3 +- .../com/bang_ggood/logging/LoggingAspect.java | 65 +++++++++++++++++++ .../com/bang_ggood/logging/dto/BaseLog.java | 35 ++++++++++ .../com/bang_ggood/logging/dto/ErrorLog.java | 44 +++++++++++++ .../com/bang_ggood/logging/dto/InfoLog.java | 34 ++++++++++ .../com/bang_ggood/logging/dto/WarnLog.java | 34 ++++++++++ .../bang-ggood/src/main/resources/logback.xml | 44 +++++++++++++ 9 files changed, 260 insertions(+), 2 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/logging/LoggingAspect.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/BaseLog.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/ErrorLog.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/InfoLog.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/WarnLog.java create mode 100644 backend/bang-ggood/src/main/resources/logback.xml diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index bce95f210..8684f900a 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -22,6 +22,7 @@ dependencies { implementation 'org.springframework.boot:spring-boot-starter-web' implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0' implementation 'org.springframework.boot:spring-boot-starter-validation' + implementation 'org.springframework.boot:spring-boot-starter-aop' implementation 'io.jsonwebtoken:jjwt-api:0.11.2' implementation 'io.jsonwebtoken:jjwt-impl:0.11.2' implementation 'io.jsonwebtoken:jjwt-gson:0.11.2' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java index c6b0b749c..537bca4dd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/Application.java @@ -2,9 +2,11 @@ import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.EnableAspectJAutoProxy; import org.springframework.data.jpa.repository.config.EnableJpaAuditing; @EnableJpaAuditing +@EnableAspectJAutoProxy @SpringBootApplication public class Application { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java index beefa5775..36048afe4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/handler/GlobalExceptionHandler.java @@ -21,15 +21,14 @@ public ResponseEntity handleBangggoodException(BangggoodExcep request.getMethod(), request.getRequestURI(), exception.getMessage()); + return ResponseEntity.status(exception.getHttpStatusCode()) .body(response); } - //TODO 로깅해야함 @ExceptionHandler(RuntimeException.class) public ResponseEntity handleRuntimeException(RuntimeException runtimeException, HttpServletRequest request) { - runtimeException.printStackTrace(); ExceptionResponse response = new ExceptionResponse( request.getMethod(), request.getRequestURI(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/logging/LoggingAspect.java b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/LoggingAspect.java new file mode 100644 index 000000000..2bac6dbe7 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/LoggingAspect.java @@ -0,0 +1,65 @@ +package com.bang_ggood.logging; + +import com.bang_ggood.logging.dto.ErrorLog; +import com.bang_ggood.logging.dto.InfoLog; +import com.bang_ggood.logging.dto.WarnLog; +import jakarta.servlet.http.HttpServletRequest; +import org.aspectj.lang.JoinPoint; +import org.aspectj.lang.annotation.AfterReturning; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Before; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.stereotype.Component; +import org.springframework.web.context.request.RequestContextHolder; +import org.springframework.web.context.request.ServletRequestAttributes; +import java.util.Arrays; +import java.util.Optional; + +@Aspect +@Component +public class LoggingAspect { + + private static final Logger log = LoggerFactory.getLogger(LoggingAspect.class); + + @AfterReturning("execution(public * com.bang_ggood..*Service.*(..)))") + public void loggingInfo(JoinPoint joinPoint) { + if (RequestContextHolder.getRequestAttributes() instanceof ServletRequestAttributes) { + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + String methodName = joinPoint.getSignature().getName(); + + log.info(InfoLog.of(request, methodName).toString()); + } + } + + @Before("execution(* com.bang_ggood.handler.GlobalExceptionHandler.*(..)) &&" + + "!execution(* com.bang_ggood.handler.GlobalExceptionHandler.handleRuntimeException(..)))") + public void loggingWarn(JoinPoint joinPoint) { + Optional exceptionOptional = Arrays.stream(joinPoint.getArgs()) + .filter(arg -> arg instanceof Exception) + .map(arg -> (Exception) arg) + .findFirst(); + + if (exceptionOptional.isPresent() && RequestContextHolder.getRequestAttributes() != null) { + Exception exception = exceptionOptional.get(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + + log.warn(WarnLog.of(exception, request).toString()); + } + } + + @Before("execution(* com.bang_ggood.handler.GlobalExceptionHandler.handleRuntimeException(..)))") + public void loggingError(JoinPoint joinPoint) { + Optional exceptionOptional = Arrays.stream(joinPoint.getArgs()) + .filter(arg -> arg instanceof Exception) + .map(arg -> (Exception) arg) + .findFirst(); + + if (exceptionOptional.isPresent() && RequestContextHolder.getRequestAttributes() != null) { + Exception exception = exceptionOptional.get(); + HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); + + log.error(ErrorLog.of(exception, request).toString()); + } + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/BaseLog.java b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/BaseLog.java new file mode 100644 index 000000000..178b68e4a --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/BaseLog.java @@ -0,0 +1,35 @@ +package com.bang_ggood.logging.dto; + +import java.time.LocalDateTime; + +public abstract class BaseLog { + + private final LocalDateTime requestTime; + private final String requestUrl; + private final String uuid; + + public BaseLog(LocalDateTime requestTime, String requestUrl, String uuid) { + this.requestTime = requestTime; + this.requestUrl = requestUrl; + this.uuid = uuid; + } + + public LocalDateTime getRequestTime() { + return requestTime; + } + + public String getRequestUrl() { + return requestUrl; + } + + public String getUuid() { + return uuid; + } + + @Override + public String toString() { + return "requestTime=" + requestTime + + ", requestUrl='" + requestUrl + + ", uuid='" + uuid; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/ErrorLog.java b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/ErrorLog.java new file mode 100644 index 000000000..3a52d8790 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/ErrorLog.java @@ -0,0 +1,44 @@ +package com.bang_ggood.logging.dto; + +import jakarta.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; +import java.util.Arrays; +import java.util.UUID; + +public class ErrorLog extends BaseLog { + + private final String errorMessage; + private final String stackTrace; + + public ErrorLog(LocalDateTime requestTime, String requestUrl, String uuid, + String errorMessage, String stackTrace) { + super(requestTime, requestUrl, uuid); + this.errorMessage = errorMessage; + this.stackTrace = stackTrace; + } + + public static ErrorLog of(Exception exception, HttpServletRequest request) { + return new ErrorLog( + LocalDateTime.now(), + request.getMethod() + ' ' + request.getRequestURI(), + UUID.randomUUID().toString(), + exception.getMessage(), + Arrays.toString(exception.getStackTrace()) + ); + } + + public String getErrorMessage() { + return errorMessage; + } + + public String getStackTrace() { + return stackTrace; + } + + @Override + public String toString() { + return super.toString() + '\'' + + ", errorMessage='" + errorMessage + '\'' + + ", stackTrace='" + stackTrace + '\''; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/InfoLog.java b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/InfoLog.java new file mode 100644 index 000000000..70f79d765 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/InfoLog.java @@ -0,0 +1,34 @@ +package com.bang_ggood.logging.dto; + +import jakarta.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; +import java.util.UUID; + +public class InfoLog extends BaseLog { + + private final String infoMethodName; + + public InfoLog(LocalDateTime requestTime, String requestUrl, String uuid, String infoMethodName) { + super(requestTime, requestUrl, uuid); + this.infoMethodName = infoMethodName; + } + + public static InfoLog of(HttpServletRequest request, String methodName) { + return new InfoLog( + LocalDateTime.now(), + request.getMethod() + ' ' + request.getRequestURI(), + UUID.randomUUID().toString(), + methodName + ); + } + + public String getInfoMethodName() { + return infoMethodName; + } + + @Override + public String toString() { + return super.toString() + '\'' + + ", infoMessage='" + infoMethodName + '\''; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/WarnLog.java b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/WarnLog.java new file mode 100644 index 000000000..bcfde0aab --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/logging/dto/WarnLog.java @@ -0,0 +1,34 @@ +package com.bang_ggood.logging.dto; + +import jakarta.servlet.http.HttpServletRequest; +import java.time.LocalDateTime; +import java.util.UUID; + +public class WarnLog extends BaseLog { + + private final String warnMessage; + + public WarnLog(LocalDateTime requestTime, String requestUrl, String uuid, String warnMessage) { + super(requestTime, requestUrl, uuid); + this.warnMessage = warnMessage; + } + + public static WarnLog of(Exception exception, HttpServletRequest request) { + return new WarnLog( + LocalDateTime.now(), + request.getMethod() + ' ' + request.getRequestURI(), + UUID.randomUUID().toString(), + exception.getMessage() + ); + } + + public String getWarnMessage() { + return warnMessage; + } + + @Override + public String toString() { + return super.toString() + '\'' + + ", warnMessage='" + warnMessage + '\''; + } +} diff --git a/backend/bang-ggood/src/main/resources/logback.xml b/backend/bang-ggood/src/main/resources/logback.xml new file mode 100644 index 000000000..d5379b463 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/logback.xml @@ -0,0 +1,44 @@ + + + + + + + + INFO + ACCEPT + DENY + + + %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level){BLUE} [%thread] %logger{36} - %msg%n + + + + + + WARN + ACCEPT + DENY + + + %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level){YELLOW} [%thread] %logger{36} - %msg%n + + + + + + ERROR + ACCEPT + DENY + + + %d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level){RED} [%thread] %logger{36} - %msg%n + + + + + + + + + From 101bc0d437c68f46247924268c049161a3bcf2c1 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Thu, 8 Aug 2024 17:47:26 +0900 Subject: [PATCH 149/348] =?UTF-8?q?[BE]=20=EB=B0=B0=ED=8F=AC=20=ED=99=98?= =?UTF-8?q?=EA=B2=BD=EC=97=90=EC=84=9C=20MySQL=20DB=EB=A5=BC=20=EC=97=B0?= =?UTF-8?q?=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#278)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/build.gradle | 1 + .../bang-ggood/src/main/resources/schema.sql | 66 ++++++------------- 2 files changed, 21 insertions(+), 46 deletions(-) diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 8684f900a..04653e210 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -26,6 +26,7 @@ dependencies { implementation 'io.jsonwebtoken:jjwt-api:0.11.2' implementation 'io.jsonwebtoken:jjwt-impl:0.11.2' implementation 'io.jsonwebtoken:jjwt-gson:0.11.2' + implementation 'com.mysql:mysql-connector-j' runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index ea33712cd..0b898b929 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -1,16 +1,16 @@ -- Drop tables if they exist -DROP TABLE IF EXISTS checklist CASCADE; -DROP TABLE IF EXISTS checklist_option CASCADE; -DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; -DROP TABLE IF EXISTS custom_checklist_question CASCADE; +DROP TABLE IF EXISTS checklist CASCADE; +DROP TABLE IF EXISTS checklist_question CASCADE; +DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS category_priority CASCADE; +DROP TABLE IF EXISTS custom_checklist_question CASCADE; -- Create tables CREATE TABLE room ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), station VARCHAR(255), walking_time INTEGER, @@ -27,8 +27,8 @@ CREATE TABLE room CREATE TABLE users ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - name VARCHAR(255), + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255) NOT NULL, email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), @@ -37,7 +37,7 @@ CREATE TABLE users CREATE TABLE checklist ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, contract_term INTEGER, deposit INTEGER, rent INTEGER, @@ -53,7 +53,7 @@ CREATE TABLE checklist CREATE TABLE checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, grade VARCHAR(255), @@ -66,7 +66,7 @@ CREATE TABLE checklist_question CREATE TABLE checklist_option ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, option_id INTEGER NOT NULL, checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), @@ -77,48 +77,22 @@ CREATE TABLE checklist_option CREATE TABLE category_priority ( - id - bigint - generated - by - default as - identity, - category_id - INTEGER - not - null, - user_id - bigint - not - null, - created_at - TIMESTAMP - not - null, - modified_at - TIMESTAMP - not - null, - deleted - BOOLEAN, - primary - key -( - id -), - foreign key -( - user_id -) references users - ); + id BIGINT AUTO_INCREMENT PRIMARY KEY, + category_id INTEGER NOT NULL, + user_id BIGINT NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (user_id) REFERENCES users (id) +); CREATE TABLE custom_checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, user_id BIGINT, question VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, - FOREIGN KEY (user_id) references users + FOREIGN KEY (user_id) references users (id) ); From 2dfef68bb60c5f4f0a92a61e08fe8b698bd057d3 Mon Sep 17 00:00:00 2001 From: tsulocalize Date: Thu, 8 Aug 2024 18:21:52 +0900 Subject: [PATCH 150/348] =?UTF-8?q?style:=20=EC=8A=A4=ED=83=80=EC=9D=BC=20?= =?UTF-8?q?=EC=A0=95=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/auth/controller/AuthController.java | 2 +- .../checklist/domain/ChecklistQuestion.java | 1 - .../repository/ChecklistQuestionRepository.java | 2 +- .../CustomChecklistQuestionRepository.java | 2 +- .../java/com/bang_ggood/config/WebMvcConfig.java | 2 +- backend/bang-ggood/src/main/resources/schema.sql | 12 ++++++------ .../bang_ggood/auth/controller/LoginMockE2ETest.java | 2 +- .../auth/service/JwtTokenProviderTest.java | 12 ++++++------ .../checklist/domain/ChecklistQuestionTest.java | 1 - .../checklist/domain/ChecklistRankTest.java | 2 +- .../test/java/com/bang_ggood/user/UserFixture.java | 4 ++-- 11 files changed, 20 insertions(+), 22 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index 27a7ea02d..eefa87496 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -1,7 +1,7 @@ package com.bang_ggood.auth.controller; -import com.bang_ggood.auth.service.AuthService; import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.service.AuthService; import jakarta.validation.Valid; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 997d6c448..aa5b77942 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -9,7 +9,6 @@ import jakarta.persistence.GenerationType; import jakarta.persistence.Id; import jakarta.persistence.ManyToOne; - import java.util.Objects; @Entity diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java index d4508608a..b8f7e39bf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepository.java @@ -2,9 +2,9 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; import org.springframework.data.jpa.repository.JpaRepository; -import java.util.List; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; +import java.util.List; public interface ChecklistQuestionRepository extends JpaRepository { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java index 0a9f9b3cb..af0a60388 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/CustomChecklistQuestionRepository.java @@ -10,7 +10,7 @@ public interface CustomChecklistQuestionRepository extends JpaRepository { - @Query("SELECT c FROM CustomChecklistQuestion c WHERE c.user.id = :#{#user.id} AND c.deleted = false " ) + @Query("SELECT c FROM CustomChecklistQuestion c WHERE c.user.id = :#{#user.id} AND c.deleted = false ") List findAllByUser(@Param("user") User user); @Modifying(flushAutomatically = true, clearAutomatically = true) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java index b78195489..e9e8dad70 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/WebMvcConfig.java @@ -1,7 +1,7 @@ package com.bang_ggood.config; -import com.bang_ggood.auth.service.AuthService; import com.bang_ggood.auth.config.AuthPrincipalArgumentResolver; +import com.bang_ggood.auth.service.AuthService; import org.springframework.context.annotation.Configuration; import org.springframework.web.method.support.HandlerMethodArgumentResolver; import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 0b898b929..e53152be9 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -77,12 +77,12 @@ CREATE TABLE checklist_option CREATE TABLE category_priority ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - category_id INTEGER NOT NULL, - user_id BIGINT NOT NULL, - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, + id BIGINT AUTO_INCREMENT PRIMARY KEY, + category_id INTEGER NOT NULL, + user_id BIGINT NOT NULL, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (user_id) REFERENCES users (id) ); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java index 7f118337e..3cfb333a3 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/LoginMockE2ETest.java @@ -1,8 +1,8 @@ package com.bang_ggood.auth.controller; import com.bang_ggood.AcceptanceMockTestSupport; -import com.bang_ggood.auth.service.AuthService; import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.service.AuthService; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.mockito.Mockito; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java index fd8b760d7..4a1a84383 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java @@ -39,13 +39,13 @@ void resolveToken_expiredTime_exception() { // given String JWT_SECRET_KEY = "A".repeat(32); int JWT_ACCESS_TOKEN_EXPIRE_LENGTH = 1; - JwtTokenProvider expiredJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); + JwtTokenProvider expiredJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); User user = userRepository.save(USER1); - String token = expiredJwtTokenProvider.createToken(user); + String token = expiredJwtTokenProvider.createToken(user); // when & then - Assertions.assertThatCode(() -> expiredJwtTokenProvider.resolveToken(token)) + Assertions.assertThatCode(() -> expiredJwtTokenProvider.resolveToken(token)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED.getMessage()); } @@ -59,10 +59,10 @@ void resolveToken_invalidSignature_exception() { JwtTokenProvider invalidJwtTokenProvider = new JwtTokenProvider(JWT_SECRET_KEY, JWT_ACCESS_TOKEN_EXPIRE_LENGTH); User user = userRepository.save(USER1); - String token = jwtTokenProvider.createToken(user); + String token = jwtTokenProvider.createToken(user); // when & then - Assertions.assertThatCode(() -> invalidJwtTokenProvider.resolveToken(token)) + Assertions.assertThatCode(() -> invalidJwtTokenProvider.resolveToken(token)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_INVALID.getMessage()); } @@ -74,7 +74,7 @@ void resolveToken_invalidToken_exception() { String invalidToken = "malformed"; // when & then - Assertions.assertThatCode(() -> jwtTokenProvider.resolveToken(invalidToken)) + Assertions.assertThatCode(() -> jwtTokenProvider.resolveToken(invalidToken)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_INVALID.getMessage()); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java index a614e2ab0..8f52cd046 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistQuestionTest.java @@ -5,7 +5,6 @@ import org.junit.jupiter.api.Test; import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.*; class ChecklistQuestionTest { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java index a9964f0d9..456e0d946 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java @@ -1,8 +1,8 @@ package com.bang_ggood.checklist.domain; -import java.util.List; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java index c70164107..a196e150e 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -11,9 +11,9 @@ public class UserFixture { public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoApiResponse("", "", new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), - new ProfileResponse("", "",""))); + new ProfileResponse("", "", ""))); public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER2 = new OauthInfoApiResponse("", "", new KakaoAccountResponse(USER2.getEmail(), USER2.getName(), - new ProfileResponse("", "",""))); + new ProfileResponse("", "", ""))); } From de42411a6e346bf2fb07e875810808ae283c3e1f Mon Sep 17 00:00:00 2001 From: tsulocalize Date: Thu, 8 Aug 2024 18:48:28 +0900 Subject: [PATCH 151/348] =?UTF-8?q?fix:=20=EC=9C=A0=EC=A0=80=20name=20colu?= =?UTF-8?q?mn=EC=9D=84=20nullable=20=ED=95=98=EB=8F=84=EB=A1=9D=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 --- backend/bang-ggood/src/main/resources/schema.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index e53152be9..def571351 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -28,7 +28,7 @@ CREATE TABLE room CREATE TABLE users ( id BIGINT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(255) NOT NULL, + name VARCHAR(255), email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), From 21ec46138294be295e18e5e4c33502273294dae9 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Fri, 9 Aug 2024 10:18:52 +0900 Subject: [PATCH 152/348] =?UTF-8?q?refactor:=20ResponseCookie=20sameSite?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bang_ggood/auth/controller/CookieProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index edef0e8d9..55075edd5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -22,7 +22,7 @@ public ResponseCookie createCookie(String token) { .domain(domain) .httpOnly(true) .secure(true) - .sameSite("None") + .sameSite("strict") .maxAge(Duration.ofHours(2)) .path("/") .build(); From a7fb26257ba21dd352e6c291d638369e2b51e40a Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Fri, 9 Aug 2024 10:41:13 +0900 Subject: [PATCH 153/348] =?UTF-8?q?refactor:=20ResponseCookie=20sameSite?= =?UTF-8?q?=20=EC=84=A4=EC=A0=95=20=EC=B6=94=EA=B0=80=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/bang_ggood/auth/controller/CookieProvider.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index 55075edd5..edef0e8d9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -22,7 +22,7 @@ public ResponseCookie createCookie(String token) { .domain(domain) .httpOnly(true) .secure(true) - .sameSite("strict") + .sameSite("None") .maxAge(Duration.ofHours(2)) .path("/") .build(); From 16cddd4a4d6286b718d35b6a00ba2f2bc98c4b4e Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 9 Aug 2024 18:07:14 +0900 Subject: [PATCH 154/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A2=8B=EC=95=84=EC=9A=94=20=EB=8F=84?= =?UTF-8?q?=EB=A9=94=EC=9D=B8=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#297)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: jinwoo22 Co-authored-by: shin-jisong <86762272+shin-jisong@users.noreply.github.com> --- .../checklist/domain/ChecklistLike.java | 61 +++++++++++++++++++ 1 file changed, 61 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistLike.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistLike.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistLike.java new file mode 100644 index 000000000..7a607d2d1 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistLike.java @@ -0,0 +1,61 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.OneToOne; +import java.util.Objects; + +@Entity +public class ChecklistLike extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @OneToOne(fetch = FetchType.LAZY) + private Checklist checklist; + + public ChecklistLike(Checklist checklist) { + this.checklist = checklist; + } + + protected ChecklistLike() { + } + + public Long getId() { + return id; + } + + public Checklist getChecklist() { + return checklist; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChecklistLike that = (ChecklistLike) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "ChecklistLike{" + + "id=" + id + + ", checklist=" + checklist + + '}'; + } +} From c96667765beb036ab23d27c0db05067a18706c3f Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Sat, 10 Aug 2024 11:34:23 +0900 Subject: [PATCH 155/348] =?UTF-8?q?[BE]=20dev=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=EC=99=80=20dev-be=20=EB=B8=8C=EB=9E=9C=EC=B9=98?= =?UTF-8?q?=EC=9D=98=20=EC=BD=94=EB=93=9C=20=EC=83=81=ED=83=9C=EB=A5=BC=20?= =?UTF-8?q?=EB=B3=91=ED=95=A9=EC=8B=9C=ED=82=A8=EB=8B=A4.=20=20(#299)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: jinwoo22 From bd0f3207492bfa12d76894ce036c294ae98fbc75 Mon Sep 17 00:00:00 2001 From: tkdgur0906 Date: Sun, 11 Aug 2024 00:20:35 +0900 Subject: [PATCH 156/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A2=8B=EC=95=84=EC=9A=94=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 6 ++++ .../repository/ChecklistLikeRepository.java | 10 ++++++ .../checklist/service/ChecklistService.java | 33 ++++++++++++++++++- .../bang_ggood/exception/ExceptionCode.java | 4 +++ 4 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index cac92d19b..6c08fb67c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -38,6 +38,12 @@ public ResponseEntity createChecklist(@AuthPrincipal User user, @Valid @Re return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } + @PostMapping("/checklists/{id}/like") + public ResponseEntity createChecklistLike(@AuthPrincipal User user, @PathVariable("id") long id) { + checklistService.createChecklistLike(user, id); + return ResponseEntity.noContent().build(); + } + @GetMapping("/checklists/questions") public ResponseEntity readChecklistQuestions(@AuthPrincipal User user) { return ResponseEntity.ok(checklistService.readChecklistQuestions(user)); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java new file mode 100644 index 000000000..fc187ce25 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java @@ -0,0 +1,10 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistLike; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ChecklistLikeRepository extends JpaRepository { + + boolean existsByChecklist(Checklist checklist); +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 9438d4cec..5cdf93496 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -5,6 +5,7 @@ import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.ChecklistRank; @@ -31,6 +32,7 @@ import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -60,16 +62,19 @@ public class ChecklistService { private final ChecklistOptionRepository checklistOptionRepository; private final ChecklistQuestionRepository checklistQuestionRepository; private final CustomChecklistQuestionRepository customChecklistQuestionRepository; + private final ChecklistLikeRepository checklistLikeRepository; public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, ChecklistOptionRepository checklistOptionRepository, ChecklistQuestionRepository checklistQuestionRepository, - CustomChecklistQuestionRepository customChecklistQuestionRepository) { + CustomChecklistQuestionRepository customChecklistQuestionRepository, + ChecklistLikeRepository checklistLikeRepository) { this.checklistRepository = checklistRepository; this.roomRepository = roomRepository; this.checklistOptionRepository = checklistOptionRepository; this.checklistQuestionRepository = checklistQuestionRepository; this.customChecklistQuestionRepository = customChecklistQuestionRepository; + this.checklistLikeRepository = checklistLikeRepository; } @Transactional @@ -129,6 +134,32 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli checklistQuestionRepository.saveAll(checklistQuestions); } + @Transactional + public void createChecklistLike(User user, long id) { + Checklist checklist = checklistRepository.getById(id); + + validateChecklistLike(user, checklist); + + checklistLikeRepository.save(new ChecklistLike(checklist)); + } + + private void validateChecklistLike(User user, Checklist checklist) { + validateChecklistOwnership(user, checklist); + validateChecklistAlreadyLiked(checklist); + } + + private void validateChecklistOwnership(User user, Checklist checklist) { + if (!checklist.getUser().equals(user)) { + throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_OWNED_BY_USER); + } + } + + private void validateChecklistAlreadyLiked(Checklist checklist) { + if (checklistLikeRepository.existsByChecklist(checklist)) { + throw new BangggoodException(ExceptionCode.LIKE_ALREADY_EXISTS); + } + } + @Transactional public ChecklistQuestionsResponse readChecklistQuestions(User user) { List customChecklistQuestions = customChecklistQuestionRepository.findAllByUser(user); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index ec4d60865..8d66efb63 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -30,6 +30,7 @@ public enum ExceptionCode { // Checklist CHECKLIST_COMPARISON_INVALID_COUNT(HttpStatus.BAD_REQUEST, "비교할 체크리스트 개수가 유효하지 않습니다."), CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), + CHECKLIST_NOT_OWNED_BY_USER(HttpStatus.BAD_REQUEST, "유저의 체크리스트가 아닙니다."), // CustomChecklist CUSTOM_CHECKLIST_QUESTION_EMPTY(HttpStatus.BAD_REQUEST, "커스텀 질문 개수가 유효하지 않습니다."), @@ -49,6 +50,9 @@ public enum ExceptionCode { //Score SCORE_NOT_DESCENDING_SORTED(HttpStatus.BAD_REQUEST, "정렬되지 않은 점수입니다."), + //like + LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "체크리스트가 이미 좋아요 상태입니다"), + // Auth AUTHENTICATION_COOKIE_EMPTY(HttpStatus.UNAUTHORIZED, "인증 정보가 존재하지 않습니다."), AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), From 69dfb081797562112962417996b40a4d50bd9d2a Mon Sep 17 00:00:00 2001 From: tkdgur0906 Date: Sun, 11 Aug 2024 00:20:46 +0900 Subject: [PATCH 157/348] =?UTF-8?q?test:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A2=8B=EC=95=84=EC=9A=94=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=20=EA=B8=B0=EB=8A=A5=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 --- .../controller/ChecklistE2ETest.java | 27 ++++++++++++++++ .../service/ChecklistServiceTest.java | 32 +++++++++++++++++++ .../src/test/resources/schema-test.sql | 11 +++++++ 3 files changed, 70 insertions(+) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index a56137aa6..314ceda46 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -73,6 +73,33 @@ void createChecklist_noQuestionId_exception() { .statusCode(400); } + @DisplayName("체크리스트 좋아요 추가 성공") + @Test + void createChecklistLike() { + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().post("/checklists/" + checklistId + "/like") + .then().log().all() + .statusCode(204); + } + + @DisplayName("체크리스트 좋아요 추가 실패 : 이미 좋아요가 추가가 된 체크리스트인 경우") + @Test + void createChecklistLike_checklistAlreadyLiked_exception() { + long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); + checklistService.createChecklistLike(USER1, checklistId); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().post("/checklists/" + checklistId + "/like") + .then().log().all() + .statusCode(409); + } + @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 3eac59eb5..ed7408a55 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -15,6 +15,7 @@ import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -69,6 +70,9 @@ class ChecklistServiceTest extends IntegrationTestSupport { @Autowired private UserRepository userRepository; + @Autowired + private ChecklistLikeRepository checklistLikeRepository; + @BeforeEach() public void setUp() { userRepository.save(UserFixture.USER1); @@ -139,6 +143,34 @@ void createChecklist_duplicatedOptionId_exception() { .hasMessage(ExceptionCode.OPTION_DUPLICATED.getMessage()); } + @DisplayName("체크리스트 좋아요 추가 성공") + @Test + void createChecklistLike() { + //given + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + + // when + checklistService.createChecklistLike(USER1, checklist.getId()); + + //then + assertThat(checklistLikeRepository.existsByChecklist(checklist)).isTrue(); + } + + @DisplayName("체크리스트 좋아요 추가 실패 : 이미 좋아요가 추가가 된 체크리스트인 경우") + @Test + void createChecklistLike_checklistAlreadyLiked_exception() { + //given + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + + // when + checklistService.createChecklistLike(USER1, checklist.getId()); + + //then + assertThatThrownBy(() -> checklistService.createChecklistLike(USER1, checklist.getId())) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.LIKE_ALREADY_EXISTS.getMessage()); + } + @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 8c40869f5..b914a84f1 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -7,6 +7,7 @@ DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS category_priority CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; +DROP TABLE IF EXISTS checklist_like CASCADE; -- Create tables CREATE TABLE room @@ -110,3 +111,13 @@ CREATE TABLE custom_checklist_question deleted BOOLEAN, FOREIGN KEY (user_id) references users ); + +CREATE TABLE checklist_like +( + id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + checklist_id BIGINT, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); From 3ea476d3fa3ff63a05d95f12ade5adc613f46eb4 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Sun, 11 Aug 2024 10:24:34 +0900 Subject: [PATCH 158/348] =?UTF-8?q?[BE]=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=EB=8F=84=EB=A9=94=EC=9D=B8,=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=A0=9C=EA=B1=B0=ED=95=9C=EB=8B=A4.=20(#302)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/CategoryController.java | 33 ----- .../com/bang_ggood/category/domain/Badge.java | 38 ------ .../bang_ggood/category/domain/Category.java | 32 ++--- .../category/domain/CategoryPriority.java | 60 --------- .../CategoryPriorityCreateRequest.java | 6 - .../dto/response/CategoriesReadResponse.java | 6 - .../dto/response/CategoryReadResponse.java | 10 -- .../SelectedCategoryQuestionsResponse.java | 6 +- .../CategoryPriorityRepository.java | 7 - .../category/service/CategoryService.java | 75 ----------- .../controller/ChecklistController.java | 8 -- .../checklist/domain/ChecklistQuestion.java | 11 +- .../checklist/domain/ChecklistRank.java | 15 --- .../checklist/domain/ChecklistScore.java | 34 ----- .../bang_ggood/checklist/domain/Grade.java | 22 +-- .../dto/request/QuestionRequest.java | 2 +- .../checklist/dto/response/BadgeResponse.java | 10 -- .../response/CategoryScoreReadResponse.java | 12 -- .../ChecklistWithScoreReadResponse.java | 65 --------- .../ChecklistsWithScoreReadResponse.java | 6 - .../response/SelectedChecklistResponse.java | 2 +- .../response/SelectedQuestionResponse.java | 6 +- .../UserChecklistPreviewResponse.java | 9 +- .../checklist/service/ChecklistService.java | 102 +------------- .../bang_ggood/exception/ExceptionCode.java | 5 - .../bang-ggood/src/main/resources/schema.sql | 13 -- .../auth/controller/AuthE2ETest.java | 4 +- .../category/domain/CategoryTest.java | 5 - .../category/service/CategoryServiceTest.java | 91 ------------- .../checklist/ChecklistFixture.java | 20 +-- .../checklist/domain/ChecklistRankTest.java | 84 ------------ .../service/ChecklistServiceTest.java | 126 +----------------- .../src/test/resources/schema-test.sql | 16 --- 33 files changed, 39 insertions(+), 902 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java deleted file mode 100644 index 51d4c121b..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/controller/CategoryController.java +++ /dev/null @@ -1,33 +0,0 @@ -package com.bang_ggood.category.controller; - -import com.bang_ggood.auth.config.AuthPrincipal; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.service.CategoryService; -import com.bang_ggood.user.domain.User; -import org.springframework.http.ResponseEntity; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RestController; - -@RestController -public class CategoryController { - - private final CategoryService categoryService; - - public CategoryController(CategoryService categoryService) { - this.categoryService = categoryService; - } - - @PostMapping("/categories/priority") - public ResponseEntity createCategoriesPriority(@AuthPrincipal User user, @RequestBody CategoryPriorityCreateRequest request) { - categoryService.createCategoriesPriority(user, request); - return ResponseEntity.noContent().build(); - } - - @GetMapping("/categories") - public ResponseEntity readCategories(@AuthPrincipal User user) { - return ResponseEntity.ok(categoryService.readCategories()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java deleted file mode 100644 index b592d2704..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Badge.java +++ /dev/null @@ -1,38 +0,0 @@ -package com.bang_ggood.category.domain; - -public enum Badge { - - CLEAN(1, "청결", "청결해요", "✨"), - ROOM_CONDITION(2, "방 컨디션", "방 컨디션이 좋아요", "🏠"), - AMENITY(3, "편의시설", "편의시설이 많아요", "🚇"), - OPTION(4, "옵션", "옵션이 많아요", "🛋️"), - ENVIRONMENT(5, "주거환경", "주거환경이 좋아요", "🌱"), - SECURITY(6, "보안", "안전해요", "🔒"), - ECONOMIC(7, "경제적", "경제적이에요", "💰"), - NONE(8, "", "", ""); - - private static final String DESCRIPTION_FORMAT = "%s %s"; - private final Integer id; - private final String shortName; - private final String longName; - private final String emoji; - - Badge(Integer id, String shortName, String longName, String emoji) { - this.id = id; - this.shortName = shortName; - this.longName = longName; - this.emoji = emoji; - } - - public Integer getId() { - return id; - } - - public String getShortNameWithEmoji() { - return String.format(DESCRIPTION_FORMAT, this.emoji, this.shortName); - } - - public String getLongNameWithEmoji() { - return String.format(DESCRIPTION_FORMAT, this.emoji, this.longName); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index bd420386e..8e01f7225 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,30 +1,23 @@ package com.bang_ggood.category.domain; -import com.bang_ggood.checklist.domain.ChecklistQuestion; import java.util.Arrays; -import java.util.List; - -import static com.bang_ggood.category.domain.Badge.NONE; -import static com.bang_ggood.checklist.domain.ChecklistScore.calculateCategoryScore; public enum Category { - CLEAN(1, "청결", Badge.CLEAN), - ROOM_CONDITION(2, "방 컨디션", Badge.ROOM_CONDITION), - AMENITY(3, "편의시설", Badge.AMENITY), - OPTION(4, "옵션", Badge.OPTION), - ENVIRONMENT(5, "주거환경", Badge.ENVIRONMENT), - SECURITY(6, "보안", Badge.SECURITY), - ECONOMIC(7, "경제적", Badge.ECONOMIC); + CLEAN(1, "청결"), + ROOM_CONDITION(2, "방 컨디션"), + AMENITY(3, "편의시설"), + OPTION(4, "옵션"), + ENVIRONMENT(5, "주거환경"), + SECURITY(6, "보안"), + ECONOMIC(7, "경제적"); private final int id; private final String name; - private final Badge badge; - Category(int id, String name, Badge badge) { + Category(int id, String name) { this.id = id; this.name = name; - this.badge = badge; } public static boolean contains(int id) { @@ -32,15 +25,6 @@ public static boolean contains(int id) { .anyMatch(category -> category.id == id); } - public Badge provideBadge(List questions) { - int categoryScore = calculateCategoryScore(this, questions); - - if (categoryScore >= 8) { - return this.badge; - } - return NONE; - } - public int getId() { return id; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java deleted file mode 100644 index cdd36c60f..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/CategoryPriority.java +++ /dev/null @@ -1,60 +0,0 @@ -package com.bang_ggood.category.domain; - -import com.bang_ggood.BaseEntity; -import com.bang_ggood.user.domain.User; -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.FetchType; -import jakarta.persistence.GeneratedValue; -import jakarta.persistence.GenerationType; -import jakarta.persistence.Id; -import jakarta.persistence.ManyToOne; -import java.util.Objects; - -@Entity -public class CategoryPriority extends BaseEntity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - private Long id; - - @Column(nullable = false) - private Integer categoryId; - - @ManyToOne(fetch = FetchType.LAZY) - private User user; - - protected CategoryPriority() { - } - - public CategoryPriority(Integer categoryId, User user) { - this.categoryId = categoryId; - this.user = user; - } - - @Override - public boolean equals(Object o) { - if (this == o) { - return true; - } - if (o == null || getClass() != o.getClass()) { - return false; - } - CategoryPriority that = (CategoryPriority) o; - return Objects.equals(id, that.id); - } - - @Override - public int hashCode() { - return Objects.hash(id); - } - - @Override - public String toString() { - return "CategoryPriority{" + - "id=" + id + - ", categoryId=" + categoryId + - ", user=" + user + - '}'; - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java deleted file mode 100644 index d25bf384c..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/request/CategoryPriorityCreateRequest.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.category.dto.request; - -import java.util.List; - -public record CategoryPriorityCreateRequest(List categoryIds) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java deleted file mode 100644 index a94075923..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoriesReadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.category.dto.response; - -import java.util.List; - -public record CategoriesReadResponse(List categories) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java deleted file mode 100644 index 19441adcd..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/CategoryReadResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.bang_ggood.category.dto.response; - -import com.bang_ggood.category.domain.Category; - -public record CategoryReadResponse(Integer categoryId, String categoryName) { - - public static CategoryReadResponse from(Category category) { - return new CategoryReadResponse(category.getId(), category.getName()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java index 331ba2927..dd361e461 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/dto/response/SelectedCategoryQuestionsResponse.java @@ -4,15 +4,13 @@ import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; import java.util.List; -public record SelectedCategoryQuestionsResponse(Integer categoryId, String categoryName, Integer score, +public record SelectedCategoryQuestionsResponse(Integer categoryId, String categoryName, List questions) { - public static SelectedCategoryQuestionsResponse of(Category category, Integer score, - List questions) { + public static SelectedCategoryQuestionsResponse of(Category category, List questions) { return new SelectedCategoryQuestionsResponse( category.getId(), category.getName(), - score, questions ); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java deleted file mode 100644 index d37dda882..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/repository/CategoryPriorityRepository.java +++ /dev/null @@ -1,7 +0,0 @@ -package com.bang_ggood.category.repository; - -import com.bang_ggood.category.domain.CategoryPriority; -import org.springframework.data.jpa.repository.JpaRepository; - -public interface CategoryPriorityRepository extends JpaRepository { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java deleted file mode 100644 index 9536c139b..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/service/CategoryService.java +++ /dev/null @@ -1,75 +0,0 @@ -package com.bang_ggood.category.service; - -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.domain.CategoryPriority; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.category.dto.response.CategoryReadResponse; -import com.bang_ggood.category.repository.CategoryPriorityRepository; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.user.domain.User; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; -import java.util.Arrays; -import java.util.List; -import java.util.Set; - -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; - -@Service -public class CategoryService { - - private static final int MAX_CATEGORY_PRIORITY = 3; - private final CategoryPriorityRepository categoryPriorityRepository; - - public CategoryService(CategoryPriorityRepository categoryPriorityRepository) { - this.categoryPriorityRepository = categoryPriorityRepository; - } - - @Transactional - public void createCategoriesPriority(User user, CategoryPriorityCreateRequest request) { - validate(request); - List categoryPriorities = request.categoryIds().stream() - .map(id -> new CategoryPriority(id, user)) - .toList(); - categoryPriorityRepository.saveAll(categoryPriorities); - } - - private void validate(CategoryPriorityCreateRequest request) { - validateCategoryCount(request); - validateDuplication(request); - validateCategoryId(request); - } - - private void validateCategoryCount(CategoryPriorityCreateRequest request) { - if (request.categoryIds().size() > MAX_CATEGORY_PRIORITY) { - throw new BangggoodException(CATEGORY_PRIORITY_INVALID_COUNT); - } - } - - private void validateDuplication(CategoryPriorityCreateRequest request) { - int originalSize = request.categoryIds().size(); - int distinctSize = Set.copyOf(request.categoryIds()).size(); - if (originalSize != distinctSize) { - throw new BangggoodException(CATEGORY_DUPLICATED); - } - } - - private void validateCategoryId(CategoryPriorityCreateRequest request) { - request.categoryIds().stream() - .filter(id -> !Category.contains(id)) - .findAny() - .ifPresent(id -> { - throw new BangggoodException(CATEGORY_NOT_FOUND); - }); - } - - public CategoriesReadResponse readCategories() { - List categoryReadResponses = Arrays.stream(Category.values()) - .map(category -> new CategoryReadResponse(category.getId(), category.getName())) - .toList(); - return new CategoriesReadResponse(categoryReadResponses); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index cac92d19b..dd60228f7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -5,7 +5,6 @@ import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.service.ChecklistService; @@ -18,10 +17,8 @@ import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import java.net.URI; -import java.util.List; @RestController public class ChecklistController { @@ -53,11 +50,6 @@ public ResponseEntity readUserChecklistsPreview(@ return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); } - @GetMapping("/checklists/comparison") - public ResponseEntity readChecklistsComparison(@AuthPrincipal User user, @RequestParam("id") List checklistIds) { - return ResponseEntity.ok(checklistService.readChecklistsComparison(user, checklistIds)); - } - @GetMapping("/custom-checklist/all") public ResponseEntity readAllCustomChecklistQuestions(@AuthPrincipal User user) { return ResponseEntity.ok(checklistService.readAllCustomChecklistQuestions(user)); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index aa5b77942..71804781e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -27,13 +27,10 @@ public class ChecklistQuestion extends BaseEntity { @Enumerated(EnumType.STRING) private Grade grade; - private String memo; - - public ChecklistQuestion(Checklist checklist, Question question, Grade grade, String memo) { + public ChecklistQuestion(Checklist checklist, Question question, Grade grade) { this.checklist = checklist; this.question = question; this.grade = grade; - this.memo = memo; } protected ChecklistQuestion() { @@ -43,7 +40,6 @@ public void change(ChecklistQuestion checklistQuestion) { this.checklist = checklistQuestion.checklist; this.question = checklistQuestion.question; this.grade = checklistQuestion.grade; - this.memo = checklistQuestion.memo; } public boolean isDifferentQuestionId(ChecklistQuestion checklistQuestion) { @@ -66,10 +62,6 @@ public Grade getGrade() { return grade; } - public String getMemo() { - return memo; - } - @Override public boolean equals(Object o) { if (this == o) { @@ -94,7 +86,6 @@ public String toString() { ", checklist=" + checklist + ", question=" + question + ", grade=" + grade + - ", memo='" + memo + '\'' + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java deleted file mode 100644 index ec156c1dc..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistRank.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import java.util.List; - -public class ChecklistRank { - - private ChecklistRank() { - } - - public static int calculateRanks(int targetScore, List scores) { - return (int) scores.stream() - .filter(score -> score > targetScore) - .count() + 1; - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java deleted file mode 100644 index 9d3b3006a..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistScore.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import com.bang_ggood.category.domain.Category; -import java.util.List; - -public class ChecklistScore { - - private ChecklistScore() { - } - - public static int calculateTotalScore(List questions) { - if (questions.isEmpty()) { - return 0; - } - - int maxScore = Grade.calculateMaxScore(questions.size()); - int totalScore = Grade.calculateTotalScore(questions); - - return totalScore * 100 / maxScore; - } - - public static int calculateCategoryScore(Category category, List questions) { - List filteredQuestions = Question.filter(category, questions); - - if (filteredQuestions.isEmpty()) { - return 0; - } - - int maxScore = Grade.calculateMaxScore(filteredQuestions.size()); - int totalScore = Grade.calculateTotalScore(filteredQuestions); - - return totalScore * 10 / maxScore; - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java index 4aeb3cfd6..e83b6c758 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java @@ -3,20 +3,10 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; -import java.util.List; public enum Grade { - GOOD(3), - SOSO(2), - BAD(1), - NONE(0); - - private final int score; - - Grade(int score) { - this.score = score; - } + GOOD, BAD, NONE; public static Grade from(String grade) { return Arrays.stream(Grade.values()) @@ -24,14 +14,4 @@ public static Grade from(String grade) { .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.GRADE_INVALID)); } - - public static int calculateMaxScore(int size) { - return GOOD.score * size; - } - - public static int calculateTotalScore(List questions) { - return questions.stream() - .mapToInt(question -> question.getGrade().score) - .sum(); - } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java index 1032d8955..ffb3bc430 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java @@ -2,5 +2,5 @@ import jakarta.validation.constraints.NotNull; -public record QuestionRequest(@NotNull(message = "질문 아이디가 존재하지 않습니다.") Integer questionId, String grade, String memo) { +public record QuestionRequest(@NotNull(message = "질문 아이디가 존재하지 않습니다.") Integer questionId, String grade) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java deleted file mode 100644 index 3323080fe..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/BadgeResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.category.domain.Badge; - -public record BadgeResponse(Integer badgeId, String shortName, String longName) { - - public static BadgeResponse from(Badge badge) { - return new BadgeResponse(badge.getId(), badge.getShortNameWithEmoji(), badge.getLongNameWithEmoji()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java deleted file mode 100644 index 504b01b41..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CategoryScoreReadResponse.java +++ /dev/null @@ -1,12 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.category.domain.Category; - -public record CategoryScoreReadResponse( - Integer categoryId, String categoryName, Integer score -) { - - public static CategoryScoreReadResponse of(Category category, int score) { - return new CategoryScoreReadResponse(category.getId(), category.getName(), score); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java deleted file mode 100644 index 6deab2414..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistWithScoreReadResponse.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.room.dto.response.SelectedRoomResponse; -import java.util.List; - -public class ChecklistWithScoreReadResponse { - - private final Long checklistId; - private final Integer score; - private final SelectedRoomResponse room; - private final List options; - private final List categories; - private Integer rank; - - public ChecklistWithScoreReadResponse(Long checklistId, Integer score, - SelectedRoomResponse room, List options, - List categories) { - this.checklistId = checklistId; - this.score = score; - this.room = room; - this.options = options; - this.categories = categories; - } - - public static ChecklistWithScoreReadResponse of(Checklist checklist, int checklistScore, - SelectedRoomResponse room, List options, - List categoryScores) { - return new ChecklistWithScoreReadResponse( - checklist.getId(), - checklistScore, - room, - options, - categoryScores - ); - } - - public void assignRank(int rank) { - this.rank = rank; - } - - public Long getChecklistId() { - return checklistId; - } - - public Integer getScore() { - return score; - } - - public SelectedRoomResponse getRoom() { - return room; - } - - public List getOptions() { - return options; - } - - public List getCategories() { - return categories; - } - - public Integer getRank() { - return rank; - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java deleted file mode 100644 index d4f052f47..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/ChecklistsWithScoreReadResponse.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.bang_ggood.checklist.dto.response; - -import java.util.List; - -public record ChecklistsWithScoreReadResponse(List checklists) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java index 6fe53cb6c..a52291a44 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java @@ -5,7 +5,7 @@ import java.time.LocalDateTime; import java.util.List; -public record SelectedChecklistResponse(Integer score, LocalDateTime createdAt, SelectedRoomResponse room, +public record SelectedChecklistResponse(LocalDateTime createdAt, SelectedRoomResponse room, List options, List categories) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java index 7e3e3ead3..cf9efb6be 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -2,16 +2,14 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; -public record SelectedQuestionResponse(Integer questionId, String title, - String subtitle, String grade, String memo) { +public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String grade) { public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { return new SelectedQuestionResponse( checklistQuestion.getQuestion().getId(), checklistQuestion.getQuestion().getTitle(), checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getGrade().name(), - checklistQuestion.getMemo() + checklistQuestion.getGrade().name() ); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 27d90b50e..373cbe220 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -2,21 +2,18 @@ import com.bang_ggood.checklist.domain.Checklist; import java.time.LocalDateTime; -import java.util.List; public record UserChecklistPreviewResponse( Long checklistId, String roomName, String address, - Integer deposit, Integer rent, LocalDateTime createdAt, - List badge) { + Integer deposit, Integer rent, LocalDateTime createdAt) { - public static UserChecklistPreviewResponse of(Checklist checklist, List badges) { + public static UserChecklistPreviewResponse of(Checklist checklist) { return new UserChecklistPreviewResponse( checklist.getId(), checklist.getRoomName(), checklist.getRoomAddress(), checklist.getDeposit(), checklist.getRent(), - checklist.getCreatedAt(), - badges); + checklist.getCreatedAt()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 9438d4cec..5ce035966 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -1,14 +1,11 @@ package com.bang_ggood.checklist.service; -import com.bang_ggood.category.domain.Badge; import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.ChecklistRank; -import com.bang_ggood.checklist.domain.ChecklistScore; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; @@ -17,13 +14,9 @@ import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.QuestionRequest; -import com.bang_ggood.checklist.dto.response.BadgeResponse; import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.CategoryScoreReadResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.ChecklistWithScoreReadResponse; -import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.QuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; @@ -123,8 +116,7 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), - Grade.from(question.grade()), - question.memo())) + Grade.from(question.grade()))) .collect(Collectors.toList()); checklistQuestionRepository.saveAll(checklistQuestions); } @@ -194,7 +186,7 @@ private List getAllCategoryCustomCheckl @Transactional public SelectedChecklistResponse readChecklistById(User user, long id) { - Checklist checklist = checklistRepository.getById(id); + Checklist checklist = checklistRepository.getById(id); // TODO : 해당 유저의 체크리스트인지 확인 필요 SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); List options = readOptionsByChecklistId(id); @@ -202,9 +194,7 @@ public SelectedChecklistResponse readChecklistById(User user, long id) { List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); - int checklistScore = ChecklistScore.calculateTotalScore(checklist.getQuestions()); - - return new SelectedChecklistResponse(checklistScore, checklist.getCreatedAt(), selectedRoomResponse, + return new SelectedChecklistResponse(checklist.getCreatedAt(), selectedRoomResponse, options, selectedCategoryQuestionsResponse); } @@ -230,9 +220,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ .map(SelectedQuestionResponse::of) .toList(); - int categoryScore = ChecklistScore.calculateCategoryScore(category, checklistQuestions); - - return SelectedCategoryQuestionsResponse.of(category, categoryScore, selectedQuestionResponse); + return SelectedCategoryQuestionsResponse.of(category, selectedQuestionResponse); } @Transactional @@ -246,82 +234,7 @@ public UserChecklistsPreviewResponse readUserChecklistsPreview(User user) { } private UserChecklistPreviewResponse getChecklistPreview(Checklist checklist) { - return UserChecklistPreviewResponse.of(checklist, createBadges(checklist.getQuestions())); - } - - private List createBadges(List questions) { - return Arrays.stream(Category.values()) - .map(category -> category.provideBadge(questions)) - .filter(badge -> badge != Badge.NONE) - .map(BadgeResponse::from) - .toList(); - } - - @Transactional - public ChecklistsWithScoreReadResponse readChecklistsComparison(User user, List checklistIds) { - List checklists = checklistRepository.findByUserAndIdIn(user, checklistIds); - - validateChecklistComparison(checklists, checklistIds); - - List checklistsWithScore = checklists - .stream() - .map(this::getChecklistWithScore) - .toList(); - - assignRanks(checklistsWithScore, getScores(checklistsWithScore)); - - return new ChecklistsWithScoreReadResponse(checklistsWithScore); - } - - private void validateChecklistComparison(List userChecklists, List checklistIds) { - validateChecklistComparisonCount(checklistIds); - validateUserChecklist(userChecklists, checklistIds); - } - - private void validateChecklistComparisonCount(List checklistIds) { - if (checklistIds.size() > 3) { - throw new BangggoodException(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT); - } - } - - private void validateUserChecklist(List userChecklists, List checklistIds) { - if (userChecklists.size() != checklistIds.size()) { - throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); - } - } - - private ChecklistWithScoreReadResponse getChecklistWithScore(Checklist checklist) { - List categoryScores = getCategoryScores(checklist.getQuestions()); - int checklistScore = getChecklistScore(checklist.getQuestions()); - SelectedRoomResponse selectedRoom = SelectedRoomResponse.of(checklist); - List options = readOptionsByChecklistId(checklist.getId()); - - return ChecklistWithScoreReadResponse.of(checklist, checklistScore, selectedRoom, options, categoryScores); - } - - private List getCategoryScores(List questions) { - return Arrays.stream(Category.values()) - .map(category -> CategoryScoreReadResponse.of(category, - ChecklistScore.calculateCategoryScore(category, questions))) - .filter(response -> response.score() != 0) - .toList(); - } - - private int getChecklistScore(List questions) { - return ChecklistScore.calculateTotalScore(questions); - } - - private List getScores(List checklistsWithScore) { - return checklistsWithScore.stream() - .map(ChecklistWithScoreReadResponse::getScore) - .toList(); - } - - private void assignRanks(List checklistsWithScore, List scores) { - checklistsWithScore - .forEach(checklistWithScore -> checklistWithScore.assignRank( - ChecklistRank.calculateRanks(checklistWithScore.getScore(), scores) - )); + return UserChecklistPreviewResponse.of(checklist); } @Transactional @@ -358,8 +271,7 @@ private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checkli .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), - Grade.from(question.grade()), - question.memo())) + Grade.from(question.grade()))) .toList(); validateSameQuestions(questions, updateQuestions); @@ -408,7 +320,7 @@ private void validateCustomChecklistQuestionsDuplication(List questionI @Transactional public void deleteChecklistById(long id) { - // 사용자 검증 필요 + // TODO: 사용자 검증 필요 if (!checklistRepository.existsById(id)) { throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index ec4d60865..30606f9bf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -19,11 +19,6 @@ public enum ExceptionCode { // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), - // Category - CATEGORY_PRIORITY_INVALID_COUNT(HttpStatus.BAD_REQUEST, "카테고리 개수가 유효하지 않습니다."), - CATEGORY_NOT_FOUND(HttpStatus.BAD_REQUEST, "카테코리가 존재하지 않습니다."), - CATEGORY_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 카테고리가 존재합니다."), - // Grade GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index def571351..df2570b23 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -4,7 +4,6 @@ DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS checklist CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; -DROP TABLE IF EXISTS category_priority CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; -- Create tables @@ -57,7 +56,6 @@ CREATE TABLE checklist_question question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, grade VARCHAR(255), - memo VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, @@ -75,17 +73,6 @@ CREATE TABLE checklist_option FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE category_priority -( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - category_id INTEGER NOT NULL, - user_id BIGINT NOT NULL, - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, - FOREIGN KEY (user_id) REFERENCES users (id) -); - CREATE TABLE custom_checklist_question ( id BIGINT AUTO_INCREMENT PRIMARY KEY, diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java index 39776a0c1..6525769be 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -31,7 +31,7 @@ void authentication_no_cookie_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, null)) - .when().post("/categories/priority") + .when().post("/checklists") .then().log().all() .statusCode(401) .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_EMPTY.getMessage())); @@ -46,7 +46,7 @@ void authentication_invalid_cookie_exception() { RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, expectedCookie)) - .when().post("/categories/priority") + .when().post("/checklists") .then().log().all() .statusCode(401) .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_INVALID.getMessage())); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java deleted file mode 100644 index 8f46cd3c5..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/domain/CategoryTest.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.bang_ggood.category.domain; - -class CategoryTest { - -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java deleted file mode 100644 index 829362501..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/category/service/CategoryServiceTest.java +++ /dev/null @@ -1,91 +0,0 @@ -package com.bang_ggood.category.service; - -import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.category.domain.Category; -import com.bang_ggood.category.dto.request.CategoryPriorityCreateRequest; -import com.bang_ggood.category.dto.response.CategoriesReadResponse; -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.user.UserFixture; -import com.bang_ggood.user.repository.UserRepository; -import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import java.util.List; - -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_DUPLICATED; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_NOT_FOUND; -import static com.bang_ggood.exception.ExceptionCode.CATEGORY_PRIORITY_INVALID_COUNT; -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -class CategoryServiceTest extends IntegrationTestSupport { - - @Autowired - CategoryService categoryService; - @Autowired - UserRepository userRepository; - - @BeforeEach - void setUp() { - userRepository.save(UserFixture.USER1); - } - - @DisplayName("카테고리 우선순위 저장 성공") - @Test - void createCategoriesPriority() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3)); - - // when && then - assertThatCode(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) - .doesNotThrowAnyException(); - } - - @DisplayName("카테고리 우선순위 저장 실패 : 올바르지 않은 ID") - @Test - void createCategoriesPriority_invalidId_exception() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(999)); - - // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) - .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_NOT_FOUND.getMessage()); - } - - @DisplayName("카테고리 우선순위 저장 실패 : 최대 선택 개수 초과") - @Test - void createCategoriesPriority_overMaxCount_exception() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 2, 3, 4, 5, 6, 7, 8, 9)); - - // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) - .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_PRIORITY_INVALID_COUNT.getMessage()); - } - - @DisplayName("카테고리 우선순위 저장 실패 : 중복된 ID") - @Test - void createCategoriesPriority_duplication_exception() { - // given - CategoryPriorityCreateRequest request = new CategoryPriorityCreateRequest(List.of(1, 1)); - - // when && then - assertThatThrownBy(() -> categoryService.createCategoriesPriority(UserFixture.USER1, request)) - .isInstanceOf(BangggoodException.class) - .hasMessage(CATEGORY_DUPLICATED.getMessage()); - } - - @DisplayName("카테고리 목록 조회 성공") - @Test - void readCategories() { - // given & when - CategoriesReadResponse response = categoryService.readCategories(); - - // then - assertThat(response.categories()).hasSize(Category.values().length); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 330cc00d5..65255e589 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -25,35 +25,35 @@ public class ChecklistFixture { ); public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( - 1, "GOOD", "메모1" + 1, "GOOD" ); public static final QuestionRequest QUESTION_2_CREATE_REQUEST = new QuestionRequest( - 2, "SOSO", null + 2, "GOOD" ); public static final QuestionRequest QUESTION_3_CREATE_REQUEST = new QuestionRequest( - 3, "BAD", "메모3" + 3, "BAD" ); public static final QuestionRequest QUESTION_4_CREATE_REQUEST = new QuestionRequest( - 4, "SOSO", null + 4, "BAD" ); public static final QuestionRequest QUESTION_5_CREATE_REQUEST = new QuestionRequest( - 5, "GOOD", null + 5, "GOOD" ); public static final QuestionRequest QUESTION_5_UPDATE_REQUEST = new QuestionRequest( - 5, "GOOD", "메모" + 5, "GOOD" ); public static final QuestionRequest QUESTION_CREATE_REQUEST_NO_ID = new QuestionRequest( - null, "NONE", "메모" + null, "NONE" ); public static final QuestionRequest QUESTION_CREATE_REQUEST_INVALID_ID = new QuestionRequest( - 9999, "SOSO", null + 9999, "GOOD" ); @@ -155,10 +155,10 @@ public class ChecklistFixture { public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(1), Grade.BAD, "메모" + CHECKLIST1, Question.fromId(1), Grade.BAD ); public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(2), Grade.BAD, "메모" + CHECKLIST1, Question.fromId(2), Grade.BAD ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java deleted file mode 100644 index 456e0d946..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistRankTest.java +++ /dev/null @@ -1,84 +0,0 @@ -package com.bang_ggood.checklist.domain; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import java.util.List; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.junit.jupiter.api.Assertions.assertAll; - -class ChecklistRankTest { - - @DisplayName("Score 에 대한 Rank 계산 성공 : 3명인 경우") - @Test - void calculateRanksByDescendingScores_threeScores() { - //give - List scores = List.of(5, 3, 1); - - //when & then - assertAll( - () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), - () -> assertThat(ChecklistRank.calculateRanks(3, scores)).isEqualTo(2), - () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(3) - ); - } - - @DisplayName("Score 에 대한 Rank 계산 성공 : 2명인 경우") - @Test - void calculateRanksByDescendingScores_twoScores() { - //given - List scores = List.of(5, 3); - - //when & then - assertAll( - () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), - () -> assertThat(ChecklistRank.calculateRanks(3, scores)).isEqualTo(2) - ); - } - - @DisplayName("Score 에 대한 Rank 계산 성공 : 1명인 경우") - @Test - void calculateRanksByDescendingScores_oneScores() { - //given - List scores = List.of(5); - - //when & then - assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1); - } - - @DisplayName("Score 에 대한 Rank 계산 성공 : 모두 점수가 같은 경우") - @Test - void calculateRanksByDescendingScores_allSameScore() { - //given - List scores = List.of(5, 5, 5); - - //when & then - assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1); - } - - @DisplayName("Score 에 대한 Rank 계산 성공 : 1등이 2명인 경우") - @Test - void calculateRanksByDescendingScores_bothRankOne() { - //given - List scores = List.of(5, 5, 1); - - //when & then - assertAll( - () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), - () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(3) - ); - } - - @DisplayName("Score 에 대한 Rank 계산 성공 : 2등이 2명인 경우") - @Test - void calculateRanksByDescendingScores_BothRankTwo() { - //given - List scores = List.of(5, 1, 1); - - //when & then - assertAll( - () -> assertThat(ChecklistRank.calculateRanks(5, scores)).isEqualTo(1), - () -> assertThat(ChecklistRank.calculateRanks(1, scores)).isEqualTo(2) - ); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 3eac59eb5..91c9f1df9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -4,15 +4,12 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; -import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.ChecklistsWithScoreReadResponse; import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; @@ -41,7 +38,6 @@ import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_INVALID; import static com.bang_ggood.user.UserFixture.USER1; import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.junit.jupiter.api.Assertions.assertAll; @@ -178,7 +174,6 @@ void readChecklistById_invalidChecklistId_exception() { .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } - // @DisplayName("체크리스트 리스트 조회 성공") // @Test // void readUserChecklistsPreview() { @@ -208,124 +203,6 @@ void readChecklistById_invalidChecklistId_exception() { // Badge.CLEAN.getShortNameWithEmoji(), // Badge.CLEAN.getLongNameWithEmoji())); // } -// -// @DisplayName("체크리스트 리스트 조회 성공 : 뱃지가 존재하지 않을 때") -// @Test -// void readUserChecklistsPreview_NoBadge() { -// // given -// User user = new User(1L, "방방이"); //TODO 리팩토링 필요 -// Room room = RoomFixture.ROOM_1; -// Checklist checklist = createChecklist(user, room); -// List questions = List.of( -// new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), -// new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.BAD), -// new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.BAD), -// new ChecklistQuestion(checklist, Question.CLEAN_4, null), -// new ChecklistQuestion(checklist, Question.CLEAN_5, null)); -// -// roomRepository.save(room); -// checklistRepository.save(checklist); -// checklistQuestionRepository.saveAll(questions); -// -// // when -// UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); -// -// // then -// UserChecklistPreviewResponse previewResponse1 = response.checklists().get(0); -// assertThat(previewResponse1.checklistId()).isEqualTo(checklist.getId()); -// assertThat(previewResponse1.badge()).isEmpty(); -// } - - @DisplayName("체크리스트 비교 성공") - @Test - void readChecklistsComparison() { - // given - User user1 = UserFixture.USER1; - Room room1 = RoomFixture.ROOM_1; - Room room2 = RoomFixture.ROOM_2; - Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user1, room1); - Checklist checklist2 = createChecklist(user1, room2); - Checklist checklist3 = createChecklist(user1, room3); - - roomRepository.saveAll(List.of(room1, room2, room3)); - List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); - List checklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), - checklists.get(2).getId()); - - // when - ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(user1, checklistIds); - - // then - assertThat(response.checklists()).hasSize(3); - } - - @DisplayName("체크리스트 비교 성공 : 순위가 정상적으로 계산된 경우") - @Test - void readChecklistsComparison_compareRank() { - // given - User user1 = UserFixture.USER1; - Room room1 = RoomFixture.ROOM_1; - Room room2 = RoomFixture.ROOM_2; - Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user1, room1); - Checklist checklist2 = createChecklist(user1, room2); - Checklist checklist3 = createChecklist(user1, room3); - ChecklistQuestion checklistQuestion1 = new ChecklistQuestion(checklist1, Question.CLEAN_1, Grade.GOOD, null); - ChecklistQuestion checklistQuestion2 = new ChecklistQuestion(checklist2, Question.CLEAN_2, Grade.SOSO, null); - ChecklistQuestion checklistQuestion3 = new ChecklistQuestion(checklist3, Question.CLEAN_3, Grade.BAD, null); - - roomRepository.saveAll(List.of(room1, room2, room3)); - List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); - checklistQuestionRepository.saveAll(List.of(checklistQuestion1, checklistQuestion2, checklistQuestion3)); - List checklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), - checklists.get(2).getId()); - - // when - ChecklistsWithScoreReadResponse response = checklistService.readChecklistsComparison(user1, checklistIds); - - // then - assertAll( - () -> assertThat(response.checklists().get(0).getRank()).isEqualTo(1), - () -> assertThat(response.checklists().get(1).getRank()).isEqualTo(2), - () -> assertThat(response.checklists().get(2).getRank()).isEqualTo(3) - ); - } - - @DisplayName("체크리스트 비교 실패 : 아이디 개수가 유효하지 않을 때") - @Test - void readChecklistsComparison_invalidIdCount() { - // given - List invalidChecklistIds = List.of(1L, 2L, 3L, 4L); - - // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(USER1, invalidChecklistIds)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.CHECKLIST_COMPARISON_INVALID_COUNT.getMessage()); - } - - @DisplayName("체크리스트 비교 실패 : 유효하지 않은 체크리스트 id 존재") - @Test - void readChecklistsComparison_invalidId() { - // given - User user1 = UserFixture.USER1; - Room room1 = RoomFixture.ROOM_1; - Room room2 = RoomFixture.ROOM_2; - Room room3 = RoomFixture.ROOM_3; - Checklist checklist1 = createChecklist(user1, room1); - Checklist checklist2 = createChecklist(user1, room2); - Checklist checklist3 = createChecklist(user1, room3); - - roomRepository.saveAll(List.of(room1, room2, room3)); - List checklists = checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); - List invalidChecklistIds = List.of(checklists.get(0).getId(), checklists.get(1).getId(), - checklists.get(2).getId() + 1); - - // when & then - assertThatCode(() -> checklistService.readChecklistsComparison(user1, invalidChecklistIds)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); - } @DisplayName("체크리스트 수정 성공") @Test @@ -342,8 +219,7 @@ void updateChecklistById() { assertAll( () -> assertThat(checklist.getRoom().getStructure()).isEqualTo(Structure.OPEN_ONE_ROOM), () -> assertThat( - checklistOptionRepository.findByChecklistId(checklistId).get(3).getOptionId()).isEqualTo(4), - () -> assertThat(checklist.getQuestions().get(3).getMemo()).isEqualTo("메모") + checklistOptionRepository.findByChecklistId(checklistId).get(3).getOptionId()).isEqualTo(4) ); } diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 8c40869f5..e0ffe06fc 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -4,7 +4,6 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; -DROP TABLE IF EXISTS category_priority CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; @@ -69,27 +68,12 @@ CREATE TABLE checklist_question question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, grade VARCHAR(255), - memo VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); - -CREATE TABLE category_priority -( - id bigint generated by default as identity, - category_id INTEGER not null, - user_id bigint not null, - created_at TIMESTAMP not null, - modified_at TIMESTAMP not null, - deleted BOOLEAN, - primary key (id), - foreign key (user_id) references users -); - - CREATE TABLE test_entity ( id bigint generated by default as identity, From b6dab53af5e96441626f869bb8ca916dfe6e9f1b Mon Sep 17 00:00:00 2001 From: tkdgur0906 Date: Mon, 12 Aug 2024 00:37:53 +0900 Subject: [PATCH 159/348] =?UTF-8?q?feat=20:=20=ED=95=B4=EB=8B=B9=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EA=B0=80=20=EC=9E=91=EC=84=B1=ED=95=9C=20?= =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=EC=9D=B8=EC=A7=80?= =?UTF-8?q?=20=ED=8C=90=EB=B3=84=ED=95=98=EB=8A=94=20=EB=A9=94=EC=84=9C?= =?UTF-8?q?=EB=93=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 4 ++++ .../com/bang_ggood/checklist/service/ChecklistService.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 6924df9d7..b42ad7ec2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -57,6 +57,10 @@ public Checklist(Integer deposit, Integer rent, Integer contractTerm, String rea protected Checklist() { } + public boolean isOwnedBy(User user) { + return this.user.equals(user); + } + public void change(Checklist updateChecklist) { this.user = updateChecklist.user; this.room = updateChecklist.room; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 5cdf93496..3f0de6993 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -149,7 +149,7 @@ private void validateChecklistLike(User user, Checklist checklist) { } private void validateChecklistOwnership(User user, Checklist checklist) { - if (!checklist.getUser().equals(user)) { + if (!checklist.isOwnedBy(user)) { throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_OWNED_BY_USER); } } From 63f868dd56cd31970f830f1391d00e600e1c17a4 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Mon, 12 Aug 2024 15:02:42 +0900 Subject: [PATCH 160/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?310)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 12 ++-- .../domain/{Grade.java => Answer.java} | 8 +-- .../checklist/domain/Checklist.java | 70 +++++++++++++++--- .../checklist/domain/ChecklistQuestion.java | 14 ++-- .../checklist/domain/OccupancyMonth.java | 43 +++++++++++ .../checklist/domain/OccupancyPeriod.java | 33 +++++++++ .../bang_ggood/checklist/domain/Question.java | 2 +- .../checklist/dto/request/ChecklistInfo.java | 4 -- .../dto/request/ChecklistRequest.java | 10 ++- .../dto/request/QuestionRequest.java | 2 +- .../CustomChecklistQuestionResponse.java | 3 +- .../response/SelectedQuestionResponse.java | 2 +- .../checklist/service/ChecklistService.java | 31 ++++---- .../bang_ggood/exception/ExceptionCode.java | 12 ++-- .../bang_ggood/room/domain/FloorLevel.java | 8 ++- .../java/com/bang_ggood/room/domain/Room.java | 23 +++--- .../com/bang_ggood/room/domain/Structure.java | 8 ++- .../java/com/bang_ggood/room/domain/Type.java | 8 ++- .../room/dto/request/RoomRequest.java | 3 +- .../dto/response/SelectedRoomResponse.java | 2 +- .../bang-ggood/src/main/resources/schema.sql | 28 ++++---- .../java/com/bang_ggood/AcceptanceTest.java | 4 +- .../auth/service/AuthServiceTest.java | 5 +- .../checklist/ChecklistFixture.java | 18 +++-- .../controller/ChecklistE2ETest.java | 3 +- .../checklist/domain/ChecklistTest.java | 29 ++++++++ .../checklist/domain/OccupancyMonthTest.java | 33 +++++++++ .../checklist/domain/OccupancyPeriodTest.java | 33 +++++++++ .../service/ChecklistServiceTest.java | 27 +++---- .../java/com/bang_ggood/room/RoomFixture.java | 17 +++-- .../room/domain/FloorLevelTest.java | 10 +++ .../com/bang_ggood/room/domain/RoomTest.java | 2 +- .../bang_ggood/room/domain/StructureTest.java | 10 +++ .../com/bang_ggood/room/domain/TypeTest.java | 10 +++ .../src/test/resources/schema-test.sql | 71 ++++++++++--------- 35 files changed, 439 insertions(+), 159 deletions(-) rename backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/{Grade.java => Answer.java} (71%) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyMonth.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyPeriod.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyMonthTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyPeriodTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 9b70f8565..d3955602d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -30,7 +30,8 @@ public ChecklistController(ChecklistService checklistService) { } @PostMapping("/checklists") - public ResponseEntity createChecklist(@AuthPrincipal User user, @Valid @RequestBody ChecklistRequest checklistRequest) { + public ResponseEntity createChecklist(@AuthPrincipal User user, + @Valid @RequestBody ChecklistRequest checklistRequest) { long checklistId = checklistService.createChecklist(user, checklistRequest); return ResponseEntity.created(URI.create("/checklists/" + checklistId)).build(); } @@ -47,7 +48,8 @@ public ResponseEntity readChecklistQuestions(@AuthPr } @GetMapping("/checklists/{id}") - public ResponseEntity readChecklistById(@AuthPrincipal User user, @PathVariable("id") long id) { + public ResponseEntity readChecklistById(@AuthPrincipal User user, + @PathVariable("id") long id) { return ResponseEntity.ok(checklistService.readChecklistById(user, id)); } @@ -57,7 +59,8 @@ public ResponseEntity readUserChecklistsPreview(@ } @GetMapping("/custom-checklist/all") - public ResponseEntity readAllCustomChecklistQuestions(@AuthPrincipal User user) { + public ResponseEntity readAllCustomChecklistQuestions( + @AuthPrincipal User user) { return ResponseEntity.ok(checklistService.readAllCustomChecklistQuestions(user)); } @@ -71,7 +74,8 @@ public ResponseEntity updateChecklistById( } @PutMapping("/custom-checklist") - public ResponseEntity updateCustomChecklist(@AuthPrincipal User user, @RequestBody CustomChecklistUpdateRequest request) { + public ResponseEntity updateCustomChecklist(@AuthPrincipal User user, + @RequestBody CustomChecklistUpdateRequest request) { checklistService.updateCustomChecklist(user, request); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Answer.java similarity index 71% rename from backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Answer.java index e83b6c758..5b971cceb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Grade.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Answer.java @@ -4,14 +4,14 @@ import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; -public enum Grade { +public enum Answer { GOOD, BAD, NONE; - public static Grade from(String grade) { - return Arrays.stream(Grade.values()) + public static Answer from(String grade) { + return Arrays.stream(Answer.values()) .filter(value -> value.name().equals(grade)) .findFirst() - .orElseThrow(() -> new BangggoodException(ExceptionCode.GRADE_INVALID)); + .orElseThrow(() -> new BangggoodException(ExceptionCode.ANSWER_INVALID)); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index b42ad7ec2..116b0ebb7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -1,12 +1,16 @@ package com.bang_ggood.checklist.domain; import com.bang_ggood.BaseEntity; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.domain.Type; import com.bang_ggood.user.domain.User; import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; import jakarta.persistence.FetchType; import jakarta.persistence.GeneratedValue; import jakarta.persistence.GenerationType; @@ -20,16 +24,18 @@ @Entity public class Checklist extends BaseEntity { + private static final int MEMO_MAX_LENGTH = 1000; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; - @ManyToOne(fetch = FetchType.LAZY) - private User user; - @OneToOne(fetch = FetchType.LAZY) private Room room; + @ManyToOne(fetch = FetchType.LAZY) + private User user; + private Integer deposit; private Integer rent; @@ -38,20 +44,38 @@ public class Checklist extends BaseEntity { private String realEstate; + private String memo; + + private String summary; + + @Enumerated(EnumType.STRING) + private OccupancyMonth occupancyMonth; + + @Enumerated(EnumType.STRING) + private OccupancyPeriod occupancyPeriod; + @OneToMany(mappedBy = "checklist") private List questions; - public Checklist(User user, Room room, Integer deposit, Integer rent, Integer contractTerm, String realEstate) { - this.user = user; + + public Checklist(Room room, User user, Integer deposit, Integer rent, Integer contractTerm, String realEstate, + String memo, String summary, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod) { this.room = room; + this.user = user; this.deposit = deposit; this.rent = rent; this.contractTerm = contractTerm; this.realEstate = realEstate; + this.memo = memo; + this.summary = summary; + this.occupancyMonth = occupancyMonth; + this.occupancyPeriod = occupancyPeriod; + validateMemoLength(); } - public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { - this(null, null, deposit, rent, contractTerm, realEstate); + public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate, + String memo, String summary, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod) { + this(null, null, deposit, rent, contractTerm, realEstate, memo, summary, occupancyMonth, occupancyPeriod); } protected Checklist() { @@ -70,6 +94,12 @@ public void change(Checklist updateChecklist) { this.realEstate = updateChecklist.realEstate; } + private void validateMemoLength() { + if (memo.length() > MEMO_MAX_LENGTH) { + throw new BangggoodException(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH); + } + } + public Long getId() { return id; } @@ -106,7 +136,7 @@ public Type getRoomType() { return room.getType(); } - public Integer getRoomSize() { + public Double getRoomSize() { return room.getSize(); } @@ -134,6 +164,22 @@ public String getRealEstate() { return realEstate; } + public String getMemo() { + return memo; + } + + public String getSummary() { + return summary; + } + + public OccupancyMonth getOccupancyMonth() { + return occupancyMonth; + } + + public OccupancyPeriod getOccupancyPeriod() { + return occupancyPeriod; + } + public List getQuestions() { return questions; } @@ -159,12 +205,16 @@ public int hashCode() { public String toString() { return "Checklist{" + "id=" + id + - ", user=" + user + ", room=" + room + + ", user=" + user + ", deposit=" + deposit + ", rent=" + rent + ", contractTerm=" + contractTerm + ", realEstate='" + realEstate + '\'' + + ", memo='" + memo + '\'' + + ", summary='" + summary + '\'' + + ", occupancyMonth=" + occupancyMonth + + ", occupancyPeriod=" + occupancyPeriod + '}'; } -} \ No newline at end of file +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java index 71804781e..83490667d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistQuestion.java @@ -25,12 +25,12 @@ public class ChecklistQuestion extends BaseEntity { private Question question; @Enumerated(EnumType.STRING) - private Grade grade; + private Answer answer; - public ChecklistQuestion(Checklist checklist, Question question, Grade grade) { + public ChecklistQuestion(Checklist checklist, Question question, Answer answer) { this.checklist = checklist; this.question = question; - this.grade = grade; + this.answer = answer; } protected ChecklistQuestion() { @@ -39,7 +39,7 @@ protected ChecklistQuestion() { public void change(ChecklistQuestion checklistQuestion) { this.checklist = checklistQuestion.checklist; this.question = checklistQuestion.question; - this.grade = checklistQuestion.grade; + this.answer = checklistQuestion.answer; } public boolean isDifferentQuestionId(ChecklistQuestion checklistQuestion) { @@ -58,8 +58,8 @@ public Question getQuestion() { return question; } - public Grade getGrade() { - return grade; + public Answer getAnswer() { + return answer; } @Override @@ -85,7 +85,7 @@ public String toString() { "id=" + id + ", checklist=" + checklist + ", question=" + question + - ", grade=" + grade + + ", answer=" + answer + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyMonth.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyMonth.java new file mode 100644 index 000000000..26d67b74a --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyMonth.java @@ -0,0 +1,43 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum OccupancyMonth { + + JANUARY(1), + FEBRUARY(2), + MARCH(3), + APRIL(4), + MAY(5), + JUNE(6), + JULY(7), + AUGUST(8), + SEPTEMBER(9), + OCTOBER(10), + NOVEMBER(11), + DECEMBER(12), + NONE(null); + + private final Integer month; + + OccupancyMonth(Integer month) { + this.month = month; + } + + public static OccupancyMonth from(Integer month) { + if (month == null) { + return NONE; + } + return Arrays.stream(OccupancyMonth.values()) + .filter(value -> value.month != null && value.month.equals(month)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.OCCUPANCY_MONTH_INVALID)); + } + + public Integer getMonth() { + return month; + } +} + diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyPeriod.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyPeriod.java new file mode 100644 index 000000000..15010cd33 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/OccupancyPeriod.java @@ -0,0 +1,33 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum OccupancyPeriod { + + EARLY("초"), + MIDDLE("중순"), + LATE("말"), + NONE(null); + + private final String period; + + OccupancyPeriod(String period) { + this.period = period; + } + + public static OccupancyPeriod from(String period) { + if (period == null) { + return NONE; + } + return Arrays.stream(OccupancyPeriod.values()) + .filter(value -> value.period != null && value.period.equals(period)) + .findFirst() + .orElseThrow(() -> new BangggoodException(ExceptionCode.OCCUPANCY_PERIOD_INVALID)); + } + + public String getPeriod() { + return period; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index 16457f6e1..cfd349a84 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -70,7 +70,7 @@ public static Question fromId(int id) { public static List filter(Category category, List questions) { return questions.stream() - .filter(question -> question.getQuestion().isCategory(category) && question.getGrade() != null) + .filter(question -> question.getQuestion().isCategory(category) && question.getAnswer() != null) .toList(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java deleted file mode 100644 index bb61b2f7d..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistInfo.java +++ /dev/null @@ -1,4 +0,0 @@ -package com.bang_ggood.checklist.dto.request; - -public record ChecklistInfo(Integer deposit, Integer rent, Integer contractTerm, String realEstate) { -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java index 3b4d63841..dbe752b71 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java @@ -1,7 +1,11 @@ package com.bang_ggood.checklist.dto.request; +import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.OccupancyMonth; +import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.dto.request.RoomRequest; +import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; import java.util.List; @@ -12,7 +16,9 @@ public Room toRoomEntity() { return room.toRoomEntity(); } - public ChecklistInfo toChecklistInfo() { - return new ChecklistInfo(room.deposit(), room.rent(), room.contractTerm(), room.realEstate()); + public Checklist toChecklistEntity(Room roomEntity, User user) { + return new Checklist(roomEntity, user, room.deposit(), room.rent(), + room.contractTerm(), room.realEstate(), room.memo(), room.summary(), + OccupancyMonth.from(room.occupancyMonth()), OccupancyPeriod.from(room.occupancyPeriod())); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java index ffb3bc430..ac8762ac3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/QuestionRequest.java @@ -2,5 +2,5 @@ import jakarta.validation.constraints.NotNull; -public record QuestionRequest(@NotNull(message = "질문 아이디가 존재하지 않습니다.") Integer questionId, String grade) { +public record QuestionRequest(@NotNull(message = "질문 아이디가 존재하지 않습니다.") Integer questionId, String answer) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java index ec0e4026b..2e6268b11 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java @@ -5,6 +5,7 @@ public record CustomChecklistQuestionResponse(Integer questionId, String title, String subtitle, boolean isSelected) { public static CustomChecklistQuestionResponse of(Question question, boolean isSelected) { - return new CustomChecklistQuestionResponse(question.getId(), question.getTitle(), question.getSubtitle(), isSelected); + return new CustomChecklistQuestionResponse(question.getId(), question.getTitle(), question.getSubtitle(), + isSelected); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java index cf9efb6be..7785c63d4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -9,7 +9,7 @@ public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { checklistQuestion.getQuestion().getId(), checklistQuestion.getQuestion().getTitle(), checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getGrade().name() + checklistQuestion.getAnswer().name() ); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 177c09750..0c7ead6dd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -3,15 +3,14 @@ import com.bang_ggood.category.domain.Category; import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; +import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; -import com.bang_ggood.checklist.domain.Grade; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; -import com.bang_ggood.checklist.dto.request.ChecklistInfo; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.request.QuestionRequest; @@ -74,9 +73,7 @@ public ChecklistService(ChecklistRepository checklistRepository, RoomRepository public long createChecklist(User user, ChecklistRequest checklistRequest) { Room room = roomRepository.save(checklistRequest.toRoomEntity()); - ChecklistInfo checklistInfo = checklistRequest.toChecklistInfo(); - Checklist checklist = new Checklist(user, room, checklistInfo.deposit(), checklistInfo.rent(), - checklistInfo.contractTerm(), checklistInfo.realEstate()); + Checklist checklist = checklistRequest.toChecklistEntity(room, user); checklistRepository.save(checklist); createChecklistOptions(checklistRequest, checklist); @@ -121,7 +118,7 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), - Grade.from(question.grade()))) + Answer.from(question.answer()))) .collect(Collectors.toList()); checklistQuestionRepository.saveAll(checklistQuestions); } @@ -194,20 +191,24 @@ private void validateQuestionInvalid(List questions) { } @Transactional - public CategoryCustomChecklistQuestionsResponse readAllCustomChecklistQuestions(User user) { // TODO custom-checklist 도메인 분리 및 리팩토링 + public CategoryCustomChecklistQuestionsResponse readAllCustomChecklistQuestions( + User user) { // TODO custom-checklist 도메인 분리 및 리팩토링 List customChecklistQuestions = customChecklistQuestionRepository.findAllByUser(user); - List allCategoryCustomChecklistQuestions = getAllCategoryCustomChecklistQuestions(customChecklistQuestions); + List allCategoryCustomChecklistQuestions = getAllCategoryCustomChecklistQuestions( + customChecklistQuestions); return new CategoryCustomChecklistQuestionsResponse(allCategoryCustomChecklistQuestions); } - private List getAllCategoryCustomChecklistQuestions(List customChecklistQuestions) { + private List getAllCategoryCustomChecklistQuestions( + List customChecklistQuestions) { List response = new ArrayList<>(); for (Category category : Category.values()) { List categoryQuestions = Question.findQuestionsByCategory(category); List questions = categoryQuestions.stream() - .map(question -> CustomChecklistQuestionResponse.of(question, question.isSelected(customChecklistQuestions))) + .map(question -> CustomChecklistQuestionResponse.of(question, + question.isSelected(customChecklistQuestions))) .toList(); response.add(new CategoryCustomChecklistQuestionResponse(category.getId(), category.getName(), questions)); } @@ -275,9 +276,7 @@ public void updateChecklistById(User user, long id, ChecklistRequest checklistRe Room room = checklist.getRoom(); room.change(checklistRequest.toRoomEntity()); - ChecklistInfo checklistInfo = checklistRequest.toChecklistInfo(); - Checklist updateChecklist = new Checklist(user, room, checklistInfo.deposit(), checklistInfo.rent(), - checklistInfo.contractTerm(), checklistInfo.realEstate()); + Checklist updateChecklist = checklistRequest.toChecklistEntity(room, user); checklist.change(updateChecklist); updateChecklistOptions(checklistRequest, checklist); @@ -295,19 +294,19 @@ private void updateChecklistOptions(ChecklistRequest checklistRequest, Checklist } private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checklist checklist) { - validateQuestion(checklistRequest.questions()); + /*validateQuestion(checklistRequest.questions()); List questions = checklist.getQuestions(); List updateQuestions = checklistRequest.questions().stream() .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), - Grade.from(question.grade()))) + Answer.from(question.grade()))) .toList(); validateSameQuestions(questions, updateQuestions); IntStream.range(0, questions.size()) - .forEach(i -> questions.get(i).change(updateQuestions.get(i))); + .forEach(i -> questions.get(i).change(updateQuestions.get(i)));*/ } private void validateSameQuestions(List questions, List updateQuestions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index eef3e71ff..912d4acf2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -19,12 +19,13 @@ public enum ExceptionCode { // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), - // Grade - GRADE_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), + // Answer + ANSWER_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), // Checklist CHECKLIST_COMPARISON_INVALID_COUNT(HttpStatus.BAD_REQUEST, "비교할 체크리스트 개수가 유효하지 않습니다."), CHECKLIST_NOT_FOUND(HttpStatus.BAD_REQUEST, "체크리스트가 존재하지 않습니다."), + CHECKLIST_MEMO_INVALID_LENGTH(HttpStatus.BAD_REQUEST, "체크리스트 메모는 1000자 이하여야 합니다."), CHECKLIST_NOT_OWNED_BY_USER(HttpStatus.BAD_REQUEST, "유저의 체크리스트가 아닙니다."), // CustomChecklist @@ -42,8 +43,11 @@ public enum ExceptionCode { // Room ROOM_FLOOR_AND_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "방이 지상층일 경우에만 층수를 입력할 수 있습니다."), - //Score - SCORE_NOT_DESCENDING_SORTED(HttpStatus.BAD_REQUEST, "정렬되지 않은 점수입니다."), + // OccupancyMonth + OCCUPANCY_MONTH_INVALID(HttpStatus.BAD_REQUEST, "입주 가능월은 1부터 12 사이 혹은 null 값만 가능합니다."), + + // OccupancyPeriod + OCCUPANCY_PERIOD_INVALID(HttpStatus.BAD_REQUEST, "입주 가능 기간은 초, 중, 말 혹은 null 값만 가능합니다."), //like LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "체크리스트가 이미 좋아요 상태입니다"), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java index a014d7584..80b457a43 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/FloorLevel.java @@ -8,7 +8,8 @@ public enum FloorLevel { GROUND("지상"), BASEMENT("반지하/지하"), - ROOFTOP("옥탑"); + ROOFTOP("옥탑"), + NONE(null); private final String name; @@ -17,8 +18,11 @@ public enum FloorLevel { } public static FloorLevel from(String name) { + if (name == null) { + return NONE; + } return Arrays.stream(FloorLevel.values()) - .filter(value -> value.name.equals(name)) + .filter(value -> value.name != null && value.name.equals(name)) .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.FLOOR_LEVEL_INVALID)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 5d805654b..0a9d3950d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -29,7 +29,7 @@ public class Room extends BaseEntity { @Enumerated(EnumType.STRING) private Type type; - private Integer size; + private Double size; private Integer floor; @@ -42,7 +42,7 @@ public class Room extends BaseEntity { protected Room() { } - public Room(String name, String station, Integer walkingTime, String address, Type type, Integer size, + public Room(String name, String station, Integer walkingTime, String address, Type type, Double size, Integer floor, FloorLevel floorLevel, Structure structure) { this.name = name; this.station = station; @@ -76,14 +76,6 @@ public String getName() { return name; } - public Integer getFloor() { - return floor; - } - - public String getAddress() { - return address; - } - public String getStation() { return station; } @@ -92,14 +84,22 @@ public Integer getWalkingTime() { return walkingTime; } + public String getAddress() { + return address; + } + public Type getType() { return type; } - public Integer getSize() { + public Double getSize() { return size; } + public Integer getFloor() { + return floor; + } + public FloorLevel getFloorLevel() { return floorLevel; } @@ -108,7 +108,6 @@ public Structure getStructure() { return structure; } - private void validateFloorAndLevel() { if (floorLevel != FloorLevel.GROUND && floor != null) { throw new BangggoodException(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java index f7274e6a3..5626f2963 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Structure.java @@ -10,7 +10,8 @@ public enum Structure { DIVIDED_ONE_ROOM("분리형 원룸"), TWO_ROOM("투룸"), THREE_ROOM_OR_MORE("쓰리룸 이상"), - DUPLEX("복층"); + DUPLEX("복층"), + NONE(null); private final String name; @@ -19,8 +20,11 @@ public enum Structure { } public static Structure from(String name) { + if (name == null) { + return NONE; + } return Arrays.stream(Structure.values()) - .filter(value -> value.name.equals(name)) + .filter(value -> value.name != null && value.name.equals(name)) .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.STRUCTURE_INVALID)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java index be63b6e10..50b2bd15b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java @@ -9,7 +9,8 @@ public enum Type { VILLA("빌라"), OFFICETEL("오피스텔"), APARTMENT("아파트"), - OTHER("기타"); + OTHER("기타"), + NONE(null); private final String name; @@ -18,8 +19,11 @@ public enum Type { } public static Type from(String name) { + if (name == null) { + return NONE; + } return Arrays.stream(Type.values()) - .filter(value -> value.name.equals(name)) + .filter(value -> value.name != null && value.name.equals(name)) .findFirst() .orElseThrow(() -> new BangggoodException(ExceptionCode.TYPE_INVALID)); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java index 5b82a6154..957c2afdd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java @@ -9,7 +9,8 @@ public record RoomRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, Integer deposit, Integer rent, Integer contractTerm, String address, String station, Integer walkingTime, String realEstate, - String type, String structure, Integer size, Integer floor, String floorLevel) { + String type, String structure, Double size, Integer floor, String floorLevel, + Integer occupancyMonth, String occupancyPeriod, String memo, String summary) { public Room toRoomEntity() { return new Room(roomName, station, walkingTime, address, diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 3187303b7..d73ad4ad9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -4,7 +4,7 @@ public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, String address, String station, Integer walkingTime, String realEstate, - String type, Integer size, String floorLevel, String structure) { + String type, Double size, String floorLevel, String structure) { public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index df2570b23..364f08181 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -15,7 +15,7 @@ CREATE TABLE room walking_time INTEGER, address VARCHAR(255), type VARCHAR(255), - size INTEGER, + size DOUBLE, floor INTEGER, floor_level VARCHAR(255), structure VARCHAR(255), @@ -36,16 +36,20 @@ CREATE TABLE users CREATE TABLE checklist ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - contract_term INTEGER, - deposit INTEGER, - rent INTEGER, - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - room_id BIGINT NOT NULL UNIQUE, - user_id BIGINT NOT NULL, - real_estate VARCHAR(255), - deleted BOOLEAN, + id BIGINT AUTO_INCREMENT PRIMARY KEY, + room_id BIGINT NOT NULL UNIQUE, + user_id BIGINT NOT NULL, + deposit INTEGER, + rent INTEGER, + contract_term INTEGER, + real_estate VARCHAR(255), + memo VARCHAR(1000), + summary VARCHAR(255), + occupancy_month VARCHAR(255), + occupancy_period VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); @@ -55,7 +59,7 @@ CREATE TABLE checklist_question id BIGINT AUTO_INCREMENT PRIMARY KEY, question VARCHAR(255) NOT NULL, checklist_id BIGINT NOT NULL, - grade VARCHAR(255), + answer VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java index 76252f737..aa0afcb83 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceTest.java @@ -20,15 +20,13 @@ @Sql(scripts = {"/schema-test.sql", "/data-test.sql"}) public abstract class AcceptanceTest { + protected ResponseCookie responseCookie; @Autowired private JwtTokenProvider jwtTokenProvider; @Autowired private CookieProvider cookieProvider; @Autowired private UserRepository userRepository; - - protected ResponseCookie responseCookie; - @LocalServerPort private int port; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index 128e22272..ce6c036c6 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -19,17 +19,14 @@ @ExtendWith(MockitoExtension.class) class AuthServiceTest extends IntegrationTestSupport { + private static final OauthLoginRequest oauthLoginRequest = new OauthLoginRequest("testCode"); @MockBean private OauthClient oauthClient; - @Autowired private AuthService authService; - @Autowired private UserRepository userRepository; - private static final OauthLoginRequest oauthLoginRequest = new OauthLoginRequest("testCode"); - @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") @Test void login_signup() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 65255e589..a0c4656aa 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -1,8 +1,10 @@ package com.bang_ggood.checklist; +import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistQuestion; -import com.bang_ggood.checklist.domain.Grade; +import com.bang_ggood.checklist.domain.OccupancyMonth; +import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; import com.bang_ggood.checklist.dto.request.QuestionRequest; @@ -13,15 +15,17 @@ public class ChecklistFixture { public static final Checklist CHECKLIST1 = new Checklist( - UserFixture.USER1, RoomFixture.ROOM_1, - 1000, 50, 12, "방끗공인중개사" + UserFixture.USER1, + 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); public static final Checklist CHECKLIST2 = new Checklist( - UserFixture.USER1, RoomFixture.ROOM_2, - 1000, 50, 12, "방끗공인중개사" + UserFixture.USER1, + 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( @@ -155,10 +159,10 @@ public class ChecklistFixture { public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(1), Grade.BAD + CHECKLIST1, Question.fromId(1), Answer.BAD ); public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(2), Grade.BAD + CHECKLIST1, Question.fromId(2), Answer.BAD ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 314ceda46..69acb237d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -103,7 +103,8 @@ void createChecklistLike_checklistAlreadyLiked_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { - checklistService.updateCustomChecklist(USER1, new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); + checklistService.updateCustomChecklist(USER1, + new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java new file mode 100644 index 000000000..04b98d32a --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java @@ -0,0 +1,29 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.user.UserFixture; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class ChecklistTest { + + @DisplayName("체크리스트 생성 실패 : 메모가 1000자 넘을 경우") + @Test + void constructor_ChecklistInvalidMemoLength_exception() { + // given + String memo = "a".repeat(1001); + + // when & then + assertThatThrownBy( + () -> new Checklist(RoomFixture.ROOM_1, UserFixture.USER1, 1000, 20, 12, + "공인중개사", memo, "요약", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY) + ) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH.getMessage()); + } + +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyMonthTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyMonthTest.java new file mode 100644 index 000000000..959b7fd99 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyMonthTest.java @@ -0,0 +1,33 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class OccupancyMonthTest { + + @DisplayName("생성 성공") + @Test + void constructor() { + assertThat(OccupancyMonth.from(1)).isEqualTo(OccupancyMonth.JANUARY); + } + + @DisplayName("생성 성공: null인 경우") + @Test + void constructor_null() { + assertThat(OccupancyMonth.from(null)).isEqualTo(OccupancyMonth.NONE); + } + + @DisplayName("생성 실패: 유효하지 않은 달인 경우") + @Test + void constructor_invalidMonth_exception() { + assertThatThrownBy( + () -> OccupancyMonth.from(13) + ).isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OCCUPANCY_MONTH_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyPeriodTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyPeriodTest.java new file mode 100644 index 000000000..9eee4ca3f --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/OccupancyPeriodTest.java @@ -0,0 +1,33 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class OccupancyPeriodTest { + + @DisplayName("생성 성공") + @Test + void constructor() { + assertThat(OccupancyPeriod.from("초")).isEqualTo(OccupancyPeriod.EARLY); + } + + @DisplayName("생성 성공: null인 경우") + @Test + void constructor_null() { + assertThat(OccupancyPeriod.from(null)).isEqualTo(OccupancyPeriod.NONE); + } + + @DisplayName("생성 실패: 유효하지 않은 기간인 경우") + @Test + void constructor_invalidPeriod_exception() { + assertThatThrownBy( + () -> OccupancyPeriod.from("기간") + ).isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.OCCUPANCY_PERIOD_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 53c7e5550..b6dc096db 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -20,11 +20,8 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; -import com.bang_ggood.room.domain.Room; -import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; -import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; @@ -77,7 +74,7 @@ public void setUp() { roomRepository.save(RoomFixture.ROOM_3); } - @DisplayName("체크리스트 방 정보 작성 성공") + @DisplayName("체크리스트 작성 성공") @Test void createChecklist() { //given @@ -95,7 +92,7 @@ void createChecklist() { } - @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 유효하지 않을 경우") + @DisplayName("체크리스트 작성 실패: 질문 id가 유효하지 않을 경우") @Test void createChecklist_invalidQuestionId_exception() { //given & when & then @@ -106,7 +103,7 @@ void createChecklist_invalidQuestionId_exception() { .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } - @DisplayName("체크리스트 방 정보 작성 실패: 질문 id가 중복일 경우") + @DisplayName("체크리스트 작성 실패: 질문 id가 중복일 경우") @Test void createChecklist_duplicatedQuestionId_exception() { //given & when & then @@ -117,7 +114,7 @@ void createChecklist_duplicatedQuestionId_exception() { .hasMessage(ExceptionCode.QUESTION_DUPLICATED.getMessage()); } - @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 유효하지 않을 경우") + @DisplayName("체크리스트 작성 실패: 옵션 id가 유효하지 않을 경우") @Test void createChecklist_invalidOptionId_exception() { //given & when & then @@ -128,7 +125,7 @@ void createChecklist_invalidOptionId_exception() { .hasMessage(ExceptionCode.OPTION_INVALID.getMessage()); } - @DisplayName("체크리스트 방 정보 작성 실패: 옵션 id가 중복일 경우") + @DisplayName("체크리스트 작성 실패: 옵션 id가 중복일 경우") @Test void createChecklist_duplicatedOptionId_exception() { //given & when & then @@ -214,9 +211,9 @@ void readChecklistById_invalidChecklistId_exception() { // Room room = RoomFixture.ROOM_1; // Checklist checklist = createChecklist(user, room); // List questions = List.of( -// new ChecklistQuestion(checklist, Question.CLEAN_1, Grade.GOOD), -// new ChecklistQuestion(checklist, Question.CLEAN_2, Grade.GOOD), -// new ChecklistQuestion(checklist, Question.CLEAN_3, Grade.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_1, Answer.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_2, Answer.GOOD), +// new ChecklistQuestion(checklist, Question.CLEAN_3, Answer.GOOD), // new ChecklistQuestion(checklist, Question.CLEAN_4, null), // new ChecklistQuestion(checklist, Question.CLEAN_5, null)); // @@ -236,7 +233,7 @@ void readChecklistById_invalidChecklistId_exception() { // Badge.CLEAN.getLongNameWithEmoji())); // } - @DisplayName("체크리스트 수정 성공") + /*@DisplayName("체크리스트 수정 성공") @Test void updateChecklistById() { //given @@ -343,7 +340,7 @@ void createChecklist_differentQuestion_exception() { ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); - } + }*/ @DisplayName("커스텀 체크리스트 조회 성공") @Test @@ -416,10 +413,6 @@ void updateCustomChecklist_invalidQuestionId_exception() { .hasMessage(ExceptionCode.QUESTION_INVALID.getMessage()); } - public static Checklist createChecklist(User user, Room room) { - return new Checklist(user, room, 1000, 60, 24, "방끗부동산"); - } - @DisplayName("체크리스트 삭제 성공") @Test void deleteChecklistById() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 7461fe205..83f671eae 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -1,5 +1,7 @@ package com.bang_ggood.room; +import com.bang_ggood.checklist.domain.OccupancyMonth; +import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; @@ -10,34 +12,37 @@ public class RoomFixture { public static final Room ROOM_1 = new Room( "살기 좋은 방", "부개역", 10, "인천광역시 부평구", - Type.APARTMENT, 33, 3, FloorLevel.GROUND, Structure.TWO_ROOM + Type.APARTMENT, 3.5, 3, FloorLevel.GROUND, Structure.TWO_ROOM ); public static final Room ROOM_2 = new Room( "살기 싫은 방", "대구역", 10, "대구광역시 중구", - Type.OFFICETEL, 44, null, FloorLevel.BASEMENT, Structure.DIVIDED_ONE_ROOM + Type.OFFICETEL, 4.0, null, FloorLevel.BASEMENT, Structure.DIVIDED_ONE_ROOM ); public static final Room ROOM_3 = new Room( "살기 애매한 방", "잠실역", 5, "서울특별시 송파구", - Type.VILLA, 55, null, FloorLevel.ROOFTOP, Structure.DUPLEX + Type.VILLA, 5.5, null, FloorLevel.ROOFTOP, Structure.DUPLEX ); public static final RoomRequest ROOM_CREATE_REQUEST = new RoomRequest( "방이름", 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() + Structure.TWO_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), + OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" ); public static final RoomRequest ROOM_UPDATE_REQUEST = new RoomRequest( "방이름", 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.OPEN_ONE_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() + Structure.OPEN_ONE_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), + OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" ); public static final RoomRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomRequest( null, 1000, 50, 12, "부산광역시 루터회관", "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.TWO_ROOM.getName(), 33, 3, FloorLevel.GROUND.getName() + Structure.TWO_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), + OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java index 43bffd34b..bca6d3a57 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/FloorLevelTest.java @@ -20,6 +20,16 @@ void from() { assertThat(FloorLevel.from(name)).isEqualTo(FloorLevel.BASEMENT); } + @DisplayName("name으로 FloorLevel 생성 성공: null일 경우") + @Test + void from_null() { + // given + String name = null; + + // when & then + assertThat(FloorLevel.from(name)).isEqualTo(FloorLevel.NONE); + } + @DisplayName("name으로 FloorLevel 생성 실패 : 해당하지 않는 이름일 경우") @Test void from_invalidFloorLevel_exception() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java index 506a2da08..d8287fd90 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java @@ -15,7 +15,7 @@ void createChecklist_roomFloorAndLevelInvalid_exception() { //given & when & then assertThatThrownBy(() -> { new Room( - "방이름", "잠실역", 12, "부산광역시 루터회관", Type.APARTMENT, 12, + "방이름", "잠실역", 12, "부산광역시 루터회관", Type.APARTMENT, 12.0, 10, FloorLevel.BASEMENT, Structure.TWO_ROOM ); }) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java index 5ab73078e..69f1c555c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/StructureTest.java @@ -20,6 +20,16 @@ void from() { assertThat(Structure.from(name)).isEqualTo(Structure.DUPLEX); } + @DisplayName("name으로 Structure 생성 성공: null일 경우") + @Test + void from_null() { + // given + String name = null; + + // when & then + assertThat(Structure.from(name)).isEqualTo(Structure.NONE); + } + @DisplayName("name으로 Structure 생성 실패 : 해당하지 않는 이름일 경우") @Test void from_invalidStructure_exception() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java index 297fe96c8..a4f05624b 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java @@ -20,6 +20,16 @@ void from() { assertThat(Type.from(name)).isEqualTo(Type.VILLA); } + @DisplayName("name으로 Type 생성 성공 : null일 경우") + @Test + void from_null() { + // given + String name = null; + + // when & then + assertThat(Type.from(name)).isEqualTo(Type.NONE); + } + @DisplayName("name으로 Type 생성 실패 : 해당하지 않는 이름일 경우") @Test void from_invalidType_exception() { diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 25a05ca60..d67061239 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -8,16 +8,17 @@ DROP TABLE IF EXISTS test_entity CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; + -- Create tables CREATE TABLE room ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), station VARCHAR(255), walking_time INTEGER, address VARCHAR(255), type VARCHAR(255), - size INTEGER, + size DOUBLE, floor INTEGER, floor_level VARCHAR(255), structure VARCHAR(255), @@ -28,7 +29,7 @@ CREATE TABLE room CREATE TABLE users ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(255), email VARCHAR(255) NOT NULL, created_at TIMESTAMP(6), @@ -38,43 +39,58 @@ CREATE TABLE users CREATE TABLE checklist ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - contract_term INTEGER, - deposit INTEGER, - rent INTEGER, - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - room_id BIGINT NOT NULL UNIQUE, - user_id BIGINT NOT NULL, - real_estate VARCHAR(255), - deleted BOOLEAN, + id BIGINT AUTO_INCREMENT PRIMARY KEY, + room_id BIGINT NOT NULL UNIQUE, + user_id BIGINT NOT NULL, + deposit INTEGER, + rent INTEGER, + contract_term INTEGER, + real_estate VARCHAR(255), + memo VARCHAR(1000), + summary VARCHAR(255), + occupancy_month VARCHAR(255), + occupancy_period VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, FOREIGN KEY (room_id) REFERENCES room (id), FOREIGN KEY (user_id) REFERENCES users (id) ); -CREATE TABLE checklist_option +CREATE TABLE checklist_question ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - option_id INTEGER NOT NULL, - checklist_id BIGINT NOT NULL, + id BIGINT AUTO_INCREMENT PRIMARY KEY, + question VARCHAR(255) NOT NULL, + checklist_id BIGINT NOT NULL, + answer VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); -CREATE TABLE checklist_question +CREATE TABLE checklist_option ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - question VARCHAR(255) NOT NULL, - checklist_id BIGINT NOT NULL, - grade VARCHAR(255), + id BIGINT AUTO_INCREMENT PRIMARY KEY, + option_id INTEGER NOT NULL, + checklist_id BIGINT NOT NULL, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); +CREATE TABLE custom_checklist_question +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + user_id BIGINT, + question VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (user_id) references users (id) +); + CREATE TABLE test_entity ( id bigint generated by default as identity, @@ -85,17 +101,6 @@ CREATE TABLE test_entity primary key (id) ); -CREATE TABLE custom_checklist_question -( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, - user_id BIGINT, - question VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN, - FOREIGN KEY (user_id) references users -); - CREATE TABLE checklist_like ( id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, From ff2fea2277787771d22efc257861673de6810e49 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 12 Aug 2024 15:54:19 +0900 Subject: [PATCH 161/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=EC=A1=B0=ED=9A=8C=20API?= =?UTF-8?q?=EB=A5=BC=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#307)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/service/JwtTokenProvider.java | 4 +- .../bang_ggood/category/domain/Category.java | 26 +++---- .../bang_ggood/checklist/domain/Question.java | 73 +++++++++---------- .../checklist/service/ChecklistService.java | 1 + .../bang_ggood/exception/ExceptionCode.java | 1 - .../bang-ggood/src/main/resources/data.sql | 27 ++++--- .../auth/service/JwtTokenProviderTest.java | 2 +- .../checklist/CustomChecklistFixture.java | 14 +++- .../controller/ChecklistE2ETest.java | 30 ++++---- .../checklist/domain/QuestionTest.java | 38 +++++----- .../service/ChecklistServiceTest.java | 22 ++++-- .../src/test/resources/data-test.sql | 27 ++++--- 12 files changed, 142 insertions(+), 123 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java index bb77f213c..6e4ecaf2e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java @@ -16,11 +16,11 @@ public class JwtTokenProvider { private final String secretKey; - private final int tokenExpirationMills; + private final long tokenExpirationMills; public JwtTokenProvider( @Value("${jwt.secret-key}") String secretKey, - @Value("${jwt.expiration-millis}") int tokenExpirationMills) { + @Value("${jwt.expiration-millis}") long tokenExpirationMills) { this.secretKey = secretKey; this.tokenExpirationMills = tokenExpirationMills; } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 8e01f7225..7aa87e9eb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -1,28 +1,21 @@ package com.bang_ggood.category.domain; -import java.util.Arrays; - public enum Category { - CLEAN(1, "청결"), - ROOM_CONDITION(2, "방 컨디션"), - AMENITY(3, "편의시설"), - OPTION(4, "옵션"), - ENVIRONMENT(5, "주거환경"), - SECURITY(6, "보안"), - ECONOMIC(7, "경제적"); + ROOM_CONDITION(1, "방 컨디션", "🏠"), + WINDOW(2, "창문", "🪟"), + BATHROOM(3, "화장실", "🛀"), + SECURITY(4, "보안", "🚨"), + OUTSIDE(5, "외부", "🌇"); private final int id; private final String name; + private final String emoji; - Category(int id, String name) { + Category(int id, String name, String emoji) { this.id = id; this.name = name; - } - - public static boolean contains(int id) { - return Arrays.stream(values()) - .anyMatch(category -> category.id == id); + this.emoji = emoji; } public int getId() { @@ -30,6 +23,7 @@ public int getId() { } public String getName() { - return name; + String nameWithEmojiPattern = "%s %s"; + return String.format(nameWithEmojiPattern, emoji, name); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index cfd349a84..a3b1681b7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -8,44 +8,41 @@ public enum Question { - CLEAN_1(1, Category.CLEAN, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", true), - CLEAN_2(2, Category.CLEAN, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", false), - CLEAN_3(3, Category.CLEAN, "에어컨 내부는 깨끗한가요?", null, false), - CLEAN_4(4, Category.CLEAN, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어있는지, 싱크대 하부장 경첩에 배설물이 있는지 확인하세요.", true), - CLEAN_5(5, Category.CLEAN, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", false), - - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "수압 및 배수가 괜찮은가요?", "싱크대와 화장실에서 동시에 물을 틀어보세요.", true), - ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "온수가 잘 나오나요?", null, true), - ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "파손된 시설 (창문 / 방충망 / 벽)이 있지 않나요?", null, true), - ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, false), - ROOM_CONDITION_10(10, Category.ROOM_CONDITION, "콘센트 위치와 갯수가 적절한가요?", null, false), - ROOM_CONDITION_11(11, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, false), - - AMENITY_12(12, Category.AMENITY, "지하철역과 버스 정류장이 가까운 곳에 있나요?", null, true), - AMENITY_13(13, Category.AMENITY, "편의점, 마트, 세탁소, 공원이 가까운 곳에 있나요?", null, false), - AMENITY_14(14, Category.AMENITY, "병원이나 약국이 가까운 곳에 있나요?", null, false), - - OPTION_15(15, Category.OPTION, "옵션 가구들의 상태는 양호하나요?", "정상 작동 여부를 확인하세요.", false), - OPTION_16(16, Category.OPTION, "필요한 물품들을 충분히 수납할 수 있는 공간이 있나요?", null, false), - - ENVIRONMENT_17(17, Category.ENVIRONMENT, "햇빛이 잘 들어오나요?", null, false), - ENVIRONMENT_18(18, Category.ENVIRONMENT, "환기가 잘 되는 구조인가요?", "창문의 크기와 방향을 확인하세요.", true), - ENVIRONMENT_19(19, Category.ENVIRONMENT, "방음이 잘 되나요?", "벽을 두드려서 가벽이 아닌지 확인하세요.", true), - ENVIRONMENT_20(20, Category.ENVIRONMENT, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", false), - ENVIRONMENT_21(21, Category.ENVIRONMENT, "1층에 음식점이 있지는 않나요?", null, false), - ENVIRONMENT_22(22, Category.ENVIRONMENT, "집가는 길이 언덕이진 않나요?", null, false), - - SECURITY_23(23, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, true), - SECURITY_24(24, Category.SECURITY, "집에 방범창이나 이중 잠금장치가 설치되어 있나요?", null, false), - SECURITY_25(25, Category.SECURITY, "자취방의 보안 시설이 잘 갖추어져 있나요? (도어락, 창문 잠금장치 등)", null, true), - SECURITY_26(26, Category.SECURITY, "화재 경보기나 소화기 등의 안전 시설이 설치되어 있나요?", null, false), - SECURITY_27(27, Category.SECURITY, "주변 도로가 밤에도 충분히 밝은가요?", null, false), - SECURITY_28(28, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, false), - SECURITY_29(29, Category.SECURITY, "옆 건물에서 잘 보이는 구조는 아닌가요?", null, false), - SECURITY_30(30, Category.SECURITY, "관리자분이 함께 상주하시나요?", null, false), - - ECONOMIC_31(31, Category.ECONOMIC, "보증금/전월세 비용이 합리적인가요?", "관리비도 포함하여 고려하세요.", true), - ECONOMIC_32(32, Category.ECONOMIC, "교통 비용(지하철, 버스, 자가용)이 추가적으로 들지 않나요?", "주차 비용을 확인하세요.", false); + ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", true), + ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", true), + ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", true), + ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, true), + ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, true), + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", false), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, false), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, false), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, false), + + WINDOW_1(10, Category.WINDOW, "창 밖의 뷰가 가로 막혀 있지는 않나요?", null, true), + WINDOW_2(11, Category.WINDOW, "창문 상태가 괜찮나요?", null, true), + WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", true), + WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, true), + WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, false), + WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", false), + + BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", true), + BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", true), + BATHROOM_3(18, Category.BATHROOM, "화장실 내부에 환기 시설이 있나요?", null, true), + BATHROOM_4(19, Category.BATHROOM, "화장실 내부에 창문이 있나요?", null, false), + BATHROOM_5(20, Category.BATHROOM, "온수가 잘 나오나요?", null, false), + + SECURITY_1(21, Category.SECURITY, "잠금장치가 있는 공동 현관문이 있나요?", null, true), + SECURITY_2(22, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, true), + SECURITY_3(23, Category.SECURITY, "관리자분이 함께 상주하시나요?", "관리자분이 24시간 상주하시는지 확인하세요.", true), + SECURITY_4(24, Category.SECURITY, "보안 시설이 잘 갖추어져 있나요?", "도어락, 창문 잠금장치 등이 있는지 확인하세요.", false), + SECURITY_5(25, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, false), + SECURITY_6(26, Category.SECURITY, "현관문에 걸쇠가 있나요?", null, false), + + OUTSIDE_1(27, Category.OUTSIDE, "주변 도로가 밤에도 충분히 밝은가요?", null, false), + OUTSIDE_2(28, Category.OUTSIDE, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", false), + OUTSIDE_3(29, Category.OUTSIDE, "1층에 음식점이 있지는 않나요?", null, false), + OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, false), + OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, false); private final int id; private final Category category; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 0c7ead6dd..4a49e22f8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -157,6 +157,7 @@ public ChecklistQuestionsResponse readChecklistQuestions(User user) { .map(CustomChecklistQuestion::getQuestion) .collect(Collectors.groupingBy(Question::getCategory)); + // TODO entrySet 문제 해결 List categoryQuestionsResponses = categoryQuestions.entrySet().stream() .map(categoryQuestionEntry -> CategoryQuestionsResponse.of( categoryQuestionEntry.getKey(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 912d4acf2..72fabb5c5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -15,7 +15,6 @@ public enum ExceptionCode { QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), - // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 44bcaa2fc..6a45a1e42 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -2,14 +2,19 @@ INSERT INTO users(name, email, created_at, modified_at, deleted) VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) -VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +VALUES + (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_2', '2024-07-22 07:56:43', '2024-07-22 07:56:43', false), + (1, 'ROOM_CONDITION_3', '2024-07-22 07:56:44', '2024-07-22 07:56:44', false), + (1, 'ROOM_CONDITION_4', '2024-07-22 07:56:45', '2024-07-22 07:56:45', false), + (1, 'ROOM_CONDITION_5', '2024-07-22 07:56:46', '2024-07-22 07:56:46', false), + (1, 'WINDOW_1', '2024-07-22 07:56:47', '2024-07-22 07:56:47', false), + (1, 'WINDOW_2', '2024-07-22 07:56:48', '2024-07-22 07:56:48', false), + (1, 'WINDOW_3', '2024-07-22 07:56:49', '2024-07-22 07:56:49', false), + (1, 'WINDOW_4', '2024-07-22 07:56:50', '2024-07-22 07:56:50', false), + (1, 'BATHROOM_1', '2024-07-22 07:56:51', '2024-07-22 07:56:51', false), + (1, 'BATHROOM_2', '2024-07-22 07:56:52', '2024-07-22 07:56:52', false), + (1, 'BATHROOM_3', '2024-07-22 07:56:53', '2024-07-22 07:56:53', false), + (1, 'SECURITY_1', '2024-07-22 07:56:54', '2024-07-22 07:56:54', false), + (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), + (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java index 4a1a84383..fd297e89e 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/JwtTokenProviderTest.java @@ -23,7 +23,7 @@ class JwtTokenProviderTest extends IntegrationTestSupport { @Test void createToken() { // given - User user = userRepository.save(USER1); + User user = userRepository.getUserById(1L); String token = jwtTokenProvider.createToken(user); // when diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java index b1ea113b0..7c146edd8 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/CustomChecklistFixture.java @@ -1,13 +1,25 @@ package com.bang_ggood.checklist; +import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import java.util.ArrayList; import java.util.List; +import static com.bang_ggood.user.UserFixture.USER1; + public class CustomChecklistFixture { + public static List CUSTOM_CHECKLIST_QUESTION_DEFAULT = + List.of(new CustomChecklistQuestion(USER1, Question.ROOM_CONDITION_1), + new CustomChecklistQuestion(USER1, Question.WINDOW_1), + new CustomChecklistQuestion(USER1, Question.BATHROOM_1), + new CustomChecklistQuestion(USER1, Question.SECURITY_1)); public static CustomChecklistUpdateRequest CUSTOM_CHECKLIST_UPDATE_REQUEST = - new CustomChecklistUpdateRequest(List.of(1, 3, 5, 7, 8, 11, 15, 30)); + new CustomChecklistUpdateRequest(List.of(Question.ROOM_CONDITION_1.getId(), + Question.WINDOW_6.getId(), + Question.BATHROOM_1.getId(), + Question.SECURITY_1.getId())); public static CustomChecklistUpdateRequest CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY = new CustomChecklistUpdateRequest(new ArrayList<>()); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 69acb237d..f1ae34258 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,14 +1,15 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.AcceptanceTest; -import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.request.CustomChecklistUpdateRequest; import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistRepository; +import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.room.repository.RoomRepository; @@ -20,9 +21,6 @@ import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; -import java.util.HashMap; -import java.util.List; -import java.util.Map; import static com.bang_ggood.user.UserFixture.USER1; import static org.assertj.core.api.Assertions.assertThat; @@ -36,6 +34,8 @@ class ChecklistE2ETest extends AcceptanceTest { private ChecklistRepository checklistRepository; @Autowired private RoomRepository roomRepository; + @Autowired + private CustomChecklistQuestionRepository customChecklistQuestionRepository; @DisplayName("체크리스트 방 정보 작성 성공") @Test @@ -73,6 +73,7 @@ void createChecklist_noQuestionId_exception() { .statusCode(400); } + @DisplayName("체크리스트 좋아요 추가 성공") @Test void createChecklistLike() { @@ -103,8 +104,8 @@ void createChecklistLike_checklistAlreadyLiked_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { - checklistService.updateCustomChecklist(USER1, - new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); + // given + customChecklistQuestionRepository.saveAll(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT); ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() .contentType(ContentType.JSON) @@ -114,8 +115,14 @@ void readChecklistQuestions() { .statusCode(200) .extract() .as(ChecklistQuestionsResponse.class); - // Category.OPTION does not have default question - assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); + + // then + int questionsSize = 0; + for (CategoryQuestionsResponse categoryQuestionsResponse : checklistQuestionsResponse.categories()) { + questionsSize += categoryQuestionsResponse.questions().size(); + } + + assertThat(questionsSize).isEqualTo(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT.size()); } @DisplayName("커스텀 체크리스트 전체 조회 성공") @@ -198,13 +205,10 @@ void updateChecklist_noQuestionId_exception() { @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { - Map> params = new HashMap<>(); - params.put("questionIds", List.of(1, 3, 5, 7, 9, 14, 21, 30)); - RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) - .body(params) + .body(CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST) .when().put("/custom-checklist") .then().log().all() .statusCode(204); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java index c44780f98..606a2d42c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/QuestionTest.java @@ -1,55 +1,51 @@ package com.bang_ggood.checklist.domain; -import com.bang_ggood.category.domain.Category; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; -import static org.junit.jupiter.api.Assertions.assertAll; class QuestionTest { - @DisplayName("특정 카테고리의 질문 찾기 성공") + @DisplayName("질문 ID가 고유한 값인 확인") @Test - void findQuestionsByCategory() { - //given - Category category = Category.CLEAN; + void questionId_unique() { + // given & when + List questionIds = Arrays.stream(Question.values()) + .map(Question::getId) + .toList(); - //when - List questions = Question.findQuestionsByCategory(category); + Set setQuestionIds = new HashSet<>(questionIds); - //then - assertAll( - () -> assertThat(questions.size()).isEqualTo(5), - () -> assertThat(questions.get(0).getId()).isEqualTo(1) - ); + // then + assertThat(questionIds).hasSize(setQuestionIds.size()); } @DisplayName("질문 아이디를 통해 질문 찾기 성공") @Test void fromId() { //given - int questionId = 1; + int questionId = Question.BATHROOM_1.getId(); //when Question question = Question.fromId(questionId); //then - assertAll( - () -> assertThat(question.getId()).isEqualTo(questionId), - () -> assertThat(question.getCategory()).isEqualTo(Category.CLEAN) - ); + assertThat(question).isEqualTo(Question.BATHROOM_1); } @DisplayName("질문 아이디를 통해 질문 찾기 실패 : 유효하지 않은 질문 아이디일 경우") @Test void fromId_invalidQuestion_exception() { //given - int questionId = 999; + int questionId = Integer.MAX_VALUE; //when & then assertThatThrownBy(() -> Question.fromId(questionId)) @@ -61,7 +57,7 @@ void fromId_invalidQuestion_exception() { @Test void contains_true() { //given - int questionId = 1; + int questionId = Question.ROOM_CONDITION_1.getId(); //when & then assertThat(Question.contains(questionId)).isTrue(); @@ -71,7 +67,7 @@ void contains_true() { @Test void contains_false() { //given - int questionId = 999; + int questionId = Integer.MAX_VALUE; //when & then assertThat(Question.contains(questionId)).isFalse(); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index b6dc096db..7e1358f90 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -1,8 +1,9 @@ package com.bang_ggood.checklist.service; import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.category.domain.Category; +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Question; @@ -167,14 +168,19 @@ void createChecklistLike_checklistAlreadyLiked_exception() { @DisplayName("체크리스트 질문 조회 성공") @Test void readChecklistQuestions() { - // TODO : 유저 생성 시 default 질문을 DB에 저장하는 기능 추가 - checklistService.updateCustomChecklist(USER1, - new CustomChecklistUpdateRequest(List.of(1, 4, 6, 7, 8, 12, 18, 19, 23, 25, 31))); + // given + customChecklistQuestionRepository.saveAll(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT); + // given & when ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(USER1); - // then // Category.OPTION does not have default question - assertThat(checklistQuestionsResponse.categories().size()).isEqualTo(Category.values().length - 1); + // then + int questionsSize = 0; + for (CategoryQuestionsResponse categoryQuestionsResponse : checklistQuestionsResponse.categories()) { + questionsSize += categoryQuestionsResponse.questions().size(); + } + + assertThat(questionsSize).isEqualTo(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT.size()); } @DisplayName("작성된 체크리스트 조회 성공") @@ -346,8 +352,8 @@ void createChecklist_differentQuestion_exception() { @Test void readCustomChecklistQuestions() { // given - CustomChecklistQuestion question1 = new CustomChecklistQuestion(USER1, Question.CLEAN_5); - CustomChecklistQuestion question2 = new CustomChecklistQuestion(USER1, Question.AMENITY_12); + CustomChecklistQuestion question1 = new CustomChecklistQuestion(USER1, Question.ROOM_CONDITION_5); + CustomChecklistQuestion question2 = new CustomChecklistQuestion(USER1, Question.BATHROOM_1); List questions = List.of(question1, question2); customChecklistQuestionRepository.saveAll(questions); diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index 44bcaa2fc..6a45a1e42 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -2,14 +2,19 @@ INSERT INTO users(name, email, created_at, modified_at, deleted) VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) -VALUES (1, 'CLEAN_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'CLEAN_4', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ROOM_CONDITION_6', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ROOM_CONDITION_7', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ROOM_CONDITION_8', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'AMENITY_12', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ENVIRONMENT_18', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ENVIRONMENT_19', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'SECURITY_23', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'SECURITY_25', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), - (1, 'ECONOMIC_31', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); +VALUES + (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), + (1, 'ROOM_CONDITION_2', '2024-07-22 07:56:43', '2024-07-22 07:56:43', false), + (1, 'ROOM_CONDITION_3', '2024-07-22 07:56:44', '2024-07-22 07:56:44', false), + (1, 'ROOM_CONDITION_4', '2024-07-22 07:56:45', '2024-07-22 07:56:45', false), + (1, 'ROOM_CONDITION_5', '2024-07-22 07:56:46', '2024-07-22 07:56:46', false), + (1, 'WINDOW_1', '2024-07-22 07:56:47', '2024-07-22 07:56:47', false), + (1, 'WINDOW_2', '2024-07-22 07:56:48', '2024-07-22 07:56:48', false), + (1, 'WINDOW_3', '2024-07-22 07:56:49', '2024-07-22 07:56:49', false), + (1, 'WINDOW_4', '2024-07-22 07:56:50', '2024-07-22 07:56:50', false), + (1, 'BATHROOM_1', '2024-07-22 07:56:51', '2024-07-22 07:56:51', false), + (1, 'BATHROOM_2', '2024-07-22 07:56:52', '2024-07-22 07:56:52', false), + (1, 'BATHROOM_3', '2024-07-22 07:56:53', '2024-07-22 07:56:53', false), + (1, 'SECURITY_1', '2024-07-22 07:56:54', '2024-07-22 07:56:54', false), + (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), + (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); From ad9a42590d6cbd05d0c074fcb507d179dd2d993f Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:32:15 +0900 Subject: [PATCH 162/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A2=8B=EC=95=84=EC=9A=94=EB=A5=BC=20?= =?UTF-8?q?=EC=82=AD=EC=A0=9C=ED=95=9C=EB=8B=A4.=20=20(#311)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> --- .../controller/ChecklistController.java | 6 ++++ .../repository/ChecklistLikeRepository.java | 10 +++++++ .../checklist/service/ChecklistService.java | 9 ++++++ .../bang_ggood/exception/ExceptionCode.java | 2 ++ .../bang-ggood/src/main/resources/schema.sql | 13 ++++++++- .../checklist/ChecklistFixture.java | 10 +++++++ .../controller/ChecklistE2ETest.java | 18 ++++++++++++ .../checklist/domain/ChecklistTest.java | 21 ++++++++++++++ .../service/ChecklistServiceTest.java | 28 +++++++++++++++++++ .../java/com/bang_ggood/user/UserFixture.java | 6 ++++ .../src/test/resources/schema-test.sql | 6 ++-- 11 files changed, 125 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index d3955602d..7686b16eb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -85,4 +85,10 @@ public ResponseEntity deleteChecklistById(@AuthPrincipal User user, @PathV checklistService.deleteChecklistById(id); return ResponseEntity.noContent().build(); } + + @DeleteMapping("/checklists/{id}/like") + public ResponseEntity deleteChecklistLikeByChecklistId(@AuthPrincipal User user, @PathVariable("id") long id) { + checklistService.deleteChecklistLikeByChecklistId(user, id); + return ResponseEntity.noContent().build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java index fc187ce25..861e2d22e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistLikeRepository.java @@ -2,9 +2,19 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistLike; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import org.springframework.data.jpa.repository.JpaRepository; +import java.util.Optional; public interface ChecklistLikeRepository extends JpaRepository { boolean existsByChecklist(Checklist checklist); + + default ChecklistLike getByChecklistId(long checklistId) { + return findByChecklistId(checklistId) + .orElseThrow(() -> new BangggoodException(ExceptionCode.LIKE_NOT_EXISTS)); + } + + Optional findByChecklistId(long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 4a49e22f8..fbe0b8ac7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -357,4 +357,13 @@ public void deleteChecklistById(long id) { } checklistRepository.deleteById(id); } + + @Transactional + public void deleteChecklistLikeByChecklistId(User user, long checklistId) { + Checklist checklist = checklistRepository.getById(checklistId); + validateChecklistOwnership(user, checklist); + ChecklistLike checklistLike = checklistLikeRepository.getByChecklistId(checklistId); + + checklistLikeRepository.deleteById(checklistLike.getId()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 72fabb5c5..7142c9135 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -15,6 +15,7 @@ public enum ExceptionCode { QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), + // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), @@ -50,6 +51,7 @@ public enum ExceptionCode { //like LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "체크리스트가 이미 좋아요 상태입니다"), + LIKE_NOT_EXISTS(HttpStatus.BAD_REQUEST, "체크리스트 좋아요가 존재하지 않아 삭제할 수 없습니다."), // Auth AUTHENTICATION_COOKIE_EMPTY(HttpStatus.UNAUTHORIZED, "인증 정보가 존재하지 않습니다."), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 364f08181..a221ee49d 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -5,6 +5,7 @@ DROP TABLE IF EXISTS checklist CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; +DROP TABLE IF EXISTS checklist_like CASCADE; -- Create tables CREATE TABLE room @@ -15,7 +16,7 @@ CREATE TABLE room walking_time INTEGER, address VARCHAR(255), type VARCHAR(255), - size DOUBLE, + size DOUBLE, floor INTEGER, floor_level VARCHAR(255), structure VARCHAR(255), @@ -87,3 +88,13 @@ CREATE TABLE custom_checklist_question deleted BOOLEAN, FOREIGN KEY (user_id) references users (id) ); + +CREATE TABLE checklist_like +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + checklist_id BIGINT, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index a0c4656aa..ec79d7476 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -2,6 +2,7 @@ import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.OccupancyMonth; import com.bang_ggood.checklist.domain.OccupancyPeriod; @@ -28,6 +29,13 @@ public class ChecklistFixture { OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); + public static final Checklist CHECKLIST1_WITH_USER1_ID = new Checklist( + RoomFixture.ROOM_1, + UserFixture.USER1_WITH_ID, + 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + ); + public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( 1, "GOOD" ); @@ -165,4 +173,6 @@ public class ChecklistFixture { public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( CHECKLIST1, Question.fromId(2), Answer.BAD ); + + public static final ChecklistLike CHECKLIST_LIKE_1 = new ChecklistLike(CHECKLIST1); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index f1ae34258..2d3e5fc58 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -8,6 +8,7 @@ import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; +import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.checklist.service.ChecklistService; @@ -36,6 +37,8 @@ class ChecklistE2ETest extends AcceptanceTest { private RoomRepository roomRepository; @Autowired private CustomChecklistQuestionRepository customChecklistQuestionRepository; + @Autowired + private ChecklistLikeRepository checklistLikeRepository; @DisplayName("체크리스트 방 정보 작성 성공") @Test @@ -227,4 +230,19 @@ void deleteChecklistById() { .then().log().all() .statusCode(204); } + + @DisplayName("체크리스트 좋아요 삭제 성공") + @Test + void deleteChecklistLikeByChecklistId() { + roomRepository.save(RoomFixture.ROOM_1); + Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1); + checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().delete("/checklists/" + saved.getId() + "/like") + .then().log().all() + .statusCode(204); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java index 04b98d32a..bd956b87d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java @@ -1,9 +1,11 @@ package com.bang_ggood.checklist.domain; +import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; import com.bang_ggood.user.UserFixture; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; @@ -26,4 +28,23 @@ void constructor_ChecklistInvalidMemoLength_exception() { .hasMessage(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH.getMessage()); } + @DisplayName("체크리스트가 유저가 작성한 것인지 판별 성공 : 유저가 작성한 경우") + @Test + void isOwnedBy_true() { + //given + Checklist checklist = ChecklistFixture.CHECKLIST1_WITH_USER1_ID; + + //when & then + Assertions.assertThat(checklist.isOwnedBy(UserFixture.USER1_WITH_ID)).isTrue(); + } + + @DisplayName("체크리스트가 유저가 작성한 것인지 판별 성공 : 유저가 작성하지 않은 경우") + @Test + void isOwnedBy_false() { + //given + Checklist checklist = ChecklistFixture.CHECKLIST1_WITH_USER1_ID; + + //when & then + Assertions.assertThat(checklist.isOwnedBy(UserFixture.USER2_WITH_ID)).isFalse(); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 7e1358f90..8d9cba69a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -5,6 +5,8 @@ import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistLike; +import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -441,4 +443,30 @@ void deleteChecklistById_notFound_exception() { .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); } + + @DisplayName("체크리스트 좋아요 삭제 성공") + @Test + void deleteChecklistLikeByChecklistId() { + // given + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); + + // when + checklistService.deleteChecklistLikeByChecklistId(USER1, checklist.getId()); + + // then + assertThat(checklistLikeRepository.existsById(checklistLike.getId())).isFalse(); + } + + @DisplayName("체크리스트 좋아요 삭제 실패 : 체크리스트 좋아요가 없는 경우") + @Test + void deleteChecklistLikeByChecklistId_notFound_exception() { + // given + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + + // when & then + assertThatThrownBy(() -> checklistService.deleteChecklistLikeByChecklistId(USER1, checklist.getId())) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.LIKE_NOT_EXISTS.getMessage()); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java index a196e150e..099b45645 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/UserFixture.java @@ -8,7 +8,13 @@ public class UserFixture { public static final User USER1 = new User("방방이", "bang-bang@gmail.com"); + public static final User USER2 = new User("빵빵이", "bbang-bbang@gmail.com"); + + public static final User USER1_WITH_ID = new User(1L, "방방이", "bang-bang@gmail.com"); + + public static final User USER2_WITH_ID = new User(2L, "빵빵이", "bbang-bbang@gmail.com"); + public static final OauthInfoApiResponse OAUTH_INFO_RESPONSE_USER1 = new OauthInfoApiResponse("", "", new KakaoAccountResponse(USER1.getEmail(), USER1.getName(), new ProfileResponse("", "", ""))); diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index d67061239..844516fd9 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -18,7 +18,7 @@ CREATE TABLE room walking_time INTEGER, address VARCHAR(255), type VARCHAR(255), - size DOUBLE, + size DOUBLE, floor INTEGER, floor_level VARCHAR(255), structure VARCHAR(255), @@ -93,7 +93,7 @@ CREATE TABLE custom_checklist_question CREATE TABLE test_entity ( - id bigint generated by default as identity, + id BIGINT AUTO_INCREMENT PRIMARY KEY, name varchar(255) not null, created_at TIMESTAMP not null, modified_at TIMESTAMP not null, @@ -103,7 +103,7 @@ CREATE TABLE test_entity CREATE TABLE checklist_like ( - id BIGINT GENERATED BY DEFAULT AS IDENTITY PRIMARY KEY, + id BIGINT AUTO_INCREMENT PRIMARY KEY, checklist_id BIGINT, created_at TIMESTAMP(6), modified_at TIMESTAMP(6), From 4a3cdc5a325a95783a098d74d8bb3e052aed29d1 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 12 Aug 2024 16:36:15 +0900 Subject: [PATCH 163/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20API=EB=A5=BC?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#322)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/UserChecklistPreviewResponse.java | 9 ++++++--- .../bang_ggood/checklist/service/ChecklistService.java | 3 ++- .../java/com/bang_ggood/exception/ExceptionCode.java | 1 - 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 373cbe220..446255422 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -5,15 +5,18 @@ public record UserChecklistPreviewResponse( Long checklistId, String roomName, String address, - Integer deposit, Integer rent, LocalDateTime createdAt) { + Integer deposit, Integer rent, LocalDateTime createdAt, + String summary, boolean isLiked) { - public static UserChecklistPreviewResponse of(Checklist checklist) { + public static UserChecklistPreviewResponse of(Checklist checklist, boolean isLiked) { return new UserChecklistPreviewResponse( checklist.getId(), checklist.getRoomName(), checklist.getRoomAddress(), checklist.getDeposit(), checklist.getRent(), - checklist.getCreatedAt()); + checklist.getCreatedAt(), + checklist.getSummary(), + isLiked); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index fbe0b8ac7..8408a1132 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -267,7 +267,8 @@ public UserChecklistsPreviewResponse readUserChecklistsPreview(User user) { } private UserChecklistPreviewResponse getChecklistPreview(Checklist checklist) { - return UserChecklistPreviewResponse.of(checklist); + boolean isLiked = checklistLikeRepository.existsByChecklist(checklist); + return UserChecklistPreviewResponse.of(checklist, isLiked); } @Transactional diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 7142c9135..425e7b2cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -15,7 +15,6 @@ public enum ExceptionCode { QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), - // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), From c16e458b61d94b1dfa8238f197726a66bbfa6082 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:02:42 +0900 Subject: [PATCH 164/348] =?UTF-8?q?[BE]=20=EC=A7=88=EB=AC=B8=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=20=EC=88=9C=EC=84=9C=EB=A5=BC=20=EC=B9=B4=ED=85=8C?= =?UTF-8?q?=EA=B3=A0=EB=A6=AC=20=EC=88=9C=EC=9C=BC=EB=A1=9C=20=EC=A0=95?= =?UTF-8?q?=EB=A0=AC=ED=95=9C=EB=8B=A4.=20=20(#327)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/service/ChecklistService.java | 4 ++-- .../service/ChecklistServiceTest.java | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 8408a1132..9a183042f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -155,9 +156,8 @@ public ChecklistQuestionsResponse readChecklistQuestions(User user) { Map> categoryQuestions = customChecklistQuestions.stream() .map(CustomChecklistQuestion::getQuestion) - .collect(Collectors.groupingBy(Question::getCategory)); + .collect(Collectors.groupingBy(Question::getCategory, LinkedHashMap::new, Collectors.toList())); - // TODO entrySet 문제 해결 List categoryQuestionsResponses = categoryQuestions.entrySet().stream() .map(categoryQuestionEntry -> CategoryQuestionsResponse.of( categoryQuestionEntry.getKey(), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 8d9cba69a..db4e866d5 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -14,6 +14,7 @@ import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; +import com.bang_ggood.checklist.dto.response.QuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; @@ -31,8 +32,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Collection; import java.util.List; +import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; @@ -177,12 +180,17 @@ void readChecklistQuestions() { ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(USER1); // then - int questionsSize = 0; - for (CategoryQuestionsResponse categoryQuestionsResponse : checklistQuestionsResponse.categories()) { - questionsSize += categoryQuestionsResponse.questions().size(); - } - - assertThat(questionsSize).isEqualTo(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT.size()); + List defaultQuestionsIds = CUSTOM_CHECKLIST_QUESTION_DEFAULT.stream() + .map(CustomChecklistQuestion::getQuestion) + .map(Question::getId) + .toList(); + List responseQuestionsIds = checklistQuestionsResponse.categories().stream() + .map(CategoryQuestionsResponse::questions) + .flatMap(Collection::stream) + .map(QuestionResponse::questionId) + .toList(); + + assertThat(responseQuestionsIds).containsExactlyElementsOf(defaultQuestionsIds); } @DisplayName("작성된 체크리스트 조회 성공") From ba9e143de7762ee167e9d5cd849d7e3ecb3121f7 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 13 Aug 2024 10:09:31 +0900 Subject: [PATCH 165/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20=EA=B5=AC=ED=98=84=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20=20(#324)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../article/controller/ArticleController.java | 23 +++++++ .../bang_ggood/article/domain/Article.java | 62 +++++++++++++++++++ .../article/dto/ArticleResponse.java | 10 +++ .../article/repository/ArticleRepository.java | 13 ++++ .../article/service/ArticleService.java | 21 +++++++ .../bang_ggood/exception/ExceptionCode.java | 5 +- .../bang-ggood/src/main/resources/data.sql | 5 ++ .../bang-ggood/src/main/resources/schema.sql | 11 ++++ .../article/controller/ArticleE2ETest.java | 49 +++++++++++++++ .../article/service/ArticleServiceTest.java | 45 ++++++++++++++ .../src/test/resources/schema-test.sql | 12 +++- 11 files changed, 254 insertions(+), 2 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java new file mode 100644 index 000000000..f8fad7e6c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java @@ -0,0 +1,23 @@ +package com.bang_ggood.article.controller; + +import com.bang_ggood.article.dto.ArticleResponse; +import com.bang_ggood.article.service.ArticleService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ArticleController { + + private final ArticleService articleService; + + public ArticleController(ArticleService articleService) { + this.articleService = articleService; + } + + @GetMapping("/articles/{id}") + public ResponseEntity readArticle(@PathVariable("id") Long id) { + return ResponseEntity.ok(articleService.readArticle(id)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java new file mode 100644 index 000000000..b3f0ab7cf --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java @@ -0,0 +1,62 @@ +package com.bang_ggood.article.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import java.util.Objects; + +@Entity +public class Article extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String title; + + private String content; + + public Article(String title, String content) { + this.title = title; + this.content = content; + } + + protected Article() { + } + + public Long getId() { + return id; + } + + public String getTitle() { + return title; + } + + public String getContent() { + return content; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Article article = (Article) o; + return Objects.equals(id, article.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Article{" + + "id=" + id + + ", title='" + title + '\'' + + ", content='" + content + '\'' + + '}'; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java new file mode 100644 index 000000000..25b063fa3 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.article.dto; + +import com.bang_ggood.article.domain.Article; + +public record ArticleResponse(Long id, String title, String content) { + + public static ArticleResponse from(Article article) { + return new ArticleResponse(article.getId(), article.getTitle(), article.getContent()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java new file mode 100644 index 000000000..d652d8808 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java @@ -0,0 +1,13 @@ +package com.bang_ggood.article.repository; + +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ArticleRepository extends JpaRepository { + + default Article getById(Long id) { + return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.ARTICLE_NOT_FOUND)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java new file mode 100644 index 000000000..91a39d91f --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java @@ -0,0 +1,21 @@ +package com.bang_ggood.article.service; + +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.dto.ArticleResponse; +import com.bang_ggood.article.repository.ArticleRepository; +import org.springframework.stereotype.Service; + +@Service +public class ArticleService { + + private final ArticleRepository articleRepository; + + public ArticleService(ArticleRepository articleRepository) { + this.articleRepository = articleRepository; + } + + public ArticleResponse readArticle(Long id) { + Article article = articleRepository.getById(id); + return ArticleResponse.from(article); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 425e7b2cf..61f20bd53 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -57,7 +57,10 @@ public enum ExceptionCode { AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), AUTHENTICATION_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), AUTHENTICATION_TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "토큰 정보가 올바르지 않습니다."), - OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."); + OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."), + + // Article + ARTICLE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 아티클이 존재하지 않습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 6a45a1e42..69d50ddbe 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -18,3 +18,8 @@ VALUES (1, 'SECURITY_1', '2024-07-22 07:56:54', '2024-07-22 07:56:54', false), (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); + +INSERT INTO article(title, content, created_at, modified_at, deleted) +VALUES ('집을 구하는 꿀팁: 성공적인 집 찾기를 위한 가이드', + '1. **예산 설정하기**
집을 구하기 전, 가장 먼저 해야 할 일은 예산을 설정하는 것입니다. 월세와 관리비, 보증금까지 포함해 자신이 감당할 수 있는 범위를 확실히 정해두세요.', + '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index a221ee49d..0e6a8e7c6 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -6,6 +6,7 @@ DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; +DROP TABLE IF EXISTS article CASCADE; -- Create tables CREATE TABLE room @@ -98,3 +99,13 @@ CREATE TABLE checklist_like deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); + +CREATE TABLE article +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + title VARCHAR(255), + content VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java new file mode 100644 index 000000000..c24d016be --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java @@ -0,0 +1,49 @@ +package com.bang_ggood.article.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.repository.ArticleRepository; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.exception.dto.ExceptionResponse; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ArticleE2ETest extends AcceptanceTest { + + @Autowired + ArticleRepository articleRepository; + + @DisplayName("아티클 조회 성공") + @Test + void readArticle() { + Article article = new Article("제목", "내용"); + articleRepository.save(article); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/articles/" + article.getId()) + .then().log().all() + .statusCode(200); + } + + @DisplayName("아티클 조회 실패 : 유효하지 않은 아이디인 경우") + @Test + void readArticle_invalidId_exception() { + long articleId = Long.MAX_VALUE; + + ExceptionResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/articles/" + articleId) + .then().log().all() + .statusCode(400) + .extract() + .as(ExceptionResponse.class); + + assertThat(response.message()).isEqualTo(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java new file mode 100644 index 000000000..ff9dc3359 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java @@ -0,0 +1,45 @@ +package com.bang_ggood.article.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.repository.ArticleRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class ArticleServiceTest extends IntegrationTestSupport { + + @Autowired + ArticleService articleService; + @Autowired + ArticleRepository articleRepository; + + @DisplayName("아티클 조회 성공") + @Test + void readArticle() { + // given + Article article = new Article("제목", "내용"); + articleRepository.save(article); + + // when & then + assertThatCode(() -> articleService.readArticle(article.getId())) + .doesNotThrowAnyException(); + } + + @DisplayName("아티클 조회 실패 : 유효하지 않은 아이디인 경우") + @Test + void readArticle_invalidId_exception() { + // given + long articleId = Long.MAX_VALUE; + + // when & then + assertThatThrownBy(() -> articleService.readArticle(articleId)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 844516fd9..6af64059a 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -7,7 +7,7 @@ DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; - +DROP TABLE IF EXISTS article CASCADE; -- Create tables CREATE TABLE room @@ -110,3 +110,13 @@ CREATE TABLE checklist_like deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); + +CREATE TABLE article +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + title VARCHAR(255), + content VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN +); From 7db4eb4953a70366ca0b50a02d957ee2fa30ace9 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Tue, 13 Aug 2024 11:25:18 +0900 Subject: [PATCH 166/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1=20=EC=8B=9C=20=EB=A9=94?= =?UTF-8?q?=EB=AA=A8=EC=97=90=20=EA=B4=80=ED=95=B4=20NPE=20=EB=9C=A8?= =?UTF-8?q?=EB=8A=94=20=EC=98=A4=EB=A5=98=EB=A5=BC=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#335)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 116b0ebb7..a0c408384 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -95,7 +95,7 @@ public void change(Checklist updateChecklist) { } private void validateMemoLength() { - if (memo.length() > MEMO_MAX_LENGTH) { + if (memo != null && memo.length() > MEMO_MAX_LENGTH) { throw new BangggoodException(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH); } } From 2980b9d4225411c61c43e2583ffaaff92c5402fd Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Tue, 13 Aug 2024 17:26:24 +0900 Subject: [PATCH 167/348] =?UTF-8?q?[BE]=20dev=EC=99=80=20dev-be=20?= =?UTF-8?q?=EC=BD=94=EB=93=9C=EB=A5=BC=20=EB=8F=99=EA=B8=B0=ED=99=94?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#342)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: jinwoo22 --- .../main/java/com/bang_ggood/checklist/domain/Checklist.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 116b0ebb7..a0c408384 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -95,7 +95,7 @@ public void change(Checklist updateChecklist) { } private void validateMemoLength() { - if (memo.length() > MEMO_MAX_LENGTH) { + if (memo != null && memo.length() > MEMO_MAX_LENGTH) { throw new BangggoodException(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH); } } From 3a5c1b8a551453cb403365fbd9bef34d7f45a578 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 14 Aug 2024 10:33:44 +0900 Subject: [PATCH 168/348] =?UTF-8?q?fix:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=EB=B3=84=EB=A1=9C=20=EC=A1=B0=ED=9A=8C=EB=90=98?= =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ChecklistRepository.java | 4 +-- .../checklist/ChecklistFixture.java | 17 ++++++--- .../controller/ChecklistE2ETest.java | 4 +-- .../repository/ChecklistRepositoryTest.java | 35 +++++++++++++++---- .../service/ChecklistServiceTest.java | 13 ++++--- 5 files changed, 50 insertions(+), 23 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index de5d008fc..cf0deef00 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -26,8 +26,8 @@ default Checklist getById(@Param("id") long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } - @Query("SELECT c FROM Checklist c WHERE c.deleted = false") - List findAllByUser(User user); + @Query("SELECT c FROM Checklist c WHERE c.user = :user AND c.deleted = false") + List findAllByUser(@Param("user") User user); @Query("SELECT c FROM Checklist c " + "JOIN FETCH c.user u " diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index ec79d7476..3f76a4c85 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -15,20 +15,27 @@ public class ChecklistFixture { - public static final Checklist CHECKLIST1 = new Checklist( + public static final Checklist CHECKLIST1_USER1 = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1, 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); - public static final Checklist CHECKLIST2 = new Checklist( + public static final Checklist CHECKLIST2_USER1 = new Checklist( RoomFixture.ROOM_2, UserFixture.USER1, 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); + public static final Checklist CHECKLIST3_USER2 = new Checklist( + RoomFixture.ROOM_3, + UserFixture.USER2, + 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + ); + public static final Checklist CHECKLIST1_WITH_USER1_ID = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1_WITH_ID, @@ -167,12 +174,12 @@ public class ChecklistFixture { public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(1), Answer.BAD + CHECKLIST1_USER1, Question.fromId(1), Answer.BAD ); public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(2), Answer.BAD + CHECKLIST1_USER1, Question.fromId(2), Answer.BAD ); - public static final ChecklistLike CHECKLIST_LIKE_1 = new ChecklistLike(CHECKLIST1); + public static final ChecklistLike CHECKLIST_LIKE_1 = new ChecklistLike(CHECKLIST1_USER1); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 2d3e5fc58..43c13703a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -221,7 +221,7 @@ void updateCustomChecklist() { @Test void deleteChecklistById() { roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); RestAssured.given().log().all() .contentType(ContentType.JSON) @@ -235,7 +235,7 @@ void deleteChecklistById() { @Test void deleteChecklistLikeByChecklistId() { roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); RestAssured.given().log().all() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index 5b112ae66..e8290ec99 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -44,13 +44,13 @@ void setUp() { @Test void findById() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); //when Checklist foundChecklist = checklistRepository.getById(savedChecklist.getId().longValue()); //then - assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.CHECKLIST1.getId()); + assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.CHECKLIST1_USER1.getId()); } @DisplayName("아이디를 통해 체크리스트 갖고 오기 실패 : 해당하는 체크리스트가 없을 경우") @@ -65,7 +65,7 @@ void findById_notFound_exception() { @Test void findByUserAndIdIn() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); assertThat(checklistRepository.findByUserAndIdIn(UserFixture.USER1, List.of(savedChecklist.getId()))) .isEqualTo(List.of(savedChecklist)); @@ -76,8 +76,8 @@ void findByUserAndIdIn() { @Test void findAllByUser() { // given - Checklist checklist1 = ChecklistFixture.CHECKLIST1; - Checklist checklist2 = ChecklistFixture.CHECKLIST2; + Checklist checklist1 = ChecklistFixture.CHECKLIST1_USER1; + Checklist checklist2 = ChecklistFixture.CHECKLIST2_USER1; checklistRepository.saveAll(List.of(checklist1, checklist2)); checklistRepository.deleteById(checklist1.getId()); @@ -89,11 +89,32 @@ void findAllByUser() { Assertions.assertThat(checklists).containsOnly(checklist2); } + @Transactional + @DisplayName("체크리스트 리스트 조회 성공 : 사용자의 체크리스만 조회한다.") + @Test + void findAllByUser_OnlyUserChecklists() { + // given + Checklist checklist1 = ChecklistFixture.CHECKLIST1_USER1; + Checklist checklist2 = ChecklistFixture.CHECKLIST2_USER1; + + userRepository.save(UserFixture.USER2); + roomRepository.save(RoomFixture.ROOM_3); + Checklist checklist3 = ChecklistFixture.CHECKLIST3_USER2; + + checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + + // when + List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + + // then + Assertions.assertThat(checklists).containsOnly(checklist1, checklist2); + } + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") @Test void existsById_true() { //given & when - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); //then assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isTrue(); @@ -110,7 +131,7 @@ void existsById_false() { @Test void deleteById() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); //when checklistRepository.deleteById(savedChecklist.getId().longValue()); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index db4e866d5..64e0d2695 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -6,7 +6,6 @@ import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistLike; -import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -146,7 +145,7 @@ void createChecklist_duplicatedOptionId_exception() { @Test void createChecklistLike() { //given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when checklistService.createChecklistLike(USER1, checklist.getId()); @@ -159,7 +158,7 @@ void createChecklistLike() { @Test void createChecklistLike_checklistAlreadyLiked_exception() { //given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when checklistService.createChecklistLike(USER1, checklist.getId()); @@ -198,7 +197,7 @@ void readChecklistQuestions() { void readChecklistById() { // given roomRepository.save(RoomFixture.ROOM_1); - checklistRepository.save(ChecklistFixture.CHECKLIST1); + checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(UserFixture.USER1, 1L); @@ -434,7 +433,7 @@ void updateCustomChecklist_invalidQuestionId_exception() { void deleteChecklistById() { // given roomRepository.save(RoomFixture.ROOM_1); - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when checklistService.deleteChecklistById(checklist.getId()); @@ -456,7 +455,7 @@ void deleteChecklistById_notFound_exception() { @Test void deleteChecklistLikeByChecklistId() { // given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); // when @@ -470,7 +469,7 @@ void deleteChecklistLikeByChecklistId() { @Test void deleteChecklistLikeByChecklistId_notFound_exception() { // given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when & then assertThatThrownBy(() -> checklistService.deleteChecklistLikeByChecklistId(USER1, checklist.getId())) From 8fc99847bca6f0df2d6dedb289168a91f9a5b0d3 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Wed, 14 Aug 2024 10:39:32 +0900 Subject: [PATCH 169/348] =?UTF-8?q?style:=20=EC=98=A4=ED=83=80=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 --- .../checklist/repository/ChecklistRepositoryTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index e8290ec99..630e18e71 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -90,7 +90,7 @@ void findAllByUser() { } @Transactional - @DisplayName("체크리스트 리스트 조회 성공 : 사용자의 체크리스만 조회한다.") + @DisplayName("체크리스트 리스트 조회 성공 : 사용자의 체크리스트만 조회한다.") @Test void findAllByUser_OnlyUserChecklists() { // given From c1676e65fc36dfc2c70bf987fc7504955e4f1fed Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 14 Aug 2024 10:40:09 +0900 Subject: [PATCH 170/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=EA=B0=80=20?= =?UTF-8?q?=EC=9C=A0=EC=A0=80=EB=B3=84=EB=A1=9C=20=EC=A1=B0=ED=9A=8C?= =?UTF-8?q?=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=B2=84=EA=B7=B8?= =?UTF-8?q?=EB=A5=BC=20=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#348)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: gmuz1c --- .../article/controller/ArticleController.java | 23 +++++++ .../bang_ggood/article/domain/Article.java | 62 +++++++++++++++++++ .../article/dto/ArticleResponse.java | 10 +++ .../article/repository/ArticleRepository.java | 13 ++++ .../article/service/ArticleService.java | 21 +++++++ .../repository/ChecklistRepository.java | 4 +- .../checklist/service/ChecklistService.java | 4 +- .../bang_ggood/exception/ExceptionCode.java | 5 +- .../bang-ggood/src/main/resources/data.sql | 5 ++ .../bang-ggood/src/main/resources/schema.sql | 11 ++++ .../article/controller/ArticleE2ETest.java | 49 +++++++++++++++ .../article/service/ArticleServiceTest.java | 45 ++++++++++++++ .../checklist/ChecklistFixture.java | 17 +++-- .../controller/ChecklistE2ETest.java | 4 +- .../repository/ChecklistRepositoryTest.java | 35 ++++++++--- .../service/ChecklistServiceTest.java | 33 ++++++---- .../src/test/resources/schema-test.sql | 12 +++- 17 files changed, 320 insertions(+), 33 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java new file mode 100644 index 000000000..f8fad7e6c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java @@ -0,0 +1,23 @@ +package com.bang_ggood.article.controller; + +import com.bang_ggood.article.dto.ArticleResponse; +import com.bang_ggood.article.service.ArticleService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class ArticleController { + + private final ArticleService articleService; + + public ArticleController(ArticleService articleService) { + this.articleService = articleService; + } + + @GetMapping("/articles/{id}") + public ResponseEntity readArticle(@PathVariable("id") Long id) { + return ResponseEntity.ok(articleService.readArticle(id)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java new file mode 100644 index 000000000..b3f0ab7cf --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java @@ -0,0 +1,62 @@ +package com.bang_ggood.article.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import java.util.Objects; + +@Entity +public class Article extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String title; + + private String content; + + public Article(String title, String content) { + this.title = title; + this.content = content; + } + + protected Article() { + } + + public Long getId() { + return id; + } + + public String getTitle() { + return title; + } + + public String getContent() { + return content; + } + + @Override + public boolean equals(Object o) { + if (this == o) return true; + if (o == null || getClass() != o.getClass()) return false; + Article article = (Article) o; + return Objects.equals(id, article.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "Article{" + + "id=" + id + + ", title='" + title + '\'' + + ", content='" + content + '\'' + + '}'; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java new file mode 100644 index 000000000..25b063fa3 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.article.dto; + +import com.bang_ggood.article.domain.Article; + +public record ArticleResponse(Long id, String title, String content) { + + public static ArticleResponse from(Article article) { + return new ArticleResponse(article.getId(), article.getTitle(), article.getContent()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java new file mode 100644 index 000000000..d652d8808 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java @@ -0,0 +1,13 @@ +package com.bang_ggood.article.repository; + +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.springframework.data.jpa.repository.JpaRepository; + +public interface ArticleRepository extends JpaRepository { + + default Article getById(Long id) { + return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.ARTICLE_NOT_FOUND)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java new file mode 100644 index 000000000..91a39d91f --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java @@ -0,0 +1,21 @@ +package com.bang_ggood.article.service; + +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.dto.ArticleResponse; +import com.bang_ggood.article.repository.ArticleRepository; +import org.springframework.stereotype.Service; + +@Service +public class ArticleService { + + private final ArticleRepository articleRepository; + + public ArticleService(ArticleRepository articleRepository) { + this.articleRepository = articleRepository; + } + + public ArticleResponse readArticle(Long id) { + Article article = articleRepository.getById(id); + return ArticleResponse.from(article); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index de5d008fc..cf0deef00 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -26,8 +26,8 @@ default Checklist getById(@Param("id") long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } - @Query("SELECT c FROM Checklist c WHERE c.deleted = false") - List findAllByUser(User user); + @Query("SELECT c FROM Checklist c WHERE c.user = :user AND c.deleted = false") + List findAllByUser(@Param("user") User user); @Query("SELECT c FROM Checklist c " + "JOIN FETCH c.user u " diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 8408a1132..9a183042f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -40,6 +40,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashSet; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -155,9 +156,8 @@ public ChecklistQuestionsResponse readChecklistQuestions(User user) { Map> categoryQuestions = customChecklistQuestions.stream() .map(CustomChecklistQuestion::getQuestion) - .collect(Collectors.groupingBy(Question::getCategory)); + .collect(Collectors.groupingBy(Question::getCategory, LinkedHashMap::new, Collectors.toList())); - // TODO entrySet 문제 해결 List categoryQuestionsResponses = categoryQuestions.entrySet().stream() .map(categoryQuestionEntry -> CategoryQuestionsResponse.of( categoryQuestionEntry.getKey(), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 425e7b2cf..61f20bd53 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -57,7 +57,10 @@ public enum ExceptionCode { AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), AUTHENTICATION_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), AUTHENTICATION_TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "토큰 정보가 올바르지 않습니다."), - OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."); + OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."), + + // Article + ARTICLE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 아티클이 존재하지 않습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 6a45a1e42..69d50ddbe 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -18,3 +18,8 @@ VALUES (1, 'SECURITY_1', '2024-07-22 07:56:54', '2024-07-22 07:56:54', false), (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); + +INSERT INTO article(title, content, created_at, modified_at, deleted) +VALUES ('집을 구하는 꿀팁: 성공적인 집 찾기를 위한 가이드', + '1. **예산 설정하기**
집을 구하기 전, 가장 먼저 해야 할 일은 예산을 설정하는 것입니다. 월세와 관리비, 보증금까지 포함해 자신이 감당할 수 있는 범위를 확실히 정해두세요.', + '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index a221ee49d..0e6a8e7c6 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -6,6 +6,7 @@ DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; +DROP TABLE IF EXISTS article CASCADE; -- Create tables CREATE TABLE room @@ -98,3 +99,13 @@ CREATE TABLE checklist_like deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); + +CREATE TABLE article +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + title VARCHAR(255), + content VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java new file mode 100644 index 000000000..c24d016be --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java @@ -0,0 +1,49 @@ +package com.bang_ggood.article.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.repository.ArticleRepository; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.exception.dto.ExceptionResponse; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; + +public class ArticleE2ETest extends AcceptanceTest { + + @Autowired + ArticleRepository articleRepository; + + @DisplayName("아티클 조회 성공") + @Test + void readArticle() { + Article article = new Article("제목", "내용"); + articleRepository.save(article); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/articles/" + article.getId()) + .then().log().all() + .statusCode(200); + } + + @DisplayName("아티클 조회 실패 : 유효하지 않은 아이디인 경우") + @Test + void readArticle_invalidId_exception() { + long articleId = Long.MAX_VALUE; + + ExceptionResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/articles/" + articleId) + .then().log().all() + .statusCode(400) + .extract() + .as(ExceptionResponse.class); + + assertThat(response.message()).isEqualTo(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java new file mode 100644 index 000000000..ff9dc3359 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java @@ -0,0 +1,45 @@ +package com.bang_ggood.article.service; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.repository.ArticleRepository; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class ArticleServiceTest extends IntegrationTestSupport { + + @Autowired + ArticleService articleService; + @Autowired + ArticleRepository articleRepository; + + @DisplayName("아티클 조회 성공") + @Test + void readArticle() { + // given + Article article = new Article("제목", "내용"); + articleRepository.save(article); + + // when & then + assertThatCode(() -> articleService.readArticle(article.getId())) + .doesNotThrowAnyException(); + } + + @DisplayName("아티클 조회 실패 : 유효하지 않은 아이디인 경우") + @Test + void readArticle_invalidId_exception() { + // given + long articleId = Long.MAX_VALUE; + + // when & then + assertThatThrownBy(() -> articleService.readArticle(articleId)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index ec79d7476..3f76a4c85 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -15,20 +15,27 @@ public class ChecklistFixture { - public static final Checklist CHECKLIST1 = new Checklist( + public static final Checklist CHECKLIST1_USER1 = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1, 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); - public static final Checklist CHECKLIST2 = new Checklist( + public static final Checklist CHECKLIST2_USER1 = new Checklist( RoomFixture.ROOM_2, UserFixture.USER1, 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); + public static final Checklist CHECKLIST3_USER2 = new Checklist( + RoomFixture.ROOM_3, + UserFixture.USER2, + 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + ); + public static final Checklist CHECKLIST1_WITH_USER1_ID = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1_WITH_ID, @@ -167,12 +174,12 @@ public class ChecklistFixture { public static final ChecklistQuestion CHECKLIST_QUESTION_1 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(1), Answer.BAD + CHECKLIST1_USER1, Question.fromId(1), Answer.BAD ); public static final ChecklistQuestion CHECKLIST_QUESTION_2 = new ChecklistQuestion( - CHECKLIST1, Question.fromId(2), Answer.BAD + CHECKLIST1_USER1, Question.fromId(2), Answer.BAD ); - public static final ChecklistLike CHECKLIST_LIKE_1 = new ChecklistLike(CHECKLIST1); + public static final ChecklistLike CHECKLIST_LIKE_1 = new ChecklistLike(CHECKLIST1_USER1); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 2d3e5fc58..43c13703a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -221,7 +221,7 @@ void updateCustomChecklist() { @Test void deleteChecklistById() { roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); RestAssured.given().log().all() .contentType(ContentType.JSON) @@ -235,7 +235,7 @@ void deleteChecklistById() { @Test void deleteChecklistLikeByChecklistId() { roomRepository.save(RoomFixture.ROOM_1); - Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); RestAssured.given().log().all() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index 5b112ae66..630e18e71 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -44,13 +44,13 @@ void setUp() { @Test void findById() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); //when Checklist foundChecklist = checklistRepository.getById(savedChecklist.getId().longValue()); //then - assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.CHECKLIST1.getId()); + assertThat(foundChecklist.getId()).isEqualTo(ChecklistFixture.CHECKLIST1_USER1.getId()); } @DisplayName("아이디를 통해 체크리스트 갖고 오기 실패 : 해당하는 체크리스트가 없을 경우") @@ -65,7 +65,7 @@ void findById_notFound_exception() { @Test void findByUserAndIdIn() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); assertThat(checklistRepository.findByUserAndIdIn(UserFixture.USER1, List.of(savedChecklist.getId()))) .isEqualTo(List.of(savedChecklist)); @@ -76,8 +76,8 @@ void findByUserAndIdIn() { @Test void findAllByUser() { // given - Checklist checklist1 = ChecklistFixture.CHECKLIST1; - Checklist checklist2 = ChecklistFixture.CHECKLIST2; + Checklist checklist1 = ChecklistFixture.CHECKLIST1_USER1; + Checklist checklist2 = ChecklistFixture.CHECKLIST2_USER1; checklistRepository.saveAll(List.of(checklist1, checklist2)); checklistRepository.deleteById(checklist1.getId()); @@ -89,11 +89,32 @@ void findAllByUser() { Assertions.assertThat(checklists).containsOnly(checklist2); } + @Transactional + @DisplayName("체크리스트 리스트 조회 성공 : 사용자의 체크리스트만 조회한다.") + @Test + void findAllByUser_OnlyUserChecklists() { + // given + Checklist checklist1 = ChecklistFixture.CHECKLIST1_USER1; + Checklist checklist2 = ChecklistFixture.CHECKLIST2_USER1; + + userRepository.save(UserFixture.USER2); + roomRepository.save(RoomFixture.ROOM_3); + Checklist checklist3 = ChecklistFixture.CHECKLIST3_USER2; + + checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); + + // when + List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + + // then + Assertions.assertThat(checklists).containsOnly(checklist1, checklist2); + } + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") @Test void existsById_true() { //given & when - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); //then assertThat(checklistRepository.existsById(savedChecklist.getId().longValue())).isTrue(); @@ -110,7 +131,7 @@ void existsById_false() { @Test void deleteById() { //given - Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist savedChecklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); //when checklistRepository.deleteById(savedChecklist.getId().longValue()); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 8d9cba69a..64e0d2695 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -6,7 +6,6 @@ import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistLike; -import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -14,6 +13,7 @@ import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; +import com.bang_ggood.checklist.dto.response.QuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; @@ -31,8 +31,10 @@ import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.Collection; import java.util.List; +import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_DUPLICATED; import static com.bang_ggood.checklist.CustomChecklistFixture.CUSTOM_CHECKLIST_UPDATE_REQUEST_EMPTY; @@ -143,7 +145,7 @@ void createChecklist_duplicatedOptionId_exception() { @Test void createChecklistLike() { //given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when checklistService.createChecklistLike(USER1, checklist.getId()); @@ -156,7 +158,7 @@ void createChecklistLike() { @Test void createChecklistLike_checklistAlreadyLiked_exception() { //given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when checklistService.createChecklistLike(USER1, checklist.getId()); @@ -177,12 +179,17 @@ void readChecklistQuestions() { ChecklistQuestionsResponse checklistQuestionsResponse = checklistService.readChecklistQuestions(USER1); // then - int questionsSize = 0; - for (CategoryQuestionsResponse categoryQuestionsResponse : checklistQuestionsResponse.categories()) { - questionsSize += categoryQuestionsResponse.questions().size(); - } - - assertThat(questionsSize).isEqualTo(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT.size()); + List defaultQuestionsIds = CUSTOM_CHECKLIST_QUESTION_DEFAULT.stream() + .map(CustomChecklistQuestion::getQuestion) + .map(Question::getId) + .toList(); + List responseQuestionsIds = checklistQuestionsResponse.categories().stream() + .map(CategoryQuestionsResponse::questions) + .flatMap(Collection::stream) + .map(QuestionResponse::questionId) + .toList(); + + assertThat(responseQuestionsIds).containsExactlyElementsOf(defaultQuestionsIds); } @DisplayName("작성된 체크리스트 조회 성공") @@ -190,7 +197,7 @@ void readChecklistQuestions() { void readChecklistById() { // given roomRepository.save(RoomFixture.ROOM_1); - checklistRepository.save(ChecklistFixture.CHECKLIST1); + checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when SelectedChecklistResponse selectedChecklistResponse = checklistService.readChecklistById(UserFixture.USER1, 1L); @@ -426,7 +433,7 @@ void updateCustomChecklist_invalidQuestionId_exception() { void deleteChecklistById() { // given roomRepository.save(RoomFixture.ROOM_1); - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when checklistService.deleteChecklistById(checklist.getId()); @@ -448,7 +455,7 @@ void deleteChecklistById_notFound_exception() { @Test void deleteChecklistLikeByChecklistId() { // given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); // when @@ -462,7 +469,7 @@ void deleteChecklistLikeByChecklistId() { @Test void deleteChecklistLikeByChecklistId_notFound_exception() { // given - Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when & then assertThatThrownBy(() -> checklistService.deleteChecklistLikeByChecklistId(USER1, checklist.getId())) diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 844516fd9..6af64059a 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -7,7 +7,7 @@ DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; - +DROP TABLE IF EXISTS article CASCADE; -- Create tables CREATE TABLE room @@ -110,3 +110,13 @@ CREATE TABLE checklist_like deleted BOOLEAN, FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); + +CREATE TABLE article +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + title VARCHAR(255), + content VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN +); From df7d422266472b1717abef39b23883fbf1bd1fc4 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 14 Aug 2024 16:41:44 +0900 Subject: [PATCH 171/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#360)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bang_ggood/checklist/domain/Checklist.java | 8 ++++---- .../dto/response/SelectedChecklistResponse.java | 3 +-- .../checklist/service/ChecklistService.java | 12 +++++------- .../room/dto/response/SelectedRoomResponse.java | 7 +++++-- 4 files changed, 15 insertions(+), 15 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index a0c408384..4d15ba7aa 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -172,12 +172,12 @@ public String getSummary() { return summary; } - public OccupancyMonth getOccupancyMonth() { - return occupancyMonth; + public Integer getOccupancyMonth() { + return occupancyMonth.getMonth(); } - public OccupancyPeriod getOccupancyPeriod() { - return occupancyPeriod; + public String getOccupancyPeriod() { + return occupancyPeriod.getPeriod(); } public List getQuestions() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java index a52291a44..53eab5e61 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java @@ -2,10 +2,9 @@ import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.room.dto.response.SelectedRoomResponse; -import java.time.LocalDateTime; import java.util.List; -public record SelectedChecklistResponse(LocalDateTime createdAt, SelectedRoomResponse room, +public record SelectedChecklistResponse(SelectedRoomResponse room, List options, List categories) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 9a183042f..f24f0a370 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -219,16 +219,14 @@ private List getAllCategoryCustomCheckl @Transactional public SelectedChecklistResponse readChecklistById(User user, long id) { - Checklist checklist = checklistRepository.getById(id); // TODO : 해당 유저의 체크리스트인지 확인 필요 - SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); + Checklist checklist = checklistRepository.getById(id); + validateChecklistOwnership(user, checklist); + SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); List options = readOptionsByChecklistId(id); + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); - List selectedCategoryQuestionsResponse = - readCategoryQuestionsByChecklistId(id); - - return new SelectedChecklistResponse(checklist.getCreatedAt(), selectedRoomResponse, - options, selectedCategoryQuestionsResponse); + return new SelectedChecklistResponse(selectedRoomResponse, options, selectedCategoryQuestionsResponse); } private List readOptionsByChecklistId(long checklistId) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index d73ad4ad9..13c740ae2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -1,16 +1,19 @@ package com.bang_ggood.room.dto.response; import com.bang_ggood.checklist.domain.Checklist; +import java.time.LocalDateTime; public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, String address, String station, Integer walkingTime, String realEstate, - String type, Double size, String floorLevel, String structure) { + String type, Double size, String floorLevel, String structure, + Integer occupancyMonth, String occupancyPeriod, String memo, String summary, LocalDateTime createdAt) { public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), - checklist.getRoomStructure().getName()); + checklist.getRoomStructure().getName(), checklist.getOccupancyMonth(), checklist.getOccupancyPeriod(), + checklist.getMemo(), checklist.getSummary(), checklist.getCreatedAt()); } } From 8186333bbed701eba28a4dbe702036fea335d22c Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:22:22 +0900 Subject: [PATCH 172/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EB=A6=AC=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC?= =?UTF-8?q?=20=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4.=20(#357)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../article/controller/ArticleController.java | 6 ++++++ .../article/dto/ArticlePreviewResponse.java | 10 ++++++++++ .../article/dto/ArticlesPreviewResponse.java | 6 ++++++ .../article/service/ArticleService.java | 10 ++++++++++ .../article/controller/ArticleE2ETest.java | 16 ++++++++++++++++ 5 files changed, 48 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java index f8fad7e6c..f858ec7e6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java @@ -1,6 +1,7 @@ package com.bang_ggood.article.controller; import com.bang_ggood.article.dto.ArticleResponse; +import com.bang_ggood.article.dto.ArticlesPreviewResponse; import com.bang_ggood.article.service.ArticleService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; @@ -20,4 +21,9 @@ public ArticleController(ArticleService articleService) { public ResponseEntity readArticle(@PathVariable("id") Long id) { return ResponseEntity.ok(articleService.readArticle(id)); } + + @GetMapping("/articles") + public ResponseEntity readArticles() { + return ResponseEntity.ok(articleService.readArticles()); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java new file mode 100644 index 000000000..634b930b5 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.article.dto; + +import com.bang_ggood.article.domain.Article; + +public record ArticlePreviewResponse(Long id, String title) { + + public static ArticlePreviewResponse from(Article article) { + return new ArticlePreviewResponse(article.getId(), article.getTitle()); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java new file mode 100644 index 000000000..1c3b0bec3 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.article.dto; + +import java.util.List; + +public record ArticlesPreviewResponse(List responses) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java index 91a39d91f..4c9ffa089 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java @@ -1,9 +1,12 @@ package com.bang_ggood.article.service; import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.dto.ArticlePreviewResponse; import com.bang_ggood.article.dto.ArticleResponse; +import com.bang_ggood.article.dto.ArticlesPreviewResponse; import com.bang_ggood.article.repository.ArticleRepository; import org.springframework.stereotype.Service; +import java.util.List; @Service public class ArticleService { @@ -18,4 +21,11 @@ public ArticleResponse readArticle(Long id) { Article article = articleRepository.getById(id); return ArticleResponse.from(article); } + + public ArticlesPreviewResponse readArticles() { + List articles = articleRepository.findAll().stream() + .map(ArticlePreviewResponse::from) + .toList(); + return new ArticlesPreviewResponse(articles); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java index c24d016be..c6cd585f6 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java @@ -34,6 +34,9 @@ void readArticle() { @DisplayName("아티클 조회 실패 : 유효하지 않은 아이디인 경우") @Test void readArticle_invalidId_exception() { + Article article = new Article("제목", "내용"); + articleRepository.save(article); + long articleId = Long.MAX_VALUE; ExceptionResponse response = RestAssured.given().log().all() @@ -46,4 +49,17 @@ void readArticle_invalidId_exception() { assertThat(response.message()).isEqualTo(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); } + + @DisplayName("아티클 목록 조회 성공") + @Test + void readArticles() { + Article article = new Article("제목", "내용"); + articleRepository.save(article); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/articles") + .then().log().all() + .statusCode(200); + } } From 8da11b775609726835ccbc1f3f245869a44fee4a Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 14 Aug 2024 17:47:40 +0900 Subject: [PATCH 173/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20?= =?UTF-8?q?API=EB=A5=BC=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#362)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/category/domain/Category.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java index 7aa87e9eb..6865f4aa2 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/category/domain/Category.java @@ -2,20 +2,18 @@ public enum Category { - ROOM_CONDITION(1, "방 컨디션", "🏠"), - WINDOW(2, "창문", "🪟"), - BATHROOM(3, "화장실", "🛀"), - SECURITY(4, "보안", "🚨"), - OUTSIDE(5, "외부", "🌇"); + ROOM_CONDITION(1, "방 컨디션"), + WINDOW(2, "창문"), + BATHROOM(3, "화장실"), + SECURITY(4, "보안"), + OUTSIDE(5, "외부"); private final int id; private final String name; - private final String emoji; - Category(int id, String name, String emoji) { + Category(int id, String name) { this.id = id; this.name = name; - this.emoji = emoji; } public int getId() { @@ -23,7 +21,6 @@ public int getId() { } public String getName() { - String nameWithEmojiPattern = "%s %s"; - return String.format(nameWithEmojiPattern, emoji, name); + return name; } } From d9c7b6ab45d7e5bbeaedc23af51191067da35a78 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Wed, 14 Aug 2024 17:52:36 +0900 Subject: [PATCH 174/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?364)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/domain/Checklist.java | 6 +++++- .../checklist/service/ChecklistService.java | 7 ++++--- .../java/com/bang_ggood/room/domain/Room.java | 1 + .../controller/ChecklistE2ETest.java | 12 ++++++----- .../service/ChecklistServiceTest.java | 20 +++++++++++++++++-- 5 files changed, 35 insertions(+), 11 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 4d15ba7aa..71621635d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -86,12 +86,16 @@ public boolean isOwnedBy(User user) { } public void change(Checklist updateChecklist) { - this.user = updateChecklist.user; this.room = updateChecklist.room; this.deposit = updateChecklist.deposit; this.rent = updateChecklist.rent; this.contractTerm = updateChecklist.contractTerm; this.realEstate = updateChecklist.realEstate; + this.memo = updateChecklist.memo; + this.summary = updateChecklist.summary; + this.occupancyMonth = updateChecklist.occupancyMonth; + this.occupancyPeriod = updateChecklist.occupancyPeriod; + validateMemoLength(); } private void validateMemoLength() { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index f24f0a370..be2b20141 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -272,6 +272,7 @@ private UserChecklistPreviewResponse getChecklistPreview(Checklist checklist) { @Transactional public void updateChecklistById(User user, long id, ChecklistRequest checklistRequest) { Checklist checklist = checklistRepository.getById(id); + validateChecklistOwnership(user, checklist); Room room = checklist.getRoom(); room.change(checklistRequest.toRoomEntity()); @@ -294,19 +295,19 @@ private void updateChecklistOptions(ChecklistRequest checklistRequest, Checklist } private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checklist checklist) { - /*validateQuestion(checklistRequest.questions()); + validateQuestion(checklistRequest.questions()); List questions = checklist.getQuestions(); List updateQuestions = checklistRequest.questions().stream() .map(question -> new ChecklistQuestion( checklist, Question.fromId(question.questionId()), - Answer.from(question.grade()))) + Answer.from(question.answer()))) .toList(); validateSameQuestions(questions, updateQuestions); IntStream.range(0, questions.size()) - .forEach(i -> questions.get(i).change(updateQuestions.get(i)));*/ + .forEach(i -> questions.get(i).change(updateQuestions.get(i))); } private void validateSameQuestions(List questions, List updateQuestions) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 0a9d3950d..451bae10d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -66,6 +66,7 @@ public void change(Room room) { this.floor = room.floor; this.floorLevel = room.floorLevel; this.structure = room.structure; + validateFloorAndLevel(); } public Long getId() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 43c13703a..c0e022950 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -40,7 +40,7 @@ class ChecklistE2ETest extends AcceptanceTest { @Autowired private ChecklistLikeRepository checklistLikeRepository; - @DisplayName("체크리스트 방 정보 작성 성공") + @DisplayName("체크리스트 작성 성공") @Test void createChecklist() { RestAssured.given().log().all() @@ -52,7 +52,7 @@ void createChecklist() { .statusCode(201); } - @DisplayName("체크리스트 방 정보 작성 실패: 방 이름을 넣지 않은 경우") + @DisplayName("체크리스트 작성 실패: 방 이름을 넣지 않은 경우") @Test void createChecklist_noRoomName_exception() { RestAssured.given().log().all() @@ -61,10 +61,11 @@ void createChecklist_noRoomName_exception() { .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_ROOM_NAME) .when().post("/checklists") .then().log().all() - .statusCode(400); + .statusCode(400) + .body("message", containsString("방 이름이 존재하지 않습니다.")); } - @DisplayName("체크리스트 방 정보 작성 실패: 질문 ID를 넣지 않은 경우") + @DisplayName("체크리스트 작성 실패: 질문 ID를 넣지 않은 경우") @Test void createChecklist_noQuestionId_exception() { RestAssured.given().log().all() @@ -73,7 +74,8 @@ void createChecklist_noQuestionId_exception() { .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST_NO_QUESTION_ID) .when().post("/checklists") .then().log().all() - .statusCode(400); + .statusCode(400) + .body("message", containsString("질문 아이디가 존재하지 않습니다.")); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 64e0d2695..7fe707767 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -23,6 +23,7 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.repository.UserRepository; @@ -248,7 +249,7 @@ void readChecklistById_invalidChecklistId_exception() { // Badge.CLEAN.getLongNameWithEmoji())); // } - /*@DisplayName("체크리스트 수정 성공") + @DisplayName("체크리스트 수정 성공") @Test void updateChecklistById() { //given @@ -355,7 +356,22 @@ void createChecklist_differentQuestion_exception() { ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.QUESTION_DIFFERENT.getMessage()); - }*/ + } + + @DisplayName("체크리스트 수정 실패 : 해당 유저의 체크리스트가 아닐 경우") + @Test + void createChecklist_notOwnedBy_exception() { + //given + long checklistId = checklistService.createChecklist(UserFixture.USER1, + ChecklistFixture.CHECKLIST_CREATE_REQUEST); + + //when & then + assertThatThrownBy( + () -> checklistService.updateChecklistById(UserFixture.USER2, checklistId, + ChecklistFixture.CHECKLIST_UPDATE_REQUEST_DIFFERENT_QUESTION)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.CHECKLIST_NOT_OWNED_BY_USER.getMessage()); + } @DisplayName("커스텀 체크리스트 조회 성공") @Test From f1148cab1e565616e037de8281542737b9522bab Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 15 Aug 2024 14:41:29 +0900 Subject: [PATCH 175/348] =?UTF-8?q?feat:=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=82=AD=EC=A0=9C=EC=97=90=20=EC=9C=A0?= =?UTF-8?q?=EC=A0=80=20=ED=99=95=EC=9D=B8=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/ChecklistController.java | 2 +- .../checklist/service/ChecklistService.java | 7 ++----- .../service/ChecklistServiceTest.java | 18 ++++++++++++------ 3 files changed, 15 insertions(+), 12 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 7686b16eb..1053a749a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -82,7 +82,7 @@ public ResponseEntity updateCustomChecklist(@AuthPrincipal User user, @DeleteMapping("/checklists/{id}") public ResponseEntity deleteChecklistById(@AuthPrincipal User user, @PathVariable("id") long id) { - checklistService.deleteChecklistById(id); + checklistService.deleteChecklistById(user, id); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index be2b20141..dd74c8009 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -350,11 +350,8 @@ private void validateCustomChecklistQuestionsDuplication(List questionI } @Transactional - public void deleteChecklistById(long id) { - // TODO: 사용자 검증 필요 - if (!checklistRepository.existsById(id)) { - throw new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND); - } + public void deleteChecklistById(User user, long id) { + validateChecklistOwnership(user, checklistRepository.getById(id)); checklistRepository.deleteById(id); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 7fe707767..8f5f2c650 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -452,19 +452,25 @@ void deleteChecklistById() { Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); // when - checklistService.deleteChecklistById(checklist.getId()); + checklistService.deleteChecklistById(UserFixture.USER1, checklist.getId()); // then assertThat(checklistRepository.existsById(checklist.getId().longValue())).isFalse(); } - @DisplayName("체크리스트 삭제 실패") + @DisplayName("체크리스트 삭제 실패 : 체크리스트 작성 유저와 삭제하려는 유저가 다른 경우") @Test - void deleteChecklistById_notFound_exception() { - // given & when & then - assertThatThrownBy(() -> checklistService.deleteChecklistById(-1)) + void deleteChecklistById_notOwnedByUser_exception() { + // given + roomRepository.save(RoomFixture.ROOM_1); + Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); + + // when & then + assertThatThrownBy( + () -> checklistService.deleteChecklistById(UserFixture.USER2, checklist.getId()) + ) .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.CHECKLIST_NOT_FOUND.getMessage()); + .hasMessage(ExceptionCode.CHECKLIST_NOT_OWNED_BY_USER.getMessage()); } @DisplayName("체크리스트 좋아요 삭제 성공") From a5ee0708348338dfb24e8e58e0084abdeed7ebe4 Mon Sep 17 00:00:00 2001 From: shin-jisong <86762272+shin-jisong@users.noreply.github.com> Date: Thu, 15 Aug 2024 16:35:43 +0900 Subject: [PATCH 176/348] =?UTF-8?q?feat(Option):=20=EC=98=B5=EC=85=98=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=88=9C=EC=84=9C=20=EB=B3=80?= =?UTF-8?q?=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/checklist/domain/Option.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index c0d3ea285..2c1464aed 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -6,20 +6,21 @@ public enum Option { - AIR_CONDITIONER(1, "에어컨"), - REFRIGERATOR(2, "냉장고"), - MICROWAVE_OVEN(3, "전자레인지"), - WASHING_MACHINE(4, "세탁기"), - SINK(5, "싱크대"), - GAS_STOVE(6, "가스레인지/인덕션"), - INTERNET(7, "인터넷"), - BED(8, "침대"), - DESK(9, "책상"), - CLOSET(10, "옷장"), - SHOE_RACK(11, "신발장"), - ELEVATOR(12, "엘리베이터"), - DRYER(13, "건조기"), - TV(14, "TV"); + DOOR_LOCK(1, "도어락"), + AIR_CONDITIONER(2, "에어컨"), + REFRIGERATOR(3, "냉장고"), + SINK(4, "싱크대"), + GAS_STOVE(5, "가스레인지"), + MICROWAVE_OVEN(6, "전자레인지"), + CLOSET(7, "옷장"), + SHOE_RACK(8, "신발장"), + WASHING_MACHINE(9, "세탁기"), + DRYER(10, "건조기"), + INTERNET(11, "인터넷"), + BED(12, "침대"), + DESK(13, "책상"), + TV(14, "TV"), + ELEVATOR(15, "엘리베이터"); private final int id; private final String name; From 231624ff766ad7bca36e3a0d7bccf6b4489310d3 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Fri, 16 Aug 2024 11:29:07 +0900 Subject: [PATCH 177/348] =?UTF-8?q?[BE]=20=ED=9A=8C=EC=9B=90=EA=B0=80?= =?UTF-8?q?=EC=9E=85=EC=8B=9C=20=EB=94=94=ED=8F=B4=ED=8A=B8=20=EC=B2=B4?= =?UTF-8?q?=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80=ED=95=9C=EB=8B=A4.=20(#379)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/auth/service/AuthService.java | 45 +++++++++++++++++- .../bang_ggood/checklist/domain/Option.java | 4 ++ .../auth/service/AuthServiceTest.java | 46 +++++++++++++++++++ 3 files changed, 94 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index b541c285c..e95544c04 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -2,12 +2,24 @@ import com.bang_ggood.auth.dto.request.OauthLoginRequest; import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; +import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.checklist.domain.OccupancyMonth; +import com.bang_ggood.checklist.domain.OccupancyPeriod; +import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.request.ChecklistRequest; +import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; +import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.room.domain.FloorLevel; +import com.bang_ggood.room.domain.Structure; +import com.bang_ggood.room.domain.Type; +import com.bang_ggood.room.dto.request.RoomRequest; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service @@ -15,17 +27,21 @@ public class AuthService { private final OauthClient oauthClient; private final JwtTokenProvider jwtTokenProvider; + private final ChecklistService checklistService; private final UserRepository userRepository; private final CustomChecklistQuestionRepository customChecklistQuestionRepository; - public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, UserRepository userRepository, + public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, ChecklistService checklistService, + UserRepository userRepository, CustomChecklistQuestionRepository customChecklistQuestionRepository) { this.oauthClient = oauthClient; this.jwtTokenProvider = jwtTokenProvider; + this.checklistService = checklistService; this.userRepository = userRepository; this.customChecklistQuestionRepository = customChecklistQuestionRepository; } + @Transactional public String login(OauthLoginRequest request) { OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request); @@ -38,6 +54,7 @@ public String login(OauthLoginRequest request) { private User signUp(OauthInfoApiResponse oauthInfoApiResponse) { User user = userRepository.save(oauthInfoApiResponse.toUserEntity()); createDefaultChecklistQuestions(user); + createDefaultChecklist(user); return user; } @@ -50,6 +67,32 @@ private void createDefaultChecklistQuestions(User user) { //TODO 리팩토링 customChecklistQuestionRepository.saveAll(checklistQuestions); } + private void createDefaultChecklist(User user) { + RoomRequest roomRequest = new RoomRequest( + "예시용 체크리스트", 2000, 50, 12, "서울특별시 송파구", + "잠실역", 10, "방끗 부동산", Type.VILLA.getName(), Structure.OPEN_ONE_ROOM.getName(), + 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + "집을 둘러보며 필요한 메모를 작성해보세요.", "한줄평 작성하는 곳"); + + List options = List.of( + Option.TV.getId(), + Option.AIR_CONDITIONER.getId(), + Option.SINK.getId(), + Option.BED.getId()); + + List questionRequests = List.of( + new QuestionRequest(Question.ROOM_CONDITION_1.getId(), Answer.GOOD.name()), + new QuestionRequest(Question.ROOM_CONDITION_2.getId(), Answer.BAD.name()), + new QuestionRequest(Question.ROOM_CONDITION_3.getId(), Answer.GOOD.name()), + new QuestionRequest(Question.WINDOW_1.getId(), Answer.GOOD.name()), + new QuestionRequest(Question.WINDOW_2.getId(), Answer.BAD.name()), + new QuestionRequest(Question.BATHROOM_1.getId(), Answer.GOOD.name()), + new QuestionRequest(Question.BATHROOM_2.getId(), Answer.GOOD.name())); + + ChecklistRequest checklistRequest = new ChecklistRequest(roomRequest, options, questionRequests); + checklistService.createChecklist(user, checklistRequest); + } + public User extractUser(String token) { AuthUser authUser = jwtTokenProvider.resolveToken(token); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index 2c1464aed..28487daf9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -44,6 +44,10 @@ public static Option fromId(int id) { throw new BangggoodException(ExceptionCode.OPTION_INVALID); } + public int getId() { + return id; + } + public String getName() { return name; } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index ce6c036c6..9257ee8f9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -2,7 +2,13 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; +import com.bang_ggood.checklist.domain.Question; +import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; @@ -25,6 +31,8 @@ class AuthServiceTest extends IntegrationTestSupport { @Autowired private AuthService authService; @Autowired + private ChecklistService checklistService; + @Autowired private UserRepository userRepository; @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") @@ -55,4 +63,42 @@ void login() { // then Assertions.assertThat(token).isNotBlank(); } + + @DisplayName("로그인 성공 : 회원 가입시 디폴트 체크리스트 질문을 추가한다.") + @Test + void login_default_checklist_question() { + // given + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) + .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER2); + + // when + String token = authService.login(oauthLoginRequest); + + // then + User user = authService.extractUser(token); + ChecklistQuestionsResponse checklistQuestions = checklistService.readChecklistQuestions(user); + + int sum = 0; + for (CategoryQuestionsResponse response: checklistQuestions.categories()) { + sum += response.questions().size(); + } + + Assertions.assertThat(sum).isEqualTo(Question.findDefaultQuestions().size()); + } + + @DisplayName("로그인 성공 : 회원 가입시 디폴트 체크리스트를 추가한다.") + @Test + void login_default_checklist() { + // given + Mockito.when(oauthClient.requestOauthInfo(any(OauthLoginRequest.class))) + .thenReturn(UserFixture.OAUTH_INFO_RESPONSE_USER2); + + // when + String token = authService.login(oauthLoginRequest); + + // then + User user = authService.extractUser(token); + UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); + Assertions.assertThat(response.checklists()).hasSize(1); + } } From ba4a0088d8079761d1ba3c45d051e2be8b973921 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 16 Aug 2024 15:10:56 +0900 Subject: [PATCH 178/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A2=8B=EC=95=84=EC=9A=94=20=ED=95=84?= =?UTF-8?q?=ED=84=B0=EB=A7=81=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EA=B5=AC?= =?UTF-8?q?=ED=98=84=ED=95=9C=EB=8B=A4.=20(#370)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Co-authored-by: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Co-authored-by: gmuz1c Co-authored-by: shin-jisong <86762272+shin-jisong@users.noreply.github.com> --- .../controller/ChecklistController.java | 9 ++++- .../repository/ChecklistRepository.java | 11 +++++- .../checklist/service/ChecklistService.java | 11 +++++- .../auth/service/AuthServiceTest.java | 2 +- .../checklist/ChecklistFixture.java | 11 +++++- .../controller/ChecklistE2ETest.java | 13 ++++++- .../repository/ChecklistRepositoryTest.java | 27 ++++++++++++++ .../service/ChecklistServiceTest.java | 37 ++++++++++++++++--- 8 files changed, 109 insertions(+), 12 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 1053a749a..03cb290b3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -54,8 +54,8 @@ public ResponseEntity readChecklistById(@AuthPrincipa } @GetMapping("/checklists") - public ResponseEntity readUserChecklistsPreview(@AuthPrincipal User user) { - return ResponseEntity.ok(checklistService.readUserChecklistsPreview(user)); + public ResponseEntity readChecklistsPreview(@AuthPrincipal User user) { + return ResponseEntity.ok(checklistService.readChecklistsPreview(user)); } @GetMapping("/custom-checklist/all") @@ -64,6 +64,11 @@ public ResponseEntity readAllCustomChe return ResponseEntity.ok(checklistService.readAllCustomChecklistQuestions(user)); } + @GetMapping("/checklists/like") + public ResponseEntity readLikedChecklistsPreview(@AuthPrincipal User user) { + return ResponseEntity.ok(checklistService.readLikedChecklistsPreview(user)); + } + @PutMapping("/checklists/{id}") public ResponseEntity updateChecklistById( @AuthPrincipal User user, diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index cf0deef00..890893e60 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -26,9 +26,18 @@ default Checklist getById(@Param("id") long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.CHECKLIST_NOT_FOUND)); } - @Query("SELECT c FROM Checklist c WHERE c.user = :user AND c.deleted = false") + @Query("SELECT c FROM Checklist c " + + "WHERE c.user = :user " + + "AND c.deleted = false") List findAllByUser(@Param("user") User user); + @Query("SELECT c FROM Checklist c " + + "JOIN ChecklistLike cl " + + "on cl.checklist = c " + + "WHERE c.user = :user " + + "AND c.deleted = false") + List findAllByUserAndIsLiked(@Param("user") User user); + @Query("SELECT c FROM Checklist c " + "JOIN FETCH c.user u " + "JOIN FETCH c.room r " diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index dd74c8009..abc66e9ff 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -255,7 +255,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ } @Transactional - public UserChecklistsPreviewResponse readUserChecklistsPreview(User user) { + public UserChecklistsPreviewResponse readChecklistsPreview(User user) { List checklists = checklistRepository.findAllByUser(user); List responses = checklists.stream() .map(this::getChecklistPreview) @@ -269,6 +269,15 @@ private UserChecklistPreviewResponse getChecklistPreview(Checklist checklist) { return UserChecklistPreviewResponse.of(checklist, isLiked); } + @Transactional + public UserChecklistsPreviewResponse readLikedChecklistsPreview(User user) { + List likedChecklists = checklistRepository.findAllByUserAndIsLiked(user); + List responses = likedChecklists.stream() + .map(checklist -> UserChecklistPreviewResponse.of(checklist, true)) + .toList(); + return new UserChecklistsPreviewResponse(responses); + } + @Transactional public void updateChecklistById(User user, long id, ChecklistRequest checklistRequest) { Checklist checklist = checklistRepository.getById(id); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index 9257ee8f9..fffce3c30 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -98,7 +98,7 @@ void login_default_checklist() { // then User user = authService.extractUser(token); - UserChecklistsPreviewResponse response = checklistService.readUserChecklistsPreview(user); + UserChecklistsPreviewResponse response = checklistService.readChecklistsPreview(user); Assertions.assertThat(response.checklists()).hasSize(1); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index 3f76a4c85..fc7d269f6 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -29,6 +29,13 @@ public class ChecklistFixture { OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY ); + public static final Checklist CHECKLIST3_USER1 = new Checklist( + RoomFixture.ROOM_3, + UserFixture.USER1, + 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + ); + public static final Checklist CHECKLIST3_USER2 = new Checklist( RoomFixture.ROOM_3, UserFixture.USER2, @@ -181,5 +188,7 @@ public class ChecklistFixture { CHECKLIST1_USER1, Question.fromId(2), Answer.BAD ); - public static final ChecklistLike CHECKLIST_LIKE_1 = new ChecklistLike(CHECKLIST1_USER1); + public static final ChecklistLike CHECKLIST1_LIKE = new ChecklistLike(CHECKLIST1_USER1); + + public static final ChecklistLike CHECKLIST2_LIKE = new ChecklistLike(CHECKLIST2_USER1); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index c0e022950..0bf83f90f 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -163,6 +163,17 @@ void readChecklistById() { ); } + @DisplayName("좋아요된 체크리스트 리스트 조회 성공") + @Test + void readLikedUserChecklistsPreview() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().get("/checklists/like") + .then().log().all() + .statusCode(200); + } + @DisplayName("체크리스트 수정 성공") @Test void updateChecklist() { @@ -238,7 +249,7 @@ void deleteChecklistById() { void deleteChecklistLikeByChecklistId() { roomRepository.save(RoomFixture.ROOM_1); Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); - checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); + checklistLikeRepository.save(ChecklistFixture.CHECKLIST1_LIKE); RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index 630e18e71..6227b5431 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -33,11 +33,15 @@ class ChecklistRepositoryTest extends IntegrationTestSupport { @Autowired private UserRepository userRepository; + @Autowired + private ChecklistLikeRepository checklistLikeRepository; + @BeforeEach void setUp() { userRepository.save(UserFixture.USER1); roomRepository.save(RoomFixture.ROOM_1); roomRepository.save(RoomFixture.ROOM_2); + roomRepository.save(RoomFixture.ROOM_3); } @DisplayName("아이디를 통해 체크리스트 갖고 오기 성공") @@ -110,6 +114,29 @@ void findAllByUser_OnlyUserChecklists() { Assertions.assertThat(checklists).containsOnly(checklist1, checklist2); } + @Transactional + @DisplayName("체크리스트 좋아요 필터링 조회 성공") + @Test + void findAllByUserAndIsLiked() { + // given + checklistRepository.saveAll( + List.of(ChecklistFixture.CHECKLIST1_USER1, + ChecklistFixture.CHECKLIST2_USER1, + ChecklistFixture.CHECKLIST3_USER1) + ); + checklistLikeRepository.saveAll( + List.of(ChecklistFixture.CHECKLIST1_LIKE, + ChecklistFixture.CHECKLIST2_LIKE) + ); + + // when + List checklists = checklistRepository.findAllByUserAndIsLiked(UserFixture.USER1); + + // then + Assertions.assertThat(checklists) + .containsOnly(ChecklistFixture.CHECKLIST1_USER1, ChecklistFixture.CHECKLIST2_USER1); + } + @DisplayName("아이디를 통해 체크리스트 존재 확인 성공 : 존재하는 경우") @Test void existsById_true() { diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 8f5f2c650..574e3ae91 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -15,6 +15,7 @@ import com.bang_ggood.checklist.dto.response.CustomChecklistQuestionResponse; import com.bang_ggood.checklist.dto.response.QuestionResponse; import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; +import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; @@ -153,7 +154,7 @@ void createChecklistLike() { //then assertThat(checklistLikeRepository.existsByChecklist(checklist)).isTrue(); - } + } @DisplayName("체크리스트 좋아요 추가 실패 : 이미 좋아요가 추가가 된 체크리스트인 경우") @Test @@ -165,9 +166,9 @@ void createChecklistLike_checklistAlreadyLiked_exception() { checklistService.createChecklistLike(USER1, checklist.getId()); //then - assertThatThrownBy(() -> checklistService.createChecklistLike(USER1, checklist.getId())) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.LIKE_ALREADY_EXISTS.getMessage()); + assertThatThrownBy(() -> checklistService.createChecklistLike(USER1, checklist.getId())) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.LIKE_ALREADY_EXISTS.getMessage()); } @DisplayName("체크리스트 질문 조회 성공") @@ -394,6 +395,32 @@ void readCustomChecklistQuestions() { Assertions.assertThat(selectedCount).isEqualTo(questions.size()); } + @DisplayName("좋아요된 체크리스트 리스트 조회 성공") + @Test + void readLikedChecklistsPreview() { + //given + checklistRepository.saveAll( + List.of(ChecklistFixture.CHECKLIST1_USER1, + ChecklistFixture.CHECKLIST2_USER1, + ChecklistFixture.CHECKLIST3_USER1) + ); + checklistLikeRepository.saveAll( + List.of(ChecklistFixture.CHECKLIST1_LIKE, + ChecklistFixture.CHECKLIST2_LIKE) + ); + + //when + List checklists = + checklistService.readLikedChecklistsPreview(USER1).checklists(); + + //then + assertAll( + () -> assertThat(checklists.size()).isEqualTo(2), + () -> assertThat(checklists.get(0).checklistId()).isEqualTo(ChecklistFixture.CHECKLIST1_USER1.getId()), + () -> assertThat(checklists.get(1).checklistId()).isEqualTo(ChecklistFixture.CHECKLIST2_USER1.getId()) + ); + } + @DisplayName("커스텀 체크리스트 업데이트 성공") @Test void updateCustomChecklist() { @@ -478,7 +505,7 @@ void deleteChecklistById_notOwnedByUser_exception() { void deleteChecklistLikeByChecklistId() { // given Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); - ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); + ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST1_LIKE); // when checklistService.deleteChecklistLikeByChecklistId(USER1, checklist.getId()); From 0cd660458bee2527cd127f3ddd5534acda906399 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Fri, 16 Aug 2024 17:08:34 +0900 Subject: [PATCH 179/348] =?UTF-8?q?[BE]=20dev,=20prod,=20local=20=EC=84=A4?= =?UTF-8?q?=EC=A0=95=20=ED=8C=8C=EC=9D=BC=20=EB=B6=84=EB=A6=AC=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#386)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/backend-ci.yml | 5 ++++- .github/workflows/{backend-cd.yml => backend-dev-cd.yml} | 8 +++++--- backend/bang-ggood/.gitignore | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) rename .github/workflows/{backend-cd.yml => backend-dev-cd.yml} (81%) diff --git a/.github/workflows/backend-ci.yml b/.github/workflows/backend-ci.yml index 7b37e809d..891fb591d 100644 --- a/.github/workflows/backend-ci.yml +++ b/.github/workflows/backend-ci.yml @@ -35,11 +35,14 @@ jobs: - name: Write application.yml env: APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + APPLICATION_LOCAL_YML: ${{ secrets.APPLICATION_LOCAL_YML }} APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} run: | - echo "${APPLICATION_YML}" > src/main/resources/application.yml + echo "${APPLICATION_YML}" > src/test/resources/application.yml + echo "${APPLICATION_LOCAL_YML}" > src/test/resources/application-local.yml echo "${APPLICATION_TEST_YML}" > src/test/resources/application-test.yml - name: Build with Gradle run: ./gradlew clean build + diff --git a/.github/workflows/backend-cd.yml b/.github/workflows/backend-dev-cd.yml similarity index 81% rename from .github/workflows/backend-cd.yml rename to .github/workflows/backend-dev-cd.yml index e8c880328..3b3f35dcf 100644 --- a/.github/workflows/backend-cd.yml +++ b/.github/workflows/backend-dev-cd.yml @@ -1,4 +1,4 @@ -name: backend-cd +name: backend-dev-cd on: pull_request: @@ -33,9 +33,11 @@ jobs: - name: Write application.yml env: APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + APPLICATION_DEV_YML: ${{ secrets.APPLICATION_DEV_YML }} APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} run: | echo "${APPLICATION_YML}" > backend/bang-ggood/src/main/resources/application.yml + echo "${APPLICATION_DEV_YML}" > backend/bang-ggood/src/main/resources/application-dev.yml echo "${APPLICATION_TEST_YML}" > backend/bang-ggood/src/test/resources/application-test.yml - name: Build with Gradle @@ -51,7 +53,7 @@ jobs: deploy: needs: build - runs-on: bang-ggood + runs-on: bang-ggood-dev steps: - name: change permission run: sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-bang-ggood @@ -65,4 +67,4 @@ jobs: run: sudo fuser -k -n tcp 8080 || true - name: Start server - run: sudo nohup java -jar -Duser.timezone=Asia/Seoul ./backend/bang-ggood/build/libs/*SNAPSHOT.jar > /home/ubuntu/actions-runner/server.log 2>&1 & + run: sudo nohup java -jar -Dspring.profiles.active=dev -Duser.timezone=Asia/Seoul ./backend/bang-ggood/build/libs/*SNAPSHOT.jar > /home/ubuntu/actions-runner/server.log 2>&1 & diff --git a/backend/bang-ggood/.gitignore b/backend/bang-ggood/.gitignore index cb8bf25be..263d00224 100644 --- a/backend/bang-ggood/.gitignore +++ b/backend/bang-ggood/.gitignore @@ -19,6 +19,9 @@ bin/ ### IntelliJ IDEA ### src/main/resources/application.yml +src/main/resources/application-local.yml +src/main/resources/application-dev.yml +src/main/resources/application-prod.yml src/test/resources/application-test.yml .idea *.iws From 7507160b7b14e43ffd8225adc230a98330750a92 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Fri, 16 Aug 2024 17:19:30 +0900 Subject: [PATCH 180/348] =?UTF-8?q?fix:=20=EB=A8=B8=EC=A7=80=20=EC=B6=A9?= =?UTF-8?q?=EB=8F=8C=20=ED=95=B4=EA=B2=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/hs_err_pid6379.jfr | Bin 0 -> 209068 bytes backend/bang-ggood/hs_err_pid6379.log | 1649 +++++++++++++++++ .../controller/ChecklistE2ETest.java | 2 +- .../service/ChecklistServiceTest.java | 2 +- 4 files changed, 1651 insertions(+), 2 deletions(-) create mode 100644 backend/bang-ggood/hs_err_pid6379.jfr create mode 100644 backend/bang-ggood/hs_err_pid6379.log diff --git a/backend/bang-ggood/hs_err_pid6379.jfr b/backend/bang-ggood/hs_err_pid6379.jfr new file mode 100644 index 0000000000000000000000000000000000000000..1a9e892fc54f826dee7d8817924ba24e3b837666 GIT binary patch literal 209068 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

kXhCV+ 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 KkYF!)V*eii=rbe$ literal 0 HcmV?d00001 diff --git a/backend/bang-ggood/hs_err_pid6379.log b/backend/bang-ggood/hs_err_pid6379.log new file mode 100644 index 000000000..fd85e2171 --- /dev/null +++ b/backend/bang-ggood/hs_err_pid6379.log @@ -0,0 +1,1649 @@ +# +# A fatal error has been detected by the Java Runtime Environment: +# +# SIGBUS (0xa) at pc=0x00000001180014e4, pid=6379, tid=5379 +# +# JRE version: Java(TM) SE Runtime Environment (17.0.9+11) (build 17.0.9+11-LTS-201) +# Java VM: Java HotSpot(TM) 64-Bit Server VM (17.0.9+11-LTS-201, mixed mode, emulated-client, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, bsd-aarch64) +# Problematic frame: +# v ~StubRoutines::SafeFetch32 +# +# No core dump will be written. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again +# +# JFR recording file will be written. Location: /Users/jinwoo/Documents/woowacourse/2024-bang-ggood/backend/bang-ggood/hs_err_pid6379.jfr +# +# If you would like to submit a bug report, please visit: +# https://bugreport.java.com/bugreport/crash.jsp +# + +--------------- S U M M A R Y ------------ + +Command Line: -XX:TieredStopAtLevel=1 -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -Dmanagement.endpoints.jmx.exposure.include=* -javaagent:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar=51990:/Applications/IntelliJ IDEA.app/Contents/bin -agentpath:/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/libasyncProfiler.so=start,jfr,event=cpu,interval=10ms,jfrsync=profile,cstack=no,file=/Users/jinwoo/IdeaSnapshots/Application__1__2024_08_16_151221.jfr,log=/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/Application__1__2024_08_16_151221.jfr.log.txt,logLevel=DEBUG -Dfile.encoding=UTF-8 com.bang_ggood.Application + +Host: "Mac14,9" arm64 1 MHz, 10 cores, 16G, Darwin 22.3.0, macOS 13.2.1 (22D68) +Time: Fri Aug 16 15:12:23 2024 KST elapsed time: 2.357016 seconds (0d 0h 0m 2s) + +--------------- T H R E A D --------------- + +Current thread (0x000000011f253e00): JavaThread "main" [_thread_in_Java, id=5379, stack(0x000000016f000000,0x000000016f203000)] + +Stack: [0x000000016f000000,0x000000016f203000], sp=0x000000016f1ffc60, free space=2047k +Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) +v ~StubRoutines::SafeFetch32 +V [libjvm.dylib+0x7b6c14] os::is_readable_range(void const*, void const*)+0x2c +V [libjvm.dylib+0x7676e8] Method::is_valid_method(Method const*)+0x38 +V [libjvm.dylib+0x35f704] frame::is_interpreted_frame_valid(JavaThread*) const+0x7c +V [libjvm.dylib+0x35f5e0] frame::safe_for_sender(JavaThread*)+0x4ec +V [libjvm.dylib+0x92cfd4] JavaThread::pd_get_top_frame(frame*, void*, bool)+0x200 +V [libjvm.dylib+0x35c474] AsyncGetCallTrace+0x1b0 +C [libasyncProfiler.so+0x3ac64] Profiler::getJavaTraceAsync(void*, ASGCT_CallFrame*, int, StackContext*)+0x15c +C [libasyncProfiler.so+0x3bd14] Profiler::recordSampleForThread(int, void*, unsigned long long, int, Event*, int*)+0x1c4 +C [libasyncProfiler.so+0x4a03c] WallClock::signalHandler(int, __siginfo*, void*)+0xa8 +C [libsystem_platform.dylib+0x42a4] _sigtramp+0x38 +C 0xbc7d00011831a33c +j java.lang.invoke.InvokerBytecodeGenerator.addMethod()V+698 java.base@17.0.9 +j java.lang.invoke.InvokerBytecodeGenerator.generateCustomizedCodeBytes()[B+6 java.base@17.0.9 +j java.lang.invoke.InvokerBytecodeGenerator.generateCustomizedCode(Ljava/lang/invoke/LambdaForm;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MemberName;+27 java.base@17.0.9 +j java.lang.invoke.LambdaForm.compileToBytecode()V+69 java.base@17.0.9 +J 972 c1 java.lang.invoke.LambdaForm.prepare()V java.base@17.0.9 (112 bytes) @ 0x00000001182dab08 [0x00000001182daa80+0x0000000000000088] +J 971 c1 java.lang.invoke.MethodHandle.(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;)V java.base@17.0.9 (37 bytes) @ 0x00000001182da358 [0x00000001182da280+0x00000000000000d8] +j java.lang.invoke.BoundMethodHandle.(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;)V+3 java.base@17.0.9 +j java.lang.invoke.BoundMethodHandle$Species_LL.(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;Ljava/lang/Object;Ljava/lang/Object;)V+3 java.base@17.0.9 +j java.lang.invoke.BoundMethodHandle$Species_LL.make(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/invoke/BoundMethodHandle;+8 java.base@17.0.9 +j java.lang.invoke.DirectMethodHandle$Holder.invokeStatic(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+16 java.base@17.0.9 +j java.lang.invoke.BoundMethodHandle$Species_L.copyWithExtendL(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;Ljava/lang/Object;)Ljava/lang/invoke/BoundMethodHandle;+19 java.base@17.0.9 +j java.lang.invoke.MethodHandles.argumentsWithCombiner(ZLjava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;[I)Ljava/lang/invoke/MethodHandle;+122 java.base@17.0.9 +j java.lang.invoke.MethodHandles.filterArgumentsWithCombiner(Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;[I)Ljava/lang/invoke/MethodHandle;+5 java.base@17.0.9 +j java.lang.invoke.StringConcatFactory.generateMHInlineCopy(Ljava/lang/invoke/MethodType;Ljava/util/List;)Ljava/lang/invoke/MethodHandle;+387 java.base@17.0.9 +j java.lang.invoke.StringConcatFactory.makeConcatWithConstants(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;+220 java.base@17.0.9 +j java.lang.invoke.DirectMethodHandle$Holder.invokeStatic(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+18 java.base@17.0.9 +j java.lang.invoke.DelegatingMethodHandle$Holder.delegate(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+21 java.base@17.0.9 +j java.lang.invoke.Invokers$Holder.invokeExact_MT(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+26 java.base@17.0.9 +j java.lang.invoke.BootstrapMethodInvoker.invoke(Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;+157 java.base@17.0.9 +j java.lang.invoke.CallSite.makeSite(Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/invoke/CallSite;+8 java.base@17.0.9 +j java.lang.invoke.MethodHandleNatives.linkCallSiteImpl(Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;+6 java.base@17.0.9 +j java.lang.invoke.MethodHandleNatives.linkCallSite(Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;+46 java.base@17.0.9 +v ~StubRoutines::call_stub +V [libjvm.dylib+0x46c6ec] JavaCalls::call_helper(JavaValue*, methodHandle const&, JavaCallArguments*, JavaThread*)+0x38c +V [libjvm.dylib+0x46bca8] JavaCalls::call_static(JavaValue*, Klass*, Symbol*, Symbol*, JavaCallArguments*, JavaThread*)+0xc4 +V [libjvm.dylib+0x8ee334] SystemDictionary::invoke_bootstrap_method(BootstrapInfo&, JavaThread*)+0x300 +V [libjvm.dylib+0x687d34] LinkResolver::resolve_dynamic_call(CallInfo&, BootstrapInfo&, JavaThread*)+0x28 +V [libjvm.dylib+0x687570] LinkResolver::resolve_invokedynamic(CallInfo&, constantPoolHandle const&, int, JavaThread*)+0x88 +V [libjvm.dylib+0x466308] InterpreterRuntime::resolve_invokedynamic(JavaThread*)+0x128 +V [libjvm.dylib+0x466428] InterpreterRuntime::resolve_from_cache(JavaThread*, Bytecodes::Code)+0xb4 +j sun.management.Util.newObjectName(Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;+2 java.management@17.0.9 +j sun.management.MemoryManagerImpl.getObjectName()Ljavax/management/ObjectName;+6 java.management@17.0.9 +j java.lang.management.DefaultPlatformMBeanProvider$5.isMemoryManager(Ljava/lang/management/MemoryManagerMXBean;)Z+1 java.management@17.0.9 +j java.lang.management.DefaultPlatformMBeanProvider$5$$Lambda$85+0x000000b8010c7b08.test(Ljava/lang/Object;)Z+8 java.management@17.0.9 +j java.util.stream.ReferencePipeline$2$1.accept(Ljava/lang/Object;)V+8 java.base@17.0.9 +j java.util.ArrayList$ArrayListSpliterator.forEachRemaining(Ljava/util/function/Consumer;)V+95 java.base@17.0.9 +j java.util.stream.AbstractPipeline.copyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)V+32 java.base@17.0.9 +j java.util.stream.AbstractPipeline.wrapAndCopyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)Ljava/util/stream/Sink;+13 java.base@17.0.9 +j java.util.stream.ReduceOps$ReduceOp.evaluateSequential(Ljava/util/stream/PipelineHelper;Ljava/util/Spliterator;)Ljava/lang/Object;+6 java.base@17.0.9 +j java.util.stream.AbstractPipeline.evaluate(Ljava/util/stream/TerminalOp;)Ljava/lang/Object;+88 java.base@17.0.9 +j java.util.stream.ReferencePipeline.collect(Ljava/util/stream/Collector;)Ljava/lang/Object;+86 java.base@17.0.9 +j java.lang.management.DefaultPlatformMBeanProvider$5.nameToMBeanMap()Ljava/util/Map;+32 java.management@17.0.9 +j java.lang.management.ManagementFactory.lambda$getPlatformMBeanServer$0(Lsun/management/spi/PlatformMBeanProvider$PlatformComponent;)Ljava/util/stream/Stream;+1 java.management@17.0.9 +j java.lang.management.ManagementFactory$$Lambda$82+0x000000b80101d6b0.apply(Ljava/lang/Object;)Ljava/lang/Object;+4 java.management@17.0.9 +j java.util.stream.ReferencePipeline$7$1.accept(Ljava/lang/Object;)V+8 java.base@17.0.9 +j java.util.stream.ReferencePipeline$2$1.accept(Ljava/lang/Object;)V+21 java.base@17.0.9 +j java.util.HashMap$ValueSpliterator.forEachRemaining(Ljava/util/function/Consumer;)V+145 java.base@17.0.9 +j java.util.stream.AbstractPipeline.copyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)V+32 java.base@17.0.9 +j java.util.stream.AbstractPipeline.wrapAndCopyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)Ljava/util/stream/Sink;+13 java.base@17.0.9 +j java.util.stream.ForEachOps$ForEachOp.evaluateSequential(Ljava/util/stream/PipelineHelper;Ljava/util/Spliterator;)Ljava/lang/Void;+3 java.base@17.0.9 +j java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(Ljava/util/stream/PipelineHelper;Ljava/util/Spliterator;)Ljava/lang/Object;+3 java.base@17.0.9 +j java.util.stream.AbstractPipeline.evaluate(Ljava/util/stream/TerminalOp;)Ljava/lang/Object;+88 java.base@17.0.9 +j java.util.stream.ReferencePipeline.forEach(Ljava/util/function/Consumer;)V+6 java.base@17.0.9 +j java.lang.management.ManagementFactory.getPlatformMBeanServer()Ljavax/management/MBeanServer;+68 java.management@17.0.9 +j sun.management.jmxremote.ConnectorBootstrap.startLocalConnectorServer()Ljavax/management/remote/JMXConnectorServer;+88 jdk.management.agent@17.0.9 +j jdk.internal.agent.Agent.startLocalManagementAgent()V+13 jdk.management.agent@17.0.9 +j jdk.internal.agent.Agent.startAgent(Ljava/util/Properties;)V+58 jdk.management.agent@17.0.9 +j jdk.internal.agent.Agent.startAgent()V+20 jdk.management.agent@17.0.9 +v ~StubRoutines::call_stub +V [libjvm.dylib+0x46c6ec] JavaCalls::call_helper(JavaValue*, methodHandle const&, JavaCallArguments*, JavaThread*)+0x38c +V [libjvm.dylib+0x46bca8] JavaCalls::call_static(JavaValue*, Klass*, Symbol*, Symbol*, JavaCallArguments*, JavaThread*)+0xc4 +V [libjvm.dylib+0x46bd30] JavaCalls::call_static(JavaValue*, Klass*, Symbol*, Symbol*, JavaThread*)+0x4c +V [libjvm.dylib+0x724090] Management::initialize(JavaThread*)+0x118 +V [libjvm.dylib+0x91fe3c] Threads::create_vm(JavaVMInitArgs*, bool*)+0x8bc +V [libjvm.dylib+0x4e13d8] JNI_CreateJavaVM+0x6c +C [libjli.dylib+0x6e40] JavaMain+0x104 +C [libjli.dylib+0x9a80] ThreadJavaMain+0xc +C [libsystem_pthread.dylib+0x706c] _pthread_start+0x94 + + +siginfo: si_signo: 10 (SIGBUS), si_code: 1 (BUS_ADRALN), si_addr: 0x00000001180014e4 + +Register to memory mapping: + + x0=0x000000b800028000 is pointing into metadata + x1=0x00000000cafebabe is an unknown value + x2=0x000000016f1ffdc8 is pointing into the stack for thread: 0x000000011f253e00 + x3=0x0000000000000001 is an unknown value + x4=0x000000016f1fffa0 is pointing into the stack for thread: 0x000000011f253e00 + x5=0x000000016f1fffa0 is pointing into the stack for thread: 0x000000011f253e00 + x6=0x0000000055051573 is an unknown value + x7=0x000000070e86e6a0 is an oop: java.lang.invoke.MethodType$ConcurrentWeakInternSet$WeakEntry +{0x000000070e86e6a0} - klass: 'java/lang/invoke/MethodType$ConcurrentWeakInternSet$WeakEntry' + - ---- fields (total size 4 words): + - private 'referent' 'Ljava/lang/Object;' @12 a 'java/lang/invoke/MethodType'{0x000000070e818318} = ()Ljava/lang/Object; (e1d03063) + - volatile 'queue' 'Ljava/lang/ref/ReferenceQueue;' @16 a 'java/lang/ref/ReferenceQueue'{0x000000070e86d050} (e1d0da0a) + - volatile 'next' 'Ljava/lang/ref/Reference;' @20 NULL (0) + - private transient 'discovered' 'Ljava/lang/ref/Reference;' @24 NULL (0) + - public final 'hashcode' 'I' @28 1426407542 (55054076) + x8=0x00000001180014e0 is at begin+0 in a stub +StubRoutines::SafeFetch32 [0x00000001180014e0, 0x00000001180014ec] (12 bytes) + x9=0x000000016f2005a0 is pointing into the stack for thread: 0x000000011f253e00 +x10=0x0 is NULL +x11=0x000000016f2005f0 is pointing into the stack for thread: 0x000000011f253e00 +x12=0x00000000000000ab is an unknown value +x13=0x0 is NULL +x14=0x0 is NULL +x15=0x0 is NULL +x16=0x000000018b644e9c: pthread_getspecific+0 in /usr/lib/system/libsystem_pthread.dylib at 0x000000018b643000 +x17=0x0000600003ee2760 points into unknown readable memory: 0xfffffffffffffffe | fe ff ff ff ff ff ff ff +x18=0x0 is NULL +x19=0x000000b800028000 is pointing into metadata +x20=0x000000011f253e00 is a thread +x21=0x0000000000000001 is an unknown value +x22=0x0000000102a5c560: _ZN12StubRoutines25_call_stub_return_addressE+0 in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 +x23=0x0000000102a5c7b8: _ZN12StubRoutines18_safefetch32_entryE+0 in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 +x24=0x00000000cafebabe is an unknown value +x25=0x000000016f2005a0 is pointing into the stack for thread: 0x000000011f253e00 +x26=0x000000012804831c points into unknown readable memory: 00 00 00 00 +x27=0x000000012804c390 points into unknown readable memory: 0x72656e6e00000127 | 27 01 00 00 6e 6e 65 72 +x28=0x000000011831a444 is at entry_point+836 in (nmethod*)0x0000000118319f10 +Compiled method (c1) 2361 1108 1 java.lang.invoke.MemberName::getInvocationType (56 bytes) + total in heap [0x0000000118319f10,0x000000011831a7a8] = 2200 + relocation [0x000000011831a068,0x000000011831a0c8] = 96 + main code [0x000000011831a100,0x000000011831a400] = 768 + stub code [0x000000011831a400,0x000000011831a478] = 120 + metadata [0x000000011831a478,0x000000011831a4e0] = 104 + scopes data [0x000000011831a4e0,0x000000011831a5c0] = 224 + scopes pcs [0x000000011831a5c0,0x000000011831a770] = 432 + dependencies [0x000000011831a770,0x000000011831a788] = 24 + nul chk table [0x000000011831a788,0x000000011831a7a8] = 32 + + +Registers: + x0=0x000000b800028000 x1=0x00000000cafebabe x2=0x000000016f1ffdc8 x3=0x0000000000000001 + x4=0x000000016f1fffa0 x5=0x000000016f1fffa0 x6=0x0000000055051573 x7=0x000000070e86e6a0 + x8=0x00000001180014e0 x9=0x000000016f2005a0 x10=0x0000000000000000 x11=0x000000016f2005f0 +x12=0x00000000000000ab x13=0x0000000000000000 x14=0x0000000000000000 x15=0x0000000000000000 +x16=0x000000018b644e9c x17=0x0000600003ee2760 x18=0x0000000000000000 x19=0x000000b800028000 +x20=0x000000011f253e00 x21=0x0000000000000001 x22=0x0000000102a5c560 x23=0x0000000102a5c7b8 +x24=0x00000000cafebabe x25=0x000000016f2005a0 x26=0x000000012804831c x27=0x000000012804c390 +x28=0x000000011831a444 fp=0x000000016f1ffc90 lr=0x000000010265e614 sp=0x000000016f1ffc60 +pc=0x00000001180014e4 cpsr=0x0000000060001000 +Top of Stack: (sp=0x000000016f1ffc60) +0x000000016f1ffc60: 000000016f200640 000000016f2005a0 +0x000000016f1ffc70: 0000000102a5c560 000000b800028ba0 +0x000000016f1ffc80: 000000b800028000 000000b800028bf8 +0x000000016f1ffc90: 000000016f1ffcb0 000000010265ec14 +0x000000016f1ffca0: 000000016f1ffd10 000000b800028ba0 +0x000000016f1ffcb0: 000000016f1ffcd0 000000010260f6e8 +0x000000016f1ffcc0: 000000016f1ffd10 000000011f253e00 +0x000000016f1ffcd0: 000000016f1ffd00 0000000102207704 +0x000000016f1ffce0: 0000000102a5c560 0000000118005590 +0x000000016f1ffcf0: 0000000118005c60 000000011f253e00 +0x000000016f1ffd00: 000000016f1ffd80 00000001022075e0 +0x000000016f1ffd10: 000000016f2005a0 0000000118005c60 +0x000000016f1ffd20: 0000000118005590 0000000100000000 +0x000000016f1ffd30: 000000016f200640 000000016f2005a0 +0x000000016f1ffd40: 000000012804831c 000000011f2540b0 +0x000000016f1ffd50: 000000011f253e00 000000016f1fffa0 +0x000000016f1ffd60: 0000000118319f10 000000011831a444 +0x000000016f1ffd70: 000000011f253e00 000000016f1ffe90 +0x000000016f1ffd80: 000000016f1ffe20 00000001027d4fd4 +0x000000016f1ffd90: 000000016f1ffdd0 000000010230e3ec +0x000000016f1ffda0: 000000016f1ffe88 0000000118008440 +0x000000016f1ffdb0: 000000014c41d36b 0000000102a641b0 +0x000000016f1ffdc0: 000000016f2004e0 000000016f200640 +0x000000016f1ffdd0: 000000016f2004e0 000000011831a444 +0x000000016f1ffde0: 0000000118319f10 0000000100000000 +0x000000016f1ffdf0: 000000016f200640 000000016f2004e0 +0x000000016f1ffe00: 000000016f2000f8 0000000000000800 +0x000000016f1ffe10: 000000011f253e00 000000016f1fff00 +0x000000016f1ffe20: 000000016f1ffee0 0000000102204474 +0x000000016f1ffe30: 000000016f1ffe88 000000014c41d3c8 +0x000000016f1ffe40: 000000070fa513f0 0000000000000000 +0x000000016f1ffe50: 0000000000000000 000000014c41d370 + +Instructions: (pc=0x00000001180014e4) +0x00000001180013e4: 1e614000 1400003a d2842809 f2a05469 +0x00000001180013f4: f2c00029 6d425935 1e640886 0c402d31 +0x0000000118001404: 1e6408c7 1f5654d0 1e6c1017 1f5050d0 +0x0000000118001414: 1f504cd0 1f5048d0 1e650af6 1f50d8f6 +0x0000000118001424: 1f5694d6 1f5158f6 1e762880 36000501 +0x0000000118001434: 1e614000 14000026 2e251ca5 d2843009 +0x0000000118001444: f2a05469 f2c00029 6d425d36 1e600806 +0x0000000118001454: 0c402d32 1f5758c7 1e6c101a 1f4754c7 +0x0000000118001464: 1e650805 1f4750c7 d2866668 f2a7fa68 +0x0000000118001474: 1f474cc7 1e6608c0 1f4748c7 1e6e1019 +0x0000000118001484: eb08007f 540000ac 1f479400 1f460340 +0x0000000118001494: 1e603b20 1400000e d2a7fd29 eb09007f +0x00000001180014a4: 540000ac 51480069 d3607d29 9e670121 +0x00000001180014b4: 14000002 1e6a5001 1f679417 1f668742 +0x00000001180014c4: 1e613b23 1e773857 1e773860 a8c17ff3 +0x00000001180014d4: 910003bf a8c17bfd d65f03c0 b9400001 +0x00000001180014e4: aa0103e0 d65f03c0 f9400001 aa0103e0 +0x00000001180014f4: d65f03c0 00000000 00000000 00000000 +0x0000000118001504: 00000000 00000000 00000000 00000000 +0x0000000118001514: 00000000 00000000 00000000 00000000 +0x0000000118001524: 00000000 00000000 00000000 00000000 +0x0000000118001534: 00000000 00000000 00000000 00000000 +0x0000000118001544: 00000000 00000000 00000000 00000000 +0x0000000118001554: 00000000 00000000 00000000 00000000 +0x0000000118001564: 00000000 00000000 00000000 00000000 +0x0000000118001574: 00000000 00000000 00000000 00000000 +0x0000000118001584: 00000000 00000000 00000000 00000000 +0x0000000118001594: 00000000 00000000 00000000 00000000 +0x00000001180015a4: 00000000 00000000 00000000 00000000 +0x00000001180015b4: 00000000 00000000 00000000 00000000 +0x00000001180015c4: 00000000 00000000 00000000 00000000 +0x00000001180015d4: 00000000 00000000 00000000 00000000 + + +Stack slot to memory mapping: +stack at sp + 0 slots: 0x000000016f200640 is pointing into the stack for thread: 0x000000011f253e00 +stack at sp + 1 slots: 0x000000016f2005a0 is pointing into the stack for thread: 0x000000011f253e00 +stack at sp + 2 slots: 0x0000000102a5c560: _ZN12StubRoutines25_call_stub_return_addressE+0 in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 +stack at sp + 3 slots: {method} {0x000000b800028ba0} 'emitStaticInvoke' '(Ljava/lang/invoke/MemberName;Ljava/lang/invoke/LambdaForm$Name;)V' in 'java/lang/invoke/InvokerBytecodeGenerator' +stack at sp + 4 slots: 0x000000b800028000 is pointing into metadata +stack at sp + 5 slots: {method} {0x000000b800028bf8} 'emitStaticInvoke' '(Ljava/lang/invoke/LambdaForm$Name;)V' in 'java/lang/invoke/InvokerBytecodeGenerator' +stack at sp + 6 slots: 0x000000016f1ffcb0 is pointing into the stack for thread: 0x000000011f253e00 +stack at sp + 7 slots: 0x000000010265ec14: _ZN2os17is_readable_rangeEPKvS1_+0x2c in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 + +StubRoutines::SafeFetch32 [0x00000001180014e0, 0x00000001180014ec] (12 bytes) +[MachCode] + 0x00000001180014e0: 0100 40b9 | e003 01aa | c003 5fd6 +[/MachCode] + +Compiled method (c1) 2363 972 1 java.lang.invoke.LambdaForm::prepare (112 bytes) + total in heap [0x00000001182da890,0x00000001182db448] = 3000 + relocation [0x00000001182da9e8,0x00000001182daa68] = 128 + main code [0x00000001182daa80,0x00000001182dae00] = 896 + stub code [0x00000001182dae00,0x00000001182daeb8] = 184 + oops [0x00000001182daeb8,0x00000001182daec0] = 8 + metadata [0x00000001182daec0,0x00000001182daf38] = 120 + scopes data [0x00000001182daf38,0x00000001182db0d0] = 408 + scopes pcs [0x00000001182db0d0,0x00000001182db3f0] = 800 + dependencies [0x00000001182db3f0,0x00000001182db410] = 32 + nul chk table [0x00000001182db410,0x00000001182db448] = 56 + +[Constant Pool (empty)] + +[MachCode] +[Entry Point] + # {method} {0x000000b8000dff48} 'prepare' '()V' in 'java/lang/invoke/LambdaForm' + # [sp+0xa0] (sp of caller) + 0x00000001182daa80: 2808 40b9 | 3f01 086b | c001 0054 + + 0x00000001182daa8c: ; {runtime_call ic_miss_stub} + 0x00000001182daa8c: 5d75 f517 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 + 0x00000001182daaac: 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 +[Verified Entry Point] + 0x00000001182daac0: 1f20 03d5 | e953 40d1 | 3f01 00f9 | ff83 02d1 + + 0x00000001182daad0: ;*getstatic COMPILE_THRESHOLD {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@0 (line 811) + 0x00000001182daad0: fd7b 09a9 | e133 00f9 + + 0x00000001182daad8: ;*getfield invocationCounter {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::forceInterpretation@1 (line 928) + ; - java.lang.invoke.LambdaForm::prepare@7 (line 811) + 0x00000001182daad8: 2014 40b9 | 1f04 0031 | e017 9f9a | 0000 0012 | 1f00 0071 + + 0x00000001182daaec: ;*ifne {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@10 (line 811) + 0x00000001182daaec: 0101 0054 + + 0x00000001182daaf0: ;*getfield isCompiled {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@14 (line 811) + 0x00000001182daaf0: 2064 4039 | 1f00 0071 + + 0x00000001182daaf8: ;*ifne {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@17 (line 811) + 0x00000001182daaf8: a100 0054 | e003 01aa + + 0x00000001182dab00: ;*invokevirtual compileToBytecode {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@21 (line 812) + 0x00000001182dab00: e103 00aa + + 0x00000001182dab04: ; ImmutableOopMap {[96]=Oop } + ;*invokevirtual compileToBytecode {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@21 (line 812) + ; {optimized virtual_call} + 0x00000001182dab04: bf00 0094 | e133 40f9 | 2028 40b9 + + 0x00000001182dab10: ;*getfield vmentry {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@25 (line 814) + 0x00000001182dab10: 00f0 7dd3 | e203 1faa | 1f00 02eb + + 0x00000001182dab1c: ;*ifnull {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@28 (line 814) + 0x00000001182dab1c: c10d 0054 | e003 01aa + + 0x00000001182dab24: ;*invokevirtual methodType {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@33 (line 818) + 0x00000001182dab24: e103 00aa + + 0x00000001182dab28: ; ImmutableOopMap {[96]=Oop } + ;*invokevirtual methodType {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@33 (line 818) + ; {optimized virtual_call} + 0x00000001182dab28: f675 f597 | e037 00f9 + + 0x00000001182dab30: ; implicit exception: dispatches to 0x00000001182dacec + 0x00000001182dab30: 0314 40b9 + + 0x00000001182dab34: ;*getfield form {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodType::form@1 (line 163) + ; - java.lang.invoke.LambdaForm::prepare@38 (line 819) + 0x00000001182dab34: 63f0 7dd3 + + 0x00000001182dab38: ; implicit exception: dispatches to 0x00000001182dacf0 + 0x00000001182dab38: 641c 40b9 + + 0x00000001182dab3c: ;*getfield lambdaForms {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@1 (line 131) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab3c: 84f0 7dd3 + + 0x00000001182dab40: ; implicit exception: dispatches to 0x00000001182dacf4 + 0x00000001182dab40: 8a0c 40b9 | 5f19 0071 | 890d 0054 | 8428 40b9 + + 0x00000001182dab50: ;*aaload {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@5 (line 131) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab50: 84f0 7dd3 | ea03 1faa | 9f00 0aeb + + 0x00000001182dab5c: ;*ifnull {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@8 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab5c: 8003 0054 + + 0x00000001182dab60: ; implicit exception: dispatches to 0x00000001182dad10 + ;*invokevirtual get {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab60: 9f00 40f9 | 8a0c 40b9 | 4af1 7dd3 | 8be3 4039 | 7f01 0071 + + 0x00000001182dab74: ;*invokespecial get {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.ref.SoftReference::get@1 (line 112) + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab74: 010d 0054 | eb03 1faa | 5f01 0beb + + 0x00000001182dab80: ;*ifnull {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.ref.SoftReference::get@6 (line 113) + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab80: 2001 0054 + + 0x00000001182dab84: ;*getfield timestamp {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.ref.SoftReference::get@10 (line 113) + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab84: 8b10 40f9 + + 0x00000001182dab88: ; {oop(a 'java/lang/Class'{0x00000007ffd021f0} = 'java/lang/ref/SoftReference')} + 0x00000001182dab88: 023e 84d2 | 02fa bff2 | e200 c0f2 + + 0x00000001182dab94: ;*getstatic clock {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.ref.SoftReference::get@13 (line 113) + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab94: 4138 40f9 | 7f01 01eb + + 0x00000001182dab9c: ;*lcmp {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.ref.SoftReference::get@16 (line 113) + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dab9c: 4000 0054 + + 0x00000001182daba0: ;*putfield timestamp {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.ref.SoftReference::get@24 (line 114) + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182daba0: 8110 00f9 | 2a01 00b4 + + 0x00000001182daba8: ; {metadata('java/lang/invoke/LambdaForm')} + 0x00000001182daba8: 0244 9bd2 | a201 a0f2 | 0217 c0f2 | 4809 40b9 | 0817 c0f2 | 1f01 02eb | 210b 0054 + + 0x00000001182dabc4: ;*checkcast {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@15 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dabc4: 0100 0014 + + 0x00000001182dabc8: ;*goto {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@18 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dabc8: 0200 0014 + + 0x00000001182dabcc: ;*areturn {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@22 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dabcc: ea03 1faa | e303 1faa | 5f01 03eb + + 0x00000001182dabd8: ;*ifnonnull {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@48 (line 820) + 0x00000001182dabd8: a105 0054 | ea3f 00f9 + + 0x00000001182dabe0: ; {metadata('java/lang/invoke/LambdaForm')} + 0x00000001182dabe0: 0344 9bd2 | a301 a0f2 | 0317 c0f2 | e503 00aa | 8087 40f9 | 0bc0 0091 | 888f 40f9 | 7f01 08eb + 0x00000001182dac00: 6809 0054 | 8b87 00f9 | ea03 40b2 | 0a00 00f9 | ea03 032a | 0a7c 0129 | 0a40 0091 | 5f7d 00a9 + 0x00000001182dac20: 5f7d 01a9 + + 0x00000001182dac24: ;*new {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@75 (line 822) + 0x00000001182dac24: bf3a 03d5 | e03b 00f9 | e203 05aa + + 0x00000001182dac30: ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@80 (line 822) + 0x00000001182dac30: e103 00aa + + 0x00000001182dac34: ; ImmutableOopMap {[96]=Oop [112]=Oop [120]=Oop [104]=Oop } + ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@80 (line 822) + ; {optimized virtual_call} + 0x00000001182dac34: b375 f597 + + 0x00000001182dac38: ;*invokestatic generateLambdaFormInterpreterEntryPoint {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@86 (line 823) + 0x00000001182dac38: e137 40f9 + + 0x00000001182dac3c: ; ImmutableOopMap {[96]=Oop [112]=Oop [104]=Oop } + ;*invokestatic generateLambdaFormInterpreterEntryPoint {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@86 (line 823) + ; {static_call} + 0x00000001182dac3c: 3177 f597 | 82e3 4039 | 5f00 0071 | e43b 40f9 | 4107 0054 | 08fc 43d3 | 8828 00b9 | 8200 00ca + 0x00000001182dac5c: 42fc 55d3 | 5f00 00f1 + + 0x00000001182dac64: ;*putfield vmentry {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@89 (line 823) + 0x00000001182dac64: 4107 0054 | e037 40f9 | 0114 40b9 + + 0x00000001182dac70: ;*getfield form {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodType::form@1 (line 163) + ; - java.lang.invoke.LambdaForm::prepare@93 (line 824) + 0x00000001182dac70: 21f0 7dd3 + + 0x00000001182dac74: ; implicit exception: dispatches to 0x00000001182dad5c + 0x00000001182dac74: 3f00 40f9 | e207 1f32 + + 0x00000001182dac7c: ;*invokevirtual setCachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@99 (line 824) + 0x00000001182dac7c: e303 04aa + + 0x00000001182dac80: ; ImmutableOopMap {[96]=Oop [112]=Oop [104]=Oop } + ;*invokevirtual setCachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@99 (line 824) + ; {optimized virtual_call} + 0x00000001182dac80: a075 f597 + + 0x00000001182dac84: ;*aload_0 {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@103 (line 826) + 0x00000001182dac84: ea03 00aa | e037 40f9 | e133 40f9 + + 0x00000001182dac90: ; implicit exception: dispatches to 0x00000001182dad60 + 0x00000001182dac90: 4229 40b9 + + 0x00000001182dac94: ;*getfield vmentry {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@105 (line 826) + 0x00000001182dac94: 42f0 7dd3 | 80e3 4039 | 1f00 0071 | 2106 0054 | 48fc 43d3 | 2828 00b9 | 2000 02ca | 00fc 55d3 + 0x00000001182dacb4: 1f00 00f1 + + 0x00000001182dacb8: ;*putfield vmentry {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@108 (line 826) + 0x00000001182dacb8: 2106 0054 | fd7b 49a9 | ff83 0291 + + 0x00000001182dacc4: ; {poll_return} + 0x00000001182dacc4: 88a7 41f9 | ff63 28eb | 0806 0054 + + 0x00000001182dacd0: ;*return {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@111 (line 828) + 0x00000001182dacd0: c003 5fd6 | fd7b 49a9 | ff83 0291 + + 0x00000001182dacdc: ; {poll_return} + 0x00000001182dacdc: 88a7 41f9 | ff63 28eb | a805 0054 | c003 5fd6 + + 0x00000001182dacec: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop } + ;*invokevirtual form {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@38 (line 819) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182dacec: 854d f897 + + 0x00000001182dacf0: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop } + ;*invokevirtual cachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182dacf0: 844d f897 + + 0x00000001182dacf4: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } + ;*aaload {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@5 (line 131) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182dacf4: 834d f897 | e807 7fb2 | e903 04aa + + 0x00000001182dad00: ; {runtime_call throw_range_check_failed Runtime1 stub} + 0x00000001182dad00: 1e40 9bd2 | de01 a3f2 | 3e00 c0f2 + + 0x00000001182dad0c: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } + ;*aaload {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@5 (line 131) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + 0x00000001182dad0c: c003 3fd6 + + 0x00000001182dad10: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } + ;*invokevirtual get {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182dad10: 7c4d f897 | 2af3 ffb4 | ea03 00f9 + + 0x00000001182dad1c: ; {runtime_call g1_pre_barrier_slow} + 0x00000001182dad1c: 7962 f897 | 96ff ff17 | e803 0aaa + + 0x00000001182dad28: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } + ;*checkcast {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@15 (line 132) + ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) + ; {runtime_call throw_class_cast_exception Runtime1 stub} + 0x00000001182dad28: 7656 f897 + + 0x00000001182dad2c: ; ImmutableOopMap {[96]=Oop c_rarg5=Oop [104]=Oop [120]=Oop } + ;*new {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@75 (line 822) + ; {runtime_call fast_new_instance Runtime1 stub} + 0x00000001182dad2c: b54f f897 | beff ff17 | 8228 40b9 | 42f0 7dd3 | a2f8 ffb4 | e203 00f9 + + 0x00000001182dad44: ; {runtime_call g1_pre_barrier_slow} + 0x00000001182dad44: 6f62 f897 | c2ff ff17 | e0f8 ffb4 | e403 00f9 + + 0x00000001182dad54: ; {runtime_call g1_post_barrier_slow} + 0x00000001182dad54: 2b63 f897 | c4ff ff17 + + 0x00000001182dad5c: ; ImmutableOopMap {[96]=Oop c_rarg4=Oop [112]=Oop c_rarg0=Oop [104]=Oop c_rarg1=Oop } + ;*invokevirtual setCachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.LambdaForm::prepare@99 (line 824) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182dad5c: 694d f897 + + 0x00000001182dad60: ; ImmutableOopMap {r10=Oop c_rarg1=Oop [96]=Oop c_rarg0=Oop [104]=Oop } + ;*getfield vmentry {reexecute=1 rethrow=0 return_oop=0} + ; - (reexecute) java.lang.invoke.LambdaForm::prepare@105 (line 826) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182dad60: 684d f897 | 2028 40b9 | 00f0 7dd3 | c0f9 ffb4 | e003 00f9 + + 0x00000001182dad74: ; {runtime_call g1_pre_barrier_slow} + 0x00000001182dad74: 6362 f897 | cbff ff17 | 02fa ffb4 | e103 00f9 + + 0x00000001182dad84: ; {runtime_call g1_post_barrier_slow} + 0x00000001182dad84: 1f63 f897 | cdff ff17 + + 0x00000001182dad8c: ; {internal_word} + 0x00000001182dad8c: c8f9 ff10 | 88b3 01f9 + + 0x00000001182dad94: ; {runtime_call SafepointBlob} + 0x00000001182dad94: 1b8e f517 + + 0x00000001182dad98: ; {internal_word} + 0x00000001182dad98: 28fa ff10 | 88b3 01f9 + + 0x00000001182dada0: ; {runtime_call SafepointBlob} + 0x00000001182dada0: 188e f517 | 1f20 03d5 | 1f20 03d5 | 80ef 41f9 | 9fef 01f9 | 9ff3 01f9 | fd7b 49a9 | ff83 0291 + 0x00000001182dadc0: ; {runtime_call unwind_exception Runtime1 stub} + 0x00000001182dadc0: 9049 f817 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 + 0x00000001182dade0: 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 +[Stub Code] + 0x00000001182dae00: ; {no_reloc} + 0x00000001182dae00: df3f 03d5 + + 0x00000001182dae04: ; {metadata({method} {0x000000b8000dfe98} 'compileToBytecode' '()V' in 'java/lang/invoke/LambdaForm')} + 0x00000001182dae04: 0cd3 9fd2 | ac01 a0f2 | 0c17 c0f2 | 08d7 8ed2 | 6800 a3f2 | 2800 c0f2 | 0001 1fd6 + + 0x00000001182dae20: ; {static_stub} + 0x00000001182dae20: df3f 03d5 + + 0x00000001182dae24: ; {metadata(NULL)} + 0x00000001182dae24: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 + + 0x00000001182dae40: ; {static_stub} + 0x00000001182dae40: df3f 03d5 + + 0x00000001182dae44: ; {metadata(NULL)} + 0x00000001182dae44: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 + + 0x00000001182dae60: ; {static_stub} + 0x00000001182dae60: df3f 03d5 + + 0x00000001182dae64: ; {metadata(NULL)} + 0x00000001182dae64: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 + + 0x00000001182dae80: ; {static_stub} + 0x00000001182dae80: df3f 03d5 + + 0x00000001182dae84: ; {metadata(NULL)} + 0x00000001182dae84: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 +[Exception Handler] + 0x00000001182daea0: ; {runtime_call handle_exception_from_callee Runtime1 stub} + 0x00000001182daea0: 9854 f897 | c1d5 bbd4 | 8533 8d02 | 0100 0000 +[Deopt Handler Code] + 0x00000001182daeb0: 1e00 0010 + + 0x00000001182daeb4: ; {runtime_call DeoptimizationBlob} + 0x00000001182daeb4: a38e f517 +[/MachCode] + + +Compiled method (c1) 2368 971 1 java.lang.invoke.MethodHandle:: (37 bytes) + total in heap [0x00000001182da090,0x00000001182da820] = 1936 + relocation [0x00000001182da1e8,0x00000001182da248] = 96 + main code [0x00000001182da280,0x00000001182da4c0] = 576 + stub code [0x00000001182da4c0,0x00000001182da558] = 152 + metadata [0x00000001182da558,0x00000001182da5b8] = 96 + scopes data [0x00000001182da5b8,0x00000001182da680] = 200 + scopes pcs [0x00000001182da680,0x00000001182da7f0] = 368 + dependencies [0x00000001182da7f0,0x00000001182da808] = 24 + nul chk table [0x00000001182da808,0x00000001182da820] = 24 + +[Constant Pool (empty)] + +[MachCode] +[Entry Point] + # {method} {0x000000b8000c6e08} '' '(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;)V' in 'java/lang/invoke/MethodHandle' + # this: c_rarg1:c_rarg1 + = 'java/lang/invoke/MethodHandle' + # parm0: c_rarg2:c_rarg2 + = 'java/lang/invoke/MethodType' + # parm1: c_rarg3:c_rarg3 + = 'java/lang/invoke/LambdaForm' + # [sp+0x70] (sp of caller) + 0x00000001182da280: 2808 40b9 | 3f01 086b | c001 0054 + + 0x00000001182da28c: ; {runtime_call ic_miss_stub} + 0x00000001182da28c: 5d77 f517 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 + 0x00000001182da2ac: 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 +[Verified Entry Point] + 0x00000001182da2c0: 1f20 03d5 | e953 40d1 | 3f01 00f9 | ffc3 01d1 + + 0x00000001182da2d0: ;*aload_0 {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@0 (line 477) + 0x00000001182da2d0: fd7b 06a9 | e10b 03a9 | e323 00f9 | e003 1faa | 5f00 00eb + + 0x00000001182da2e4: ;*ifnonnull {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@1 (line 207) + ; - java.lang.invoke.MethodHandle::@6 (line 478) + 0x00000001182da2e4: 4007 0054 | 80e3 4039 | 1f00 0071 | a109 0054 | 48fc 43d3 | 2810 00b9 | 2000 02ca | 00fc 55d3 + 0x00000001182da304: 1f00 00f1 + + 0x00000001182da308: ;*putfield type {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@12 (line 478) + 0x00000001182da308: a109 0054 | e003 1faa | 7f00 00eb + + 0x00000001182da314: ;*ifnonnull {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@1 (line 207) + ; - java.lang.invoke.MethodHandle::@17 (line 479) + 0x00000001182da314: 0003 0054 + + 0x00000001182da318: ; implicit exception: dispatches to 0x00000001182da44c + 0x00000001182da318: 7f00 40f9 + + 0x00000001182da31c: ;*invokevirtual uncustomize {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@23 (line 479) + 0x00000001182da31c: e103 03aa + + 0x00000001182da320: ; ImmutableOopMap {[48]=Oop [56]=Oop [64]=Oop } + ;*invokevirtual uncustomize {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@23 (line 479) + ; {optimized virtual_call} + 0x00000001182da320: 7888 fd97 | 81e3 4039 | 3f00 0071 | e11b 40f9 | 0109 0054 | 08fc 43d3 | 2814 00b9 | 2200 00ca + 0x00000001182da340: 42fc 55d3 | 5f00 00f1 + + 0x00000001182da348: ;*putfield form {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@26 (line 479) + 0x00000001182da348: 0109 0054 + + 0x00000001182da34c: ; implicit exception: dispatches to 0x00000001182da478 + 0x00000001182da34c: 1f00 40f9 + + 0x00000001182da350: ;*invokevirtual prepare {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@33 (line 481) + 0x00000001182da350: e103 00aa + + 0x00000001182da354: ; ImmutableOopMap {[56]=Oop [64]=Oop [48]=Oop } + ;*invokevirtual prepare {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@33 (line 481) + ; {optimized virtual_call} + 0x00000001182da354: db01 0094 | bf3a 03d5 | fd7b 46a9 | ffc3 0191 + + 0x00000001182da364: ; {poll_return} + 0x00000001182da364: 88a7 41f9 | ff63 28eb | 8808 0054 + + 0x00000001182da370: ;*return {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@36 (line 482) + 0x00000001182da370: c003 5fd6 + + 0x00000001182da374: ; {metadata('java/lang/NullPointerException')} + 0x00000001182da374: 037b 8dd2 | 0301 a0f2 | 0317 c0f2 | 8087 40f9 | 0bc0 0091 | 888f 40f9 | 7f01 08eb | c807 0054 + 0x00000001182da394: 8b87 00f9 | ea03 40b2 | 0a00 00f9 | ea03 032a | 0a7c 0129 | 0a40 0091 | 5f7d 00a9 | 5f7d 01a9 + 0x00000001182da3b4: ;*new {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@4 (line 208) + ; - java.lang.invoke.MethodHandle::@17 (line 479) + 0x00000001182da3b4: bf3a 03d5 + + 0x00000001182da3b8: ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@8 (line 208) + ; - java.lang.invoke.MethodHandle::@17 (line 479) + 0x00000001182da3b8: e103 00aa | e027 00f9 + + 0x00000001182da3c0: ; ImmutableOopMap {[48]=Oop [64]=Oop [56]=Oop [72]=Oop } + ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@8 (line 208) + ; - java.lang.invoke.MethodHandle::@17 (line 479) + ; {optimized virtual_call} + 0x00000001182da3c0: d077 f597 | e027 40f9 + + 0x00000001182da3c8: ;*athrow {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@11 (line 208) + ; - java.lang.invoke.MethodHandle::@17 (line 479) + 0x00000001182da3c8: 3900 0014 + + 0x00000001182da3cc: ; {metadata('java/lang/NullPointerException')} + 0x00000001182da3cc: 037b 8dd2 | 0301 a0f2 | 0317 c0f2 | 8087 40f9 | 0bc0 0091 | 888f 40f9 | 7f01 08eb | 4805 0054 + 0x00000001182da3ec: 8b87 00f9 | ea03 40b2 | 0a00 00f9 | ea03 032a | 0a7c 0129 | 0a40 0091 | 5f7d 00a9 | 5f7d 01a9 + 0x00000001182da40c: ;*new {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@4 (line 208) + ; - java.lang.invoke.MethodHandle::@6 (line 478) + 0x00000001182da40c: bf3a 03d5 + + 0x00000001182da410: ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@8 (line 208) + ; - java.lang.invoke.MethodHandle::@6 (line 478) + 0x00000001182da410: e103 00aa | e02b 00f9 + + 0x00000001182da418: ; ImmutableOopMap {[48]=Oop [80]=Oop [64]=Oop [56]=Oop } + ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@8 (line 208) + ; - java.lang.invoke.MethodHandle::@6 (line 478) + ; {optimized virtual_call} + 0x00000001182da418: ba77 f597 | e02b 40f9 | 2300 0014 | 2010 40b9 | 00f0 7dd3 | 40f6 ffb4 | e003 00f9 + + 0x00000001182da434: ; {runtime_call g1_pre_barrier_slow} + 0x00000001182da434: b364 f897 | afff ff17 | 82f6 ffb4 | e103 00f9 + + 0x00000001182da444: ; {runtime_call g1_post_barrier_slow} + 0x00000001182da444: 6f65 f897 | b1ff ff17 + + 0x00000001182da44c: ; ImmutableOopMap {c_rarg3=Oop [64]=Oop [56]=Oop [48]=Oop } + ;*invokevirtual uncustomize {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@23 (line 479) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182da44c: ad4f f897 | 2214 40b9 | 42f0 7dd3 | e2f6 ffb4 | e203 00f9 + + 0x00000001182da460: ; {runtime_call g1_pre_barrier_slow} + 0x00000001182da460: a864 f897 | b4ff ff17 | 20f7 ffb4 | e103 00f9 + + 0x00000001182da470: ; {runtime_call g1_post_barrier_slow} + 0x00000001182da470: 6465 f897 | b6ff ff17 + + 0x00000001182da478: ; ImmutableOopMap {[56]=Oop [64]=Oop c_rarg0=Oop c_rarg1=Oop [48]=Oop } + ;*invokevirtual prepare {reexecute=0 rethrow=0 return_oop=0} + ; - java.lang.invoke.MethodHandle::@33 (line 481) + ; {runtime_call throw_null_pointer_exception Runtime1 stub} + 0x00000001182da478: a24f f897 + + 0x00000001182da47c: ; {internal_word} + 0x00000001182da47c: 48f7 ff10 | 88b3 01f9 + + 0x00000001182da484: ; {runtime_call SafepointBlob} + 0x00000001182da484: 5f90 f517 + + 0x00000001182da488: ; ImmutableOopMap {[48]=Oop [64]=Oop [56]=Oop } + ;*new {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@4 (line 208) + ; - java.lang.invoke.MethodHandle::@17 (line 479) + ; {runtime_call fast_new_instance Runtime1 stub} + 0x00000001182da488: de51 f897 | cbff ff17 + + 0x00000001182da490: ; ImmutableOopMap {[48]=Oop [56]=Oop [64]=Oop } + ;*new {reexecute=0 rethrow=0 return_oop=0} + ; - java.util.Objects::requireNonNull@4 (line 208) + ; - java.lang.invoke.MethodHandle::@6 (line 478) + ; {runtime_call fast_new_instance Runtime1 stub} + 0x00000001182da490: dc51 f897 | dfff ff17 | 1f20 03d5 | 1f20 03d5 | 80ef 41f9 | 9fef 01f9 | 9ff3 01f9 | fd7b 46a9 + 0x00000001182da4b0: ffc3 0191 + + 0x00000001182da4b4: ; {runtime_call unwind_exception Runtime1 stub} + 0x00000001182da4b4: d34b f817 | 0000 0000 | 0000 0000 +[Stub Code] + 0x00000001182da4c0: ; {no_reloc} + 0x00000001182da4c0: df3f 03d5 + + 0x00000001182da4c4: ; {metadata(NULL)} + 0x00000001182da4c4: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 + + 0x00000001182da4e0: ; {static_stub} + 0x00000001182da4e0: df3f 03d5 + + 0x00000001182da4e4: ; {metadata({method} {0x000000b8000dff48} 'prepare' '()V' in 'java/lang/invoke/LambdaForm')} + 0x00000001182da4e4: 0ce9 9fd2 | ac01 a0f2 | 0c17 c0f2 | 08d7 8ed2 | 6800 a3f2 | 2800 c0f2 | 0001 1fd6 + + 0x00000001182da500: ; {static_stub} + 0x00000001182da500: df3f 03d5 + + 0x00000001182da504: ; {metadata(NULL)} + 0x00000001182da504: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 + + 0x00000001182da520: ; {static_stub} + 0x00000001182da520: df3f 03d5 + + 0x00000001182da524: ; {metadata(NULL)} + 0x00000001182da524: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 +[Exception Handler] + 0x00000001182da540: ; {runtime_call handle_exception_from_callee Runtime1 stub} + 0x00000001182da540: f056 f897 | c1d5 bbd4 | 8533 8d02 | 0100 0000 +[Deopt Handler Code] + 0x00000001182da550: 1e00 0010 + + 0x00000001182da554: ; {runtime_call DeoptimizationBlob} + 0x00000001182da554: fb90 f517 +[/MachCode] + + +--------------- P R O C E S S --------------- + +Threads class SMR info: +_java_thread_list=0x0000600001c911c0, length=14, elements={ +0x000000011f253e00, 0x0000000120109200, 0x000000012010ba00, 0x000000011e846400, +0x000000012010fa00, 0x000000010a80a400, 0x000000010a80aa00, 0x000000010b01fa00, +0x000000011f254e00, 0x000000010a9b7200, 0x000000012010d600, 0x000000011e00c600, +0x000000010b031e00, 0x000000010b01ec00 +} + +Java Threads: ( => current thread ) +=>0x000000011f253e00 JavaThread "main" [_thread_in_Java, id=5379, stack(0x000000016f000000,0x000000016f203000)] + 0x0000000120109200 JavaThread "Reference Handler" daemon [_thread_blocked, id=19971, stack(0x000000016fe54000,0x0000000170057000)] + 0x000000012010ba00 JavaThread "Finalizer" daemon [_thread_blocked, id=19715, stack(0x0000000170060000,0x0000000170263000)] + 0x000000011e846400 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=22787, stack(0x0000000170384000,0x0000000170587000)] + 0x000000012010fa00 JavaThread "Service Thread" daemon [_thread_blocked, id=30723, stack(0x0000000170590000,0x0000000170793000)] + 0x000000010a80a400 JavaThread "Monitor Deflation Thread" daemon [_thread_blocked, id=23043, stack(0x000000017079c000,0x000000017099f000)] + 0x000000010a80aa00 JavaThread "C1 CompilerThread0" daemon [_thread_blocked, id=23555, stack(0x00000001709a8000,0x0000000170bab000)] + 0x000000010b01fa00 JavaThread "Sweeper thread" daemon [_thread_blocked, id=29955, stack(0x0000000170bb4000,0x0000000170db7000)] + 0x000000011f254e00 JavaThread "Common-Cleaner" daemon [_thread_blocked, id=29699, stack(0x0000000170dc0000,0x0000000170fc3000)] + 0x000000010a9b7200 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=24323, stack(0x0000000170fcc000,0x00000001711cf000)] + 0x000000012010d600 JavaThread "JFR Recorder Thread" daemon [_thread_blocked, id=24579, stack(0x00000001711d8000,0x00000001713db000)] + 0x000000011e00c600 JavaThread "JFR Periodic Tasks" daemon [_thread_blocked, id=25091, stack(0x00000001713e4000,0x00000001715e7000)] + 0x000000010b031e00 JavaThread "Async-profiler Timer" daemon [_thread_in_native, id=27139, stack(0x00000001720b8000,0x00000001722bb000)] + 0x000000010b01ec00 JavaThread "Notification Thread" daemon [_thread_blocked, id=26627, stack(0x00000001722c4000,0x00000001724c7000)] + +Other Threads: + 0x000000011df0dd50 VMThread "VM Thread" [stack: 0x000000016fc48000,0x000000016fe4b000] [id=20227] + 0x000000010de729d0 GCTaskThread "GC Thread#0" [stack: 0x000000016f20c000,0x000000016f40f000] [id=12035] + 0x000000010de8dda0 GCTaskThread "GC Thread#1" [stack: 0x00000001715f0000,0x00000001717f3000] [id=29187] + 0x000000010de8e220 GCTaskThread "GC Thread#2" [stack: 0x00000001717fc000,0x00000001719ff000] [id=25859] + 0x00000001012ad4c0 GCTaskThread "GC Thread#3" [stack: 0x0000000171a08000,0x0000000171c0b000] [id=28931] + 0x00000001012add30 GCTaskThread "GC Thread#4" [stack: 0x0000000171c14000,0x0000000171e17000] [id=28419] + 0x00000001012ae5a0 GCTaskThread "GC Thread#5" [stack: 0x0000000171e20000,0x0000000172023000] [id=28163] + 0x000000010de73080 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000016f418000,0x000000016f61b000] [id=13827] + 0x000000010de73910 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000016f624000,0x000000016f827000] [id=12803] + 0x000000010126fef0 ConcurrentGCThread "G1 Refine#0" [stack: 0x000000016f830000,0x000000016fa33000] [id=21507] + 0x0000000101270790 ConcurrentGCThread "G1 Service" [stack: 0x000000016fa3c000,0x000000016fc3f000] [id=16899] + +Threads with active compile tasks: + +VM state: not at safepoint (normal execution) + +VM Mutex/Monitor currently owned by a thread: None + +Heap address: 0x0000000700000000, size: 4096 MB, Compressed Oops mode: Zero based, Oop shift amount: 3 + +CDS archive(s) mapped at: [0x000000b800000000-0x000000b800be4000-0x000000b800be4000), size 12468224, SharedBaseAddress: 0x000000b800000000, ArchiveRelocationMode: 1. +Compressed class space mapped at: 0x000000b801000000-0x000000b841000000, reserved size: 1073741824 +Narrow klass base: 0x000000b800000000, Narrow klass shift: 0, Narrow klass range: 0x100000000 + +GC Precious Log: + CPUs: 10 total, 10 available + Memory: 16384M + Large Page Support: Disabled + NUMA Support: Disabled + Compressed Oops: Enabled (Zero based) + Heap Region Size: 2M + Heap Min Capacity: 8M + Heap Initial Capacity: 256M + Heap Max Capacity: 4G + Pre-touch: Disabled + Parallel Workers: 9 + Concurrent Workers: 2 + Concurrent Refinement Workers: 9 + Periodic GC: Disabled + +Heap: + garbage-first heap total 266240K, used 13372K [0x0000000700000000, 0x0000000800000000) + region size 2048K, 5 young (10240K), 2 survivors (4096K) + Metaspace used 4334K, committed 4480K, reserved 1114112K + class space used 537K, committed 640K, reserved 1048576K + +Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next) +| 0|0x0000000700000000, 0x0000000700200000, 0x0000000700200000|100%| O| |TAMS 0x0000000700000000, 0x0000000700000000| Untracked +| 1|0x0000000700200000, 0x0000000700317000, 0x0000000700400000| 54%| O| |TAMS 0x0000000700200000, 0x0000000700200000| Untracked +| 2|0x0000000700400000, 0x0000000700400000, 0x0000000700600000| 0%| F| |TAMS 0x0000000700400000, 0x0000000700400000| Untracked +| 3|0x0000000700600000, 0x0000000700600000, 0x0000000700800000| 0%| F| |TAMS 0x0000000700600000, 0x0000000700600000| Untracked +| 4|0x0000000700800000, 0x0000000700800000, 0x0000000700a00000| 0%| F| |TAMS 0x0000000700800000, 0x0000000700800000| Untracked +| 5|0x0000000700a00000, 0x0000000700a00000, 0x0000000700c00000| 0%| F| |TAMS 0x0000000700a00000, 0x0000000700a00000| Untracked +| 6|0x0000000700c00000, 0x0000000700c00000, 0x0000000700e00000| 0%| F| |TAMS 0x0000000700c00000, 0x0000000700c00000| Untracked +| 7|0x0000000700e00000, 0x0000000700e00000, 0x0000000701000000| 0%| F| |TAMS 0x0000000700e00000, 0x0000000700e00000| Untracked +| 8|0x0000000701000000, 0x0000000701000000, 0x0000000701200000| 0%| F| |TAMS 0x0000000701000000, 0x0000000701000000| Untracked +| 9|0x0000000701200000, 0x0000000701200000, 0x0000000701400000| 0%| F| |TAMS 0x0000000701200000, 0x0000000701200000| Untracked +| 10|0x0000000701400000, 0x0000000701400000, 0x0000000701600000| 0%| F| |TAMS 0x0000000701400000, 0x0000000701400000| Untracked +| 11|0x0000000701600000, 0x0000000701600000, 0x0000000701800000| 0%| F| |TAMS 0x0000000701600000, 0x0000000701600000| Untracked +| 12|0x0000000701800000, 0x0000000701800000, 0x0000000701a00000| 0%| F| |TAMS 0x0000000701800000, 0x0000000701800000| Untracked +| 13|0x0000000701a00000, 0x0000000701a00000, 0x0000000701c00000| 0%| F| |TAMS 0x0000000701a00000, 0x0000000701a00000| Untracked +| 14|0x0000000701c00000, 0x0000000701c00000, 0x0000000701e00000| 0%| F| |TAMS 0x0000000701c00000, 0x0000000701c00000| Untracked +| 15|0x0000000701e00000, 0x0000000701e00000, 0x0000000702000000| 0%| F| |TAMS 0x0000000701e00000, 0x0000000701e00000| Untracked +| 16|0x0000000702000000, 0x0000000702000000, 0x0000000702200000| 0%| F| |TAMS 0x0000000702000000, 0x0000000702000000| Untracked +| 17|0x0000000702200000, 0x0000000702200000, 0x0000000702400000| 0%| F| |TAMS 0x0000000702200000, 0x0000000702200000| Untracked +| 18|0x0000000702400000, 0x0000000702400000, 0x0000000702600000| 0%| F| |TAMS 0x0000000702400000, 0x0000000702400000| Untracked +| 19|0x0000000702600000, 0x0000000702600000, 0x0000000702800000| 0%| F| |TAMS 0x0000000702600000, 0x0000000702600000| Untracked +| 20|0x0000000702800000, 0x0000000702800000, 0x0000000702a00000| 0%| F| |TAMS 0x0000000702800000, 0x0000000702800000| Untracked +| 21|0x0000000702a00000, 0x0000000702a00000, 0x0000000702c00000| 0%| F| |TAMS 0x0000000702a00000, 0x0000000702a00000| Untracked +| 22|0x0000000702c00000, 0x0000000702c00000, 0x0000000702e00000| 0%| F| |TAMS 0x0000000702c00000, 0x0000000702c00000| Untracked +| 23|0x0000000702e00000, 0x0000000702e00000, 0x0000000703000000| 0%| F| |TAMS 0x0000000702e00000, 0x0000000702e00000| Untracked +| 24|0x0000000703000000, 0x0000000703000000, 0x0000000703200000| 0%| F| |TAMS 0x0000000703000000, 0x0000000703000000| Untracked +| 25|0x0000000703200000, 0x0000000703200000, 0x0000000703400000| 0%| F| |TAMS 0x0000000703200000, 0x0000000703200000| Untracked +| 26|0x0000000703400000, 0x0000000703400000, 0x0000000703600000| 0%| F| |TAMS 0x0000000703400000, 0x0000000703400000| Untracked +| 27|0x0000000703600000, 0x0000000703600000, 0x0000000703800000| 0%| F| |TAMS 0x0000000703600000, 0x0000000703600000| Untracked +| 28|0x0000000703800000, 0x0000000703800000, 0x0000000703a00000| 0%| F| |TAMS 0x0000000703800000, 0x0000000703800000| Untracked +| 29|0x0000000703a00000, 0x0000000703a00000, 0x0000000703c00000| 0%| F| |TAMS 0x0000000703a00000, 0x0000000703a00000| Untracked +| 30|0x0000000703c00000, 0x0000000703c00000, 0x0000000703e00000| 0%| F| |TAMS 0x0000000703c00000, 0x0000000703c00000| Untracked +| 31|0x0000000703e00000, 0x0000000703e00000, 0x0000000704000000| 0%| F| |TAMS 0x0000000703e00000, 0x0000000703e00000| Untracked +| 32|0x0000000704000000, 0x0000000704000000, 0x0000000704200000| 0%| F| |TAMS 0x0000000704000000, 0x0000000704000000| Untracked +| 33|0x0000000704200000, 0x0000000704200000, 0x0000000704400000| 0%| F| |TAMS 0x0000000704200000, 0x0000000704200000| Untracked +| 34|0x0000000704400000, 0x0000000704400000, 0x0000000704600000| 0%| F| |TAMS 0x0000000704400000, 0x0000000704400000| Untracked +| 35|0x0000000704600000, 0x0000000704600000, 0x0000000704800000| 0%| F| |TAMS 0x0000000704600000, 0x0000000704600000| Untracked +| 36|0x0000000704800000, 0x0000000704800000, 0x0000000704a00000| 0%| F| |TAMS 0x0000000704800000, 0x0000000704800000| Untracked +| 37|0x0000000704a00000, 0x0000000704a00000, 0x0000000704c00000| 0%| F| |TAMS 0x0000000704a00000, 0x0000000704a00000| Untracked +| 38|0x0000000704c00000, 0x0000000704c00000, 0x0000000704e00000| 0%| F| |TAMS 0x0000000704c00000, 0x0000000704c00000| Untracked +| 39|0x0000000704e00000, 0x0000000704e00000, 0x0000000705000000| 0%| F| |TAMS 0x0000000704e00000, 0x0000000704e00000| Untracked +| 40|0x0000000705000000, 0x0000000705000000, 0x0000000705200000| 0%| F| |TAMS 0x0000000705000000, 0x0000000705000000| Untracked +| 41|0x0000000705200000, 0x0000000705200000, 0x0000000705400000| 0%| F| |TAMS 0x0000000705200000, 0x0000000705200000| Untracked +| 42|0x0000000705400000, 0x0000000705400000, 0x0000000705600000| 0%| F| |TAMS 0x0000000705400000, 0x0000000705400000| Untracked +| 43|0x0000000705600000, 0x0000000705600000, 0x0000000705800000| 0%| F| |TAMS 0x0000000705600000, 0x0000000705600000| Untracked +| 44|0x0000000705800000, 0x0000000705800000, 0x0000000705a00000| 0%| F| |TAMS 0x0000000705800000, 0x0000000705800000| Untracked +| 45|0x0000000705a00000, 0x0000000705a00000, 0x0000000705c00000| 0%| F| |TAMS 0x0000000705a00000, 0x0000000705a00000| Untracked +| 46|0x0000000705c00000, 0x0000000705c00000, 0x0000000705e00000| 0%| F| |TAMS 0x0000000705c00000, 0x0000000705c00000| Untracked +| 47|0x0000000705e00000, 0x0000000705e00000, 0x0000000706000000| 0%| F| |TAMS 0x0000000705e00000, 0x0000000705e00000| Untracked +| 48|0x0000000706000000, 0x0000000706000000, 0x0000000706200000| 0%| F| |TAMS 0x0000000706000000, 0x0000000706000000| Untracked +| 49|0x0000000706200000, 0x0000000706200000, 0x0000000706400000| 0%| F| |TAMS 0x0000000706200000, 0x0000000706200000| Untracked +| 50|0x0000000706400000, 0x0000000706400000, 0x0000000706600000| 0%| F| |TAMS 0x0000000706400000, 0x0000000706400000| Untracked +| 51|0x0000000706600000, 0x0000000706600000, 0x0000000706800000| 0%| F| |TAMS 0x0000000706600000, 0x0000000706600000| Untracked +| 52|0x0000000706800000, 0x0000000706800000, 0x0000000706a00000| 0%| F| |TAMS 0x0000000706800000, 0x0000000706800000| Untracked +| 53|0x0000000706a00000, 0x0000000706a00000, 0x0000000706c00000| 0%| F| |TAMS 0x0000000706a00000, 0x0000000706a00000| Untracked +| 54|0x0000000706c00000, 0x0000000706c00000, 0x0000000706e00000| 0%| F| |TAMS 0x0000000706c00000, 0x0000000706c00000| Untracked +| 55|0x0000000706e00000, 0x0000000706e00000, 0x0000000707000000| 0%| F| |TAMS 0x0000000706e00000, 0x0000000706e00000| Untracked +| 56|0x0000000707000000, 0x0000000707000000, 0x0000000707200000| 0%| F| |TAMS 0x0000000707000000, 0x0000000707000000| Untracked +| 57|0x0000000707200000, 0x0000000707200000, 0x0000000707400000| 0%| F| |TAMS 0x0000000707200000, 0x0000000707200000| Untracked +| 58|0x0000000707400000, 0x0000000707400000, 0x0000000707600000| 0%| F| |TAMS 0x0000000707400000, 0x0000000707400000| Untracked +| 59|0x0000000707600000, 0x0000000707600000, 0x0000000707800000| 0%| F| |TAMS 0x0000000707600000, 0x0000000707600000| Untracked +| 60|0x0000000707800000, 0x0000000707800000, 0x0000000707a00000| 0%| F| |TAMS 0x0000000707800000, 0x0000000707800000| Untracked +| 61|0x0000000707a00000, 0x0000000707a00000, 0x0000000707c00000| 0%| F| |TAMS 0x0000000707a00000, 0x0000000707a00000| Untracked +| 62|0x0000000707c00000, 0x0000000707c00000, 0x0000000707e00000| 0%| F| |TAMS 0x0000000707c00000, 0x0000000707c00000| Untracked +| 63|0x0000000707e00000, 0x0000000707e00000, 0x0000000708000000| 0%| F| |TAMS 0x0000000707e00000, 0x0000000707e00000| Untracked +| 64|0x0000000708000000, 0x0000000708000000, 0x0000000708200000| 0%| F| |TAMS 0x0000000708000000, 0x0000000708000000| Untracked +| 65|0x0000000708200000, 0x0000000708200000, 0x0000000708400000| 0%| F| |TAMS 0x0000000708200000, 0x0000000708200000| Untracked +| 66|0x0000000708400000, 0x0000000708400000, 0x0000000708600000| 0%| F| |TAMS 0x0000000708400000, 0x0000000708400000| Untracked +| 67|0x0000000708600000, 0x0000000708600000, 0x0000000708800000| 0%| F| |TAMS 0x0000000708600000, 0x0000000708600000| Untracked +| 68|0x0000000708800000, 0x0000000708800000, 0x0000000708a00000| 0%| F| |TAMS 0x0000000708800000, 0x0000000708800000| Untracked +| 69|0x0000000708a00000, 0x0000000708a00000, 0x0000000708c00000| 0%| F| |TAMS 0x0000000708a00000, 0x0000000708a00000| Untracked +| 70|0x0000000708c00000, 0x0000000708c00000, 0x0000000708e00000| 0%| F| |TAMS 0x0000000708c00000, 0x0000000708c00000| Untracked +| 71|0x0000000708e00000, 0x0000000708e00000, 0x0000000709000000| 0%| F| |TAMS 0x0000000708e00000, 0x0000000708e00000| Untracked +| 72|0x0000000709000000, 0x0000000709000000, 0x0000000709200000| 0%| F| |TAMS 0x0000000709000000, 0x0000000709000000| Untracked +| 73|0x0000000709200000, 0x0000000709200000, 0x0000000709400000| 0%| F| |TAMS 0x0000000709200000, 0x0000000709200000| Untracked +| 74|0x0000000709400000, 0x0000000709400000, 0x0000000709600000| 0%| F| |TAMS 0x0000000709400000, 0x0000000709400000| Untracked +| 75|0x0000000709600000, 0x0000000709600000, 0x0000000709800000| 0%| F| |TAMS 0x0000000709600000, 0x0000000709600000| Untracked +| 76|0x0000000709800000, 0x0000000709800000, 0x0000000709a00000| 0%| F| |TAMS 0x0000000709800000, 0x0000000709800000| Untracked +| 77|0x0000000709a00000, 0x0000000709a00000, 0x0000000709c00000| 0%| F| |TAMS 0x0000000709a00000, 0x0000000709a00000| Untracked +| 78|0x0000000709c00000, 0x0000000709c00000, 0x0000000709e00000| 0%| F| |TAMS 0x0000000709c00000, 0x0000000709c00000| Untracked +| 79|0x0000000709e00000, 0x0000000709e00000, 0x000000070a000000| 0%| F| |TAMS 0x0000000709e00000, 0x0000000709e00000| Untracked +| 80|0x000000070a000000, 0x000000070a000000, 0x000000070a200000| 0%| F| |TAMS 0x000000070a000000, 0x000000070a000000| Untracked +| 81|0x000000070a200000, 0x000000070a200000, 0x000000070a400000| 0%| F| |TAMS 0x000000070a200000, 0x000000070a200000| Untracked +| 82|0x000000070a400000, 0x000000070a400000, 0x000000070a600000| 0%| F| |TAMS 0x000000070a400000, 0x000000070a400000| Untracked +| 83|0x000000070a600000, 0x000000070a600000, 0x000000070a800000| 0%| F| |TAMS 0x000000070a600000, 0x000000070a600000| Untracked +| 84|0x000000070a800000, 0x000000070a800000, 0x000000070aa00000| 0%| F| |TAMS 0x000000070a800000, 0x000000070a800000| Untracked +| 85|0x000000070aa00000, 0x000000070aa00000, 0x000000070ac00000| 0%| F| |TAMS 0x000000070aa00000, 0x000000070aa00000| Untracked +| 86|0x000000070ac00000, 0x000000070ac00000, 0x000000070ae00000| 0%| F| |TAMS 0x000000070ac00000, 0x000000070ac00000| Untracked +| 87|0x000000070ae00000, 0x000000070ae00000, 0x000000070b000000| 0%| F| |TAMS 0x000000070ae00000, 0x000000070ae00000| Untracked +| 88|0x000000070b000000, 0x000000070b000000, 0x000000070b200000| 0%| F| |TAMS 0x000000070b000000, 0x000000070b000000| Untracked +| 89|0x000000070b200000, 0x000000070b200000, 0x000000070b400000| 0%| F| |TAMS 0x000000070b200000, 0x000000070b200000| Untracked +| 90|0x000000070b400000, 0x000000070b400000, 0x000000070b600000| 0%| F| |TAMS 0x000000070b400000, 0x000000070b400000| Untracked +| 91|0x000000070b600000, 0x000000070b600000, 0x000000070b800000| 0%| F| |TAMS 0x000000070b600000, 0x000000070b600000| Untracked +| 92|0x000000070b800000, 0x000000070b800000, 0x000000070ba00000| 0%| F| |TAMS 0x000000070b800000, 0x000000070b800000| Untracked +| 93|0x000000070ba00000, 0x000000070ba00000, 0x000000070bc00000| 0%| F| |TAMS 0x000000070ba00000, 0x000000070ba00000| Untracked +| 94|0x000000070bc00000, 0x000000070bc00000, 0x000000070be00000| 0%| F| |TAMS 0x000000070bc00000, 0x000000070bc00000| Untracked +| 95|0x000000070be00000, 0x000000070be00000, 0x000000070c000000| 0%| F| |TAMS 0x000000070be00000, 0x000000070be00000| Untracked +| 96|0x000000070c000000, 0x000000070c000000, 0x000000070c200000| 0%| F| |TAMS 0x000000070c000000, 0x000000070c000000| Untracked +| 97|0x000000070c200000, 0x000000070c200000, 0x000000070c400000| 0%| F| |TAMS 0x000000070c200000, 0x000000070c200000| Untracked +| 98|0x000000070c400000, 0x000000070c400000, 0x000000070c600000| 0%| F| |TAMS 0x000000070c400000, 0x000000070c400000| Untracked +| 99|0x000000070c600000, 0x000000070c600000, 0x000000070c800000| 0%| F| |TAMS 0x000000070c600000, 0x000000070c600000| Untracked +| 100|0x000000070c800000, 0x000000070c800000, 0x000000070ca00000| 0%| F| |TAMS 0x000000070c800000, 0x000000070c800000| Untracked +| 101|0x000000070ca00000, 0x000000070ca00000, 0x000000070cc00000| 0%| F| |TAMS 0x000000070ca00000, 0x000000070ca00000| Untracked +| 102|0x000000070cc00000, 0x000000070cc00000, 0x000000070ce00000| 0%| F| |TAMS 0x000000070cc00000, 0x000000070cc00000| Untracked +| 103|0x000000070ce00000, 0x000000070ce00000, 0x000000070d000000| 0%| F| |TAMS 0x000000070ce00000, 0x000000070ce00000| Untracked +| 104|0x000000070d000000, 0x000000070d000000, 0x000000070d200000| 0%| F| |TAMS 0x000000070d000000, 0x000000070d000000| Untracked +| 105|0x000000070d200000, 0x000000070d200000, 0x000000070d400000| 0%| F| |TAMS 0x000000070d200000, 0x000000070d200000| Untracked +| 106|0x000000070d400000, 0x000000070d400000, 0x000000070d600000| 0%| F| |TAMS 0x000000070d400000, 0x000000070d400000| Untracked +| 107|0x000000070d600000, 0x000000070d600000, 0x000000070d800000| 0%| F| |TAMS 0x000000070d600000, 0x000000070d600000| Untracked +| 108|0x000000070d800000, 0x000000070d800000, 0x000000070da00000| 0%| F| |TAMS 0x000000070d800000, 0x000000070d800000| Untracked +| 109|0x000000070da00000, 0x000000070da00000, 0x000000070dc00000| 0%| F| |TAMS 0x000000070da00000, 0x000000070da00000| Untracked +| 110|0x000000070dc00000, 0x000000070dc00000, 0x000000070de00000| 0%| F| |TAMS 0x000000070dc00000, 0x000000070dc00000| Untracked +| 111|0x000000070de00000, 0x000000070de00000, 0x000000070e000000| 0%| F| |TAMS 0x000000070de00000, 0x000000070de00000| Untracked +| 112|0x000000070e000000, 0x000000070e000000, 0x000000070e200000| 0%| F| |TAMS 0x000000070e000000, 0x000000070e000000| Untracked +| 113|0x000000070e200000, 0x000000070e200000, 0x000000070e400000| 0%| F| |TAMS 0x000000070e200000, 0x000000070e200000| Untracked +| 114|0x000000070e400000, 0x000000070e400000, 0x000000070e600000| 0%| F| |TAMS 0x000000070e400000, 0x000000070e400000| Untracked +| 115|0x000000070e600000, 0x000000070e800000, 0x000000070e800000|100%| S|CS|TAMS 0x000000070e600000, 0x000000070e600000| Complete +| 116|0x000000070e800000, 0x000000070ea00000, 0x000000070ea00000|100%| S|CS|TAMS 0x000000070e800000, 0x000000070e800000| Complete +| 117|0x000000070ea00000, 0x000000070ea00000, 0x000000070ec00000| 0%| F| |TAMS 0x000000070ea00000, 0x000000070ea00000| Untracked +| 118|0x000000070ec00000, 0x000000070ec00000, 0x000000070ee00000| 0%| F| |TAMS 0x000000070ec00000, 0x000000070ec00000| Untracked +| 119|0x000000070ee00000, 0x000000070ee00000, 0x000000070f000000| 0%| F| |TAMS 0x000000070ee00000, 0x000000070ee00000| Untracked +| 120|0x000000070f000000, 0x000000070f000000, 0x000000070f200000| 0%| F| |TAMS 0x000000070f000000, 0x000000070f000000| Untracked +| 121|0x000000070f200000, 0x000000070f200000, 0x000000070f400000| 0%| F| |TAMS 0x000000070f200000, 0x000000070f200000| Untracked +| 122|0x000000070f400000, 0x000000070f400000, 0x000000070f600000| 0%| F| |TAMS 0x000000070f400000, 0x000000070f400000| Untracked +| 123|0x000000070f600000, 0x000000070f600000, 0x000000070f800000| 0%| F| |TAMS 0x000000070f600000, 0x000000070f600000| Untracked +| 124|0x000000070f800000, 0x000000070f800000, 0x000000070fa00000| 0%| F| |TAMS 0x000000070f800000, 0x000000070f800000| Untracked +| 125|0x000000070fa00000, 0x000000070fac2d98, 0x000000070fc00000| 38%| E| |TAMS 0x000000070fa00000, 0x000000070fa00000| Complete +| 126|0x000000070fc00000, 0x000000070fe00000, 0x000000070fe00000|100%| E|CS|TAMS 0x000000070fc00000, 0x000000070fc00000| Complete +| 127|0x000000070fe00000, 0x0000000710000000, 0x0000000710000000|100%| E|CS|TAMS 0x000000070fe00000, 0x000000070fe00000| Complete +|2046|0x00000007ffc00000, 0x00000007ffd78000, 0x00000007ffe00000| 73%|OA| |TAMS 0x00000007ffc00000, 0x00000007ffc00000| Untracked +|2047|0x00000007ffe00000, 0x00000007ffe80000, 0x0000000800000000| 25%|CA| |TAMS 0x00000007ffe00000, 0x00000007ffe00000| Untracked + +Card table byte_map: [0x000000010c000000,0x000000010c800000] _byte_map_base: 0x0000000108800000 + +Marking Bits (Prev, Next): (CMBitMap*) 0x0000000120011610, (CMBitMap*) 0x0000000120011650 + Prev Bits: [0x0000000120800000, 0x0000000124800000) + Next Bits: [0x0000000148000000, 0x000000014c000000) + +Polling page: 0x0000000100ee4000 + +Metaspace: + +Usage: + Non-class: 3.71 MB used. + Class: 537.78 KB used. + Both: 4.23 MB used. + +Virtual space: + Non-class space: 64.00 MB reserved, 3.75 MB ( 6%) committed, 1 nodes. + Class space: 1.00 GB reserved, 640.00 KB ( <1%) committed, 1 nodes. + Both: 1.06 GB reserved, 4.38 MB ( <1%) committed. + +Chunk freelists: + Non-Class: 11.88 MB + Class: 15.24 MB + Both: 27.12 MB + +MaxMetaspaceSize: unlimited +CompressedClassSpaceSize: 1.00 GB +Initial GC threshold: 21.00 MB +Current GC threshold: 21.00 MB +CDS: on +MetaspaceReclaimPolicy: balanced + - commit_granule_bytes: 65536. + - commit_granule_words: 8192. + - virtual_space_node_default_size: 8388608. + - enlarge_chunks_in_place: 1. + - new_chunks_are_fully_committed: 0. + - uncommit_free_chunks: 1. + - use_allocation_guard: 0. + - handle_deallocations: 1. + + +Internal statistics: + +num_allocs_failed_limit: 0. +num_arena_births: 98. +num_arena_deaths: 0. +num_vsnodes_births: 2. +num_vsnodes_deaths: 0. +num_space_committed: 70. +num_space_uncommitted: 0. +num_chunks_returned_to_freelist: 0. +num_chunks_taken_from_freelist: 121. +num_chunk_merges: 0. +num_chunk_splits: 70. +num_chunks_enlarged: 34. +num_inconsistent_stats: 0. + +CodeCache: size=49152Kb used=3383Kb max_used=3383Kb free=45768Kb + bounds [0x0000000118000000, 0x0000000118350000, 0x000000011b000000] + total_blobs=1683 nmethods=1242 adapters=372 + compilation: enabled + stopped_count=0, restarted_count=0 + full_count=0 + +Compilation events (20 events): +Event: 2.355 Thread 0x000000010a80aa00 nmethod 1230 0x0000000118346b90 code [0x0000000118346d00, 0x0000000118346d98] +Event: 2.355 Thread 0x000000010a80aa00 1232 1 java.lang.reflect.Method::getRoot (5 bytes) +Event: 2.355 Thread 0x000000010a80aa00 nmethod 1232 0x0000000118346e90 code [0x0000000118347000, 0x00000001183470d8] +Event: 2.355 Thread 0x000000010a80aa00 1233 1 com.sun.jmx.mbeanserver.MXBeanMapping::getOpenType (5 bytes) +Event: 2.355 Thread 0x000000010a80aa00 nmethod 1233 0x0000000118347190 code [0x0000000118347300, 0x0000000118347398] +Event: 2.355 Thread 0x000000010a80aa00 1234 1 java.util.TreeMap::addEntryToEmptyMap (37 bytes) +Event: 2.355 Thread 0x000000010a80aa00 nmethod 1234 0x0000000118347490 code [0x0000000118347640, 0x0000000118347958] +Event: 2.355 Thread 0x000000010a80aa00 1237 1 java.util.TreeMap::getEntry (77 bytes) +Event: 2.356 Thread 0x000000010a80aa00 nmethod 1237 0x0000000118347c10 code [0x0000000118347e00, 0x00000001183480b8] +Event: 2.356 Thread 0x000000010a80aa00 1235 1 java.util.TreeMap::compare (32 bytes) +Event: 2.356 Thread 0x000000010a80aa00 nmethod 1235 0x0000000118348410 code [0x00000001183485c0, 0x0000000118348798] +Event: 2.356 Thread 0x000000010a80aa00 1236 1 java.util.TreeMap::containsKey (14 bytes) +Event: 2.356 Thread 0x000000010a80aa00 nmethod 1236 0x0000000118348910 code [0x0000000118348ac0, 0x0000000118348bb8] +Event: 2.356 Thread 0x000000010a80aa00 1239 1 jdk.internal.org.objectweb.asm.ClassReader:: (371 bytes) +Event: 2.356 Thread 0x000000010a80aa00 nmethod 1239 0x0000000118349290 code [0x0000000118349500, 0x000000011834a118] +Event: 2.356 Thread 0x000000010a80aa00 1242 1 java.lang.invoke.TypeConvertingMethodAdapter::descriptorToName (36 bytes) +Event: 2.357 Thread 0x000000010a80aa00 nmethod 1242 0x000000011834ae10 code [0x000000011834b000, 0x000000011834b338] +Event: 2.357 Thread 0x000000010a80aa00 1241 1 java.lang.invoke.MethodHandles$Lookup::hasFullPrivilegeAccess (18 bytes) +Event: 2.357 Thread 0x000000010a80aa00 nmethod 1241 0x000000011834b990 code [0x000000011834bb00, 0x000000011834bbd8] +Event: 2.357 Thread 0x000000010a80aa00 1240 1 sun.invoke.util.VerifyAccess::isMemberAccessible (338 bytes) + +GC Heap History (2 events): +Event: 2.318 GC heap before +{Heap before GC invocations=0 (full 0): + garbage-first heap total 266240K, used 22496K [0x0000000700000000, 0x0000000800000000) + region size 2048K, 11 young (22528K), 0 survivors (0K) + Metaspace used 2993K, committed 3200K, reserved 1114112K + class space used 366K, committed 448K, reserved 1048576K +} +Event: 2.319 GC heap after +{Heap after GC invocations=1 (full 0): + garbage-first heap total 266240K, used 9276K [0x0000000700000000, 0x0000000800000000) + region size 2048K, 2 young (4096K), 2 survivors (4096K) + Metaspace used 2993K, committed 3200K, reserved 1114112K + class space used 366K, committed 448K, reserved 1048576K +} + +Deoptimization events (6 events): +Event: 2.273 Thread 0x000000011f253e00 DEOPT PACKING pc=0x000000011823a518 sp=0x000000016f200970 +Event: 2.273 Thread 0x000000011f253e00 DEOPT UNPACKING pc=0x000000011803eb7c sp=0x000000016f200660 mode 3 +Event: 2.278 Thread 0x000000011f253e00 DEOPT PACKING pc=0x00000001181ffb8c sp=0x000000016f201a20 +Event: 2.278 Thread 0x000000011f253e00 DEOPT UNPACKING pc=0x000000011803eb7c sp=0x000000016f201790 mode 3 +Event: 2.304 Thread 0x000000011f253e00 DEOPT PACKING pc=0x00000001182b3f74 sp=0x000000016f2003c0 +Event: 2.304 Thread 0x000000011f253e00 DEOPT UNPACKING pc=0x000000011803eb7c sp=0x000000016f200080 mode 3 + +Classes unloaded (0 events): +No events + +Classes redefined (20 events): +Event: 2.310 Thread 0x000000011df0dd50 redefined class name=sun.nio.ch.SocketChannelImpl, count=1 +Event: 2.310 Thread 0x000000011df0dd50 redefined class name=java.lang.Throwable, count=1 +Event: 2.310 Thread 0x000000011df0dd50 redefined class name=java.lang.Error, count=2 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.internal.event.ProcessStartEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerIOUsageEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerMemoryUsageEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerCPUThrottlingEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerCPUUsageEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerConfigurationEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.InitialSecurityPropertyEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.DirectBufferStatisticsEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ActiveRecordingEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ActiveSettingEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ErrorThrownEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ExceptionStatisticsEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.SocketWriteEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.SocketReadEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.FileWriteEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.FileReadEvent, count=1 +Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.FileForceEvent, count=1 + +Internal exceptions (20 events): +Event: 2.277 Thread 0x000000011f253e00 Exception (0x000000070f398900) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.278 Thread 0x000000011f253e00 Exception (0x000000070f3a88f8) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.278 Thread 0x000000011f253e00 Exception (0x000000070f3b5840) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.279 Thread 0x000000011f253e00 Exception (0x000000070f3c3178) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.279 Thread 0x000000011f253e00 Exception (0x000000070f3eade8) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.280 Thread 0x000000011f253e00 Exception (0x000000070f005d18) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.281 Thread 0x000000011f253e00 Exception (0x000000070f017e98) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.281 Thread 0x000000011f253e00 Exception (0x000000070f028098) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.281 Thread 0x000000011f253e00 Exception (0x000000070f0339f0) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.282 Thread 0x000000011f253e00 Exception (0x000000070f04a470) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.282 Thread 0x000000011f253e00 Exception (0x000000070f059f78) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.283 Thread 0x000000011f253e00 Exception (0x000000070f0678d8) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.283 Thread 0x000000011f253e00 Exception (0x000000070f075960) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.283 Thread 0x000000011f253e00 Exception (0x000000070f082068) +thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] +Event: 2.312 Thread 0x000000011f253e00 Exception (0x000000070ea80898) +thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] +Event: 2.312 Thread 0x000000011f253e00 Exception (0x000000070ea869e8) +thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] +Event: 2.316 Thread 0x000000011f253e00 Exception (0x000000070eab6a98) +thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] +Event: 2.345 Thread 0x000000011f253e00 Exception (0x000000070fd532f8) +thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] +Event: 2.345 Thread 0x000000011f253e00 Exception (0x000000070fd567e0) +thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 826] +Event: 2.356 Thread 0x000000011f253e00 Exception (0x000000070fdf7678) +thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] + +VM Operations (20 events): +Event: 2.267 Executing VM operation: ICBufferFull +Event: 2.267 Executing VM operation: ICBufferFull done +Event: 2.309 Executing VM operation: ICBufferFull +Event: 2.309 Executing VM operation: ICBufferFull done +Event: 2.310 Executing VM operation: RedefineClasses +Event: 2.311 Executing VM operation: RedefineClasses done +Event: 2.315 Executing VM operation: HandshakeAllThreads +Event: 2.315 Executing VM operation: HandshakeAllThreads done +Event: 2.318 Executing VM operation: G1CollectForAllocation +Event: 2.319 Executing VM operation: G1CollectForAllocation done +Event: 2.324 Executing VM operation: JFRCheckpoint +Event: 2.324 Executing VM operation: JFRCheckpoint done +Event: 2.325 Executing VM operation: JFROldObject +Event: 2.325 Executing VM operation: JFROldObject done +Event: 2.330 Executing VM operation: RedefineClasses +Event: 2.331 Executing VM operation: RedefineClasses done +Event: 2.333 Executing VM operation: ClassLoaderStatsOperation +Event: 2.333 Executing VM operation: ClassLoaderStatsOperation done +Event: 2.346 Executing VM operation: HandshakeAllThreads +Event: 2.346 Executing VM operation: HandshakeAllThreads done + +Events (20 events): +Event: 2.355 loading class sun/management/MemoryImpl +Event: 2.356 loading class java/lang/management/MemoryMXBean +Event: 2.356 loading class java/lang/management/MemoryMXBean done +Event: 2.356 loading class sun/management/MemoryImpl done +Event: 2.356 loading class java/lang/management/MemoryManagerMXBean +Event: 2.356 loading class java/lang/management/MemoryManagerMXBean done +Event: 2.356 loading class sun/management/MemoryManagerImpl +Event: 2.356 loading class sun/management/MemoryManagerImpl done +Event: 2.356 loading class com/sun/management/internal/GarbageCollectorExtImpl +Event: 2.356 loading class com/sun/management/GarbageCollectorMXBean +Event: 2.356 loading class java/lang/management/GarbageCollectorMXBean +Event: 2.356 loading class java/lang/management/GarbageCollectorMXBean done +Event: 2.356 loading class com/sun/management/GarbageCollectorMXBean done +Event: 2.356 loading class sun/management/GarbageCollectorImpl +Event: 2.356 loading class sun/management/GarbageCollectorImpl done +Event: 2.356 loading class com/sun/management/internal/GarbageCollectorExtImpl done +Event: 2.356 loading class sun/management/Util +Event: 2.356 loading class sun/management/Util done +Event: 2.356 loading class java/lang/management/ManagementPermission +Event: 2.356 loading class java/lang/management/ManagementPermission done + + +Dynamic libraries: +0x0000000100f44000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libjli.dylib +0x00000001a2b50000 /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa +0x000000018e974000 /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit +0x000000019131c000 /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData +0x000000018c5d5000 /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation +0x0000000196d00000 /usr/lib/libSystem.B.dylib +0x000000018f880000 /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation +0x00000001f7e05000 /System/Library/PrivateFrameworks/CollectionViewCore.framework/Versions/A/CollectionViewCore +0x000000019cfbc000 /System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices +0x0000000195122000 /System/Library/PrivateFrameworks/XCTTargetBootstrap.framework/Versions/A/XCTTargetBootstrap +0x0000000198a96000 /System/Library/PrivateFrameworks/InternationalSupport.framework/Versions/A/InternationalSupport +0x0000000198b1d000 /System/Library/PrivateFrameworks/UserActivity.framework/Versions/A/UserActivity +0x000000020f01e000 /System/Library/PrivateFrameworks/WindowManagement.framework/Versions/A/WindowManagement +0x000000018c29e000 /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration +0x0000000197f9a000 /usr/lib/libspindump.dylib +0x000000018fa26000 /System/Library/Frameworks/UniformTypeIdentifiers.framework/Versions/A/UniformTypeIdentifiers +0x0000000193435000 /usr/lib/libapp_launch_measurement.dylib +0x00000001928e3000 /System/Library/PrivateFrameworks/CoreAnalytics.framework/Versions/A/CoreAnalytics +0x000000019343c000 /System/Library/PrivateFrameworks/CoreAutoLayout.framework/Versions/A/CoreAutoLayout +0x0000000194930000 /System/Library/Frameworks/Metal.framework/Versions/A/Metal +0x0000000195881000 /usr/lib/liblangid.dylib +0x0000000195128000 /System/Library/PrivateFrameworks/CoreSVG.framework/Versions/A/CoreSVG +0x000000019034e000 /System/Library/PrivateFrameworks/SkyLight.framework/Versions/A/SkyLight +0x0000000190766000 /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics +0x000000019d687000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate +0x0000000197a08000 /System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices +0x0000000194910000 /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface +0x0000000192911000 /usr/lib/libDiagnosticMessagesClient.dylib +0x0000000196c46000 /usr/lib/libz.1.dylib +0x00000001a0923000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices +0x000000019510a000 /System/Library/PrivateFrameworks/DFRFoundation.framework/Versions/A/DFRFoundation +0x000000018e1f2000 /usr/lib/libicucore.A.dylib +0x0000000199a27000 /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox +0x0000000198aa1000 /System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore +0x00000001afc2f000 /System/Library/PrivateFrameworks/TextInput.framework/Versions/A/TextInput +0x00000001902b3000 /usr/lib/libMobileGestalt.dylib +0x0000000194dd6000 /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox +0x0000000192dbc000 /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore +0x000000018de4d000 /System/Library/Frameworks/Security.framework/Versions/A/Security +0x000000019cffc000 /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition +0x0000000193174000 /System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI +0x000000018d745000 /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio +0x00000001929ed000 /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration +0x00000001983ce000 /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport +0x00000001902b1000 /usr/lib/libenergytrace.dylib +0x000000018e837000 /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit +0x000000019d3e3000 /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices +0x00000001933c2000 /System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis +0x00000001dab8f000 /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL +0x0000000193486000 /usr/lib/libxml2.2.dylib +0x0000000196255000 /System/Library/PrivateFrameworks/MobileKeyBag.framework/Versions/A/MobileKeyBag +0x000000018b2d4000 /usr/lib/libobjc.A.dylib +0x000000018b58a000 /usr/lib/libc++.1.dylib +0x0000000190db1000 /System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync +0x000000018b6a8000 /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation +0x00000001954a2000 /System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage +0x000000018d566000 /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText +0x0000000195161000 /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO +0x0000000196d06000 /System/Library/PrivateFrameworks/SoftLinking.framework/Versions/A/SoftLinking +0x0000000196f9a000 /usr/lib/libcompression.dylib +0x00000001989f2000 /System/Library/PrivateFrameworks/TextureIO.framework/Versions/A/TextureIO +0x00000001976da000 /usr/lib/libate.dylib +0x0000000196cfa000 /usr/lib/system/libcache.dylib +0x0000000196cb3000 /usr/lib/system/libcommonCrypto.dylib +0x0000000196ce1000 /usr/lib/system/libcompiler_rt.dylib +0x0000000196cd7000 /usr/lib/system/libcopyfile.dylib +0x000000018b408000 /usr/lib/system/libcorecrypto.dylib +0x000000018b4be000 /usr/lib/system/libdispatch.dylib +0x000000018b650000 /usr/lib/system/libdyld.dylib +0x0000000196cf0000 /usr/lib/system/libkeymgr.dylib +0x0000000196c91000 /usr/lib/system/libmacho.dylib +0x000000019634f000 /usr/lib/system/libquarantine.dylib +0x0000000196ced000 /usr/lib/system/libremovefile.dylib +0x0000000190318000 /usr/lib/system/libsystem_asl.dylib +0x000000018b3a5000 /usr/lib/system/libsystem_blocks.dylib +0x000000018b509000 /usr/lib/system/libsystem_c.dylib +0x0000000196ce5000 /usr/lib/system/libsystem_collections.dylib +0x000000019586f000 /usr/lib/system/libsystem_configuration.dylib +0x00000001948de000 /usr/lib/system/libsystem_containermanager.dylib +0x0000000196990000 /usr/lib/system/libsystem_coreservices.dylib +0x000000018e4a9000 /usr/lib/system/libsystem_darwin.dylib +0x0000000196cf1000 /usr/lib/system/libsystem_dnssd.dylib +0x000000018b506000 /usr/lib/system/libsystem_featureflags.dylib +0x000000018b67c000 /usr/lib/system/libsystem_info.dylib +0x0000000196c58000 /usr/lib/system/libsystem_m.dylib +0x000000018b492000 /usr/lib/system/libsystem_malloc.dylib +0x0000000190298000 /usr/lib/system/libsystem_networkextension.dylib +0x000000018e913000 /usr/lib/system/libsystem_notify.dylib +0x0000000195874000 /usr/lib/system/libsystem_sandbox.dylib +0x0000000196cea000 /usr/lib/system/libsystem_secinit.dylib +0x000000018b609000 /usr/lib/system/libsystem_kernel.dylib +0x000000018b674000 /usr/lib/system/libsystem_platform.dylib +0x000000018b643000 /usr/lib/system/libsystem_pthread.dylib +0x0000000191aed000 /usr/lib/system/libsystem_symptoms.dylib +0x000000018b3ee000 /usr/lib/system/libsystem_trace.dylib +0x0000000196cc4000 /usr/lib/system/libunwind.dylib +0x000000018b3aa000 /usr/lib/system/libxpc.dylib +0x000000018b5f1000 /usr/lib/libc++abi.dylib +0x0000000196ccf000 /usr/lib/liboah.dylib +0x0000000197597000 /usr/lib/liblzma.5.dylib +0x0000000196d02000 /usr/lib/libfakelink.dylib +0x000000018fed6000 /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork +0x0000000196e41000 /usr/lib/libarchive.2.dylib +0x000000019b336000 /System/Library/Frameworks/Combine.framework/Versions/A/Combine +0x00000001993f1000 /usr/lib/swift/libswiftCore.dylib +0x00000001acd04000 /usr/lib/swift/libswiftCoreFoundation.dylib +0x00000001aabc1000 /usr/lib/swift/libswiftDarwin.dylib +0x000000019e8fc000 /usr/lib/swift/libswiftDispatch.dylib +0x00000001acd25000 /usr/lib/swift/libswiftIOKit.dylib +0x00000001a0d4e000 /usr/lib/swift/libswiftObjectiveC.dylib +0x00000001acd18000 /usr/lib/swift/libswiftXPC.dylib +0x0000000215856000 /usr/lib/swift/libswift_Concurrency.dylib +0x00000002159a8000 /usr/lib/swift/libswift_StringProcessing.dylib +0x00000001a0d52000 /usr/lib/swift/libswiftos.dylib +0x000000018e7bc000 /System/Library/PrivateFrameworks/CoreServicesInternal.framework/Versions/A/CoreServicesInternal +0x000000019637a000 /usr/lib/libbsm.0.dylib +0x0000000196c97000 /usr/lib/system/libkxld.dylib +0x00000001933fe000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents +0x000000018e4b4000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore +0x0000000192954000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata +0x0000000196996000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices +0x0000000196ec8000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit +0x0000000191a70000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE +0x000000018bb80000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices +0x0000000197540000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices +0x000000019340b000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList +0x0000000196f67000 /usr/lib/libapple_nghttp2.dylib +0x000000018fed2000 /usr/lib/libnetwork.dylib +0x00000001916f4000 /usr/lib/libsqlite3.dylib +0x0000000191af6000 /System/Library/Frameworks/Network.framework/Versions/A/Network +0x00000002149a3000 /usr/lib/libCoreEntitlements.dylib +0x0000000201410000 /System/Library/PrivateFrameworks/MessageSecurity.framework/Versions/A/MessageSecurity +0x00000001916da000 /System/Library/PrivateFrameworks/ProtocolBuffer.framework/Versions/A/ProtocolBuffer +0x0000000196972000 /System/Library/PrivateFrameworks/AppleFSCompression.framework/Versions/A/AppleFSCompression +0x0000000196362000 /usr/lib/libcoretls.dylib +0x00000001975b0000 /usr/lib/libcoretls_cfhelpers.dylib +0x0000000196f94000 /usr/lib/libpam.2.dylib +0x0000000197618000 /usr/lib/libxar.1.dylib +0x00000001979e3000 /usr/lib/libheimdal-asn1.dylib +0x0000000196d07000 /usr/lib/libpcap.A.dylib +0x0000000191ae3000 /usr/lib/libdns_services.dylib +0x000000019587c000 /System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo +0x0000000196056000 /System/Library/PrivateFrameworks/IOMobileFramebuffer.framework/Versions/A/IOMobileFramebuffer +0x0000000196983000 /usr/lib/libbz2.1.0.dylib +0x0000000196352000 /usr/lib/libCheckFix.dylib +0x0000000190330000 /System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC +0x0000000195883000 /System/Library/PrivateFrameworks/CoreNLP.framework/Versions/A/CoreNLP +0x0000000192913000 /System/Library/PrivateFrameworks/MetadataUtilities.framework/Versions/A/MetadataUtilities +0x000000019638b000 /usr/lib/libmecab.dylib +0x000000018c328000 /usr/lib/libCRFSuite.dylib +0x00000001963e8000 /usr/lib/libgermantok.dylib +0x0000000196f40000 /usr/lib/libThaiTokenizer.dylib +0x00000001929f6000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage +0x000000019d3ba000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib +0x000000019765e000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib +0x0000000195f56000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib +0x000000018bf34000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib +0x000000019706c000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib +0x00000001963eb000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib +0x0000000196f7f000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib +0x0000000197067000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib +0x000000019597c000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib +0x000000018c237000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib +0x0000000200746000 /System/Library/PrivateFrameworks/MIL.framework/Versions/A/MIL +0x0000000196d3c000 /usr/lib/libiconv.2.dylib +0x0000000196c90000 /usr/lib/libcharset.1.dylib +0x00000001933de000 /System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory +0x00000001933ce000 /System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory +0x00000001975b2000 /System/Library/PrivateFrameworks/APFS.framework/Versions/A/APFS +0x000000019628c000 /System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation +0x0000000197627000 /usr/lib/libutil.dylib +0x00000001ff7bb000 /System/Library/PrivateFrameworks/InstalledContentLibrary.framework/Versions/A/InstalledContentLibrary +0x000000018e7fa000 /System/Library/PrivateFrameworks/CoreServicesStore.framework/Versions/A/CoreServicesStore +0x00000001f67b6000 /System/Library/PrivateFrameworks/AppleMobileFileIntegrity.framework/Versions/A/AppleMobileFileIntegrity +0x00000001acce3000 /usr/lib/libmis.dylib +0x00000001bac44000 /System/Library/PrivateFrameworks/MobileSystemServices.framework/Versions/A/MobileSystemServices +0x00000001d5481000 /System/Library/PrivateFrameworks/ConfigProfileHelper.framework/Versions/A/ConfigProfileHelper +0x0000000196f42000 /System/Library/PrivateFrameworks/AppleSauce.framework/Versions/A/AppleSauce +0x000000018d00f000 /System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling +0x000000019762b000 /usr/lib/libxslt.1.dylib +0x0000000196e2f000 /usr/lib/libcmph.dylib +0x0000000196043000 /System/Library/PrivateFrameworks/CoreEmoji.framework/Versions/A/CoreEmoji +0x0000000195976000 /System/Library/PrivateFrameworks/LinguisticData.framework/Versions/A/LinguisticData +0x000000018c1ef000 /System/Library/PrivateFrameworks/Lexicon.framework/Versions/A/Lexicon +0x000000019631f000 /System/Library/PrivateFrameworks/BackgroundTaskManagement.framework/Versions/A/BackgroundTaskManagement +0x0000000214b46000 /usr/lib/libTLE.dylib +0x00000002158f3000 /usr/lib/swift/libswift_RegexParser.dylib +0x0000000198293000 /System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG +0x00000001979c8000 /usr/lib/libexpat.1.dylib +0x0000000198854000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib +0x000000019887f000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib +0x0000000198968000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib +0x00000001982d8000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib +0x000000019890c000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib +0x0000000198903000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib +0x0000000194c5f000 /System/Library/PrivateFrameworks/FontServices.framework/libFontParser.dylib +0x0000000191a12000 /System/Library/PrivateFrameworks/RunningBoardServices.framework/Versions/A/RunningBoardServices +0x00000001a3282000 /System/Library/PrivateFrameworks/IOSurfaceAccelerator.framework/Versions/A/IOSurfaceAccelerator +0x00000001983ca000 /System/Library/PrivateFrameworks/WatchdogClient.framework/Versions/A/WatchdogClient +0x000000018d188000 /System/Library/Frameworks/CoreDisplay.framework/Versions/A/CoreDisplay +0x0000000194b39000 /System/Library/Frameworks/CoreMedia.framework/Versions/A/CoreMedia +0x0000000194926000 /System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator +0x000000019356f000 /System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo +0x0000000196f92000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/MetalPerformanceShaders +0x0000000198409000 /System/Library/Frameworks/VideoToolbox.framework/Versions/A/VideoToolbox +0x0000000191955000 /System/Library/PrivateFrameworks/BaseBoard.framework/Versions/A/BaseBoard +0x00000001988fe000 /System/Library/PrivateFrameworks/GPUWrangler.framework/Versions/A/GPUWrangler +0x00000001988de000 /System/Library/PrivateFrameworks/IOPresentment.framework/Versions/A/IOPresentment +0x0000000198906000 /System/Library/PrivateFrameworks/DSExternalDisplay.framework/Versions/A/DSExternalDisplay +0x00000001fbf64000 /System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/libllvm-flatbuffers.dylib +0x00000001dab82000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreFSCache.dylib +0x00000001fbf60000 /System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/libGPUCompilerUtils.dylib +0x000000019896e000 /System/Library/PrivateFrameworks/CMCaptureCore.framework/Versions/A/CMCaptureCore +0x00000001f08bf000 /System/Library/Frameworks/ExtensionFoundation.framework/Versions/A/ExtensionFoundation +0x000000019f0a3000 /System/Library/PrivateFrameworks/CoreTime.framework/Versions/A/CoreTime +0x0000000197f85000 /System/Library/PrivateFrameworks/AppServerSupport.framework/Versions/A/AppServerSupport +0x000000019a309000 /System/Library/PrivateFrameworks/perfdata.framework/Versions/A/perfdata +0x000000018d2a8000 /System/Library/PrivateFrameworks/AudioToolboxCore.framework/Versions/A/AudioToolboxCore +0x0000000194b0f000 /System/Library/PrivateFrameworks/caulk.framework/Versions/A/caulk +0x0000000199bc6000 /usr/lib/libAudioStatistics.dylib +0x00000001ac109000 /System/Library/PrivateFrameworks/SystemPolicy.framework/Versions/A/SystemPolicy +0x0000000199e68000 /usr/lib/libSMC.dylib +0x00000001a2a25000 /System/Library/Frameworks/CoreMIDI.framework/Versions/A/CoreMIDI +0x0000000198821000 /usr/lib/libAudioToolboxUtility.dylib +0x00000001a7e7c000 /System/Library/PrivateFrameworks/OSAServicesClient.framework/Versions/A/OSAServicesClient +0x000000019a316000 /usr/lib/libperfcheck.dylib +0x00000001978b3000 /System/Library/PrivateFrameworks/PlugInKit.framework/Versions/A/PlugInKit +0x000000019627e000 /System/Library/PrivateFrameworks/AssertionServices.framework/Versions/A/AssertionServices +0x00000001dabe4000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib +0x00000001daba3000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib +0x00000001dad8a000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib +0x00000001dabac000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib +0x00000001daba0000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib +0x0000000214b25000 /usr/lib/libRosetta.dylib +0x00000001dab89000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib +0x00000001957f4000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSCore.framework/Versions/A/MPSCore +0x00000001968e8000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSImage.framework/Versions/A/MPSImage +0x0000000196400000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSNeuralNetwork.framework/Versions/A/MPSNeuralNetwork +0x00000001967ec000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSMatrix.framework/Versions/A/MPSMatrix +0x00000001965fe000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSRayIntersector.framework/Versions/A/MPSRayIntersector +0x000000019681b000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSNDArray.framework/Versions/A/MPSNDArray +0x00000001f1c8d000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSFunctions.framework/Versions/A/MPSFunctions +0x000000018bdfa000 /System/Library/PrivateFrameworks/MetalTools.framework/Versions/A/MetalTools +0x000000019587a000 /System/Library/PrivateFrameworks/AggregateDictionary.framework/Versions/A/AggregateDictionary +0x000000019776c000 /usr/lib/libIOReport.dylib +0x00000001a1c12000 /System/Library/PrivateFrameworks/ASEProcessing.framework/Versions/A/ASEProcessing +0x0000000197b23000 /System/Library/PrivateFrameworks/GraphVisualizer.framework/Versions/A/GraphVisualizer +0x00000001fbe81000 /System/Library/PrivateFrameworks/FontServices.framework/Versions/A/FontServices +0x0000000197f43000 /System/Library/PrivateFrameworks/OTSVG.framework/Versions/A/OTSVG +0x0000000193122000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib +0x0000000197f8f000 /System/Library/PrivateFrameworks/FontServices.framework/libhvf.dylib +0x00000001fbe82000 /System/Library/PrivateFrameworks/FontServices.framework/libXTFontStaticRegistryData.dylib +0x000000020dd1e000 /System/Library/PrivateFrameworks/VideoToolboxParavirtualizationSupport.framework/Versions/A/VideoToolboxParavirtualizationSupport +0x000000019797c000 /System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA +0x0000000199c06000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS +0x0000000190ea4000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices +0x000000019897a000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore +0x0000000199fc1000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD +0x0000000199fb5000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy +0x0000000199bda000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis +0x0000000198938000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATSUI.framework/Versions/A/ATSUI +0x0000000199f48000 /usr/lib/libcups.2.dylib +0x000000019a324000 /System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos +0x000000019a335000 /System/Library/Frameworks/GSS.framework/Versions/A/GSS +0x0000000199c78000 /usr/lib/libresolv.9.dylib +0x0000000197f9f000 /System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal +0x00000001a0cd0000 /System/Library/Frameworks/Kerberos.framework/Versions/A/Libraries/libHeimdalProxy.dylib +0x000000019a385000 /System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth +0x00000001efaf9000 /System/Library/Frameworks/AVFAudio.framework/Versions/A/AVFAudio +0x00000001a7ecb000 /System/Library/PrivateFrameworks/AXCoreUtilities.framework/Versions/A/AXCoreUtilities +0x0000000199b52000 /System/Library/PrivateFrameworks/AudioSession.framework/Versions/A/AudioSession +0x000000019b0ed000 /System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth +0x0000000197a7d000 /System/Library/PrivateFrameworks/MediaExperience.framework/Versions/A/MediaExperience +0x00000001999ed000 /System/Library/PrivateFrameworks/AudioSession.framework/libSessionUtility.dylib +0x0000000199fcd000 /System/Library/PrivateFrameworks/AudioResourceArbitration.framework/Versions/A/AudioResourceArbitration +0x000000019dfd2000 /System/Library/PrivateFrameworks/PowerLog.framework/Versions/A/PowerLog +0x000000019df14000 /System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth +0x00000001a0cd1000 /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit +0x00000001960e1000 /System/Library/PrivateFrameworks/CoreUtils.framework/Versions/A/CoreUtils +0x00000001fa882000 /System/Library/PrivateFrameworks/CoreUtilsExtras.framework/Versions/A/CoreUtilsExtras +0x00000001ff655000 /System/Library/PrivateFrameworks/IO80211.framework/Versions/A/IO80211 +0x00000001979ed000 /System/Library/PrivateFrameworks/IconFoundation.framework/Versions/A/IconFoundation +0x000000019cfe8000 /System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore +0x0000000101ea8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib +0x0000000100ef8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libjimage.dylib +0x0000000100fa8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libinstrument.dylib +0x0000000100ff4000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libjava.dylib +0x0000000101130000 /private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/libasyncProfiler.so +0x00000001010c8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libzip.dylib +0x00000001010f0000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libnio.dylib +0x00000001011b8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libnet.dylib +0x0000000100fd4000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libextnet.dylib +0x00000001011dc000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libmanagement.dylib +0x0000000101d8c000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libmanagement_ext.dylib + + +VM Arguments: +jvm_args: -XX:TieredStopAtLevel=1 -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -Dmanagement.endpoints.jmx.exposure.include=* -javaagent:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar=51990:/Applications/IntelliJ IDEA.app/Contents/bin -agentpath:/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/libasyncProfiler.so=start,jfr,event=cpu,interval=10ms,jfrsync=profile,cstack=no,file=/Users/jinwoo/IdeaSnapshots/Application__1__2024_08_16_151221.jfr,log=/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/Application__1__2024_08_16_151221.jfr.log.txt,logLevel=DEBUG -Dfile.encoding=UTF-8 +java_command: com.bang_ggood.Application +java_class_path (initial): /Users/jinwoo/Documents/woowacourse/2024-bang-ggood/backend/bang-ggood/out/production/classes:/Users/jinwoo/Documents/woowacourse/2024-bang-ggood/backend/bang-ggood/out/production/resources:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-data-jpa/3.3.2/2731d74dfc18fb905c29930cf55493980c2cee5a/spring-boot-starter-data-jpa-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-web/3.3.2/720418538668a8742d0ae24097811d5250cf5c32/spring-boot-starter-web-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.2.0/178d8ed6714d78b8b475c45bc60642a9232fcb70/springdoc-openapi-starter-webmvc-ui-2.2.0.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-validation/3.3.2/81ee06b318ed35c2a3f4882a0f7b9946a39e1b39/spring-boot-starter-validation-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-aop/3.3.2/26d996e253768d3121bb3ffbef28cefc07fdbddb/spring-boot-starter-aop-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/io.jsonwebtoken/jjwt-impl/0.11.2/8fd8acf9d3cb9a2db05bfa484c2a1408cc3507f9/jjwt-impl-0.11.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/io.jsonwebtoken/jjwt-gson/0.11.2/b1a60b3e0bc81587e272b71dfb3041c4c99a85f5/jjwt-gson-0.11.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/io.jsonwebtoken/jjwt-api/0.11.2/57c34dce3e88f2972c5c5465b6291acfb5628084/jjwt-api-0.11.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/com.mysql/mysql-connector-j/8.3.0/1cc7fa5d61f4bbc113531a4ba6d85d41cf3d57e1/mysql-connector-j-8.3.0.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-jdbc/3.3.2/544775d745288972598ab2e872e5a4816b6d9b39/spring-boot-starter-jdbc-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.hibernate.orm/hibernate-core/6.5. +Launcher Type: SUN_STANDARD + +[Global flags] + intx CICompilerCount = 4 {product} {ergonomic} + uint ConcGCThreads = 2 {product} {ergonomic} + bool FlightRecorder = true {product} {management} + uint G1ConcRefinementThreads = 9 {product} {ergonomic} + size_t G1HeapRegionSize = 2097152 {product} {ergonomic} + uintx GCDrainStackTargetSize = 64 {product} {ergonomic} + size_t InitialHeapSize = 268435456 {product} {ergonomic} + bool ManagementServer = true {product} {command line} + size_t MarkStackSize = 4194304 {product} {ergonomic} + size_t MaxHeapSize = 4294967296 {product} {ergonomic} + size_t MaxNewSize = 2575302656 {product} {ergonomic} + size_t MinHeapDeltaBytes = 2097152 {product} {ergonomic} + size_t MinHeapSize = 8388608 {product} {ergonomic} + uintx NonProfiledCodeHeapSize = 0 {pd product} {ergonomic} + bool ProfileInterpreter = false {pd product} {command line} + uintx ProfiledCodeHeapSize = 0 {pd product} {ergonomic} + size_t SoftMaxHeapSize = 4294967296 {manageable} {ergonomic} + intx TieredStopAtLevel = 1 {product} {command line} + bool UseCompressedClassPointers = true {product lp64_product} {ergonomic} + bool UseCompressedOops = true {product lp64_product} {ergonomic} + bool UseG1GC = true {product} {ergonomic} + bool UseNUMA = false {product} {ergonomic} + bool UseNUMAInterleaving = false {product} {ergonomic} + +Logging: +Log output configuration: + #0: stdout all=warning,jni+resolve=error uptime,level,tags (reconfigured) + #1: stderr all=off uptime,level,tags + +Environment Variables: +PATH=/Users/jinwoo/.nvm/versions/node/v20.15.1/bin:/opt/homebrew/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Java/JavaVirtualMachines/Library/Java/JavaVirtualMachines/:/Applications/VMware Fusion.app/Contents/Public +SHELL=/bin/zsh +LC_CTYPE=ko_KR.UTF-8 + +Signal Handlers: + SIGSEGV: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGBUS: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGFPE: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGPIPE: javaSignalHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGXFSZ: javaSignalHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGILL: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGUSR2: SR_handler in libjvm.dylib, mask=00100000000000000000000000000000, flags=SA_RESTART|SA_SIGINFO + SIGHUP: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGINT: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGTERM: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGQUIT: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + SIGTRAP: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO + + +--------------- S Y S T E M --------------- + +OS: +uname: Darwin 22.3.0 Darwin Kernel Version 22.3.0: Mon Jan 30 20:39:46 PST 2023; root:xnu-8792.81.3~2/RELEASE_ARM64_T6020 arm64 +OS uptime: 0 days 5:28 hours +rlimit (soft/hard): STACK 8176k/65520k , CORE 0k/infinity , NPROC 2666/4000 , NOFILE 10240/infinity , AS infinity/infinity , CPU infinity/infinity , DATA infinity/infinity , FSIZE infinity/infinity , MEMLOCK infinity/infinity , RSS infinity/infinity +load average: 2.58 1.59 1.41 + +CPU: total 10 (initial active 10) 0x61:0x0:0xda33d83d:0, fp, simd, crc, lse + +Memory: 16k page, physical 16777216k(76560k free), swap 0k(0k free) + +vm_info: Java HotSpot(TM) 64-Bit Server VM (17.0.9+11-LTS-201) for bsd-aarch64 JRE (17.0.9+11-LTS-201), built on Oct 10 2023 22:12:15 by "mach5one" with clang Apple LLVM 12.0.0 (clang-1200.0.32.29) + +END. diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 8b4bc5a58..0bf83f90f 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -249,7 +249,7 @@ void deleteChecklistById() { void deleteChecklistLikeByChecklistId() { roomRepository.save(RoomFixture.ROOM_1); Checklist saved = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); - checklistLikeRepository.save(ChecklistFixture.CHECKLIST1_LIKE_1); + checklistLikeRepository.save(ChecklistFixture.CHECKLIST1_LIKE); RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 4fe4d28b9..574e3ae91 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -505,7 +505,7 @@ void deleteChecklistById_notOwnedByUser_exception() { void deleteChecklistLikeByChecklistId() { // given Checklist checklist = checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); - ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST_LIKE_1); + ChecklistLike checklistLike = checklistLikeRepository.save(ChecklistFixture.CHECKLIST1_LIKE); // when checklistService.deleteChecklistLikeByChecklistId(USER1, checklist.getId()); From 024545a0fdccfdd2db68bc16e82a563240cc20aa Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 16 Aug 2024 20:25:20 +0900 Subject: [PATCH 181/348] =?UTF-8?q?chore:=20=EB=94=94=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20pr=20=EC=95=8C=EB=A6=BC=20=EC=8A=A4=ED=81=AC?= =?UTF-8?q?=EB=A6=BD=ED=8A=B8=20=EC=9E=91=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/discord-pr-notify.yml | 41 +++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 .github/workflows/discord-pr-notify.yml diff --git a/.github/workflows/discord-pr-notify.yml b/.github/workflows/discord-pr-notify.yml new file mode 100644 index 000000000..37ea2dabd --- /dev/null +++ b/.github/workflows/discord-pr-notify.yml @@ -0,0 +1,41 @@ +name: Discord PR + +on: + pull_request: + branches: ["dev"] + +jobs: + create-issue: + name: Discord notification + runs-on: ubuntu-latest + steps: + - name: Send PR + uses: Ilshidur/action-discord@0.3.2 + env: + DISCORD_WEBHOOK: ${{ secrets.DISCORD_WEBHOOK_URL }} + DISCORD_USERNAME: Bang_GGood_Master + DISCORD_EMBEDS: > + [ + { + "title": "똑똑~ 방 리모델링 요청이 왔어요!🏠\n${{ github.event.pull_request.title }}", + "color": 16777123, + "description": "${{ github.event.pull_request.html_url }}", + "fields": [ + { + "name": "Pull Request Number", + "value": "#${{ github.event.pull_request.number }}", + "inline": true + }, + { + "name": "Author", + "value": "${{ github.event.pull_request.user.login }}", + "inline": true + }, + { + "name": "Reviewers", + "value": "${{ join(github.event.pull_request.requested_reviewers.*.login, ', ') }}", + "inline": false + } + ] + } + ] From dbec94431ce91d1a673bedb85d6804290da78679 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Fri, 16 Aug 2024 20:27:08 +0900 Subject: [PATCH 182/348] =?UTF-8?q?chore:=20=EB=94=94=EC=8A=A4=EC=BD=94?= =?UTF-8?q?=EB=93=9C=20pr=20=EC=95=8C=EB=A6=BC=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=20=EC=84=A4=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/discord-pr-notify.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/discord-pr-notify.yml b/.github/workflows/discord-pr-notify.yml index 37ea2dabd..b03d24931 100644 --- a/.github/workflows/discord-pr-notify.yml +++ b/.github/workflows/discord-pr-notify.yml @@ -2,7 +2,8 @@ name: Discord PR on: pull_request: - branches: ["dev"] + branches: ["dev-be"] + paths: 'backend/**' jobs: create-issue: From 608e66296b84893ff736814d048c122510189a77 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Sun, 18 Aug 2024 15:18:39 +0900 Subject: [PATCH 183/348] =?UTF-8?q?[BE]=20=EC=98=B5=EC=85=98=20=EB=AA=A9?= =?UTF-8?q?=EB=A1=9D=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20?= =?UTF-8?q?=20(#388)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/auth/service/AuthService.java | 2 +- .../bang_ggood/checklist/domain/Option.java | 24 ++++++++----------- 2 files changed, 11 insertions(+), 15 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index e95544c04..6181a2114 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -75,7 +75,7 @@ private void createDefaultChecklist(User user) { "집을 둘러보며 필요한 메모를 작성해보세요.", "한줄평 작성하는 곳"); List options = List.of( - Option.TV.getId(), + Option.INDUCTION.getId(), Option.AIR_CONDITIONER.getId(), Option.SINK.getId(), Option.BED.getId()); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java index 28487daf9..c145b20d1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Option.java @@ -6,21 +6,17 @@ public enum Option { - DOOR_LOCK(1, "도어락"), - AIR_CONDITIONER(2, "에어컨"), - REFRIGERATOR(3, "냉장고"), - SINK(4, "싱크대"), - GAS_STOVE(5, "가스레인지"), - MICROWAVE_OVEN(6, "전자레인지"), + REFRIGERATOR(1, "냉장고"), + SINK(2, "싱크대"), + INDUCTION(3, "인덕션"), + MICROWAVE_OVEN(4, "전자레인지"), + AIR_CONDITIONER(5, "에어컨"), + WASHING_MACHINE(6, "세탁기"), CLOSET(7, "옷장"), - SHOE_RACK(8, "신발장"), - WASHING_MACHINE(9, "세탁기"), - DRYER(10, "건조기"), - INTERNET(11, "인터넷"), - BED(12, "침대"), - DESK(13, "책상"), - TV(14, "TV"), - ELEVATOR(15, "엘리베이터"); + DESK(8, "책상"), + BED(9, "침대"), + SHOE_RACK(10, "신발장"), + ELEVATOR(11, "엘리베이터"); private final int id; private final String name; From c40943938a2d3ecdb92fccfe4c928b8736d1e57f Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:27:21 +0900 Subject: [PATCH 184/348] =?UTF-8?q?chore:=20prod=20cd=20=ED=8C=8C=EC=9D=BC?= =?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 --- .github/workflows/backend-prod-cd | 70 +++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 .github/workflows/backend-prod-cd diff --git a/.github/workflows/backend-prod-cd b/.github/workflows/backend-prod-cd new file mode 100644 index 000000000..d96978637 --- /dev/null +++ b/.github/workflows/backend-prod-cd @@ -0,0 +1,70 @@ +name: backend-prod-cd + +on: + pull_request: + branches: [ "main" ] + types: [closed] + +jobs: + build: + if: github.event.pull_request.merged == true + runs-on: ubuntu-latest + permissions: + contents: read + + steps: + - name: Checkout Repository + uses: actions/checkout@v4 + + - name: Set up JDK 17 + uses: actions/setup-java@v4 + with: + java-version: '17' + distribution: 'temurin' + + - name: Setup Gradle + uses: gradle/gradle-build-action@v3 + with: + gradle-version: 8.8 + + - name: Grant execute permission for gradlew + run: chmod +x backend/bang-ggood/gradlew + + - name: Write application.yml + env: + APPLICATION_YML: ${{ secrets.APPLICATION_YML }} + APPLICATION_PROD_YML: ${{ secrets.APPLICATION_PROD_YML }} + APPLICATION_TEST_YML: ${{ secrets.APPLICATION_TEST_YML }} + run: | + echo "${APPLICATION_YML}" > backend/bang-ggood/src/main/resources/application.yml + echo "${APPLICATION_PROD_YML}" > backend/bang-ggood/src/main/resources/application-prod.yml + echo "${APPLICATION_TEST_YML}" > backend/bang-ggood/src/test/resources/application-test.yml + + - name: Build with Gradle + run: ./gradlew clean build + working-directory: backend/bang-ggood + + - name: Upload build artifact + uses: actions/upload-artifact@v3 + with: + working-directory: backend/bang-ggood + name: bang-ggood-be-develop-jar + path: ./**/*.jar + + deploy: + needs: build + runs-on: bang-ggood + steps: + - name: change permission + run: sudo chown -R ubuntu:ubuntu /home/ubuntu/actions-runner/_work/2024-bang-ggood + + - name: Download build artifact + uses: actions/download-artifact@v3 + with: + name: bang-ggood-be-develop-jar + + - name: Turn off the server 8080 if runs + run: sudo fuser -k -n tcp 8080 || true + + - name: Start server + run: sudo nohup java -jar -Dspring.profiles.active=prod -Duser.timezone=Asia/Seoul ./backend/bang-ggood/build/libs/*SNAPSHOT.jar > /home/ubuntu/actions-runner/server.log 2>&1 & From 680eb130fb98935130f52d9c4cf7e20b96b0789b Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 19 Aug 2024 14:39:03 +0900 Subject: [PATCH 185/348] =?UTF-8?q?fix:=20yml=20=ED=8C=8C=EC=9D=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{backend-prod-cd => backend-prod-cd.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{backend-prod-cd => backend-prod-cd.yml} (100%) diff --git a/.github/workflows/backend-prod-cd b/.github/workflows/backend-prod-cd.yml similarity index 100% rename from .github/workflows/backend-prod-cd rename to .github/workflows/backend-prod-cd.yml From a61f40b90f690e1af1edd2cdc9703f3980ddd1e5 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:21:43 +0900 Subject: [PATCH 186/348] =?UTF-8?q?[BE]=20drop=20=EB=AA=85=EB=A0=B9?= =?UTF-8?q?=EC=96=B4=20=EC=88=9C=EC=84=9C=EB=A5=BC=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#414)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/hs_err_pid6379.jfr | Bin 209068 -> 0 bytes .../bang-ggood/src/main/resources/schema.sql | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/hs_err_pid6379.jfr b/backend/bang-ggood/hs_err_pid6379.jfr index 1a9e892fc54f826dee7d8817924ba24e3b837666..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 literal 209068 zcmeFa37lM2wJ)6RvwI%X86gM+=`9!XNMdk+bOa zgk$^nq1S)<;@$M(-G9}Q6Dsb$_M(SsZ#W$nYP+GrOz;|3WQ#$5C?6DqRE5`g;EEnU znHwBRXM$9vSF<9UNoRwU=T)yx6w`+XU!t!}sPHP2?Unea!}F>RJA5#iKBwZh6%#x! zn;WX|8WPD|wou%V9nNGby}GpgHQ4TXwfcUx3E#F?g>O5m!?$y4!nbp4!?*M5yxNRh zZFYV5w!Oit?bD-;;oJ76@NGx4SDVrkTEe&OtzLC+dT6*XFwv_n@S8Tz%cPQ%yej;= zVbf%<8m}E2Hcj!W(wST$H5DJw>ol*bk6x#HRVjMi#j8rt>#kl6pSNN54EwHqH~X&R zefHg)-Mt#V&W720*mv!|eb=$4eK%(>uZDkT!|c87yY~0ncO4(F@8*2atKs|DF#ALH zUHeS?u45njZqA3j8otjBvp-_rweM@+b?j%~&6(v@r}@PFApw3f+pF&5H|<_^ir;j2 z)d_wx2U6rWbG_;$znKSd@|*d%PNA5~2Mcf=ezOqQ;WvwL9e(psT!-KM6K0v;Y?%Ge z;oJ6)g>O6lC44*QUorQ3?!Sd^+dIRz9gD-abGo1gdhU|&ZTr&jZO5|k?VROM4n6mP z@NN5w@NLI|;oCU}d9`xm8)mNz-?py`-*&7H-_BWssh5-2Vsho(zhnC3-8xK=yz9mk z$h#h|rdQsr_iB>z?qIK`Any+GyrJCCe|QG}c6{9PQo}=sLZHJ#8;)rIPkqzz|9A#R zI{pW)ju(9LU-n(c2G0~WC5HZ|XVQsOD&d(7UV1&#hnFP2hL;pRD-8Dr_zW+7_zW-o z_zW)t_-t@Elg4LwISilSWg|YrO9r2%(uWV?GrVN+8D4Vu3@=0YEFTPh0-xa}kI(Q@ zz-M?V;^pW)?`{8#?}<-hX(3$_Up&i`-NCcXZD z_%xAC{U3aamm@1YFP+ODg_le&|EUUmctkG01+N*r9!-Czv&m!Vtd7jF{L*(Ezob4* z-|0vn&o6x^@Js4My!3UXPvV!%$^4Q!1uvS(zxKls)93xgFU#@Z z+zNQwz71(yB>2R6(I461{OFHN@q*}&{@^RlAH@r!KQh5r<&Okk?Q78=+2A7lUVpBb zyBI?{tdRdYUJyDif!8l4dNV;`Q@WTOxDlNsPg;$GD`qDurbuHfG z1AhOl3a=@hJv_HDI6R#%4kt3#g$D{lK@tw`+qg+NLoWNB3a>@}PE$neOC*Eq!|$Xv zXA^_z_c55urpZ&%4}Txmuzw$sF8%-l-;_=Tw^ew}Ft8%jTYvd> zTs_@KQT7g89q)2k`r}R=`JV}=4ivFyYYj)`5>`zD2K8A5LY7Kvms#xcaJ^N zYmeM(k0kAp`|OdFJ@O-aq|Y9?-yTWZBM;ak8GGc%_DI1VdC(q7*vWgy9_h75eqxV& z(jNJ#J(9FXerAuP?2(7uJTf`QHR72YmlRvYp`Kca4s-@unoe=^Ab zI<$%bIM7V+8(2j)$CtA6^+I&W3g|@)R?p(lzhU-ExQ-s-;l5nqP1;Zx$PH&w*<2C2 zm>d`g^1;OwbrZb0?w-z`r5jc+J*3iWmG?bM*R5Ky8b_B@dChWY-TKw5I~T893c=}- z?v+cIu3fQu`DvavSFhbik|a5Z`X3iH}tGnwRFj8RbHcfy0&xO zK}(mMU*)yAf6G}%)q1EM1NJyt?9`37%P<%LedV zU6~+}9UiLm>U#z-$kdYI!6DCUT$_j8$&rHbnwF)rsU`R{lS^(a007gs@+-Ou)n4&L+d7wO-4TAU9M@4`RlaC9y6y}CnlgT3hh z?;E`8gM)m!Z!^F#-^YQgS2TI`2Ly>By1O9X?6pN-?imOU$>lSt7H_w%TqYAFi@1SR zK{1g^6ce~wE(sT$%eHzGmv?QTYplqUKc!<6z2@aX)_x0~sLh*RdY~(pO%CVD%}w&A zIUnWn(Um8AyRJ>-6Zq-O@~&kG%0r?Lr+97Ahuxc@x`WHRrg~GCx7(j}FE!0;iax;o zO!pe;Z+j2BcvF_Q_vAOPfbUHwiUEDHDv{r~t5<(0y>=H9`Qi+(mj76qP3`72AG$7J z2?YEZApM~t+TFdj17I$NfyBmOO*W93-ou*|9>frI`h9O=cyt+t*_%ji+|!%1G)v)g zF>qp#S_!pCXZ!c^nim6DtqUlM(Ip(H|@h<4WPfkT))!?+%I>LL&1KuT{?J#%MB-SunIO zMh~SqB$3&;2CB!pw4XPb6$yR_BMT4D@}{hV737NtCJs-m87{8rTNMoE@|*YfnhspH zu8V>x+sJJAjDa8v@#hi)%P`H$yV_yN;USt{n$8Yyx9A`&Fp&u-dFkPaSQqpa=6btCAMrP%&*s7Pgg?cft;^+#h56pJ=v*cxEZW`a-X9 zWjZ^2#F9*AC1T1VuVGyd=q6a+wKCWLQE%cQ1L> zy-8{ldI00=S+Ue>T+y|7xUVnB(_}8g>?RY315O31t%c=Y6JOnWr32tg zdV)f6=@CJ4xEOR6Lr1v+e8#eMYceTO_X8oq!v~A$wYh>Cz_NT0e2XZJ>h;-SSRSC0 zys5NrJg=@RmkPQNuYzy#nR7b!>rEFC%MT6mIUi{n5hYXM|Mx@q%=xKw;V?p3{E6o^ zhad2nS5{O{;A4TG4=}_45D?*XO%cH`I#P)Um+LD=2XLK30NN@Mdyg z$y`1~`h^&qEqE!^LX`R=XtC5@4TeqgZLqdV6*y@Gxvc$iSO#n8Q2jToB^aw&|m+S`pB zE{@sIUGi~_HaKGBRh5p6+o5Za&*80)?1! zVUjl!8sJ`WDeEA9Wlh#!iOkElvpd<_J9cVMF2^_E_vFH}rg-&B^ZmJO4jE`+syAtQ zyH62om`%oCOT(MSN6AJK3<2cmba=*g|A1knll{5jf*(m>7s5>bTBvp|l}`GR&g_bi zj}P(zTrLs5&POv4AJU2bEW9UwWpEHiwHvg!m>U{Gg!d0#^*-T-Z9IKXQAGDE?A91f#QmACgGJ=$h@H zt8+!bXX8z@2PkAhFsT4e7r4u}$N4(dUTeuQ1p8|#%c+5lReF!4A)>x?zfZ<);8YV?7&o0$<<*7ifFJ8D0_!^^SF)YJEtt<5s7)q^c&mS(d@Sl2m)?ExL$!CGQ}K=a{wn`XsJx)!%p>uM zX9g4L?3NG9Yei+PH!(C)pD;L_=oav4Bac>A)OmFrUnwQt0uC9|H&?WIZFGLx^T0K@s1SX&OS(K$7f+6D^u9C;=xLeZzTv?FFeo zk(pqWC8P^}t`FWJUGS5Xz4@Ecz-GOHkJy^qgxhND8UVDS=|;k7CemS{gw}yeq)}Jr zm|HLnBt>7v_yN`jf71Zmw@*Kd$tN|z^?{lYo`~Z}nN||fp`z8uW(t96?m=ph@w*ZL zHtFJK)5d^}Zko>G86-(9gb49(hnZYJWXte97Wk{Il2g+KV6aRYmjE6NA*q?M5*!-x ztl?~yE(u00py4z4G0mNfBGl$FF#I0kH~r9pMP?!t7ikH;26)4Y!5=Izi@Ox>t~g-L zTK2Pimk_WI$4j~<5)N=gkcf{^+aKU?GC7Q7CApceG|x&1-f^?fFWm7rfvyaEqRhDkOD@u zY8dL5%ZHMv!#5#VGRGQJ6Ct>QX%Q7b3Wb>l5;jeA6MT@^3sXl(_~1ll7#^gE8G%;O z*M%5Mnf-c1NTjRyl&9+Og5R%p2WLiPB?V6U$V^-v6gTDa8wKuBF~=~UPSyZu@`+(& z-kVLm=ql?7a4d)~pP4VyPUrb31`iG4W_yDqfou{ATxm++EUcp_8dHE`1!mGPAORag zkP6kco~Ljp}qy5xkhr->V3>)3N{ct<($BNK+YhZ%=&JG z2#Aj~60V2kRv?quG>`^(C5q1vn7^SJgeUihNa86gZ2Hc~sWx?>k=FDrBZOQtgsL0q zQFVWkCeO@?Jo~5Oxw~Uk^!m%m?ggp>@1nlj1oJIeu_1}7J5bv zKY23=zoF^+@-A`11=F~es3-eZn>tJRoBfh$gd`$&JP`x)3j@PNVETSPg(TcG!uulE zr0gY;F%zL`Y(vp^mam7Q<&hAPJGMfl#05GtklV!a6T2Fy#3={j1MOD4ubNR}3UR z^{ng;8GJK|CUAKd2P?}Ci6M6vDeGl4RW|^-MetHHJnCYKd@H#^Og4_JmzglvifWfq z{tXK<)#Os3-xf8Ieb`Xj2(?qd0faW+hWCW8xNKX{U3d#K8EFiq zoGIVNNO(Dej3*P|mtaw?s9+AG_Dq^26J9%%&m9gG1*FS^?l!gX_o6{wCxBEPX`}cw z_UbxxwJqz%P!I=_5Z_CF5iA@3(MFa^5U3|NWY3*S!ND3;gt5%-!WJqiM*7wb$cP)4 zb~W?S67#W4l$8WDiQGErTN&rlAOTB8T#xVMHj$VL2v3Ab_+F=xk&+G(N;-r9sLznX z%m6&=OeJ83;7}L|I6ktvYq*%}>qC$dFNFCCrsYD){$0{a6-oFQy4`&sfXvGtoNN6<~pV+DR1+JL# z2pf|yK3HQf|23Ito31<*k&*}UO^H;&OpTl+c^ojyK0D?;d7^Bgmfb@)inP#@tR2z} zj_s<#KIw};6PF-3wU0nBk~gL+K!ueOGclR>0j*Pm3eHdYf@DF95egQSgUl&DyLC|_ z!%W?w5d8Y=AV%BDs)+omPl(QaOauH5-8WyN^)STSS?G}JpCw+(OjCZCEJ)N|V!f$n zX^BE$CKd8xxcQ=~UmN94&Fixied&%VZ7@w}%Mf~-gYi_lx5xs*oNhNLIQ?c!#|Lw% zVfefjFzSL0WH!w76c|nH~be z)IE$?Bsnm=D+v|i92{bEfFDMyDEi+JFKX-&PB&!=;2)?3#Z2xB@&w2TTKlMiLDdQH zG5Qh-(;Q)DccHshYXKd=sC-R6-JeD%r|2Fzs7P7Z`Gy$D)X*&gewz9y!WoyqWxZ%~ zLbJ-#G^WHDlt?Xo@b_z(kK*y zW7A-37P?9|q)JDwG&w+#ilSP6xKP~JZ}&eYZ-K>=0{}F*>U^{NI?gbCO);GshKK+s zEub?O(m#t#3!;<~s9g6kje}YtWZzJ`&eAK4QT}}xe%0*Ft~{*blh>AT3}ZlB2)8-F z5mJ##q7UlN?krSsc4$5xMe`zbA3${=Q6zwo_XpX%LphLl7LYYz+@zrhVB-G$0hG9r z03`#&$`pU5UtvUSz`g<{Qlt`3JYB)76PpD0m%fD&4q1I01M%I!4=tfHRB2EQBAz8@tK1Q5h)u z31;mygP;Iz284m)AGO4w%9c_-YJ~QAQ2WxX5H^8N;F%)|OsE_(aGTnPbEhm%IESVl zD%VsZ9qcUIoE&N`ad*c~0*`M`cZerV&I)C&cHoW^=|WPA~^Yg+&RQ zKnoTJ09pm8^A|d~%@MZC#eCcm3=bV7Brl>H#EY7Gk^Op1y_w31kiTLLF2shR=2goe z2E>c0!mlFgu`~~jlpVj9$w;dAAM<7}LU>AJKorY%CAkYdB|RiK)iM+Hi)nK4ThNN# z=sa;@6#cZ4VY3Z1=w+xOfWABo;+Q;wnd-2uE)@P3ixFrxq6Bu7thF>_WnCvDjZ}qM zc0Mk**oEN+fmniRUYkcxGnI4KYyxsLlLr$=Sa?D~TsYC`5}4tiCEiooD9)>vk~2bg z5#R0LxH<~Ukow?|nGwkd_()8inw!|_r$vEZ1tsh=Xg*>hxMbmTh_A~PtW~tB-vIXK zvI5Q6v`DYHMhll zLiUZT#4Ag}c3`AlK1Xs*w+4mUv}Qj@UIyk$SrYTNz@zjTJC6O8AZ_eMf)7IX5F`_U znNQe-Q$`1V2)Y1}0EdW=A@Mvr#sV@5pZnU3uboepFiK|pBBSO-&hydM_?oGUq4}ZtJKZ?kkLAng#<~AiZn`)^Xn@Lh0Ds?JNoYg>7 z-1TnSsIawaeMzc_tl<;GAdFLr6{c8arSd5_lHOsq+{uc8{KZVxIFXhDh2qj`!E~k( z7zhTc_E~#Suvy|Ff_*AIJSa(%X^T_~K1PzO{~_{$%_G7gnV(5m7fb<^4Z%jxBD@(8JBkBu9QP(PjeY2hu6JM3PcXxb&Gk zSxhGZNfl71AUut-6@OzNQ%B)WNT?5X;#0P?(7ho1Bj2WiUZN=a2v(#9!5nv(HyuV(BL|KHNJjKVAOs*r z>4`Mef+8TG%0FQLT8L?U-BRO+UrOIC-EpD`+?R5Nuo1h|EAHn!g3joW2a01*+a$iY& ztD9yBknm@cH20b1cMlIyS2B-Y$kZ^nP+J#G*S=I2rlEDM>K3FFo&tlL1(!epfk3eS zW^X{AB8C1&aw*6~F-9bQ38Y6{8}J7?;YD2s`KA0guLUBelT-rtLC%}H8S#P{OBE2r z&~$=d!AKdtTIHC97!iU}5KCsk0l;(Y^bxHFwIT~bhQx*%AV5t5F%Kq%kT(-R9InHmJa;b6aZ`)0O%(_va@0%bO2MlqWqjTo8$#5DknWmTV0kJWt6DnrPRxRxsx zK@CkJY~gcV+h>Oe0Sch8J^GkSxGmEP?J12}jc}I0w@hpmOl@Hpz!ifv%@ML-wq&)7x=NZ3Cb1alOoa$QSo`lt<6u{va%=@D}oKYEhFa&O@f-=-% zY-VA7FRusHJ2Pq2Dj{oeQE+iwjGYkgQB^70t*F=MPUpoDu_^8PcClE{4Sh z@23C{DA+K@<@SfLm^6&`hZ#cAkW<=-R-+6R3PSSGAUNd3!g!w0I|cV$2@Um_|KvH;UPC0t#^ zf}jM9s@sjwf9C2KM$~t2Ob_`IMA|5Yu$G?k$2Y5# z(;23!pZcQAL|4!P6PZSEE=K*H#&C?;!-b!OI=S}X15ROy5azCg{NkTBZD6RR6C}cV zt?RVtA#^z8%9QHzuCUw~sS%YvEDxk9iD1>e4;i5F%c(J(G08k63M7yXY&Phq4@m;y z3o&A{NPjVR*@!()b37PO2bGtljKMum%iC?KiYiqU#Hkv={kw|8Sz=TuA|Y8uVgFT_ zNl=-j5S;F!iypWoM^nPyfk;uXDF|r?AXWRMX<0_gbP4`)S3tq+uI(&Q^L44QwXFwv z(vJ-&U;ywWJVSnzmL3`jkrg120zh2~8iOxlwra`txjNFerhA<)079uLc>ECcauc;_ zVOPd-6R|Y{1$O59hY3c52cR|!Gg-2~NT7WAe-hlMm<$Mm0D=p{kXLXx23OH9t-fHE zL4Kid$i=)ssC?5#l@eWMM!te#7*hdG5as0xz+QXEkGj4ZP(WA}cIi_?uE6$c3TI&W zQ|{@M{u2J1$rEB4xg1?O6GHCBR~Ts70l|}RapZg$g9h0F1L}}9iZD?(F>aD`H(5SR zq|Lt}PDy+VH#Ra9XCJXJa_k{QDk|E63x>bkS}FHKaP|&;qjwW&4}T9NhnZ+E9JN32 z$QEPu3SyqC{d+~>eyf4R84(Xri)sjOi#RSX>Y(VnsGT}9i7boNVnF%~nL5=p2zgh| zRHQN}IW8*zPu^tGZK`J?`9>n9HC|kO;XGnRI6(ug6__TXnYlfLV-9y!hLawNMChO8 z?Gco5BjoHz{mHxuL605|Of4s4gwk4MtOb}eN>&)w-n2CNn$I}sQujR!@Bf;aPWdDDd6Nh+-6vg`_~(uFmJyqUsP{~qaDTNAeSRb!1B z)&83($WewV@$I9wc|$-buL*+xfH=M#xSTqNkYBOa(0QVr&I!K>vkPq1-%R1ZU9NktyxN}pFPC3h-?n#It z3vR$(V|i(BEGj$yY-@F3zJ%H$=t?l70AI_gY+~yqOD&z8T7%kRs}KQfTQc@#k&g(l zh7gPi3M+u71buUPt;tAxYZ!EiGKdHvcoLw2I!tM9f z%cA|D??1+)5BoZ-f6}fgn@9ITnWg6x8e7mzA1hkT^k|M^NjrSGO&4thr;JoQZ^70? z=stu2Ze=2tkes&BquC5MDrJ9V=`ogB(ds*^CJtH$yduXf?z-Jo4Ezi?>5Q%y^TmoZ zd*q@4+9w4Eg8#tW!0KU7$haYQ5|-S2BL(5G<8c=PXpAV}4TLKgl%>n2)?N;^W#LVk zlq1Mk#c0DUqzQp$Mf``=OUuJ^%X9yTMpDxNWn9z8(4as(HH?StsFd)oBRsOa9keIn zI29&D5mD=5lGt&StWAVDh(%Y9oDd3FD$+BCV#;+`h{dLii6`}iZw3X_#xX?OEEJtB zBG(mbp%|y(9^4sn3~1+qv1q0gsmjuP9&PqcaBh+qnQD)~d0nQ|twG?N%&u99pCO%xIS#2Wj} z^c9S^Noq9sCdct=;c87ipm;ikD1&7ala*fp{6)u~Ey7G%8oDVuCd$(rc`@>J`*DY{ zQqZ9flZ%8C1LI-J0FhoBDIrV+ofPuHOGB9S8=v5+_hG`zk=;oXF3A~PC>yDch3HF0 z$w39x&)^7Qoo4x9dpStsH?WMADy1b~8qSvcnj}A6A+t;pusjMehP2S!=M5_;hzVCM zIFLQN=2G0P0uS5Z6e6%30p$&XmBg)>Dtw<%oR}m*7t2EKDxhCH&pK}8Cvh-znrJ(D zsNYlC$J=t*xPD`e22xbhfcE0hP2FD+7Bfg{P)#(3a6c-myKr~Cvd~yKKH(i_0WBdL zuuVnwyP+vU{K~6D9m@N)&*P*IpMjObo>|CAFvD7>fM*Bs$kUONpH=R&Fv|z$SW>~3 z6AIFFP;wKqXPH*y{}`aC5~tqNfQV=~Bf1H9TblvLNXudg#c(yn!H+c?gUyUEn<>+_ z@DTIIfX5e=W{ZagTA~C?5#dK0nYW?p8Sc)su?@-0v3Y=%M=b?yyLtSsq(#zvLi~nc zdy7TtLA-86Qylf*_u6SrNRt3LlDF3pkOUglr7&Ec;ZTE#3|)`;klYR&lFjnCNkVrDsT2tB~>THXovNWHu@*q@Dd z_5ggP7~?SRF69%Ja~XJ>UECO@C|gTCi=|CDjF@HXVUau5gqKDc$z)yx_TCQ4!v-^9 zFO=}%riCmIuqC1t(btE{al^<1SDsK+FYB4hE^h`oY} zcPF1BzaNRqy)5^|aT%AbhSouZj>5NuE!Wg7sS)Q>m@8+FjyHorFQ2r%pvxKw9lRS1 z0WbA-Rsp0(B-X+lH7)`F0o+IY!VzYAbi-g4B#UAS!PNCZY7%mGfm0Mfhe1*M2SH~x zIyhXUJJ>LV`7idZ;+%D9J?aUVZ|Vc5wIyJJNx{_s7o*qJ=*|;ncQp>&6}Q}zQ(-7B z4$0J@lYt#F%UXV;lslxG0;{tN=S_nYM~jh0WT>a1c239K+4LXMOo50Yifk@Y4-!od zmkmraP=j{m@vqV{NwON#T#!YwcIi<&kB?bP=`2DgWIw=?z5Q5zLw7iZyTyq6u%<&i zyV=d9b2+wQLP9=wSF7FtL;)6hbhC>P&8(Jz8i)N_-X2jJjv`JDCz4R1b%ZM-L?O~H zV7Yi%yoZ~RMt8^--3i>8<|03XQ0gFIMD+++OERMTvr9j>P@k2!X38^wkd8zA08wx=H4-XeLa9(`Rb-Uz*|QX*mYO zA9!^n9@s7d?-SCqhvK4^HccfO=diUG7n|`%JO1y`szs+$v#dn1r4nVAO4KeY+vii~ zI~g0MK?v!}_60b;&{RWnslBCORU=r-oVSG zgk&%+;$;Yf@}4M0G@hLz`=qIdWz)97U4Bw*zp?|3foP&Il^qycM~9iwodxC{fJHN; z5#2*wof1`?Fvm28^Z~d69KoPFFzAl?_#cDpScv}@nQ3KLE5dC}iWOfNCzuR4UNhTr zg1s0!{k*8FT{K#RZsvg&d9K*@0Rg!|8iiTvwqXyuysKMR1(j+`<(%23at_8gr$Z5Y z-XiwOIddcfv&)A?TTLTeIu>UNSjHFUnr2HUfoV$xN8s2z^D&1U3#*!(U{GHHIYe;1 zTxZfkwL>0)$gP|M!Oel-=0I?B7MVH*Ktw^9MwuuoMPPKh;suRDv0P88-t09UNXCfF zaSUxCB}AT!83bK8LhrK%ONS9KH(B@k53?J%`iF~sF)oIVG= zqTnM0QqK|T!IB8uCUkq92rq@J;y_%eWD2+j)M)NJ1Q5Gpi8k_7&V_j9LOgRJp1F(6 z4E1V`dJuF68iwm7fDRuIWQD~iP2Ifhh3&Wz&rT8*nt@a9(hw7^Xs7a(jAmh({2G@S z2mdjZzy*n$I#9&9a3H9h2MNzZk2awS-MH%DRZ%^#a$W~MhdY@!*EE2p3=vPOxJC3Q zD8R%i^MEGPwCah?sB+$XQ!j-9_KTJCAh>xD9G2eiN+89}n9${Es~atJi`*H&$Qmop z*lSr%+D22ZmF;373``(aU8lVTw5vf=<615*fqb*fFTRA9D)MXf!u;}mazwD#wJjfe zJ9a|poZ=U;25oH>>@RSE6$U5L(lqXVrjpG{Pz0tm+6G6psyV7ei{R#CPO$62WU9bK zaff~j5u|cHW(2G6E9XN=u`s`K{(Msh9HKo;mGc*1xqV(bGo{EhFCd;v6d0fdI-^}Iq|<}}P!gwLBf(v5|LPg1tulyW;trpJbcXY}EQ%l8lhP;&v zA(w^Nb|AuhT%SdD$Vp3d*oj2e4-|WlX^t0OecWi9Gq*Frt$IU=$H+6ZuC973lHg<*IMXiRB}Tp#%c zvk<6)S7?DE)%`l?n2fS)J^?NE7$Sd9-rMTI&^ooVzHy+mV^t$ zRKv^})Xb@os*hr%Q%j+W%f56zPYFO<9kuaDC+9xm3^^m)q)`^7dF{lo@s?%*P>--X zdI%E4ftrJ@uTm*uv}7Ssi%=ltQW6ZlSaf+73>)}Mr?@Yj$ERT{B=)gVW&s9f+i~gc z7x9=E8tkN;g?mu-c^e<#^^0Vk5oSdl_v>?+^3h4R(AW%P8QYHbWkhLY8SH z-^);l0xaJejWEox=&m;z?&e1-OMzG%2(!!qdfX^UmcpM)YXWkWhN6%+z*j7nZFYx) z8bTcu^6nU7{ zz(AuasbEWv(^AhfwK?1=Z_F`~dc=HY>V2g%n*lf`FO=$3F>F(&P9202Gnxtemu_QHc5^#EKz~i<6dsFtI7^R zM9U3?`=#Q*0o{Uq42ZG59VKuj11QPKrmtGDa^;HdrCn=QFX`UUy<&CO(hW=3uIW0! z>}4+yW(yb~ycI20(C#c#AGNrcskS3J^s9<2*MgwOGE~`*4!PDwd_AP&o3POj?-Pps zg*OJ0X2~Afab|7OGD3+IEu4O`{hb_v7oKv=3ER*a>CMD?_(HlD)!Etmm}yXBE^E@J z;124e)!(*5g5CWjZK}bDamPhk=z(3I$Z5iByEC0o@nbCo_T58}=S~StDMLS{`K>obFYLb81oUl!f;w z-ba-LVQwwnf!QZFIyI<|K}S$2Py_=*2h{NYV-{NfeW&-I9RRRce{6FBvk0|c0r?E$ z2=NQ)Pa7jrVHUDiIWXcUe<>wuL75Z|xK1dR7^A6dx6WR;>yhkiX{X%oA(dh`ftK!3 z8`c^mK#K`9QT!)AAbkzZk$Q+Ch%4|pm7-A-kK2%=_C{@L#3RDcGsHcfrR!oO-``(? z`X~kQaGfONwWeD}FRp7uFL0ymKSL204RqMIL6K|u{IdZ`)|x)VDr&Z5!b_7zCua;( zMs#!|wZjgBo89IRLUz)##7^9J_&N5{QbVl-PGXA5iVl^R zXf0|>lJZ4i5;&=0Zj!>V(+5loHB&j+^a-ux2(r8+MyAhvkia3H;sK-S14y(RCHXm8 zS1YX`fGWs-JHsL*otf|tC0J*cuM#50!eqxdVfC6@T8)M7+OEtv@GPR}uJP z@=c+vY3C1Ya!L<^@UYoPKKp|L53UUNUEaHvW9Ci(@EnMJ&;QD5 zt<;#^T` zIWT}VlU65N1qz38NtZH;tRU8nf=jpr9aiK`b*F5u+?p%odA_>@_o3#LD{#uo`%%j- z3hN+sS?DLpLMU+aUlGEhQI+eGlznxyffEZ05>W$WBocUs;i1rlCN0>C)ilVlOVx17 z(kQ2cqFJVIvYHP0V#-K}jwzUBZ<~jp#g$mnjvX^;lec}8kKh=NRVgS+mb%~%jupe< z6>uk8-{r_fjP-0d3}uahv0wvca^22Ga#cg{#Rb_wr6eIiza%XyU~dd}_hWh}ZAjHi#CYE8KC&9^~AfA7ALn zsg>B6vvyLpufr}+l=lnLYq2c0Xmi1UaiN{Wk%$*aqP(?DX^wE1%mry91!t&6F3aoR z@OUa9aHv+w?k+@bpYqae?%(B|X&ILM;sD*&XvEJj`^mT=K!p#WP?}2wPCsKZxG(KG>aUkb9Ke zxt376z=SADEruRsB{|Ruu?`RFC%t(L&x%Ny3$xUdzz;WoY-dM?Td;20##Ex+NUvpY z7POr)d0WC1!UBaK5O$Q>a3C5vWgoLoC+a%{NudP+o`{K<2u_hU80MgZ&LJcg@cGzd znzMZyVGv-nTg=(Slv-}J$z0vMz=XWn1rbBH6N&JI*hdwSIvLuOoJ+!!-Bb#ZU1lo8 zt#BC#r?PcVJ%!OjWuwRjrV2#C%?w}@O%642BpGQZD7NyK<+=i(TS1#+(L4taiOwyn zl@8R>G&X030AymZ1emtIhA!|IxDrDZdihIjj~=Ni7jNM97j)NCH+Vhm?xJ*9GYa3X zk~932iC<2;+hbGl0`CTx(jlQginbf)-*K1jN*=F0Tyid1H$W$E2f+IQ)P-3+7O&~z zI*Wx<0f)4Jx1iCDSLnervdlg~z-%tFydkeRM-i-ccQsWgjnG3ZkKoYs#GW4_OQ< zuZ=8c)=~|K6DMaod9dyMcreTCYw1~U zsEhy>vqvvY9FeThN=#ZKjVMefz}sq*x4LfZ6U1ErW*XcjnmZVWkWZ!^w0RR?W>Xzd z$$Etl+)8Lw82~XeLTkL10?Ij59I^18@Dnnk4==&M(iv{98^NFudrF}VCF%p097MHU z-gzVfU23xm7=?8rrk7R;kz6;Kf9=6I3$}8MEpLfy-nd2scc7+VdI;mUp<(3fZ@W^f(H^ z)CmttHZ}#(jvgwD(eh-fxiqG!^9?bTlH71-Yz_`UEUiUuP?tQDv8$mPtf}U<5l}M} zxbZW{V1-k_F7{S_~EREu4_MzL(h81uE>B7EnEM_2{)YN;W;CMSm;G(iS zl4*%#Ci5Zu2VW(={a6)IdIj@OonggoE3Nloxh%>Gv`lLjjNYHOHKdPS4&l%V`LR}^ z6c#;@0)Wn!qD-|Ym01i=NQy)x71?Q#zr=Meh6k8IMxA_8dGBo|)Aps3w6Qah9)OQU zUIUubpT+a^=m%h9%DUUI0B0b}*C-@dr(kw>GHzl?LqTfk(%DE~5IWifR#Hu76)+wB z&=R|yd|kM9&b*)1c(}J9E6{OW^ba7{2$=v{(qd`?#nPsI0s1!R-#J(rY{MJOwq9`` zJ*|O0o{hFUWa$M7Aa!s?dG3P2vNnWWz#zdXv{=~M7kzD!sPIP+g!o$c#lptx2yL*Or0!E4+`Gl$h zJ>39OwYSE!eRx`wp)8YbKhw@|o>o@SlW9;kW~_ujOO77%J8XA%;S7;N9SIPv6)jS= z91QF6ynPWRr^~1qEioPNN6?S13?YG9E~aYn$9tA`qjg%8iM%BC)097S!J<&+fFXIi z12G!dxjBmjs%uDu^X9;=(BJx&66lX7Ns?El2WSwx*<{lNSs=i%jGsFdwTc)+41#IH zhW7O2D{29<7@c?Pu#RnFm-f|0AfiPqBxa8bS!r-NQ&g>y;|+d;6RH`!m;_6@ zw1L#hg@wdT0Js_Hx&%QX9TIy)@t-^@wMN+OHyAu4Z?YC)-e)@*)G0-q`|vN+pnyng zjD>u03o4D2f%ydYU?gT1QtXgI0Vjs_tdJ8^+##1jFx4*7q31WjA~Xr0P$}4nEd!>> zQo;mFb2_Og^5pk z99)laa%FuM;HNE(&qT3}?*n$WFY3$uN65qP!(Ja@RX^apmL{Pw#y2Daw9w$3#GFRVfXcO zQ1tw!G?uWE#>--RYWY4vaXr)`)Lfw^OYLZ+QCxJ< z4Iv)fW)YjKVbzjDn69-D2p$K3{cnnrMI}iFahjL*YT-U>k{_HJokD(*A`fy8%25dm zwUp3sh&Z+DIKu|hu-rZv#W5G)CUU%%FAD+7sH|Dt3cITao(x7PH(VPevo~32dcvyo zsRAvoLW#Qx)kM^s=W5>)>(-r6V36>+&i!f|g~1+;psY)u-a9>_s7u=r(YlYmW%wG$ zR0UwN7*$9d)TIbb0UB<|=3G)5>?YEp;ikHhpgZR9?}O?dvt9HuZxFr&?W#7 z2Yr}AmkPpG-ruiX_phT_M1wTG2CzbBQKSm50g$Y@Sb31#z&5Kl(HeqpnpM=5uoxYD z48ow91VfW_(Gfa_t|((xsLL76+HUH!u=!h~OK#%Py2x4~4yU1AAOFG*i0MdoKR}vb zt)n*C9pZ&gXtPxf))Y~nJz@MIKSm^77&QTCrHt3iJW_-%Yq9$#`8q6Gu?T}<9KI~} zjGZUMKzykiwa`|;^xi%WM4w(p`f0#!^mLobG&a=-yppO~9G)Q^!-{TeCgL|6-8NJ_ zZGt%NEDww}pQYt;k|IqhXde+LTM8zyECU$;7Ku+^!sS8*ASK$2L2lv{OCljhO=(zX{~&b&3hnt^#;jICEGNtX zQa2k;W#_AiO$=m92~_u8Cx9=I53paNtut&VFXL>fcjnN5|U>bSok0d(i-kf10bX=7RcX_Ht}8z>bja~qHWM7<{5qd{yen0(Fq9e#~TgFsd-cO?NUc>SB>r?nyOd*6 z8joQSAQRC)9`7F7?Se~FN9!?Y%L6=R1A#^QfUzqnS0AY!(Q3m@_+)Ah2cjkRHl{H7 zVHf%%+2qJ&n)`&#vphqK_!?3~Giro0H4jTAx2sXDA((0Q)w zrv3LJFpy!|8i5#O*Lj#4+0z7@ta5QAynQ^Ej2=o1v!GU6G(j*mBrGyFPO^58Cy+(3 zXd!7~94B~?=b=@+YAz2SAv4p&6?FC~#0E`rn%mdf$0eezg@Ax=X^Ae#v?Y%kb@5?= zug;`^2sli{OqEcHle)oyK^$$K-=#+_80X zlmz2h@{Mb-!|$NoS7)5%4CeU9ews=Z&xEA@B6=zcanq{|*V)K|Z)TpuTa0US6o7rC zTFp*lKXL2m8C8x3-PUj=U?D9_N}LHMy5y0;?W7za6etU)-9bqG;B9S(0pcVc>z>0Y z3ESgtrmo4-ww7e_id$t7&D0Qp0sEpm58Z-PC^YX!%L#mgJOUgV9^m5IE=epOub4u( z5exPs6E;lhcZNrQ{L=55pMk^`LPPYD}Bn#xe z4^Aa_lQIlLKVWX|ua5T6Uxcs<(JRX(75ABI@(2}JMrzY~?X1AQc|;%DD$K+YQ-J}| za}C?EEfaSmgeOSj7(VC_f{uMtlq{I$Tv$Nh+zw~rNt^B1zzP45*sz5Y{vokp(z1AHt!_E3&*0l&rvYZ#Y zS8#w6z$q>9M z#P(452M@?>rwyVcSow$W(`M-yNef#M{Hw$e0sl6S#hnaOlc4QNP-jKPi42|}xB$se zcPwZu^;;w>1^86@z^vl>G!fVo0RJq&@>OicNihz8LHJ}d@G{c2qP^OjD5x4>qk(E} zg)bNnyKkCW3pAw3etDNdohcD+!);oo11B9m2xHZ1rPq#Kpzu$7Y*TtF|Il%AP}uYd z|B(J*+olghSEc$Fwy%g5i4uZR&b=ct!B8?9!Et+K=~}uzNd#L!;UBU^YyvfjmN-yl z-QjmlWiiKGV{#)p*1*?zc<>JWgT1V{J&~)<@@sS$+wXI&6K`oGSay$pXaZ2_ZR}4< zTEw8w7&J$Iweo-s7ld#f30Kz>i~dMem8b4s znU|oReyB3?NLjlO!casNU`K|bTfsK(i)7D8JO-{C6Dllj z2FD;UPNtn0jNzg*i+@N|*aZpykf^W^68@o?!G1^h2Q$;fddg`H*BF6w@VFOh7@p;<0)3))2TC#1Vo*$)F6(<1k%>lu)1?~Xy{GU z1V|-LA(^T52>?J6Ew3H>9^s#MGl!CfY}gUP@V6M&*I^oxB$4t$*T~-jp4Ac1Drm&O z&Pliu2?To_;U5wRb~3_03!sOz*^*#X93bIfW1~)6&<#ll>p{p>$U302z&>-r4~u zD#Oq3)XKG_*_J}b;!eS2Xw)B~#*@-`uMh}ZCRIte@!GLdlI#^6_Q618*g6USkc6>q z68^!?G2ObyE&iHs9DXpvEy;G7GM!9XiH(!OJ*ENOg^;G>KtcGcKoz!-m=X)Ak-7-# z1)>~luvCt8tzhc8TVA{4pb(-_Eeia(v5G2iykqDXGX(VE&X3oQeU$JI&>&S4m$!4P zD|NckQ4#_@GK2s&y`5_oqRB6xLq7*;Or*o&c{TWi(NShw4F_K*HN_50_=hBfJ(%zh zHeuo)?s6HzHcERBqGB~26{2fTCfnS{3;FSGfce(^sQisWH0|%t>tSrW52BQ&(N2tW`s_F#xvQWEW~oKNUpZPXiU40YU~@ zasoJ`5MM;rFqk+Z%r|+NA~^`UbRq?RZOd6T1um5Uv@J%SOtGG*C~0xnJ95iqLn7r2 zk~xtC*JN3;n0O1o>p6$vMFFM-S&?Lh`d~#yyCAh(2-6^BiKy`m^`C>peyIu&2}X9p zxw*Kp(v-)vh2>PjnYtW98G7mK0#2z1Q*SFz`$nV|T^&C}&D8{jEccyuXf7!e$_>tp z#KV>d%%Cy3iCzLe{Q2As1K!^TazWW5*zH{RA^P4x+n* zMWN3Lo5as{cOpDx+12vf#vr%Nnkp=0!Gb?D8BpPy+LUO)KDoHI9)4Clju0jlKiH}< z4W>*%8S7B1VMCqh^{KV|sEUf64D`lnh^prDA&dv1mO)tyRtM_rin`Dv21~kkbc;AC z+lQM_nqo*i==$7K9%?Aj-CyumbaQx*NFQp_|+{ zK_jpp*P^>!DC*mdjU*@6osd8js=+izyGgR#S*j#IC^>$V79T@`t>`C|!ip{D%G0Ms zU377AoqB1wa^90@8T=bJ7u5GB58>TdpkcL1C=u&WH9n*LET_jde2uK3LHvQh(k}7y zns?>skxEz~6r-_Kd{k8>+8|n~Nh~HjS1Y9rdecJ286+>*Osq#1J_8NV3gM4;hPCln zHp}bz*qc)gfcQW3Vo8%;$x{~KKzMewe-Fq_dg{>PI2VabO|Lvs%%G5L*-k2cYc0qa z&ho2x$moyenl|hhu2hY!g}F+&S=-Cd+(n2r?=NPcO1-Fa=Po+AVnXEujT1gyc}Iiy zY~2|RcU4^Jz0mN!x<_m9=auz$G<>t>waP!53H(Q+~Trq)1d`+W_c=zge ze1zq0{cCk{OYz%#yk2havTC`#J?r`Q&aJtl;VYPcYieXdwtIpwiIE4ilbj)otw_D8C_QjF|- z4W+_*Kn28FTrcOGkFQ&SlJWhqCerlBjhu53onrn}Q*lSbE7kZIuYc9o>55Gwm^a{d2HwzNgAh@fk4@|{tCN$ zITrQLHjyBIt8*4NoHHB6aL#QO!}-Wg3s@fVMtYXpJ&X{?X;k;uy;b=&RULBar_hKY zl~=1}gfCRc2rsO9PX#hxXLB;&Z^JrsZt z&o6-$yiyTO_ZNt{!SU@9nGyp()~UbpA0it|%O0r}YdJE!Kpy@eQwe~a(>NmV&LjWSS=visnlA(yRE(Tfa{;(+N@2*)^Xz?lvA@U{-&DOIdXw7~MccW4N%Cv%429^Td=d{JlNBvqvEZ^sbM zWE@bM*PrO*_1{zUdkmn|Phwv6=4SE4N5QL|-xN9S%at?uB6Hym(M?{j=8l^0QXZln z@Ye*vG@ac-??Dw>GUlS%BfX0h){&>ar$&P1RrL~Veo!T~n70ir5o~tExPQ#`8b@|z z##a;(okis$M?^2H=$^w@+~Yr0Hv5YRV(#%@6AL?vXnwCM@eS4L+qM-)Kr|F@U#=K^ zSdK=Ib*k0!r!mw=Vj6UAnHm3?Q&ssxgUtAMbjI&dM7iD7HspHaEOQ=-+$f&*JxoRc zNxg`4(e+7Z>+J0{wg4ZeQ*jr6gzY>UlgcwhiQ}_JpahS_K0A@@A*Kkf#7pAfD=2rZ&uiZQ^f<0{R2gsS z8p*e{rvIpV%lnn#`kPES`4L11H-Mg|Q}76U&jn7@cu@Tg9JG7->3aB5#9R0Do3uIP z7+l^xevgX!irD4fDC3RY_3i<;IJDC@H^-V-P$A%$#r- z67vwVok1mDcr7X)J`_9e5~rT?8Fdv`um>x}gxcQ{UjKTfbOn<^&8^$RwBN0Fd_+(n~G`WL5m{pm7}&DDmVXtx|G z+*LaMbCeGH`A$0iO-g^q{LcK*XLm_txnI;ExJ;6%M>L7tiRO7!J^j4XXYxaBA^fH$ z#82&va|Y8s8rbFMF+l%yq9RAJ#}l3Yn_b0IeM95#)9-ZN4>S9mMU?7r-3Gz)96$YY zZT0EbFk9yIZ#&`OU~%i$GT1|^S?2T`oc^R!$v|U5dQAmG5$T7T{{BRpG@sK#__jEy zaYaT*=2S?A3s5l&d`>~{FEOTg$cnQcFFF$Zu_B5m%Y?f4_s-E!Mh@#Y8d+!4?ZmQn ze0;29C&y{8)kWhVW}bKa=MNP~z5yUP){x$EzV~JQ-j)1&v3rXVLHFC59j3XQSdXOZ zj-mn=s|tKi0oC*Gv~j3C|6-&)b53*)?zLPV^FSF@{*I~vsqz*l7M-GF`h||^g?C|0 zFM-pDSBL(p35JX*BKrQI;QDNsz*yk=80xGVW&R#is^@jZ9WPdGV;?w7^A=#9i=Djb z)iN@7-N(MTHCQWI)0LXzJgaE%<#+Kme&h7Eq{Y=Ar4jA7Rn6O6R~xTGqsTv&b$`=o zt$anj$@DuK{-BQMM5q73J@p&v+nyVTjF$F-#T3uVIpvK@89@#2gZ;mqB!oH>TtKjhr+ z`AS;cp(*fN+X2tUalfPL#B&bc_<5D%B^q}B`ff51Z`*{OOl+jr<>Qo{v;NM;|G2`@|0BhOFI1Obt@XCiDWJ~|tC@vK$JpWT z3Bav#BxF+3(YG5NUvSXluM{cVs=)nh)s*cnFOD|~;=FN|4#xsWUmkzE(~ri$*B2_L zzF4JlPW3jf8hIO&d;=XOsl?XeU?ylp@BnRWx6&F2CabZ|yR^#SI>%F5_9{P6+wlLt=#ZPk~&niiv+n zJ}S2s?{{iDr{MCh(K04ithnrL`uV59ExP6VFDb=w0>tbdzf?K3C*iqDX0wdeenv|z zpBl%MewU^c_h5T+hwvv|61RAkD)$dG4?b6wd#A$un3*#ml3&MW=42%Z$2Gg~DNlg7 zE;mg#Y+XFB=*|OQQ3XGLTU{E4Fs_~u+~!$Gt=$guo0P2@$1t}x%XjN~zPq&&@f8j2 zZ`&^4#xTZlyKHmkVpigdTz{nH(C@*!U*a$(-&Ijuhwr$CV-4yXINufBQ)(oqu-lDl zUJnsr=lHmxBfYD%VnIgn8Eqf=wFa^acTyzuLnrt>@3^xIRZJI~8sW^+V~&P=#;(lLS-MgK_f804$LmM7F?OF2 za}B51m>xS0mmy>=ChE$Vu3boA6MA?7?CJ8@XHU@tzOj?KpmA*}f}nOZU<$hu#T`Fz3SqaZ0)HE&7WbTMRAGtRf0{()c#YW8c&u z__X!*It71lDET+(lB0v4)KmU=7*dfh8q(Tp$j*ak;`YalylvCR2S}Ws>cs2&GBcAo!_o5zm?SA)V(0$ zJPUXFL@eSwu5jZaxD>bN;6bOe<4uJge?eq&&w153=gZ1T5O|l(<^ZwOuYB4e%6>_H z0}$yhy{71AX~RHl2dc0U;1SY8Cpx+tC_UuN$HhuQoTu*oJ3B8KM*!hCXAeDqgK)SH zj56FuoJcq11xPa4>oqkPGgS9oL!otOS3TIrnB& zj`%Kj*E&-CvntI-iD5rbfBxQ=BI{dRGIuyli{~m=@FjI`w{Jx>r@=I@$L6`8Y20ac zGaj$P-EWnsjPe}qGz2`Q3KJLCr<63iSxK`ys$03SGp;=+0a4um5q*3cCA1^)ChU=J zZ>&9`@sm#?b&Z>tZb2RT_{WuAf1-@(#+P(GrSSgbaj=?)O0v{`N5ht8+T=RQW>2)7 zgk{ia?g0GnbRxl9%A%i4NqH>tof6wU=KD_L!+#Ps6(yKEzN_@_HI4fb#^>(5bCx=0 z64m{R(Mbh9rSB;N?>on5+oTl&Tey&ohIYAr$@85y< zP_|Hu`-UHj1zp17fpReyYbjN)fV9!(C zeo#&JZ*`yUJieuQ?oSmQg=oy(#zkugL{!&U0Gx zTa`CBHvc=N1RvD7`K9JLJ7WA7U=G}Z%D2^LeF69B9)DRO`&k&jT^QxAkT_cXSaZj)^F`}<%YkY+0C;%a4P;AM)X~Voe{CN z4z~jBqd5I%wfzSmHHKL@PV1k3Lw62;;g05uj-;21EBdTOS)+XIRp)EBIeY@SlD{}? z`4#F)zo@SCxgBV1cfn<{YoPnYu>U!dz%knQaHE5S=#*C+;CF-C+=-BgdzojQbH1;V ze3JodBQ0^q3PSNVnJ?u)bs1H(O>7x$fZiYJq0~+ zhjy2vx;Htq7QgRbD8RW*@B4Wzt=a&v&G!vAveg~3@Yz#v2l3srzG?|Q4g?PN$F#Y1 z(?2_8@sBj9(6+Vi_`m8bpLtEE|8$;y=enx(?zVH^aZ>d&H8B0gS_!@%2Ikl*<=dPk zINwy2JPU5cy{C(u;>f+qJ)O#GJNiA{>;UuERZX9c%c#s)9(5R)XUS5xqPtgHu&<%y z)Z?_ImzFH=kXK?T6=LITfs&B_h0y_5wC+wY}bNM|!cXYX(?&OCzs=R;6IuPRp z@f-I$I(4?{)YCYZL$rFG`<(lDSnckUrKh~?O!0L(RX>LMxR<%vnU>cSEga7gDDpbL zbv)CbH6{KP+<<$XzdC92U+DI64apJSs-#lpX{yR3!pn45p{vz7fA1et%vk(AG{ryB z2=ut3kRSYGir;Hf{8OFcv($=j+u>6T599_pc#f;oasIFeak zAnwtT-lsXy-Hozlb-QN^dC%1Vaq$PBLh9Vk7uC`ta&WzTbRGtNXRP}4=qS~vvmH2l zlhPBXYIXmI|Mv~&OsC3zn{H%stp>q+8cRzP+oOjcD`k_fCoic<6FmgZ?H0jj{B+vO zm0SGD4m5`{)d_|&r^kzFh}CXle6d3eJg6q}IZi?y6N!CiixUZMCoykjyhrMIk5i-g z>5dvNjN(o*>zH=`UVCHjDf8LS$ZliV&g+gXU*nAF9IYZUS&dS^mA`f z9lw}E;OOVxr&WZ%FyS)#xo;=|uwTUAPy>Ry#o_tN@tnjFNTxV`&QBdGpWKJjihaD+ zU9M5Bd^Dz&+f$4F9Hi_@|4v2l$HS7`y34Iju#er|m5Nv1)LkncYm|1x?N&aDfKZO@ zTv+iQSun9hrTm0S`SBR=-!3J9lt*xBF;lxmOEWi@c=RP`)`@KqC&Zov9hlllk$Gfg)9O_pZMispf5qGYp@Yico!!H|U z;qP`^7To&JA#d04Z&w*y4Oi+Oe?vLc>&kGm@kXno)gAw(jO&h{`-l>i-z?+0;+=c(l#Rj5`@UXA;@@)W>_=d};Ub;^K~V10 zdz?{yJw`yqhjpRT4RX1Lk>6{oe^gT`o4n0BjC;KgNY9bItxp9c= zE#Ux@^g4c~PW%oJveU*aF-zx98We2M3c&6+pD% zsO`N@*tt>Jx$`w?JElpJ^qp-3BZ}Bp$M|O(vG*FAPZ?{IvM)O7c7sOZpX=Tc$2JKa z9T!P_x!T`)!E#hni)i@u&;(c)6%w!4Aiw>RV$j2z+Jbq`?b%Z)u5EirXSZJ~j&rOUi+RL@q^cuK? zv3SP^D5Aw&hr5~IBewHdBm4gbA#<9`bS@h*~WFF9GyPqkF_xM67qzRI^dyAk=k#2sKdE+O86u$`U@HgX+TjH`Lx!e}G^8KWIY`gNqZ#7zAe zJpIEYmklEjAF`if9sYETV86Be}Hi4t(*wHyb9+Y!t8b!?mQD zxc6f2cb;#|Izjoxio*ZMqO9Qwr|0mhUES!hO)x8$aJ*ZY3tODMWkT+KZ%$>3fCHmx zOp2j0CG%Q0Q?3Kse~J&qp5{$CWIR zZmwwyg)N;lH#4_jxOdZsFforZ;j1BeqY4_T<1J?~fH|I!%UZy<;@Qoq2bU2%5c#Tx)2`?Y(y3N^xy2Qj$enTR-JFJY%@l$%g{0ir^pdJnQ1pGjUbb z4!DTDm;#c!D8l_ko6fYfuIFbvSMF`G)uN@*oZ8ZjM72D~mWnY3xECr(MBO z?&T;(!6MO}=_bu%oON7k_i>!{Fb!fi8wJ*uaGVc#KaX*oD-8ps-ij9__2W zPMYJ;Ee+xwjJY>7WZ0adsmmDyci;?2A2zO^!O)2uzR6YbTxI~XgLf-86mJ=X-N7xv z)fhOj=4dmmx=5%z1eJcu5Rtvj9RYeHoIPPG{4ti3r$~i?vllCw5oc!+HNKrsKccmn zl1!KmYx?cLm!k20pk;Ok08NSK47`CJ!`lQNjHUHgbJ^U6IV0A$z0Mu09iS)rqc8F) zPP|<~iU{65$9q1*-;*@T_(f~BeFDCV@Rk|Mr}!fAIOsjg-?azy*t_C&jAHnKJ54=# z)eCw3%>Df}C4G)7>1PJj*~%R!63^K@_B(?s_VXOaXtl)QUe52FdSHOo&kNnad5+tv z`P}Yo;5hpY_TV;ww~x6=yobNfMvikfR79LQj|pncH!-(!l+7H)%!WM2MUc|oW=l6v z)^JmGF*iGJa-8=K#`;>m4@r{#nwJ9%*Sgu-jc%6l*y%2Asov@a&IcUl#erHsZ+8Rd zJf05ugiCE3$JuMJQEB0Ip5lXZKj*Ep8~r@Y7lk{AXuN&Oap-$2;(*>J^z#8JGr%<&w1O~4c^Y+GU(tF;d72-rl5OC+hALEmF&Qg9|U8??FVby zj!4Kj;cq8r7I;4*);6}iO18haEzQ`Zt9fX!Y|swaPB_|K@NpNsIpeV_&|vG*C5D*) zV?nO4!|Z(*VIBLDyFHV0P4A85_@Vp5FgiolmmZm2$QB68_RZXa+`|WT4;OZU8`3f_ z`6-`s*Z0#D;cJdV_e+V2@FjOAY0llt=iEKLG@Ng{p$LB?g~OmO#Y^tzQH#b`b|d*C z?ix@yw~-bhyfN|dHCxoOa5^spcM}O1aAb9LMqhfFg zn8=EKnB+O~wuA$F`iDtKN%t5$v@~B^m-299;SfY95J8CQkaDK_cY=;tp<)2K2^BRr zK#La*fknWWujBiY+psT5&(AeH-;csidVZea`DNI|q30hG(*m6_+T%|QkGFC%+YQfO zKv_DG`AmF{neaS9|IfKqUx!@MZvOjo1bScb-z#D5zvjP}4%jj98~*z`z<08b%4=J<4=H@*zn&3&X@~dMu=6U6?gcXwA+_f3IL^txO=vQZJ}UTq4tH3LqWzA?B|Euj4;jwxh5wo8_2-b9 z=(e57eHZu#;^PN-0&+Rlb8(@%mFIw;L>M4mwf8Y!diarSrtW6b<3_IgJa5e4uO;6> zm>*{ge#5(bYSAF>6b5k_@7Fkp+j&g>GPh1c3xCt}pVZbLq(L;DL3*CaFoRy!XBGw` z%?HIO{4cri-{ZwkKQG%<@cWclr*~mW7+q&1qnUjowS7-Wv3$m*Yn0q_F1f9|5PFbS zS$8n%BmN(_Bv-&u6mz7}tT46;PW58?&9|||OOVJbxr`g*Exd@R_s_~_>!~Vj5n}DH zxLO%i=|LWYf50c4SbHKNMF!;^#Ez z4`SMgJ2p@9ot#(ULyPX;&EyqgO)I*?0)==3v_#i%19uHSh8rhN&HvF-A&)aX$>t?L z;@6w` z>|V`J${+Q!3SW)ipt+4Fq^`r@h?1MA4bFO`-NeUR1T!dpzGI!>hOZXf^Cx+3Mdi7b zBYswk&ENIm7(or+6zcIhxxFDZRE31*`&wH^x^( zcp^M^hh8(t`9+=}T*z#9c7c6>8&Z<%BNX`+8H@eGSo{@WSWXCKA%NM+O>Kwzi`W>9i8wU8-_)y=2okDS_@8Xpr+Sp|mQj8sQ zh*%kDc1WM(W?S@`X5{)zn|O?$`M_C`QGbF*v1HS35R#dj_^@BkquAg7tZZ5_Ip2(_ zDefV?!5t5p2w(E>q&n9%+DcuC76VJJzsW-)CIiI;07*SpC;UY(iFjR<`rg> zxR(kB=UsglLWlsaVoBeul7Gu5MTa56aBD_LOfOyyqa+3@TlCdg&v5a95K|CLvxQW} zSA0-tAim>TzKo|PyxJkuf6{?C7(UL$+_aF?mhqU1By}G5ajxc@j^~$_Fw3L`F)R-o-QoSdUw!(~Dn+vP)qvII*DwOuN-={tSj^4-Skgf<=TEWR=NtDagF!7SMWNvaIfP=zEQfnG;4Bi5iG$~ycXvh{=T~k^uLk!|7aic z{_hsd!tFfW^Ag8h*C#tkp62pj%HR2Aq3s9mx!=ayUJ%+=b5pZbmq(xMJI&3m@;C4t z-Q)VJ_u+L0f~d|B=Ji8dRG08!{jLwx0Yj;Y89UmVMr`5Qa#r7bZTTBgGBiSG7HE5$ zkNW-sY@o~`d)Ko!{47*p4jbom`%GahaXhH~)p76ndJaz0k89{M-WI?+TIW zOI$@B#Y^r(HO$R@Q6bGYxf-)vEEiH(k5Y62pYA5UDSI22&rN+XVtBq=7>Y+Z`RgDj zB7cKGekou1X$D^>#CNyw-;_mpl@}2$h6WS4DG}3qj7=2KJUf5`_8~NrJ!G z2HrIpj9a+25S=AlLAOD>2w6B4L#ma!Q_^Xnn_jBj;ZY+MRK8TOT^}^tPDh&SLxKnu^3ly@W z_k%DJ8@X8`@$2yKv2{CZK3cMR{17j_ec!NzKP|AZoWrbQ&TO{ZhXt7HxiuEo{F_*} zS@_2Ui}?drG7#0|3vUxp5ZfV zgJGtu7BqiRu073&e6{XDL#*GC_=|}AR$hd@hM$PP>z`ZXmoX!ewPh~|qEdN0vfE%t zUK2$ADPQSC!*hk9l;}rc7%%49Z!|n>xXq=)#HWY{LHxpmS&PAcDXg{_IE8bIFnT^uiE-3Q`qA5sogE)GCTUZSFU6z{rw8r@epPlbib;(*L!=BfZtDp8x!feuGPYd&=CF zWVk$$l#)t$aF!HpR?5TCxl$x7^*ey zg9CRzu=b69mJ&-zS&6;ucx!7sJQrBjxl-JkY-y!`D{Ym{{y$Fh%&PP_z5c)M=l}dK zX8RR4KlRF`j?9x|9vJxe`ZpN4US$KoP;k!FxD-^%%98Om!k( z&TlIutA{w1{%}k2&Q&=9K%G zQ0{9^xvx3pz9y9WnN#j(PPv~6<^JZV{SBzPN|DkG5Sc17j{N|0!UIeQ4>Tn_(46o< z6T*W`2@f(SJjg&;RP@2-sDlltq7;Xi@-!r$@X^Bj8kHYl7)B#q^nA`tvZwLH1`cwLunN^dwW%lgv+iCtdCT6vm}35m3FgVB zm?s-BMGN!$dGxUG{F(5t*+%v*BI3Vg+cd;-!KtVc+3jPuk!L3gsVa+{C!}#A zZW#iC9L#YBOp$7}p-p7BCfkPXSio-C&1 z6FyRy%u~wx1ly9aP^b)g7|o$N#Xwb*ev?VtR72abLU+^3`m`$Xa7->65Kx-K(dt=k z(K#aFX(q_iyF#9Bg8YZBkpEzUJfkb*879bo>M|0{!;w>bQl3EIr!Xfq9HqXljJ z?+jY0J9j1eZv&S2c2Wkb(A!BSm;qDFfB{n+%U}j`fHGH!r}7jbXh0T)Drb=Mgese$ zDaFwg6SPoqw2%o}b8)n06SP^y(PkOYM0tiYXhq~1HbI`<74mEYvS{GuWRSIdsJOb! z$>M3Ni-;J>B06YFiHH#+qB#658N@P=!QpDj;<1H86j3yTRzyTm1F~qgVj1LuW-Dfb z+G>v4YCsid=ASdDg=XfT4VdD~#xs~jY-QX8Igv#!JUJ64$jK~n;T17yg4~uxF5GjQ z3G&=5a^armnjp{X3VEIha(h?E?Iy^nu8>nE$ftLOe7Xtp|8#}?KPJfkrz_+#ntvSxO~neo3}VgIiY`#52RRZF@;2So1Pl8AnWfS%P+k#|58 zN1xv%Iv|RppV=ikAc~`()g?M0a?wQ-dUi=({3E_Nnv3I}lZ$J|av?_WXwKVs6KSKp zIPC?ww2eynp;42EII%7ibTexdM0`MGi08|5iIKBtLPSQh3Gzkx$f9HsjMj`m#Y;+%ZWxb+y#nOA7eqb-UB?HStnGJVFJIGRm~quqq~ zQ|83cY)TyMCd8jGCyr)Q;%GM^{H$HqB#26ff*4MK?g)Gx)?USm_?`TfY>dXa`8kP@nHV2i~bav#bMV*RwNF9 z;=~^?Cyr)w;s7X4{Qi96qUA)hNStYw$T-@I)4n$=O+7XfanW2H_il5((45DYIFZnv zp{P#de^2#oVqurD^+KUsvy$j-KHzkht;>2(5f;ieu ziKD$Z@msnej&@VxXwM~{Tsv^prZtx9D5MQZi`1M?Pb3W zq4}f}{%5u{SE`&9Yf=7U4aTA&t4__z8Z?v{YX`2_?uvebbpBTBOrObOx~OTsaV z(qVJ?jH0AxjxxYx$j_AtRAfmDCiawTtExrlwjI15A4*XDiXF1S^}A zU|dOpSQGyCyJLUzIAiUuiyzUXHHJnZsKk@4QgT)ywLZTjtJh3lflysl{>$>VgoNtS zsr5}wN*rlp<4_gX`r2w?ayV#iFuEGOrf_pqkx!|bf*uOZjAe}dYi{Q3vk94uBnojp zyQ!&uu5&E0I2W44{!>XRRZY{ewuw#Fd6>MIu6Qs};7VgYpHU~!X4cl!&a56+J+@qm z#-d}(Crzubzgwm8zI?UL6`vq@msnh>!+Rt#f184_R_w5`TDeyk!i!IEgrg!cY*@~hGd>MXOAOU=yJ)5S(MsJM(e&WbyhPB zWQ`ljT27JYG*va#Yrv20GXX|@41nuvsv7TLl$S4hR5SxQW)rm}u$n|zgWY=xhdq+s zC?O>x88vE9sCqh_Xi1c4u=`dPr;AFH84dL{P+bjn)q}-hQCmWmySl0RQO56kPjgr{ z5i`;VN;TmGDy0+2Ml!(|jdCex%EndIHd!ZBH&`dd8YNi{ zN1MxGU8c2Cg?YK-zntE&<<+w!{NG`#0P`uk)8;lntYV$qw5K>Tj=CCp0yEayFTp3!dPx#}gOrEzsUXxLI3LmFZf|KkNuo zpj6pCy~$^ZL}K%>$d=DaCRznPfxk{slJT&Dqbdzba#l>PkHuOOYuNNjzsdD{Oac}f{WVBYxE}HGQV@$= zs#4N@a5g_?xNZJh8Q!%Ya=ejj+UXvl91k?}mA2$T2DoB32Rtqzdcn+$az{UFO11U- z0fxBX2ab3waW<9Aby42R8c(g8aT7y(@SMjr`!pCwFqcA6!usiNzK)aT3pwZl! zU~{(#@Jb6`q*L1Rti8mIS918{$Qp#xY_xFe15^KzV!l{a(5 zqjSWB)h8Bh798?1lb9uJoHA*`xJWEG2ZsM7EEr>Jri`0FKeWYq)xDhB5u9zMy%nB# z)~(QZUd`U|!$&#rkXD=z!kAV{L1~IyCQgWIR~|2_4K9;^6^EuMbNJKedA`ToOG|&L*qKMo=IM{Sz7Iku9HgLuY#Iz^B z{?*QY6Yd}Q^c5FSmqW^Y<6~`6xjYz=5{W$EvE_lbBo1$J^5yfSL^)&$!ixM^zl$M> z`v=~0?=A0x((qoTJNpfpc*jdSH}pGaZ%N-igDgWE9(#G$hJN1;>swb+QqpJ0#5D_l z+|=)uy}kPO9b_3eZ0p8lZ}fX~U`elm!yed$pYIK(pI7b0&u#4I?Ppx}M!&b%&n4&L z=N9(!#*6TC6Z`qbRrtAlV$KFEGP`~-eJz<&Pt9Dd%fJza;N_p+aB z-@wmR?B~1h;O9#A^VyH_^LF-g!RPpStM>G3{JaG}hc#?EbN{A(%XZZD{RLjE?~sXm zKe&E#zlZMV)wkau%gA8IwYO~UcbFyJv1f^@jx15j&MmcA@cgOk@O-F6y~gl7eLbEZ zYEf6NxxU#UI+_y#;5Vd=P&KQG-`!r&jc3D1XE(pPf&`t$p4 z#`8lgoww_B7HV`B-h$_4mh@tsA5Q;ndS2SAG?oQ`ZmM!*KWh}zLxZ|9QsEG*WHfi7QELL^uA9IQq|*kZaiXudd#ZfBZJ@EfyO}= zb-9kjg?H^rJRfFJA7D&DsJ!#5?!@zcmd?v^Ui$Fhv-G@|MLnCrgMao4J6GXpZ%g_j z1NHP>cs|(DafSYzQ@`YHJnv)axYY3cV|qT^(y@kfqltQ0!>vni+T8EqYkKwl7br%* zp$%_t+xAYst4`@V#!^yZ8G70?_dc<)UrDd)`lO#bf8gNL?%Vk!{#vFE=^Q%bv{zn# zYg50HK4%Z<{ASG1LprxE*x2vhi=OON(sy{T_ZO&^Y3p9S7Nc_PDaZnpPmCp-T4Tu* zr#Ae$+~cYk7fzOI0dV>BhSEn$x`Zh|(eA}DO8;-|_KNzcO%+J`{JI>Aad{viS4dJk zILqTIKV?d7Avm%L;YhMP7A>C~Ok!z8%E;lwdU}!_|96)MQsu|NeVXNtMU~^qDYPZy z0tcNXfXeIZr#F<_9q8Rwej;nAu)}@B-<^(1hyT~5>v~trm~qn7uo73~rev(ODp`*W zyvWJ+@`{=Sj)Nj)5o=4fwk0d!K!hv#vCWgE$UG^P01P6{N@ls)0^NeJw{mt%dt7OW zAvDO4z@rQ*9R|&|MBr(UQ$TxqSeaMZ62Q-zSc?>nWQEIZNUNmddOC!Da7RgXl%r-FxB)U$+gcLTMo1^OYFJ}~>|pN6(b!lbaQJHK{QdgRG*3^!h zHUSz!uK;Zb#waE|dD_(R6+TPpXwu05=D^J6=2%Rw6#AHd6P;MzVLu-!rRmF`xDHcX zEoqBNEy_vdHBx*YM#|x+bYimbzn!YYqe`TFI%EX(XM-41X7B zsXV6woZ>&($vF|}XPO$TFr+gceU+{)5532O`3i71H*hn1`W{#$9cBD;YpLaSFOj=4ce9;R_t z?O_FJUj?(BO1uJDEU994t7LUz<~ytouhTAjU2-UB_k{v}n>*<6`<=F6$nAFdoqnG! z=m;u`TQa3p!D!KHVGz#2W`3R$;Cy?rD`NM#oj#ApC;7ZChisD+hs);o`s{Yu?Qqj8 z1f7n8e1puvVOfp^c?bAafy6RalW<1V=%!_Eu%az&h4)cuv)a8r*{8@JuiYhkeF0y< z<#h*L?m*CE^SB(6-{EwGf&nkir?9~^C5eG2Kj)_xIhIzsTZ1NmrZGOdqS!nEryZ~2 zgt|!1kjv+DNVbqS;P<;clGCr)15STI$!Dn@oB`;D!b`DMUDrLb-|tZzZl~Adlbv>l zJrHn)LIEY@@CB7n(B=)v0a*?dwN={f zn25fR?302azw8VK{E|Zs*xZ4TR%n<#(}9BgG=oE(pMYKR z*aA+)76|(6Zl70icpU++T@D4Dn0Y~0(C?Rg?vPvKhcFL5KbTB9J8o~#>5_wrQ}Ovi z4!_qCbO+rok2~OT`0bEe!0mDPY(AI94$Z;?kq-G(EvdwxBUbij1@^6?a7|+IirH2l zc}!M&Fz5|QZrNiGxdMTp-R^Wd?UE}Xd1RkkhJZp&+3i*A`2;E$fu4=p-(~4%%Yh)* ze7DQx^}1o_-434*!gKq5Qoy13ybhRlm(T7AU}_Ybvqa}WRG*lh6%N3+L@pGm_!evC zZxC!;v3e@qFlOV!Q7K|o{E96Yba_LbpzH`Z+-|2I23}D-o`CFE+-}9|^10!R8)#Gr zG!C9K;B>r}ixgzA1rz@>nBuhXU|0UCN)_WCjTUGAcE4zfs#x=x(m zkl*Qr3>{8c3Sjw`LW);XB$>>$M+&+Jq&(~+5y+`l@=N-OZDGv@Q#ZL-aWiSF_{;4!;hP8rPD zoUl*n@jw$m>AFz4Z7%5X8UaJsVo zjfsCr>*oPFm>3*5rwMCfp45!JEb@ZM%G<0#mrwR!f;dA?te;+|6q1}Szt7=!JK_6a z5e)|IvR#%1%nF9tbF(C29|e2enkrW+$h*l_uGj1@6-vZvhrdwi@L1iFI~WMU@p0Qj zm@zQxc8|;J^eBE9RLLpJ4k>6?oK7Qw3QnNsTxM3qO711c;=(GIeddGTZ`YSg7o2S@ z-w>T2{*TAz_WJ{NFCHK?3Iu#EpBH|*-(83h9FYv6o^xGnL4w!K7bDmfrxF5RUbjEs zvxj^E_?56la4!)#xEzYp4^8l87bAGu2Rf&<^>DV8|974uA^BsqSNbcF@v>V3LCJwR zY?DGZnW8X+zLMgCM;UVY{TP2YYPE~?J7%XZhzQB)3EEvQxVAx;(-R2TVCFn7tj0Eymp7f=0R=(ODz8Hx4{Z~gK%8^@L(mc&F=7txCf*`vn9wRiGoN<7-Byf zH3BGV%zIWrmem8c@SlVd^X806(fVS zfh@2zWaNRq=7K=kLZOK@2{PPaQ4lw@R74Cn_m z@+KNdfeTkiOof2Y>2vx6elOf>ObLf1J3>B>&*k1tahVlF10fquWI5AE|_UgfwgNUlktpbyJC!V1_xkK1iPuh7tYW;k?{CPkw$T>mRtx$Glu;dq9eek6pwP<kj&n6Ae0$tj9K@+bJn_>>t=AuipooXAe0fk4xX-%FQ%!QU@y4l++Tj zCZZBbPw5xZ7*?2lub=XsF1OF^hG*-+;_gSH!H4A?GWCWW0j#iKOGkrB_Rw^ZK6aUJ zKyoC33R5MSNjo?Lc9&Q7BE#)Ls=?{O5|4z9BLoM;AClp}NiK&Uchcvk9Wrz(4mkVJ zCC_Z`XR;)UEhO1IK^RxW_BKR?SQC&B^V=24O_@a-A|bCL<+98Ck^|Pjs$< z`~vQ#lK~2b>_L_r@grj&@CMy}Cp=3DV#NY1Vc@+u62N`nEQJGdp0Ksn5)Q^usR7Gw z&Hk*21yFs2FAflk@GWTjT|(vy+o{OXxc#1x3vL|Zeavn@cHI#5qwY6=fyWwKm<%!! zM5bqpY}Rs`rx~@VfF=?=Kd0N_MCL@26r7zvo&>8DGE7K=JA+6VVE+;xf!F5MUC}~0 zMvWeuVLi+n=&oRPHyLY+7M^Dx@#x$JDIxOQNz}?*TIjnN_DU3TVn@#Bgs3E#Za7a8Y^F!C zNq!{tkd49Kr`?Z4hvdxSK`E&K^k8QPW(Ons#D??fbRqYHU0~YtMP8BIQrYI0uiB%N6u_ zy>O`Q*sJF5H?xZe-(SvQFdN-u{7kGk0eG4&y91j-AtXed{t)(sC7aI{a3GI?bdb&G z@%u7-3N#MLXA91%{Bw-W2&%fWVlL2sD_DV5I0(ISS9+|7C9!3VEHQR4d=hFyQF?%_ zf15XmM7JB+0U1>$E)+x<(4l@n@45Q%g^*8Bnzo4J*q;^2SOp8q$QB}DXLUIcgWHt= z*u&2f>6@LE+%tZPu6CN4Pv|Qh+$_rG`LN;W$4+U; zjoc$D5Im9xyO9p3$7_R+gH=Ra={Si4TIIkW--1Hc9mUaeotcd#Hto2{XUm)2ZS@3w zh*MmMAK@Xo;ThV3HlH05#i=X5+u?NuZGI~BC`g2@X?Azd1X*lSP=$mxBT!X>1gID5 zD^;~43GP5-hmMq6M>&pPe!`h_1E>!T?WCwE1aA=%?+;oOO2h8_86C;E(`h?bJB^|tQBJi`j;3e1< z>|ELHa0nn#Bq>qH=yXZ8pzOh1x5H?A*iJ9%ShX~D1;d8#LfAcs3h@VmjP zgy24afX|6k9HtX259;b|kVRO#zqz{xK#zqV#XB}6aDA7Q+wa0F&&J%4X@rWh=5zlL) z;@^s`FVy16UJN+O2H_eas!^PFw;Q!u4s79|4hi8O}P6;99*%|H`OaM7B@1`@N`eb0eW92OZejM~#s~k+I?Hm1N+s5d}`q zSfELg-M!Z|T-b5fRbJ2}c(OJ)DO$}N%8A?*IJx2WW1WH51=&F_-F7*E(e^3G1k!qL zP7)q&hGfrPgC{qQ z1AaHslpKp@bx-3ZTvAXONF{NULY7lj`cD_(RKsEIltXS8>(4cHa~mlEa;Ol9Ho=EAge{c+F$v+q@7;WQ~6M# zh9g{d368$(^->K1jE4i31ABxLvP`J9$!>3FDPT$*&?avosj-NJ%#s_E6Z;>OEpo#R zRIr7Q1gBzWp$E2RPX zTSX{8@}n37yOADLb4fPE4GFqjDCa}*na@f%2clABM-w=!gn|bO%C!GL^lVpI(04Kj zs3}5S1BnQph=hDOveEFOz-mZBPSt_UBA4RD8Gyo6Xdh5B5RcKpphvdRIiAeft8g?F zD?Onl+>Y;gk{dR*Txn^GAR!?mLJZ>|&)9O@7eU8e9?4=K#ZE!xofX3|K{*yLJ!CRI z&54^Gs$=oin0EURo#vmhq?39+x)`o@T&$PfdnY@;#DItBz{N>3=+*BM>CswhvCyf~ z(mvX;Qo8(Q#<}ki^ild42xmMq=Sxd1bUVO|dl}>*oUU-xw3J<-$NGMo!IX2DqK8gP zE%y+`yWXe1b!eOg)sKnhoWFr zk={*KssJ+e!!gNr}hG=^``vqWP-jkB{sm;$@9hQzw@G&2X@;GCH@# z%8wN$tWls_=Q?0DQ4?i_Z+DV4)|#}^6>EXGGEaNL4#vfBPlfhZevYo1?pagXu?L9r zn^uBh=$Rjxza`i&?a!QJeWw&SJ=Z0G;aKnVhIvw4DIecPS#<1T2&aM@+X7Gv8l^uj z-bDf#F>_}1_;I-2A;Rzf3gJ|B>EWcovy~)HI)uVbSP*YlBy__EI`-&cxO>3&1Qrbs5_4^Dxzhw^tp4!kzB<<`Az<d6hbwyI`k!{nOU(td5xa65u?C*6Pc$8W!;ZU#3sO`KUZZR*6CO_Qrn zEp=v&57Re?NnSMNluAu$afL_Y`01^)r_7!=0jDde_zXp8R}i(Az9DM;XEauG;g#Cj zZ7)&F^WRbn6H(oy>QYa>h>9sGKPt{t_g*5UUWnT!N{^tyok?PwIkk4i)S0!Dswdaf zO`1?T#MW*f?>@=a?xcU6Z0zw^^c9Ur32^0 zW}Z5wlFfJ~p_eZrfMN7b=xlmjb?r<>#3q`d!a7xnsxZIZkN?1jalS#_y?8NEDj_^j~!CB;a^#DI*|sIPqK|I54B?b3%AH)%Y*UY*m8WAcEErEhyKUrTS3NR zQJ3y`tCamQDE!0yD>nCA@d)lH=^tME0DfEg^$%aW20zOC^Bb zK?A~9J%}fJ4;|b;{4D*l4AFlK9T?t4Pt^JShV>6Ge~21~_YXfsKSmxheD(v6Q6v8O zH&tEt=D+?ay60UyC_OdzoNysiWp>z^4ie9fge&C~eyHlJ3x-)vi7x(xDF4oCIEXx6 zKLMM-q3K{us?3}awDM!^FtJ*bs&2S+w52|}atBd5*@O~o@~PouAyU<3uhFKeZ|@mt zX^eiqlW0|$(1Hu1)F9DQh#E1bwW{iKi$+*cCf$Pq7fiYHPM#?fCk= zk(OUapZ37@G0GB)-tZ%J z_1|3!kZ${+(|3@d6lrQ}g%4a%o2%HpAVx?vebY0f4tw@dcimA3Y;#vp;)pJ%EI9w@ z8V(&o?RXC4o1;(fC-O78ew#m_<|sC=A$tuL%kK<{K43bpv~H3 zzHC;+IYZ+VyI*oX6}mz+74Xa(PGEvXrR(JXDp`B#jx zNYVWZ2yKdy#e6eBGqVaBmP&?$MHtKhQ9IWx9c2kdUtdTaOzma|DCMe`Qn;I;uxha$ zGBB!oA>QGX=*#C)7iOykZa|YFg-Nm|Rb6}ID9f*+S1%??BSj%nDmyImaqZ~1W0YlD zbTt~Fz%!n?% zkjT~<$qG|~_?Q3-HOq8hbqF=RFAS1N! z5~A4+BUFcaKXV%{La6HeM@LzvL{}{(^3^7ysGHo>#_q!_%yFh!RiB2w_@f&yC5pch z^`#~(;ojr~W=R7ImT*^6qMGG3bPakMv*Lv4cb5_3VItz`NSkO=Gkpyt3IM8|&!06K24MFU)Jr!EK+X6mT{!|dAZq$a==E=++pnSyjuc-t9Bd2H zLSLo7@Q=GkLRBxih9J#UwW>`H$EL<&kwC1y@DPa*YUiStM_IzrhZx;I8OJ@}#*yn* z!|o}H#S=6w3ipu*rgp5rD)-0eJ00`_r*z%XRGfsVi_%qO1!qR4S?xUUZ=)@h(S_F$ z;W45N8)5<65i>zSLNAi!a_qbVQ$7{ld_6(WHnJg3c_|)15};t`0@%blQ(0%4)%4dl zlTDa^19fa>6HaTx*{jowi#FR1muuN5INj@RBARASca#2wfr782x2heN>>6oVjH{KR z*WXMePd{+^;6^Ikv^_-$#+tPYJPS)S4@_0}!=2oO;4%8uEyPQWk(YekB$-XCE8KzB zhA`#wQI?HFb@{DC)y&cn3Y#m%DY9m@4R_n@L1Yno3l6ZpFf+|0$On_MJ{gx^g~YUlX~BDWH;yH`=)W_FH7$K0Ze5NhY% zPe)mH6X~st^nV%0C|{i#aqlY?DB$!X^XhOEvhZ*f094bvmyfcnqyEmgn_k5%yq=7E zlP1&`rmeN9o$qfv+CrJ~=!$!YT#o;RO>f%rCIS*-ozTA3ZS2@)oi4#$yEDP2U2cUa=P?v9V?~{o~W4ER=%1w&qMq#MSgUp__fzbFLHHXhl&NQ`&Wc?Zzw zV(sXzrwQ$Z!f35Y=5&6f=%K zj1ld8fxxrQUKSjuURs**`6ew@`Uu{Gjmy0+5<;PIq3d*Y0e9S}zxP>d3BJ&K{~7KX z4u#^jO?^~ehdE@zT3Hl{ZpfXBJIt}op>fvnu-?-dFBj`cd#Rc1t0mg&Jd3rKwxFW7 zF{ED>7#5BcpbOmb(Hw@?@hQwO8=1c`yh0kl@q#+alNcHLfJyY#SBSsg7Vj#U$xdea zdk`=8I3eG-j*u(Nki{&M#%|}8$RNQr#iXTd~hEZ^Odg=wuzW!c8jbov)jHLsmwJ7YcZ3UMm)~2Of;fJM_C3o znett{u?wkC4OL9nr1Xtokd5Ypn+VTjH2DWwV12aJD}_l@-UpkoQ#CFTx3`7QyQxr5cQ7E~e>by``Y zntpi;_b(oQj|d93WL`LwWV%Z~$X(40!3(3b)#bqt2t`<3@=ye?oX^fDJ{qm9w~Ia^ zWMPrcLDuf{)_dH&akOTe@A{aK1f|VI%5_lG$M=k~+((k#^a-IIm({@>G%d2#`0IE9 z{IMyy?^D7NreqF|_Q?E9A#;=QD z%*196J~0``MLxQ5OkaA(v6eKUzW5oTRu)5T!dH8u&5iLGeYb`DcRmW+fzPJ%b2|xN zn9ezGiDOP0LV5$l5-lh% zIiEh*w{}|#*{S^vNV*z-4Q!QQVUnI+* zx2oy=NG+U2{eQyxj~}f5t69pE&C|kRYNlOPSHjm}GWhU|gDL~sYoc2A!ot#9RdpjW zVoU~WzNG#SnhYj4nGaXCT}^)oKXE>d!+VT})`K+;O$r(9qPen6v#Q<$TfT?p)S^8k zg}}k$psKd8{HtnJ^(rj?EJwWRYwFW9M=VU>!UP5FuV+Pz=F-oFQPs}3M_MkW5jgW3 z;$?ox!4g1CnAKb0a|PxM<-@7!dbk5jK${p-2TedtDEd|8@dzTRF0QaVb79oZ`A7yb zD}C#?B%rL7hDV9L?}#!pifz(ltL`0iZh=NoO=)x=Ll~7=7J$J0bKPp*2d{&HuHQ?v zb3k!*G(MB-)EA3K&*MJF4c`%{na^SB^YBJB{V0@>t;>79CxY2^8EldPt3`yKjIhmo zeF5tHRIQOTRx(G9{U^h(~W(7tgduF zOJrPI2p{w;+)XZwnqCc&eono7!g}dO84>MpD&w2r)ae&R6z(Y>PEEfBQ^&^o;r;YZ zIb$7!yxA9eS+XI$Sx<+2$Uw918HR>~&J2cTDG|C|P*;%8FlShzc#V1+=;tietx`+I zdsRP#elo!G&d397$9KE+4Px~iJtep0OajcNe!#{o1@(hcq(VwWb@adQ2_JXUi z0Z3J^Mbyf6I9^^r{d8l8qi(X6*k@KaV4{2l0M+!RcX6F~ZV~mDqZ5JC=|r3EV0Csv zeOQFFn}Oy;NY%5H;GFScJ@`&cS#I1IkvAJ=n~q{dq*M znKhBwBx*q+>WMz=eAa@@C>mJGu>;*-CHd(fSn44B$U6%kD9moBDv z$eA833hp=N^QiMZ2#*Q+V+NQj=qcly+F+ISIrkzewOG`6(fLF)Cu+ov#Ym~)Qw=)s z_aMv`k`EYg&O$PEmK2^!UvzAOCW_k` z#c4*0f;{x#M#!@k6k$G`s@?$evVyvK^a^79a4}eHgOj5x-6E_?dkOA>s|YS+WGDXx z>!MV&7g1znF0mVg;sNd3fdyGB0<3m^{=*o}MSFnt+YJ|uygNPO#|Ki2l{e;rsp-EV z*~q+(t=G^y=J`AM@5mf@?tmkxrwnIvyy%gEV$f=O=e=XJ{fzk?)N{^$20pQ^55gMc zidp`3#dQSMjr^;|n-+)YLMg0ug& zh+;QNWJtqnTVk`rg$0voRy&s<3}oq!H&>W`^yHAx8bGkZ)Qw&<|d=AEw zZ9_h~f_l!Gwo~hC`Ls>HdegDm7SG2Ftmqcc6s1{dZzRu455YPg!4?f0_49A*=BP7$ zKc%s@$Z?EJv)Xy%6Fm68?{=b{v+m;_Q7NmW>X*o@uyU~lcMxb^xtOpRnbx08(Z3K% zTZ)a@ov2Guqs6Lk?_5dr&8ly^Pk(CN`0={sycQj>7x-b-!Fz!Tbvk|ZO`ZNtcO5+X zr!?w0U3E3aiV0{hqknJ&#I%I(1wMrr_>dXiyXgg*jE1*IBRoZt!&G~#k3t%qFzfy` z>!cgjeLQ@J0_zsEhgx#y%4Mj|XRG5?_tGnLV|AR;7LCG?jf+Wfxj-+%Y1=}OYWggs z1zC^F@9Sodb^6hpO!6RBBw1VtQcZU(AFWyHW%pB$-LTYupkh5a*38f66kH>7Vbt`O z(6%k444<-ICYUG#tsr+zg+-O)%UP0veJo1R}=fDr4u0Bpg?~LTYne&LESjE+5h2u$`A>59q}LZLi<<`p;N6`8uM z-avhKLtUyHs-;#+W6_%we&HMtHN6!>_$dwHIh&{tv*VGZB~iNVrmOJ30HE5r>Z~!A zH>snQZ%{|wIG9WCFclxtDe@k?Rqb4{mj_$wW}@7UU<{AC<8(MO0Vh|_gD{l&}t*^3qLtTx@sX=O0I~L)p z6n0|c;!Yx&tsm6I!IwL2(@w9l>sY8;?#1sBS~o2B6#f^1!hF`}k-rzq*a} zm6Km3t;CIBL47|j{S1_o#fJC3PmFbA$!(0ZHP=OpRwZSc)y_K*@Ui9UEk?T=FI|;L zC~-OuslR$*)yxA^)7K)3W@o%sen{_OcE+pQOU8uyX*}pqzr#|&BAZQ&yjf(^ee&aH zXk|KjWb+9+VUf+gkLVrpA{!xm>V7BnoO=4bO-EbaC*yF-$3*=!qjBgNb!{J($A3HU z0z0XT?^zfBelWVIp5D+zIu(xU2Ay|C(qg43-+n^xlaqOv5=$sa6c1{k9WNkv!YVIb z{FFfRDldBS>SS@JH{@Pe@E%xNM4J`YY^Q$anY@1y_qwpY3;Z=SqHw3!`p+9xb>Hoy zEawp;&oM?)KMf-$d+^|dwW{hvDEYXGSh;cs$z+jPY2E<{Ws=esmm;P`W8f(VN=4n| zD9ic8+vT4TZ~ybth^awB>2#4h7{HU(tg1iUJIZnmG4ljt=DeRsP*bE7tD#QdCaGd+ z18|iKhFW8YitWQ)x|2j@whwn8qgYcFj~7b<(D-TXYUer7s-+~X4?ib%&iILhH6Hh8 z(sER+LZ`7Q1EF@@aKRYOe6QI>Jms11{D_H3iX4Vw^ie1jVeQygdS|4ziLz}sQSZhk zN>y`nTxrJX)NFBTVe?V|P)%QhL_4b>TJ#0=ms3GhH+hP}?#|+-cq_IaSTM8YOM>l2 zFjLi3D;y;V>6g`schlv7AWe3`Xw8P-@fG!vXT$TQ%dX*>9!|7L5mt~?uonXmu6n`! zH|*HFx`+DdhVxn^y(lF9Lk++NLG$7JuZimg zX7hov_u(MBcEa4v5|*8+sYUjgbCU7&p4fjtG=L3wO*hid3zH~^DVz+WV_*87AHGnDr=)SCaAN|cBJ?#(15Y(@-Oz%E96&~ z=f8uP*Fu6>nj4NMnI39lH@kYSTc~RKxzEeBjj*S`Bc{5s5yp0HrdJ6f6;zZrs_Hg4 z?fYoFK4*02n5>BhRgs`!YWj>KbVq1{4?a0mHs}99VkPJX-$F;hn zx}EjYa}mL@;!-grEq_?c3+R_FqBrSAO$-|Z-6ibudb48CYR6ZwP%Ih$@VV4;H+THiF_(S3PJzs5sa# zMzhrWFQk6DVX5mT`)m%oz3@!tjktjfg`KSC?A9ejw;PoVblGWFdtA9NxOERMF*{xR zBkLvabZx%-pLdNRiLLOv6a-b(?{VuP3#r#$Om8;j0B?>*S{++rwC6e---h8~`)wBv z)9RV7UP^sTI>0`Nc$i&o#_2zX3+mZB?7Z|~yaVWmQ4Sn$6Ru`fx1$f1Gfyw0KI#v` zJKzH%x`g)W)VFi$t=gUMfA@znz`K;dU3I*qHC~yB;Y8ZPVOlZyMVAxr2jS}gr-$`x zwbgrc;vXC=;!%7TjgRajI`IpZA0*DB_}&>O{yB)VGP`#f@q?h2N_$eE|1}1+fBd^^ z!FgH9(TVly9S}Z}!Rg`nWApI02R_{IonGqtM-I0fpM3f(G~%p#37SR%q?g5_s%3q$ z(1Y48SO^dc{WECp{KfcPQgZH{Lrh(rlT+`JZKMdtVfd&FWnX5RW;1aT-}4Wsv_a$D0N*I9f!~HCHh&)Q_ra@L1x4_ zx@C<%mxM8@kIk#cFecSrmSa+v&8PN5r%Ui38>H4cy80Gh9>5?EMC2ovbP zV6Z-5Ek{sGqY@87ZTZr}hjV1=flCN?FhM{78u~E2*?CJd&$WjQ;b@uV7pZsH^U*>- z<7077l%3r!!Gu_NDIp)mt`laq1YwO7m072KK;&-LKAJRS4k;0v58=~UR+IrbAdIt@ zF(O(jR)MWaB&+b=OwH84fW^%WVDR|*$yHMur_?qzO`B3%4k6us86gg=o0NGv66E%? zr-#En(Bx}W6l@dDYn&CXQ6fpn0=0eZazYycBO!wy`Zh=dZfRufl%n}Zt(m3d@Z||9 z!uAZfR*y-oTTa-A8k!sNX_2>%!y8|J1vQVZYatsLPEKlzM3}S$GdME!4Fh6h0TqB9 zf&uz1=Ijes67mr=-0Yb?>$F+1esPIqRBHEC1TzR@s3{!To-fKU7R#@uh7p;kDbx`Oe8+UqF|B2H{eL<+RCHbgnz?) zd8mW&$Bd_T*9{vItO`e`K45LbLAG8BD3K|M&1)3gY`3$b2&3G|mV>zH>c;q;HCFO>U58$Ko)L3XEf%1Cwc6a05Y(7#~;u%tvA_XFO2? z^K#aW)I0#@K}s;qD8E4x^nx0G z&EQ6{A*znGrs`vo%udCDiCWyQ(hsBc!mUKBe|23o!opdi@j4{+C2Q+jU58q+c+vuS zJ$oBL_n{}TREQqlHo0kv1+V)VdkDG&iDw${m{j@>0v=Rd$4w${((L6? zsY_OJc6c*;PJh6>FS(Q2Moz`|V{CQNxwx@l61y*wM28eYUx2)y1#uJr83>T`S7oR; z3xEv3-0x%{qp2eYU}&k$?P>&o?z@ZVFd!S95>hZrbNC@j3+~PUISK*|0nnRSAZJ0K z!LSN<-b0iQV?6Q7)Ql;jmGlkPemH9vM=(bc z5hvyziN^pYqpMdL6l29{WCa%L_|y*!fbqg!D2JEM4W&@cSMJYn<0{b2!e3c_mAZa) zh8tI5ZZ?y*_ca4!?6{2VT;2wDo_~PoFm_ydqM?~`MCzF}1Tu)dIMx>_H96WFO1%6* zdOTQo918Wqr1|tAdOn;zr%5$lQRD!G-WzR~Je+BBiEX9e0^e^*-TN5P7&$qL4uW$~I1qt%nC%B^*soG=Gnk{82SX&0$T$%=%0SlctTX`)8CP9fr8%PH0Mj!625T4r zn?-H4C|Pa6yD*{jM)Mg@5Z>wR46!WXIKu<;VyKFvK~ehCwrs`kTBJ;)$N z2+MX=yg9)Ddcnjkeu)tfn&JDk=9Lktd;uEDv zs6HHGCF{pnew{k!WukC2Z)I=B3=0$&acjL2ZBEYGQwmnje1);1zlWX#XiBCimOmkN z+d66=X>1n~1m&rH4CXK+3y2+EFJTrf#P8n?g{>|t%pFGLEB&2}~cnPY}=J2v(F z>x6w+6TZaWiddPU!dx+BTrvp*`vn6SF{wq15Lsl-KcGi$=`$O&-sw5Z_EVgP^Bs)% z=d2Ol7U@hi9aw8j#!dp&EEqarXj>3e|xP}wU<}mZ)HO`lm z!n=Np!5srQN|*%Uz!reSI&*aDoUKIhkPJoWO>1U!wy?$#0+~#68AfO2TZB786Fa$Z zZFIdY3l>Mf_^NNSH`JOT`WQZ(iRj9KIer^!Iz(uqA;zeKr{h!mSnCm#zeC!oe#$iM zcmk@C@!sR$iXWN!{vAe}Y1AJT=-s?V1Qu9@My77uMooiR(-gAJcusHnGJAdqf6mhK zdgGC)Z&~9o)<}o*I6Zoe7dwgGP|_Xpy|I!q^&AG0dsx%(=?(df$EU7&m++3zjch*1 z(WxunBalNVz{t&;P!RSsYh+0a$`lAWmGac*tnILIh~#iT=DaYb9MNaVJ@Q~Kf1d~s zC+9<0*{cu$9GQB8wGCqiLf4K2HH}H_U`-=5Rx#6J%sR8PAr{!)OFtm0hv&YL4wjwo z$EQAFfWvgTt2d9*#np;zTYdy7M#xjm1zuQ>D_`OyAi(ALx@27Oe{=-7&ZADOy! z2eC2?$sJN%{G5A|aFdXk zkc2=cf`ZzF;M{b-HiSX^K==q^fAs&q`h_Gw+K{l4fO0*o73M)uK}JPEKtKgSK^aw? z5D;+!L;(dyR8$lPP}KMP?W%L`xycOyoP4yLQdHcI~~Z&e-Qqky3W=!jhsv z-NBUk5;rSdg=Ut!)oz6~vfwLXW31QFVGB2wX2 zQ?2(@UY(WQZ|>Kml@bO8QfSAqCj{J1fz=yRP3T0R8)ly-nT%%f644DG3J!`wM=66v zuhPmYTzRYuF2i=s>Y*ay>RTik~!0noT%z>23jlqVX?Vz>|@`t3>S?$?xtuLjGg>F z(V!SqhM!*Cz3YlbfPZ^i^Oj(N`_e)oJ3Iv{NJV6YYtE2FE0ll-!H0+J-rP(M3OKnJ zbc!(Dcmx9q*uMxcAqd2-LFG%<*f-9SYElq_qsK^!QJk-VQ$G<3>9`W64yrq;<5mV2 z;q0ha;L~5EY1|Pwp+{k1aZzARU|+m2@NvTVY9icN!7szMGTH`KP9r>#aPHF_Po8zr8<~OS(*@SEwzdYR zfa-EwZXN`|7xHf4I{~FJDmt$|)m|*axFoQ91~cbk28d7!n&tgR*Y_W$ScG6pld(Pm z_ufWa9!j{Zc>t)b94b73JzNe8LT2EU;CQ7q5i@H5`h2F;69d5xfEc8#G93ZhF-w6; zZwUeQLeG3Epj0e3NOHB+?(NK)3aU-v9RYt*;Lw~yKh2xfB^ARdJ`3}Mb|5hO z4(5k!CVKuLnlQ)3rqLm=RWQ+75;lcTVM+Mv(1hjpMr8xP;^4mTz`7V-x=%LFO z;|6a{D{jwWoG_Ot8M4;oUIjju04Br}3sy)GnC=CEhXp57UH&T>J921Em1y6)kB0Wo zF&71X5iA^6xM8^3c^>_<0_Wzj6fjD#jbWG^Jnku`-qk1!yfUBA3)DWL-jeQF4Y7E1 z1t~eJMrZg7GAvub3>_NVShcgX!`u2*R#jEjt-*;X@SS96r8AUVTT_p31}G~J=joD# zq?ZU@uSU$>aIyls1%#TD=ZsZ5MIGS1i(w%QEMCNn$-N8N@i#&N;4}*gn!rv0qR@Vo zw^Wq(E|#UEJ{|8jItCWq&Ae@U7xo-eS~glXO}%@NGYT@8(?x;L1rNJuSUjh(EO5s? zq=*7hzsj2ON-$^#Y@onT1>BBR#RB52C1Zkp1rx%-gOMTd!Lfm!#drWaGmQ&HO!6T+RE zy6+>gjE)OhIwd1zC|7es^>Z1fX1l z99e3K<8x@k+0OoD@HmDN!cnUH2`hcl{X`^#8wqVYys*^P?j4*91BV2uZ8#*SOCyck zz=36?l?ubW*d%DiN6Cs&HY8%}_*oG0$hDxbEDg$gEY-VHVoGELeq2s+G}H_%>Id&$ z8Nvtv_CBBhmDL`A5B;=cB>^}(3S;vCuL1CD1q3+?8({VhNsiUxRm|DeE1qCU){GuL zV!-HnM~>+n_)^f?d(jk77g-sQ24jbVYAHHqdl#U2Q0W30R6BY}FdIaKUS_{y@= z%LeAljt5CKy(v|-b#lIZA}GlY3Pl$M%rMddcRtMgEk*9s%1H<&fvu99pvKr$TUvn3 zTEh$p_^|kx$}uo5D}|*w>7;%yxlOiJ-)Xs{>Uq>|?Ug zhKyN)Tf|*41{)l*`9#*>7S;+2{HUO{3xh`8v(^+De+oSM2+Pkq zFP`WK{a7z=3v$+=ifYKU<;|9UQQ(nvq?#QT(OZ5&;7!5I{}oKB0gMiT@#{%A5!17G zv5bvkF;IHs2KEaqRRf&Kpb&PO=#$ltGBYKH-o@CfIY>BFD1@L`+dA-?;Kjn}22(1K z9VrpU`@pvXawL!tu-|AMShA5hbu~rfG!*mjYe`M$T`W8svXoXWw-3DVIPuea7x%}p zV+0nLK-_5wTTfuo6GVw?R8&gfSxNWfcq)}6FL-(rQQQ7Ex90L7kGiq6mg2N*3zW9+ z+DtU+A7zLEatnl&EU;a`>6$S#L1}@FNPj zBEWXNid8uk(`I~*Fd3Pt7RwK(E%X0Ljgm`VE7f*Dm`DotXyMCJuv z6L84!!bk-Gl$9Q>qxTuCkT;=Aasw~DB6U#G zxTk*X`GzzQ*!3zAl8flSiy5JWCf!~W{Pc_02#2&wwTuVq$DDcgb;;YiP#I1=P#;91 zd2bNfrm@_uRLMhXs^R067dRnEO&lPhR8|=IfjRq02C5Y*5x6##i)3#wu4;wTG4P?_ zKur^hZ#-avBHIR59VRHLXYKGBry5d414qIi1eVIF)eC+~qFCvvtkx%rPR;ZBi$r|E($T?yE?U=^seCvWQh=Ic?m!FzI6|nf% zir}fFr)%;xcHym`2{w+X!GouI|B8MfE_sa(EB>udeM#~eLxLM?$*4-$rfbG63maO;N}DJVcYTcktC$h&p(SJGXt8#=dO(-XEB|72%as(|f?sZ`v;k zxP35t_ewD=;G;VwBk-kE^f`1tb$D3~qPcxauv-_6si`c#0dp4K=nxvqs4c8OZIbNg ze`INN!|z+t(=^)H3(hei0SV#?sU6heu4sQMkQlMP(U^+-S@!IorLEW~i~ArC{V%9b zz*NUBXMZ5jB;j7ggps(B zVB{xEWd0Vax^OZ~vDZk7s$idis7#7|AS4NONwI$kNkUaJ?FT23RHBelV_Z@{dMLWH zo&CCilF^gJg>dTS)ec!}7|a~|oB&hdN5S*ym5)BZihE*+Q|!G{h^KqDCoW&)+DoT0sWqnoeTKw+R(Z0^NaoqQ1tARxy{l@5HpS>* zpB4i(>?gV#xRcoTPGdP4GKawBp&o;{O7#kCQEEzcw08Ov=RW42;q2+99lJ&t9IHQ%$Ec%PmKWBn+wad9~D?4a;Yf? zjXJMMFxz33%>lXAQ`T|vol=$JlAgkSmC==%9uYv&pqp#(m|iU}DfAf#20xO^`jEij zh#~V9@^q=(WFfr?vxOd|g}xp@JNsb)BoojRwh%9{jeS6X338|7h@Q8}iItO;~4Sc?Jdo1j_wPL-oxkzRAU5Ju7gIcgW_@+Fmx7WMcs+5hs}X5jeTndnGkZ z>$p@ga0bB(wtRt-d+>LH(LxU8#f4;iOXiVMoJ^4JU?wnxqE+ekZk4Wvp3YrhX51f6 zOM3JGCQ+};AzD12G}P>aCpCqpigGgWodQtY5~IzfeoB%ObWugaATeC4Ad41|N(e;q zbg-WjNE@Ap*7`f>w)H&oZbjSkZx&wf%MY0_sZ*}LBu#)bCBg3*@J)9Ct&p0_~5jiN(} z;P`I6TRN_|P#ejLORFfz{?Qe2o!jxtPLKs(tp7L#(8yM;RTdy-bQlwGZzy-^Txbxpe{%PF5O8*JFrd!=F0 zL&d#%531qUb0Ij}hXs(M7P=ZF#Xzx0VM&p8$V_W(KXM;w#EJ)$x-N!`4EFdXOpOuB zVlC&SJRpfmkik&Ykln0aN<<})FfB+r+kRbOt(41yP;swgP%!&Zz-qH<49&0~xL?{v znqC&t);=Qub>9q!;hTiF$gPUD_OfMCo6t``-ljpC)~t1NrTa^_Lh zAkZrVrrBQ$v?T$!Vx?L01@_Jr%miNv2;(?%jD!SV4b>?oc96Gc+lw9`mf99@ItLr^ z$d_&H=L8(=yI=ur?fEOECC<>wrc5tDuE8AwiDX zGLn0|$+dqJU~2``suLQhdGJP;wYB%HljZR6H_%0<6kDKhzAqmmwG;)r7PqEE ziu$jLv4G~;&u$=8U)*+BwLak2)N(=2-zfQ=POTYGIjRCRmAbaEpB89>3sv?#E{nS! zXTEr@h!Sw&^3iM_yF~$nW1zqwjN8vgk|_bJ)44^-3B`fB^NCq8kK(BkHbjw&|!Or?_bY2f>S7uYoLk>K18n z5XxCd;adi7y+C=sD&{>>n(N(*r4)19+iwd-dXF0D`RUQ39L-#E+_5HYWf6*Xxd4vC zS^=nGg>a`Dg{hWizbOz|N8RyNDm7=@*yFd663ngOz_NSD1m#kGNFY>CbgzWZ;;0do zWzMd|3HY;s*$&=#(ObHU$+0KswB`0*R zk0Mtqd&QF^7L9ZWyZBTZdtslX#k+?g>LY-hZNKysk%Olsbtzqgv+QpLthOp9dbg7- z`@W}{SwTZd%VHL2q6^U1SXt`V0#cK004&OoL2AmBU5q&wK0~^RJ!(P~i?|SHKP#Zj zp0`xihXVV{O)5ya?6{MHr7ISqoaAsl{cLEPH7`)pF5lk%9Kq^v8LYfA))9xNijM>* z+2O#rAVHB3uTyZm?|7aBlo;6*gPYa+f|05i7B=!~Wn7mD#rn^DffUHH$y<2)$C*#8 z{}Tdj<&ehoz#67Lv=oicw~q-})ju2#m-F2;1MIZ| zf)z{znO;>jrS-TYT92o|N72WN{OnCZN$pot4QCfwSaQY^2103|VK=F(t#`l(=+BFb z2XJveBP+*4rk^mK7^X#GN_BR5ED}j4;eV<`6!Wgi0d)Ld-Rf-yfZ*&$q zq^*6=KBgzRHeULvvYnjCUkEHsJ?hZ}gLRzus?-rPl?ULGQE<0be%4&(Cj`i4F18KW z!X1qiN^Wo8@jCOStIkv73P<67rDe5{m)U`B?Ja_mG!T{#J|W>;uttO0+wZCDC|b*V zB7J(qwk-RJH&{YSaUUhsVu|vjI@d#b<|H|?pHSSK6X-x*c)>PG4e+l@R2$ zZ%IO&N4yDF=m2yWve@Cc4-3uE!i0LlG>^en>#L zflVHQ3L*z(&Nn1ESyxY;sW`Dv!#4I$0(9!mzQ_8xnUGb7bgM*Q2|{x0R|S&lmIIyz zH({6)iU-`l#rA^(SK12o!ogTIVPvkpMat^*pl-7Egf}&NEW_UOHevDVMyYNG0J-*k zhY5fP$&Zrt84gDmh$LX%^aBP$j{Tw_r1I9LLgHByx&R`Wm;%oqky0H)A1){=#!oJ_ z@Td^yoi1Hw@NOu&Hp~7@5K@F+5QAzc_zu(Lff+RK9cEAGy$EoaO0tMP+T(&RuW;2o zB`DlvU6%mV`VxE2yUdy!k`DiFydhH#qeXB>F^tRXZGzh=NFW?ypXz^M6OdL@wf>>x z5u*xx8H~s*d-E}t$UPy%34+ogtT*ool$vJ8(T7-$VOF?lD|_Z~l86@X2rzRrB*}hU z(rD}`>RG~s>F*JV3BCFinMiodO(?mxh~n~;_nn$_$J^ppTn3(v9Y~p1^6a++nublF zOfE@W3-54VvM2AXV^cWcI31(KBwSg5k!}~-n$$LLxI;}*Cfr`B!^Q@iyqCk?1flAFV zZXxT{&o)2*sZ?E7E0r<5DsLG*ihwT^An0hL)N+~jGoLX>Vh{knT3!QvYpOl>BtbF3 zJBqCEQ<4~WV`-JL#w$8G_6bQ(4bt&=@^GAHe=ZGDeb*O?B+)x?Q{N_#MECei?g!C} zHMso?sR7RHy?V%rmL2e(B(-vyn(zZR~dinxHDd z!H{lcvlN6&Q(aZ1aLsBzc1o%}gnkuuHKQ>N`RENHM_kC@eo8x~Aer{$ub3whd8BsQ z{T|hW0Zc$i0NqeM8q9;1dX+6#!&(b_34@SnPx#uQ%L6>#KpM(b4!Z5^H3CZ3I`-<} ze8W=Can!3E6ksOf?Brg2@T~E*hzsopPm_9EVnOLrQ8x;GhPfp;b`+0%3aWeO>#xXtQf(YmBg0m!{tc)HGLQ(A* z0V$zfzRd}HIxj#r|B@AI|fi+RH!J2<8Agy;423!HlGmL#?Yq|Ee zADI&_95^}ZOA(l6uH84ozWp2#l%l;y#ZZ11N|m`;0II^8A*zMZ);=yEwHxD1&6f+R z%W(OK1>W{ku)r`%^^5Gs1%VICVKDX9Ssn&6+kQtd;aC9ip4$2T_zrv-ZQfk~&^2LxHMb?rDRLc%YSp6)1) zdf_Y~pTVdrf?q);PF(Hm2gkE6(4i?y13bs@%m;j`kw4FVU4Uw0xy_Xs#tSdx1S=;< zb}%x`kTDPdhx4Hkw3|EID*}ucPmCL?aYibao$X@#tN?OC0ki}1BsjVj6@bH1EofX| z@14j3RF5nFm*AI7it2fm#;r(u=_F!h%PbYD)I;F%1eU5COdZS|d$(ZXaRa{fN40`ON#?qTA z@bEgN!RG{y0|C{QB~X5qR%yddw!L5~^R{BO`{DqjZ1tiFl!4eGV7%l8urlbw7?0WH zU|e8-Dj1nfF(6($Sb6r`X)FeZA_&|VvszUP$6U-U<4M7wn~j1MkANqy3|p@KvA`e? z3;*c%_hP<-0*OFxhw1k0=_DT~drB}p%ib#Kj>QoW&p|ZZ{y^pG3C3Le_uA38H^V{A zwKvTmHF}SUf((@|s;=fq-qB!VuL#EaW4QE-ceNEHJ9rL!LBYO&^&hHRWs!$Gr3GLxPYd zTS_<#n3QiPiFoHUE}|L4$IkWv0koGP!_?taln3hIgk28*NZ$L^hDGwUUlbYPI_{Nv znmt$FLHd5hj*7u)JK3*GQkLdW&g)Fd#86A$_F-}?Yj2+u#B`0w1GWe<#c*U++eBOY zfjgz+1SOQCx3gann3kYIf$isq6DvO`#VXD4JLw>!;&?JRF&waaDxIdOw9sS%9%dJ%4L^R=d`3N`QO=l`rz7H zmc95cq1UT#iIVq%Y>MtmI|Z5{D?_=DahBsLLhTSF4lshF9AI2ltr)ZN5hRmYG?&Gs zs?%uCk)!Iz3SYuWWCR8^%YIJaN_{BeUVTZQ-rWcGEc!2=DL?l>C7=7)2oHuk=8-lJ zhCRksmyWC~Q*5aJFx^t|Y83r$NBdL3ZKsZY4qQYitWK?e;*R;`eA3Kx?EgUr6j{dH zR9LS&7f9zhSRQ2yp<5LclS}DhT(=pt7wJj&4wrP(tU zF+)r0>LgLPTavv|l6iP6z7~ha4Er5P5YHAcQLU)q(f!f8Nq~mF0X51>=kdQ_g%1lt zig2{XWt*E6d%7Zew0mCtTSP;}0h8_#4;y)lzu|J{rig2At>^7_KB~?7M zp~NDb{6-JMUXCuxuzwVolFPjg?qjA*HJd1hm(>gx=O7POj=gLNv9t>i z+;ZqA118X`s&qKWx3%{QT#0j%sN2j1^R2*?EG00R*<_kamP$9so-Gh10EpKQ$Y$ER z1wnIgmL=0d#{6pmrD{<`9~;n%xL6K&p1t#a(oVw-YN~F~7`fLr2xy=WO}B#ER?SAk$|Y~|r#k}uOfDKPF6Sbt;2I@%eo@cGM0vW+wu1BH>3t=TJ3 zceHm1QagndyckS>X3uI(v+r6#Vl74H9$e3@OnU7jNmjk4l1Uz*cJ`eQFh{aXJayVp zhi&Q7tpZF9E@oSZ6r=SnGbwfRDYt-cJ>nj zNS2+-hHXkTq^)NVue1NN3S>v z=Whx;O-8dR20ebpZzgG6q@_^rshQH?XeZSS`yoL?KSHDGwwfz+zW~(P&jEOPtb_ft zAgKB5Ah1(BNU8R!Ev!Y1+7+?W%2a$!5|d>=yrFsoI0{@w6|jxHVk>iKy$Pg6^=by^ z%szo=Q38;j)ngQ+r^n410Y6-@lEdTBCnl{&nq3&W1t$bl-N;PE;EUx)6;VWP~Lw=x}szRy7VSWF;s2inlqQh6VDO`H-S14(eYQ_gV2Z0cJ}n= z2v62(Fwa8~tjh)grYJ$33K;iPOI65}=b4qZa5p)qkIk~z3z(-E)#c#Oe3lA&3)bsx zfu@FlXn;_9tG4!=FG!n|@j;D`^dpC8|4zaDt!d`kUkRwSF24xhcrF{!uc8c0q_PgR$g=NwiFx6B06!H4 z<}>TO{56?YT~!sT7&nr*+Oz|tIbHoK9A5x&7o z;d$*F%pKngmu*JWs}9CIjL5MM3V<85oWtPtTwe!9MSnufgz2G^Dobm?&C*f{s z(0bPA+WrHmI(zvbvu1|CIGKaDL#guE^Cq!CLDzE-kM-3wzieYrI7rsplJS-Cy!@ap9H{wj=O8XhXzvNf(m7Y)*xoH&GPaS44 z`RC21US}vK`ib9wuHTp;hu(IC)DxUu>RwqtQf^FjwC^}d2rkuvow*Oh@G)HIrX6J_ zotWPfyey0p>`S2!#Xx!+3;r~+H)__-e*7I0OvX3f`S}&GyozEAb1K!I{w{$rL$E#| z^J4wdYw9scjCLP|A#Y!IjELfmk9y&I1yE8X+iyuKO|!iVQCeiWJ@Gj4Xo+&Poy1JC z*GM`~!$X+R#y%(sisw~S(`r{bf{+XBhWAJ!6R3^U2JY8Z=qd1qV6{}jhCEP!HPG7r zNs?o)#{iZ<=zIhgEPPssX;Yp>wr@$w98ud6ui{&4XNDL$dNOZjWNpbso zNsL$307sC^z!dlPd`N75Ap*+}UlUN@qEWj9bb}Y!FMdRX>_!OPOJRO0!?xjKrrFPb zOw5+JBkI1`#`=6A$uYqv*T{6AIYC@Jwn58g5g$8tEtBA?+4kH|2**y;^u-*WC{GBu z4cKjI_&07S4s83BG}=lZL)a~q)*Hn8$5W=ql{ zQE**w%`g9&Fm=BPna#=aQ7%)Di$_+PDRin4u+C6-7O&cCi_c`&5!!sl&UHQz)|VZmwnF z`$$IWxDTc{UFpGJULZ~ZP_PDbGYo(=I$yxz(r;>5okK21Yv!+9a ztt|~pJ!9OGJBWfE0zxVr0yqqOlQ?JGX#u2$3WBaOHGAC7JDCv|;0p=zU(1;B<^%TtkkF##1at9y2$>Cu*R+{vK6yXFz=)1Q+x z$$WDqAb6VrNqeJx@&CQx-N}djX3JCNvG20u|NE6Cv)=QYiHEI*ZxA~>VdMLLGv$D_ zd2>SCf4@Hc3B*zlThkI!uAh4EuFw5ujO8EPFGprTO38+YkYq)Qo`H|PB)l-b!7v{< z`_kur*%;I19%xWZUzjVGi%`_%8oa_9O8EMRJIMU&E>pIXl(qW?IGnVqN?>WzhAMHuI(Azm5IBRd7qA)$E4N zF`KQcjj0U_^Cp?O#zg$RH4d#=n1^R#W;M*s+iP|)rZnuzd)$mdb@t}nm})F**pauz z$~IoZ--ja?M;P-F_%SXKjoO@d+Vrze|MFSX-KMdiVRhcQ*jG&BZUj!m9QPTE5LguB zL;tMK`#73?daB#ph`%6yqT5rxIAc2gK5PBin1R1BW%mYH*9Qw z^?4h(tl?Peb&*BJa{PTia;Xm_kF`D-=`-dvtd2Pt)f1C&Zp@>;g;B;d1U@m7FuZeP z-Zqz*(itQ0DVBeKXCxYb9p7*=ZE%!tV#EHl36ZNJF(AiUFKQ8Ctia#+05$nuyuCKK+cD!p=^A+qx2S zp&|YMYk?KLD`88=L0ra}KSW%Dsq{_el87&SX#F>tANh`$_`I^Fk!);h*qbioQjNI{ z3)3Xn21QRw8+NaW9M8vW^Z7w?Ma&{!6iQqXbBC`py6;rc+vc^1pDMb7>)}-KUICvg zy6!#`v*0Aau~-i$i=H*F!1_5-G{fwPiXJQKZebC;TC~o*%2jIM^@qro_`AJmuCEjRo@%qfOa**l(doF^CZ_Yo)Ss*z)OKU)X)6wm z-B>gqb9NF4uEpQkNdMIQyD_I>d+PoOwvuJ{_|@eQWh7xjU-_9Y0@MGSKd-YUMIi5_ zZql?+?)sIl5aj+N+%?I#;6K02renRmZ~A1pRW1KL%WX=-v1>lW6k3c z)Ie*GU30>0^Z!Jx-fn;lwdLXChy0tb=8<{O8)PRCG1vbbNA{5AOYGl(M7M=Fo?ycH(|BJRr%p+{8pM ze5MsK5^ih3GB(Z~ZYLf+&2k&zy}g1hCiR%sB`p zbupfdHSa>`Z-vHtapqivUWv#x-icoVidV?2R=S>ENDN z^KKp75^LV0gPUT_#X9(Sta+~vZiqGS)4_GI<`NxT8*47r!G~kb`*rZaSaX>Uu8K96 z>)>ghxdK6du5mQpd;lS~d`_&nQi5HK$D++uI`zwz=4ze#ZmjvBPTd}FKBR-oV$6pT z+zkqE`pq>6eu5#oKgwK-pg+er6K6hx(8ye4Rh+pFp?wiujCbPA^%6waHpH8cDumNno-o0}QTHD2|bTM)v? z?(>^lRp`D1a~neOU5q_`b2~%1#<_U&Nrb*f-G7KTpF;2qhVYbWK8+v_h-XZ52Sd5W z6rcHw3Z3+u&#Dm4ZO^IDZlC!)LTLAC%X~qF4n>+fRcMdTd{Kp7@R_@GT9mn4g?@}Q z_aOB5T;tnF^CcB}&S&l=^nSn55M{p1AlkPu!Q97S7h`6W`HBk7i!xtjD98BPGGAjT z*Z3*Qe4U{}7MHzb-z5j+x!K^^Zi-$6L4(0Dk}eAh{RB+)#E z@I0JY9!oTjBZvvIKGJ+o5_61oiRSw{cqGaMPXcO=u`<#8kf>dZwUOpWl8E}OO*B7t z!s{Z<6HfTBWqyJ%miod(^HYS5pm{hXeuiLljxoV!oJf%YWE%PgcjM;wUh-H4Qg9k11v<|*wncwK(G0Xf`2j92M?{x5xWqz-N zZ(HUW9Xw!??+M+5ruhScm}gtaCk*pP#C+zF$aDBxWJdlZ(X^lCPtq^)XJ16a_y&Im z^Kawv$7jA0F+rmKi4xr%F-fAIL{7$E(;PWPlC!7EpZIC==lh81_}j%e6ETB-&A;C! z$?rtY#NQ(0y~tVoYewBJ$@9!RDYY6IxNt! zg^XcU8D^J7I_YjEJ)rj@>`4BVCJGaQc1^-P04~O_lL*;s67EI#KKx<~%H?YkmLR+o zzZp3qeXmKlACYA$filFJgyo2=Pzg9X7Co5w03s{#Gg0KijFnNV5MGTR))|DGv(|$M zKZKtlLeE+2VT9L6oM+Or)>?!g!Oth>v$NJZgx5=)XVtUTqX<7HaSBUktqllo#BV$g zc5Bi;i+miBC-5^23QwO!ZbEo7em;?^K8xJq#wS3S+7Y=G@oo4;i%_*Eay!CL;^)Vz zTisg4pOQF_Un>5z#3^}w6uAT8XC%%;l!~kT6mMR(o(1eV{GxFpIFb27)bj|xfS-x_ z?Z0eZ+)jjF#Lq7W=y`Fw5Z;Yn3=SzrI&6yGgYZlE8KPI&6ulSWmnF^v_NM548t#Mq z#P};ZJ|V}T;$>6xt4MeazZ?$w)obEk*9azdQXy{wBh#AkW~8A42#o{F3DebTs~Lgb(9~3Q^&7H2z31fl8jE@kf#H z4t@q|xa*QRvF{>$3_s49T^$~aK92Bv_}%YA!uCtQZ23MSAK+&|AZGkS9alQ2cViuR zuBe>0$FmFA$0qt{TBl_(jI+udgCluw`WgQSzi7;%V^^Mu`xxO90;k68Ox!03e=2cm z&Q`^JhVV)JqEX>9e|{(abA-Pj9Fu-hx8t5Tl}r14UjlXtKbfQp^LF~bLgZ`wc#voO zv>T@uYN!7j9XCY(^n(9e#J|HY9b(z8yx0BTBYXzGL{wmJ-W&e22>*beDSD_^{XZgn zPU2Klz3Tr-!+oN#de#3k;=kbMLkDcm+b8)OCNMwsR`(^0M|gt7sifNDpNQ}z{Gvsj zwZ}gh;VJmVh%#%Be=5S$1WqlNicc3fm0RcHXCQo=z^UB&A$}&pvjk2hmx^;hqA{l! zza22fFXDi-IAd~#+<`RKZ=rvR&l_Lg{-oa<-`M{1kobz2-9B=iJCWay{$_kO!gC}} zCE9M^T?o&`Z<-HtlnL_?nJ)-bt(~@rumC?F^ht~_M0gQ?CgR6hABwyiVJ;G-h&mK` z58{jQ^BdGu9g4gc;rsB55slTM$R!#cBbuQ@kxLO*`KiF#IScY*qJcRZePba>J@GktQ89iCFEpa!( zd+_s#ZfslPO9=19FHv-4n-bY2FC)&4>sZldH%`s*t3?|V_W||_em+s2Z4~&ch;vQs zE!vPsKK>fxWJ3P&zSj|c1HTv?))?Q9@B#eDwAK_ooET(URHHo-jH7{!9|Z23_&vi0 z?kajL@em?!;l~Ct{x-sgB|ZWAw)K%mTsZY^>pTRht~nCr76^I^i&lE*Q4O~?@+k7Z zgI^+;0ORi>d`#k0$E}S#j_`XDr@C&fRPcSoO;OXW^OR4G!otK40Q*qjt4#bg7`Bo+ zcIr#>N&)V=R~6tAPB)@i@wf;ACy9RD;S_{KlC`eu=)r^=W<}}90{!k3%w<*Zf9mEz zkk>rai&x!r5j6c248|MA-B@j_Fbusx6}5c&q^kd@kW9+R(~T{*{1szLtMHMh3id@< zA|-GiZMG_d*^QRJOnu<5h8=A64pWo!67jTCcZ8sG#H@sy;o1xTI`y(seGR99)dClT z`7|i!hn3?kZrJGRGG5FmfT5I6Db;rCG=wwBioq){Mdf2?cI7Pl)m(!)AFV`P&_FzM zg)3v#!#QQGzTOi5@X+Z|;6kvHolz)}ukP|r6Bm>9S6xyao>hT6-Pi)S%jyfF?j2To zUe{EI8(^+Ut7UmjFcVj-Rr}kCs*!O^4|N^ny}n!O_0*8rD3;=IH6gdKk}Bk5oSsXr zWGGfEXUzx+-7920)`hyFUVy5Rr?erR29s}D9e)!tu*vDH=rYU?dFGl-(YoNbWbQPW z4Ar{Yi|e$wtY%~ZjI;&+8hJ|r9;zv=7KiHE0@(G%aeWw^0J@PUTM5G}_~eS4N~UcM zZc4Lnb0md}$m@y$PH*WD6zcl;76<};R=aUiuv(AA?OC@t7s$=Sy0YVMD<)sE4X&)? z8!6p74d(7+MUG*dn^NdVm52kWcV6g0?KGIXm=!Pi>Ke)}tw^4#(z1(aP%K?aij$)s$?w+EY-oqH(!M9!#jE3};>M zB^;8;)9bRM(}5<0zlC7y4x(&mwSqG|_v?y&*D6mZZeSE4t%V_79)>_&KJJg)GU1mJFl(rxGM zQw{7}I&x@vDQ*vq^p4N(DVL`YD}f>tJ6PQW=*#1YHL3Zj(RhS^OKtvOzwqQ_m4@kh zHERE+nhfTF4V!77KUhni`K-91mDT0WoaxIWp(`@|kpb;An5R%HqGO*h+IepGg zf=B*lNVt_4a()uj99YR@zoG4Wfa$|Kc5l)xo`j~o=m9p%{hNBlbz8y0VBEZ^VmU+q z2-~gnqWfJ_y=nCzY%XH~Ep&VDXCw(i2p{tw$tDl>&(=9Sx7AI!`D>7H5DH8i<$60-crxY zi`;H;J2cD;@sxKD$+vde7}^_mOI`3FDtbk(b1Y&)|Bz|pmglyh$t(#s%{?_(NTPAN z#r7s*m#O{3%mhyxJxx(<>+>s}auCJmiE~TY)c6R}@@_*NfEK#dzFZZo_n& z(WnNE;L`~%3R8F0Q`Hsq1%2?3zTVKSlOCML>C;H&;xJ^I%P^H0TH>SzhxG1axdTsO zN^uwx;cGHvNOPnolTe(ObeBm?x+n~7&G{NPXCm>VK|)n+0;3rnn=5cU!4|L^7zmjN z&I}qt>r1GjqS-YPvK%!Q4LDXL6i1`$e`3&IT8`ZaFB{P6V_oHKS+jJ#TwWv5Ze+#s z+t|a3hSovKr%?&g)^(i*)5K(1D28??E3)Ht*L4~~GnCZ=A28u}5ow>Y{H@F3&a(m=@76SSt%I2U`DmW(12%k?byf5jug-Ec4WwIAkqnqe^x7Xc;c

kXhCV+ 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 KkYF!)V*eii=rbe$ diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 0e6a8e7c6..897ae7481 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -1,12 +1,12 @@ -- Drop tables if they exist -DROP TABLE IF EXISTS room CASCADE; -DROP TABLE IF EXISTS users CASCADE; -DROP TABLE IF EXISTS checklist CASCADE; -DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; +DROP TABLE IF EXISTS checklist_question CASCADE; +DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; DROP TABLE IF EXISTS article CASCADE; +DROP TABLE IF EXISTS checklist CASCADE; +DROP TABLE IF EXISTS users CASCADE; -- Create tables CREATE TABLE room From c73f1c5d732ed155976c74e7599b714899e6ab1a Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:21:55 +0900 Subject: [PATCH 187/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=20=EC=82=AD=EC=A0=9C=20=EA=B8=B0=EB=8A=A5=20?= =?UTF-8?q?api=EB=A5=BC=20=EA=B5=AC=ED=98=84=ED=95=9C=EB=8B=A4.=20(#389)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../article/controller/ArticleController.java | 34 +++++- .../bang_ggood/article/domain/Article.java | 18 +++- .../article/dto/ArticlePreviewResponse.java | 10 -- .../article/dto/ArticleResponse.java | 10 -- .../dto/request/ArticleCreateRequest.java | 11 ++ .../ArticleDetailPreviewResponse.java | 17 +++ .../dto/response/ArticlePreviewResponse.java | 14 +++ .../article/dto/response/ArticleResponse.java | 18 ++++ .../ArticlesDetailPreviewResponse.java | 6 ++ .../ArticlesPreviewResponse.java | 4 +- .../article/repository/ArticleRepository.java | 26 +++++ .../article/service/ArticleService.java | 37 ++++++- .../bang-ggood/src/main/resources/schema.sql | 2 + .../bang_ggood/article/ArticleFixture.java | 15 +++ .../article/controller/ArticleE2ETest.java | 95 ++++++++++++++-- .../repository/ArticleRepositoryTest.java | 102 ++++++++++++++++++ .../article/service/ArticleServiceTest.java | 62 ++++++++++- .../src/test/resources/schema-test.sql | 2 + 18 files changed, 438 insertions(+), 45 deletions(-) delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlePreviewResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesDetailPreviewResponse.java rename backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/{ => response}/ArticlesPreviewResponse.java (60%) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/article/ArticleFixture.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java index f858ec7e6..c86806703 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/controller/ArticleController.java @@ -1,12 +1,21 @@ package com.bang_ggood.article.controller; -import com.bang_ggood.article.dto.ArticleResponse; -import com.bang_ggood.article.dto.ArticlesPreviewResponse; +import com.bang_ggood.article.dto.request.ArticleCreateRequest; +import com.bang_ggood.article.dto.response.ArticleResponse; +import com.bang_ggood.article.dto.response.ArticlesDetailPreviewResponse; +import com.bang_ggood.article.dto.response.ArticlesPreviewResponse; import com.bang_ggood.article.service.ArticleService; +import com.bang_ggood.auth.config.AuthPrincipal; +import com.bang_ggood.user.domain.User; +import jakarta.validation.Valid; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; +import java.net.URI; @RestController public class ArticleController { @@ -17,13 +26,32 @@ public ArticleController(ArticleService articleService) { this.articleService = articleService; } + @PostMapping("/articles") + public ResponseEntity createArticle(@AuthPrincipal User user, + @Valid @RequestBody ArticleCreateRequest request) { + Long id = articleService.createArticle(request); + return ResponseEntity.created(URI.create("articles/" + id)).build(); + } + @GetMapping("/articles/{id}") public ResponseEntity readArticle(@PathVariable("id") Long id) { return ResponseEntity.ok(articleService.readArticle(id)); } @GetMapping("/articles") - public ResponseEntity readArticles() { + public ResponseEntity readArticles() { return ResponseEntity.ok(articleService.readArticles()); } + + @GetMapping("/articles/latest") + public ResponseEntity readLatestArticles() { + return ResponseEntity.ok(articleService.readLatestArticles()); + } + + @DeleteMapping("/articles/{id}") + public ResponseEntity deleteArticle(@AuthPrincipal User user, + @PathVariable("id") Long id) { + articleService.deleteArticle(id); + return ResponseEntity.noContent().build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java index b3f0ab7cf..452820273 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java @@ -18,9 +18,15 @@ public class Article extends BaseEntity { private String content; - public Article(String title, String content) { + private String keyword; + + private String summary; + + public Article(String title, String content, String keyword, String summary) { this.title = title; this.content = content; + this.keyword = keyword; + this.summary = summary; } protected Article() { @@ -38,6 +44,14 @@ public String getContent() { return content; } + public String getKeyword() { + return keyword; + } + + public String getSummary() { + return summary; + } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -57,6 +71,8 @@ public String toString() { "id=" + id + ", title='" + title + '\'' + ", content='" + content + '\'' + + ", keyword='" + keyword + '\'' + + ", summary='" + summary + '\'' + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java deleted file mode 100644 index 634b930b5..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlePreviewResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.bang_ggood.article.dto; - -import com.bang_ggood.article.domain.Article; - -public record ArticlePreviewResponse(Long id, String title) { - - public static ArticlePreviewResponse from(Article article) { - return new ArticlePreviewResponse(article.getId(), article.getTitle()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java deleted file mode 100644 index 25b063fa3..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticleResponse.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.bang_ggood.article.dto; - -import com.bang_ggood.article.domain.Article; - -public record ArticleResponse(Long id, String title, String content) { - - public static ArticleResponse from(Article article) { - return new ArticleResponse(article.getId(), article.getTitle(), article.getContent()); - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java new file mode 100644 index 000000000..3766e6443 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java @@ -0,0 +1,11 @@ +package com.bang_ggood.article.dto.request; + +import com.bang_ggood.article.domain.Article; +import jakarta.validation.constraints.NotBlank; + +public record ArticleCreateRequest(@NotBlank(message = "제목을 입력해야 합니다.") String title, String content, String keyword, String summary) { + + public Article toEntity() { + return new Article(title, content, keyword, summary); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java new file mode 100644 index 000000000..1700fe90c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java @@ -0,0 +1,17 @@ +package com.bang_ggood.article.dto.response; + +import com.bang_ggood.article.domain.Article; +import java.time.LocalDateTime; + +public record ArticleDetailPreviewResponse(Long articleId, String title, String keyword, String summary, LocalDateTime createdAt) { + + public static ArticleDetailPreviewResponse from(Article article) { + return new ArticleDetailPreviewResponse( + article.getId(), + article.getTitle(), + article.getKeyword(), + article.getSummary(), + article.getCreatedAt() + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlePreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlePreviewResponse.java new file mode 100644 index 000000000..62cb2fc66 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlePreviewResponse.java @@ -0,0 +1,14 @@ +package com.bang_ggood.article.dto.response; + +import com.bang_ggood.article.domain.Article; + +public record ArticlePreviewResponse(Long articleId, String title, String keyword) { + + public static ArticlePreviewResponse from(Article article) { + return new ArticlePreviewResponse( + article.getId(), + article.getTitle(), + article.getKeyword() + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java new file mode 100644 index 000000000..ff24a9450 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java @@ -0,0 +1,18 @@ +package com.bang_ggood.article.dto.response; + +import com.bang_ggood.article.domain.Article; +import java.time.LocalDateTime; + +public record ArticleResponse(Long articleId, String title, String content, String keyword, String summary, LocalDateTime createdAt) { + + public static ArticleResponse from(Article article) { + return new ArticleResponse( + article.getId(), + article.getTitle(), + article.getContent(), + article.getKeyword(), + article.getSummary(), + article.getCreatedAt() + ); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesDetailPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesDetailPreviewResponse.java new file mode 100644 index 000000000..e762ca312 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesDetailPreviewResponse.java @@ -0,0 +1,6 @@ +package com.bang_ggood.article.dto.response; + +import java.util.List; + +public record ArticlesDetailPreviewResponse(List articles) { +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesPreviewResponse.java similarity index 60% rename from backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java rename to backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesPreviewResponse.java index 1c3b0bec3..b09aea77e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/ArticlesPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticlesPreviewResponse.java @@ -1,6 +1,6 @@ -package com.bang_ggood.article.dto; +package com.bang_ggood.article.dto.response; import java.util.List; -public record ArticlesPreviewResponse(List responses) { +public record ArticlesPreviewResponse(List articles) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java index d652d8808..860cde2e8 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/repository/ArticleRepository.java @@ -4,10 +4,36 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import java.util.List; +import java.util.Optional; public interface ArticleRepository extends JpaRepository { default Article getById(Long id) { return findById(id).orElseThrow(() -> new BangggoodException(ExceptionCode.ARTICLE_NOT_FOUND)); } + + @Query("SELECT a FROM Article a " + + "WHERE a.id = :id " + + "AND a.deleted = false") + Optional

findById(@Param("id") Long id); + + @Query("SELECT a FROM Article a " + + "WHERE a.deleted = false") + List
findAll(); + + @Query("SELECT a FROM Article a " + + "WHERE a.deleted = false " + + "ORDER BY a.createdAt DESC " + + "LIMIT :count") + List
findLatest(@Param("count") int count); + + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Query("UPDATE Article a " + + "SET a.deleted = true " + + "WHERE a.id = :id") + void deleteById(@Param("id") Long id); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java index 4c9ffa089..39d85273c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/service/ArticleService.java @@ -1,31 +1,58 @@ package com.bang_ggood.article.service; import com.bang_ggood.article.domain.Article; -import com.bang_ggood.article.dto.ArticlePreviewResponse; -import com.bang_ggood.article.dto.ArticleResponse; -import com.bang_ggood.article.dto.ArticlesPreviewResponse; +import com.bang_ggood.article.dto.request.ArticleCreateRequest; +import com.bang_ggood.article.dto.response.ArticleDetailPreviewResponse; +import com.bang_ggood.article.dto.response.ArticlePreviewResponse; +import com.bang_ggood.article.dto.response.ArticleResponse; +import com.bang_ggood.article.dto.response.ArticlesDetailPreviewResponse; +import com.bang_ggood.article.dto.response.ArticlesPreviewResponse; import com.bang_ggood.article.repository.ArticleRepository; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import java.util.List; @Service public class ArticleService { + private static final int MAX_ARTICLE_CARDS = 3; private final ArticleRepository articleRepository; public ArticleService(ArticleRepository articleRepository) { this.articleRepository = articleRepository; } + @Transactional + public long createArticle(ArticleCreateRequest request) { + Article article = request.toEntity(); + articleRepository.save(article); + return article.getId(); + } + + @Transactional(readOnly = true) public ArticleResponse readArticle(Long id) { Article article = articleRepository.getById(id); return ArticleResponse.from(article); } - public ArticlesPreviewResponse readArticles() { - List articles = articleRepository.findAll().stream() + @Transactional(readOnly = true) + public ArticlesDetailPreviewResponse readArticles() { + List articles = articleRepository.findAll().stream() + .map(ArticleDetailPreviewResponse::from) + .toList(); + return new ArticlesDetailPreviewResponse(articles); + } + + @Transactional(readOnly = true) + public ArticlesPreviewResponse readLatestArticles() { + List articles = articleRepository.findLatest(MAX_ARTICLE_CARDS).stream() .map(ArticlePreviewResponse::from) .toList(); return new ArticlesPreviewResponse(articles); } + + @Transactional + public void deleteArticle(Long id) { + articleRepository.deleteById(id); + } } diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 897ae7481..a6158242e 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -105,6 +105,8 @@ CREATE TABLE article id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), content VARCHAR(255), + keyword VARCHAR(255), + summary VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/ArticleFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/ArticleFixture.java new file mode 100644 index 000000000..f95e1a8a5 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/ArticleFixture.java @@ -0,0 +1,15 @@ +package com.bang_ggood.article; + +import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.dto.request.ArticleCreateRequest; + +public class ArticleFixture { + + public static Article ARTICLE = new Article("제목", "내용", "키워드", "요약"); + public static Article ARTICLE_1 = new Article("제목1", "내용1", "키워드1", "요약1"); + public static Article ARTICLE_2 = new Article("제목2", "내용2", "키워드2", "요약2"); + public static Article ARTICLE_3 = new Article("제목3", "내용3", "키워드3", "요약3"); + public static Article ARTICLE_4 = new Article("제목4", "내용4", "키워드4", "요약4"); + + public static ArticleCreateRequest ARTICLE_CREATE_REQUEST = new ArticleCreateRequest("제목", "내용", "키워드", "요약"); +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java index c6cd585f6..3cdf48747 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/controller/ArticleE2ETest.java @@ -1,16 +1,21 @@ package com.bang_ggood.article.controller; import com.bang_ggood.AcceptanceTest; -import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.dto.request.ArticleCreateRequest; import com.bang_ggood.article.repository.ArticleRepository; import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.exception.dto.ExceptionResponse; import io.restassured.RestAssured; import io.restassured.http.ContentType; +import io.restassured.http.Header; +import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.http.HttpHeaders; +import static com.bang_ggood.article.ArticleFixture.ARTICLE; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_CREATE_REQUEST; import static org.assertj.core.api.Assertions.assertThat; public class ArticleE2ETest extends AcceptanceTest { @@ -18,15 +23,58 @@ public class ArticleE2ETest extends AcceptanceTest { @Autowired ArticleRepository articleRepository; + @BeforeEach + void saveArticle() { + articleRepository.save(ARTICLE); + } + + @DisplayName("아티클 생성 성공") + @Test + void createArticle() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(ARTICLE_CREATE_REQUEST) + .when().post("/articles") + .then().log().all() + .statusCode(201); + } + + @DisplayName("아티클 생성 실패: 유저가 아닌 경우") + @Test + void createArticle_notUser_exception() { + ExceptionResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .body(ARTICLE_CREATE_REQUEST) + .when().post("/articles") + .then().log().all() + .statusCode(401) + .extract() + .as(ExceptionResponse.class); + + assertThat(response.message()).isEqualTo(ExceptionCode.AUTHENTICATION_COOKIE_EMPTY.getMessage()); + } + + @DisplayName("아티클 생성 실패: 제목이 비어있는 경우") + @Test + void createArticle_titleBlank_exception() { + ArticleCreateRequest request = new ArticleCreateRequest("", "내용", "키워드", "요약"); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(request) + .when().post("/articles") + .then().log().all() + .statusCode(400); + } + @DisplayName("아티클 조회 성공") @Test void readArticle() { - Article article = new Article("제목", "내용"); - articleRepository.save(article); - RestAssured.given().log().all() .contentType(ContentType.JSON) - .when().get("/articles/" + article.getId()) + .when().get("/articles/" + ARTICLE.getId()) .then().log().all() .statusCode(200); } @@ -34,9 +82,6 @@ void readArticle() { @DisplayName("아티클 조회 실패 : 유효하지 않은 아이디인 경우") @Test void readArticle_invalidId_exception() { - Article article = new Article("제목", "내용"); - articleRepository.save(article); - long articleId = Long.MAX_VALUE; ExceptionResponse response = RestAssured.given().log().all() @@ -53,13 +98,41 @@ void readArticle_invalidId_exception() { @DisplayName("아티클 목록 조회 성공") @Test void readArticles() { - Article article = new Article("제목", "내용"); - articleRepository.save(article); - RestAssured.given().log().all() .contentType(ContentType.JSON) .when().get("/articles") .then().log().all() .statusCode(200); } + + @DisplayName("최신 아티클 조회 성공") + @Test + void readLatestArticles() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().get("/articles/latest") + .then().log().all() + .statusCode(200); + } + + @DisplayName("아티클 삭제 성공") + @Test + void deleteArticle() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().delete("/articles/" + ARTICLE.getId()) + .then().log().all() + .statusCode(204); + } + + @DisplayName("아티클 삭제 실패: 유저가 아닌 경우") + @Test + void deleteArticle_notUser_exception() { + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .when().delete("/articles/" + ARTICLE.getId()) + .then().log().all() + .statusCode(401); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java new file mode 100644 index 000000000..d48add625 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java @@ -0,0 +1,102 @@ +package com.bang_ggood.article.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static com.bang_ggood.article.ArticleFixture.ARTICLE; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_1; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_2; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_3; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatCode; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +public class ArticleRepositoryTest extends IntegrationTestSupport { + + @Autowired ArticleRepository articleRepository; + + @DisplayName("아티클 조회 성공") + @Test + void getById() { + // given + articleRepository.save(ARTICLE); + + // when & then + assertThatCode(() -> articleRepository.getById(ARTICLE.getId())) + .doesNotThrowAnyException(); + } + + @DisplayName("아티클 조회 실패: 삭제된 경우") + @Test + void getById_deleted_exception() { + // given + articleRepository.save(ARTICLE); + articleRepository.deleteById(ARTICLE.getId()); + + // when & then + assertThatThrownBy(() -> articleRepository.getById(ARTICLE.getId())) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } + + @DisplayName("아티클 조회 실패: 해당 id 아티클이 없는 경우") + @Test + void getById_notFound_exception() { + // given & when & then + assertThatThrownBy(() -> articleRepository.getById(Long.MAX_VALUE)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } + + @DisplayName("아티클 목록 조회 성공") + @Test + void findAll() { + // given + articleRepository.save(ARTICLE_1); + articleRepository.save(ARTICLE_2); + + // when & then + assertThat(articleRepository.findAll()).containsExactly(ARTICLE_1, ARTICLE_2); + } + + @DisplayName("아티클 목록 조회 성공: 삭제된 아티클 제외") + @Test + void findAll_exceptDeletedArticle() { + // given + articleRepository.save(ARTICLE_1); + articleRepository.save(ARTICLE_2); + articleRepository.save(ARTICLE_3); + articleRepository.deleteById(ARTICLE_1.getId()); + + // when & then + assertThat(articleRepository.findAll()).containsExactly(ARTICLE_2, ARTICLE_3); + } + + @DisplayName("아티클 목록 최신순 조회 성공") + @Test + void findLatest() { + // given + articleRepository.save(ARTICLE_1); + articleRepository.save(ARTICLE_2); + + // when & then + assertThat(articleRepository.findLatest(1)).containsExactly(ARTICLE_2); + } + + @DisplayName("아티클 목록 최신순 조회 성공: 삭제된 아티클 제외") + @Test + void findLatest_exceptDeletedArticle() { + // given + articleRepository.save(ARTICLE_1); + articleRepository.save(ARTICLE_2); + articleRepository.save(ARTICLE_3); + articleRepository.deleteById(ARTICLE_3.getId()); + + // when & then + assertThat(articleRepository.findLatest(2)).containsExactly(ARTICLE_2, ARTICLE_1); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java index ff9dc3359..11eeb886a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java @@ -2,13 +2,23 @@ import com.bang_ggood.IntegrationTestSupport; import com.bang_ggood.article.domain.Article; +import com.bang_ggood.article.dto.request.ArticleCreateRequest; +import com.bang_ggood.article.dto.response.ArticlePreviewResponse; import com.bang_ggood.article.repository.ArticleRepository; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; +import static com.bang_ggood.article.ArticleFixture.ARTICLE; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_1; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_2; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_3; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_4; +import static com.bang_ggood.article.ArticleFixture.ARTICLE_CREATE_REQUEST; +import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatCode; import static org.assertj.core.api.Assertions.assertThatThrownBy; @@ -19,15 +29,28 @@ public class ArticleServiceTest extends IntegrationTestSupport { @Autowired ArticleRepository articleRepository; + @DisplayName("아티클 생성 성공") + @Test + void createArticle() { + // given + ArticleCreateRequest request = ARTICLE_CREATE_REQUEST; + + // when + Long articleId = articleService.createArticle(request); + + // then + assertThat(articleRepository.getById(articleId).getTitle()) + .isEqualTo(ARTICLE_CREATE_REQUEST.title()); + } + @DisplayName("아티클 조회 성공") @Test void readArticle() { // given - Article article = new Article("제목", "내용"); - articleRepository.save(article); + articleRepository.save(ARTICLE); // when & then - assertThatCode(() -> articleService.readArticle(article.getId())) + assertThatCode(() -> articleService.readArticle(ARTICLE.getId())) .doesNotThrowAnyException(); } @@ -42,4 +65,37 @@ void readArticle_invalidId_exception() { .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); } + + @DisplayName("최신 아티클 3건 조회 성공") + @Test + void readLatestArticles() { + // given + articleRepository.save(ARTICLE_1); + articleRepository.save(ARTICLE_2); + articleRepository.save(ARTICLE_3); + articleRepository.save(ARTICLE_4); + + // when + List articleTitles = articleService.readLatestArticles().articles().stream() + .map(ArticlePreviewResponse::title) + .toList(); + + // then + assertThat(articleTitles).containsExactly(ARTICLE_4.getTitle(), ARTICLE_3.getTitle(), ARTICLE_2.getTitle()); + } + + @DisplayName("아티클 삭제 성공") + @Test + void deleteArticle() { + // given + articleRepository.save(ARTICLE); + + // when + articleService.deleteArticle(ARTICLE.getId()); + + //then + assertThatThrownBy(() -> articleService.readArticle(ARTICLE.getId())) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.ARTICLE_NOT_FOUND.getMessage()); + } } diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 6af64059a..a4ca6b64d 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -116,6 +116,8 @@ CREATE TABLE article id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), content VARCHAR(255), + keyword VARCHAR(255), + summary VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN From 1c9bbc0afd8760b4eb35ce9832785e1dd9247047 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 19 Aug 2024 16:45:03 +0900 Subject: [PATCH 188/348] =?UTF-8?q?[BE]=20drop=20=ED=85=8C=EC=9D=B4?= =?UTF-8?q?=EB=B8=94=20=EB=AA=85=EB=A0=B9=EC=96=B4=20=EC=88=9C=EC=84=9C?= =?UTF-8?q?=EB=A5=BC=20=EB=B3=80=EA=B2=BD=ED=95=9C=EB=8B=A4.=20(#418)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/schema.sql | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index a6158242e..f3d81d17e 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -1,11 +1,11 @@ -- Drop tables if they exist DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; -DROP TABLE IF EXISTS room CASCADE; -DROP TABLE IF EXISTS custom_checklist_question CASCADE; -DROP TABLE IF EXISTS checklist_like CASCADE; DROP TABLE IF EXISTS article CASCADE; +DROP TABLE IF EXISTS checklist_like CASCADE; DROP TABLE IF EXISTS checklist CASCADE; +DROP TABLE IF EXISTS room CASCADE; +DROP TABLE IF EXISTS custom_checklist_question CASCADE; DROP TABLE IF EXISTS users CASCADE; -- Create tables @@ -105,9 +105,7 @@ CREATE TABLE article id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), content VARCHAR(255), - keyword VARCHAR(255), - summary VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN -); +); \ No newline at end of file From 4aa5883c6ebe01ff442691c9f205a27ac248d082 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:15:33 +0900 Subject: [PATCH 189/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EB=A5=BC=20=EC=A1=B0=ED=9A=8C=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?413)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/UserController.java | 17 +++++++++ .../com/bang_ggood/user/dto/UserResponse.java | 13 +++++++ .../user/controller/UserE2ETest.java | 36 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java new file mode 100644 index 000000000..e5651a6df --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java @@ -0,0 +1,17 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.auth.config.AuthPrincipal; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.dto.UserResponse; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + + @GetMapping("/user/me") + public ResponseEntity readUserInfo(@AuthPrincipal User user) { + return ResponseEntity.ok(UserResponse.from(user)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java new file mode 100644 index 000000000..1982d5c2c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -0,0 +1,13 @@ +package com.bang_ggood.user.dto; + +import com.bang_ggood.user.domain.User; +import java.time.LocalDateTime; + +public record UserResponse(Long id, String name, String email, LocalDateTime createdAt) { + + public static UserResponse from(User user) { + return new UserResponse( + user.getId(), user.getName(), user.getEmail(), user.getCreatedAt() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java new file mode 100644 index 000000000..deb2efbbe --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -0,0 +1,36 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.dto.UserResponse; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.http.HttpHeaders; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class UserE2ETest extends AcceptanceTest { + + @DisplayName("유저 정보 조회 성공") + @Test + void readUserInfo() { + UserResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().get("/user/me") + .then().log().all() + .statusCode(200) + .extract() + .as(UserResponse.class); + + assertAll( + () -> assertThat(response.id()).isEqualTo(UserFixture.USER1.getId()), + () -> assertThat(response.name()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.email()).isEqualTo(UserFixture.USER1.getEmail()) + ); + } +} From b9ccdc5ccdebd5c4e7bb943150e2b71a9100ef2d Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:19:23 +0900 Subject: [PATCH 190/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#423)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/dto/response/SelectedQuestionResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java index 7785c63d4..8ada2b0dd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -2,7 +2,7 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; -public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String grade) { +public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String answer) { public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { return new SelectedQuestionResponse( From be0224db2f227b070534089d994b91267668e319 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:32:29 +0900 Subject: [PATCH 191/348] =?UTF-8?q?=EC=8A=A4=ED=82=A4=EB=A7=88=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#426)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/schema.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f3d81d17e..1adb64995 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -105,6 +105,8 @@ CREATE TABLE article id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), content VARCHAR(255), + keyword VARCHAR(255), + summary VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN From d8c8c95d9737d3c389410dfe88f407112d9a4ace Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:38:05 +0900 Subject: [PATCH 192/348] =?UTF-8?q?=08=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A4=EB=A7=88=EB=A5=BC=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#428)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 69d50ddbe..5c580c73d 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -19,7 +19,7 @@ VALUES (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); -INSERT INTO article(title, content, created_at, modified_at, deleted) +INSERT INTO article(title, content, created_at, keyword, summary, modified_at, deleted) VALUES ('집을 구하는 꿀팁: 성공적인 집 찾기를 위한 가이드', '1. **예산 설정하기**
집을 구하기 전, 가장 먼저 해야 할 일은 예산을 설정하는 것입니다. 월세와 관리비, 보증금까지 포함해 자신이 감당할 수 있는 범위를 확실히 정해두세요.', - '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); + '2024-07-22 07:56:42', '꿀팁', '요약입니다', '2024-07-22 07:56:42', false); From 705f51b6afcf7faab1a2a505a0bc554fd7d28a95 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 19 Aug 2024 19:51:36 +0900 Subject: [PATCH 193/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#430)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../java/com/bang_ggood/user/controller/UserE2ETest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index 1982d5c2c..621bffb09 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long id, String name, String email, LocalDateTime createdAt) { +public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index deb2efbbe..5f81153ea 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -28,9 +28,9 @@ void readUserInfo() { .as(UserResponse.class); assertAll( - () -> assertThat(response.id()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.name()).isEqualTo(UserFixture.USER1.getName()), - () -> assertThat(response.email()).isEqualTo(UserFixture.USER1.getEmail()) + () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), + () -> assertThat(response.userName()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } } From 772592de54899e7cfd32a055fca976f1dd56e877 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 19 Aug 2024 19:56:50 +0900 Subject: [PATCH 194/348] =?UTF-8?q?[BE]=20dev-be=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=EB=A5=BC=20dev=EB=A1=9C=20=EB=B3=91=ED=95=A9=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../java/com/bang_ggood/user/controller/UserE2ETest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index 1982d5c2c..621bffb09 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long id, String name, String email, LocalDateTime createdAt) { +public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index deb2efbbe..5f81153ea 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -28,9 +28,9 @@ void readUserInfo() { .as(UserResponse.class); assertAll( - () -> assertThat(response.id()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.name()).isEqualTo(UserFixture.USER1.getName()), - () -> assertThat(response.email()).isEqualTo(UserFixture.USER1.getEmail()) + () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), + () -> assertThat(response.userName()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } } From af262363eeabd531c35b341a6430508d29f083f7 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 19 Aug 2024 17:15:33 +0900 Subject: [PATCH 195/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=EB=A5=BC=20=EC=A1=B0=ED=9A=8C=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?413)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../user/controller/UserController.java | 17 +++++++++ .../com/bang_ggood/user/dto/UserResponse.java | 13 +++++++ .../user/controller/UserE2ETest.java | 36 +++++++++++++++++++ 3 files changed, 66 insertions(+) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java new file mode 100644 index 000000000..e5651a6df --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/controller/UserController.java @@ -0,0 +1,17 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.auth.config.AuthPrincipal; +import com.bang_ggood.user.domain.User; +import com.bang_ggood.user.dto.UserResponse; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class UserController { + + @GetMapping("/user/me") + public ResponseEntity readUserInfo(@AuthPrincipal User user) { + return ResponseEntity.ok(UserResponse.from(user)); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java new file mode 100644 index 000000000..1982d5c2c --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -0,0 +1,13 @@ +package com.bang_ggood.user.dto; + +import com.bang_ggood.user.domain.User; +import java.time.LocalDateTime; + +public record UserResponse(Long id, String name, String email, LocalDateTime createdAt) { + + public static UserResponse from(User user) { + return new UserResponse( + user.getId(), user.getName(), user.getEmail(), user.getCreatedAt() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java new file mode 100644 index 000000000..deb2efbbe --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -0,0 +1,36 @@ +package com.bang_ggood.user.controller; + +import com.bang_ggood.AcceptanceTest; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.dto.UserResponse; +import io.restassured.RestAssured; +import io.restassured.http.ContentType; +import io.restassured.http.Header; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.http.HttpHeaders; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class UserE2ETest extends AcceptanceTest { + + @DisplayName("유저 정보 조회 성공") + @Test + void readUserInfo() { + UserResponse response = RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .when().get("/user/me") + .then().log().all() + .statusCode(200) + .extract() + .as(UserResponse.class); + + assertAll( + () -> assertThat(response.id()).isEqualTo(UserFixture.USER1.getId()), + () -> assertThat(response.name()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.email()).isEqualTo(UserFixture.USER1.getEmail()) + ); + } +} From e857ba394a32ec1248c9ed3d0b173f2db49d667c Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:19:23 +0900 Subject: [PATCH 196/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#423)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/dto/response/SelectedQuestionResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java index 7785c63d4..8ada2b0dd 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -2,7 +2,7 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; -public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String grade) { +public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String answer) { public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { return new SelectedQuestionResponse( From 7b513899956f024a32d089ace79d9c02176c9eda Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:32:29 +0900 Subject: [PATCH 197/348] =?UTF-8?q?=EC=8A=A4=ED=82=A4=EB=A7=88=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#426)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/schema.sql | 2 ++ 1 file changed, 2 insertions(+) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index f3d81d17e..1adb64995 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -105,6 +105,8 @@ CREATE TABLE article id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), content VARCHAR(255), + keyword VARCHAR(255), + summary VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN From 4b068bed95764dae926a8609c4d03f1b9b3f7796 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Mon, 19 Aug 2024 18:38:05 +0900 Subject: [PATCH 198/348] =?UTF-8?q?=08=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EC=8A=A4=ED=82=A4=EB=A7=88=EB=A5=BC=20=EC=88=98=EC=A0=95?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#428)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 69d50ddbe..5c580c73d 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -19,7 +19,7 @@ VALUES (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); -INSERT INTO article(title, content, created_at, modified_at, deleted) +INSERT INTO article(title, content, created_at, keyword, summary, modified_at, deleted) VALUES ('집을 구하는 꿀팁: 성공적인 집 찾기를 위한 가이드', '1. **예산 설정하기**
집을 구하기 전, 가장 먼저 해야 할 일은 예산을 설정하는 것입니다. 월세와 관리비, 보증금까지 포함해 자신이 감당할 수 있는 범위를 확실히 정해두세요.', - '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); + '2024-07-22 07:56:42', '꿀팁', '요약입니다', '2024-07-22 07:56:42', false); From 0a2fa7a9d773e5225c628894b2db57fadd007e7c Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 19 Aug 2024 19:56:50 +0900 Subject: [PATCH 199/348] =?UTF-8?q?[BE]=20dev-be=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=EB=A5=BC=20dev=EB=A1=9C=20=EB=B3=91=ED=95=A9=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#431)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../java/com/bang_ggood/user/controller/UserE2ETest.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index 1982d5c2c..621bffb09 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long id, String name, String email, LocalDateTime createdAt) { +public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index deb2efbbe..5f81153ea 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -28,9 +28,9 @@ void readUserInfo() { .as(UserResponse.class); assertAll( - () -> assertThat(response.id()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.name()).isEqualTo(UserFixture.USER1.getName()), - () -> assertThat(response.email()).isEqualTo(UserFixture.USER1.getEmail()) + () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), + () -> assertThat(response.userName()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } } From 18529963ea16a2be672714d64828875ec77d8755 Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Mon, 19 Aug 2024 20:24:06 +0900 Subject: [PATCH 200/348] =?UTF-8?q?style:=20=EB=B6=88=ED=95=84=EC=9A=94?= =?UTF-8?q?=ED=95=9C=20=ED=8C=8C=EC=9D=BC=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/hs_err_pid6379.jfr | 0 backend/bang-ggood/hs_err_pid6379.log | 1649 ------------------------- 2 files changed, 1649 deletions(-) delete mode 100644 backend/bang-ggood/hs_err_pid6379.jfr delete mode 100644 backend/bang-ggood/hs_err_pid6379.log diff --git a/backend/bang-ggood/hs_err_pid6379.jfr b/backend/bang-ggood/hs_err_pid6379.jfr deleted file mode 100644 index e69de29bb..000000000 diff --git a/backend/bang-ggood/hs_err_pid6379.log b/backend/bang-ggood/hs_err_pid6379.log deleted file mode 100644 index fd85e2171..000000000 --- a/backend/bang-ggood/hs_err_pid6379.log +++ /dev/null @@ -1,1649 +0,0 @@ -# -# A fatal error has been detected by the Java Runtime Environment: -# -# SIGBUS (0xa) at pc=0x00000001180014e4, pid=6379, tid=5379 -# -# JRE version: Java(TM) SE Runtime Environment (17.0.9+11) (build 17.0.9+11-LTS-201) -# Java VM: Java HotSpot(TM) 64-Bit Server VM (17.0.9+11-LTS-201, mixed mode, emulated-client, sharing, tiered, compressed oops, compressed class ptrs, g1 gc, bsd-aarch64) -# Problematic frame: -# v ~StubRoutines::SafeFetch32 -# -# No core dump will be written. Core dumps have been disabled. To enable core dumping, try "ulimit -c unlimited" before starting Java again -# -# JFR recording file will be written. Location: /Users/jinwoo/Documents/woowacourse/2024-bang-ggood/backend/bang-ggood/hs_err_pid6379.jfr -# -# If you would like to submit a bug report, please visit: -# https://bugreport.java.com/bugreport/crash.jsp -# - ---------------- S U M M A R Y ------------ - -Command Line: -XX:TieredStopAtLevel=1 -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -Dmanagement.endpoints.jmx.exposure.include=* -javaagent:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar=51990:/Applications/IntelliJ IDEA.app/Contents/bin -agentpath:/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/libasyncProfiler.so=start,jfr,event=cpu,interval=10ms,jfrsync=profile,cstack=no,file=/Users/jinwoo/IdeaSnapshots/Application__1__2024_08_16_151221.jfr,log=/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/Application__1__2024_08_16_151221.jfr.log.txt,logLevel=DEBUG -Dfile.encoding=UTF-8 com.bang_ggood.Application - -Host: "Mac14,9" arm64 1 MHz, 10 cores, 16G, Darwin 22.3.0, macOS 13.2.1 (22D68) -Time: Fri Aug 16 15:12:23 2024 KST elapsed time: 2.357016 seconds (0d 0h 0m 2s) - ---------------- T H R E A D --------------- - -Current thread (0x000000011f253e00): JavaThread "main" [_thread_in_Java, id=5379, stack(0x000000016f000000,0x000000016f203000)] - -Stack: [0x000000016f000000,0x000000016f203000], sp=0x000000016f1ffc60, free space=2047k -Native frames: (J=compiled Java code, j=interpreted, Vv=VM code, C=native code) -v ~StubRoutines::SafeFetch32 -V [libjvm.dylib+0x7b6c14] os::is_readable_range(void const*, void const*)+0x2c -V [libjvm.dylib+0x7676e8] Method::is_valid_method(Method const*)+0x38 -V [libjvm.dylib+0x35f704] frame::is_interpreted_frame_valid(JavaThread*) const+0x7c -V [libjvm.dylib+0x35f5e0] frame::safe_for_sender(JavaThread*)+0x4ec -V [libjvm.dylib+0x92cfd4] JavaThread::pd_get_top_frame(frame*, void*, bool)+0x200 -V [libjvm.dylib+0x35c474] AsyncGetCallTrace+0x1b0 -C [libasyncProfiler.so+0x3ac64] Profiler::getJavaTraceAsync(void*, ASGCT_CallFrame*, int, StackContext*)+0x15c -C [libasyncProfiler.so+0x3bd14] Profiler::recordSampleForThread(int, void*, unsigned long long, int, Event*, int*)+0x1c4 -C [libasyncProfiler.so+0x4a03c] WallClock::signalHandler(int, __siginfo*, void*)+0xa8 -C [libsystem_platform.dylib+0x42a4] _sigtramp+0x38 -C 0xbc7d00011831a33c -j java.lang.invoke.InvokerBytecodeGenerator.addMethod()V+698 java.base@17.0.9 -j java.lang.invoke.InvokerBytecodeGenerator.generateCustomizedCodeBytes()[B+6 java.base@17.0.9 -j java.lang.invoke.InvokerBytecodeGenerator.generateCustomizedCode(Ljava/lang/invoke/LambdaForm;Ljava/lang/invoke/MethodType;)Ljava/lang/invoke/MemberName;+27 java.base@17.0.9 -j java.lang.invoke.LambdaForm.compileToBytecode()V+69 java.base@17.0.9 -J 972 c1 java.lang.invoke.LambdaForm.prepare()V java.base@17.0.9 (112 bytes) @ 0x00000001182dab08 [0x00000001182daa80+0x0000000000000088] -J 971 c1 java.lang.invoke.MethodHandle.(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;)V java.base@17.0.9 (37 bytes) @ 0x00000001182da358 [0x00000001182da280+0x00000000000000d8] -j java.lang.invoke.BoundMethodHandle.(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;)V+3 java.base@17.0.9 -j java.lang.invoke.BoundMethodHandle$Species_LL.(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;Ljava/lang/Object;Ljava/lang/Object;)V+3 java.base@17.0.9 -j java.lang.invoke.BoundMethodHandle$Species_LL.make(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/invoke/BoundMethodHandle;+8 java.base@17.0.9 -j java.lang.invoke.DirectMethodHandle$Holder.invokeStatic(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+16 java.base@17.0.9 -j java.lang.invoke.BoundMethodHandle$Species_L.copyWithExtendL(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;Ljava/lang/Object;)Ljava/lang/invoke/BoundMethodHandle;+19 java.base@17.0.9 -j java.lang.invoke.MethodHandles.argumentsWithCombiner(ZLjava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;[I)Ljava/lang/invoke/MethodHandle;+122 java.base@17.0.9 -j java.lang.invoke.MethodHandles.filterArgumentsWithCombiner(Ljava/lang/invoke/MethodHandle;ILjava/lang/invoke/MethodHandle;[I)Ljava/lang/invoke/MethodHandle;+5 java.base@17.0.9 -j java.lang.invoke.StringConcatFactory.generateMHInlineCopy(Ljava/lang/invoke/MethodType;Ljava/util/List;)Ljava/lang/invoke/MethodHandle;+387 java.base@17.0.9 -j java.lang.invoke.StringConcatFactory.makeConcatWithConstants(Ljava/lang/invoke/MethodHandles$Lookup;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/String;[Ljava/lang/Object;)Ljava/lang/invoke/CallSite;+220 java.base@17.0.9 -j java.lang.invoke.DirectMethodHandle$Holder.invokeStatic(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+18 java.base@17.0.9 -j java.lang.invoke.DelegatingMethodHandle$Holder.delegate(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+21 java.base@17.0.9 -j java.lang.invoke.Invokers$Holder.invokeExact_MT(Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object;+26 java.base@17.0.9 -j java.lang.invoke.BootstrapMethodInvoker.invoke(Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/Object;+157 java.base@17.0.9 -j java.lang.invoke.CallSite.makeSite(Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;Ljava/lang/Class;)Ljava/lang/invoke/CallSite;+8 java.base@17.0.9 -j java.lang.invoke.MethodHandleNatives.linkCallSiteImpl(Ljava/lang/Class;Ljava/lang/invoke/MethodHandle;Ljava/lang/String;Ljava/lang/invoke/MethodType;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;+6 java.base@17.0.9 -j java.lang.invoke.MethodHandleNatives.linkCallSite(Ljava/lang/Object;ILjava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;Ljava/lang/Object;[Ljava/lang/Object;)Ljava/lang/invoke/MemberName;+46 java.base@17.0.9 -v ~StubRoutines::call_stub -V [libjvm.dylib+0x46c6ec] JavaCalls::call_helper(JavaValue*, methodHandle const&, JavaCallArguments*, JavaThread*)+0x38c -V [libjvm.dylib+0x46bca8] JavaCalls::call_static(JavaValue*, Klass*, Symbol*, Symbol*, JavaCallArguments*, JavaThread*)+0xc4 -V [libjvm.dylib+0x8ee334] SystemDictionary::invoke_bootstrap_method(BootstrapInfo&, JavaThread*)+0x300 -V [libjvm.dylib+0x687d34] LinkResolver::resolve_dynamic_call(CallInfo&, BootstrapInfo&, JavaThread*)+0x28 -V [libjvm.dylib+0x687570] LinkResolver::resolve_invokedynamic(CallInfo&, constantPoolHandle const&, int, JavaThread*)+0x88 -V [libjvm.dylib+0x466308] InterpreterRuntime::resolve_invokedynamic(JavaThread*)+0x128 -V [libjvm.dylib+0x466428] InterpreterRuntime::resolve_from_cache(JavaThread*, Bytecodes::Code)+0xb4 -j sun.management.Util.newObjectName(Ljava/lang/String;Ljava/lang/String;)Ljavax/management/ObjectName;+2 java.management@17.0.9 -j sun.management.MemoryManagerImpl.getObjectName()Ljavax/management/ObjectName;+6 java.management@17.0.9 -j java.lang.management.DefaultPlatformMBeanProvider$5.isMemoryManager(Ljava/lang/management/MemoryManagerMXBean;)Z+1 java.management@17.0.9 -j java.lang.management.DefaultPlatformMBeanProvider$5$$Lambda$85+0x000000b8010c7b08.test(Ljava/lang/Object;)Z+8 java.management@17.0.9 -j java.util.stream.ReferencePipeline$2$1.accept(Ljava/lang/Object;)V+8 java.base@17.0.9 -j java.util.ArrayList$ArrayListSpliterator.forEachRemaining(Ljava/util/function/Consumer;)V+95 java.base@17.0.9 -j java.util.stream.AbstractPipeline.copyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)V+32 java.base@17.0.9 -j java.util.stream.AbstractPipeline.wrapAndCopyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)Ljava/util/stream/Sink;+13 java.base@17.0.9 -j java.util.stream.ReduceOps$ReduceOp.evaluateSequential(Ljava/util/stream/PipelineHelper;Ljava/util/Spliterator;)Ljava/lang/Object;+6 java.base@17.0.9 -j java.util.stream.AbstractPipeline.evaluate(Ljava/util/stream/TerminalOp;)Ljava/lang/Object;+88 java.base@17.0.9 -j java.util.stream.ReferencePipeline.collect(Ljava/util/stream/Collector;)Ljava/lang/Object;+86 java.base@17.0.9 -j java.lang.management.DefaultPlatformMBeanProvider$5.nameToMBeanMap()Ljava/util/Map;+32 java.management@17.0.9 -j java.lang.management.ManagementFactory.lambda$getPlatformMBeanServer$0(Lsun/management/spi/PlatformMBeanProvider$PlatformComponent;)Ljava/util/stream/Stream;+1 java.management@17.0.9 -j java.lang.management.ManagementFactory$$Lambda$82+0x000000b80101d6b0.apply(Ljava/lang/Object;)Ljava/lang/Object;+4 java.management@17.0.9 -j java.util.stream.ReferencePipeline$7$1.accept(Ljava/lang/Object;)V+8 java.base@17.0.9 -j java.util.stream.ReferencePipeline$2$1.accept(Ljava/lang/Object;)V+21 java.base@17.0.9 -j java.util.HashMap$ValueSpliterator.forEachRemaining(Ljava/util/function/Consumer;)V+145 java.base@17.0.9 -j java.util.stream.AbstractPipeline.copyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)V+32 java.base@17.0.9 -j java.util.stream.AbstractPipeline.wrapAndCopyInto(Ljava/util/stream/Sink;Ljava/util/Spliterator;)Ljava/util/stream/Sink;+13 java.base@17.0.9 -j java.util.stream.ForEachOps$ForEachOp.evaluateSequential(Ljava/util/stream/PipelineHelper;Ljava/util/Spliterator;)Ljava/lang/Void;+3 java.base@17.0.9 -j java.util.stream.ForEachOps$ForEachOp$OfRef.evaluateSequential(Ljava/util/stream/PipelineHelper;Ljava/util/Spliterator;)Ljava/lang/Object;+3 java.base@17.0.9 -j java.util.stream.AbstractPipeline.evaluate(Ljava/util/stream/TerminalOp;)Ljava/lang/Object;+88 java.base@17.0.9 -j java.util.stream.ReferencePipeline.forEach(Ljava/util/function/Consumer;)V+6 java.base@17.0.9 -j java.lang.management.ManagementFactory.getPlatformMBeanServer()Ljavax/management/MBeanServer;+68 java.management@17.0.9 -j sun.management.jmxremote.ConnectorBootstrap.startLocalConnectorServer()Ljavax/management/remote/JMXConnectorServer;+88 jdk.management.agent@17.0.9 -j jdk.internal.agent.Agent.startLocalManagementAgent()V+13 jdk.management.agent@17.0.9 -j jdk.internal.agent.Agent.startAgent(Ljava/util/Properties;)V+58 jdk.management.agent@17.0.9 -j jdk.internal.agent.Agent.startAgent()V+20 jdk.management.agent@17.0.9 -v ~StubRoutines::call_stub -V [libjvm.dylib+0x46c6ec] JavaCalls::call_helper(JavaValue*, methodHandle const&, JavaCallArguments*, JavaThread*)+0x38c -V [libjvm.dylib+0x46bca8] JavaCalls::call_static(JavaValue*, Klass*, Symbol*, Symbol*, JavaCallArguments*, JavaThread*)+0xc4 -V [libjvm.dylib+0x46bd30] JavaCalls::call_static(JavaValue*, Klass*, Symbol*, Symbol*, JavaThread*)+0x4c -V [libjvm.dylib+0x724090] Management::initialize(JavaThread*)+0x118 -V [libjvm.dylib+0x91fe3c] Threads::create_vm(JavaVMInitArgs*, bool*)+0x8bc -V [libjvm.dylib+0x4e13d8] JNI_CreateJavaVM+0x6c -C [libjli.dylib+0x6e40] JavaMain+0x104 -C [libjli.dylib+0x9a80] ThreadJavaMain+0xc -C [libsystem_pthread.dylib+0x706c] _pthread_start+0x94 - - -siginfo: si_signo: 10 (SIGBUS), si_code: 1 (BUS_ADRALN), si_addr: 0x00000001180014e4 - -Register to memory mapping: - - x0=0x000000b800028000 is pointing into metadata - x1=0x00000000cafebabe is an unknown value - x2=0x000000016f1ffdc8 is pointing into the stack for thread: 0x000000011f253e00 - x3=0x0000000000000001 is an unknown value - x4=0x000000016f1fffa0 is pointing into the stack for thread: 0x000000011f253e00 - x5=0x000000016f1fffa0 is pointing into the stack for thread: 0x000000011f253e00 - x6=0x0000000055051573 is an unknown value - x7=0x000000070e86e6a0 is an oop: java.lang.invoke.MethodType$ConcurrentWeakInternSet$WeakEntry -{0x000000070e86e6a0} - klass: 'java/lang/invoke/MethodType$ConcurrentWeakInternSet$WeakEntry' - - ---- fields (total size 4 words): - - private 'referent' 'Ljava/lang/Object;' @12 a 'java/lang/invoke/MethodType'{0x000000070e818318} = ()Ljava/lang/Object; (e1d03063) - - volatile 'queue' 'Ljava/lang/ref/ReferenceQueue;' @16 a 'java/lang/ref/ReferenceQueue'{0x000000070e86d050} (e1d0da0a) - - volatile 'next' 'Ljava/lang/ref/Reference;' @20 NULL (0) - - private transient 'discovered' 'Ljava/lang/ref/Reference;' @24 NULL (0) - - public final 'hashcode' 'I' @28 1426407542 (55054076) - x8=0x00000001180014e0 is at begin+0 in a stub -StubRoutines::SafeFetch32 [0x00000001180014e0, 0x00000001180014ec] (12 bytes) - x9=0x000000016f2005a0 is pointing into the stack for thread: 0x000000011f253e00 -x10=0x0 is NULL -x11=0x000000016f2005f0 is pointing into the stack for thread: 0x000000011f253e00 -x12=0x00000000000000ab is an unknown value -x13=0x0 is NULL -x14=0x0 is NULL -x15=0x0 is NULL -x16=0x000000018b644e9c: pthread_getspecific+0 in /usr/lib/system/libsystem_pthread.dylib at 0x000000018b643000 -x17=0x0000600003ee2760 points into unknown readable memory: 0xfffffffffffffffe | fe ff ff ff ff ff ff ff -x18=0x0 is NULL -x19=0x000000b800028000 is pointing into metadata -x20=0x000000011f253e00 is a thread -x21=0x0000000000000001 is an unknown value -x22=0x0000000102a5c560: _ZN12StubRoutines25_call_stub_return_addressE+0 in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 -x23=0x0000000102a5c7b8: _ZN12StubRoutines18_safefetch32_entryE+0 in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 -x24=0x00000000cafebabe is an unknown value -x25=0x000000016f2005a0 is pointing into the stack for thread: 0x000000011f253e00 -x26=0x000000012804831c points into unknown readable memory: 00 00 00 00 -x27=0x000000012804c390 points into unknown readable memory: 0x72656e6e00000127 | 27 01 00 00 6e 6e 65 72 -x28=0x000000011831a444 is at entry_point+836 in (nmethod*)0x0000000118319f10 -Compiled method (c1) 2361 1108 1 java.lang.invoke.MemberName::getInvocationType (56 bytes) - total in heap [0x0000000118319f10,0x000000011831a7a8] = 2200 - relocation [0x000000011831a068,0x000000011831a0c8] = 96 - main code [0x000000011831a100,0x000000011831a400] = 768 - stub code [0x000000011831a400,0x000000011831a478] = 120 - metadata [0x000000011831a478,0x000000011831a4e0] = 104 - scopes data [0x000000011831a4e0,0x000000011831a5c0] = 224 - scopes pcs [0x000000011831a5c0,0x000000011831a770] = 432 - dependencies [0x000000011831a770,0x000000011831a788] = 24 - nul chk table [0x000000011831a788,0x000000011831a7a8] = 32 - - -Registers: - x0=0x000000b800028000 x1=0x00000000cafebabe x2=0x000000016f1ffdc8 x3=0x0000000000000001 - x4=0x000000016f1fffa0 x5=0x000000016f1fffa0 x6=0x0000000055051573 x7=0x000000070e86e6a0 - x8=0x00000001180014e0 x9=0x000000016f2005a0 x10=0x0000000000000000 x11=0x000000016f2005f0 -x12=0x00000000000000ab x13=0x0000000000000000 x14=0x0000000000000000 x15=0x0000000000000000 -x16=0x000000018b644e9c x17=0x0000600003ee2760 x18=0x0000000000000000 x19=0x000000b800028000 -x20=0x000000011f253e00 x21=0x0000000000000001 x22=0x0000000102a5c560 x23=0x0000000102a5c7b8 -x24=0x00000000cafebabe x25=0x000000016f2005a0 x26=0x000000012804831c x27=0x000000012804c390 -x28=0x000000011831a444 fp=0x000000016f1ffc90 lr=0x000000010265e614 sp=0x000000016f1ffc60 -pc=0x00000001180014e4 cpsr=0x0000000060001000 -Top of Stack: (sp=0x000000016f1ffc60) -0x000000016f1ffc60: 000000016f200640 000000016f2005a0 -0x000000016f1ffc70: 0000000102a5c560 000000b800028ba0 -0x000000016f1ffc80: 000000b800028000 000000b800028bf8 -0x000000016f1ffc90: 000000016f1ffcb0 000000010265ec14 -0x000000016f1ffca0: 000000016f1ffd10 000000b800028ba0 -0x000000016f1ffcb0: 000000016f1ffcd0 000000010260f6e8 -0x000000016f1ffcc0: 000000016f1ffd10 000000011f253e00 -0x000000016f1ffcd0: 000000016f1ffd00 0000000102207704 -0x000000016f1ffce0: 0000000102a5c560 0000000118005590 -0x000000016f1ffcf0: 0000000118005c60 000000011f253e00 -0x000000016f1ffd00: 000000016f1ffd80 00000001022075e0 -0x000000016f1ffd10: 000000016f2005a0 0000000118005c60 -0x000000016f1ffd20: 0000000118005590 0000000100000000 -0x000000016f1ffd30: 000000016f200640 000000016f2005a0 -0x000000016f1ffd40: 000000012804831c 000000011f2540b0 -0x000000016f1ffd50: 000000011f253e00 000000016f1fffa0 -0x000000016f1ffd60: 0000000118319f10 000000011831a444 -0x000000016f1ffd70: 000000011f253e00 000000016f1ffe90 -0x000000016f1ffd80: 000000016f1ffe20 00000001027d4fd4 -0x000000016f1ffd90: 000000016f1ffdd0 000000010230e3ec -0x000000016f1ffda0: 000000016f1ffe88 0000000118008440 -0x000000016f1ffdb0: 000000014c41d36b 0000000102a641b0 -0x000000016f1ffdc0: 000000016f2004e0 000000016f200640 -0x000000016f1ffdd0: 000000016f2004e0 000000011831a444 -0x000000016f1ffde0: 0000000118319f10 0000000100000000 -0x000000016f1ffdf0: 000000016f200640 000000016f2004e0 -0x000000016f1ffe00: 000000016f2000f8 0000000000000800 -0x000000016f1ffe10: 000000011f253e00 000000016f1fff00 -0x000000016f1ffe20: 000000016f1ffee0 0000000102204474 -0x000000016f1ffe30: 000000016f1ffe88 000000014c41d3c8 -0x000000016f1ffe40: 000000070fa513f0 0000000000000000 -0x000000016f1ffe50: 0000000000000000 000000014c41d370 - -Instructions: (pc=0x00000001180014e4) -0x00000001180013e4: 1e614000 1400003a d2842809 f2a05469 -0x00000001180013f4: f2c00029 6d425935 1e640886 0c402d31 -0x0000000118001404: 1e6408c7 1f5654d0 1e6c1017 1f5050d0 -0x0000000118001414: 1f504cd0 1f5048d0 1e650af6 1f50d8f6 -0x0000000118001424: 1f5694d6 1f5158f6 1e762880 36000501 -0x0000000118001434: 1e614000 14000026 2e251ca5 d2843009 -0x0000000118001444: f2a05469 f2c00029 6d425d36 1e600806 -0x0000000118001454: 0c402d32 1f5758c7 1e6c101a 1f4754c7 -0x0000000118001464: 1e650805 1f4750c7 d2866668 f2a7fa68 -0x0000000118001474: 1f474cc7 1e6608c0 1f4748c7 1e6e1019 -0x0000000118001484: eb08007f 540000ac 1f479400 1f460340 -0x0000000118001494: 1e603b20 1400000e d2a7fd29 eb09007f -0x00000001180014a4: 540000ac 51480069 d3607d29 9e670121 -0x00000001180014b4: 14000002 1e6a5001 1f679417 1f668742 -0x00000001180014c4: 1e613b23 1e773857 1e773860 a8c17ff3 -0x00000001180014d4: 910003bf a8c17bfd d65f03c0 b9400001 -0x00000001180014e4: aa0103e0 d65f03c0 f9400001 aa0103e0 -0x00000001180014f4: d65f03c0 00000000 00000000 00000000 -0x0000000118001504: 00000000 00000000 00000000 00000000 -0x0000000118001514: 00000000 00000000 00000000 00000000 -0x0000000118001524: 00000000 00000000 00000000 00000000 -0x0000000118001534: 00000000 00000000 00000000 00000000 -0x0000000118001544: 00000000 00000000 00000000 00000000 -0x0000000118001554: 00000000 00000000 00000000 00000000 -0x0000000118001564: 00000000 00000000 00000000 00000000 -0x0000000118001574: 00000000 00000000 00000000 00000000 -0x0000000118001584: 00000000 00000000 00000000 00000000 -0x0000000118001594: 00000000 00000000 00000000 00000000 -0x00000001180015a4: 00000000 00000000 00000000 00000000 -0x00000001180015b4: 00000000 00000000 00000000 00000000 -0x00000001180015c4: 00000000 00000000 00000000 00000000 -0x00000001180015d4: 00000000 00000000 00000000 00000000 - - -Stack slot to memory mapping: -stack at sp + 0 slots: 0x000000016f200640 is pointing into the stack for thread: 0x000000011f253e00 -stack at sp + 1 slots: 0x000000016f2005a0 is pointing into the stack for thread: 0x000000011f253e00 -stack at sp + 2 slots: 0x0000000102a5c560: _ZN12StubRoutines25_call_stub_return_addressE+0 in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 -stack at sp + 3 slots: {method} {0x000000b800028ba0} 'emitStaticInvoke' '(Ljava/lang/invoke/MemberName;Ljava/lang/invoke/LambdaForm$Name;)V' in 'java/lang/invoke/InvokerBytecodeGenerator' -stack at sp + 4 slots: 0x000000b800028000 is pointing into metadata -stack at sp + 5 slots: {method} {0x000000b800028bf8} 'emitStaticInvoke' '(Ljava/lang/invoke/LambdaForm$Name;)V' in 'java/lang/invoke/InvokerBytecodeGenerator' -stack at sp + 6 slots: 0x000000016f1ffcb0 is pointing into the stack for thread: 0x000000011f253e00 -stack at sp + 7 slots: 0x000000010265ec14: _ZN2os17is_readable_rangeEPKvS1_+0x2c in /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib at 0x0000000101ea8000 - -StubRoutines::SafeFetch32 [0x00000001180014e0, 0x00000001180014ec] (12 bytes) -[MachCode] - 0x00000001180014e0: 0100 40b9 | e003 01aa | c003 5fd6 -[/MachCode] - -Compiled method (c1) 2363 972 1 java.lang.invoke.LambdaForm::prepare (112 bytes) - total in heap [0x00000001182da890,0x00000001182db448] = 3000 - relocation [0x00000001182da9e8,0x00000001182daa68] = 128 - main code [0x00000001182daa80,0x00000001182dae00] = 896 - stub code [0x00000001182dae00,0x00000001182daeb8] = 184 - oops [0x00000001182daeb8,0x00000001182daec0] = 8 - metadata [0x00000001182daec0,0x00000001182daf38] = 120 - scopes data [0x00000001182daf38,0x00000001182db0d0] = 408 - scopes pcs [0x00000001182db0d0,0x00000001182db3f0] = 800 - dependencies [0x00000001182db3f0,0x00000001182db410] = 32 - nul chk table [0x00000001182db410,0x00000001182db448] = 56 - -[Constant Pool (empty)] - -[MachCode] -[Entry Point] - # {method} {0x000000b8000dff48} 'prepare' '()V' in 'java/lang/invoke/LambdaForm' - # [sp+0xa0] (sp of caller) - 0x00000001182daa80: 2808 40b9 | 3f01 086b | c001 0054 - - 0x00000001182daa8c: ; {runtime_call ic_miss_stub} - 0x00000001182daa8c: 5d75 f517 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 - 0x00000001182daaac: 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 -[Verified Entry Point] - 0x00000001182daac0: 1f20 03d5 | e953 40d1 | 3f01 00f9 | ff83 02d1 - - 0x00000001182daad0: ;*getstatic COMPILE_THRESHOLD {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@0 (line 811) - 0x00000001182daad0: fd7b 09a9 | e133 00f9 - - 0x00000001182daad8: ;*getfield invocationCounter {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::forceInterpretation@1 (line 928) - ; - java.lang.invoke.LambdaForm::prepare@7 (line 811) - 0x00000001182daad8: 2014 40b9 | 1f04 0031 | e017 9f9a | 0000 0012 | 1f00 0071 - - 0x00000001182daaec: ;*ifne {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@10 (line 811) - 0x00000001182daaec: 0101 0054 - - 0x00000001182daaf0: ;*getfield isCompiled {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@14 (line 811) - 0x00000001182daaf0: 2064 4039 | 1f00 0071 - - 0x00000001182daaf8: ;*ifne {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@17 (line 811) - 0x00000001182daaf8: a100 0054 | e003 01aa - - 0x00000001182dab00: ;*invokevirtual compileToBytecode {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@21 (line 812) - 0x00000001182dab00: e103 00aa - - 0x00000001182dab04: ; ImmutableOopMap {[96]=Oop } - ;*invokevirtual compileToBytecode {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@21 (line 812) - ; {optimized virtual_call} - 0x00000001182dab04: bf00 0094 | e133 40f9 | 2028 40b9 - - 0x00000001182dab10: ;*getfield vmentry {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@25 (line 814) - 0x00000001182dab10: 00f0 7dd3 | e203 1faa | 1f00 02eb - - 0x00000001182dab1c: ;*ifnull {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@28 (line 814) - 0x00000001182dab1c: c10d 0054 | e003 01aa - - 0x00000001182dab24: ;*invokevirtual methodType {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@33 (line 818) - 0x00000001182dab24: e103 00aa - - 0x00000001182dab28: ; ImmutableOopMap {[96]=Oop } - ;*invokevirtual methodType {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@33 (line 818) - ; {optimized virtual_call} - 0x00000001182dab28: f675 f597 | e037 00f9 - - 0x00000001182dab30: ; implicit exception: dispatches to 0x00000001182dacec - 0x00000001182dab30: 0314 40b9 - - 0x00000001182dab34: ;*getfield form {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodType::form@1 (line 163) - ; - java.lang.invoke.LambdaForm::prepare@38 (line 819) - 0x00000001182dab34: 63f0 7dd3 - - 0x00000001182dab38: ; implicit exception: dispatches to 0x00000001182dacf0 - 0x00000001182dab38: 641c 40b9 - - 0x00000001182dab3c: ;*getfield lambdaForms {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@1 (line 131) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab3c: 84f0 7dd3 - - 0x00000001182dab40: ; implicit exception: dispatches to 0x00000001182dacf4 - 0x00000001182dab40: 8a0c 40b9 | 5f19 0071 | 890d 0054 | 8428 40b9 - - 0x00000001182dab50: ;*aaload {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@5 (line 131) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab50: 84f0 7dd3 | ea03 1faa | 9f00 0aeb - - 0x00000001182dab5c: ;*ifnull {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@8 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab5c: 8003 0054 - - 0x00000001182dab60: ; implicit exception: dispatches to 0x00000001182dad10 - ;*invokevirtual get {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab60: 9f00 40f9 | 8a0c 40b9 | 4af1 7dd3 | 8be3 4039 | 7f01 0071 - - 0x00000001182dab74: ;*invokespecial get {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.ref.SoftReference::get@1 (line 112) - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab74: 010d 0054 | eb03 1faa | 5f01 0beb - - 0x00000001182dab80: ;*ifnull {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.ref.SoftReference::get@6 (line 113) - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab80: 2001 0054 - - 0x00000001182dab84: ;*getfield timestamp {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.ref.SoftReference::get@10 (line 113) - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab84: 8b10 40f9 - - 0x00000001182dab88: ; {oop(a 'java/lang/Class'{0x00000007ffd021f0} = 'java/lang/ref/SoftReference')} - 0x00000001182dab88: 023e 84d2 | 02fa bff2 | e200 c0f2 - - 0x00000001182dab94: ;*getstatic clock {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.ref.SoftReference::get@13 (line 113) - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab94: 4138 40f9 | 7f01 01eb - - 0x00000001182dab9c: ;*lcmp {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.ref.SoftReference::get@16 (line 113) - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dab9c: 4000 0054 - - 0x00000001182daba0: ;*putfield timestamp {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.ref.SoftReference::get@24 (line 114) - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182daba0: 8110 00f9 | 2a01 00b4 - - 0x00000001182daba8: ; {metadata('java/lang/invoke/LambdaForm')} - 0x00000001182daba8: 0244 9bd2 | a201 a0f2 | 0217 c0f2 | 4809 40b9 | 0817 c0f2 | 1f01 02eb | 210b 0054 - - 0x00000001182dabc4: ;*checkcast {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@15 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dabc4: 0100 0014 - - 0x00000001182dabc8: ;*goto {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@18 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dabc8: 0200 0014 - - 0x00000001182dabcc: ;*areturn {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@22 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dabcc: ea03 1faa | e303 1faa | 5f01 03eb - - 0x00000001182dabd8: ;*ifnonnull {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@48 (line 820) - 0x00000001182dabd8: a105 0054 | ea3f 00f9 - - 0x00000001182dabe0: ; {metadata('java/lang/invoke/LambdaForm')} - 0x00000001182dabe0: 0344 9bd2 | a301 a0f2 | 0317 c0f2 | e503 00aa | 8087 40f9 | 0bc0 0091 | 888f 40f9 | 7f01 08eb - 0x00000001182dac00: 6809 0054 | 8b87 00f9 | ea03 40b2 | 0a00 00f9 | ea03 032a | 0a7c 0129 | 0a40 0091 | 5f7d 00a9 - 0x00000001182dac20: 5f7d 01a9 - - 0x00000001182dac24: ;*new {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@75 (line 822) - 0x00000001182dac24: bf3a 03d5 | e03b 00f9 | e203 05aa - - 0x00000001182dac30: ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@80 (line 822) - 0x00000001182dac30: e103 00aa - - 0x00000001182dac34: ; ImmutableOopMap {[96]=Oop [112]=Oop [120]=Oop [104]=Oop } - ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@80 (line 822) - ; {optimized virtual_call} - 0x00000001182dac34: b375 f597 - - 0x00000001182dac38: ;*invokestatic generateLambdaFormInterpreterEntryPoint {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@86 (line 823) - 0x00000001182dac38: e137 40f9 - - 0x00000001182dac3c: ; ImmutableOopMap {[96]=Oop [112]=Oop [104]=Oop } - ;*invokestatic generateLambdaFormInterpreterEntryPoint {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@86 (line 823) - ; {static_call} - 0x00000001182dac3c: 3177 f597 | 82e3 4039 | 5f00 0071 | e43b 40f9 | 4107 0054 | 08fc 43d3 | 8828 00b9 | 8200 00ca - 0x00000001182dac5c: 42fc 55d3 | 5f00 00f1 - - 0x00000001182dac64: ;*putfield vmentry {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@89 (line 823) - 0x00000001182dac64: 4107 0054 | e037 40f9 | 0114 40b9 - - 0x00000001182dac70: ;*getfield form {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodType::form@1 (line 163) - ; - java.lang.invoke.LambdaForm::prepare@93 (line 824) - 0x00000001182dac70: 21f0 7dd3 - - 0x00000001182dac74: ; implicit exception: dispatches to 0x00000001182dad5c - 0x00000001182dac74: 3f00 40f9 | e207 1f32 - - 0x00000001182dac7c: ;*invokevirtual setCachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@99 (line 824) - 0x00000001182dac7c: e303 04aa - - 0x00000001182dac80: ; ImmutableOopMap {[96]=Oop [112]=Oop [104]=Oop } - ;*invokevirtual setCachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@99 (line 824) - ; {optimized virtual_call} - 0x00000001182dac80: a075 f597 - - 0x00000001182dac84: ;*aload_0 {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@103 (line 826) - 0x00000001182dac84: ea03 00aa | e037 40f9 | e133 40f9 - - 0x00000001182dac90: ; implicit exception: dispatches to 0x00000001182dad60 - 0x00000001182dac90: 4229 40b9 - - 0x00000001182dac94: ;*getfield vmentry {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@105 (line 826) - 0x00000001182dac94: 42f0 7dd3 | 80e3 4039 | 1f00 0071 | 2106 0054 | 48fc 43d3 | 2828 00b9 | 2000 02ca | 00fc 55d3 - 0x00000001182dacb4: 1f00 00f1 - - 0x00000001182dacb8: ;*putfield vmentry {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@108 (line 826) - 0x00000001182dacb8: 2106 0054 | fd7b 49a9 | ff83 0291 - - 0x00000001182dacc4: ; {poll_return} - 0x00000001182dacc4: 88a7 41f9 | ff63 28eb | 0806 0054 - - 0x00000001182dacd0: ;*return {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@111 (line 828) - 0x00000001182dacd0: c003 5fd6 | fd7b 49a9 | ff83 0291 - - 0x00000001182dacdc: ; {poll_return} - 0x00000001182dacdc: 88a7 41f9 | ff63 28eb | a805 0054 | c003 5fd6 - - 0x00000001182dacec: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop } - ;*invokevirtual form {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@38 (line 819) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182dacec: 854d f897 - - 0x00000001182dacf0: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop } - ;*invokevirtual cachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182dacf0: 844d f897 - - 0x00000001182dacf4: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } - ;*aaload {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@5 (line 131) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182dacf4: 834d f897 | e807 7fb2 | e903 04aa - - 0x00000001182dad00: ; {runtime_call throw_range_check_failed Runtime1 stub} - 0x00000001182dad00: 1e40 9bd2 | de01 a3f2 | 3e00 c0f2 - - 0x00000001182dad0c: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } - ;*aaload {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@5 (line 131) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - 0x00000001182dad0c: c003 3fd6 - - 0x00000001182dad10: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } - ;*invokevirtual get {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@12 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182dad10: 7c4d f897 | 2af3 ffb4 | ea03 00f9 - - 0x00000001182dad1c: ; {runtime_call g1_pre_barrier_slow} - 0x00000001182dad1c: 7962 f897 | 96ff ff17 | e803 0aaa - - 0x00000001182dad28: ; ImmutableOopMap {[96]=Oop c_rarg0=Oop [104]=Oop c_rarg3=Oop c_rarg4=Oop } - ;*checkcast {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodTypeForm::cachedLambdaForm@15 (line 132) - ; - java.lang.invoke.LambdaForm::prepare@43 (line 819) - ; {runtime_call throw_class_cast_exception Runtime1 stub} - 0x00000001182dad28: 7656 f897 - - 0x00000001182dad2c: ; ImmutableOopMap {[96]=Oop c_rarg5=Oop [104]=Oop [120]=Oop } - ;*new {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@75 (line 822) - ; {runtime_call fast_new_instance Runtime1 stub} - 0x00000001182dad2c: b54f f897 | beff ff17 | 8228 40b9 | 42f0 7dd3 | a2f8 ffb4 | e203 00f9 - - 0x00000001182dad44: ; {runtime_call g1_pre_barrier_slow} - 0x00000001182dad44: 6f62 f897 | c2ff ff17 | e0f8 ffb4 | e403 00f9 - - 0x00000001182dad54: ; {runtime_call g1_post_barrier_slow} - 0x00000001182dad54: 2b63 f897 | c4ff ff17 - - 0x00000001182dad5c: ; ImmutableOopMap {[96]=Oop c_rarg4=Oop [112]=Oop c_rarg0=Oop [104]=Oop c_rarg1=Oop } - ;*invokevirtual setCachedLambdaForm {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.LambdaForm::prepare@99 (line 824) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182dad5c: 694d f897 - - 0x00000001182dad60: ; ImmutableOopMap {r10=Oop c_rarg1=Oop [96]=Oop c_rarg0=Oop [104]=Oop } - ;*getfield vmentry {reexecute=1 rethrow=0 return_oop=0} - ; - (reexecute) java.lang.invoke.LambdaForm::prepare@105 (line 826) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182dad60: 684d f897 | 2028 40b9 | 00f0 7dd3 | c0f9 ffb4 | e003 00f9 - - 0x00000001182dad74: ; {runtime_call g1_pre_barrier_slow} - 0x00000001182dad74: 6362 f897 | cbff ff17 | 02fa ffb4 | e103 00f9 - - 0x00000001182dad84: ; {runtime_call g1_post_barrier_slow} - 0x00000001182dad84: 1f63 f897 | cdff ff17 - - 0x00000001182dad8c: ; {internal_word} - 0x00000001182dad8c: c8f9 ff10 | 88b3 01f9 - - 0x00000001182dad94: ; {runtime_call SafepointBlob} - 0x00000001182dad94: 1b8e f517 - - 0x00000001182dad98: ; {internal_word} - 0x00000001182dad98: 28fa ff10 | 88b3 01f9 - - 0x00000001182dada0: ; {runtime_call SafepointBlob} - 0x00000001182dada0: 188e f517 | 1f20 03d5 | 1f20 03d5 | 80ef 41f9 | 9fef 01f9 | 9ff3 01f9 | fd7b 49a9 | ff83 0291 - 0x00000001182dadc0: ; {runtime_call unwind_exception Runtime1 stub} - 0x00000001182dadc0: 9049 f817 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 - 0x00000001182dade0: 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 | 0000 0000 -[Stub Code] - 0x00000001182dae00: ; {no_reloc} - 0x00000001182dae00: df3f 03d5 - - 0x00000001182dae04: ; {metadata({method} {0x000000b8000dfe98} 'compileToBytecode' '()V' in 'java/lang/invoke/LambdaForm')} - 0x00000001182dae04: 0cd3 9fd2 | ac01 a0f2 | 0c17 c0f2 | 08d7 8ed2 | 6800 a3f2 | 2800 c0f2 | 0001 1fd6 - - 0x00000001182dae20: ; {static_stub} - 0x00000001182dae20: df3f 03d5 - - 0x00000001182dae24: ; {metadata(NULL)} - 0x00000001182dae24: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 - - 0x00000001182dae40: ; {static_stub} - 0x00000001182dae40: df3f 03d5 - - 0x00000001182dae44: ; {metadata(NULL)} - 0x00000001182dae44: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 - - 0x00000001182dae60: ; {static_stub} - 0x00000001182dae60: df3f 03d5 - - 0x00000001182dae64: ; {metadata(NULL)} - 0x00000001182dae64: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 - - 0x00000001182dae80: ; {static_stub} - 0x00000001182dae80: df3f 03d5 - - 0x00000001182dae84: ; {metadata(NULL)} - 0x00000001182dae84: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 -[Exception Handler] - 0x00000001182daea0: ; {runtime_call handle_exception_from_callee Runtime1 stub} - 0x00000001182daea0: 9854 f897 | c1d5 bbd4 | 8533 8d02 | 0100 0000 -[Deopt Handler Code] - 0x00000001182daeb0: 1e00 0010 - - 0x00000001182daeb4: ; {runtime_call DeoptimizationBlob} - 0x00000001182daeb4: a38e f517 -[/MachCode] - - -Compiled method (c1) 2368 971 1 java.lang.invoke.MethodHandle:: (37 bytes) - total in heap [0x00000001182da090,0x00000001182da820] = 1936 - relocation [0x00000001182da1e8,0x00000001182da248] = 96 - main code [0x00000001182da280,0x00000001182da4c0] = 576 - stub code [0x00000001182da4c0,0x00000001182da558] = 152 - metadata [0x00000001182da558,0x00000001182da5b8] = 96 - scopes data [0x00000001182da5b8,0x00000001182da680] = 200 - scopes pcs [0x00000001182da680,0x00000001182da7f0] = 368 - dependencies [0x00000001182da7f0,0x00000001182da808] = 24 - nul chk table [0x00000001182da808,0x00000001182da820] = 24 - -[Constant Pool (empty)] - -[MachCode] -[Entry Point] - # {method} {0x000000b8000c6e08} '' '(Ljava/lang/invoke/MethodType;Ljava/lang/invoke/LambdaForm;)V' in 'java/lang/invoke/MethodHandle' - # this: c_rarg1:c_rarg1 - = 'java/lang/invoke/MethodHandle' - # parm0: c_rarg2:c_rarg2 - = 'java/lang/invoke/MethodType' - # parm1: c_rarg3:c_rarg3 - = 'java/lang/invoke/LambdaForm' - # [sp+0x70] (sp of caller) - 0x00000001182da280: 2808 40b9 | 3f01 086b | c001 0054 - - 0x00000001182da28c: ; {runtime_call ic_miss_stub} - 0x00000001182da28c: 5d77 f517 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 - 0x00000001182da2ac: 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 | 1f20 03d5 -[Verified Entry Point] - 0x00000001182da2c0: 1f20 03d5 | e953 40d1 | 3f01 00f9 | ffc3 01d1 - - 0x00000001182da2d0: ;*aload_0 {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@0 (line 477) - 0x00000001182da2d0: fd7b 06a9 | e10b 03a9 | e323 00f9 | e003 1faa | 5f00 00eb - - 0x00000001182da2e4: ;*ifnonnull {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@1 (line 207) - ; - java.lang.invoke.MethodHandle::@6 (line 478) - 0x00000001182da2e4: 4007 0054 | 80e3 4039 | 1f00 0071 | a109 0054 | 48fc 43d3 | 2810 00b9 | 2000 02ca | 00fc 55d3 - 0x00000001182da304: 1f00 00f1 - - 0x00000001182da308: ;*putfield type {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@12 (line 478) - 0x00000001182da308: a109 0054 | e003 1faa | 7f00 00eb - - 0x00000001182da314: ;*ifnonnull {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@1 (line 207) - ; - java.lang.invoke.MethodHandle::@17 (line 479) - 0x00000001182da314: 0003 0054 - - 0x00000001182da318: ; implicit exception: dispatches to 0x00000001182da44c - 0x00000001182da318: 7f00 40f9 - - 0x00000001182da31c: ;*invokevirtual uncustomize {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@23 (line 479) - 0x00000001182da31c: e103 03aa - - 0x00000001182da320: ; ImmutableOopMap {[48]=Oop [56]=Oop [64]=Oop } - ;*invokevirtual uncustomize {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@23 (line 479) - ; {optimized virtual_call} - 0x00000001182da320: 7888 fd97 | 81e3 4039 | 3f00 0071 | e11b 40f9 | 0109 0054 | 08fc 43d3 | 2814 00b9 | 2200 00ca - 0x00000001182da340: 42fc 55d3 | 5f00 00f1 - - 0x00000001182da348: ;*putfield form {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@26 (line 479) - 0x00000001182da348: 0109 0054 - - 0x00000001182da34c: ; implicit exception: dispatches to 0x00000001182da478 - 0x00000001182da34c: 1f00 40f9 - - 0x00000001182da350: ;*invokevirtual prepare {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@33 (line 481) - 0x00000001182da350: e103 00aa - - 0x00000001182da354: ; ImmutableOopMap {[56]=Oop [64]=Oop [48]=Oop } - ;*invokevirtual prepare {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@33 (line 481) - ; {optimized virtual_call} - 0x00000001182da354: db01 0094 | bf3a 03d5 | fd7b 46a9 | ffc3 0191 - - 0x00000001182da364: ; {poll_return} - 0x00000001182da364: 88a7 41f9 | ff63 28eb | 8808 0054 - - 0x00000001182da370: ;*return {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@36 (line 482) - 0x00000001182da370: c003 5fd6 - - 0x00000001182da374: ; {metadata('java/lang/NullPointerException')} - 0x00000001182da374: 037b 8dd2 | 0301 a0f2 | 0317 c0f2 | 8087 40f9 | 0bc0 0091 | 888f 40f9 | 7f01 08eb | c807 0054 - 0x00000001182da394: 8b87 00f9 | ea03 40b2 | 0a00 00f9 | ea03 032a | 0a7c 0129 | 0a40 0091 | 5f7d 00a9 | 5f7d 01a9 - 0x00000001182da3b4: ;*new {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@4 (line 208) - ; - java.lang.invoke.MethodHandle::@17 (line 479) - 0x00000001182da3b4: bf3a 03d5 - - 0x00000001182da3b8: ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@8 (line 208) - ; - java.lang.invoke.MethodHandle::@17 (line 479) - 0x00000001182da3b8: e103 00aa | e027 00f9 - - 0x00000001182da3c0: ; ImmutableOopMap {[48]=Oop [64]=Oop [56]=Oop [72]=Oop } - ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@8 (line 208) - ; - java.lang.invoke.MethodHandle::@17 (line 479) - ; {optimized virtual_call} - 0x00000001182da3c0: d077 f597 | e027 40f9 - - 0x00000001182da3c8: ;*athrow {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@11 (line 208) - ; - java.lang.invoke.MethodHandle::@17 (line 479) - 0x00000001182da3c8: 3900 0014 - - 0x00000001182da3cc: ; {metadata('java/lang/NullPointerException')} - 0x00000001182da3cc: 037b 8dd2 | 0301 a0f2 | 0317 c0f2 | 8087 40f9 | 0bc0 0091 | 888f 40f9 | 7f01 08eb | 4805 0054 - 0x00000001182da3ec: 8b87 00f9 | ea03 40b2 | 0a00 00f9 | ea03 032a | 0a7c 0129 | 0a40 0091 | 5f7d 00a9 | 5f7d 01a9 - 0x00000001182da40c: ;*new {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@4 (line 208) - ; - java.lang.invoke.MethodHandle::@6 (line 478) - 0x00000001182da40c: bf3a 03d5 - - 0x00000001182da410: ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@8 (line 208) - ; - java.lang.invoke.MethodHandle::@6 (line 478) - 0x00000001182da410: e103 00aa | e02b 00f9 - - 0x00000001182da418: ; ImmutableOopMap {[48]=Oop [80]=Oop [64]=Oop [56]=Oop } - ;*invokespecial {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@8 (line 208) - ; - java.lang.invoke.MethodHandle::@6 (line 478) - ; {optimized virtual_call} - 0x00000001182da418: ba77 f597 | e02b 40f9 | 2300 0014 | 2010 40b9 | 00f0 7dd3 | 40f6 ffb4 | e003 00f9 - - 0x00000001182da434: ; {runtime_call g1_pre_barrier_slow} - 0x00000001182da434: b364 f897 | afff ff17 | 82f6 ffb4 | e103 00f9 - - 0x00000001182da444: ; {runtime_call g1_post_barrier_slow} - 0x00000001182da444: 6f65 f897 | b1ff ff17 - - 0x00000001182da44c: ; ImmutableOopMap {c_rarg3=Oop [64]=Oop [56]=Oop [48]=Oop } - ;*invokevirtual uncustomize {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@23 (line 479) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182da44c: ad4f f897 | 2214 40b9 | 42f0 7dd3 | e2f6 ffb4 | e203 00f9 - - 0x00000001182da460: ; {runtime_call g1_pre_barrier_slow} - 0x00000001182da460: a864 f897 | b4ff ff17 | 20f7 ffb4 | e103 00f9 - - 0x00000001182da470: ; {runtime_call g1_post_barrier_slow} - 0x00000001182da470: 6465 f897 | b6ff ff17 - - 0x00000001182da478: ; ImmutableOopMap {[56]=Oop [64]=Oop c_rarg0=Oop c_rarg1=Oop [48]=Oop } - ;*invokevirtual prepare {reexecute=0 rethrow=0 return_oop=0} - ; - java.lang.invoke.MethodHandle::@33 (line 481) - ; {runtime_call throw_null_pointer_exception Runtime1 stub} - 0x00000001182da478: a24f f897 - - 0x00000001182da47c: ; {internal_word} - 0x00000001182da47c: 48f7 ff10 | 88b3 01f9 - - 0x00000001182da484: ; {runtime_call SafepointBlob} - 0x00000001182da484: 5f90 f517 - - 0x00000001182da488: ; ImmutableOopMap {[48]=Oop [64]=Oop [56]=Oop } - ;*new {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@4 (line 208) - ; - java.lang.invoke.MethodHandle::@17 (line 479) - ; {runtime_call fast_new_instance Runtime1 stub} - 0x00000001182da488: de51 f897 | cbff ff17 - - 0x00000001182da490: ; ImmutableOopMap {[48]=Oop [56]=Oop [64]=Oop } - ;*new {reexecute=0 rethrow=0 return_oop=0} - ; - java.util.Objects::requireNonNull@4 (line 208) - ; - java.lang.invoke.MethodHandle::@6 (line 478) - ; {runtime_call fast_new_instance Runtime1 stub} - 0x00000001182da490: dc51 f897 | dfff ff17 | 1f20 03d5 | 1f20 03d5 | 80ef 41f9 | 9fef 01f9 | 9ff3 01f9 | fd7b 46a9 - 0x00000001182da4b0: ffc3 0191 - - 0x00000001182da4b4: ; {runtime_call unwind_exception Runtime1 stub} - 0x00000001182da4b4: d34b f817 | 0000 0000 | 0000 0000 -[Stub Code] - 0x00000001182da4c0: ; {no_reloc} - 0x00000001182da4c0: df3f 03d5 - - 0x00000001182da4c4: ; {metadata(NULL)} - 0x00000001182da4c4: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 - - 0x00000001182da4e0: ; {static_stub} - 0x00000001182da4e0: df3f 03d5 - - 0x00000001182da4e4: ; {metadata({method} {0x000000b8000dff48} 'prepare' '()V' in 'java/lang/invoke/LambdaForm')} - 0x00000001182da4e4: 0ce9 9fd2 | ac01 a0f2 | 0c17 c0f2 | 08d7 8ed2 | 6800 a3f2 | 2800 c0f2 | 0001 1fd6 - - 0x00000001182da500: ; {static_stub} - 0x00000001182da500: df3f 03d5 - - 0x00000001182da504: ; {metadata(NULL)} - 0x00000001182da504: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 - - 0x00000001182da520: ; {static_stub} - 0x00000001182da520: df3f 03d5 - - 0x00000001182da524: ; {metadata(NULL)} - 0x00000001182da524: 0c00 80d2 | 0c00 a0f2 | 0c00 c0f2 | 0800 80d2 | 0800 a0f2 | 0800 c0f2 | 0001 1fd6 -[Exception Handler] - 0x00000001182da540: ; {runtime_call handle_exception_from_callee Runtime1 stub} - 0x00000001182da540: f056 f897 | c1d5 bbd4 | 8533 8d02 | 0100 0000 -[Deopt Handler Code] - 0x00000001182da550: 1e00 0010 - - 0x00000001182da554: ; {runtime_call DeoptimizationBlob} - 0x00000001182da554: fb90 f517 -[/MachCode] - - ---------------- P R O C E S S --------------- - -Threads class SMR info: -_java_thread_list=0x0000600001c911c0, length=14, elements={ -0x000000011f253e00, 0x0000000120109200, 0x000000012010ba00, 0x000000011e846400, -0x000000012010fa00, 0x000000010a80a400, 0x000000010a80aa00, 0x000000010b01fa00, -0x000000011f254e00, 0x000000010a9b7200, 0x000000012010d600, 0x000000011e00c600, -0x000000010b031e00, 0x000000010b01ec00 -} - -Java Threads: ( => current thread ) -=>0x000000011f253e00 JavaThread "main" [_thread_in_Java, id=5379, stack(0x000000016f000000,0x000000016f203000)] - 0x0000000120109200 JavaThread "Reference Handler" daemon [_thread_blocked, id=19971, stack(0x000000016fe54000,0x0000000170057000)] - 0x000000012010ba00 JavaThread "Finalizer" daemon [_thread_blocked, id=19715, stack(0x0000000170060000,0x0000000170263000)] - 0x000000011e846400 JavaThread "Signal Dispatcher" daemon [_thread_blocked, id=22787, stack(0x0000000170384000,0x0000000170587000)] - 0x000000012010fa00 JavaThread "Service Thread" daemon [_thread_blocked, id=30723, stack(0x0000000170590000,0x0000000170793000)] - 0x000000010a80a400 JavaThread "Monitor Deflation Thread" daemon [_thread_blocked, id=23043, stack(0x000000017079c000,0x000000017099f000)] - 0x000000010a80aa00 JavaThread "C1 CompilerThread0" daemon [_thread_blocked, id=23555, stack(0x00000001709a8000,0x0000000170bab000)] - 0x000000010b01fa00 JavaThread "Sweeper thread" daemon [_thread_blocked, id=29955, stack(0x0000000170bb4000,0x0000000170db7000)] - 0x000000011f254e00 JavaThread "Common-Cleaner" daemon [_thread_blocked, id=29699, stack(0x0000000170dc0000,0x0000000170fc3000)] - 0x000000010a9b7200 JavaThread "Monitor Ctrl-Break" daemon [_thread_in_native, id=24323, stack(0x0000000170fcc000,0x00000001711cf000)] - 0x000000012010d600 JavaThread "JFR Recorder Thread" daemon [_thread_blocked, id=24579, stack(0x00000001711d8000,0x00000001713db000)] - 0x000000011e00c600 JavaThread "JFR Periodic Tasks" daemon [_thread_blocked, id=25091, stack(0x00000001713e4000,0x00000001715e7000)] - 0x000000010b031e00 JavaThread "Async-profiler Timer" daemon [_thread_in_native, id=27139, stack(0x00000001720b8000,0x00000001722bb000)] - 0x000000010b01ec00 JavaThread "Notification Thread" daemon [_thread_blocked, id=26627, stack(0x00000001722c4000,0x00000001724c7000)] - -Other Threads: - 0x000000011df0dd50 VMThread "VM Thread" [stack: 0x000000016fc48000,0x000000016fe4b000] [id=20227] - 0x000000010de729d0 GCTaskThread "GC Thread#0" [stack: 0x000000016f20c000,0x000000016f40f000] [id=12035] - 0x000000010de8dda0 GCTaskThread "GC Thread#1" [stack: 0x00000001715f0000,0x00000001717f3000] [id=29187] - 0x000000010de8e220 GCTaskThread "GC Thread#2" [stack: 0x00000001717fc000,0x00000001719ff000] [id=25859] - 0x00000001012ad4c0 GCTaskThread "GC Thread#3" [stack: 0x0000000171a08000,0x0000000171c0b000] [id=28931] - 0x00000001012add30 GCTaskThread "GC Thread#4" [stack: 0x0000000171c14000,0x0000000171e17000] [id=28419] - 0x00000001012ae5a0 GCTaskThread "GC Thread#5" [stack: 0x0000000171e20000,0x0000000172023000] [id=28163] - 0x000000010de73080 ConcurrentGCThread "G1 Main Marker" [stack: 0x000000016f418000,0x000000016f61b000] [id=13827] - 0x000000010de73910 ConcurrentGCThread "G1 Conc#0" [stack: 0x000000016f624000,0x000000016f827000] [id=12803] - 0x000000010126fef0 ConcurrentGCThread "G1 Refine#0" [stack: 0x000000016f830000,0x000000016fa33000] [id=21507] - 0x0000000101270790 ConcurrentGCThread "G1 Service" [stack: 0x000000016fa3c000,0x000000016fc3f000] [id=16899] - -Threads with active compile tasks: - -VM state: not at safepoint (normal execution) - -VM Mutex/Monitor currently owned by a thread: None - -Heap address: 0x0000000700000000, size: 4096 MB, Compressed Oops mode: Zero based, Oop shift amount: 3 - -CDS archive(s) mapped at: [0x000000b800000000-0x000000b800be4000-0x000000b800be4000), size 12468224, SharedBaseAddress: 0x000000b800000000, ArchiveRelocationMode: 1. -Compressed class space mapped at: 0x000000b801000000-0x000000b841000000, reserved size: 1073741824 -Narrow klass base: 0x000000b800000000, Narrow klass shift: 0, Narrow klass range: 0x100000000 - -GC Precious Log: - CPUs: 10 total, 10 available - Memory: 16384M - Large Page Support: Disabled - NUMA Support: Disabled - Compressed Oops: Enabled (Zero based) - Heap Region Size: 2M - Heap Min Capacity: 8M - Heap Initial Capacity: 256M - Heap Max Capacity: 4G - Pre-touch: Disabled - Parallel Workers: 9 - Concurrent Workers: 2 - Concurrent Refinement Workers: 9 - Periodic GC: Disabled - -Heap: - garbage-first heap total 266240K, used 13372K [0x0000000700000000, 0x0000000800000000) - region size 2048K, 5 young (10240K), 2 survivors (4096K) - Metaspace used 4334K, committed 4480K, reserved 1114112K - class space used 537K, committed 640K, reserved 1048576K - -Heap Regions: E=young(eden), S=young(survivor), O=old, HS=humongous(starts), HC=humongous(continues), CS=collection set, F=free, OA=open archive, CA=closed archive, TAMS=top-at-mark-start (previous, next) -| 0|0x0000000700000000, 0x0000000700200000, 0x0000000700200000|100%| O| |TAMS 0x0000000700000000, 0x0000000700000000| Untracked -| 1|0x0000000700200000, 0x0000000700317000, 0x0000000700400000| 54%| O| |TAMS 0x0000000700200000, 0x0000000700200000| Untracked -| 2|0x0000000700400000, 0x0000000700400000, 0x0000000700600000| 0%| F| |TAMS 0x0000000700400000, 0x0000000700400000| Untracked -| 3|0x0000000700600000, 0x0000000700600000, 0x0000000700800000| 0%| F| |TAMS 0x0000000700600000, 0x0000000700600000| Untracked -| 4|0x0000000700800000, 0x0000000700800000, 0x0000000700a00000| 0%| F| |TAMS 0x0000000700800000, 0x0000000700800000| Untracked -| 5|0x0000000700a00000, 0x0000000700a00000, 0x0000000700c00000| 0%| F| |TAMS 0x0000000700a00000, 0x0000000700a00000| Untracked -| 6|0x0000000700c00000, 0x0000000700c00000, 0x0000000700e00000| 0%| F| |TAMS 0x0000000700c00000, 0x0000000700c00000| Untracked -| 7|0x0000000700e00000, 0x0000000700e00000, 0x0000000701000000| 0%| F| |TAMS 0x0000000700e00000, 0x0000000700e00000| Untracked -| 8|0x0000000701000000, 0x0000000701000000, 0x0000000701200000| 0%| F| |TAMS 0x0000000701000000, 0x0000000701000000| Untracked -| 9|0x0000000701200000, 0x0000000701200000, 0x0000000701400000| 0%| F| |TAMS 0x0000000701200000, 0x0000000701200000| Untracked -| 10|0x0000000701400000, 0x0000000701400000, 0x0000000701600000| 0%| F| |TAMS 0x0000000701400000, 0x0000000701400000| Untracked -| 11|0x0000000701600000, 0x0000000701600000, 0x0000000701800000| 0%| F| |TAMS 0x0000000701600000, 0x0000000701600000| Untracked -| 12|0x0000000701800000, 0x0000000701800000, 0x0000000701a00000| 0%| F| |TAMS 0x0000000701800000, 0x0000000701800000| Untracked -| 13|0x0000000701a00000, 0x0000000701a00000, 0x0000000701c00000| 0%| F| |TAMS 0x0000000701a00000, 0x0000000701a00000| Untracked -| 14|0x0000000701c00000, 0x0000000701c00000, 0x0000000701e00000| 0%| F| |TAMS 0x0000000701c00000, 0x0000000701c00000| Untracked -| 15|0x0000000701e00000, 0x0000000701e00000, 0x0000000702000000| 0%| F| |TAMS 0x0000000701e00000, 0x0000000701e00000| Untracked -| 16|0x0000000702000000, 0x0000000702000000, 0x0000000702200000| 0%| F| |TAMS 0x0000000702000000, 0x0000000702000000| Untracked -| 17|0x0000000702200000, 0x0000000702200000, 0x0000000702400000| 0%| F| |TAMS 0x0000000702200000, 0x0000000702200000| Untracked -| 18|0x0000000702400000, 0x0000000702400000, 0x0000000702600000| 0%| F| |TAMS 0x0000000702400000, 0x0000000702400000| Untracked -| 19|0x0000000702600000, 0x0000000702600000, 0x0000000702800000| 0%| F| |TAMS 0x0000000702600000, 0x0000000702600000| Untracked -| 20|0x0000000702800000, 0x0000000702800000, 0x0000000702a00000| 0%| F| |TAMS 0x0000000702800000, 0x0000000702800000| Untracked -| 21|0x0000000702a00000, 0x0000000702a00000, 0x0000000702c00000| 0%| F| |TAMS 0x0000000702a00000, 0x0000000702a00000| Untracked -| 22|0x0000000702c00000, 0x0000000702c00000, 0x0000000702e00000| 0%| F| |TAMS 0x0000000702c00000, 0x0000000702c00000| Untracked -| 23|0x0000000702e00000, 0x0000000702e00000, 0x0000000703000000| 0%| F| |TAMS 0x0000000702e00000, 0x0000000702e00000| Untracked -| 24|0x0000000703000000, 0x0000000703000000, 0x0000000703200000| 0%| F| |TAMS 0x0000000703000000, 0x0000000703000000| Untracked -| 25|0x0000000703200000, 0x0000000703200000, 0x0000000703400000| 0%| F| |TAMS 0x0000000703200000, 0x0000000703200000| Untracked -| 26|0x0000000703400000, 0x0000000703400000, 0x0000000703600000| 0%| F| |TAMS 0x0000000703400000, 0x0000000703400000| Untracked -| 27|0x0000000703600000, 0x0000000703600000, 0x0000000703800000| 0%| F| |TAMS 0x0000000703600000, 0x0000000703600000| Untracked -| 28|0x0000000703800000, 0x0000000703800000, 0x0000000703a00000| 0%| F| |TAMS 0x0000000703800000, 0x0000000703800000| Untracked -| 29|0x0000000703a00000, 0x0000000703a00000, 0x0000000703c00000| 0%| F| |TAMS 0x0000000703a00000, 0x0000000703a00000| Untracked -| 30|0x0000000703c00000, 0x0000000703c00000, 0x0000000703e00000| 0%| F| |TAMS 0x0000000703c00000, 0x0000000703c00000| Untracked -| 31|0x0000000703e00000, 0x0000000703e00000, 0x0000000704000000| 0%| F| |TAMS 0x0000000703e00000, 0x0000000703e00000| Untracked -| 32|0x0000000704000000, 0x0000000704000000, 0x0000000704200000| 0%| F| |TAMS 0x0000000704000000, 0x0000000704000000| Untracked -| 33|0x0000000704200000, 0x0000000704200000, 0x0000000704400000| 0%| F| |TAMS 0x0000000704200000, 0x0000000704200000| Untracked -| 34|0x0000000704400000, 0x0000000704400000, 0x0000000704600000| 0%| F| |TAMS 0x0000000704400000, 0x0000000704400000| Untracked -| 35|0x0000000704600000, 0x0000000704600000, 0x0000000704800000| 0%| F| |TAMS 0x0000000704600000, 0x0000000704600000| Untracked -| 36|0x0000000704800000, 0x0000000704800000, 0x0000000704a00000| 0%| F| |TAMS 0x0000000704800000, 0x0000000704800000| Untracked -| 37|0x0000000704a00000, 0x0000000704a00000, 0x0000000704c00000| 0%| F| |TAMS 0x0000000704a00000, 0x0000000704a00000| Untracked -| 38|0x0000000704c00000, 0x0000000704c00000, 0x0000000704e00000| 0%| F| |TAMS 0x0000000704c00000, 0x0000000704c00000| Untracked -| 39|0x0000000704e00000, 0x0000000704e00000, 0x0000000705000000| 0%| F| |TAMS 0x0000000704e00000, 0x0000000704e00000| Untracked -| 40|0x0000000705000000, 0x0000000705000000, 0x0000000705200000| 0%| F| |TAMS 0x0000000705000000, 0x0000000705000000| Untracked -| 41|0x0000000705200000, 0x0000000705200000, 0x0000000705400000| 0%| F| |TAMS 0x0000000705200000, 0x0000000705200000| Untracked -| 42|0x0000000705400000, 0x0000000705400000, 0x0000000705600000| 0%| F| |TAMS 0x0000000705400000, 0x0000000705400000| Untracked -| 43|0x0000000705600000, 0x0000000705600000, 0x0000000705800000| 0%| F| |TAMS 0x0000000705600000, 0x0000000705600000| Untracked -| 44|0x0000000705800000, 0x0000000705800000, 0x0000000705a00000| 0%| F| |TAMS 0x0000000705800000, 0x0000000705800000| Untracked -| 45|0x0000000705a00000, 0x0000000705a00000, 0x0000000705c00000| 0%| F| |TAMS 0x0000000705a00000, 0x0000000705a00000| Untracked -| 46|0x0000000705c00000, 0x0000000705c00000, 0x0000000705e00000| 0%| F| |TAMS 0x0000000705c00000, 0x0000000705c00000| Untracked -| 47|0x0000000705e00000, 0x0000000705e00000, 0x0000000706000000| 0%| F| |TAMS 0x0000000705e00000, 0x0000000705e00000| Untracked -| 48|0x0000000706000000, 0x0000000706000000, 0x0000000706200000| 0%| F| |TAMS 0x0000000706000000, 0x0000000706000000| Untracked -| 49|0x0000000706200000, 0x0000000706200000, 0x0000000706400000| 0%| F| |TAMS 0x0000000706200000, 0x0000000706200000| Untracked -| 50|0x0000000706400000, 0x0000000706400000, 0x0000000706600000| 0%| F| |TAMS 0x0000000706400000, 0x0000000706400000| Untracked -| 51|0x0000000706600000, 0x0000000706600000, 0x0000000706800000| 0%| F| |TAMS 0x0000000706600000, 0x0000000706600000| Untracked -| 52|0x0000000706800000, 0x0000000706800000, 0x0000000706a00000| 0%| F| |TAMS 0x0000000706800000, 0x0000000706800000| Untracked -| 53|0x0000000706a00000, 0x0000000706a00000, 0x0000000706c00000| 0%| F| |TAMS 0x0000000706a00000, 0x0000000706a00000| Untracked -| 54|0x0000000706c00000, 0x0000000706c00000, 0x0000000706e00000| 0%| F| |TAMS 0x0000000706c00000, 0x0000000706c00000| Untracked -| 55|0x0000000706e00000, 0x0000000706e00000, 0x0000000707000000| 0%| F| |TAMS 0x0000000706e00000, 0x0000000706e00000| Untracked -| 56|0x0000000707000000, 0x0000000707000000, 0x0000000707200000| 0%| F| |TAMS 0x0000000707000000, 0x0000000707000000| Untracked -| 57|0x0000000707200000, 0x0000000707200000, 0x0000000707400000| 0%| F| |TAMS 0x0000000707200000, 0x0000000707200000| Untracked -| 58|0x0000000707400000, 0x0000000707400000, 0x0000000707600000| 0%| F| |TAMS 0x0000000707400000, 0x0000000707400000| Untracked -| 59|0x0000000707600000, 0x0000000707600000, 0x0000000707800000| 0%| F| |TAMS 0x0000000707600000, 0x0000000707600000| Untracked -| 60|0x0000000707800000, 0x0000000707800000, 0x0000000707a00000| 0%| F| |TAMS 0x0000000707800000, 0x0000000707800000| Untracked -| 61|0x0000000707a00000, 0x0000000707a00000, 0x0000000707c00000| 0%| F| |TAMS 0x0000000707a00000, 0x0000000707a00000| Untracked -| 62|0x0000000707c00000, 0x0000000707c00000, 0x0000000707e00000| 0%| F| |TAMS 0x0000000707c00000, 0x0000000707c00000| Untracked -| 63|0x0000000707e00000, 0x0000000707e00000, 0x0000000708000000| 0%| F| |TAMS 0x0000000707e00000, 0x0000000707e00000| Untracked -| 64|0x0000000708000000, 0x0000000708000000, 0x0000000708200000| 0%| F| |TAMS 0x0000000708000000, 0x0000000708000000| Untracked -| 65|0x0000000708200000, 0x0000000708200000, 0x0000000708400000| 0%| F| |TAMS 0x0000000708200000, 0x0000000708200000| Untracked -| 66|0x0000000708400000, 0x0000000708400000, 0x0000000708600000| 0%| F| |TAMS 0x0000000708400000, 0x0000000708400000| Untracked -| 67|0x0000000708600000, 0x0000000708600000, 0x0000000708800000| 0%| F| |TAMS 0x0000000708600000, 0x0000000708600000| Untracked -| 68|0x0000000708800000, 0x0000000708800000, 0x0000000708a00000| 0%| F| |TAMS 0x0000000708800000, 0x0000000708800000| Untracked -| 69|0x0000000708a00000, 0x0000000708a00000, 0x0000000708c00000| 0%| F| |TAMS 0x0000000708a00000, 0x0000000708a00000| Untracked -| 70|0x0000000708c00000, 0x0000000708c00000, 0x0000000708e00000| 0%| F| |TAMS 0x0000000708c00000, 0x0000000708c00000| Untracked -| 71|0x0000000708e00000, 0x0000000708e00000, 0x0000000709000000| 0%| F| |TAMS 0x0000000708e00000, 0x0000000708e00000| Untracked -| 72|0x0000000709000000, 0x0000000709000000, 0x0000000709200000| 0%| F| |TAMS 0x0000000709000000, 0x0000000709000000| Untracked -| 73|0x0000000709200000, 0x0000000709200000, 0x0000000709400000| 0%| F| |TAMS 0x0000000709200000, 0x0000000709200000| Untracked -| 74|0x0000000709400000, 0x0000000709400000, 0x0000000709600000| 0%| F| |TAMS 0x0000000709400000, 0x0000000709400000| Untracked -| 75|0x0000000709600000, 0x0000000709600000, 0x0000000709800000| 0%| F| |TAMS 0x0000000709600000, 0x0000000709600000| Untracked -| 76|0x0000000709800000, 0x0000000709800000, 0x0000000709a00000| 0%| F| |TAMS 0x0000000709800000, 0x0000000709800000| Untracked -| 77|0x0000000709a00000, 0x0000000709a00000, 0x0000000709c00000| 0%| F| |TAMS 0x0000000709a00000, 0x0000000709a00000| Untracked -| 78|0x0000000709c00000, 0x0000000709c00000, 0x0000000709e00000| 0%| F| |TAMS 0x0000000709c00000, 0x0000000709c00000| Untracked -| 79|0x0000000709e00000, 0x0000000709e00000, 0x000000070a000000| 0%| F| |TAMS 0x0000000709e00000, 0x0000000709e00000| Untracked -| 80|0x000000070a000000, 0x000000070a000000, 0x000000070a200000| 0%| F| |TAMS 0x000000070a000000, 0x000000070a000000| Untracked -| 81|0x000000070a200000, 0x000000070a200000, 0x000000070a400000| 0%| F| |TAMS 0x000000070a200000, 0x000000070a200000| Untracked -| 82|0x000000070a400000, 0x000000070a400000, 0x000000070a600000| 0%| F| |TAMS 0x000000070a400000, 0x000000070a400000| Untracked -| 83|0x000000070a600000, 0x000000070a600000, 0x000000070a800000| 0%| F| |TAMS 0x000000070a600000, 0x000000070a600000| Untracked -| 84|0x000000070a800000, 0x000000070a800000, 0x000000070aa00000| 0%| F| |TAMS 0x000000070a800000, 0x000000070a800000| Untracked -| 85|0x000000070aa00000, 0x000000070aa00000, 0x000000070ac00000| 0%| F| |TAMS 0x000000070aa00000, 0x000000070aa00000| Untracked -| 86|0x000000070ac00000, 0x000000070ac00000, 0x000000070ae00000| 0%| F| |TAMS 0x000000070ac00000, 0x000000070ac00000| Untracked -| 87|0x000000070ae00000, 0x000000070ae00000, 0x000000070b000000| 0%| F| |TAMS 0x000000070ae00000, 0x000000070ae00000| Untracked -| 88|0x000000070b000000, 0x000000070b000000, 0x000000070b200000| 0%| F| |TAMS 0x000000070b000000, 0x000000070b000000| Untracked -| 89|0x000000070b200000, 0x000000070b200000, 0x000000070b400000| 0%| F| |TAMS 0x000000070b200000, 0x000000070b200000| Untracked -| 90|0x000000070b400000, 0x000000070b400000, 0x000000070b600000| 0%| F| |TAMS 0x000000070b400000, 0x000000070b400000| Untracked -| 91|0x000000070b600000, 0x000000070b600000, 0x000000070b800000| 0%| F| |TAMS 0x000000070b600000, 0x000000070b600000| Untracked -| 92|0x000000070b800000, 0x000000070b800000, 0x000000070ba00000| 0%| F| |TAMS 0x000000070b800000, 0x000000070b800000| Untracked -| 93|0x000000070ba00000, 0x000000070ba00000, 0x000000070bc00000| 0%| F| |TAMS 0x000000070ba00000, 0x000000070ba00000| Untracked -| 94|0x000000070bc00000, 0x000000070bc00000, 0x000000070be00000| 0%| F| |TAMS 0x000000070bc00000, 0x000000070bc00000| Untracked -| 95|0x000000070be00000, 0x000000070be00000, 0x000000070c000000| 0%| F| |TAMS 0x000000070be00000, 0x000000070be00000| Untracked -| 96|0x000000070c000000, 0x000000070c000000, 0x000000070c200000| 0%| F| |TAMS 0x000000070c000000, 0x000000070c000000| Untracked -| 97|0x000000070c200000, 0x000000070c200000, 0x000000070c400000| 0%| F| |TAMS 0x000000070c200000, 0x000000070c200000| Untracked -| 98|0x000000070c400000, 0x000000070c400000, 0x000000070c600000| 0%| F| |TAMS 0x000000070c400000, 0x000000070c400000| Untracked -| 99|0x000000070c600000, 0x000000070c600000, 0x000000070c800000| 0%| F| |TAMS 0x000000070c600000, 0x000000070c600000| Untracked -| 100|0x000000070c800000, 0x000000070c800000, 0x000000070ca00000| 0%| F| |TAMS 0x000000070c800000, 0x000000070c800000| Untracked -| 101|0x000000070ca00000, 0x000000070ca00000, 0x000000070cc00000| 0%| F| |TAMS 0x000000070ca00000, 0x000000070ca00000| Untracked -| 102|0x000000070cc00000, 0x000000070cc00000, 0x000000070ce00000| 0%| F| |TAMS 0x000000070cc00000, 0x000000070cc00000| Untracked -| 103|0x000000070ce00000, 0x000000070ce00000, 0x000000070d000000| 0%| F| |TAMS 0x000000070ce00000, 0x000000070ce00000| Untracked -| 104|0x000000070d000000, 0x000000070d000000, 0x000000070d200000| 0%| F| |TAMS 0x000000070d000000, 0x000000070d000000| Untracked -| 105|0x000000070d200000, 0x000000070d200000, 0x000000070d400000| 0%| F| |TAMS 0x000000070d200000, 0x000000070d200000| Untracked -| 106|0x000000070d400000, 0x000000070d400000, 0x000000070d600000| 0%| F| |TAMS 0x000000070d400000, 0x000000070d400000| Untracked -| 107|0x000000070d600000, 0x000000070d600000, 0x000000070d800000| 0%| F| |TAMS 0x000000070d600000, 0x000000070d600000| Untracked -| 108|0x000000070d800000, 0x000000070d800000, 0x000000070da00000| 0%| F| |TAMS 0x000000070d800000, 0x000000070d800000| Untracked -| 109|0x000000070da00000, 0x000000070da00000, 0x000000070dc00000| 0%| F| |TAMS 0x000000070da00000, 0x000000070da00000| Untracked -| 110|0x000000070dc00000, 0x000000070dc00000, 0x000000070de00000| 0%| F| |TAMS 0x000000070dc00000, 0x000000070dc00000| Untracked -| 111|0x000000070de00000, 0x000000070de00000, 0x000000070e000000| 0%| F| |TAMS 0x000000070de00000, 0x000000070de00000| Untracked -| 112|0x000000070e000000, 0x000000070e000000, 0x000000070e200000| 0%| F| |TAMS 0x000000070e000000, 0x000000070e000000| Untracked -| 113|0x000000070e200000, 0x000000070e200000, 0x000000070e400000| 0%| F| |TAMS 0x000000070e200000, 0x000000070e200000| Untracked -| 114|0x000000070e400000, 0x000000070e400000, 0x000000070e600000| 0%| F| |TAMS 0x000000070e400000, 0x000000070e400000| Untracked -| 115|0x000000070e600000, 0x000000070e800000, 0x000000070e800000|100%| S|CS|TAMS 0x000000070e600000, 0x000000070e600000| Complete -| 116|0x000000070e800000, 0x000000070ea00000, 0x000000070ea00000|100%| S|CS|TAMS 0x000000070e800000, 0x000000070e800000| Complete -| 117|0x000000070ea00000, 0x000000070ea00000, 0x000000070ec00000| 0%| F| |TAMS 0x000000070ea00000, 0x000000070ea00000| Untracked -| 118|0x000000070ec00000, 0x000000070ec00000, 0x000000070ee00000| 0%| F| |TAMS 0x000000070ec00000, 0x000000070ec00000| Untracked -| 119|0x000000070ee00000, 0x000000070ee00000, 0x000000070f000000| 0%| F| |TAMS 0x000000070ee00000, 0x000000070ee00000| Untracked -| 120|0x000000070f000000, 0x000000070f000000, 0x000000070f200000| 0%| F| |TAMS 0x000000070f000000, 0x000000070f000000| Untracked -| 121|0x000000070f200000, 0x000000070f200000, 0x000000070f400000| 0%| F| |TAMS 0x000000070f200000, 0x000000070f200000| Untracked -| 122|0x000000070f400000, 0x000000070f400000, 0x000000070f600000| 0%| F| |TAMS 0x000000070f400000, 0x000000070f400000| Untracked -| 123|0x000000070f600000, 0x000000070f600000, 0x000000070f800000| 0%| F| |TAMS 0x000000070f600000, 0x000000070f600000| Untracked -| 124|0x000000070f800000, 0x000000070f800000, 0x000000070fa00000| 0%| F| |TAMS 0x000000070f800000, 0x000000070f800000| Untracked -| 125|0x000000070fa00000, 0x000000070fac2d98, 0x000000070fc00000| 38%| E| |TAMS 0x000000070fa00000, 0x000000070fa00000| Complete -| 126|0x000000070fc00000, 0x000000070fe00000, 0x000000070fe00000|100%| E|CS|TAMS 0x000000070fc00000, 0x000000070fc00000| Complete -| 127|0x000000070fe00000, 0x0000000710000000, 0x0000000710000000|100%| E|CS|TAMS 0x000000070fe00000, 0x000000070fe00000| Complete -|2046|0x00000007ffc00000, 0x00000007ffd78000, 0x00000007ffe00000| 73%|OA| |TAMS 0x00000007ffc00000, 0x00000007ffc00000| Untracked -|2047|0x00000007ffe00000, 0x00000007ffe80000, 0x0000000800000000| 25%|CA| |TAMS 0x00000007ffe00000, 0x00000007ffe00000| Untracked - -Card table byte_map: [0x000000010c000000,0x000000010c800000] _byte_map_base: 0x0000000108800000 - -Marking Bits (Prev, Next): (CMBitMap*) 0x0000000120011610, (CMBitMap*) 0x0000000120011650 - Prev Bits: [0x0000000120800000, 0x0000000124800000) - Next Bits: [0x0000000148000000, 0x000000014c000000) - -Polling page: 0x0000000100ee4000 - -Metaspace: - -Usage: - Non-class: 3.71 MB used. - Class: 537.78 KB used. - Both: 4.23 MB used. - -Virtual space: - Non-class space: 64.00 MB reserved, 3.75 MB ( 6%) committed, 1 nodes. - Class space: 1.00 GB reserved, 640.00 KB ( <1%) committed, 1 nodes. - Both: 1.06 GB reserved, 4.38 MB ( <1%) committed. - -Chunk freelists: - Non-Class: 11.88 MB - Class: 15.24 MB - Both: 27.12 MB - -MaxMetaspaceSize: unlimited -CompressedClassSpaceSize: 1.00 GB -Initial GC threshold: 21.00 MB -Current GC threshold: 21.00 MB -CDS: on -MetaspaceReclaimPolicy: balanced - - commit_granule_bytes: 65536. - - commit_granule_words: 8192. - - virtual_space_node_default_size: 8388608. - - enlarge_chunks_in_place: 1. - - new_chunks_are_fully_committed: 0. - - uncommit_free_chunks: 1. - - use_allocation_guard: 0. - - handle_deallocations: 1. - - -Internal statistics: - -num_allocs_failed_limit: 0. -num_arena_births: 98. -num_arena_deaths: 0. -num_vsnodes_births: 2. -num_vsnodes_deaths: 0. -num_space_committed: 70. -num_space_uncommitted: 0. -num_chunks_returned_to_freelist: 0. -num_chunks_taken_from_freelist: 121. -num_chunk_merges: 0. -num_chunk_splits: 70. -num_chunks_enlarged: 34. -num_inconsistent_stats: 0. - -CodeCache: size=49152Kb used=3383Kb max_used=3383Kb free=45768Kb - bounds [0x0000000118000000, 0x0000000118350000, 0x000000011b000000] - total_blobs=1683 nmethods=1242 adapters=372 - compilation: enabled - stopped_count=0, restarted_count=0 - full_count=0 - -Compilation events (20 events): -Event: 2.355 Thread 0x000000010a80aa00 nmethod 1230 0x0000000118346b90 code [0x0000000118346d00, 0x0000000118346d98] -Event: 2.355 Thread 0x000000010a80aa00 1232 1 java.lang.reflect.Method::getRoot (5 bytes) -Event: 2.355 Thread 0x000000010a80aa00 nmethod 1232 0x0000000118346e90 code [0x0000000118347000, 0x00000001183470d8] -Event: 2.355 Thread 0x000000010a80aa00 1233 1 com.sun.jmx.mbeanserver.MXBeanMapping::getOpenType (5 bytes) -Event: 2.355 Thread 0x000000010a80aa00 nmethod 1233 0x0000000118347190 code [0x0000000118347300, 0x0000000118347398] -Event: 2.355 Thread 0x000000010a80aa00 1234 1 java.util.TreeMap::addEntryToEmptyMap (37 bytes) -Event: 2.355 Thread 0x000000010a80aa00 nmethod 1234 0x0000000118347490 code [0x0000000118347640, 0x0000000118347958] -Event: 2.355 Thread 0x000000010a80aa00 1237 1 java.util.TreeMap::getEntry (77 bytes) -Event: 2.356 Thread 0x000000010a80aa00 nmethod 1237 0x0000000118347c10 code [0x0000000118347e00, 0x00000001183480b8] -Event: 2.356 Thread 0x000000010a80aa00 1235 1 java.util.TreeMap::compare (32 bytes) -Event: 2.356 Thread 0x000000010a80aa00 nmethod 1235 0x0000000118348410 code [0x00000001183485c0, 0x0000000118348798] -Event: 2.356 Thread 0x000000010a80aa00 1236 1 java.util.TreeMap::containsKey (14 bytes) -Event: 2.356 Thread 0x000000010a80aa00 nmethod 1236 0x0000000118348910 code [0x0000000118348ac0, 0x0000000118348bb8] -Event: 2.356 Thread 0x000000010a80aa00 1239 1 jdk.internal.org.objectweb.asm.ClassReader:: (371 bytes) -Event: 2.356 Thread 0x000000010a80aa00 nmethod 1239 0x0000000118349290 code [0x0000000118349500, 0x000000011834a118] -Event: 2.356 Thread 0x000000010a80aa00 1242 1 java.lang.invoke.TypeConvertingMethodAdapter::descriptorToName (36 bytes) -Event: 2.357 Thread 0x000000010a80aa00 nmethod 1242 0x000000011834ae10 code [0x000000011834b000, 0x000000011834b338] -Event: 2.357 Thread 0x000000010a80aa00 1241 1 java.lang.invoke.MethodHandles$Lookup::hasFullPrivilegeAccess (18 bytes) -Event: 2.357 Thread 0x000000010a80aa00 nmethod 1241 0x000000011834b990 code [0x000000011834bb00, 0x000000011834bbd8] -Event: 2.357 Thread 0x000000010a80aa00 1240 1 sun.invoke.util.VerifyAccess::isMemberAccessible (338 bytes) - -GC Heap History (2 events): -Event: 2.318 GC heap before -{Heap before GC invocations=0 (full 0): - garbage-first heap total 266240K, used 22496K [0x0000000700000000, 0x0000000800000000) - region size 2048K, 11 young (22528K), 0 survivors (0K) - Metaspace used 2993K, committed 3200K, reserved 1114112K - class space used 366K, committed 448K, reserved 1048576K -} -Event: 2.319 GC heap after -{Heap after GC invocations=1 (full 0): - garbage-first heap total 266240K, used 9276K [0x0000000700000000, 0x0000000800000000) - region size 2048K, 2 young (4096K), 2 survivors (4096K) - Metaspace used 2993K, committed 3200K, reserved 1114112K - class space used 366K, committed 448K, reserved 1048576K -} - -Deoptimization events (6 events): -Event: 2.273 Thread 0x000000011f253e00 DEOPT PACKING pc=0x000000011823a518 sp=0x000000016f200970 -Event: 2.273 Thread 0x000000011f253e00 DEOPT UNPACKING pc=0x000000011803eb7c sp=0x000000016f200660 mode 3 -Event: 2.278 Thread 0x000000011f253e00 DEOPT PACKING pc=0x00000001181ffb8c sp=0x000000016f201a20 -Event: 2.278 Thread 0x000000011f253e00 DEOPT UNPACKING pc=0x000000011803eb7c sp=0x000000016f201790 mode 3 -Event: 2.304 Thread 0x000000011f253e00 DEOPT PACKING pc=0x00000001182b3f74 sp=0x000000016f2003c0 -Event: 2.304 Thread 0x000000011f253e00 DEOPT UNPACKING pc=0x000000011803eb7c sp=0x000000016f200080 mode 3 - -Classes unloaded (0 events): -No events - -Classes redefined (20 events): -Event: 2.310 Thread 0x000000011df0dd50 redefined class name=sun.nio.ch.SocketChannelImpl, count=1 -Event: 2.310 Thread 0x000000011df0dd50 redefined class name=java.lang.Throwable, count=1 -Event: 2.310 Thread 0x000000011df0dd50 redefined class name=java.lang.Error, count=2 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.internal.event.ProcessStartEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerIOUsageEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerMemoryUsageEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerCPUThrottlingEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerCPUUsageEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ContainerConfigurationEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.InitialSecurityPropertyEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.DirectBufferStatisticsEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ActiveRecordingEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ActiveSettingEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ErrorThrownEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.ExceptionStatisticsEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.SocketWriteEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.SocketReadEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.FileWriteEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.FileReadEvent, count=1 -Event: 2.330 Thread 0x000000011df0dd50 redefined class name=jdk.jfr.events.FileForceEvent, count=1 - -Internal exceptions (20 events): -Event: 2.277 Thread 0x000000011f253e00 Exception (0x000000070f398900) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.278 Thread 0x000000011f253e00 Exception (0x000000070f3a88f8) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.278 Thread 0x000000011f253e00 Exception (0x000000070f3b5840) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.279 Thread 0x000000011f253e00 Exception (0x000000070f3c3178) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.279 Thread 0x000000011f253e00 Exception (0x000000070f3eade8) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.280 Thread 0x000000011f253e00 Exception (0x000000070f005d18) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.281 Thread 0x000000011f253e00 Exception (0x000000070f017e98) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.281 Thread 0x000000011f253e00 Exception (0x000000070f028098) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.281 Thread 0x000000011f253e00 Exception (0x000000070f0339f0) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.282 Thread 0x000000011f253e00 Exception (0x000000070f04a470) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.282 Thread 0x000000011f253e00 Exception (0x000000070f059f78) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.283 Thread 0x000000011f253e00 Exception (0x000000070f0678d8) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.283 Thread 0x000000011f253e00 Exception (0x000000070f075960) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.283 Thread 0x000000011f253e00 Exception (0x000000070f082068) -thrown [open/src/hotspot/share/classfile/systemDictionary.cpp, line 256] -Event: 2.312 Thread 0x000000011f253e00 Exception (0x000000070ea80898) -thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] -Event: 2.312 Thread 0x000000011f253e00 Exception (0x000000070ea869e8) -thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] -Event: 2.316 Thread 0x000000011f253e00 Exception (0x000000070eab6a98) -thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] -Event: 2.345 Thread 0x000000011f253e00 Exception (0x000000070fd532f8) -thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] -Event: 2.345 Thread 0x000000011f253e00 Exception (0x000000070fd567e0) -thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 826] -Event: 2.356 Thread 0x000000011f253e00 Exception (0x000000070fdf7678) -thrown [open/src/hotspot/share/interpreter/linkResolver.cpp, line 759] - -VM Operations (20 events): -Event: 2.267 Executing VM operation: ICBufferFull -Event: 2.267 Executing VM operation: ICBufferFull done -Event: 2.309 Executing VM operation: ICBufferFull -Event: 2.309 Executing VM operation: ICBufferFull done -Event: 2.310 Executing VM operation: RedefineClasses -Event: 2.311 Executing VM operation: RedefineClasses done -Event: 2.315 Executing VM operation: HandshakeAllThreads -Event: 2.315 Executing VM operation: HandshakeAllThreads done -Event: 2.318 Executing VM operation: G1CollectForAllocation -Event: 2.319 Executing VM operation: G1CollectForAllocation done -Event: 2.324 Executing VM operation: JFRCheckpoint -Event: 2.324 Executing VM operation: JFRCheckpoint done -Event: 2.325 Executing VM operation: JFROldObject -Event: 2.325 Executing VM operation: JFROldObject done -Event: 2.330 Executing VM operation: RedefineClasses -Event: 2.331 Executing VM operation: RedefineClasses done -Event: 2.333 Executing VM operation: ClassLoaderStatsOperation -Event: 2.333 Executing VM operation: ClassLoaderStatsOperation done -Event: 2.346 Executing VM operation: HandshakeAllThreads -Event: 2.346 Executing VM operation: HandshakeAllThreads done - -Events (20 events): -Event: 2.355 loading class sun/management/MemoryImpl -Event: 2.356 loading class java/lang/management/MemoryMXBean -Event: 2.356 loading class java/lang/management/MemoryMXBean done -Event: 2.356 loading class sun/management/MemoryImpl done -Event: 2.356 loading class java/lang/management/MemoryManagerMXBean -Event: 2.356 loading class java/lang/management/MemoryManagerMXBean done -Event: 2.356 loading class sun/management/MemoryManagerImpl -Event: 2.356 loading class sun/management/MemoryManagerImpl done -Event: 2.356 loading class com/sun/management/internal/GarbageCollectorExtImpl -Event: 2.356 loading class com/sun/management/GarbageCollectorMXBean -Event: 2.356 loading class java/lang/management/GarbageCollectorMXBean -Event: 2.356 loading class java/lang/management/GarbageCollectorMXBean done -Event: 2.356 loading class com/sun/management/GarbageCollectorMXBean done -Event: 2.356 loading class sun/management/GarbageCollectorImpl -Event: 2.356 loading class sun/management/GarbageCollectorImpl done -Event: 2.356 loading class com/sun/management/internal/GarbageCollectorExtImpl done -Event: 2.356 loading class sun/management/Util -Event: 2.356 loading class sun/management/Util done -Event: 2.356 loading class java/lang/management/ManagementPermission -Event: 2.356 loading class java/lang/management/ManagementPermission done - - -Dynamic libraries: -0x0000000100f44000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libjli.dylib -0x00000001a2b50000 /System/Library/Frameworks/Cocoa.framework/Versions/A/Cocoa -0x000000018e974000 /System/Library/Frameworks/AppKit.framework/Versions/C/AppKit -0x000000019131c000 /System/Library/Frameworks/CoreData.framework/Versions/A/CoreData -0x000000018c5d5000 /System/Library/Frameworks/Foundation.framework/Versions/C/Foundation -0x0000000196d00000 /usr/lib/libSystem.B.dylib -0x000000018f880000 /System/Library/PrivateFrameworks/UIFoundation.framework/Versions/A/UIFoundation -0x00000001f7e05000 /System/Library/PrivateFrameworks/CollectionViewCore.framework/Versions/A/CollectionViewCore -0x000000019cfbc000 /System/Library/PrivateFrameworks/RemoteViewServices.framework/Versions/A/RemoteViewServices -0x0000000195122000 /System/Library/PrivateFrameworks/XCTTargetBootstrap.framework/Versions/A/XCTTargetBootstrap -0x0000000198a96000 /System/Library/PrivateFrameworks/InternationalSupport.framework/Versions/A/InternationalSupport -0x0000000198b1d000 /System/Library/PrivateFrameworks/UserActivity.framework/Versions/A/UserActivity -0x000000020f01e000 /System/Library/PrivateFrameworks/WindowManagement.framework/Versions/A/WindowManagement -0x000000018c29e000 /System/Library/Frameworks/SystemConfiguration.framework/Versions/A/SystemConfiguration -0x0000000197f9a000 /usr/lib/libspindump.dylib -0x000000018fa26000 /System/Library/Frameworks/UniformTypeIdentifiers.framework/Versions/A/UniformTypeIdentifiers -0x0000000193435000 /usr/lib/libapp_launch_measurement.dylib -0x00000001928e3000 /System/Library/PrivateFrameworks/CoreAnalytics.framework/Versions/A/CoreAnalytics -0x000000019343c000 /System/Library/PrivateFrameworks/CoreAutoLayout.framework/Versions/A/CoreAutoLayout -0x0000000194930000 /System/Library/Frameworks/Metal.framework/Versions/A/Metal -0x0000000195881000 /usr/lib/liblangid.dylib -0x0000000195128000 /System/Library/PrivateFrameworks/CoreSVG.framework/Versions/A/CoreSVG -0x000000019034e000 /System/Library/PrivateFrameworks/SkyLight.framework/Versions/A/SkyLight -0x0000000190766000 /System/Library/Frameworks/CoreGraphics.framework/Versions/A/CoreGraphics -0x000000019d687000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Accelerate -0x0000000197a08000 /System/Library/PrivateFrameworks/IconServices.framework/Versions/A/IconServices -0x0000000194910000 /System/Library/Frameworks/IOSurface.framework/Versions/A/IOSurface -0x0000000192911000 /usr/lib/libDiagnosticMessagesClient.dylib -0x0000000196c46000 /usr/lib/libz.1.dylib -0x00000001a0923000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/ApplicationServices -0x000000019510a000 /System/Library/PrivateFrameworks/DFRFoundation.framework/Versions/A/DFRFoundation -0x000000018e1f2000 /usr/lib/libicucore.A.dylib -0x0000000199a27000 /System/Library/Frameworks/AudioToolbox.framework/Versions/A/AudioToolbox -0x0000000198aa1000 /System/Library/PrivateFrameworks/DataDetectorsCore.framework/Versions/A/DataDetectorsCore -0x00000001afc2f000 /System/Library/PrivateFrameworks/TextInput.framework/Versions/A/TextInput -0x00000001902b3000 /usr/lib/libMobileGestalt.dylib -0x0000000194dd6000 /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/HIToolbox.framework/Versions/A/HIToolbox -0x0000000192dbc000 /System/Library/Frameworks/QuartzCore.framework/Versions/A/QuartzCore -0x000000018de4d000 /System/Library/Frameworks/Security.framework/Versions/A/Security -0x000000019cffc000 /System/Library/Frameworks/Carbon.framework/Versions/A/Frameworks/SpeechRecognition.framework/Versions/A/SpeechRecognition -0x0000000193174000 /System/Library/PrivateFrameworks/CoreUI.framework/Versions/A/CoreUI -0x000000018d745000 /System/Library/Frameworks/CoreAudio.framework/Versions/A/CoreAudio -0x00000001929ed000 /System/Library/Frameworks/DiskArbitration.framework/Versions/A/DiskArbitration -0x00000001983ce000 /System/Library/PrivateFrameworks/MultitouchSupport.framework/Versions/A/MultitouchSupport -0x00000001902b1000 /usr/lib/libenergytrace.dylib -0x000000018e837000 /System/Library/Frameworks/IOKit.framework/Versions/A/IOKit -0x000000019d3e3000 /System/Library/Frameworks/CoreServices.framework/Versions/A/CoreServices -0x00000001933c2000 /System/Library/PrivateFrameworks/PerformanceAnalysis.framework/Versions/A/PerformanceAnalysis -0x00000001dab8f000 /System/Library/Frameworks/OpenGL.framework/Versions/A/OpenGL -0x0000000193486000 /usr/lib/libxml2.2.dylib -0x0000000196255000 /System/Library/PrivateFrameworks/MobileKeyBag.framework/Versions/A/MobileKeyBag -0x000000018b2d4000 /usr/lib/libobjc.A.dylib -0x000000018b58a000 /usr/lib/libc++.1.dylib -0x0000000190db1000 /System/Library/Frameworks/ColorSync.framework/Versions/A/ColorSync -0x000000018b6a8000 /System/Library/Frameworks/CoreFoundation.framework/Versions/A/CoreFoundation -0x00000001954a2000 /System/Library/Frameworks/CoreImage.framework/Versions/A/CoreImage -0x000000018d566000 /System/Library/Frameworks/CoreText.framework/Versions/A/CoreText -0x0000000195161000 /System/Library/Frameworks/ImageIO.framework/Versions/A/ImageIO -0x0000000196d06000 /System/Library/PrivateFrameworks/SoftLinking.framework/Versions/A/SoftLinking -0x0000000196f9a000 /usr/lib/libcompression.dylib -0x00000001989f2000 /System/Library/PrivateFrameworks/TextureIO.framework/Versions/A/TextureIO -0x00000001976da000 /usr/lib/libate.dylib -0x0000000196cfa000 /usr/lib/system/libcache.dylib -0x0000000196cb3000 /usr/lib/system/libcommonCrypto.dylib -0x0000000196ce1000 /usr/lib/system/libcompiler_rt.dylib -0x0000000196cd7000 /usr/lib/system/libcopyfile.dylib -0x000000018b408000 /usr/lib/system/libcorecrypto.dylib -0x000000018b4be000 /usr/lib/system/libdispatch.dylib -0x000000018b650000 /usr/lib/system/libdyld.dylib -0x0000000196cf0000 /usr/lib/system/libkeymgr.dylib -0x0000000196c91000 /usr/lib/system/libmacho.dylib -0x000000019634f000 /usr/lib/system/libquarantine.dylib -0x0000000196ced000 /usr/lib/system/libremovefile.dylib -0x0000000190318000 /usr/lib/system/libsystem_asl.dylib -0x000000018b3a5000 /usr/lib/system/libsystem_blocks.dylib -0x000000018b509000 /usr/lib/system/libsystem_c.dylib -0x0000000196ce5000 /usr/lib/system/libsystem_collections.dylib -0x000000019586f000 /usr/lib/system/libsystem_configuration.dylib -0x00000001948de000 /usr/lib/system/libsystem_containermanager.dylib -0x0000000196990000 /usr/lib/system/libsystem_coreservices.dylib -0x000000018e4a9000 /usr/lib/system/libsystem_darwin.dylib -0x0000000196cf1000 /usr/lib/system/libsystem_dnssd.dylib -0x000000018b506000 /usr/lib/system/libsystem_featureflags.dylib -0x000000018b67c000 /usr/lib/system/libsystem_info.dylib -0x0000000196c58000 /usr/lib/system/libsystem_m.dylib -0x000000018b492000 /usr/lib/system/libsystem_malloc.dylib -0x0000000190298000 /usr/lib/system/libsystem_networkextension.dylib -0x000000018e913000 /usr/lib/system/libsystem_notify.dylib -0x0000000195874000 /usr/lib/system/libsystem_sandbox.dylib -0x0000000196cea000 /usr/lib/system/libsystem_secinit.dylib -0x000000018b609000 /usr/lib/system/libsystem_kernel.dylib -0x000000018b674000 /usr/lib/system/libsystem_platform.dylib -0x000000018b643000 /usr/lib/system/libsystem_pthread.dylib -0x0000000191aed000 /usr/lib/system/libsystem_symptoms.dylib -0x000000018b3ee000 /usr/lib/system/libsystem_trace.dylib -0x0000000196cc4000 /usr/lib/system/libunwind.dylib -0x000000018b3aa000 /usr/lib/system/libxpc.dylib -0x000000018b5f1000 /usr/lib/libc++abi.dylib -0x0000000196ccf000 /usr/lib/liboah.dylib -0x0000000197597000 /usr/lib/liblzma.5.dylib -0x0000000196d02000 /usr/lib/libfakelink.dylib -0x000000018fed6000 /System/Library/Frameworks/CFNetwork.framework/Versions/A/CFNetwork -0x0000000196e41000 /usr/lib/libarchive.2.dylib -0x000000019b336000 /System/Library/Frameworks/Combine.framework/Versions/A/Combine -0x00000001993f1000 /usr/lib/swift/libswiftCore.dylib -0x00000001acd04000 /usr/lib/swift/libswiftCoreFoundation.dylib -0x00000001aabc1000 /usr/lib/swift/libswiftDarwin.dylib -0x000000019e8fc000 /usr/lib/swift/libswiftDispatch.dylib -0x00000001acd25000 /usr/lib/swift/libswiftIOKit.dylib -0x00000001a0d4e000 /usr/lib/swift/libswiftObjectiveC.dylib -0x00000001acd18000 /usr/lib/swift/libswiftXPC.dylib -0x0000000215856000 /usr/lib/swift/libswift_Concurrency.dylib -0x00000002159a8000 /usr/lib/swift/libswift_StringProcessing.dylib -0x00000001a0d52000 /usr/lib/swift/libswiftos.dylib -0x000000018e7bc000 /System/Library/PrivateFrameworks/CoreServicesInternal.framework/Versions/A/CoreServicesInternal -0x000000019637a000 /usr/lib/libbsm.0.dylib -0x0000000196c97000 /usr/lib/system/libkxld.dylib -0x00000001933fe000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/FSEvents.framework/Versions/A/FSEvents -0x000000018e4b4000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/CarbonCore.framework/Versions/A/CarbonCore -0x0000000192954000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/Metadata.framework/Versions/A/Metadata -0x0000000196996000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/OSServices.framework/Versions/A/OSServices -0x0000000196ec8000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SearchKit.framework/Versions/A/SearchKit -0x0000000191a70000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/AE.framework/Versions/A/AE -0x000000018bb80000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/LaunchServices.framework/Versions/A/LaunchServices -0x0000000197540000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/DictionaryServices.framework/Versions/A/DictionaryServices -0x000000019340b000 /System/Library/Frameworks/CoreServices.framework/Versions/A/Frameworks/SharedFileList.framework/Versions/A/SharedFileList -0x0000000196f67000 /usr/lib/libapple_nghttp2.dylib -0x000000018fed2000 /usr/lib/libnetwork.dylib -0x00000001916f4000 /usr/lib/libsqlite3.dylib -0x0000000191af6000 /System/Library/Frameworks/Network.framework/Versions/A/Network -0x00000002149a3000 /usr/lib/libCoreEntitlements.dylib -0x0000000201410000 /System/Library/PrivateFrameworks/MessageSecurity.framework/Versions/A/MessageSecurity -0x00000001916da000 /System/Library/PrivateFrameworks/ProtocolBuffer.framework/Versions/A/ProtocolBuffer -0x0000000196972000 /System/Library/PrivateFrameworks/AppleFSCompression.framework/Versions/A/AppleFSCompression -0x0000000196362000 /usr/lib/libcoretls.dylib -0x00000001975b0000 /usr/lib/libcoretls_cfhelpers.dylib -0x0000000196f94000 /usr/lib/libpam.2.dylib -0x0000000197618000 /usr/lib/libxar.1.dylib -0x00000001979e3000 /usr/lib/libheimdal-asn1.dylib -0x0000000196d07000 /usr/lib/libpcap.A.dylib -0x0000000191ae3000 /usr/lib/libdns_services.dylib -0x000000019587c000 /System/Library/PrivateFrameworks/AppleSystemInfo.framework/Versions/A/AppleSystemInfo -0x0000000196056000 /System/Library/PrivateFrameworks/IOMobileFramebuffer.framework/Versions/A/IOMobileFramebuffer -0x0000000196983000 /usr/lib/libbz2.1.0.dylib -0x0000000196352000 /usr/lib/libCheckFix.dylib -0x0000000190330000 /System/Library/PrivateFrameworks/TCC.framework/Versions/A/TCC -0x0000000195883000 /System/Library/PrivateFrameworks/CoreNLP.framework/Versions/A/CoreNLP -0x0000000192913000 /System/Library/PrivateFrameworks/MetadataUtilities.framework/Versions/A/MetadataUtilities -0x000000019638b000 /usr/lib/libmecab.dylib -0x000000018c328000 /usr/lib/libCRFSuite.dylib -0x00000001963e8000 /usr/lib/libgermantok.dylib -0x0000000196f40000 /usr/lib/libThaiTokenizer.dylib -0x00000001929f6000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vImage.framework/Versions/A/vImage -0x000000019d3ba000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/vecLib -0x000000019765e000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvMisc.dylib -0x0000000195f56000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libvDSP.dylib -0x000000018bf34000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib -0x000000019706c000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib -0x00000001963eb000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLinearAlgebra.dylib -0x0000000196f7f000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparseBLAS.dylib -0x0000000197067000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libQuadrature.dylib -0x000000019597c000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBNNS.dylib -0x000000018c237000 /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libSparse.dylib -0x0000000200746000 /System/Library/PrivateFrameworks/MIL.framework/Versions/A/MIL -0x0000000196d3c000 /usr/lib/libiconv.2.dylib -0x0000000196c90000 /usr/lib/libcharset.1.dylib -0x00000001933de000 /System/Library/Frameworks/OpenDirectory.framework/Versions/A/Frameworks/CFOpenDirectory.framework/Versions/A/CFOpenDirectory -0x00000001933ce000 /System/Library/Frameworks/OpenDirectory.framework/Versions/A/OpenDirectory -0x00000001975b2000 /System/Library/PrivateFrameworks/APFS.framework/Versions/A/APFS -0x000000019628c000 /System/Library/Frameworks/SecurityFoundation.framework/Versions/A/SecurityFoundation -0x0000000197627000 /usr/lib/libutil.dylib -0x00000001ff7bb000 /System/Library/PrivateFrameworks/InstalledContentLibrary.framework/Versions/A/InstalledContentLibrary -0x000000018e7fa000 /System/Library/PrivateFrameworks/CoreServicesStore.framework/Versions/A/CoreServicesStore -0x00000001f67b6000 /System/Library/PrivateFrameworks/AppleMobileFileIntegrity.framework/Versions/A/AppleMobileFileIntegrity -0x00000001acce3000 /usr/lib/libmis.dylib -0x00000001bac44000 /System/Library/PrivateFrameworks/MobileSystemServices.framework/Versions/A/MobileSystemServices -0x00000001d5481000 /System/Library/PrivateFrameworks/ConfigProfileHelper.framework/Versions/A/ConfigProfileHelper -0x0000000196f42000 /System/Library/PrivateFrameworks/AppleSauce.framework/Versions/A/AppleSauce -0x000000018d00f000 /System/Library/PrivateFrameworks/LanguageModeling.framework/Versions/A/LanguageModeling -0x000000019762b000 /usr/lib/libxslt.1.dylib -0x0000000196e2f000 /usr/lib/libcmph.dylib -0x0000000196043000 /System/Library/PrivateFrameworks/CoreEmoji.framework/Versions/A/CoreEmoji -0x0000000195976000 /System/Library/PrivateFrameworks/LinguisticData.framework/Versions/A/LinguisticData -0x000000018c1ef000 /System/Library/PrivateFrameworks/Lexicon.framework/Versions/A/Lexicon -0x000000019631f000 /System/Library/PrivateFrameworks/BackgroundTaskManagement.framework/Versions/A/BackgroundTaskManagement -0x0000000214b46000 /usr/lib/libTLE.dylib -0x00000002158f3000 /usr/lib/swift/libswift_RegexParser.dylib -0x0000000198293000 /System/Library/PrivateFrameworks/AppleJPEG.framework/Versions/A/AppleJPEG -0x00000001979c8000 /usr/lib/libexpat.1.dylib -0x0000000198854000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libPng.dylib -0x000000019887f000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libTIFF.dylib -0x0000000198968000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libGIF.dylib -0x00000001982d8000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJP2.dylib -0x000000019890c000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libJPEG.dylib -0x0000000198903000 /System/Library/Frameworks/ImageIO.framework/Versions/A/Resources/libRadiance.dylib -0x0000000194c5f000 /System/Library/PrivateFrameworks/FontServices.framework/libFontParser.dylib -0x0000000191a12000 /System/Library/PrivateFrameworks/RunningBoardServices.framework/Versions/A/RunningBoardServices -0x00000001a3282000 /System/Library/PrivateFrameworks/IOSurfaceAccelerator.framework/Versions/A/IOSurfaceAccelerator -0x00000001983ca000 /System/Library/PrivateFrameworks/WatchdogClient.framework/Versions/A/WatchdogClient -0x000000018d188000 /System/Library/Frameworks/CoreDisplay.framework/Versions/A/CoreDisplay -0x0000000194b39000 /System/Library/Frameworks/CoreMedia.framework/Versions/A/CoreMedia -0x0000000194926000 /System/Library/PrivateFrameworks/IOAccelerator.framework/Versions/A/IOAccelerator -0x000000019356f000 /System/Library/Frameworks/CoreVideo.framework/Versions/A/CoreVideo -0x0000000196f92000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/MetalPerformanceShaders -0x0000000198409000 /System/Library/Frameworks/VideoToolbox.framework/Versions/A/VideoToolbox -0x0000000191955000 /System/Library/PrivateFrameworks/BaseBoard.framework/Versions/A/BaseBoard -0x00000001988fe000 /System/Library/PrivateFrameworks/GPUWrangler.framework/Versions/A/GPUWrangler -0x00000001988de000 /System/Library/PrivateFrameworks/IOPresentment.framework/Versions/A/IOPresentment -0x0000000198906000 /System/Library/PrivateFrameworks/DSExternalDisplay.framework/Versions/A/DSExternalDisplay -0x00000001fbf64000 /System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/libllvm-flatbuffers.dylib -0x00000001dab82000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreFSCache.dylib -0x00000001fbf60000 /System/Library/PrivateFrameworks/GPUCompiler.framework/Versions/31001/Libraries/libGPUCompilerUtils.dylib -0x000000019896e000 /System/Library/PrivateFrameworks/CMCaptureCore.framework/Versions/A/CMCaptureCore -0x00000001f08bf000 /System/Library/Frameworks/ExtensionFoundation.framework/Versions/A/ExtensionFoundation -0x000000019f0a3000 /System/Library/PrivateFrameworks/CoreTime.framework/Versions/A/CoreTime -0x0000000197f85000 /System/Library/PrivateFrameworks/AppServerSupport.framework/Versions/A/AppServerSupport -0x000000019a309000 /System/Library/PrivateFrameworks/perfdata.framework/Versions/A/perfdata -0x000000018d2a8000 /System/Library/PrivateFrameworks/AudioToolboxCore.framework/Versions/A/AudioToolboxCore -0x0000000194b0f000 /System/Library/PrivateFrameworks/caulk.framework/Versions/A/caulk -0x0000000199bc6000 /usr/lib/libAudioStatistics.dylib -0x00000001ac109000 /System/Library/PrivateFrameworks/SystemPolicy.framework/Versions/A/SystemPolicy -0x0000000199e68000 /usr/lib/libSMC.dylib -0x00000001a2a25000 /System/Library/Frameworks/CoreMIDI.framework/Versions/A/CoreMIDI -0x0000000198821000 /usr/lib/libAudioToolboxUtility.dylib -0x00000001a7e7c000 /System/Library/PrivateFrameworks/OSAServicesClient.framework/Versions/A/OSAServicesClient -0x000000019a316000 /usr/lib/libperfcheck.dylib -0x00000001978b3000 /System/Library/PrivateFrameworks/PlugInKit.framework/Versions/A/PlugInKit -0x000000019627e000 /System/Library/PrivateFrameworks/AssertionServices.framework/Versions/A/AssertionServices -0x00000001dabe4000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLU.dylib -0x00000001daba3000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGFXShared.dylib -0x00000001dad8a000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib -0x00000001dabac000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGLImage.dylib -0x00000001daba0000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCVMSPluginSupport.dylib -0x0000000214b25000 /usr/lib/libRosetta.dylib -0x00000001dab89000 /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libCoreVMClient.dylib -0x00000001957f4000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSCore.framework/Versions/A/MPSCore -0x00000001968e8000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSImage.framework/Versions/A/MPSImage -0x0000000196400000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSNeuralNetwork.framework/Versions/A/MPSNeuralNetwork -0x00000001967ec000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSMatrix.framework/Versions/A/MPSMatrix -0x00000001965fe000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSRayIntersector.framework/Versions/A/MPSRayIntersector -0x000000019681b000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSNDArray.framework/Versions/A/MPSNDArray -0x00000001f1c8d000 /System/Library/Frameworks/MetalPerformanceShaders.framework/Versions/A/Frameworks/MPSFunctions.framework/Versions/A/MPSFunctions -0x000000018bdfa000 /System/Library/PrivateFrameworks/MetalTools.framework/Versions/A/MetalTools -0x000000019587a000 /System/Library/PrivateFrameworks/AggregateDictionary.framework/Versions/A/AggregateDictionary -0x000000019776c000 /usr/lib/libIOReport.dylib -0x00000001a1c12000 /System/Library/PrivateFrameworks/ASEProcessing.framework/Versions/A/ASEProcessing -0x0000000197b23000 /System/Library/PrivateFrameworks/GraphVisualizer.framework/Versions/A/GraphVisualizer -0x00000001fbe81000 /System/Library/PrivateFrameworks/FontServices.framework/Versions/A/FontServices -0x0000000197f43000 /System/Library/PrivateFrameworks/OTSVG.framework/Versions/A/OTSVG -0x0000000193122000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/Resources/libFontRegistry.dylib -0x0000000197f8f000 /System/Library/PrivateFrameworks/FontServices.framework/libhvf.dylib -0x00000001fbe82000 /System/Library/PrivateFrameworks/FontServices.framework/libXTFontStaticRegistryData.dylib -0x000000020dd1e000 /System/Library/PrivateFrameworks/VideoToolboxParavirtualizationSupport.framework/Versions/A/VideoToolboxParavirtualizationSupport -0x000000019797c000 /System/Library/PrivateFrameworks/AppleVA.framework/Versions/A/AppleVA -0x0000000199c06000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATS.framework/Versions/A/ATS -0x0000000190ea4000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/HIServices.framework/Versions/A/HIServices -0x000000019897a000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/PrintCore.framework/Versions/A/PrintCore -0x0000000199fc1000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/QD.framework/Versions/A/QD -0x0000000199fb5000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ColorSyncLegacy.framework/Versions/A/ColorSyncLegacy -0x0000000199bda000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/SpeechSynthesis.framework/Versions/A/SpeechSynthesis -0x0000000198938000 /System/Library/Frameworks/ApplicationServices.framework/Versions/A/Frameworks/ATSUI.framework/Versions/A/ATSUI -0x0000000199f48000 /usr/lib/libcups.2.dylib -0x000000019a324000 /System/Library/Frameworks/Kerberos.framework/Versions/A/Kerberos -0x000000019a335000 /System/Library/Frameworks/GSS.framework/Versions/A/GSS -0x0000000199c78000 /usr/lib/libresolv.9.dylib -0x0000000197f9f000 /System/Library/PrivateFrameworks/Heimdal.framework/Versions/A/Heimdal -0x00000001a0cd0000 /System/Library/Frameworks/Kerberos.framework/Versions/A/Libraries/libHeimdalProxy.dylib -0x000000019a385000 /System/Library/PrivateFrameworks/CommonAuth.framework/Versions/A/CommonAuth -0x00000001efaf9000 /System/Library/Frameworks/AVFAudio.framework/Versions/A/AVFAudio -0x00000001a7ecb000 /System/Library/PrivateFrameworks/AXCoreUtilities.framework/Versions/A/AXCoreUtilities -0x0000000199b52000 /System/Library/PrivateFrameworks/AudioSession.framework/Versions/A/AudioSession -0x000000019b0ed000 /System/Library/Frameworks/IOBluetooth.framework/Versions/A/IOBluetooth -0x0000000197a7d000 /System/Library/PrivateFrameworks/MediaExperience.framework/Versions/A/MediaExperience -0x00000001999ed000 /System/Library/PrivateFrameworks/AudioSession.framework/libSessionUtility.dylib -0x0000000199fcd000 /System/Library/PrivateFrameworks/AudioResourceArbitration.framework/Versions/A/AudioResourceArbitration -0x000000019dfd2000 /System/Library/PrivateFrameworks/PowerLog.framework/Versions/A/PowerLog -0x000000019df14000 /System/Library/Frameworks/CoreBluetooth.framework/Versions/A/CoreBluetooth -0x00000001a0cd1000 /System/Library/Frameworks/AudioUnit.framework/Versions/A/AudioUnit -0x00000001960e1000 /System/Library/PrivateFrameworks/CoreUtils.framework/Versions/A/CoreUtils -0x00000001fa882000 /System/Library/PrivateFrameworks/CoreUtilsExtras.framework/Versions/A/CoreUtilsExtras -0x00000001ff655000 /System/Library/PrivateFrameworks/IO80211.framework/Versions/A/IO80211 -0x00000001979ed000 /System/Library/PrivateFrameworks/IconFoundation.framework/Versions/A/IconFoundation -0x000000019cfe8000 /System/Library/PrivateFrameworks/SpeechRecognitionCore.framework/Versions/A/SpeechRecognitionCore -0x0000000101ea8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/server/libjvm.dylib -0x0000000100ef8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libjimage.dylib -0x0000000100fa8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libinstrument.dylib -0x0000000100ff4000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libjava.dylib -0x0000000101130000 /private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/libasyncProfiler.so -0x00000001010c8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libzip.dylib -0x00000001010f0000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libnio.dylib -0x00000001011b8000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libnet.dylib -0x0000000100fd4000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libextnet.dylib -0x00000001011dc000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libmanagement.dylib -0x0000000101d8c000 /Library/Java/JavaVirtualMachines/jdk-17.jdk/Contents/Home/lib/libmanagement_ext.dylib - - -VM Arguments: -jvm_args: -XX:TieredStopAtLevel=1 -Dspring.output.ansi.enabled=always -Dcom.sun.management.jmxremote -Dspring.jmx.enabled=true -Dspring.liveBeansView.mbeanDomain -Dspring.application.admin.enabled=true -Dmanagement.endpoints.jmx.exposure.include=* -javaagent:/Applications/IntelliJ IDEA.app/Contents/lib/idea_rt.jar=51990:/Applications/IntelliJ IDEA.app/Contents/bin -agentpath:/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/libasyncProfiler.so=start,jfr,event=cpu,interval=10ms,jfrsync=profile,cstack=no,file=/Users/jinwoo/IdeaSnapshots/Application__1__2024_08_16_151221.jfr,log=/private/var/folders/j7/7nsqn6k500x_mkc64k6_3bd00000gn/T/Application__1__2024_08_16_151221.jfr.log.txt,logLevel=DEBUG -Dfile.encoding=UTF-8 -java_command: com.bang_ggood.Application -java_class_path (initial): /Users/jinwoo/Documents/woowacourse/2024-bang-ggood/backend/bang-ggood/out/production/classes:/Users/jinwoo/Documents/woowacourse/2024-bang-ggood/backend/bang-ggood/out/production/resources:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-data-jpa/3.3.2/2731d74dfc18fb905c29930cf55493980c2cee5a/spring-boot-starter-data-jpa-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-web/3.3.2/720418538668a8742d0ae24097811d5250cf5c32/spring-boot-starter-web-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springdoc/springdoc-openapi-starter-webmvc-ui/2.2.0/178d8ed6714d78b8b475c45bc60642a9232fcb70/springdoc-openapi-starter-webmvc-ui-2.2.0.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-validation/3.3.2/81ee06b318ed35c2a3f4882a0f7b9946a39e1b39/spring-boot-starter-validation-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-aop/3.3.2/26d996e253768d3121bb3ffbef28cefc07fdbddb/spring-boot-starter-aop-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/io.jsonwebtoken/jjwt-impl/0.11.2/8fd8acf9d3cb9a2db05bfa484c2a1408cc3507f9/jjwt-impl-0.11.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/io.jsonwebtoken/jjwt-gson/0.11.2/b1a60b3e0bc81587e272b71dfb3041c4c99a85f5/jjwt-gson-0.11.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/io.jsonwebtoken/jjwt-api/0.11.2/57c34dce3e88f2972c5c5465b6291acfb5628084/jjwt-api-0.11.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/com.mysql/mysql-connector-j/8.3.0/1cc7fa5d61f4bbc113531a4ba6d85d41cf3d57e1/mysql-connector-j-8.3.0.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.springframework.boot/spring-boot-starter-jdbc/3.3.2/544775d745288972598ab2e872e5a4816b6d9b39/spring-boot-starter-jdbc-3.3.2.jar:/Users/jinwoo/.gradle/caches/modules-2/files-2.1/org.hibernate.orm/hibernate-core/6.5. -Launcher Type: SUN_STANDARD - -[Global flags] - intx CICompilerCount = 4 {product} {ergonomic} - uint ConcGCThreads = 2 {product} {ergonomic} - bool FlightRecorder = true {product} {management} - uint G1ConcRefinementThreads = 9 {product} {ergonomic} - size_t G1HeapRegionSize = 2097152 {product} {ergonomic} - uintx GCDrainStackTargetSize = 64 {product} {ergonomic} - size_t InitialHeapSize = 268435456 {product} {ergonomic} - bool ManagementServer = true {product} {command line} - size_t MarkStackSize = 4194304 {product} {ergonomic} - size_t MaxHeapSize = 4294967296 {product} {ergonomic} - size_t MaxNewSize = 2575302656 {product} {ergonomic} - size_t MinHeapDeltaBytes = 2097152 {product} {ergonomic} - size_t MinHeapSize = 8388608 {product} {ergonomic} - uintx NonProfiledCodeHeapSize = 0 {pd product} {ergonomic} - bool ProfileInterpreter = false {pd product} {command line} - uintx ProfiledCodeHeapSize = 0 {pd product} {ergonomic} - size_t SoftMaxHeapSize = 4294967296 {manageable} {ergonomic} - intx TieredStopAtLevel = 1 {product} {command line} - bool UseCompressedClassPointers = true {product lp64_product} {ergonomic} - bool UseCompressedOops = true {product lp64_product} {ergonomic} - bool UseG1GC = true {product} {ergonomic} - bool UseNUMA = false {product} {ergonomic} - bool UseNUMAInterleaving = false {product} {ergonomic} - -Logging: -Log output configuration: - #0: stdout all=warning,jni+resolve=error uptime,level,tags (reconfigured) - #1: stderr all=off uptime,level,tags - -Environment Variables: -PATH=/Users/jinwoo/.nvm/versions/node/v20.15.1/bin:/opt/homebrew/bin:/usr/local/bin:/System/Cryptexes/App/usr/bin:/usr/bin:/bin:/usr/sbin:/sbin:/Library/Java/JavaVirtualMachines/Library/Java/JavaVirtualMachines/:/Applications/VMware Fusion.app/Contents/Public -SHELL=/bin/zsh -LC_CTYPE=ko_KR.UTF-8 - -Signal Handlers: - SIGSEGV: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGBUS: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGFPE: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGPIPE: javaSignalHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGXFSZ: javaSignalHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGILL: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGUSR2: SR_handler in libjvm.dylib, mask=00100000000000000000000000000000, flags=SA_RESTART|SA_SIGINFO - SIGHUP: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGINT: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGTERM: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGQUIT: UserHandler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - SIGTRAP: crash_handler in libjvm.dylib, mask=11100110000111110111111111111111, flags=SA_RESTART|SA_SIGINFO - - ---------------- S Y S T E M --------------- - -OS: -uname: Darwin 22.3.0 Darwin Kernel Version 22.3.0: Mon Jan 30 20:39:46 PST 2023; root:xnu-8792.81.3~2/RELEASE_ARM64_T6020 arm64 -OS uptime: 0 days 5:28 hours -rlimit (soft/hard): STACK 8176k/65520k , CORE 0k/infinity , NPROC 2666/4000 , NOFILE 10240/infinity , AS infinity/infinity , CPU infinity/infinity , DATA infinity/infinity , FSIZE infinity/infinity , MEMLOCK infinity/infinity , RSS infinity/infinity -load average: 2.58 1.59 1.41 - -CPU: total 10 (initial active 10) 0x61:0x0:0xda33d83d:0, fp, simd, crc, lse - -Memory: 16k page, physical 16777216k(76560k free), swap 0k(0k free) - -vm_info: Java HotSpot(TM) 64-Bit Server VM (17.0.9+11-LTS-201) for bsd-aarch64 JRE (17.0.9+11-LTS-201), built on Oct 10 2023 22:12:15 by "mach5one" with clang Apple LLVM 12.0.0 (clang-1200.0.32.29) - -END. From a289a578ddc04a0382d3457c537a36e4bcab2748 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Mon, 19 Aug 2024 20:31:55 +0900 Subject: [PATCH 201/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=ED=98=95=EC=8B=9D=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#434)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../test/java/com/bang_ggood/user/controller/UserE2ETest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index 621bffb09..a77eef9e9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) { +public record UserResponse(Long userId, String nickname, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index 5f81153ea..f6f30ab41 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -29,7 +29,7 @@ void readUserInfo() { assertAll( () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.userName()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.nickname()).isEqualTo(UserFixture.USER1.getName()), () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } From 726453cc8c617f21b13595e7ec1579def465bc88 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Tue, 20 Aug 2024 10:54:39 +0900 Subject: [PATCH 202/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EB=AA=85=EC=9D=84=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?439)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java index 92581638c..79b432d4c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/dto/response/OauthInfoApiResponse.java @@ -7,6 +7,6 @@ public record OauthInfoApiResponse(String id, String connected_at, KakaoAccountResponse kakao_account) { public User toUserEntity() { - return new User(kakao_account.name(), kakao_account.email()); + return new User(kakao_account.profile().nickname(), kakao_account.email()); } } From 0933a926a3f7284e43f98db87b9a93600bc9ed93 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:11:40 +0900 Subject: [PATCH 203/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20co?= =?UTF-8?q?ntent=20=EA=B8=B8=EC=9D=B4=EB=A5=BC=20=EB=8A=98=EB=A6=B0?= =?UTF-8?q?=EB=8B=A4.=20(#442)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/schema.sql | 2 +- backend/bang-ggood/src/test/resources/schema-test.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 1adb64995..aefd47f9e 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -104,7 +104,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(255), + content VARCHAR(65536), keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index a4ca6b64d..cab89a836 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -115,7 +115,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(255), + content VARCHAR(65536), keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), From a6cc43f8aa71779bece33bd53d4e7579c3fce840 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:27:27 +0900 Subject: [PATCH 204/348] =?UTF-8?q?[BE]=20AcceptanceMockTestSupport=20?= =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20ActiveProfiles=EC=97=90=20test=EB=A5=BC=20?= =?UTF-8?q?=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4.=20(#445)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/config/CorsConfig.java | 6 +++++- .../test/java/com/bang_ggood/AcceptanceMockTestSupport.java | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java index b9985f1d4..6de5989dc 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java @@ -1,5 +1,6 @@ package com.bang_ggood.config; +import org.springframework.boot.context.properties.ConfigurationProperties; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; import org.springframework.web.cors.CorsConfiguration; @@ -8,12 +9,15 @@ import java.util.List; @Configuration +@ConfigurationProperties(prefix = "cors") public class CorsConfig { + private List allowOrigins; + @Bean public CorsFilter corsFilter() { CorsConfiguration configuration = new CorsConfiguration(); - configuration.addAllowedOriginPattern("*"); + configuration.setAllowedOrigins(allowOrigins); configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "PATCH", "DELETE", "OPTIONS")); configuration.addAllowedHeader("*"); configuration.setAllowCredentials(true); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java index ad615ba89..bb94f4c78 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/AcceptanceMockTestSupport.java @@ -7,8 +7,10 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; import org.springframework.boot.test.web.server.LocalServerPort; +import org.springframework.test.context.ActiveProfiles; import org.springframework.test.web.servlet.MockMvc; +@ActiveProfiles("test") @AutoConfigureMockMvc @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) public abstract class AcceptanceMockTestSupport { From 49fe2dc70342d3319c1857a7c05ed8be35760c31 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:45:43 +0900 Subject: [PATCH 205/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EA=B8=B8=EC=9D=B4=EB=A5=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#448)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/schema.sql | 2 +- backend/bang-ggood/src/test/resources/schema-test.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index aefd47f9e..c0bcf2f98 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -104,7 +104,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(65536), + content VARCHAR(16383), keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index cab89a836..8364b7074 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -115,7 +115,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(65536), + content VARCHAR(16383), keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), From 85e6fdbe8bd02f5123656e849729f0b8afa7a12b Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:58:26 +0900 Subject: [PATCH 206/348] =?UTF-8?q?[BE]=20=ED=98=84=EC=9E=AC=20=EC=9C=84?= =?UTF-8?q?=EC=B9=98=EC=97=90=EC=84=9C=20=EA=B0=80=EA=B9=8C=EC=9A=B4=20?= =?UTF-8?q?=EC=A7=80=ED=95=98=EC=B2=A0=20=EC=97=AD=EC=9D=84=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=ED=95=9C=EB=8B=A4.=20(#421)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/build.gradle | 1 + .../bang_ggood/exception/ExceptionCode.java | 5 +- .../com/bang_ggood/station/SubwayReader.java | 38 + .../controller/SubwayStationController.java | 26 + .../station/domain/SubwayStation.java | 49 ++ .../station/dto/SubwayStationResponse.java | 10 + .../station/service/SubwayStationService.java | 30 + .../main/resources/seoul_stations_240819.csv | 768 ++++++++++++++++++ .../station/SubwayStationServiceTest.java | 39 + .../test/resources/seoul_stations_240819.csv | 768 ++++++++++++++++++ 10 files changed, 1733 insertions(+), 1 deletion(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java create mode 100644 backend/bang-ggood/src/main/resources/seoul_stations_240819.csv create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java create mode 100644 backend/bang-ggood/src/test/resources/seoul_stations_240819.csv diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 04653e210..483a11f04 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -27,6 +27,7 @@ dependencies { implementation 'io.jsonwebtoken:jjwt-impl:0.11.2' implementation 'io.jsonwebtoken:jjwt-gson:0.11.2' implementation 'com.mysql:mysql-connector-j' + implementation 'com.opencsv:opencsv:5.9' runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 61f20bd53..e7b381658 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -60,7 +60,10 @@ public enum ExceptionCode { OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."), // Article - ARTICLE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 아티클이 존재하지 않습니다."); + ARTICLE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 아티클이 존재하지 않습니다."), + + // Station + STATION_NOT_FOUND(HttpStatus.INTERNAL_SERVER_ERROR, "지하철 역을 찾을 수 없습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java new file mode 100644 index 000000000..04eda3743 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java @@ -0,0 +1,38 @@ +package com.bang_ggood.station; + +import com.bang_ggood.station.domain.SubwayStation; +import com.opencsv.CSVReader; +import com.opencsv.CSVReaderBuilder; +import com.opencsv.exceptions.CsvValidationException; +import org.springframework.core.io.ClassPathResource; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +public class SubwayReader { + + public static final String SUBWAY_DATA_PATH = "seoul_stations_240819.csv"; + + public static List readSubwayStationData() { + List stations = new ArrayList<>(); + ClassPathResource resource = new ClassPathResource(SUBWAY_DATA_PATH); + try (CSVReader csvReader = new CSVReaderBuilder( + new InputStreamReader(resource.getInputStream(), Charset.forName("EUC-KR"))).build()) { + String[] line = csvReader.readNext(); // drop first row + while ((line = csvReader.readNext()) != null) { + SubwayStation station = new SubwayStation( + Integer.parseInt(line[0]), + line[1], + line[2], + Double.parseDouble(line[3]), + Double.parseDouble(line[4])); + stations.add(station); + } + return stations; + } catch (IOException | CsvValidationException e) { + throw new RuntimeException("지하철 데이터 파일을 읽어오는데 실패했습니다."); + } + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java new file mode 100644 index 000000000..bb8dc71bb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java @@ -0,0 +1,26 @@ +package com.bang_ggood.station.controller; + +import com.bang_ggood.station.dto.SubwayStationResponse; +import com.bang_ggood.station.service.SubwayStationService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class SubwayStationController { + + private final SubwayStationService subwayStationService; + + public SubwayStationController(SubwayStationService subwayStationService) { + this.subwayStationService = subwayStationService; + } + + @GetMapping("/stations/nearest") + public ResponseEntity readNearestStation(@RequestParam("latitude") double latitude, + @RequestParam("longitude") double longitude) { + + SubwayStationResponse response = subwayStationService.readNearestStation(latitude, longitude); + return ResponseEntity.ok(response); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java new file mode 100644 index 000000000..7cec623bb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java @@ -0,0 +1,49 @@ +package com.bang_ggood.station.domain; + +public class SubwayStation { + + private final Integer id; + private final String name; + private final String line; + private final double latitude; + private final double longitude; + + public SubwayStation(Integer id, String name, String line, double latitude, double longitude) { + this.id = id; + this.name = name; + this.line = line; + this.latitude = latitude; + this.longitude = longitude; + } + + public Integer getId() { + return id; + } + + public String getName() { + return name; + } + + public String getLine() { + return line; + } + + public double getLatitude() { + return latitude; + } + + public double getLongitude() { + return longitude; + } + + @Override + public String toString() { + return "Station{" + + "id=" + id + + ", name='" + name + '\'' + + ", line='" + line + '\'' + + ", latitude=" + latitude + + ", longitude=" + longitude + + '}'; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java new file mode 100644 index 000000000..caa90f182 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.station.dto; + +import com.bang_ggood.station.domain.SubwayStation; + +public record SubwayStationResponse(String stationName, String stationLine, Integer walkingTime) { + + public static SubwayStationResponse of(SubwayStation station, Integer walkingTime) { + return new SubwayStationResponse(station.getName(), station.getLine(), walkingTime); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java new file mode 100644 index 000000000..f0d64cafb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java @@ -0,0 +1,30 @@ +package com.bang_ggood.station.service; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.station.domain.SubwayStation; +import com.bang_ggood.station.dto.SubwayStationResponse; +import com.bang_ggood.station.SubwayReader; +import org.springframework.stereotype.Service; +import java.util.Comparator; +import java.util.List; + +@Service +public class SubwayStationService { + + private static final int METER_PER_DEGREE = 111_320; + private static final double AVERAGE_WALKING_SPEED = 1.3 * 60; // meter per minute + private static final List SUBWAY_STATIONS = SubwayReader.readSubwayStationData(); + + public SubwayStationResponse readNearestStation(double latitude, double longitude) { + return SUBWAY_STATIONS.stream() + .map(station -> { + double dx = (station.getLatitude() - latitude) * METER_PER_DEGREE; + double dy = (station.getLongitude() - longitude) * METER_PER_DEGREE * Math.cos(station.getLatitude()); + double distance = Math.sqrt(dx * dx + dy * dy); + return SubwayStationResponse.of(station, (int) Math.round(distance / AVERAGE_WALKING_SPEED)); + }) + .min(Comparator.comparing(SubwayStationResponse::walkingTime)) + .orElseThrow(() -> new BangggoodException(ExceptionCode.STATION_NOT_FOUND)); + } +} diff --git a/backend/bang-ggood/src/main/resources/seoul_stations_240819.csv b/backend/bang-ggood/src/main/resources/seoul_stations_240819.csv new file mode 100644 index 000000000..f6a384cd8 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/seoul_stations_240819.csv @@ -0,0 +1,768 @@ +_ID,,ȣ,,浵 +4703,4.19ֹ,̽ż,37.649502,127.013684 +1907,,1ȣ,37.748577,127.044213 +340,,3ȣ,37.492245,127.117757 +2818,,8ȣ,37.492888,127.118398 +2748,д,7ȣ,37.480338,126.882656 +1702,д,1ȣ,37.481581,126.882581 +4107,,9ȣ,37.561391,126.854456 +4704,,̽ż,37.641537,127.016789 +3216,,õ2ȣ,37.484192,126.683673 +3211,(Ƽ),õ2ȣ,37.524649,126.675539 +3212,߾ӽ,õ2ȣ,37.517054,126.676672 +1265,,߾Ӽ,37.568491,126.915487 +1851,õ,д缱,37.448605,127.126697 +1323,,ἱ,37.814536,127.510739 +1816,,1ȣ,37.464737,126.694181 +3123,Ÿ,õ1ȣ,37.467048,126.707938 +1312,,ἱ,37.634118,127.114757 +3117,,õ1ȣ,37.517268,126.721514 +222,,2ȣ,37.49799,127.027912 +4307,,źд缱,37.496837,127.028104 +2732,û,7ȣ,37.517179,127.041255 +1849,û,д缱,37.517469,127.041151 +4502,,μ,37.270161,127.126033 +2549,,5ȣ,37.535804,127.132481 +2813,û,8ȣ,37.530341,127.120508 +1269,,߾Ӽ,37.612314,126.843223 +214,(͹̳),2ȣ,37.535095,127.094681 +9995,,5ȣ,37.55749,127.17593 +1326,,ἱ,37.805723,127.634146 +2559,,5ȣ,37.498079,127.13482 +1801,,1ȣ,37.494594,126.85968 +1027,,д缱,37.489116,127.06614 +4101,ȭ,9ȣ,37.578608,126.798153 +2512,ȭ,5ȣ,37.572399,126.806171 +2560,ſ,5ȣ,37.493105,127.14415 +212,ǴԱ,2ȣ,37.540373,127.069191 +2729,ǴԱ,7ȣ,37.540786,127.071011 +4925,Ϻ,,37.63165,126.705975 +3203,˴ܻŸ,õ2ȣ,37.60185,126.657108 +3201,˴ܿ(˴ܻ),õ2ȣ,37.594877,126.627178 +3208,˹,õ2ȣ,37.561405,126.677566 +4209,˾,ö1ȣ,37.569098,126.674007 +3207,˾,õ2ȣ,37.56866,126.675687 +1504,Ɽ,氭,37.399907,127.25263 +4610,⵵ûϺû,μ,37.75059,127.071495 +1451,渶,4ȣ,37.443885,127.007888 +317,溹(μû),3ȣ,37.575762,126.97353 +3115,αԱ,õ1ȣ,37.538157,126.722597 +4604,ö,μ,37.737202,127.043257 +341,,3ȣ,37.495918,127.12454 +3114,,õ1ȣ,37.543238,126.728128 +4208,,ö1ȣ,37.571662,126.7363 +3110,,õ1ȣ,37.571449,126.73578 +2553,,5ȣ,37.555004,127.154151 +2641,(),6ȣ,37.590508,127.036296 +1873,,μ,37.24963,126.980248 +329,͹̳,3ȣ,37.504891,127.004916 +2736,͹̳,7ȣ,37.503367,127.005068 +4123,͹̳,9ȣ,37.50598,127.004403 +1757,,4ȣ,37.316784,126.823144 +4513,,μ,37.24484,127.214251 +4928,,,37.601243,126.770345 +1272,,߾Ӽ,37.645676,126.801762 +4612,,μ,37.750471,127.083715 +1506,,氭,37.351315,127.34674 +2530,,5ȣ,37.544431,126.951372 +2627,,6ȣ,37.543555,126.951678 +1292,,߾Ӽ,37.542596,126.952099 +4202,,ö1ȣ,37.54253,126.952024 +2718,(б),7ȣ,37.625742,127.072896 +4103,׽,9ȣ,37.563726,126.810678 +4212,ȭû,ö1ȣ,37.459041,126.477516 +1453,õ,4ȣ,37.433021,126.996568 +1705,,1ȣ,37.419232,126.908706 +4411,ǻ(),Ÿ,37.4691018,126.9450639 +4319,(),źд缱,37.30211,127.044483 +4318,߾(ִ),źд缱,37.288617,127.051478 +2547,(Ŵ),5ȣ,37.545303,127.10357 +1750,,1ȣ,37.416182,126.884466 +2750,Ÿ,7ȣ,37.479252,126.854876 +1019,,1ȣ,37.623632,127.061835 +2534,ȭ(ȭȸ),5ȣ,37.571525,126.97717 +2625,â(),6ȣ,37.547456,126.931993 +223,(.û),2ȣ,37.493961,127.014667 +330,(.û),3ȣ,37.493025,127.013786 +4921,,,37.645384,126.628633 +1701,,1ȣ,37.503039,126.881966 +232,εд,2ȣ,37.485266,126.901401 +1026,,д缱,37.486839,127.058856 +1205,,߾Ӽ,37.603392,127.143869 +4121,,9ȣ,37.501364,126.987332 +2616,,6ȣ,37.611377,126.91727 +1863,,д缱,37.298969,127.105664 +9009,, ö,37.29913,127.10389 +213,(û),2ȣ,37.537077,127.085916 +1813,,1ȣ,37.496756,126.870793 +310,Ĺ,3ȣ,37.636763,126.918821 +1214,,߾Ӽ,37.516169,127.399367 +3138,,õ1ȣ,37.399907,126.630347 +4114,ȸǻ,9ȣ,37.528105,126.917874 +2545,(ɵ),5ȣ,37.557088,127.079577 +2727,(ɵ),7ȣ,37.556897,127.079338 +1709,,1ȣ,37.35356,126.948462 +1324,,ἱ,37.832067,127.557695 +2760,õ,7ȣ,37.506997,126.73128 +2551,ٸ(ȸ),5ȣ,37.545477,127.142853 +3111,,õ1ȣ,37.566379,126.742654 +1316,ݰ,ἱ,37.637382,127.207853 +1279,ݸ,߾Ӽ,37.751322,126.765347 +1708,,1ȣ,37.372221,126.943429 +1458,,4ȣ,37.372209,126.943417 +1703,õû,1ȣ,37.455626,126.89398 +1280,,߾Ӽ,37.766217,126.774644 +324,ȣ,3ȣ,37.548034,127.015872 +1865,,д缱,37.275061,127.11591 +4501,,μ,37.275449,127.116665 +2550,浿,5ȣ,37.537801,127.140004 +417,,4ȣ,37.603407,127.025053 +4511,跮,μ,37.237247,127.198781 +1327,,ἱ,37.818466,127.71434 +2513,,5ȣ,37.562384,126.801292 +4102,,9ȣ,37.561916,126.802152 +4207,,ö1ȣ,37.561842,126.801904 +4929,,,37.56236,126.801868 +1980,,ؼ,37.5617,126.8041 +2519,ġ,5ȣ,37.531768,126.846683 +2753,ġ,7ȣ,37.506207,126.810939 +227,,2ȣ,37.47693,126.963693 +2747,,7ȣ,37.486056,126.887249 +3225,û,õ2ȣ,37.448161,126.736939 +1883,δũ,μ,37.407722,126.695216 +331,͹̳(),3ȣ,37.485013,127.016189 +2739,,7ȣ,37.484596,126.971251 +1002,,1ȣ,37.541021,126.9713 +2828,,8ȣ,37.4624,127.13977 +1328,õ,ἱ,37.864007,127.723792 +434,·,4ȣ,37.463873,126.989134 +2823,ѻ꼺Ա(.û),8ȣ,37.451535,127.159816 +2737,,7ȣ,37.487618,126.993513 +4118,,9ȣ,37.512887,126.953222 +4117,뷮,9ȣ,37.513534,126.941005 +1004,뷮,1ȣ,37.514149,126.94271 +411,,4ȣ,37.65627,127.063276 +2715,,7ȣ,37.654836,127.060462 +313,,3ȣ,37.600927,126.935756 +2630,(걸û),6ȣ,37.534675,126.986695 +1908,,1ȣ,37.75938,127.042292 +1021,õ,1ȣ,37.644799,127.051269 +2734,,7ȣ,37.511093,127.021415 +4305,,źд缱,37.511093,127.021415 +1271,ɰ,߾Ӽ,37.618808,126.820783 +2824,ܴŸ,8ȣ,37.44521,127.156866 +4811,޹,ؼ,37.348847,126.809409 +1878,޿,μ,37.379681,126.745177 +2543,ʸ,5ȣ,37.566747,127.052704 +409,,4ȣ,37.670272,127.079066 +4407,,Ÿ,37.4902998,126.9275133 +237,,2ȣ,37.534946,126.902767 +4113,,9ȣ,37.533406,126.902809 +1729,,1ȣ,37.344285,126.948345 +9002,, ö,37.63191,126.81113 +1953,,3ȣ,37.631626,126.811024 +1452,,4ȣ,37.435675,127.006523 +233,븲(αû),2ȣ,37.493243,126.894932 +2746,븲(αû),7ȣ,37.493013,126.897075 +1028,Ա,д缱,37.491373,127.07272 +1005,,1ȣ,37.513342,126.926382 +4402,,Ÿ,37.5133059,126.9257265 +1320,뼺,ἱ,37.684071,127.379319 +1752,߹,4ȣ,37.328467,126.917332 +337,û,3ȣ,37.493514,127.079532 +335,ġ,3ȣ,37.494612,127.063642 +1958,ȭ,3ȣ,37.676087,126.747569 +2626,(),6ȣ,37.547771,126.942069 +1910,,1ȣ,37.818486,127.056486 +1208,,߾Ӽ,37.586781,127.208832 +1911,,1ȣ,37.843188,127.061277 +334,,3ȣ,37.490922,127.055452 +1025,,д缱,37.491224,127.055186 +1206,,߾Ӽ,37.608806,127.161153 +247,õ,2ȣ,37.514287,126.882768 +1902,,1ȣ,37.679563,127.045595 +2712,,7ȣ,37.689241,127.046509 +1903,,1ȣ,37.689534,127.046049 +1209,,߾Ӽ,37.579622,127.222672 +1817,,1ȣ,37.468446,126.642706 +1823,ȭ,1ȣ,37.46607,126.668672 +316,,3ȣ,37.574571,126.957748 +2614,,6ȣ,37.618456,126.933031 +1714,,1ȣ,37.466613,126.889249 +3206,,õ2ȣ,37.585212,126.675844 +2644,,6ȣ,37.610537,127.056431 +155,빮,1ȣ,37.571687,127.01093 +421,빮,4ȣ,37.57093,127.009287 +205,빮繮ȭ,2ȣ,37.565613,127.009054 +422,빮繮ȭ,4ȣ,37.565133,127.007885 +2537,빮繮ȭ,5ȣ,37.564665,127.005353 +322,Ա,3ȣ,37.559052,127.005602 +1915,õ,1ȣ,37.927878,127.05479 +1913,õ߾,1ȣ,37.901885,127.056482 +3132,,õ1ȣ,37.397878,126.674005 +159,,1ȣ,37.573197,127.01648 +2637,,6ȣ,37.572279,127.015653 +4505,,μ,37.269043,127.152716 +3121,,õ1ȣ,37.485312,126.718247 +1808,,1ȣ,37.471408,126.702896 +4608,,μ,37.745271,127.056947 +1811,õ,1ȣ,37.475276,126.632802 +431,(),4ȣ,37.502852,126.980347 +4120,(),9ȣ,37.502878,126.978153 +4314,õ,źд缱,37.337928,127.102976 +3131,,õ1ȣ,37.404737,126.681015 +9010,ź, ö,37.20034,127.09569 +1727,,1ȣ,36.833705,127.14896 +4515,,μ,37.267051,127.21364 +2555,̵,5ȣ,37.527788,127.136248 +4137,̿,9ȣ,37.519683,127.137989 +4109,,9ȣ,37.550632,126.865689 +2619,й̵Ƽ,6ȣ,37.576108,126.901391 +1294,й̵Ƽ,߾Ӽ,37.577475,126.900453 +4204,й̵Ƽ,ö1ȣ,37.576958,126.898609 +210,Ҽ,2ȣ,37.547184,127.047367 +2730,Ҽ,7ȣ,37.53154,127.066704 +2515,,5ȣ,37.560183,126.825448 +4105,,9ȣ,37.566778,126.82731 +4206,,ö1ȣ,37.565543,126.827378 +1955,,3ȣ,37.652206,126.77762 +2714,,7ȣ,37.66494,127.057675 +4922,,,37.640732,126.644344 +1319,,ἱ,37.652782,127.311767 +2542,,5ȣ,37.5661,127.042973 +3204,,õ2ȣ,37.597566,126.666998 +2561,õ,5ȣ,37.49499,127.152781 +2529,,5ȣ,37.539574,126.945932 +2621,û,6ȣ,37.563515,126.903343 +3224,,õ2ȣ,37.454911,126.732094 +1203,,߾Ӽ,37.59955,127.091909 +2622,,6ȣ,37.556094,126.910052 +1904,,1ȣ,37.709914,127.047455 +1869,,д缱,37.245795,127.057353 +1872,ű,д缱,37.265481,127.015678 +333,ź,3ȣ,37.486947,127.046769 +1870,źǼ,д缱,37.252759,127.040566 +2720,԰,7ȣ,37.610637,127.077725 +2723,,7ȣ,37.588579,127.087503 +424,,4ȣ,37.560989,126.986325 +2552,,5ȣ,37.55137,127.143999 +4510,,μ,37.237964,127.190294 +1707,,1ȣ,37.384653,126.935433 +2827,,8ȣ,37.433824,127.129837 +1853,,д缱,37.432052,127.129104 +3223,𷡳,õ2ȣ,37.45583,126.719298 +2521,,5ȣ,37.526065,126.864931 +2814,伺(ȭǹ),8ȣ,37.517409,127.112359 +315,,3ȣ,37.582299,126.950291 +235,,2ȣ,37.517933,126.89476 +1284,,߾Ӽ,37.854619,126.788047 +2819,,8ȣ,37.485855,127.1225 +3127,а,õ1ȣ,37.434935,126.698579 +1858,̱,д缱,37.350077,127.10891 +4313,̱,źд缱,37.349982,127.108918 +9996,̻,5ȣ,37.560927,127.193877 +415,̾(̹),4ȣ,37.62667,127.025983 +416,̾ƻŸ,4ȣ,37.613292,127.030053 +3112,,õ1ȣ,37.553703,126.745077 +1753,ݿ,4ȣ,37.312212,126.903524 +2735,,7ȣ,37.508178,127.011727 +4601,߰,μ,37.727048,127.052803 +2516,߻,5ȣ,37.558598,126.837668 +225,,2ȣ,37.481426,126.997596 +2557,,5ȣ,37.508857,127.126133 +1901,,1ȣ,37.667503,127.044273 +2511,ȭ,5ȣ,37.577446,126.812741 +1405,,1ȣ,36.777629,127.052991 +1273,鸶,߾Ӽ,37.658239,126.794461 +1954,鼮,3ȣ,37.643114,126.78787 +1325,縮,ἱ,37.830779,127.58933 +1807,,1ȣ,37.483664,126.707704 +2633,Ƽ,6ȣ,37.548013,127.007055 +1457,,4ȣ,37.389793,126.950806 +4603,,μ,37.728755,127.04353 +1313,,ἱ,37.64202,127.12684 +408,,4ȣ,37.66778,127.11581 +1716,,1ȣ,37.207503,127.032731 +2744,,7ȣ,37.499872,126.920428 +4404,,Ÿ,37.5002739,126.9204355 +4405,Ű,Ÿ,37.4955691,126.9180827 +4406,ź,Ÿ,37.4929598,126.9234964 +2639,,6ȣ,37.585274,127.019351 +4712,,̽ż,37.585286,127.019381 +1914,,1ȣ,37.913702,127.057277 +1861,,д缱,37.312752,127.108196 +4514,,μ,37.258965,127.218457 +2821,,8ȣ,37.471052,127.126732 +1031,,д缱,37.470345,127.126658 +1401,,1ȣ,36.801215,127.135763 +4129,,9ȣ,37.514219,127.060245 +229,õ,2ȣ,37.482362,126.941892 +2648,ȭ(Ƿ),6ȣ,37.617283,127.091401 +1815,ΰ,1ȣ,37.488418,126.74109 +1509,ι,氭,37.260192,127.490277 +1804,õ,1ȣ,37.48405,126.782686 +2757,õû,7ȣ,37.504631,126.763538 +2754,õտ,7ȣ,37.50538,126.797337 +1982,õտ,ؼ,37.505457,126.797289 +1806,,1ȣ,37.489445,126.724506 +3120,,õ1ȣ,37.490535,126.723453 +2761,û,7ȣ,37.507394,126.721599 +3118,û,õ1ȣ,37.508407,126.720555 +3122,Ÿ,õ1ȣ,37.477679,126.710208 +3119,,õ1ȣ,37.498383,126.722244 +4709,ѻ꺸,̽ż,37.612072,127.008251 +4701,ѻ,̽ż,37.662909,127.012706 +312,ұ,3ȣ,37.610553,126.92982 +2613,ұ,6ȣ,37.610873,126.92939 +2724,簡,7ȣ,37.580894,127.088478 +226,,2ȣ,37.476538,126.981544 +433,,4ȣ,37.476955,126.981651 +1315,縪,ἱ,37.65108,127.176933 +1877,縮,μ,37.28998,126.85685 +4926,(û),,37.620249,126.719731 +4124,,9ȣ,37.504206,127.015259 +3762,,7ȣ,37.5086,126.7035277 +1751,꺻,4ȣ,37.358101,126.933274 +2822,꼺,8ȣ,37.457122,127.149908 +4508,ﰡ,μ,37.242115,127.168075 +428,ﰢ,4ȣ,37.534075,126.9726 +2629,ﰢ,6ȣ,37.535534,126.974032 +1503,ﵿ,氭,37.409522,127.20336 +2759,ü,7ȣ,37.506411,126.742153 +3759,ü,7ȣ,37.50724,126.74179 +9006,Ｚ, ö,37.50887,127.06324 +219,Ｚ(),2ȣ,37.508844,127.06316 +4128,Ｚ߾,9ȣ,37.513011,127.053282 +1950,,3ȣ,37.653083,126.895558 +4706,,̽ż,37.626914,127.018106 +4707,Ÿ,̽ż,37.621337,127.020473 +4131,,9ȣ,37.504738,127.088025 +1866,,д缱,37.26181,127.108847 +410,,4ȣ,37.660878,127.073572 +2741,,7ȣ,37.502834,126.94791 +3758,,7ȣ,37.505814,126.753163 +1754,ϼ,4ȣ,37.302795,126.866489 +2722,(ÿܹ͹̳),7ȣ,37.595577,127.085716 +1202,(ÿܹ͹̳),߾Ӽ,37.596678,127.08504 +2624,,6ȣ,37.547716,126.922852 +207,սʸ,2ȣ,37.564354,127.029354 +2643,(ѱб),6ȣ,37.606377,127.048491 +2554,ϵ,5ȣ,37.556712,127.166417 +1322,õ,ἱ,37.770246,127.454821 +4317,,źд缱,37.297664,127.069342 +4609,,μ,37.748885,127.06362 +2617,(Ż),6ȣ,37.591148,126.913629 +4116,,9ȣ,37.517274,126.928422 +4401,,Ÿ,37.5170969,126.929399 +1263,,߾Ӽ,37.551881,126.935711 +3210,û,õ2ȣ,37.543742,126.676787 +2533,빮,5ȣ,37.565773,126.966641 +1749,ź,1ȣ,37.195504,127.051672 +3214,οȸ,õ2ȣ,37.500168,126.675795 +1009,,߾Ӽ,37.519594,126.988537 +9005,, ö,37.55569,126.97296 +4410,뺥óŸ,Ÿ,37.4720019,126.9339351 +228,Ա(DZû),2ȣ,37.481247,126.952739 +1847,｣,д缱,37.543617,127.044707 +426,￪,4ȣ,37.55281,126.972556 +1001,￪,1ȣ,37.554337,126.971134 +1291,￪,߾Ӽ,37.557231,126.97103 +4201,￪,ö1ȣ,37.553247,126.969769 +4403,溴û,Ÿ,37.5060464,126.9227083 +4409,,Ÿ,37.4782341,126.9330365 +1722,,1ȣ,37.056496,127.052819 +224,,2ȣ,37.491897,127.007917 +1855,,д缱,37.385126,127.123592 +2645,,6ȣ,37.614872,127.065595 +1018,,1ȣ,37.614532,127.065934 +3763,(źϽ),7ȣ,37.5062285,126.6762813 +3213,(źϽ),õ2ȣ,37.506193,126.676203 +3220,,õ2ȣ,37.457611,126.692575 +1704,,1ȣ,37.435047,126.902295 +3222,õŸ,õ2ȣ,37.456805,126.709986 +2816,,8ȣ,37.505557,127.106832 +4133,,9ȣ,37.505208,127.10704 +4132,̰,9ȣ,37.502558,127.097033 +220,,2ȣ,37.504286,127.048203 +1023,,д缱,37.504856,127.048807 +1450,,4ȣ,37.451673,127.002303 +4812,,ؼ,37.334353,126.809904 +4112,,9ȣ,37.53802,126.893525 +4127,,9ȣ,37.510297,127.043999 +1850,,д缱,37.510735,127.043677 +3128,,õ1ȣ,37.426684,126.698863 +1711,հ,1ȣ,37.300349,126.97075 +1512,,氭,37.39468,127.11945 +9008,, ö,37.39467,127.12058 +4316,,źд缱,37.313335,127.0801 +211,,2ȣ,37.544581,127.055961 +418,ſԱ(),4ȣ,37.592612,127.016441 +4711,ſԱ(),̽ż,37.592467,127.016516 +1725,ȯ,1ȣ,36.916076,127.126964 +1715,,1ȣ,37.245025,127.013222 +1717,,1ȣ,37.187533,127.04318 +1510,ո,氭,37.295309,127.570938 +3137,Ʈũ,õ1ȣ,37.393054,126.634729 +1880,ҷ,μ,37.40095,126.733522 +1814,һ,1ȣ,37.482753,126.79544 +4804,һ,ؼ,37.483279,126.795023 +4805,һ,ؼ,37.468467,126.797252 +1916,ҿ,1ȣ,37.9481,127.061034 +4702,ֹ,̽ż,37.65603,127.013273 +4708,ֻ,̽ż,37.620238,127.013626 +1805,۳,1ȣ,37.4876,126.753664 +1886,۵,μ,37.428514,126.657772 +3139,۵޺,õ1ȣ,37.407143,126.62597 +4614,ۻ,μ,37.737279,127.087159 +2514,,5ȣ,37.561184,126.811973 +1721,ź,1ȣ,37.075696,127.054301 +2817,,8ȣ,37.499703,127.112183 +4134,ij,9ȣ,37.510372,127.112216 +1856,,д缱,37.378455,127.114322 +2713,,7ȣ,37.67785,127.055315 +1763,,4ȣ,37.349801,126.925365 +1267,,߾Ӽ,37.580842,126.895611 +339,,3ȣ,37.487378,127.101907 +1030,,д缱,37.487472,127.101422 +9007,, ö,37.48637,127.10161 +1713,,1ȣ,37.266348,126.999561 +1846,,д缱,37.265917,126.999422 +1871,û,д缱,37.261911,127.030736 +414,(ϱû),4ȣ,37.638052,127.025732 +4315,û,źд缱,37.322702,127.095026 +2826,,8ȣ,37.437428,127.140722 +427,Ա(),4ȣ,37.54456,126.972106 +2740,ǴԱ(),7ȣ,37.496029,126.953822 +1889,,μ,37.460789,126.638297 +3219,ùΰ(ȭâ),õ2ȣ,37.458335,126.681192 +151,û,1ȣ,37.565715,126.977088 +201,û,2ȣ,37.563588,126.975411 +4509,û.δ,μ,37.239151,127.178406 +4810,ɰ,ؼ,37.369864,126.808573 +4806,,ؼ,37.450145,126.793041 +4809,û,ؼ,37.382223,126.805625 +1864,Ű,д缱,37.286102,127.111313 +2539,űȣ,5ȣ,37.554548,127.020331 +2526,ű,5ȣ,37.517623,126.914839 +1032,ű,1ȣ,37.516862,126.917865 +1760,űõ,4ȣ,37.338212,126.765844 +2649,ų,6ȣ,37.613174,127.102231 +1311,ų,ἱ,37.612887,127.103218 +4125,ų,9ȣ,37.504598,127.02506 +4306,ų,źд缱,37.504598,127.02506 +245,Ŵ,2ȣ,37.57004,127.046481 +206,Ŵ,2ȣ,37.56564,127.019614 +2636,Ŵ,6ȣ,37.566154,127.016146 +231,Ŵ,2ȣ,37.487462,126.913149 +2743,ŴŸ,7ȣ,37.499701,126.928276 +234,ŵ,2ȣ,37.508961,126.891084 +1007,ŵ,1ȣ,37.508787,126.891144 +1507,ŵе,氭,37.317185,127.40476 +230,Ÿ,2ȣ,37.484201,126.929715 +4408,Ÿ,Ÿ,37.4849266,126.9296159 +4111,Ÿ,9ȣ,37.544277,126.88308 +4122,Ź,9ȣ,37.503415,126.995925 +4104,Źȭ,9ȣ,37.567532,126.816601 +327,Ż,3ȣ,37.516334,127.020114 +4304,Ż,źд缱,37.516334,127.020114 +156,ż,1ȣ,37.576048,127.024634 +246,ż,2ȣ,37.574747,127.024932 +4713,ż,̽ż,37.576095,127.023242 +3129,ſ,õ1ȣ,37.41804,126.693863 +429,ſ,4ȣ,37.52917,126.967894 +1213,ſ,߾Ӽ,37.525545,127.372921 +1017,̹,1ȣ,37.601854,127.067325 +2520,(),5ȣ,37.524997,126.856191 +249,װŸ,2ȣ,37.520074,126.852912 +3756,ߵ,7ȣ,37.50282,126.77566 +1408,â(õ),1ȣ,36.769502,126.951108 +4807,õ,ؼ,37.439066,126.786788 +240,,2ȣ,37.555131,126.936926 +1252,,߾Ӽ,37.559733,126.942597 +1890,,μ,37.46874,126.623853 +2745,dz,7ȣ,37.50008,126.90993 +4808,,ؼ,37.409008,126.788017 +2825,,8ȣ,37.440918,127.147564 +413,ֹ,4ȣ,37.648627,127.034709 +1402,ֿ(緿),1ȣ,36.793759,127.1214 +1403,ƻ,1ȣ,36.792053,127.104361 +3209,ƽþƵ(̻Ÿ),õ2ȣ,37.5517,126.677122 +1215,ƽ,߾Ӽ,37.51382,127.443173 +2546,(̴Ĺ),5ȣ,37.551691,127.089761 +242,,2ȣ,37.557345,126.956141 +318,ȱ,3ȣ,37.576477,126.985443 +1759,Ȼ,4ȣ,37.327082,126.788532 +2640,Ⱦ(뺴),6ȣ,37.586272,127.029005 +1706,Ⱦ,1ȣ,37.401592,126.922874 +2811,ϻ,8ȣ,37.55021,127.127562 +326,б,3ȣ,37.527072,127.028461 +1848,бε,д缱,37.527381,127.040534 +2531,ֿ,5ȣ,37.553736,126.95682 +1277,ߴ,߾Ӽ,37.712327,126.761356 +1876,߸,μ,37.264179,126.879483 +1854,ž,д缱,37.411185,127.128715 +323,,3ȣ,37.554867,127.010541 +2634,,6ȣ,37.554263,127.010358 +1212,,߾Ӽ,37.545981,127.329098 +1204,,߾Ӽ,37.606596,127.107906 +332,(ʱû),3ȣ,37.484477,127.033902 +4308,(ʱû),źд缱,37.483809,127.034653 +4309,ùǽ(),źд缱,37.470023,127.03842 +1207,,߾Ӽ,37.60533,127.19364 +1909,,1ȣ,37.774381,127.044708 +248,õû,2ȣ,37.512398,126.865819 +4106,õⱳ,9ȣ,37.568381,126.841333 +4920,,,37.642379,126.614309 +2523,,5ȣ,37.525569,126.886129 +1217,,߾Ӽ,37.492773,127.491837 +4613,,μ,37.742802,127.085035 +2728,̴(),7ȣ,37.548014,127.074658 +4504,,μ,37.274917,127.143714 +1875,õ,μ,37.250102,126.90879 +4126,,9ȣ,37.507287,127.033868 +2528,dz,5ȣ,37.527098,126.932901 +2527,ǵ,5ȣ,37.521747,126.924357 +4115,ǵ,9ȣ,37.52176,126.92403 +1511,,氭,37.282308,127.628816 +1803,,1ȣ,37.485178,126.811502 +221,,2ȣ,37.500622,127.036456 +2612,,6ȣ,37.606021,126.922744 +1885,,μ,37.417804,126.67894 +311,ų,3ȣ,37.619229,126.921038 +2615,ų,6ȣ,37.618636,126.920625 +9004,ų, ö,37.61878,126.9213 +1919,õ,1ȣ,38.10073,127.07372 +4110,â,9ȣ,37.546936,126.874916 +1006,,1ȣ,37.515504,126.907628 +236,û,2ȣ,37.525706,126.89661 +2524,û,5ȣ,37.5242,126.89503 +2525,,5ȣ,37.522669,126.905139 +4217,,ö1ȣ,37.51202,126.524254 +1868,,д缱,37.251568,127.071394 +3125,ȸ,õ1ȣ,37.449396,126.701012 +342,,3ȣ,37.502129,127.128319 +2558,,5ȣ,37.502057,127.127938 +406,,4ȣ,37.705,127.19281 +1802,,1ȣ,37.494526,126.845365 +1859,,д缱,37.339824,127.108942 +2522,(񵿿),5ȣ,37.524496,126.875181 +1874,õ,μ,37.24304,126.963676 +1216,,߾Ӽ,37.506062,127.473868 +1719,,1ȣ,37.145885,127.06672 +1718,,1ȣ,37.168953,127.063197 +1762,̵,4ȣ,37.362357,126.738714 +325,,3ȣ,37.541684,127.017269 +1011,,߾Ӽ,37.540446,127.018672 +2752,¼(ȸԱ),7ȣ,37.492092,126.823023 +1821,¼(ȸԱ),1ȣ,37.492433,126.824086 +1407,¾õ,1ȣ,36.780483,127.003249 +2556,øȰ(ѱü),5ȣ,37.516201,127.130923 +4136,øȰ(ѱü),9ȣ,37.516269,127.130288 +3205,,õ2ȣ,37.592928,126.673203 +3202,ձ,õ2ȣ,37.59518,126.642696 +208,սʸ(û),2ȣ,37.561238,127.036954 +2541,սʸ(û),5ȣ,37.56184,127.037059 +1013,սʸ(û),߾Ӽ,37.561827,127.038352 +1016,ܴ,1ȣ,37.596073,127.063549 +244,,2ȣ,37.561904,127.050899 +250,(빮û),2ȣ,37.574028,127.038091 +2725,븶,7ȣ,37.573647,127.086727 +1219,빮,߾Ӽ,37.48223,127.594647 +1003,,1ȣ,37.529849,126.964561 +2517,,5ȣ,37.548768,126.836318 +1211,,߾Ӽ,37.554669,127.310115 +4512,.۴,μ,37.237845,127.209198 +4211,,ö1ȣ,37.492904,126.49379 +4924,,,37.653867,126.68393 +3227,(â),õ2ȣ,37.440127,126.75997 +1278,,߾Ӽ,37.725826,126.767257 +9000,, ö,37.71614,126.72841 +1286,õ,߾Ӽ,37.879942,126.769999 +4814,,ؼ,37.31321,126.796261 +1951,,3ȣ,37.653324,126.843041 +1218,,߾Ӽ,37.468672,127.547076 +4815,,ؼ,37.302371,126.786691 +1884,,μ,37.413049,126.686648 +3130,,õ1ȣ,37.412333,126.687869 +1981,,ؼ,37.5239,126.8049 +1948,,3ȣ,37.650658,126.872642 +1020,,1ȣ,37.633212,127.058831 +2642,(),6ȣ,37.601948,127.041518 +1879,,μ,37.391769,126.742699 +2620,Ű(),6ȣ,37.569532,126.899298 +1282,,߾Ӽ,37.796188,126.792587 +203,3,2ȣ,37.566306,126.991696 +320,3,3ȣ,37.566672,126.992548 +204,4,2ȣ,37.566595,126.997817 +2536,4,5ȣ,37.567352,126.998032 +202,Ա,2ȣ,37.566014,126.982618 +1012,,߾Ӽ,37.549946,127.034538 +2611,,6ȣ,37.598605,126.915577 +1710,ǿ,1ȣ,37.320852,126.948217 +1906,,1ȣ,37.738415,127.045958 +4605,νû,μ,37.739256,127.034781 +4607,߾,μ,37.743676,127.049565 +241,̴,2ȣ,37.556733,126.946013 +1502,̸,氭,37.394655,127.127819 +1860,̸,д缱,37.395371,127.128248 +2738,̼,7ȣ,37.485196,126.981605 +1508,õ,氭,37.265579,127.44226 +430,(߾ӹڹ),4ȣ,37.522295,126.974733 +1008,(߾ӹڹ),߾Ӽ,37.522427,126.973406 +2631,¿,6ȣ,37.534488,126.994302 +1455,δ,4ȣ,37.401553,126.976715 +1812,õ,1ȣ,37.476079,126.616801 +1891,õ,μ,37.476403,126.617326 +3215,õ,õ2ȣ,37.4897,126.675208 +4213,õ1͹̳,ö1ȣ,37.447464,126.452508 +4215,õ2͹̳,ö1ȣ,37.460699,126.441442 +1881,õ,μ,37.400614,126.722478 +3226,õ,õ2ȣ,37.448769,126.752618 +3136,õԱ,õ1ȣ,37.386007,126.639484 +3124,õû,õ1ȣ,37.457263,126.702143 +3221,õû,õ2ȣ,37.456833,126.701306 +3126,õ͹̳,õ1ȣ,37.442383,126.699706 +1888,ϴ,μ,37.448493,126.649619 +1275,ϻ,߾Ӽ,37.682077,126.769846 +338,Ͽ,3ȣ,37.483681,127.08439 +1285,,߾Ӽ,37.888421,126.746765 +3113,,õ1ȣ,37.545059,126.738665 +3116,,õ1ȣ,37.530415,126.722527 +216,(ıû),2ȣ,37.513262,127.100159 +2815,(ıû),8ȣ,37.514692,127.104338 +215,dz,2ȣ,37.520733,127.10379 +217,ǻ,2ȣ,37.511687,127.086162 +328,,3ȣ,37.512759,127.01122 +4923,,,37.643986,126.669017 +2742,¹,7ȣ,37.504898,126.93915 +2711,,7ȣ,37.700109,127.053196 +2820,,8ȣ,37.478703,127.126191 +2544,,5ȣ,37.56144,127.064623 +1918,,1ȣ,38.02458,127.0718 +4517,.,μ,37.285342,127.219561 +4710,,̽ż,37.603133,127.013396 +1956,߻,3ȣ,37.659477,126.773359 +1454,ΰõû,4ȣ,37.426513,126.98978 +1761,,4ȣ,37.351735,126.742989 +1857,,д缱,37.365994,127.10807 +4312,,źд缱,37.367098,127.108403 +157,⵿,1ȣ,37.578103,127.034893 +1810,,1ȣ,37.466769,126.656666 +152,,1ȣ,37.570161,126.982923 +153,3,1ȣ,37.570406,126.991847 +319,3,3ȣ,37.571605,126.991791 +2535,3,5ȣ,37.57254,126.990305 +154,5,1ȣ,37.570926,127.001849 +218,տ,2ȣ,37.511022,127.073704 +4130,տ,9ȣ,37.511426,127.076275 +1809,־,1ȣ,37.465047,126.679742 +3218,־,õ2ȣ,37.464992,126.679098 +3217,־ȱ,õ2ȣ,37.473703,126.68113 +1957,ֿ,3ȣ,37.670072,126.761334 +1862,,д缱,37.324753,127.107395 +2716,߰,7ȣ,37.644583,127.064303 +2726,߰,7ȣ,37.565923,127.08432 +1822,ߵ,1ȣ,37.486562,126.764843 +1201,߶,߾Ӽ,37.594917,127.076116 +1756,߾,4ȣ,37.315941,126.838573 +4138,߾Ӻƺ,9ȣ,37.529191,127.148739 +2721,ȭ,7ȣ,37.602545,127.079264 +4108,,9ȣ,37.557402,126.861939 +2618,(),6ȣ,37.583876,126.909645 +4503,,μ,37.269606,127.136515 +3135,,õ1ȣ,37.378384,126.645168 +1723,,1ȣ,37.0188,127.070444 +309,,3ȣ,37.648033,126.913917 +1220,,߾Ӽ,37.476393,127.629874 +1912,,1ȣ,37.892334,127.055716 +1726,,1ȣ,36.870593,127.143904 +1720,,1ȣ,37.109447,127.062278 +405,,4ȣ,37.7205,127.2034 +412,â,4ȣ,37.653088,127.047274 +1022,â,߾Ӽ,37.653007,127.047806 +2638,â,6ȣ,37.579661,127.015241 +1318,õ,ἱ,37.658978,127.285379 +1728,õ,1ȣ,36.810005,127.146826 +2751,õ,7ȣ,37.486637,126.838713 +2548,õȣ(dz伺),5ȣ,37.53864,127.123308 +2812,õȣ(dz伺),8ȣ,37.538113,127.123254 +2749,ö,7ȣ,37.47605,126.867911 +4310,ûԱ,źд缱,37.447211,127.055664 +2538,û,5ȣ,37.560276,127.013639 +2635,û,6ȣ,37.560608,127.013986 +2731,û,7ȣ,37.519365,127.05335 +4210,û,ö1ȣ,37.556409,126.624648 +158,û(øԱ),1ȣ,37.579956,127.044585 +1014,û(øԱ),߾Ӽ,37.580759,127.0483 +1867,û,д缱,37.259489,127.078934 +1321,û,ἱ,37.735488,127.42661 +4506,ʴ,μ,37.260752,127.159443 +1917,ʼ,1ȣ,37.98172,127.06912 +1505,ʿ,氭,37.374419,127.299 +4813,,ؼ,37.319619,126.808147 +1758,,4ȣ,37.320646,126.805913 +432,ѽŴԱ(̼),4ȣ,37.486263,126.981989 +3755,,7ȣ,37.50365,126.78828 +1329,õ,ἱ,37.885054,127.717023 +321,湫,3ȣ,37.56143,126.994072 +423,湫,4ȣ,37.561207,126.99408 +243,(Ա),2ȣ,37.559704,126.964378 +2532,(Ա),5ȣ,37.560236,126.9629 +3133,ķ۽Ÿ,õ1ȣ,37.387855,126.661673 +9001,Ųؽ, ö,37.66532,126.74843 +1276,ź,߾Ӽ,37.694023,126.761086 +4615,ž,μ,37.733579,127.088704 +1404,,1ȣ,36.78866,127.08485 +2646,¸Ա,6ȣ,37.617338,127.074735 +2719,¸Ա,7ȣ,37.618294,127.075397 +1852,,д缱,37.440019,127.127709 +3134,ũũ,õ1ȣ,37.382268,126.656365 +1314,,ἱ,37.648311,127.143952 +1283,,߾Ӽ,37.815298,126.792783 +1501,DZ,氭,37.394761,127.111217 +4311,DZ,źд缱,37.394761,127.112217 +1210,ȴ,߾Ӽ,37.547371,127.243939 +1317,ȣ,ἱ,37.653225,127.244493 +1456,,4ȣ,37.394287,126.963883 +1724,,1ȣ,36.990726,127.085159 +4927,dz,,37.612488,126.732387 +1274,dz,߾Ӽ,37.672346,126.786243 +2717,ϰ,7ȣ,37.636352,127.06799 +2565,ϳ˴ܻ,5ȣ,37.53972,127.22345 +2566,ϳû(dz-),5ȣ,37.54205,127.20612 +2564,ϳdz,5ȣ,37.552034,127.203864 +2733,е,7ȣ,37.514229,127.031656 +336,п,3ȣ,37.496663,127.070594 +2632,Ѱ,6ȣ,37.539631,127.001725 +1010,ѳ,߾Ӽ,37.52943,127.009169 +1755,Ѵ,4ȣ,37.309689,126.85344 +419,ѼԱ(Ｑ),4ȣ,37.588458,127.006221 +4135,Ѽ,9ȣ,37.516404,127.116503 +209,Ѿ,2ȣ,37.555273,127.043655 +1024,Ƽ,д缱,37.496237,127.052873 +238,,2ȣ,37.549457,126.913808 +2623,,6ȣ,37.549209,126.913366 +2540,,5ȣ,37.557322,127.029476 +1270,,߾Ӽ,37.612102,126.834146 +420,ȭ,4ȣ,37.582336,127.001844 +1882,ȣ,μ,37.401637,126.708627 +239,ȫԱ,2ȣ,37.55679,126.923708 +1293,ȫԱ,߾Ӽ,37.557641,126.926683 +1264,ȫԱ,߾Ӽ,37.557641,126.926683 +4203,ȫԱ,ö1ȣ,37.557438,126.926715 +314,ȫ,3ȣ,37.589066,126.943736 +4705,ȭ,̽ż,37.634133,127.017511 +2518,ȭ,5ȣ,37.541513,126.840461 +2647,ȭ(￩Ա),6ȣ,37.620064,127.084689 +1712,ȭ,1ȣ,37.283862,126.989627 +1268,ȭ,߾Ӽ,37.602888,126.868387 +1952,ȭ,3ȣ,37.634592,126.83265 +1015,ȸ,߾Ӽ,37.58946,127.057583 +1905,ȸ,1ȣ,37.724416,127.04736 +4602,ȸ,μ,37.725006,127.047073 +425,ȸ(빮),4ȣ,37.558514,126.978246 +4611,ȿ,μ,37.754025,127.076902 +2628,ȿâ,6ȣ,37.539233,126.961384 +1261,ȿâ,߾Ӽ,37.538579,126.96221 +4119,漮(߾ӴԱ),9ȣ,37.50877,126.963708 +4606,Ｑ,μ,37.743302,127.037023 \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java new file mode 100644 index 000000000..741270ee0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java @@ -0,0 +1,39 @@ +package com.bang_ggood.station; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.station.service.SubwayStationService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SubwayStationServiceTest extends IntegrationTestSupport { + + @Autowired + SubwayStationService subwayStationService; + + @DisplayName("가까운 지하철 조회 성공") + @ParameterizedTest + @MethodSource("provideStationData") + void readNearestStation(double latitude, double longitude, String nearestStationName) { + // given & when + String stationName = subwayStationService.readNearestStation(latitude, longitude).stationName(); + + // then + assertThat(stationName).isEqualTo(nearestStationName); + } + + // check data in "https://apis.map.kakao.com/web/sample/addMapClickEventWithMarker/" + private static Stream provideStationData() { + return Stream.of( + Arguments.of(37.50495731889611, 126.7550884277559, "상동"), + Arguments.of(37.48352733443973, 126.80085909322227, "소사"), + Arguments.of(37.47909015564278, 126.9517354974442, "서울대입구(관악구청)"), + Arguments.of(37.516248619935034, 127.10303565244502, "잠실(송파구청)") + ); + } +} diff --git a/backend/bang-ggood/src/test/resources/seoul_stations_240819.csv b/backend/bang-ggood/src/test/resources/seoul_stations_240819.csv new file mode 100644 index 000000000..21d1ae50f --- /dev/null +++ b/backend/bang-ggood/src/test/resources/seoul_stations_240819.csv @@ -0,0 +1,768 @@ +_ID,,ȣ,,浵 +4703,4.19ֹ,̽ż,37.649502,127.013684 +1907,,1ȣ,37.748577,127.044213 +340,,3ȣ,37.492245,127.117757 +2818,,8ȣ,37.492888,127.118398 +2748,д,7ȣ,37.480338,126.882656 +1702,д,1ȣ,37.481581,126.882581 +4107,,9ȣ,37.561391,126.854456 +4704,,̽ż,37.641537,127.016789 +3216,,õ2ȣ,37.484192,126.683673 +3211,(Ƽ),õ2ȣ,37.524649,126.675539 +3212,߾ӽ,õ2ȣ,37.517054,126.676672 +1265,,߾Ӽ,37.568491,126.915487 +1851,õ,д缱,37.448605,127.126697 +1323,,ἱ,37.814536,127.510739 +1816,,1ȣ,37.464737,126.694181 +3123,Ÿ,õ1ȣ,37.467048,126.707938 +1312,,ἱ,37.634118,127.114757 +3117,,õ1ȣ,37.517268,126.721514 +222,,2ȣ,37.49799,127.027912 +4307,,źд缱,37.496837,127.028104 +2732,û,7ȣ,37.517179,127.041255 +1849,û,д缱,37.517469,127.041151 +4502,,μ,37.270161,127.126033 +2549,,5ȣ,37.535804,127.132481 +2813,û,8ȣ,37.530341,127.120508 +1269,,߾Ӽ,37.612314,126.843223 +214,(͹̳),2ȣ,37.535095,127.094681 +9995,,5ȣ,37.55749,127.17593 +1326,,ἱ,37.805723,127.634146 +2559,,5ȣ,37.498079,127.13482 +1801,,1ȣ,37.494594,126.85968 +1027,,д缱,37.489116,127.06614 +4101,ȭ,9ȣ,37.578608,126.798153 +2512,ȭ,5ȣ,37.572399,126.806171 +2560,ſ,5ȣ,37.493105,127.14415 +212,ǴԱ,2ȣ,37.540373,127.069191 +2729,ǴԱ,7ȣ,37.540786,127.071011 +4925,Ϻ,,37.63165,126.705975 +3203,˴ܻŸ,õ2ȣ,37.60185,126.657108 +3201,˴ܿ(˴ܻ),õ2ȣ,37.594877,126.627178 +3208,˹,õ2ȣ,37.561405,126.677566 +4209,˾,ö1ȣ,37.569098,126.674007 +3207,˾,õ2ȣ,37.56866,126.675687 +1504,Ɽ,氭,37.399907,127.25263 +4610,⵵ûϺû,μ,37.75059,127.071495 +1451,渶,4ȣ,37.443885,127.007888 +317,溹(μû),3ȣ,37.575762,126.97353 +3115,αԱ,õ1ȣ,37.538157,126.722597 +4604,ö,μ,37.737202,127.043257 +341,,3ȣ,37.495918,127.12454 +3114,,õ1ȣ,37.543238,126.728128 +4208,,ö1ȣ,37.571662,126.7363 +3110,,õ1ȣ,37.571449,126.73578 +2553,,5ȣ,37.555004,127.154151 +2641,(),6ȣ,37.590508,127.036296 +1873,,μ,37.24963,126.980248 +329,͹̳,3ȣ,37.504891,127.004916 +2736,͹̳,7ȣ,37.503367,127.005068 +4123,͹̳,9ȣ,37.50598,127.004403 +1757,,4ȣ,37.316784,126.823144 +4513,,μ,37.24484,127.214251 +4928,,,37.601243,126.770345 +1272,,߾Ӽ,37.645676,126.801762 +4612,,μ,37.750471,127.083715 +1506,,氭,37.351315,127.34674 +2530,,5ȣ,37.544431,126.951372 +2627,,6ȣ,37.543555,126.951678 +1292,,߾Ӽ,37.542596,126.952099 +4202,,ö1ȣ,37.54253,126.952024 +2718,(б),7ȣ,37.625742,127.072896 +4103,׽,9ȣ,37.563726,126.810678 +4212,ȭû,ö1ȣ,37.459041,126.477516 +1453,õ,4ȣ,37.433021,126.996568 +1705,,1ȣ,37.419232,126.908706 +4411,ǻ(),Ÿ,37.4691018,126.9450639 +4319,(),źд缱,37.30211,127.044483 +4318,߾(ִ),źд缱,37.288617,127.051478 +2547,(Ŵ),5ȣ,37.545303,127.10357 +1750,,1ȣ,37.416182,126.884466 +2750,Ÿ,7ȣ,37.479252,126.854876 +1019,,1ȣ,37.623632,127.061835 +2534,ȭ(ȭȸ),5ȣ,37.571525,126.97717 +2625,â(),6ȣ,37.547456,126.931993 +223,(.û),2ȣ,37.493961,127.014667 +330,(.û),3ȣ,37.493025,127.013786 +4921,,,37.645384,126.628633 +1701,,1ȣ,37.503039,126.881966 +232,εд,2ȣ,37.485266,126.901401 +1026,,д缱,37.486839,127.058856 +1205,,߾Ӽ,37.603392,127.143869 +4121,,9ȣ,37.501364,126.987332 +2616,,6ȣ,37.611377,126.91727 +1863,,д缱,37.298969,127.105664 +9009,, ö,37.29913,127.10389 +213,(û),2ȣ,37.537077,127.085916 +1813,,1ȣ,37.496756,126.870793 +310,Ĺ,3ȣ,37.636763,126.918821 +1214,,߾Ӽ,37.516169,127.399367 +3138,,õ1ȣ,37.399907,126.630347 +4114,ȸǻ,9ȣ,37.528105,126.917874 +2545,(ɵ),5ȣ,37.557088,127.079577 +2727,(ɵ),7ȣ,37.556897,127.079338 +1709,,1ȣ,37.35356,126.948462 +1324,,ἱ,37.832067,127.557695 +2760,õ,7ȣ,37.506997,126.73128 +2551,ٸ(ȸ),5ȣ,37.545477,127.142853 +3111,,õ1ȣ,37.566379,126.742654 +1316,ݰ,ἱ,37.637382,127.207853 +1279,ݸ,߾Ӽ,37.751322,126.765347 +1708,,1ȣ,37.372221,126.943429 +1458,,4ȣ,37.372209,126.943417 +1703,õû,1ȣ,37.455626,126.89398 +1280,,߾Ӽ,37.766217,126.774644 +324,ȣ,3ȣ,37.548034,127.015872 +1865,,д缱,37.275061,127.11591 +4501,,μ,37.275449,127.116665 +2550,浿,5ȣ,37.537801,127.140004 +417,,4ȣ,37.603407,127.025053 +4511,跮,μ,37.237247,127.198781 +1327,,ἱ,37.818466,127.71434 +2513,,5ȣ,37.562384,126.801292 +4102,,9ȣ,37.561916,126.802152 +4207,,ö1ȣ,37.561842,126.801904 +4929,,,37.56236,126.801868 +1980,,ؼ,37.5617,126.8041 +2519,ġ,5ȣ,37.531768,126.846683 +2753,ġ,7ȣ,37.506207,126.810939 +227,,2ȣ,37.47693,126.963693 +2747,,7ȣ,37.486056,126.887249 +3225,û,õ2ȣ,37.448161,126.736939 +1883,δũ,μ,37.407722,126.695216 +331,͹̳(),3ȣ,37.485013,127.016189 +2739,,7ȣ,37.484596,126.971251 +1002,,1ȣ,37.541021,126.9713 +2828,,8ȣ,37.4624,127.13977 +1328,õ,ἱ,37.864007,127.723792 +434,·,4ȣ,37.463873,126.989134 +2823,ѻ꼺Ա(.û),8ȣ,37.451535,127.159816 +2737,,7ȣ,37.487618,126.993513 +4118,,9ȣ,37.512887,126.953222 +4117,뷮,9ȣ,37.513534,126.941005 +1004,뷮,1ȣ,37.514149,126.94271 +411,,4ȣ,37.65627,127.063276 +2715,,7ȣ,37.654836,127.060462 +313,,3ȣ,37.600927,126.935756 +2630,(걸û),6ȣ,37.534675,126.986695 +1908,,1ȣ,37.75938,127.042292 +1021,õ,1ȣ,37.644799,127.051269 +2734,,7ȣ,37.511093,127.021415 +4305,,źд缱,37.511093,127.021415 +1271,ɰ,߾Ӽ,37.618808,126.820783 +2824,ܴŸ,8ȣ,37.44521,127.156866 +4811,޹,ؼ,37.348847,126.809409 +1878,޿,μ,37.379681,126.745177 +2543,ʸ,5ȣ,37.566747,127.052704 +409,,4ȣ,37.670272,127.079066 +4407,,Ÿ,37.4902998,126.9275133 +237,,2ȣ,37.534946,126.902767 +4113,,9ȣ,37.533406,126.902809 +1729,,1ȣ,37.344285,126.948345 +9002,, ö,37.63191,126.81113 +1953,,3ȣ,37.631626,126.811024 +1452,,4ȣ,37.435675,127.006523 +233,븲(αû),2ȣ,37.493243,126.894932 +2746,븲(αû),7ȣ,37.493013,126.897075 +1028,Ա,д缱,37.491373,127.07272 +1005,,1ȣ,37.513342,126.926382 +4402,,Ÿ,37.5133059,126.9257265 +1320,뼺,ἱ,37.684071,127.379319 +1752,߹,4ȣ,37.328467,126.917332 +337,û,3ȣ,37.493514,127.079532 +335,ġ,3ȣ,37.494612,127.063642 +1958,ȭ,3ȣ,37.676087,126.747569 +2626,(),6ȣ,37.547771,126.942069 +1910,,1ȣ,37.818486,127.056486 +1208,,߾Ӽ,37.586781,127.208832 +1911,,1ȣ,37.843188,127.061277 +334,,3ȣ,37.490922,127.055452 +1025,,д缱,37.491224,127.055186 +1206,,߾Ӽ,37.608806,127.161153 +247,õ,2ȣ,37.514287,126.882768 +1902,,1ȣ,37.679563,127.045595 +2712,,7ȣ,37.689241,127.046509 +1903,,1ȣ,37.689534,127.046049 +1209,,߾Ӽ,37.579622,127.222672 +1817,,1ȣ,37.468446,126.642706 +1823,ȭ,1ȣ,37.46607,126.668672 +316,,3ȣ,37.574571,126.957748 +2614,,6ȣ,37.618456,126.933031 +1714,,1ȣ,37.466613,126.889249 +3206,,õ2ȣ,37.585212,126.675844 +2644,,6ȣ,37.610537,127.056431 +155,빮,1ȣ,37.571687,127.01093 +421,빮,4ȣ,37.57093,127.009287 +205,빮繮ȭ,2ȣ,37.565613,127.009054 +422,빮繮ȭ,4ȣ,37.565133,127.007885 +2537,빮繮ȭ,5ȣ,37.564665,127.005353 +322,Ա,3ȣ,37.559052,127.005602 +1915,õ,1ȣ,37.927878,127.05479 +1913,õ߾,1ȣ,37.901885,127.056482 +3132,,õ1ȣ,37.397878,126.674005 +159,,1ȣ,37.573197,127.01648 +2637,,6ȣ,37.572279,127.015653 +4505,,μ,37.269043,127.152716 +3121,,õ1ȣ,37.485312,126.718247 +1808,,1ȣ,37.471408,126.702896 +4608,,μ,37.745271,127.056947 +1811,õ,1ȣ,37.475276,126.632802 +431,(),4ȣ,37.502852,126.980347 +4120,(),9ȣ,37.502878,126.978153 +4314,õ,źд缱,37.337928,127.102976 +3131,,õ1ȣ,37.404737,126.681015 +9010,ź, ö,37.20034,127.09569 +1727,,1ȣ,36.833705,127.14896 +4515,,μ,37.267051,127.21364 +2555,̵,5ȣ,37.527788,127.136248 +4137,̿,9ȣ,37.519683,127.137989 +4109,,9ȣ,37.550632,126.865689 +2619,й̵Ƽ,6ȣ,37.576108,126.901391 +1294,й̵Ƽ,߾Ӽ,37.577475,126.900453 +4204,й̵Ƽ,ö1ȣ,37.576958,126.898609 +210,Ҽ,2ȣ,37.547184,127.047367 +2730,Ҽ,7ȣ,37.53154,127.066704 +2515,,5ȣ,37.560183,126.825448 +4105,,9ȣ,37.566778,126.82731 +4206,,ö1ȣ,37.565543,126.827378 +1955,,3ȣ,37.652206,126.77762 +2714,,7ȣ,37.66494,127.057675 +4922,,,37.640732,126.644344 +1319,,ἱ,37.652782,127.311767 +2542,,5ȣ,37.5661,127.042973 +3204,,õ2ȣ,37.597566,126.666998 +2561,õ,5ȣ,37.49499,127.152781 +2529,,5ȣ,37.539574,126.945932 +2621,û,6ȣ,37.563515,126.903343 +3224,,õ2ȣ,37.454911,126.732094 +1203,,߾Ӽ,37.59955,127.091909 +2622,,6ȣ,37.556094,126.910052 +1904,,1ȣ,37.709914,127.047455 +1869,,д缱,37.245795,127.057353 +1872,ű,д缱,37.265481,127.015678 +333,ź,3ȣ,37.486947,127.046769 +1870,źǼ,д缱,37.252759,127.040566 +2720,԰,7ȣ,37.610637,127.077725 +2723,,7ȣ,37.588579,127.087503 +424,,4ȣ,37.560989,126.986325 +2552,,5ȣ,37.55137,127.143999 +4510,,μ,37.237964,127.190294 +1707,,1ȣ,37.384653,126.935433 +2827,,8ȣ,37.433824,127.129837 +1853,,д缱,37.432052,127.129104 +3223,𷡳,õ2ȣ,37.45583,126.719298 +2521,,5ȣ,37.526065,126.864931 +2814,伺(ȭǹ),8ȣ,37.517409,127.112359 +315,,3ȣ,37.582299,126.950291 +235,,2ȣ,37.517933,126.89476 +1284,,߾Ӽ,37.854619,126.788047 +2819,,8ȣ,37.485855,127.1225 +3127,а,õ1ȣ,37.434935,126.698579 +1858,̱,д缱,37.350077,127.10891 +4313,̱,źд缱,37.349982,127.108918 +9996,̻,5ȣ,37.560927,127.193877 +415,̾(̹),4ȣ,37.62667,127.025983 +416,̾ƻŸ,4ȣ,37.613292,127.030053 +3112,,õ1ȣ,37.553703,126.745077 +1753,ݿ,4ȣ,37.312212,126.903524 +2735,,7ȣ,37.508178,127.011727 +4601,߰,μ,37.727048,127.052803 +2516,߻,5ȣ,37.558598,126.837668 +225,,2ȣ,37.481426,126.997596 +2557,,5ȣ,37.508857,127.126133 +1901,,1ȣ,37.667503,127.044273 +2511,ȭ,5ȣ,37.577446,126.812741 +1405,,1ȣ,36.777629,127.052991 +1273,鸶,߾Ӽ,37.658239,126.794461 +1954,鼮,3ȣ,37.643114,126.78787 +1325,縮,ἱ,37.830779,127.58933 +1807,,1ȣ,37.483664,126.707704 +2633,Ƽ,6ȣ,37.548013,127.007055 +1457,,4ȣ,37.389793,126.950806 +4603,,μ,37.728755,127.04353 +1313,,ἱ,37.64202,127.12684 +408,,4ȣ,37.66778,127.11581 +1716,,1ȣ,37.207503,127.032731 +2744,,7ȣ,37.499872,126.920428 +4404,,Ÿ,37.5002739,126.9204355 +4405,Ű,Ÿ,37.4955691,126.9180827 +4406,ź,Ÿ,37.4929598,126.9234964 +2639,,6ȣ,37.585274,127.019351 +4712,,̽ż,37.585286,127.019381 +1914,,1ȣ,37.913702,127.057277 +1861,,д缱,37.312752,127.108196 +4514,,μ,37.258965,127.218457 +2821,,8ȣ,37.471052,127.126732 +1031,,д缱,37.470345,127.126658 +1401,,1ȣ,36.801215,127.135763 +4129,,9ȣ,37.514219,127.060245 +229,õ,2ȣ,37.482362,126.941892 +2648,ȭ(Ƿ),6ȣ,37.617283,127.091401 +1815,ΰ,1ȣ,37.488418,126.74109 +1509,ι,氭,37.260192,127.490277 +1804,õ,1ȣ,37.48405,126.782686 +2757,õû,7ȣ,37.504631,126.763538 +2754,õտ,7ȣ,37.50538,126.797337 +1982,õտ,ؼ,37.505457,126.797289 +1806,,1ȣ,37.489445,126.724506 +3120,,õ1ȣ,37.490535,126.723453 +2761,û,7ȣ,37.507394,126.721599 +3118,û,õ1ȣ,37.508407,126.720555 +3122,Ÿ,õ1ȣ,37.477679,126.710208 +3119,,õ1ȣ,37.498383,126.722244 +4709,ѻ꺸,̽ż,37.612072,127.008251 +4701,ѻ,̽ż,37.662909,127.012706 +312,ұ,3ȣ,37.610553,126.92982 +2613,ұ,6ȣ,37.610873,126.92939 +2724,簡,7ȣ,37.580894,127.088478 +226,,2ȣ,37.476538,126.981544 +433,,4ȣ,37.476955,126.981651 +1315,縪,ἱ,37.65108,127.176933 +1877,縮,μ,37.28998,126.85685 +4926,(û),,37.620249,126.719731 +4124,,9ȣ,37.504206,127.015259 +3762,,7ȣ,37.5086,126.7035277 +1751,꺻,4ȣ,37.358101,126.933274 +2822,꼺,8ȣ,37.457122,127.149908 +4508,ﰡ,μ,37.242115,127.168075 +428,ﰢ,4ȣ,37.534075,126.9726 +2629,ﰢ,6ȣ,37.535534,126.974032 +1503,ﵿ,氭,37.409522,127.20336 +2759,ü,7ȣ,37.506411,126.742153 +3759,ü,7ȣ,37.50724,126.74179 +9006,Ｚ, ö,37.50887,127.06324 +219,Ｚ(),2ȣ,37.508844,127.06316 +4128,Ｚ߾,9ȣ,37.513011,127.053282 +1950,,3ȣ,37.653083,126.895558 +4706,,̽ż,37.626914,127.018106 +4707,Ÿ,̽ż,37.621337,127.020473 +4131,,9ȣ,37.504738,127.088025 +1866,,д缱,37.26181,127.108847 +410,,4ȣ,37.660878,127.073572 +2741,,7ȣ,37.502834,126.94791 +3758,,7ȣ,37.505814,126.753163 +1754,ϼ,4ȣ,37.302795,126.866489 +2722,(ÿܹ͹̳),7ȣ,37.595577,127.085716 +1202,(ÿܹ͹̳),߾Ӽ,37.596678,127.08504 +2624,,6ȣ,37.547716,126.922852 +207,սʸ,2ȣ,37.564354,127.029354 +2643,(ѱб),6ȣ,37.606377,127.048491 +2554,ϵ,5ȣ,37.556712,127.166417 +1322,õ,ἱ,37.770246,127.454821 +4317,,źд缱,37.297664,127.069342 +4609,,μ,37.748885,127.06362 +2617,(Ż),6ȣ,37.591148,126.913629 +4116,,9ȣ,37.517274,126.928422 +4401,,Ÿ,37.5170969,126.929399 +1263,,߾Ӽ,37.551881,126.935711 +3210,û,õ2ȣ,37.543742,126.676787 +2533,빮,5ȣ,37.565773,126.966641 +1749,ź,1ȣ,37.195504,127.051672 +3214,οȸ,õ2ȣ,37.500168,126.675795 +1009,,߾Ӽ,37.519594,126.988537 +9005,, ö,37.55569,126.97296 +4410,뺥óŸ,Ÿ,37.4720019,126.9339351 +228,Ա(DZû),2ȣ,37.481247,126.952739 +1847,｣,д缱,37.543617,127.044707 +426,￪,4ȣ,37.55281,126.972556 +1001,￪,1ȣ,37.554337,126.971134 +1291,￪,߾Ӽ,37.557231,126.97103 +4201,￪,ö1ȣ,37.553247,126.969769 +4403,溴û,Ÿ,37.5060464,126.9227083 +4409,,Ÿ,37.4782341,126.9330365 +1722,,1ȣ,37.056496,127.052819 +224,,2ȣ,37.491897,127.007917 +1855,,д缱,37.385126,127.123592 +2645,,6ȣ,37.614872,127.065595 +1018,,1ȣ,37.614532,127.065934 +3763,(źϽ),7ȣ,37.5062285,126.6762813 +3213,(źϽ),õ2ȣ,37.506193,126.676203 +3220,,õ2ȣ,37.457611,126.692575 +1704,,1ȣ,37.435047,126.902295 +3222,õŸ,õ2ȣ,37.456805,126.709986 +2816,,8ȣ,37.505557,127.106832 +4133,,9ȣ,37.505208,127.10704 +4132,̰,9ȣ,37.502558,127.097033 +220,,2ȣ,37.504286,127.048203 +1023,,д缱,37.504856,127.048807 +1450,,4ȣ,37.451673,127.002303 +4812,,ؼ,37.334353,126.809904 +4112,,9ȣ,37.53802,126.893525 +4127,,9ȣ,37.510297,127.043999 +1850,,д缱,37.510735,127.043677 +3128,,õ1ȣ,37.426684,126.698863 +1711,հ,1ȣ,37.300349,126.97075 +1512,,氭,37.39468,127.11945 +9008,, ö,37.39467,127.12058 +4316,,źд缱,37.313335,127.0801 +211,,2ȣ,37.544581,127.055961 +418,ſԱ(),4ȣ,37.592612,127.016441 +4711,ſԱ(),̽ż,37.592467,127.016516 +1725,ȯ,1ȣ,36.916076,127.126964 +1715,,1ȣ,37.245025,127.013222 +1717,,1ȣ,37.187533,127.04318 +1510,ո,氭,37.295309,127.570938 +3137,Ʈũ,õ1ȣ,37.393054,126.634729 +1880,ҷ,μ,37.40095,126.733522 +1814,һ,1ȣ,37.482753,126.79544 +4804,һ,ؼ,37.483279,126.795023 +4805,һ,ؼ,37.468467,126.797252 +1916,ҿ,1ȣ,37.9481,127.061034 +4702,ֹ,̽ż,37.65603,127.013273 +4708,ֻ,̽ż,37.620238,127.013626 +1805,۳,1ȣ,37.4876,126.753664 +1886,۵,μ,37.428514,126.657772 +3139,۵޺,õ1ȣ,37.407143,126.62597 +4614,ۻ,μ,37.737279,127.087159 +2514,,5ȣ,37.561184,126.811973 +1721,ź,1ȣ,37.075696,127.054301 +2817,,8ȣ,37.499703,127.112183 +4134,ij,9ȣ,37.510372,127.112216 +1856,,д缱,37.378455,127.114322 +2713,,7ȣ,37.67785,127.055315 +1763,,4ȣ,37.349801,126.925365 +1267,,߾Ӽ,37.580842,126.895611 +339,,3ȣ,37.487378,127.101907 +1030,,д缱,37.487472,127.101422 +9007,, ö,37.48637,127.10161 +1713,,1ȣ,37.266348,126.999561 +1846,,д缱,37.265917,126.999422 +1871,û,д缱,37.261911,127.030736 +414,(ϱû),4ȣ,37.638052,127.025732 +4315,û,źд缱,37.322702,127.095026 +2826,,8ȣ,37.437428,127.140722 +427,Ա(),4ȣ,37.54456,126.972106 +2740,ǴԱ(),7ȣ,37.496029,126.953822 +1889,,μ,37.460789,126.638297 +3219,ùΰ(ȭâ),õ2ȣ,37.458335,126.681192 +151,û,1ȣ,37.565715,126.977088 +201,û,2ȣ,37.563588,126.975411 +4509,û.δ,μ,37.239151,127.178406 +4810,ɰ,ؼ,37.369864,126.808573 +4806,,ؼ,37.450145,126.793041 +4809,û,ؼ,37.382223,126.805625 +1864,Ű,д缱,37.286102,127.111313 +2539,űȣ,5ȣ,37.554548,127.020331 +2526,ű,5ȣ,37.517623,126.914839 +1032,ű,1ȣ,37.516862,126.917865 +1760,űõ,4ȣ,37.338212,126.765844 +2649,ų,6ȣ,37.613174,127.102231 +1311,ų,ἱ,37.612887,127.103218 +4125,ų,9ȣ,37.504598,127.02506 +4306,ų,źд缱,37.504598,127.02506 +245,Ŵ,2ȣ,37.57004,127.046481 +206,Ŵ,2ȣ,37.56564,127.019614 +2636,Ŵ,6ȣ,37.566154,127.016146 +231,Ŵ,2ȣ,37.487462,126.913149 +2743,ŴŸ,7ȣ,37.499701,126.928276 +234,ŵ,2ȣ,37.508961,126.891084 +1007,ŵ,1ȣ,37.508787,126.891144 +1507,ŵе,氭,37.317185,127.40476 +230,Ÿ,2ȣ,37.484201,126.929715 +4408,Ÿ,Ÿ,37.4849266,126.9296159 +4111,Ÿ,9ȣ,37.544277,126.88308 +4122,Ź,9ȣ,37.503415,126.995925 +4104,Źȭ,9ȣ,37.567532,126.816601 +327,Ż,3ȣ,37.516334,127.020114 +4304,Ż,źд缱,37.516334,127.020114 +156,ż,1ȣ,37.576048,127.024634 +246,ż,2ȣ,37.574747,127.024932 +4713,ż,̽ż,37.576095,127.023242 +3129,ſ,õ1ȣ,37.41804,126.693863 +429,ſ,4ȣ,37.52917,126.967894 +1213,ſ,߾Ӽ,37.525545,127.372921 +1017,̹,1ȣ,37.601854,127.067325 +2520,(),5ȣ,37.524997,126.856191 +249,װŸ,2ȣ,37.520074,126.852912 +3756,ߵ,7ȣ,37.50282,126.77566 +1408,â(õ),1ȣ,36.769502,126.951108 +4807,õ,ؼ,37.439066,126.786788 +240,,2ȣ,37.555131,126.936926 +1252,,߾Ӽ,37.559733,126.942597 +1890,,μ,37.46874,126.623853 +2745,dz,7ȣ,37.50008,126.90993 +4808,,ؼ,37.409008,126.788017 +2825,,8ȣ,37.440918,127.147564 +413,ֹ,4ȣ,37.648627,127.034709 +1402,ֿ(緿),1ȣ,36.793759,127.1214 +1403,ƻ,1ȣ,36.792053,127.104361 +3209,ƽþƵ(̻Ÿ),õ2ȣ,37.5517,126.677122 +1215,ƽ,߾Ӽ,37.51382,127.443173 +2546,(̴Ĺ),5ȣ,37.551691,127.089761 +242,,2ȣ,37.557345,126.956141 +318,ȱ,3ȣ,37.576477,126.985443 +1759,Ȼ,4ȣ,37.327082,126.788532 +2640,Ⱦ(뺴),6ȣ,37.586272,127.029005 +1706,Ⱦ,1ȣ,37.401592,126.922874 +2811,ϻ,8ȣ,37.55021,127.127562 +326,б,3ȣ,37.527072,127.028461 +1848,бε,д缱,37.527381,127.040534 +2531,ֿ,5ȣ,37.553736,126.95682 +1277,ߴ,߾Ӽ,37.712327,126.761356 +1876,߸,μ,37.264179,126.879483 +1854,ž,д缱,37.411185,127.128715 +323,,3ȣ,37.554867,127.010541 +2634,,6ȣ,37.554263,127.010358 +1212,,߾Ӽ,37.545981,127.329098 +1204,,߾Ӽ,37.606596,127.107906 +332,(ʱû),3ȣ,37.484477,127.033902 +4308,(ʱû),źд缱,37.483809,127.034653 +4309,ùǽ(),źд缱,37.470023,127.03842 +1207,,߾Ӽ,37.60533,127.19364 +1909,,1ȣ,37.774381,127.044708 +248,õû,2ȣ,37.512398,126.865819 +4106,õⱳ,9ȣ,37.568381,126.841333 +4920,,,37.642379,126.614309 +2523,,5ȣ,37.525569,126.886129 +1217,,߾Ӽ,37.492773,127.491837 +4613,,μ,37.742802,127.085035 +2728,̴(),7ȣ,37.548014,127.074658 +4504,,μ,37.274917,127.143714 +1875,õ,μ,37.250102,126.90879 +4126,,9ȣ,37.507287,127.033868 +2528,dz,5ȣ,37.527098,126.932901 +2527,ǵ,5ȣ,37.521747,126.924357 +4115,ǵ,9ȣ,37.52176,126.92403 +1511,,氭,37.282308,127.628816 +1803,,1ȣ,37.485178,126.811502 +221,,2ȣ,37.500622,127.036456 +2612,,6ȣ,37.606021,126.922744 +1885,,μ,37.417804,126.67894 +311,ų,3ȣ,37.619229,126.921038 +2615,ų,6ȣ,37.618636,126.920625 +9004,ų, ö,37.61878,126.9213 +1919,õ,1ȣ,38.10073,127.07372 +4110,â,9ȣ,37.546936,126.874916 +1006,,1ȣ,37.515504,126.907628 +236,û,2ȣ,37.525706,126.89661 +2524,û,5ȣ,37.5242,126.89503 +2525,,5ȣ,37.522669,126.905139 +4217,,ö1ȣ,37.51202,126.524254 +1868,,д缱,37.251568,127.071394 +3125,ȸ,õ1ȣ,37.449396,126.701012 +342,,3ȣ,37.502129,127.128319 +2558,,5ȣ,37.502057,127.127938 +406,,4ȣ,37.705,127.19281 +1802,,1ȣ,37.494526,126.845365 +1859,,д缱,37.339824,127.108942 +2522,(񵿿),5ȣ,37.524496,126.875181 +1874,õ,μ,37.24304,126.963676 +1216,,߾Ӽ,37.506062,127.473868 +1719,,1ȣ,37.145885,127.06672 +1718,,1ȣ,37.168953,127.063197 +1762,̵,4ȣ,37.362357,126.738714 +325,,3ȣ,37.541684,127.017269 +1011,,߾Ӽ,37.540446,127.018672 +2752,¼(ȸԱ),7ȣ,37.492092,126.823023 +1821,¼(ȸԱ),1ȣ,37.492433,126.824086 +1407,¾õ,1ȣ,36.780483,127.003249 +2556,øȰ(ѱü),5ȣ,37.516201,127.130923 +4136,øȰ(ѱü),9ȣ,37.516269,127.130288 +3205,,õ2ȣ,37.592928,126.673203 +3202,ձ,õ2ȣ,37.59518,126.642696 +208,սʸ(û),2ȣ,37.561238,127.036954 +2541,սʸ(û),5ȣ,37.56184,127.037059 +1013,սʸ(û),߾Ӽ,37.561827,127.038352 +1016,ܴ,1ȣ,37.596073,127.063549 +244,,2ȣ,37.561904,127.050899 +250,(빮û),2ȣ,37.574028,127.038091 +2725,븶,7ȣ,37.573647,127.086727 +1219,빮,߾Ӽ,37.48223,127.594647 +1003,,1ȣ,37.529849,126.964561 +2517,,5ȣ,37.548768,126.836318 +1211,,߾Ӽ,37.554669,127.310115 +4512,.۴,μ,37.237845,127.209198 +4211,,ö1ȣ,37.492904,126.49379 +4924,,,37.653867,126.68393 +3227,(â),õ2ȣ,37.440127,126.75997 +1278,,߾Ӽ,37.725826,126.767257 +9000,, ö,37.71614,126.72841 +1286,õ,߾Ӽ,37.879942,126.769999 +4814,,ؼ,37.31321,126.796261 +1951,,3ȣ,37.653324,126.843041 +1218,,߾Ӽ,37.468672,127.547076 +4815,,ؼ,37.302371,126.786691 +1884,,μ,37.413049,126.686648 +3130,,õ1ȣ,37.412333,126.687869 +1981,,ؼ,37.5239,126.8049 +1948,,3ȣ,37.650658,126.872642 +1020,,1ȣ,37.633212,127.058831 +2642,(),6ȣ,37.601948,127.041518 +1879,,μ,37.391769,126.742699 +2620,Ű(),6ȣ,37.569532,126.899298 +1282,,߾Ӽ,37.796188,126.792587 +203,3,2ȣ,37.566306,126.991696 +320,3,3ȣ,37.566672,126.992548 +204,4,2ȣ,37.566595,126.997817 +2536,4,5ȣ,37.567352,126.998032 +202,Ա,2ȣ,37.566014,126.982618 +1012,,߾Ӽ,37.549946,127.034538 +2611,,6ȣ,37.598605,126.915577 +1710,ǿ,1ȣ,37.320852,126.948217 +1906,,1ȣ,37.738415,127.045958 +4605,νû,μ,37.739256,127.034781 +4607,߾,μ,37.743676,127.049565 +241,̴,2ȣ,37.556733,126.946013 +1502,̸,氭,37.394655,127.127819 +1860,̸,д缱,37.395371,127.128248 +2738,̼,7ȣ,37.485196,126.981605 +1508,õ,氭,37.265579,127.44226 +430,(߾ӹڹ),4ȣ,37.522295,126.974733 +1008,(߾ӹڹ),߾Ӽ,37.522427,126.973406 +2631,¿,6ȣ,37.534488,126.994302 +1455,δ,4ȣ,37.401553,126.976715 +1812,õ,1ȣ,37.476079,126.616801 +1891,õ,μ,37.476403,126.617326 +3215,õ,õ2ȣ,37.4897,126.675208 +4213,õ1͹̳,ö1ȣ,37.447464,126.452508 +4215,õ2͹̳,ö1ȣ,37.460699,126.441442 +1881,õ,μ,37.400614,126.722478 +3226,õ,õ2ȣ,37.448769,126.752618 +3136,õԱ,õ1ȣ,37.386007,126.639484 +3124,õû,õ1ȣ,37.457263,126.702143 +3221,õû,õ2ȣ,37.456833,126.701306 +3126,õ͹̳,õ1ȣ,37.442383,126.699706 +1888,ϴ,μ,37.448493,126.649619 +1275,ϻ,߾Ӽ,37.682077,126.769846 +338,Ͽ,3ȣ,37.483681,127.08439 +1285,,߾Ӽ,37.888421,126.746765 +3113,,õ1ȣ,37.545059,126.738665 +3116,,õ1ȣ,37.530415,126.722527 +216,(ıû),2ȣ,37.513262,127.100159 +2815,(ıû),8ȣ,37.514692,127.104338 +215,dz,2ȣ,37.520733,127.10379 +217,ǻ,2ȣ,37.511687,127.086162 +328,,3ȣ,37.512759,127.01122 +4923,,,37.643986,126.669017 +2742,¹,7ȣ,37.504898,126.93915 +2711,,7ȣ,37.700109,127.053196 +2820,,8ȣ,37.478703,127.126191 +2544,,5ȣ,37.56144,127.064623 +1918,,1ȣ,38.02458,127.0718 +4517,.,μ,37.285342,127.219561 +4710,,̽ż,37.603133,127.013396 +1956,߻,3ȣ,37.659477,126.773359 +1454,ΰõû,4ȣ,37.426513,126.98978 +1761,,4ȣ,37.351735,126.742989 +1857,,д缱,37.365994,127.10807 +4312,,źд缱,37.367098,127.108403 +157,⵿,1ȣ,37.578103,127.034893 +1810,,1ȣ,37.466769,126.656666 +152,,1ȣ,37.570161,126.982923 +153,3,1ȣ,37.570406,126.991847 +319,3,3ȣ,37.571605,126.991791 +2535,3,5ȣ,37.57254,126.990305 +154,5,1ȣ,37.570926,127.001849 +218,տ,2ȣ,37.511022,127.073704 +4130,տ,9ȣ,37.511426,127.076275 +1809,־,1ȣ,37.465047,126.679742 +3218,־,õ2ȣ,37.464992,126.679098 +3217,־ȱ,õ2ȣ,37.473703,126.68113 +1957,ֿ,3ȣ,37.670072,126.761334 +1862,,д缱,37.324753,127.107395 +2716,߰,7ȣ,37.644583,127.064303 +2726,߰,7ȣ,37.565923,127.08432 +1822,ߵ,1ȣ,37.486562,126.764843 +1201,߶,߾Ӽ,37.594917,127.076116 +1756,߾,4ȣ,37.315941,126.838573 +4138,߾Ӻƺ,9ȣ,37.529191,127.148739 +2721,ȭ,7ȣ,37.602545,127.079264 +4108,,9ȣ,37.557402,126.861939 +2618,(),6ȣ,37.583876,126.909645 +4503,,μ,37.269606,127.136515 +3135,,õ1ȣ,37.378384,126.645168 +1723,,1ȣ,37.0188,127.070444 +309,,3ȣ,37.648033,126.913917 +1220,,߾Ӽ,37.476393,127.629874 +1912,,1ȣ,37.892334,127.055716 +1726,,1ȣ,36.870593,127.143904 +1720,,1ȣ,37.109447,127.062278 +405,,4ȣ,37.7205,127.2034 +412,â,4ȣ,37.653088,127.047274 +1022,â,߾Ӽ,37.653007,127.047806 +2638,â,6ȣ,37.579661,127.015241 +1318,õ,ἱ,37.658978,127.285379 +1728,õ,1ȣ,36.810005,127.146826 +2751,õ,7ȣ,37.486637,126.838713 +2548,õȣ(dz伺),5ȣ,37.53864,127.123308 +2812,õȣ(dz伺),8ȣ,37.538113,127.123254 +2749,ö,7ȣ,37.47605,126.867911 +4310,ûԱ,źд缱,37.447211,127.055664 +2538,û,5ȣ,37.560276,127.013639 +2635,û,6ȣ,37.560608,127.013986 +2731,û,7ȣ,37.519365,127.05335 +4210,û,ö1ȣ,37.556409,126.624648 +158,û(øԱ),1ȣ,37.579956,127.044585 +1014,û(øԱ),߾Ӽ,37.580759,127.0483 +1867,û,д缱,37.259489,127.078934 +1321,û,ἱ,37.735488,127.42661 +4506,ʴ,μ,37.260752,127.159443 +1917,ʼ,1ȣ,37.98172,127.06912 +1505,ʿ,氭,37.374419,127.299 +4813,,ؼ,37.319619,126.808147 +1758,,4ȣ,37.320646,126.805913 +432,ѽŴԱ(̼),4ȣ,37.486263,126.981989 +3755,,7ȣ,37.50365,126.78828 +1329,õ,ἱ,37.885054,127.717023 +321,湫,3ȣ,37.56143,126.994072 +423,湫,4ȣ,37.561207,126.99408 +243,(Ա),2ȣ,37.559704,126.964378 +2532,(Ա),5ȣ,37.560236,126.9629 +3133,ķ۽Ÿ,õ1ȣ,37.387855,126.661673 +9001,Ųؽ, ö,37.66532,126.74843 +1276,ź,߾Ӽ,37.694023,126.761086 +4615,ž,μ,37.733579,127.088704 +1404,,1ȣ,36.78866,127.08485 +2646,¸Ա,6ȣ,37.617338,127.074735 +2719,¸Ա,7ȣ,37.618294,127.075397 +1852,,д缱,37.440019,127.127709 +3134,ũũ,õ1ȣ,37.382268,126.656365 +1314,,ἱ,37.648311,127.143952 +1283,,߾Ӽ,37.815298,126.792783 +1501,DZ,氭,37.394761,127.111217 +4311,DZ,źд缱,37.394761,127.112217 +1210,ȴ,߾Ӽ,37.547371,127.243939 +1317,ȣ,ἱ,37.653225,127.244493 +1456,,4ȣ,37.394287,126.963883 +1724,,1ȣ,36.990726,127.085159 +4927,dz,,37.612488,126.732387 +1274,dz,߾Ӽ,37.672346,126.786243 +2717,ϰ,7ȣ,37.636352,127.06799 +2565,ϳ˴ܻ,5ȣ,37.53972,127.22345 +2566,ϳû(dz-),5ȣ,37.54205,127.20612 +2564,ϳdz,5ȣ,37.552034,127.203864 +2733,е,7ȣ,37.514229,127.031656 +336,п,3ȣ,37.496663,127.070594 +2632,Ѱ,6ȣ,37.539631,127.001725 +1010,ѳ,߾Ӽ,37.52943,127.009169 +1755,Ѵ,4ȣ,37.309689,126.85344 +419,ѼԱ(Ｑ),4ȣ,37.588458,127.006221 +4135,Ѽ,9ȣ,37.516404,127.116503 +209,Ѿ,2ȣ,37.555273,127.043655 +1024,Ƽ,д缱,37.496237,127.052873 +238,,2ȣ,37.549457,126.913808 +2623,,6ȣ,37.549209,126.913366 +2540,,5ȣ,37.557322,127.029476 +1270,,߾Ӽ,37.612102,126.834146 +420,ȭ,4ȣ,37.582336,127.001844 +1882,ȣ,μ,37.401637,126.708627 +239,ȫԱ,2ȣ,37.55679,126.923708 +1293,ȫԱ,߾Ӽ,37.557641,126.926683 +1264,ȫԱ,߾Ӽ,37.557641,126.926683 +4203,ȫԱ,ö1ȣ,37.557438,126.926715 +314,ȫ,3ȣ,37.589066,126.943736 +4705,ȭ,̽ż,37.634133,127.017511 +2518,ȭ,5ȣ,37.541513,126.840461 +2647,ȭ(￩Ա),6ȣ,37.620064,127.084689 +1712,ȭ,1ȣ,37.283862,126.989627 +1268,ȭ,߾Ӽ,37.602888,126.868387 +1952,ȭ,3ȣ,37.634592,126.83265 +1015,ȸ,߾Ӽ,37.58946,127.057583 +1905,ȸ,1ȣ,37.724416,127.04736 +4602,ȸ,μ,37.725006,127.047073 +425,ȸ(빮),4ȣ,37.558514,126.978246 +4611,ȿ,μ,37.754025,127.076902 +2628,ȿâ,6ȣ,37.539233,126.961384 +1261,ȿâ,߾Ӽ,37.538579,126.96221 +4119,漮(߾ӴԱ),9ȣ,37.50877,126.963708 +4606,Ｑ,μ,37.743302,127.037023 \ No newline at end of file From fa0474c3924c6f872ad3f3b8459eb91fd19db984 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 20 Aug 2024 13:59:15 +0900 Subject: [PATCH 207/348] =?UTF-8?q?[BE]=20dev-be=20=EB=B8=8C=EB=9E=9C?= =?UTF-8?q?=EC=B9=98=EC=99=80=20dev=20=EB=B8=8C=EB=9E=9C=EC=B9=98=EB=A5=BC?= =?UTF-8?q?=20=EB=B3=91=ED=95=A9=ED=95=9C=EB=8B=A4.=20(#449)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/build.gradle | 1 + .../bang_ggood/exception/ExceptionCode.java | 5 +- .../com/bang_ggood/station/SubwayReader.java | 38 + .../controller/SubwayStationController.java | 26 + .../station/domain/SubwayStation.java | 49 ++ .../station/dto/SubwayStationResponse.java | 10 + .../station/service/SubwayStationService.java | 30 + .../bang-ggood/src/main/resources/schema.sql | 2 +- .../main/resources/seoul_stations_240819.csv | 768 ++++++++++++++++++ .../station/SubwayStationServiceTest.java | 39 + .../src/test/resources/schema-test.sql | 2 +- .../test/resources/seoul_stations_240819.csv | 768 ++++++++++++++++++ 12 files changed, 1735 insertions(+), 3 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java create mode 100644 backend/bang-ggood/src/main/resources/seoul_stations_240819.csv create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java create mode 100644 backend/bang-ggood/src/test/resources/seoul_stations_240819.csv diff --git a/backend/bang-ggood/build.gradle b/backend/bang-ggood/build.gradle index 04653e210..483a11f04 100644 --- a/backend/bang-ggood/build.gradle +++ b/backend/bang-ggood/build.gradle @@ -27,6 +27,7 @@ dependencies { implementation 'io.jsonwebtoken:jjwt-impl:0.11.2' implementation 'io.jsonwebtoken:jjwt-gson:0.11.2' implementation 'com.mysql:mysql-connector-j' + implementation 'com.opencsv:opencsv:5.9' runtimeOnly 'com.h2database:h2' testImplementation 'org.springframework.boot:spring-boot-starter-test' diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 61f20bd53..e7b381658 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -60,7 +60,10 @@ public enum ExceptionCode { OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."), // Article - ARTICLE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 아티클이 존재하지 않습니다."); + ARTICLE_NOT_FOUND(HttpStatus.BAD_REQUEST, "해당 아티클이 존재하지 않습니다."), + + // Station + STATION_NOT_FOUND(HttpStatus.INTERNAL_SERVER_ERROR, "지하철 역을 찾을 수 없습니다."); private final HttpStatus httpStatus; private final String message; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java new file mode 100644 index 000000000..04eda3743 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/SubwayReader.java @@ -0,0 +1,38 @@ +package com.bang_ggood.station; + +import com.bang_ggood.station.domain.SubwayStation; +import com.opencsv.CSVReader; +import com.opencsv.CSVReaderBuilder; +import com.opencsv.exceptions.CsvValidationException; +import org.springframework.core.io.ClassPathResource; +import java.io.IOException; +import java.io.InputStreamReader; +import java.nio.charset.Charset; +import java.util.ArrayList; +import java.util.List; + +public class SubwayReader { + + public static final String SUBWAY_DATA_PATH = "seoul_stations_240819.csv"; + + public static List readSubwayStationData() { + List stations = new ArrayList<>(); + ClassPathResource resource = new ClassPathResource(SUBWAY_DATA_PATH); + try (CSVReader csvReader = new CSVReaderBuilder( + new InputStreamReader(resource.getInputStream(), Charset.forName("EUC-KR"))).build()) { + String[] line = csvReader.readNext(); // drop first row + while ((line = csvReader.readNext()) != null) { + SubwayStation station = new SubwayStation( + Integer.parseInt(line[0]), + line[1], + line[2], + Double.parseDouble(line[3]), + Double.parseDouble(line[4])); + stations.add(station); + } + return stations; + } catch (IOException | CsvValidationException e) { + throw new RuntimeException("지하철 데이터 파일을 읽어오는데 실패했습니다."); + } + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java new file mode 100644 index 000000000..bb8dc71bb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/controller/SubwayStationController.java @@ -0,0 +1,26 @@ +package com.bang_ggood.station.controller; + +import com.bang_ggood.station.dto.SubwayStationResponse; +import com.bang_ggood.station.service.SubwayStationService; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; + +@RestController +public class SubwayStationController { + + private final SubwayStationService subwayStationService; + + public SubwayStationController(SubwayStationService subwayStationService) { + this.subwayStationService = subwayStationService; + } + + @GetMapping("/stations/nearest") + public ResponseEntity readNearestStation(@RequestParam("latitude") double latitude, + @RequestParam("longitude") double longitude) { + + SubwayStationResponse response = subwayStationService.readNearestStation(latitude, longitude); + return ResponseEntity.ok(response); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java new file mode 100644 index 000000000..7cec623bb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/domain/SubwayStation.java @@ -0,0 +1,49 @@ +package com.bang_ggood.station.domain; + +public class SubwayStation { + + private final Integer id; + private final String name; + private final String line; + private final double latitude; + private final double longitude; + + public SubwayStation(Integer id, String name, String line, double latitude, double longitude) { + this.id = id; + this.name = name; + this.line = line; + this.latitude = latitude; + this.longitude = longitude; + } + + public Integer getId() { + return id; + } + + public String getName() { + return name; + } + + public String getLine() { + return line; + } + + public double getLatitude() { + return latitude; + } + + public double getLongitude() { + return longitude; + } + + @Override + public String toString() { + return "Station{" + + "id=" + id + + ", name='" + name + '\'' + + ", line='" + line + '\'' + + ", latitude=" + latitude + + ", longitude=" + longitude + + '}'; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java new file mode 100644 index 000000000..caa90f182 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/dto/SubwayStationResponse.java @@ -0,0 +1,10 @@ +package com.bang_ggood.station.dto; + +import com.bang_ggood.station.domain.SubwayStation; + +public record SubwayStationResponse(String stationName, String stationLine, Integer walkingTime) { + + public static SubwayStationResponse of(SubwayStation station, Integer walkingTime) { + return new SubwayStationResponse(station.getName(), station.getLine(), walkingTime); + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java new file mode 100644 index 000000000..f0d64cafb --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java @@ -0,0 +1,30 @@ +package com.bang_ggood.station.service; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.station.domain.SubwayStation; +import com.bang_ggood.station.dto.SubwayStationResponse; +import com.bang_ggood.station.SubwayReader; +import org.springframework.stereotype.Service; +import java.util.Comparator; +import java.util.List; + +@Service +public class SubwayStationService { + + private static final int METER_PER_DEGREE = 111_320; + private static final double AVERAGE_WALKING_SPEED = 1.3 * 60; // meter per minute + private static final List SUBWAY_STATIONS = SubwayReader.readSubwayStationData(); + + public SubwayStationResponse readNearestStation(double latitude, double longitude) { + return SUBWAY_STATIONS.stream() + .map(station -> { + double dx = (station.getLatitude() - latitude) * METER_PER_DEGREE; + double dy = (station.getLongitude() - longitude) * METER_PER_DEGREE * Math.cos(station.getLatitude()); + double distance = Math.sqrt(dx * dx + dy * dy); + return SubwayStationResponse.of(station, (int) Math.round(distance / AVERAGE_WALKING_SPEED)); + }) + .min(Comparator.comparing(SubwayStationResponse::walkingTime)) + .orElseThrow(() -> new BangggoodException(ExceptionCode.STATION_NOT_FOUND)); + } +} diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index aefd47f9e..c0bcf2f98 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -104,7 +104,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(65536), + content VARCHAR(16383), keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/main/resources/seoul_stations_240819.csv b/backend/bang-ggood/src/main/resources/seoul_stations_240819.csv new file mode 100644 index 000000000..f6a384cd8 --- /dev/null +++ b/backend/bang-ggood/src/main/resources/seoul_stations_240819.csv @@ -0,0 +1,768 @@ +_ID,,ȣ,,浵 +4703,4.19ֹ,̽ż,37.649502,127.013684 +1907,,1ȣ,37.748577,127.044213 +340,,3ȣ,37.492245,127.117757 +2818,,8ȣ,37.492888,127.118398 +2748,д,7ȣ,37.480338,126.882656 +1702,д,1ȣ,37.481581,126.882581 +4107,,9ȣ,37.561391,126.854456 +4704,,̽ż,37.641537,127.016789 +3216,,õ2ȣ,37.484192,126.683673 +3211,(Ƽ),õ2ȣ,37.524649,126.675539 +3212,߾ӽ,õ2ȣ,37.517054,126.676672 +1265,,߾Ӽ,37.568491,126.915487 +1851,õ,д缱,37.448605,127.126697 +1323,,ἱ,37.814536,127.510739 +1816,,1ȣ,37.464737,126.694181 +3123,Ÿ,õ1ȣ,37.467048,126.707938 +1312,,ἱ,37.634118,127.114757 +3117,,õ1ȣ,37.517268,126.721514 +222,,2ȣ,37.49799,127.027912 +4307,,źд缱,37.496837,127.028104 +2732,û,7ȣ,37.517179,127.041255 +1849,û,д缱,37.517469,127.041151 +4502,,μ,37.270161,127.126033 +2549,,5ȣ,37.535804,127.132481 +2813,û,8ȣ,37.530341,127.120508 +1269,,߾Ӽ,37.612314,126.843223 +214,(͹̳),2ȣ,37.535095,127.094681 +9995,,5ȣ,37.55749,127.17593 +1326,,ἱ,37.805723,127.634146 +2559,,5ȣ,37.498079,127.13482 +1801,,1ȣ,37.494594,126.85968 +1027,,д缱,37.489116,127.06614 +4101,ȭ,9ȣ,37.578608,126.798153 +2512,ȭ,5ȣ,37.572399,126.806171 +2560,ſ,5ȣ,37.493105,127.14415 +212,ǴԱ,2ȣ,37.540373,127.069191 +2729,ǴԱ,7ȣ,37.540786,127.071011 +4925,Ϻ,,37.63165,126.705975 +3203,˴ܻŸ,õ2ȣ,37.60185,126.657108 +3201,˴ܿ(˴ܻ),õ2ȣ,37.594877,126.627178 +3208,˹,õ2ȣ,37.561405,126.677566 +4209,˾,ö1ȣ,37.569098,126.674007 +3207,˾,õ2ȣ,37.56866,126.675687 +1504,Ɽ,氭,37.399907,127.25263 +4610,⵵ûϺû,μ,37.75059,127.071495 +1451,渶,4ȣ,37.443885,127.007888 +317,溹(μû),3ȣ,37.575762,126.97353 +3115,αԱ,õ1ȣ,37.538157,126.722597 +4604,ö,μ,37.737202,127.043257 +341,,3ȣ,37.495918,127.12454 +3114,,õ1ȣ,37.543238,126.728128 +4208,,ö1ȣ,37.571662,126.7363 +3110,,õ1ȣ,37.571449,126.73578 +2553,,5ȣ,37.555004,127.154151 +2641,(),6ȣ,37.590508,127.036296 +1873,,μ,37.24963,126.980248 +329,͹̳,3ȣ,37.504891,127.004916 +2736,͹̳,7ȣ,37.503367,127.005068 +4123,͹̳,9ȣ,37.50598,127.004403 +1757,,4ȣ,37.316784,126.823144 +4513,,μ,37.24484,127.214251 +4928,,,37.601243,126.770345 +1272,,߾Ӽ,37.645676,126.801762 +4612,,μ,37.750471,127.083715 +1506,,氭,37.351315,127.34674 +2530,,5ȣ,37.544431,126.951372 +2627,,6ȣ,37.543555,126.951678 +1292,,߾Ӽ,37.542596,126.952099 +4202,,ö1ȣ,37.54253,126.952024 +2718,(б),7ȣ,37.625742,127.072896 +4103,׽,9ȣ,37.563726,126.810678 +4212,ȭû,ö1ȣ,37.459041,126.477516 +1453,õ,4ȣ,37.433021,126.996568 +1705,,1ȣ,37.419232,126.908706 +4411,ǻ(),Ÿ,37.4691018,126.9450639 +4319,(),źд缱,37.30211,127.044483 +4318,߾(ִ),źд缱,37.288617,127.051478 +2547,(Ŵ),5ȣ,37.545303,127.10357 +1750,,1ȣ,37.416182,126.884466 +2750,Ÿ,7ȣ,37.479252,126.854876 +1019,,1ȣ,37.623632,127.061835 +2534,ȭ(ȭȸ),5ȣ,37.571525,126.97717 +2625,â(),6ȣ,37.547456,126.931993 +223,(.û),2ȣ,37.493961,127.014667 +330,(.û),3ȣ,37.493025,127.013786 +4921,,,37.645384,126.628633 +1701,,1ȣ,37.503039,126.881966 +232,εд,2ȣ,37.485266,126.901401 +1026,,д缱,37.486839,127.058856 +1205,,߾Ӽ,37.603392,127.143869 +4121,,9ȣ,37.501364,126.987332 +2616,,6ȣ,37.611377,126.91727 +1863,,д缱,37.298969,127.105664 +9009,, ö,37.29913,127.10389 +213,(û),2ȣ,37.537077,127.085916 +1813,,1ȣ,37.496756,126.870793 +310,Ĺ,3ȣ,37.636763,126.918821 +1214,,߾Ӽ,37.516169,127.399367 +3138,,õ1ȣ,37.399907,126.630347 +4114,ȸǻ,9ȣ,37.528105,126.917874 +2545,(ɵ),5ȣ,37.557088,127.079577 +2727,(ɵ),7ȣ,37.556897,127.079338 +1709,,1ȣ,37.35356,126.948462 +1324,,ἱ,37.832067,127.557695 +2760,õ,7ȣ,37.506997,126.73128 +2551,ٸ(ȸ),5ȣ,37.545477,127.142853 +3111,,õ1ȣ,37.566379,126.742654 +1316,ݰ,ἱ,37.637382,127.207853 +1279,ݸ,߾Ӽ,37.751322,126.765347 +1708,,1ȣ,37.372221,126.943429 +1458,,4ȣ,37.372209,126.943417 +1703,õû,1ȣ,37.455626,126.89398 +1280,,߾Ӽ,37.766217,126.774644 +324,ȣ,3ȣ,37.548034,127.015872 +1865,,д缱,37.275061,127.11591 +4501,,μ,37.275449,127.116665 +2550,浿,5ȣ,37.537801,127.140004 +417,,4ȣ,37.603407,127.025053 +4511,跮,μ,37.237247,127.198781 +1327,,ἱ,37.818466,127.71434 +2513,,5ȣ,37.562384,126.801292 +4102,,9ȣ,37.561916,126.802152 +4207,,ö1ȣ,37.561842,126.801904 +4929,,,37.56236,126.801868 +1980,,ؼ,37.5617,126.8041 +2519,ġ,5ȣ,37.531768,126.846683 +2753,ġ,7ȣ,37.506207,126.810939 +227,,2ȣ,37.47693,126.963693 +2747,,7ȣ,37.486056,126.887249 +3225,û,õ2ȣ,37.448161,126.736939 +1883,δũ,μ,37.407722,126.695216 +331,͹̳(),3ȣ,37.485013,127.016189 +2739,,7ȣ,37.484596,126.971251 +1002,,1ȣ,37.541021,126.9713 +2828,,8ȣ,37.4624,127.13977 +1328,õ,ἱ,37.864007,127.723792 +434,·,4ȣ,37.463873,126.989134 +2823,ѻ꼺Ա(.û),8ȣ,37.451535,127.159816 +2737,,7ȣ,37.487618,126.993513 +4118,,9ȣ,37.512887,126.953222 +4117,뷮,9ȣ,37.513534,126.941005 +1004,뷮,1ȣ,37.514149,126.94271 +411,,4ȣ,37.65627,127.063276 +2715,,7ȣ,37.654836,127.060462 +313,,3ȣ,37.600927,126.935756 +2630,(걸û),6ȣ,37.534675,126.986695 +1908,,1ȣ,37.75938,127.042292 +1021,õ,1ȣ,37.644799,127.051269 +2734,,7ȣ,37.511093,127.021415 +4305,,źд缱,37.511093,127.021415 +1271,ɰ,߾Ӽ,37.618808,126.820783 +2824,ܴŸ,8ȣ,37.44521,127.156866 +4811,޹,ؼ,37.348847,126.809409 +1878,޿,μ,37.379681,126.745177 +2543,ʸ,5ȣ,37.566747,127.052704 +409,,4ȣ,37.670272,127.079066 +4407,,Ÿ,37.4902998,126.9275133 +237,,2ȣ,37.534946,126.902767 +4113,,9ȣ,37.533406,126.902809 +1729,,1ȣ,37.344285,126.948345 +9002,, ö,37.63191,126.81113 +1953,,3ȣ,37.631626,126.811024 +1452,,4ȣ,37.435675,127.006523 +233,븲(αû),2ȣ,37.493243,126.894932 +2746,븲(αû),7ȣ,37.493013,126.897075 +1028,Ա,д缱,37.491373,127.07272 +1005,,1ȣ,37.513342,126.926382 +4402,,Ÿ,37.5133059,126.9257265 +1320,뼺,ἱ,37.684071,127.379319 +1752,߹,4ȣ,37.328467,126.917332 +337,û,3ȣ,37.493514,127.079532 +335,ġ,3ȣ,37.494612,127.063642 +1958,ȭ,3ȣ,37.676087,126.747569 +2626,(),6ȣ,37.547771,126.942069 +1910,,1ȣ,37.818486,127.056486 +1208,,߾Ӽ,37.586781,127.208832 +1911,,1ȣ,37.843188,127.061277 +334,,3ȣ,37.490922,127.055452 +1025,,д缱,37.491224,127.055186 +1206,,߾Ӽ,37.608806,127.161153 +247,õ,2ȣ,37.514287,126.882768 +1902,,1ȣ,37.679563,127.045595 +2712,,7ȣ,37.689241,127.046509 +1903,,1ȣ,37.689534,127.046049 +1209,,߾Ӽ,37.579622,127.222672 +1817,,1ȣ,37.468446,126.642706 +1823,ȭ,1ȣ,37.46607,126.668672 +316,,3ȣ,37.574571,126.957748 +2614,,6ȣ,37.618456,126.933031 +1714,,1ȣ,37.466613,126.889249 +3206,,õ2ȣ,37.585212,126.675844 +2644,,6ȣ,37.610537,127.056431 +155,빮,1ȣ,37.571687,127.01093 +421,빮,4ȣ,37.57093,127.009287 +205,빮繮ȭ,2ȣ,37.565613,127.009054 +422,빮繮ȭ,4ȣ,37.565133,127.007885 +2537,빮繮ȭ,5ȣ,37.564665,127.005353 +322,Ա,3ȣ,37.559052,127.005602 +1915,õ,1ȣ,37.927878,127.05479 +1913,õ߾,1ȣ,37.901885,127.056482 +3132,,õ1ȣ,37.397878,126.674005 +159,,1ȣ,37.573197,127.01648 +2637,,6ȣ,37.572279,127.015653 +4505,,μ,37.269043,127.152716 +3121,,õ1ȣ,37.485312,126.718247 +1808,,1ȣ,37.471408,126.702896 +4608,,μ,37.745271,127.056947 +1811,õ,1ȣ,37.475276,126.632802 +431,(),4ȣ,37.502852,126.980347 +4120,(),9ȣ,37.502878,126.978153 +4314,õ,źд缱,37.337928,127.102976 +3131,,õ1ȣ,37.404737,126.681015 +9010,ź, ö,37.20034,127.09569 +1727,,1ȣ,36.833705,127.14896 +4515,,μ,37.267051,127.21364 +2555,̵,5ȣ,37.527788,127.136248 +4137,̿,9ȣ,37.519683,127.137989 +4109,,9ȣ,37.550632,126.865689 +2619,й̵Ƽ,6ȣ,37.576108,126.901391 +1294,й̵Ƽ,߾Ӽ,37.577475,126.900453 +4204,й̵Ƽ,ö1ȣ,37.576958,126.898609 +210,Ҽ,2ȣ,37.547184,127.047367 +2730,Ҽ,7ȣ,37.53154,127.066704 +2515,,5ȣ,37.560183,126.825448 +4105,,9ȣ,37.566778,126.82731 +4206,,ö1ȣ,37.565543,126.827378 +1955,,3ȣ,37.652206,126.77762 +2714,,7ȣ,37.66494,127.057675 +4922,,,37.640732,126.644344 +1319,,ἱ,37.652782,127.311767 +2542,,5ȣ,37.5661,127.042973 +3204,,õ2ȣ,37.597566,126.666998 +2561,õ,5ȣ,37.49499,127.152781 +2529,,5ȣ,37.539574,126.945932 +2621,û,6ȣ,37.563515,126.903343 +3224,,õ2ȣ,37.454911,126.732094 +1203,,߾Ӽ,37.59955,127.091909 +2622,,6ȣ,37.556094,126.910052 +1904,,1ȣ,37.709914,127.047455 +1869,,д缱,37.245795,127.057353 +1872,ű,д缱,37.265481,127.015678 +333,ź,3ȣ,37.486947,127.046769 +1870,źǼ,д缱,37.252759,127.040566 +2720,԰,7ȣ,37.610637,127.077725 +2723,,7ȣ,37.588579,127.087503 +424,,4ȣ,37.560989,126.986325 +2552,,5ȣ,37.55137,127.143999 +4510,,μ,37.237964,127.190294 +1707,,1ȣ,37.384653,126.935433 +2827,,8ȣ,37.433824,127.129837 +1853,,д缱,37.432052,127.129104 +3223,𷡳,õ2ȣ,37.45583,126.719298 +2521,,5ȣ,37.526065,126.864931 +2814,伺(ȭǹ),8ȣ,37.517409,127.112359 +315,,3ȣ,37.582299,126.950291 +235,,2ȣ,37.517933,126.89476 +1284,,߾Ӽ,37.854619,126.788047 +2819,,8ȣ,37.485855,127.1225 +3127,а,õ1ȣ,37.434935,126.698579 +1858,̱,д缱,37.350077,127.10891 +4313,̱,źд缱,37.349982,127.108918 +9996,̻,5ȣ,37.560927,127.193877 +415,̾(̹),4ȣ,37.62667,127.025983 +416,̾ƻŸ,4ȣ,37.613292,127.030053 +3112,,õ1ȣ,37.553703,126.745077 +1753,ݿ,4ȣ,37.312212,126.903524 +2735,,7ȣ,37.508178,127.011727 +4601,߰,μ,37.727048,127.052803 +2516,߻,5ȣ,37.558598,126.837668 +225,,2ȣ,37.481426,126.997596 +2557,,5ȣ,37.508857,127.126133 +1901,,1ȣ,37.667503,127.044273 +2511,ȭ,5ȣ,37.577446,126.812741 +1405,,1ȣ,36.777629,127.052991 +1273,鸶,߾Ӽ,37.658239,126.794461 +1954,鼮,3ȣ,37.643114,126.78787 +1325,縮,ἱ,37.830779,127.58933 +1807,,1ȣ,37.483664,126.707704 +2633,Ƽ,6ȣ,37.548013,127.007055 +1457,,4ȣ,37.389793,126.950806 +4603,,μ,37.728755,127.04353 +1313,,ἱ,37.64202,127.12684 +408,,4ȣ,37.66778,127.11581 +1716,,1ȣ,37.207503,127.032731 +2744,,7ȣ,37.499872,126.920428 +4404,,Ÿ,37.5002739,126.9204355 +4405,Ű,Ÿ,37.4955691,126.9180827 +4406,ź,Ÿ,37.4929598,126.9234964 +2639,,6ȣ,37.585274,127.019351 +4712,,̽ż,37.585286,127.019381 +1914,,1ȣ,37.913702,127.057277 +1861,,д缱,37.312752,127.108196 +4514,,μ,37.258965,127.218457 +2821,,8ȣ,37.471052,127.126732 +1031,,д缱,37.470345,127.126658 +1401,,1ȣ,36.801215,127.135763 +4129,,9ȣ,37.514219,127.060245 +229,õ,2ȣ,37.482362,126.941892 +2648,ȭ(Ƿ),6ȣ,37.617283,127.091401 +1815,ΰ,1ȣ,37.488418,126.74109 +1509,ι,氭,37.260192,127.490277 +1804,õ,1ȣ,37.48405,126.782686 +2757,õû,7ȣ,37.504631,126.763538 +2754,õտ,7ȣ,37.50538,126.797337 +1982,õտ,ؼ,37.505457,126.797289 +1806,,1ȣ,37.489445,126.724506 +3120,,õ1ȣ,37.490535,126.723453 +2761,û,7ȣ,37.507394,126.721599 +3118,û,õ1ȣ,37.508407,126.720555 +3122,Ÿ,õ1ȣ,37.477679,126.710208 +3119,,õ1ȣ,37.498383,126.722244 +4709,ѻ꺸,̽ż,37.612072,127.008251 +4701,ѻ,̽ż,37.662909,127.012706 +312,ұ,3ȣ,37.610553,126.92982 +2613,ұ,6ȣ,37.610873,126.92939 +2724,簡,7ȣ,37.580894,127.088478 +226,,2ȣ,37.476538,126.981544 +433,,4ȣ,37.476955,126.981651 +1315,縪,ἱ,37.65108,127.176933 +1877,縮,μ,37.28998,126.85685 +4926,(û),,37.620249,126.719731 +4124,,9ȣ,37.504206,127.015259 +3762,,7ȣ,37.5086,126.7035277 +1751,꺻,4ȣ,37.358101,126.933274 +2822,꼺,8ȣ,37.457122,127.149908 +4508,ﰡ,μ,37.242115,127.168075 +428,ﰢ,4ȣ,37.534075,126.9726 +2629,ﰢ,6ȣ,37.535534,126.974032 +1503,ﵿ,氭,37.409522,127.20336 +2759,ü,7ȣ,37.506411,126.742153 +3759,ü,7ȣ,37.50724,126.74179 +9006,Ｚ, ö,37.50887,127.06324 +219,Ｚ(),2ȣ,37.508844,127.06316 +4128,Ｚ߾,9ȣ,37.513011,127.053282 +1950,,3ȣ,37.653083,126.895558 +4706,,̽ż,37.626914,127.018106 +4707,Ÿ,̽ż,37.621337,127.020473 +4131,,9ȣ,37.504738,127.088025 +1866,,д缱,37.26181,127.108847 +410,,4ȣ,37.660878,127.073572 +2741,,7ȣ,37.502834,126.94791 +3758,,7ȣ,37.505814,126.753163 +1754,ϼ,4ȣ,37.302795,126.866489 +2722,(ÿܹ͹̳),7ȣ,37.595577,127.085716 +1202,(ÿܹ͹̳),߾Ӽ,37.596678,127.08504 +2624,,6ȣ,37.547716,126.922852 +207,սʸ,2ȣ,37.564354,127.029354 +2643,(ѱб),6ȣ,37.606377,127.048491 +2554,ϵ,5ȣ,37.556712,127.166417 +1322,õ,ἱ,37.770246,127.454821 +4317,,źд缱,37.297664,127.069342 +4609,,μ,37.748885,127.06362 +2617,(Ż),6ȣ,37.591148,126.913629 +4116,,9ȣ,37.517274,126.928422 +4401,,Ÿ,37.5170969,126.929399 +1263,,߾Ӽ,37.551881,126.935711 +3210,û,õ2ȣ,37.543742,126.676787 +2533,빮,5ȣ,37.565773,126.966641 +1749,ź,1ȣ,37.195504,127.051672 +3214,οȸ,õ2ȣ,37.500168,126.675795 +1009,,߾Ӽ,37.519594,126.988537 +9005,, ö,37.55569,126.97296 +4410,뺥óŸ,Ÿ,37.4720019,126.9339351 +228,Ա(DZû),2ȣ,37.481247,126.952739 +1847,｣,д缱,37.543617,127.044707 +426,￪,4ȣ,37.55281,126.972556 +1001,￪,1ȣ,37.554337,126.971134 +1291,￪,߾Ӽ,37.557231,126.97103 +4201,￪,ö1ȣ,37.553247,126.969769 +4403,溴û,Ÿ,37.5060464,126.9227083 +4409,,Ÿ,37.4782341,126.9330365 +1722,,1ȣ,37.056496,127.052819 +224,,2ȣ,37.491897,127.007917 +1855,,д缱,37.385126,127.123592 +2645,,6ȣ,37.614872,127.065595 +1018,,1ȣ,37.614532,127.065934 +3763,(źϽ),7ȣ,37.5062285,126.6762813 +3213,(źϽ),õ2ȣ,37.506193,126.676203 +3220,,õ2ȣ,37.457611,126.692575 +1704,,1ȣ,37.435047,126.902295 +3222,õŸ,õ2ȣ,37.456805,126.709986 +2816,,8ȣ,37.505557,127.106832 +4133,,9ȣ,37.505208,127.10704 +4132,̰,9ȣ,37.502558,127.097033 +220,,2ȣ,37.504286,127.048203 +1023,,д缱,37.504856,127.048807 +1450,,4ȣ,37.451673,127.002303 +4812,,ؼ,37.334353,126.809904 +4112,,9ȣ,37.53802,126.893525 +4127,,9ȣ,37.510297,127.043999 +1850,,д缱,37.510735,127.043677 +3128,,õ1ȣ,37.426684,126.698863 +1711,հ,1ȣ,37.300349,126.97075 +1512,,氭,37.39468,127.11945 +9008,, ö,37.39467,127.12058 +4316,,źд缱,37.313335,127.0801 +211,,2ȣ,37.544581,127.055961 +418,ſԱ(),4ȣ,37.592612,127.016441 +4711,ſԱ(),̽ż,37.592467,127.016516 +1725,ȯ,1ȣ,36.916076,127.126964 +1715,,1ȣ,37.245025,127.013222 +1717,,1ȣ,37.187533,127.04318 +1510,ո,氭,37.295309,127.570938 +3137,Ʈũ,õ1ȣ,37.393054,126.634729 +1880,ҷ,μ,37.40095,126.733522 +1814,һ,1ȣ,37.482753,126.79544 +4804,һ,ؼ,37.483279,126.795023 +4805,һ,ؼ,37.468467,126.797252 +1916,ҿ,1ȣ,37.9481,127.061034 +4702,ֹ,̽ż,37.65603,127.013273 +4708,ֻ,̽ż,37.620238,127.013626 +1805,۳,1ȣ,37.4876,126.753664 +1886,۵,μ,37.428514,126.657772 +3139,۵޺,õ1ȣ,37.407143,126.62597 +4614,ۻ,μ,37.737279,127.087159 +2514,,5ȣ,37.561184,126.811973 +1721,ź,1ȣ,37.075696,127.054301 +2817,,8ȣ,37.499703,127.112183 +4134,ij,9ȣ,37.510372,127.112216 +1856,,д缱,37.378455,127.114322 +2713,,7ȣ,37.67785,127.055315 +1763,,4ȣ,37.349801,126.925365 +1267,,߾Ӽ,37.580842,126.895611 +339,,3ȣ,37.487378,127.101907 +1030,,д缱,37.487472,127.101422 +9007,, ö,37.48637,127.10161 +1713,,1ȣ,37.266348,126.999561 +1846,,д缱,37.265917,126.999422 +1871,û,д缱,37.261911,127.030736 +414,(ϱû),4ȣ,37.638052,127.025732 +4315,û,źд缱,37.322702,127.095026 +2826,,8ȣ,37.437428,127.140722 +427,Ա(),4ȣ,37.54456,126.972106 +2740,ǴԱ(),7ȣ,37.496029,126.953822 +1889,,μ,37.460789,126.638297 +3219,ùΰ(ȭâ),õ2ȣ,37.458335,126.681192 +151,û,1ȣ,37.565715,126.977088 +201,û,2ȣ,37.563588,126.975411 +4509,û.δ,μ,37.239151,127.178406 +4810,ɰ,ؼ,37.369864,126.808573 +4806,,ؼ,37.450145,126.793041 +4809,û,ؼ,37.382223,126.805625 +1864,Ű,д缱,37.286102,127.111313 +2539,űȣ,5ȣ,37.554548,127.020331 +2526,ű,5ȣ,37.517623,126.914839 +1032,ű,1ȣ,37.516862,126.917865 +1760,űõ,4ȣ,37.338212,126.765844 +2649,ų,6ȣ,37.613174,127.102231 +1311,ų,ἱ,37.612887,127.103218 +4125,ų,9ȣ,37.504598,127.02506 +4306,ų,źд缱,37.504598,127.02506 +245,Ŵ,2ȣ,37.57004,127.046481 +206,Ŵ,2ȣ,37.56564,127.019614 +2636,Ŵ,6ȣ,37.566154,127.016146 +231,Ŵ,2ȣ,37.487462,126.913149 +2743,ŴŸ,7ȣ,37.499701,126.928276 +234,ŵ,2ȣ,37.508961,126.891084 +1007,ŵ,1ȣ,37.508787,126.891144 +1507,ŵе,氭,37.317185,127.40476 +230,Ÿ,2ȣ,37.484201,126.929715 +4408,Ÿ,Ÿ,37.4849266,126.9296159 +4111,Ÿ,9ȣ,37.544277,126.88308 +4122,Ź,9ȣ,37.503415,126.995925 +4104,Źȭ,9ȣ,37.567532,126.816601 +327,Ż,3ȣ,37.516334,127.020114 +4304,Ż,źд缱,37.516334,127.020114 +156,ż,1ȣ,37.576048,127.024634 +246,ż,2ȣ,37.574747,127.024932 +4713,ż,̽ż,37.576095,127.023242 +3129,ſ,õ1ȣ,37.41804,126.693863 +429,ſ,4ȣ,37.52917,126.967894 +1213,ſ,߾Ӽ,37.525545,127.372921 +1017,̹,1ȣ,37.601854,127.067325 +2520,(),5ȣ,37.524997,126.856191 +249,װŸ,2ȣ,37.520074,126.852912 +3756,ߵ,7ȣ,37.50282,126.77566 +1408,â(õ),1ȣ,36.769502,126.951108 +4807,õ,ؼ,37.439066,126.786788 +240,,2ȣ,37.555131,126.936926 +1252,,߾Ӽ,37.559733,126.942597 +1890,,μ,37.46874,126.623853 +2745,dz,7ȣ,37.50008,126.90993 +4808,,ؼ,37.409008,126.788017 +2825,,8ȣ,37.440918,127.147564 +413,ֹ,4ȣ,37.648627,127.034709 +1402,ֿ(緿),1ȣ,36.793759,127.1214 +1403,ƻ,1ȣ,36.792053,127.104361 +3209,ƽþƵ(̻Ÿ),õ2ȣ,37.5517,126.677122 +1215,ƽ,߾Ӽ,37.51382,127.443173 +2546,(̴Ĺ),5ȣ,37.551691,127.089761 +242,,2ȣ,37.557345,126.956141 +318,ȱ,3ȣ,37.576477,126.985443 +1759,Ȼ,4ȣ,37.327082,126.788532 +2640,Ⱦ(뺴),6ȣ,37.586272,127.029005 +1706,Ⱦ,1ȣ,37.401592,126.922874 +2811,ϻ,8ȣ,37.55021,127.127562 +326,б,3ȣ,37.527072,127.028461 +1848,бε,д缱,37.527381,127.040534 +2531,ֿ,5ȣ,37.553736,126.95682 +1277,ߴ,߾Ӽ,37.712327,126.761356 +1876,߸,μ,37.264179,126.879483 +1854,ž,д缱,37.411185,127.128715 +323,,3ȣ,37.554867,127.010541 +2634,,6ȣ,37.554263,127.010358 +1212,,߾Ӽ,37.545981,127.329098 +1204,,߾Ӽ,37.606596,127.107906 +332,(ʱû),3ȣ,37.484477,127.033902 +4308,(ʱû),źд缱,37.483809,127.034653 +4309,ùǽ(),źд缱,37.470023,127.03842 +1207,,߾Ӽ,37.60533,127.19364 +1909,,1ȣ,37.774381,127.044708 +248,õû,2ȣ,37.512398,126.865819 +4106,õⱳ,9ȣ,37.568381,126.841333 +4920,,,37.642379,126.614309 +2523,,5ȣ,37.525569,126.886129 +1217,,߾Ӽ,37.492773,127.491837 +4613,,μ,37.742802,127.085035 +2728,̴(),7ȣ,37.548014,127.074658 +4504,,μ,37.274917,127.143714 +1875,õ,μ,37.250102,126.90879 +4126,,9ȣ,37.507287,127.033868 +2528,dz,5ȣ,37.527098,126.932901 +2527,ǵ,5ȣ,37.521747,126.924357 +4115,ǵ,9ȣ,37.52176,126.92403 +1511,,氭,37.282308,127.628816 +1803,,1ȣ,37.485178,126.811502 +221,,2ȣ,37.500622,127.036456 +2612,,6ȣ,37.606021,126.922744 +1885,,μ,37.417804,126.67894 +311,ų,3ȣ,37.619229,126.921038 +2615,ų,6ȣ,37.618636,126.920625 +9004,ų, ö,37.61878,126.9213 +1919,õ,1ȣ,38.10073,127.07372 +4110,â,9ȣ,37.546936,126.874916 +1006,,1ȣ,37.515504,126.907628 +236,û,2ȣ,37.525706,126.89661 +2524,û,5ȣ,37.5242,126.89503 +2525,,5ȣ,37.522669,126.905139 +4217,,ö1ȣ,37.51202,126.524254 +1868,,д缱,37.251568,127.071394 +3125,ȸ,õ1ȣ,37.449396,126.701012 +342,,3ȣ,37.502129,127.128319 +2558,,5ȣ,37.502057,127.127938 +406,,4ȣ,37.705,127.19281 +1802,,1ȣ,37.494526,126.845365 +1859,,д缱,37.339824,127.108942 +2522,(񵿿),5ȣ,37.524496,126.875181 +1874,õ,μ,37.24304,126.963676 +1216,,߾Ӽ,37.506062,127.473868 +1719,,1ȣ,37.145885,127.06672 +1718,,1ȣ,37.168953,127.063197 +1762,̵,4ȣ,37.362357,126.738714 +325,,3ȣ,37.541684,127.017269 +1011,,߾Ӽ,37.540446,127.018672 +2752,¼(ȸԱ),7ȣ,37.492092,126.823023 +1821,¼(ȸԱ),1ȣ,37.492433,126.824086 +1407,¾õ,1ȣ,36.780483,127.003249 +2556,øȰ(ѱü),5ȣ,37.516201,127.130923 +4136,øȰ(ѱü),9ȣ,37.516269,127.130288 +3205,,õ2ȣ,37.592928,126.673203 +3202,ձ,õ2ȣ,37.59518,126.642696 +208,սʸ(û),2ȣ,37.561238,127.036954 +2541,սʸ(û),5ȣ,37.56184,127.037059 +1013,սʸ(û),߾Ӽ,37.561827,127.038352 +1016,ܴ,1ȣ,37.596073,127.063549 +244,,2ȣ,37.561904,127.050899 +250,(빮û),2ȣ,37.574028,127.038091 +2725,븶,7ȣ,37.573647,127.086727 +1219,빮,߾Ӽ,37.48223,127.594647 +1003,,1ȣ,37.529849,126.964561 +2517,,5ȣ,37.548768,126.836318 +1211,,߾Ӽ,37.554669,127.310115 +4512,.۴,μ,37.237845,127.209198 +4211,,ö1ȣ,37.492904,126.49379 +4924,,,37.653867,126.68393 +3227,(â),õ2ȣ,37.440127,126.75997 +1278,,߾Ӽ,37.725826,126.767257 +9000,, ö,37.71614,126.72841 +1286,õ,߾Ӽ,37.879942,126.769999 +4814,,ؼ,37.31321,126.796261 +1951,,3ȣ,37.653324,126.843041 +1218,,߾Ӽ,37.468672,127.547076 +4815,,ؼ,37.302371,126.786691 +1884,,μ,37.413049,126.686648 +3130,,õ1ȣ,37.412333,126.687869 +1981,,ؼ,37.5239,126.8049 +1948,,3ȣ,37.650658,126.872642 +1020,,1ȣ,37.633212,127.058831 +2642,(),6ȣ,37.601948,127.041518 +1879,,μ,37.391769,126.742699 +2620,Ű(),6ȣ,37.569532,126.899298 +1282,,߾Ӽ,37.796188,126.792587 +203,3,2ȣ,37.566306,126.991696 +320,3,3ȣ,37.566672,126.992548 +204,4,2ȣ,37.566595,126.997817 +2536,4,5ȣ,37.567352,126.998032 +202,Ա,2ȣ,37.566014,126.982618 +1012,,߾Ӽ,37.549946,127.034538 +2611,,6ȣ,37.598605,126.915577 +1710,ǿ,1ȣ,37.320852,126.948217 +1906,,1ȣ,37.738415,127.045958 +4605,νû,μ,37.739256,127.034781 +4607,߾,μ,37.743676,127.049565 +241,̴,2ȣ,37.556733,126.946013 +1502,̸,氭,37.394655,127.127819 +1860,̸,д缱,37.395371,127.128248 +2738,̼,7ȣ,37.485196,126.981605 +1508,õ,氭,37.265579,127.44226 +430,(߾ӹڹ),4ȣ,37.522295,126.974733 +1008,(߾ӹڹ),߾Ӽ,37.522427,126.973406 +2631,¿,6ȣ,37.534488,126.994302 +1455,δ,4ȣ,37.401553,126.976715 +1812,õ,1ȣ,37.476079,126.616801 +1891,õ,μ,37.476403,126.617326 +3215,õ,õ2ȣ,37.4897,126.675208 +4213,õ1͹̳,ö1ȣ,37.447464,126.452508 +4215,õ2͹̳,ö1ȣ,37.460699,126.441442 +1881,õ,μ,37.400614,126.722478 +3226,õ,õ2ȣ,37.448769,126.752618 +3136,õԱ,õ1ȣ,37.386007,126.639484 +3124,õû,õ1ȣ,37.457263,126.702143 +3221,õû,õ2ȣ,37.456833,126.701306 +3126,õ͹̳,õ1ȣ,37.442383,126.699706 +1888,ϴ,μ,37.448493,126.649619 +1275,ϻ,߾Ӽ,37.682077,126.769846 +338,Ͽ,3ȣ,37.483681,127.08439 +1285,,߾Ӽ,37.888421,126.746765 +3113,,õ1ȣ,37.545059,126.738665 +3116,,õ1ȣ,37.530415,126.722527 +216,(ıû),2ȣ,37.513262,127.100159 +2815,(ıû),8ȣ,37.514692,127.104338 +215,dz,2ȣ,37.520733,127.10379 +217,ǻ,2ȣ,37.511687,127.086162 +328,,3ȣ,37.512759,127.01122 +4923,,,37.643986,126.669017 +2742,¹,7ȣ,37.504898,126.93915 +2711,,7ȣ,37.700109,127.053196 +2820,,8ȣ,37.478703,127.126191 +2544,,5ȣ,37.56144,127.064623 +1918,,1ȣ,38.02458,127.0718 +4517,.,μ,37.285342,127.219561 +4710,,̽ż,37.603133,127.013396 +1956,߻,3ȣ,37.659477,126.773359 +1454,ΰõû,4ȣ,37.426513,126.98978 +1761,,4ȣ,37.351735,126.742989 +1857,,д缱,37.365994,127.10807 +4312,,źд缱,37.367098,127.108403 +157,⵿,1ȣ,37.578103,127.034893 +1810,,1ȣ,37.466769,126.656666 +152,,1ȣ,37.570161,126.982923 +153,3,1ȣ,37.570406,126.991847 +319,3,3ȣ,37.571605,126.991791 +2535,3,5ȣ,37.57254,126.990305 +154,5,1ȣ,37.570926,127.001849 +218,տ,2ȣ,37.511022,127.073704 +4130,տ,9ȣ,37.511426,127.076275 +1809,־,1ȣ,37.465047,126.679742 +3218,־,õ2ȣ,37.464992,126.679098 +3217,־ȱ,õ2ȣ,37.473703,126.68113 +1957,ֿ,3ȣ,37.670072,126.761334 +1862,,д缱,37.324753,127.107395 +2716,߰,7ȣ,37.644583,127.064303 +2726,߰,7ȣ,37.565923,127.08432 +1822,ߵ,1ȣ,37.486562,126.764843 +1201,߶,߾Ӽ,37.594917,127.076116 +1756,߾,4ȣ,37.315941,126.838573 +4138,߾Ӻƺ,9ȣ,37.529191,127.148739 +2721,ȭ,7ȣ,37.602545,127.079264 +4108,,9ȣ,37.557402,126.861939 +2618,(),6ȣ,37.583876,126.909645 +4503,,μ,37.269606,127.136515 +3135,,õ1ȣ,37.378384,126.645168 +1723,,1ȣ,37.0188,127.070444 +309,,3ȣ,37.648033,126.913917 +1220,,߾Ӽ,37.476393,127.629874 +1912,,1ȣ,37.892334,127.055716 +1726,,1ȣ,36.870593,127.143904 +1720,,1ȣ,37.109447,127.062278 +405,,4ȣ,37.7205,127.2034 +412,â,4ȣ,37.653088,127.047274 +1022,â,߾Ӽ,37.653007,127.047806 +2638,â,6ȣ,37.579661,127.015241 +1318,õ,ἱ,37.658978,127.285379 +1728,õ,1ȣ,36.810005,127.146826 +2751,õ,7ȣ,37.486637,126.838713 +2548,õȣ(dz伺),5ȣ,37.53864,127.123308 +2812,õȣ(dz伺),8ȣ,37.538113,127.123254 +2749,ö,7ȣ,37.47605,126.867911 +4310,ûԱ,źд缱,37.447211,127.055664 +2538,û,5ȣ,37.560276,127.013639 +2635,û,6ȣ,37.560608,127.013986 +2731,û,7ȣ,37.519365,127.05335 +4210,û,ö1ȣ,37.556409,126.624648 +158,û(øԱ),1ȣ,37.579956,127.044585 +1014,û(øԱ),߾Ӽ,37.580759,127.0483 +1867,û,д缱,37.259489,127.078934 +1321,û,ἱ,37.735488,127.42661 +4506,ʴ,μ,37.260752,127.159443 +1917,ʼ,1ȣ,37.98172,127.06912 +1505,ʿ,氭,37.374419,127.299 +4813,,ؼ,37.319619,126.808147 +1758,,4ȣ,37.320646,126.805913 +432,ѽŴԱ(̼),4ȣ,37.486263,126.981989 +3755,,7ȣ,37.50365,126.78828 +1329,õ,ἱ,37.885054,127.717023 +321,湫,3ȣ,37.56143,126.994072 +423,湫,4ȣ,37.561207,126.99408 +243,(Ա),2ȣ,37.559704,126.964378 +2532,(Ա),5ȣ,37.560236,126.9629 +3133,ķ۽Ÿ,õ1ȣ,37.387855,126.661673 +9001,Ųؽ, ö,37.66532,126.74843 +1276,ź,߾Ӽ,37.694023,126.761086 +4615,ž,μ,37.733579,127.088704 +1404,,1ȣ,36.78866,127.08485 +2646,¸Ա,6ȣ,37.617338,127.074735 +2719,¸Ա,7ȣ,37.618294,127.075397 +1852,,д缱,37.440019,127.127709 +3134,ũũ,õ1ȣ,37.382268,126.656365 +1314,,ἱ,37.648311,127.143952 +1283,,߾Ӽ,37.815298,126.792783 +1501,DZ,氭,37.394761,127.111217 +4311,DZ,źд缱,37.394761,127.112217 +1210,ȴ,߾Ӽ,37.547371,127.243939 +1317,ȣ,ἱ,37.653225,127.244493 +1456,,4ȣ,37.394287,126.963883 +1724,,1ȣ,36.990726,127.085159 +4927,dz,,37.612488,126.732387 +1274,dz,߾Ӽ,37.672346,126.786243 +2717,ϰ,7ȣ,37.636352,127.06799 +2565,ϳ˴ܻ,5ȣ,37.53972,127.22345 +2566,ϳû(dz-),5ȣ,37.54205,127.20612 +2564,ϳdz,5ȣ,37.552034,127.203864 +2733,е,7ȣ,37.514229,127.031656 +336,п,3ȣ,37.496663,127.070594 +2632,Ѱ,6ȣ,37.539631,127.001725 +1010,ѳ,߾Ӽ,37.52943,127.009169 +1755,Ѵ,4ȣ,37.309689,126.85344 +419,ѼԱ(Ｑ),4ȣ,37.588458,127.006221 +4135,Ѽ,9ȣ,37.516404,127.116503 +209,Ѿ,2ȣ,37.555273,127.043655 +1024,Ƽ,д缱,37.496237,127.052873 +238,,2ȣ,37.549457,126.913808 +2623,,6ȣ,37.549209,126.913366 +2540,,5ȣ,37.557322,127.029476 +1270,,߾Ӽ,37.612102,126.834146 +420,ȭ,4ȣ,37.582336,127.001844 +1882,ȣ,μ,37.401637,126.708627 +239,ȫԱ,2ȣ,37.55679,126.923708 +1293,ȫԱ,߾Ӽ,37.557641,126.926683 +1264,ȫԱ,߾Ӽ,37.557641,126.926683 +4203,ȫԱ,ö1ȣ,37.557438,126.926715 +314,ȫ,3ȣ,37.589066,126.943736 +4705,ȭ,̽ż,37.634133,127.017511 +2518,ȭ,5ȣ,37.541513,126.840461 +2647,ȭ(￩Ա),6ȣ,37.620064,127.084689 +1712,ȭ,1ȣ,37.283862,126.989627 +1268,ȭ,߾Ӽ,37.602888,126.868387 +1952,ȭ,3ȣ,37.634592,126.83265 +1015,ȸ,߾Ӽ,37.58946,127.057583 +1905,ȸ,1ȣ,37.724416,127.04736 +4602,ȸ,μ,37.725006,127.047073 +425,ȸ(빮),4ȣ,37.558514,126.978246 +4611,ȿ,μ,37.754025,127.076902 +2628,ȿâ,6ȣ,37.539233,126.961384 +1261,ȿâ,߾Ӽ,37.538579,126.96221 +4119,漮(߾ӴԱ),9ȣ,37.50877,126.963708 +4606,Ｑ,μ,37.743302,127.037023 \ No newline at end of file diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java new file mode 100644 index 000000000..741270ee0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java @@ -0,0 +1,39 @@ +package com.bang_ggood.station; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.station.service.SubwayStationService; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.Arguments; +import org.junit.jupiter.params.provider.MethodSource; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.stream.Stream; + +import static org.assertj.core.api.Assertions.assertThat; + +public class SubwayStationServiceTest extends IntegrationTestSupport { + + @Autowired + SubwayStationService subwayStationService; + + @DisplayName("가까운 지하철 조회 성공") + @ParameterizedTest + @MethodSource("provideStationData") + void readNearestStation(double latitude, double longitude, String nearestStationName) { + // given & when + String stationName = subwayStationService.readNearestStation(latitude, longitude).stationName(); + + // then + assertThat(stationName).isEqualTo(nearestStationName); + } + + // check data in "https://apis.map.kakao.com/web/sample/addMapClickEventWithMarker/" + private static Stream provideStationData() { + return Stream.of( + Arguments.of(37.50495731889611, 126.7550884277559, "상동"), + Arguments.of(37.48352733443973, 126.80085909322227, "소사"), + Arguments.of(37.47909015564278, 126.9517354974442, "서울대입구(관악구청)"), + Arguments.of(37.516248619935034, 127.10303565244502, "잠실(송파구청)") + ); + } +} diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index cab89a836..8364b7074 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -115,7 +115,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(65536), + content VARCHAR(16383), keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/test/resources/seoul_stations_240819.csv b/backend/bang-ggood/src/test/resources/seoul_stations_240819.csv new file mode 100644 index 000000000..21d1ae50f --- /dev/null +++ b/backend/bang-ggood/src/test/resources/seoul_stations_240819.csv @@ -0,0 +1,768 @@ +_ID,,ȣ,,浵 +4703,4.19ֹ,̽ż,37.649502,127.013684 +1907,,1ȣ,37.748577,127.044213 +340,,3ȣ,37.492245,127.117757 +2818,,8ȣ,37.492888,127.118398 +2748,д,7ȣ,37.480338,126.882656 +1702,д,1ȣ,37.481581,126.882581 +4107,,9ȣ,37.561391,126.854456 +4704,,̽ż,37.641537,127.016789 +3216,,õ2ȣ,37.484192,126.683673 +3211,(Ƽ),õ2ȣ,37.524649,126.675539 +3212,߾ӽ,õ2ȣ,37.517054,126.676672 +1265,,߾Ӽ,37.568491,126.915487 +1851,õ,д缱,37.448605,127.126697 +1323,,ἱ,37.814536,127.510739 +1816,,1ȣ,37.464737,126.694181 +3123,Ÿ,õ1ȣ,37.467048,126.707938 +1312,,ἱ,37.634118,127.114757 +3117,,õ1ȣ,37.517268,126.721514 +222,,2ȣ,37.49799,127.027912 +4307,,źд缱,37.496837,127.028104 +2732,û,7ȣ,37.517179,127.041255 +1849,û,д缱,37.517469,127.041151 +4502,,μ,37.270161,127.126033 +2549,,5ȣ,37.535804,127.132481 +2813,û,8ȣ,37.530341,127.120508 +1269,,߾Ӽ,37.612314,126.843223 +214,(͹̳),2ȣ,37.535095,127.094681 +9995,,5ȣ,37.55749,127.17593 +1326,,ἱ,37.805723,127.634146 +2559,,5ȣ,37.498079,127.13482 +1801,,1ȣ,37.494594,126.85968 +1027,,д缱,37.489116,127.06614 +4101,ȭ,9ȣ,37.578608,126.798153 +2512,ȭ,5ȣ,37.572399,126.806171 +2560,ſ,5ȣ,37.493105,127.14415 +212,ǴԱ,2ȣ,37.540373,127.069191 +2729,ǴԱ,7ȣ,37.540786,127.071011 +4925,Ϻ,,37.63165,126.705975 +3203,˴ܻŸ,õ2ȣ,37.60185,126.657108 +3201,˴ܿ(˴ܻ),õ2ȣ,37.594877,126.627178 +3208,˹,õ2ȣ,37.561405,126.677566 +4209,˾,ö1ȣ,37.569098,126.674007 +3207,˾,õ2ȣ,37.56866,126.675687 +1504,Ɽ,氭,37.399907,127.25263 +4610,⵵ûϺû,μ,37.75059,127.071495 +1451,渶,4ȣ,37.443885,127.007888 +317,溹(μû),3ȣ,37.575762,126.97353 +3115,αԱ,õ1ȣ,37.538157,126.722597 +4604,ö,μ,37.737202,127.043257 +341,,3ȣ,37.495918,127.12454 +3114,,õ1ȣ,37.543238,126.728128 +4208,,ö1ȣ,37.571662,126.7363 +3110,,õ1ȣ,37.571449,126.73578 +2553,,5ȣ,37.555004,127.154151 +2641,(),6ȣ,37.590508,127.036296 +1873,,μ,37.24963,126.980248 +329,͹̳,3ȣ,37.504891,127.004916 +2736,͹̳,7ȣ,37.503367,127.005068 +4123,͹̳,9ȣ,37.50598,127.004403 +1757,,4ȣ,37.316784,126.823144 +4513,,μ,37.24484,127.214251 +4928,,,37.601243,126.770345 +1272,,߾Ӽ,37.645676,126.801762 +4612,,μ,37.750471,127.083715 +1506,,氭,37.351315,127.34674 +2530,,5ȣ,37.544431,126.951372 +2627,,6ȣ,37.543555,126.951678 +1292,,߾Ӽ,37.542596,126.952099 +4202,,ö1ȣ,37.54253,126.952024 +2718,(б),7ȣ,37.625742,127.072896 +4103,׽,9ȣ,37.563726,126.810678 +4212,ȭû,ö1ȣ,37.459041,126.477516 +1453,õ,4ȣ,37.433021,126.996568 +1705,,1ȣ,37.419232,126.908706 +4411,ǻ(),Ÿ,37.4691018,126.9450639 +4319,(),źд缱,37.30211,127.044483 +4318,߾(ִ),źд缱,37.288617,127.051478 +2547,(Ŵ),5ȣ,37.545303,127.10357 +1750,,1ȣ,37.416182,126.884466 +2750,Ÿ,7ȣ,37.479252,126.854876 +1019,,1ȣ,37.623632,127.061835 +2534,ȭ(ȭȸ),5ȣ,37.571525,126.97717 +2625,â(),6ȣ,37.547456,126.931993 +223,(.û),2ȣ,37.493961,127.014667 +330,(.û),3ȣ,37.493025,127.013786 +4921,,,37.645384,126.628633 +1701,,1ȣ,37.503039,126.881966 +232,εд,2ȣ,37.485266,126.901401 +1026,,д缱,37.486839,127.058856 +1205,,߾Ӽ,37.603392,127.143869 +4121,,9ȣ,37.501364,126.987332 +2616,,6ȣ,37.611377,126.91727 +1863,,д缱,37.298969,127.105664 +9009,, ö,37.29913,127.10389 +213,(û),2ȣ,37.537077,127.085916 +1813,,1ȣ,37.496756,126.870793 +310,Ĺ,3ȣ,37.636763,126.918821 +1214,,߾Ӽ,37.516169,127.399367 +3138,,õ1ȣ,37.399907,126.630347 +4114,ȸǻ,9ȣ,37.528105,126.917874 +2545,(ɵ),5ȣ,37.557088,127.079577 +2727,(ɵ),7ȣ,37.556897,127.079338 +1709,,1ȣ,37.35356,126.948462 +1324,,ἱ,37.832067,127.557695 +2760,õ,7ȣ,37.506997,126.73128 +2551,ٸ(ȸ),5ȣ,37.545477,127.142853 +3111,,õ1ȣ,37.566379,126.742654 +1316,ݰ,ἱ,37.637382,127.207853 +1279,ݸ,߾Ӽ,37.751322,126.765347 +1708,,1ȣ,37.372221,126.943429 +1458,,4ȣ,37.372209,126.943417 +1703,õû,1ȣ,37.455626,126.89398 +1280,,߾Ӽ,37.766217,126.774644 +324,ȣ,3ȣ,37.548034,127.015872 +1865,,д缱,37.275061,127.11591 +4501,,μ,37.275449,127.116665 +2550,浿,5ȣ,37.537801,127.140004 +417,,4ȣ,37.603407,127.025053 +4511,跮,μ,37.237247,127.198781 +1327,,ἱ,37.818466,127.71434 +2513,,5ȣ,37.562384,126.801292 +4102,,9ȣ,37.561916,126.802152 +4207,,ö1ȣ,37.561842,126.801904 +4929,,,37.56236,126.801868 +1980,,ؼ,37.5617,126.8041 +2519,ġ,5ȣ,37.531768,126.846683 +2753,ġ,7ȣ,37.506207,126.810939 +227,,2ȣ,37.47693,126.963693 +2747,,7ȣ,37.486056,126.887249 +3225,û,õ2ȣ,37.448161,126.736939 +1883,δũ,μ,37.407722,126.695216 +331,͹̳(),3ȣ,37.485013,127.016189 +2739,,7ȣ,37.484596,126.971251 +1002,,1ȣ,37.541021,126.9713 +2828,,8ȣ,37.4624,127.13977 +1328,õ,ἱ,37.864007,127.723792 +434,·,4ȣ,37.463873,126.989134 +2823,ѻ꼺Ա(.û),8ȣ,37.451535,127.159816 +2737,,7ȣ,37.487618,126.993513 +4118,,9ȣ,37.512887,126.953222 +4117,뷮,9ȣ,37.513534,126.941005 +1004,뷮,1ȣ,37.514149,126.94271 +411,,4ȣ,37.65627,127.063276 +2715,,7ȣ,37.654836,127.060462 +313,,3ȣ,37.600927,126.935756 +2630,(걸û),6ȣ,37.534675,126.986695 +1908,,1ȣ,37.75938,127.042292 +1021,õ,1ȣ,37.644799,127.051269 +2734,,7ȣ,37.511093,127.021415 +4305,,źд缱,37.511093,127.021415 +1271,ɰ,߾Ӽ,37.618808,126.820783 +2824,ܴŸ,8ȣ,37.44521,127.156866 +4811,޹,ؼ,37.348847,126.809409 +1878,޿,μ,37.379681,126.745177 +2543,ʸ,5ȣ,37.566747,127.052704 +409,,4ȣ,37.670272,127.079066 +4407,,Ÿ,37.4902998,126.9275133 +237,,2ȣ,37.534946,126.902767 +4113,,9ȣ,37.533406,126.902809 +1729,,1ȣ,37.344285,126.948345 +9002,, ö,37.63191,126.81113 +1953,,3ȣ,37.631626,126.811024 +1452,,4ȣ,37.435675,127.006523 +233,븲(αû),2ȣ,37.493243,126.894932 +2746,븲(αû),7ȣ,37.493013,126.897075 +1028,Ա,д缱,37.491373,127.07272 +1005,,1ȣ,37.513342,126.926382 +4402,,Ÿ,37.5133059,126.9257265 +1320,뼺,ἱ,37.684071,127.379319 +1752,߹,4ȣ,37.328467,126.917332 +337,û,3ȣ,37.493514,127.079532 +335,ġ,3ȣ,37.494612,127.063642 +1958,ȭ,3ȣ,37.676087,126.747569 +2626,(),6ȣ,37.547771,126.942069 +1910,,1ȣ,37.818486,127.056486 +1208,,߾Ӽ,37.586781,127.208832 +1911,,1ȣ,37.843188,127.061277 +334,,3ȣ,37.490922,127.055452 +1025,,д缱,37.491224,127.055186 +1206,,߾Ӽ,37.608806,127.161153 +247,õ,2ȣ,37.514287,126.882768 +1902,,1ȣ,37.679563,127.045595 +2712,,7ȣ,37.689241,127.046509 +1903,,1ȣ,37.689534,127.046049 +1209,,߾Ӽ,37.579622,127.222672 +1817,,1ȣ,37.468446,126.642706 +1823,ȭ,1ȣ,37.46607,126.668672 +316,,3ȣ,37.574571,126.957748 +2614,,6ȣ,37.618456,126.933031 +1714,,1ȣ,37.466613,126.889249 +3206,,õ2ȣ,37.585212,126.675844 +2644,,6ȣ,37.610537,127.056431 +155,빮,1ȣ,37.571687,127.01093 +421,빮,4ȣ,37.57093,127.009287 +205,빮繮ȭ,2ȣ,37.565613,127.009054 +422,빮繮ȭ,4ȣ,37.565133,127.007885 +2537,빮繮ȭ,5ȣ,37.564665,127.005353 +322,Ա,3ȣ,37.559052,127.005602 +1915,õ,1ȣ,37.927878,127.05479 +1913,õ߾,1ȣ,37.901885,127.056482 +3132,,õ1ȣ,37.397878,126.674005 +159,,1ȣ,37.573197,127.01648 +2637,,6ȣ,37.572279,127.015653 +4505,,μ,37.269043,127.152716 +3121,,õ1ȣ,37.485312,126.718247 +1808,,1ȣ,37.471408,126.702896 +4608,,μ,37.745271,127.056947 +1811,õ,1ȣ,37.475276,126.632802 +431,(),4ȣ,37.502852,126.980347 +4120,(),9ȣ,37.502878,126.978153 +4314,õ,źд缱,37.337928,127.102976 +3131,,õ1ȣ,37.404737,126.681015 +9010,ź, ö,37.20034,127.09569 +1727,,1ȣ,36.833705,127.14896 +4515,,μ,37.267051,127.21364 +2555,̵,5ȣ,37.527788,127.136248 +4137,̿,9ȣ,37.519683,127.137989 +4109,,9ȣ,37.550632,126.865689 +2619,й̵Ƽ,6ȣ,37.576108,126.901391 +1294,й̵Ƽ,߾Ӽ,37.577475,126.900453 +4204,й̵Ƽ,ö1ȣ,37.576958,126.898609 +210,Ҽ,2ȣ,37.547184,127.047367 +2730,Ҽ,7ȣ,37.53154,127.066704 +2515,,5ȣ,37.560183,126.825448 +4105,,9ȣ,37.566778,126.82731 +4206,,ö1ȣ,37.565543,126.827378 +1955,,3ȣ,37.652206,126.77762 +2714,,7ȣ,37.66494,127.057675 +4922,,,37.640732,126.644344 +1319,,ἱ,37.652782,127.311767 +2542,,5ȣ,37.5661,127.042973 +3204,,õ2ȣ,37.597566,126.666998 +2561,õ,5ȣ,37.49499,127.152781 +2529,,5ȣ,37.539574,126.945932 +2621,û,6ȣ,37.563515,126.903343 +3224,,õ2ȣ,37.454911,126.732094 +1203,,߾Ӽ,37.59955,127.091909 +2622,,6ȣ,37.556094,126.910052 +1904,,1ȣ,37.709914,127.047455 +1869,,д缱,37.245795,127.057353 +1872,ű,д缱,37.265481,127.015678 +333,ź,3ȣ,37.486947,127.046769 +1870,źǼ,д缱,37.252759,127.040566 +2720,԰,7ȣ,37.610637,127.077725 +2723,,7ȣ,37.588579,127.087503 +424,,4ȣ,37.560989,126.986325 +2552,,5ȣ,37.55137,127.143999 +4510,,μ,37.237964,127.190294 +1707,,1ȣ,37.384653,126.935433 +2827,,8ȣ,37.433824,127.129837 +1853,,д缱,37.432052,127.129104 +3223,𷡳,õ2ȣ,37.45583,126.719298 +2521,,5ȣ,37.526065,126.864931 +2814,伺(ȭǹ),8ȣ,37.517409,127.112359 +315,,3ȣ,37.582299,126.950291 +235,,2ȣ,37.517933,126.89476 +1284,,߾Ӽ,37.854619,126.788047 +2819,,8ȣ,37.485855,127.1225 +3127,а,õ1ȣ,37.434935,126.698579 +1858,̱,д缱,37.350077,127.10891 +4313,̱,źд缱,37.349982,127.108918 +9996,̻,5ȣ,37.560927,127.193877 +415,̾(̹),4ȣ,37.62667,127.025983 +416,̾ƻŸ,4ȣ,37.613292,127.030053 +3112,,õ1ȣ,37.553703,126.745077 +1753,ݿ,4ȣ,37.312212,126.903524 +2735,,7ȣ,37.508178,127.011727 +4601,߰,μ,37.727048,127.052803 +2516,߻,5ȣ,37.558598,126.837668 +225,,2ȣ,37.481426,126.997596 +2557,,5ȣ,37.508857,127.126133 +1901,,1ȣ,37.667503,127.044273 +2511,ȭ,5ȣ,37.577446,126.812741 +1405,,1ȣ,36.777629,127.052991 +1273,鸶,߾Ӽ,37.658239,126.794461 +1954,鼮,3ȣ,37.643114,126.78787 +1325,縮,ἱ,37.830779,127.58933 +1807,,1ȣ,37.483664,126.707704 +2633,Ƽ,6ȣ,37.548013,127.007055 +1457,,4ȣ,37.389793,126.950806 +4603,,μ,37.728755,127.04353 +1313,,ἱ,37.64202,127.12684 +408,,4ȣ,37.66778,127.11581 +1716,,1ȣ,37.207503,127.032731 +2744,,7ȣ,37.499872,126.920428 +4404,,Ÿ,37.5002739,126.9204355 +4405,Ű,Ÿ,37.4955691,126.9180827 +4406,ź,Ÿ,37.4929598,126.9234964 +2639,,6ȣ,37.585274,127.019351 +4712,,̽ż,37.585286,127.019381 +1914,,1ȣ,37.913702,127.057277 +1861,,д缱,37.312752,127.108196 +4514,,μ,37.258965,127.218457 +2821,,8ȣ,37.471052,127.126732 +1031,,д缱,37.470345,127.126658 +1401,,1ȣ,36.801215,127.135763 +4129,,9ȣ,37.514219,127.060245 +229,õ,2ȣ,37.482362,126.941892 +2648,ȭ(Ƿ),6ȣ,37.617283,127.091401 +1815,ΰ,1ȣ,37.488418,126.74109 +1509,ι,氭,37.260192,127.490277 +1804,õ,1ȣ,37.48405,126.782686 +2757,õû,7ȣ,37.504631,126.763538 +2754,õտ,7ȣ,37.50538,126.797337 +1982,õտ,ؼ,37.505457,126.797289 +1806,,1ȣ,37.489445,126.724506 +3120,,õ1ȣ,37.490535,126.723453 +2761,û,7ȣ,37.507394,126.721599 +3118,û,õ1ȣ,37.508407,126.720555 +3122,Ÿ,õ1ȣ,37.477679,126.710208 +3119,,õ1ȣ,37.498383,126.722244 +4709,ѻ꺸,̽ż,37.612072,127.008251 +4701,ѻ,̽ż,37.662909,127.012706 +312,ұ,3ȣ,37.610553,126.92982 +2613,ұ,6ȣ,37.610873,126.92939 +2724,簡,7ȣ,37.580894,127.088478 +226,,2ȣ,37.476538,126.981544 +433,,4ȣ,37.476955,126.981651 +1315,縪,ἱ,37.65108,127.176933 +1877,縮,μ,37.28998,126.85685 +4926,(û),,37.620249,126.719731 +4124,,9ȣ,37.504206,127.015259 +3762,,7ȣ,37.5086,126.7035277 +1751,꺻,4ȣ,37.358101,126.933274 +2822,꼺,8ȣ,37.457122,127.149908 +4508,ﰡ,μ,37.242115,127.168075 +428,ﰢ,4ȣ,37.534075,126.9726 +2629,ﰢ,6ȣ,37.535534,126.974032 +1503,ﵿ,氭,37.409522,127.20336 +2759,ü,7ȣ,37.506411,126.742153 +3759,ü,7ȣ,37.50724,126.74179 +9006,Ｚ, ö,37.50887,127.06324 +219,Ｚ(),2ȣ,37.508844,127.06316 +4128,Ｚ߾,9ȣ,37.513011,127.053282 +1950,,3ȣ,37.653083,126.895558 +4706,,̽ż,37.626914,127.018106 +4707,Ÿ,̽ż,37.621337,127.020473 +4131,,9ȣ,37.504738,127.088025 +1866,,д缱,37.26181,127.108847 +410,,4ȣ,37.660878,127.073572 +2741,,7ȣ,37.502834,126.94791 +3758,,7ȣ,37.505814,126.753163 +1754,ϼ,4ȣ,37.302795,126.866489 +2722,(ÿܹ͹̳),7ȣ,37.595577,127.085716 +1202,(ÿܹ͹̳),߾Ӽ,37.596678,127.08504 +2624,,6ȣ,37.547716,126.922852 +207,սʸ,2ȣ,37.564354,127.029354 +2643,(ѱб),6ȣ,37.606377,127.048491 +2554,ϵ,5ȣ,37.556712,127.166417 +1322,õ,ἱ,37.770246,127.454821 +4317,,źд缱,37.297664,127.069342 +4609,,μ,37.748885,127.06362 +2617,(Ż),6ȣ,37.591148,126.913629 +4116,,9ȣ,37.517274,126.928422 +4401,,Ÿ,37.5170969,126.929399 +1263,,߾Ӽ,37.551881,126.935711 +3210,û,õ2ȣ,37.543742,126.676787 +2533,빮,5ȣ,37.565773,126.966641 +1749,ź,1ȣ,37.195504,127.051672 +3214,οȸ,õ2ȣ,37.500168,126.675795 +1009,,߾Ӽ,37.519594,126.988537 +9005,, ö,37.55569,126.97296 +4410,뺥óŸ,Ÿ,37.4720019,126.9339351 +228,Ա(DZû),2ȣ,37.481247,126.952739 +1847,｣,д缱,37.543617,127.044707 +426,￪,4ȣ,37.55281,126.972556 +1001,￪,1ȣ,37.554337,126.971134 +1291,￪,߾Ӽ,37.557231,126.97103 +4201,￪,ö1ȣ,37.553247,126.969769 +4403,溴û,Ÿ,37.5060464,126.9227083 +4409,,Ÿ,37.4782341,126.9330365 +1722,,1ȣ,37.056496,127.052819 +224,,2ȣ,37.491897,127.007917 +1855,,д缱,37.385126,127.123592 +2645,,6ȣ,37.614872,127.065595 +1018,,1ȣ,37.614532,127.065934 +3763,(źϽ),7ȣ,37.5062285,126.6762813 +3213,(źϽ),õ2ȣ,37.506193,126.676203 +3220,,õ2ȣ,37.457611,126.692575 +1704,,1ȣ,37.435047,126.902295 +3222,õŸ,õ2ȣ,37.456805,126.709986 +2816,,8ȣ,37.505557,127.106832 +4133,,9ȣ,37.505208,127.10704 +4132,̰,9ȣ,37.502558,127.097033 +220,,2ȣ,37.504286,127.048203 +1023,,д缱,37.504856,127.048807 +1450,,4ȣ,37.451673,127.002303 +4812,,ؼ,37.334353,126.809904 +4112,,9ȣ,37.53802,126.893525 +4127,,9ȣ,37.510297,127.043999 +1850,,д缱,37.510735,127.043677 +3128,,õ1ȣ,37.426684,126.698863 +1711,հ,1ȣ,37.300349,126.97075 +1512,,氭,37.39468,127.11945 +9008,, ö,37.39467,127.12058 +4316,,źд缱,37.313335,127.0801 +211,,2ȣ,37.544581,127.055961 +418,ſԱ(),4ȣ,37.592612,127.016441 +4711,ſԱ(),̽ż,37.592467,127.016516 +1725,ȯ,1ȣ,36.916076,127.126964 +1715,,1ȣ,37.245025,127.013222 +1717,,1ȣ,37.187533,127.04318 +1510,ո,氭,37.295309,127.570938 +3137,Ʈũ,õ1ȣ,37.393054,126.634729 +1880,ҷ,μ,37.40095,126.733522 +1814,һ,1ȣ,37.482753,126.79544 +4804,һ,ؼ,37.483279,126.795023 +4805,һ,ؼ,37.468467,126.797252 +1916,ҿ,1ȣ,37.9481,127.061034 +4702,ֹ,̽ż,37.65603,127.013273 +4708,ֻ,̽ż,37.620238,127.013626 +1805,۳,1ȣ,37.4876,126.753664 +1886,۵,μ,37.428514,126.657772 +3139,۵޺,õ1ȣ,37.407143,126.62597 +4614,ۻ,μ,37.737279,127.087159 +2514,,5ȣ,37.561184,126.811973 +1721,ź,1ȣ,37.075696,127.054301 +2817,,8ȣ,37.499703,127.112183 +4134,ij,9ȣ,37.510372,127.112216 +1856,,д缱,37.378455,127.114322 +2713,,7ȣ,37.67785,127.055315 +1763,,4ȣ,37.349801,126.925365 +1267,,߾Ӽ,37.580842,126.895611 +339,,3ȣ,37.487378,127.101907 +1030,,д缱,37.487472,127.101422 +9007,, ö,37.48637,127.10161 +1713,,1ȣ,37.266348,126.999561 +1846,,д缱,37.265917,126.999422 +1871,û,д缱,37.261911,127.030736 +414,(ϱû),4ȣ,37.638052,127.025732 +4315,û,źд缱,37.322702,127.095026 +2826,,8ȣ,37.437428,127.140722 +427,Ա(),4ȣ,37.54456,126.972106 +2740,ǴԱ(),7ȣ,37.496029,126.953822 +1889,,μ,37.460789,126.638297 +3219,ùΰ(ȭâ),õ2ȣ,37.458335,126.681192 +151,û,1ȣ,37.565715,126.977088 +201,û,2ȣ,37.563588,126.975411 +4509,û.δ,μ,37.239151,127.178406 +4810,ɰ,ؼ,37.369864,126.808573 +4806,,ؼ,37.450145,126.793041 +4809,û,ؼ,37.382223,126.805625 +1864,Ű,д缱,37.286102,127.111313 +2539,űȣ,5ȣ,37.554548,127.020331 +2526,ű,5ȣ,37.517623,126.914839 +1032,ű,1ȣ,37.516862,126.917865 +1760,űõ,4ȣ,37.338212,126.765844 +2649,ų,6ȣ,37.613174,127.102231 +1311,ų,ἱ,37.612887,127.103218 +4125,ų,9ȣ,37.504598,127.02506 +4306,ų,źд缱,37.504598,127.02506 +245,Ŵ,2ȣ,37.57004,127.046481 +206,Ŵ,2ȣ,37.56564,127.019614 +2636,Ŵ,6ȣ,37.566154,127.016146 +231,Ŵ,2ȣ,37.487462,126.913149 +2743,ŴŸ,7ȣ,37.499701,126.928276 +234,ŵ,2ȣ,37.508961,126.891084 +1007,ŵ,1ȣ,37.508787,126.891144 +1507,ŵе,氭,37.317185,127.40476 +230,Ÿ,2ȣ,37.484201,126.929715 +4408,Ÿ,Ÿ,37.4849266,126.9296159 +4111,Ÿ,9ȣ,37.544277,126.88308 +4122,Ź,9ȣ,37.503415,126.995925 +4104,Źȭ,9ȣ,37.567532,126.816601 +327,Ż,3ȣ,37.516334,127.020114 +4304,Ż,źд缱,37.516334,127.020114 +156,ż,1ȣ,37.576048,127.024634 +246,ż,2ȣ,37.574747,127.024932 +4713,ż,̽ż,37.576095,127.023242 +3129,ſ,õ1ȣ,37.41804,126.693863 +429,ſ,4ȣ,37.52917,126.967894 +1213,ſ,߾Ӽ,37.525545,127.372921 +1017,̹,1ȣ,37.601854,127.067325 +2520,(),5ȣ,37.524997,126.856191 +249,װŸ,2ȣ,37.520074,126.852912 +3756,ߵ,7ȣ,37.50282,126.77566 +1408,â(õ),1ȣ,36.769502,126.951108 +4807,õ,ؼ,37.439066,126.786788 +240,,2ȣ,37.555131,126.936926 +1252,,߾Ӽ,37.559733,126.942597 +1890,,μ,37.46874,126.623853 +2745,dz,7ȣ,37.50008,126.90993 +4808,,ؼ,37.409008,126.788017 +2825,,8ȣ,37.440918,127.147564 +413,ֹ,4ȣ,37.648627,127.034709 +1402,ֿ(緿),1ȣ,36.793759,127.1214 +1403,ƻ,1ȣ,36.792053,127.104361 +3209,ƽþƵ(̻Ÿ),õ2ȣ,37.5517,126.677122 +1215,ƽ,߾Ӽ,37.51382,127.443173 +2546,(̴Ĺ),5ȣ,37.551691,127.089761 +242,,2ȣ,37.557345,126.956141 +318,ȱ,3ȣ,37.576477,126.985443 +1759,Ȼ,4ȣ,37.327082,126.788532 +2640,Ⱦ(뺴),6ȣ,37.586272,127.029005 +1706,Ⱦ,1ȣ,37.401592,126.922874 +2811,ϻ,8ȣ,37.55021,127.127562 +326,б,3ȣ,37.527072,127.028461 +1848,бε,д缱,37.527381,127.040534 +2531,ֿ,5ȣ,37.553736,126.95682 +1277,ߴ,߾Ӽ,37.712327,126.761356 +1876,߸,μ,37.264179,126.879483 +1854,ž,д缱,37.411185,127.128715 +323,,3ȣ,37.554867,127.010541 +2634,,6ȣ,37.554263,127.010358 +1212,,߾Ӽ,37.545981,127.329098 +1204,,߾Ӽ,37.606596,127.107906 +332,(ʱû),3ȣ,37.484477,127.033902 +4308,(ʱû),źд缱,37.483809,127.034653 +4309,ùǽ(),źд缱,37.470023,127.03842 +1207,,߾Ӽ,37.60533,127.19364 +1909,,1ȣ,37.774381,127.044708 +248,õû,2ȣ,37.512398,126.865819 +4106,õⱳ,9ȣ,37.568381,126.841333 +4920,,,37.642379,126.614309 +2523,,5ȣ,37.525569,126.886129 +1217,,߾Ӽ,37.492773,127.491837 +4613,,μ,37.742802,127.085035 +2728,̴(),7ȣ,37.548014,127.074658 +4504,,μ,37.274917,127.143714 +1875,õ,μ,37.250102,126.90879 +4126,,9ȣ,37.507287,127.033868 +2528,dz,5ȣ,37.527098,126.932901 +2527,ǵ,5ȣ,37.521747,126.924357 +4115,ǵ,9ȣ,37.52176,126.92403 +1511,,氭,37.282308,127.628816 +1803,,1ȣ,37.485178,126.811502 +221,,2ȣ,37.500622,127.036456 +2612,,6ȣ,37.606021,126.922744 +1885,,μ,37.417804,126.67894 +311,ų,3ȣ,37.619229,126.921038 +2615,ų,6ȣ,37.618636,126.920625 +9004,ų, ö,37.61878,126.9213 +1919,õ,1ȣ,38.10073,127.07372 +4110,â,9ȣ,37.546936,126.874916 +1006,,1ȣ,37.515504,126.907628 +236,û,2ȣ,37.525706,126.89661 +2524,û,5ȣ,37.5242,126.89503 +2525,,5ȣ,37.522669,126.905139 +4217,,ö1ȣ,37.51202,126.524254 +1868,,д缱,37.251568,127.071394 +3125,ȸ,õ1ȣ,37.449396,126.701012 +342,,3ȣ,37.502129,127.128319 +2558,,5ȣ,37.502057,127.127938 +406,,4ȣ,37.705,127.19281 +1802,,1ȣ,37.494526,126.845365 +1859,,д缱,37.339824,127.108942 +2522,(񵿿),5ȣ,37.524496,126.875181 +1874,õ,μ,37.24304,126.963676 +1216,,߾Ӽ,37.506062,127.473868 +1719,,1ȣ,37.145885,127.06672 +1718,,1ȣ,37.168953,127.063197 +1762,̵,4ȣ,37.362357,126.738714 +325,,3ȣ,37.541684,127.017269 +1011,,߾Ӽ,37.540446,127.018672 +2752,¼(ȸԱ),7ȣ,37.492092,126.823023 +1821,¼(ȸԱ),1ȣ,37.492433,126.824086 +1407,¾õ,1ȣ,36.780483,127.003249 +2556,øȰ(ѱü),5ȣ,37.516201,127.130923 +4136,øȰ(ѱü),9ȣ,37.516269,127.130288 +3205,,õ2ȣ,37.592928,126.673203 +3202,ձ,õ2ȣ,37.59518,126.642696 +208,սʸ(û),2ȣ,37.561238,127.036954 +2541,սʸ(û),5ȣ,37.56184,127.037059 +1013,սʸ(û),߾Ӽ,37.561827,127.038352 +1016,ܴ,1ȣ,37.596073,127.063549 +244,,2ȣ,37.561904,127.050899 +250,(빮û),2ȣ,37.574028,127.038091 +2725,븶,7ȣ,37.573647,127.086727 +1219,빮,߾Ӽ,37.48223,127.594647 +1003,,1ȣ,37.529849,126.964561 +2517,,5ȣ,37.548768,126.836318 +1211,,߾Ӽ,37.554669,127.310115 +4512,.۴,μ,37.237845,127.209198 +4211,,ö1ȣ,37.492904,126.49379 +4924,,,37.653867,126.68393 +3227,(â),õ2ȣ,37.440127,126.75997 +1278,,߾Ӽ,37.725826,126.767257 +9000,, ö,37.71614,126.72841 +1286,õ,߾Ӽ,37.879942,126.769999 +4814,,ؼ,37.31321,126.796261 +1951,,3ȣ,37.653324,126.843041 +1218,,߾Ӽ,37.468672,127.547076 +4815,,ؼ,37.302371,126.786691 +1884,,μ,37.413049,126.686648 +3130,,õ1ȣ,37.412333,126.687869 +1981,,ؼ,37.5239,126.8049 +1948,,3ȣ,37.650658,126.872642 +1020,,1ȣ,37.633212,127.058831 +2642,(),6ȣ,37.601948,127.041518 +1879,,μ,37.391769,126.742699 +2620,Ű(),6ȣ,37.569532,126.899298 +1282,,߾Ӽ,37.796188,126.792587 +203,3,2ȣ,37.566306,126.991696 +320,3,3ȣ,37.566672,126.992548 +204,4,2ȣ,37.566595,126.997817 +2536,4,5ȣ,37.567352,126.998032 +202,Ա,2ȣ,37.566014,126.982618 +1012,,߾Ӽ,37.549946,127.034538 +2611,,6ȣ,37.598605,126.915577 +1710,ǿ,1ȣ,37.320852,126.948217 +1906,,1ȣ,37.738415,127.045958 +4605,νû,μ,37.739256,127.034781 +4607,߾,μ,37.743676,127.049565 +241,̴,2ȣ,37.556733,126.946013 +1502,̸,氭,37.394655,127.127819 +1860,̸,д缱,37.395371,127.128248 +2738,̼,7ȣ,37.485196,126.981605 +1508,õ,氭,37.265579,127.44226 +430,(߾ӹڹ),4ȣ,37.522295,126.974733 +1008,(߾ӹڹ),߾Ӽ,37.522427,126.973406 +2631,¿,6ȣ,37.534488,126.994302 +1455,δ,4ȣ,37.401553,126.976715 +1812,õ,1ȣ,37.476079,126.616801 +1891,õ,μ,37.476403,126.617326 +3215,õ,õ2ȣ,37.4897,126.675208 +4213,õ1͹̳,ö1ȣ,37.447464,126.452508 +4215,õ2͹̳,ö1ȣ,37.460699,126.441442 +1881,õ,μ,37.400614,126.722478 +3226,õ,õ2ȣ,37.448769,126.752618 +3136,õԱ,õ1ȣ,37.386007,126.639484 +3124,õû,õ1ȣ,37.457263,126.702143 +3221,õû,õ2ȣ,37.456833,126.701306 +3126,õ͹̳,õ1ȣ,37.442383,126.699706 +1888,ϴ,μ,37.448493,126.649619 +1275,ϻ,߾Ӽ,37.682077,126.769846 +338,Ͽ,3ȣ,37.483681,127.08439 +1285,,߾Ӽ,37.888421,126.746765 +3113,,õ1ȣ,37.545059,126.738665 +3116,,õ1ȣ,37.530415,126.722527 +216,(ıû),2ȣ,37.513262,127.100159 +2815,(ıû),8ȣ,37.514692,127.104338 +215,dz,2ȣ,37.520733,127.10379 +217,ǻ,2ȣ,37.511687,127.086162 +328,,3ȣ,37.512759,127.01122 +4923,,,37.643986,126.669017 +2742,¹,7ȣ,37.504898,126.93915 +2711,,7ȣ,37.700109,127.053196 +2820,,8ȣ,37.478703,127.126191 +2544,,5ȣ,37.56144,127.064623 +1918,,1ȣ,38.02458,127.0718 +4517,.,μ,37.285342,127.219561 +4710,,̽ż,37.603133,127.013396 +1956,߻,3ȣ,37.659477,126.773359 +1454,ΰõû,4ȣ,37.426513,126.98978 +1761,,4ȣ,37.351735,126.742989 +1857,,д缱,37.365994,127.10807 +4312,,źд缱,37.367098,127.108403 +157,⵿,1ȣ,37.578103,127.034893 +1810,,1ȣ,37.466769,126.656666 +152,,1ȣ,37.570161,126.982923 +153,3,1ȣ,37.570406,126.991847 +319,3,3ȣ,37.571605,126.991791 +2535,3,5ȣ,37.57254,126.990305 +154,5,1ȣ,37.570926,127.001849 +218,տ,2ȣ,37.511022,127.073704 +4130,տ,9ȣ,37.511426,127.076275 +1809,־,1ȣ,37.465047,126.679742 +3218,־,õ2ȣ,37.464992,126.679098 +3217,־ȱ,õ2ȣ,37.473703,126.68113 +1957,ֿ,3ȣ,37.670072,126.761334 +1862,,д缱,37.324753,127.107395 +2716,߰,7ȣ,37.644583,127.064303 +2726,߰,7ȣ,37.565923,127.08432 +1822,ߵ,1ȣ,37.486562,126.764843 +1201,߶,߾Ӽ,37.594917,127.076116 +1756,߾,4ȣ,37.315941,126.838573 +4138,߾Ӻƺ,9ȣ,37.529191,127.148739 +2721,ȭ,7ȣ,37.602545,127.079264 +4108,,9ȣ,37.557402,126.861939 +2618,(),6ȣ,37.583876,126.909645 +4503,,μ,37.269606,127.136515 +3135,,õ1ȣ,37.378384,126.645168 +1723,,1ȣ,37.0188,127.070444 +309,,3ȣ,37.648033,126.913917 +1220,,߾Ӽ,37.476393,127.629874 +1912,,1ȣ,37.892334,127.055716 +1726,,1ȣ,36.870593,127.143904 +1720,,1ȣ,37.109447,127.062278 +405,,4ȣ,37.7205,127.2034 +412,â,4ȣ,37.653088,127.047274 +1022,â,߾Ӽ,37.653007,127.047806 +2638,â,6ȣ,37.579661,127.015241 +1318,õ,ἱ,37.658978,127.285379 +1728,õ,1ȣ,36.810005,127.146826 +2751,õ,7ȣ,37.486637,126.838713 +2548,õȣ(dz伺),5ȣ,37.53864,127.123308 +2812,õȣ(dz伺),8ȣ,37.538113,127.123254 +2749,ö,7ȣ,37.47605,126.867911 +4310,ûԱ,źд缱,37.447211,127.055664 +2538,û,5ȣ,37.560276,127.013639 +2635,û,6ȣ,37.560608,127.013986 +2731,û,7ȣ,37.519365,127.05335 +4210,û,ö1ȣ,37.556409,126.624648 +158,û(øԱ),1ȣ,37.579956,127.044585 +1014,û(øԱ),߾Ӽ,37.580759,127.0483 +1867,û,д缱,37.259489,127.078934 +1321,û,ἱ,37.735488,127.42661 +4506,ʴ,μ,37.260752,127.159443 +1917,ʼ,1ȣ,37.98172,127.06912 +1505,ʿ,氭,37.374419,127.299 +4813,,ؼ,37.319619,126.808147 +1758,,4ȣ,37.320646,126.805913 +432,ѽŴԱ(̼),4ȣ,37.486263,126.981989 +3755,,7ȣ,37.50365,126.78828 +1329,õ,ἱ,37.885054,127.717023 +321,湫,3ȣ,37.56143,126.994072 +423,湫,4ȣ,37.561207,126.99408 +243,(Ա),2ȣ,37.559704,126.964378 +2532,(Ա),5ȣ,37.560236,126.9629 +3133,ķ۽Ÿ,õ1ȣ,37.387855,126.661673 +9001,Ųؽ, ö,37.66532,126.74843 +1276,ź,߾Ӽ,37.694023,126.761086 +4615,ž,μ,37.733579,127.088704 +1404,,1ȣ,36.78866,127.08485 +2646,¸Ա,6ȣ,37.617338,127.074735 +2719,¸Ա,7ȣ,37.618294,127.075397 +1852,,д缱,37.440019,127.127709 +3134,ũũ,õ1ȣ,37.382268,126.656365 +1314,,ἱ,37.648311,127.143952 +1283,,߾Ӽ,37.815298,126.792783 +1501,DZ,氭,37.394761,127.111217 +4311,DZ,źд缱,37.394761,127.112217 +1210,ȴ,߾Ӽ,37.547371,127.243939 +1317,ȣ,ἱ,37.653225,127.244493 +1456,,4ȣ,37.394287,126.963883 +1724,,1ȣ,36.990726,127.085159 +4927,dz,,37.612488,126.732387 +1274,dz,߾Ӽ,37.672346,126.786243 +2717,ϰ,7ȣ,37.636352,127.06799 +2565,ϳ˴ܻ,5ȣ,37.53972,127.22345 +2566,ϳû(dz-),5ȣ,37.54205,127.20612 +2564,ϳdz,5ȣ,37.552034,127.203864 +2733,е,7ȣ,37.514229,127.031656 +336,п,3ȣ,37.496663,127.070594 +2632,Ѱ,6ȣ,37.539631,127.001725 +1010,ѳ,߾Ӽ,37.52943,127.009169 +1755,Ѵ,4ȣ,37.309689,126.85344 +419,ѼԱ(Ｑ),4ȣ,37.588458,127.006221 +4135,Ѽ,9ȣ,37.516404,127.116503 +209,Ѿ,2ȣ,37.555273,127.043655 +1024,Ƽ,д缱,37.496237,127.052873 +238,,2ȣ,37.549457,126.913808 +2623,,6ȣ,37.549209,126.913366 +2540,,5ȣ,37.557322,127.029476 +1270,,߾Ӽ,37.612102,126.834146 +420,ȭ,4ȣ,37.582336,127.001844 +1882,ȣ,μ,37.401637,126.708627 +239,ȫԱ,2ȣ,37.55679,126.923708 +1293,ȫԱ,߾Ӽ,37.557641,126.926683 +1264,ȫԱ,߾Ӽ,37.557641,126.926683 +4203,ȫԱ,ö1ȣ,37.557438,126.926715 +314,ȫ,3ȣ,37.589066,126.943736 +4705,ȭ,̽ż,37.634133,127.017511 +2518,ȭ,5ȣ,37.541513,126.840461 +2647,ȭ(￩Ա),6ȣ,37.620064,127.084689 +1712,ȭ,1ȣ,37.283862,126.989627 +1268,ȭ,߾Ӽ,37.602888,126.868387 +1952,ȭ,3ȣ,37.634592,126.83265 +1015,ȸ,߾Ӽ,37.58946,127.057583 +1905,ȸ,1ȣ,37.724416,127.04736 +4602,ȸ,μ,37.725006,127.047073 +425,ȸ(빮),4ȣ,37.558514,126.978246 +4611,ȿ,μ,37.754025,127.076902 +2628,ȿâ,6ȣ,37.539233,126.961384 +1261,ȿâ,߾Ӽ,37.538579,126.96221 +4119,漮(߾ӴԱ),9ȣ,37.50877,126.963708 +4606,Ｑ,μ,37.743302,127.037023 \ No newline at end of file From 8442f063b9ecf2d824b9bc8b5b530fcbf54091f2 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Tue, 20 Aug 2024 14:09:37 +0900 Subject: [PATCH 208/348] =?UTF-8?q?=EC=95=84=ED=8B=B0=ED=81=B4=20=EB=82=B4?= =?UTF-8?q?=EC=9A=A9=20=EC=BB=AC=EB=9F=BC=20=ED=83=80=EC=9E=85=EC=9D=84=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD=ED=95=9C=EB=8B=A4.=20(#450)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/schema.sql | 2 +- backend/bang-ggood/src/test/resources/schema-test.sql | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index c0bcf2f98..0223b31b1 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -104,7 +104,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(16383), + content TEXT, keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 8364b7074..4257bd355 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -115,7 +115,7 @@ CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, title VARCHAR(255), - content VARCHAR(16383), + content TEXT, keyword VARCHAR(255), summary VARCHAR(255), created_at TIMESTAMP(6), From 85bd85774b077a512d477c31dedaf5f51f21fc32 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:01:37 +0900 Subject: [PATCH 209/348] =?UTF-8?q?[BE]=20CORS=20=EC=84=A4=EC=A0=95?= =?UTF-8?q?=EC=8B=9C=20dev,=20prod=EB=A5=BC=20=EB=B6=84=EB=A6=AC=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#452)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bang_ggood/config/CorsConfig.java | 8 ++++++ .../com/bang_ggood/config/CorsConfigTest.java | 28 +++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java index 6de5989dc..41600d05f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/config/CorsConfig.java @@ -27,4 +27,12 @@ public CorsFilter corsFilter() { return new CorsFilter(source); } + + public List getAllowOrigins() { + return allowOrigins; + } + + public void setAllowOrigins(List allowOrigins) { + this.allowOrigins = allowOrigins; + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java new file mode 100644 index 000000000..6d164d30b --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java @@ -0,0 +1,28 @@ +package com.bang_ggood.config; + +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.context.SpringBootTest; +import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; + +import static org.junit.jupiter.api.Assertions.*; + +@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) +class CorsConfigTest { + + @Autowired + CorsConfig corsConfig; + + @DisplayName("daf") + @Test + void df() { + // given +// System.out.println("start"); +// System.out.println(corsConfig.allowOrigins); + // when + + // then + } + +} From b48aea5257b605b7d180b08970a8019e8cf20c10 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:09:02 +0900 Subject: [PATCH 210/348] =?UTF-8?q?[BE]=20CORS=20=EC=84=A4=EC=A0=95=20?= =?UTF-8?q?=EC=A0=95=EB=B3=B4=EB=A5=BC=20=EB=B3=80=EA=B2=BD=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#454)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From 98eeae766567b52a9d54c199e5e1f885282a2f2b Mon Sep 17 00:00:00 2001 From: jinwoo22 Date: Tue, 20 Aug 2024 15:14:09 +0900 Subject: [PATCH 211/348] =?UTF-8?q?fix:=20=EC=8B=A4=ED=8C=A8=EB=9C=A8?= =?UTF-8?q?=EB=8A=94=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bang_ggood/config/CorsConfigTest.java | 28 ------------------- 1 file changed, 28 deletions(-) delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java deleted file mode 100644 index 6d164d30b..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/config/CorsConfigTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.bang_ggood.config; - -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.boot.test.context.SpringBootTest.WebEnvironment; - -import static org.junit.jupiter.api.Assertions.*; - -@SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT) -class CorsConfigTest { - - @Autowired - CorsConfig corsConfig; - - @DisplayName("daf") - @Test - void df() { - // given -// System.out.println("start"); -// System.out.println(corsConfig.allowOrigins); - // when - - // then - } - -} From 84a9a1254c37d952be66269ae1e9f459195cbd15 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:31:51 +0900 Subject: [PATCH 212/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20username=EC=9D=84?= =?UTF-8?q?=20=EB=B0=98=ED=99=98=ED=95=9C=EB=8B=A4.=20(#458)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../test/java/com/bang_ggood/user/controller/UserE2ETest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index ae58a8ce8..f2fe1c2be 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long userId, String nickname, String userEmail, LocalDateTime createdAt) { +public record UserResponse(Long userId, String username, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( user.getId(), user.getName(), user.getEmail(), user.getCreatedAt() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index f6f30ab41..267f65e51 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -29,7 +29,7 @@ void readUserInfo() { assertAll( () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.nickname()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.username()).isEqualTo(UserFixture.USER1.getName()), () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } From e137ccd9f716498ffa0a6a7cdcc29a9208f38ccd Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:43:24 +0900 Subject: [PATCH 213/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20userName=EC=9D=84?= =?UTF-8?q?=20=EB=B0=98=ED=99=98=ED=95=9C=EB=8B=A4.=20(#459)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../test/java/com/bang_ggood/user/controller/UserE2ETest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index f2fe1c2be..10b9e8a45 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long userId, String username, String userEmail, LocalDateTime createdAt) { +public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( user.getId(), user.getName(), user.getEmail(), user.getCreatedAt() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index 267f65e51..5f81153ea 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -29,7 +29,7 @@ void readUserInfo() { assertAll( () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.username()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.userName()).isEqualTo(UserFixture.USER1.getName()), () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } From 980cac9a29e8f130c84996cc534ce1d45afa7d8e Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:42:37 +0900 Subject: [PATCH 214/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EA=B5=AC=ED=98=84?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#457)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/AuthPrincipalArgumentResolver.java | 1 + .../auth/controller/AuthController.java | 12 +++++++ .../auth/controller/CookieProvider.java | 12 +++++++ .../bang_ggood/auth/service/AuthService.java | 33 +++++++++++++++++-- .../bang_ggood/exception/ExceptionCode.java | 2 ++ .../auth/controller/AuthE2ETest.java | 22 +++++++++++++ .../auth/service/AuthServiceTest.java | 31 +++++++++++++---- 7 files changed, 105 insertions(+), 8 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java index d5cebc6a7..3662fa6fa 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java @@ -40,6 +40,7 @@ public User resolveArgument(MethodParameter parameter, ModelAndViewContainer mav } String token = extractToken(request.getCookies()); + return authService.extractUser(token); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index eefa87496..9e0faa4cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -1,13 +1,16 @@ package com.bang_ggood.auth.controller; +import com.bang_ggood.auth.config.AuthPrincipal; import com.bang_ggood.auth.dto.request.OauthLoginRequest; import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RestController; @RestController @@ -28,4 +31,13 @@ public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } + + @PostMapping("/oauth/logout") + public ResponseEntity logout(@AuthPrincipal User user, + @RequestHeader(value = "Cookie") String accessToken) { + authService.logout(accessToken, user); + ResponseCookie expiredCookie = cookieProvider.deleteCookie(); + + return ResponseEntity.noContent().header(HttpHeaders.SET_COOKIE, expiredCookie.toString()).build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index edef0e8d9..380586174 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -27,4 +27,16 @@ public ResponseCookie createCookie(String token) { .path("/") .build(); } + + public ResponseCookie deleteCookie() { + return ResponseCookie + .from(TOKEN_COOKIE_NAME, "") + .domain(domain) + .httpOnly(true) + .secure(true) + .sameSite("None") + .maxAge(0) + .path("/") + .build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 6181a2114..486dde795 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -12,6 +12,8 @@ import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.domain.Type; @@ -20,11 +22,15 @@ import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Service public class AuthService { + private static final Set blackList = new HashSet<>(); + private final OauthClient oauthClient; private final JwtTokenProvider jwtTokenProvider; private final ChecklistService checklistService; @@ -71,7 +77,8 @@ private void createDefaultChecklist(User user) { RoomRequest roomRequest = new RoomRequest( "예시용 체크리스트", 2000, 50, 12, "서울특별시 송파구", "잠실역", 10, "방끗 부동산", Type.VILLA.getName(), Structure.OPEN_ONE_ROOM.getName(), - 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), + OccupancyPeriod.EARLY.getPeriod(), "집을 둘러보며 필요한 메모를 작성해보세요.", "한줄평 작성하는 곳"); List options = List.of( @@ -93,9 +100,31 @@ private void createDefaultChecklist(User user) { checklistService.createChecklist(user, checklistRequest); } + public void logout(String accessToken, User user) { + AuthUser authUser = jwtTokenProvider.resolveToken(accessToken); + validateTokenOwnership(user, authUser); + blackList.add(accessToken); + } + + private static void validateTokenOwnership(User user, AuthUser authUser) { + if (!user.getId().equals(authUser.id())) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER); + } + } + + public boolean isAccessTokenInBlackList(String accessToken) { + return blackList.contains(accessToken); + } + public User extractUser(String token) { AuthUser authUser = jwtTokenProvider.resolveToken(token); - + validateAccessTokenInBlacklist(token); return userRepository.getUserById(authUser.id()); } + + private void validateAccessTokenInBlacklist(String token) { + if (isAccessTokenInBlackList(token)) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_IN_BLACKLIST); + } + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index e7b381658..1d766fcb5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -57,6 +57,8 @@ public enum ExceptionCode { AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), AUTHENTICATION_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), AUTHENTICATION_TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "토큰 정보가 올바르지 않습니다."), + AUTHENTICATION_TOKEN_IN_BLACKLIST(HttpStatus.UNAUTHORIZED, "이미 로그아웃되어 더 이상 사용할 수 없는 토큰입니다. 다시 로그인 해주세요."), + AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER(HttpStatus.UNAUTHORIZED, "해당 유저의 토큰이 아닙니다"), OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."), // Article diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java index 6525769be..3614d12e0 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -2,18 +2,25 @@ import com.bang_ggood.AcceptanceTest; import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.UserFixture; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import static org.hamcrest.Matchers.containsString; class AuthE2ETest extends AcceptanceTest { + @Autowired + private AuthService authService; + @DisplayName("로그인 실패 : 인가코드가 없는 경우") @Test void login_code_notBlank_exception() { @@ -51,4 +58,19 @@ void authentication_invalid_cookie_exception() { .statusCode(401) .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_INVALID.getMessage())); } + + @DisplayName("인증 실패 : 블랙리스트에 들어간 토큰일 경우") + @Test + void authentication_token_blacklist_exception() { + authService.logout(this.responseCookie.getValue(), UserFixture.USER1); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) + .when().post("/checklists") + .then().log().all() + .statusCode(401) + .body("message", containsString(ExceptionCode.AUTHENTICATION_TOKEN_IN_BLACKLIST.getMessage())); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index fffce3c30..2aee6b48c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -7,10 +7,11 @@ import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -20,6 +21,10 @@ import org.springframework.boot.test.mock.mockito.MockBean; import static com.bang_ggood.user.UserFixture.USER1; +import static com.bang_ggood.user.UserFixture.USER1_WITH_ID; +import static com.bang_ggood.user.UserFixture.USER2_WITH_ID; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @ExtendWith(MockitoExtension.class) @@ -34,6 +39,8 @@ class AuthServiceTest extends IntegrationTestSupport { private ChecklistService checklistService; @Autowired private UserRepository userRepository; + @Autowired + private JwtTokenProvider jwtTokenProvider; @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") @Test @@ -46,7 +53,7 @@ void login_signup() { String token = authService.login(oauthLoginRequest); // then - Assertions.assertThat(token).isNotBlank(); + assertThat(token).isNotBlank(); } @DisplayName("로그인 성공 : 존재하는 회원이면 데이터베이스에 새로운 유저를 추가하지않고 토큰을 바로 반환한다.") @@ -61,7 +68,7 @@ void login() { String token = authService.login(oauthLoginRequest); // then - Assertions.assertThat(token).isNotBlank(); + assertThat(token).isNotBlank(); } @DisplayName("로그인 성공 : 회원 가입시 디폴트 체크리스트 질문을 추가한다.") @@ -79,11 +86,11 @@ void login_default_checklist_question() { ChecklistQuestionsResponse checklistQuestions = checklistService.readChecklistQuestions(user); int sum = 0; - for (CategoryQuestionsResponse response: checklistQuestions.categories()) { + for (CategoryQuestionsResponse response : checklistQuestions.categories()) { sum += response.questions().size(); } - Assertions.assertThat(sum).isEqualTo(Question.findDefaultQuestions().size()); + assertThat(sum).isEqualTo(Question.findDefaultQuestions().size()); } @DisplayName("로그인 성공 : 회원 가입시 디폴트 체크리스트를 추가한다.") @@ -99,6 +106,18 @@ void login_default_checklist() { // then User user = authService.extractUser(token); UserChecklistsPreviewResponse response = checklistService.readChecklistsPreview(user); - Assertions.assertThat(response.checklists()).hasSize(1); + assertThat(response.checklists()).hasSize(1); + } + + @DisplayName("로그아웃 실패 : 다른 유저의 토큰인 경우") + @Test + void logout_invalid_ownership_exception() { + // given + String token = jwtTokenProvider.createToken(USER1_WITH_ID); + + //when & then + assertThatThrownBy(() -> authService.logout(token, USER2_WITH_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER.getMessage()); } } From 37d5e08a44a38ac962e8310c2e2a57010d6bc6fa Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:48:33 +0900 Subject: [PATCH 215/348] =?UTF-8?q?[BE]=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=8B=9C=20=ED=95=98=EC=9D=B4=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=ED=95=A8=EA=BB=98=20=EC=A0=84=EB=8B=AC?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20=20(#467)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/AuthController.java | 1 - .../bang_ggood/checklist/domain/Question.java | 104 ++++++++++++------ .../CustomChecklistQuestionResponse.java | 16 ++- .../dto/response/QuestionResponse.java | 31 +++++- .../response/SelectedQuestionResponse.java | 20 ++-- .../checklist/service/ChecklistService.java | 6 +- .../bang_ggood/exception/ExceptionCode.java | 2 + .../controller/ChecklistE2ETest.java | 42 ++----- .../service/ChecklistServiceTest.java | 2 +- 9 files changed, 136 insertions(+), 88 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index 9e0faa4cf..0e0784916 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -28,7 +28,6 @@ public AuthController(AuthService authService, CookieProvider cookieProvider) { public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { String token = authService.login(request); ResponseCookie cookie = cookieProvider.createCookie(token); - return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index a3b1681b7..fdbfbfec7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -4,60 +4,88 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; public enum Question { - ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", true), - ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", true), - ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", true), - ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, true), - ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, true), - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", false), - ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, false), - ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, false), - ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, false), - - WINDOW_1(10, Category.WINDOW, "창 밖의 뷰가 가로 막혀 있지는 않나요?", null, true), - WINDOW_2(11, Category.WINDOW, "창문 상태가 괜찮나요?", null, true), - WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", true), - WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, true), - WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, false), - WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", false), - - BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", true), - BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", true), - BATHROOM_3(18, Category.BATHROOM, "화장실 내부에 환기 시설이 있나요?", null, true), - BATHROOM_4(19, Category.BATHROOM, "화장실 내부에 창문이 있나요?", null, false), - BATHROOM_5(20, Category.BATHROOM, "온수가 잘 나오나요?", null, false), - - SECURITY_1(21, Category.SECURITY, "잠금장치가 있는 공동 현관문이 있나요?", null, true), - SECURITY_2(22, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, true), - SECURITY_3(23, Category.SECURITY, "관리자분이 함께 상주하시나요?", "관리자분이 24시간 상주하시는지 확인하세요.", true), - SECURITY_4(24, Category.SECURITY, "보안 시설이 잘 갖추어져 있나요?", "도어락, 창문 잠금장치 등이 있는지 확인하세요.", false), - SECURITY_5(25, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, false), - SECURITY_6(26, Category.SECURITY, "현관문에 걸쇠가 있나요?", null, false), - - OUTSIDE_1(27, Category.OUTSIDE, "주변 도로가 밤에도 충분히 밝은가요?", null, false), - OUTSIDE_2(28, Category.OUTSIDE, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", false), - OUTSIDE_3(29, Category.OUTSIDE, "1층에 음식점이 있지는 않나요?", null, false), - OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, false), - OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, false); + ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", List.of("곰팡이"), true), + ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", List.of("불쾌한 냄새"), true), + ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", List.of("벌레"), true), + ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, List.of("방 인테리어"), true), + ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, List.of("수납할 수 있는 공간"), true), + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", List.of("에어컨"),false), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, List.of("보일러"), false), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, List.of("콘센트"), false), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, List.of("벽지 상태"), false), + + WINDOW_1(10, Category.WINDOW, "창 밖의 뷰가 가로 막혀 있지는 않나요?", null, List.of("창 밖의 뷰"), true), + WINDOW_2(11, Category.WINDOW, "창문 상태가 괜찮나요?", null, List.of("창문 상태"), true), + WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", List.of("환기"), true), + WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, List.of("햇빛"), true), + WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, List.of("이중창"), false), + WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", List.of("불쾌한 냄새"), false), + + BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", List.of("깨끗"), true), + BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", List.of("수압 및 물 빠짐"), true), + BATHROOM_3(18, Category.BATHROOM, "화장실 내부에 환기 시설이 있나요?", null, List.of("환기 시설"), true), + BATHROOM_4(19, Category.BATHROOM, "화장실 내부에 창문이 있나요?", null, List.of("창문"), false), + BATHROOM_5(20, Category.BATHROOM, "온수가 잘 나오나요?", null, List.of("온수"), false), + + SECURITY_1(21, Category.SECURITY, "잠금장치가 있는 공동 현관문이 있나요?", null, List.of("잠금장치", "공동 현관문"), true), + SECURITY_2(22, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, List.of("CCTV"), true), + SECURITY_3(23, Category.SECURITY, "관리자분이 함께 상주하시나요?", "관리자분이 24시간 상주하시는지 확인하세요.", List.of("관리자분"), true), + SECURITY_4(24, Category.SECURITY, "보안 시설이 잘 갖추어져 있나요?", "도어락, 창문 잠금장치 등이 있는지 확인하세요.", List.of("보안 시설"), false), + SECURITY_5(25, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, List.of("인터폰"), false), + SECURITY_6(26, Category.SECURITY, "현관문에 걸쇠가 있나요?", null, List.of("걸쇠"), false), + + OUTSIDE_1(27, Category.OUTSIDE, "주변 도로가 밤에도 충분히 밝은가요?", null, List.of("주변 도로", "밝은가요"), false), + OUTSIDE_2(28, Category.OUTSIDE, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", List.of("소음 시설"), false), + OUTSIDE_3(29, Category.OUTSIDE, "1층에 음식점이 있지는 않나요?", null, List.of("음식점"), false), + OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, List.of("언덕"), false), + OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, List.of("보이는 구조"), false); private final int id; private final Category category; private final String title; private final String subtitle; + private final List highlights; private final boolean isDefault; - Question(int id, Category category, String title, String subtitle, boolean isDefault) { + Question(int id, Category category, String title, String subtitle, List highlights, boolean isDefault) { this.id = id; this.category = category; this.title = title; this.subtitle = subtitle; + this.highlights = highlights; this.isDefault = isDefault; } + static { + validateQuestionIdDuplication(); + validateQuestionHighlightsMisMatch(); + } + + private static void validateQuestionIdDuplication() { + Set idSet = new HashSet<>(); + for (Question question : Question.values()) { + if (!idSet.add(question.getId())) { + throw new BangggoodException(ExceptionCode.QUESTION_ID_ERROR); + } + } + } + + private static void validateQuestionHighlightsMisMatch() { + for (Question question : Question.values()) { + for (String highlight : question.highlights) { + if (!question.getTitle().contains(highlight)) { + throw new BangggoodException(ExceptionCode.QUESTION_HIGHLIGHT_ERROR); + } + } + } + } + public static Question fromId(int id) { return Arrays.stream(values()) .filter(question -> question.id == id) @@ -119,4 +147,8 @@ public String getSubtitle() { public Category getCategory() { return category; } + + public List getHighlights() { + return highlights; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java index 2e6268b11..3daaa3b0e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java @@ -2,10 +2,16 @@ import com.bang_ggood.checklist.domain.Question; -public record CustomChecklistQuestionResponse(Integer questionId, String title, String subtitle, - boolean isSelected) { - public static CustomChecklistQuestionResponse of(Question question, boolean isSelected) { - return new CustomChecklistQuestionResponse(question.getId(), question.getTitle(), question.getSubtitle(), - isSelected); +public class CustomChecklistQuestionResponse extends QuestionResponse { + + private final boolean isSelected; + + public CustomChecklistQuestionResponse(Question question, boolean isSelected) { + super(question); + this.isSelected = isSelected; + } + + public boolean isSelected() { + return isSelected; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java index f1d5f5918..d4fc31f8f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -1,10 +1,35 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Question; +import java.util.List; -public record QuestionResponse(Integer questionId, String title, String subtitle) { +public class QuestionResponse { - public static QuestionResponse of(Question question) { - return new QuestionResponse(question.getId(), question.getTitle(), question.getSubtitle()); + private final Integer questionId; + private final String title; + private final String subtitle; + private final List highlights; + + public QuestionResponse(Question question) { + this.questionId = question.getId(); + this.title = question.getTitle(); + this.subtitle = question.getSubtitle(); + this.highlights = question.getHighlights(); + } + + public Integer getQuestionId() { + return questionId; + } + + public String getTitle() { + return title; + } + + public String getSubtitle() { + return subtitle; + } + + public List getHighlights() { + return highlights; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java index 8ada2b0dd..747877dd4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -2,14 +2,16 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; -public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String answer) { - - public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { - return new SelectedQuestionResponse( - checklistQuestion.getQuestion().getId(), - checklistQuestion.getQuestion().getTitle(), - checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getAnswer().name() - ); +public class SelectedQuestionResponse extends QuestionResponse { + + private final String answer; + + public SelectedQuestionResponse(ChecklistQuestion checklistQuestion) { + super(checklistQuestion.getQuestion()); + this.answer = checklistQuestion.getAnswer().name(); + } + + public String getAnswer() { + return answer; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index abc66e9ff..731b2e6c1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -162,7 +162,7 @@ public ChecklistQuestionsResponse readChecklistQuestions(User user) { .map(categoryQuestionEntry -> CategoryQuestionsResponse.of( categoryQuestionEntry.getKey(), categoryQuestionEntry.getValue().stream() - .map(QuestionResponse::of) + .map(QuestionResponse::new) .toList())) .toList(); @@ -208,7 +208,7 @@ private List getAllCategoryCustomCheckl for (Category category : Category.values()) { List categoryQuestions = Question.findQuestionsByCategory(category); List questions = categoryQuestions.stream() - .map(question -> CustomChecklistQuestionResponse.of(question, + .map(question -> new CustomChecklistQuestionResponse(question, question.isSelected(customChecklistQuestions))) .toList(); response.add(new CategoryCustomChecklistQuestionResponse(category.getId(), category.getName(), questions)); @@ -248,7 +248,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ List checklistQuestions) { List selectedQuestionResponse = Question.filterWithUnselectedGrade(category, checklistQuestions).stream() - .map(SelectedQuestionResponse::of) + .map(SelectedQuestionResponse::new) .toList(); return SelectedCategoryQuestionsResponse.of(category, selectedQuestionResponse); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 1d766fcb5..0f5ccf9f5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -12,6 +12,8 @@ public enum ExceptionCode { OPTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 옵션이 존재합니다."), // Question + QUESTION_ID_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "중복된 질문 ID가 존재해 질문을 생성할 수 없습니다."), + QUESTION_HIGHLIGHT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "잘못된 하이라이트 키워드가 존재해 질문을 생성할 수 없습니다."), QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 0bf83f90f..de2932c04 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,13 +1,9 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.AcceptanceTest; -import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; @@ -17,14 +13,12 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import static com.bang_ggood.user.UserFixture.USER1; -import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; class ChecklistE2ETest extends AcceptanceTest { @@ -112,22 +106,12 @@ void readChecklistQuestions() { // given customChecklistQuestionRepository.saveAll(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT); - ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() + RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/questions") .then().log().all() - .statusCode(200) - .extract() - .as(ChecklistQuestionsResponse.class); - - // then - int questionsSize = 0; - for (CategoryQuestionsResponse categoryQuestionsResponse : checklistQuestionsResponse.categories()) { - questionsSize += categoryQuestionsResponse.questions().size(); - } - - assertThat(questionsSize).isEqualTo(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT.size()); + .statusCode(200); } @DisplayName("커스텀 체크리스트 전체 조회 성공") @@ -138,9 +122,7 @@ void readAllCustomChecklistQuestion() { .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/custom-checklist/all") .then().log().all() - .statusCode(200) - .extract() - .as(CategoryCustomChecklistQuestionsResponse.class); + .statusCode(200); } @DisplayName("작성된 체크리스트 조회 성공") @@ -148,19 +130,19 @@ void readAllCustomChecklistQuestion() { void readChecklistById() { long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); - SelectedChecklistResponse selectedChecklistResponse = RestAssured.given().log().all() + RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/" + checklistId) .then().log().all() - .statusCode(200) - .extract() - .as(SelectedChecklistResponse.class); - - Assertions.assertAll( - () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), - () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") - ); + .statusCode(200); +// .extract() +// .as(SelectedChecklistResponse.class); +// +// Assertions.assertAll( +// () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), +// () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") +// ); } @DisplayName("좋아요된 체크리스트 리스트 조회 성공") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 574e3ae91..b197b26c7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -188,7 +188,7 @@ void readChecklistQuestions() { List responseQuestionsIds = checklistQuestionsResponse.categories().stream() .map(CategoryQuestionsResponse::questions) .flatMap(Collection::stream) - .map(QuestionResponse::questionId) + .map(QuestionResponse::getQuestionId) .toList(); assertThat(responseQuestionsIds).containsExactlyElementsOf(defaultQuestionsIds); From 26833dc955af73d452f1f9f0ff91ff2ee52a22d0 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Wed, 21 Aug 2024 13:23:34 +0900 Subject: [PATCH 216/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1,=20=EC=88=98=EC=A0=95,?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20API=EC=97=90=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=ED=95=9C=EB=8B=A4.=20=20(#470)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/article/domain/Article.java | 8 +- .../dto/request/ArticleCreateRequest.java | 3 +- .../ArticleDetailPreviewResponse.java | 3 +- .../article/dto/response/ArticleResponse.java | 3 +- .../bang_ggood/auth/service/AuthService.java | 26 ++--- .../controller/ChecklistController.java | 3 +- .../checklist/domain/Checklist.java | 104 ++++++++++-------- .../domain/ChecklistMaintenance.java | 72 ++++++++++++ .../checklist/domain/MaintenanceItem.java | 42 +++++++ .../bang_ggood/checklist/domain/Question.java | 22 ++-- .../dto/request/ChecklistRequest.java | 6 +- .../ChecklistMaintenanceRepository.java | 18 +++ .../repository/ChecklistOptionRepository.java | 2 +- .../ChecklistQuestionRepository.java | 9 ++ .../repository/ChecklistRepository.java | 2 +- .../checklist/service/ChecklistService.java | 61 +++++++++- .../bang_ggood/exception/ExceptionCode.java | 8 +- .../java/com/bang_ggood/room/domain/Room.java | 79 +++++++------ .../java/com/bang_ggood/room/domain/Type.java | 34 ------ .../room/dto/request/RoomRequest.java | 17 +-- .../dto/response/SelectedRoomResponse.java | 6 +- .../room/repository/RoomRepository.java | 11 ++ .../station/service/SubwayStationService.java | 5 +- .../bang-ggood/src/main/resources/data.sql | 3 +- .../bang-ggood/src/main/resources/schema.sql | 45 +++++--- .../repository/ArticleRepositoryTest.java | 3 +- .../article/service/ArticleServiceTest.java | 1 - .../checklist/ChecklistFixture.java | 35 ++++-- .../controller/ChecklistE2ETest.java | 15 +-- .../checklist/domain/ChecklistTest.java | 4 +- .../checklist/domain/MaintenanceItemTest.java | 45 ++++++++ .../ChecklistMaintenanceRepositoryTest.java | 63 +++++++++++ .../ChecklistQuestionRepositoryTest.java | 77 +++++++++++++ .../java/com/bang_ggood/room/RoomFixture.java | 45 ++++---- .../com/bang_ggood/room/domain/RoomTest.java | 4 +- .../com/bang_ggood/room/domain/TypeTest.java | 44 -------- .../room/repository/RoomRepositoryTest.java | 46 ++++++++ .../station/SubwayStationServiceTest.java | 20 ++-- .../src/test/resources/data-test.sql | 3 +- .../src/test/resources/schema-test.sql | 43 +++++--- 40 files changed, 735 insertions(+), 305 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java index 452820273..c2d72d4bb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java @@ -54,8 +54,12 @@ public String getSummary() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Article article = (Article) o; return Objects.equals(id, article.id); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java index 3766e6443..c673a71ca 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java @@ -3,7 +3,8 @@ import com.bang_ggood.article.domain.Article; import jakarta.validation.constraints.NotBlank; -public record ArticleCreateRequest(@NotBlank(message = "제목을 입력해야 합니다.") String title, String content, String keyword, String summary) { +public record ArticleCreateRequest(@NotBlank(message = "제목을 입력해야 합니다.") String title, String content, String keyword, + String summary) { public Article toEntity() { return new Article(title, content, keyword, summary); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java index 1700fe90c..12ed03343 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java @@ -3,7 +3,8 @@ import com.bang_ggood.article.domain.Article; import java.time.LocalDateTime; -public record ArticleDetailPreviewResponse(Long articleId, String title, String keyword, String summary, LocalDateTime createdAt) { +public record ArticleDetailPreviewResponse(Long articleId, String title, String keyword, String summary, + LocalDateTime createdAt) { public static ArticleDetailPreviewResponse from(Article article) { return new ArticleDetailPreviewResponse( diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java index ff24a9450..b0b530514 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java @@ -3,7 +3,8 @@ import com.bang_ggood.article.domain.Article; import java.time.LocalDateTime; -public record ArticleResponse(Long articleId, String title, String content, String keyword, String summary, LocalDateTime createdAt) { +public record ArticleResponse(Long articleId, String title, String content, String keyword, String summary, + LocalDateTime createdAt) { public static ArticleResponse from(Article article) { return new ArticleResponse( diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 486dde795..57b5a4d9c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -4,8 +4,6 @@ import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; -import com.bang_ggood.checklist.domain.OccupancyMonth; -import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -14,9 +12,6 @@ import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; -import com.bang_ggood.room.domain.FloorLevel; -import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import com.bang_ggood.room.dto.request.RoomRequest; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; @@ -47,6 +42,12 @@ public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, C this.customChecklistQuestionRepository = customChecklistQuestionRepository; } + private static void validateTokenOwnership(User user, AuthUser authUser) { + if (!user.getId().equals(authUser.id())) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER); + } + } + @Transactional public String login(OauthLoginRequest request) { OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request); @@ -75,11 +76,10 @@ private void createDefaultChecklistQuestions(User user) { //TODO 리팩토링 private void createDefaultChecklist(User user) { RoomRequest roomRequest = new RoomRequest( - "예시용 체크리스트", 2000, 50, 12, "서울특별시 송파구", - "잠실역", 10, "방끗 부동산", Type.VILLA.getName(), Structure.OPEN_ONE_ROOM.getName(), - 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), - OccupancyPeriod.EARLY.getPeriod(), - "집을 둘러보며 필요한 메모를 작성해보세요.", "한줄평 작성하는 곳"); + "예시용 체크리스트", "방끗시 집잘구하구 행복하동", "방방하우스", "잠실", 10, + 3000, 60, 5, List.of(1, 3), "지상", 14, "분리형 원룸", 9.5, + 12, 9, "초", "방끗공인중개사", + "이곳에 필요한 메모를 작성하세요.", "이곳에 한줄평을 남겨 보세요."); List options = List.of( Option.INDUCTION.getId(), @@ -106,12 +106,6 @@ public void logout(String accessToken, User user) { blackList.add(accessToken); } - private static void validateTokenOwnership(User user, AuthUser authUser) { - if (!user.getId().equals(authUser.id())) { - throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER); - } - } - public boolean isAccessTokenInBlackList(String accessToken) { return blackList.contains(accessToken); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 03cb290b3..07c1efb7c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -92,7 +92,8 @@ public ResponseEntity deleteChecklistById(@AuthPrincipal User user, @PathV } @DeleteMapping("/checklists/{id}/like") - public ResponseEntity deleteChecklistLikeByChecklistId(@AuthPrincipal User user, @PathVariable("id") long id) { + public ResponseEntity deleteChecklistLikeByChecklistId(@AuthPrincipal User user, + @PathVariable("id") long id) { checklistService.deleteChecklistLikeByChecklistId(user, id); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 71621635d..6d36ecc4e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -6,7 +6,6 @@ import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import com.bang_ggood.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -40,13 +39,9 @@ public class Checklist extends BaseEntity { private Integer rent; - private Integer contractTerm; - - private String realEstate; + private Integer maintenanceFee; - private String memo; - - private String summary; + private Integer contractTerm; @Enumerated(EnumType.STRING) private OccupancyMonth occupancyMonth; @@ -54,28 +49,38 @@ public class Checklist extends BaseEntity { @Enumerated(EnumType.STRING) private OccupancyPeriod occupancyPeriod; + private String realEstate; + + private String memo; + + private String summary; + @OneToMany(mappedBy = "checklist") private List questions; - public Checklist(Room room, User user, Integer deposit, Integer rent, Integer contractTerm, String realEstate, - String memo, String summary, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod) { + public Checklist(Room room, User user, Integer deposit, Integer rent, Integer maintenanceFee, + Integer contractTerm, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod, + String realEstate, String memo, String summary) { this.room = room; this.user = user; this.deposit = deposit; this.rent = rent; + this.maintenanceFee = maintenanceFee; this.contractTerm = contractTerm; + this.occupancyMonth = occupancyMonth; + this.occupancyPeriod = occupancyPeriod; this.realEstate = realEstate; this.memo = memo; this.summary = summary; - this.occupancyMonth = occupancyMonth; - this.occupancyPeriod = occupancyPeriod; validateMemoLength(); } - public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate, - String memo, String summary, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod) { - this(null, null, deposit, rent, contractTerm, realEstate, memo, summary, occupancyMonth, occupancyPeriod); + public Checklist(Integer deposit, Integer rent, Integer maintenanceFee, Integer contractTerm, + OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod, String realEstate, + String memo, String summary) { + this(null, null, deposit, rent, maintenanceFee, contractTerm, occupancyMonth, occupancyPeriod, realEstate, memo, + summary); } protected Checklist() { @@ -89,12 +94,13 @@ public void change(Checklist updateChecklist) { this.room = updateChecklist.room; this.deposit = updateChecklist.deposit; this.rent = updateChecklist.rent; + this.maintenanceFee = updateChecklist.maintenanceFee; this.contractTerm = updateChecklist.contractTerm; + this.occupancyMonth = updateChecklist.occupancyMonth; + this.occupancyPeriod = updateChecklist.occupancyPeriod; this.realEstate = updateChecklist.realEstate; this.memo = updateChecklist.memo; this.summary = updateChecklist.summary; - this.occupancyMonth = updateChecklist.occupancyMonth; - this.occupancyPeriod = updateChecklist.occupancyPeriod; validateMemoLength(); } @@ -108,12 +114,40 @@ public Long getId() { return id; } + public Room getRoom() { + return room; + } + public User getUser() { return user; } - public Room getRoom() { - return room; + public Integer getDeposit() { + return deposit; + } + + public Integer getRent() { + return rent; + } + + public Integer getMaintenanceFee() { + return maintenanceFee; + } + + public Integer getContractTerm() { + return contractTerm; + } + + public String getRealEstate() { + return realEstate; + } + + public String getMemo() { + return memo; + } + + public String getSummary() { + return summary; } public String getRoomName() { @@ -136,10 +170,6 @@ public Integer getRoomWalkingTime() { return room.getWalkingTime(); } - public Type getRoomType() { - return room.getType(); - } - public Double getRoomSize() { return room.getSize(); } @@ -152,30 +182,6 @@ public Structure getRoomStructure() { return room.getStructure(); } - public Integer getDeposit() { - return deposit; - } - - public Integer getRent() { - return rent; - } - - public Integer getContractTerm() { - return contractTerm; - } - - public String getRealEstate() { - return realEstate; - } - - public String getMemo() { - return memo; - } - - public String getSummary() { - return summary; - } - public Integer getOccupancyMonth() { return occupancyMonth.getMonth(); } @@ -213,12 +219,14 @@ public String toString() { ", user=" + user + ", deposit=" + deposit + ", rent=" + rent + + ", maintenanceFee=" + maintenanceFee + ", contractTerm=" + contractTerm + + ", occupancyMonth=" + occupancyMonth + + ", occupancyPeriod=" + occupancyPeriod + ", realEstate='" + realEstate + '\'' + ", memo='" + memo + '\'' + ", summary='" + summary + '\'' + - ", occupancyMonth=" + occupancyMonth + - ", occupancyPeriod=" + occupancyPeriod + + ", questions=" + questions + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java new file mode 100644 index 000000000..ffd441425 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java @@ -0,0 +1,72 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import java.util.Objects; + +@Entity +public class ChecklistMaintenance extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private Checklist checklist; + + @Enumerated(EnumType.STRING) + private MaintenanceItem maintenanceItem; + + public ChecklistMaintenance(Checklist checklist, MaintenanceItem maintenanceItem) { + this.checklist = checklist; + this.maintenanceItem = maintenanceItem; + } + + protected ChecklistMaintenance() { + } + + public Long getId() { + return id; + } + + public Checklist getChecklist() { + return checklist; + } + + public MaintenanceItem getMaintenanceItem() { + return maintenanceItem; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChecklistMaintenance that = (ChecklistMaintenance) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "ChecklistMaintenance{" + + "id=" + id + + ", checklist=" + checklist + + ", maintenanceItem='" + maintenanceItem + '\'' + + '}'; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java new file mode 100644 index 000000000..d34ed8091 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java @@ -0,0 +1,42 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum MaintenanceItem { + WATERWORKS(1, "수도"), + ELECTRICITY(2, "전기"), + INTERNET(3, "인터넷"), + GAS(4, "가스"); + + private final int id; + private final String name; + + MaintenanceItem(int id, String name) { + this.id = id; + this.name = name; + } + + public static boolean contains(int id) { + return Arrays.stream(MaintenanceItem.values()) + .anyMatch(maintenanceItem -> maintenanceItem.id == id); + } + + public static MaintenanceItem fromId(int id) { + for (MaintenanceItem maintenanceItem : values()) { + if (maintenanceItem.id == id) { + return maintenanceItem; + } + } + throw new BangggoodException(ExceptionCode.MAINTENANCE_ITEM_INVALID); + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index fdbfbfec7..d4b0e55ed 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -10,12 +10,15 @@ public enum Question { - ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", List.of("곰팡이"), true), - ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", List.of("불쾌한 냄새"), true), + ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", + List.of("곰팡이"), true), + ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", List.of("불쾌한 냄새"), + true), ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", List.of("벌레"), true), ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, List.of("방 인테리어"), true), ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, List.of("수납할 수 있는 공간"), true), - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", List.of("에어컨"),false), + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", List.of("에어컨"), + false), ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, List.of("보일러"), false), ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, List.of("콘센트"), false), ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, List.of("벽지 상태"), false), @@ -25,7 +28,8 @@ public enum Question { WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", List.of("환기"), true), WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, List.of("햇빛"), true), WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, List.of("이중창"), false), - WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", List.of("불쾌한 냄새"), false), + WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", List.of("불쾌한 냄새"), + false), BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", List.of("깨끗"), true), BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", List.of("수압 및 물 빠짐"), true), @@ -46,6 +50,11 @@ public enum Question { OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, List.of("언덕"), false), OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, List.of("보이는 구조"), false); + static { + validateQuestionIdDuplication(); + validateQuestionHighlightsMisMatch(); + } + private final int id; private final Category category; private final String title; @@ -62,11 +71,6 @@ public enum Question { this.isDefault = isDefault; } - static { - validateQuestionIdDuplication(); - validateQuestionHighlightsMisMatch(); - } - private static void validateQuestionIdDuplication() { Set idSet = new HashSet<>(); for (Question question : Question.values()) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java index dbe752b71..8302d21fe 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java @@ -17,8 +17,8 @@ public Room toRoomEntity() { } public Checklist toChecklistEntity(Room roomEntity, User user) { - return new Checklist(roomEntity, user, room.deposit(), room.rent(), - room.contractTerm(), room.realEstate(), room.memo(), room.summary(), - OccupancyMonth.from(room.occupancyMonth()), OccupancyPeriod.from(room.occupancyPeriod())); + return new Checklist(roomEntity, user, room.deposit(), room.rent(), room.maintenanceFee(), room.contractTerm(), + OccupancyMonth.from(room.occupancyMonth()), OccupancyPeriod.from(room.occupancyPeriod()), + room.realEstate(), room.memo(), room.summary()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java new file mode 100644 index 000000000..d95db4b88 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java @@ -0,0 +1,18 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.ChecklistMaintenance; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; + +public interface ChecklistMaintenanceRepository extends JpaRepository { + + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Transactional + @Query("UPDATE ChecklistMaintenance cm " + + "SET cm.deleted = true " + + "WHERE cm.checklist.id = :checklistId") + void deleteAllByChecklistId(@Param("checklistId") Long checklistId); +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index f72248f3f..653d149dc 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -21,7 +21,7 @@ public interface ChecklistOptionRepository extends JpaRepository { @@ -12,4 +14,11 @@ public interface ChecklistQuestionRepository extends JpaRepository findByChecklistId(@Param("checklistId") long checklistId); + + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Transactional + @Query("UPDATE ChecklistQuestion cq " + + "SET cq.deleted = true " + + "WHERE cq.checklist.id = :checklistId") + void deleteAllByChecklistId(@Param("checklistId") Long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 890893e60..9145e17b0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -53,7 +53,7 @@ List findByUserAndIdIn(@Param("user") User user, boolean existsById(@Param("id") long id); @Transactional - @Modifying + @Modifying(flushAutomatically = true, clearAutomatically = true) @Query("UPDATE Checklist c " + "SET c.deleted = true " + "WHERE c.id = :id") diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 731b2e6c1..2ad2eadc9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -5,10 +5,12 @@ import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.checklist.domain.MaintenanceItem; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -24,6 +26,7 @@ import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; @@ -54,18 +57,21 @@ public class ChecklistService { private final RoomRepository roomRepository; private final ChecklistOptionRepository checklistOptionRepository; private final ChecklistQuestionRepository checklistQuestionRepository; + private final ChecklistMaintenanceRepository checklistMaintenanceRepository; private final CustomChecklistQuestionRepository customChecklistQuestionRepository; private final ChecklistLikeRepository checklistLikeRepository; public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, ChecklistOptionRepository checklistOptionRepository, ChecklistQuestionRepository checklistQuestionRepository, + ChecklistMaintenanceRepository checklistMaintenanceRepository, CustomChecklistQuestionRepository customChecklistQuestionRepository, ChecklistLikeRepository checklistLikeRepository) { this.checklistRepository = checklistRepository; this.roomRepository = roomRepository; this.checklistOptionRepository = checklistOptionRepository; this.checklistQuestionRepository = checklistQuestionRepository; + this.checklistMaintenanceRepository = checklistMaintenanceRepository; this.customChecklistQuestionRepository = customChecklistQuestionRepository; this.checklistLikeRepository = checklistLikeRepository; } @@ -79,6 +85,7 @@ public long createChecklist(User user, ChecklistRequest checklistRequest) { createChecklistOptions(checklistRequest, checklist); createChecklistQuestions(checklistRequest, checklist); + createChecklistIncludedMaintenances(checklistRequest, checklist); return checklist.getId(); } @@ -124,6 +131,38 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli checklistQuestionRepository.saveAll(checklistQuestions); } + private void createChecklistIncludedMaintenances(ChecklistRequest checklistRequest, Checklist checklist) { + validateIncludedMaintenance(checklistRequest.room().includedMaintenances()); + List checklistMaintenances = + checklistRequest.room().includedMaintenances().stream() + .map(maintenanceId -> new ChecklistMaintenance(checklist, + MaintenanceItem.fromId(maintenanceId))) + .collect(Collectors.toList()); + checklistMaintenanceRepository.saveAll(checklistMaintenances); + } + + private void validateIncludedMaintenance(List includedMaintenances) { + validateIncludedMaintenanceDuplicate(includedMaintenances); + validateIncludedMaintenanceInvalid(includedMaintenances); + } + + private void validateIncludedMaintenanceDuplicate(List includedMaintenances) { + Set set = new HashSet<>(); + includedMaintenances.forEach(id -> { + if (!set.add(id)) { + throw new BangggoodException(ExceptionCode.MAINTENANCE_ITEM_DUPLICATE); + } + }); + } + + private void validateIncludedMaintenanceInvalid(List includedMaintenances) { + for (Integer maintenancesId : includedMaintenances) { + if (!MaintenanceItem.contains(maintenancesId)) { + throw new BangggoodException(ExceptionCode.MAINTENANCE_ITEM_INVALID); + } + } + } + @Transactional public void createChecklistLike(User user, long id) { Checklist checklist = checklistRepository.getById(id); @@ -224,7 +263,8 @@ public SelectedChecklistResponse readChecklistById(User user, long id) { SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); List options = readOptionsByChecklistId(id); - List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId( + id); return new SelectedChecklistResponse(selectedRoomResponse, options, selectedCategoryQuestionsResponse); } @@ -291,6 +331,7 @@ public void updateChecklistById(User user, long id, ChecklistRequest checklistRe updateChecklistOptions(checklistRequest, checklist); updateChecklistQuestions(checklistRequest, checklist); + updateChecklistIncludedMaintenances(checklistRequest, checklist); } private void updateChecklistOptions(ChecklistRequest checklistRequest, Checklist checklist) { @@ -319,6 +360,17 @@ private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checkli .forEach(i -> questions.get(i).change(updateQuestions.get(i))); } + private void updateChecklistIncludedMaintenances(ChecklistRequest checklistRequest, Checklist checklist) { + List maintenanceIds = checklistRequest.room().includedMaintenances(); + validateIncludedMaintenance(maintenanceIds); + List checklistMaintenances = maintenanceIds.stream() + .map(maintenanceId -> new ChecklistMaintenance(checklist, + MaintenanceItem.fromId(maintenanceId))) + .toList(); + checklistMaintenanceRepository.deleteAllByChecklistId(checklist.getId()); + checklistMaintenanceRepository.saveAll(checklistMaintenances); + } + private void validateSameQuestions(List questions, List updateQuestions) { if (questions.size() != updateQuestions.size()) { throw new BangggoodException(ExceptionCode.QUESTION_DIFFERENT); @@ -360,8 +412,13 @@ private void validateCustomChecklistQuestionsDuplication(List questionI @Transactional public void deleteChecklistById(User user, long id) { - validateChecklistOwnership(user, checklistRepository.getById(id)); + Checklist checklist = checklistRepository.getById(id); + validateChecklistOwnership(user, checklist); + checklistQuestionRepository.deleteAllByChecklistId(checklist.getId()); + checklistOptionRepository.deleteAllByChecklistId(checklist.getId()); + checklistMaintenanceRepository.deleteAllByChecklistId(checklist.getId()); checklistRepository.deleteById(id); + roomRepository.deleteById(checklist.getRoom().getId()); } @Transactional diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 0f5ccf9f5..9932a20d5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -17,6 +17,7 @@ public enum ExceptionCode { QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), + // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), @@ -32,9 +33,6 @@ public enum ExceptionCode { // CustomChecklist CUSTOM_CHECKLIST_QUESTION_EMPTY(HttpStatus.BAD_REQUEST, "커스텀 질문 개수가 유효하지 않습니다."), - // Type - TYPE_INVALID(HttpStatus.BAD_REQUEST, "타입이 유효하지 않습니다."), - // FloorLevel FLOOR_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "층 종류가 유효하지 않습니다."), @@ -50,6 +48,10 @@ public enum ExceptionCode { // OccupancyPeriod OCCUPANCY_PERIOD_INVALID(HttpStatus.BAD_REQUEST, "입주 가능 기간은 초, 중, 말 혹은 null 값만 가능합니다."), + // MaintenanceItem + MAINTENANCE_ITEM_DUPLICATE(HttpStatus.BAD_REQUEST, "중복된 관리비 항목이 존재합니다."), + MAINTENANCE_ITEM_INVALID(HttpStatus.BAD_REQUEST, "유효하지 않은 관리비 항목이 입력되었습니다."), + //like LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "체크리스트가 이미 좋아요 상태입니다"), LIKE_NOT_EXISTS(HttpStatus.BAD_REQUEST, "체크리스트 좋아요가 존재하지 않아 삭제할 수 없습니다."), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 451bae10d..b4222882d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -20,55 +20,60 @@ public class Room extends BaseEntity { private String name; - private String station; - - private Integer walkingTime; - private String address; - @Enumerated(EnumType.STRING) - private Type type; + private String buildingName; - private Double size; + private String station; - private Integer floor; + private Integer walkingTime; @Enumerated(EnumType.STRING) private FloorLevel floorLevel; + private Integer floor; + @Enumerated(EnumType.STRING) private Structure structure; + private Double size; + protected Room() { } - public Room(String name, String station, Integer walkingTime, String address, Type type, Double size, - Integer floor, FloorLevel floorLevel, Structure structure) { + public Room(String name, String address, String buildingName, String station, Integer walkingTime, + FloorLevel floorLevel, Integer floor, Structure structure, Double size) { this.name = name; + this.address = address; + this.buildingName = buildingName; this.station = station; this.walkingTime = walkingTime; - this.address = address; - this.type = type; - this.size = size; - this.floor = floor; this.floorLevel = floorLevel; + this.floor = floor; this.structure = structure; + this.size = size; validateFloorAndLevel(); } public void change(Room room) { this.name = room.name; + this.address = room.address; + this.buildingName = room.buildingName; this.station = room.station; this.walkingTime = room.walkingTime; - this.address = room.address; - this.type = room.type; - this.size = room.size; - this.floor = room.floor; this.floorLevel = room.floorLevel; + this.floor = room.floor; this.structure = room.structure; + this.size = room.size; validateFloorAndLevel(); } + private void validateFloorAndLevel() { + if (floorLevel != FloorLevel.GROUND && floor != null) { + throw new BangggoodException(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID); + } + } + public Long getId() { return id; } @@ -77,42 +82,36 @@ public String getName() { return name; } - public String getStation() { - return station; - } - - public Integer getWalkingTime() { - return walkingTime; - } - public String getAddress() { return address; } - public Type getType() { - return type; + public String getBuildingName() { + return buildingName; } - public Double getSize() { - return size; + public String getStation() { + return station; } - public Integer getFloor() { - return floor; + public Integer getWalkingTime() { + return walkingTime; } public FloorLevel getFloorLevel() { return floorLevel; } + public Integer getFloor() { + return floor; + } + public Structure getStructure() { return structure; } - private void validateFloorAndLevel() { - if (floorLevel != FloorLevel.GROUND && floor != null) { - throw new BangggoodException(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID); - } + public Double getSize() { + return size; } @Override @@ -137,14 +136,14 @@ public String toString() { return "Room{" + "id=" + id + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", buildingName='" + buildingName + '\'' + ", station='" + station + '\'' + ", walkingTime=" + walkingTime + - ", address='" + address + '\'' + - ", type=" + type + - ", size=" + size + - ", floor=" + floor + ", floorLevel=" + floorLevel + + ", floor=" + floor + ", structure=" + structure + + ", size=" + size + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java deleted file mode 100644 index 50b2bd15b..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bang_ggood.room.domain; - -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import java.util.Arrays; - -public enum Type { - - VILLA("빌라"), - OFFICETEL("오피스텔"), - APARTMENT("아파트"), - OTHER("기타"), - NONE(null); - - private final String name; - - Type(String name) { - this.name = name; - } - - public static Type from(String name) { - if (name == null) { - return NONE; - } - return Arrays.stream(Type.values()) - .filter(value -> value.name != null && value.name.equals(name)) - .findFirst() - .orElseThrow(() -> new BangggoodException(ExceptionCode.TYPE_INVALID)); - } - - public String getName() { - return name; - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java index 957c2afdd..7672a05e4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java @@ -3,17 +3,20 @@ import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import jakarta.validation.constraints.NotBlank; +import java.util.List; public record RoomRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, - Integer deposit, Integer rent, Integer contractTerm, String address, - String station, Integer walkingTime, String realEstate, - String type, String structure, Double size, Integer floor, String floorLevel, - Integer occupancyMonth, String occupancyPeriod, String memo, String summary) { + String address, String buildingName, String station, + Integer walkingTime, Integer deposit, Integer rent, Integer maintenanceFee, + List includedMaintenances, String floorLevel, Integer floor, + String structure, Double size, Integer contractTerm, Integer occupancyMonth, + String occupancyPeriod, + String realEstate, String memo, String summary +) { public Room toRoomEntity() { - return new Room(roomName, station, walkingTime, address, - Type.from(type), size, floor, FloorLevel.from(floorLevel), Structure.from(structure)); + return new Room(roomName, address, buildingName, station, walkingTime, + FloorLevel.from(floorLevel), floor, Structure.from(structure), size); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 13c740ae2..59a86ee06 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -6,13 +6,15 @@ public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, String address, String station, Integer walkingTime, String realEstate, String type, Double size, String floorLevel, String structure, - Integer occupancyMonth, String occupancyPeriod, String memo, String summary, LocalDateTime createdAt) { + Integer occupancyMonth, String occupancyPeriod, String memo, String summary, + LocalDateTime createdAt) { public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), - checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), + //TODO 수정 필요 + null, checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), checklist.getRoomStructure().getName(), checklist.getOccupancyMonth(), checklist.getOccupancyPeriod(), checklist.getMemo(), checklist.getSummary(), checklist.getCreatedAt()); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java index 4818c8a1c..3a9d9b2bf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java @@ -2,6 +2,17 @@ import com.bang_ggood.room.domain.Room; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; public interface RoomRepository extends JpaRepository { + + @Transactional + @Modifying + @Query("UPDATE Room r " + + "SET r.deleted = true " + + "WHERE r.id = :id") + void deleteById(@Param("id") Long id); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java index f0d64cafb..55390796a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java @@ -2,9 +2,9 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.station.SubwayReader; import com.bang_ggood.station.domain.SubwayStation; import com.bang_ggood.station.dto.SubwayStationResponse; -import com.bang_ggood.station.SubwayReader; import org.springframework.stereotype.Service; import java.util.Comparator; import java.util.List; @@ -20,7 +20,8 @@ public SubwayStationResponse readNearestStation(double latitude, double longitud return SUBWAY_STATIONS.stream() .map(station -> { double dx = (station.getLatitude() - latitude) * METER_PER_DEGREE; - double dy = (station.getLongitude() - longitude) * METER_PER_DEGREE * Math.cos(station.getLatitude()); + double dy = + (station.getLongitude() - longitude) * METER_PER_DEGREE * Math.cos(station.getLatitude()); double distance = Math.sqrt(dx * dx + dy * dy); return SubwayStationResponse.of(station, (int) Math.round(distance / AVERAGE_WALKING_SPEED)); }) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 5c580c73d..905720a9e 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -2,8 +2,7 @@ INSERT INTO users(name, email, created_at, modified_at, deleted) VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) -VALUES - (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), +VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), (1, 'ROOM_CONDITION_2', '2024-07-22 07:56:43', '2024-07-22 07:56:43', false), (1, 'ROOM_CONDITION_3', '2024-07-22 07:56:44', '2024-07-22 07:56:44', false), (1, 'ROOM_CONDITION_4', '2024-07-22 07:56:45', '2024-07-22 07:56:45', false), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 0223b31b1..42f847e96 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -3,6 +3,7 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS article CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; +DROP TABLE IF EXISTS checklist_maintenance CASCADE; DROP TABLE IF EXISTS checklist CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; @@ -11,19 +12,19 @@ DROP TABLE IF EXISTS users CASCADE; -- Create tables CREATE TABLE room ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(255), - station VARCHAR(255), - walking_time INTEGER, - address VARCHAR(255), - type VARCHAR(255), - size DOUBLE, - floor INTEGER, - floor_level VARCHAR(255), - structure VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255), + address VARCHAR(255), + building_name VARCHAR(255), + station VARCHAR(255), + walking_time INTEGER, + floor_level VARCHAR(255), + floor INTEGER, + structure VARCHAR(255), + size DOUBLE, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE users @@ -43,12 +44,13 @@ CREATE TABLE checklist user_id BIGINT NOT NULL, deposit INTEGER, rent INTEGER, + maintenance_fee INTEGER, contract_term INTEGER, + occupancy_month VARCHAR(255), + occupancy_period VARCHAR(255), real_estate VARCHAR(255), memo VARCHAR(1000), summary VARCHAR(255), - occupancy_month VARCHAR(255), - occupancy_period VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, @@ -100,6 +102,17 @@ CREATE TABLE checklist_like FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); +CREATE TABLE checklist_maintenance +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + checklist_id BIGINT, + maintenance_item VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, @@ -110,4 +123,4 @@ CREATE TABLE article created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN -); \ No newline at end of file +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java index d48add625..e5cdd2427 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java @@ -17,7 +17,8 @@ public class ArticleRepositoryTest extends IntegrationTestSupport { - @Autowired ArticleRepository articleRepository; + @Autowired + ArticleRepository articleRepository; @DisplayName("아티클 조회 성공") @Test diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java index 11eeb886a..bec99b6c3 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java @@ -1,7 +1,6 @@ package com.bang_ggood.article.service; import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.article.domain.Article; import com.bang_ggood.article.dto.request.ArticleCreateRequest; import com.bang_ggood.article.dto.response.ArticlePreviewResponse; import com.bang_ggood.article.repository.ArticleRepository; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index fc7d269f6..332a4673d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -2,8 +2,10 @@ import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.MaintenanceItem; import com.bang_ggood.checklist.domain.OccupancyMonth; import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.checklist.domain.Question; @@ -18,36 +20,41 @@ public class ChecklistFixture { public static final Checklist CHECKLIST1_USER1 = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST2_USER1 = new Checklist( RoomFixture.ROOM_2, UserFixture.USER1, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST3_USER1 = new Checklist( RoomFixture.ROOM_3, UserFixture.USER1, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST3_USER2 = new Checklist( RoomFixture.ROOM_3, UserFixture.USER2, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST1_WITH_USER1_ID = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1_WITH_ID, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( @@ -191,4 +198,12 @@ public class ChecklistFixture { public static final ChecklistLike CHECKLIST1_LIKE = new ChecklistLike(CHECKLIST1_USER1); public static final ChecklistLike CHECKLIST2_LIKE = new ChecklistLike(CHECKLIST2_USER1); + + public static final ChecklistMaintenance CHECKLIST1_INCLUDED_MAINTENANCE_1 = new ChecklistMaintenance( + ChecklistFixture.CHECKLIST1_USER1, MaintenanceItem.ELECTRICITY + ); + + public static final ChecklistMaintenance CHECKLIST1_INCLUDED_MAINTENANCE_2 = new ChecklistMaintenance( + ChecklistFixture.CHECKLIST1_USER1, MaintenanceItem.GAS + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index de2932c04..4e5d5a23a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -136,13 +136,14 @@ void readChecklistById() { .when().get("/checklists/" + checklistId) .then().log().all() .statusCode(200); -// .extract() -// .as(SelectedChecklistResponse.class); -// -// Assertions.assertAll( -// () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), -// () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") -// ); + /*.extract() + .as(SelectedChecklistResponse.class); + + Assertions.assertAll( + () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo(ChecklistFixture.CHECKLIST_CREATE_REQUEST.room().roomName()), + () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo(ChecklistFixture.CHECKLIST_CREATE_REQUEST.room().address()) + );*/ + //TODO 수정 } @DisplayName("좋아요된 체크리스트 리스트 조회 성공") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java index bd956b87d..f7a0ee8a2 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java @@ -21,8 +21,8 @@ void constructor_ChecklistInvalidMemoLength_exception() { // when & then assertThatThrownBy( - () -> new Checklist(RoomFixture.ROOM_1, UserFixture.USER1, 1000, 20, 12, - "공인중개사", memo, "요약", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY) + () -> new Checklist(RoomFixture.ROOM_1, UserFixture.USER1, 1000, 20, 10, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, "공인중개사", memo, "요약") ) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH.getMessage()); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java new file mode 100644 index 000000000..5c013d5cf --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java @@ -0,0 +1,45 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class MaintenanceItemTest { + + @DisplayName("관리 항목 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(MaintenanceItem.contains(MaintenanceItem.GAS.getId())).isTrue(); + } + + @DisplayName("관리 항목 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(Option.contains(Integer.MAX_VALUE)).isFalse(); + } + + @DisplayName("아이디를 통해 생성 성공") + @Test + void fromId() { + // given & when + MaintenanceItem maintenanceItem = MaintenanceItem.ELECTRICITY; + + //then + assertThat(MaintenanceItem.fromId(maintenanceItem.getId())).isEqualTo(maintenanceItem); + } + + @DisplayName("아이디를 통해 생성 실패 : 유효하지 않은 아이디일 경우") + @Test + void fromId_invalid_exception() { + // given & when & then + assertThatThrownBy( + () -> MaintenanceItem.fromId(Integer.MAX_VALUE) + ) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.MAINTENANCE_ITEM_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java new file mode 100644 index 000000000..4dc258282 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java @@ -0,0 +1,63 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class ChecklistMaintenanceRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoomRepository roomRepository; + + @Autowired + private ChecklistMaintenanceRepository checklistMaintenanceRepository; + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); + } + + + @DisplayName("관리 항목 체크리스트 ID로 논리적 삭제 성공") + @Test + void deleteById() { + //given + ChecklistMaintenance saved1 = checklistMaintenanceRepository.save( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_1); + ChecklistMaintenance saved2 = checklistMaintenanceRepository.save( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_2); + + //when + checklistMaintenanceRepository.deleteAllByChecklistId( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_1.getChecklist().getId()); + + //then + assertAll( + () -> assertThat(checklistMaintenanceRepository.existsById(saved1.getId())).isTrue(), + () -> assertThat(checklistMaintenanceRepository.existsById(saved2.getId())).isTrue(), + () -> assertThat( + checklistMaintenanceRepository.findById(saved1.getId()).get().isDeleted()).isTrue(), + () -> assertThat( + checklistMaintenanceRepository.findById(saved2.getId()).get().isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java new file mode 100644 index 000000000..8233865e3 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java @@ -0,0 +1,77 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class ChecklistQuestionRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoomRepository roomRepository; + + @Autowired + private ChecklistQuestionRepository checklistQuestionRepository; + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); + } + + @DisplayName("질문 답변을 체크리스트 ID로 조회 성공") + @Test + void findByChecklistId() { + //given + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_1); + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_2); + + // when + List checklistQuestions = checklistQuestionRepository.findByChecklistId( + ChecklistFixture.CHECKLIST_QUESTION_1.getId()); + + //then + assertAll( + () -> assertThat(checklistQuestions.get(0).isDeleted()).isFalse() + ); + } + + @DisplayName("질문 답변을 체크리스트 ID로 논리적 삭제 성공") + @Test + void deleteAllByChecklistId() { + //given + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_1); + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_2); + + //when + checklistQuestionRepository.deleteAllByChecklistId( + ChecklistFixture.CHECKLIST_QUESTION_1.getChecklist().getId()); + + //then + assertAll( + () -> assertThat( + checklistQuestionRepository.existsById(ChecklistFixture.CHECKLIST_QUESTION_1.getId())).isTrue(), + () -> assertThat( + checklistQuestionRepository.findById(ChecklistFixture.CHECKLIST_QUESTION_1.getId()).get() + .isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 83f671eae..887409ad9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -5,44 +5,51 @@ import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import com.bang_ggood.room.dto.request.RoomRequest; +import java.util.List; public class RoomFixture { public static final Room ROOM_1 = new Room( - "살기 좋은 방", "부개역", 10, "인천광역시 부평구", - Type.APARTMENT, 3.5, 3, FloorLevel.GROUND, Structure.TWO_ROOM + "살기 좋은 방", "인천광역시 부평구", null, + "부개", 10, FloorLevel.GROUND, 3, + Structure.TWO_ROOM, 3.5 ); public static final Room ROOM_2 = new Room( - "살기 싫은 방", "대구역", 10, "대구광역시 중구", - Type.OFFICETEL, 4.0, null, FloorLevel.BASEMENT, Structure.DIVIDED_ONE_ROOM + "살기 싫은 방", "대구광역시 중구", "롯데타워", + "대구", 10, FloorLevel.BASEMENT, null, + Structure.DIVIDED_ONE_ROOM, 4.0 ); public static final Room ROOM_3 = new Room( - "살기 애매한 방", "잠실역", 5, "서울특별시 송파구", - Type.VILLA, 5.5, null, FloorLevel.ROOFTOP, Structure.DUPLEX + "살기 애매한 방", "서울특별시 송파구", "루터회관", + "잠실", 5, FloorLevel.ROOFTOP, null, + Structure.DUPLEX, 5.5 ); public static final RoomRequest ROOM_CREATE_REQUEST = new RoomRequest( - "방이름", 1000, 50, 12, "부산광역시 루터회관", - "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.TWO_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), - OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" + "방이름", "부산광역시 북구", "루터회관", "잠실", + 10, 1000, 50, 5, + List.of(1, 3), FloorLevel.GROUND.getName(), 10, + Structure.TWO_ROOM.getName(), 3.3, 12, OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + "방끗공인중개사", "메모", "한줄평" ); public static final RoomRequest ROOM_UPDATE_REQUEST = new RoomRequest( - "방이름", 1000, 50, 12, "부산광역시 루터회관", - "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.OPEN_ONE_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), - OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" + "방이름", "부산광역시 루터회관", "잠실역", "루터회관", + 10, 1000, 50, 5, + List.of(1, 3), FloorLevel.GROUND.getName(), 10, + Structure.OPEN_ONE_ROOM.getName(), 3.3, 12, OccupancyMonth.APRIL.getMonth(), + OccupancyPeriod.EARLY.getPeriod(), + "방끗공인중개사", "메모", "한줄평" ); public static final RoomRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomRequest( - null, 1000, 50, 12, "부산광역시 루터회관", - "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.TWO_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), - OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" + null, "부산광역시 루터회관", "루터회관", "잠실역", + 10, 1000, 50, 5, + List.of(1, 3), FloorLevel.GROUND.getName(), 10, + Structure.TWO_ROOM.getName(), 3.3, 12, OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + "방끗공인중개사", "메모", "한줄평" ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java index d8287fd90..61aa14417 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java @@ -15,8 +15,8 @@ void createChecklist_roomFloorAndLevelInvalid_exception() { //given & when & then assertThatThrownBy(() -> { new Room( - "방이름", "잠실역", 12, "부산광역시 루터회관", Type.APARTMENT, 12.0, - 10, FloorLevel.BASEMENT, Structure.TWO_ROOM + "방이름", "부산광역시 북구", "루터회관", "잠실", 12, + FloorLevel.BASEMENT, 10, Structure.TWO_ROOM, 7.5 ); }) .isInstanceOf(BangggoodException.class) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java deleted file mode 100644 index a4f05624b..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.bang_ggood.room.domain; - -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -class TypeTest { - - @DisplayName("name으로 Type 생성 성공") - @Test - void from() { - // given - String name = "빌라"; - - // when & then - assertThat(Type.from(name)).isEqualTo(Type.VILLA); - } - - @DisplayName("name으로 Type 생성 성공 : null일 경우") - @Test - void from_null() { - // given - String name = null; - - // when & then - assertThat(Type.from(name)).isEqualTo(Type.NONE); - } - - @DisplayName("name으로 Type 생성 실패 : 해당하지 않는 이름일 경우") - @Test - void from_invalidType_exception() { - // given - String name = "시소"; - - // when & then - assertThatThrownBy(() -> Type.from(name)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.TYPE_INVALID.getMessage()); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java new file mode 100644 index 000000000..e369664b0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java @@ -0,0 +1,46 @@ +package com.bang_ggood.room.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class RoomRepositoryTest extends IntegrationTestSupport { + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoomRepository roomRepository; + + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + } + + + @DisplayName("방 논리적 삭제 성공") + @Test + void deleteById() { + //given + Room saved = roomRepository.save(RoomFixture.ROOM_1); + + //when + roomRepository.deleteById(saved.getId()); + + //then + assertAll( + () -> assertThat(roomRepository.existsById(saved.getId())).isTrue(), + () -> assertThat(roomRepository.findById(saved.getId()).get().isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java index 741270ee0..dd066cc84 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java @@ -16,6 +16,16 @@ public class SubwayStationServiceTest extends IntegrationTestSupport { @Autowired SubwayStationService subwayStationService; + // check data in "https://apis.map.kakao.com/web/sample/addMapClickEventWithMarker/" + private static Stream provideStationData() { + return Stream.of( + Arguments.of(37.50495731889611, 126.7550884277559, "상동"), + Arguments.of(37.48352733443973, 126.80085909322227, "소사"), + Arguments.of(37.47909015564278, 126.9517354974442, "서울대입구(관악구청)"), + Arguments.of(37.516248619935034, 127.10303565244502, "잠실(송파구청)") + ); + } + @DisplayName("가까운 지하철 조회 성공") @ParameterizedTest @MethodSource("provideStationData") @@ -26,14 +36,4 @@ void readNearestStation(double latitude, double longitude, String nearestStation // then assertThat(stationName).isEqualTo(nearestStationName); } - - // check data in "https://apis.map.kakao.com/web/sample/addMapClickEventWithMarker/" - private static Stream provideStationData() { - return Stream.of( - Arguments.of(37.50495731889611, 126.7550884277559, "상동"), - Arguments.of(37.48352733443973, 126.80085909322227, "소사"), - Arguments.of(37.47909015564278, 126.9517354974442, "서울대입구(관악구청)"), - Arguments.of(37.516248619935034, 127.10303565244502, "잠실(송파구청)") - ); - } } diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index 6a45a1e42..42a9069b9 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -2,8 +2,7 @@ INSERT INTO users(name, email, created_at, modified_at, deleted) VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) -VALUES - (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), +VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), (1, 'ROOM_CONDITION_2', '2024-07-22 07:56:43', '2024-07-22 07:56:43', false), (1, 'ROOM_CONDITION_3', '2024-07-22 07:56:44', '2024-07-22 07:56:44', false), (1, 'ROOM_CONDITION_4', '2024-07-22 07:56:45', '2024-07-22 07:56:45', false), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 4257bd355..352ec4c88 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -2,6 +2,7 @@ DROP TABLE IF EXISTS checklist CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; +DROP TABLE IF EXISTS checklist_maintenance CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; @@ -12,19 +13,19 @@ DROP TABLE IF EXISTS article CASCADE; -- Create tables CREATE TABLE room ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(255), - station VARCHAR(255), - walking_time INTEGER, - address VARCHAR(255), - type VARCHAR(255), - size DOUBLE, - floor INTEGER, - floor_level VARCHAR(255), - structure VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255), + address VARCHAR(255), + building_name VARCHAR(255), + station VARCHAR(255), + walking_time INTEGER, + floor_level VARCHAR(255), + floor INTEGER, + structure VARCHAR(255), + size DOUBLE, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE users @@ -44,12 +45,13 @@ CREATE TABLE checklist user_id BIGINT NOT NULL, deposit INTEGER, rent INTEGER, + maintenance_fee INTEGER, contract_term INTEGER, + occupancy_month VARCHAR(255), + occupancy_period VARCHAR(255), real_estate VARCHAR(255), memo VARCHAR(1000), summary VARCHAR(255), - occupancy_month VARCHAR(255), - occupancy_period VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, @@ -57,6 +59,17 @@ CREATE TABLE checklist FOREIGN KEY (user_id) REFERENCES users (id) ); +CREATE TABLE checklist_maintenance +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + checklist_id BIGINT, + maintenance_item VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + CREATE TABLE checklist_question ( id BIGINT AUTO_INCREMENT PRIMARY KEY, From 4ea3dd1e8197f001ec30b1f51a073aa2a1d83be8 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:31:51 +0900 Subject: [PATCH 217/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20username=EC=9D=84?= =?UTF-8?q?=20=EB=B0=98=ED=99=98=ED=95=9C=EB=8B=A4.=20(#458)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../test/java/com/bang_ggood/user/controller/UserE2ETest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index ae58a8ce8..f2fe1c2be 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long userId, String nickname, String userEmail, LocalDateTime createdAt) { +public record UserResponse(Long userId, String username, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( user.getId(), user.getName(), user.getEmail(), user.getCreatedAt() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index f6f30ab41..267f65e51 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -29,7 +29,7 @@ void readUserInfo() { assertAll( () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.nickname()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.username()).isEqualTo(UserFixture.USER1.getName()), () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } From 9e788ef5d23015596d3eed77e0b081ed57d48e7c Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Tue, 20 Aug 2024 15:43:24 +0900 Subject: [PATCH 218/348] =?UTF-8?q?[BE]=20=EC=9C=A0=EC=A0=80=20=EC=A0=95?= =?UTF-8?q?=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20=EC=8B=9C=20userName=EC=9D=84?= =?UTF-8?q?=20=EB=B0=98=ED=99=98=ED=95=9C=EB=8B=A4.=20(#459)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/user/dto/UserResponse.java | 2 +- .../test/java/com/bang_ggood/user/controller/UserE2ETest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java index f2fe1c2be..10b9e8a45 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/user/dto/UserResponse.java @@ -3,7 +3,7 @@ import com.bang_ggood.user.domain.User; import java.time.LocalDateTime; -public record UserResponse(Long userId, String username, String userEmail, LocalDateTime createdAt) { +public record UserResponse(Long userId, String userName, String userEmail, LocalDateTime createdAt) { public static UserResponse from(User user) { return new UserResponse( user.getId(), user.getName(), user.getEmail(), user.getCreatedAt() diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java index 267f65e51..5f81153ea 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/user/controller/UserE2ETest.java @@ -29,7 +29,7 @@ void readUserInfo() { assertAll( () -> assertThat(response.userId()).isEqualTo(UserFixture.USER1.getId()), - () -> assertThat(response.username()).isEqualTo(UserFixture.USER1.getName()), + () -> assertThat(response.userName()).isEqualTo(UserFixture.USER1.getName()), () -> assertThat(response.userEmail()).isEqualTo(UserFixture.USER1.getEmail()) ); } From e4ddd25f3a7bc802d29c74da351c45bdf9681152 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:42:37 +0900 Subject: [PATCH 219/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=20=EA=B8=B0=EB=8A=A5=EC=9D=84=20=EA=B5=AC=ED=98=84?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#457)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/AuthPrincipalArgumentResolver.java | 1 + .../auth/controller/AuthController.java | 12 +++++++ .../auth/controller/CookieProvider.java | 12 +++++++ .../bang_ggood/auth/service/AuthService.java | 33 +++++++++++++++++-- .../bang_ggood/exception/ExceptionCode.java | 2 ++ .../auth/controller/AuthE2ETest.java | 22 +++++++++++++ .../auth/service/AuthServiceTest.java | 31 +++++++++++++---- 7 files changed, 105 insertions(+), 8 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java index d5cebc6a7..3662fa6fa 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/config/AuthPrincipalArgumentResolver.java @@ -40,6 +40,7 @@ public User resolveArgument(MethodParameter parameter, ModelAndViewContainer mav } String token = extractToken(request.getCookies()); + return authService.extractUser(token); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index eefa87496..9e0faa4cf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -1,13 +1,16 @@ package com.bang_ggood.auth.controller; +import com.bang_ggood.auth.config.AuthPrincipal; import com.bang_ggood.auth.dto.request.OauthLoginRequest; import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestHeader; import org.springframework.web.bind.annotation.RestController; @RestController @@ -28,4 +31,13 @@ public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } + + @PostMapping("/oauth/logout") + public ResponseEntity logout(@AuthPrincipal User user, + @RequestHeader(value = "Cookie") String accessToken) { + authService.logout(accessToken, user); + ResponseCookie expiredCookie = cookieProvider.deleteCookie(); + + return ResponseEntity.noContent().header(HttpHeaders.SET_COOKIE, expiredCookie.toString()).build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java index edef0e8d9..380586174 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/CookieProvider.java @@ -27,4 +27,16 @@ public ResponseCookie createCookie(String token) { .path("/") .build(); } + + public ResponseCookie deleteCookie() { + return ResponseCookie + .from(TOKEN_COOKIE_NAME, "") + .domain(domain) + .httpOnly(true) + .secure(true) + .sameSite("None") + .maxAge(0) + .path("/") + .build(); + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 6181a2114..486dde795 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -12,6 +12,8 @@ import com.bang_ggood.checklist.dto.request.QuestionRequest; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Structure; import com.bang_ggood.room.domain.Type; @@ -20,11 +22,15 @@ import com.bang_ggood.user.repository.UserRepository; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.HashSet; import java.util.List; +import java.util.Set; @Service public class AuthService { + private static final Set blackList = new HashSet<>(); + private final OauthClient oauthClient; private final JwtTokenProvider jwtTokenProvider; private final ChecklistService checklistService; @@ -71,7 +77,8 @@ private void createDefaultChecklist(User user) { RoomRequest roomRequest = new RoomRequest( "예시용 체크리스트", 2000, 50, 12, "서울특별시 송파구", "잠실역", 10, "방끗 부동산", Type.VILLA.getName(), Structure.OPEN_ONE_ROOM.getName(), - 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), + OccupancyPeriod.EARLY.getPeriod(), "집을 둘러보며 필요한 메모를 작성해보세요.", "한줄평 작성하는 곳"); List options = List.of( @@ -93,9 +100,31 @@ private void createDefaultChecklist(User user) { checklistService.createChecklist(user, checklistRequest); } + public void logout(String accessToken, User user) { + AuthUser authUser = jwtTokenProvider.resolveToken(accessToken); + validateTokenOwnership(user, authUser); + blackList.add(accessToken); + } + + private static void validateTokenOwnership(User user, AuthUser authUser) { + if (!user.getId().equals(authUser.id())) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER); + } + } + + public boolean isAccessTokenInBlackList(String accessToken) { + return blackList.contains(accessToken); + } + public User extractUser(String token) { AuthUser authUser = jwtTokenProvider.resolveToken(token); - + validateAccessTokenInBlacklist(token); return userRepository.getUserById(authUser.id()); } + + private void validateAccessTokenInBlacklist(String token) { + if (isAccessTokenInBlackList(token)) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_IN_BLACKLIST); + } + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index e7b381658..1d766fcb5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -57,6 +57,8 @@ public enum ExceptionCode { AUTHENTICATION_COOKIE_INVALID(HttpStatus.UNAUTHORIZED, "인증 정보가 올바르지 않습니다."), AUTHENTICATION_TOKEN_EXPIRED(HttpStatus.UNAUTHORIZED, "토큰이 만료되었습니다."), AUTHENTICATION_TOKEN_INVALID(HttpStatus.UNAUTHORIZED, "토큰 정보가 올바르지 않습니다."), + AUTHENTICATION_TOKEN_IN_BLACKLIST(HttpStatus.UNAUTHORIZED, "이미 로그아웃되어 더 이상 사용할 수 없는 토큰입니다. 다시 로그인 해주세요."), + AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER(HttpStatus.UNAUTHORIZED, "해당 유저의 토큰이 아닙니다"), OAUTH_TOKEN_INTERNAL_EXCEPTION(HttpStatus.INTERNAL_SERVER_ERROR, "카카오 서버와 통신하는 과정 중 예상치 못한 예외가 발생했습니다."), // Article diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java index 6525769be..3614d12e0 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -2,18 +2,25 @@ import com.bang_ggood.AcceptanceTest; import com.bang_ggood.auth.dto.request.OauthLoginRequest; +import com.bang_ggood.auth.service.AuthService; +import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.user.UserFixture; import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import static org.hamcrest.Matchers.containsString; class AuthE2ETest extends AcceptanceTest { + @Autowired + private AuthService authService; + @DisplayName("로그인 실패 : 인가코드가 없는 경우") @Test void login_code_notBlank_exception() { @@ -51,4 +58,19 @@ void authentication_invalid_cookie_exception() { .statusCode(401) .body("message", containsString(ExceptionCode.AUTHENTICATION_COOKIE_INVALID.getMessage())); } + + @DisplayName("인증 실패 : 블랙리스트에 들어간 토큰일 경우") + @Test + void authentication_token_blacklist_exception() { + authService.logout(this.responseCookie.getValue(), UserFixture.USER1); + + RestAssured.given().log().all() + .contentType(ContentType.JSON) + .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) + .body(ChecklistFixture.CHECKLIST_CREATE_REQUEST) + .when().post("/checklists") + .then().log().all() + .statusCode(401) + .body("message", containsString(ExceptionCode.AUTHENTICATION_TOKEN_IN_BLACKLIST.getMessage())); + } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index fffce3c30..2aee6b48c 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -7,10 +7,11 @@ import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.service.ChecklistService; +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; -import org.assertj.core.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; @@ -20,6 +21,10 @@ import org.springframework.boot.test.mock.mockito.MockBean; import static com.bang_ggood.user.UserFixture.USER1; +import static com.bang_ggood.user.UserFixture.USER1_WITH_ID; +import static com.bang_ggood.user.UserFixture.USER2_WITH_ID; +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; @ExtendWith(MockitoExtension.class) @@ -34,6 +39,8 @@ class AuthServiceTest extends IntegrationTestSupport { private ChecklistService checklistService; @Autowired private UserRepository userRepository; + @Autowired + private JwtTokenProvider jwtTokenProvider; @DisplayName("로그인 성공 : 존재하지 않는 회원이면 데이터베이스에 새로운 유저를 추가하고 토큰을 반환한다.") @Test @@ -46,7 +53,7 @@ void login_signup() { String token = authService.login(oauthLoginRequest); // then - Assertions.assertThat(token).isNotBlank(); + assertThat(token).isNotBlank(); } @DisplayName("로그인 성공 : 존재하는 회원이면 데이터베이스에 새로운 유저를 추가하지않고 토큰을 바로 반환한다.") @@ -61,7 +68,7 @@ void login() { String token = authService.login(oauthLoginRequest); // then - Assertions.assertThat(token).isNotBlank(); + assertThat(token).isNotBlank(); } @DisplayName("로그인 성공 : 회원 가입시 디폴트 체크리스트 질문을 추가한다.") @@ -79,11 +86,11 @@ void login_default_checklist_question() { ChecklistQuestionsResponse checklistQuestions = checklistService.readChecklistQuestions(user); int sum = 0; - for (CategoryQuestionsResponse response: checklistQuestions.categories()) { + for (CategoryQuestionsResponse response : checklistQuestions.categories()) { sum += response.questions().size(); } - Assertions.assertThat(sum).isEqualTo(Question.findDefaultQuestions().size()); + assertThat(sum).isEqualTo(Question.findDefaultQuestions().size()); } @DisplayName("로그인 성공 : 회원 가입시 디폴트 체크리스트를 추가한다.") @@ -99,6 +106,18 @@ void login_default_checklist() { // then User user = authService.extractUser(token); UserChecklistsPreviewResponse response = checklistService.readChecklistsPreview(user); - Assertions.assertThat(response.checklists()).hasSize(1); + assertThat(response.checklists()).hasSize(1); + } + + @DisplayName("로그아웃 실패 : 다른 유저의 토큰인 경우") + @Test + void logout_invalid_ownership_exception() { + // given + String token = jwtTokenProvider.createToken(USER1_WITH_ID); + + //when & then + assertThatThrownBy(() -> authService.logout(token, USER2_WITH_ID)) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER.getMessage()); } } From 5aa0ae71cff826a5a1b34254d7f58b4110d43d5b Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 21 Aug 2024 11:48:33 +0900 Subject: [PATCH 220/348] =?UTF-8?q?[BE]=20=EC=A7=88=EB=AC=B8=20=EC=A1=B0?= =?UTF-8?q?=ED=9A=8C=EC=8B=9C=20=ED=95=98=EC=9D=B4=EB=9D=BC=EC=9D=B4?= =?UTF-8?q?=ED=8A=B8=EB=A5=BC=20=ED=95=A8=EA=BB=98=20=EC=A0=84=EB=8B=AC?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20=20(#467)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/controller/AuthController.java | 1 - .../bang_ggood/checklist/domain/Question.java | 104 ++++++++++++------ .../CustomChecklistQuestionResponse.java | 16 ++- .../dto/response/QuestionResponse.java | 31 +++++- .../response/SelectedQuestionResponse.java | 20 ++-- .../checklist/service/ChecklistService.java | 6 +- .../bang_ggood/exception/ExceptionCode.java | 2 + .../controller/ChecklistE2ETest.java | 42 ++----- .../service/ChecklistServiceTest.java | 2 +- 9 files changed, 136 insertions(+), 88 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index 9e0faa4cf..0e0784916 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -28,7 +28,6 @@ public AuthController(AuthService authService, CookieProvider cookieProvider) { public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { String token = authService.login(request); ResponseCookie cookie = cookieProvider.createCookie(token); - return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index a3b1681b7..fdbfbfec7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -4,60 +4,88 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; import java.util.Arrays; +import java.util.HashSet; import java.util.List; +import java.util.Set; public enum Question { - ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", true), - ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", true), - ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", true), - ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, true), - ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, true), - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", false), - ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, false), - ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, false), - ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, false), - - WINDOW_1(10, Category.WINDOW, "창 밖의 뷰가 가로 막혀 있지는 않나요?", null, true), - WINDOW_2(11, Category.WINDOW, "창문 상태가 괜찮나요?", null, true), - WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", true), - WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, true), - WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, false), - WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", false), - - BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", true), - BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", true), - BATHROOM_3(18, Category.BATHROOM, "화장실 내부에 환기 시설이 있나요?", null, true), - BATHROOM_4(19, Category.BATHROOM, "화장실 내부에 창문이 있나요?", null, false), - BATHROOM_5(20, Category.BATHROOM, "온수가 잘 나오나요?", null, false), - - SECURITY_1(21, Category.SECURITY, "잠금장치가 있는 공동 현관문이 있나요?", null, true), - SECURITY_2(22, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, true), - SECURITY_3(23, Category.SECURITY, "관리자분이 함께 상주하시나요?", "관리자분이 24시간 상주하시는지 확인하세요.", true), - SECURITY_4(24, Category.SECURITY, "보안 시설이 잘 갖추어져 있나요?", "도어락, 창문 잠금장치 등이 있는지 확인하세요.", false), - SECURITY_5(25, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, false), - SECURITY_6(26, Category.SECURITY, "현관문에 걸쇠가 있나요?", null, false), - - OUTSIDE_1(27, Category.OUTSIDE, "주변 도로가 밤에도 충분히 밝은가요?", null, false), - OUTSIDE_2(28, Category.OUTSIDE, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", false), - OUTSIDE_3(29, Category.OUTSIDE, "1층에 음식점이 있지는 않나요?", null, false), - OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, false), - OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, false); + ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", List.of("곰팡이"), true), + ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", List.of("불쾌한 냄새"), true), + ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", List.of("벌레"), true), + ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, List.of("방 인테리어"), true), + ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, List.of("수납할 수 있는 공간"), true), + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", List.of("에어컨"),false), + ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, List.of("보일러"), false), + ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, List.of("콘센트"), false), + ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, List.of("벽지 상태"), false), + + WINDOW_1(10, Category.WINDOW, "창 밖의 뷰가 가로 막혀 있지는 않나요?", null, List.of("창 밖의 뷰"), true), + WINDOW_2(11, Category.WINDOW, "창문 상태가 괜찮나요?", null, List.of("창문 상태"), true), + WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", List.of("환기"), true), + WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, List.of("햇빛"), true), + WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, List.of("이중창"), false), + WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", List.of("불쾌한 냄새"), false), + + BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", List.of("깨끗"), true), + BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", List.of("수압 및 물 빠짐"), true), + BATHROOM_3(18, Category.BATHROOM, "화장실 내부에 환기 시설이 있나요?", null, List.of("환기 시설"), true), + BATHROOM_4(19, Category.BATHROOM, "화장실 내부에 창문이 있나요?", null, List.of("창문"), false), + BATHROOM_5(20, Category.BATHROOM, "온수가 잘 나오나요?", null, List.of("온수"), false), + + SECURITY_1(21, Category.SECURITY, "잠금장치가 있는 공동 현관문이 있나요?", null, List.of("잠금장치", "공동 현관문"), true), + SECURITY_2(22, Category.SECURITY, "출입구와 복도에 CCTV가 설치되어 있나요?", null, List.of("CCTV"), true), + SECURITY_3(23, Category.SECURITY, "관리자분이 함께 상주하시나요?", "관리자분이 24시간 상주하시는지 확인하세요.", List.of("관리자분"), true), + SECURITY_4(24, Category.SECURITY, "보안 시설이 잘 갖추어져 있나요?", "도어락, 창문 잠금장치 등이 있는지 확인하세요.", List.of("보안 시설"), false), + SECURITY_5(25, Category.SECURITY, "화면이 달린 인터폰이 제공되나요?", null, List.of("인터폰"), false), + SECURITY_6(26, Category.SECURITY, "현관문에 걸쇠가 있나요?", null, List.of("걸쇠"), false), + + OUTSIDE_1(27, Category.OUTSIDE, "주변 도로가 밤에도 충분히 밝은가요?", null, List.of("주변 도로", "밝은가요"), false), + OUTSIDE_2(28, Category.OUTSIDE, "주변에 소음 시설이 있나요?", "유흥시설, 놀이터, 공사장이 있는지 확인하세요.", List.of("소음 시설"), false), + OUTSIDE_3(29, Category.OUTSIDE, "1층에 음식점이 있지는 않나요?", null, List.of("음식점"), false), + OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, List.of("언덕"), false), + OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, List.of("보이는 구조"), false); private final int id; private final Category category; private final String title; private final String subtitle; + private final List highlights; private final boolean isDefault; - Question(int id, Category category, String title, String subtitle, boolean isDefault) { + Question(int id, Category category, String title, String subtitle, List highlights, boolean isDefault) { this.id = id; this.category = category; this.title = title; this.subtitle = subtitle; + this.highlights = highlights; this.isDefault = isDefault; } + static { + validateQuestionIdDuplication(); + validateQuestionHighlightsMisMatch(); + } + + private static void validateQuestionIdDuplication() { + Set idSet = new HashSet<>(); + for (Question question : Question.values()) { + if (!idSet.add(question.getId())) { + throw new BangggoodException(ExceptionCode.QUESTION_ID_ERROR); + } + } + } + + private static void validateQuestionHighlightsMisMatch() { + for (Question question : Question.values()) { + for (String highlight : question.highlights) { + if (!question.getTitle().contains(highlight)) { + throw new BangggoodException(ExceptionCode.QUESTION_HIGHLIGHT_ERROR); + } + } + } + } + public static Question fromId(int id) { return Arrays.stream(values()) .filter(question -> question.id == id) @@ -119,4 +147,8 @@ public String getSubtitle() { public Category getCategory() { return category; } + + public List getHighlights() { + return highlights; + } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java index 2e6268b11..3daaa3b0e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java @@ -2,10 +2,16 @@ import com.bang_ggood.checklist.domain.Question; -public record CustomChecklistQuestionResponse(Integer questionId, String title, String subtitle, - boolean isSelected) { - public static CustomChecklistQuestionResponse of(Question question, boolean isSelected) { - return new CustomChecklistQuestionResponse(question.getId(), question.getTitle(), question.getSubtitle(), - isSelected); +public class CustomChecklistQuestionResponse extends QuestionResponse { + + private final boolean isSelected; + + public CustomChecklistQuestionResponse(Question question, boolean isSelected) { + super(question); + this.isSelected = isSelected; + } + + public boolean isSelected() { + return isSelected; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java index f1d5f5918..d4fc31f8f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/QuestionResponse.java @@ -1,10 +1,35 @@ package com.bang_ggood.checklist.dto.response; import com.bang_ggood.checklist.domain.Question; +import java.util.List; -public record QuestionResponse(Integer questionId, String title, String subtitle) { +public class QuestionResponse { - public static QuestionResponse of(Question question) { - return new QuestionResponse(question.getId(), question.getTitle(), question.getSubtitle()); + private final Integer questionId; + private final String title; + private final String subtitle; + private final List highlights; + + public QuestionResponse(Question question) { + this.questionId = question.getId(); + this.title = question.getTitle(); + this.subtitle = question.getSubtitle(); + this.highlights = question.getHighlights(); + } + + public Integer getQuestionId() { + return questionId; + } + + public String getTitle() { + return title; + } + + public String getSubtitle() { + return subtitle; + } + + public List getHighlights() { + return highlights; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java index 8ada2b0dd..747877dd4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedQuestionResponse.java @@ -2,14 +2,16 @@ import com.bang_ggood.checklist.domain.ChecklistQuestion; -public record SelectedQuestionResponse(Integer questionId, String title, String subtitle, String answer) { - - public static SelectedQuestionResponse of(ChecklistQuestion checklistQuestion) { - return new SelectedQuestionResponse( - checklistQuestion.getQuestion().getId(), - checklistQuestion.getQuestion().getTitle(), - checklistQuestion.getQuestion().getSubtitle(), - checklistQuestion.getAnswer().name() - ); +public class SelectedQuestionResponse extends QuestionResponse { + + private final String answer; + + public SelectedQuestionResponse(ChecklistQuestion checklistQuestion) { + super(checklistQuestion.getQuestion()); + this.answer = checklistQuestion.getAnswer().name(); + } + + public String getAnswer() { + return answer; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index abc66e9ff..731b2e6c1 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -162,7 +162,7 @@ public ChecklistQuestionsResponse readChecklistQuestions(User user) { .map(categoryQuestionEntry -> CategoryQuestionsResponse.of( categoryQuestionEntry.getKey(), categoryQuestionEntry.getValue().stream() - .map(QuestionResponse::of) + .map(QuestionResponse::new) .toList())) .toList(); @@ -208,7 +208,7 @@ private List getAllCategoryCustomCheckl for (Category category : Category.values()) { List categoryQuestions = Question.findQuestionsByCategory(category); List questions = categoryQuestions.stream() - .map(question -> CustomChecklistQuestionResponse.of(question, + .map(question -> new CustomChecklistQuestionResponse(question, question.isSelected(customChecklistQuestions))) .toList(); response.add(new CategoryCustomChecklistQuestionResponse(category.getId(), category.getName(), questions)); @@ -248,7 +248,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ List checklistQuestions) { List selectedQuestionResponse = Question.filterWithUnselectedGrade(category, checklistQuestions).stream() - .map(SelectedQuestionResponse::of) + .map(SelectedQuestionResponse::new) .toList(); return SelectedCategoryQuestionsResponse.of(category, selectedQuestionResponse); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 1d766fcb5..0f5ccf9f5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -12,6 +12,8 @@ public enum ExceptionCode { OPTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 옵션이 존재합니다."), // Question + QUESTION_ID_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "중복된 질문 ID가 존재해 질문을 생성할 수 없습니다."), + QUESTION_HIGHLIGHT_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "잘못된 하이라이트 키워드가 존재해 질문을 생성할 수 없습니다."), QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index 0bf83f90f..de2932c04 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -1,13 +1,9 @@ package com.bang_ggood.checklist.controller; import com.bang_ggood.AcceptanceTest; -import com.bang_ggood.category.dto.response.CategoryQuestionsResponse; import com.bang_ggood.checklist.ChecklistFixture; import com.bang_ggood.checklist.CustomChecklistFixture; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.dto.response.CategoryCustomChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.ChecklistQuestionsResponse; -import com.bang_ggood.checklist.dto.response.SelectedChecklistResponse; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; import com.bang_ggood.checklist.repository.CustomChecklistQuestionRepository; @@ -17,14 +13,12 @@ import io.restassured.RestAssured; import io.restassured.http.ContentType; import io.restassured.http.Header; -import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpHeaders; import static com.bang_ggood.user.UserFixture.USER1; -import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.Matchers.containsString; class ChecklistE2ETest extends AcceptanceTest { @@ -112,22 +106,12 @@ void readChecklistQuestions() { // given customChecklistQuestionRepository.saveAll(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT); - ChecklistQuestionsResponse checklistQuestionsResponse = RestAssured.given().log().all() + RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/questions") .then().log().all() - .statusCode(200) - .extract() - .as(ChecklistQuestionsResponse.class); - - // then - int questionsSize = 0; - for (CategoryQuestionsResponse categoryQuestionsResponse : checklistQuestionsResponse.categories()) { - questionsSize += categoryQuestionsResponse.questions().size(); - } - - assertThat(questionsSize).isEqualTo(CustomChecklistFixture.CUSTOM_CHECKLIST_QUESTION_DEFAULT.size()); + .statusCode(200); } @DisplayName("커스텀 체크리스트 전체 조회 성공") @@ -138,9 +122,7 @@ void readAllCustomChecklistQuestion() { .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/custom-checklist/all") .then().log().all() - .statusCode(200) - .extract() - .as(CategoryCustomChecklistQuestionsResponse.class); + .statusCode(200); } @DisplayName("작성된 체크리스트 조회 성공") @@ -148,19 +130,19 @@ void readAllCustomChecklistQuestion() { void readChecklistById() { long checklistId = checklistService.createChecklist(USER1, ChecklistFixture.CHECKLIST_CREATE_REQUEST); - SelectedChecklistResponse selectedChecklistResponse = RestAssured.given().log().all() + RestAssured.given().log().all() .contentType(ContentType.JSON) .header(new Header(HttpHeaders.COOKIE, this.responseCookie.toString())) .when().get("/checklists/" + checklistId) .then().log().all() - .statusCode(200) - .extract() - .as(SelectedChecklistResponse.class); - - Assertions.assertAll( - () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), - () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") - ); + .statusCode(200); +// .extract() +// .as(SelectedChecklistResponse.class); +// +// Assertions.assertAll( +// () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), +// () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") +// ); } @DisplayName("좋아요된 체크리스트 리스트 조회 성공") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index 574e3ae91..b197b26c7 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -188,7 +188,7 @@ void readChecklistQuestions() { List responseQuestionsIds = checklistQuestionsResponse.categories().stream() .map(CategoryQuestionsResponse::questions) .flatMap(Collection::stream) - .map(QuestionResponse::questionId) + .map(QuestionResponse::getQuestionId) .toList(); assertThat(responseQuestionsIds).containsExactlyElementsOf(defaultQuestionsIds); From 42b7ebd6c1d2d833e0276b00e3f713f0c8dc2313 Mon Sep 17 00:00:00 2001 From: gmuz1c Date: Wed, 21 Aug 2024 13:23:34 +0900 Subject: [PATCH 221/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=9E=91=EC=84=B1,=20=EC=88=98=EC=A0=95,?= =?UTF-8?q?=20=EC=82=AD=EC=A0=9C=20API=EC=97=90=20=EB=B3=80=EA=B2=BD?= =?UTF-8?q?=EB=90=9C=20=EB=8D=B0=EC=9D=B4=ED=84=B0=EB=A5=BC=20=EB=B0=98?= =?UTF-8?q?=EC=98=81=ED=95=9C=EB=8B=A4.=20=20(#470)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/article/domain/Article.java | 8 +- .../dto/request/ArticleCreateRequest.java | 3 +- .../ArticleDetailPreviewResponse.java | 3 +- .../article/dto/response/ArticleResponse.java | 3 +- .../bang_ggood/auth/service/AuthService.java | 26 ++--- .../controller/ChecklistController.java | 3 +- .../checklist/domain/Checklist.java | 104 ++++++++++-------- .../domain/ChecklistMaintenance.java | 72 ++++++++++++ .../checklist/domain/MaintenanceItem.java | 42 +++++++ .../bang_ggood/checklist/domain/Question.java | 22 ++-- .../dto/request/ChecklistRequest.java | 6 +- .../ChecklistMaintenanceRepository.java | 18 +++ .../repository/ChecklistOptionRepository.java | 2 +- .../ChecklistQuestionRepository.java | 9 ++ .../repository/ChecklistRepository.java | 2 +- .../checklist/service/ChecklistService.java | 61 +++++++++- .../bang_ggood/exception/ExceptionCode.java | 8 +- .../java/com/bang_ggood/room/domain/Room.java | 79 +++++++------ .../java/com/bang_ggood/room/domain/Type.java | 34 ------ .../room/dto/request/RoomRequest.java | 17 +-- .../dto/response/SelectedRoomResponse.java | 6 +- .../room/repository/RoomRepository.java | 11 ++ .../station/service/SubwayStationService.java | 5 +- .../bang-ggood/src/main/resources/data.sql | 3 +- .../bang-ggood/src/main/resources/schema.sql | 45 +++++--- .../repository/ArticleRepositoryTest.java | 3 +- .../article/service/ArticleServiceTest.java | 1 - .../checklist/ChecklistFixture.java | 35 ++++-- .../controller/ChecklistE2ETest.java | 15 +-- .../checklist/domain/ChecklistTest.java | 4 +- .../checklist/domain/MaintenanceItemTest.java | 45 ++++++++ .../ChecklistMaintenanceRepositoryTest.java | 63 +++++++++++ .../ChecklistQuestionRepositoryTest.java | 77 +++++++++++++ .../java/com/bang_ggood/room/RoomFixture.java | 45 ++++---- .../com/bang_ggood/room/domain/RoomTest.java | 4 +- .../com/bang_ggood/room/domain/TypeTest.java | 44 -------- .../room/repository/RoomRepositoryTest.java | 46 ++++++++ .../station/SubwayStationServiceTest.java | 20 ++-- .../src/test/resources/data-test.sql | 3 +- .../src/test/resources/schema-test.sql | 43 +++++--- 40 files changed, 735 insertions(+), 305 deletions(-) create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java create mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java delete mode 100644 backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java delete mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java create mode 100644 backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java index 452820273..c2d72d4bb 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/domain/Article.java @@ -54,8 +54,12 @@ public String getSummary() { @Override public boolean equals(Object o) { - if (this == o) return true; - if (o == null || getClass() != o.getClass()) return false; + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } Article article = (Article) o; return Objects.equals(id, article.id); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java index 3766e6443..c673a71ca 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/request/ArticleCreateRequest.java @@ -3,7 +3,8 @@ import com.bang_ggood.article.domain.Article; import jakarta.validation.constraints.NotBlank; -public record ArticleCreateRequest(@NotBlank(message = "제목을 입력해야 합니다.") String title, String content, String keyword, String summary) { +public record ArticleCreateRequest(@NotBlank(message = "제목을 입력해야 합니다.") String title, String content, String keyword, + String summary) { public Article toEntity() { return new Article(title, content, keyword, summary); diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java index 1700fe90c..12ed03343 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleDetailPreviewResponse.java @@ -3,7 +3,8 @@ import com.bang_ggood.article.domain.Article; import java.time.LocalDateTime; -public record ArticleDetailPreviewResponse(Long articleId, String title, String keyword, String summary, LocalDateTime createdAt) { +public record ArticleDetailPreviewResponse(Long articleId, String title, String keyword, String summary, + LocalDateTime createdAt) { public static ArticleDetailPreviewResponse from(Article article) { return new ArticleDetailPreviewResponse( diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java index ff24a9450..b0b530514 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/article/dto/response/ArticleResponse.java @@ -3,7 +3,8 @@ import com.bang_ggood.article.domain.Article; import java.time.LocalDateTime; -public record ArticleResponse(Long articleId, String title, String content, String keyword, String summary, LocalDateTime createdAt) { +public record ArticleResponse(Long articleId, String title, String content, String keyword, String summary, + LocalDateTime createdAt) { public static ArticleResponse from(Article article) { return new ArticleResponse( diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 486dde795..57b5a4d9c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -4,8 +4,6 @@ import com.bang_ggood.auth.dto.response.OauthInfoApiResponse; import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; -import com.bang_ggood.checklist.domain.OccupancyMonth; -import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -14,9 +12,6 @@ import com.bang_ggood.checklist.service.ChecklistService; import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; -import com.bang_ggood.room.domain.FloorLevel; -import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import com.bang_ggood.room.dto.request.RoomRequest; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; @@ -47,6 +42,12 @@ public AuthService(OauthClient oauthClient, JwtTokenProvider jwtTokenProvider, C this.customChecklistQuestionRepository = customChecklistQuestionRepository; } + private static void validateTokenOwnership(User user, AuthUser authUser) { + if (!user.getId().equals(authUser.id())) { + throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER); + } + } + @Transactional public String login(OauthLoginRequest request) { OauthInfoApiResponse oauthInfoApiResponse = oauthClient.requestOauthInfo(request); @@ -75,11 +76,10 @@ private void createDefaultChecklistQuestions(User user) { //TODO 리팩토링 private void createDefaultChecklist(User user) { RoomRequest roomRequest = new RoomRequest( - "예시용 체크리스트", 2000, 50, 12, "서울특별시 송파구", - "잠실역", 10, "방끗 부동산", Type.VILLA.getName(), Structure.OPEN_ONE_ROOM.getName(), - 5.0, 2, FloorLevel.GROUND.getName(), OccupancyMonth.SEPTEMBER.getMonth(), - OccupancyPeriod.EARLY.getPeriod(), - "집을 둘러보며 필요한 메모를 작성해보세요.", "한줄평 작성하는 곳"); + "예시용 체크리스트", "방끗시 집잘구하구 행복하동", "방방하우스", "잠실", 10, + 3000, 60, 5, List.of(1, 3), "지상", 14, "분리형 원룸", 9.5, + 12, 9, "초", "방끗공인중개사", + "이곳에 필요한 메모를 작성하세요.", "이곳에 한줄평을 남겨 보세요."); List options = List.of( Option.INDUCTION.getId(), @@ -106,12 +106,6 @@ public void logout(String accessToken, User user) { blackList.add(accessToken); } - private static void validateTokenOwnership(User user, AuthUser authUser) { - if (!user.getId().equals(authUser.id())) { - throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER); - } - } - public boolean isAccessTokenInBlackList(String accessToken) { return blackList.contains(accessToken); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java index 03cb290b3..07c1efb7c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/controller/ChecklistController.java @@ -92,7 +92,8 @@ public ResponseEntity deleteChecklistById(@AuthPrincipal User user, @PathV } @DeleteMapping("/checklists/{id}/like") - public ResponseEntity deleteChecklistLikeByChecklistId(@AuthPrincipal User user, @PathVariable("id") long id) { + public ResponseEntity deleteChecklistLikeByChecklistId(@AuthPrincipal User user, + @PathVariable("id") long id) { checklistService.deleteChecklistLikeByChecklistId(user, id); return ResponseEntity.noContent().build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 71621635d..6d36ecc4e 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -6,7 +6,6 @@ import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import com.bang_ggood.user.domain.User; import jakarta.persistence.Entity; import jakarta.persistence.EnumType; @@ -40,13 +39,9 @@ public class Checklist extends BaseEntity { private Integer rent; - private Integer contractTerm; - - private String realEstate; + private Integer maintenanceFee; - private String memo; - - private String summary; + private Integer contractTerm; @Enumerated(EnumType.STRING) private OccupancyMonth occupancyMonth; @@ -54,28 +49,38 @@ public class Checklist extends BaseEntity { @Enumerated(EnumType.STRING) private OccupancyPeriod occupancyPeriod; + private String realEstate; + + private String memo; + + private String summary; + @OneToMany(mappedBy = "checklist") private List questions; - public Checklist(Room room, User user, Integer deposit, Integer rent, Integer contractTerm, String realEstate, - String memo, String summary, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod) { + public Checklist(Room room, User user, Integer deposit, Integer rent, Integer maintenanceFee, + Integer contractTerm, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod, + String realEstate, String memo, String summary) { this.room = room; this.user = user; this.deposit = deposit; this.rent = rent; + this.maintenanceFee = maintenanceFee; this.contractTerm = contractTerm; + this.occupancyMonth = occupancyMonth; + this.occupancyPeriod = occupancyPeriod; this.realEstate = realEstate; this.memo = memo; this.summary = summary; - this.occupancyMonth = occupancyMonth; - this.occupancyPeriod = occupancyPeriod; validateMemoLength(); } - public Checklist(Integer deposit, Integer rent, Integer contractTerm, String realEstate, - String memo, String summary, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod) { - this(null, null, deposit, rent, contractTerm, realEstate, memo, summary, occupancyMonth, occupancyPeriod); + public Checklist(Integer deposit, Integer rent, Integer maintenanceFee, Integer contractTerm, + OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod, String realEstate, + String memo, String summary) { + this(null, null, deposit, rent, maintenanceFee, contractTerm, occupancyMonth, occupancyPeriod, realEstate, memo, + summary); } protected Checklist() { @@ -89,12 +94,13 @@ public void change(Checklist updateChecklist) { this.room = updateChecklist.room; this.deposit = updateChecklist.deposit; this.rent = updateChecklist.rent; + this.maintenanceFee = updateChecklist.maintenanceFee; this.contractTerm = updateChecklist.contractTerm; + this.occupancyMonth = updateChecklist.occupancyMonth; + this.occupancyPeriod = updateChecklist.occupancyPeriod; this.realEstate = updateChecklist.realEstate; this.memo = updateChecklist.memo; this.summary = updateChecklist.summary; - this.occupancyMonth = updateChecklist.occupancyMonth; - this.occupancyPeriod = updateChecklist.occupancyPeriod; validateMemoLength(); } @@ -108,12 +114,40 @@ public Long getId() { return id; } + public Room getRoom() { + return room; + } + public User getUser() { return user; } - public Room getRoom() { - return room; + public Integer getDeposit() { + return deposit; + } + + public Integer getRent() { + return rent; + } + + public Integer getMaintenanceFee() { + return maintenanceFee; + } + + public Integer getContractTerm() { + return contractTerm; + } + + public String getRealEstate() { + return realEstate; + } + + public String getMemo() { + return memo; + } + + public String getSummary() { + return summary; } public String getRoomName() { @@ -136,10 +170,6 @@ public Integer getRoomWalkingTime() { return room.getWalkingTime(); } - public Type getRoomType() { - return room.getType(); - } - public Double getRoomSize() { return room.getSize(); } @@ -152,30 +182,6 @@ public Structure getRoomStructure() { return room.getStructure(); } - public Integer getDeposit() { - return deposit; - } - - public Integer getRent() { - return rent; - } - - public Integer getContractTerm() { - return contractTerm; - } - - public String getRealEstate() { - return realEstate; - } - - public String getMemo() { - return memo; - } - - public String getSummary() { - return summary; - } - public Integer getOccupancyMonth() { return occupancyMonth.getMonth(); } @@ -213,12 +219,14 @@ public String toString() { ", user=" + user + ", deposit=" + deposit + ", rent=" + rent + + ", maintenanceFee=" + maintenanceFee + ", contractTerm=" + contractTerm + + ", occupancyMonth=" + occupancyMonth + + ", occupancyPeriod=" + occupancyPeriod + ", realEstate='" + realEstate + '\'' + ", memo='" + memo + '\'' + ", summary='" + summary + '\'' + - ", occupancyMonth=" + occupancyMonth + - ", occupancyPeriod=" + occupancyPeriod + + ", questions=" + questions + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java new file mode 100644 index 000000000..ffd441425 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java @@ -0,0 +1,72 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.BaseEntity; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import java.util.Objects; + +@Entity +public class ChecklistMaintenance extends BaseEntity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne(fetch = FetchType.LAZY) + private Checklist checklist; + + @Enumerated(EnumType.STRING) + private MaintenanceItem maintenanceItem; + + public ChecklistMaintenance(Checklist checklist, MaintenanceItem maintenanceItem) { + this.checklist = checklist; + this.maintenanceItem = maintenanceItem; + } + + protected ChecklistMaintenance() { + } + + public Long getId() { + return id; + } + + public Checklist getChecklist() { + return checklist; + } + + public MaintenanceItem getMaintenanceItem() { + return maintenanceItem; + } + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ChecklistMaintenance that = (ChecklistMaintenance) o; + return Objects.equals(id, that.id); + } + + @Override + public int hashCode() { + return Objects.hashCode(id); + } + + @Override + public String toString() { + return "ChecklistMaintenance{" + + "id=" + id + + ", checklist=" + checklist + + ", maintenanceItem='" + maintenanceItem + '\'' + + '}'; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java new file mode 100644 index 000000000..d34ed8091 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java @@ -0,0 +1,42 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import java.util.Arrays; + +public enum MaintenanceItem { + WATERWORKS(1, "수도"), + ELECTRICITY(2, "전기"), + INTERNET(3, "인터넷"), + GAS(4, "가스"); + + private final int id; + private final String name; + + MaintenanceItem(int id, String name) { + this.id = id; + this.name = name; + } + + public static boolean contains(int id) { + return Arrays.stream(MaintenanceItem.values()) + .anyMatch(maintenanceItem -> maintenanceItem.id == id); + } + + public static MaintenanceItem fromId(int id) { + for (MaintenanceItem maintenanceItem : values()) { + if (maintenanceItem.id == id) { + return maintenanceItem; + } + } + throw new BangggoodException(ExceptionCode.MAINTENANCE_ITEM_INVALID); + } + + public int getId() { + return id; + } + + public String getName() { + return name; + } +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java index fdbfbfec7..d4b0e55ed 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Question.java @@ -10,12 +10,15 @@ public enum Question { - ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", List.of("곰팡이"), true), - ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", List.of("불쾌한 냄새"), true), + ROOM_CONDITION_1(1, Category.ROOM_CONDITION, "방 안에 물이 새거나 곰팡이가 핀 곳은 없나요?", "천장, 벽면, 가구 뒤, 장판을 확인하세요.", + List.of("곰팡이"), true), + ROOM_CONDITION_2(2, Category.ROOM_CONDITION, "방에서 불쾌한 냄새가 나지는 않나요?", "싱크대, 화장실 배수구를 확인하세요.", List.of("불쾌한 냄새"), + true), ROOM_CONDITION_3(3, Category.ROOM_CONDITION, "벌레가 나온 흔적은 없나요?", "벌레 퇴치약이 부착되어 있는지 확인하세요.", List.of("벌레"), true), ROOM_CONDITION_4(4, Category.ROOM_CONDITION, "방 인테리어가 마음에 드나요?", null, List.of("방 인테리어"), true), ROOM_CONDITION_5(5, Category.ROOM_CONDITION, "물건을 충분히 수납할 수 있는 공간이 있나요?", null, List.of("수납할 수 있는 공간"), true), - ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", List.of("에어컨"),false), + ROOM_CONDITION_6(6, Category.ROOM_CONDITION, "에어컨은 깨끗한가요?", "에어컨을 틀어서 불쾌한 냄새가 나진 않는지 확인하세요.", List.of("에어컨"), + false), ROOM_CONDITION_7(7, Category.ROOM_CONDITION, "보일러가 잘 동작하나요?", null, List.of("보일러"), false), ROOM_CONDITION_8(8, Category.ROOM_CONDITION, "콘센트 위치와 개수가 적절한가요?", null, List.of("콘센트"), false), ROOM_CONDITION_9(9, Category.ROOM_CONDITION, "벽지 상태가 양호한가요?", null, List.of("벽지 상태"), false), @@ -25,7 +28,8 @@ public enum Question { WINDOW_3(12, Category.WINDOW, "환기가 잘 되는 구조인가요?", "창문 크기와 방향을 확인하세요.", List.of("환기"), true), WINDOW_4(13, Category.WINDOW, "햇빛이 잘 들어오나요?", null, List.of("햇빛"), true), WINDOW_5(14, Category.WINDOW, "창문이 이중창인가요?", null, List.of("이중창"), false), - WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", List.of("불쾌한 냄새"), false), + WINDOW_6(15, Category.WINDOW, "창문 밖에서 불쾌한 냄새가 들어오진 않나요?", "하천, 배수구, 음식물 쓰레기통이 있지 않은지 확인하세요.", List.of("불쾌한 냄새"), + false), BATHROOM_1(16, Category.BATHROOM, "화장실이 깨끗한가요?", "청소 가능한 얼룩인지 확인하세요.", List.of("깨끗"), true), BATHROOM_2(17, Category.BATHROOM, "수압 및 물 빠짐이 괜찮은가요?", "화장실에서 수도와 변기를 동시에 사용해보세요.", List.of("수압 및 물 빠짐"), true), @@ -46,6 +50,11 @@ public enum Question { OUTSIDE_4(30, Category.OUTSIDE, "집 가는 길이 언덕이진 않나요?", null, List.of("언덕"), false), OUTSIDE_5(31, Category.OUTSIDE, "옆 건물에서 보이는 구조는 아닌가요?", null, List.of("보이는 구조"), false); + static { + validateQuestionIdDuplication(); + validateQuestionHighlightsMisMatch(); + } + private final int id; private final Category category; private final String title; @@ -62,11 +71,6 @@ public enum Question { this.isDefault = isDefault; } - static { - validateQuestionIdDuplication(); - validateQuestionHighlightsMisMatch(); - } - private static void validateQuestionIdDuplication() { Set idSet = new HashSet<>(); for (Question question : Question.values()) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java index dbe752b71..8302d21fe 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/request/ChecklistRequest.java @@ -17,8 +17,8 @@ public Room toRoomEntity() { } public Checklist toChecklistEntity(Room roomEntity, User user) { - return new Checklist(roomEntity, user, room.deposit(), room.rent(), - room.contractTerm(), room.realEstate(), room.memo(), room.summary(), - OccupancyMonth.from(room.occupancyMonth()), OccupancyPeriod.from(room.occupancyPeriod())); + return new Checklist(roomEntity, user, room.deposit(), room.rent(), room.maintenanceFee(), room.contractTerm(), + OccupancyMonth.from(room.occupancyMonth()), OccupancyPeriod.from(room.occupancyPeriod()), + room.realEstate(), room.memo(), room.summary()); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java new file mode 100644 index 000000000..d95db4b88 --- /dev/null +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java @@ -0,0 +1,18 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.checklist.domain.ChecklistMaintenance; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; + +public interface ChecklistMaintenanceRepository extends JpaRepository { + + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Transactional + @Query("UPDATE ChecklistMaintenance cm " + + "SET cm.deleted = true " + + "WHERE cm.checklist.id = :checklistId") + void deleteAllByChecklistId(@Param("checklistId") Long checklistId); +} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java index f72248f3f..653d149dc 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistOptionRepository.java @@ -21,7 +21,7 @@ public interface ChecklistOptionRepository extends JpaRepository { @@ -12,4 +14,11 @@ public interface ChecklistQuestionRepository extends JpaRepository findByChecklistId(@Param("checklistId") long checklistId); + + @Modifying(flushAutomatically = true, clearAutomatically = true) + @Transactional + @Query("UPDATE ChecklistQuestion cq " + + "SET cq.deleted = true " + + "WHERE cq.checklist.id = :checklistId") + void deleteAllByChecklistId(@Param("checklistId") Long checklistId); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 890893e60..9145e17b0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -53,7 +53,7 @@ List findByUserAndIdIn(@Param("user") User user, boolean existsById(@Param("id") long id); @Transactional - @Modifying + @Modifying(flushAutomatically = true, clearAutomatically = true) @Query("UPDATE Checklist c " + "SET c.deleted = true " + "WHERE c.id = :id") diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 731b2e6c1..2ad2eadc9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -5,10 +5,12 @@ import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; +import com.bang_ggood.checklist.domain.MaintenanceItem; import com.bang_ggood.checklist.domain.Option; import com.bang_ggood.checklist.domain.Question; import com.bang_ggood.checklist.dto.request.ChecklistRequest; @@ -24,6 +26,7 @@ import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; +import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; @@ -54,18 +57,21 @@ public class ChecklistService { private final RoomRepository roomRepository; private final ChecklistOptionRepository checklistOptionRepository; private final ChecklistQuestionRepository checklistQuestionRepository; + private final ChecklistMaintenanceRepository checklistMaintenanceRepository; private final CustomChecklistQuestionRepository customChecklistQuestionRepository; private final ChecklistLikeRepository checklistLikeRepository; public ChecklistService(ChecklistRepository checklistRepository, RoomRepository roomRepository, ChecklistOptionRepository checklistOptionRepository, ChecklistQuestionRepository checklistQuestionRepository, + ChecklistMaintenanceRepository checklistMaintenanceRepository, CustomChecklistQuestionRepository customChecklistQuestionRepository, ChecklistLikeRepository checklistLikeRepository) { this.checklistRepository = checklistRepository; this.roomRepository = roomRepository; this.checklistOptionRepository = checklistOptionRepository; this.checklistQuestionRepository = checklistQuestionRepository; + this.checklistMaintenanceRepository = checklistMaintenanceRepository; this.customChecklistQuestionRepository = customChecklistQuestionRepository; this.checklistLikeRepository = checklistLikeRepository; } @@ -79,6 +85,7 @@ public long createChecklist(User user, ChecklistRequest checklistRequest) { createChecklistOptions(checklistRequest, checklist); createChecklistQuestions(checklistRequest, checklist); + createChecklistIncludedMaintenances(checklistRequest, checklist); return checklist.getId(); } @@ -124,6 +131,38 @@ private void createChecklistQuestions(ChecklistRequest checklistRequest, Checkli checklistQuestionRepository.saveAll(checklistQuestions); } + private void createChecklistIncludedMaintenances(ChecklistRequest checklistRequest, Checklist checklist) { + validateIncludedMaintenance(checklistRequest.room().includedMaintenances()); + List checklistMaintenances = + checklistRequest.room().includedMaintenances().stream() + .map(maintenanceId -> new ChecklistMaintenance(checklist, + MaintenanceItem.fromId(maintenanceId))) + .collect(Collectors.toList()); + checklistMaintenanceRepository.saveAll(checklistMaintenances); + } + + private void validateIncludedMaintenance(List includedMaintenances) { + validateIncludedMaintenanceDuplicate(includedMaintenances); + validateIncludedMaintenanceInvalid(includedMaintenances); + } + + private void validateIncludedMaintenanceDuplicate(List includedMaintenances) { + Set set = new HashSet<>(); + includedMaintenances.forEach(id -> { + if (!set.add(id)) { + throw new BangggoodException(ExceptionCode.MAINTENANCE_ITEM_DUPLICATE); + } + }); + } + + private void validateIncludedMaintenanceInvalid(List includedMaintenances) { + for (Integer maintenancesId : includedMaintenances) { + if (!MaintenanceItem.contains(maintenancesId)) { + throw new BangggoodException(ExceptionCode.MAINTENANCE_ITEM_INVALID); + } + } + } + @Transactional public void createChecklistLike(User user, long id) { Checklist checklist = checklistRepository.getById(id); @@ -224,7 +263,8 @@ public SelectedChecklistResponse readChecklistById(User user, long id) { SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); List options = readOptionsByChecklistId(id); - List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId( + id); return new SelectedChecklistResponse(selectedRoomResponse, options, selectedCategoryQuestionsResponse); } @@ -291,6 +331,7 @@ public void updateChecklistById(User user, long id, ChecklistRequest checklistRe updateChecklistOptions(checklistRequest, checklist); updateChecklistQuestions(checklistRequest, checklist); + updateChecklistIncludedMaintenances(checklistRequest, checklist); } private void updateChecklistOptions(ChecklistRequest checklistRequest, Checklist checklist) { @@ -319,6 +360,17 @@ private void updateChecklistQuestions(ChecklistRequest checklistRequest, Checkli .forEach(i -> questions.get(i).change(updateQuestions.get(i))); } + private void updateChecklistIncludedMaintenances(ChecklistRequest checklistRequest, Checklist checklist) { + List maintenanceIds = checklistRequest.room().includedMaintenances(); + validateIncludedMaintenance(maintenanceIds); + List checklistMaintenances = maintenanceIds.stream() + .map(maintenanceId -> new ChecklistMaintenance(checklist, + MaintenanceItem.fromId(maintenanceId))) + .toList(); + checklistMaintenanceRepository.deleteAllByChecklistId(checklist.getId()); + checklistMaintenanceRepository.saveAll(checklistMaintenances); + } + private void validateSameQuestions(List questions, List updateQuestions) { if (questions.size() != updateQuestions.size()) { throw new BangggoodException(ExceptionCode.QUESTION_DIFFERENT); @@ -360,8 +412,13 @@ private void validateCustomChecklistQuestionsDuplication(List questionI @Transactional public void deleteChecklistById(User user, long id) { - validateChecklistOwnership(user, checklistRepository.getById(id)); + Checklist checklist = checklistRepository.getById(id); + validateChecklistOwnership(user, checklist); + checklistQuestionRepository.deleteAllByChecklistId(checklist.getId()); + checklistOptionRepository.deleteAllByChecklistId(checklist.getId()); + checklistMaintenanceRepository.deleteAllByChecklistId(checklist.getId()); checklistRepository.deleteById(id); + roomRepository.deleteById(checklist.getRoom().getId()); } @Transactional diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 0f5ccf9f5..9932a20d5 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -17,6 +17,7 @@ public enum ExceptionCode { QUESTION_INVALID(HttpStatus.BAD_REQUEST, "잘못된 질문 ID입니다."), QUESTION_DUPLICATED(HttpStatus.BAD_REQUEST, "중복된 질문이 존재합니다."), QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), + // User USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), @@ -32,9 +33,6 @@ public enum ExceptionCode { // CustomChecklist CUSTOM_CHECKLIST_QUESTION_EMPTY(HttpStatus.BAD_REQUEST, "커스텀 질문 개수가 유효하지 않습니다."), - // Type - TYPE_INVALID(HttpStatus.BAD_REQUEST, "타입이 유효하지 않습니다."), - // FloorLevel FLOOR_LEVEL_INVALID(HttpStatus.BAD_REQUEST, "층 종류가 유효하지 않습니다."), @@ -50,6 +48,10 @@ public enum ExceptionCode { // OccupancyPeriod OCCUPANCY_PERIOD_INVALID(HttpStatus.BAD_REQUEST, "입주 가능 기간은 초, 중, 말 혹은 null 값만 가능합니다."), + // MaintenanceItem + MAINTENANCE_ITEM_DUPLICATE(HttpStatus.BAD_REQUEST, "중복된 관리비 항목이 존재합니다."), + MAINTENANCE_ITEM_INVALID(HttpStatus.BAD_REQUEST, "유효하지 않은 관리비 항목이 입력되었습니다."), + //like LIKE_ALREADY_EXISTS(HttpStatus.CONFLICT, "체크리스트가 이미 좋아요 상태입니다"), LIKE_NOT_EXISTS(HttpStatus.BAD_REQUEST, "체크리스트 좋아요가 존재하지 않아 삭제할 수 없습니다."), diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java index 451bae10d..b4222882d 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Room.java @@ -20,55 +20,60 @@ public class Room extends BaseEntity { private String name; - private String station; - - private Integer walkingTime; - private String address; - @Enumerated(EnumType.STRING) - private Type type; + private String buildingName; - private Double size; + private String station; - private Integer floor; + private Integer walkingTime; @Enumerated(EnumType.STRING) private FloorLevel floorLevel; + private Integer floor; + @Enumerated(EnumType.STRING) private Structure structure; + private Double size; + protected Room() { } - public Room(String name, String station, Integer walkingTime, String address, Type type, Double size, - Integer floor, FloorLevel floorLevel, Structure structure) { + public Room(String name, String address, String buildingName, String station, Integer walkingTime, + FloorLevel floorLevel, Integer floor, Structure structure, Double size) { this.name = name; + this.address = address; + this.buildingName = buildingName; this.station = station; this.walkingTime = walkingTime; - this.address = address; - this.type = type; - this.size = size; - this.floor = floor; this.floorLevel = floorLevel; + this.floor = floor; this.structure = structure; + this.size = size; validateFloorAndLevel(); } public void change(Room room) { this.name = room.name; + this.address = room.address; + this.buildingName = room.buildingName; this.station = room.station; this.walkingTime = room.walkingTime; - this.address = room.address; - this.type = room.type; - this.size = room.size; - this.floor = room.floor; this.floorLevel = room.floorLevel; + this.floor = room.floor; this.structure = room.structure; + this.size = room.size; validateFloorAndLevel(); } + private void validateFloorAndLevel() { + if (floorLevel != FloorLevel.GROUND && floor != null) { + throw new BangggoodException(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID); + } + } + public Long getId() { return id; } @@ -77,42 +82,36 @@ public String getName() { return name; } - public String getStation() { - return station; - } - - public Integer getWalkingTime() { - return walkingTime; - } - public String getAddress() { return address; } - public Type getType() { - return type; + public String getBuildingName() { + return buildingName; } - public Double getSize() { - return size; + public String getStation() { + return station; } - public Integer getFloor() { - return floor; + public Integer getWalkingTime() { + return walkingTime; } public FloorLevel getFloorLevel() { return floorLevel; } + public Integer getFloor() { + return floor; + } + public Structure getStructure() { return structure; } - private void validateFloorAndLevel() { - if (floorLevel != FloorLevel.GROUND && floor != null) { - throw new BangggoodException(ExceptionCode.ROOM_FLOOR_AND_LEVEL_INVALID); - } + public Double getSize() { + return size; } @Override @@ -137,14 +136,14 @@ public String toString() { return "Room{" + "id=" + id + ", name='" + name + '\'' + + ", address='" + address + '\'' + + ", buildingName='" + buildingName + '\'' + ", station='" + station + '\'' + ", walkingTime=" + walkingTime + - ", address='" + address + '\'' + - ", type=" + type + - ", size=" + size + - ", floor=" + floor + ", floorLevel=" + floorLevel + + ", floor=" + floor + ", structure=" + structure + + ", size=" + size + '}'; } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java deleted file mode 100644 index 50b2bd15b..000000000 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/domain/Type.java +++ /dev/null @@ -1,34 +0,0 @@ -package com.bang_ggood.room.domain; - -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import java.util.Arrays; - -public enum Type { - - VILLA("빌라"), - OFFICETEL("오피스텔"), - APARTMENT("아파트"), - OTHER("기타"), - NONE(null); - - private final String name; - - Type(String name) { - this.name = name; - } - - public static Type from(String name) { - if (name == null) { - return NONE; - } - return Arrays.stream(Type.values()) - .filter(value -> value.name != null && value.name.equals(name)) - .findFirst() - .orElseThrow(() -> new BangggoodException(ExceptionCode.TYPE_INVALID)); - } - - public String getName() { - return name; - } -} diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java index 957c2afdd..7672a05e4 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/request/RoomRequest.java @@ -3,17 +3,20 @@ import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import jakarta.validation.constraints.NotBlank; +import java.util.List; public record RoomRequest(@NotBlank(message = "방 이름이 존재하지 않습니다.") String roomName, - Integer deposit, Integer rent, Integer contractTerm, String address, - String station, Integer walkingTime, String realEstate, - String type, String structure, Double size, Integer floor, String floorLevel, - Integer occupancyMonth, String occupancyPeriod, String memo, String summary) { + String address, String buildingName, String station, + Integer walkingTime, Integer deposit, Integer rent, Integer maintenanceFee, + List includedMaintenances, String floorLevel, Integer floor, + String structure, Double size, Integer contractTerm, Integer occupancyMonth, + String occupancyPeriod, + String realEstate, String memo, String summary +) { public Room toRoomEntity() { - return new Room(roomName, station, walkingTime, address, - Type.from(type), size, floor, FloorLevel.from(floorLevel), Structure.from(structure)); + return new Room(roomName, address, buildingName, station, walkingTime, + FloorLevel.from(floorLevel), floor, Structure.from(structure), size); } } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 13c740ae2..59a86ee06 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -6,13 +6,15 @@ public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, String address, String station, Integer walkingTime, String realEstate, String type, Double size, String floorLevel, String structure, - Integer occupancyMonth, String occupancyPeriod, String memo, String summary, LocalDateTime createdAt) { + Integer occupancyMonth, String occupancyPeriod, String memo, String summary, + LocalDateTime createdAt) { public static SelectedRoomResponse of(Checklist checklist) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), - checklist.getRoomType().getName(), checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), + //TODO 수정 필요 + null, checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), checklist.getRoomStructure().getName(), checklist.getOccupancyMonth(), checklist.getOccupancyPeriod(), checklist.getMemo(), checklist.getSummary(), checklist.getCreatedAt()); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java index 4818c8a1c..3a9d9b2bf 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/repository/RoomRepository.java @@ -2,6 +2,17 @@ import com.bang_ggood.room.domain.Room; import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.query.Param; +import org.springframework.transaction.annotation.Transactional; public interface RoomRepository extends JpaRepository { + + @Transactional + @Modifying + @Query("UPDATE Room r " + + "SET r.deleted = true " + + "WHERE r.id = :id") + void deleteById(@Param("id") Long id); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java index f0d64cafb..55390796a 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/station/service/SubwayStationService.java @@ -2,9 +2,9 @@ import com.bang_ggood.exception.BangggoodException; import com.bang_ggood.exception.ExceptionCode; +import com.bang_ggood.station.SubwayReader; import com.bang_ggood.station.domain.SubwayStation; import com.bang_ggood.station.dto.SubwayStationResponse; -import com.bang_ggood.station.SubwayReader; import org.springframework.stereotype.Service; import java.util.Comparator; import java.util.List; @@ -20,7 +20,8 @@ public SubwayStationResponse readNearestStation(double latitude, double longitud return SUBWAY_STATIONS.stream() .map(station -> { double dx = (station.getLatitude() - latitude) * METER_PER_DEGREE; - double dy = (station.getLongitude() - longitude) * METER_PER_DEGREE * Math.cos(station.getLatitude()); + double dy = + (station.getLongitude() - longitude) * METER_PER_DEGREE * Math.cos(station.getLatitude()); double distance = Math.sqrt(dx * dx + dy * dy); return SubwayStationResponse.of(station, (int) Math.round(distance / AVERAGE_WALKING_SPEED)); }) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 5c580c73d..905720a9e 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -2,8 +2,7 @@ INSERT INTO users(name, email, created_at, modified_at, deleted) VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) -VALUES - (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), +VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), (1, 'ROOM_CONDITION_2', '2024-07-22 07:56:43', '2024-07-22 07:56:43', false), (1, 'ROOM_CONDITION_3', '2024-07-22 07:56:44', '2024-07-22 07:56:44', false), (1, 'ROOM_CONDITION_4', '2024-07-22 07:56:45', '2024-07-22 07:56:45', false), diff --git a/backend/bang-ggood/src/main/resources/schema.sql b/backend/bang-ggood/src/main/resources/schema.sql index 0223b31b1..42f847e96 100644 --- a/backend/bang-ggood/src/main/resources/schema.sql +++ b/backend/bang-ggood/src/main/resources/schema.sql @@ -3,6 +3,7 @@ DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; DROP TABLE IF EXISTS article CASCADE; DROP TABLE IF EXISTS checklist_like CASCADE; +DROP TABLE IF EXISTS checklist_maintenance CASCADE; DROP TABLE IF EXISTS checklist CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS custom_checklist_question CASCADE; @@ -11,19 +12,19 @@ DROP TABLE IF EXISTS users CASCADE; -- Create tables CREATE TABLE room ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(255), - station VARCHAR(255), - walking_time INTEGER, - address VARCHAR(255), - type VARCHAR(255), - size DOUBLE, - floor INTEGER, - floor_level VARCHAR(255), - structure VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255), + address VARCHAR(255), + building_name VARCHAR(255), + station VARCHAR(255), + walking_time INTEGER, + floor_level VARCHAR(255), + floor INTEGER, + structure VARCHAR(255), + size DOUBLE, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE users @@ -43,12 +44,13 @@ CREATE TABLE checklist user_id BIGINT NOT NULL, deposit INTEGER, rent INTEGER, + maintenance_fee INTEGER, contract_term INTEGER, + occupancy_month VARCHAR(255), + occupancy_period VARCHAR(255), real_estate VARCHAR(255), memo VARCHAR(1000), summary VARCHAR(255), - occupancy_month VARCHAR(255), - occupancy_period VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, @@ -100,6 +102,17 @@ CREATE TABLE checklist_like FOREIGN KEY (checklist_id) REFERENCES checklist (id) ); +CREATE TABLE checklist_maintenance +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + checklist_id BIGINT, + maintenance_item VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + CREATE TABLE article ( id BIGINT AUTO_INCREMENT PRIMARY KEY, @@ -110,4 +123,4 @@ CREATE TABLE article created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN -); \ No newline at end of file +); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java index d48add625..e5cdd2427 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/repository/ArticleRepositoryTest.java @@ -17,7 +17,8 @@ public class ArticleRepositoryTest extends IntegrationTestSupport { - @Autowired ArticleRepository articleRepository; + @Autowired + ArticleRepository articleRepository; @DisplayName("아티클 조회 성공") @Test diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java index 11eeb886a..bec99b6c3 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/article/service/ArticleServiceTest.java @@ -1,7 +1,6 @@ package com.bang_ggood.article.service; import com.bang_ggood.IntegrationTestSupport; -import com.bang_ggood.article.domain.Article; import com.bang_ggood.article.dto.request.ArticleCreateRequest; import com.bang_ggood.article.dto.response.ArticlePreviewResponse; import com.bang_ggood.article.repository.ArticleRepository; diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java index fc7d269f6..332a4673d 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/ChecklistFixture.java @@ -2,8 +2,10 @@ import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.checklist.domain.MaintenanceItem; import com.bang_ggood.checklist.domain.OccupancyMonth; import com.bang_ggood.checklist.domain.OccupancyPeriod; import com.bang_ggood.checklist.domain.Question; @@ -18,36 +20,41 @@ public class ChecklistFixture { public static final Checklist CHECKLIST1_USER1 = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST2_USER1 = new Checklist( RoomFixture.ROOM_2, UserFixture.USER1, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST3_USER1 = new Checklist( RoomFixture.ROOM_3, UserFixture.USER1, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST3_USER2 = new Checklist( RoomFixture.ROOM_3, UserFixture.USER2, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final Checklist CHECKLIST1_WITH_USER1_ID = new Checklist( RoomFixture.ROOM_1, UserFixture.USER1_WITH_ID, - 1000, 50, 12, "방끗공인중개사", "메모", "한줄평", - OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY + 1000, 50, 5, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, + "방끗공인중개사", "메모", "한줄평" ); public static final QuestionRequest QUESTION_1_CREATE_REQUEST = new QuestionRequest( @@ -191,4 +198,12 @@ public class ChecklistFixture { public static final ChecklistLike CHECKLIST1_LIKE = new ChecklistLike(CHECKLIST1_USER1); public static final ChecklistLike CHECKLIST2_LIKE = new ChecklistLike(CHECKLIST2_USER1); + + public static final ChecklistMaintenance CHECKLIST1_INCLUDED_MAINTENANCE_1 = new ChecklistMaintenance( + ChecklistFixture.CHECKLIST1_USER1, MaintenanceItem.ELECTRICITY + ); + + public static final ChecklistMaintenance CHECKLIST1_INCLUDED_MAINTENANCE_2 = new ChecklistMaintenance( + ChecklistFixture.CHECKLIST1_USER1, MaintenanceItem.GAS + ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java index de2932c04..4e5d5a23a 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/controller/ChecklistE2ETest.java @@ -136,13 +136,14 @@ void readChecklistById() { .when().get("/checklists/" + checklistId) .then().log().all() .statusCode(200); -// .extract() -// .as(SelectedChecklistResponse.class); -// -// Assertions.assertAll( -// () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo("방이름"), -// () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo("부산광역시 루터회관") -// ); + /*.extract() + .as(SelectedChecklistResponse.class); + + Assertions.assertAll( + () -> assertThat(selectedChecklistResponse.room().roomName()).isEqualTo(ChecklistFixture.CHECKLIST_CREATE_REQUEST.room().roomName()), + () -> assertThat(selectedChecklistResponse.room().address()).isEqualTo(ChecklistFixture.CHECKLIST_CREATE_REQUEST.room().address()) + );*/ + //TODO 수정 } @DisplayName("좋아요된 체크리스트 리스트 조회 성공") diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java index bd956b87d..f7a0ee8a2 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/ChecklistTest.java @@ -21,8 +21,8 @@ void constructor_ChecklistInvalidMemoLength_exception() { // when & then assertThatThrownBy( - () -> new Checklist(RoomFixture.ROOM_1, UserFixture.USER1, 1000, 20, 12, - "공인중개사", memo, "요약", OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY) + () -> new Checklist(RoomFixture.ROOM_1, UserFixture.USER1, 1000, 20, 10, 12, + OccupancyMonth.OCTOBER, OccupancyPeriod.EARLY, "공인중개사", memo, "요약") ) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.CHECKLIST_MEMO_INVALID_LENGTH.getMessage()); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java new file mode 100644 index 000000000..5c013d5cf --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/domain/MaintenanceItemTest.java @@ -0,0 +1,45 @@ +package com.bang_ggood.checklist.domain; + +import com.bang_ggood.exception.BangggoodException; +import com.bang_ggood.exception.ExceptionCode; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.assertj.core.api.Assertions.assertThatThrownBy; + +class MaintenanceItemTest { + + @DisplayName("관리 항목 포함 성공: 포함하는 경우") + @Test + void contains_true() { + assertThat(MaintenanceItem.contains(MaintenanceItem.GAS.getId())).isTrue(); + } + + @DisplayName("관리 항목 포함 성공 : 포함하지 않는 경우") + @Test + void contains_false() { + assertThat(Option.contains(Integer.MAX_VALUE)).isFalse(); + } + + @DisplayName("아이디를 통해 생성 성공") + @Test + void fromId() { + // given & when + MaintenanceItem maintenanceItem = MaintenanceItem.ELECTRICITY; + + //then + assertThat(MaintenanceItem.fromId(maintenanceItem.getId())).isEqualTo(maintenanceItem); + } + + @DisplayName("아이디를 통해 생성 실패 : 유효하지 않은 아이디일 경우") + @Test + void fromId_invalid_exception() { + // given & when & then + assertThatThrownBy( + () -> MaintenanceItem.fromId(Integer.MAX_VALUE) + ) + .isInstanceOf(BangggoodException.class) + .hasMessage(ExceptionCode.MAINTENANCE_ITEM_INVALID.getMessage()); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java new file mode 100644 index 000000000..4dc258282 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java @@ -0,0 +1,63 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class ChecklistMaintenanceRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoomRepository roomRepository; + + @Autowired + private ChecklistMaintenanceRepository checklistMaintenanceRepository; + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); + } + + + @DisplayName("관리 항목 체크리스트 ID로 논리적 삭제 성공") + @Test + void deleteById() { + //given + ChecklistMaintenance saved1 = checklistMaintenanceRepository.save( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_1); + ChecklistMaintenance saved2 = checklistMaintenanceRepository.save( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_2); + + //when + checklistMaintenanceRepository.deleteAllByChecklistId( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_1.getChecklist().getId()); + + //then + assertAll( + () -> assertThat(checklistMaintenanceRepository.existsById(saved1.getId())).isTrue(), + () -> assertThat(checklistMaintenanceRepository.existsById(saved2.getId())).isTrue(), + () -> assertThat( + checklistMaintenanceRepository.findById(saved1.getId()).get().isDeleted()).isTrue(), + () -> assertThat( + checklistMaintenanceRepository.findById(saved2.getId()).get().isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java new file mode 100644 index 000000000..8233865e3 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistQuestionRepositoryTest.java @@ -0,0 +1,77 @@ +package com.bang_ggood.checklist.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.checklist.ChecklistFixture; +import com.bang_ggood.checklist.domain.ChecklistQuestion; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.repository.RoomRepository; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class ChecklistQuestionRepositoryTest extends IntegrationTestSupport { + + @Autowired + private ChecklistRepository checklistRepository; + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoomRepository roomRepository; + + @Autowired + private ChecklistQuestionRepository checklistQuestionRepository; + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + roomRepository.save(RoomFixture.ROOM_1); + checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); + } + + @DisplayName("질문 답변을 체크리스트 ID로 조회 성공") + @Test + void findByChecklistId() { + //given + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_1); + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_2); + + // when + List checklistQuestions = checklistQuestionRepository.findByChecklistId( + ChecklistFixture.CHECKLIST_QUESTION_1.getId()); + + //then + assertAll( + () -> assertThat(checklistQuestions.get(0).isDeleted()).isFalse() + ); + } + + @DisplayName("질문 답변을 체크리스트 ID로 논리적 삭제 성공") + @Test + void deleteAllByChecklistId() { + //given + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_1); + checklistQuestionRepository.save(ChecklistFixture.CHECKLIST_QUESTION_2); + + //when + checklistQuestionRepository.deleteAllByChecklistId( + ChecklistFixture.CHECKLIST_QUESTION_1.getChecklist().getId()); + + //then + assertAll( + () -> assertThat( + checklistQuestionRepository.existsById(ChecklistFixture.CHECKLIST_QUESTION_1.getId())).isTrue(), + () -> assertThat( + checklistQuestionRepository.findById(ChecklistFixture.CHECKLIST_QUESTION_1.getId()).get() + .isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java index 83f671eae..887409ad9 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/RoomFixture.java @@ -5,44 +5,51 @@ import com.bang_ggood.room.domain.FloorLevel; import com.bang_ggood.room.domain.Room; import com.bang_ggood.room.domain.Structure; -import com.bang_ggood.room.domain.Type; import com.bang_ggood.room.dto.request.RoomRequest; +import java.util.List; public class RoomFixture { public static final Room ROOM_1 = new Room( - "살기 좋은 방", "부개역", 10, "인천광역시 부평구", - Type.APARTMENT, 3.5, 3, FloorLevel.GROUND, Structure.TWO_ROOM + "살기 좋은 방", "인천광역시 부평구", null, + "부개", 10, FloorLevel.GROUND, 3, + Structure.TWO_ROOM, 3.5 ); public static final Room ROOM_2 = new Room( - "살기 싫은 방", "대구역", 10, "대구광역시 중구", - Type.OFFICETEL, 4.0, null, FloorLevel.BASEMENT, Structure.DIVIDED_ONE_ROOM + "살기 싫은 방", "대구광역시 중구", "롯데타워", + "대구", 10, FloorLevel.BASEMENT, null, + Structure.DIVIDED_ONE_ROOM, 4.0 ); public static final Room ROOM_3 = new Room( - "살기 애매한 방", "잠실역", 5, "서울특별시 송파구", - Type.VILLA, 5.5, null, FloorLevel.ROOFTOP, Structure.DUPLEX + "살기 애매한 방", "서울특별시 송파구", "루터회관", + "잠실", 5, FloorLevel.ROOFTOP, null, + Structure.DUPLEX, 5.5 ); public static final RoomRequest ROOM_CREATE_REQUEST = new RoomRequest( - "방이름", 1000, 50, 12, "부산광역시 루터회관", - "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.TWO_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), - OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" + "방이름", "부산광역시 북구", "루터회관", "잠실", + 10, 1000, 50, 5, + List.of(1, 3), FloorLevel.GROUND.getName(), 10, + Structure.TWO_ROOM.getName(), 3.3, 12, OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + "방끗공인중개사", "메모", "한줄평" ); public static final RoomRequest ROOM_UPDATE_REQUEST = new RoomRequest( - "방이름", 1000, 50, 12, "부산광역시 루터회관", - "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.OPEN_ONE_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), - OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" + "방이름", "부산광역시 루터회관", "잠실역", "루터회관", + 10, 1000, 50, 5, + List.of(1, 3), FloorLevel.GROUND.getName(), 10, + Structure.OPEN_ONE_ROOM.getName(), 3.3, 12, OccupancyMonth.APRIL.getMonth(), + OccupancyPeriod.EARLY.getPeriod(), + "방끗공인중개사", "메모", "한줄평" ); public static final RoomRequest ROOM_CREATE_REQUEST_NO_ROOM_NAME = new RoomRequest( - null, 1000, 50, 12, "부산광역시 루터회관", - "잠실역", 10, "방끗공인중개사", Type.VILLA.getName(), - Structure.TWO_ROOM.getName(), 3.3, 3, FloorLevel.GROUND.getName(), - OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), "메모", "한줄평" + null, "부산광역시 루터회관", "루터회관", "잠실역", + 10, 1000, 50, 5, + List.of(1, 3), FloorLevel.GROUND.getName(), 10, + Structure.TWO_ROOM.getName(), 3.3, 12, OccupancyMonth.APRIL.getMonth(), OccupancyPeriod.EARLY.getPeriod(), + "방끗공인중개사", "메모", "한줄평" ); } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java index d8287fd90..61aa14417 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/RoomTest.java @@ -15,8 +15,8 @@ void createChecklist_roomFloorAndLevelInvalid_exception() { //given & when & then assertThatThrownBy(() -> { new Room( - "방이름", "잠실역", 12, "부산광역시 루터회관", Type.APARTMENT, 12.0, - 10, FloorLevel.BASEMENT, Structure.TWO_ROOM + "방이름", "부산광역시 북구", "루터회관", "잠실", 12, + FloorLevel.BASEMENT, 10, Structure.TWO_ROOM, 7.5 ); }) .isInstanceOf(BangggoodException.class) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java deleted file mode 100644 index a4f05624b..000000000 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/room/domain/TypeTest.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.bang_ggood.room.domain; - -import com.bang_ggood.exception.BangggoodException; -import com.bang_ggood.exception.ExceptionCode; -import org.junit.jupiter.api.DisplayName; -import org.junit.jupiter.api.Test; - -import static org.assertj.core.api.Assertions.assertThat; -import static org.assertj.core.api.Assertions.assertThatThrownBy; - -class TypeTest { - - @DisplayName("name으로 Type 생성 성공") - @Test - void from() { - // given - String name = "빌라"; - - // when & then - assertThat(Type.from(name)).isEqualTo(Type.VILLA); - } - - @DisplayName("name으로 Type 생성 성공 : null일 경우") - @Test - void from_null() { - // given - String name = null; - - // when & then - assertThat(Type.from(name)).isEqualTo(Type.NONE); - } - - @DisplayName("name으로 Type 생성 실패 : 해당하지 않는 이름일 경우") - @Test - void from_invalidType_exception() { - // given - String name = "시소"; - - // when & then - assertThatThrownBy(() -> Type.from(name)) - .isInstanceOf(BangggoodException.class) - .hasMessage(ExceptionCode.TYPE_INVALID.getMessage()); - } -} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java new file mode 100644 index 000000000..e369664b0 --- /dev/null +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/room/repository/RoomRepositoryTest.java @@ -0,0 +1,46 @@ +package com.bang_ggood.room.repository; + +import com.bang_ggood.IntegrationTestSupport; +import com.bang_ggood.room.RoomFixture; +import com.bang_ggood.room.domain.Room; +import com.bang_ggood.user.UserFixture; +import com.bang_ggood.user.repository.UserRepository; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.DisplayName; +import org.junit.jupiter.api.Test; +import org.springframework.beans.factory.annotation.Autowired; + +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertAll; + +class RoomRepositoryTest extends IntegrationTestSupport { + + @Autowired + private UserRepository userRepository; + + @Autowired + private RoomRepository roomRepository; + + + @BeforeEach + void setUp() { + userRepository.save(UserFixture.USER1); + } + + + @DisplayName("방 논리적 삭제 성공") + @Test + void deleteById() { + //given + Room saved = roomRepository.save(RoomFixture.ROOM_1); + + //when + roomRepository.deleteById(saved.getId()); + + //then + assertAll( + () -> assertThat(roomRepository.existsById(saved.getId())).isTrue(), + () -> assertThat(roomRepository.findById(saved.getId()).get().isDeleted()).isTrue() + ); + } +} diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java index 741270ee0..dd066cc84 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/station/SubwayStationServiceTest.java @@ -16,6 +16,16 @@ public class SubwayStationServiceTest extends IntegrationTestSupport { @Autowired SubwayStationService subwayStationService; + // check data in "https://apis.map.kakao.com/web/sample/addMapClickEventWithMarker/" + private static Stream provideStationData() { + return Stream.of( + Arguments.of(37.50495731889611, 126.7550884277559, "상동"), + Arguments.of(37.48352733443973, 126.80085909322227, "소사"), + Arguments.of(37.47909015564278, 126.9517354974442, "서울대입구(관악구청)"), + Arguments.of(37.516248619935034, 127.10303565244502, "잠실(송파구청)") + ); + } + @DisplayName("가까운 지하철 조회 성공") @ParameterizedTest @MethodSource("provideStationData") @@ -26,14 +36,4 @@ void readNearestStation(double latitude, double longitude, String nearestStation // then assertThat(stationName).isEqualTo(nearestStationName); } - - // check data in "https://apis.map.kakao.com/web/sample/addMapClickEventWithMarker/" - private static Stream provideStationData() { - return Stream.of( - Arguments.of(37.50495731889611, 126.7550884277559, "상동"), - Arguments.of(37.48352733443973, 126.80085909322227, "소사"), - Arguments.of(37.47909015564278, 126.9517354974442, "서울대입구(관악구청)"), - Arguments.of(37.516248619935034, 127.10303565244502, "잠실(송파구청)") - ); - } } diff --git a/backend/bang-ggood/src/test/resources/data-test.sql b/backend/bang-ggood/src/test/resources/data-test.sql index 6a45a1e42..42a9069b9 100644 --- a/backend/bang-ggood/src/test/resources/data-test.sql +++ b/backend/bang-ggood/src/test/resources/data-test.sql @@ -2,8 +2,7 @@ INSERT INTO users(name, email, created_at, modified_at, deleted) VALUES ('방방이', 'bang-ggood@gmail.com', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false); INSERT INTO custom_checklist_question(user_id, question, created_at, modified_at, deleted) -VALUES - (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), +VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false), (1, 'ROOM_CONDITION_2', '2024-07-22 07:56:43', '2024-07-22 07:56:43', false), (1, 'ROOM_CONDITION_3', '2024-07-22 07:56:44', '2024-07-22 07:56:44', false), (1, 'ROOM_CONDITION_4', '2024-07-22 07:56:45', '2024-07-22 07:56:45', false), diff --git a/backend/bang-ggood/src/test/resources/schema-test.sql b/backend/bang-ggood/src/test/resources/schema-test.sql index 4257bd355..352ec4c88 100644 --- a/backend/bang-ggood/src/test/resources/schema-test.sql +++ b/backend/bang-ggood/src/test/resources/schema-test.sql @@ -2,6 +2,7 @@ DROP TABLE IF EXISTS checklist CASCADE; DROP TABLE IF EXISTS checklist_option CASCADE; DROP TABLE IF EXISTS checklist_question CASCADE; +DROP TABLE IF EXISTS checklist_maintenance CASCADE; DROP TABLE IF EXISTS room CASCADE; DROP TABLE IF EXISTS users CASCADE; DROP TABLE IF EXISTS test_entity CASCADE; @@ -12,19 +13,19 @@ DROP TABLE IF EXISTS article CASCADE; -- Create tables CREATE TABLE room ( - id BIGINT AUTO_INCREMENT PRIMARY KEY, - name VARCHAR(255), - station VARCHAR(255), - walking_time INTEGER, - address VARCHAR(255), - type VARCHAR(255), - size DOUBLE, - floor INTEGER, - floor_level VARCHAR(255), - structure VARCHAR(255), - created_at TIMESTAMP(6), - modified_at TIMESTAMP(6), - deleted BOOLEAN + id BIGINT AUTO_INCREMENT PRIMARY KEY, + name VARCHAR(255), + address VARCHAR(255), + building_name VARCHAR(255), + station VARCHAR(255), + walking_time INTEGER, + floor_level VARCHAR(255), + floor INTEGER, + structure VARCHAR(255), + size DOUBLE, + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN ); CREATE TABLE users @@ -44,12 +45,13 @@ CREATE TABLE checklist user_id BIGINT NOT NULL, deposit INTEGER, rent INTEGER, + maintenance_fee INTEGER, contract_term INTEGER, + occupancy_month VARCHAR(255), + occupancy_period VARCHAR(255), real_estate VARCHAR(255), memo VARCHAR(1000), summary VARCHAR(255), - occupancy_month VARCHAR(255), - occupancy_period VARCHAR(255), created_at TIMESTAMP(6), modified_at TIMESTAMP(6), deleted BOOLEAN, @@ -57,6 +59,17 @@ CREATE TABLE checklist FOREIGN KEY (user_id) REFERENCES users (id) ); +CREATE TABLE checklist_maintenance +( + id BIGINT AUTO_INCREMENT PRIMARY KEY, + checklist_id BIGINT, + maintenance_item VARCHAR(255), + created_at TIMESTAMP(6), + modified_at TIMESTAMP(6), + deleted BOOLEAN, + FOREIGN KEY (checklist_id) REFERENCES checklist (id) +); + CREATE TABLE checklist_question ( id BIGINT AUTO_INCREMENT PRIMARY KEY, From 75a450212ca9b24af5407a7b24746dac76c0a44c Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:15:17 +0900 Subject: [PATCH 222/348] =?UTF-8?q?=EC=BB=A4=EC=8A=A4=ED=85=80=20=EC=A7=88?= =?UTF-8?q?=EB=AC=B8=20=EC=A1=B0=ED=9A=8C=20response=EB=A5=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#486)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/dto/response/CustomChecklistQuestionResponse.java | 2 +- .../com/bang_ggood/checklist/service/ChecklistServiceTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java index 3daaa3b0e..89261a9c7 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/CustomChecklistQuestionResponse.java @@ -11,7 +11,7 @@ public CustomChecklistQuestionResponse(Question question, boolean isSelected) { this.isSelected = isSelected; } - public boolean isSelected() { + public boolean getIsSelected() { return isSelected; } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java index b197b26c7..7efc751bf 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/service/ChecklistServiceTest.java @@ -389,7 +389,7 @@ void readCustomChecklistQuestions() { // then long selectedCount = response.categories().stream() .flatMap(category -> category.questions().stream()) - .filter(CustomChecklistQuestionResponse::isSelected) + .filter(CustomChecklistQuestionResponse::getIsSelected) .count(); Assertions.assertThat(selectedCount).isEqualTo(questions.size()); From 84901f72064b88e1f612f7f95306a4b86b9ea4b0 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:20:03 +0900 Subject: [PATCH 223/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#482)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/domain/Checklist.java | 5 ++- .../domain/ChecklistMaintenance.java | 8 +++-- .../checklist/domain/MaintenanceItem.java | 4 +-- .../ChecklistMaintenanceRepository.java | 6 ++++ .../checklist/service/ChecklistService.java | 16 ++++++--- .../dto/response/SelectedRoomResponse.java | 15 ++++---- .../ChecklistMaintenanceRepositoryTest.java | 35 +++++++++++++++++++ 7 files changed, 72 insertions(+), 17 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java index 6d36ecc4e..602cf711f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/Checklist.java @@ -58,7 +58,6 @@ public class Checklist extends BaseEntity { @OneToMany(mappedBy = "checklist") private List questions; - public Checklist(Room room, User user, Integer deposit, Integer rent, Integer maintenanceFee, Integer contractTerm, OccupancyMonth occupancyMonth, OccupancyPeriod occupancyPeriod, String realEstate, String memo, String summary) { @@ -158,6 +157,10 @@ public String getRoomAddress() { return room.getAddress(); } + public String getRoomBuildingName() { + return room.getBuildingName(); + } + public Integer getRoomFloor() { return room.getFloor(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java index ffd441425..f174c4e4c 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/ChecklistMaintenance.java @@ -40,8 +40,12 @@ public Checklist getChecklist() { return checklist; } - public MaintenanceItem getMaintenanceItem() { - return maintenanceItem; + public Integer getMaintenanceItemId() { + return maintenanceItem.getId(); + } + + public String getMaintenanceItemName() { + return maintenanceItem.getName(); } @Override diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java index d34ed8091..ae95d1491 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/domain/MaintenanceItem.java @@ -6,8 +6,8 @@ public enum MaintenanceItem { WATERWORKS(1, "수도"), - ELECTRICITY(2, "전기"), - INTERNET(3, "인터넷"), + INTERNET(2, "인터넷"), + ELECTRICITY(3, "전기"), GAS(4, "가스"); private final int id; diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java index d95db4b88..105ae0014 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepository.java @@ -1,14 +1,20 @@ package com.bang_ggood.checklist.repository; +import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistMaintenance; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Modifying; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; +import java.util.List; public interface ChecklistMaintenanceRepository extends JpaRepository { + @Query("SELECT cm FROM ChecklistMaintenance cm " + + "WHERE cm.checklist =:checklist and cm.deleted = false ") + List findAllByChecklist(@Param("checklist") Checklist checklist); + @Modifying(flushAutomatically = true, clearAutomatically = true) @Transactional @Query("UPDATE ChecklistMaintenance cm " diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 2ad2eadc9..7a8b93be6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -5,8 +5,8 @@ import com.bang_ggood.category.dto.response.SelectedCategoryQuestionsResponse; import com.bang_ggood.checklist.domain.Answer; import com.bang_ggood.checklist.domain.Checklist; -import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; +import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; @@ -26,8 +26,8 @@ import com.bang_ggood.checklist.dto.response.SelectedQuestionResponse; import com.bang_ggood.checklist.dto.response.UserChecklistPreviewResponse; import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; -import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; +import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -261,14 +261,20 @@ public SelectedChecklistResponse readChecklistById(User user, long id) { Checklist checklist = checklistRepository.getById(id); validateChecklistOwnership(user, checklist); - SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist); + List maintenanceIds = readChecklistMaintenancesByChecklist(checklist); + SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist, maintenanceIds); List options = readOptionsByChecklistId(id); - List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId( - id); + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); return new SelectedChecklistResponse(selectedRoomResponse, options, selectedCategoryQuestionsResponse); } + private List readChecklistMaintenancesByChecklist(Checklist checklist) { + return checklistMaintenanceRepository.findAllByChecklist(checklist).stream() + .map(ChecklistMaintenance::getMaintenanceItemId) + .toList(); + } + private List readOptionsByChecklistId(long checklistId) { return checklistOptionRepository.findByChecklistId(checklistId) .stream() diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index 59a86ee06..29266559f 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -2,20 +2,21 @@ import com.bang_ggood.checklist.domain.Checklist; import java.time.LocalDateTime; +import java.util.List; public record SelectedRoomResponse(String roomName, Integer deposit, Integer rent, Integer contractTerm, Integer floor, - String address, String station, Integer walkingTime, String realEstate, - String type, Double size, String floorLevel, String structure, + String address, String buildingName, String station, Integer walkingTime, String realEstate, + Double size, String floorLevel, String structure, Integer occupancyMonth, String occupancyPeriod, String memo, String summary, + List includedMaintenances, LocalDateTime createdAt) { - public static SelectedRoomResponse of(Checklist checklist) { + public static SelectedRoomResponse of(Checklist checklist, List includedMaintenances) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), - checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), + checklist.getContractTerm(), checklist.getRoomFloor(), checklist.getRoomAddress(), checklist.getRoomBuildingName(), checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), - //TODO 수정 필요 - null, checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), + checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), checklist.getRoomStructure().getName(), checklist.getOccupancyMonth(), checklist.getOccupancyPeriod(), - checklist.getMemo(), checklist.getSummary(), checklist.getCreatedAt()); + checklist.getMemo(), checklist.getSummary(), includedMaintenances, checklist.getCreatedAt()); } } diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java index 4dc258282..207fdea83 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistMaintenanceRepositoryTest.java @@ -7,10 +7,12 @@ import com.bang_ggood.room.repository.RoomRepository; import com.bang_ggood.user.UserFixture; import com.bang_ggood.user.repository.UserRepository; +import org.assertj.core.api.Assertions; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.DisplayName; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; +import java.util.List; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertAll; @@ -36,6 +38,39 @@ void setUp() { checklistRepository.save(ChecklistFixture.CHECKLIST1_USER1); } + @DisplayName("체크리스트 관리비 포함 항목 조회 성공") + @Test + void findAllByChecklist() { + // given + ChecklistMaintenance saved1 = checklistMaintenanceRepository.save( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_1); + ChecklistMaintenance saved2 = checklistMaintenanceRepository.save( + ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_2); + + // when + List checklistMaintenances = checklistMaintenanceRepository + .findAllByChecklist(ChecklistFixture.CHECKLIST1_USER1); + + // then + Assertions.assertThat(checklistMaintenances).containsExactly(saved1, saved2); + } + + @DisplayName("체크리스트 관리비 포함 항목 조회 성공 : 삭제된 항목은 조회하지 않는다.") + @Test + void findAllByChecklist_() { + // given + checklistMaintenanceRepository.save(ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_1); + checklistMaintenanceRepository.save(ChecklistFixture.CHECKLIST1_INCLUDED_MAINTENANCE_2); + checklistMaintenanceRepository.deleteAllByChecklistId(ChecklistFixture.CHECKLIST1_USER1.getId()); + + // when + List checklistMaintenances = checklistMaintenanceRepository + .findAllByChecklist(ChecklistFixture.CHECKLIST1_USER1); + + // then + Assertions.assertThat(checklistMaintenances).isEmpty(); + } + @DisplayName("관리 항목 체크리스트 ID로 논리적 삭제 성공") @Test From c1e76b5ed357b991933a71dbec80b2af31621500 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:45:55 +0900 Subject: [PATCH 224/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EB=A6=AC=EC=8A=A4=ED=8A=B8=20API=EB=A5=BC?= =?UTF-8?q?=20=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#491)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/response/UserChecklistPreviewResponse.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java index 446255422..0b0fdcdfe 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/UserChecklistPreviewResponse.java @@ -4,7 +4,8 @@ import java.time.LocalDateTime; public record UserChecklistPreviewResponse( - Long checklistId, String roomName, String address, + Long checklistId, String roomName, String address, String buildingName, + String station, Integer walkingTime, Integer deposit, Integer rent, LocalDateTime createdAt, String summary, boolean isLiked) { @@ -13,6 +14,9 @@ public static UserChecklistPreviewResponse of(Checklist checklist, boolean isLik checklist.getId(), checklist.getRoomName(), checklist.getRoomAddress(), + checklist.getRoomBuildingName(), + checklist.getRoomStation(), + checklist.getRoomWalkingTime(), checklist.getDeposit(), checklist.getRent(), checklist.getCreatedAt(), From 1b7a806d57fb79ab59349e78c6b9b33ba0bf4672 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Wed, 21 Aug 2024 15:51:54 +0900 Subject: [PATCH 225/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4?= =?UTF-8?q?=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=9C=EB=8B=A4.=20(#493)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang-ggood/src/main/resources/data.sql | 33 ++++++++++++++++--- 1 file changed, 29 insertions(+), 4 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 905720a9e..3773ca287 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -18,7 +18,32 @@ VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', fal (1, 'SECURITY_2', '2024-07-22 07:56:55', '2024-07-22 07:56:55', false), (1, 'SECURITY_3', '2024-07-22 07:56:56', '2024-07-22 07:56:56', false); -INSERT INTO article(title, content, created_at, keyword, summary, modified_at, deleted) -VALUES ('집을 구하는 꿀팁: 성공적인 집 찾기를 위한 가이드', - '1. **예산 설정하기**
집을 구하기 전, 가장 먼저 해야 할 일은 예산을 설정하는 것입니다. 월세와 관리비, 보증금까지 포함해 자신이 감당할 수 있는 범위를 확실히 정해두세요.', - '2024-07-22 07:56:42', '꿀팁', '요약입니다', '2024-07-22 07:56:42', false); +INSERT INTO article(title, content, keyword, summary, created_at, modified_at, deleted) +VALUES ('자취방 이사만 5번 피셜! 원룸 구할 때 체크리스트 1탄', + '학교 주변 자취방을 구하는 **대학생 분들,** 회사 주변 방을 구하는 **직장인 분들!** 그리고 그외 전국의 예비 자취생 여러분 모두 잘 오셨습니다.

원래 **자취방 구하기는 대학생 종강 시즌이 제철**이신 거, 다들 아시죠? 👀 그래서 오늘은 자취방 이사만 5번 해본 **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트**를 가져왔습니다.

한 번도 생각해 보지 못했지만 **보자마자 납득 100%인 꿀팁들**을 고르고 골라 왔으니, 모두 집중하고 따라오시지요!

👇 저장해두고 체크해 보세요!

![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/advices/168816951483078032.png)



🪟 창문

**✅ 옆 건물에서 잘 보이는 구조인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/160436720332165459.jpg)
많은 분들이 잘 생각하지 못하시는 부분 중 하나죠! **옆 건물과 사생활 보호가 되는지 여부**입니다. 물론 블라인드를 쳐서 가릴 수는 있지만, **매번 블라인드를 쳐둬야 하는 건** 은근 불편한 일이거든요! (=자취방 3호 경험담)

그리고 자취의 특권은 **샤워 후 자연의 상태로 나와서** 옷을 갈아입을 수 있다는 것 아니겠습니까? 🛀 그러니 자취의 장점을 누리기 위해 꼭 한번 체크해 보시는 게 좋겠습니다.

**✅ 환기하기에 적합한 크기인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/159505656294119930.jpg)
자취방의 경우 그 특성상 창문이 하나만 있는 경우가 많은데요. 하지만 창문 전체가 시원~하게 열리는 형태가 아니라, 위 사진처럼 **틈새만 열리는 경우라면 피하시는 게 좋습니다.**

좁은 평수일수록 환기가 매우 중요한데, 요런 창문의 경우에는 **환기 능력**이 떨어질 수밖에 없기 때문이죠! 결정 요인은 아니지만 **의외로 삶의 질과 연결**되는 부분이기 때문에 체크해 보시길 권장합니다.

**✅ 방충망/방범창 이상 없는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/164397041095518794.jpg)
창문 확인의 기본 of 기본! 바로 **방충망과 방범창 여부**입니다.

방충망은 구멍이 뚫려 **보수할 부분이 있는지**까지 체크해 주시는 게 좋고, 방범창은 **저층일수록 꼭** **확인**해 주시는 것이 좋습니다.

**✅ 햇빛 잘 들어오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166038643972068590.jpeg)
물론 집을 보러 가기 전에 남향인지 북향인지 중개인 분께서 설명을 해주실 텐데요. 하지만 남향이어도 앞 건물에 가려져 빛이 잘 안 들어올 수 있으니, 꼭 확인하기로 합시다.

**🍯 여기서 작은 꿀팁!**
Q. 앞 건물에 막힌 남향과 일반 북향/서향이 고민이라면?
A. 그래도 남향을 추천해요! 빛이 들어오지 않는 남향이라도 북향이나 서향보다는 훨씬 쾌적하답니다.

🔐 보안

**✅ 관리자 분 상주하시는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167971937444371683.jpg)자취방 특성상 상시로 관리자 분이 계시는 경우가 많지는 않죠! 하지만 오피스텔의 경우에는 종종 관**리자분이 상주하고 계시는 경우**가 있는데요 👀

자취를 하다 보면 갑자기 불이 나가는 등 **전문가의 도움이 필요한 순간**들이 찾아오기 마련이죠. (그것의 자취의 맛..) 따라서 상주 관리자분이 계신 집이라면 **+15점** 해주시는 것이 좋겠습니다.

**✅ 현관문 잠금장치 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167894935043362031.jpeg)
요것도 쉽게 지나칠 수 있는 포인트! 하지만 잠금장치 여부는 꼭 확인해 주시는 게 좋습니다. 자취를 하다 보면 정말 가끔 **모르는 사람이 초인종을 누르는 경우**도 있거든요 🤔

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 출입구와 복도에 CCTV 있는지
 ✅ 공동 현관 비밀번호 있는지

🏡 주변 환경

**✅ 무인 택배 보관함 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166618977771822482.jpeg)
처음엔 굳이 필요한가 싶지만, **여기저기 활용도 좋은 무인 택배함!** 상세 주소 노출 없이 택배를 보관하기 좋은 것은 물론, 물건을 집에 두고 와야 하는데 **올라가기 귀찮을 때나 중고거래할 때** 등 유용하게 사용할 수 있어요.

만약 무인 택배함이 있는 집이라면 **보너스 점수**를 주기로 합시다 🕵️‍♀️

**✅ 대중교통 이용 편리한지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/168740647444591385.jpeg)
자취방을 구하는 목적은 바로 **학교나 직장 등에 편리하게 가기 위함**이 1번 아니겠습니까? 따라서 대중교통이 이용이 불편한 위치에 집이 있다면 **삶이 질이 수직 하락**할 수밖에 없죠!

지도상 시간도 체크하고, 실제로 자취방에서 대중교통 타는 곳까지 가보며 **경사나 주변 환경**도 체크해 보세요 🏃

**✅ 주변에 소음 시설 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/164194588552065716.jpeg)
아무래도 자취방 중에는 소음에 약한 곳이 많은데요! 따라서 **주변에 소음을 유발하는 시설이 있는지** 꼭 확인하셔야 합니다. 대표적으로는 **큰 도로와 술집** 정도가 있어요.

거기에 더해 꼭 확인하셔야 할 것은 바로 **24시 해장국집**입니다. 대개 **새벽까지 시끌시끌한 경우**가 많으므로 꼭 한번 확인해 보시길 바랍니다. (저도 알고 싶지 않았습니다)

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 편의점, 은행 등 편의시설 있는지
 ✅ 집 가는 길이 언덕인지
 ✅ 골목이라면 가로등 있는지

🛌 기본 옵션

**✅ 옵션 가구 치워줄 수 있는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/165794935274391835.jpeg)
멀쩡한 옵션 가구를 왜 치우느냐! 하실 수 있지만, 자취를 하다 보면 의외로 **옵션 가구가 짐이 되는 경우**들이 많더라고요 🤔

에디터 또한 어느 날부터 옵션 책상이 불필요하고 너무 거슬려서 결국 집주인 분께 양해를 구하고 수거해 주시길 부탁드린 경우가 있답니다. 경우에 따라 집 주인분께서 거절하실 수도 있을 수 있으니 **꼭 사전에 확인**해 보세요!

**✅ 화구 종류 체크하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167471560364252808.jpg) 집에서 요리를 종종 해 드시는 분이라면 꼭 **화구 종류를 확인**해 주세요! 요리를 즐겨 하시는 분일수록 가스레인지가 더 편리해요.

특히 하이라이트로 되어 있는 경우에는 **화력이 매우 약한 곳들**이 꽤나 있으니 ^^; 꼭 사전에 확인하시길 권합니다.

✅ **에어컨/냉장고 작동 점검하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168620136263807016.jpeg)
옵션 가구 중 **가장 고가인 에어컨과 냉장고**는 사전에 점검을 해두면 좋아요! 

만약 집 구하는 날 체크하지 못했다면, 혹시라도 문제가 생길 경우를 대비하여 **이사 후 일주일 내로 확인**해 보시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 옵션 가구 필요 없다면 치워줄 수 있는지 확인하기
  ✅ 옵션 가구 종류 확인하기 (신발장, 블라인드 등)

지면 관계상 1탄은 여기까지~
2탄에서 이어서 만나요💟

출처 : 오늘의집', + '자취방 꿀팁', + '원룸 체크리스트', + '2024-07-22 07:56:42', + '2024-07-22 07:56:42', + false),( + '자취방 이사만 5번 피셜! 원룸 구할 때 체크리스트 2탄', + '안녕하세요~ **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트 2탄**으로 돌아왔습니다!

1탄을 아직 못보신 분들은 먼저 확인하고 돌아와주세요. 다들 집중하시고 가봅시다~

🕵️ 디테일

**✅ 인터폰 영상 지원되는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168217562696278839.jpeg)
이것도 앞서 이야기해 드린 **현관문 잠금장치와 비슷한 맥락**인데요! **배달 음식이나 등기 수령** 같은 경우에도 음성 인터폰만 듣는 것보다는 영상을 통해 방문자를 확인하는 것이 안전하죠.

잘 모르는 상대가 찾아왔을 때, **상대방의 모습을 확인**할 수 있다는 것만으로도 **마음의 안정에 큰 도움**이 되니 확인해 보시는 걸 추천드립니다. (방문 기록을 증거로 남길 수 있는 건 덤!)


**✅ 바퀴벌레 약 설치되어 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/159404181119534587.jpeg)
만약 집을 보러 갔는데 가구 뒤, 신발장 옆, 화장실 변기 뒤쪽 등등 **바퀴벌레 약을 설치한 흔적**이 있다? **웬만하면 런하시기를 추천합니다** 🏃‍♂️

물론 현재 거주자분이 꼼꼼한 성격으로 사전 예방하신 경우일 수도 있지만, 대부분 높은 확률로 한차례 발견했기 때문에 설치하는 경우가 많기 때문이죠...😱 가능한 도망치시기를!


**✅ 벽지에 곰팡이 흔적 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168645987277346900.jpeg)
곰팡이가 잘 생기는 **창문 주변 벽지와 침대 뒤쪽** 등, **시커먼 곰팡이 흔적**이 있는지 확인해 주세요.

곰팡이 흔적이 심하게 남아 있다면 높은 확률로 **습도 관리가 어려운 집**이거나 **집 구조적으로 곰팡이가 생길 수밖에 없는 곳**이랍니다. 따라서 이 경우에도 빠르게 런하시길! 🏃‍♂️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 콘센트 개수는 충분한지
  ✅ 옆집 방음 잘 되는지


✍🏻 기타 사항

**✅ 건물에 집주인분 사시는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/156680003862457833.jpg)
사소하지만 은근 중요한 디테일! 바로 **집주인 분과 같은 건물에서 살게 되는지**를 체크해 주시면 좋습니다.

대학가 인근 빌라의 경우 집주인 분도 같은 건물에 거주하시는 경우가 종종 있는데요. **이게 은근 불편하고 머쓱하다는 사실..!** 물론 개인차는 있겠지만 본인이 에디터의 경우에 해당된다면? 은밀하게 체크해 주세요.


**✅ 분리수거 시스템 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/165413921573933477.jpeg)
**분리 수거 시스템이 체계적으로 운영**되고 있는지, **쓰레기 버리기에는 수월한지**도 확인해 주시면 좋습니다.

자취방 중에 간혹 굉장히 불편하고 비효율적인 분리수거 시스템을 가진 곳들이 있거든요! **배출 일자나 주기적으로 쓰레기 관리해 주시는 분이 계시는지 여부** 등등 면밀하게 체크하시는 게 좋겠습니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 관리비 포함 항목 확인하기
  ✅ 인테리어 가능 여부 체크하기

🚽 화장실

**✅ 배수구 냄새 올라오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/163777210096433394.jpg)
**화장실 숙적!** 바로 **배수구 냄새**죠.특히 더워지는 여름철엔 모두가 고민하는 부분이긴 하지만, **유달리 배수구 냄새가 지독하게 나는 집**이 있다는 사실!

이 부분은 정말 삶의 질과 직결되기 때문에, **화장실에 들어가 문을 닫고** 꼭 한번 확인해 주세요 😉


**✅ 화장실 내부에 창문 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/161331910819056750.jpg)
흔한 조건은 아니지만 **있다면 무조건 플러스 오십 점인 화장실 창문!**

창문이 없다면 환풍기는 잘 되는지, 방문 당시 화장실 습도는 어느 정도인지 확인해 주시는 편이 좋습니다 🌬️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 샤워 여유 공간 충분한지
  ✅ 곰팡이 흔적 있는지


🚿 수도와 배수

**✅ 싱크대/화장실 배수구 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167694880830634529.jpeg)
곳곳의 수전에서 물이 잘 나오는지를 확인하는 것과 더불어, 꼭 챙겨야 할 것은 **배수구로 물이 내려가는 속도**입니다. **특히 세면대의 경우**가 각종 이물질이 축적되어 물이 매우 늦게 내려가는 경우가 있어요! (= 2호 자취방)

빠르게 설거지나 빨래를 해야 하는데 물이 잘 안 내려가면 정말 성격 안 좋아지기 때문에 🤯 화장실과 싱크대 모두 꼼꼼히 체크하시길 권합니다.


**✅ 변기 물 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/166970947851460229.jpg)
여기서 포인트는 **시원하고 우렁차게!** 입니다. 종종 변기 내려가는 힘이 매우 약한 곳들이 있는데요.

이 경우 삶의 질이 급격히 저하되므로, **변기 내릴 때 소리와 시원함**을 꼭! 체크하시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 싱크대/세면대/샤워기 물 잘 나오는지
 ✅ 싱크대/화장실 온수 잘 나오는지


오늘은 자취 이사만 5번 경력을 살려 고인물이 아니면 알 수 없는 원룸 구할 때 체크할 것들에 대해 소개해 드렸는데요!
맨 위에 있는 이미지 저장하셔서 자취방 구할 때 꼭 요긴하게 사용하시길 바랍니다 💟

출처 : 오늘의집', + '자취방 꿀팁', + '원룸 체크리스트', + '2024-07-22 07:56:42', + '2024-07-22 07:56:42', + false),( + '초보 세입자들에게 전하는 부동산 계약 팁', + '마음에 쏙 드는 방을 찾았다면 이젠 집을 계약할 단계겠죠? 이번 포스트에서는 초보 세입자분들을 위해서 방을 계약할 때 참고해야 할 사항들을 말씀드리도록 하겠습니다.

등기부등본, 건축물대장 열람은 필수!

등기부등본과 건축물대장은 해당 부동산, 건물에 대해서 소유권자에 대한 사항과 위치·면적·구조·용도·층수 등에 대한 사항을 알 수 있는 문서인데요. 등기부등본과 건축물대장을 통해서 **계약하려는 방, 건물의 소유주가 실제 계약을 진행하는 임대인과 동일한지, 건물 또한 등록된 내용과 다른 부분이 없는지** 확인해야 합니다.

특히, 등기부등본에는 부동산에 대해 설정된 융자, 경매, 저당권에 대해서도 확인할 수 있으니 반드시 확인하고 계약을 진행해야 합니다. 혹시나 등기부등본과 건축물대장에 표시된 내용이 다를 수 있는데 권리관계는 등기부등본을 기준으로 하며 부동산의 표시는 건축물대장을 기준으로 하게 되기 때문에 이를 참고하시고, 혹시 표시가 달라 걱정이 된다면 인터넷 등기소를 통해 수정을 하시면 됩니다.

계약은 집주인과 하는 것이다!

계약은 집주인이 임대인이고 방을 구하는 여러분이 임차인이 되어 진행되는 것입니다. **계약의 당사자는 반드시 본인과 집주인이 되어야 한다는 것**인데요. 보통은 방을 구하는 당사자와 집주인, 중개인 이렇게 계약을 진행하겠지만 가끔 특별한 사유로 집주인(임대인)이 직접 자리하여 계약을 진행하지 못하는 경우가 발생할 수 있습니다. 이때, 임대인은 대리인에게 본인의 직인과 대리인 임명장을 통해서 실제로 권한을 부여한 대리인임을 증명할 수 있고 대리인은 부여된 권한 안에서 대리계약을 진행할 수 있습니다.

주의할 것은, 대리인은 계약에서 집주인으로부터 권한을 부여받은 대리인일 뿐, 계약 당사자가 아니기 때문에 계약서상의 성명 직인은 모두 집주인인 임대인의 것이 들어가야 하며 계약금도 집주인이 별도로 말한 내용이 없다면 집주인 명의의 계좌로 입금해야 합니다.

협의된 내용은 특약사항에 명시할 것!

집을 계약할 때 집주인과 얘기하여 협의한 내용들(옵션사항, 월세 및 관리비 관련 사항, 기타 생활규칙, 내부 개조 등)은 계약서상에 명시가 안된 경우가 많기 때문에 이러한 내용들은 특약사항으로 따로 적어주는 것이 좋습니다.

집주인과 얘기가 다 되었다고 생각하여 이를 계약서 상에 기재하지 않았을 경우 문제가 발생했을 때, 이전에 집주인과 협의된 사항임을 본인이 직접 밝혀야 하기 때문에 **임차인이 적극적으로 특약사항을 확인하고 내용을 명시**해야 합니다.

전입신고 및 확정일자를 받을 것!

전입신고와 확정일자는 임차인이 임대차계약에서 법적으로 권리를 보호받을 수 있는 절차입니다. 전입신고는 새로운 거주지에 전입하여 주소지 변경 사항을 알리는 절차이며 이를 통해 주택임대차보호법의 보호를 받을 수 있고, 확정일자는 임대차계약을 맺은 날짜를 확인하는 것으로 경매 등의 상황에서 우선적으로 보증금을 변제받을 수 있게 됩니다.

전입신고와 확정일자는 주민센터에서 바로 민원이 가능하며 전입신고와 동시에 확정일자를 받는 것이 가장 편리한 방법이며 **신고는 전입한 날로부터 14일 이내로 완료**하면 됩니다.

출처:https://brunch.co.kr/@dprnrn234/124', + '등기부등본', + '방 계약 시 주의할 점', + '2024-07-22 07:56:42', + '2024-07-22 07:56:42', + false),( + '전세 사기 피하는 법…계약 전 꼭 확인해야 할 8가지', + '![img](https://mediahub.seoul.go.kr/uploads/mediahub/2023/05/whHWpgBBQsZMIKotGenBwFIKcPERqYKu.png)
![img](https://mediahub.seoul.go.kr/uploads/mediahub/2023/05/yyxhNCPoGKUFhtSmnxCNAxFHovdrREfW.png)

전세사기 예방, 꼭! 확인해야 할 8가지!


압류 및 세금체납 등 권리제한사항이 있거나 매매가격보다 과도하게 높은 전세가격 등으로 **보증금을 돌려받지 못하는 전세사기!**

깡통전세·전세사기 피해자가 더 늘어나지 않도록 하기 위해 예방 대책 및 지원 방안을 마련하고 총력을 기울이고 있는데요. **전세사기 예방을 위해 꼭 확인해야 할 8가지, 함께 살펴보아요!** ![img](https://mediahub.seoul.go.kr/uploads/mediahub/2023/05/ZrgaSqFihDwrSiXzxxUVzIgjcohGoGCe.png)
![img](https://mediahub.seoul.go.kr/uploads/mediahub/2023/05/GYuqUxJtzxeFpHrWtBObYmzYPIqySThn.png)
![img](https://mediahub.seoul.go.kr/uploads/mediahub/2023/05/TFWMcSjDHnkEDiBGBmMcRVxpRhDPRkbP.png)
![img](https://mediahub.seoul.go.kr/uploads/mediahub/2023/05/cYHtopKhdHyBhbFWpNodygWStpjCVmUZ.png)

출처:https://mediahub.seoul.go.kr/archives/2007948', + '전세', + '전세 사기 피하는 법', + '2024-07-22 07:56:42', + '2024-07-22 07:56:42', + false); From 5a48edc04be444fbf49949ea6b15321ea8de310c Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Wed, 21 Aug 2024 17:39:06 +0900 Subject: [PATCH 226/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EC=B7=A8=EC=86=8C=EC=84=A0=EC=9D=84=20=EC=A0=9C=EA=B1=B0?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#503)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 3773ca287..bc477deb7 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -20,14 +20,14 @@ VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', fal INSERT INTO article(title, content, keyword, summary, created_at, modified_at, deleted) VALUES ('자취방 이사만 5번 피셜! 원룸 구할 때 체크리스트 1탄', - '학교 주변 자취방을 구하는 **대학생 분들,** 회사 주변 방을 구하는 **직장인 분들!** 그리고 그외 전국의 예비 자취생 여러분 모두 잘 오셨습니다.

원래 **자취방 구하기는 대학생 종강 시즌이 제철**이신 거, 다들 아시죠? 👀 그래서 오늘은 자취방 이사만 5번 해본 **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트**를 가져왔습니다.

한 번도 생각해 보지 못했지만 **보자마자 납득 100%인 꿀팁들**을 고르고 골라 왔으니, 모두 집중하고 따라오시지요!

👇 저장해두고 체크해 보세요!

![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/advices/168816951483078032.png)



🪟 창문

**✅ 옆 건물에서 잘 보이는 구조인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/160436720332165459.jpg)
많은 분들이 잘 생각하지 못하시는 부분 중 하나죠! **옆 건물과 사생활 보호가 되는지 여부**입니다. 물론 블라인드를 쳐서 가릴 수는 있지만, **매번 블라인드를 쳐둬야 하는 건** 은근 불편한 일이거든요! (=자취방 3호 경험담)

그리고 자취의 특권은 **샤워 후 자연의 상태로 나와서** 옷을 갈아입을 수 있다는 것 아니겠습니까? 🛀 그러니 자취의 장점을 누리기 위해 꼭 한번 체크해 보시는 게 좋겠습니다.

**✅ 환기하기에 적합한 크기인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/159505656294119930.jpg)
자취방의 경우 그 특성상 창문이 하나만 있는 경우가 많은데요. 하지만 창문 전체가 시원~하게 열리는 형태가 아니라, 위 사진처럼 **틈새만 열리는 경우라면 피하시는 게 좋습니다.**

좁은 평수일수록 환기가 매우 중요한데, 요런 창문의 경우에는 **환기 능력**이 떨어질 수밖에 없기 때문이죠! 결정 요인은 아니지만 **의외로 삶의 질과 연결**되는 부분이기 때문에 체크해 보시길 권장합니다.

**✅ 방충망/방범창 이상 없는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/164397041095518794.jpg)
창문 확인의 기본 of 기본! 바로 **방충망과 방범창 여부**입니다.

방충망은 구멍이 뚫려 **보수할 부분이 있는지**까지 체크해 주시는 게 좋고, 방범창은 **저층일수록 꼭** **확인**해 주시는 것이 좋습니다.

**✅ 햇빛 잘 들어오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166038643972068590.jpeg)
물론 집을 보러 가기 전에 남향인지 북향인지 중개인 분께서 설명을 해주실 텐데요. 하지만 남향이어도 앞 건물에 가려져 빛이 잘 안 들어올 수 있으니, 꼭 확인하기로 합시다.

**🍯 여기서 작은 꿀팁!**
Q. 앞 건물에 막힌 남향과 일반 북향/서향이 고민이라면?
A. 그래도 남향을 추천해요! 빛이 들어오지 않는 남향이라도 북향이나 서향보다는 훨씬 쾌적하답니다.

🔐 보안

**✅ 관리자 분 상주하시는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167971937444371683.jpg)자취방 특성상 상시로 관리자 분이 계시는 경우가 많지는 않죠! 하지만 오피스텔의 경우에는 종종 관**리자분이 상주하고 계시는 경우**가 있는데요 👀

자취를 하다 보면 갑자기 불이 나가는 등 **전문가의 도움이 필요한 순간**들이 찾아오기 마련이죠. (그것의 자취의 맛..) 따라서 상주 관리자분이 계신 집이라면 **+15점** 해주시는 것이 좋겠습니다.

**✅ 현관문 잠금장치 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167894935043362031.jpeg)
요것도 쉽게 지나칠 수 있는 포인트! 하지만 잠금장치 여부는 꼭 확인해 주시는 게 좋습니다. 자취를 하다 보면 정말 가끔 **모르는 사람이 초인종을 누르는 경우**도 있거든요 🤔

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 출입구와 복도에 CCTV 있는지
 ✅ 공동 현관 비밀번호 있는지

🏡 주변 환경

**✅ 무인 택배 보관함 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166618977771822482.jpeg)
처음엔 굳이 필요한가 싶지만, **여기저기 활용도 좋은 무인 택배함!** 상세 주소 노출 없이 택배를 보관하기 좋은 것은 물론, 물건을 집에 두고 와야 하는데 **올라가기 귀찮을 때나 중고거래할 때** 등 유용하게 사용할 수 있어요.

만약 무인 택배함이 있는 집이라면 **보너스 점수**를 주기로 합시다 🕵️‍♀️

**✅ 대중교통 이용 편리한지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/168740647444591385.jpeg)
자취방을 구하는 목적은 바로 **학교나 직장 등에 편리하게 가기 위함**이 1번 아니겠습니까? 따라서 대중교통이 이용이 불편한 위치에 집이 있다면 **삶이 질이 수직 하락**할 수밖에 없죠!

지도상 시간도 체크하고, 실제로 자취방에서 대중교통 타는 곳까지 가보며 **경사나 주변 환경**도 체크해 보세요 🏃

**✅ 주변에 소음 시설 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/164194588552065716.jpeg)
아무래도 자취방 중에는 소음에 약한 곳이 많은데요! 따라서 **주변에 소음을 유발하는 시설이 있는지** 꼭 확인하셔야 합니다. 대표적으로는 **큰 도로와 술집** 정도가 있어요.

거기에 더해 꼭 확인하셔야 할 것은 바로 **24시 해장국집**입니다. 대개 **새벽까지 시끌시끌한 경우**가 많으므로 꼭 한번 확인해 보시길 바랍니다. (저도 알고 싶지 않았습니다)

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 편의점, 은행 등 편의시설 있는지
 ✅ 집 가는 길이 언덕인지
 ✅ 골목이라면 가로등 있는지

🛌 기본 옵션

**✅ 옵션 가구 치워줄 수 있는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/165794935274391835.jpeg)
멀쩡한 옵션 가구를 왜 치우느냐! 하실 수 있지만, 자취를 하다 보면 의외로 **옵션 가구가 짐이 되는 경우**들이 많더라고요 🤔

에디터 또한 어느 날부터 옵션 책상이 불필요하고 너무 거슬려서 결국 집주인 분께 양해를 구하고 수거해 주시길 부탁드린 경우가 있답니다. 경우에 따라 집 주인분께서 거절하실 수도 있을 수 있으니 **꼭 사전에 확인**해 보세요!

**✅ 화구 종류 체크하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167471560364252808.jpg) 집에서 요리를 종종 해 드시는 분이라면 꼭 **화구 종류를 확인**해 주세요! 요리를 즐겨 하시는 분일수록 가스레인지가 더 편리해요.

특히 하이라이트로 되어 있는 경우에는 **화력이 매우 약한 곳들**이 꽤나 있으니 ^^; 꼭 사전에 확인하시길 권합니다.

✅ **에어컨/냉장고 작동 점검하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168620136263807016.jpeg)
옵션 가구 중 **가장 고가인 에어컨과 냉장고**는 사전에 점검을 해두면 좋아요! 

만약 집 구하는 날 체크하지 못했다면, 혹시라도 문제가 생길 경우를 대비하여 **이사 후 일주일 내로 확인**해 보시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 옵션 가구 필요 없다면 치워줄 수 있는지 확인하기
  ✅ 옵션 가구 종류 확인하기 (신발장, 블라인드 등)

지면 관계상 1탄은 여기까지~
2탄에서 이어서 만나요💟

출처 : 오늘의집', + '학교 주변 자취방을 구하는 **대학생 분들,** 회사 주변 방을 구하는 **직장인 분들!** 그리고 그외 전국의 예비 자취생 여러분 모두 잘 오셨습니다.

원래 **자취방 구하기는 대학생 종강 시즌이 제철**이신 거, 다들 아시죠? 👀 그래서 오늘은 자취방 이사만 5번 해본 **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트**를 가져왔습니다.

한 번도 생각해 보지 못했지만 **보자마자 납득 100%인 꿀팁들**을 고르고 골라 왔으니, 모두 집중하고 따라오시지요!



🪟 창문

**✅ 옆 건물에서 잘 보이는 구조인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/160436720332165459.jpg)
많은 분들이 잘 생각하지 못하시는 부분 중 하나죠! **옆 건물과 사생활 보호가 되는지 여부**입니다. 물론 블라인드를 쳐서 가릴 수는 있지만, **매번 블라인드를 쳐둬야 하는 건** 은근 불편한 일이거든요! (=자취방 3호 경험담)

그리고 자취의 특권은 **샤워 후 자연의 상태로 나와서** 옷을 갈아입을 수 있다는 것 아니겠습니까? 🛀 그러니 자취의 장점을 누리기 위해 꼭 한번 체크해 보시는 게 좋겠습니다.

**✅ 환기하기에 적합한 크기인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/159505656294119930.jpg)
자취방의 경우 그 특성상 창문이 하나만 있는 경우가 많은데요. 하지만 창문 전체가 시원하게 열리는 형태가 아니라, 위 사진처럼 **틈새만 열리는 경우라면 피하시는 게 좋습니다.**

좁은 평수일수록 환기가 매우 중요한데, 요런 창문의 경우에는 **환기 능력**이 떨어질 수밖에 없기 때문이죠! 결정 요인은 아니지만 **의외로 삶의 질과 연결**되는 부분이기 때문에 체크해 보시길 권장합니다.

**✅ 방충망/방범창 이상 없는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/164397041095518794.jpg)
창문 확인의 기본 of 기본! 바로 **방충망과 방범창 여부**입니다.

방충망은 구멍이 뚫려 **보수할 부분이 있는지**까지 체크해 주시는 게 좋고, 방범창은 **저층일수록 꼭** **확인**해 주시는 것이 좋습니다.

**✅ 햇빛 잘 들어오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166038643972068590.jpeg)
물론 집을 보러 가기 전에 남향인지 북향인지 중개인 분께서 설명을 해주실 텐데요. 하지만 남향이어도 앞 건물에 가려져 빛이 잘 안 들어올 수 있으니, 꼭 확인하기로 합시다.

**🍯 여기서 작은 꿀팁!**
Q. 앞 건물에 막힌 남향과 일반 북향/서향이 고민이라면?
A. 그래도 남향을 추천해요! 빛이 들어오지 않는 남향이라도 북향이나 서향보다는 훨씬 쾌적하답니다.

🔐 보안

**✅ 관리자 분 상주하시는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167971937444371683.jpg)자취방 특성상 상시로 관리자 분이 계시는 경우가 많지는 않죠! 하지만 오피스텔의 경우에는 종종 관**리자분이 상주하고 계시는 경우**가 있는데요 👀

자취를 하다 보면 갑자기 불이 나가는 등 **전문가의 도움이 필요한 순간**들이 찾아오기 마련이죠. (그것의 자취의 맛..) 따라서 상주 관리자분이 계신 집이라면 **+15점** 해주시는 것이 좋겠습니다.

**✅ 현관문 잠금장치 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167894935043362031.jpeg)
요것도 쉽게 지나칠 수 있는 포인트! 하지만 잠금장치 여부는 꼭 확인해 주시는 게 좋습니다. 자취를 하다 보면 정말 가끔 **모르는 사람이 초인종을 누르는 경우**도 있거든요 🤔

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 출입구와 복도에 CCTV 있는지
 ✅ 공동 현관 비밀번호 있는지

🏡 주변 환경

**✅ 무인 택배 보관함 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166618977771822482.jpeg)
처음엔 굳이 필요한가 싶지만, **여기저기 활용도 좋은 무인 택배함!** 상세 주소 노출 없이 택배를 보관하기 좋은 것은 물론, 물건을 집에 두고 와야 하는데 **올라가기 귀찮을 때나 중고거래할 때** 등 유용하게 사용할 수 있어요.

만약 무인 택배함이 있는 집이라면 **보너스 점수**를 주기로 합시다 🕵️‍♀️

**✅ 대중교통 이용 편리한지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/168740647444591385.jpeg)
자취방을 구하는 목적은 바로 **학교나 직장 등에 편리하게 가기 위함**이 1번 아니겠습니까? 따라서 대중교통이 이용이 불편한 위치에 집이 있다면 **삶이 질이 수직 하락**할 수밖에 없죠!

지도상 시간도 체크하고, 실제로 자취방에서 대중교통 타는 곳까지 가보며 **경사나 주변 환경**도 체크해 보세요 🏃

**✅ 주변에 소음 시설 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/164194588552065716.jpeg)
아무래도 자취방 중에는 소음에 약한 곳이 많은데요! 따라서 **주변에 소음을 유발하는 시설이 있는지** 꼭 확인하셔야 합니다. 대표적으로는 **큰 도로와 술집** 정도가 있어요.

거기에 더해 꼭 확인하셔야 할 것은 바로 **24시 해장국집**입니다. 대개 **새벽까지 시끌시끌한 경우**가 많으므로 꼭 한번 확인해 보시길 바랍니다. (저도 알고 싶지 않았습니다)

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 편의점, 은행 등 편의시설 있는지
 ✅ 집 가는 길이 언덕인지
 ✅ 골목이라면 가로등 있는지

🛌 기본 옵션

**✅ 옵션 가구 치워줄 수 있는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/165794935274391835.jpeg)
멀쩡한 옵션 가구를 왜 치우느냐! 하실 수 있지만, 자취를 하다 보면 의외로 **옵션 가구가 짐이 되는 경우**들이 많더라고요 🤔

에디터 또한 어느 날부터 옵션 책상이 불필요하고 너무 거슬려서 결국 집주인 분께 양해를 구하고 수거해 주시길 부탁드린 경우가 있답니다. 경우에 따라 집 주인분께서 거절하실 수도 있을 수 있으니 **꼭 사전에 확인**해 보세요!

**✅ 화구 종류 체크하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167471560364252808.jpg) 집에서 요리를 종종 해 드시는 분이라면 꼭 **화구 종류를 확인**해 주세요! 요리를 즐겨 하시는 분일수록 가스레인지가 더 편리해요.

특히 하이라이트로 되어 있는 경우에는 **화력이 매우 약한 곳들**이 꽤나 있으니 ^^; 꼭 사전에 확인하시길 권합니다.

✅ **에어컨/냉장고 작동 점검하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168620136263807016.jpeg)
옵션 가구 중 **가장 고가인 에어컨과 냉장고**는 사전에 점검을 해두면 좋아요! 

만약 집 구하는 날 체크하지 못했다면, 혹시라도 문제가 생길 경우를 대비하여 **이사 후 일주일 내로 확인**해 보시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 옵션 가구 필요 없다면 치워줄 수 있는지 확인하기
  ✅ 옵션 가구 종류 확인하기 (신발장, 블라인드 등)

지면 관계상 1탄은 여기까지~
2탄에서 이어서 만나요💟

출처 : 오늘의집', '자취방 꿀팁', '원룸 체크리스트', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),( '자취방 이사만 5번 피셜! 원룸 구할 때 체크리스트 2탄', - '안녕하세요~ **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트 2탄**으로 돌아왔습니다!

1탄을 아직 못보신 분들은 먼저 확인하고 돌아와주세요. 다들 집중하시고 가봅시다~

🕵️ 디테일

**✅ 인터폰 영상 지원되는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168217562696278839.jpeg)
이것도 앞서 이야기해 드린 **현관문 잠금장치와 비슷한 맥락**인데요! **배달 음식이나 등기 수령** 같은 경우에도 음성 인터폰만 듣는 것보다는 영상을 통해 방문자를 확인하는 것이 안전하죠.

잘 모르는 상대가 찾아왔을 때, **상대방의 모습을 확인**할 수 있다는 것만으로도 **마음의 안정에 큰 도움**이 되니 확인해 보시는 걸 추천드립니다. (방문 기록을 증거로 남길 수 있는 건 덤!)


**✅ 바퀴벌레 약 설치되어 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/159404181119534587.jpeg)
만약 집을 보러 갔는데 가구 뒤, 신발장 옆, 화장실 변기 뒤쪽 등등 **바퀴벌레 약을 설치한 흔적**이 있다? **웬만하면 런하시기를 추천합니다** 🏃‍♂️

물론 현재 거주자분이 꼼꼼한 성격으로 사전 예방하신 경우일 수도 있지만, 대부분 높은 확률로 한차례 발견했기 때문에 설치하는 경우가 많기 때문이죠...😱 가능한 도망치시기를!


**✅ 벽지에 곰팡이 흔적 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168645987277346900.jpeg)
곰팡이가 잘 생기는 **창문 주변 벽지와 침대 뒤쪽** 등, **시커먼 곰팡이 흔적**이 있는지 확인해 주세요.

곰팡이 흔적이 심하게 남아 있다면 높은 확률로 **습도 관리가 어려운 집**이거나 **집 구조적으로 곰팡이가 생길 수밖에 없는 곳**이랍니다. 따라서 이 경우에도 빠르게 런하시길! 🏃‍♂️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 콘센트 개수는 충분한지
  ✅ 옆집 방음 잘 되는지


✍🏻 기타 사항

**✅ 건물에 집주인분 사시는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/156680003862457833.jpg)
사소하지만 은근 중요한 디테일! 바로 **집주인 분과 같은 건물에서 살게 되는지**를 체크해 주시면 좋습니다.

대학가 인근 빌라의 경우 집주인 분도 같은 건물에 거주하시는 경우가 종종 있는데요. **이게 은근 불편하고 머쓱하다는 사실..!** 물론 개인차는 있겠지만 본인이 에디터의 경우에 해당된다면? 은밀하게 체크해 주세요.


**✅ 분리수거 시스템 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/165413921573933477.jpeg)
**분리 수거 시스템이 체계적으로 운영**되고 있는지, **쓰레기 버리기에는 수월한지**도 확인해 주시면 좋습니다.

자취방 중에 간혹 굉장히 불편하고 비효율적인 분리수거 시스템을 가진 곳들이 있거든요! **배출 일자나 주기적으로 쓰레기 관리해 주시는 분이 계시는지 여부** 등등 면밀하게 체크하시는 게 좋겠습니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 관리비 포함 항목 확인하기
  ✅ 인테리어 가능 여부 체크하기

🚽 화장실

**✅ 배수구 냄새 올라오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/163777210096433394.jpg)
**화장실 숙적!** 바로 **배수구 냄새**죠.특히 더워지는 여름철엔 모두가 고민하는 부분이긴 하지만, **유달리 배수구 냄새가 지독하게 나는 집**이 있다는 사실!

이 부분은 정말 삶의 질과 직결되기 때문에, **화장실에 들어가 문을 닫고** 꼭 한번 확인해 주세요 😉


**✅ 화장실 내부에 창문 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/161331910819056750.jpg)
흔한 조건은 아니지만 **있다면 무조건 플러스 오십 점인 화장실 창문!**

창문이 없다면 환풍기는 잘 되는지, 방문 당시 화장실 습도는 어느 정도인지 확인해 주시는 편이 좋습니다 🌬️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 샤워 여유 공간 충분한지
  ✅ 곰팡이 흔적 있는지


🚿 수도와 배수

**✅ 싱크대/화장실 배수구 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167694880830634529.jpeg)
곳곳의 수전에서 물이 잘 나오는지를 확인하는 것과 더불어, 꼭 챙겨야 할 것은 **배수구로 물이 내려가는 속도**입니다. **특히 세면대의 경우**가 각종 이물질이 축적되어 물이 매우 늦게 내려가는 경우가 있어요! (= 2호 자취방)

빠르게 설거지나 빨래를 해야 하는데 물이 잘 안 내려가면 정말 성격 안 좋아지기 때문에 🤯 화장실과 싱크대 모두 꼼꼼히 체크하시길 권합니다.


**✅ 변기 물 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/166970947851460229.jpg)
여기서 포인트는 **시원하고 우렁차게!** 입니다. 종종 변기 내려가는 힘이 매우 약한 곳들이 있는데요.

이 경우 삶의 질이 급격히 저하되므로, **변기 내릴 때 소리와 시원함**을 꼭! 체크하시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 싱크대/세면대/샤워기 물 잘 나오는지
 ✅ 싱크대/화장실 온수 잘 나오는지


오늘은 자취 이사만 5번 경력을 살려 고인물이 아니면 알 수 없는 원룸 구할 때 체크할 것들에 대해 소개해 드렸는데요!
맨 위에 있는 이미지 저장하셔서 자취방 구할 때 꼭 요긴하게 사용하시길 바랍니다 💟

출처 : 오늘의집', + '안녕하세요~ **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트 2탄**으로 돌아왔습니다!

1탄을 아직 못보신 분들은 먼저 확인하고 돌아와주세요. 다들 집중하시고 가봅시다!!

🕵️ 디테일

**✅ 인터폰 영상 지원되는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168217562696278839.jpeg)
이것도 앞서 이야기해 드린 **현관문 잠금장치와 비슷한 맥락**인데요! **배달 음식이나 등기 수령** 같은 경우에도 음성 인터폰만 듣는 것보다는 영상을 통해 방문자를 확인하는 것이 안전하죠.

잘 모르는 상대가 찾아왔을 때, **상대방의 모습을 확인**할 수 있다는 것만으로도 **마음의 안정에 큰 도움**이 되니 확인해 보시는 걸 추천드립니다. (방문 기록을 증거로 남길 수 있는 건 덤!)


**✅ 바퀴벌레 약 설치되어 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/159404181119534587.jpeg)
만약 집을 보러 갔는데 가구 뒤, 신발장 옆, 화장실 변기 뒤쪽 등등 **바퀴벌레 약을 설치한 흔적**이 있다? **웬만하면 런하시기를 추천합니다** 🏃‍♂️

물론 현재 거주자분이 꼼꼼한 성격으로 사전 예방하신 경우일 수도 있지만, 대부분 높은 확률로 한차례 발견했기 때문에 설치하는 경우가 많기 때문이죠...😱 가능한 도망치시기를!


**✅ 벽지에 곰팡이 흔적 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168645987277346900.jpeg)
곰팡이가 잘 생기는 **창문 주변 벽지와 침대 뒤쪽** 등, **시커먼 곰팡이 흔적**이 있는지 확인해 주세요.

곰팡이 흔적이 심하게 남아 있다면 높은 확률로 **습도 관리가 어려운 집**이거나 **집 구조적으로 곰팡이가 생길 수밖에 없는 곳**이랍니다. 따라서 이 경우에도 빠르게 런하시길! 🏃‍♂️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 콘센트 개수는 충분한지
  ✅ 옆집 방음 잘 되는지


✍🏻 기타 사항

**✅ 건물에 집주인분 사시는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/156680003862457833.jpg)
사소하지만 은근 중요한 디테일! 바로 **집주인 분과 같은 건물에서 살게 되는지**를 체크해 주시면 좋습니다.

대학가 인근 빌라의 경우 집주인 분도 같은 건물에 거주하시는 경우가 종종 있는데요. **이게 은근 불편하고 머쓱하다는 사실..!** 물론 개인차는 있겠지만 본인이 에디터의 경우에 해당된다면? 은밀하게 체크해 주세요.


**✅ 분리수거 시스템 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/165413921573933477.jpeg)
**분리 수거 시스템이 체계적으로 운영**되고 있는지, **쓰레기 버리기에는 수월한지**도 확인해 주시면 좋습니다.

자취방 중에 간혹 굉장히 불편하고 비효율적인 분리수거 시스템을 가진 곳들이 있거든요! **배출 일자나 주기적으로 쓰레기 관리해 주시는 분이 계시는지 여부** 등등 면밀하게 체크하시는 게 좋겠습니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 관리비 포함 항목 확인하기
  ✅ 인테리어 가능 여부 체크하기

🚽 화장실

**✅ 배수구 냄새 올라오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/163777210096433394.jpg)
**화장실 숙적!** 바로 **배수구 냄새**죠.특히 더워지는 여름철엔 모두가 고민하는 부분이긴 하지만, **유달리 배수구 냄새가 지독하게 나는 집**이 있다는 사실!

이 부분은 정말 삶의 질과 직결되기 때문에, **화장실에 들어가 문을 닫고** 꼭 한번 확인해 주세요 😉


**✅ 화장실 내부에 창문 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/161331910819056750.jpg)
흔한 조건은 아니지만 **있다면 무조건 플러스 오십 점인 화장실 창문!**

창문이 없다면 환풍기는 잘 되는지, 방문 당시 화장실 습도는 어느 정도인지 확인해 주시는 편이 좋습니다 🌬️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 샤워 여유 공간 충분한지
  ✅ 곰팡이 흔적 있는지


🚿 수도와 배수

**✅ 싱크대/화장실 배수구 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167694880830634529.jpeg)
곳곳의 수전에서 물이 잘 나오는지를 확인하는 것과 더불어, 꼭 챙겨야 할 것은 **배수구로 물이 내려가는 속도**입니다. **특히 세면대의 경우**가 각종 이물질이 축적되어 물이 매우 늦게 내려가는 경우가 있어요! (= 2호 자취방)

빠르게 설거지나 빨래를 해야 하는데 물이 잘 안 내려가면 정말 성격 안 좋아지기 때문에 🤯 화장실과 싱크대 모두 꼼꼼히 체크하시길 권합니다.


**✅ 변기 물 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/166970947851460229.jpg)
여기서 포인트는 **시원하고 우렁차게!** 입니다. 종종 변기 내려가는 힘이 매우 약한 곳들이 있는데요.

이 경우 삶의 질이 급격히 저하되므로, **변기 내릴 때 소리와 시원함**을 꼭! 체크하시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 싱크대/세면대/샤워기 물 잘 나오는지
 ✅ 싱크대/화장실 온수 잘 나오는지


오늘은 자취 이사만 5번 경력을 살려 고인물이 아니면 알 수 없는 원룸 구할 때 체크할 것들에 대해 소개해 드렸는데요!
자취방 구할 때 꼭 요긴하게 사용하시길 바랍니다 💟

출처 : 오늘의집', '자취방 꿀팁', '원룸 체크리스트', '2024-07-22 07:56:42', From 117a86d587908c25ac3aaccdde95d0c4062f0d83 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:19:11 +0900 Subject: [PATCH 227/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=EB=A5=BC=20=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?511)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/auth/service/AuthService.java | 5 +++-- .../main/java/com/bang_ggood/exception/ExceptionCode.java | 2 +- .../java/com/bang_ggood/auth/controller/AuthE2ETest.java | 2 +- .../java/com/bang_ggood/auth/service/AuthServiceTest.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 57b5a4d9c..96a5519c0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -101,9 +101,10 @@ private void createDefaultChecklist(User user) { } public void logout(String accessToken, User user) { - AuthUser authUser = jwtTokenProvider.resolveToken(accessToken); + String splitToken = accessToken.split("=")[1]; + AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); validateTokenOwnership(user, authUser); - blackList.add(accessToken); + blackList.add(splitToken); } public boolean isAccessTokenInBlackList(String accessToken) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 9932a20d5..e960adfae 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -19,7 +19,7 @@ public enum ExceptionCode { QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), // User - USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), + USER_NOT_FOUND(HttpStatus.UNAUTHORIZED, "유저가 존재하지 않습니다."), // Answer ANSWER_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java index 3614d12e0..533724a96 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -62,7 +62,7 @@ void authentication_invalid_cookie_exception() { @DisplayName("인증 실패 : 블랙리스트에 들어간 토큰일 경우") @Test void authentication_token_blacklist_exception() { - authService.logout(this.responseCookie.getValue(), UserFixture.USER1); + authService.logout(this.responseCookie.getName() + "="+ this.responseCookie.getValue(), UserFixture.USER1); RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index 2aee6b48c..05dd68b99 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -116,7 +116,7 @@ void logout_invalid_ownership_exception() { String token = jwtTokenProvider.createToken(USER1_WITH_ID); //when & then - assertThatThrownBy(() -> authService.logout(token, USER2_WITH_ID)) + assertThatThrownBy(() -> authService.logout("token=" + token, USER2_WITH_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER.getMessage()); } From 1db65fa8ed51dd954271691d93ffc9e2ff6b76c2 Mon Sep 17 00:00:00 2001 From: sunghyun-0 <94783621+tsulocalize@users.noreply.github.com> Date: Wed, 21 Aug 2024 17:39:06 +0900 Subject: [PATCH 228/348] =?UTF-8?q?[BE]=20=EC=95=84=ED=8B=B0=ED=81=B4=20?= =?UTF-8?q?=EC=B7=A8=EC=86=8C=EC=84=A0=EC=9D=84=20=EC=A0=9C=EA=B1=B0?= =?UTF-8?q?=ED=95=9C=EB=8B=A4.=20(#503)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- backend/bang-ggood/src/main/resources/data.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/resources/data.sql b/backend/bang-ggood/src/main/resources/data.sql index 3773ca287..bc477deb7 100644 --- a/backend/bang-ggood/src/main/resources/data.sql +++ b/backend/bang-ggood/src/main/resources/data.sql @@ -20,14 +20,14 @@ VALUES (1, 'ROOM_CONDITION_1', '2024-07-22 07:56:42', '2024-07-22 07:56:42', fal INSERT INTO article(title, content, keyword, summary, created_at, modified_at, deleted) VALUES ('자취방 이사만 5번 피셜! 원룸 구할 때 체크리스트 1탄', - '학교 주변 자취방을 구하는 **대학생 분들,** 회사 주변 방을 구하는 **직장인 분들!** 그리고 그외 전국의 예비 자취생 여러분 모두 잘 오셨습니다.

원래 **자취방 구하기는 대학생 종강 시즌이 제철**이신 거, 다들 아시죠? 👀 그래서 오늘은 자취방 이사만 5번 해본 **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트**를 가져왔습니다.

한 번도 생각해 보지 못했지만 **보자마자 납득 100%인 꿀팁들**을 고르고 골라 왔으니, 모두 집중하고 따라오시지요!

👇 저장해두고 체크해 보세요!

![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/advices/168816951483078032.png)



🪟 창문

**✅ 옆 건물에서 잘 보이는 구조인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/160436720332165459.jpg)
많은 분들이 잘 생각하지 못하시는 부분 중 하나죠! **옆 건물과 사생활 보호가 되는지 여부**입니다. 물론 블라인드를 쳐서 가릴 수는 있지만, **매번 블라인드를 쳐둬야 하는 건** 은근 불편한 일이거든요! (=자취방 3호 경험담)

그리고 자취의 특권은 **샤워 후 자연의 상태로 나와서** 옷을 갈아입을 수 있다는 것 아니겠습니까? 🛀 그러니 자취의 장점을 누리기 위해 꼭 한번 체크해 보시는 게 좋겠습니다.

**✅ 환기하기에 적합한 크기인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/159505656294119930.jpg)
자취방의 경우 그 특성상 창문이 하나만 있는 경우가 많은데요. 하지만 창문 전체가 시원~하게 열리는 형태가 아니라, 위 사진처럼 **틈새만 열리는 경우라면 피하시는 게 좋습니다.**

좁은 평수일수록 환기가 매우 중요한데, 요런 창문의 경우에는 **환기 능력**이 떨어질 수밖에 없기 때문이죠! 결정 요인은 아니지만 **의외로 삶의 질과 연결**되는 부분이기 때문에 체크해 보시길 권장합니다.

**✅ 방충망/방범창 이상 없는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/164397041095518794.jpg)
창문 확인의 기본 of 기본! 바로 **방충망과 방범창 여부**입니다.

방충망은 구멍이 뚫려 **보수할 부분이 있는지**까지 체크해 주시는 게 좋고, 방범창은 **저층일수록 꼭** **확인**해 주시는 것이 좋습니다.

**✅ 햇빛 잘 들어오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166038643972068590.jpeg)
물론 집을 보러 가기 전에 남향인지 북향인지 중개인 분께서 설명을 해주실 텐데요. 하지만 남향이어도 앞 건물에 가려져 빛이 잘 안 들어올 수 있으니, 꼭 확인하기로 합시다.

**🍯 여기서 작은 꿀팁!**
Q. 앞 건물에 막힌 남향과 일반 북향/서향이 고민이라면?
A. 그래도 남향을 추천해요! 빛이 들어오지 않는 남향이라도 북향이나 서향보다는 훨씬 쾌적하답니다.

🔐 보안

**✅ 관리자 분 상주하시는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167971937444371683.jpg)자취방 특성상 상시로 관리자 분이 계시는 경우가 많지는 않죠! 하지만 오피스텔의 경우에는 종종 관**리자분이 상주하고 계시는 경우**가 있는데요 👀

자취를 하다 보면 갑자기 불이 나가는 등 **전문가의 도움이 필요한 순간**들이 찾아오기 마련이죠. (그것의 자취의 맛..) 따라서 상주 관리자분이 계신 집이라면 **+15점** 해주시는 것이 좋겠습니다.

**✅ 현관문 잠금장치 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167894935043362031.jpeg)
요것도 쉽게 지나칠 수 있는 포인트! 하지만 잠금장치 여부는 꼭 확인해 주시는 게 좋습니다. 자취를 하다 보면 정말 가끔 **모르는 사람이 초인종을 누르는 경우**도 있거든요 🤔

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 출입구와 복도에 CCTV 있는지
 ✅ 공동 현관 비밀번호 있는지

🏡 주변 환경

**✅ 무인 택배 보관함 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166618977771822482.jpeg)
처음엔 굳이 필요한가 싶지만, **여기저기 활용도 좋은 무인 택배함!** 상세 주소 노출 없이 택배를 보관하기 좋은 것은 물론, 물건을 집에 두고 와야 하는데 **올라가기 귀찮을 때나 중고거래할 때** 등 유용하게 사용할 수 있어요.

만약 무인 택배함이 있는 집이라면 **보너스 점수**를 주기로 합시다 🕵️‍♀️

**✅ 대중교통 이용 편리한지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/168740647444591385.jpeg)
자취방을 구하는 목적은 바로 **학교나 직장 등에 편리하게 가기 위함**이 1번 아니겠습니까? 따라서 대중교통이 이용이 불편한 위치에 집이 있다면 **삶이 질이 수직 하락**할 수밖에 없죠!

지도상 시간도 체크하고, 실제로 자취방에서 대중교통 타는 곳까지 가보며 **경사나 주변 환경**도 체크해 보세요 🏃

**✅ 주변에 소음 시설 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/164194588552065716.jpeg)
아무래도 자취방 중에는 소음에 약한 곳이 많은데요! 따라서 **주변에 소음을 유발하는 시설이 있는지** 꼭 확인하셔야 합니다. 대표적으로는 **큰 도로와 술집** 정도가 있어요.

거기에 더해 꼭 확인하셔야 할 것은 바로 **24시 해장국집**입니다. 대개 **새벽까지 시끌시끌한 경우**가 많으므로 꼭 한번 확인해 보시길 바랍니다. (저도 알고 싶지 않았습니다)

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 편의점, 은행 등 편의시설 있는지
 ✅ 집 가는 길이 언덕인지
 ✅ 골목이라면 가로등 있는지

🛌 기본 옵션

**✅ 옵션 가구 치워줄 수 있는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/165794935274391835.jpeg)
멀쩡한 옵션 가구를 왜 치우느냐! 하실 수 있지만, 자취를 하다 보면 의외로 **옵션 가구가 짐이 되는 경우**들이 많더라고요 🤔

에디터 또한 어느 날부터 옵션 책상이 불필요하고 너무 거슬려서 결국 집주인 분께 양해를 구하고 수거해 주시길 부탁드린 경우가 있답니다. 경우에 따라 집 주인분께서 거절하실 수도 있을 수 있으니 **꼭 사전에 확인**해 보세요!

**✅ 화구 종류 체크하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167471560364252808.jpg) 집에서 요리를 종종 해 드시는 분이라면 꼭 **화구 종류를 확인**해 주세요! 요리를 즐겨 하시는 분일수록 가스레인지가 더 편리해요.

특히 하이라이트로 되어 있는 경우에는 **화력이 매우 약한 곳들**이 꽤나 있으니 ^^; 꼭 사전에 확인하시길 권합니다.

✅ **에어컨/냉장고 작동 점검하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168620136263807016.jpeg)
옵션 가구 중 **가장 고가인 에어컨과 냉장고**는 사전에 점검을 해두면 좋아요! 

만약 집 구하는 날 체크하지 못했다면, 혹시라도 문제가 생길 경우를 대비하여 **이사 후 일주일 내로 확인**해 보시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 옵션 가구 필요 없다면 치워줄 수 있는지 확인하기
  ✅ 옵션 가구 종류 확인하기 (신발장, 블라인드 등)

지면 관계상 1탄은 여기까지~
2탄에서 이어서 만나요💟

출처 : 오늘의집', + '학교 주변 자취방을 구하는 **대학생 분들,** 회사 주변 방을 구하는 **직장인 분들!** 그리고 그외 전국의 예비 자취생 여러분 모두 잘 오셨습니다.

원래 **자취방 구하기는 대학생 종강 시즌이 제철**이신 거, 다들 아시죠? 👀 그래서 오늘은 자취방 이사만 5번 해본 **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트**를 가져왔습니다.

한 번도 생각해 보지 못했지만 **보자마자 납득 100%인 꿀팁들**을 고르고 골라 왔으니, 모두 집중하고 따라오시지요!



🪟 창문

**✅ 옆 건물에서 잘 보이는 구조인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/160436720332165459.jpg)
많은 분들이 잘 생각하지 못하시는 부분 중 하나죠! **옆 건물과 사생활 보호가 되는지 여부**입니다. 물론 블라인드를 쳐서 가릴 수는 있지만, **매번 블라인드를 쳐둬야 하는 건** 은근 불편한 일이거든요! (=자취방 3호 경험담)

그리고 자취의 특권은 **샤워 후 자연의 상태로 나와서** 옷을 갈아입을 수 있다는 것 아니겠습니까? 🛀 그러니 자취의 장점을 누리기 위해 꼭 한번 체크해 보시는 게 좋겠습니다.

**✅ 환기하기에 적합한 크기인지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/159505656294119930.jpg)
자취방의 경우 그 특성상 창문이 하나만 있는 경우가 많은데요. 하지만 창문 전체가 시원하게 열리는 형태가 아니라, 위 사진처럼 **틈새만 열리는 경우라면 피하시는 게 좋습니다.**

좁은 평수일수록 환기가 매우 중요한데, 요런 창문의 경우에는 **환기 능력**이 떨어질 수밖에 없기 때문이죠! 결정 요인은 아니지만 **의외로 삶의 질과 연결**되는 부분이기 때문에 체크해 보시길 권장합니다.

**✅ 방충망/방범창 이상 없는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/164397041095518794.jpg)
창문 확인의 기본 of 기본! 바로 **방충망과 방범창 여부**입니다.

방충망은 구멍이 뚫려 **보수할 부분이 있는지**까지 체크해 주시는 게 좋고, 방범창은 **저층일수록 꼭** **확인**해 주시는 것이 좋습니다.

**✅ 햇빛 잘 들어오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166038643972068590.jpeg)
물론 집을 보러 가기 전에 남향인지 북향인지 중개인 분께서 설명을 해주실 텐데요. 하지만 남향이어도 앞 건물에 가려져 빛이 잘 안 들어올 수 있으니, 꼭 확인하기로 합시다.

**🍯 여기서 작은 꿀팁!**
Q. 앞 건물에 막힌 남향과 일반 북향/서향이 고민이라면?
A. 그래도 남향을 추천해요! 빛이 들어오지 않는 남향이라도 북향이나 서향보다는 훨씬 쾌적하답니다.

🔐 보안

**✅ 관리자 분 상주하시는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167971937444371683.jpg)자취방 특성상 상시로 관리자 분이 계시는 경우가 많지는 않죠! 하지만 오피스텔의 경우에는 종종 관**리자분이 상주하고 계시는 경우**가 있는데요 👀

자취를 하다 보면 갑자기 불이 나가는 등 **전문가의 도움이 필요한 순간**들이 찾아오기 마련이죠. (그것의 자취의 맛..) 따라서 상주 관리자분이 계신 집이라면 **+15점** 해주시는 것이 좋겠습니다.

**✅ 현관문 잠금장치 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167894935043362031.jpeg)
요것도 쉽게 지나칠 수 있는 포인트! 하지만 잠금장치 여부는 꼭 확인해 주시는 게 좋습니다. 자취를 하다 보면 정말 가끔 **모르는 사람이 초인종을 누르는 경우**도 있거든요 🤔

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 출입구와 복도에 CCTV 있는지
 ✅ 공동 현관 비밀번호 있는지

🏡 주변 환경

**✅ 무인 택배 보관함 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/166618977771822482.jpeg)
처음엔 굳이 필요한가 싶지만, **여기저기 활용도 좋은 무인 택배함!** 상세 주소 노출 없이 택배를 보관하기 좋은 것은 물론, 물건을 집에 두고 와야 하는데 **올라가기 귀찮을 때나 중고거래할 때** 등 유용하게 사용할 수 있어요.

만약 무인 택배함이 있는 집이라면 **보너스 점수**를 주기로 합시다 🕵️‍♀️

**✅ 대중교통 이용 편리한지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/168740647444591385.jpeg)
자취방을 구하는 목적은 바로 **학교나 직장 등에 편리하게 가기 위함**이 1번 아니겠습니까? 따라서 대중교통이 이용이 불편한 위치에 집이 있다면 **삶이 질이 수직 하락**할 수밖에 없죠!

지도상 시간도 체크하고, 실제로 자취방에서 대중교통 타는 곳까지 가보며 **경사나 주변 환경**도 체크해 보세요 🏃

**✅ 주변에 소음 시설 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/164194588552065716.jpeg)
아무래도 자취방 중에는 소음에 약한 곳이 많은데요! 따라서 **주변에 소음을 유발하는 시설이 있는지** 꼭 확인하셔야 합니다. 대표적으로는 **큰 도로와 술집** 정도가 있어요.

거기에 더해 꼭 확인하셔야 할 것은 바로 **24시 해장국집**입니다. 대개 **새벽까지 시끌시끌한 경우**가 많으므로 꼭 한번 확인해 보시길 바랍니다. (저도 알고 싶지 않았습니다)

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 편의점, 은행 등 편의시설 있는지
 ✅ 집 가는 길이 언덕인지
 ✅ 골목이라면 가로등 있는지

🛌 기본 옵션

**✅ 옵션 가구 치워줄 수 있는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/165794935274391835.jpeg)
멀쩡한 옵션 가구를 왜 치우느냐! 하실 수 있지만, 자취를 하다 보면 의외로 **옵션 가구가 짐이 되는 경우**들이 많더라고요 🤔

에디터 또한 어느 날부터 옵션 책상이 불필요하고 너무 거슬려서 결국 집주인 분께 양해를 구하고 수거해 주시길 부탁드린 경우가 있답니다. 경우에 따라 집 주인분께서 거절하실 수도 있을 수 있으니 **꼭 사전에 확인**해 보세요!

**✅ 화구 종류 체크하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/167471560364252808.jpg) 집에서 요리를 종종 해 드시는 분이라면 꼭 **화구 종류를 확인**해 주세요! 요리를 즐겨 하시는 분일수록 가스레인지가 더 편리해요.

특히 하이라이트로 되어 있는 경우에는 **화력이 매우 약한 곳들**이 꽤나 있으니 ^^; 꼭 사전에 확인하시길 권합니다.

✅ **에어컨/냉장고 작동 점검하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168620136263807016.jpeg)
옵션 가구 중 **가장 고가인 에어컨과 냉장고**는 사전에 점검을 해두면 좋아요! 

만약 집 구하는 날 체크하지 못했다면, 혹시라도 문제가 생길 경우를 대비하여 **이사 후 일주일 내로 확인**해 보시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 옵션 가구 필요 없다면 치워줄 수 있는지 확인하기
  ✅ 옵션 가구 종류 확인하기 (신발장, 블라인드 등)

지면 관계상 1탄은 여기까지~
2탄에서 이어서 만나요💟

출처 : 오늘의집', '자취방 꿀팁', '원룸 체크리스트', '2024-07-22 07:56:42', '2024-07-22 07:56:42', false),( '자취방 이사만 5번 피셜! 원룸 구할 때 체크리스트 2탄', - '안녕하세요~ **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트 2탄**으로 돌아왔습니다!

1탄을 아직 못보신 분들은 먼저 확인하고 돌아와주세요. 다들 집중하시고 가봅시다~

🕵️ 디테일

**✅ 인터폰 영상 지원되는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168217562696278839.jpeg)
이것도 앞서 이야기해 드린 **현관문 잠금장치와 비슷한 맥락**인데요! **배달 음식이나 등기 수령** 같은 경우에도 음성 인터폰만 듣는 것보다는 영상을 통해 방문자를 확인하는 것이 안전하죠.

잘 모르는 상대가 찾아왔을 때, **상대방의 모습을 확인**할 수 있다는 것만으로도 **마음의 안정에 큰 도움**이 되니 확인해 보시는 걸 추천드립니다. (방문 기록을 증거로 남길 수 있는 건 덤!)


**✅ 바퀴벌레 약 설치되어 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/159404181119534587.jpeg)
만약 집을 보러 갔는데 가구 뒤, 신발장 옆, 화장실 변기 뒤쪽 등등 **바퀴벌레 약을 설치한 흔적**이 있다? **웬만하면 런하시기를 추천합니다** 🏃‍♂️

물론 현재 거주자분이 꼼꼼한 성격으로 사전 예방하신 경우일 수도 있지만, 대부분 높은 확률로 한차례 발견했기 때문에 설치하는 경우가 많기 때문이죠...😱 가능한 도망치시기를!


**✅ 벽지에 곰팡이 흔적 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168645987277346900.jpeg)
곰팡이가 잘 생기는 **창문 주변 벽지와 침대 뒤쪽** 등, **시커먼 곰팡이 흔적**이 있는지 확인해 주세요.

곰팡이 흔적이 심하게 남아 있다면 높은 확률로 **습도 관리가 어려운 집**이거나 **집 구조적으로 곰팡이가 생길 수밖에 없는 곳**이랍니다. 따라서 이 경우에도 빠르게 런하시길! 🏃‍♂️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 콘센트 개수는 충분한지
  ✅ 옆집 방음 잘 되는지


✍🏻 기타 사항

**✅ 건물에 집주인분 사시는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/156680003862457833.jpg)
사소하지만 은근 중요한 디테일! 바로 **집주인 분과 같은 건물에서 살게 되는지**를 체크해 주시면 좋습니다.

대학가 인근 빌라의 경우 집주인 분도 같은 건물에 거주하시는 경우가 종종 있는데요. **이게 은근 불편하고 머쓱하다는 사실..!** 물론 개인차는 있겠지만 본인이 에디터의 경우에 해당된다면? 은밀하게 체크해 주세요.


**✅ 분리수거 시스템 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/165413921573933477.jpeg)
**분리 수거 시스템이 체계적으로 운영**되고 있는지, **쓰레기 버리기에는 수월한지**도 확인해 주시면 좋습니다.

자취방 중에 간혹 굉장히 불편하고 비효율적인 분리수거 시스템을 가진 곳들이 있거든요! **배출 일자나 주기적으로 쓰레기 관리해 주시는 분이 계시는지 여부** 등등 면밀하게 체크하시는 게 좋겠습니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 관리비 포함 항목 확인하기
  ✅ 인테리어 가능 여부 체크하기

🚽 화장실

**✅ 배수구 냄새 올라오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/163777210096433394.jpg)
**화장실 숙적!** 바로 **배수구 냄새**죠.특히 더워지는 여름철엔 모두가 고민하는 부분이긴 하지만, **유달리 배수구 냄새가 지독하게 나는 집**이 있다는 사실!

이 부분은 정말 삶의 질과 직결되기 때문에, **화장실에 들어가 문을 닫고** 꼭 한번 확인해 주세요 😉


**✅ 화장실 내부에 창문 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/161331910819056750.jpg)
흔한 조건은 아니지만 **있다면 무조건 플러스 오십 점인 화장실 창문!**

창문이 없다면 환풍기는 잘 되는지, 방문 당시 화장실 습도는 어느 정도인지 확인해 주시는 편이 좋습니다 🌬️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 샤워 여유 공간 충분한지
  ✅ 곰팡이 흔적 있는지


🚿 수도와 배수

**✅ 싱크대/화장실 배수구 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167694880830634529.jpeg)
곳곳의 수전에서 물이 잘 나오는지를 확인하는 것과 더불어, 꼭 챙겨야 할 것은 **배수구로 물이 내려가는 속도**입니다. **특히 세면대의 경우**가 각종 이물질이 축적되어 물이 매우 늦게 내려가는 경우가 있어요! (= 2호 자취방)

빠르게 설거지나 빨래를 해야 하는데 물이 잘 안 내려가면 정말 성격 안 좋아지기 때문에 🤯 화장실과 싱크대 모두 꼼꼼히 체크하시길 권합니다.


**✅ 변기 물 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/166970947851460229.jpg)
여기서 포인트는 **시원하고 우렁차게!** 입니다. 종종 변기 내려가는 힘이 매우 약한 곳들이 있는데요.

이 경우 삶의 질이 급격히 저하되므로, **변기 내릴 때 소리와 시원함**을 꼭! 체크하시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 싱크대/세면대/샤워기 물 잘 나오는지
 ✅ 싱크대/화장실 온수 잘 나오는지


오늘은 자취 이사만 5번 경력을 살려 고인물이 아니면 알 수 없는 원룸 구할 때 체크할 것들에 대해 소개해 드렸는데요!
맨 위에 있는 이미지 저장하셔서 자취방 구할 때 꼭 요긴하게 사용하시길 바랍니다 💟

출처 : 오늘의집', + '안녕하세요~ **자취방 구하기 만렙 에디터**가 찐 노하우가 담겨 있는 **원룸 구할 때 확인해야 할 체크리스트 2탄**으로 돌아왔습니다!

1탄을 아직 못보신 분들은 먼저 확인하고 돌아와주세요. 다들 집중하시고 가봅시다!!

🕵️ 디테일

**✅ 인터폰 영상 지원되는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168217562696278839.jpeg)
이것도 앞서 이야기해 드린 **현관문 잠금장치와 비슷한 맥락**인데요! **배달 음식이나 등기 수령** 같은 경우에도 음성 인터폰만 듣는 것보다는 영상을 통해 방문자를 확인하는 것이 안전하죠.

잘 모르는 상대가 찾아왔을 때, **상대방의 모습을 확인**할 수 있다는 것만으로도 **마음의 안정에 큰 도움**이 되니 확인해 보시는 걸 추천드립니다. (방문 기록을 증거로 남길 수 있는 건 덤!)


**✅ 바퀴벌레 약 설치되어 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/159404181119534587.jpeg)
만약 집을 보러 갔는데 가구 뒤, 신발장 옆, 화장실 변기 뒤쪽 등등 **바퀴벌레 약을 설치한 흔적**이 있다? **웬만하면 런하시기를 추천합니다** 🏃‍♂️

물론 현재 거주자분이 꼼꼼한 성격으로 사전 예방하신 경우일 수도 있지만, 대부분 높은 확률로 한차례 발견했기 때문에 설치하는 경우가 많기 때문이죠...😱 가능한 도망치시기를!


**✅ 벽지에 곰팡이 흔적 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/168645987277346900.jpeg)
곰팡이가 잘 생기는 **창문 주변 벽지와 침대 뒤쪽** 등, **시커먼 곰팡이 흔적**이 있는지 확인해 주세요.

곰팡이 흔적이 심하게 남아 있다면 높은 확률로 **습도 관리가 어려운 집**이거나 **집 구조적으로 곰팡이가 생길 수밖에 없는 곳**이랍니다. 따라서 이 경우에도 빠르게 런하시길! 🏃‍♂️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 콘센트 개수는 충분한지
  ✅ 옆집 방음 잘 되는지


✍🏻 기타 사항

**✅ 건물에 집주인분 사시는지 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/156680003862457833.jpg)
사소하지만 은근 중요한 디테일! 바로 **집주인 분과 같은 건물에서 살게 되는지**를 체크해 주시면 좋습니다.

대학가 인근 빌라의 경우 집주인 분도 같은 건물에 거주하시는 경우가 종종 있는데요. **이게 은근 불편하고 머쓱하다는 사실..!** 물론 개인차는 있겠지만 본인이 에디터의 경우에 해당된다면? 은밀하게 체크해 주세요.


**✅ 분리수거 시스템 확인하기**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/165413921573933477.jpeg)
**분리 수거 시스템이 체계적으로 운영**되고 있는지, **쓰레기 버리기에는 수월한지**도 확인해 주시면 좋습니다.

자취방 중에 간혹 굉장히 불편하고 비효율적인 분리수거 시스템을 가진 곳들이 있거든요! **배출 일자나 주기적으로 쓰레기 관리해 주시는 분이 계시는지 여부** 등등 면밀하게 체크하시는 게 좋겠습니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 관리비 포함 항목 확인하기
  ✅ 인테리어 가능 여부 체크하기

🚽 화장실

**✅ 배수구 냄새 올라오는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/163777210096433394.jpg)
**화장실 숙적!** 바로 **배수구 냄새**죠.특히 더워지는 여름철엔 모두가 고민하는 부분이긴 하지만, **유달리 배수구 냄새가 지독하게 나는 집**이 있다는 사실!

이 부분은 정말 삶의 질과 직결되기 때문에, **화장실에 들어가 문을 닫고** 꼭 한번 확인해 주세요 😉


**✅ 화장실 내부에 창문 있는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/161331910819056750.jpg)
흔한 조건은 아니지만 **있다면 무조건 플러스 오십 점인 화장실 창문!**

창문이 없다면 환풍기는 잘 되는지, 방문 당시 화장실 습도는 어느 정도인지 확인해 주시는 편이 좋습니다 🌬️

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
  ✅ 샤워 여유 공간 충분한지
  ✅ 곰팡이 흔적 있는지


🚿 수도와 배수

**✅ 싱크대/화장실 배수구 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/snapshots/167694880830634529.jpeg)
곳곳의 수전에서 물이 잘 나오는지를 확인하는 것과 더불어, 꼭 챙겨야 할 것은 **배수구로 물이 내려가는 속도**입니다. **특히 세면대의 경우**가 각종 이물질이 축적되어 물이 매우 늦게 내려가는 경우가 있어요! (= 2호 자취방)

빠르게 설거지나 빨래를 해야 하는데 물이 잘 안 내려가면 정말 성격 안 좋아지기 때문에 🤯 화장실과 싱크대 모두 꼼꼼히 체크하시길 권합니다.


**✅ 변기 물 잘 내려가는지**
![img](https://image.ohou.se/i/bucketplace-v2-development/uploads/cards/projects/166970947851460229.jpg)
여기서 포인트는 **시원하고 우렁차게!** 입니다. 종종 변기 내려가는 힘이 매우 약한 곳들이 있는데요.

이 경우 삶의 질이 급격히 저하되므로, **변기 내릴 때 소리와 시원함**을 꼭! 체크하시길 바랍니다.

**🙋‍♀️ 추가로 이것도 확인해 보세요!**
 ✅ 싱크대/세면대/샤워기 물 잘 나오는지
 ✅ 싱크대/화장실 온수 잘 나오는지


오늘은 자취 이사만 5번 경력을 살려 고인물이 아니면 알 수 없는 원룸 구할 때 체크할 것들에 대해 소개해 드렸는데요!
자취방 구할 때 꼭 요긴하게 사용하시길 바랍니다 💟

출처 : 오늘의집', '자취방 꿀팁', '원룸 체크리스트', '2024-07-22 07:56:42', From 6182b49e7865c3e6979c5d3b6c29984486d88ba9 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:19:11 +0900 Subject: [PATCH 229/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=EB=A5=BC=20=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?511)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/bang_ggood/auth/service/AuthService.java | 5 +++-- .../main/java/com/bang_ggood/exception/ExceptionCode.java | 2 +- .../java/com/bang_ggood/auth/controller/AuthE2ETest.java | 2 +- .../java/com/bang_ggood/auth/service/AuthServiceTest.java | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 57b5a4d9c..96a5519c0 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -101,9 +101,10 @@ private void createDefaultChecklist(User user) { } public void logout(String accessToken, User user) { - AuthUser authUser = jwtTokenProvider.resolveToken(accessToken); + String splitToken = accessToken.split("=")[1]; + AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); validateTokenOwnership(user, authUser); - blackList.add(accessToken); + blackList.add(splitToken); } public boolean isAccessTokenInBlackList(String accessToken) { diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java index 9932a20d5..e960adfae 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/exception/ExceptionCode.java @@ -19,7 +19,7 @@ public enum ExceptionCode { QUESTION_DIFFERENT(HttpStatus.BAD_REQUEST, "수정할 질문 목록이 기존의 질문 목록과 동일하지 않습니다."), // User - USER_NOT_FOUND(HttpStatus.BAD_REQUEST, "유저가 존재하지 않습니다."), + USER_NOT_FOUND(HttpStatus.UNAUTHORIZED, "유저가 존재하지 않습니다."), // Answer ANSWER_INVALID(HttpStatus.BAD_REQUEST, "점수가 유효하지 않습니다."), diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java index 3614d12e0..533724a96 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/controller/AuthE2ETest.java @@ -62,7 +62,7 @@ void authentication_invalid_cookie_exception() { @DisplayName("인증 실패 : 블랙리스트에 들어간 토큰일 경우") @Test void authentication_token_blacklist_exception() { - authService.logout(this.responseCookie.getValue(), UserFixture.USER1); + authService.logout(this.responseCookie.getName() + "="+ this.responseCookie.getValue(), UserFixture.USER1); RestAssured.given().log().all() .contentType(ContentType.JSON) diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java index 2aee6b48c..05dd68b99 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/auth/service/AuthServiceTest.java @@ -116,7 +116,7 @@ void logout_invalid_ownership_exception() { String token = jwtTokenProvider.createToken(USER1_WITH_ID); //when & then - assertThatThrownBy(() -> authService.logout(token, USER2_WITH_ID)) + assertThatThrownBy(() -> authService.logout("token=" + token, USER2_WITH_ID)) .isInstanceOf(BangggoodException.class) .hasMessage(ExceptionCode.AUTHENTICATION_TOKEN_NOT_OWNED_BY_USER.getMessage()); } From bfaae04d45419ba54e1f8bc903baadb36546865f Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:35:08 +0900 Subject: [PATCH 230/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=B5=9C=EC=8B=A0=EC=88=9C?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A1=B0=ED=9A=8C=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?509)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ChecklistRepository.java | 5 +++-- .../checklist/service/ChecklistService.java | 4 +--- .../repository/ChecklistRepositoryTest.java | 21 +++++++++++++++++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 9145e17b0..89453d0e3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -28,8 +28,9 @@ default Checklist getById(@Param("id") long id) { @Query("SELECT c FROM Checklist c " + "WHERE c.user = :user " - + "AND c.deleted = false") - List findAllByUser(@Param("user") User user); + + "AND c.deleted = false " + + "ORDER BY c.createdAt DESC ") + List findAllByUserOrderByLatest(@Param("user") User user); @Query("SELECT c FROM Checklist c " + "JOIN ChecklistLike cl " diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index e70beaab5..588c38057 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -7,7 +7,6 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; -import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; @@ -29,7 +28,6 @@ import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; -import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -305,7 +303,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ @Transactional public UserChecklistsPreviewResponse readChecklistsPreview(User user) { - List checklists = checklistRepository.findAllByUser(user); + List checklists = checklistRepository.findAllByUserOrderByLatest(user); List responses = checklists.stream() .map(this::getChecklistPreview) .toList(); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index 6227b5431..8eb74e7bd 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -87,12 +87,29 @@ void findAllByUser() { checklistRepository.deleteById(checklist1.getId()); // when - List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + List checklists = checklistRepository.findAllByUserOrderByLatest(UserFixture.USER1); // then Assertions.assertThat(checklists).containsOnly(checklist2); } + @DisplayName("체크리스트 리스트 조회 성공 : 체크리스트를 최신순으로 조회한다.") + @Test + void findAllByUser_OrderByLatest() { + // given + Checklist checklist1 = ChecklistFixture.CHECKLIST1_USER1; + checklistRepository.save(checklist1); + + Checklist checklist2 = ChecklistFixture.CHECKLIST2_USER1; + checklistRepository.save(checklist2); + + // when + List checklists = checklistRepository.findAllByUserOrderByLatest(UserFixture.USER1); + + // then + Assertions.assertThat(checklists).containsExactly(checklist2, checklist1); + } + @Transactional @DisplayName("체크리스트 리스트 조회 성공 : 사용자의 체크리스트만 조회한다.") @Test @@ -108,7 +125,7 @@ void findAllByUser_OnlyUserChecklists() { checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); // when - List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + List checklists = checklistRepository.findAllByUserOrderByLatest(UserFixture.USER1); // then Assertions.assertThat(checklists).containsOnly(checklist1, checklist2); From 5b4a9bb06aa0d374a8b5f021f1066aeed3c8bfa0 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 19:43:04 +0900 Subject: [PATCH 231/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=EC=97=90=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EB=A5=BC=20=EC=9E=91=EC=84=B1=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?518)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/auth/controller/AuthController.java | 5 +++++ .../com/bang_ggood/auth/service/AuthService.java | 8 ++++++++ .../bang_ggood/auth/service/JwtTokenProvider.java | 12 +++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index 0e0784916..f5b801075 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -5,6 +5,8 @@ import com.bang_ggood.auth.service.AuthService; import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; @@ -16,6 +18,8 @@ @RestController public class AuthController { + + private static final Logger log = LoggerFactory.getLogger(AuthController.class); private final AuthService authService; private final CookieProvider cookieProvider; @@ -27,6 +31,7 @@ public AuthController(AuthService authService, CookieProvider cookieProvider) { @PostMapping("/oauth/login") public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { String token = authService.login(request); + log.info("login token: {}", token); ResponseCookie cookie = cookieProvider.createCookie(token); return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 96a5519c0..a55960e26 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -15,6 +15,8 @@ import com.bang_ggood.room.dto.request.RoomRequest; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashSet; @@ -24,6 +26,8 @@ @Service public class AuthService { + + private static final Logger log = LoggerFactory.getLogger(AuthService.class); private static final Set blackList = new HashSet<>(); private final OauthClient oauthClient; @@ -101,6 +105,8 @@ private void createDefaultChecklist(User user) { } public void logout(String accessToken, User user) { + log.info("logout accessToken: {}", accessToken); + String splitToken = accessToken.split("=")[1]; AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); validateTokenOwnership(user, authUser); @@ -112,7 +118,9 @@ public boolean isAccessTokenInBlackList(String accessToken) { } public User extractUser(String token) { + log.info("extractUser token: {}", token); AuthUser authUser = jwtTokenProvider.resolveToken(token); + log.info("extractUser authUserId: {}", authUser.id()); validateAccessTokenInBlacklist(token); return userRepository.getUserById(authUser.id()); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java index 6e4ecaf2e..ca9625ab9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java @@ -8,6 +8,8 @@ import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.Date; @@ -15,6 +17,8 @@ @Component public class JwtTokenProvider { + + private static final Logger log = LoggerFactory.getLogger(JwtTokenProvider.class); private final String secretKey; private final long tokenExpirationMills; @@ -28,17 +32,20 @@ public JwtTokenProvider( public String createToken(User user) { Date now = new Date(); Date expiredDate = new Date(now.getTime() + tokenExpirationMills); - - return Jwts.builder() + log.info("userId {} ", user.getId()); + String token = Jwts.builder() .setSubject(user.getId().toString()) .setIssuedAt(now) .setExpiration(expiredDate) .signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) .compact(); + log.info("createToken token {}", token); + return token; } public AuthUser resolveToken(String token) { try { + log.info("resolveToken token: {}", token); Claims claims = Jwts.parserBuilder() .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) .build() @@ -47,7 +54,6 @@ public AuthUser resolveToken(String token) { Long id = Long.valueOf(claims.getSubject()); return AuthUser.from(id); - } catch (ExpiredJwtException exception) { throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED); } catch (JwtException exception) { From e6577696fee0cb29991b11d4913a511d81d77da8 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Wed, 21 Aug 2024 18:35:08 +0900 Subject: [PATCH 232/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=EB=A5=BC=20=EC=B5=9C=EC=8B=A0=EC=88=9C?= =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=A1=B0=ED=9A=8C=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?509)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../repository/ChecklistRepository.java | 5 +++-- .../checklist/service/ChecklistService.java | 4 +--- .../repository/ChecklistRepositoryTest.java | 21 +++++++++++++++++-- 3 files changed, 23 insertions(+), 7 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java index 9145e17b0..89453d0e3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/repository/ChecklistRepository.java @@ -28,8 +28,9 @@ default Checklist getById(@Param("id") long id) { @Query("SELECT c FROM Checklist c " + "WHERE c.user = :user " - + "AND c.deleted = false") - List findAllByUser(@Param("user") User user); + + "AND c.deleted = false " + + "ORDER BY c.createdAt DESC ") + List findAllByUserOrderByLatest(@Param("user") User user); @Query("SELECT c FROM Checklist c " + "JOIN ChecklistLike cl " diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index e70beaab5..588c38057 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -7,7 +7,6 @@ import com.bang_ggood.checklist.domain.Checklist; import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistLike; -import com.bang_ggood.checklist.domain.ChecklistMaintenance; import com.bang_ggood.checklist.domain.ChecklistOption; import com.bang_ggood.checklist.domain.ChecklistQuestion; import com.bang_ggood.checklist.domain.CustomChecklistQuestion; @@ -29,7 +28,6 @@ import com.bang_ggood.checklist.dto.response.UserChecklistsPreviewResponse; import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistLikeRepository; -import com.bang_ggood.checklist.repository.ChecklistMaintenanceRepository; import com.bang_ggood.checklist.repository.ChecklistOptionRepository; import com.bang_ggood.checklist.repository.ChecklistQuestionRepository; import com.bang_ggood.checklist.repository.ChecklistRepository; @@ -305,7 +303,7 @@ private SelectedCategoryQuestionsResponse readQuestionsByCategory(Category categ @Transactional public UserChecklistsPreviewResponse readChecklistsPreview(User user) { - List checklists = checklistRepository.findAllByUser(user); + List checklists = checklistRepository.findAllByUserOrderByLatest(user); List responses = checklists.stream() .map(this::getChecklistPreview) .toList(); diff --git a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java index 6227b5431..8eb74e7bd 100644 --- a/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java +++ b/backend/bang-ggood/src/test/java/com/bang_ggood/checklist/repository/ChecklistRepositoryTest.java @@ -87,12 +87,29 @@ void findAllByUser() { checklistRepository.deleteById(checklist1.getId()); // when - List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + List checklists = checklistRepository.findAllByUserOrderByLatest(UserFixture.USER1); // then Assertions.assertThat(checklists).containsOnly(checklist2); } + @DisplayName("체크리스트 리스트 조회 성공 : 체크리스트를 최신순으로 조회한다.") + @Test + void findAllByUser_OrderByLatest() { + // given + Checklist checklist1 = ChecklistFixture.CHECKLIST1_USER1; + checklistRepository.save(checklist1); + + Checklist checklist2 = ChecklistFixture.CHECKLIST2_USER1; + checklistRepository.save(checklist2); + + // when + List checklists = checklistRepository.findAllByUserOrderByLatest(UserFixture.USER1); + + // then + Assertions.assertThat(checklists).containsExactly(checklist2, checklist1); + } + @Transactional @DisplayName("체크리스트 리스트 조회 성공 : 사용자의 체크리스트만 조회한다.") @Test @@ -108,7 +125,7 @@ void findAllByUser_OnlyUserChecklists() { checklistRepository.saveAll(List.of(checklist1, checklist2, checklist3)); // when - List checklists = checklistRepository.findAllByUser(UserFixture.USER1); + List checklists = checklistRepository.findAllByUserOrderByLatest(UserFixture.USER1); // then Assertions.assertThat(checklists).containsOnly(checklist1, checklist2); From 2e736e438065160d81d9386f2258cbb2dd307981 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 19:43:04 +0900 Subject: [PATCH 233/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=20?= =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=EC=97=90=20=EB=A1=9C?= =?UTF-8?q?=EA=B7=B8=EB=A5=BC=20=EC=9E=91=EC=84=B1=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?518)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/auth/controller/AuthController.java | 5 +++++ .../com/bang_ggood/auth/service/AuthService.java | 8 ++++++++ .../bang_ggood/auth/service/JwtTokenProvider.java | 12 +++++++++--- 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index 0e0784916..f5b801075 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -5,6 +5,8 @@ import com.bang_ggood.auth.service.AuthService; import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; @@ -16,6 +18,8 @@ @RestController public class AuthController { + + private static final Logger log = LoggerFactory.getLogger(AuthController.class); private final AuthService authService; private final CookieProvider cookieProvider; @@ -27,6 +31,7 @@ public AuthController(AuthService authService, CookieProvider cookieProvider) { @PostMapping("/oauth/login") public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { String token = authService.login(request); + log.info("login token: {}", token); ResponseCookie cookie = cookieProvider.createCookie(token); return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 96a5519c0..a55960e26 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -15,6 +15,8 @@ import com.bang_ggood.room.dto.request.RoomRequest; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashSet; @@ -24,6 +26,8 @@ @Service public class AuthService { + + private static final Logger log = LoggerFactory.getLogger(AuthService.class); private static final Set blackList = new HashSet<>(); private final OauthClient oauthClient; @@ -101,6 +105,8 @@ private void createDefaultChecklist(User user) { } public void logout(String accessToken, User user) { + log.info("logout accessToken: {}", accessToken); + String splitToken = accessToken.split("=")[1]; AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); validateTokenOwnership(user, authUser); @@ -112,7 +118,9 @@ public boolean isAccessTokenInBlackList(String accessToken) { } public User extractUser(String token) { + log.info("extractUser token: {}", token); AuthUser authUser = jwtTokenProvider.resolveToken(token); + log.info("extractUser authUserId: {}", authUser.id()); validateAccessTokenInBlacklist(token); return userRepository.getUserById(authUser.id()); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java index 6e4ecaf2e..ca9625ab9 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java @@ -8,6 +8,8 @@ import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.Date; @@ -15,6 +17,8 @@ @Component public class JwtTokenProvider { + + private static final Logger log = LoggerFactory.getLogger(JwtTokenProvider.class); private final String secretKey; private final long tokenExpirationMills; @@ -28,17 +32,20 @@ public JwtTokenProvider( public String createToken(User user) { Date now = new Date(); Date expiredDate = new Date(now.getTime() + tokenExpirationMills); - - return Jwts.builder() + log.info("userId {} ", user.getId()); + String token = Jwts.builder() .setSubject(user.getId().toString()) .setIssuedAt(now) .setExpiration(expiredDate) .signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) .compact(); + log.info("createToken token {}", token); + return token; } public AuthUser resolveToken(String token) { try { + log.info("resolveToken token: {}", token); Claims claims = Jwts.parserBuilder() .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) .build() @@ -47,7 +54,6 @@ public AuthUser resolveToken(String token) { Long id = Long.valueOf(claims.getSubject()); return AuthUser.from(id); - } catch (ExpiredJwtException exception) { throw new BangggoodException(ExceptionCode.AUTHENTICATION_TOKEN_EXPIRED); } catch (JwtException exception) { From af63172016e39170f9e7524214a3fbd737bb1ade Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 20:01:38 +0900 Subject: [PATCH 234/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9D=B4=20=EC=95=88=EB=90=98=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=EB=A5=BC=20=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?521)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/auth/service/AuthService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index a55960e26..1ed2a93a6 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -107,7 +107,7 @@ private void createDefaultChecklist(User user) { public void logout(String accessToken, User user) { log.info("logout accessToken: {}", accessToken); - String splitToken = accessToken.split("=")[1]; + String splitToken = accessToken.substring(6); AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); validateTokenOwnership(user, authUser); blackList.add(splitToken); From f91309b843356336587c21032b7fe609a44742c7 Mon Sep 17 00:00:00 2001 From: tkdgur0906 <39580658+tkdgur0906@users.noreply.github.com> Date: Wed, 21 Aug 2024 20:27:09 +0900 Subject: [PATCH 235/348] =?UTF-8?q?[BE]=20=EB=A1=9C=EA=B7=B8=EC=95=84?= =?UTF-8?q?=EC=9B=83=EC=9D=B4=20=EC=A0=95=EC=83=81=EC=A0=81=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EB=90=98=EC=A7=80=20=EC=95=8A=EB=8A=94=20=EB=AC=B8?= =?UTF-8?q?=EC=A0=9C=EB=A5=BC=20=ED=95=B4=EA=B2=B0=ED=95=9C=EB=8B=A4.=20(#?= =?UTF-8?q?524)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/bang_ggood/auth/service/AuthService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 1ed2a93a6..1b9ae5490 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -107,7 +107,7 @@ private void createDefaultChecklist(User user) { public void logout(String accessToken, User user) { log.info("logout accessToken: {}", accessToken); - String splitToken = accessToken.substring(6); + String splitToken = accessToken.split("token=")[1]; AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); validateTokenOwnership(user, authUser); blackList.add(splitToken); From fc17e61d48b2155f2a5440f3ea37781c0f4380ff Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Thu, 22 Aug 2024 16:05:09 +0900 Subject: [PATCH 236/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=20API=EB=A5=BC=20?= =?UTF-8?q?=EC=88=98=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#526)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../checklist/dto/response/SelectedChecklistResponse.java | 1 + .../com/bang_ggood/checklist/service/ChecklistService.java | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java index 53eab5e61..e6446d0a3 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/dto/response/SelectedChecklistResponse.java @@ -5,6 +5,7 @@ import java.util.List; public record SelectedChecklistResponse(SelectedRoomResponse room, + boolean isLiked, List options, List categories) { } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java index 588c38057..fd74f0773 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/checklist/service/ChecklistService.java @@ -264,10 +264,10 @@ public SelectedChecklistResponse readChecklistById(User user, long id) { List maintenanceIds = readChecklistMaintenancesByChecklist(checklist); SelectedRoomResponse selectedRoomResponse = SelectedRoomResponse.of(checklist, maintenanceIds); List options = readOptionsByChecklistId(id); - List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId( - id); + List selectedCategoryQuestionsResponse = readCategoryQuestionsByChecklistId(id); + boolean isLiked = checklistLikeRepository.existsByChecklist(checklist); - return new SelectedChecklistResponse(selectedRoomResponse, options, selectedCategoryQuestionsResponse); + return new SelectedChecklistResponse(selectedRoomResponse, isLiked, options, selectedCategoryQuestionsResponse); } private List readChecklistMaintenancesByChecklist(Checklist checklist) { From bd70f0efc38eb29e95808248e6a3bf7072892b7b Mon Sep 17 00:00:00 2001 From: tkdgur0906 Date: Thu, 22 Aug 2024 17:11:34 +0900 Subject: [PATCH 237/348] =?UTF-8?q?refactor:=20=EC=9E=91=EC=84=B1=ED=95=9C?= =?UTF-8?q?=20=EB=A1=9C=EA=B9=85=20=EC=A0=9C=EA=B1=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/bang_ggood/auth/controller/AuthController.java | 5 ----- .../main/java/com/bang_ggood/auth/service/AuthService.java | 7 ------- .../java/com/bang_ggood/auth/service/JwtTokenProvider.java | 7 ------- 3 files changed, 19 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java index f5b801075..0e0784916 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/controller/AuthController.java @@ -5,8 +5,6 @@ import com.bang_ggood.auth.service.AuthService; import com.bang_ggood.user.domain.User; import jakarta.validation.Valid; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.http.HttpHeaders; import org.springframework.http.ResponseCookie; import org.springframework.http.ResponseEntity; @@ -18,8 +16,6 @@ @RestController public class AuthController { - - private static final Logger log = LoggerFactory.getLogger(AuthController.class); private final AuthService authService; private final CookieProvider cookieProvider; @@ -31,7 +27,6 @@ public AuthController(AuthService authService, CookieProvider cookieProvider) { @PostMapping("/oauth/login") public ResponseEntity login(@Valid @RequestBody OauthLoginRequest request) { String token = authService.login(request); - log.info("login token: {}", token); ResponseCookie cookie = cookieProvider.createCookie(token); return ResponseEntity.ok().header(HttpHeaders.SET_COOKIE, cookie.toString()).build(); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java index 1b9ae5490..05ec2a5be 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/AuthService.java @@ -15,8 +15,6 @@ import com.bang_ggood.room.dto.request.RoomRequest; import com.bang_ggood.user.domain.User; import com.bang_ggood.user.repository.UserRepository; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import java.util.HashSet; @@ -26,8 +24,6 @@ @Service public class AuthService { - - private static final Logger log = LoggerFactory.getLogger(AuthService.class); private static final Set blackList = new HashSet<>(); private final OauthClient oauthClient; @@ -105,7 +101,6 @@ private void createDefaultChecklist(User user) { } public void logout(String accessToken, User user) { - log.info("logout accessToken: {}", accessToken); String splitToken = accessToken.split("token=")[1]; AuthUser authUser = jwtTokenProvider.resolveToken(splitToken); @@ -118,9 +113,7 @@ public boolean isAccessTokenInBlackList(String accessToken) { } public User extractUser(String token) { - log.info("extractUser token: {}", token); AuthUser authUser = jwtTokenProvider.resolveToken(token); - log.info("extractUser authUserId: {}", authUser.id()); validateAccessTokenInBlacklist(token); return userRepository.getUserById(authUser.id()); } diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java index ca9625ab9..2d3726e1b 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/auth/service/JwtTokenProvider.java @@ -8,8 +8,6 @@ import io.jsonwebtoken.JwtException; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.security.Keys; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Component; import java.util.Date; @@ -17,8 +15,6 @@ @Component public class JwtTokenProvider { - - private static final Logger log = LoggerFactory.getLogger(JwtTokenProvider.class); private final String secretKey; private final long tokenExpirationMills; @@ -32,20 +28,17 @@ public JwtTokenProvider( public String createToken(User user) { Date now = new Date(); Date expiredDate = new Date(now.getTime() + tokenExpirationMills); - log.info("userId {} ", user.getId()); String token = Jwts.builder() .setSubject(user.getId().toString()) .setIssuedAt(now) .setExpiration(expiredDate) .signWith(Keys.hmacShaKeyFor(secretKey.getBytes())) .compact(); - log.info("createToken token {}", token); return token; } public AuthUser resolveToken(String token) { try { - log.info("resolveToken token: {}", token); Claims claims = Jwts.parserBuilder() .setSigningKey(Keys.hmacShaKeyFor(secretKey.getBytes())) .build() From 86da9b21e5d3876d63a1ff9acb26a5554d940d29 Mon Sep 17 00:00:00 2001 From: Hyelim Choi Date: Fri, 23 Aug 2024 10:51:32 +0900 Subject: [PATCH 238/348] =?UTF-8?q?hofix:=20=EB=B2=84=ED=8A=BC=20=EC=82=AC?= =?UTF-8?q?=EC=9D=B4=EC=A6=88=EB=A5=BC=20=EC=88=98=EC=A0=95=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/_common/AlertModal/AlertModal.tsx | 1 + frontend/src/components/_common/Button/Button.tsx | 2 +- frontend/src/index.tsx | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/_common/AlertModal/AlertModal.tsx b/frontend/src/components/_common/AlertModal/AlertModal.tsx index 8d23c7b18..04cdea5c3 100644 --- a/frontend/src/components/_common/AlertModal/AlertModal.tsx +++ b/frontend/src/components/_common/AlertModal/AlertModal.tsx @@ -51,6 +51,7 @@ const S = { width: 100%; ${flexRow} justify-content: space-around; + gap: 1rem; `, IconBox: styled.div` display: flex; diff --git a/frontend/src/components/_common/Button/Button.tsx b/frontend/src/components/_common/Button/Button.tsx index cd8d2eaa2..5da7f9c1d 100644 --- a/frontend/src/components/_common/Button/Button.tsx +++ b/frontend/src/components/_common/Button/Button.tsx @@ -80,7 +80,7 @@ const sizeStyles = { ${title4} `, medium: css` - padding: 1.2rem 4.8rem; + padding: 1.2rem 3.6rem; ${title3} `, full: css` diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index e03cc356e..c824cfc11 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -10,6 +10,7 @@ async function enableMocking() { if (process.env.DEV_MODE !== 'on') { return; } + const { worker } = await import('./mocks/browser'); await worker.start({ serviceWorker: { From 44e1b2113ebaa78e4d82cbb72ce4c6c733938ea1 Mon Sep 17 00:00:00 2001 From: Hyelim Choi <74346290+healim01@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:53:04 +0900 Subject: [PATCH 239/348] =?UTF-8?q?[FE]=20hofix=EB=A1=9C=20=EB=B2=84?= =?UTF-8?q?=ED=8A=BC=20=EC=82=AC=EC=9D=B4=EC=A6=88=EB=A5=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=ED=95=9C=EB=8B=A4.=20(#553)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/components/_common/AlertModal/AlertModal.tsx | 1 + frontend/src/components/_common/Button/Button.tsx | 2 +- frontend/src/index.tsx | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/_common/AlertModal/AlertModal.tsx b/frontend/src/components/_common/AlertModal/AlertModal.tsx index 8d23c7b18..04cdea5c3 100644 --- a/frontend/src/components/_common/AlertModal/AlertModal.tsx +++ b/frontend/src/components/_common/AlertModal/AlertModal.tsx @@ -51,6 +51,7 @@ const S = { width: 100%; ${flexRow} justify-content: space-around; + gap: 1rem; `, IconBox: styled.div` display: flex; diff --git a/frontend/src/components/_common/Button/Button.tsx b/frontend/src/components/_common/Button/Button.tsx index cd8d2eaa2..5da7f9c1d 100644 --- a/frontend/src/components/_common/Button/Button.tsx +++ b/frontend/src/components/_common/Button/Button.tsx @@ -80,7 +80,7 @@ const sizeStyles = { ${title4} `, medium: css` - padding: 1.2rem 4.8rem; + padding: 1.2rem 3.6rem; ${title3} `, full: css` diff --git a/frontend/src/index.tsx b/frontend/src/index.tsx index e03cc356e..c824cfc11 100644 --- a/frontend/src/index.tsx +++ b/frontend/src/index.tsx @@ -10,6 +10,7 @@ async function enableMocking() { if (process.env.DEV_MODE !== 'on') { return; } + const { worker } = await import('./mocks/browser'); await worker.start({ serviceWorker: { From 67813ec7fcbcb2c4fa653cf5b46fa4f444576dc8 Mon Sep 17 00:00:00 2001 From: jinwoo22 <98975580+JINU-CHANG@users.noreply.github.com> Date: Fri, 23 Aug 2024 10:56:29 +0900 Subject: [PATCH 240/348] =?UTF-8?q?[BE]=20=EC=B2=B4=ED=81=AC=EB=A6=AC?= =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=A1=B0=ED=9A=8C=EC=8B=9C=20=EA=B4=80?= =?UTF-8?q?=EB=A6=AC=EB=B9=84=EB=A5=BC=20=ED=8F=AC=ED=95=A8=ED=95=9C?= =?UTF-8?q?=EB=8B=A4.=20(#554)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bang_ggood/room/dto/response/SelectedRoomResponse.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java index c45463d98..6350b3625 100644 --- a/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java +++ b/backend/bang-ggood/src/main/java/com/bang_ggood/room/dto/response/SelectedRoomResponse.java @@ -8,7 +8,7 @@ public record SelectedRoomResponse(String roomName, Integer deposit, Integer ren String address, String buildingName, String station, Integer walkingTime, String realEstate, Double size, String floorLevel, String structure, Integer occupancyMonth, String occupancyPeriod, String memo, String summary, - List includedMaintenances, LocalDateTime createdAt) { + List includedMaintenances, Integer maintenanceFee, LocalDateTime createdAt) { public static SelectedRoomResponse of(Checklist checklist, List includedMaintenances) { return new SelectedRoomResponse(checklist.getRoomName(), checklist.getDeposit(), checklist.getRent(), @@ -16,6 +16,6 @@ public static SelectedRoomResponse of(Checklist checklist, List include checklist.getRoomStation(), checklist.getRoomWalkingTime(), checklist.getRealEstate(), checklist.getRoomSize(), checklist.getRoomFloorLevel().getName(), checklist.getRoomStructure().getName(), checklist.getOccupancyMonth(), checklist.getOccupancyPeriod(), - checklist.getMemo(), checklist.getSummary(), includedMaintenances, checklist.getCreatedAt()); + checklist.getMemo(), checklist.getSummary(), includedMaintenances, checklist.getMaintenanceFee(), checklist.getCreatedAt()); } } From 2ceab6e11c67b228b8e47525ec92f26cba51b5ca Mon Sep 17 00:00:00 2001 From: Hyelim Choi Date: Fri, 23 Aug 2024 11:12:32 +0900 Subject: [PATCH 241/348] =?UTF-8?q?hofix:=20=EC=9B=8C=EB=94=A9=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/NewChecklist/AddressModal/DaumAddressModal.tsx | 1 - .../NewChecklist/NewRoomInfoForm/NearTransportation.tsx | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/frontend/src/components/NewChecklist/AddressModal/DaumAddressModal.tsx b/frontend/src/components/NewChecklist/AddressModal/DaumAddressModal.tsx index 5d0757d51..e54e50502 100644 --- a/frontend/src/components/NewChecklist/AddressModal/DaumAddressModal.tsx +++ b/frontend/src/components/NewChecklist/AddressModal/DaumAddressModal.tsx @@ -53,7 +53,6 @@ const DaumAddressModal = () => { 주소 검색 -
diff --git a/frontend/src/components/NewChecklist/NewRoomInfoForm/NearTransportation.tsx b/frontend/src/components/NewChecklist/NewRoomInfoForm/NearTransportation.tsx index 80393493d..7c606c562 100644 --- a/frontend/src/components/NewChecklist/NewRoomInfoForm/NearTransportation.tsx +++ b/frontend/src/components/NewChecklist/NewRoomInfoForm/NearTransportation.tsx @@ -38,7 +38,7 @@ const NearTransportation = () => { /> -