refact: 모델 분리, 뷰모델 전체 리팩토링

Tlog/app/src/main/java/com/tlog/MyApplication.kt

@@ -3,8 +3,7 @@ package com.tlog
 import android.app.Application
 import com.kakao.sdk.common.KakaoSdk
 import com.navercorp.nid.NaverIdLoginSDK
-import com.tlog.api.retrofit.TokenProvider
-import com.tlog.data.local.ScrapManager
+import com.tlog.data.local.TokenProvider
 import com.tlog.data.local.UserPreferences
 import dagger.hilt.android.HiltAndroidApp
 import kotlinx.coroutines.CoroutineScope

Tlog/app/src/main/java/com/tlog/api/AiApi.kt

@@ -1,11 +1,11 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.CourseItem
-import com.tlog.data.model.travel.AiRequest
-import com.tlog.data.model.travel.AiTravel
-import com.tlog.data.model.travel.CourseResponse
-import com.tlog.data.model.travel.CourseSaveRequest
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.course.CourseItem
+import com.tlog.data.model.request.travel.AiRequest
+import com.tlog.data.model.response.travel.AiTravel
+import com.tlog.data.model.response.travel.CourseResponse
+import com.tlog.data.model.request.travel.CourseSaveRequest
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.POST

Tlog/app/src/main/java/com/tlog/api/BannerApi.kt

@@ -1,8 +1,7 @@
 package com.tlog.api
 
-import com.tlog.data.api.BannerTravelResponse
-import com.tlog.data.api.BaseListResponse
-import com.tlog.data.api.BaseResponse
+import com.tlog.data.model.response.travel.BannerTravelResponse
+import com.tlog.data.model.response.base.BaseResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
 import retrofit2.http.Query

Tlog/app/src/main/java/com/tlog/api/CourseApi.kt

@@ -1,16 +1,13 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.UserCourseResponse
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.course.UserCourseResponse
 import retrofit2.http.GET
 import retrofit2.http.Path
 
 interface CourseApi {
-
     @GET("/api/course/user/{userId}")
     suspend fun getUserCourseList(
         @Path("userId") userId: String
     ): BaseResponse<List<UserCourseResponse>>
-
-
-}
+}

Tlog/app/src/main/java/com/tlog/api/LoginApi.kt

@@ -1,10 +1,10 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.FcmTokenBody
-import com.tlog.data.api.FirebaseTokenData
-import com.tlog.data.api.LoginRequest
-import com.tlog.data.api.RegisterRequest
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.request.auth.FcmTokenRequest
+import com.tlog.data.model.response.auth.FirebaseTokenResponse
+import com.tlog.data.model.request.auth.LoginRequest
+import com.tlog.data.model.request.auth.RegisterRequest
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.Header
@@ -14,7 +14,7 @@ interface LoginApi {
     @POST("api/auth/login/user")
     suspend fun ssoLogin(
         @Body loginRequest: LoginRequest
-    ): Response<BaseResponse<FirebaseTokenData>>
+    ): Response<BaseResponse<FirebaseTokenResponse>>
 
     @POST("api/auth/logout")
     suspend fun ssoLogout(
@@ -23,11 +23,11 @@ interface LoginApi {
 
     @POST("/api/notify")
     suspend fun setFcmToken(
-        @Body fcmTokenBody: FcmTokenBody
+        @Body fcmTokenBody: FcmTokenRequest
     ): BaseResponse<Unit>
 
     @POST("/api/auth/register/user")
     suspend fun ssoRegister(
         @Body request: RegisterRequest
-    ): Response<BaseResponse<FirebaseTokenData>>
+    ): Response<BaseResponse<FirebaseTokenResponse>>
 }

Tlog/app/src/main/java/com/tlog/api/MainApi.kt

@@ -1,8 +1,8 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseListPage
-import com.tlog.data.api.BaseListResponse
-import com.tlog.data.api.BaseResponse
+import com.tlog.data.model.response.base.BaseListPage
+import com.tlog.data.model.response.base.BaseListResponse
+import com.tlog.data.model.response.base.BaseResponse
 import com.tlog.data.model.share.Banner
 import com.tlog.data.model.share.BannerItem
 import com.tlog.data.model.share.LocalGuide

Tlog/app/src/main/java/com/tlog/api/RestaurantApi.kt

@@ -1,7 +1,7 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.model.restaurant.Restaurant
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.restaurant.Restaurant
 import retrofit2.http.GET
 import retrofit2.http.Query
 

Tlog/app/src/main/java/com/tlog/api/ScrapApi.kt

@@ -1,6 +1,6 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
+import com.tlog.data.model.response.base.BaseResponse
 import com.tlog.data.model.travel.Scrap
 import okhttp3.RequestBody
 import retrofit2.http.Body

Tlog/app/src/main/java/com/tlog/api/SearchApi.kt

@@ -1,39 +1,38 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.Pageable
-import com.tlog.data.api.PopularDestination
-import com.tlog.data.api.SearchResponse
-import com.tlog.data.api.SearchTravel
-import com.tlog.data.api.TravelDestinationResponse
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.page.Pageable
+import com.tlog.data.model.response.travel.PopularDestination
+import com.tlog.data.model.response.travel.SearchTravelResponse
+import com.tlog.data.model.response.travel.TravelSearch
 import retrofit2.http.GET
 import retrofit2.http.Query
 
 interface SearchApi {
     @GET("/api/search/destination/by-name") // 여행지 이름으로 검색
     suspend fun searchTravelListByName(
         @Query("name") searchText: String
-    ): BaseResponse<List<SearchTravel>>
+    ): BaseResponse<List<TravelSearch>>
 
     @GET("/api/search/destination/by-city") // 여행지 도시 이름으로 검색
     suspend fun searchTravelListByCity(
         @Query("page") page: Int,
         @Query("size") size: Int,
         @Query("sort") sort: List<String>,
         @Query("city") city: String
-    ): BaseResponse<SearchResponse>
+    ): BaseResponse<SearchTravelResponse>
 
     @GET("/api/search/destination/by-city-and-city") // 여행지 도시 이름 + 여행지 이름으로 검색
     suspend fun searchTravelListByCityAndCity(
         @Query("pageable") pageable: Pageable,
         @Query("city") city: String,
         @Query("name") name: String
-    ): BaseResponse<SearchResponse>
+    ): BaseResponse<SearchTravelResponse>
 
     @GET("/api/search/destination/by-address") // 여행지 주소로 검색
     suspend fun searchTravelListByAddress(
         @Query("address") address: String
-    ): BaseResponse<List<TravelDestinationResponse>>
+    ): BaseResponse<List<SearchTravelResponse>>
 
     @GET("/api/search/destination/popular-destination") // 인기 여행지 조회
     suspend fun getPopularDestinations(): BaseResponse<List<PopularDestination>>

Tlog/app/src/main/java/com/tlog/api/SnsApi.kt

@@ -1,26 +1,25 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseListResponse
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.ChatMessageHistoryResponse
-import com.tlog.data.api.ChatRoom
-import com.tlog.data.api.CreateCommentRequest
-import com.tlog.data.api.FollowRequest
-import com.tlog.data.api.PostWriteBody
-import com.tlog.data.api.ReportRequest
-import com.tlog.data.api.SnsDescription
-import com.tlog.data.api.SnsPost
-import com.tlog.data.api.SnsPostPreview
-import com.tlog.data.api.SnsUser
-import com.tlog.data.api.SnsUserProfile
-import com.tlog.data.api.StatusMessage
-import com.tlog.data.api.UpdateSnsIdRequest
+import com.tlog.data.model.response.base.BaseListResponse
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.sns.ChatMessageHistoryResponse
+import com.tlog.data.model.response.sns.ChatRoom
+import com.tlog.data.model.response.sns.CommentRequest
+import com.tlog.data.model.request.sns.FollowRequest
+import com.tlog.data.model.request.sns.PostWriteBody
+import com.tlog.data.model.request.sns.ReportRequest
+import com.tlog.data.model.request.sns.SnsDescription
+import com.tlog.data.model.response.sns.SnsPost
+import com.tlog.data.model.response.sns.SnsPostPreview
+import com.tlog.data.model.response.sns.SnsUser
+import com.tlog.data.model.response.sns.SnsUserProfile
+import com.tlog.data.model.request.sns.StatusMessage
+import com.tlog.data.model.request.sns.UpdateSnsIdRequest
 import com.tlog.data.model.sns.Comment
 import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.PATCH
 import retrofit2.http.POST
-import retrofit2.http.PUT
 import retrofit2.http.Path
 import retrofit2.http.Query
 
@@ -68,7 +67,7 @@ interface SnsApi {
     @POST("/api/post/{postId}/reply")
     suspend fun addComment(
         @Path("postId") postId: String,
-        @Body request: CreateCommentRequest
+        @Body request: CommentRequest
     ): BaseResponse<Comment>
 
     // 팔로잉 목록

Tlog/app/src/main/java/com/tlog/api/TbtiApi.kt

@@ -1,7 +1,7 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.UpdateTbtiResponse
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.tbti.UpdateTbtiResponse
 import com.tlog.data.model.share.TbtiDescription
 import com.tlog.data.model.tbti.TbtiQuestion
 import retrofit2.http.GET

Tlog/app/src/main/java/com/tlog/api/TeamApi.kt

@@ -1,9 +1,9 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.CreateTeamRequest
-import com.tlog.data.api.JoinTeamRequest
-import com.tlog.data.api.TeamCreateResponse
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.request.team.CreateTeamRequest
+import com.tlog.data.model.request.team.JoinTeamRequest
+import com.tlog.data.model.response.team.TeamCreateResponse
 import com.tlog.data.model.team.DetailTeam
 import com.tlog.data.model.team.Team
 import retrofit2.http.Body

Tlog/app/src/main/java/com/tlog/api/TravelApi.kt

@@ -1,11 +1,11 @@
 package com.tlog.api
 
-import com.tlog.data.api.AddTravelRequest
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.ReviewListResponse
-import com.tlog.data.api.ReviewRequest
-import com.tlog.data.api.TravelDetailResponse
-import com.tlog.data.api.TravelRecommendPagedResponse
+import com.tlog.data.model.request.travel.AddTravelRequest
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.response.review.ReviewsResponse
+import com.tlog.data.model.request.review.ReviewRequest
+import com.tlog.data.model.response.travel.TravelDetailResponse
+import com.tlog.data.model.response.travel.TravelRecommendPagedResponse
 import com.tlog.data.model.travel.Scrap
 import retrofit2.http.Body
 import retrofit2.http.DELETE
@@ -49,7 +49,7 @@ interface TravelApi {
         @Query("page") page: Int,
         @Query("size") size: Int,
         @Query("sort") sort: List<String>
-    ): BaseResponse<ReviewListResponse>
+    ): BaseResponse<ReviewsResponse>
 
     @DELETE("/api/scrap/user/{userId}/destination/{destId}")
     suspend fun deleteScrapDestination(

Tlog/app/src/main/java/com/tlog/api/UserApi.kt

@@ -1,8 +1,8 @@
 package com.tlog.api
 
-import com.tlog.data.api.BaseResponse
-import com.tlog.data.api.FeedbackRequest
-import com.tlog.data.api.ProfileImageRequest
+import com.tlog.data.model.response.base.BaseResponse
+import com.tlog.data.model.request.auth.FeedbackRequest
+import com.tlog.data.model.request.auth.ProfileImageRequest
 import com.tlog.data.model.travel.Cart
 import com.tlog.data.model.user.User
 import retrofit2.http.GET

Tlog/app/src/main/java/com/tlog/data/model/share/ErrorType.kt → Tlog/app/src/main/java/com/tlog/common/error/ErrorType.kt

@@ -1,4 +1,4 @@
-package com.tlog.data.model.share
+package com.tlog.common.error
 
 enum class ErrorType(val message: String) {
     // 네트워크

Tlog/app/src/main/java/com/tlog/data/model/share/ThrowableExtensions.kt → Tlog/app/src/main/java/com/tlog/common/error/ThrowableExtensions.kt

@@ -1,4 +1,4 @@
-package com.tlog.data.model.share
+package com.tlog.common.error
 
 import retrofit2.HttpException
 import java.io.IOException