Merge pull request #164 from Team-Ampersand/feature/163_write_the_log…

…ic_find_password 🔀 :: (#163) write the logic find password
Team-Ampersand · Feb 29, 2024 · 7b5a23d · 7b5a23d
2 parents 3227898 + a902f30
commit 7b5a23d
Show file tree

Hide file tree

Showing 23 changed files with 483 additions and 254 deletions.
diff --git a/app/src/main/java/com/msg/dotori/DotoriNavHost.kt b/app/src/main/java/com/msg/dotori/DotoriNavHost.kt
@@ -63,11 +63,13 @@ fun DotoriNavHost(
             navigateToLogin = { navController.navigateToLogin() }
         )
         passwordAuthenticationScreen(
+            viewModelStoreOwner = viewModelStoreOwner,
             navigateToBack = { navController.popBackStack() },
             navigateToLogin = { navController.navigateToLogin() },
             navigateToFindPassword = { navController.navigateToFindPassword() }
         )
         findPasswordScreen(
+            viewModelStoreOwner = viewModelStoreOwner,
             navigateToBack = { navController.popBackStack() },
             navigateToLogin = { navController.navigateToLogin() }
         )

diff --git a/data/src/main/java/com/msg/data/remote/datasource/auth/AuthDataSource.kt b/data/src/main/java/com/msg/data/remote/datasource/auth/AuthDataSource.kt
@@ -1,5 +1,6 @@
 package com.msg.data.remote.datasource.auth
 
+import com.msg.data.remote.dto.auth.ChangePasswordRequest
 import com.msg.data.remote.dto.auth.LoginRequest
 import com.msg.data.remote.dto.auth.LoginResponse
 import com.msg.data.remote.dto.auth.SignUpRequest
@@ -10,4 +11,6 @@ interface AuthDataSource {
     suspend fun tokenReissue(): LoginResponse
 
     suspend fun signUp(body: SignUpRequest)
+
+    suspend fun changePassword(body: ChangePasswordRequest)
 }
diff --git a/data/src/main/java/com/msg/data/remote/datasource/auth/AuthDataSourceImpl.kt b/data/src/main/java/com/msg/data/remote/datasource/auth/AuthDataSourceImpl.kt
@@ -1,5 +1,6 @@
 package com.msg.data.remote.datasource.auth
 
+import com.msg.data.remote.dto.auth.ChangePasswordRequest
 import com.msg.data.remote.dto.auth.LoginRequest
 import com.msg.data.remote.dto.auth.LoginResponse
 import com.msg.data.remote.dto.auth.SignUpRequest
@@ -21,4 +22,8 @@ class AuthDataSourceImpl @Inject constructor(
     override suspend fun signUp(body: SignUpRequest) = safeApiCall {
         authApi.signUp(body)
     }
+
+    override suspend fun changePassword(body: ChangePasswordRequest) = safeApiCall {
+        authApi.changePassword(body)
+    }
 }
diff --git a/data/src/main/java/com/msg/data/remote/datasource/email/EmailDataSource.kt b/data/src/main/java/com/msg/data/remote/datasource/email/EmailDataSource.kt
@@ -4,7 +4,9 @@ import com.msg.data.remote.dto.email.EmailVerifyRequest
 import com.msg.data.remote.dto.email.SendEmailRequest
 
 interface EmailDataSource {
-    suspend fun sendEmail(body: SendEmailRequest)
+    suspend fun sendSignUpEmail(body: SendEmailRequest)
+
+    suspend fun sendPasswordEmail(body: SendEmailRequest)
 
     suspend fun emailVerify(body: EmailVerifyRequest)
 }
diff --git a/data/src/main/java/com/msg/data/remote/datasource/email/EmailDataSourceImpl.kt b/data/src/main/java/com/msg/data/remote/datasource/email/EmailDataSourceImpl.kt
@@ -9,8 +9,12 @@ import javax.inject.Inject
 class EmailDataSourceImpl @Inject constructor(
     private val emailApi: EmailApi
 ): EmailDataSource {
-    override suspend fun sendEmail(body: SendEmailRequest) = safeApiCall {
-        emailApi.sendEmail(body)
+    override suspend fun sendSignUpEmail(body: SendEmailRequest) = safeApiCall {
+        emailApi.sendSignUpEmail(body)
+    }
+
+    override suspend fun sendPasswordEmail(body: SendEmailRequest)  = safeApiCall {
+        emailApi.sendPasswordEmail(body)
     }
 
     override suspend fun emailVerify(body: EmailVerifyRequest) = safeApiCall {

diff --git a/data/src/main/java/com/msg/data/remote/dto/auth/ChangePasswordRequest.kt b/data/src/main/java/com/msg/data/remote/dto/auth/ChangePasswordRequest.kt
@@ -0,0 +1,13 @@
+package com.msg.data.remote.dto.auth
+
+import com.msg.domain.model.auth.ChangePasswordRequestModel
+
+data class ChangePasswordRequest(
+    val email: String,
+    val newPassword: String
+)
+
+fun ChangePasswordRequestModel.asChangePasswordRequest() = ChangePasswordRequest(
+    email = email,
+    newPassword = newPassword
+)
diff --git a/data/src/main/java/com/msg/data/remote/network/AuthApi.kt b/data/src/main/java/com/msg/data/remote/network/AuthApi.kt
@@ -3,6 +3,7 @@ package com.msg.data.remote.network
 import com.msg.data.remote.dto.auth.LoginRequest
 import com.msg.data.remote.dto.auth.LoginResponse
 import com.msg.data.remote.dto.auth.SignUpRequest
+import com.msg.data.remote.dto.auth.ChangePasswordRequest
 import retrofit2.http.Body
 import retrofit2.http.PATCH
 import retrofit2.http.POST
@@ -20,4 +21,9 @@ interface AuthApi {
     suspend fun signUp(
         @Body body: SignUpRequest
     )
+
+    @PATCH("auth/password")
+    suspend fun changePassword(
+        @Body body: ChangePasswordRequest
+    )
 }
diff --git a/data/src/main/java/com/msg/data/remote/network/EmailApi.kt b/data/src/main/java/com/msg/data/remote/network/EmailApi.kt
@@ -7,7 +7,12 @@ import retrofit2.http.POST
 
 interface EmailApi {
     @POST("email/signup")
-    suspend fun sendEmail(
+    suspend fun sendSignUpEmail(
+        @Body body: SendEmailRequest
+    )
+
+    @POST("email/password")
+    suspend fun sendPasswordEmail(
         @Body body: SendEmailRequest
     )
 

diff --git a/data/src/main/java/com/msg/data/repository/AuthRepositoryImpl.kt b/data/src/main/java/com/msg/data/repository/AuthRepositoryImpl.kt
@@ -2,9 +2,11 @@ package com.msg.data.repository
 
 import com.msg.data.local.datasource.LocalDataSource
 import com.msg.data.remote.datasource.auth.AuthDataSource
+import com.msg.data.remote.dto.auth.asChangePasswordRequest
 import com.msg.data.remote.dto.auth.asLoginRequest
 import com.msg.data.remote.dto.auth.asLoginResponseModel
 import com.msg.data.remote.dto.auth.asSignUpRequest
+import com.msg.domain.model.auth.ChangePasswordRequestModel
 import com.msg.domain.model.auth.LoginRequestModel
 import com.msg.domain.model.auth.LoginResponseModel
 import com.msg.domain.model.auth.SignUpRequestModel
@@ -35,4 +37,6 @@ class AuthRepositoryImpl @Inject constructor(
     override suspend fun getRole(): String = localDataSource.getRole().first()
 
     override suspend fun signUp(body: SignUpRequestModel) = authDataSource.signUp(body.asSignUpRequest())
+
+    override suspend fun changePassword(body: ChangePasswordRequestModel) = authDataSource.changePassword(body.asChangePasswordRequest())
 }
diff --git a/data/src/main/java/com/msg/data/repository/EmailRepositoryImpl.kt b/data/src/main/java/com/msg/data/repository/EmailRepositoryImpl.kt
@@ -11,7 +11,9 @@ import javax.inject.Inject
 class EmailRepositoryImpl @Inject constructor(
     private val emailDataSource: EmailDataSource
 ): EmailRepository {
-    override suspend fun sendEmail(body: SendEmailRequestModel) = emailDataSource.sendEmail(body.asSendEmailRequest())
+    override suspend fun sendSignUpEmail(body: SendEmailRequestModel) = emailDataSource.sendSignUpEmail(body.asSendEmailRequest())
+
+    override suspend fun sendPasswordEmail(body: SendEmailRequestModel) = emailDataSource.sendPasswordEmail(body.asSendEmailRequest())
 
     override suspend fun emailVerify(body: EmailVerifyRequestModel) = emailDataSource.emailVerify(body.asEmailVerifyRequest())
 }
diff --git a/domain/src/main/java/com/msg/domain/model/auth/ChangePasswordRequestModel.kt b/domain/src/main/java/com/msg/domain/model/auth/ChangePasswordRequestModel.kt
@@ -0,0 +1,6 @@
+package com.msg.domain.model.auth
+
+data class ChangePasswordRequestModel(
+    val email: String,
+    val newPassword: String
+)
diff --git a/domain/src/main/java/com/msg/domain/repository/AuthRepository.kt b/domain/src/main/java/com/msg/domain/repository/AuthRepository.kt
@@ -1,5 +1,6 @@
 package com.msg.domain.repository
 
+import com.msg.domain.model.auth.ChangePasswordRequestModel
 import com.msg.domain.model.auth.LoginRequestModel
 import com.msg.domain.model.auth.LoginResponseModel
 import com.msg.domain.model.auth.SignUpRequestModel
@@ -20,4 +21,6 @@ interface AuthRepository {
     suspend fun getRole(): String
 
     suspend fun signUp(body: SignUpRequestModel)
+
+    suspend fun changePassword(body: ChangePasswordRequestModel)
 }
diff --git a/domain/src/main/java/com/msg/domain/repository/EmailRepository.kt b/domain/src/main/java/com/msg/domain/repository/EmailRepository.kt
@@ -4,7 +4,9 @@ import com.msg.domain.model.email.EmailVerifyRequestModel
 import com.msg.domain.model.email.SendEmailRequestModel
 
 interface EmailRepository {
-    suspend fun sendEmail(body: SendEmailRequestModel)
+    suspend fun sendSignUpEmail(body: SendEmailRequestModel)
+
+    suspend fun sendPasswordEmail(body: SendEmailRequestModel)
 
     suspend fun emailVerify(body: EmailVerifyRequestModel)
 }
diff --git a/domain/src/main/java/com/msg/domain/usecase/auth/ChangePasswordUseCase.kt b/domain/src/main/java/com/msg/domain/usecase/auth/ChangePasswordUseCase.kt
@@ -0,0 +1,11 @@
+package com.msg.domain.usecase.auth
+
+import com.msg.domain.model.auth.ChangePasswordRequestModel
+import com.msg.domain.repository.AuthRepository
+import javax.inject.Inject
+
+class ChangePasswordUseCase @Inject constructor(
+    private val repository: AuthRepository
+) {
+    suspend operator fun invoke(body: ChangePasswordRequestModel) = kotlin.runCatching { repository.changePassword(body) }
+}
diff --git a/domain/src/main/java/com/msg/domain/usecase/email/SendPasswordEmailUseCase.kt b/domain/src/main/java/com/msg/domain/usecase/email/SendPasswordEmailUseCase.kt
@@ -0,0 +1,11 @@
+package com.msg.domain.usecase.email
+
+import com.msg.domain.model.email.SendEmailRequestModel
+import com.msg.domain.repository.EmailRepository
+import javax.inject.Inject
+
+class SendPasswordEmailUseCase @Inject constructor(
+    private val repository: EmailRepository
+) {
+    suspend operator fun invoke(body: SendEmailRequestModel) = kotlin.runCatching { repository.sendPasswordEmail(body) }
+}
diff --git a/.../domain/usecase/email/SendEmailUseCase.kt → ...n/usecase/email/SendSignUpEmailUseCase.kt b/.../domain/usecase/email/SendEmailUseCase.kt → ...n/usecase/email/SendSignUpEmailUseCase.kt
@@ -4,8 +4,8 @@ import com.msg.domain.model.email.SendEmailRequestModel
 import com.msg.domain.repository.EmailRepository
 import javax.inject.Inject
 
-class SendEmailUseCase @Inject constructor(
+class SendSignUpEmailUseCase @Inject constructor(
     private val repository: EmailRepository
 ) {
-    suspend operator fun invoke(body: SendEmailRequestModel) = kotlin.runCatching { repository.sendEmail(body) }
+    suspend operator fun invoke(body: SendEmailRequestModel) = kotlin.runCatching { repository.sendSignUpEmail(body) }
 }