[feat/#10] api 5개를 위한 service와 model을 정의합니다.

AND-SOPT-ANDROID · Dec 2, 2024 · 935d201 · 935d201
1 parent cf30390
commit 935d201
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 17 deletions.
diff --git a/...pt/and/data/local/TokenLocalDataSource.kt → .../local/datasource/TokenLocalDataSource.kt b/...pt/and/data/local/TokenLocalDataSource.kt → .../local/datasource/TokenLocalDataSource.kt
@@ -1,4 +1,4 @@
-package org.sopt.and.data.local
+package org.sopt.and.data.local.datasource
 
 interface TokenLocalDataSource {
     var token: String

diff --git a/...nd/data/local/TokenLocalDataSourceImpl.kt → ...atasourceimpl/TokenLocalDataSourceImpl.kt b/...nd/data/local/TokenLocalDataSourceImpl.kt → ...atasourceimpl/TokenLocalDataSourceImpl.kt
@@ -1,6 +1,7 @@
-package org.sopt.and.data.local
+package org.sopt.and.data.local.datasourceimpl
 
 import android.content.SharedPreferences
+import org.sopt.and.data.local.datasource.TokenLocalDataSource
 import javax.inject.Inject
 
 class TokenLocalDataSourceImpl @Inject constructor(

diff --git a/app/src/main/java/org/sopt/and/data/remote/model/request/UserInfoUpdateRequestDto.kt b/app/src/main/java/org/sopt/and/data/remote/model/request/UserInfoUpdateRequestDto.kt
@@ -0,0 +1,10 @@
+package org.sopt.and.data.remote.model.request
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UserInfoUpdateRequestDto (
+    @SerialName("hobby") val hobby: String?,
+    @SerialName("password") val password: String?
+)
diff --git a/...e/model/response/GetMyHobbyResponseDto.kt → ...remote/model/response/HobbyResponseDto.kt b/...e/model/response/GetMyHobbyResponseDto.kt → ...remote/model/response/HobbyResponseDto.kt
@@ -4,6 +4,6 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class GetMyHobbyResponseDto(
+data class HobbyResponseDto(
     @SerialName("hobby") val hobby: String
 )
diff --git a/app/src/main/java/org/sopt/and/data/remote/service/AuthService.kt b/app/src/main/java/org/sopt/and/data/remote/service/AuthService.kt
@@ -1,5 +1,6 @@
 package org.sopt.and.data.remote.service
 
+import org.sopt.and.data.remote.model.base.ApiResponse
 import org.sopt.and.data.remote.model.request.LoginRequestDto
 import org.sopt.and.data.remote.model.request.UserRegistrationRequestDto
 import org.sopt.and.data.remote.model.response.LoginResponseDto
@@ -12,10 +13,10 @@ interface AuthService {
     @POST("user")
     fun registerUser(
         @Body userRegistrationRequestDto: UserRegistrationRequestDto
-    ): Call<UserRegistrationResponseDto>
+    ): ApiResponse<UserRegistrationResponseDto>
 
     @POST("login")
     fun login(
         @Body loginRequestDto: LoginRequestDto
-    ): Call<LoginResponseDto>
+    ): ApiResponse<LoginResponseDto>
 }
diff --git a/app/src/main/java/org/sopt/and/data/remote/service/UserService.kt b/app/src/main/java/org/sopt/and/data/remote/service/UserService.kt
@@ -1,13 +1,29 @@
 package org.sopt.and.data.remote.service
 
-import org.sopt.and.data.remote.model.response.GetMyHobbyResponseDto
-import retrofit2.Call
+import org.sopt.and.data.remote.model.base.ApiResponse
+import org.sopt.and.data.remote.model.request.UserInfoUpdateRequestDto
+import org.sopt.and.data.remote.model.response.HobbyResponseDto
+import retrofit2.http.Body
 import retrofit2.http.GET
 import retrofit2.http.Header
+import retrofit2.http.PUT
+import retrofit2.http.Path
 
 interface UserService {
     @GET("user/my-hobby")
     fun getMyHobby(
         @Header("token") token: String
-    ): Call<GetMyHobbyResponseDto>
+    ): ApiResponse<HobbyResponseDto>
+
+    @GET("user/{no}/hobby")
+    fun getOthersHobby(
+        @Header("token") token: String,
+        @Path("no") userNo: Int
+    ): ApiResponse<HobbyResponseDto>
+
+    @PUT("user")
+    fun updateUserInfo(
+        @Header("token") token: String,
+        @Body userInfoUpdateRequestDto: UserInfoUpdateRequestDto
+    ): ApiResponse<Unit>
 }
diff --git a/app/src/main/java/org/sopt/and/data/repositoryimpl/TokenRepositoryImpl.kt b/app/src/main/java/org/sopt/and/data/repositoryimpl/TokenRepositoryImpl.kt
@@ -1,6 +1,6 @@
 package org.sopt.and.data.repositoryimpl
 
-import org.sopt.and.data.local.TokenLocalDataSource
+import org.sopt.and.data.local.datasource.TokenLocalDataSource
 import org.sopt.and.domain.repository.TokenRepository
 import javax.inject.Inject
 

diff --git a/app/src/main/java/org/sopt/and/di/TokenDataStoreModule.kt b/app/src/main/java/org/sopt/and/di/TokenDataStoreModule.kt
@@ -5,8 +5,8 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import org.sopt.and.data.local.TokenLocalDataSource
-import org.sopt.and.data.local.TokenLocalDataSourceImpl
+import org.sopt.and.data.local.datasource.TokenLocalDataSource
+import org.sopt.and.data.local.datasourceimpl.TokenLocalDataSourceImpl
 import javax.inject.Singleton
 
 @Module

diff --git a/app/src/main/java/org/sopt/and/presentation/ui/main/screen/MainViewModel.kt b/app/src/main/java/org/sopt/and/presentation/ui/main/screen/MainViewModel.kt
@@ -6,8 +6,8 @@ import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
-import org.sopt.and.data.local.TokenLocalDataSource
-import org.sopt.and.data.remote.model.response.GetMyHobbyResponseDto
+import org.sopt.and.data.local.datasource.TokenLocalDataSource
+import org.sopt.and.data.remote.model.response.HobbyResponseDto
 import org.sopt.and.di.ServicePool
 import retrofit2.Call
 import retrofit2.Callback
@@ -26,10 +26,10 @@ class MainViewModel @Inject constructor(
     fun getUserHobby() {
         viewModelScope.launch {
             userService.getMyHobby(token = tokenLocalDataSource.token).enqueue(object :
-                Callback<GetMyHobbyResponseDto> {
+                Callback<HobbyResponseDto> {
                 override fun onResponse(
-                    call: Call<GetMyHobbyResponseDto>,
-                    response: Response<GetMyHobbyResponseDto>
+                    call: Call<HobbyResponseDto>,
+                    response: Response<HobbyResponseDto>
                 ) {
                     if (response.isSuccessful) {
                         _userHobbyState.value =
@@ -40,7 +40,7 @@ class MainViewModel @Inject constructor(
                 }
 
                 override fun onFailure(
-                    call: Call<GetMyHobbyResponseDto>,
+                    call: Call<HobbyResponseDto>,
                     t: Throwable
                 ) {
                     _userHobbyState.value = UserHobbyState.Failure(t.message.toString())