🔀 :: (#216) - 회원가입 api 연결을 하였습니다

app/build.gradle.kts

@@ -36,6 +36,7 @@ dependencies {
     implementation(project(":feature:chart"))
     implementation(project(":feature:account"))
     implementation(project(":feature:signin"))
+    implementation(project(":feature:signup"))
     implementation(project(":feature:trade"))
     implementation(project(":feature:investmentSearch"))
     implementation(project(":feature:monthlyEarnings"))

app/src/main/java/com/jusicool/jusicool_android/navigation/JusicoolNavHost.kt

@@ -8,7 +8,10 @@ import com.jusicool.account.navigation.accountRoute
 import com.jusicool.account.navigation.navigateToAccountRoute
 import com.jusicool.chart.navigation.chartRoute
 import com.jusicool.chart.navigation.navigateToChartRoute
+import com.jusicool.signin.navigation.navigateToSignInRoute
 import com.jusicool.signin.navigation.signInRoute
+import com.jusicool.signup.navigation.navigateToSignUpRoute
+import com.jusicool.signup.navigation.signUpRoute
 import com.jusicool.trade.navigation.buyReserveRoute
 import com.jusicool.trade.navigation.buyRoute
 import com.jusicool.trade.navigation.navigateToBuyReserveRoute
@@ -42,10 +45,14 @@ fun JusicoolNavHost(
         startDestination = startDestination
     ) {
         signInRoute(
-            navigateToSignUp = { /*TODO()*/ },
+            navigateToSignUp = navController::navigateToSignUpRoute,
             navigateToAccount = navController::navigateToAccountRoute
         )
 
+        signUpRoute(
+            navigateToSignIn = navController::navigateToSignInRoute
+        )
+
         accountRoute(
             navigateToOrderHistory = navController::navigateToOrderHistoryRoute,
             navigateToMonthlyEarningsRoute = navController::navigateToMonthlyEarningsRoute,

data/di/src/main/java/com/jusicool/di/RepositoryModule.kt

@@ -16,6 +16,8 @@ import com.jusicool.repository.MarketRepository
 import com.jusicool.repository.MarketRepositoryImpl
 import com.jusicool.repository.OrderRepository
 import com.jusicool.repository.OrderRepositoryImpl
+import com.jusicool.repository.SchoolRepository
+import com.jusicool.repository.SchoolRepositoryImpl
 import com.jusicool.repository.WsKoreaInvestmentRepository
 import com.jusicool.repository.WsKoreaInvestmentRepositoryImpl
 import dagger.Binds
@@ -72,4 +74,9 @@ abstract class RepositoryModule {
     abstract fun bindCommunityRepository(
         communityRepositoryImpl: CommunityRepositoryImpl
     ): CommunityRepository
+
+    @Binds
+    abstract fun bindSchoolRepository(
+        schoolRepositoryImpl: SchoolRepositoryImpl
+    ): SchoolRepository
 }

data/model/src/main/java/com/jusicool/model/auth/SignUpRequest.kt

@@ -0,0 +1,11 @@
+package com.jusicool.model.auth
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SignUpRequest(
+    val username: String,
+    val email: String,
+    val password: String,
+    val school: String
+)

data/model/src/main/java/com/jusicool/model/auth/VerificationCodeRequest.kt

@@ -0,0 +1,9 @@
+package com.jusicool.model.auth
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class VerificationCodeRequest(
+    val email: String,
+    val code: Int
+)

data/model/src/main/java/com/jusicool/model/auth/VerificationEmailRequest.kt

@@ -0,0 +1,8 @@
+package com.jusicool.model.auth
+
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class VerificationEmailRequest(
+    val email: String
+)

data/model/src/main/java/com/jusicool/model/mapper/auth/SignUpRequestMapper.kt

@@ -0,0 +1,12 @@
+package com.jusicool.model.mapper.auth
+
+import com.jusicool.entity.auth.SignUpModel
+import com.jusicool.model.auth.SignUpRequest
+
+fun SignUpModel.toDto(): SignUpRequest =
+    SignUpRequest(
+        username = this.username,
+        email = this.email,
+        password = this.password,
+        school = this.school
+    )

data/model/src/main/java/com/jusicool/model/mapper/auth/VerificationCodeRequestMapper.kt

@@ -0,0 +1,10 @@
+package com.jusicool.model.mapper.auth
+
+import com.jusicool.entity.auth.VerificationCodeModel
+import com.jusicool.model.auth.VerificationCodeRequest
+
+fun VerificationCodeModel.toDto(): VerificationCodeRequest =
+    VerificationCodeRequest(
+        email = this.email,
+        code = this.code
+    )

data/model/src/main/java/com/jusicool/model/mapper/auth/VerificationEmailRequestMapper.kt

@@ -0,0 +1,9 @@
+package com.jusicool.model.mapper.auth
+
+import com.jusicool.entity.auth.VerificationEmailModel
+import com.jusicool.model.auth.VerificationEmailRequest
+
+fun VerificationEmailModel.toDto(): VerificationEmailRequest =
+    VerificationEmailRequest(
+        email = this.email
+    )

data/model/src/main/java/com/jusicool/model/mapper/school/SchoolInfoMapper.kt

@@ -0,0 +1,50 @@
+package com.jusicool.model.mapper.school
+
+import com.jusicool.entity.school.SchoolInfoModel
+import com.jusicool.model.school.SchoolInfoResponse
+import com.jusicool.model.school.SchoolRow
+
+fun SchoolInfoResponse.toModel(): List<SchoolInfoModel> {
+    val rows = sections
+        .orEmpty()
+        .flatMap { it.row.orEmpty() }
+
+    val dedup = LinkedHashMap<String, SchoolInfoModel>()
+
+    rows.forEach { r ->
+        val name = r.name?.trim().orEmpty()
+        if (name.isEmpty()) return@forEach
+
+        val address = listOfNotNull(
+            r.roadAddr?.trim()?.takeIf { it.isNotEmpty() },
+            r.roadDetail?.trim()?.takeIf { it.isNotEmpty() }
+        ).joinToString(" ")
+
+        val model = SchoolInfoModel(
+            officeCode = r.officeCode.orEmpty(),
+            schoolCode = r.schoolCode.orEmpty(),
+            name = name,
+            address = address
+        )
+
+        val key = if (model.schoolCode.isNotEmpty()) {
+            "code:${model.schoolCode}"
+        } else {
+            "fallback:${model.name}|${model.address}"
+        }
+
+        dedup.putIfAbsent(key, model)
+    }
+
+    return dedup.values.toList()
+}
+
+fun SchoolRow.toModel(): SchoolInfoModel = SchoolInfoModel(
+    officeCode = officeCode.orEmpty(),
+    schoolCode = schoolCode.orEmpty(),
+    name = name.orEmpty(),
+    address = listOfNotNull(
+        roadAddr?.trim()?.takeIf { it.isNotEmpty() },
+        roadDetail?.trim()?.takeIf { it.isNotEmpty() }
+    ).joinToString(" ")
+)

data/model/src/main/java/com/jusicool/model/school/SchoolInfoResponse.kt

@@ -0,0 +1,23 @@
+package com.jusicool.model.school
+
+import com.squareup.moshi.Json
+import com.squareup.moshi.JsonClass
+
+@JsonClass(generateAdapter = true)
+data class SchoolInfoResponse(
+    @Json(name = "schoolInfo") val sections: List<RowSection>? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class RowSection(
+    val row: List<SchoolRow>? = null
+)
+
+@JsonClass(generateAdapter = true)
+data class SchoolRow(
+    @Json(name = "ATPT_OFCDC_SC_CODE") val officeCode: String? = null,
+    @Json(name = "SD_SCHUL_CODE") val schoolCode: String? = null,
+    @Json(name = "SCHUL_NM") val name: String? = null,
+    @Json(name = "ORG_RDNMA") val roadAddr: String? = null,
+    @Json(name = "ORG_RDNDA") val roadDetail: String? = null
+)

data/network/build.gradle.kts

@@ -32,6 +32,11 @@ android {
             name = "KOREAINVESTMENT_BASE_URL",
             value = "\"${getApiKey("KOREAINVESTMENT_BASE_URL")}\""
         )
+        buildConfigField(
+            type = "String",
+            name = "NEIS_API_KEY",
+            value = "\"${getApiKey("NEIS_API_KEY")}\""
+        )
     }
 
     namespace = "com.jusicool.network"

data/network/src/main/java/com/jusicool/network/api/AuthApi.kt

@@ -3,10 +3,28 @@ package com.jusicool.network.api
 import retrofit2.http.Body
 import retrofit2.http.POST
 import com.jusicool.model.auth.SignInRequest
+import com.jusicool.model.auth.SignUpRequest
+import com.jusicool.model.auth.VerificationCodeRequest
+import com.jusicool.model.auth.VerificationEmailRequest
 
 interface AuthApi {
     @POST("/user/signin")
     suspend fun signIn(
         @Body body: SignInRequest
     )
+
+    @POST("/user/signup")
+    suspend fun signUp(
+        @Body body: SignUpRequest
+    )
+
+    @POST("/user/email/send")
+    suspend fun verificationEmailRequest(
+        @Body body: VerificationEmailRequest
+    )
+
+    @POST("/user/email/verify")
+    suspend fun verificationCodeRequest(
+        @Body body: VerificationCodeRequest
+    )
 }

data/network/src/main/java/com/jusicool/network/api/SchoolApi.kt

@@ -0,0 +1,17 @@
+package com.jusicool.network.api
+
+
+import com.jusicool.model.school.SchoolInfoResponse
+import retrofit2.http.GET
+import retrofit2.http.Query
+
+interface SchoolApi {
+    @GET("schoolInfo")
+    suspend fun searchSchools(
+        @Query("KEY")    key: String,
+        @Query("Type")   type: String = "json",
+        @Query("pIndex") pIndex: Int = 1,
+        @Query("pSize")  pSize: Int = 30,
+        @Query("SCHUL_NM") keyword: String
+    ): SchoolInfoResponse
+}

data/network/src/main/java/com/jusicool/network/datasource/auth/AuthDataSource.kt

@@ -1,8 +1,17 @@
 package com.jusicool.network.datasource.auth
 
 import com.jusicool.model.auth.SignInRequest
+import com.jusicool.model.auth.SignUpRequest
+import com.jusicool.model.auth.VerificationCodeRequest
+import com.jusicool.model.auth.VerificationEmailRequest
 import kotlinx.coroutines.flow.Flow
 
 interface AuthDataSource {
     fun authSignIn(body: SignInRequest): Flow<Unit>
+
+    fun authSignUp(body: SignUpRequest): Flow<Unit>
+
+    fun verificationEmail(body: VerificationEmailRequest): Flow<Unit>
+
+    fun verificationCode(body: VerificationCodeRequest): Flow<Unit>
 }

data/network/src/main/java/com/jusicool/network/datasource/auth/AuthDataSourceImpl.kt

@@ -1,6 +1,9 @@
 package com.jusicool.network.datasource.auth
 
 import com.jusicool.model.auth.SignInRequest
+import com.jusicool.model.auth.SignUpRequest
+import com.jusicool.model.auth.VerificationCodeRequest
+import com.jusicool.model.auth.VerificationEmailRequest
 import com.jusicool.network.api.AuthApi
 import com.jusicool.utils.performApiRequest
 import kotlinx.coroutines.flow.Flow
@@ -11,4 +14,13 @@ class AuthDataSourceImpl @Inject constructor(
 ) : AuthDataSource {
     override fun authSignIn(body: SignInRequest): Flow<Unit> =
         performApiRequest { service.signIn(body = body) }
+
+    override fun authSignUp(body: SignUpRequest): Flow<Unit> =
+        performApiRequest { service.signUp(body = body) }
+
+    override fun verificationEmail(body: VerificationEmailRequest): Flow<Unit> =
+        performApiRequest { service.verificationEmailRequest(body = body) }
+
+    override fun verificationCode(body: VerificationCodeRequest): Flow<Unit> =
+        performApiRequest { service.verificationCodeRequest(body = body) }
 }

data/network/src/main/java/com/jusicool/network/datasource/school/SchoolDataSource.kt

@@ -0,0 +1,8 @@
+package com.jusicool.network.datasource.school
+
+import com.jusicool.model.school.SchoolInfoResponse
+import kotlinx.coroutines.flow.Flow
+
+interface SchoolDataSource {
+    fun searchSchools(keyword: String, page: Int = 1, size: Int = 30): Flow<SchoolInfoResponse>
+}

data/network/src/main/java/com/jusicool/network/datasource/school/SchoolDatasourceImpl.kt

@@ -0,0 +1,16 @@
+package com.jusicool.network.datasource.school
+
+import com.jusicool.model.mapper.school.toModel
+import com.jusicool.model.school.SchoolInfoResponse
+import com.jusicool.network.BuildConfig
+import com.jusicool.network.api.SchoolApi
+import com.jusicool.utils.performApiRequest
+import kotlinx.coroutines.flow.Flow
+import javax.inject.Inject
+
+class SchoolDatasourceImpl @Inject constructor(
+    private val schoolApi: SchoolApi
+) : SchoolDataSource {
+    override fun searchSchools(keyword: String, page: Int, size: Int): Flow<SchoolInfoResponse> =
+        performApiRequest { schoolApi.searchSchools(key = BuildConfig.NEIS_API_KEY, pIndex = page, pSize = size, keyword = keyword) }
+}

data/network/src/main/java/com/jusicool/network/di/NetworkModule.kt

@@ -11,11 +11,13 @@ import com.jusicool.network.api.HoldingApi
 import com.jusicool.network.api.KoreaInvestmentApi
 import com.jusicool.network.api.MarketApi
 import com.jusicool.network.api.OrderApi
+import com.jusicool.network.api.SchoolApi
 import com.jusicool.network.util.BaseApiRetrofit
 import com.jusicool.network.util.BasicCookieJar
 import com.jusicool.network.util.KoreaInvestmentAuthManager
 import com.jusicool.network.util.KoreaInvestmentInterceptor
 import com.jusicool.network.util.KoreaInvestmentRetrofit
+import com.jusicool.network.util.NeisRetrofit
 import com.jusicool.network.util.UpbitRetrofit
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.kotlin.reflect.KotlinJsonAdapterFactory
@@ -145,6 +147,19 @@ object NetworkModule {
             .addConverterFactory(moshiConverterFactory)
             .build()
 
+    @Provides
+    @Singleton
+    @NeisRetrofit
+    fun provideNeisRetrofit(
+        okHttpClient: OkHttpClient,
+        moshiConverterFactory: MoshiConverterFactory
+    ): Retrofit =
+        Retrofit.Builder()
+            .baseUrl("https://open.neis.go.kr/hub/")
+            .client(okHttpClient)
+            .addConverterFactory(moshiConverterFactory)
+            .build()
+
     @Provides
     fun provideAuthApi(@BaseApiRetrofit retrofit: Retrofit): AuthApi =
         retrofit.create(AuthApi::class.java)
@@ -176,4 +191,8 @@ object NetworkModule {
     @Provides
     fun provideCommunityApi(@BaseApiRetrofit retrofit: Retrofit): CommunityApi =
         retrofit.create(CommunityApi::class.java)
+
+    @Provides
+    fun provideSchoolApi(@NeisRetrofit retrofit: Retrofit): SchoolApi =
+        retrofit.create(SchoolApi::class.java)
 }

data/network/src/main/java/com/jusicool/network/di/RemoteDataSourceModule.kt

@@ -18,6 +18,8 @@ import com.jusicool.network.datasource.market.MarketDataSource
 import com.jusicool.network.datasource.market.MarketDataSourceImpl
 import com.jusicool.network.datasource.order.OrderDataSource
 import com.jusicool.network.datasource.order.OrderDataSourceImpl
+import com.jusicool.network.datasource.school.SchoolDataSource
+import com.jusicool.network.datasource.school.SchoolDatasourceImpl
 import dagger.Binds
 import dagger.Module
 import dagger.hilt.InstallIn
@@ -77,4 +79,9 @@ abstract class RemoteDataSourceModule {
     abstract fun bindMarketDataSource(
         marketDataSourceImpl: MarketDataSourceImpl
     ): MarketDataSource
+
+    @Binds
+    abstract fun bindSchoolDataSource(
+        schoolDatasourceImpl: SchoolDatasourceImpl
+    ): SchoolDataSource
 }