diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
new file mode 100644
index 0000000..de01b6c
--- /dev/null
+++ b/.github/workflows/CI-CD.yml
@@ -0,0 +1,84 @@
+name: CI-CD.yml
+on:
+  pull_request:
+    branches: ["donguk"]
+    types:
+      - closed
+
+jobs:
+  build:
+    if: github.event.pull_request.merged == true
+    runs-on: ubuntu-latest
+    steps:
+      - name: 📢 깃허브 checkout
+        uses: actions/checkout@v3
+
+      - name: 📢 GitHubAction JDK 17 설치
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+
+      - name: 📢 Gradle 실행 권한 부여!
+        run: chmod +x gradlew
+
+      - name: 📢 Gradle 캐싱
+        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: 📢 GitIgnore 파일들 넣어주기
+        env:
+          APPLICATION_PROPERTIES: ${{ secrets.APPLICATION_PROPERTIES}}
+          EMAIL_PROPERTIES: ${{secrets.EMAIL_PROPERTIES}}
+        run: |
+          rm -f src/main/resources/application.properties
+          rm -f src/main/resources/email.properties
+          echo "${{ secrets.APPLICATION_PROPERTIES }}" > src/main/resources/application.properties
+          echo "${{ secrets.EMAIL_PROPERTIES }}" > src/main/resources/email.properties
+
+      - name: 📢 Gradle 빌드(war 만들기)
+        run: ./gradlew clean build
+
+      - name: 📢 Docker image 만들기
+        run: docker build -t ${{ secrets.DOCKERHUB_USERNAME }}/zibi-backserver .
+
+      - name: 📢 DockerHub에 로그인
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME}}
+          password: ${{ secrets.DOCKERHUB_PASSWORD}}
+
+      - name: 📢 DockerHub에 PUSH
+        run: docker push ${{ secrets.DOCKERHUB_USERNAME}}/zibi-backserver
+
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+    if: github.event.pull_request.merged == true
+    steps:
+      - name: 📢SSH로 EC2에 접속해보자
+        uses: appleboy/ssh-action@master
+        with:
+          host: ${{ secrets.EC2_HOST}}
+          username: ${{ secrets.EC2_USERNAME}}
+          key: ${{ secrets.EC2_PRIVATE_KEY}}
+          script: |
+            echo "✅ EC2 연결 성공!"
+            echo "✅ Docker를 실행 시키기 위해 compose.yml 파일로 고고띠"
+            cd ~/zibi
+            
+            echo "✅ DockerHub 에서 이미지 가져오기(pull)"
+            docker pull ${{ secrets.DOCKERHUB_USERNAME }}/zibi-backserver
+            
+            echo "✅ 이제 DockeCompose 돌리자!!"
+            docker compose down
+            docker compose up -d
+            
+            echo "✅ PortForwarding을 8080으로 했으니깐 Public IP의 8080포트로 가자 "
+            echo "✅ 포트 번호 적기 싫으면 compose파일에서 80->8080 으로 포트포워딩 하면 됨!!"
\ No newline at end of file
diff --git a/.idea/artifacts/Gradle___org_scoula___KB_BE_1_0_SNAPSHOT_war__exploded_.xml b/.idea/artifacts/Gradle___org_scoula___KB_BE_1_0_SNAPSHOT_war__exploded_.xml
index bb8b9eb..57909e7 100644
--- a/.idea/artifacts/Gradle___org_scoula___KB_BE_1_0_SNAPSHOT_war__exploded_.xml
+++ b/.idea/artifacts/Gradle___org_scoula___KB_BE_1_0_SNAPSHOT_war__exploded_.xml
@@ -16,7 +16,7 @@
       <element id="directory" name="WEB-INF">
         <element id="directory" name="classes">
           <element id="module-output" name="KB_BE.main" />
-          <element id="dir-copy" path="$PROJECT_DIR$/build/resources/main" />
+          <element id="dir-copy" path="$PROJECT_DIR$/out/production/resources" />
         </element>
         <element id="directory" name="lib">
           <element id="library" level="project" name="Gradle: io.springfox:springfox-swagger2:2.9.2" />
@@ -29,13 +29,13 @@
           <element id="library" level="project" name="Gradle: org.apache.httpcomponents:httpcore:4.4.15" />
           <element id="library" level="project" name="Gradle: org.springframework:spring-context-support:5.3.37" />
           <element id="library" level="project" name="Gradle: com.sun.mail:javax.mail:1.6.2" />
-          <element id="library" level="project" name="Gradle: org.springframework:spring-webmvc:5.3.37" />
           <element id="library" level="project" name="Gradle: javax.annotation:javax.annotation-api:1.3.2" />
           <element id="library" level="project" name="Gradle: io.jsonwebtoken:jjwt-api:0.11.5" />
           <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-taglibs:5.8.13" />
           <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-web:5.8.13" />
           <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-config:5.8.13" />
           <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-core:5.8.13" />
+          <element id="library" level="project" name="Gradle: org.springframework:spring-webmvc:5.3.37" />
           <element id="library" level="project" name="Gradle: org.springframework:spring-context:5.3.37" />
           <element id="library" level="project" name="Gradle: javax.inject:javax.inject:1" />
           <element id="library" level="project" name="Gradle: org.aspectj:aspectjrt:1.9.20" />
@@ -74,10 +74,10 @@
           <element id="library" level="project" name="Gradle: org.springframework:spring-beans:5.3.37" />
           <element id="library" level="project" name="Gradle: org.springframework:spring-core:5.3.37" />
           <element id="library" level="project" name="Gradle: javax.activation:activation:1.1" />
+          <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-acl:5.8.13" />
           <element id="library" level="project" name="Gradle: org.springframework:spring-aop:5.3.37" />
           <element id="library" level="project" name="Gradle: org.springframework:spring-web:5.3.37" />
           <element id="library" level="project" name="Gradle: org.springframework:spring-expression:5.3.37" />
-          <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-acl:5.8.13" />
           <element id="library" level="project" name="Gradle: org.springframework.security:spring-security-crypto:5.8.13" />
           <element id="library" level="project" name="Gradle: xml-apis:xml-apis:1.4.01" />
           <element id="library" level="project" name="Gradle: com.google.protobuf:protobuf-java:3.21.9" />
diff --git a/.idea/dataSources.local.xml b/.idea/dataSources.local.xml
index af2ad67..dbc3e0f 100644
--- a/.idea/dataSources.local.xml
+++ b/.idea/dataSources.local.xml
@@ -1,9 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="dataSourceStorageLocal" created-in="IU-251.27812.49">
-    <data-source name="zibi" uuid="91e31f91-7c95-4f26-9da5-c86172e2af59">
+    <data-source name="zibi" uuid="0c600d1f-0531-4355-b89d-02432125bdad">
+      <database-info product="MySQL" version="8.0.42-0ubuntu0.24.04.2" jdbc-version="4.2" driver-name="MySQL Connector/J" driver-version="mysql-connector-j-8.2.0 (Revision: 06a1f724497fd81c6a659131fda822c9e5085b6c)" dbms="MYSQL" exact-version="8.0.42" exact-driver-version="8.2">
+        <extra-name-characters>#@</extra-name-characters>
+        <identifier-quote-string>`</identifier-quote-string>
+      </database-info>
+      <case-sensitivity plain-identifiers="exact" quoted-identifiers="exact" />
+      <secret-storage>master_key</secret-storage>
+      <user-name>admin</user-name>
+      <schema-mapping>
+        <introspection-scope>
+          <node kind="schema" negative="1" />
+        </introspection-scope>
+      </schema-mapping>
+      <load-sources>user_and_system_sources</load-sources>
+    </data-source>
+    <data-source name="@localhost" uuid="bb9e649f-61e5-4d24-9a91-24cbc28142ff">
       <database-info product="" version="" jdbc-version="" driver-name="" driver-version="" dbms="MYSQL" />
+      <secret-storage>master_key</secret-storage>
       <schema-mapping />
+      <load-sources>user_and_system_sources</load-sources>
     </data-source>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml
index 4f76264..b906275 100644
--- a/.idea/dataSources.xml
+++ b/.idea/dataSources.xml
@@ -1,11 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="DataSourceManagerImpl" format="xml" multifile-model="true">
-    <data-source source="LOCAL" name="zibi" uuid="91e31f91-7c95-4f26-9da5-c86172e2af59">
+    <data-source source="LOCAL" name="zibi" uuid="0c600d1f-0531-4355-b89d-02432125bdad">
       <driver-ref>mysql.8</driver-ref>
       <synchronize>true</synchronize>
       <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
       <jdbc-url>jdbc:mysql://3.34.64.47:3306</jdbc-url>
+      <jdbc-additional-properties>
+        <property name="com.intellij.clouds.kubernetes.db.host.port" />
+        <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
+        <property name="com.intellij.clouds.kubernetes.db.resource.type" value="Deployment" />
+        <property name="com.intellij.clouds.kubernetes.db.container.port" />
+      </jdbc-additional-properties>
+      <working-dir>$ProjectFileDir$</working-dir>
+    </data-source>
+    <data-source source="LOCAL" name="@localhost" uuid="bb9e649f-61e5-4d24-9a91-24cbc28142ff">
+      <driver-ref>mysql.8</driver-ref>
+      <synchronize>true</synchronize>
+      <jdbc-driver>com.mysql.cj.jdbc.Driver</jdbc-driver>
+      <jdbc-url>jdbc:mysql://localhost:3306</jdbc-url>
       <jdbc-additional-properties>
         <property name="com.intellij.clouds.kubernetes.db.host.port" />
         <property name="com.intellij.clouds.kubernetes.db.enabled" value="false" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index f2c1963..065275f 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,6 +4,8 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="delegatedBuild" value="false" />
+        <option name="testRunner" value="PLATFORM" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="17" />
         <option name="modules">
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..bdf8890
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,6 @@
+FROM tomcat:9.0.107-jdk17-temurin
+
+COPY build/libs/*SNAPSHOT.war /usr/local/tomcat/webapps/ROOT.war
+
+EXPOSE 8080
+
diff --git a/compose.yml b/compose.yml
new file mode 100644
index 0000000..54092fb
--- /dev/null
+++ b/compose.yml
@@ -0,0 +1,5 @@
+services:
+  my-docker-server:
+    build: .
+    ports:
+      - "8080:8080"
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 249e583..ccebba7 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 0d18421..42defcc 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index ce509e3..79a61d4 100644
--- a/gradlew
+++ b/gradlew
@@ -1,132 +1,132 @@
-\\\\\#!/bin/sh
-
-\\\\\#
-\\\\\# Copyright © 2015-2021 the original authors.
-\\\\\#
-\\\\\# Licensed under the Apache License, Version 2.0 (the "License");
-\\\\\# you may not use this file except in compliance with the License.
-\\\\\# You may obtain a copy of the License at
-\\\\\#
-\\\\\#      https://www.apache.org/licenses/LICENSE-2.0
-\\\\\#
-\\\\\# Unless required by applicable law or agreed to in writing, software
-\\\\\# distributed under the License is distributed on an "AS IS" BASIS,
-\\\\\# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-\\\\\# See the License for the specific language governing permissions and
-\\\\\# limitations under the License.
-\\\\\#
-
-\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#
-\\\\\#
-\\\\\#   Gradle start up script for POSIX generated by Gradle.
-\\\\\#
-\\\\\#   Important for running:
-\\\\\#
-\\\\\#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
-\\\\\#       noncompliant, but you have some other compliant shell such as ksh or
-\\\\\#       bash, then to run this script, type that shell name before the whole
-\\\\\#       command line, like:
-\\\\\#
-\\\\\#           ksh Gradle
-\\\\\#
-\\\\\#       Busybox and similar reduced shells will NOT work, because this script
-\\\\\#       requires all of these POSIX shell features:
-\\\\\#         * functions;
-\\\\\#         * expansions «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#var», «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{var}», «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{var:-default}», «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{var+SET}»,
-\\\\\#           «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{var\\\\\#prefix}», «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{var%suffix}», and «\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#( cmd )»;
-\\\\\#         * compound commands having a testable exit status, especially «case»;
-\\\\\#         * various built-in commands including «command», «set», and «ulimit».
-\\\\\#
-\\\\\#   Important for patching:
-\\\\\#
-\\\\\#   (2) This script targets any POSIX shell, so it avoids extensions provided
-\\\\\#       by Bash, Ksh, etc; in particular arrays are avoided.
-\\\\\#
-\\\\\#       The "traditional" practice of packing multiple parameters into a
-\\\\\#       space-separated string is a well documented source of bugs and security
-\\\\\#       problems, so this is (mostly) avoided, by progressively accumulating
-\\\\\#       options in "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#@", and eventually passing that to Java.
-\\\\\#
-\\\\\#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
-\\\\\#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
-\\\\\#       see the in-line comments for details.
-\\\\\#
-\\\\\#       There are tweaks for specific operating systems such as AIX, CygWin,
-\\\\\#       Darwin, MinGW, and NonStop.
-\\\\\#
-\\\\\#   (3) This script is generated from the Groovy template
-\\\\\#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
-\\\\\#       within the Gradle project.
-\\\\\#
-\\\\\#       You can find Gradle at https://github.com/gradle/gradle/.
-\\\\\#
-\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#
-
-\\\\\# Attempt to set APP_HOME
-
-\\\\\# Resolve links: \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#0 may be a link
-app_path=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#0
-
-\\\\\# Need this for daisy-chained symlinks.
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+##############################################################################
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
+##############################################################################
+
+# Attempt to set APP_HOME
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
 while
-    APP_HOME=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{app_path%"\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{app_path\\\\\#\\\\\#*/}"}  \\\\\# leaves a trailing /; empty if no leading path
-    [ -h "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#app_path" ]
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
 do
-    ls=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#( ls -ld "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#app_path" )
-    link=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{ls\\\\\#*' -> '}
-    case \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#link in             \\\\\#(
-      /*)   app_path=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#link ;; \\\\\#(
-      *)    app_path=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#APP_HOME\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#link ;;
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
     esac
 done
 
-APP_HOME=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#( cd "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
-APP_NAME="Gradle"
-APP_BASE_NAME=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#{0\\\\\#\\\\\#*/}
-
-\\\\\# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# 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"'
 
-\\\\\# Use the maximum available, or set MAX_FD != -1 to use that value.
+# Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
 
 warn () {
-    echo "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#*"
+    echo "$*"
 } >&2
 
 die () {
     echo
-    echo "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#*"
+    echo "$*"
     echo
     exit 1
 } >&2
 
-\\\\\# OS specific support (must be 'true' or 'false').
+# 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    ;; \\\\\#(
+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
+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
+# 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
+        JAVACMD=$JAVA_HOME/bin/java
     fi
-    if [ ! -x "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#JAVA_HOME
+    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."
@@ -139,96 +139,106 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
 fi
 
-\\\\\# Increase the maximum file descriptors if we can.
-if ! "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#cygwin" && ! "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#darwin" && ! "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#nonstop" ; then
-    case \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#MAX_FD in \\\\\#(
+# Increase the maximum file descriptors if we can.
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+    case $MAX_FD in #(
       max*)
-        MAX_FD=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#( ulimit -H -n ) ||
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
+        MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
-    case \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#MAX_FD in  \\\\\#(
-      '' | soft) :;; \\\\\#(
+    case $MAX_FD in  #(
+      '' | soft) :;; #(
       *)
-        ulimit -n "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#MAX_FD"
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=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.
+# 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" )
+# 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" )
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
 
-    \\\\\# Now convert the arguments - kludge to limit ourselves to /bin/sh
+    # 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" ] ;;                      \\\\\#(
+            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" )
+            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
+        # 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
 
-\\\\\# Collect all arguments for the java command;
-\\\\\#   * \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#DEFAULT_JVM_OPTS, \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#JAVA_OPTS, and \\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#GRADLE_OPTS can contain fragments of
-\\\\\#     shell script including quotes and variable substitutions, so put them in
-\\\\\#     double quotes to make sure that they get re-expanded; and
-\\\\\#   * put everything else in single quotes, so that it's not re-expanded.
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
 
 set -- \
-        "-Dorg.gradle.appname=\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#APP_BASE_NAME" \
-        -classpath "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#CLASSPATH" \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
         org.gradle.wrapper.GradleWrapperMain \
-        "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#@"
-
-\\\\\# 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" |
+        "$@"
+
+# 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" "\\\\#[[\\\\#[[\\\#[[\\#[[\#[[\$]]#]]\#]]\\#]]\\\#]]\\\\#@"
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 46917f0..93e3f59 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -14,18 +14,19 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
-@rem \\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#\\\\\#
+@if "%DEBUG%"=="" @echo off
+@rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
 @rem
-@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=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+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!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+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
diff --git a/src/main/java/org/scoula/config/SwaggerConfig.java b/src/main/java/org/scoula/config/SwaggerConfig.java
index 02838b4..ab8efae 100644
--- a/src/main/java/org/scoula/config/SwaggerConfig.java
+++ b/src/main/java/org/scoula/config/SwaggerConfig.java
@@ -52,7 +52,8 @@ private ApiKey apiKey() {
     private SecurityContext securityContext() {
         return SecurityContext.builder()
                 .securityReferences(defaultAuth())
-                .forPaths(PathSelectors.regex("/v1/(?!auth/(login|refresh|signup)|email|oauth/kakao).*"))
+                .forPaths(PathSelectors.regex("/v1/(?!auth/(login|refresh|signup|resetpassword)|email|oauth/kakao).*"
+                ))
                 .build();
     }
 
diff --git a/src/main/java/org/scoula/controller/AccountController.java b/src/main/java/org/scoula/controller/AccountController.java
index be71ad5..938bdd2 100644
--- a/src/main/java/org/scoula/controller/AccountController.java
+++ b/src/main/java/org/scoula/controller/AccountController.java
@@ -87,4 +87,38 @@ public ResponseEntity<ChungyakAccountDTO> getUserAccount(@ApiParam(hidden = true
         }
     }
 
+    @DeleteMapping("")
+    @ApiOperation(value = "청약 계좌 삭제", notes = "사용자의 청약 계좌를 삭제합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "계좌 삭제 성공"),
+            @ApiResponse(code = 404, message = "등록된 계좌 없음"),
+            @ApiResponse(code = 500, message = "서버 오류")
+    })
+    public ResponseEntity<Map<String, String>> deleteUserAccount(
+            @ApiParam(hidden = true) @RequestHeader("Authorization") String token
+    ) {
+        try {
+            String userId = jwtProcessor.getUsername(token.replace("Bearer ", ""));
+            int userIdx = userMapper.findUserIdxByUserId(userId);
+
+            boolean deleted = codefApiService.deleteAccountByUserIdx(userIdx);
+
+            if (deleted) {
+                Map<String, String> response = new HashMap<>();
+                response.put("message", "계좌가 성공적으로 삭제되었습니다.");
+                return ResponseEntity.ok(response);
+            } else {
+                Map<String, String> response = new HashMap<>();
+                response.put("message", "삭제할 계좌가 존재하지 않습니다.");
+                return ResponseEntity.status(HttpStatus.NOT_FOUND).body(response);
+            }
+
+        } catch (Exception e) {
+            log.error("계좌 삭제 실패", e);
+            Map<String, String> response = new HashMap<>();
+            response.put("message", "계좌 삭제 중 오류가 발생했습니다.");
+            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(response);
+        }
+    }
+
 }
diff --git a/src/main/java/org/scoula/controller/AuthController.java b/src/main/java/org/scoula/controller/AuthController.java
index 6c332f8..6db4677 100644
--- a/src/main/java/org/scoula/controller/AuthController.java
+++ b/src/main/java/org/scoula/controller/AuthController.java
@@ -3,8 +3,7 @@
 import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
-import org.scoula.dto.swagger.Auth.SwaggerPasswordChangeRequestDTO;
-import org.scoula.dto.swagger.Auth.SwaggerRefreshTokenRequestDTO;
+import org.scoula.dto.swagger.Auth.*;
 import org.scoula.security.dto.MemberDTO;
 import org.scoula.security.util.JwtProcessor;
 import org.scoula.service.AuthService;
@@ -83,57 +82,75 @@ public ResponseEntity<?> signUp(@RequestBody MemberDTO memberDTO) {
     }
 
     @DeleteMapping("/signout")
-    @ApiOperation(value = "회원 탈퇴", notes = "회원 탈퇴 처리 및 DB에서 사용자 삭제")
+    @ApiOperation(value = "회원 탈퇴", notes = "비밀번호 확인 후 회원 탈퇴를 수행합니다.")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "회원 탈퇴 완료")
+            @ApiResponse(code = 200, message = "회원 탈퇴 완료"),
+            @ApiResponse(code = 401, message = "비밀번호 불일치"),
+            @ApiResponse(code = 404, message = "사용자 정보 없음")
     })
-    public ResponseEntity<?> signOut(  @ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken) {
+    public ResponseEntity<?> signOut(
+            @ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken,
+            @RequestBody SwaggerSignOutRequestDTO request
+    ) {
         String accessToken = tokenUtils.extractAccessToken(bearerToken);
-        String username = jwtProcessor.getUsername(accessToken);
-        userService.deleteUser(username);
-        return ResponseEntity.ok(Map.of("message", "회원 탈퇴 완료!"));
+        String userId = jwtProcessor.getUsername(accessToken);
+
+        try {
+            userService.deleteUser(userId, request.getPassword());
+            return ResponseEntity.ok(Map.of("message", "회원 탈퇴 완료!"));
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.status(401).body(Map.of("error", e.getMessage()));
+        } catch (Exception e) {
+            log.error("회원 탈퇴 중 오류 발생", e);
+            return ResponseEntity.internalServerError().body(Map.of("error", "회원 탈퇴 중 서버 오류"));
+        }
     }
 
-    @PutMapping("/password")
-    @ApiOperation(value = "비밀번호 변경", notes = "기존 비밀번호를 검증 후 새 비밀번호로 변경합니다.")
+
+
+    @PutMapping("/resetpassword")
+    @ApiOperation(value = "비밀번호 초기화", notes = "user_id를 기반으로 비밀번호를 새 값으로 강제로 초기화합니다.")
     @ApiResponses({
-            @ApiResponse(code = 200, message = "비밀번호 변경 완료"),
-            @ApiResponse(code = 400, message = "기존 비밀번호 오류 또는 동일한 비밀번호")
+            @ApiResponse(code = 200, message = "비밀번호 초기화 성공"),
+            @ApiResponse(code = 400, message = "유효하지 않은 요청 또는 사용자 없음"),
+            @ApiResponse(code = 500, message = "서버 오류")
     })
-    public ResponseEntity<?> changePassword(  @ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken,
-                                            @RequestBody SwaggerPasswordChangeRequestDTO body) {
-        String accessToken = tokenUtils.extractAccessToken(bearerToken);
-        String userid = jwtProcessor.getUsername(accessToken);
+    public ResponseEntity<?> PasswordReset(@RequestBody SwaggerPasswordResetRequestDTO body) {
+        String userId = body.getUserId() == null ? "" : body.getUserId().trim();
+        String newPassword = body.getNewPassword() == null ? "" : body.getNewPassword().trim();
 
-        String oldPassword = body.getOldPassword() == null ? "" : body.getOldPassword();
-        String newPassword = body.getNewPassword() == null ? "" : body.getNewPassword();
+        if (userId.isEmpty() || newPassword.isEmpty()) {
+            return ResponseEntity.badRequest()
+                    .body(Map.of("error", "userId와 newPassword는 필수 입력 항목입니다."));
+        }
 
         try {
-            userService.updatePassword(userid, oldPassword, newPassword);
-            return ResponseEntity.ok(Map.of("message", "비밀번호 변경 완료!"));
-        } catch (IllegalArgumentException | IllegalStateException e) {
-            return ResponseEntity
-                    .badRequest()
-                    .body(Map.of("error", e.getMessage()));
+            userService.resetPassword(body);
+            return ResponseEntity.ok(Map.of("message", "비밀번호 초기화 완료"));
+        } catch (IllegalStateException | IllegalArgumentException e) {
+            return ResponseEntity.badRequest().body(Map.of("error", e.getMessage()));
         } catch (Exception e) {
-            log.error("비밀번호 변경 중 서버 오류", e);
+            log.error("비밀번호 초기화 처리 중 서버 오류 발생", e);
             return ResponseEntity.internalServerError()
-                    .body(Map.of("error", "비밀번호 변경 처리 중 오류"));
+                    .body(Map.of("error", "비밀번호 초기화 처리 중 서버 오류가 발생했습니다."));
         }
     }
 
+
     @PutMapping("/update")
     @ApiOperation(value = "회원정보 수정", notes = "회원 정보를 수정합니다 (userId는 수정 불가)")
     @ApiResponses({
             @ApiResponse(code = 200, message = "회원정보 수정 완료"),
             @ApiResponse(code = 400, message = "해당 사용자를 찾을 수 없음")
     })
-    public ResponseEntity<?> updateUser( @ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken,
-                                        @RequestBody MemberDTO user) {
+    public ResponseEntity<?> updateUser(
+            @ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken,
+            @RequestBody SwaggerUpdate updateDto
+    ) {
         String accessToken = tokenUtils.extractAccessToken(bearerToken);
         String userId = jwtProcessor.getUsername(accessToken);
-
         Integer usersIdx = userService.findUserIdxByUserId(userId);
+
         if (usersIdx == null) {
             return ResponseEntity.badRequest()
                     .body(Map.of("error", "해당 사용자를 찾을 수 없습니다."));
@@ -141,12 +158,48 @@ public ResponseEntity<?> updateUser( @ApiParam(hidden = true) @RequestHeader("Au
 
         log.info("/v1/auth/update 엔드포인트 호출됨");
 
-        user.setUsersIdx(usersIdx);
-        user.setUserId(userId);
+        MemberDTO user = MemberDTO.builder()
+                .usersIdx(usersIdx)
+                .userId(userId)
+                .userName(updateDto.getUserName())
+                .address(updateDto.getAddress())
+                .birthdate(updateDto.getBirthdate())
+                .build();
 
         userService.updateUser(user);
+
         log.info("수정 요청 받은 userName: {}", user.getUserName());
-        System.out.println(">> PUT 요청 도착: " + user);
+
         return ResponseEntity.ok(Map.of("message", "회원정보 수정 완료"));
     }
+
+    //비밀번호 변경
+    @PutMapping("/changepassword")
+    @ApiOperation(value = "비밀번호 변경", notes = "기존 비밀번호를 검증 후 새 비밀번호로 변경합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "비밀번호 변경 완료"),
+            @ApiResponse(code = 400, message = "기존 비밀번호 오류 또는 동일한 비밀번호")
+    })
+    public ResponseEntity<?> changePassword(  @ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken,
+                                              @RequestBody SwaggerPasswordChangeRequestDTO body) {
+        String accessToken = tokenUtils.extractAccessToken(bearerToken);
+        String userid = jwtProcessor.getUsername(accessToken);
+
+        String oldPassword = body.getOldPassword() == null ? "" : body.getOldPassword();
+        String newPassword = body.getNewPassword() == null ? "" : body.getNewPassword();
+
+        try {
+            userService.updatePassword(userid, oldPassword, newPassword);
+            return ResponseEntity.ok(Map.of("message", "비밀번호 변경 완료!"));
+        } catch (IllegalArgumentException | IllegalStateException e) {
+            return ResponseEntity
+                    .badRequest()
+                    .body(Map.of("error", e.getMessage()));
+        } catch (Exception e) {
+            log.error("비밀번호 변경 중 서버 오류", e);
+            return ResponseEntity.internalServerError()
+                    .body(Map.of("error", "비밀번호 변경 처리 중 오류"));
+        }
+    }
+
 }
diff --git a/src/main/java/org/scoula/controller/GaScoreController.java b/src/main/java/org/scoula/controller/GaScoreController.java
index b4f56f1..90dfef7 100644
--- a/src/main/java/org/scoula/controller/GaScoreController.java
+++ b/src/main/java/org/scoula/controller/GaScoreController.java
@@ -1,8 +1,10 @@
 package org.scoula.controller;
 
+import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.scoula.dto.GaScoreDTO;
+import org.scoula.dto.swagger.GaScore.SwaggerGaScoreRequest;
 import org.scoula.service.GaScoreService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -13,17 +15,43 @@
 @RestController
 @RequestMapping("/v1/ga-score")
 @RequiredArgsConstructor
+@Api(tags = "가점 API", description = "사용자 설문 기반 가점 계산 및 저장")
 public class GaScoreController {
 
     private final GaScoreService gaScoreService;
 
     @PostMapping
-    public ResponseEntity<GaScoreDTO> saveGaScore(@RequestBody GaScoreDTO requestDto,
-                                                  HttpServletRequest request) {
+    @ApiOperation(value = "가점 계산 정보 저장 및 응답", notes = "사용자의 설문 응답을 저장하고 가점 계산 결과를 반환합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "가점 계산 성공", response = GaScoreDTO.class),
+            @ApiResponse(code = 400, message = "잘못된 요청"),
+            @ApiResponse(code = 500, message = "서버 오류")
+    })
+    public ResponseEntity<GaScoreDTO> saveGaScore(@RequestBody SwaggerGaScoreRequest requestDto,
+                                                 @ApiParam(hidden = true) HttpServletRequest request) {
         log.info("POST /v1/ga-score request: {}", requestDto);
 
         GaScoreDTO responseDto = gaScoreService.saveGaScore(requestDto, request);
 
         return ResponseEntity.ok(responseDto);
     }
+
+    @GetMapping
+    @ApiOperation(value = "가점 계산 결과 조회", notes = "저장된 가점 계산 결과를 반환합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "가점 조회 성공", response = GaScoreDTO.class),
+            @ApiResponse(code = 404, message = "데이터 없음"),
+            @ApiResponse(code = 500, message = "서버 오류")
+    })
+    public ResponseEntity<GaScoreDTO> getGaScore(@ApiParam(hidden = true) HttpServletRequest request) {
+        log.info("GET /v1/ga-score");
+
+        GaScoreDTO responseDto = gaScoreService.getGaScore(request);
+
+        if (responseDto == null) {
+            return ResponseEntity.notFound().build();
+        }
+
+        return ResponseEntity.ok(responseDto);
+    }
 }
diff --git a/src/main/java/org/scoula/controller/KakaoLoginController.java b/src/main/java/org/scoula/controller/KakaoLoginController.java
index fc28313..e356477 100644
--- a/src/main/java/org/scoula/controller/KakaoLoginController.java
+++ b/src/main/java/org/scoula/controller/KakaoLoginController.java
@@ -1,36 +1,48 @@
 package org.scoula.controller;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
 import org.scoula.dto.oauth.KakaoUserInfoDto;
 import org.scoula.service.oauth.KakaoOauthService;
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("/api/oauth/kakao")
+@Api(tags = "카카오 API", description = "카카오 소셜 로그인 관련 API")
 public class KakaoLoginController {
 
     private final KakaoOauthService kakaoOauthService;
 
     /**
-     * 카카오 로그인 후 리다이렉트되는 callback 엔드포인트
+     * 카카오 인증 콜백 (Swagger UI에 노출되지 않음)
      * @param code 카카오에서 전달하는 인가 코드
      * @return KakaoUserInfoDto + JWT
      */
     @GetMapping("/callback")
+    @ApiOperation(value = "카카오 로그인 콜백 처리", hidden = true)
     public ResponseEntity<KakaoUserInfoDto> kakaoLogin(@RequestParam("code") String code) {
         log.info("카카오 인가 코드 수신: {}", code);
-
         KakaoUserInfoDto userInfo = kakaoOauthService.processKakaoLogin(code);
         return ResponseEntity.ok(userInfo);
     }
 
+    /**
+     * 카카오 로그인 페이지로 리다이렉트
+     */
     @GetMapping("/login")
+    @ApiOperation(value = "카카오 로그인 요청", notes = "카카오 인증 페이지로 리다이렉트합니다.")
     public String redirectToKakao() {
-        return "redirect:https://kauth.kakao.com/oauth/authorize?client_id=53da207a5cc86b7ec03890c960d2937b&redirect_uri=http://localhost:8080/api/oauth/kakao/callback&response_type=code";
+        String clientId = "53da207a5cc86b7ec03890c960d2937b";
+        String redirectUri = "http://localhost:8080/api/oauth/kakao/callback";
+        return "redirect:https://kauth.kakao.com/oauth/authorize"
+                + "?client_id=" + clientId
+                + "&redirect_uri=" + redirectUri
+                + "&response_type=code";
     }
 }
diff --git a/src/main/java/org/scoula/controller/ProbabilityController.java b/src/main/java/org/scoula/controller/ProbabilityController.java
index 3458088..5a595a7 100644
--- a/src/main/java/org/scoula/controller/ProbabilityController.java
+++ b/src/main/java/org/scoula/controller/ProbabilityController.java
@@ -1,5 +1,6 @@
 package org.scoula.controller;
 
+import io.swagger.annotations.Api;
 import lombok.RequiredArgsConstructor;
 import org.scoula.dto.ProbabilityDTO;
 import org.scoula.service.ProbabilityService;
@@ -9,6 +10,7 @@
 
 @RestController
 @RequiredArgsConstructor
+@Api(tags = "❌❌미구현 ❌❌")
 @RequestMapping("/api/probability")
 public class ProbabilityController {
 
diff --git a/src/main/java/org/scoula/controller/SubscriptionController.java b/src/main/java/org/scoula/controller/SubscriptionController.java
index 18252b3..5c5fa3d 100644
--- a/src/main/java/org/scoula/controller/SubscriptionController.java
+++ b/src/main/java/org/scoula/controller/SubscriptionController.java
@@ -6,14 +6,14 @@
 import org.scoula.dto.AptDetailDTO;
 import org.scoula.dto.HouseListDTO;
 import org.scoula.dto.OfficetelDetailDTO;
+import org.scoula.mapper.UserMapper;
+import org.scoula.security.util.JwtProcessor;
 import org.scoula.service.AptService;
 import org.scoula.service.HouseService;
 import org.scoula.service.OfficetelService;
+import org.scoula.util.TokenUtils;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
@@ -27,21 +27,29 @@ public class SubscriptionController {
     private final HouseService houseService;
     private final AptService aptService;
     private final OfficetelService officetelService;
+    private final TokenUtils tokenUtils;
+    private final JwtProcessor jwtProcessor;
+    private final UserMapper userMapper;
 
     @GetMapping("")
     @ApiOperation(
             value = "모든 청약공고 가져오기",
-            notes = "page, pageSize 쿼리 파라미터로 페이징 처리합니다. 인증 헤더 필요"
+            notes = "user의 즐겨찾기 정보를 포함한 전체 공고 리스트를 반환합니다. 인증 헤더 필요"
     )
     @ApiResponses({
             @ApiResponse(code = 200, message = "성공", response = HouseListDTO.class, responseContainer = "List"),
             @ApiResponse(code = 401, message = "인증 실패"),
             @ApiResponse(code = 500, message = "서버 오류")
     })
-    public ResponseEntity<?> getHousingList() {
+    public ResponseEntity<?> getHousingList(@ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken) {
         try {
-            List<HouseListDTO> list = houseService.getAllHousingList();
+
+            String accessToken = tokenUtils.extractAccessToken(bearerToken);
+            String userId = jwtProcessor.getUsername(accessToken);
+            int userIdx = userMapper.findUserIdxByUserId(userId);
+            List<HouseListDTO> list = houseService.getAllHousingList(userIdx);
             return ResponseEntity.ok(list);
+
         } catch (IllegalStateException e) {
             return ResponseEntity.internalServerError().body(Map.of("error", e.getMessage()));
         } catch (Exception e) {
@@ -59,9 +67,9 @@ public ResponseEntity<?> getHousingList() {
             @ApiResponse(code = 401, message = "인증 실패"),
             @ApiResponse(code = 500, message = "서버 오류")
     })
-    public ResponseEntity<?> getApartmentDetail(    @ApiParam(value = "아파트 공고번호", example = "2025000306", required = true)
-                                                        @RequestParam("pblanc_no") String pblancNo) {
+    public ResponseEntity<?> getApartmentDetail(@ApiParam(value = "아파트 공고번호", example = "2025000306", required = true) @RequestParam("pblanc_no") String pblancNo) {
         try {
+            aptService.incrementAptViewCount(pblancNo);
             AptDetailDTO detail = aptService.getAptDetail(pblancNo);
             return ResponseEntity.ok(detail);
         } catch (IllegalArgumentException e) {
@@ -84,6 +92,7 @@ public ResponseEntity<?> getApartmentDetail(    @ApiParam(value = "아파트 공
     public ResponseEntity<?> getOfficetelDetail(@ApiParam(value = "오피스텔 공고번호", example = "2025950040", required = true)
                                                     @RequestParam("pblanc_no") String pblancNo) {
         try {
+            officetelService.incrementOfficeViewCount(pblancNo);
             OfficetelDetailDTO detail = officetelService.getOfficetelDetail(pblancNo);
             return ResponseEntity.ok(detail);
         } catch (IllegalArgumentException e) {
diff --git a/src/main/java/org/scoula/controller/UserFavoriteController.java b/src/main/java/org/scoula/controller/UserFavoriteController.java
index dc504e5..5082191 100644
--- a/src/main/java/org/scoula/controller/UserFavoriteController.java
+++ b/src/main/java/org/scoula/controller/UserFavoriteController.java
@@ -1,68 +1,113 @@
 package org.scoula.controller;
 
+
+import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
+import lombok.extern.log4j.Log4j2;
 import org.scoula.dto.FavoriteRequestDTO;
-import org.scoula.dto.UserFavoriteDTO;
+import org.scoula.dto.HouseListDTO;
+import org.scoula.dto.swagger.UserFavorite.SwaggerAddFavoriteRequestDTO;
 import org.scoula.mapper.UserMapper;
-import org.scoula.security.account.mapper.UserDetailsMapper;
 import org.scoula.security.util.JwtProcessor;
 import org.scoula.service.UserFavoriteService;
+import org.scoula.service.UserService;
+import org.scoula.util.TokenUtils;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 import java.util.Map;
 
-@Slf4j
+@Log4j2
 @RestController
 @RequestMapping("/v1/me/favorite")
 @RequiredArgsConstructor
+@Api(tags = "즐겨찾기 API", description = "사용자의 주택 즐겨찾기 추가, 삭제, 조회 기능 제공")
 public class UserFavoriteController {
     private final UserMapper userMapper;
     private final UserFavoriteService userFavoriteService;
     private final JwtProcessor jwtProcessor;
+    private final TokenUtils tokenUtils;
+    private final UserService userService;
     public static final String BEARER_PREFIX = "Bearer ";
 
     // 즐겨찾기 추가
-    @PostMapping
-    public ResponseEntity<String> addFavorite(@RequestBody FavoriteRequestDTO favorite) {
-        boolean success = userFavoriteService.addFavorite(favorite.getUsersIdx(), favorite.getHouseType(), favorite.getNoticeIdx());
+    @PostMapping(produces = "application/json; charset=UTF-8")
+    @ApiOperation(value = "즐겨찾기 추가", notes = "사용자의 즐겨찾기에 주택을 추가합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "즐겨찾기 추가 완료"),
+            @ApiResponse(code = 400, message = "이미 즐겨찾기에 존재함")
+    })
+    public ResponseEntity<?> addFavorite(@ApiParam(hidden = true) @RequestHeader ("Authorization") String bearerToken , @RequestBody SwaggerAddFavoriteRequestDTO body) {
+        String accessToken = tokenUtils.extractAccessToken(bearerToken);
+        String username = jwtProcessor.getUsername(accessToken);
+        int usersIdx = userMapper.findUserIdxByUserId(username);
+
+        FavoriteRequestDTO favorite = FavoriteRequestDTO.builder()
+                        .usersIdx(usersIdx)
+                        .houseType(body.getHouseType())
+                        .pblancNo(body.getPblancNo())
+                        .build();
+
+        boolean success = userFavoriteService.addFavorite(favorite.getUsersIdx(), favorite.getHouseType(), favorite.getPblancNo());
         return success ? ResponseEntity.ok("즐겨찾기 추가 완료") :
                 ResponseEntity.badRequest().body("이미 즐겨찾기에 존재합니다.");
     }
 
+    // 즐겨찾기 삭제
+    @DeleteMapping(produces = "application/json; charset=UTF-8")
+    @ApiOperation(value = "즐겨찾기 삭제", notes = "사용자의 즐겨찾기에서 특정 주택을 삭제합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "즐겨찾기 삭제 완료"),
+            @ApiResponse(code = 400, message = "즐겨찾기가 존재하지 않거나 삭제 실패"),
+            @ApiResponse(code = 500, message = "서버 오류 발생")
+    })
+    public ResponseEntity<String> removeFavorite(
+            @ApiParam(hidden = true)
+            @RequestHeader("Authorization") String bearerToken,
+
+            @ApiParam(value = "주택 유형 (APT / 신혼희망타운 / 오피스텔 등)",example ="APT", required = true)
+            @RequestParam("house_type") String houseType,
+
+            @ApiParam(value = "공고 번호", example = "2025000306", required = true)
+            @RequestParam("pblanc_no") String pblancNo
+    ) {
+        try {
+            String accessToken = tokenUtils.extractAccessToken(bearerToken);
+            String username = jwtProcessor.getUsername(accessToken);
+            int usersIdx = userMapper.findUserIdxByUserId(username);
+
+            boolean success = userFavoriteService.deleteFavorite(usersIdx, houseType, pblancNo);
+
+            return success ? ResponseEntity.ok("즐겨찾기 삭제 완료") : ResponseEntity.badRequest().body("즐겨찾기가 존재하지 않거나 삭제 실패");
+        } catch (Exception e) {
+            log.error("즐겨찾기 삭제 중 오류", e);
+            return ResponseEntity.internalServerError().body("서버 오류 발생");
+        }
+    }
+
     // 특정 사용자의 즐겨찾기 목록
     @GetMapping("/list")
-    public ResponseEntity<?> getFavorites(@RequestHeader("Authorization") String bearerToken) {
+    @ApiOperation(value = "즐겨찾기 목록 조회", notes = "현재 로그인한 사용자의 즐겨찾기 주택 목록을 조회합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "즐겨찾기 목록 조회 성공", response = HouseListDTO.class, responseContainer = "List"),
+            @ApiResponse(code = 500, message = "즐겨찾기 목록 조회 중 오류")
+    })
+    public ResponseEntity<?> getFavorites(@ApiParam(hidden = true) @RequestHeader("Authorization") String bearerToken) {
         try {
-            //  1. access 토큰 꺼내기
-            String accessToken = null;
-            if (bearerToken != null && bearerToken.startsWith(BEARER_PREFIX)) {
-                accessToken = bearerToken.substring(BEARER_PREFIX.length());}
-            else {
-                return ResponseEntity.status(400).body(Map.of("error", "Authorization 헤더가 유효하지 않습니다"));}
-
-            // 2. 유효성 검사하기
-            if (!jwtProcessor.validateToken(accessToken)) {
-                return ResponseEntity.status(401).body(Map.of("error", "유효하지 않은 Access Token"));}
-
-            // 3. Refresh Token 삭제
+            String accessToken = tokenUtils.extractAccessToken(bearerToken);
             String username = jwtProcessor.getUsername(accessToken);
             int usersIdx = userMapper.findUserIdxByUserId(username);
 
-            return ResponseEntity.ok(userFavoriteService.getFavorites(usersIdx));
+            List<HouseListDTO> favorites = userFavoriteService.getFavoriteHouses(usersIdx);
+            return ResponseEntity.ok(favorites);
+
         } catch (Exception e) {
-            log.error("사용자 즐겨찾기 목록 읽는 중 오류", e);
-            return ResponseEntity.status(500).body(Map.of("error", "사용자 즐겨찾기 목록 읽는 중 오류"));
+            log.error("즐겨찾기 목록 조회 실패", e);
+            return ResponseEntity.status(500).body(Map.of("error", "즐겨찾기 목록 조회 중 오류"));
         }
     }
 
-    // 즐겨찾기 삭제
-    @DeleteMapping("/{favoriteId}")
-    public ResponseEntity<String> removeFavorite(@PathVariable("favoriteId") int favoriteId) {
-        boolean success = userFavoriteService.deleteFavorite(favoriteId);
-        return success ? ResponseEntity.ok("즐겨찾기 삭제 완료") :
-                ResponseEntity.badRequest().body("삭제 실패");
-    }
+
+
 }
diff --git a/src/main/java/org/scoula/controller/UserSelectedController.java b/src/main/java/org/scoula/controller/UserSelectedController.java
index d63a9c9..f5798da 100644
--- a/src/main/java/org/scoula/controller/UserSelectedController.java
+++ b/src/main/java/org/scoula/controller/UserSelectedController.java
@@ -1,5 +1,6 @@
 package org.scoula.controller;
 
+import io.swagger.annotations.*;
 import lombok.RequiredArgsConstructor;
 import org.scoula.dto.UserSelectedDTO;
 import org.scoula.security.util.JwtProcessor;
@@ -7,9 +8,13 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @RestController
 @RequestMapping("/v1/user/preferences")
 @RequiredArgsConstructor
+@Api(tags = "사용자 선호 API", description = "사용자의 선호 정보를 저장·조회합니다")
 public class UserSelectedController {
 
     private final UserSelectedService userSelectedService;
@@ -20,16 +25,40 @@ private String extractUserIdFromToken(String token) {
     }
 
     @PostMapping
-    public ResponseEntity<String> saveUserSelected(@RequestHeader("Authorization") String token,
-                                                   @RequestBody UserSelectedDTO userSelectedDTO) {
+    @ApiOperation(value = "선호 정보 저장", notes = "로그인된 사용자의 선호 정보를 저장합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "저장 성공"),
+            @ApiResponse(code = 400, message = "잘못된 요청"),
+            @ApiResponse(code = 401, message = "인증 실패")
+    })
+
+    public ResponseEntity<Map<String, String>> saveUserSelected(
+            @ApiParam(value = "저장할 사용자 선호 정보", required = true)
+            @RequestBody UserSelectedDTO userSelectedDTO,
+            @ApiParam(hidden = true)@RequestHeader("Authorization") String token
+    ) {
         String userId = extractUserIdFromToken(token);
         userSelectedService.saveAllPreferences(userId, userSelectedDTO);
-        return ResponseEntity.ok("사용자 선호 정보가 저장되었습니다.");
+        Map<String, String> response = new HashMap<>();
+        response.put("message", "사용자 선호 정보가 저장되었습니다.");
+        return ResponseEntity.ok(response);
     }
 
     @GetMapping
-    public UserSelectedDTO getUserSelected(@RequestHeader("Authorization") String token) {
+    @ApiOperation(value = "❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌❌", notes = "로그인된 사용자의 선호 정보를 조회합니다.")
+    @ApiResponses({
+            @ApiResponse(code = 200, message = "조회 성공", response = UserSelectedDTO.class),
+            @ApiResponse(code = 401, message = "인증 실패"),
+            @ApiResponse(code = 404, message = "선호 정보 없음")
+    })
+
+    public ResponseEntity<UserSelectedDTO> getUserSelected(
+            @ApiParam(hidden = true) @RequestHeader("Authorization") String token
+    ) {
         String userId = extractUserIdFromToken(token);
-        return userSelectedService.getUserSelected(userId);
+        UserSelectedDTO dto = userSelectedService.getUserSelected(userId);
+        return ResponseEntity.ok(dto);
+
     }
+
 }
diff --git a/src/main/java/org/scoula/dto/AptDTO.java b/src/main/java/org/scoula/dto/AptDTO.java
index ca9b4c4..ecefd48 100644
--- a/src/main/java/org/scoula/dto/AptDTO.java
+++ b/src/main/java/org/scoula/dto/AptDTO.java
@@ -141,7 +141,9 @@ public class AptDTO {
     @JsonProperty("PBLANC_URL")
     private String pblancUrl;
 
-    private Long lattitude;
+    private Double latitude;
 
-    private Long longitude;
+    private Double longitude;
+
+    private int aptIdx;
 }
diff --git a/src/main/java/org/scoula/dto/AptDetailDTO.java b/src/main/java/org/scoula/dto/AptDetailDTO.java
index 950e9ae..b2fb1d2 100644
--- a/src/main/java/org/scoula/dto/AptDetailDTO.java
+++ b/src/main/java/org/scoula/dto/AptDetailDTO.java
@@ -1,6 +1,7 @@
 package org.scoula.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
@@ -9,59 +10,146 @@
 
 @Data
 public class AptDetailDTO {
+    @JsonIgnore
+    private Integer aptIdx;
+    @JsonProperty ("favorite_count")
+    private Integer favoriteCount;
+    @JsonProperty("view_count")
+    private Integer viewCount;
+
+    @JsonProperty("house_manage_no")
     private String houseManageNo;
+
+    @JsonProperty("pblanc_no")
     private String pblancNo;
+
+    @JsonProperty("house_nm")
     private String houseNm;
+
+    @JsonProperty("house_secd")
     private String houseSecd;
+
+    @JsonProperty("house_secd_nm")
     private String houseSecdNm;
+
+    @JsonProperty("house_dtl_secd")
     private String houseDtlSecd;
+
+    @JsonProperty("house_dtl_secd_nm")
     private String houseDtlSecdNm;
+
+    @JsonProperty("search_house_secd")
     private String rentSecd;
+
+    @JsonProperty("search_house_secd_nm")
     private String rentSecdNm;
+
+    @JsonProperty("subscrpt_area_code")
     private String subscrptAreaCode;
+
+    @JsonProperty("subscrpt_area_code_nm")
     private String subscrptAreaCodeNm;
+
+    @JsonProperty("hssply_adres")
     private String hssplyAdres;
+
+    @JsonProperty("tot_suply_hshldco")
     private Integer totSuplyHshldco;
+
+    @JsonProperty("rcrit_pblanc_de")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate rcritPblancDe;
+
+    @JsonProperty("rcept_bgnde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate rceptBgnde;
+
+    @JsonProperty("rcept_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate rceptEndde;
+
+    @JsonProperty("spsply_rcept_bgnde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate spsplyRceptBgnde;
+
+    @JsonProperty("spsply_rcept_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate spsplyRceptEndde;
+
+    @JsonProperty("gnrl_rnk1_crsparea_rcptde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk1CrspareaRcptde;
+
+    @JsonProperty("gnrl_rnk1_crsparea_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk1CrspareaEndde;
+
+    @JsonProperty("gnrl_rnk1_etc_area_rcptde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk1EtcAreaRcptde;
+
+    @JsonProperty("gnrl_rnk1_etc_area_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk1EtcAreaEndde;
+
+    @JsonProperty("gnrl_rnk2_crsparea_rcptde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk2CrspareaRcptde;
+
+    @JsonProperty("gnrl_rnk2_crsparea_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk2CrspareaEndde;
+
+    @JsonProperty("gnrl_rnk2_etc_area_rcptde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk2EtcAreaRcptde;
+
+    @JsonProperty("gnrl_rnk2_etc_area_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate gnrlRnk2EtcAreaEndde;
+
+    @JsonProperty("przwner_presnatn_de")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate przwnerPresnatnDe;
+
+    @JsonProperty("cntrct_cncls_bgnde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate cntrctCnclsBgnde;
+
+    @JsonProperty("cntrct_cncls_endde")
     @JsonFormat(pattern = "yyyy-MM-dd")
     private LocalDate cntrctCnclsEndde;
+
+    @JsonProperty("hmpg_adres")
     private String hmpgAdres;
+
+    @JsonProperty("cnstrct_entrps_nm")
     private String cnstrctEntrpsNm;
+
+    @JsonProperty("mdhs_telno")
     private String mdhsTelno;
+
+    @JsonProperty("bsns_mby_nm")
     private String bsnsMbyNm;
+
+    @JsonProperty("mvn_prearnge_ym")
     private String mvnPrearngeYm;
+
+    @JsonProperty("speclt_rdn_earth_at")
     private String specltRdnEarthAt;
+
+    @JsonProperty("mdat_trget_area_secd")
     private String mdatTrgetAreaSecd;
+
+    @JsonProperty("parcprc_uls_at")
     private String parcprcUlsAt;
+
+    @JsonProperty("pblanc_url")
     private String pblancUrl;
+
+    @JsonProperty("apt_type")
     private List<AptTypeDTO> aptType;
+
+    @JsonProperty("infra_places")
+    private List<InfraPlaceDTO> infraPlaces;
 }
diff --git a/src/main/java/org/scoula/dto/AptTypeDTO.java b/src/main/java/org/scoula/dto/AptTypeDTO.java
index c1b807f..2f2458f 100644
--- a/src/main/java/org/scoula/dto/AptTypeDTO.java
+++ b/src/main/java/org/scoula/dto/AptTypeDTO.java
@@ -1,5 +1,6 @@
 package org.scoula.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -22,5 +23,6 @@ public class AptTypeDTO {
     @JsonProperty("LTTOT_TOP_AMOUNT")
     private String lttotTopAmount;
 
+    @JsonIgnore
     private Integer aptIdx;
 }
diff --git a/src/main/java/org/scoula/dto/FavoriteRequestDTO.java b/src/main/java/org/scoula/dto/FavoriteRequestDTO.java
index 45ad00c..5a74abe 100644
--- a/src/main/java/org/scoula/dto/FavoriteRequestDTO.java
+++ b/src/main/java/org/scoula/dto/FavoriteRequestDTO.java
@@ -1,10 +1,17 @@
 package org.scoula.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Builder;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
+@Builder
 public class FavoriteRequestDTO {
     private int usersIdx;
+    @JsonProperty("house_type")
     private String houseType;
-    private int noticeIdx;
+    @JsonProperty("pblanc_no")
+    private String pblancNo;
 }
diff --git a/src/main/java/org/scoula/dto/GaScoreDTO.java b/src/main/java/org/scoula/dto/GaScoreDTO.java
index 3268e4c..ecbd45d 100644
--- a/src/main/java/org/scoula/dto/GaScoreDTO.java
+++ b/src/main/java/org/scoula/dto/GaScoreDTO.java
@@ -1,53 +1,76 @@
 package org.scoula.dto;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
+import java.time.YearMonth;
 
 @Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
 public class GaScoreDTO {
-
+    //무주택
     @JsonProperty("no_house_period")
     private int noHousePeriod;
 
+    //부양가족수
     @JsonProperty("dependents_nm")
     private int dependentsNm;
 
+    //무주택기간 점수로 변환
     @JsonProperty("no_house_score")
     private int noHouseScore;
 
+    //부양 가족수 점수
     @JsonProperty("dependents_score")
     private int dependentsScore;
 
+    //주택 청약 통장 가입 기간(개월수)
     @JsonProperty("payment_period")
     private int paymentPeriod;
 
+    //통장가입기간 점수화
     @JsonProperty("payment_period_score")
     private int paymentPeriodScore;
 
+    //세대주 여부 (1 or 0)
     @JsonProperty("head_of_household")
     private int headOfHousehold;
 
+    //주택 소유 여부 (1 or 0 )
     @JsonProperty("house_owner")
     private int houseOwner;
 
+    //주택 처분 여부 (1 or 0 )
     @JsonProperty("house_disposal")
     private int houseDisposal;
 
+    //주택 처분 날짜 (처분여부가 1이면 이게 필수임 or null)
     @JsonProperty("disposal_date")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private LocalDate disposalDate;
+    private String disposalDate;
 
+    //결혼 여부 (1 or 0)
     @JsonProperty("marital_status")
     private int maritalStatus;
 
+    // 결혼 1이면 결혼 날짜 0 이면 null
     @JsonProperty("wedding_date")
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd")
-    private LocalDate weddingDate;
+    private String weddingDate;
 
+    // 총 가점 합계
     @JsonProperty("total_ga_score")
     private int totalGaScore;
 
+    @JsonProperty("residence_start_date")
+    private String residenceStartDate;
+
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY, value = "birth_date")
+    private String birthDate;
 }
diff --git a/src/main/java/org/scoula/dto/HomePriceDTO.java b/src/main/java/org/scoula/dto/HomePriceDTO.java
index 5253c60..6481839 100644
--- a/src/main/java/org/scoula/dto/HomePriceDTO.java
+++ b/src/main/java/org/scoula/dto/HomePriceDTO.java
@@ -1,18 +1,21 @@
 package org.scoula.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(description = "희망 최소·최대 가격 DTO")
 public class HomePriceDTO {
 
+    @ApiModelProperty(value = "희망 최소 가격", example = "300000000", required = true)
     @JsonProperty("hope_min_price")
     private int hopeMinPrice;
 
+    @ApiModelProperty(value = "희망 최대 가격", example = "500000000", required = true)
     @JsonProperty("hope_max_price")
     private int hopeMaxPrice;
 }
diff --git a/src/main/java/org/scoula/dto/HomeSizeDTO.java b/src/main/java/org/scoula/dto/HomeSizeDTO.java
index afbde94..f0821f9 100644
--- a/src/main/java/org/scoula/dto/HomeSizeDTO.java
+++ b/src/main/java/org/scoula/dto/HomeSizeDTO.java
@@ -1,18 +1,21 @@
 package org.scoula.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(description = "선택 주택 면적 DTO")
 public class HomeSizeDTO {
 
+    @ApiModelProperty(value = "최소 주택 면적(㎡)", example = "60", required = true)
     @JsonProperty("min_homesize")
     private int minHomesize;
 
+    @ApiModelProperty(value = "최대 주택 면적(㎡)", example = "85", required = true)
     @JsonProperty("max_homesize")
     private int maxHomesize;
 }
diff --git a/src/main/java/org/scoula/dto/HomeTypeDTO.java b/src/main/java/org/scoula/dto/HomeTypeDTO.java
index 2d25d88..df022bf 100644
--- a/src/main/java/org/scoula/dto/HomeTypeDTO.java
+++ b/src/main/java/org/scoula/dto/HomeTypeDTO.java
@@ -1,15 +1,17 @@
 package org.scoula.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(description = "선택 주택 유형 DTO")
 public class HomeTypeDTO {
 
+    @ApiModelProperty(value = "선택 주택 종류", example = "아파트", required = true)
     @JsonProperty("selected_house_secd")
     private String selectedHouseSecd;
 }
diff --git a/src/main/java/org/scoula/dto/HouseListDTO.java b/src/main/java/org/scoula/dto/HouseListDTO.java
index 15f5232..0ce1260 100644
--- a/src/main/java/org/scoula/dto/HouseListDTO.java
+++ b/src/main/java/org/scoula/dto/HouseListDTO.java
@@ -1,13 +1,34 @@
 package org.scoula.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 
 @Data
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class HouseListDTO {
-    private String houseNm;              // 공고명
-    private String hssplyAdres;          // 공급 주소
-    private String applicationPeriod;    // 접수 기간 문자열 (예: 2025.07.31 ~ 2025.08.05)
-    private Double suplyAr;              // 공급 면적 (apt_type.suply_ar 또는 officetel_type.excluse_ar)
-    private Integer price;               // 분양가 (apt_type.lttot_top_amount 또는 officetel_type.suply_amount)
-    private String houseType;            // 공고유형 (APT, 신혼희망타운, 오피스텔, 도시형생활주택)
+    @JsonProperty("favorite_count")
+    private Integer favoriteCount;
+    @JsonProperty("house_nm") // 공고명
+    private String houseNm;
+    @JsonProperty("hssply_adres") // 공급 주소
+    private String hssplyAdres;
+    @JsonProperty("pblanc_no")
+    private String pblancNo;
+    @JsonProperty("application_period") // 접수 기간 문자열 (예: 2025.07.31 ~ 2025.08.05)
+    private String applicationPeriod;
+    private String si;
+    private String sigungu;
+    @JsonProperty("house_type") // 공고유형 (APT, 신혼희망타운, 오피스텔, 도시형생활주택)
+    private String houseType;
+    @JsonProperty("min_area")
+    private String minArea;
+    @JsonProperty("max_area")
+    private String maxArea;
+    @JsonProperty("min_price")
+    private String minPrice;
+    @JsonProperty("max_price")
+    private String maxPrice;
+    @JsonProperty("is_favorite")
+    private boolean isFavorite;
 }
diff --git a/src/main/java/org/scoula/dto/InfraPlaceDTO.java b/src/main/java/org/scoula/dto/InfraPlaceDTO.java
new file mode 100644
index 0000000..4ca0695
--- /dev/null
+++ b/src/main/java/org/scoula/dto/InfraPlaceDTO.java
@@ -0,0 +1,16 @@
+package org.scoula.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.Data;
+
+@Data
+public class InfraPlaceDTO {
+    @JsonProperty("place_type")
+    private String placeType;
+    @JsonProperty("place_name")
+    private String placeName;
+    @JsonProperty("distance")
+    private Double distance;
+    @JsonProperty("road_address_name")
+    private String roadAddressName;
+}
diff --git a/src/main/java/org/scoula/dto/OfficetelDTO.java b/src/main/java/org/scoula/dto/OfficetelDTO.java
index 6dbe589..41569dc 100644
--- a/src/main/java/org/scoula/dto/OfficetelDTO.java
+++ b/src/main/java/org/scoula/dto/OfficetelDTO.java
@@ -86,6 +86,11 @@ public class OfficetelDTO {
 
     @JsonProperty("PBLANC_URL")
     private String pblancUrl;
+
+    private Integer officetelIdx;
+
+    private Double latitude;
+    private Double longitude;
 }
 
 
diff --git a/src/main/java/org/scoula/dto/OfficetelDetailDTO.java b/src/main/java/org/scoula/dto/OfficetelDetailDTO.java
index 4fc97ec..9d6b05a 100644
--- a/src/main/java/org/scoula/dto/OfficetelDetailDTO.java
+++ b/src/main/java/org/scoula/dto/OfficetelDetailDTO.java
@@ -2,12 +2,19 @@
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.databind.PropertyNamingStrategies;
+import com.fasterxml.jackson.databind.annotation.JsonNaming;
 import lombok.Data;
 
 import java.time.LocalDate;
 import java.util.List;
 @Data
+@JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy.class)
 public class OfficetelDetailDTO {
+    @JsonProperty("favorite_count")
+    private Integer favoriteCount;
+    @JsonProperty("view_count")
+    private Integer viewCount;
     private String houseManageNo;
     private String pblancNo;
     private String houseNm;
@@ -38,4 +45,5 @@ public class OfficetelDetailDTO {
     private String mvnPrearngeYm;
     private String pblancUrl;
     private List<OfficetelTypeDTO> officetelType;
+    private List<InfraPlaceDTO> infraPlaces;
 }
diff --git a/src/main/java/org/scoula/dto/OfficetelTypeDTO.java b/src/main/java/org/scoula/dto/OfficetelTypeDTO.java
index 00bcaee..b2e22c0 100644
--- a/src/main/java/org/scoula/dto/OfficetelTypeDTO.java
+++ b/src/main/java/org/scoula/dto/OfficetelTypeDTO.java
@@ -1,5 +1,6 @@
 package org.scoula.dto;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
@@ -24,6 +25,7 @@ public class OfficetelTypeDTO {
     @JsonProperty("SUBSCRPT_REQST_AMOUNT")
     private Integer subscrptReqstAmount;
 
+    @JsonIgnore
     private Integer officetelIdx;
 
 
diff --git a/src/main/java/org/scoula/dto/PlaceDTO.java b/src/main/java/org/scoula/dto/PlaceDTO.java
new file mode 100644
index 0000000..a46173c
--- /dev/null
+++ b/src/main/java/org/scoula/dto/PlaceDTO.java
@@ -0,0 +1,16 @@
+package org.scoula.dto;
+
+import lombok.Data;
+
+@Data
+public class PlaceDTO {
+    private Integer aptIdx;
+    private Integer officetelIdx;
+    private String placeType;
+    private String placeName;
+    private String address;
+    private Integer distance;           // 거리 (meter)
+    private double latitude;
+    private double longitude;
+    private String categoryName;
+}
diff --git a/src/main/java/org/scoula/dto/RegionDTO.java b/src/main/java/org/scoula/dto/RegionDTO.java
index 83fee33..8b4eae4 100644
--- a/src/main/java/org/scoula/dto/RegionDTO.java
+++ b/src/main/java/org/scoula/dto/RegionDTO.java
@@ -1,18 +1,20 @@
 package org.scoula.dto;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.*;
 
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@ApiModel(description = "선택 지역 DTO")
 public class RegionDTO {
 
-
+    @ApiModelProperty(value = "시·도", example = "서울특별시", required = true)
     private String si;
 
+    @ApiModelProperty(value = "구·군", example = "성북구", required = true)
     @JsonProperty("gun_gu")
     private String gunGu;
 }
diff --git a/src/main/java/org/scoula/dto/UserFavoriteDTO.java b/src/main/java/org/scoula/dto/UserFavoriteDTO.java
index 3387463..124e332 100644
--- a/src/main/java/org/scoula/dto/UserFavoriteDTO.java
+++ b/src/main/java/org/scoula/dto/UserFavoriteDTO.java
@@ -4,10 +4,10 @@
 
 @Data
 public class UserFavoriteDTO {
-    private int userFavoriteIdx;      // PK
-    private Integer usersIdx;         // 사용자 ID
-    private Integer aptIdx;           // 아파트 공고 ID (nullable)
-    private Integer offiIdx;          // 오피스텔 공고 ID (nullable)
-    private Float predictedWinRate;   // 예측 당첨 확률
-    private Float predictedCutoffScore; // 예측 커트라인 점수
+    private int     userFavoriteIdx;       // PK
+    private Integer usersIdx;              // FK → users.users_idx
+    private String  aptPblanc;             // nullable
+    private String  officePblanc;          // nullable
+    private Float   predictedWinRate;
+    private Float   predictedCutoffScore;
 }
diff --git a/src/main/java/org/scoula/dto/UserSelectedDTO.java b/src/main/java/org/scoula/dto/UserSelectedDTO.java
index 5778d24..3659886 100644
--- a/src/main/java/org/scoula/dto/UserSelectedDTO.java
+++ b/src/main/java/org/scoula/dto/UserSelectedDTO.java
@@ -24,4 +24,4 @@ public class UserSelectedDTO {
 
     @JsonProperty("selected_hometype")
     private List<HomeTypeDTO> selectedHometype = new ArrayList<>();
-}
+}
\ No newline at end of file
diff --git a/src/main/java/org/scoula/dto/swagger/Auth/SwaggerPasswordResetRequestDTO.java b/src/main/java/org/scoula/dto/swagger/Auth/SwaggerPasswordResetRequestDTO.java
new file mode 100644
index 0000000..5bb622f
--- /dev/null
+++ b/src/main/java/org/scoula/dto/swagger/Auth/SwaggerPasswordResetRequestDTO.java
@@ -0,0 +1,16 @@
+package org.scoula.dto.swagger.Auth;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SwaggerPasswordResetRequestDTO {
+    @JsonProperty("user_id")
+    @ApiModelProperty(value = "비밀번호를 변경할 사용자 ID", required = true, example = "test@example.com")
+    private String userId;
+
+    @JsonProperty("new_password")
+    @ApiModelProperty(value = "새 비밀번호", required = true, example = "NewP@ssword123")
+    private String newPassword;
+}
diff --git a/src/main/java/org/scoula/dto/swagger/Auth/SwaggerSignOutRequestDTO.java b/src/main/java/org/scoula/dto/swagger/Auth/SwaggerSignOutRequestDTO.java
new file mode 100644
index 0000000..5cc4551
--- /dev/null
+++ b/src/main/java/org/scoula/dto/swagger/Auth/SwaggerSignOutRequestDTO.java
@@ -0,0 +1,11 @@
+package org.scoula.dto.swagger.Auth;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SwaggerSignOutRequestDTO {
+
+    @ApiModelProperty(value = "회원 탈퇴를 위한 회원 비밀번호 입력", required = true, example = "1234")
+    private String password;
+}
diff --git a/src/main/java/org/scoula/dto/swagger/Auth/SwaggerUpdate.java b/src/main/java/org/scoula/dto/swagger/Auth/SwaggerUpdate.java
new file mode 100644
index 0000000..d7073af
--- /dev/null
+++ b/src/main/java/org/scoula/dto/swagger/Auth/SwaggerUpdate.java
@@ -0,0 +1,36 @@
+package org.scoula.dto.swagger.Auth;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.scoula.security.dto.AuthDTO;
+
+import java.util.Date;
+import java.util.List;
+
+@Data
+public class SwaggerUpdate {
+
+    @ApiModelProperty(
+            value   = "변경할 유저 이름 입력",
+            required= true,
+            example = "test 유저 이름"
+    )
+    @JsonProperty("user_name")
+    private String userName;           // users.user_name
+
+    @ApiModelProperty(
+            value   = "변경된 address",
+            required= true,
+            example = "서울특별시 강남구"
+    )
+    private String address;
+
+    @ApiModelProperty(
+            value   = "변경된 생일 입력",
+            required= true,
+            example = "2001-01-01"
+    )
+    private Date birthdate;
+
+}
diff --git a/src/main/java/org/scoula/dto/swagger/GaScore/SwaggerGaScoreRequest.java b/src/main/java/org/scoula/dto/swagger/GaScore/SwaggerGaScoreRequest.java
new file mode 100644
index 0000000..1c762e8
--- /dev/null
+++ b/src/main/java/org/scoula/dto/swagger/GaScore/SwaggerGaScoreRequest.java
@@ -0,0 +1,51 @@
+package org.scoula.dto.swagger.GaScore;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SwaggerGaScoreRequest {
+
+    @ApiModelProperty(value = "세대주 여부 (1: 예, 0: 아니오)", example = "1", required = true)
+    @JsonProperty("head_of_household")
+    private int headOfHousehold;
+
+    @ApiModelProperty(value = "주택 소유 여부 (1: 무주택, 0: 유주택)", example = "1", required = true)
+    @JsonProperty("house_owner")
+    private int houseOwner;
+
+    @ApiModelProperty(value = "주택 처분 여부 (1: 처분함, 0: 안함)", example = "0", required = true)
+    @JsonProperty("house_disposal")
+    private int houseDisposal;
+
+    @ApiModelProperty(value = "주택 처분일 (yyyy-MM, null 허용)", example = "null")
+    @JsonProperty("disposal_date")
+    private String disposalDate;
+
+    @ApiModelProperty(value = "혼인 여부 (1: 기혼, 0: 미혼)", example = "1", required = true)
+    @JsonProperty("marital_status")
+    private int maritalStatus;
+
+    @ApiModelProperty(value = "혼인 날짜 (yyyy-MM, null 허용)", example = "2015-05")
+    @JsonProperty("wedding_date")
+    private String weddingDate;
+
+    @ApiModelProperty(value = "무주택 기간 (단위 : 년)", example = "6", required = true)
+    @JsonProperty("no_house_period")
+    private int noHousePeriod;
+
+    @ApiModelProperty(value = "부양가족 수", example = "3", required = true)
+    @JsonProperty("dependents_nm")
+    private int dependentsNm;
+
+    @ApiModelProperty()
+    @JsonProperty(access = JsonProperty.Access.WRITE_ONLY, value = "birth_date")
+    private String birthDate;
+
+    @ApiModelProperty()
+    @JsonProperty("residence_start_date")
+    private String residenceStartDate;
+
+}
diff --git a/src/main/java/org/scoula/dto/swagger/UserFavorite/SwaggerAddFavoriteRequestDTO.java b/src/main/java/org/scoula/dto/swagger/UserFavorite/SwaggerAddFavoriteRequestDTO.java
new file mode 100644
index 0000000..af61692
--- /dev/null
+++ b/src/main/java/org/scoula/dto/swagger/UserFavorite/SwaggerAddFavoriteRequestDTO.java
@@ -0,0 +1,17 @@
+package org.scoula.dto.swagger.UserFavorite;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class SwaggerAddFavoriteRequestDTO {
+
+    @ApiModelProperty(value = "주택 유형 (APT, 신혼희망타운 등)", example = "APT", required = true)
+    @JsonProperty("house_type")
+    private String houseType;
+
+    @ApiModelProperty(value = "공고 번호", example = "2025000271", required = true)
+    @JsonProperty("pblanc_no")
+    private String pblancNo;
+}
diff --git a/src/main/java/org/scoula/mapper/AccountMapper.java b/src/main/java/org/scoula/mapper/AccountMapper.java
index 18b374b..30d63ba 100644
--- a/src/main/java/org/scoula/mapper/AccountMapper.java
+++ b/src/main/java/org/scoula/mapper/AccountMapper.java
@@ -17,5 +17,8 @@ void insertChungyakAccount(@Param("dto") ChungyakAccountDTO dto,
     ChungyakAccountDTO findAccountByUserIdx(@Param("userIdx") int userIdx);
 
     LocalDate findAccountStartDate(@Param("userIdx") int userIdx);
+
+    void deleteAccountByUserIdx(@Param("userIdx") int userIdx);
+
 }
 
diff --git a/src/main/java/org/scoula/mapper/AptMapper.java b/src/main/java/org/scoula/mapper/AptMapper.java
index f42cfa1..1efc238 100644
--- a/src/main/java/org/scoula/mapper/AptMapper.java
+++ b/src/main/java/org/scoula/mapper/AptMapper.java
@@ -10,7 +10,7 @@
 @Mapper
 public interface AptMapper {
     void insertApt(AptDTO aptDTO);
-    List<AptIdxDTO> getIdxAndHouseMangeNo(); // apt 테이블에서  house_manage_no 와 apt_idx 만 가져옴
+    List<AptIdxDTO> getIdxAndHouseMangeNo();
     void insertAptType(AptTypeDTO aptTypeResponseDTO);
     void deleteOld(@Param("firstDayOfMonth") LocalDate firstDayOfMonth);
 
@@ -18,8 +18,22 @@ public interface AptMapper {
     List<OfficetelIdxDTO>getIdxAndHouseManageNoFromOfficetel();
     void insertOfficetelType(OfficetelTypeDTO officetelTypeDTO);
     void deleteOldFromOfficetel(@Param("firstDayOfMonth") LocalDate firstDayOfMonth);
+
     AptDetailDTO getAptDetails(String pblanc_no);
     OfficetelDetailDTO getOfficetelDetails(String pblanc_no);
 
+    int findAptIdxByPblancNo(@Param("pblancNo") String pblancNo);
+    int findOfficetelIdxByPblancNo(@Param("pblancNo") String pblancNo);
+
+    List<AptDTO> findAllAptLocations();
+    List<OfficetelDTO> findAllOfficetelLocations();
+
+    int incrementAptViewCount(@Param("pblancNo") String pblancNo);
+    int incrementOfficetelViewCount(@Param("pblancNo") String pblancNo);
+
+    List<InfraPlaceDTO> getInfraPlace(@Param("aptIdx") int aptIdx);
+    List<InfraPlaceDTO> getOfficetelInfraPlace(@Param("officetelIdx") int officetelIdx);
+
+
 
 }
diff --git a/src/main/java/org/scoula/mapper/GaScoreMapper.java b/src/main/java/org/scoula/mapper/GaScoreMapper.java
index 1751ac2..7a036bb 100644
--- a/src/main/java/org/scoula/mapper/GaScoreMapper.java
+++ b/src/main/java/org/scoula/mapper/GaScoreMapper.java
@@ -9,4 +9,6 @@ public interface GaScoreMapper {
 
     // 청약 가점 정보 저장
     void insertGaScore(@Param("dto") GaScoreDTO dto, @Param("userIdx") int userIdx);
+
+    GaScoreDTO findGaScoreByUserIdx(@Param("userIdx") int userIdx);
 }
diff --git a/src/main/java/org/scoula/mapper/HouseListMapper.java b/src/main/java/org/scoula/mapper/HouseListMapper.java
index c9a10ba..bda4f83 100644
--- a/src/main/java/org/scoula/mapper/HouseListMapper.java
+++ b/src/main/java/org/scoula/mapper/HouseListMapper.java
@@ -1,9 +1,10 @@
 package org.scoula.mapper;
 
+import org.apache.ibatis.annotations.Param;
 import org.scoula.dto.HouseListDTO;
 
 import java.util.List;
 
 public interface HouseListMapper {
-    List<HouseListDTO> getAllHouseList();
+    List<HouseListDTO> getAllHouseList(@Param("userIdx") int userIdx);
 }
diff --git a/src/main/java/org/scoula/mapper/PlaceMapper.java b/src/main/java/org/scoula/mapper/PlaceMapper.java
new file mode 100644
index 0000000..f9ea0c6
--- /dev/null
+++ b/src/main/java/org/scoula/mapper/PlaceMapper.java
@@ -0,0 +1,25 @@
+package org.scoula.mapper;
+
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.scoula.dto.PlaceDTO;
+
+@Mapper
+public interface PlaceMapper {
+    void insertHospital(PlaceDTO place);
+    void insertSchool(PlaceDTO place);
+    void insertMart(PlaceDTO place);
+    void insertSubway(PlaceDTO place);
+    void insertKindergarten(PlaceDTO place);
+
+    boolean existsPlace(@Param("aptIdx") int aptIdx,
+                        @Param("placeName") String placeName,
+                        @Param("address") String address,
+                        @Param("placeType") String placeType);
+
+    void truncateHospital();
+    void truncateMart();
+    void truncateSchool();
+    void truncateSubway();
+    void truncateKindergarten();
+}
\ No newline at end of file
diff --git a/src/main/java/org/scoula/mapper/UserFavoriteMapper.java b/src/main/java/org/scoula/mapper/UserFavoriteMapper.java
index 962a941..bb0f8c7 100644
--- a/src/main/java/org/scoula/mapper/UserFavoriteMapper.java
+++ b/src/main/java/org/scoula/mapper/UserFavoriteMapper.java
@@ -2,25 +2,32 @@
 
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
+import org.scoula.dto.HouseListDTO;
 import org.scoula.dto.UserFavoriteDTO;
 
 import java.util.List;
 
 @Mapper
 public interface UserFavoriteMapper {
-    // 즐겨찾기 추가
+    /** 단일 즐겨찾기 추가 */
     int insertUserFavorite(UserFavoriteDTO favorite);
 
-    // 특정 사용자의 즐겨찾기 리스트 조회
-    List<UserFavoriteDTO> findFavoritesByUsersIdx(int usersIdx);
+    /** APT 공고번호 기준 중복 체크 */
+    int countByUsersIdxAndAptPblanc(@Param("usersIdx")   int usersIdx, @Param("aptPblanc") String aptPblanc);
 
-    // 특정 즐겨찾기 삭제
-    int deleteUserFavorite(int userFavoriteIdx);
+    /** 오피스텔 공고번호 기준 중복 체크 */
+    int countByUsersIdxAndOfficePblanc(@Param("usersIdx")      int usersIdx, @Param("officePblanc") String officePblanc);
 
-    // 아파트 즐겨찾기 여부
-    boolean isFavoriteAPT(@Param("usersIdx") int usersIdx, @Param("noticeIdx") int noticeIdx);
+    int deleteByUsersIdxAndAptPblanc(@Param("usersIdx") int usersIdx, @Param("aptPblanc") String aptPblanc);
 
-    // 오피스텔 즐겨찾기 여부
-    boolean isFavoriteOFFI(@Param("usersIdx") int usersIdx, @Param("noticeIdx") int noticeIdx);
+    int deleteByUsersIdxAndOfficePblanc(@Param("usersIdx") int usersIdx,@Param("officePblanc") String officePblanc);
+
+    List<HouseListDTO> findAptHouseByPblancNo(@Param("pblancNo") String pblancNo);
+
+    List<HouseListDTO> findOfficetelHouseByPblancNo(@Param("pblancNo") String pblancNo);
+
+    List<UserFavoriteDTO> findFavoritesByUsersIdx(@Param("usersIdx") int usersIdx);
+
+    int countFavoritesByPblancNo(@Param("pblancNo") String pblancNo);
 
 }
diff --git a/src/main/java/org/scoula/mapper/UserMapper.java b/src/main/java/org/scoula/mapper/UserMapper.java
index 47a2d93..6b725b6 100644
--- a/src/main/java/org/scoula/mapper/UserMapper.java
+++ b/src/main/java/org/scoula/mapper/UserMapper.java
@@ -3,6 +3,7 @@
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
+import org.scoula.dto.swagger.Auth.SwaggerPasswordResetRequestDTO;
 import org.scoula.security.dto.AuthDTO;
 import org.scoula.security.dto.MemberDTO;
 
@@ -19,9 +20,13 @@ public interface UserMapper {
     void updateUser(MemberDTO member);
     void deleteUser(String id);
 
+    int insertKakaoUserIdByUserId(@Param("userId") String userId, @Param("kakaoUserId") Long kakaoUserId);
     MemberDTO findByUsername(@Param("username") String username);
     int countUserByIdx(@Param("usersIdx") int usersIdx);  //  users_auth 테이블에 해당 유저 정보가 저장되어있는지 확인
     void insertUserAuth(@Param("usersIdx") Long usersIdx);
     void insertAuth(AuthDTO authDTO);
     int updatePasswordByUsername(MemberDTO member);
+
+    int resetPassword(SwaggerPasswordResetRequestDTO request);
+    int insertUserInfo(@Param("usersIdx") int usersIdx);
 }
\ No newline at end of file
diff --git a/src/main/java/org/scoula/security/config/SecurityConfig.java b/src/main/java/org/scoula/security/config/SecurityConfig.java
index a5c378d..0736b23 100644
--- a/src/main/java/org/scoula/security/config/SecurityConfig.java
+++ b/src/main/java/org/scoula/security/config/SecurityConfig.java
@@ -105,12 +105,12 @@ public void configure(HttpSecurity http) throws Exception {
         http
                 .authorizeRequests()//경로별접근권한설정
                 .antMatchers(HttpMethod.OPTIONS,"/**").permitAll()
-                .antMatchers("/v1/auth/refresh", "/v1/auth/signup").permitAll()
-                .antMatchers("/v1/auth/logout","/v1/auth/signout","/v1/auth/password","/v1/auth/update").hasRole("MEMBER")
+                .antMatchers("/v1/auth/refresh", "/v1/auth/signup","/v1/auth/resetpassword","/v1/email/**","/api/oauth/kakao/**").permitAll()
+
+                .antMatchers("/v1/auth/logout","/v1/auth/signout","/v1/auth/update").hasRole("MEMBER")
                 .antMatchers("/v1/account/**").hasRole("MEMBER")
-                .antMatchers("/v1/email/**").permitAll()
+                .antMatchers("v1/me/**").hasRole("MEMBER")
                 .antMatchers("/v1/subscriptions/**").hasRole("MEMBER")
-                .antMatchers("/oauth/kakao/**").permitAll()
                 .anyRequest().authenticated(); //나머지는로그인된경우모두허용
 
 
diff --git a/src/main/java/org/scoula/security/dto/MemberDTO.java b/src/main/java/org/scoula/security/dto/MemberDTO.java
index 5bd4ec8..6d69485 100644
--- a/src/main/java/org/scoula/security/dto/MemberDTO.java
+++ b/src/main/java/org/scoula/security/dto/MemberDTO.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -12,6 +13,7 @@
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
+@Builder
 public class MemberDTO {
     @ApiModelProperty(hidden = true)
     private int usersIdx;
diff --git a/src/main/java/org/scoula/security/util/JwtProcessor.java b/src/main/java/org/scoula/security/util/JwtProcessor.java
index 50d25d3..52c80ea 100644
--- a/src/main/java/org/scoula/security/util/JwtProcessor.java
+++ b/src/main/java/org/scoula/security/util/JwtProcessor.java
@@ -13,7 +13,7 @@
 
 @Component
 public class JwtProcessor {
-    private static final long ACCESS_TOKEN_VALID_MILLISECOND = 1000L * 60 * 5; // 5분
+    private static final long ACCESS_TOKEN_VALID_MILLISECOND = 1000L * 60 * 500; // 5분
     private static final long REFRESH_TOKEN_VALID_MILLISECOND = 1000L * 60 * 60 * 24 * 7; // 7일
 
     private String secretKey = "충분히 긴 임의의(랜덤한) 비밀키 문자열 배정";
diff --git a/src/main/java/org/scoula/service/AptService.java b/src/main/java/org/scoula/service/AptService.java
index ca7f6a1..d470959 100644
--- a/src/main/java/org/scoula/service/AptService.java
+++ b/src/main/java/org/scoula/service/AptService.java
@@ -10,6 +10,7 @@
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -37,8 +38,8 @@ public class AptService {
     public AptResponseDTO fetchAptData(int page, int perPage) {
         try {
             // 오늘 날짜 월로 쿼리 날리기 yyyy-MM 포맷
-            String startDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
-
+//            String startDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+            String startDate = "2025-07";
             StringBuilder urlBuilder = new StringBuilder(HOUSE_URL);
             urlBuilder.append("?")
                     .append("page=").append(page)
@@ -186,11 +187,18 @@ public void syncAptData() {
     public AptDetailDTO getAptDetail(String pblancNo) {
         try {
             AptDetailDTO dto = aptMapper.getAptDetails(pblancNo);
-            if (dto == null) {
+
+            if (dto == null || dto.getAptIdx() == null || dto.getAptIdx() == 0) {
                 log.warn("해당 공고번호 [{}]에 대한 청약 정보가 존재하지 않습니다.", pblancNo);
                 throw new IllegalArgumentException("해당 공고에 대한 정보가 존재하지 않습니다.");
             }
+
+            // 이제 따로 쿼리 없이 바로 사용 가능
+            List<InfraPlaceDTO> infraPlaces = aptMapper.getInfraPlace(dto.getAptIdx());
+            dto.setInfraPlaces(infraPlaces);
+
             return dto;
+
         } catch (Exception e) {
             log.error("청약 공고 상세 조회 중 예외 발생. pblancNo: {}, error: {}", pblancNo, e.getMessage(), e);
             throw new IllegalStateException("청약 공고 상세 정보를 조회하는 중 오류가 발생했습니다.", e);
@@ -198,5 +206,12 @@ public AptDetailDTO getAptDetail(String pblancNo) {
     }
 
 
+    @Transactional
+    public void incrementAptViewCount(String pblancNo) {
+        int updated = aptMapper.incrementAptViewCount(pblancNo);
+        if (updated == 0) {
+            throw new IllegalArgumentException("존재하지 않는 공고번호 입니다: " + pblancNo);
+        }
+    }
 
 }
diff --git a/src/main/java/org/scoula/service/CodefApiService.java b/src/main/java/org/scoula/service/CodefApiService.java
index 1c0b190..7b20beb 100644
--- a/src/main/java/org/scoula/service/CodefApiService.java
+++ b/src/main/java/org/scoula/service/CodefApiService.java
@@ -233,4 +233,18 @@ public ChungyakAccountDTO getAccountByUserIdx(int userIdx) {
     private String getSafe(JsonObject obj, String key) {
         return obj.has(key) ? obj.get(key).getAsString() : "";
     }
+
+    public boolean deleteAccountByUserIdx(int userIdx) {
+        try {
+            ChungyakAccountDTO account = accountMapper.findAccountByUserIdx(userIdx);
+            if (account == null) {
+                return false;
+            }
+            accountMapper.deleteAccountByUserIdx(userIdx);
+            return true;
+        } catch (Exception e) {
+            log.error("계좌 삭제 중 오류", e);
+            throw new RuntimeException("계좌 삭제 실패", e);
+        }
+    }
 }
diff --git a/src/main/java/org/scoula/service/GaScoreService.java b/src/main/java/org/scoula/service/GaScoreService.java
index 2477da5..fad78bf 100644
--- a/src/main/java/org/scoula/service/GaScoreService.java
+++ b/src/main/java/org/scoula/service/GaScoreService.java
@@ -3,6 +3,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.scoula.dto.GaScoreDTO;
+import org.scoula.dto.swagger.GaScore.SwaggerGaScoreRequest;
 import org.scoula.mapper.AccountMapper;
 import org.scoula.mapper.GaScoreMapper;
 import org.scoula.mapper.UserMapper;
@@ -12,8 +13,11 @@
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDate;
+import java.time.Period;
+import java.time.YearMonth;
 import java.time.format.DateTimeFormatter;
 import java.time.temporal.ChronoUnit;
+import java.util.stream.Stream;
 
 @Service
 @RequiredArgsConstructor
@@ -22,52 +26,116 @@ public class GaScoreService {
 
     private final GaScoreMapper gaScoreMapper;
     private final UserMapper userMapper;
-    private final AccountMapper accountMapper; // ✅ 추가
+    private final AccountMapper accountMapper;
     private final TokenUtils tokenUtils;
-    private final JwtProcessor jwtProcessor; // JWT 파싱용
+    private final JwtProcessor jwtProcessor;
 
-    public GaScoreDTO saveGaScore(GaScoreDTO dto, HttpServletRequest request) {
-        // 1. 헤더에서 토큰 추출
+    public GaScoreDTO saveGaScore(SwaggerGaScoreRequest requestDto, HttpServletRequest request) {
         String bearerToken = request.getHeader("Authorization");
         String accessToken = tokenUtils.extractAccessToken(bearerToken);
 
-        // 2. JWT에서 userIdx 추출
         String userId = jwtProcessor.getUsername(accessToken);
         int userIdx = userMapper.findUserIdxByUserId(userId);
 
-        // 3. 날짜 필드 조건 처리
-        if (dto.getHouseDisposal() == 0) {
-            dto.setDisposalDate(null);
+        LocalDate birthDate = LocalDate.parse(requestDto.getBirthDate());
+        LocalDate weddingDate = parseYearMonth(requestDto.getWeddingDate());
+        LocalDate disposalDate = parseYearMonth(requestDto.getDisposalDate());
+
+        int age = Period.between(birthDate, LocalDate.now()).getYears();
+
+        int noHousePeriod;
+        int noHouseScore;
+        String residenceStartDate = requestDto.getResidenceStartDate();
+
+        if (age < 30 && requestDto.getMaritalStatus() == 0) {
+            noHousePeriod = 0;
+            noHouseScore = 0;
+        } else if (requestDto.getHouseOwner() == 1) {
+            noHousePeriod = 0;
+            noHouseScore = 0;
+        } else {
+            LocalDate thirtiethBirthday = birthDate.plusYears(30);
+            LocalDate baseDate;
+
+            if (requestDto.getHouseOwner() == 0) {
+                if (requestDto.getMaritalStatus() == 1 && weddingDate != null) {
+                    baseDate = thirtiethBirthday.isBefore(weddingDate) ? weddingDate : thirtiethBirthday;
+                } else {
+                    baseDate = thirtiethBirthday;
+                }
+            } else {
+                if (requestDto.getMaritalStatus() == 1 && weddingDate != null && disposalDate != null) {
+                    baseDate = Stream.of(thirtiethBirthday, weddingDate, disposalDate)
+                            .max(LocalDate::compareTo).get();
+                } else if (disposalDate != null) {
+                    baseDate = thirtiethBirthday.isAfter(disposalDate) ? thirtiethBirthday : disposalDate;
+                } else {
+                    baseDate = thirtiethBirthday;
+                }
+            }
+
+            noHousePeriod = (int) ChronoUnit.YEARS.between(baseDate, LocalDate.now());
+            noHouseScore = calculateNoHouseScore(noHousePeriod);
+
+            if (residenceStartDate == null) {
+                residenceStartDate = baseDate.format(DateTimeFormatter.ofPattern("yyyy-MM"));
+            }
         }
-        if (dto.getMaritalStatus() == 0) {
-            dto.setWeddingDate(null);
-        }
-
-        // 4. 점수 계산
-        int noHouseScore = Math.min(dto.getNoHousePeriod() * 2, 32);
-        int dependentsScore = Math.min((dto.getDependentsNm() + 1) * 5, 35);
 
+        int dependentsScore = Math.min((requestDto.getDependentsNm() + 1) * 5, 35);
         int paymentPeriod = calculatePaymentPeriod(userIdx);
         int paymentPeriodScore = calculatePaymentPeriodScore(paymentPeriod);
-
         int totalScore = noHouseScore + dependentsScore + paymentPeriodScore;
 
-        // 5. DTO에 결과 세팅
-        dto.setNoHouseScore(noHouseScore);
-        dto.setDependentsScore(dependentsScore);
-        dto.setPaymentPeriod(paymentPeriod);
-        dto.setPaymentPeriodScore(paymentPeriodScore);
-        dto.setTotalGaScore(totalScore);
+        GaScoreDTO responseDTO = GaScoreDTO.builder()
+                .noHousePeriod(noHousePeriod)
+                .noHouseScore(noHouseScore)
+                .dependentsNm(requestDto.getDependentsNm())
+                .dependentsScore(dependentsScore)
+                .headOfHousehold(requestDto.getHeadOfHousehold())
+                .houseOwner(requestDto.getHouseOwner())
+                .houseDisposal(requestDto.getHouseDisposal())
+                .disposalDate(disposalDate != null ?
+                        disposalDate.format(DateTimeFormatter.ofPattern("yyyy-MM")) : null)
+                .maritalStatus(requestDto.getMaritalStatus())
+                .weddingDate(weddingDate != null ?
+                        weddingDate.format(DateTimeFormatter.ofPattern("yyyy-MM")) : null)
+                .birthDate(requestDto.getBirthDate())
+                .residenceStartDate(residenceStartDate)
+                .paymentPeriod(paymentPeriod)
+                .paymentPeriodScore(paymentPeriodScore)
+                .totalGaScore(totalScore)
+                .build();
+
+        gaScoreMapper.insertGaScore(responseDTO, userIdx);
+        log.info("사용자 {} 청약 가점 저장 완료: totalScore={}", userIdx, totalScore);
+
+        return responseDTO;
+    }
 
-        // 6. DB 저장
-        gaScoreMapper.insertGaScore(dto, userIdx);
+    public GaScoreDTO getGaScore(HttpServletRequest request) {
+        String bearerToken = request.getHeader("Authorization");
+        String accessToken = tokenUtils.extractAccessToken(bearerToken);
 
-        log.info("사용자 {} 청약 가점 저장 완료: totalScore={}", userIdx, totalScore);
+        String userId = jwtProcessor.getUsername(accessToken);
+        int userIdx = userMapper.findUserIdxByUserId(userId);
+
+        GaScoreDTO dto = gaScoreMapper.findGaScoreByUserIdx(userIdx);
+
+        if (dto != null) {
+            log.info("사용자 {} 청약 가점 조회 완료: totalScore={}", userIdx, dto.getTotalGaScore());
+        } else {
+            log.warn("사용자 {} 청약 가점 조회 실패 - 데이터 없음", userIdx);
+        }
 
         return dto;
     }
 
-    // AccountMapper 활용해서 계좌 개설일 조회
+    private LocalDate parseYearMonth(String yearMonth) {
+        if (yearMonth == null || yearMonth.isEmpty()) return null;
+        return YearMonth.parse(yearMonth, DateTimeFormatter.ofPattern("yyyy-MM")).atDay(1);
+    }
+
     private int calculatePaymentPeriod(int userIdx) {
         LocalDate startDate = accountMapper.findAccountStartDate(userIdx);
         if (startDate == null) return 0;
@@ -76,23 +144,15 @@ private int calculatePaymentPeriod(int userIdx) {
     }
 
     private int calculatePaymentPeriodScore(int months) {
-        int years = months / 12;
         if (months < 6) return 1;
         if (months < 12) return 2;
-        if (years < 2) return 3;
-        if (years < 3) return 4;
-        if (years < 4) return 5;
-        if (years < 5) return 6;
-        if (years < 6) return 7;
-        if (years < 7) return 8;
-        if (years < 8) return 9;
-        if (years < 9) return 10;
-        if (years < 10) return 11;
-        if (years < 11) return 12;
-        if (years < 12) return 13;
-        if (years < 13) return 14;
-        if (years < 14) return 15;
-        if (years < 15) return 16;
-        return 17;
+        int years = months / 12;
+        return Math.min(years + 2, 17);
+    }
+
+    private int calculateNoHouseScore(int years) {
+        if (years == 0) return 0;
+        if (years < 1) return 2;
+        return Math.min(years * 2, 32);
     }
 }
diff --git a/src/main/java/org/scoula/service/HouseService.java b/src/main/java/org/scoula/service/HouseService.java
index 23efddb..647db8d 100644
--- a/src/main/java/org/scoula/service/HouseService.java
+++ b/src/main/java/org/scoula/service/HouseService.java
@@ -14,9 +14,9 @@
 public class HouseService {
     private final HouseListMapper houseListMapper;
 
-    public List<HouseListDTO> getAllHousingList() {
+    public List<HouseListDTO> getAllHousingList(int userIdx) {
         try {
-            return houseListMapper.getAllHouseList();
+            return houseListMapper.getAllHouseList(userIdx);
         } catch (Exception e) {
             log.error("청약 공고 목록 조회 중 예외 발생", e);
             throw new IllegalStateException("청약 공고 목록을 불러오는 중 오류가 발생했습니다.", e);
diff --git a/src/main/java/org/scoula/service/KakaoMapInfraService.java b/src/main/java/org/scoula/service/KakaoMapInfraService.java
new file mode 100644
index 0000000..8ee975a
--- /dev/null
+++ b/src/main/java/org/scoula/service/KakaoMapInfraService.java
@@ -0,0 +1,219 @@
+package org.scoula.service;
+
+import lombok.extern.log4j.Log4j2;
+import org.scoula.dto.AptDTO;
+import org.scoula.dto.OfficetelDTO;
+import org.scoula.dto.PlaceDTO;
+import org.scoula.mapper.AptMapper;
+import org.scoula.mapper.PlaceMapper;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.http.*;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+import org.springframework.web.util.UriComponentsBuilder;
+
+import java.util.*;
+
+@Service
+@Log4j2
+public class KakaoMapInfraService {
+
+    private static final String CATEGORY_SEARCH_URL = "https://dapi.kakao.com/v2/local/search/category.json";
+
+    private final AptMapper aptMapper;
+    private final PlaceMapper placeMapper;
+    private final RestTemplate restTemplate = new RestTemplate();
+
+    @Value("${kakao.rest_key}")
+    private String kakaoRestKey;
+
+    public KakaoMapInfraService(AptMapper aptMapper, PlaceMapper placeMapper) {
+        this.aptMapper = aptMapper;
+        this.placeMapper = placeMapper;
+    }
+
+    public void fetchAndSavePlacesForAll() {
+        // 테이블 초기화
+        placeMapper.truncateHospital();
+        placeMapper.truncateMart();
+        placeMapper.truncateSchool();
+        placeMapper.truncateSubway();
+        placeMapper.truncateKindergarten();
+        log.info("모든 장소 테이블 초기화 완료");
+
+        // 아파트 + 오피스텔 위치 합치기
+        List<AptDTO> aptList = aptMapper.findAllAptLocations();
+        List<OfficetelDTO> officetelList = aptMapper.findAllOfficetelLocations();
+
+        Map<String, String> categoryMap = Map.of(
+                "HP8", "hospital",     // 병원
+                "MT1", "mart",        // 대형마트
+                "SC4", "school",      // 학교
+                "SW8", "subway",      // 지하철역
+                "PS3", "kindergarten" // 유치원
+        );
+
+        // 아파트 처리
+        for (AptDTO apt : aptList) {
+            processLocation(apt.getAptIdx(), null, apt.getLatitude(), apt.getLongitude(), categoryMap);
+        }
+
+        // 오피스텔 처리
+        for (OfficetelDTO officetel : officetelList) {
+            processLocation(null, officetel.getOfficetelIdx(), officetel.getLatitude(), officetel.getLongitude(), categoryMap);
+        }
+    }
+
+    private void processLocation(Integer aptIdx, Integer officetelIdx,
+                                 double latitude, double longitude,
+                                 Map<String, String> categoryMap) {
+
+        for (Map.Entry<String, String> entry : categoryMap.entrySet()) {
+            String categoryCode = entry.getKey();
+            String placeType = entry.getValue();
+
+            // 카테고리별 반경 설정
+            int radius;
+            switch (placeType) {
+                case "hospital": radius = 4000; break;
+                case "mart": radius = 4000; break;
+                case "school": radius = 500; break;
+                case "subway": radius = 1000; break;
+                case "kindergarten": radius = 500; break;
+                default: radius = 1000;
+            }
+
+            List<PlaceDTO> places = searchByCategory(latitude, longitude, categoryCode, radius, placeType);
+
+            if (places == null || places.isEmpty()) {
+                log.info("검색 결과 없음: {} / {}", placeType, aptIdx != null ? "aptIdx=" + aptIdx : "officetelIdx=" + officetelIdx);
+                continue;
+            }
+
+            for (PlaceDTO place : places) {
+                place.setAptIdx(aptIdx);
+                place.setOfficetelIdx(officetelIdx);
+                place.setPlaceType(placeType);
+
+                // 중복 체크
+                boolean exists = placeMapper.existsPlace(
+                        aptIdx != null ? aptIdx : officetelIdx,
+                        place.getPlaceName(),
+                        place.getAddress(),
+                        placeType
+                );
+
+                if (!exists) {
+                    switch (placeType) {
+                        case "hospital": placeMapper.insertHospital(place); break;
+                        case "school": placeMapper.insertSchool(place); break;
+                        case "mart": placeMapper.insertMart(place); break;
+                        case "subway": placeMapper.insertSubway(place); break;
+                        case "kindergarten": placeMapper.insertKindergarten(place); break;
+                    }
+                    log.info("저장 완료: {} {} {}", aptIdx != null ? "aptIdx=" + aptIdx : "officetelIdx=" + officetelIdx, placeType, place.getPlaceName());
+                } else {
+                    log.info("중복 저장 안 함: {} {} {}", aptIdx != null ? "aptIdx=" + aptIdx : "officetelIdx=" + officetelIdx, placeType, place.getPlaceName());
+                }
+            }
+        }
+    }
+
+    private List<PlaceDTO> searchByCategory(double latitude, double longitude,
+                                            String categoryCode, int radius, String placeType) {
+        int page = 1;
+        int size = 15;
+        List<PlaceDTO> allResults = new ArrayList<>();
+
+        while (true) {
+            UriComponentsBuilder builder = UriComponentsBuilder.fromHttpUrl(CATEGORY_SEARCH_URL)
+                    .queryParam("category_group_code", categoryCode)
+                    .queryParam("x", longitude)
+                    .queryParam("y", latitude)
+                    .queryParam("radius", radius)
+                    .queryParam("size", size)
+                    .queryParam("page", page);
+
+            HttpHeaders headers = new HttpHeaders();
+            headers.set("Authorization", "KakaoAK " + kakaoRestKey);
+
+            HttpEntity<String> entity = new HttpEntity<>(headers);
+
+            ResponseEntity<Map> response = restTemplate.exchange(
+                    builder.toUriString(),
+                    HttpMethod.GET,
+                    entity,
+                    Map.class
+            );
+
+            Map<String, Object> body = response.getBody();
+            if (body == null || body.get("documents") == null) break;
+
+            List<Map<String, Object>> documents = (List<Map<String, Object>>) body.get("documents");
+            if (documents.isEmpty()) break;
+
+            for (Map<String, Object> doc : documents) {
+                PlaceDTO dto = new PlaceDTO();
+                dto.setPlaceName((String) doc.get("place_name"));
+
+                String roadAddress = (String) doc.get("road_address_name");
+                String jibunAddress = (String) doc.get("address_name");
+                dto.setAddress(roadAddress != null && !roadAddress.isEmpty() ? roadAddress : jibunAddress);
+
+                String distanceStr = (String) doc.get("distance");
+                dto.setDistance(distanceStr != null && !distanceStr.isEmpty() ? Integer.parseInt(distanceStr) : 0);
+
+                dto.setLatitude(Double.parseDouble((String) doc.get("y")));
+                dto.setLongitude(Double.parseDouble((String) doc.get("x")));
+                dto.setCategoryName((String) doc.get("category_name"));
+
+                allResults.add(dto);
+
+                // 5개 모이면 중단
+                if (allResults.size() >= 5) {
+                    return filterResults(allResults, placeType);
+                }
+            }
+
+            // meta에서 is_end 체크
+            Map<String, Object> meta = (Map<String, Object>) body.get("meta");
+            if (meta != null && Boolean.TRUE.equals(meta.get("is_end"))) break;
+
+            page++;
+        }
+
+        return filterResults(allResults, placeType);
+    }
+
+    private List<PlaceDTO> filterResults(List<PlaceDTO> allResults, String placeType) {
+        switch (placeType) {
+            case "hospital":
+                return allResults.stream()
+                        .filter(place -> isLargeHospital(place.getCategoryName()))
+                        .sorted(Comparator.comparingInt(PlaceDTO::getDistance))
+                        .limit(5)
+                        .toList();
+
+            case "mart":
+                return allResults.stream()
+                        .filter(place -> place.getCategoryName() != null
+                                && place.getCategoryName().contains("대형마트"))
+                        .sorted(Comparator.comparingInt(PlaceDTO::getDistance))
+                        .limit(5)
+                        .toList();
+
+            default:
+                return allResults.stream()
+                        .sorted(Comparator.comparingInt(PlaceDTO::getDistance))
+                        .limit(5)
+                        .toList();
+        }
+    }
+
+    private boolean isLargeHospital(String categoryName) {
+        if (categoryName == null) return false;
+        return categoryName.contains("종합병원")
+                || categoryName.contains("대학병원")
+                || categoryName.contains("시도립병원");
+    }
+}
diff --git a/src/main/java/org/scoula/service/OfficetelService.java b/src/main/java/org/scoula/service/OfficetelService.java
index 2e1b54e..90d4e8d 100644
--- a/src/main/java/org/scoula/service/OfficetelService.java
+++ b/src/main/java/org/scoula/service/OfficetelService.java
@@ -10,6 +10,7 @@
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.PropertySource;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
@@ -38,7 +39,8 @@ public class OfficetelService {
     public OfficetelResponseDTO fetchOfficetelData(int page, int perPage) {
         try {
             // 오늘 날짜 월로 쿼리 날리기 yyyy-MM 포맷
-            String startDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+//            String startDate = LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy-MM"));
+            String startDate = "2025-07";
 
             StringBuilder urlBuilder = new StringBuilder(OFFICETEL_URL);
             urlBuilder.append("?")
@@ -209,11 +211,15 @@ public void deleteOldOfficetelDataBeforeThisMonth() {
 
     public OfficetelDetailDTO getOfficetelDetail(String pblancNo) {
         try {
+
             OfficetelDetailDTO dto = officeMapper.getOfficetelDetails(pblancNo);
-            if (dto == null) {
+            int aptIdx = officeMapper.findOfficetelIdxByPblancNo(pblancNo);
+            if (dto == null || aptIdx == 0 ) {
                 log.warn("해당 공고번호 [{}]에 대한 청약 정보가 존재하지 않습니다.", pblancNo);
                 throw new IllegalArgumentException("해당 공고에 대한 정보가 존재하지 않습니다.");
             }
+            List<InfraPlaceDTO> infraPlaces = officeMapper.getOfficetelInfraPlace(aptIdx);
+            dto.setInfraPlaces(infraPlaces);
             return dto;
         } catch (Exception e) {
             log.error("청약 공고 상세 조회 중 예외 발생. pblancNo: {}, error: {}", pblancNo, e.getMessage(), e);
@@ -221,5 +227,13 @@ public OfficetelDetailDTO getOfficetelDetail(String pblancNo) {
         }
     }
 
+    @Transactional
+    public void incrementOfficeViewCount(String pblancNo) {
+        int updated = officeMapper.incrementOfficetelViewCount(pblancNo);
+        if (updated == 0 ) {
+            throw new IllegalArgumentException("존재하지 않는 공고번호 입니다."+pblancNo);
+        }
+    }
+
 
 }
diff --git a/src/main/java/org/scoula/service/UserFavoriteService.java b/src/main/java/org/scoula/service/UserFavoriteService.java
index 5df1a69..bbbcc07 100644
--- a/src/main/java/org/scoula/service/UserFavoriteService.java
+++ b/src/main/java/org/scoula/service/UserFavoriteService.java
@@ -1,76 +1,103 @@
 package org.scoula.service;
 
 import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
 import lombok.extern.slf4j.Slf4j;
+import org.scoula.dto.HouseListDTO;
 import org.scoula.dto.UserFavoriteDTO;
 import org.scoula.mapper.UserFavoriteMapper;
-import org.scoula.mapper.UserMapper;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.List;
 
-@Slf4j
+@Log4j2
 @Service
 @RequiredArgsConstructor
 public class UserFavoriteService {
-    private final UserFavoriteMapper userFavoriteMapper;
+    private final UserFavoriteMapper mapper;
 
-    // 즐겨찾기 추가
-    public boolean addFavorite(int usersIdx, String houseType, int noticeIdx) {
+    /** 즐겨찾기 추가 */
+    public boolean addFavorite(int usersIdx, String houseType, String pblancNo) {
         try {
-            UserFavoriteDTO favorite = new UserFavoriteDTO();
-            favorite.setUsersIdx(usersIdx);
+            boolean exists;
+
             if ("APT".equals(houseType) || "신혼희망타운".equals(houseType)) {
-                if (isFavoriteAPT(usersIdx, noticeIdx)) {
-                    log.info("APT 즐겨찾기가 이미 존재합니다. usersIdx={}, noticeIdx={}", usersIdx, noticeIdx);
-                    return false;  // 이미 존재
-                }
-                favorite.setAptIdx(noticeIdx);
-                favorite.setOffiIdx(null);
+                exists = mapper.countByUsersIdxAndAptPblanc(usersIdx, pblancNo) > 0;
+            } else if ("오피스텔".equals(houseType) || "도시형생활주택".equals(houseType)) {
+                exists = mapper.countByUsersIdxAndOfficePblanc(usersIdx, pblancNo) > 0;
             } else {
-                if (isFavoriteOFFI(usersIdx, noticeIdx)) {
-                    log.info("OFFI 즐겨찾기가 이미 존재합니다. usersIdx={}, noticeIdx={}", usersIdx, noticeIdx);
-                    return false;  // 이미 존재
-                }
-                favorite.setOffiIdx(noticeIdx);
-                favorite.setAptIdx(null);
+                throw new IllegalArgumentException("지원하지 않는 houseType입니다: " + houseType);
             }
 
-            if (userFavoriteMapper.insertUserFavorite(favorite) == 1) {
-                return true;
+            if (exists) {
+                log.info("{} 즐겨찾기가 이미 존재합니다. usersIdx={}, pblancNo={}", houseType, usersIdx, pblancNo);
+                return false;
+            }
+
+            UserFavoriteDTO fav = new UserFavoriteDTO();
+            fav.setUsersIdx(usersIdx);
+
+            if ("APT".equals(houseType) || "신혼희망타운".equals(houseType)) {
+                fav.setAptPblanc(pblancNo);
+            } else {
+                fav.setOfficePblanc(pblancNo);
             }
-            return false;
 
+            return mapper.insertUserFavorite(fav) == 1;
+
+        } catch (IllegalArgumentException e) {
+            throw e; // 명확히 던짐
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error("즐겨찾기 추가 실패: {}", e.getMessage(), e);
             return false;
         }
     }
 
-    // 즐겨찾기 해제
-    public boolean deleteFavorite(int userFavoriteIdx) {
+    /** 즐겨찾기 해제 */
+    public boolean deleteFavorite(int usersIdx, String houseType, String pblancNo) {
         try {
-            if (userFavoriteMapper.deleteUserFavorite(userFavoriteIdx) == 1) {
-                return true;
+            if ("APT".equals(houseType) || "신혼희망타운".equals(houseType)) {
+                return mapper.deleteByUsersIdxAndAptPblanc(usersIdx, pblancNo) == 1;
             }
-            return false;
+
+            if ("오피스텔".equals(houseType) || "도시형생활주택".equals(houseType)) {
+                return mapper.deleteByUsersIdxAndOfficePblanc(usersIdx, pblancNo) == 1;
+            }
+
+            // 그 외 유형은 예외 발생
+            throw new IllegalArgumentException("지원하지 않는 houseType입니다: " + houseType);
+
+        } catch (IllegalArgumentException e) {
+            throw e; // 명시적 예외 처리
         } catch (Exception e) {
-            log.error(e.getMessage());
+            log.error("즐겨찾기 삭제 실패: {}", e.getMessage(), e);
             return false;
         }
     }
 
-    // 즐겨찾기 목록 조회
-    public List<UserFavoriteDTO> getFavorites(int usersIdx) {
-        return userFavoriteMapper.findFavoritesByUsersIdx(usersIdx);
-    }
+    public List<HouseListDTO> getFavoriteHouses(int usersIdx) {
+        List<UserFavoriteDTO> favorites = mapper.findFavoritesByUsersIdx(usersIdx);
+        List<HouseListDTO> result = new ArrayList<>();
 
-    // 즐겨찾기 여부 확인
-    public boolean isFavoriteAPT(int usersIdx, int noticeIdx) {
-        return userFavoriteMapper.isFavoriteAPT(usersIdx, noticeIdx);
-    }
+        for (UserFavoriteDTO fav : favorites) {
+            if (fav.getAptPblanc() != null) {
+                List<HouseListDTO> aptList = mapper.findAptHouseByPblancNo(fav.getAptPblanc());
+                for (HouseListDTO dto : aptList) {
+                    dto.setFavoriteCount(mapper.countFavoritesByPblancNo(dto.getPblancNo()));
+                }
+                result.addAll(aptList);
+            }
+            if (fav.getOfficePblanc() != null) {
+                List<HouseListDTO> offList = mapper.findOfficetelHouseByPblancNo(fav.getOfficePblanc());
+                for (HouseListDTO dto : offList) {
+                    dto.setFavoriteCount(mapper.countFavoritesByPblancNo(dto.getPblancNo()));
+                }
+                result.addAll(offList);
+            }
+        }
 
-    public boolean isFavoriteOFFI(int usersIdx, int noticeIdx) {
-        return userFavoriteMapper.isFavoriteOFFI(usersIdx, noticeIdx);
+        return result;
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/main/java/org/scoula/service/UserService.java b/src/main/java/org/scoula/service/UserService.java
index b4d90bc..e205eac 100644
--- a/src/main/java/org/scoula/service/UserService.java
+++ b/src/main/java/org/scoula/service/UserService.java
@@ -1,5 +1,7 @@
 package org.scoula.service;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.log4j.Log4j2;
+import org.scoula.dto.swagger.Auth.SwaggerPasswordResetRequestDTO;
 import org.scoula.mapper.UserMapper;
 import org.scoula.security.dto.AuthDTO;
 import org.scoula.security.dto.MemberDTO;
@@ -11,6 +13,7 @@
 
 @Service
 @RequiredArgsConstructor
+@Log4j2
 public class UserService {
     private final UserMapper userMapper;
     private final PasswordEncoder passwordEncoder;
@@ -34,6 +37,7 @@ public void signUp(MemberDTO memberDTO) {
         authDTO.setUsersIdx(memberDTO.getUsersIdx());
         authDTO.setAuth("ROLE_MEMBER");
         userMapper.insertAuth(authDTO);
+        userMapper.insertUserInfo(memberDTO.getUsersIdx());
     }
 
 //    @Transactional
@@ -63,8 +67,20 @@ public void updateUser(MemberDTO user) {
     }
 
 
-    public void deleteUser(String userId) {
+    public void deleteUser(String userId, String inputPassword) {
+        // 1. DB에서 회원 정보 조회
+        MemberDTO user = userMapper.findById(userId);
+        if (user == null) {
+            throw new IllegalArgumentException("해당 사용자가 존재하지 않습니다.");
+        }
+
+        // 2. 입력한 비밀번호와 암호화된 비밀번호 비교
+        if (!passwordEncoder.matches(inputPassword, user.getPassword())) {
+            throw new IllegalArgumentException("비밀번호가 일치하지 않습니다.");
+        }
+        // 3. 비밀번호가 맞으면 삭제
         userMapper.deleteUser(userId);
+        log.info("회원 탈퇴 완료 - userId: {}", userId);
     }
 
     public MemberDTO findByUsername(String username) {
@@ -102,6 +118,23 @@ public void updatePassword(String userId, String oldPassword, String newPassword
         }
     }
 
+    public void resetPassword(SwaggerPasswordResetRequestDTO request) {
+        try {
+            String encodedPassword = passwordEncoder.encode(request.getNewPassword());
+            request.setNewPassword(encodedPassword);
+
+            int updated = userMapper.resetPassword(request);
+            if (updated == 0) {
+                throw new IllegalStateException("해당 사용자 ID를 찾을 수 없습니다.");
+            }
+
+            log.info("비밀번호 초기화 완료 - userId: {}, newPassword: {}", request.getUserId(), request.getNewPassword());
+
+        } catch (Exception e) {
+            log.error("비밀번호 초기화 중 오류 발생 - userId: {}", request.getUserId(), e);
+            throw new RuntimeException("비밀번호 초기화 처리 중 서버 오류가 발생했습니다.");
+        }
+    }
 
 
 
diff --git a/src/main/java/org/scoula/service/oauth/KakaoOauthService.java b/src/main/java/org/scoula/service/oauth/KakaoOauthService.java
index 6158176..76d10cf 100644
--- a/src/main/java/org/scoula/service/oauth/KakaoOauthService.java
+++ b/src/main/java/org/scoula/service/oauth/KakaoOauthService.java
@@ -41,11 +41,13 @@ public class KakaoOauthService {
     public KakaoUserInfoDto processKakaoLogin(String code) {
         String accessToken = this.getAccessToken(code);
         KakaoUserInfoDto userInfo = this.getUserInfo(accessToken);
+        log.info("userInfo: {}", userInfo.toString());
 
-        MemberDTO user = this.processKakaoUser(userInfo);
-
-        // JWT 발급 (JwtProcessor 사용)
-        String jwtToken = jwtProcessor.generateAccessToken(user.getUserId());
+//        MemberDTO user = this.processKakaoUser(userInfo);
+            this.processKakaoUser(userInfo);
+//
+//        // JWT 발급 (JwtProcessor 사용)
+//        String jwtToken = jwtProcessor.generateAccessToken(user.getUserId());
 //        userInfo.setToken(jwtToken);
 
         return userInfo;
@@ -170,44 +172,39 @@ public KakaoUserInfoDto getUserInfo(String accessToken) {
     }
 
     // MyBatis로 사용자 DB 처리
-    public MemberDTO processKakaoUser(KakaoUserInfoDto userInfo) {
+    public void processKakaoUser(KakaoUserInfoDto userInfo) {
         MemberDTO existingUser = userMapper.findById(userInfo.getEmail());
-
         if (existingUser != null) {
-            int count = userMapper.countUserByIdx(existingUser.getUsersIdx());
-            if (count == 0) {
-                AuthDTO authUser = new AuthDTO();
-                authUser.setUsersIdx(existingUser.getUsersIdx());
-                authUser.setAuth("ROLE_MEMBER");
-                userMapper.insertAuth(authUser);
-            }
-            return existingUser;
-        }
+            userMapper.insertKakaoUserIdByUserId(userInfo.getEmail(),userInfo.getKakaoId());
 
-        MemberDTO kakaoUser = new MemberDTO();
-        kakaoUser.setKakaoUserId(userInfo.getKakaoId());
-        kakaoUser.setUserId(userInfo.getEmail());
-        kakaoUser.setUserName(userInfo.getName());
-        kakaoUser.setAddress(userInfo.getShippingAddress());
-        kakaoUser.setPassword(null);
-
-        /* 사용자 생일 정보 받기 */
-        String birthyear = userInfo.getBirthyear();
-        String birthday = userInfo.getBirthday();
-        String birthyearday = birthyear + "-" + birthday.substring(0, 2) + "-" + birthday.substring(2, 4);
-        // 문자열 → LocalDate
-        LocalDate localDate = LocalDate.parse(birthyearday, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
-        // LocalDate → Date
-        Date birthdate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
-        kakaoUser.setBirthdate(birthdate);
-
-        /* users 테이블에 kakao 계정 정보 저장 */
-        userMapper.insertUser(kakaoUser);
-
-        AuthDTO kakaoAuth = new AuthDTO();
-        kakaoAuth.setAuth("ROLE_MEMBER");
-        kakaoAuth.setUsersIdx(userMapper.findUserIdxByUserId(userInfo.getEmail()));
-        userMapper.insertAuth(kakaoAuth);
-        return kakaoUser;
+        }
+        else {
+            // 1) birthdate 계산
+            String birthyear = userInfo.getBirthyear();
+            String birthday  = userInfo.getBirthday();
+            String birthyearday = birthyear + "-"
+                    + birthday.substring(0, 2) + "-"
+                    + birthday.substring(2, 4);
+            LocalDate localDate = LocalDate.parse(birthyearday, DateTimeFormatter.ofPattern("yyyy-MM-dd"));
+            Date birthdate = Date.from(localDate.atStartOfDay(ZoneId.systemDefault()).toInstant());
+
+            // 2) Builder로 MemberDTO 생성
+            MemberDTO kakaoUser = MemberDTO.builder()
+                    .kakaoUserId(userInfo.getKakaoId())
+                    .userId(userInfo.getEmail())
+                    .userName(userInfo.getName())
+                    .address(userInfo.getShippingAddress())
+                    .password(null)
+                    .birthdate(birthdate)
+                    .build();
+
+            /* users 테이블에 kakao 계정 정보 저장 */
+            userMapper.insertUser(kakaoUser);
+            AuthDTO kakaoAuth = new AuthDTO();
+            kakaoAuth.setAuth("ROLE_MEMBER");
+            kakaoAuth.setUsersIdx(userMapper.findUserIdxByUserId(userInfo.getEmail()));
+            userMapper.insertAuth(kakaoAuth);
+//            return kakaoUser;
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 6cfdf44..16ea849 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -4,10 +4,9 @@ jdbc.username=admin
 jdbc.password=zibipassword
 
 #Oauth
-kakao.rest_key=5a743890c223b81e0e2ca139881c8cb7
-kakao.redirect_url=http://localhost:8080/oauth/kakao/callback
+kakao.rest_key=53da207a5cc86b7ec03890c960d2937b
+kakao.redirect_url=http://localhost:8080/api/oauth/kakao/callback
 external.api.serviceKey=PQGpmr1zaI3HKxa%2BckRamEynSodJqI7OQ%2BhFp25TeBWQ81tmjkuGif%2F3XyZVhGcZxf2%2Fk3wB8ERkC8iYqQUkcA%3D%3D
-mybatis.mapper-locations=classpath:mapper/*.xml
 
 # codef ??
 codef.client.id=70b86a97-a4df-44e8-a29a-afad529a8d4f
diff --git a/src/main/resources/org/scoula/mapper/AccountMapper.xml b/src/main/resources/org/scoula/mapper/AccountMapper.xml
index 8a3ece8..2a1f1b5 100644
--- a/src/main/resources/org/scoula/mapper/AccountMapper.xml
+++ b/src/main/resources/org/scoula/mapper/AccountMapper.xml
@@ -67,5 +67,8 @@
         WHERE user_idx = #{userIdx}
     </select>
 
+    <delete id="deleteAccountByUserIdx">
+        DELETE FROM account WHERE user_idx = #{userIdx}
+    </delete>
 
 </mapper>
diff --git a/src/main/resources/org/scoula/mapper/AptMapper.xml b/src/main/resources/org/scoula/mapper/AptMapper.xml
index 2849486..b74a10a 100644
--- a/src/main/resources/org/scoula/mapper/AptMapper.xml
+++ b/src/main/resources/org/scoula/mapper/AptMapper.xml
@@ -17,7 +17,7 @@
             gnrl_rnk2_etc_area_endde, przwner_presnatn_de, cntrct_cncls_bgnde,
             cntrct_cncls_endde, hmpg_adres, cnstrct_entrps_nm, mdhs_telno,
             bsns_mby_nm, mvn_prearnge_ym, speclt_rdn_earth_at, mdat_trget_area_secd,
-            parcprc_uls_at, pblanc_url
+            parcprc_uls_at, pblanc_url,si,sigungu
         ) VALUES (
                      #{houseManageNo}, #{pblancNo}, #{houseNm}, #{houseSecd}, #{houseSecdNm},
                      #{houseDtlSecd}, #{houseDtlSecdNm}, #{rentSecd}, #{rentSecdNm},
@@ -29,7 +29,9 @@
                      #{gnrlRnk2EtcAreaEndde}, #{przwnerPresnatnDe}, #{cntrctCnclsBgnde},
                      #{cntrctCnclsEndde}, #{hmpgAdres}, #{cnstrctEntrpsNm}, #{mdhsTelno},
                      #{bsnsMbyNm}, #{mvnPrearngeYm}, #{specltRdnEarthAt}, #{mdatTrgetAreaSecd},
-                     #{parcprcUlsAt}, #{pblancUrl}
+                     #{parcprcUlsAt}, #{pblancUrl},
+                    SUBSTRING_INDEX(#{hssplyAdres}, ' ', 1),
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(#{hssplyAdres}, ' ', 2), ' ', -1)
                  )
             ON DUPLICATE KEY UPDATE
                                  house_nm = VALUES(house_nm),
@@ -79,7 +81,9 @@
             bsns_mby_nm,
             mdhs_telno,
             mvn_prearnge_ym,
-            pblanc_url
+            pblanc_url,
+            si,
+            sigungu
         ) VALUES (
                      #{houseManageNo},
                      #{pblancNo},
@@ -103,7 +107,9 @@
                      #{bsnsMbyNm},
                      #{mdhsTelno},
                      #{mvnPrearngeYm},
-                     #{pblancUrl}
+                     #{pblancUrl},
+                     SUBSTRING_INDEX(#{hssplyAdres}, ' ', 1),
+                     SUBSTRING_INDEX(SUBSTRING_INDEX(#{hssplyAdres}, ' ', 2), ' ', -1)
                  )
         ON DUPLICATE KEY UPDATE
                              house_nm = VALUES(house_nm),
@@ -144,7 +150,11 @@
     </resultMap>
 
     <resultMap id="aptDetailMap" type="org.scoula.dto.AptDetailDTO">
+
         <id property="pblancNo" column="pblanc_no"/>
+        <result property="aptIdx" column="apt_idx"/>
+        <result property="favoriteCount" column="favorite_count"/>
+        <result property="viewCount" column="view_count"/>
         <result property="houseManageNo" column="house_manage_no"/>
         <result property="houseNm" column="house_nm"/>
         <result property="houseSecd" column="house_secd"/>
@@ -185,9 +195,16 @@
         <collection property="aptType" resultMap="aptTypeMap"/>
     </resultMap>
 
+    <update id="incrementAptViewCount">
+        UPDATE apt_table
+        SET view_count = view_count + 1
+        WHERE pblanc_no = #{pblancNo}
+    </update>
+
 
     <select id="getAptDetails" resultMap="aptDetailMap">
         SELECT
+            a.apt_idx,
             a.house_manage_no,
             a.pblanc_no,
             a.house_nm,
@@ -226,7 +243,8 @@
             a.mdat_trget_area_secd,
             a.parcprc_uls_at,
             a.pblanc_url,
-
+            a.view_count,
+            (SELECT COUNT(*) FROM user_favorite uf WHERE uf.apt_pblanc = a.pblanc_no) AS favorite_count,
             t.house_ty,
             t.suply_ar,
             t.suply_hshldco,
@@ -235,9 +253,10 @@
 
         FROM apt_table a
                  LEFT JOIN apt_type t ON a.apt_idx = t.apt_idx
-        WHERE a.pblanc_no = #{pblancNo};
+        WHERE a.pblanc_no = #{pblancNo}
     </select>
 
+
     <insert id="insertOfficetelType">
         INSERT INTO officetel_type (
             model_no,
@@ -267,6 +286,12 @@
                              subscrpt_reqst_amount = VALUES(subscrpt_reqst_amount),
                              tp = VALUES(tp);
     </insert>
+    <update id="incrementOfficetelViewCount">
+        UPDATE officetel_table
+        SET view_count = view_count + 1
+        WHERE pblanc_no = #{pblancNo}
+    </update>
+
 
     <delete id="deleteOldFromOfficetel" parameterType="java.time.LocalDate">
         DELETE FROM officetel_table
@@ -288,6 +313,8 @@
 
     <resultMap id="officetelDetailMap" type="org.scoula.dto.OfficetelDetailDTO">
         <id property="pblancNo" column="pblanc_no"/>
+        <result property="favoriteCount" column="favorite_count"/>
+        <result property="viewCount" column="view_count"/>
         <result property="houseManageNo" column="house_manage_no"/>
         <result property="houseNm" column="house_nm"/>
         <result property="houseSecd" column="house_secd"/>
@@ -315,6 +342,7 @@
 
     <select id="getOfficetelDetails" resultMap="officetelDetailMap">
         SELECT
+            ot.view_count,
             ot.house_manage_no,
             ot.pblanc_no,
             ot.house_nm,
@@ -345,16 +373,60 @@
             ott.suply_amount,
             ott.subscrpt_reqst_amount,
             ott.house_manage_no ,
-            ott.pblanc_no
+            ott.pblanc_no,
+        (SELECT COUNT(*) FROM user_favorite uf WHERE uf.office_pblanc = ot.pblanc_no) AS favorite_count
+
         FROM officetel_table ot
                  LEFT JOIN officetel_type ott
                            ON ot.officetel_idx = ott.officetel_idx
         WHERE ot.pblanc_no = #{pblancNo}
     </select>
 
+    <select id="findAllAptLocations" resultType="org.scoula.dto.AptDTO">
+        SELECT
+            apt_idx AS aptIdx,
+            latitude,
+            longitude
+        FROM apt_table
+        WHERE latitude IS NOT NULL
+          AND longitude IS NOT NULL
+    </select>
+    <select id="findAptIdxByPblancNo" resultType="java.lang.Integer">
+        SELECT apt_idx
+        FROM apt_table
+        WHERE pblanc_no = #{pblancNo}
+    </select>
 
+    <select id="getInfraPlace" resultType="org.scoula.dto.InfraPlaceDTO">
+        SELECT place_type, place_idx, place_name, distance, road_address_name
+        FROM vw_infra_places WHERE apt_idx = #{aptIdx}
+    </select>
+
+    <select id="getOfficetelInfraPlace" resultType="org.scoula.dto.InfraPlaceDTO">
+        SELECT place_type, place_idx, place_name, distance, road_address_name
+        FROM vw_infra_places WHERE officetel_idx = #{officetelIdx}
+    </select>
 
 
+    <select id="findOfficetelIdxByPblancNo" resultType="java.lang.Integer">
+        SELECT officetel_idx
+        FROM officetel_table
+        WHERE pblanc_no = #{pblancNo}
+    </select>
+
+    <select id="findAllOfficetelLocations" resultType="org.scoula.dto.OfficetelDTO">
+        SELECT
+            officetel_idx AS officetelIdx,
+            latitude,
+            longitude
+        FROM officetel_table
+        WHERE latitude IS NOT NULL
+          AND longitude IS NOT NULL
+    </select>
+    <select id="countFavoritesByPblancNo" resultType="int">
+        SELECT COUNT(*) FROM user_favorite
+        WHERE apt_pblanc = #{pblancNo}
+    </select>
 
 
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/org/scoula/mapper/GaScoreMapper.xml b/src/main/resources/org/scoula/mapper/GaScoreMapper.xml
index 9936668..3a869b4 100644
--- a/src/main/resources/org/scoula/mapper/GaScoreMapper.xml
+++ b/src/main/resources/org/scoula/mapper/GaScoreMapper.xml
@@ -5,54 +5,87 @@
 
 <mapper namespace="org.scoula.mapper.GaScoreMapper">
 
-    <!-- 청약 가점 저장 -->
+    <resultMap id="GaScoreResultMap" type="org.scoula.dto.GaScoreDTO">
+        <result property="noHousePeriod" column="no_house_period"/>
+        <result property="noHouseScore" column="no_house_score"/>
+        <result property="dependentsNm" column="dependents_nm"/>
+        <result property="dependentsScore" column="dependents_score"/>
+        <result property="headOfHousehold" column="head_of_household"/>
+        <result property="houseOwner" column="house_owner"/>
+        <result property="houseDisposal" column="house_disposal"/>
+        <result property="disposalDate" column="disposal_date"/>
+        <result property="maritalStatus" column="marital_status"/>
+        <result property="weddingDate" column="wedding_date"/>
+        <result property="residenceStartDate" column="residence_start_date"/>
+        <result property="paymentPeriod" column="payment_period"/>
+        <result property="paymentPeriodScore" column="payment_period_score"/>
+        <result property="totalGaScore" column="total_ga_score"/>
+    </resultMap>
+
     <insert id="insertGaScore">
-        INSERT INTO user_info (
-            users_idx,
+        INSERT INTO user_info (users_idx,
+                               no_house_period,
+                               no_house_score,
+                               dependents_nm,
+                               dependents_score,
+                               head_of_household,
+                               house_owner,
+                               house_disposal,
+                               disposal_date,
+                               marital_status,
+                               wedding_date,
+                               residence_start_date,
+                               payment_period,
+                               payment_period_score,
+                               total_ga_score)
+        VALUES (#{userIdx},
+                #{dto.noHousePeriod},
+                #{dto.noHouseScore},
+                #{dto.dependentsNm},
+                #{dto.dependentsScore},
+                #{dto.headOfHousehold},
+                #{dto.houseOwner},
+                #{dto.houseDisposal},
+                #{dto.disposalDate},
+                #{dto.maritalStatus},
+                #{dto.weddingDate},
+                #{dto.residenceStartDate},
+                #{dto.paymentPeriod},
+                #{dto.paymentPeriodScore},
+                #{dto.totalGaScore})
+        ON DUPLICATE KEY UPDATE no_house_period      = VALUES(no_house_period),
+                                no_house_score       = VALUES(no_house_score),
+                                dependents_nm        = VALUES(dependents_nm),
+                                dependents_score     = VALUES(dependents_score),
+                                head_of_household    = VALUES(head_of_household),
+                                house_owner          = VALUES(house_owner),
+                                house_disposal       = VALUES(house_disposal),
+                                disposal_date        = VALUES(disposal_date),
+                                marital_status       = VALUES(marital_status),
+                                wedding_date         = VALUES(wedding_date),
+                                residence_start_date = VALUES(residence_start_date),
+                                payment_period       = VALUES(payment_period),
+                                payment_period_score = VALUES(payment_period_score),
+                                total_ga_score       = VALUES(total_ga_score)
+    </insert>
+
+    <select id="findGaScoreByUserIdx" parameterType="int" resultMap="GaScoreResultMap">
+        SELECT
             no_house_period,
-            dependents_nm,
             no_house_score,
-            dependents_score,
-            payment_period,
-            payment_period_score,
+            dependents_nm,
             head_of_household,
             house_owner,
             house_disposal,
             disposal_date,
             marital_status,
             wedding_date,
+            residence_start_date,
+            payment_period,
+            payment_period_score,
             total_ga_score
-        )
-        VALUES (
-                   #{userIdx},
-                   #{dto.noHousePeriod},
-                   #{dto.dependentsNm},
-                   #{dto.noHouseScore},
-                   #{dto.dependentsScore},
-                   #{dto.paymentPeriod},
-                   #{dto.paymentPeriodScore},
-                   #{dto.headOfHousehold},
-                   #{dto.houseOwner},
-                   #{dto.houseDisposal},
-                   #{dto.disposalDate},
-                   #{dto.maritalStatus},
-                   #{dto.weddingDate},
-                   #{dto.totalGaScore}
-               )
-        ON DUPLICATE KEY UPDATE
-                             no_house_period      = VALUES(no_house_period),
-                             dependents_nm        = VALUES(dependents_nm),
-                             no_house_score       = VALUES(no_house_score),
-                             dependents_score     = VALUES(dependents_score),
-                             payment_period       = VALUES(payment_period),
-                             payment_period_score = VALUES(payment_period_score),
-                             head_of_household    = VALUES(head_of_household),
-                             house_owner          = VALUES(house_owner),
-                             house_disposal       = VALUES(house_disposal),
-                             disposal_date        = VALUES(disposal_date),
-                             marital_status       = VALUES(marital_status),
-                             wedding_date         = VALUES(wedding_date),
-                             total_ga_score       = VALUES(total_ga_score)
-    </insert>
+        FROM user_info
+        WHERE users_idx = #{userIdx}
+    </select>
 
 </mapper>
diff --git a/src/main/resources/org/scoula/mapper/HouseListMapper.xml b/src/main/resources/org/scoula/mapper/HouseListMapper.xml
index db11dd6..590399a 100644
--- a/src/main/resources/org/scoula/mapper/HouseListMapper.xml
+++ b/src/main/resources/org/scoula/mapper/HouseListMapper.xml
@@ -6,7 +6,18 @@
 <mapper namespace="org.scoula.mapper.HouseListMapper">
 
     <select id="getAllHouseList" resultType="org.scoula.dto.HouseListDTO">
-        SELECT * FROM vw_all_housing_list
+        SELECT
+            v.*,
+            CASE
+                WHEN uf.users_idx IS NOT NULL THEN TRUE
+                ELSE FALSE
+                END AS is_favorite
+        FROM vw_all_house_list v
+                 LEFT JOIN user_favorite uf
+                           ON v.pblanc_no = COALESCE(uf.apt_pblanc, uf.office_pblanc)
+                               AND uf.users_idx = #{userIdx}
     </select>
 
+
+
 </mapper>
\ No newline at end of file
diff --git a/src/main/resources/org/scoula/mapper/PlaceMapper.xml b/src/main/resources/org/scoula/mapper/PlaceMapper.xml
new file mode 100644
index 0000000..87e43f4
--- /dev/null
+++ b/src/main/resources/org/scoula/mapper/PlaceMapper.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
+<mapper namespace="org.scoula.mapper.PlaceMapper">
+
+    <insert id="insertHospital" parameterType="org.scoula.dto.PlaceDTO">
+        INSERT INTO hospital (apt_idx, officetel_idx, place_name, distance, road_address_name)
+        VALUES (#{aptIdx}, #{officetelIdx}, #{placeName}, #{distance}, #{address})
+    </insert>
+
+    <insert id="insertSchool" parameterType="org.scoula.dto.PlaceDTO">
+        INSERT INTO school (apt_idx, officetel_idx, place_name, distance, road_address_name)
+        VALUES (#{aptIdx}, #{officetelIdx}, #{placeName}, #{distance}, #{address})
+    </insert>
+
+    <insert id="insertMart" parameterType="org.scoula.dto.PlaceDTO">
+        INSERT INTO mart (apt_idx, officetel_idx, place_name, distance, road_address_name)
+        VALUES (#{aptIdx}, #{officetelIdx}, #{placeName}, #{distance}, #{address})
+    </insert>
+
+    <insert id="insertSubway" parameterType="org.scoula.dto.PlaceDTO">
+        INSERT INTO subway (apt_idx, officetel_idx, place_name, distance, road_address_name)
+        VALUES (#{aptIdx}, #{officetelIdx}, #{placeName}, #{distance}, #{address})
+    </insert>
+
+    <insert id="insertKindergarten" parameterType="org.scoula.dto.PlaceDTO">
+        INSERT INTO kindergarten (apt_idx, officetel_idx, place_name, distance, road_address_name)
+        VALUES (#{aptIdx}, #{officetelIdx}, #{placeName}, #{distance}, #{address})
+    </insert>
+
+    <!-- 중복 체크 -->
+    <select id="existsPlace" parameterType="map" resultType="boolean">
+        <choose>
+            <when test="placeType == 'hospital'">
+                SELECT EXISTS(
+                SELECT 1 FROM hospital
+                WHERE apt_idx = #{aptIdx}
+                AND place_name = #{placeName}
+                AND road_address_name = #{address}
+                )
+            </when>
+            <when test="placeType == 'school'">
+                SELECT EXISTS(
+                SELECT 1 FROM school
+                WHERE apt_idx = #{aptIdx}
+                AND place_name = #{placeName}
+                AND road_address_name = #{address}
+                )
+            </when>
+            <when test="placeType == 'mart'">
+                SELECT EXISTS(
+                SELECT 1 FROM mart
+                WHERE apt_idx = #{aptIdx}
+                AND place_name = #{placeName}
+                AND road_address_name = #{address}
+                )
+            </when>
+            <when test="placeType == 'subway'">
+                SELECT EXISTS(
+                SELECT 1 FROM subway
+                WHERE apt_idx = #{aptIdx}
+                AND place_name = #{placeName}
+                AND road_address_name = #{address}
+                )
+            </when>
+
+            <when test="placeType == 'kindergarten'">
+                SELECT EXISTS(
+                SELECT 1 FROM kindergarten
+                WHERE apt_idx = #{aptIdx}
+                AND place_name = #{placeName}
+                AND road_address_name = #{address}
+                )
+            </when>
+            <otherwise>
+                SELECT FALSE
+            </otherwise>
+        </choose>
+    </select>
+
+    <delete id="truncateHospital">TRUNCATE TABLE hospital;</delete>
+    <delete id="truncateMart">TRUNCATE TABLE mart;</delete>
+    <delete id="truncateSchool">TRUNCATE TABLE school;</delete>
+    <delete id="truncateSubway">TRUNCATE TABLE subway;</delete>
+    <delete id="truncateKindergarten">TRUNCATE TABLE kindergarten;</delete>
+
+</mapper>
diff --git a/src/main/resources/org/scoula/mapper/UserFavoriteMapper.xml b/src/main/resources/org/scoula/mapper/UserFavoriteMapper.xml
index 4616ef1..d7af156 100644
--- a/src/main/resources/org/scoula/mapper/UserFavoriteMapper.xml
+++ b/src/main/resources/org/scoula/mapper/UserFavoriteMapper.xml
@@ -4,43 +4,82 @@
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
 <mapper namespace="org.scoula.mapper.UserFavoriteMapper">
-
-    <!-- 즐겨찾기 추가 -->
     <insert id="insertUserFavorite" parameterType="org.scoula.dto.UserFavoriteDTO">
-        INSERT INTO user_favorite
-        (users_idx, apt_idx, offi_idx, predicted_win_rate, predicted_cutoff_score)
-        VALUES
-            (#{usersIdx}, #{aptIdx}, #{offiIdx}, NULL, NULL);
+        INSERT INTO user_favorite (
+            users_idx,
+            apt_pblanc,
+            office_pblanc,
+            predicted_win_rate,
+            predicted_cutoff_score
+        )
+        VALUES (
+                   #{usersIdx},
+                   #{aptPblanc},
+                   #{officePblanc},
+                   #{predictedWinRate},
+                   #{predictedCutoffScore}
+               )
     </insert>
 
 
-    <!-- 특정 사용자의 즐겨찾기 리스트 조회 -->
-    <select id="findFavoritesByUsersIdx" parameterType="int" resultType="org.scoula.dto.UserFavoriteDTO">
-        SELECT *
+
+    <select id="countByUsersIdxAndAptPblanc" resultType="int">
+        SELECT COUNT(*)
+        FROM user_favorite
+        WHERE users_idx   = #{usersIdx}
+          AND apt_pblanc   = #{aptPblanc}
+    </select>
+
+    <select id="countByUsersIdxAndOfficePblanc" resultType="int">
+        SELECT COUNT(*)
         FROM user_favorite
-        WHERE users_idx = #{usersIdx};
+        WHERE users_idx      = #{usersIdx}
+          AND office_pblanc  = #{officePblanc}
     </select>
 
-    <!-- 특정 즐겨찾기 삭제 -->
-    <delete id="deleteUserFavorite" parameterType="int">
+    <delete id="deleteByUsersIdxAndAptPblanc" parameterType="map">
         DELETE FROM user_favorite
-        WHERE user_favorite_idx = #{userFavoriteIdx};
+        WHERE users_idx = #{usersIdx}
+          AND apt_pblanc = #{aptPblanc}
     </delete>
 
-    <!-- 아파트 즐겨찾기 여부 -->
-    <select id="isFavoriteAPT" parameterType="map" resultType="boolean">
-        SELECT CASE WHEN COUNT(*) > 0 THEN TRUE ELSE FALSE END
-        FROM user_favorite
+    <delete id="deleteByUsersIdxAndOfficePblanc" parameterType="map">
+        DELETE FROM user_favorite
         WHERE users_idx = #{usersIdx}
-          AND apt_idx = #{noticeIdx};
+          AND office_pblanc = #{officePblanc}
+    </delete>
+
+    <select id="findAptHouseByPblancNo" resultType="org.scoula.dto.HouseListDTO">
+        SELECT *
+        FROM vw_all_house_list
+        WHERE pblanc_no = #{pblancNo}
+          AND house_type IN ('APT', '신혼희망타운')
     </select>
 
-    <!-- 오피스텔 즐겨찾기 여부 -->
-    <select id="isFavoriteOFFI" parameterType="map" resultType="boolean">
-        SELECT CASE WHEN COUNT(*) > 0 THEN TRUE ELSE FALSE END
+
+    <select id="findOfficetelHouseByPblancNo" resultType="org.scoula.dto.HouseListDTO">
+        SELECT *
+        FROM vw_all_house_list
+        WHERE pblanc_no = #{pblancNo}
+          AND house_type IN ('오피스텔', '도시형생활주택')
+    </select>
+
+
+    <select id="findFavoritesByUsersIdx" resultType="org.scoula.dto.UserFavoriteDTO">
+        SELECT
+            user_favorite_idx,
+            users_idx,
+            apt_pblanc,
+            office_pblanc,
+            predicted_win_rate,
+            predicted_cutoff_score
         FROM user_favorite
         WHERE users_idx = #{usersIdx}
-          AND offi_idx = #{noticeIdx};
+    </select>
+    <select id="countFavoritesByPblancNo" resultType="int">
+        SELECT COUNT(*)
+        FROM user_favorite
+        WHERE apt_pblanc = #{pblancNo} OR office_pblanc = #{pblancNo}
     </select>
 
 </mapper>
diff --git a/src/main/resources/org/scoula/mapper/UserMapper.xml b/src/main/resources/org/scoula/mapper/UserMapper.xml
index ded68e5..e0e5921 100644
--- a/src/main/resources/org/scoula/mapper/UserMapper.xml
+++ b/src/main/resources/org/scoula/mapper/UserMapper.xml
@@ -53,6 +53,11 @@
         SET password = #{password}
         WHERE user_id = #{userId}
     </update>
+    <update id="resetPassword">
+        UPDATE users
+        SET password = #{newPassword}
+        WHERE user_id = #{userId}
+    </update>
 
 
     <!-- 사용자 삭제 -->
@@ -61,7 +66,7 @@
     </delete>
 
     <!-- 해당 유저가 users_auth 테이블에 있는지 확인 -->
-    <select id="countUserByIdx" parameterType="long" resultType="int">
+    <select id="countUserByIdx" parameterType="int" resultType="int">
         SELECT COUNT(*) FROM users_auth WHERE user_idx = #{usersIdx}
     </select>
 
@@ -79,7 +84,15 @@
         INSERT INTO users_auth (user_idx, auth)
         VALUES (#{usersIdx}, #{auth})
     </insert>
-
+    <insert id="insertUserInfo" parameterType="int">
+        INSERT INTO user_info (users_idx)
+        VALUES (#{usersIdx})
+    </insert>
+    <update id="insertKakaoUserIdByUserId">
+        UPDATE users
+        SET kakao_user_id = #{kakaoUserId}
+        WHERE user_id       = #{userId}
+    </update>
 
 
 </mapper>
diff --git a/src/test/java/org/scoula/mapper/HouseMapperTest.java b/src/test/java/org/scoula/mapper/HouseMapperTest.java
deleted file mode 100644
index aa6f4ea..0000000
--- a/src/test/java/org/scoula/mapper/HouseMapperTest.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package org.scoula.mapper;
-
-import org.junit.jupiter.api.Test;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class HouseMapperTest {
-
-    @Test
-    void insertApt() {
-    }
-}
\ No newline at end of file
diff --git a/src/test/java/org/scoula/persistence/JDBCTests.java b/src/test/java/org/scoula/persistence/JDBCTests.java
deleted file mode 100644
index 2dee9ed..0000000
--- a/src/test/java/org/scoula/persistence/JDBCTests.java
+++ /dev/null
@@ -1,35 +0,0 @@
-package org.scoula.persistence;
-
-import lombok.extern.log4j.Log4j2;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-
-import static org.junit.jupiter.api.Assertions.fail;
-
-
-@Log4j2
-public class JDBCTests {
-    @BeforeAll
-    public static void setup () {
-        try{
-            Class.forName("com.mysql.cj.jdbc.Driver");
-        }catch(Exception e){
-            e.printStackTrace();
-        }
-    }
-
-    @Test
-    @DisplayName("JDBC드라이버 연결이 된다")
-    public void testConnection() {
-        String url = "jdbc:mysql://localhost:3306/scoula_db";
-        try(Connection con = DriverManager.getConnection(url, "scoula", "1234")) {
-            log.info(con);
-        }catch(Exception e){
-            fail(e.getMessage());
-        }
-    }
-}
diff --git a/src/test/java/org/scoula/service/HouseServiceTest.java b/src/test/java/org/scoula/service/HouseServiceTest.java
index f91e997..9a9e859 100644
--- a/src/test/java/org/scoula/service/HouseServiceTest.java
+++ b/src/test/java/org/scoula/service/HouseServiceTest.java
@@ -17,10 +17,7 @@ class HouseServiceTest {
     @Autowired
     private HouseService houseService;
 
-    @Test
-    void getAllHousingList() {
-        houseService.getAllHousingList().forEach(dto -> log.info(dto.toString()));
-    }
+
 
 
 }
\ No newline at end of file
diff --git a/src/test/java/org/scoula/service/HousingApiServiceTest.java b/src/test/java/org/scoula/service/HousingApiServiceTest.java
deleted file mode 100644
index 1008a0c..0000000
--- a/src/test/java/org/scoula/service/HousingApiServiceTest.java
+++ /dev/null
@@ -1,40 +0,0 @@
-//package org.scoula.service;
-//
-//import com.fasterxml.jackson.databind.JsonNode;
-//import com.fasterxml.jackson.databind.ObjectMapper;
-//import org.springframework.web.client.RestTemplate;
-//
-//import static org.junit.jupiter.api.Assertions.*;
-//
-//class HousingApiServiceTest {
-//
-//    public static void main(String[] args) {
-//        // RestTemplate, ObjectMapper 직접 생성
-//        RestTemplate restTemplate = new RestTemplate();
-//        ObjectMapper objectMapper = new ObjectMapper();
-//
-//        // HousingApiService 생성자 주입
-//        HousingApiService housingApiService = new HousingApiService(restTemplate, objectMapper);
-//
-//        // Spring 없이 serviceKey 직접 세팅
-//        housingApiService.setServiceKey("PQGpmr1zaI3HKxa%2BckRamEynSodJqI7OQ%2BhFp25TeBWQ81tmjkuGif%2F3XyZVhGcZxf2%2Fk3wB8ERkC8iYqQUkcA%3D%3D");
-//
-//        try {
-//            callAndPrint("APT Detail", housingApiService.getAptDetail());
-//            callAndPrint("Officetel Detail", housingApiService.getOfficetelDetail());
-//            callAndPrint("Remndr Detail", housingApiService.getRemndrDetail());
-//            callAndPrint("APT By HouseType", housingApiService.getAptByHouseType());
-//            callAndPrint("Officetel By HouseType", housingApiService.getOfficetelByHouseType());
-//            callAndPrint("Remndr By HouseType", housingApiService.getRemndrByHouseType());
-//        } catch (Exception e) {
-//            System.err.println("테스트 중 에러 발생: " + e.getMessage());
-//            e.printStackTrace();
-//        }
-//    }
-//
-//    private static void callAndPrint(String label, JsonNode response) {
-//        System.out.println("=== " + label + " ===");
-//        System.out.println(response.toPrettyString());
-//        System.out.println();
-//    }
-//}
diff --git a/src/test/java/org/scoula/service/KakaoMapInfraServiceTest.java b/src/test/java/org/scoula/service/KakaoMapInfraServiceTest.java
new file mode 100644
index 0000000..4f4ddca
--- /dev/null
+++ b/src/test/java/org/scoula/service/KakaoMapInfraServiceTest.java
@@ -0,0 +1,26 @@
+//package org.scoula.service;
+//
+//import lombok.extern.log4j.Log4j2;
+//import org.junit.jupiter.api.Test;
+//import org.junit.jupiter.api.extension.ExtendWith;
+//import org.scoula.config.RootConfig;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.test.context.ContextConfiguration;
+//import org.springframework.test.context.junit.jupiter.SpringExtension;
+//
+//@ExtendWith(SpringExtension.class)
+//@ContextConfiguration(classes = { KakaoMapInfraService.class, RootConfig.class })
+//@Log4j2
+//class KakaoMapInfraServiceTest {
+//
+//    @Autowired
+//    private KakaoMapInfraService kakaoMapInfraService;
+//
+//    @Test
+//    void fetchAndSavePlacesForAll() {
+//
+//        log.info("Starting test");
+//        kakaoMapInfraService.fetchAndSavePlacesForAll();
+//        log.info("Finished test");
+//    }
+//}
diff --git a/src/test/java/org/scoula/service/OfficetelServiceTest.java b/src/test/java/org/scoula/service/OfficetelServiceTest.java
index d4a9cf8..ea2d8a0 100644
--- a/src/test/java/org/scoula/service/OfficetelServiceTest.java
+++ b/src/test/java/org/scoula/service/OfficetelServiceTest.java
@@ -103,17 +103,17 @@ void syncOfficetelData() {
         officetelService.syncOfficetelData();
     }
 
-    @Test
-    void deleteOfficetelData() {
-        officetelService.deleteOldOfficetelDataBeforeThisMonth();
-    }
-
-    @Test
-    void getAptDetail() {
-        OfficetelDetailDTO detail = officetelService.getOfficetelDetail("2025950040");
-        log.info("OfficetelDetailDTO  : {}",detail.toString());
-
-    }
+//    @Test
+//    void deleteOfficetelData() {
+//        officetelService.deleteOldOfficetelDataBeforeThisMonth();
+//    }
+
+//    @Test
+//    void getAptDetail() {
+//        OfficetelDetailDTO detail = officetelService.getOfficetelDetail("2025950040");
+//        log.info("OfficetelDetailDTO  : {}",detail.toString());
+//
+//    }
 
 
 }
\ No newline at end of file
diff --git a/src/test/java/org/scoula/service/UserFavoriteServiceTest.java b/src/test/java/org/scoula/service/UserFavoriteServiceTest.java
index 9541d3d..e63ac35 100644
--- a/src/test/java/org/scoula/service/UserFavoriteServiceTest.java
+++ b/src/test/java/org/scoula/service/UserFavoriteServiceTest.java
@@ -4,7 +4,9 @@
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.scoula.config.RootConfig;
+import org.scoula.dto.HouseListDTO;
 import org.scoula.dto.UserFavoriteDTO;
+import org.scoula.mapper.UserFavoriteMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit.jupiter.SpringExtension;
@@ -12,46 +14,32 @@
 import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.*;
+
 @ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = { UserFavoriteService.class, RootConfig.class }) // AptService만 테스트
+@ContextConfiguration(classes = { UserFavoriteService.class, RootConfig.class })
 @Log4j2
 class UserFavoriteServiceTest {
+
     @Autowired
-    UserFavoriteService userFavoriteService;
-    @Test
-    void addFavorite() {
-        boolean result1 = userFavoriteService.addFavorite(1, "APT", 10);
-        log.info("APT 즐겨찾기 추가 결과: {}", result1);
-        assertTrue(result1 || !result1);  // 단순 실행 테스트 (값 확인 가능)
-
-        boolean result2 = userFavoriteService.addFavorite(1, "OFFI", 3);
-        log.info("OFFI 즐겨찾기 추가 결과: {}", result2);
-        assertTrue(result2 || !result2);
-    }
+    private UserFavoriteService userFavoriteService;
 
-    @Test
-    void deleteFavorite() {
-        boolean result = userFavoriteService.deleteFavorite(2);
-        log.info("즐겨찾기 삭제 결과 (userFavoriteIdx=2): {}", result);
-        assertTrue(result || !result); // 단순 실행 확인용
-    }
 
+    /**
+     * APT 공고번호를 즐겨찾기에 추가했을 때
+     */
     @Test
-    void getFavorites() {
-        List<UserFavoriteDTO> favorites = userFavoriteService.getFavorites(1);
-        assertNotNull(favorites);
-        log.info("즐겨찾기 목록 크기: {}", favorites.size());
+    void addFavorite_apt() {
+        String aptPblancNo = "2025950040";  // 테스트용 공고번호
+        boolean result = userFavoriteService.addFavorite(1, "APT", aptPblancNo);
+        log.info("APT 즐겨찾기 추가 결과: {}", result);
+        assertTrue(result || !result);  // 단순 실행 확인
     }
 
-    @Test
-    void isFavorite() {
-        boolean isAptFavorite = userFavoriteService.isFavoriteAPT(1, 10);
-        log.info("APT 즐겨찾기 여부 (usersIdx=1, noticeIdx=10): {}", isAptFavorite);
-
-        boolean isOffiFavorite = userFavoriteService.isFavoriteOFFI(1, 3);
-        log.info("OFFI 즐겨찾기 여부 (usersIdx=1, noticeIdx=3): {}", isOffiFavorite);
 
-        assertTrue(isAptFavorite || !isAptFavorite);
-        assertTrue(isOffiFavorite || !isOffiFavorite);
+    @Test
+    void indAptHouseByPblancNo() {
+        List<HouseListDTO> list =  userFavoriteService.getFavoriteHouses(45);
+        list.forEach(dto -> log.info(dto.toString()));
     }
-}
\ No newline at end of file
+
+}
diff --git a/src/test/java/org/scoula/service/UserServiceTest.java b/src/test/java/org/scoula/service/UserServiceTest.java
deleted file mode 100644
index be07312..0000000
--- a/src/test/java/org/scoula/service/UserServiceTest.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package org.scoula.service;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.junit.jupiter.MockitoExtension;
-import org.scoula.mapper.UserMapper;
-import org.scoula.security.dto.MemberDTO;
-import org.scoula.service.UserService;
-
-import java.sql.Date;
-
-import static org.junit.jupiter.api.Assertions.*;
-        import static org.mockito.Mockito.*;
-
-@ExtendWith(MockitoExtension.class)
-class UserServiceTest {
-
-    @Mock
-    UserMapper userMapper;
-
-    @InjectMocks
-    UserService userService;
-
-    @Test
-    void updateUser_필수값없으면_예외_테스트() {
-        // 1. userId 없음
-        MemberDTO user1 = new MemberDTO();
-        user1.setUserName("홍길동");
-        user1.setAddress("서울");
-        user1.setBirthdate(Date.valueOf("1990-01-01"));
-
-        Exception ex1 = assertThrows(IllegalArgumentException.class, () -> userService.updateUser(user1));
-        assertEquals("userId는 필수입니다.", ex1.getMessage());
-
-//        // 2. userName 없음
-//        MemberDTO user2 = new MemberDTO();
-//        user2.setUserId("user@example.com");
-//        user2.setAddress("서울");
-//        user2.setBirthdate(Date.valueOf("1990-01-01"));
-//
-//        Exception ex2 = assertThrows(IllegalArgumentException.class, () -> userService.updateUser(user2));
-//        assertEquals("userName은 필수 입력값입니다.", ex2.getMessage());
-//
-//        // 3. address 없음
-//        MemberDTO user3 = new MemberDTO();
-//        user3.setUserId("user@example.com");
-//        user3.setUserName("홍길동");
-//        user3.setBirthdate(Date.valueOf("1990-01-01"));
-//
-//        Exception ex3 = assertThrows(IllegalArgumentException.class, () -> userService.updateUser(user3));
-//        assertEquals("address는 필수 입력값입니다.", ex3.getMessage());
-//
-//        // 4. birthdate 없음
-//        MemberDTO user4 = new MemberDTO();
-//        user4.setUserId("user@example.com");
-//        user4.setUserName("홍길동");
-//        user4.setAddress("서울");
-//
-//        Exception ex4 = assertThrows(IllegalArgumentException.class, () -> userService.updateUser(user4));
-//        assertEquals("birthdate는 필수 입력값입니다.", ex4.getMessage());
-    }
-}
diff --git a/src/test/java/org/scoula/service/oauth/KakaoOauthServiceTest.java b/src/test/java/org/scoula/service/oauth/KakaoOauthServiceTest.java
deleted file mode 100644
index f391022..0000000
--- a/src/test/java/org/scoula/service/oauth/KakaoOauthServiceTest.java
+++ /dev/null
@@ -1,36 +0,0 @@
-package org.scoula.service.oauth;
-
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.test.context.ContextConfiguration;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-
-import static org.junit.jupiter.api.Assertions.*;
-@ExtendWith(SpringExtension.class)
-@ContextConfiguration(classes = {KakaoOauthService.class})
-class KakaoOauthServiceTest {
-
-    @Autowired
-    private KakaoOauthService kakaoOauthService;
-    @Test
-    void processKakaoLogin() {
-
-    }
-
-    @Test
-    void testProcessKakaoLogin() {
-    }
-
-    @Test
-    void getAccessToken() {
-    }
-
-    @Test
-    void getUserInfo() {
-    }
-
-    @Test
-    void processKakaoUser() {
-    }
-}
\ No newline at end of file