[Feat] 6주차 필수과제, 심화과제, 도전과제

app/src/main/java/org/sopt/and/data/local/TokenLocalDataSource.kt → app/src/main/java/org/sopt/and/data/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

app/src/main/java/org/sopt/and/data/local/TokenLocalDataSourceImpl.kt → app/src/main/java/org/sopt/and/data/local/datasourceimpl/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(

app/src/main/java/org/sopt/and/data/mapper/todata/UserMapper.kt

@@ -0,0 +1,23 @@
+package org.sopt.and.data.mapper.todata
+
+import org.sopt.and.data.remote.model.request.LoginRequestDto
+import org.sopt.and.data.remote.model.request.UserInfoUpdateRequestDto
+import org.sopt.and.data.remote.model.request.UserRegistrationRequestDto
+import org.sopt.and.domain.model.User
+
+fun User.toUserRegistrationRequestDto(): UserRegistrationRequestDto = UserRegistrationRequestDto(
+    username = this.username,
+    password = this.password,
+    hobby = this.hobby
+)
+
+fun User.toLoginRequestDto(): LoginRequestDto = LoginRequestDto(
+    username = this.username,
+    password = this.password
+)
+
+
+fun User.toUserInfoUpdateRequestDto(): UserInfoUpdateRequestDto = UserInfoUpdateRequestDto(
+    hobby = this.hobby,
+    password = this.password
+)

app/src/main/java/org/sopt/and/data/mapper/todomain/HobbyResponseDtoMapper.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.data.mapper.todomain
+
+import org.sopt.and.data.remote.model.response.HobbyResponseDto
+import org.sopt.and.domain.model.Hobby
+
+fun HobbyResponseDto.toDomain(): Hobby =  Hobby(
+    hobby = this.hobby
+)

app/src/main/java/org/sopt/and/data/mapper/todomain/LoginResponseDtoMapper.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.data.mapper.todomain
+
+import org.sopt.and.data.remote.model.response.LoginResponseDto
+import org.sopt.and.domain.model.Token
+
+fun LoginResponseDto.toDomain(): Token = Token(
+    token = this.token
+)

app/src/main/java/org/sopt/and/data/mapper/todomain/UserRegistrationResponseDtoMapper.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.data.mapper.todomain
+
+import org.sopt.and.data.remote.model.response.UserRegistrationResponseDto
+import org.sopt.and.domain.model.UserNo
+
+fun UserRegistrationResponseDto.toDomain(): UserNo = UserNo(
+    no = this.no
+)

app/src/main/java/org/sopt/and/data/remote/datasource/AuthRemoteDataSource.kt

@@ -0,0 +1,12 @@
+package org.sopt.and.data.remote.datasource
+
+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
+import org.sopt.and.data.remote.model.response.UserRegistrationResponseDto
+
+interface AuthRemoteDataSource {
+    suspend fun registerUser(userRegistrationRequestDto: UserRegistrationRequestDto): ApiResponse<UserRegistrationResponseDto>
+    suspend fun login(loginRequestDto: LoginRequestDto): ApiResponse<LoginResponseDto>
+}

app/src/main/java/org/sopt/and/data/remote/datasource/UserRemoteDataSource.kt

@@ -0,0 +1,12 @@
+package org.sopt.and.data.remote.datasource
+
+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.Response
+
+interface UserRemoteDataSource {
+    suspend fun getMyHobby(token: String): ApiResponse<HobbyResponseDto>
+    suspend fun getOthersHobby(token: String, userNo: Int): ApiResponse<HobbyResponseDto>
+    suspend fun updateUserInfo(token: String, userInfoUpdateRequestDto: UserInfoUpdateRequestDto): Response<Unit>
+}

app/src/main/java/org/sopt/and/data/remote/datasourceimpl/AuthRemoteDataSourceImpl.kt

@@ -0,0 +1,20 @@
+package org.sopt.and.data.remote.datasourceimpl
+
+import org.sopt.and.data.remote.datasource.AuthRemoteDataSource
+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
+import org.sopt.and.data.remote.model.response.UserRegistrationResponseDto
+import org.sopt.and.data.remote.service.AuthService
+import javax.inject.Inject
+
+class AuthRemoteDataSourceImpl @Inject constructor(
+    private val authService: AuthService
+) : AuthRemoteDataSource {
+    override suspend fun registerUser(userRegistrationRequestDto: UserRegistrationRequestDto): ApiResponse<UserRegistrationResponseDto> =
+        authService.registerUser(userRegistrationRequestDto = userRegistrationRequestDto)
+
+    override suspend fun login(loginRequestDto: LoginRequestDto): ApiResponse<LoginResponseDto> =
+        authService.login(loginRequestDto = loginRequestDto)
+}

app/src/main/java/org/sopt/and/data/remote/datasourceimpl/UserRemoteDataSourceImpl.kt

@@ -0,0 +1,26 @@
+package org.sopt.and.data.remote.datasourceimpl
+
+import org.sopt.and.data.remote.datasource.UserRemoteDataSource
+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 org.sopt.and.data.remote.service.UserService
+import retrofit2.Response
+import javax.inject.Inject
+
+class UserRemoteDataSourceImpl @Inject constructor(
+    private val userService: UserService
+): UserRemoteDataSource {
+    override suspend fun getMyHobby(token: String): ApiResponse<HobbyResponseDto> =
+        userService.getMyHobby(token = token)
+
+
+    override suspend fun getOthersHobby(token: String, userNo: Int): ApiResponse<HobbyResponseDto> =
+        userService.getOthersHobby(token = token, userNo = userNo)
+
+    override suspend fun updateUserInfo(
+        token: String,
+        userInfoUpdateRequestDto: UserInfoUpdateRequestDto
+    ): Response<Unit> =
+        userService.updateUserInfo(token = token, userInfoUpdateRequestDto = userInfoUpdateRequestDto)
+}

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?
+)

app/src/main/java/org/sopt/and/data/remote/model/response/GetMyHobbyResponseDto.kt → app/src/main/java/org/sopt/and/data/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
 )

app/src/main/java/org/sopt/and/data/remote/service/AuthService.kt

@@ -1,21 +1,21 @@
 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
 import org.sopt.and.data.remote.model.response.UserRegistrationResponseDto
-import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.POST
 
 interface AuthService {
     @POST("user")
-    fun registerUser(
+    suspend fun registerUser(
         @Body userRegistrationRequestDto: UserRegistrationRequestDto
-    ): Call<UserRegistrationResponseDto>
+    ): ApiResponse<UserRegistrationResponseDto>
 
     @POST("login")
-    fun login(
+    suspend fun login(
         @Body loginRequestDto: LoginRequestDto
-    ): Call<LoginResponseDto>
+    ): ApiResponse<LoginResponseDto>
 }

app/src/main/java/org/sopt/and/data/remote/service/UserService.kt

@@ -1,13 +1,30 @@
 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.Response
+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(
+    suspend fun getMyHobby(
         @Header("token") token: String
-    ): Call<GetMyHobbyResponseDto>
+    ): ApiResponse<HobbyResponseDto>
+
+    @GET("user/{no}/hobby")
+    suspend fun getOthersHobby(
+        @Header("token") token: String,
+        @Path("no") userNo: Int
+    ): ApiResponse<HobbyResponseDto>
+
+    @PUT("user")
+    suspend fun updateUserInfo(
+        @Header("token") token: String,
+        @Body userInfoUpdateRequestDto: UserInfoUpdateRequestDto
+    ): Response<Unit>
 }

app/src/main/java/org/sopt/and/data/remote/util/handleApiResponse.kt

@@ -0,0 +1,8 @@
+package org.sopt.and.data.remote.util
+
+import org.sopt.and.data.remote.model.base.ApiResponse
+
+fun <T> ApiResponse<T>.handleApiResponse(): Result<T> {
+    return if (this.result != null) Result.success(this.result)
+    else Result.failure(Exception("No data Available"))
+}

app/src/main/java/org/sopt/and/data/repositoryimpl/AuthRepositoryImpl.kt

@@ -0,0 +1,32 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.mapper.todata.toUserRegistrationRequestDto
+import org.sopt.and.data.mapper.todomain.toDomain
+import org.sopt.and.data.remote.datasource.AuthRemoteDataSource
+import org.sopt.and.data.remote.model.request.LoginRequestDto
+import org.sopt.and.data.remote.util.handleApiResponse
+import org.sopt.and.domain.model.Token
+import org.sopt.and.domain.model.User
+import org.sopt.and.domain.model.UserNo
+import org.sopt.and.domain.repository.AuthRepository
+import javax.inject.Inject
+
+class AuthRepositoryImpl @Inject constructor(
+    private val authRemoteDataSource: AuthRemoteDataSource
+): AuthRepository {
+    override suspend fun registerUser(user: User): Result<UserNo> {
+        return runCatching {
+            authRemoteDataSource.registerUser(userRegistrationRequestDto = user.toUserRegistrationRequestDto()).handleApiResponse().getOrThrow().toDomain()
+        }
+    }
+
+    override suspend fun login(username: String, password: String): Result<Token> {
+        return runCatching {
+            authRemoteDataSource.login(loginRequestDto = LoginRequestDto(
+                username = username,
+                password = password
+            )).handleApiResponse().getOrThrow().toDomain()
+        }
+    }
+
+}

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
 

app/src/main/java/org/sopt/and/data/repositoryimpl/UserRepositoryImpl.kt

@@ -0,0 +1,46 @@
+package org.sopt.and.data.repositoryimpl
+
+import org.sopt.and.data.mapper.todomain.toDomain
+import org.sopt.and.data.remote.datasource.UserRemoteDataSource
+import org.sopt.and.data.remote.model.request.UserInfoUpdateRequestDto
+import org.sopt.and.data.remote.util.handleApiResponse
+import org.sopt.and.domain.model.Hobby
+import org.sopt.and.domain.repository.UserRepository
+import javax.inject.Inject
+
+class UserRepositoryImpl @Inject constructor(
+    private val userRemoteDataSource: UserRemoteDataSource
+) : UserRepository {
+    override suspend fun getMyHobby(token: String): Result<Hobby> {
+        return runCatching {
+            userRemoteDataSource.getMyHobby(token = token).handleApiResponse().getOrThrow().toDomain()
+        }
+    }
+
+    override suspend fun getOthersHobby(token: String, userNo: Int): Result<Hobby> {
+        return runCatching {
+            userRemoteDataSource.getOthersHobby(token = token, userNo = userNo).handleApiResponse().getOrThrow().toDomain()
+        }
+    }
+
+    override suspend fun updateUserInfo(
+        token: String,
+        password: String?,
+        hobby: String?
+    ): Result<Unit> {
+        return runCatching {
+            val response = userRemoteDataSource.updateUserInfo(
+                token = token,
+                userInfoUpdateRequestDto = UserInfoUpdateRequestDto(
+                    password = password,
+                    hobby = hobby
+                )
+            )
+            if(response.isSuccessful) {
+                Result.success(Unit)
+            } else {
+                Result.failure(Exception("Error : ${response.code()} ${response.message()}"))
+            }
+        }
+    }
+}