🔀 :: (#156) write the logic sign up

app/src/main/java/com/msg/dotori/DotoriNavHost.kt

@@ -1,6 +1,7 @@
 package com.msg.dotori
 
 import androidx.compose.runtime.Composable
+import androidx.lifecycle.viewmodel.compose.LocalViewModelStoreOwner
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.NavHost
 import com.msg.presentation.view.find_password.navigation.findPasswordScreen
@@ -30,6 +31,8 @@ fun DotoriNavHost(
     navController: NavHostController,
     startDestination: String
 ) {
+    val viewModelStoreOwner = checkNotNull(LocalViewModelStoreOwner.current)
+
     NavHost(
         navController = navController,
         startDestination = startDestination
@@ -39,16 +42,19 @@ fun DotoriNavHost(
             navigateToSignUp = { navController.navigateToSignUp() }
         )
         signUpScreen(
+            viewModelStoreOwner = viewModelStoreOwner,
             navigateToBack = { navController.popBackStack() },
             navigateToLogin = { navController.navigateToLogin() },
             navigateToAuthentication = { navController.navigateToAuthentication() }
         )
         authenticationScreen(
+            viewModelStoreOwner = viewModelStoreOwner,
             navigateToBack = { navController.popBackStack() },
             navigateToLogin = { navController.navigateToLogin() },
             navigateToPassword = { navController.navigateToPassword() }
         )
         passwordScreen(
+            viewModelStoreOwner = viewModelStoreOwner,
             navigateToBack = { navController.popBackStack() },
             navigateToLogin = { navController.navigateToLogin() }
         )

app/src/main/java/com/msg/dotori/module/NetworkModule.kt

@@ -3,6 +3,7 @@ package com.msg.dotori.module
 import android.util.Log
 import com.msg.dotori.BuildConfig
 import com.msg.data.remote.network.AuthApi
+import com.msg.data.remote.network.EmailApi
 import com.msg.data.remote.network.MassageApi
 import com.msg.data.remote.network.MusicApi
 import com.msg.data.remote.network.NoticeApi
@@ -18,6 +19,7 @@ import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory
+import retrofit2.create
 import java.util.concurrent.TimeUnit
 import javax.inject.Singleton
 
@@ -53,7 +55,7 @@ object NetworkModule {
         gsonConverterFactory: GsonConverterFactory
     ): Retrofit {
         return Retrofit.Builder()
-            .baseUrl(BuildConfig.RELEASE_URL)
+            .baseUrl(BuildConfig.DEVELOP_URL)
             .client(okHttpClient)
             .addConverterFactory(gsonConverterFactory)
             .build()
@@ -92,4 +94,8 @@ object NetworkModule {
     @Provides
     @Singleton
     fun provideRuleViolationApi(retrofit: Retrofit): RuleViolationApi = retrofit.create(RuleViolationApi::class.java)
+
+    @Provides
+    @Singleton
+    fun provideEmailApi(retrofit: Retrofit): EmailApi = retrofit.create(EmailApi::class.java)
 }

app/src/main/java/com/msg/dotori/module/RemoteDataSourceModule.kt

@@ -2,6 +2,8 @@ package com.msg.dotori.module
 
 import com.msg.data.remote.datasource.auth.AuthDataSourceImpl
 import com.msg.data.remote.datasource.auth.AuthDataSource
+import com.msg.data.remote.datasource.email.EmailDataSource
+import com.msg.data.remote.datasource.email.EmailDataSourceImpl
 import com.msg.data.remote.datasource.massage.MassageDataSource
 import com.msg.data.remote.datasource.massage.MassageDataSourceImpl
 import com.msg.data.remote.datasource.music.MusicDataSource
@@ -42,4 +44,7 @@ interface RemoteDataSourceModule {
 
     @Binds
     fun bindsRuleViolationDataSource(ruleViolationDataSourceImpl: RuleViolationDataSourceImpl): RuleViolationDataSource
+
+    @Binds
+    fun bindsEmailDataSource(emailDataSourceImpl: EmailDataSourceImpl): EmailDataSource
 }

app/src/main/java/com/msg/dotori/module/RepositoryModule.kt

@@ -1,13 +1,15 @@
 package com.msg.dotori.module
 
 import com.msg.data.repository.AuthRepositoryImpl
+import com.msg.data.repository.EmailRepositoryImpl
 import com.msg.data.repository.MassageRepositoryImpl
 import com.msg.data.repository.MusicRepositoryImpl
 import com.msg.data.repository.NoticeRepositoryImpl
 import com.msg.data.repository.RuleViolationRepositoryImpl
 import com.msg.data.repository.SelfStudyRepositoryImpl
 import com.msg.data.repository.StudentInfoRepositoryImpl
 import com.msg.domain.repository.AuthRepository
+import com.msg.domain.repository.EmailRepository
 import com.msg.domain.repository.MassageRepository
 import com.msg.domain.repository.MusicRepository
 import com.msg.domain.repository.NoticeRepository
@@ -42,4 +44,7 @@ interface RepositoryModule {
 
     @Binds
     fun bindsRuleViolationRepository(ruleViolationRepositoryImpl: RuleViolationRepositoryImpl): RuleViolationRepository
+
+    @Binds
+    fun bindsEmailRepository(emailRepositoryImpl: EmailRepositoryImpl): EmailRepository
 }

data/src/main/java/com/msg/data/remote/datasource/auth/AuthDataSource.kt

@@ -2,9 +2,12 @@ package com.msg.data.remote.datasource.auth
 
 import com.msg.data.remote.dto.auth.LoginRequest
 import com.msg.data.remote.dto.auth.LoginResponse
+import com.msg.data.remote.dto.auth.SignUpRequest
 
 interface AuthDataSource {
     suspend fun login(loginRequest: LoginRequest): LoginResponse
 
     suspend fun tokenReissue(): LoginResponse
+
+    suspend fun signUp(body: SignUpRequest)
 }

data/src/main/java/com/msg/data/remote/datasource/auth/AuthDataSourceImpl.kt

@@ -2,14 +2,23 @@ package com.msg.data.remote.datasource.auth
 
 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.network.AuthApi
 import com.msg.data.remote.util.safeApiCall
 import javax.inject.Inject
 
 class AuthDataSourceImpl @Inject constructor(
     private val authApi: AuthApi
 ): AuthDataSource {
-    override suspend fun login(loginRequest: LoginRequest): LoginResponse = safeApiCall { authApi.login(loginRequest) }
+    override suspend fun login(loginRequest: LoginRequest): LoginResponse = safeApiCall {
+        authApi.login(loginRequest)
+    }
 
-    override suspend fun tokenReissue(): LoginResponse = safeApiCall { authApi.tokenReissue() }
+    override suspend fun tokenReissue(): LoginResponse = safeApiCall {
+        authApi.tokenReissue()
+    }
+
+    override suspend fun signUp(body: SignUpRequest) = safeApiCall {
+        authApi.signUp(body)
+    }
 }

data/src/main/java/com/msg/data/remote/datasource/email/EmailDataSource.kt

@@ -0,0 +1,10 @@
+package com.msg.data.remote.datasource.email
+
+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 emailVerify(body: EmailVerifyRequest)
+}

data/src/main/java/com/msg/data/remote/datasource/email/EmailDataSourceImpl.kt

@@ -0,0 +1,19 @@
+package com.msg.data.remote.datasource.email
+
+import com.msg.data.remote.dto.email.EmailVerifyRequest
+import com.msg.data.remote.dto.email.SendEmailRequest
+import com.msg.data.remote.network.EmailApi
+import com.msg.data.remote.util.safeApiCall
+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 emailVerify(body: EmailVerifyRequest) = safeApiCall {
+        emailApi.emailVerify(body)
+    }
+}

data/src/main/java/com/msg/data/remote/dto/auth/Gender.kt

@@ -0,0 +1,13 @@
+package com.msg.data.remote.dto.auth
+
+import com.msg.domain.model.auth.GenderModel
+
+enum class Gender {
+    MAN,
+    WOMAN
+}
+
+fun GenderModel.asRole() = when (this) {
+    GenderModel.MAN -> Gender.MAN
+    GenderModel.WOMAN -> Gender.WOMAN
+}

data/src/main/java/com/msg/data/remote/dto/auth/SignUpRequest.kt

@@ -0,0 +1,19 @@
+package com.msg.data.remote.dto.auth
+
+import com.msg.domain.model.auth.SignUpRequestModel
+
+data class SignUpRequest(
+    val memberName: String,
+    val stuNum: String,
+    val password: String,
+    val email: String,
+    val gender: Gender
+)
+
+fun SignUpRequestModel.asSignUpRequest() = SignUpRequest(
+    memberName = memberName,
+    stuNum = stuNum,
+    password = password,
+    email = email,
+    gender = gender.asRole()
+)

data/src/main/java/com/msg/data/remote/dto/email/EmailVerifyRequest.kt

@@ -0,0 +1,11 @@
+package com.msg.data.remote.dto.email
+
+import com.msg.domain.model.email.EmailVerifyRequestModel
+
+data class EmailVerifyRequest(
+    val key: String
+)
+
+fun EmailVerifyRequestModel.asEmailVerifyRequest() = EmailVerifyRequest(
+    key = key
+)

data/src/main/java/com/msg/data/remote/dto/email/SendEmailRequest.kt

@@ -0,0 +1,11 @@
+package com.msg.data.remote.dto.email
+
+import com.msg.domain.model.email.SendEmailRequestModel
+
+data class SendEmailRequest(
+    val email: String
+)
+
+fun SendEmailRequestModel.asSendEmailRequest() = SendEmailRequest(
+    email = email
+)

data/src/main/java/com/msg/data/remote/network/AuthApi.kt

@@ -2,6 +2,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 retrofit2.http.Body
 import retrofit2.http.PATCH
 import retrofit2.http.POST
@@ -14,4 +15,9 @@ interface AuthApi {
 
     @PATCH("auth")
     suspend fun tokenReissue(): LoginResponse
+
+    @POST("auth/signup")
+    suspend fun signUp(
+        @Body body: SignUpRequest
+    )
 }

data/src/main/java/com/msg/data/remote/network/EmailApi.kt

@@ -0,0 +1,18 @@
+package com.msg.data.remote.network
+
+import com.msg.data.remote.dto.email.EmailVerifyRequest
+import com.msg.data.remote.dto.email.SendEmailRequest
+import retrofit2.http.Body
+import retrofit2.http.POST
+
+interface EmailApi {
+    @POST("email/signup")
+    suspend fun sendEmail(
+        @Body body: SendEmailRequest
+    )
+
+    @POST("email/verify-email")
+    suspend fun emailVerify(
+        @Body body: EmailVerifyRequest
+    )
+}

data/src/main/java/com/msg/data/remote/util/AuthInterceptor.kt

@@ -26,6 +26,7 @@ class AuthInterceptor @Inject constructor(
         val builder = request.newBuilder()
         val path = request.url.encodedPath
         val ignorePath = listOf("/auth")
+        val ignorePath2 = listOf("/email")
         val currentTime = LocalDateTime.now()
 
         ignorePath.forEach {
@@ -34,6 +35,12 @@ class AuthInterceptor @Inject constructor(
             }
         }
 
+        ignorePath2.forEach {
+            if (path.contains(it)) {
+                return chain.proceed(request)
+            }
+        }
+
         val refreshToken = runBlocking { localDataSource.getRefreshToken().first() }
         val accessTokenExp = runBlocking { LocalDateTime.parse(localDataSource.getExpiresAt().first()) }
         val refreshTokenExp = accessTokenExp.plusMonths(6)

data/src/main/java/com/msg/data/repository/AuthRepositoryImpl.kt

@@ -4,8 +4,10 @@ import com.msg.data.local.datasource.LocalDataSource
 import com.msg.data.remote.datasource.auth.AuthDataSource
 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.LoginRequestModel
 import com.msg.domain.model.auth.LoginResponseModel
+import com.msg.domain.model.auth.SignUpRequestModel
 import com.msg.domain.repository.AuthRepository
 import kotlinx.coroutines.flow.first
 import javax.inject.Inject
@@ -17,6 +19,7 @@ class AuthRepositoryImpl @Inject constructor(
     override suspend fun login(loginRequest: LoginRequestModel): LoginResponseModel = authDataSource.login(loginRequest.asLoginRequest()).asLoginResponseModel()
 
     override suspend fun tokenReissue(): LoginResponseModel = authDataSource.tokenReissue().asLoginResponseModel()
+
     override suspend fun saveToken(
         accessToken: String,
         refreshToken: String,
@@ -30,4 +33,6 @@ class AuthRepositoryImpl @Inject constructor(
     override suspend fun saveRole(roles: String) = localDataSource.saveRole(roles)
 
     override suspend fun getRole(): String = localDataSource.getRole().first()
+
+    override suspend fun signUp(body: SignUpRequestModel) = authDataSource.signUp(body.asSignUpRequest())
 }

data/src/main/java/com/msg/data/repository/EmailRepositoryImpl.kt

@@ -0,0 +1,17 @@
+package com.msg.data.repository
+
+import com.msg.data.remote.datasource.email.EmailDataSource
+import com.msg.data.remote.dto.email.asEmailVerifyRequest
+import com.msg.data.remote.dto.email.asSendEmailRequest
+import com.msg.domain.model.email.EmailVerifyRequestModel
+import com.msg.domain.model.email.SendEmailRequestModel
+import com.msg.domain.repository.EmailRepository
+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 emailVerify(body: EmailVerifyRequestModel) = emailDataSource.emailVerify(body.asEmailVerifyRequest())
+}

domain/src/main/java/com/msg/domain/model/auth/GenderModel.kt

@@ -0,0 +1,6 @@
+package com.msg.domain.model.auth
+
+enum class GenderModel {
+    MAN,
+    WOMAN
+}

domain/src/main/java/com/msg/domain/model/auth/SignUpRequestModel.kt

@@ -0,0 +1,9 @@
+package com.msg.domain.model.auth
+
+data class SignUpRequestModel(
+    val memberName: String,
+    val stuNum: String,
+    val password: String,
+    val email: String,
+    val gender: GenderModel
+)

domain/src/main/java/com/msg/domain/model/email/EmailVerifyRequestModel.kt

@@ -0,0 +1,5 @@
+package com.msg.domain.model.email
+
+data class EmailVerifyRequestModel(
+    val key: String
+)

domain/src/main/java/com/msg/domain/model/email/SendEmailRequestModel.kt

@@ -0,0 +1,5 @@
+package com.msg.domain.model.email
+
+data class SendEmailRequestModel(
+    val email: String
+)

domain/src/main/java/com/msg/domain/repository/AuthRepository.kt

@@ -2,6 +2,7 @@ package com.msg.domain.repository
 
 import com.msg.domain.model.auth.LoginRequestModel
 import com.msg.domain.model.auth.LoginResponseModel
+import com.msg.domain.model.auth.SignUpRequestModel
 
 interface AuthRepository {
     suspend fun login(loginRequest: LoginRequestModel): LoginResponseModel
@@ -17,4 +18,6 @@ interface AuthRepository {
     suspend fun saveRole(roles: String)
 
     suspend fun getRole(): String
+
+    suspend fun signUp(body: SignUpRequestModel)
 }