Merge pull request #25 from EarthGardener/feature/24_login_mypage_ref…

…actor

Feature/24 login mypage refactor

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/api/LoginService.kt

@@ -3,16 +3,18 @@ package team.gdsc.earthgardener.data.api
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import retrofit2.http.*
-import team.gdsc.earthgardener.data.model.response.ResCheckEmailSuccessData
-import team.gdsc.earthgardener.data.model.response.ResCheckNicknameSuccessData
-import team.gdsc.earthgardener.data.model.response.ResSignUpSuccessData
+import team.gdsc.earthgardener.data.model.request.signin.ReqSignInSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckEmailSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckNicknameSuccessData
+import team.gdsc.earthgardener.data.model.response.signin.ResSignInSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResSignUpSuccessData
 
 interface LoginService {
     // Get Email Code
     @GET("user/signup/email")
     suspend fun getEmail(
         @Query("email") email: String
-    ):ResCheckEmailSuccessData
+    ): ResCheckEmailSuccessData
 
     // Get NickName
     @GET("user/signup/nickname")
@@ -29,4 +31,8 @@ interface LoginService {
     ): ResSignUpSuccessData
 
     // Post SignIn
+    @POST("user/signin")
+    suspend fun postSignIn(
+        @Body data: ReqSignInSuccessData
+    ): ResSignInSuccessData
 }

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/api/ProfileService.kt

@@ -0,0 +1,9 @@
+package team.gdsc.earthgardener.data.api
+
+import retrofit2.http.GET
+import team.gdsc.earthgardener.data.model.response.profile.ResProfileSuccessData
+
+interface ProfileService {
+    @GET("user/profile")
+    suspend fun getProfile() : ResProfileSuccessData
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/profile/ProfileDataSource.kt

@@ -0,0 +1,7 @@
+package team.gdsc.earthgardener.data.datasource.profile
+
+import team.gdsc.earthgardener.data.model.response.profile.ResProfileSuccessData
+
+interface ProfileDataSource {
+    suspend fun getProfile(): ResProfileSuccessData
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/profile/ProfileRemoteDataSource.kt

@@ -0,0 +1,11 @@
+package team.gdsc.earthgardener.data.datasource.profile
+
+import team.gdsc.earthgardener.data.api.ProfileService
+import team.gdsc.earthgardener.data.model.response.profile.ResProfileSuccessData
+
+class ProfileRemoteDataSource(private val profileService: ProfileService)
+    :ProfileDataSource{
+    override suspend fun getProfile(): ResProfileSuccessData {
+        return profileService.getProfile()
+    }
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signin/SignInDataSource.kt

@@ -0,0 +1,8 @@
+package team.gdsc.earthgardener.data.datasource.signin
+
+import team.gdsc.earthgardener.data.model.request.signin.ReqSignInSuccessData
+import team.gdsc.earthgardener.data.model.response.signin.ResSignInSuccessData
+
+interface SignInDataSource {
+    suspend fun postSignIn(data: ReqSignInSuccessData): ResSignInSuccessData
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signin/SignInRemoteDataSource.kt

@@ -0,0 +1,13 @@
+package team.gdsc.earthgardener.data.datasource.signin
+
+import team.gdsc.earthgardener.data.api.LoginService
+import team.gdsc.earthgardener.data.model.request.signin.ReqSignInSuccessData
+import team.gdsc.earthgardener.data.model.response.signin.ResSignInSuccessData
+
+class SignInRemoteDataSource(private val loginService: LoginService)
+    : SignInDataSource{
+    override suspend fun postSignIn(data: ReqSignInSuccessData): ResSignInSuccessData {
+        return loginService.postSignIn(data)
+    }
+
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signup/SignUpDataSource.kt

@@ -2,7 +2,7 @@ package team.gdsc.earthgardener.data.datasource.signup
 
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
-import team.gdsc.earthgardener.data.model.response.ResSignUpSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResSignUpSuccessData
 
 interface SignUpDataSource {
     suspend fun postSignUp(

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signup/SignUpRemoteDataSource.kt

@@ -3,7 +3,7 @@ package team.gdsc.earthgardener.data.datasource.signup
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import team.gdsc.earthgardener.data.api.LoginService
-import team.gdsc.earthgardener.data.model.response.ResSignUpSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResSignUpSuccessData
 
 class SignUpRemoteDataSource(private val loginService: LoginService)
     :SignUpDataSource{

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signup/email/CheckEmailDataSource.kt

@@ -0,0 +1,7 @@
+package team.gdsc.earthgardener.data.datasource.signup.email
+
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckEmailSuccessData
+
+interface CheckEmailDataSource {
+    suspend fun getCheckEmail(email: String): ResCheckEmailSuccessData
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/email/CheckEmailRemoteDataSource.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signup/email/CheckEmailRemoteDataSource.kt

@@ -1,9 +1,10 @@
-package team.gdsc.earthgardener.data.datasource.email
+package team.gdsc.earthgardener.data.datasource.signup.email
 
 import team.gdsc.earthgardener.data.api.LoginService
-import team.gdsc.earthgardener.data.model.response.ResCheckEmailSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckEmailSuccessData
 
-class CheckEmailRemoteDataSource (private val loginService: LoginService) : CheckEmailDataSource {
+class CheckEmailRemoteDataSource (private val loginService: LoginService)
+    : CheckEmailDataSource {
     override suspend fun getCheckEmail(email: String): ResCheckEmailSuccessData {
         return loginService.getEmail(email)
     }

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signup/nickname/CheckNicknameDataSource.kt

@@ -0,0 +1,7 @@
+package team.gdsc.earthgardener.data.datasource.signup.nickname
+
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckNicknameSuccessData
+
+interface CheckNicknameDataSource {
+    suspend fun getCheckNickname(nickname: String): ResCheckNicknameSuccessData
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/nickname/CheckNicknameRemoteDataSource.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/datasource/signup/nickname/CheckNicknameRemoteDataSource.kt

@@ -1,7 +1,7 @@
-package team.gdsc.earthgardener.data.datasource.nickname
+package team.gdsc.earthgardener.data.datasource.signup.nickname
 
 import team.gdsc.earthgardener.data.api.LoginService
-import team.gdsc.earthgardener.data.model.response.ResCheckNicknameSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckNicknameSuccessData
 
 class CheckNicknameRemoteDataSource(private val loginService: LoginService): CheckNicknameDataSource {
     override suspend fun getCheckNickname(nickname: String): ResCheckNicknameSuccessData {

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/profile/ProfileMapper.kt

@@ -0,0 +1,19 @@
+package team.gdsc.earthgardener.data.mapper.profile
+
+import team.gdsc.earthgardener.data.model.response.profile.ResProfileSuccessData
+import team.gdsc.earthgardener.domain.profile.ProfileData
+
+object ProfileMapper {
+    fun mapperProfileSuccessData(resProfileSuccessData: ResProfileSuccessData)
+    : ProfileData {
+        return ProfileData(
+            message = resProfileSuccessData.message,
+            status = resProfileSuccessData.status,
+            data = ProfileData.ProfileInfo(
+                resProfileSuccessData.data.email,
+                resProfileSuccessData.data.nickname,
+                resProfileSuccessData.data.image_url
+            )
+        )
+    }
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/signin/SignInMapper.kt

@@ -0,0 +1,16 @@
+package team.gdsc.earthgardener.data.mapper.signin
+
+import team.gdsc.earthgardener.data.model.response.signin.ResSignInSuccessData
+import team.gdsc.earthgardener.domain.signin.SigninSuccessData
+
+object SignInMapper {
+
+    fun mapperSignInSuccessData(resSignInSuccessData: ResSignInSuccessData)
+    : SigninSuccessData {
+        return SigninSuccessData(
+            message = resSignInSuccessData.message,
+            status = resSignInSuccessData.status,
+            token = resSignInSuccessData.token
+        )
+    }
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/CheckEmailMapper.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/signup/CheckEmailMapper.kt

@@ -1,6 +1,6 @@
-package team.gdsc.earthgardener.data.mapper
+package team.gdsc.earthgardener.data.mapper.signup
 
-import team.gdsc.earthgardener.data.model.response.ResCheckEmailSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckEmailSuccessData
 import team.gdsc.earthgardener.domain.email.CheckEmailData
 
 object CheckEmailMapper {

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/CheckNicknameMapper.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/signup/CheckNicknameMapper.kt

@@ -1,6 +1,6 @@
-package team.gdsc.earthgardener.data.mapper
+package team.gdsc.earthgardener.data.mapper.signup
 
-import team.gdsc.earthgardener.data.model.response.ResCheckNicknameSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResCheckNicknameSuccessData
 import team.gdsc.earthgardener.domain.nickname.CheckNicknameData
 
 object CheckNicknameMapper {

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/SignUpMapper.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/mapper/signup/SignUpMapper.kt

@@ -1,6 +1,6 @@
-package team.gdsc.earthgardener.data.mapper
+package team.gdsc.earthgardener.data.mapper.signup
 
-import team.gdsc.earthgardener.data.model.response.ResSignUpSuccessData
+import team.gdsc.earthgardener.data.model.response.signup.ResSignUpSuccessData
 import team.gdsc.earthgardener.domain.signup.SignUpData
 
 object SignUpMapper {

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/request/signin/ReqSignInSuccessData.kt

@@ -0,0 +1,11 @@
+package team.gdsc.earthgardener.data.model.request.signin
+
+import com.google.gson.annotations.SerializedName
+
+data class ReqSignInSuccessData(
+    @SerializedName("email")
+    val email: String,
+
+    @SerializedName("pw")
+    val pw: String
+)

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/profile/ResProfileSuccessData.kt

@@ -0,0 +1,25 @@
+package team.gdsc.earthgardener.data.model.response.profile
+
+import com.google.gson.annotations.SerializedName
+
+data class ResProfileSuccessData(
+    @SerializedName("message")
+    val message: String,
+
+    @SerializedName("data")
+    val data: Profile,
+
+    @SerializedName("status")
+    val status: Int
+){
+    data class Profile(
+        @SerializedName("email")
+        val email: String,
+
+        @SerializedName("nickname")
+        val nickname: String,
+
+        @SerializedName("image_url")
+        val image_url: String
+    )
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/signin/ResSignInSuccessData.kt

@@ -0,0 +1,7 @@
+package team.gdsc.earthgardener.data.model.response.signin
+
+data class ResSignInSuccessData(
+    val message: String,
+    val status: Int,
+    val token: String
+)

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/ResCheckEmailSuccessData.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/signup/ResCheckEmailSuccessData.kt

@@ -1,4 +1,4 @@
-package team.gdsc.earthgardener.data.model.response
+package team.gdsc.earthgardener.data.model.response.signup
 
 import com.google.gson.annotations.SerializedName
 

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/ResCheckNicknameSuccessData.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/signup/ResCheckNicknameSuccessData.kt

@@ -1,4 +1,4 @@
-package team.gdsc.earthgardener.data.model.response
+package team.gdsc.earthgardener.data.model.response.signup
 
 import com.google.gson.annotations.SerializedName
 

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/ResSignUpSuccessData.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/model/response/signup/ResSignUpSuccessData.kt

@@ -1,4 +1,4 @@
-package team.gdsc.earthgardener.data.model.response
+package team.gdsc.earthgardener.data.model.response.signup
 
 import com.google.gson.annotations.SerializedName
 

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/profile/ProfileRepositoryImpl.kt

@@ -0,0 +1,13 @@
+package team.gdsc.earthgardener.data.repository.profile
+
+import team.gdsc.earthgardener.data.datasource.profile.ProfileDataSource
+import team.gdsc.earthgardener.data.mapper.profile.ProfileMapper
+import team.gdsc.earthgardener.domain.profile.ProfileData
+import team.gdsc.earthgardener.domain.profile.ProfileRepository
+
+class ProfileRepositoryImpl(private val profileDataSource: ProfileDataSource)
+    : ProfileRepository {
+    override suspend fun getProfileResult(): ProfileData {
+        return ProfileMapper.mapperProfileSuccessData(profileDataSource.getProfile())
+    }
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/signin/SignInRepositoryImpl.kt

@@ -0,0 +1,14 @@
+package team.gdsc.earthgardener.data.repository.signin
+
+import team.gdsc.earthgardener.data.datasource.signin.SignInDataSource
+import team.gdsc.earthgardener.data.mapper.signin.SignInMapper
+import team.gdsc.earthgardener.data.model.request.signin.ReqSignInSuccessData
+import team.gdsc.earthgardener.domain.signin.SignInRepository
+import team.gdsc.earthgardener.domain.signin.SigninSuccessData
+
+class SignInRepositoryImpl(private val signInDataSource: SignInDataSource)
+    :SignInRepository{
+    override suspend fun postSignInResult(data: ReqSignInSuccessData): SigninSuccessData {
+        return SignInMapper.mapperSignInSuccessData(signInDataSource.postSignIn(data))
+    }
+}

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/CheckEmailRepositoryImpl.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/signup/CheckEmailRepositoryImpl.kt

@@ -1,7 +1,7 @@
-package team.gdsc.earthgardener.data.repository
+package team.gdsc.earthgardener.data.repository.signup
 
-import team.gdsc.earthgardener.data.datasource.email.CheckEmailDataSource
-import team.gdsc.earthgardener.data.mapper.CheckEmailMapper
+import team.gdsc.earthgardener.data.datasource.signup.email.CheckEmailDataSource
+import team.gdsc.earthgardener.data.mapper.signup.CheckEmailMapper
 import team.gdsc.earthgardener.domain.email.CheckEmailData
 import team.gdsc.earthgardener.domain.email.CheckEmailRepository
 

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/CheckNicknameRepositoryImpl.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/signup/CheckNicknameRepositoryImpl.kt

@@ -1,7 +1,7 @@
-package team.gdsc.earthgardener.data.repository
+package team.gdsc.earthgardener.data.repository.signup
 
-import team.gdsc.earthgardener.data.datasource.nickname.CheckNicknameDataSource
-import team.gdsc.earthgardener.data.mapper.CheckNicknameMapper
+import team.gdsc.earthgardener.data.datasource.signup.nickname.CheckNicknameDataSource
+import team.gdsc.earthgardener.data.mapper.signup.CheckNicknameMapper
 import team.gdsc.earthgardener.domain.nickname.CheckNicknameData
 import team.gdsc.earthgardener.domain.nickname.CheckNicknameRepository
 

EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/SignUpRepositoryImpl.kt → EarthGardener/app/src/main/java/team/gdsc/earthgardener/data/repository/signup/SignUpRepositoryImpl.kt

@@ -1,9 +1,9 @@
-package team.gdsc.earthgardener.data.repository
+package team.gdsc.earthgardener.data.repository.signup
 
 import okhttp3.MultipartBody
 import okhttp3.RequestBody
 import team.gdsc.earthgardener.data.datasource.signup.SignUpDataSource
-import team.gdsc.earthgardener.data.mapper.SignUpMapper
+import team.gdsc.earthgardener.data.mapper.signup.SignUpMapper
 import team.gdsc.earthgardener.domain.signup.SignUpData
 import team.gdsc.earthgardener.domain.signup.SignUpRepository
 

EarthGardener/app/src/main/java/team/gdsc/earthgardener/di/DataSourceModule.kt

@@ -1,22 +1,27 @@
 package team.gdsc.earthgardener.di
 
 import org.koin.dsl.module
-import team.gdsc.earthgardener.data.datasource.email.CheckEmailDataSource
-import team.gdsc.earthgardener.data.datasource.email.CheckEmailRemoteDataSource
-import team.gdsc.earthgardener.data.datasource.nickname.CheckNicknameDataSource
-import team.gdsc.earthgardener.data.datasource.nickname.CheckNicknameRemoteDataSource
+import team.gdsc.earthgardener.data.datasource.signup.email.CheckEmailDataSource
+import team.gdsc.earthgardener.data.datasource.signup.email.CheckEmailRemoteDataSource
+import team.gdsc.earthgardener.data.datasource.signup.nickname.CheckNicknameDataSource
+import team.gdsc.earthgardener.data.datasource.signup.nickname.CheckNicknameRemoteDataSource
 import team.gdsc.earthgardener.data.datasource.tree.TreeInfoDataSource
 import team.gdsc.earthgardener.data.datasource.tree.TreeInfoRemoteDataSource
 import team.gdsc.earthgardener.data.datasource.tree.TreeNameDataSource
 import team.gdsc.earthgardener.data.datasource.tree.TreeNameRemoteDataSource
-import team.gdsc.earthgardener.data.datasource.post.PostLocalDataSource
 import team.gdsc.earthgardener.data.datasource.post.PostRemoteDataSource
 import team.gdsc.earthgardener.data.datasource.post.PostDataSource
+import team.gdsc.earthgardener.data.datasource.profile.ProfileDataSource
+import team.gdsc.earthgardener.data.datasource.profile.ProfileRemoteDataSource
+import team.gdsc.earthgardener.data.datasource.signin.SignInDataSource
+import team.gdsc.earthgardener.data.datasource.signin.SignInRemoteDataSource
 
 val dataSourceModule = module {
     single<CheckEmailDataSource> { CheckEmailRemoteDataSource(get()) }
     single<CheckNicknameDataSource> { CheckNicknameRemoteDataSource(get()) }
     single<TreeInfoDataSource> { TreeInfoRemoteDataSource(get()) }
     single<TreeNameDataSource> { TreeNameRemoteDataSource(get()) }
     single<PostDataSource>{ PostRemoteDataSource(get()) }
+    single<SignInDataSource>{ SignInRemoteDataSource(get()) }
+    single<ProfileDataSource>{ ProfileRemoteDataSource(get())}
 }