From b4754bad23a41e6497fb062ffbcf359e7c478096 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Fri, 19 Jan 2024 12:25:53 +0900
Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20xml=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/res/layout/activity_my_page.xml | 99 ++++++++++++++++++++
 app/src/main/res/values/strings.xml          |  5 +-
 2 files changed, 103 insertions(+), 1 deletion(-)

diff --git a/app/src/main/res/layout/activity_my_page.xml b/app/src/main/res/layout/activity_my_page.xml
index b7730f7c..4f78cab8 100644
--- a/app/src/main/res/layout/activity_my_page.xml
+++ b/app/src/main/res/layout/activity_my_page.xml
@@ -142,6 +142,105 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/ll_inquire"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:attr/selectableItemBackground"
+            android:orientation="horizontal">
+
+
+            <TextView
+                style="@style/AndroidBody1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:text="@string/inquire"
+                android:textColor="@color/black" />
+
+            <android.widget.Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <ImageButton
+                android:id="@+id/btn_inquire"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="16dp"
+                android:background="@android:color/transparent"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_arrow_right" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_service_rule"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:attr/selectableItemBackground"
+            android:orientation="horizontal">
+
+
+            <TextView
+                style="@style/AndroidBody1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:text="@string/service_rule"
+                android:textColor="@color/black" />
+
+            <android.widget.Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <ImageButton
+                android:id="@+id/btn_service_rule"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="16dp"
+                android:background="@android:color/transparent"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_arrow_right" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/ll_private_information"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?android:attr/selectableItemBackground"
+            android:orientation="horizontal">
+
+
+            <TextView
+                style="@style/AndroidBody1"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="16dp"
+                android:text="@string/private_information"
+                android:textColor="@color/black" />
+
+            <android.widget.Space
+                android:layout_width="0dp"
+                android:layout_height="0dp"
+                android:layout_weight="1" />
+
+            <ImageButton
+                android:id="@+id/btn_private_information"
+                android:layout_width="18dp"
+                android:layout_height="18dp"
+                android:layout_gravity="center"
+                android:layout_marginEnd="16dp"
+                android:background="@android:color/transparent"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_arrow_right" />
+
+        </LinearLayout>
+
         <TextView
             android:id="@+id/tv_logout"
             style="@style/AndroidBody1"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2d94a98c..d2b5e752 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,7 +73,7 @@
     <string name="report">신고</string>
     <string name="fix">수정하기</string>
     <string name="delete">삭제하기</string>
-    <string name="myreview">내가 쓴 리뷰</string>
+    <string name="myreview">작성한 리뷰</string>
     <string name="none_review">아직 작성한 리뷰가 없어요</string>
     <string name="none_review_my">첫 리뷰를 남겨 주세요!</string>
     <string name="none_review_list">가장 먼저 리뷰를 남겨 주세요</string>
@@ -112,4 +112,7 @@
     <string name="max_300">최대 300자</string>
     <string name="max_150">최대 150</string>
     <string name="store_app_version">스토어 앱 버전</string>
+    <string name="inquire">문의하기</string>
+    <string name="service_rule">서비스 이용약관</string>
+    <string name="private_information">개인정보 처리방침</string>
 </resources>
\ No newline at end of file

From 87cbc1a0dc72b3750ee3c09712b7b0aa2324d51b Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Fri, 19 Jan 2024 13:59:07 +0900
Subject: [PATCH 02/11] =?UTF-8?q?feat:=20=EB=AC=B8=EC=9D=98=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20xml=20=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  24 +---
 .../ui/mypage/Inquire/InquireActivity.kt      |  12 ++
 .../drawable/shape_edittext_small_gray.xml    |  16 +++
 app/src/main/res/layout/activity_inquire.xml  | 112 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   6 +
 5 files changed, 152 insertions(+), 18 deletions(-)
 create mode 100644 app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
 create mode 100644 app/src/main/res/drawable/shape_edittext_small_gray.xml
 create mode 100644 app/src/main/res/layout/activity_inquire.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 077b5a7c..78cd439a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -37,6 +37,9 @@
         android:usesCleartextTraffic="true"
         tools:replace="android:usesCleartextTraffic"
         tools:targetApi="31">
+        <activity
+            android:name=".ui.mypage.Inquire.InquireActivity"
+            android:exported="false" />
         <activity
             android:name=".ui.review.write.ReviewWriteRateActivity"
             android:exported="true">
@@ -60,8 +63,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
-
         <activity
             android:name=".ui.common.AndroidMessageDialogActivity"
             android:exported="true">
@@ -69,7 +70,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".ui.common.ForceUpdateDialogActivity"
             android:exported="true">
@@ -77,18 +77,19 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
+
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
 
                 <data
                     android:host="oauth"
-                    android:scheme="kakao${KAKAO_NATIVE_APP_KEY}" />       </intent-filter>
+                    android:scheme="kakao${KAKAO_NATIVE_APP_KEY}" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".base.BaseActivity"
@@ -97,12 +98,10 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".ui.mypage.usernamechange.UserNameChangeActivity"
             android:exported="true"
             android:windowSoftInputMode="adjustResize">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -117,7 +116,6 @@
         <activity
             android:name=".ui.review.list.ReviewActivity"
             android:exported="true">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -129,7 +127,6 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".ui.info.InfoActivity"
             android:exported="true"
@@ -138,11 +135,9 @@
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
         <activity
             android:name=".ui.main.MainActivity"
             android:exported="true">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -151,7 +146,6 @@
             android:name=".ui.review.etc.OthersReviewDialogActivity"
             android:exported="true"
             android:theme="@style/Theme.MyDialog">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -160,7 +154,6 @@
             android:name=".ui.review.etc.MyReviewDialogActivity"
             android:exported="true"
             android:theme="@style/Theme.MyDialog">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -168,7 +161,6 @@
         <activity
             android:name=".ui.review.etc.ReportActivity"
             android:exported="true">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
@@ -176,14 +168,10 @@
         <activity
             android:name=".ui.review.etc.FixedReviewActivity"
             android:exported="true">
-
             <meta-data
                 android:name="android.app.lib_name"
                 android:value="" />
         </activity>
-
-
-
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
new file mode 100644
index 00000000..be86cc2c
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
@@ -0,0 +1,12 @@
+package com.eatssu.android.ui.mypage.Inquire
+
+import androidx.appcompat.app.AppCompatActivity
+import android.os.Bundle
+import com.eatssu.android.R
+
+class InquireActivity : AppCompatActivity() {
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.activity_inquire)
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_edittext_small_gray.xml b/app/src/main/res/drawable/shape_edittext_small_gray.xml
new file mode 100644
index 00000000..733e7ae2
--- /dev/null
+++ b/app/src/main/res/drawable/shape_edittext_small_gray.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle" >
+    <solid android:color="@color/white" />
+    <stroke
+        android:width="1dp"
+        android:color="@color/gray500"/>
+    <corners
+        android:radius="10dp"/>
+    <padding
+        android:top="5dp"
+        android:bottom="5dp"
+        android:right="10dp"
+        android:left="10dp"/>
+
+</shape>
diff --git a/app/src/main/res/layout/activity_inquire.xml b/app/src/main/res/layout/activity_inquire.xml
new file mode 100644
index 00000000..66200527
--- /dev/null
+++ b/app/src/main/res/layout/activity_inquire.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="16dp"
+    tools:context=".ui.mypage.Inquire.InquireActivity">
+
+    <TextView
+        android:id="@+id/tv_report"
+        style="@style/AndroidSubtitle1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:includeFontPadding="false"
+        android:text="@string/leave_inquiry"
+        android:textColor="@color/black"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <LinearLayout
+        android:id="@+id/ll_my_email"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal"
+        android:paddingTop="30dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_report">
+
+        <TextView
+            style="@style/AndroidBody1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/email"
+            android:textColor="@color/black"
+            android:layout_marginRight="10dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/tv_ch_nickname"/>
+
+        <EditText
+            android:id="@+id/et_ch_nickname"
+            style="@style/AndroidBody3"
+            android:hint="@string/leave_email"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/shape_edittext_small_gray"
+            android:inputType="text"
+            android:maxLines="1"
+            android:maxLength="8"
+             />
+    </LinearLayout>
+
+    <TextView
+        android:id="@+id/tv_inquire_content"
+        style="@style/AndroidBody1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="?android:attr/selectableItemBackground"
+        android:text="@string/inquire_content"
+        android:layout_marginTop="20dp"
+        android:textColor="@color/black"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/ll_my_email"/>
+
+    <EditText
+        android:id="@+id/et_report_comment"
+        style="@style/AndroidBody3"
+        android:layout_width="match_parent"
+        android:layout_height="250dp"
+        android:layout_marginTop="10dp"
+        android:background="@drawable/shape_edittext_big"
+        android:gravity="top"
+        android:hint="@string/write_text"
+        android:includeFontPadding="false"
+        android:inputType="textMultiLine"
+        android:lineSpacingExtra="-4dp"
+        android:lines="10"
+        android:maxLength="500"
+        android:padding="10dp"
+        android:privateImeOptions="defaultInputmode=korea"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tv_inquire_content"
+        tools:ignore="SpeakableTextPresentCheck" />
+
+    <TextView
+        android:id="@+id/tv_maxtext"
+        style="@style/AndroidCaption2"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/max_500"
+        android:textAlignment="center"
+        app:layout_constraintEnd_toEndOf="@+id/et_report_comment"
+        app:layout_constraintTop_toBottomOf="@+id/et_report_comment" />
+
+    <Button
+        android:id="@+id/btn_send_report"
+        style="@style/AndroidButton1"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="30dp"
+        android:background="@drawable/shape_btn"
+        android:includeFontPadding="false"
+        android:text="@string/send"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintRight_toRightOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d2b5e752..43b45017 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -111,8 +111,14 @@
     <string name="recomented">\'를 추천하시겠어요?</string>
     <string name="max_300">최대 300자</string>
     <string name="max_150">최대 150</string>
+    <string name="max_500">최대 500자</string>
     <string name="store_app_version">스토어 앱 버전</string>
     <string name="inquire">문의하기</string>
     <string name="service_rule">서비스 이용약관</string>
     <string name="private_information">개인정보 처리방침</string>
+    <string name="leave_inquiry">문의할 내용을 남겨주세요.</string>
+    <string name="email">이메일</string>
+    <string name="leave_email">답변받을 이메일 주소를 남겨주세요.</string>
+    <string name="inquire_content">문의 내용</string>
+    <string name="send">전송하기</string>
 </resources>
\ No newline at end of file

From 83acd9e795f4be628940abcd3d0341f5ddc546f0 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Fri, 19 Jan 2024 14:33:50 +0900
Subject: [PATCH 03/11] =?UTF-8?q?feat:=20=EB=AC=B8=EC=9D=98=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EC=84=9C=EB=B2=84=20=EC=97=B0=EB=8F=99=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=9E=91=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/data/service/InquiresService.kt   | 22 +++++++
 .../ui/mypage/Inquire/InquireActivity.kt      | 57 ++++++++++++++++++-
 2 files changed, 77 insertions(+), 2 deletions(-)
 create mode 100644 app/src/main/java/com/eatssu/android/data/service/InquiresService.kt

diff --git a/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt b/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
new file mode 100644
index 00000000..1439c7c1
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
@@ -0,0 +1,22 @@
+package com.eatssu.android.data.service
+
+import com.eatssu.android.data.model.request.ReportRequestDto
+import com.eatssu.android.data.model.response.GetReportTypeResponseDto
+import okhttp3.RequestBody
+import retrofit2.Call
+import retrofit2.http.Body
+import retrofit2.http.GET
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+interface InquiresService {
+    @POST("inquires/") //리뷰 신고하기
+    fun inquireContent(
+        @Body request: String
+    ): Call<Void>
+
+    @GET("inquires/{userInquiriesId}") //리뷰 신고 사유 받아오기
+    fun getInquiries(
+        @Path("userInquiriesId") userInquiriesId: Long,
+    ): Call<GetReportTypeResponseDto>
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
index be86cc2c..79cd880b 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
@@ -2,11 +2,64 @@ package com.eatssu.android.ui.mypage.Inquire
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import android.util.Log
+import com.eatssu.android.BuildConfig
 import com.eatssu.android.R
+import com.eatssu.android.base.BaseActivity
+import com.eatssu.android.data.service.InquiresService
+import com.eatssu.android.data.service.UserService
+import com.eatssu.android.databinding.ActivityInquireBinding
+import com.eatssu.android.ui.mypage.myreview.MyReviewListActivity
+import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity
+import com.eatssu.android.util.extension.startActivity
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBinding::inflate)  {
+    private lateinit var inquiresService: InquiresService
+
+    private var content = ""
 
-class InquireActivity : AppCompatActivity() {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_inquire)
+        toolbarTitle.text = "문의하기" // 툴바 제목 설정
+
+        bindData()
+    }
+
+    override fun onResume() {
+        super.onResume()
+    }
+
+    private fun bindData(){
+        content = binding.etReportComment.text.toString()
+
+        binding.btnSendReport.setOnClickListener {
+            signOut(content);
+        }
+
+    }
+
+    private fun signOut(content: String) {
+        inquiresService.inquireContent(content).enqueue(object : Callback<Void> {
+            override fun onResponse(
+                call: Call<Void>,
+                response: Response<Void>,
+            ) {
+                if (response.isSuccessful){
+                    if (response.code() == 200) {
+                        Log.d("InquireActivity", "onResponse 성공: 문의하기" + response.body().toString())
+
+                    } else {
+                        Log.d("InquireActivity", "onResponse 오류: 문의하기" + response.body().toString())
+                    }
+                }
+            }
+
+            override fun onFailure(call: Call<Void>, t: Throwable) {
+                Log.d("InquireActivity", "onFailure 에러: 문의하기" + t.message.toString())
+            }
+        })
     }
 }
\ No newline at end of file

From 3e7669722252d8825ee8da2ed10e5c4fafb8545e Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Fri, 19 Jan 2024 15:08:02 +0900
Subject: [PATCH 04/11] =?UTF-8?q?feat:=20=EB=82=B4=20=EC=9D=B4=EB=A9=94?=
 =?UTF-8?q?=EC=9D=BC=20default=EB=A1=9C=20=EC=84=A4=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ui/mypage/Inquire/InquireActivity.kt      | 19 ++++++++++++++++---
 .../android/ui/mypage/MyPageActivity.kt       |  5 +++++
 app/src/main/res/layout/activity_inquire.xml  |  3 +--
 3 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
index 79cd880b..83688f65 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
@@ -1,25 +1,31 @@
 package com.eatssu.android.ui.mypage.Inquire
 
+import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
+import android.widget.Toast
 import com.eatssu.android.BuildConfig
 import com.eatssu.android.R
 import com.eatssu.android.base.BaseActivity
 import com.eatssu.android.data.service.InquiresService
 import com.eatssu.android.data.service.UserService
 import com.eatssu.android.databinding.ActivityInquireBinding
+import com.eatssu.android.ui.main.MainActivity
 import com.eatssu.android.ui.mypage.myreview.MyReviewListActivity
 import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity
+import com.eatssu.android.util.MySharedPreferences
 import com.eatssu.android.util.extension.startActivity
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
+import java.util.Locale
 
 class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBinding::inflate)  {
     private lateinit var inquiresService: InquiresService
 
     private var content = ""
+    private var email = ""
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -35,13 +41,20 @@ class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBind
     private fun bindData(){
         content = binding.etReportComment.text.toString()
 
+        // 카카오 로그인으로 받아온 이메일 정보 가져오기
+        val userEmail = MySharedPreferences.getUserEmail(this)
+
+        // EditText에 이메일 정보 설정
+        binding.etEmail.setText(userEmail)
+        // EditText를 편집 가능하게 만들기
+        binding.etEmail.isEnabled = true
+
         binding.btnSendReport.setOnClickListener {
-            signOut(content);
+            inquireContent(content);
         }
-
     }
 
-    private fun signOut(content: String) {
+    private fun inquireContent(content: String) {
         inquiresService.inquireContent(content).enqueue(object : Callback<Void> {
             override fun onResponse(
                 call: Call<Void>,
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
index 27cd58c0..cf8d02b4 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
@@ -16,6 +16,7 @@ import com.eatssu.android.databinding.ActivityMyPageBinding
 import com.eatssu.android.ui.common.VersionViewModel
 import com.eatssu.android.ui.common.VersionViewModelFactory
 import com.eatssu.android.ui.login.SocialLoginActivity
+import com.eatssu.android.ui.mypage.Inquire.InquireActivity
 import com.eatssu.android.ui.mypage.myreview.MyReviewListActivity
 import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity
 import com.eatssu.android.util.MySharedPreferences
@@ -62,6 +63,10 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
             startActivity<UserNameChangeActivity>()
         }
 
+        binding.llInquire.setOnClickListener {
+            startActivity<InquireActivity>()
+        }
+
         binding.llMyReview.setOnClickListener {
             startActivity<MyReviewListActivity>()
         }
diff --git a/app/src/main/res/layout/activity_inquire.xml b/app/src/main/res/layout/activity_inquire.xml
index 66200527..df5db525 100644
--- a/app/src/main/res/layout/activity_inquire.xml
+++ b/app/src/main/res/layout/activity_inquire.xml
@@ -39,7 +39,7 @@
             app:layout_constraintTop_toBottomOf="@+id/tv_ch_nickname"/>
 
         <EditText
-            android:id="@+id/et_ch_nickname"
+            android:id="@+id/et_email"
             style="@style/AndroidBody3"
             android:hint="@string/leave_email"
             android:layout_width="0dp"
@@ -48,7 +48,6 @@
             android:background="@drawable/shape_edittext_small_gray"
             android:inputType="text"
             android:maxLines="1"
-            android:maxLength="8"
              />
     </LinearLayout>
 

From 7e697891757df9c3bb092a1179a4692353e5b004 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Tue, 20 Feb 2024 16:46:06 +0900
Subject: [PATCH 05/11] =?UTF-8?q?feat=20:=20=EB=AC=B8=EC=9D=98=ED=95=98?=
 =?UTF-8?q?=EA=B8=B0=20=EC=84=9C=EB=B2=84=20=EC=97=B0=EA=B2=B0=20=EC=99=84?=
 =?UTF-8?q?=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/model/request/InquiriesRequestDto.kt |  5 ++++
 .../ui/mypage/Inquire/InquireActivity.kt      | 26 +++++++++----------
 2 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100644 app/src/main/java/com/eatssu/android/data/model/request/InquiriesRequestDto.kt

diff --git a/app/src/main/java/com/eatssu/android/data/model/request/InquiriesRequestDto.kt b/app/src/main/java/com/eatssu/android/data/model/request/InquiriesRequestDto.kt
new file mode 100644
index 00000000..e87849c2
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/data/model/request/InquiriesRequestDto.kt
@@ -0,0 +1,5 @@
+package com.eatssu.android.data.model.request
+
+data class InquiriesRequestDto(
+    val content : String
+)
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
index 83688f65..d1f844e8 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
@@ -1,25 +1,18 @@
 package com.eatssu.android.ui.mypage.Inquire
 
-import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
-import com.eatssu.android.BuildConfig
-import com.eatssu.android.R
 import com.eatssu.android.base.BaseActivity
+import com.eatssu.android.data.model.request.InquiriesRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.service.InquiresService
-import com.eatssu.android.data.service.UserService
 import com.eatssu.android.databinding.ActivityInquireBinding
-import com.eatssu.android.ui.main.MainActivity
-import com.eatssu.android.ui.mypage.myreview.MyReviewListActivity
-import com.eatssu.android.ui.mypage.usernamechange.UserNameChangeActivity
 import com.eatssu.android.util.MySharedPreferences
-import com.eatssu.android.util.extension.startActivity
+import com.eatssu.android.util.RetrofitImpl
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
-import java.util.Locale
 
 class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBinding::inflate)  {
     private lateinit var inquiresService: InquiresService
@@ -39,6 +32,8 @@ class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBind
     }
 
     private fun bindData(){
+        inquiresService = RetrofitImpl.retrofit.create(InquiresService::class.java);
+
         content = binding.etReportComment.text.toString()
 
         // 카카오 로그인으로 받아온 이메일 정보 가져오기
@@ -55,22 +50,25 @@ class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBind
     }
 
     private fun inquireContent(content: String) {
-        inquiresService.inquireContent(content).enqueue(object : Callback<Void> {
+        inquiresService.inquireContent(InquiriesRequestDto(content)).enqueue(object : Callback<BaseResponse<InquiriesRequestDto>> {
             override fun onResponse(
-                call: Call<Void>,
-                response: Response<Void>,
+                call: Call<BaseResponse<InquiriesRequestDto>>,
+                response: Response<BaseResponse<InquiriesRequestDto>>,
             ) {
                 if (response.isSuccessful){
                     if (response.code() == 200) {
                         Log.d("InquireActivity", "onResponse 성공: 문의하기" + response.body().toString())
+                        Toast.makeText(this@InquireActivity, "문의가 완료되었습니다.", Toast.LENGTH_SHORT).show()
 
                     } else {
                         Log.d("InquireActivity", "onResponse 오류: 문의하기" + response.body().toString())
                     }
+
+                    finish()
                 }
             }
 
-            override fun onFailure(call: Call<Void>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<InquiriesRequestDto>>, t: Throwable) {
                 Log.d("InquireActivity", "onFailure 에러: 문의하기" + t.message.toString())
             }
         })

From 939cee8962f131a3175a394a7523dc81d9d4af57 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Tue, 20 Feb 2024 16:49:28 +0900
Subject: [PATCH 06/11] =?UTF-8?q?feat=20:=20=EC=B9=B4=EC=B9=B4=EC=98=A4=20?=
 =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=84=9C=EB=B2=84=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/data/service/InquiresService.kt   | 10 +-
 .../android/data/service/OauthService.kt      |  5 +-
 .../eatssu/android/ui/login/LoginViewModel.kt | 75 +++++++++++++++
 .../android/ui/login/LoginViewModelFactory.kt | 20 ++++
 .../android/ui/login/SocialLoginActivity.kt   | 94 +++++++++----------
 5 files changed, 150 insertions(+), 54 deletions(-)
 create mode 100644 app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt
 create mode 100644 app/src/main/java/com/eatssu/android/ui/login/LoginViewModelFactory.kt

diff --git a/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt b/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
index 1439c7c1..67156628 100644
--- a/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
@@ -1,6 +1,8 @@
 package com.eatssu.android.data.service
 
+import com.eatssu.android.data.model.request.InquiriesRequestDto
 import com.eatssu.android.data.model.request.ReportRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.GetReportTypeResponseDto
 import okhttp3.RequestBody
 import retrofit2.Call
@@ -10,12 +12,12 @@ import retrofit2.http.POST
 import retrofit2.http.Path
 
 interface InquiresService {
-    @POST("inquires/") //리뷰 신고하기
+    @POST("inquiries/") // 문의 작성
     fun inquireContent(
-        @Body request: String
-    ): Call<Void>
+        @Body request: InquiriesRequestDto
+    ): Call<BaseResponse<InquiriesRequestDto>>
 
-    @GET("inquires/{userInquiriesId}") //리뷰 신고 사유 받아오기
+    @GET("inquiries/{inquiryId}") //리뷰 신고 사유 받아오기
     fun getInquiries(
         @Path("userInquiriesId") userInquiriesId: Long,
     ): Call<GetReportTypeResponseDto>
diff --git a/app/src/main/java/com/eatssu/android/data/service/OauthService.kt b/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
index 3e2a75cf..161b12d4 100644
--- a/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
@@ -1,6 +1,7 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.data.model.request.LoginWithKakaoRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.TokenResponseDto
 import retrofit2.Call
 import retrofit2.http.Body
@@ -8,6 +9,6 @@ import retrofit2.http.POST
 
 interface OauthService {
 
-    @POST("oauth/kakao")
-    fun loginWithKakao( @Body request : LoginWithKakaoRequestDto) : Call<TokenResponseDto>
+    @POST("oauths/kakao")
+    fun loginWithKakao( @Body request : LoginWithKakaoRequestDto) : Call<BaseResponse<TokenResponseDto>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt
new file mode 100644
index 00000000..2d7385ff
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt
@@ -0,0 +1,75 @@
+package com.eatssu.android.ui.login
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.eatssu.android.R
+import com.eatssu.android.data.model.request.LoginWithKakaoRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
+import com.eatssu.android.data.model.response.TokenResponseDto
+import com.eatssu.android.data.service.OauthService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import retrofit2.Call
+import retrofit2.Callback
+import retrofit2.Response
+
+public class LoginViewModel(private val oauthService: OauthService): ViewModel() {
+    private val _getLoginDataSuccessResponse = MutableLiveData<TokenResponseDto?>()
+    val getHomeLoginSuccessResponse: LiveData<TokenResponseDto?> = _getLoginDataSuccessResponse
+
+    private val _getLoginDataErrorResponse = MutableLiveData<String>()
+    val getHomeLoginErrorResponse: LiveData<String> = _getLoginDataErrorResponse
+
+    private val _toastMessage = MutableLiveData<String>()
+    val toastMessage: LiveData<String> = _toastMessage
+
+//    fun getLogin(email: String, providerID: String) {
+//        viewModelScope.launch {
+//            kotlin.runCatching {
+//                oauthService.loginWithKakao(LoginWithKakaoRequestDto(email, providerID))
+//            }.fold(onSuccess = { successResponse ->
+//                _getLoginDataSuccessResponse.value = successResponse.result
+//            }, onFailure = { errorResponse ->
+//                _getLoginDataErrorResponse.value = errorResponse.message
+//            })
+//        }
+//    }
+
+    fun getLogin(email: String, providerID: String) {
+        oauthService.loginWithKakao(LoginWithKakaoRequestDto(email,providerID)).enqueue(object : Callback<BaseResponse<TokenResponseDto>> {
+            override fun onResponse(call: Call<BaseResponse<TokenResponseDto>>, response: Response<BaseResponse<TokenResponseDto>>) {
+                if (response.isSuccessful) {
+                    val data = response.body()!!
+                    if (data.isSuccess) {
+                        _getLoginDataSuccessResponse.value = data.result
+                    } else {
+                        _getLoginDataErrorResponse.value = data.message
+                        handleErrorResponse("가입 안됨.")
+                    }
+                } else {
+                    handleErrorResponse("가입 안됨.")
+                }
+            }
+
+            override fun onFailure(call: Call<BaseResponse<TokenResponseDto>>, t: Throwable) {
+                handleErrorResponse("네트워크 오류입니다.")
+            }
+        })
+    }
+
+    private fun handleSuccessResponse(message: String) {
+        viewModelScope.launch(Dispatchers.Main) {
+            _toastMessage.value = message
+        }
+    }
+
+
+
+    private fun handleErrorResponse(message: String) {
+        viewModelScope.launch(Dispatchers.Main) {
+            _toastMessage.value = message
+        }
+    }
+}
diff --git a/app/src/main/java/com/eatssu/android/ui/login/LoginViewModelFactory.kt b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModelFactory.kt
new file mode 100644
index 00000000..cbb2872b
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModelFactory.kt
@@ -0,0 +1,20 @@
+package com.eatssu.android.ui.login
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.ViewModelProvider
+import com.eatssu.android.data.service.MenuService
+import com.eatssu.android.data.service.OauthService
+
+import kotlin.Suppress;
+
+class LoginViewModelFactory(private val oauthService: OauthService) :
+        ViewModelProvider.Factory {
+
+        override fun <T : ViewModel> create(modelClass: Class<T>): T {
+        if (modelClass.isAssignableFrom(LoginViewModel::class.java)) {
+            @Suppress("UNCHECKED_CAST")
+            return LoginViewModel(oauthService) as T
+        }
+        throw IllegalArgumentException("Unknown ViewModel class")
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt
index 056e1923..79bb6a45 100644
--- a/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt
@@ -6,16 +6,21 @@ import android.os.Bundle
 import android.util.Log
 import android.view.View
 import android.widget.Toast
+import androidx.lifecycle.ViewModelProvider
 import androidx.lifecycle.lifecycleScope
 import com.eatssu.android.App
 import com.eatssu.android.base.BaseActivity
 import com.eatssu.android.util.MySharedPreferences
 import com.eatssu.android.util.RetrofitImpl.nonRetrofit
 import com.eatssu.android.data.model.request.LoginWithKakaoRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.TokenResponseDto
 import com.eatssu.android.data.service.OauthService
 import com.eatssu.android.databinding.ActivitySocialLoginBinding
 import com.eatssu.android.ui.main.MainActivity
+import com.eatssu.android.util.RetrofitImpl
+import com.eatssu.android.util.extension.showToast
+import com.eatssu.android.util.extension.startActivity
 import com.kakao.sdk.common.model.ClientError
 import com.kakao.sdk.common.model.ClientErrorCause
 import com.kakao.sdk.user.UserApiClient
@@ -27,35 +32,45 @@ import retrofit2.Response
 
 class SocialLoginActivity : BaseActivity<ActivitySocialLoginBinding>(ActivitySocialLoginBinding::inflate) {
 
+    private lateinit var loginViewModel: LoginViewModel
+    private lateinit var oauthService: OauthService
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
+        oauthService = RetrofitImpl.nonRetrofit.create(OauthService::class.java)
+        loginViewModel =
+            ViewModelProvider(this, LoginViewModelFactory(oauthService))[LoginViewModel::class.java]
+//        loginViewModel = ViewModelProvider(this)[LoginViewModel::class.java]
+
+
         // 툴바 사용하지 않도록 설정
         toolbar.let {
-            toolbar.visibility= View.GONE
-            toolbarTitle.visibility= View.GONE
+            toolbar.visibility = View.GONE
+            toolbarTitle.visibility = View.GONE
             setSupportActionBar(it)
             supportActionBar?.setDisplayHomeAsUpEnabled(false)
             supportActionBar?.setDisplayShowTitleEnabled(false)
         }
 
 
+        checkAutoLogin()
+        bind()
+    }
+
+    private fun checkAutoLogin() {
         // SharedPreferences 안에 값이 저장되어 있을 때-> Login 패스하기
-        if (MySharedPreferences.getUserEmail(this).isNotBlank()) {
+        if (MySharedPreferences.getUserEmail(this).isNotBlank())
+        {
             // SharedPreferences 안에 값이 저장되어 있을 때 -> MainActivity로 이동
-            Toast.makeText(
-                this,
-                "자동 로그인 되었습니다.",
-                Toast.LENGTH_SHORT
-            ).show()
-            val intent = Intent(this, MainActivity::class.java)
-            startActivity(intent)
+            Toast.makeText(this, "자동 로그인 되었습니다.", Toast.LENGTH_SHORT).show()
+            startActivity<MainActivity>()
             finish()
         }
+    }
 
+    private fun bind(){
         val context = this
-
-
         binding.mcvKakaoLogin.setOnClickListener {
 
             Log.d("post", "버튼 클릭")
@@ -88,43 +103,26 @@ class SocialLoginActivity : BaseActivity<ActivitySocialLoginBinding>(ActivitySoc
                 Log.d(TAG, "invoke: email =" + user.kakaoAccount!!.email)
                 val email = user.kakaoAccount!!.email.toString()
 
+                loginViewModel.getLogin(email, providerID)
+                loginViewModel.getHomeLoginSuccessResponse.observe(this) { successData ->
+                    successData.run {
+                        /*자동 로그인*/
+                        MySharedPreferences.setUserEmail(this@SocialLoginActivity, email)
+                        MySharedPreferences.setUserPlatform(this@SocialLoginActivity, "KAKAO")
+
+                        /*토큰 저장*/
+                        App.token_prefs.accessToken = successData?.accessToken
+                        App.token_prefs.refreshToken = successData?.refreshToken
+
+                        Toast.makeText(this@SocialLoginActivity, "$email 계정으로 로그인에 성공하였습니다.", Toast.LENGTH_SHORT).show()
+                        startActivity<MainActivity>()  // 화면 전환을 시켜줌
+                    }
+                }
 
-                val intent = Intent(this, MainActivity::class.java)
-
-                val service = nonRetrofit.create(OauthService::class.java)
-                service.loginWithKakao(LoginWithKakaoRequestDto(email,providerID))
-                    .enqueue(object : Callback<TokenResponseDto> {
-                        override fun onResponse(
-                            call: Call<TokenResponseDto>,
-                            response: Response<TokenResponseDto>
-                        ) {
-                            if (response.isSuccessful) {
-                                if (response.code() == 200) {
-                                    Log.d("post", "onResponse 성공: " + response.body().toString())
-
-                                    /*자동 로그인*/
-                                    MySharedPreferences.setUserEmail(this@SocialLoginActivity,email)
-                                    MySharedPreferences.setUserPlatform(this@SocialLoginActivity,"KAKAO")
-
-                                    /*토큰 저장*/
-                                    App.token_prefs.accessToken = response.body()!!.accessToken
-                                    App.token_prefs.refreshToken =
-                                        response.body()!!.refreshToken//헤더에 붙일 토큰 저장
-
-                                    Toast.makeText(this@SocialLoginActivity, "$email 계정으로 로그인에 성공하였습니다.", Toast.LENGTH_SHORT).show()
-                                    startActivity(intent)  // 화면 전환을 시켜줌
-                                    finish()
-                                } else {
-                                    Log.d("post", "onResponse 오류: " + response.body().toString())
-                                    Toast.makeText(this@SocialLoginActivity, "error: " + response.message(), Toast.LENGTH_SHORT).show()
-                                }
-                            }
-                        }
-
-                        override fun onFailure(call: Call<TokenResponseDto>, t: Throwable) {
-                            Log.d("post", "onFailure 에러: " + t.message.toString())
-                        }
-                    })
+                loginViewModel.getHomeLoginErrorResponse.observe(this) { errorMessage ->
+                    showToast(errorMessage)
+                    Log.d("errorMessage",errorMessage)
+                }
             }
         }
     }

From bf730c6afe809b5565b513503978f111bd3f1283 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Thu, 22 Feb 2024 19:35:48 +0900
Subject: [PATCH 07/11] =?UTF-8?q?feat=20:=20=EB=82=B4=EA=B0=80=20=EC=93=B4?=
 =?UTF-8?q?=20=EB=A6=AC=EB=B7=B0=20=EB=B0=8F=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20=EC=A0=95=EB=B3=B4=20=EC=A1=B0=ED=9A=8C=20?=
 =?UTF-8?q?=EC=84=9C=EB=B2=84=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../eatssu/android/data/service/MyPageService.kt  |  9 +++++----
 .../eatssu/android/data/service/UserService.kt    | 13 +++++++------
 .../eatssu/android/ui/mypage/MyPageActivity.kt    |  9 +++++----
 .../eatssu/android/ui/mypage/MypageViewModel.kt   | 13 +++++++------
 .../ui/mypage/myreview/MyReviewListActivity.kt    | 13 +++++++------
 .../usernamechange/UserNameChangeViewModel.kt     | 15 ++++++++-------
 6 files changed, 39 insertions(+), 33 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/data/service/MyPageService.kt b/app/src/main/java/com/eatssu/android/data/service/MyPageService.kt
index 878f5703..902a1e83 100644
--- a/app/src/main/java/com/eatssu/android/data/service/MyPageService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/MyPageService.kt
@@ -1,5 +1,6 @@
 package com.eatssu.android.data.service
 
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.GetMyInfoResponseDto
 import com.eatssu.android.data.model.response.GetMyReviewResponseDto
 import retrofit2.Call
@@ -8,9 +9,9 @@ import retrofit2.http.POST
 import retrofit2.http.Query
 
 interface MyPageService {
-    @GET("mypage/myreview") //내가 쓴 리뷰 모아보기
-    fun getMyReviews(): Call<GetMyReviewResponseDto>
+    @GET("users/reviews") //내가 쓴 리뷰 모아보기
+    fun getMyReviews(): Call<BaseResponse<GetMyReviewResponseDto>>
 
-    @GET("mypage/info") //내 정보 모아보기
-    fun getMyInfo(): Call<GetMyInfoResponseDto>
+    @GET("users/mypage") //내 정보 모아보기
+    fun getMyInfo(): Call<BaseResponse<GetMyInfoResponseDto>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/service/UserService.kt b/app/src/main/java/com/eatssu/android/data/service/UserService.kt
index aa3ea8c0..e3f14674 100644
--- a/app/src/main/java/com/eatssu/android/data/service/UserService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/UserService.kt
@@ -1,6 +1,7 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.data.model.request.ChangeNicknameRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.TokenResponseDto
 import retrofit2.Call
 import retrofit2.http.*
@@ -11,15 +12,15 @@ interface UserService {
         @Header("Authorization") refreshToken: String?)
     : Call<TokenResponseDto>
 
-    @PATCH("user/nickname") //닉네임 수정
-    fun changeNickname(@Body request: ChangeNicknameRequestDto): Call<Void>
+    @PATCH("users/nickname") //닉네임 수정
+    fun changeNickname(@Body request: ChangeNicknameRequestDto): Call<BaseResponse<Void>>
 
-    @DELETE("user/signout") //유저 탈퇴
-    fun signOut(): Call<String>
+    @DELETE("users") //유저 탈퇴
+    fun signOut(): Call<BaseResponse<String>>
 
-    @GET("user/check-nickname") //닉네임 중 복 체크, 존재하는 닉네임이면 errorCode 2012
+    @GET("users/validate/nickname") //닉네임 중 복 체크, 존재하는 닉네임이면 errorCode 2012
     fun checkNickname(
         @Query("nickname") nickname: String
-    ): Call<String>
+    ): Call<BaseResponse<String>>
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
index cf8d02b4..784bd82c 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/MyPageActivity.kt
@@ -9,6 +9,7 @@ import androidx.lifecycle.ViewModelProvider
 import com.eatssu.android.App
 import com.eatssu.android.BuildConfig
 import com.eatssu.android.base.BaseActivity
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
 import com.eatssu.android.data.service.MyPageService
 import com.eatssu.android.data.service.UserService
@@ -153,10 +154,10 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
 
 
     private fun signOut() {
-        userService.signOut().enqueue(object : Callback<String> {
+        userService.signOut().enqueue(object : Callback<BaseResponse<String>> {
             override fun onResponse(
-                call: Call<String>,
-                response: Response<String>,
+                call: Call<BaseResponse<String>>,
+                response: Response<BaseResponse<String>>,
             ) {
                 if (response.isSuccessful){
                     if (response.code() == 200) {
@@ -168,7 +169,7 @@ class MyPageActivity : BaseActivity<ActivityMyPageBinding>(ActivityMyPageBinding
                 }
             }
 
-            override fun onFailure(call: Call<String>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<String>>, t: Throwable) {
                 Log.d("MyPageActivity", "onFailure 에러: 탈퇴" + t.message.toString())
             }
         })
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt
index aa576670..6cbf6022 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.GetMyInfoResponseDto
 import com.eatssu.android.data.service.MyPageService
 import kotlinx.coroutines.Dispatchers
@@ -25,16 +26,16 @@ class MypageViewModel(private val myPageService: MyPageService) : ViewModel() {
     val isNull: LiveData<Boolean> get() = _isNull
 
     fun checkMyInfo() {
-        myPageService.getMyInfo().enqueue(object : Callback<GetMyInfoResponseDto> {
-            override fun onResponse(call: Call<GetMyInfoResponseDto>, response: Response<GetMyInfoResponseDto>) {
+        myPageService.getMyInfo().enqueue(object : Callback<BaseResponse<GetMyInfoResponseDto>> {
+            override fun onResponse(call: Call<BaseResponse<GetMyInfoResponseDto>>, response: Response<BaseResponse<GetMyInfoResponseDto>>) {
                 if (response.isSuccessful) {
-                    _nickname.postValue(response.body()?.nickname)
+                    _nickname.postValue(response.body()?.result?.nickname)
 
-                    if (response.body()?.nickname.isNullOrBlank()) {
+                    if (response.body()?.result?.nickname.isNullOrBlank()) {
                         handleErrorResponse("환영합니다.") //null이면 isNull에 true를 넣음
                         _isNull.postValue(true)
                     } else {
-                        handleSuccessResponse("${response.body()?.nickname} 님 환영합니다.")
+                        handleSuccessResponse("${response.body()?.result?.nickname} 님 환영합니다.")
                         _isNull.postValue(false)
 
                     }
@@ -43,7 +44,7 @@ class MypageViewModel(private val myPageService: MyPageService) : ViewModel() {
                 }
             }
 
-            override fun onFailure(call: Call<GetMyInfoResponseDto>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<GetMyInfoResponseDto>>, t: Throwable) {
                 handleErrorResponse("정보를 불러 올 수 없습니다.")
             }
         })
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt
index 05758ec8..f2157806 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt
@@ -5,6 +5,7 @@ import android.util.Log
 import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.eatssu.android.base.BaseActivity
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.GetMyReviewResponseDto
 import com.eatssu.android.data.service.MyPageService
 import com.eatssu.android.databinding.ActivityMyReviewListBinding
@@ -36,10 +37,10 @@ class MyReviewListActivity : BaseActivity<ActivityMyReviewListBinding>(ActivityM
     private fun lodeReview() {
         val myPageService = retrofit.create(MyPageService::class.java)
         myPageService.getMyReviews().enqueue(object :
-            Callback<GetMyReviewResponseDto> {
+            Callback<BaseResponse<GetMyReviewResponseDto>> {
             override fun onResponse(
-                call: Call<GetMyReviewResponseDto>,
-                response: Response<GetMyReviewResponseDto>
+                call: Call<BaseResponse<GetMyReviewResponseDto>>,
+                response: Response<BaseResponse<GetMyReviewResponseDto>>
             ) {
                 if (response.isSuccessful) {
                     // 정상적으로 통신이 성공된 경우
@@ -47,13 +48,13 @@ class MyReviewListActivity : BaseActivity<ActivityMyReviewListBinding>(ActivityM
 
                     val body = response.body()
 
-                    if(body?.numberOfElements ==0){
+                    if(body?.result?.dataList?.size==0){
                         binding.llNonReview.visibility=View.VISIBLE
                         binding.nestedScrollView.visibility=View.GONE
                     }else{
                         binding.llNonReview.visibility=View.GONE
                         binding.nestedScrollView.visibility=View.VISIBLE
-                        setAdapter(body!!.dataList)
+                        setAdapter(body!!.result!!.dataList)
                     }
 
                 } else {
@@ -62,7 +63,7 @@ class MyReviewListActivity : BaseActivity<ActivityMyReviewListBinding>(ActivityM
                 }
             }
 
-            override fun onFailure(call: Call<GetMyReviewResponseDto>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<GetMyReviewResponseDto>>, t: Throwable) {
                 // 통신 실패 (인터넷 끊킴, 예외 발생 등 시스템적인 이유)
                 Log.d("post", "onFailure 에러: " + t.message.toString())
             }
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt
index 13e4a0e4..5c76f2d4 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.data.model.request.ChangeNicknameRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.service.UserService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -25,10 +26,10 @@ class UserNameChangeViewModel(private val userService: UserService) : ViewModel(
     val toastMessage: LiveData<String> get() = _toastMessage
 
     fun checkNickname(inputNickname: String) {
-        userService.checkNickname(inputNickname).enqueue(object : Callback<String> {
-            override fun onResponse(call: Call<String>, response: Response<String>) {
+        userService.checkNickname(inputNickname).enqueue(object : Callback<BaseResponse<String>> {
+            override fun onResponse(call: Call<BaseResponse<String>>, response: Response<BaseResponse<String>>) {
                 if (response.isSuccessful) {
-                    if (response.body() == "true") {
+                    if (response.body()?.result == "true") {
                         handleSuccessResponse("사용가능한 닉네임 입니다.")
                     } else {
                         handleErrorResponse("이미 사용 중인 닉네임 입니다.")
@@ -38,15 +39,15 @@ class UserNameChangeViewModel(private val userService: UserService) : ViewModel(
                 }
             }
 
-            override fun onFailure(call: Call<String>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<String>>, t: Throwable) {
                 handleErrorResponse("닉네임 중복 확인에 실패했습니다.")
             }
         })
     }
 
     fun changeNickname(inputNickname: String) {
-        userService.changeNickname(ChangeNicknameRequestDto(inputNickname)).enqueue(object : Callback<Void> {
-            override fun onResponse(call: Call<Void>, response: Response<Void>) {
+        userService.changeNickname(ChangeNicknameRequestDto(inputNickname)).enqueue(object : Callback<BaseResponse<Void>> {
+            override fun onResponse(call: Call<BaseResponse<Void>>, response: Response<BaseResponse<Void>>) {
                 if (response.isSuccessful) {
                     handleSuccessResponse("닉네임 설정에 성공했습니다.")
                 } else {
@@ -54,7 +55,7 @@ class UserNameChangeViewModel(private val userService: UserService) : ViewModel(
                 }
             }
 
-            override fun onFailure(call: Call<Void>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
                 handleErrorResponse("닉네임 설정에 실패했습니다.")
             }
         })

From 41405036857744568120a971b151583a3c140d84 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Thu, 22 Feb 2024 19:39:50 +0900
Subject: [PATCH 08/11] =?UTF-8?q?feat=20:=20=EB=A6=AC=EB=B7=B0=20=EC=82=AD?=
 =?UTF-8?q?=EC=A0=9C=20=EB=B0=8F=20=EC=88=98=EC=A0=95=20=EC=84=9C=EB=B2=84?=
 =?UTF-8?q?=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../android/data/service/ReviewService.kt       | 17 +++++++++--------
 .../android/ui/review/etc/DeleteViewModel.kt    |  7 ++++---
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt b/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
index b0fa21b1..047eadcb 100644
--- a/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
@@ -1,5 +1,6 @@
 package com.eatssu.android.data.service
 
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.GetReviewListResponse
 import com.eatssu.android.data.model.response.GetReviewInfoResponseDto
 import okhttp3.MultipartBody
@@ -10,7 +11,7 @@ import retrofit2.http.*
 
 interface ReviewService {
     @Multipart
-    @POST("review/{menuId}")
+    @POST("reviews/{menuId}")
     fun writeReview(
         @Path("menuId") menuId: Long,
         @Part files: List<MultipartBody.Part>, // Remove the part name from the annotation
@@ -18,24 +19,24 @@ interface ReviewService {
     ): Call<Void>
 
     @Multipart
-    @POST("review/{menuId}")
+    @POST("reviews/{menuId}")
     fun writeReview(
         @Path("menuId") menuId: Long,
         @Part("reviewCreate") reviewData: RequestBody,
     ): Call<Void>
 
 
-    @DELETE("/review/{reviewId}") //리뷰 삭제
-    fun delReview(@Path("reviewId") reviewId: Long): Call<Void>
+    @DELETE("/reviews/{reviewId}") //리뷰 삭제
+    fun delReview(@Path("reviewId") reviewId: Long): Call<BaseResponse<Void>>
 
-    @PATCH("/review/{reviewId}") //리뷰 수정(글 수정)
+    @PATCH("/reviews/{reviewId}") //리뷰 수정(글 수정)
     fun modifyReview(
         @Path("reviewId") reviewId: Long,
         @Body request: RequestBody
-    ): Call<Void>
+    ): Call<BaseResponse<Void>>
 
 
-    @GET("/review/info") // Retrieve menu review information (rating, etc.) for changeable menus
+    @GET("/reviews/info") // Retrieve menu review information (rating, etc.) for changeable menus
     fun getRreviewInfo(
         @Query("menuType") menuType: String,
         @Query("mealId") mealId: Long?,
@@ -43,7 +44,7 @@ interface ReviewService {
     ): Call<GetReviewInfoResponseDto>
 
 
-    @GET("/review/list") //메뉴 리뷰 리스트 조회 - 고정메뉴
+    @GET("/reviews/list") //메뉴 리뷰 리스트 조회 - 고정메뉴
     fun getReviewList(
         @Query("menuType") menuType: String,
         @Query("mealId") mealId: Long?,
diff --git a/app/src/main/java/com/eatssu/android/ui/review/etc/DeleteViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/etc/DeleteViewModel.kt
index 3c40bb84..3e180cee 100644
--- a/app/src/main/java/com/eatssu/android/ui/review/etc/DeleteViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/review/etc/DeleteViewModel.kt
@@ -4,6 +4,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.service.ReviewService
 import com.eatssu.android.util.RetrofitImpl
 import kotlinx.coroutines.Dispatchers
@@ -25,8 +26,8 @@ class DeleteViewModel : ViewModel() {
         val service = RetrofitImpl.retrofit.create(ReviewService::class.java)
 
         viewModelScope.launch(Dispatchers.IO) {
-            service.delReview(reviewId).enqueue(object : Callback<Void> {
-                override fun onResponse(call: Call<Void>, response: Response<Void>) {
+            service.delReview(reviewId).enqueue(object : Callback<BaseResponse<Void>> {
+                override fun onResponse(call: Call<BaseResponse<Void>>, response: Response<BaseResponse<Void>>) {
                     if (response.isSuccessful) {
                         if (response.code() == 200) {
                             handleSuccessResponse("삭제가 완료되었습니다.")
@@ -36,7 +37,7 @@ class DeleteViewModel : ViewModel() {
                     }
                 }
 
-                override fun onFailure(call: Call<Void>, t: Throwable) {
+                override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
                     handleErrorResponse("삭제가 실패하였습니다.")
                 }
             })

From 13dbdd14f150c0d4332829c6feb02256334dc8d4 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Thu, 22 Feb 2024 19:43:41 +0900
Subject: [PATCH 09/11] =?UTF-8?q?feat=20:=20=EB=A6=AC=EB=B7=B0=20=EC=8B=A0?=
 =?UTF-8?q?=EA=B3=A0=ED=95=98=EA=B8=B0=20=EC=84=9C=EB=B2=84=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/data/service/ReportService.kt  | 7 ++++---
 .../com/eatssu/android/ui/review/etc/ReportViewModel.kt    | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/data/service/ReportService.kt b/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
index 96c1539f..791eb8a1 100644
--- a/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
@@ -1,6 +1,7 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.data.model.request.ReportRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.model.response.GetReportTypeResponseDto
 import retrofit2.Call
 import retrofit2.http.Body
@@ -8,11 +9,11 @@ import retrofit2.http.GET
 import retrofit2.http.POST
 
 interface ReportService {
-    @POST("report/") //리뷰 신고하기
+    @POST("reports/") //리뷰 신고하기
     fun reportReview(
         @Body request: ReportRequestDto
-    ): Call<Void>
+    ): Call<BaseResponse<Void>>
 
-    @GET("report/type") //리뷰 신고 사유 받아오기
+    @GET("reports/types") //리뷰 신고 사유 받아오기
     fun getMyReviews(): Call<GetReportTypeResponseDto>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt
index 8f5f04b2..b47f2ff1 100644
--- a/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.data.model.request.ReportRequestDto
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.service.ReportService
 import com.eatssu.android.data.service.ReviewService
 import com.eatssu.android.util.RetrofitImpl
@@ -29,8 +30,8 @@ class ReportViewModel : ViewModel() {
         val service = RetrofitImpl.retrofit.create(ReportService::class.java)
 
         viewModelScope.launch(Dispatchers.IO) {
-            service.reportReview(ReportRequestDto(reviewId, reportType, content)).enqueue(object : Callback<Void> {
-                override fun onResponse(call: Call<Void>, response: Response<Void>) {
+            service.reportReview(ReportRequestDto(reviewId, reportType, content)).enqueue(object : Callback<BaseResponse<Void>> {
+                override fun onResponse(call: Call<BaseResponse<Void>>, response: Response<BaseResponse<Void>>) {
                     if (response.isSuccessful) {
                         if (response.code() == 200) {
                             handleSuccessResponse("신고가 완료되었습니다.")
@@ -40,7 +41,7 @@ class ReportViewModel : ViewModel() {
                     }
                 }
 
-                override fun onFailure(call: Call<Void>, t: Throwable) {
+                override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
                     handleErrorResponse("신고가 실패하였습니다.")
                 }
             })

From 7a1c0ae12962e69b13766a2fbb0a3b3e00af6456 Mon Sep 17 00:00:00 2001
From: Amepistheo <kellylhji@gmail.com>
Date: Thu, 22 Feb 2024 20:30:04 +0900
Subject: [PATCH 10/11] =?UTF-8?q?fix=20:=20baseResponse=EB=A1=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/eatssu/android/ui/review/etc/FixViewModel.kt  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/eatssu/android/ui/review/etc/FixViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/etc/FixViewModel.kt
index d18af595..85f88bd8 100644
--- a/app/src/main/java/com/eatssu/android/ui/review/etc/FixViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/review/etc/FixViewModel.kt
@@ -5,6 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import com.eatssu.android.data.model.response.BaseResponse
 import com.eatssu.android.data.service.ReviewService
 import com.eatssu.android.util.RetrofitImpl
 import com.eatssu.android.util.RetrofitImpl.retrofit
@@ -37,8 +38,8 @@ class FixViewModel : ViewModel() {
         """.trimIndent().toRequestBody("application/json".toMediaTypeOrNull())
 
         viewModelScope.launch(Dispatchers.IO) {
-            service.modifyReview(reviewId, reviewData).enqueue(object : Callback<Void> {
-                override fun onResponse(call: Call<Void>, response: Response<Void>) {
+            service.modifyReview(reviewId, reviewData).enqueue(object : Callback<BaseResponse<Void>> {
+                override fun onResponse(call: Call<BaseResponse<Void>>, response: Response<BaseResponse<Void>>) {
                     if (response.isSuccessful) {
                         if (response.code() == 200) {
                             handleSuccessResponse("수정이 완료되었습니다.")
@@ -48,7 +49,7 @@ class FixViewModel : ViewModel() {
                     }
                 }
 
-                override fun onFailure(call: Call<Void>, t: Throwable) {
+                override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
                     handleErrorResponse("수정이 실패하였습니다.")
                 }
             })

From 7e0502e62655482fa053140c64471076c3ad6af8 Mon Sep 17 00:00:00 2001
From: yujin <jini1514@soongsil.ac.kr>
Date: Mon, 26 Feb 2024 20:20:16 +0900
Subject: [PATCH 11/11] =?UTF-8?q?rename:=20xxxdto=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../data/dto/request/ChangeNicknameRequest.kt |  5 +++
 .../dto/request/ChangeNicknameRequestDto.kt   |  5 ---
 .../data/dto/request/ChangePwRequest.kt       |  5 +++
 .../data/dto/request/ChangePwRequestDto.kt    |  5 ---
 .../data/dto/request/InquiriesRequest.kt      |  5 +++
 .../data/dto/request/InquiriesRequestDto.kt   |  5 ---
 ...RequestDto.kt => LoginWithKakaoRequest.kt} |  4 +--
 ...MenuRequestDto.kt => ModifyMenuRequest.kt} |  8 ++---
 ...ewRequestDto.kt => ModifyReviewRequest.kt} |  4 +--
 .../{ReportRequestDto.kt => ReportRequest.kt} |  4 +--
 ...stDto.kt => ChangeMenuInfoListResponse.kt} |  0
 ...ResponseDto.kt => GetFixedMenuResponse.kt} |  0
 ...nfoResponseDto.kt => GetMyInfoResponse.kt} |  2 +-
 ...wResponseDto.kt => GetMyReviewResponse.kt} | 10 +++---
 ...esponseDto.kt => GetReportTypeResponse.kt} |  4 +--
 ...esponseDto.kt => GetReviewInfoResponse.kt} |  6 ++--
 ...ResponseDto.kt => GetTodayMealResponse.kt} |  0
 .../data/dto/response/InfoResponseDto.kt      | 17 ----------
 .../{TokenResponseDto.kt => TokenResponse.kt} |  4 +--
 ...{FirebaseInfoItem.kt => RestaurantInfo.kt} |  4 +--
 .../FirebaseRemoteConfigRepository.kt         | 14 ++++----
 .../android/data/service/InquiresService.kt   |  6 ++--
 .../android/data/service/OauthService.kt      | 10 +++---
 .../android/data/service/ReportService.kt     |  4 +--
 .../android/data/service/ReviewService.kt     |  4 +--
 .../android/data/service/UserService.kt       | 15 ++++-----
 .../eatssu/android/ui/info/InfoViewModel.kt   |  4 +--
 .../eatssu/android/ui/login/LoginViewModel.kt | 16 ++++-----
 .../ui/mypage/Inquire/InquireActivity.kt      | 33 +++++++++++--------
 .../android/ui/mypage/MypageViewModel.kt      | 10 +++---
 .../ui/mypage/myreview/MyReviewAdapter.kt     |  4 +--
 .../mypage/myreview/MyReviewListActivity.kt   | 12 +++----
 .../usernamechange/UserNameChangeViewModel.kt | 24 ++++++++------
 .../android/ui/review/etc/ReportViewModel.kt  | 22 ++++++++-----
 .../android/ui/review/list/ReviewViewModel.kt | 14 ++++----
 35 files changed, 142 insertions(+), 147 deletions(-)
 create mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequest.kt
 delete mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequestDto.kt
 create mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt
 delete mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequestDto.kt
 create mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequest.kt
 delete mode 100644 app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequestDto.kt
 rename app/src/main/java/com/eatssu/android/data/dto/request/{LoginWithKakaoRequestDto.kt => LoginWithKakaoRequest.kt} (73%)
 rename app/src/main/java/com/eatssu/android/data/dto/request/{ModifyMenuRequestDto.kt => ModifyMenuRequest.kt} (50%)
 rename app/src/main/java/com/eatssu/android/data/dto/request/{ModifyReviewRequestDto.kt => ModifyReviewRequest.kt} (57%)
 rename app/src/main/java/com/eatssu/android/data/dto/request/{ReportRequestDto.kt => ReportRequest.kt} (82%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{ChangeMenuInfoListDto.kt => ChangeMenuInfoListResponse.kt} (100%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{GetFixedMenuResponseDto.kt => GetFixedMenuResponse.kt} (100%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{GetMyInfoResponseDto.kt => GetMyInfoResponse.kt} (87%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{GetMyReviewResponseDto.kt => GetMyReviewResponse.kt} (71%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{GetReportTypeResponseDto.kt => GetReportTypeResponse.kt} (74%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{GetReviewInfoResponseDto.kt => GetReviewInfoResponse.kt} (85%)
 rename app/src/main/java/com/eatssu/android/data/dto/response/{GetTodayMealResponseDto.kt => GetTodayMealResponse.kt} (100%)
 delete mode 100644 app/src/main/java/com/eatssu/android/data/dto/response/InfoResponseDto.kt
 rename app/src/main/java/com/eatssu/android/data/dto/response/{TokenResponseDto.kt => TokenResponse.kt} (77%)
 rename app/src/main/java/com/eatssu/android/data/model/{FirebaseInfoItem.kt => RestaurantInfo.kt} (69%)

diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequest.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequest.kt
new file mode 100644
index 00000000..830849b2
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequest.kt
@@ -0,0 +1,5 @@
+package com.eatssu.android.data.dto.request
+
+data class ChangeNicknameRequest(
+    val nickname: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequestDto.kt
deleted file mode 100644
index 09e4fd3f..00000000
--- a/app/src/main/java/com/eatssu/android/data/dto/request/ChangeNicknameRequestDto.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.eatssu.android.data.dto.request
-
-data class ChangeNicknameRequestDto(
-    val nickname: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt
new file mode 100644
index 00000000..b32d49b5
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequest.kt
@@ -0,0 +1,5 @@
+package com.eatssu.android.data.dto.request
+
+data class ChangePwRequest(
+    val pwd: String,
+)
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequestDto.kt
deleted file mode 100644
index 0678661b..00000000
--- a/app/src/main/java/com/eatssu/android/data/dto/request/ChangePwRequestDto.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.eatssu.android.data.dto.request
-
-data class ChangePwRequestDto(
-    val pwd: String
-)
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequest.kt b/app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequest.kt
new file mode 100644
index 00000000..b9f936e9
--- /dev/null
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequest.kt
@@ -0,0 +1,5 @@
+package com.eatssu.android.data.model.request
+
+data class InquiriesRequest(
+    val content: String,
+)
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequestDto.kt
deleted file mode 100644
index e87849c2..00000000
--- a/app/src/main/java/com/eatssu/android/data/dto/request/InquiriesRequestDto.kt
+++ /dev/null
@@ -1,5 +0,0 @@
-package com.eatssu.android.data.model.request
-
-data class InquiriesRequestDto(
-    val content : String
-)
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequest.kt
similarity index 73%
rename from app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequestDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequest.kt
index fa20e8b7..98fd2977 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequestDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/LoginWithKakaoRequest.kt
@@ -2,10 +2,10 @@ package com.eatssu.android.data.dto.request
 
 import com.google.gson.annotations.SerializedName
 
-data class LoginWithKakaoRequestDto (
+data class LoginWithKakaoRequest(
     @SerializedName("email")
     val email: String,
 
     @SerializedName("providerId")
-    val providerId: String
+    val providerId: String,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ModifyMenuRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ModifyMenuRequest.kt
similarity index 50%
rename from app/src/main/java/com/eatssu/android/data/dto/request/ModifyMenuRequestDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/request/ModifyMenuRequest.kt
index ea2b1ade..68ee5dbf 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/request/ModifyMenuRequestDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/ModifyMenuRequest.kt
@@ -1,10 +1,10 @@
 package com.eatssu.android.data.dto.request
 
-data class ModifyMenuRequestDto(
-    val addTodayMenuList: List<AddTodayMenu>
-){
+data class ModifyMenuRequest(
+    val addTodayMenuList: List<AddTodayMenu>,
+) {
     data class AddTodayMenu(
         val name: String,
-        val price: Int
+        val price: Int,
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequest.kt
similarity index 57%
rename from app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequestDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequest.kt
index 55d410c6..097289e8 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequestDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/ModifyReviewRequest.kt
@@ -1,7 +1,7 @@
 package com.eatssu.android.data.dto.request
 
-data class ModifyReviewRequestDto(
+data class ModifyReviewRequest(
     val content: String,
     val grade: Int,
-    val reviewTags: List<String>
+    val reviewTags: List<String>,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/request/ReportRequestDto.kt b/app/src/main/java/com/eatssu/android/data/dto/request/ReportRequest.kt
similarity index 82%
rename from app/src/main/java/com/eatssu/android/data/dto/request/ReportRequestDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/request/ReportRequest.kt
index 8e65ed1b..30d5ab84 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/request/ReportRequestDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/request/ReportRequest.kt
@@ -2,7 +2,7 @@ package com.eatssu.android.data.dto.request
 
 import com.google.gson.annotations.SerializedName
 
-data class ReportRequestDto(
+data class ReportRequest(
     @SerializedName("reviewId")
     val reviewId: Long,
 
@@ -10,5 +10,5 @@ data class ReportRequestDto(
     val reportType: String,
 
     @SerializedName("content")
-    val content: String
+    val content: String,
 )
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/ChangeMenuInfoListDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/ChangeMenuInfoListResponse.kt
similarity index 100%
rename from app/src/main/java/com/eatssu/android/data/dto/response/ChangeMenuInfoListDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/ChangeMenuInfoListResponse.kt
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/GetFixedMenuResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/GetFixedMenuResponse.kt
similarity index 100%
rename from app/src/main/java/com/eatssu/android/data/dto/response/GetFixedMenuResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/GetFixedMenuResponse.kt
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/GetMyInfoResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/GetMyInfoResponse.kt
similarity index 87%
rename from app/src/main/java/com/eatssu/android/data/dto/response/GetMyInfoResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/GetMyInfoResponse.kt
index 583ccceb..95a1426b 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/response/GetMyInfoResponseDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/response/GetMyInfoResponse.kt
@@ -2,7 +2,7 @@ package com.eatssu.android.data.dto.response
 
 import com.google.gson.annotations.SerializedName
 
-data class GetMyInfoResponseDto(
+data class GetMyInfoResponse(
 
     @SerializedName("nickname") var nickname: String? = null,
     @SerializedName("provider") var provider: String? = null,
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/GetMyReviewResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/GetMyReviewResponse.kt
similarity index 71%
rename from app/src/main/java/com/eatssu/android/data/dto/response/GetMyReviewResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/GetMyReviewResponse.kt
index 278a3e80..6c8723bb 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/response/GetMyReviewResponseDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/response/GetMyReviewResponse.kt
@@ -1,16 +1,16 @@
 package com.eatssu.android.data.dto.response
 
-data class GetMyReviewResponseDto(
+data class GetMyReviewResponse(
     val dataList: List<Data>,
     val hasNext: Boolean,
-    val numberOfElements: Int
-){
+    val numberOfElements: Int,
+) {
     data class Data(
         val content: String,
-        val reviewId : Int,
+        val reviewId: Int,
         val mainGrade: Int,
         val amountGrade: Int,
-        val tasteGrade : Int,
+        val tasteGrade: Int,
         val imgUrlList: List<String>,
         val writeDate: String,
         val menuName: String,
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/GetReportTypeResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/GetReportTypeResponse.kt
similarity index 74%
rename from app/src/main/java/com/eatssu/android/data/dto/response/GetReportTypeResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/GetReportTypeResponse.kt
index 1d45653d..9bf02d25 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/response/GetReportTypeResponseDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/response/GetReportTypeResponse.kt
@@ -2,10 +2,10 @@ package com.eatssu.android.data.dto.response
 
 import com.google.gson.annotations.SerializedName
 
-data class GetReportTypeResponseDto(
+data class GetReportTypeResponse(
     @SerializedName("reportType")
     val reportType: String,
 
     @SerializedName("typeDescription")
-    val typeDescription: String
+    val typeDescription: String,
 )
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/GetReviewInfoResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/GetReviewInfoResponse.kt
similarity index 85%
rename from app/src/main/java/com/eatssu/android/data/dto/response/GetReviewInfoResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/GetReviewInfoResponse.kt
index 90fe1772..a99f8d39 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/response/GetReviewInfoResponseDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/response/GetReviewInfoResponse.kt
@@ -1,18 +1,18 @@
 package com.eatssu.android.data.dto.response
 
-data class GetReviewInfoResponseDto(
+data class GetReviewInfoResponse(
     val menuName: List<String>,
     val totalReviewCount: Int,
     val mainGrade: Double,
     val amountGrade: Double,
     val tasteGrade: Double,
     val reviewGradeCnt: ReviewGradeCnt,
-){
+) {
     data class ReviewGradeCnt(
         val fiveCnt: Int,
         val fourCnt: Int,
         val oneCnt: Int,
         val threeCnt: Int,
-        val twoCnt: Int
+        val twoCnt: Int,
     )
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/GetTodayMealResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/GetTodayMealResponse.kt
similarity index 100%
rename from app/src/main/java/com/eatssu/android/data/dto/response/GetTodayMealResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/GetTodayMealResponse.kt
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/InfoResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/InfoResponseDto.kt
deleted file mode 100644
index 5c0dee1c..00000000
--- a/app/src/main/java/com/eatssu/android/data/dto/response/InfoResponseDto.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package com.eatssu.android.data.dto.response
-
-import com.google.gson.annotations.SerializedName
-
-data class InfoResponseDto(
-    @SerializedName("location")
-    val location: String,
-
-    @SerializedName("openHours")
-    val openHours: List<Result>
-) {
-    data class Result(
-        val dayType: String,
-        val timepart: String,
-        val time: String
-    )
-}
diff --git a/app/src/main/java/com/eatssu/android/data/dto/response/TokenResponseDto.kt b/app/src/main/java/com/eatssu/android/data/dto/response/TokenResponse.kt
similarity index 77%
rename from app/src/main/java/com/eatssu/android/data/dto/response/TokenResponseDto.kt
rename to app/src/main/java/com/eatssu/android/data/dto/response/TokenResponse.kt
index 42145a80..ae2cd78b 100644
--- a/app/src/main/java/com/eatssu/android/data/dto/response/TokenResponseDto.kt
+++ b/app/src/main/java/com/eatssu/android/data/dto/response/TokenResponse.kt
@@ -2,10 +2,10 @@ package com.eatssu.android.data.dto.response
 
 import com.google.gson.annotations.SerializedName
 
-data class TokenResponseDto(
+data class TokenResponse(
     @SerializedName("accessToken")
     val accessToken: String,
 
     @SerializedName("refreshToken")
-    val refreshToken: String
+    val refreshToken: String,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/model/FirebaseInfoItem.kt b/app/src/main/java/com/eatssu/android/data/model/RestaurantInfo.kt
similarity index 69%
rename from app/src/main/java/com/eatssu/android/data/model/FirebaseInfoItem.kt
rename to app/src/main/java/com/eatssu/android/data/model/RestaurantInfo.kt
index 1d5e4cdb..bf2cbff8 100644
--- a/app/src/main/java/com/eatssu/android/data/model/FirebaseInfoItem.kt
+++ b/app/src/main/java/com/eatssu/android/data/model/RestaurantInfo.kt
@@ -1,8 +1,8 @@
 package com.eatssu.android.data.model
 
-data class FirebaseInfoItem(
+data class RestaurantInfo(
     val name: String,
     val location: String,
     val time: String,
-    val etc: String
+    val etc: String,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt b/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
index bb3ebc31..7491c977 100644
--- a/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
+++ b/app/src/main/java/com/eatssu/android/data/repository/FirebaseRemoteConfigRepository.kt
@@ -3,7 +3,7 @@ package com.eatssu.android.data.repository
 import android.util.Log
 import com.eatssu.android.R
 import com.eatssu.android.data.model.AndroidMessage
-import com.eatssu.android.data.model.FirebaseInfoItem
+import com.eatssu.android.data.model.RestaurantInfo
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import com.google.firebase.remoteconfig.FirebaseRemoteConfigSettings
 import com.google.gson.Gson
@@ -53,13 +53,13 @@ class FirebaseRemoteConfigRepository {
         return instance.getString("app_version")
     }
 
-    fun getCafeteriaInfo(): ArrayList<FirebaseInfoItem> {
+    fun getCafeteriaInfo(): ArrayList<RestaurantInfo> {
         return parsingJson(instance.getString("cafeteria_info"))
     }
 
-    private fun parsingJson(json: String): ArrayList<FirebaseInfoItem> {
+    private fun parsingJson(json: String): ArrayList<RestaurantInfo> {
         val jsonArray = JSONArray(json)
-        val list = ArrayList<FirebaseInfoItem>()
+        val list = ArrayList<RestaurantInfo>()
 
         for (index in 0 until jsonArray.length()) {
             val jsonObject = jsonArray.getJSONObject(index)
@@ -69,9 +69,9 @@ class FirebaseRemoteConfigRepository {
             val time = jsonObject.optString("time", "")
             val etc = jsonObject.optString("etc", "")
 
-            val firebaseInfoItem = FirebaseInfoItem(name, location, time, etc)
-            Log.d("FirebaseRemoteConfigRepository", firebaseInfoItem.toString())
-            list.add(firebaseInfoItem)
+            val restaurantInfo = RestaurantInfo(name, location, time, etc)
+            Log.d("FirebaseRemoteConfigRepository", restaurantInfo.toString())
+            list.add(restaurantInfo)
         }
         return list
     }
diff --git a/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt b/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
index 72ecf9cb..921ab24f 100644
--- a/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/InquiresService.kt
@@ -1,7 +1,7 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.model.request.InquiriesRequestDto
+import com.eatssu.android.data.model.request.InquiriesRequest
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
@@ -9,7 +9,7 @@ import retrofit2.http.POST
 interface InquiresService {
     @POST("inquiries/") // 문의 작성
     fun inquireContent(
-        @Body request: InquiriesRequestDto
-    ): Call<BaseResponse<InquiriesRequestDto>>
+        @Body request: InquiriesRequest,
+    ): Call<BaseResponse<InquiriesRequest>>
 
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/service/OauthService.kt b/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
index f77de189..1f568a91 100644
--- a/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/OauthService.kt
@@ -1,8 +1,8 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.request.LoginWithKakaoRequestDto
-import com.eatssu.android.data.dto.response.TokenResponseDto
+import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
+import com.eatssu.android.data.dto.response.TokenResponse
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.Header
@@ -13,11 +13,11 @@ interface OauthService { //여기는 토큰이 없는 레트로핏을 끼웁니
     fun getNewToken(
         @Header("Authorization") refreshToken: String?,
     ) //얘는 SP에 있는거 헤더에 넣어주면 됩니다.
-            : Call<BaseResponse<TokenResponseDto>>
+            : Call<BaseResponse<TokenResponse>>
 
     @POST("oauths/kakao")
     fun loginWithKakao(
-        @Body request: LoginWithKakaoRequestDto,
+        @Body request: LoginWithKakaoRequest,
     )
-            : Call<BaseResponse<TokenResponseDto>>
+            : Call<BaseResponse<TokenResponse>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/service/ReportService.kt b/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
index 373159ad..913f58f1 100644
--- a/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/ReportService.kt
@@ -1,7 +1,7 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.request.ReportRequestDto
+import com.eatssu.android.data.dto.request.ReportRequest
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
@@ -9,6 +9,6 @@ import retrofit2.http.POST
 interface ReportService {
     @POST("reports/") //리뷰 신고하기
     fun reportReview(
-        @Body request: ReportRequestDto
+        @Body request: ReportRequest,
     ): Call<BaseResponse<Void>>
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt b/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
index d79216ba..8bd3f036 100644
--- a/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/ReviewService.kt
@@ -2,7 +2,7 @@ package com.eatssu.android.data.service
 
 
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.response.GetReviewInfoResponseDto
+import com.eatssu.android.data.dto.response.GetReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetReviewListResponse
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
@@ -42,7 +42,7 @@ interface ReviewService {
         @Query("menuType") menuType: String,
         @Query("mealId") mealId: Long?,
         @Query("menuId") menuId: Long?,
-    ): Call<GetReviewInfoResponseDto>
+    ): Call<GetReviewInfoResponse>
 
 
     @GET("/review/list") //메뉴 리뷰 리스트 조회 - 고정메뉴
diff --git a/app/src/main/java/com/eatssu/android/data/service/UserService.kt b/app/src/main/java/com/eatssu/android/data/service/UserService.kt
index 9a2037e2..118a39b2 100644
--- a/app/src/main/java/com/eatssu/android/data/service/UserService.kt
+++ b/app/src/main/java/com/eatssu/android/data/service/UserService.kt
@@ -1,9 +1,9 @@
 package com.eatssu.android.data.service
 
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.request.ChangeNicknameRequestDto
-import com.eatssu.android.data.dto.response.GetMyInfoResponseDto
-import com.eatssu.android.data.dto.response.GetMyReviewResponseDto
+import com.eatssu.android.data.dto.request.ChangeNicknameRequest
+import com.eatssu.android.data.dto.response.GetMyInfoResponse
+import com.eatssu.android.data.dto.response.GetMyReviewResponse
 import retrofit2.Call
 import retrofit2.http.*
 
@@ -15,20 +15,19 @@ interface UserService {
     ): Call<BaseResponse<Boolean>>
 
     @PATCH("users/nickname") //닉네임 수정
-    fun changeNickname(@Body request: ChangeNicknameRequestDto)
+    fun changeNickname(@Body request: ChangeNicknameRequest)
             : Call<BaseResponse<Void>>
 
     @GET("/users/validate/nickname") //닉네임 중복 체크
     fun checkNickname(
         @Query("nickname") nickname: String,
-    )
-            : Call<BaseResponse<Boolean>>
+    ): Call<BaseResponse<Boolean>>
 
     @GET("users/reviews") //내가 쓴 리뷰 모아보기
-    fun getMyReviews(): Call<BaseResponse<GetMyReviewResponseDto>> //Todo 언닝 해줭
+    fun getMyReviews(): Call<BaseResponse<GetMyReviewResponse>> //Todo 언닝 해줭
 
     @GET("users/mypage") //내 정보 모아보기
-    fun getMyInfo(): Call<BaseResponse<GetMyInfoResponseDto>>
+    fun getMyInfo(): Call<BaseResponse<GetMyInfoResponse>>
 
     @DELETE("users") //유저 탈퇴
     fun signOut(): Call<BaseResponse<Boolean>>
diff --git a/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt b/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt
index 6701ff7b..e80b52ab 100644
--- a/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/info/InfoViewModel.kt
@@ -3,12 +3,12 @@ package com.eatssu.android.ui.info
 import android.util.Log
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
-import com.eatssu.android.data.model.FirebaseInfoItem
+import com.eatssu.android.data.model.RestaurantInfo
 import com.eatssu.android.data.repository.FirebaseRemoteConfigRepository
 
 class InfoViewModel(firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository): ViewModel() {
 
-    val infoList: MutableLiveData<ArrayList<FirebaseInfoItem>> = MutableLiveData()
+    val infoList: MutableLiveData<ArrayList<RestaurantInfo>> = MutableLiveData()
 
     val dodamLocation = MutableLiveData<String>()
     val dodamTime = MutableLiveData<String>()
diff --git a/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt
index 1caa96cb..a931cad1 100644
--- a/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/login/LoginViewModel.kt
@@ -5,8 +5,8 @@ import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.App
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.request.LoginWithKakaoRequestDto
-import com.eatssu.android.data.dto.response.TokenResponseDto
+import com.eatssu.android.data.dto.request.LoginWithKakaoRequest
+import com.eatssu.android.data.dto.response.TokenResponse
 import com.eatssu.android.data.service.OauthService
 import com.eatssu.android.util.MySharedPreferences
 import dagger.hilt.android.lifecycle.HiltViewModel
@@ -27,11 +27,11 @@ class LoginViewModel(private val oauthService: OauthService) : ViewModel() {
 
     fun getLogin(email: String, providerID: String) {
         viewModelScope.launch {
-            oauthService.loginWithKakao(LoginWithKakaoRequestDto(email, providerID))
-                .enqueue(object : Callback<BaseResponse<TokenResponseDto>> {
+            oauthService.loginWithKakao(LoginWithKakaoRequest(email, providerID))
+                .enqueue(object : Callback<BaseResponse<TokenResponse>> {
                     override fun onResponse(
-                        call: Call<BaseResponse<TokenResponseDto>>,
-                        response: Response<BaseResponse<TokenResponseDto>>,
+                        call: Call<BaseResponse<TokenResponse>>,
+                        response: Response<BaseResponse<TokenResponse>>,
                     ) {
                         if (response.isSuccessful) {
                             if (response.code() == 200) {
@@ -73,7 +73,7 @@ class LoginViewModel(private val oauthService: OauthService) : ViewModel() {
                     }
 
                     override fun onFailure(
-                        call: Call<BaseResponse<TokenResponseDto>>,
+                        call: Call<BaseResponse<TokenResponse>>,
                         t: Throwable,
                     ) {
                         Log.d("LoginViewModel", "onFailure 에러: " + t.message.toString())
@@ -94,5 +94,5 @@ data class LoginState(
     var toastMessage: String = "",
     var loading: Boolean = true,
     var error: Boolean = false,
-    var tokens: TokenResponseDto? = null,
+    var tokens: TokenResponse? = null,
 )
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
index e79d0394..efb0f435 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/Inquire/InquireActivity.kt
@@ -5,7 +5,7 @@ import android.util.Log
 import android.widget.Toast
 import com.eatssu.android.base.BaseActivity
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.model.request.InquiriesRequestDto
+import com.eatssu.android.data.model.request.InquiriesRequest
 import com.eatssu.android.data.service.InquiresService
 import com.eatssu.android.databinding.ActivityInquireBinding
 import com.eatssu.android.util.MySharedPreferences
@@ -50,17 +50,22 @@ class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBind
     }
 
     private fun inquireContent(content: String) {
-        inquiresService.inquireContent(InquiriesRequestDto(content)).enqueue(object : Callback<BaseResponse<InquiriesRequestDto>> {
-            override fun onResponse(
-                call: Call<BaseResponse<InquiriesRequestDto>>,
-                response: Response<BaseResponse<InquiriesRequestDto>>,
-            ) {
-                if (response.isSuccessful){
-                    if (response.code() == 200) {
-                        Log.d("InquireActivity", "onResponse 성공: 문의하기" + response.body().toString())
-                        Toast.makeText(this@InquireActivity, "문의가 완료되었습니다.", Toast.LENGTH_SHORT).show()
+        inquiresService.inquireContent(InquiriesRequest(content))
+            .enqueue(object : Callback<BaseResponse<InquiriesRequest>> {
+                override fun onResponse(
+                    call: Call<BaseResponse<InquiriesRequest>>,
+                    response: Response<BaseResponse<InquiriesRequest>>,
+                ) {
+                    if (response.isSuccessful) {
+                        if (response.code() == 200) {
+                            Log.d(
+                                "InquireActivity",
+                                "onResponse 성공: 문의하기" + response.body().toString()
+                            )
+                            Toast.makeText(this@InquireActivity, "문의가 완료되었습니다.", Toast.LENGTH_SHORT)
+                                .show()
 
-                    } else {
+                        } else {
                         Log.d("InquireActivity", "onResponse 오류: 문의하기" + response.body().toString())
                     }
 
@@ -68,9 +73,9 @@ class InquireActivity : BaseActivity<ActivityInquireBinding>(ActivityInquireBind
                 }
             }
 
-            override fun onFailure(call: Call<BaseResponse<InquiriesRequestDto>>, t: Throwable) {
-                Log.d("InquireActivity", "onFailure 에러: 문의하기" + t.message.toString())
-            }
+                override fun onFailure(call: Call<BaseResponse<InquiriesRequest>>, t: Throwable) {
+                    Log.d("InquireActivity", "onFailure 에러: 문의하기" + t.message.toString())
+                }
         })
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt
index f5c2fe6a..228356c4 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/MypageViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.response.GetMyInfoResponseDto
+import com.eatssu.android.data.dto.response.GetMyInfoResponse
 import com.eatssu.android.data.service.UserService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -26,10 +26,10 @@ class MypageViewModel(private val userService: UserService) : ViewModel() {
     val isNull: LiveData<Boolean> get() = _isNull
 
     fun checkMyInfo() {
-        userService.getMyInfo().enqueue(object : Callback<BaseResponse<GetMyInfoResponseDto>> {
+        userService.getMyInfo().enqueue(object : Callback<BaseResponse<GetMyInfoResponse>> {
             override fun onResponse(
-                call: Call<BaseResponse<GetMyInfoResponseDto>>,
-                response: Response<BaseResponse<GetMyInfoResponseDto>>,
+                call: Call<BaseResponse<GetMyInfoResponse>>,
+                response: Response<BaseResponse<GetMyInfoResponse>>,
             ) {
                 if (response.isSuccessful) {
                     _nickname.postValue(response.body()?.result?.nickname)
@@ -47,7 +47,7 @@ class MypageViewModel(private val userService: UserService) : ViewModel() {
                 }
             }
 
-            override fun onFailure(call: Call<BaseResponse<GetMyInfoResponseDto>>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<GetMyInfoResponse>>, t: Throwable) {
                 handleErrorResponse("정보를 불러 올 수 없습니다.")
             }
         })
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt
index 1eeb013f..0e5cd476 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewAdapter.kt
@@ -8,13 +8,13 @@ import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.bumptech.glide.Glide
-import com.eatssu.android.data.dto.response.GetMyReviewResponseDto
+import com.eatssu.android.data.dto.response.GetMyReviewResponse
 import com.eatssu.android.databinding.ItemReviewBinding
 import com.eatssu.android.ui.review.etc.MyReviewDialogActivity
 import com.eatssu.android.util.MySharedPreferences
 
 
-class MyReviewAdapter(private val dataList: List<GetMyReviewResponseDto.Data>) :
+class MyReviewAdapter(private val dataList: List<GetMyReviewResponse.Data>) :
     RecyclerView.Adapter<MyReviewAdapter.ViewHolder>() {
 
     inner class ViewHolder(private val binding: ItemReviewBinding) :
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt
index adb34cca..9d17f187 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/myreview/MyReviewListActivity.kt
@@ -6,7 +6,7 @@ import android.view.View
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.eatssu.android.base.BaseActivity
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.response.GetMyReviewResponseDto
+import com.eatssu.android.data.dto.response.GetMyReviewResponse
 import com.eatssu.android.data.service.UserService
 import com.eatssu.android.databinding.ActivityMyReviewListBinding
 import com.eatssu.android.util.RetrofitImpl.retrofit
@@ -25,7 +25,7 @@ class MyReviewListActivity : BaseActivity<ActivityMyReviewListBinding>(ActivityM
         lodeReview()
     }
 
-    private fun setAdapter(reviewList: List<GetMyReviewResponseDto.Data>) {
+    private fun setAdapter(reviewList: List<GetMyReviewResponse.Data>) {
         val listAdapter = MyReviewAdapter(reviewList)
         val linearLayoutManager = LinearLayoutManager(this)
 
@@ -37,10 +37,10 @@ class MyReviewListActivity : BaseActivity<ActivityMyReviewListBinding>(ActivityM
     private fun lodeReview() {
         val userService = retrofit.create(UserService::class.java)
         userService.getMyReviews().enqueue(object :
-            Callback<BaseResponse<GetMyReviewResponseDto>> {
+            Callback<BaseResponse<GetMyReviewResponse>> {
             override fun onResponse(
-                call: Call<BaseResponse<GetMyReviewResponseDto>>,
-                response: Response<BaseResponse<GetMyReviewResponseDto>>,
+                call: Call<BaseResponse<GetMyReviewResponse>>,
+                response: Response<BaseResponse<GetMyReviewResponse>>,
             ) {
                 if (response.isSuccessful) {
                     // 정상적으로 통신이 성공된 경우
@@ -63,7 +63,7 @@ class MyReviewListActivity : BaseActivity<ActivityMyReviewListBinding>(ActivityM
                 }
             }
 
-            override fun onFailure(call: Call<BaseResponse<GetMyReviewResponseDto>>, t: Throwable) {
+            override fun onFailure(call: Call<BaseResponse<GetMyReviewResponse>>, t: Throwable) {
                 // 통신 실패 (인터넷 끊킴, 예외 발생 등 시스템적인 이유)
                 Log.d("post", "onFailure 에러: " + t.message.toString())
             }
diff --git a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt
index 9ffcf2d6..c8fd0d9a 100644
--- a/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/mypage/usernamechange/UserNameChangeViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.request.ChangeNicknameRequestDto
+import com.eatssu.android.data.dto.request.ChangeNicknameRequest
 import com.eatssu.android.data.service.UserService
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
@@ -49,17 +49,21 @@ class UserNameChangeViewModel(private val userService: UserService) : ViewModel(
     }
 
     fun changeNickname(inputNickname: String) {
-        userService.changeNickname(ChangeNicknameRequestDto(inputNickname)).enqueue(object : Callback<BaseResponse<Void>> {
-            override fun onResponse(call: Call<BaseResponse<Void>>, response: Response<BaseResponse<Void>>) {
-                if (response.isSuccessful) {
-                    handleSuccessResponse("닉네임 설정에 성공했습니다.")
-                } else {
-                    handleErrorResponse("닉네임 설정에 실패했습니다.")
+        userService.changeNickname(ChangeNicknameRequest(inputNickname))
+            .enqueue(object : Callback<BaseResponse<Void>> {
+                override fun onResponse(
+                    call: Call<BaseResponse<Void>>,
+                    response: Response<BaseResponse<Void>>,
+                ) {
+                    if (response.isSuccessful) {
+                        handleSuccessResponse("닉네임 설정에 성공했습니다.")
+                    } else {
+                        handleErrorResponse("닉네임 설정에 실패했습니다.")
+                    }
                 }
-            }
 
-            override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
-                handleErrorResponse("닉네임 설정에 실패했습니다.")
+                override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
+                    handleErrorResponse("닉네임 설정에 실패했습니다.")
             }
         })
     }
diff --git a/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt
index cc77f9bc..a51cb486 100644
--- a/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/review/etc/ReportViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
 import com.eatssu.android.base.BaseResponse
-import com.eatssu.android.data.dto.request.ReportRequestDto
+import com.eatssu.android.data.dto.request.ReportRequest
 import com.eatssu.android.data.service.ReportService
 import com.eatssu.android.util.RetrofitImpl
 import kotlinx.coroutines.Dispatchers
@@ -26,16 +26,20 @@ class ReportViewModel : ViewModel() {
         val service = RetrofitImpl.retrofit.create(ReportService::class.java)
 
         viewModelScope.launch(Dispatchers.IO) {
-            service.reportReview(ReportRequestDto(reviewId, reportType, content)).enqueue(object : Callback<BaseResponse<Void>> {
-                override fun onResponse(call: Call<BaseResponse<Void>>, response: Response<BaseResponse<Void>>) {
-                    if (response.isSuccessful) {
-                        if (response.code() == 200) {
-                            handleSuccessResponse("신고가 완료되었습니다.")
-                        } else {
-                            handleErrorResponse("신고가 실패하였습니다.")
+            service.reportReview(ReportRequest(reviewId, reportType, content))
+                .enqueue(object : Callback<BaseResponse<Void>> {
+                    override fun onResponse(
+                        call: Call<BaseResponse<Void>>,
+                        response: Response<BaseResponse<Void>>,
+                    ) {
+                        if (response.isSuccessful) {
+                            if (response.code() == 200) {
+                                handleSuccessResponse("신고가 완료되었습니다.")
+                            } else {
+                                handleErrorResponse("신고가 실패하였습니다.")
+                            }
                         }
                     }
-                }
 
                 override fun onFailure(call: Call<BaseResponse<Void>>, t: Throwable) {
                     handleErrorResponse("신고가 실패하였습니다.")
diff --git a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt
index f359d6b4..177b7abb 100644
--- a/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt
+++ b/app/src/main/java/com/eatssu/android/ui/review/list/ReviewViewModel.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
-import com.eatssu.android.data.dto.response.GetReviewInfoResponseDto
+import com.eatssu.android.data.dto.response.GetReviewInfoResponse
 import com.eatssu.android.data.dto.response.GetReviewListResponse
 import com.eatssu.android.data.enums.MenuType
 import com.eatssu.android.data.service.ReviewService
@@ -20,8 +20,8 @@ class ReviewViewModel(private val reviewService: ReviewService) : ViewModel() {
     private val _reviewList = MutableLiveData<GetReviewListResponse>()
     val reviewList: LiveData<GetReviewListResponse> = _reviewList
 
-    private val _reviewInfo = MutableLiveData<GetReviewInfoResponseDto>()
-    val reviewInfo: LiveData<GetReviewInfoResponseDto> = _reviewInfo
+    private val _reviewInfo = MutableLiveData<GetReviewInfoResponse>()
+    val reviewInfo: LiveData<GetReviewInfoResponse> = _reviewInfo
 
     fun loadReviewList(
         menuType: MenuType,
@@ -65,10 +65,10 @@ class ReviewViewModel(private val reviewService: ReviewService) : ViewModel() {
         viewModelScope.launch {
 
             reviewService.getRreviewInfo(menuType.toString(), mealId, menuId)
-                .enqueue(object : Callback<GetReviewInfoResponseDto> {
+                .enqueue(object : Callback<GetReviewInfoResponse> {
                     override fun onResponse(
-                        call: Call<GetReviewInfoResponseDto>,
-                        response: Response<GetReviewInfoResponseDto>
+                        call: Call<GetReviewInfoResponse>,
+                        response: Response<GetReviewInfoResponse>,
                     ) {
                         if (response.isSuccessful) {
                             // 정상적으로 통신이 성공된 경우
@@ -81,7 +81,7 @@ class ReviewViewModel(private val reviewService: ReviewService) : ViewModel() {
                         }
                     }
 
-                    override fun onFailure(call: Call<GetReviewInfoResponseDto>, t: Throwable) {
+                    override fun onFailure(call: Call<GetReviewInfoResponse>, t: Throwable) {
                         // 통신 실패 (인터넷 끊킴, 예외 발생 등 시스템적인 이유)
                         Log.d("post", "onFailure 에러: " + t.message.toString())
                     }