4주차 세미나 과제 #9
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package org.android.go.sopt.data.entity.remote.request | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class RequestPostSignInDto( | ||
| @SerialName("id") | ||
| val id: String, | ||
| @SerialName("password") | ||
| val password: String, | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| package org.android.go.sopt.data.entity.remote.request | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class RequestPostSignUpDto( | ||
| @SerialName("id") | ||
| val id: String, | ||
| @SerialName("password") | ||
| val password: String, | ||
| @SerialName("name") | ||
| val name: String, | ||
| @SerialName("skill") | ||
| val skill: String, | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,52 @@ | ||
| package org.android.go.sopt.data.entity.remote.response | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
| import org.android.go.sopt.domain.model.Follower | ||
|
|
||
| @Serializable | ||
| data class ResponseGetFollowerListDto( | ||
| @SerialName("page") | ||
| val page: Int, | ||
| @SerialName("per_page") | ||
| val perPage: Int, | ||
| @SerialName("total") | ||
| val total: Int, | ||
| @SerialName("total_pages") | ||
| val totalPages: Int, | ||
| @SerialName("data") | ||
| val data: List<Follower>, | ||
| @SerialName("support") | ||
| val support: Support, | ||
| ) { | ||
| @Serializable | ||
| data class Follower( | ||
| @SerialName("id") | ||
| val id: Int, | ||
| @SerialName("email") | ||
| val email: String, | ||
| @SerialName("first_name") | ||
| val firstName: String, | ||
| @SerialName("last_name") | ||
| val lastName: String, | ||
| @SerialName("avatar") | ||
| val avatar: String, | ||
| ) | ||
|
|
||
| @Serializable | ||
| data class Support( | ||
| @SerialName("url") | ||
| val url: String, | ||
| @SerialName("text") | ||
| val text: String, | ||
| ) | ||
|
|
||
| fun toFollower() = data.map { follower -> | ||
| Follower( | ||
| id = follower.id, | ||
| name = "${follower.firstName} ${follower.lastName}", | ||
|
|
||
| profile = follower.avatar, | ||
| email = follower.email, | ||
| ) | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.android.go.sopt.data.entity.remote.response | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class ResponsePostSignInDto( | ||
| @SerialName("id") | ||
| val id: String, | ||
| @SerialName("name") | ||
| val name: String, | ||
| @SerialName("skill") | ||
| val skill: String?, | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package org.android.go.sopt.data.entity.remote.response | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class ResponsePostSignUpDto( | ||
| @SerialName("name") | ||
| val name: String, | ||
| @SerialName("skill") | ||
| val skill: String, | ||
| ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| package org.android.go.sopt.data.entity.remote.response.wrapper | ||
|
|
||
| import kotlinx.serialization.SerialName | ||
| import kotlinx.serialization.Serializable | ||
|
|
||
| @Serializable | ||
| data class BaseResponse<T>( | ||
|
There was a problem hiding this comment.
저희 다 오픈소스잖아요 🤭 |
||
| @SerialName("status") | ||
| val status: Int, | ||
| @SerialName("message") | ||
| val message: String, | ||
| @SerialName("data") | ||
| val data: T? = null, | ||
|
There was a problem hiding this comment. 오오오 Response에서 data의 타입만 달라지니까 제네릭으로 만들 수 있군요! 한수 배워갑니다👍👍 |
||
| ) | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,26 +1,42 @@ | ||
| package org.android.go.sopt.data.repository | ||
|
|
||
| import org.android.go.sopt.data.entity.remote.request.RequestPostSignInDto | ||
| import org.android.go.sopt.data.entity.remote.request.RequestPostSignUpDto | ||
| import org.android.go.sopt.data.entity.remote.response.ResponsePostSignInDto | ||
| import org.android.go.sopt.data.entity.remote.response.ResponsePostSignUpDto | ||
| import org.android.go.sopt.data.source.local.SharedPrefDataSource | ||
| import org.android.go.sopt.data.source.remote.AuthDataSource | ||
| import org.android.go.sopt.domain.model.User | ||
| import org.android.go.sopt.domain.repository.AuthRepository | ||
| import javax.inject.Inject | ||
|
|
||
| class AuthRepositoryImpl @Inject constructor( | ||
| private val authDataSource: AuthDataSource, | ||
| private val sharedPrefDataSource: SharedPrefDataSource, | ||
| ) : AuthRepository { | ||
| override suspend fun postSignup(requestPostSignUpDto: RequestPostSignUpDto): Result<ResponsePostSignUpDto?> = | ||
|
There was a problem hiding this comment. 좀 더 간결하게 이벤트를 처리하기 위해 runCatching을 활용해서 반환 타입을 Result로 지정해주었습니당 |
||
| runCatching { | ||
| authDataSource.postSignup(requestPostSignUpDto).data | ||
| } | ||
|
|
||
| override suspend fun postSignin(requestPostSignInDto: RequestPostSignInDto): Result<ResponsePostSignInDto?> = | ||
| runCatching { | ||
| authDataSource.postSignIn(requestPostSignInDto).data | ||
| } | ||
|
|
||
| override fun setAutoLogin(isAutoLogin: Boolean) { | ||
| sharedPrefDataSource.isAutoLogin = isAutoLogin | ||
| } | ||
|
|
||
| override fun getAutoLogin(): Boolean = sharedPrefDataSource.isAutoLogin | ||
|
|
||
| override fun setSignedUpUser(user: User) { | ||
| sharedPrefDataSource.signedUpUser = user | ||
| } | ||
|
|
||
| override fun getSignedUpUser(): User? = sharedPrefDataSource.signedUpUser | ||
|
|
||
| override fun clearLocalPref() { | ||
| sharedPrefDataSource.clearLocalPref() | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,15 @@ | ||
| package org.android.go.sopt.data.repository | ||
|
|
||
| import org.android.go.sopt.data.source.remote.FollowerDataSource | ||
| import org.android.go.sopt.domain.model.Follower | ||
| import org.android.go.sopt.domain.repository.FollowerRepository | ||
| import javax.inject.Inject | ||
|
|
||
| class FollowerRepositoryImpl @Inject constructor( | ||
| private val followerDataSource: FollowerDataSource, | ||
| ) : FollowerRepository { | ||
| override suspend fun getFollowerList(page: Int): Result<List<Follower>> = | ||
| runCatching { | ||
| followerDataSource.getFollowerList(page).toFollower() | ||
|
There was a problem hiding this comment. 오 처음부터 api url 에 page 숫자를 명시해준게 아닌, 인자로 받아서 여러 페이지 접근할 수 있도록 해주셨군요 짱이십니다 👍 |
||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| package org.android.go.sopt.data.service | ||
|
|
||
| import org.android.go.sopt.data.entity.remote.request.RequestPostSignInDto | ||
| import org.android.go.sopt.data.entity.remote.request.RequestPostSignUpDto | ||
| import org.android.go.sopt.data.entity.remote.response.ResponsePostSignInDto | ||
| import org.android.go.sopt.data.entity.remote.response.ResponsePostSignUpDto | ||
| import org.android.go.sopt.data.entity.remote.response.wrapper.BaseResponse | ||
| import retrofit2.http.Body | ||
| import retrofit2.http.POST | ||
|
|
||
| interface AuthService { | ||
| @POST("sign-up") | ||
| suspend fun postSignUp( | ||
| @Body requestPostSignUpDto: RequestPostSignUpDto, | ||
| ): BaseResponse<ResponsePostSignUpDto> | ||
|
|
||
| @POST("sign-in") | ||
| suspend fun postSignIn( | ||
| @Body requestPostSignInDto: RequestPostSignInDto, | ||
| ): BaseResponse<ResponsePostSignInDto> | ||
| } | ||
|
There was a problem hiding this comment. 오호 함수명이랑 Dto 클래스명에 어떤 HTTP 메서드를 사용하는지 명시해주니까 더 좋은 거 같아요! |
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| package org.android.go.sopt.data.service | ||
|
|
||
| import org.android.go.sopt.data.entity.remote.response.ResponseGetFollowerListDto | ||
| import retrofit2.http.GET | ||
| import retrofit2.http.Query | ||
|
|
||
| interface FollowerService { | ||
| @GET("users") | ||
| suspend fun getFollowerList( | ||
| @Query("page") page: Int, | ||
| ): ResponseGetFollowerListDto | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DiffUtill에서 아이템을 비교할 때 혹시 명확한 식별을 위해서 id도 가져오는건가용? (뭔가 나의 말이 이상한데......)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
넵
areItemsTheSame에서 id 값을 비교해주고 싶어서 가져왔습니다!