diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyNickNameResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyNickNameResponse.kt deleted file mode 100644 index 086e5f9e3..000000000 --- a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyNickNameResponse.kt +++ /dev/null @@ -1,10 +0,0 @@ -package com.eatssu.android.data.remote.dto.response - -import kotlinx.serialization.SerialName -import kotlinx.serialization.Serializable - -@Serializable -data class MyNickNameResponse( - @SerialName("nickname") val nickname: String? = null, - @SerialName("provider") val provider: String? = null, -) diff --git a/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyPageResponse.kt b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyPageResponse.kt new file mode 100644 index 000000000..548e03e27 --- /dev/null +++ b/app/src/main/java/com/eatssu/android/data/remote/dto/response/MyPageResponse.kt @@ -0,0 +1,15 @@ +package com.eatssu.android.data.remote.dto.response + +import com.eatssu.common.enums.Provider +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +@Serializable +data class MyPageResponse( + @SerialName("nickname") val nickname: String? = null, + @SerialName("provider") val provider: Provider? = null, + @SerialName("departmentId") val departmentId: Long? = null, + @SerialName("departmentName") val departmentName: String? = null, + @SerialName("collegeId") val collegeId: Long? = null, + @SerialName("collegeName") val collegeName: String? = null, +) diff --git a/app/src/main/java/com/eatssu/android/data/remote/service/UserService.kt b/app/src/main/java/com/eatssu/android/data/remote/service/UserService.kt index 311a4cbb2..509c697bc 100644 --- a/app/src/main/java/com/eatssu/android/data/remote/service/UserService.kt +++ b/app/src/main/java/com/eatssu/android/data/remote/service/UserService.kt @@ -5,7 +5,7 @@ import com.eatssu.android.data.remote.dto.request.ChangeNicknameRequest import com.eatssu.android.data.remote.dto.request.UserDepartmentRequest import com.eatssu.android.data.remote.dto.response.CollegeResponse import com.eatssu.android.data.remote.dto.response.DepartmentResponse -import com.eatssu.android.data.remote.dto.response.MyNickNameResponse +import com.eatssu.android.data.remote.dto.response.MyPageResponse import com.eatssu.android.data.remote.dto.response.PartnershipResponse import com.eatssu.android.data.remote.dto.response.UserCollegeDepartmentResponse import retrofit2.http.Body @@ -28,7 +28,7 @@ interface UserService { ): ApiResult @GET("users/mypage") //내 정보 모아보기 - suspend fun getMyInfo(): ApiResult + suspend fun getMyInfo(): ApiResult @DELETE("users") //유저 탈퇴 suspend fun signOut(): ApiResult diff --git a/app/src/main/java/com/eatssu/android/di/NetworkModule.kt b/app/src/main/java/com/eatssu/android/di/NetworkModule.kt index b434a2da0..da0d719ae 100644 --- a/app/src/main/java/com/eatssu/android/di/NetworkModule.kt +++ b/app/src/main/java/com/eatssu/android/di/NetworkModule.kt @@ -55,6 +55,7 @@ object NetworkModule { @Singleton @Provides fun provideJson(): Json = Json { + ignoreUnknownKeys = true } // 토큰이 필요한 okhttpClient