[#152] 위치 저장 API 호출 시점 벼녕

Author: JaesungLeee

core/data/src/main/java/team/noweekend/data/mapper/UserMapper.kt

@@ -14,7 +14,7 @@ internal fun UserProfileResponse.toDomain(): User = User(
     revocableToken = revocableToken,
     role = role,
     remainingAnnualLeave = remainingAnnualLeave,
-    latitude = location.latitude,
-    longitude = location.longitude,
+    latitude = location?.latitude,
+    longitude = location?.longitude,
     averageTemperature = averageTemperature,
 )

core/data/src/main/java/team/noweekend/data/repository/LoginRepositoryImpl.kt

@@ -1,6 +1,7 @@
 package team.noweekend.data.repository
 
 import team.noweekend.core.domain.repository.AuthRepository
+import team.noweekend.core.domain.repository.LocationRepository
 import team.noweekend.core.domain.repository.LoginRepository
 import team.noweekend.core.model.login.LoginInfoDomainModel
 import team.noweekend.core.model.login.LoginRequest
@@ -12,6 +13,7 @@ import javax.inject.Inject
 internal class LoginRepositoryImpl @Inject constructor(
     private val loginApi: LoginApi,
     private val authRepository: AuthRepository,
+    private val locationRepository: LocationRepository,
 ) : LoginRepository {
     override suspend fun requestGoogleLogin(requestBody: LoginRequest): LoginInfoDomainModel {
         return loginApi.requestLogin(
@@ -21,6 +23,7 @@ internal class LoginRepositoryImpl @Inject constructor(
             ),
         ).also {
             authRepository.setAccessToken(token = it.accessToken)
+            locationRepository.postUserLocation()
         }
             .toDataModel()
             .toDomainModel()

core/domain/src/main/java/team/noweekend/core/domain/repository/LocationRepository.kt

@@ -2,7 +2,7 @@ package team.noweekend.core.domain.repository
 
 interface LocationRepository {
     suspend fun postUserLocation(
-        latitude: Float,
-        longitude: Float,
+        latitude: Float = 37.55616F,
+        longitude: Float = 126.9723F,
     )
 }

core/model/src/main/java/team/noweekend/core/model/user/User.kt

@@ -8,10 +8,10 @@ data class User(
     val userBirth: String,
     val oAuthId: String,
     val oAuthType: String,
-    val revocableToken: String,
+    val revocableToken: String?,
     val role: String,
     val remainingAnnualLeave: Float,
-    val latitude: Float,
-    val longitude: Float,
+    val latitude: Float?,
+    val longitude: Float?,
     val averageTemperature: Float,
 )

core/remote/src/main/kotlin/team/noweekend/core/remote/di/NetworkModule.kt

@@ -36,6 +36,7 @@ internal class NetworkModule {
             prettyPrint = true
             isLenient = true
             ignoreUnknownKeys = true
+            explicitNulls = true
         }
     }
 

core/remote/src/main/kotlin/team/noweekend/core/remote/model/user/UserProfileResponse.kt

@@ -21,13 +21,13 @@ data class UserProfileResponse(
     @SerialName("providerType")
     val oAuthType: String,
     @SerialName("revocableToken")
-    val revocableToken: String,
+    val revocableToken: String?,
     @SerialName("role")
     val role: String,
     @SerialName("remainingAnnualLeave")
     val remainingAnnualLeave: Float,
     @SerialName("location")
-    val location: UserLocationDto,
+    val location: UserLocationDto?,
     @SerialName("averageTemperature")
     val averageTemperature: Float,
 )

feature/home/src/main/java/team/noweekend/feature/home/mvi/HomeViewModel.kt

@@ -18,7 +18,6 @@ import team.noweekend.core.domain.usecase.GetHolidayUseCase
 import team.noweekend.core.domain.usecase.GetSandwichRecommendVacationUseCase
 import team.noweekend.core.domain.usecase.GetUserProfileUseCase
 import team.noweekend.core.domain.usecase.GetWeatherRecommendVacationUseCase
-import team.noweekend.core.domain.usecase.UserLocationUseCase
 import team.noweekend.core.model.calendar.WeeksData
 import team.noweekend.core.model.vacation.VacationType
 import team.noweekend.feature.home.mapper.toImageTypeWithId
@@ -34,19 +33,18 @@ class HomeViewModel @Inject constructor(
     savedStateHandle: SavedStateHandle,
     private val getHolidayUseCase: GetHolidayUseCase,
     private val getWeatherRecommendVacationUseCase: GetWeatherRecommendVacationUseCase,
-    private val userLocationUseCase: UserLocationUseCase,
     private val getSandwichRecommendVacationUseCase: GetSandwichRecommendVacationUseCase,
     private val getUserProfileUseCase: GetUserProfileUseCase,
     private val calendarDataProviderUseCase: CalendarDataProviderUseCase,
 ) : MVIViewModel<HomeIntent, HomeSideEffect, HomeUiState>(
     savedStateHandle = savedStateHandle,
 ) {
     init {
-        getUserProfile()
         getPopularRecommendVacations()
         getRemainedHolidays()
-        saveUserLocation()
+        getWeatherRecommendVacation()
         getCalendarData()
+        getUserProfile()
     }
 
     override fun createInitialState(savedStateHandle: SavedStateHandle): HomeUiState {
@@ -127,16 +125,6 @@ class HomeViewModel @Inject constructor(
             }
     }
 
-    private fun saveUserLocation() = execute {
-        userLocationUseCase.saveLocation()
-            .onSuccess {
-                getWeatherRecommendVacation()
-            }
-            .onFailure { exception ->
-                Log.d("logtag", "$exception")
-            }
-    }
-
     private fun getWeatherRecommendVacation() = execute {
         getWeatherRecommendVacationUseCase()
             .onSuccess { remoteVacations ->