Merge pull request #54 from meongmory/feature/api-register-family

[feature/api-register-family] 펫 다이어리 생성 API 기본 틀 구현

app/src/main/java/com/meongmoryteam/meongmory/di/NetworkModule.kt

@@ -1,6 +1,7 @@
 package com.meongmoryteam.meongmory.di
 
 import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
+import com.meongmoryteam.data.service.family.FamilyApi
 import com.meongmoryteam.data.service.login.LoginApi
 import com.meongmoryteam.data.service.logout.LogoutApi
 import com.meongmoryteam.data.service.mypage.MyPageApi
@@ -55,6 +56,12 @@ object NetworkModule {
         return retrofit.create(LoginApi::class.java)
     }
 
+    @Provides
+    @Singleton
+    fun provideFamilyApi(retrofit: Retrofit): FamilyApi {
+        return retrofit.create(FamilyApi::class.java)
+    }
+
     @Provides
     @Singleton
     fun provideMyPageApi(retrofit: Retrofit): MyPageApi {

app/src/main/java/com/meongmoryteam/meongmory/di/RepositoryModule.kt

@@ -1,7 +1,12 @@
 package com.meongmoryteam.meongmory.di
 
+import com.meongmoryteam.data.datasource.family.FamilyDataSource
+import com.meongmoryteam.data.datasource.family.FamilyDataSourceImpl
 import com.meongmoryteam.data.datasource.login.LoginDataSource
 import com.meongmoryteam.data.datasource.login.LoginDataSourceImpl
+import com.meongmoryteam.data.repository.family.FamilyRepositoryImpl
+import com.meongmoryteam.data.repository.login.LoginRepositoryImpl
+import com.meongmoryteam.domain.repository.family.FamilyRepository
 import com.meongmoryteam.data.datasource.logout.LogoutDataSource
 import com.meongmoryteam.data.datasource.logout.LogoutDataSourceImpl
 import com.meongmoryteam.data.datasource.mypage.MyPageDataSource
@@ -34,6 +39,18 @@ abstract class RepositoryModule {
         loginDataSourceImpl: LoginDataSourceImpl
     ): LoginDataSource
 
+    @Singleton
+    @Binds
+    abstract fun bindFamilyRepository(
+        familyRepositoryImpl: FamilyRepositoryImpl
+    ): FamilyRepository
+
+    @Singleton
+    @Binds
+    abstract fun bindFamilyDataSource(
+        familyDataSourceImpl: FamilyDataSourceImpl
+    ): FamilyDataSource
+
     @Singleton
     @Binds
     abstract fun bindMyPageRepository(

data/src/main/java/com/meongmoryteam/data/datasource/family/FamilyDataSource.kt

@@ -0,0 +1,11 @@
+package com.meongmoryteam.data.datasource.family
+
+import com.meongmoryteam.data.model.request.family.RegisterFamilyCodeRequest
+import com.meongmoryteam.data.model.request.family.RegisterFamilyNameRequest
+import com.meongmoryteam.data.model.response.family.PostRegisterFamilyCodeRes
+import com.meongmoryteam.data.model.response.family.PostRegisterFamilyNameRes
+
+interface FamilyDataSource {
+    suspend fun registerFamilyWithName(registerFamilyNameReq: RegisterFamilyNameRequest): Result<PostRegisterFamilyNameRes>
+    suspend fun registerFamilyWithCode(familyId: String, registerFamilyCodeReq: RegisterFamilyCodeRequest): Result<PostRegisterFamilyCodeRes>
+}

data/src/main/java/com/meongmoryteam/data/datasource/family/FamilyDataSourceImpl.kt

@@ -0,0 +1,24 @@
+package com.meongmoryteam.data.datasource.family
+
+import com.meongmoryteam.data.model.request.family.RegisterFamilyCodeRequest
+import com.meongmoryteam.data.model.request.family.RegisterFamilyNameRequest
+import com.meongmoryteam.data.model.response.family.PostRegisterFamilyCodeRes
+import com.meongmoryteam.data.model.response.family.PostRegisterFamilyNameRes
+import com.meongmoryteam.data.service.family.FamilyApi
+import javax.inject.Inject
+
+class FamilyDataSourceImpl @Inject constructor(
+    private val familyApi: FamilyApi
+) : FamilyDataSource {
+    override suspend fun registerFamilyWithName(registerFamilyNameReq: RegisterFamilyNameRequest): Result<PostRegisterFamilyNameRes> {
+        return runCatching { familyApi.postRegisterFamilyName(registerFamilyNameReq) }
+    }
+
+    override suspend fun registerFamilyWithCode(
+        familyId: String,
+        registerFamilyCodeReq: RegisterFamilyCodeRequest
+    ): Result<PostRegisterFamilyCodeRes> {
+        return runCatching { familyApi.postRegisterFamilyCode(familyId, registerFamilyCodeReq) }
+    }
+
+}

data/src/main/java/com/meongmoryteam/data/model/request/family/RegisterFamilyCodeRequest.kt

@@ -0,0 +1,15 @@
+package com.meongmoryteam.data.model.request.family
+
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyCodeRequestEntity
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RegisterFamilyCodeRequest(
+    val familyCode: String
+)
+
+fun RegisterFamilyCodeRequestEntity.toRegisterWithCodeRequest(): RegisterFamilyCodeRequest {
+    return RegisterFamilyCodeRequest(
+        familyCode = this.familyCode
+    )
+}

data/src/main/java/com/meongmoryteam/data/model/request/family/RegisterFamilyNameRequest.kt

@@ -0,0 +1,15 @@
+package com.meongmoryteam.data.model.request.family
+
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyCodeRequestEntity
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyNameRequestEntity
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class RegisterFamilyNameRequest(
+    val name: String
+)
+
+fun RegisterFamilyNameRequestEntity.toRegisterWithNameRequest(): RegisterFamilyNameRequest {
+    return RegisterFamilyNameRequest(
+        name = this.name)
+}

data/src/main/java/com/meongmoryteam/data/model/response/family/PostRegisterFamilyCodeRes.kt

@@ -0,0 +1,22 @@
+package com.meongmoryteam.data.model.response.family
+
+import com.meongmoryteam.domain.model.response.family.PostRegisterFamilyCodeEntity
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostRegisterFamilyCodeRes(
+    val code: String,
+    val data: String,
+    val message: String,
+    val status: Int,
+)
+
+fun PostRegisterFamilyCodeRes.toPostRegisterFamilyCodeEntity(): PostRegisterFamilyCodeEntity {
+    return PostRegisterFamilyCodeEntity(
+        code = this.code,
+        data = this.data,
+        message = this.message,
+        status = this.status,
+    )
+}
+

data/src/main/java/com/meongmoryteam/data/model/response/family/PostRegisterFamilyNameRes.kt

@@ -0,0 +1,21 @@
+package com.meongmoryteam.data.model.response.family
+
+import com.meongmoryteam.domain.model.response.family.PostRegisterFamilyNameEntity
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class PostRegisterFamilyNameRes(
+    val code: String,
+    val data: String,
+    val message: String,
+    val status: Int,
+)
+
+fun PostRegisterFamilyNameRes.toPostRegisterFamilyNameEntity(): PostRegisterFamilyNameEntity {
+    return PostRegisterFamilyNameEntity(
+        code = this.code,
+        data = this.data,
+        message = this.message,
+        status = this.status,
+    )
+}

data/src/main/java/com/meongmoryteam/data/repository/family/FamilyRepositoryImpl.kt

@@ -0,0 +1,32 @@
+package com.meongmoryteam.data.repository.family
+
+import com.meongmoryteam.data.datasource.family.FamilyDataSource
+import com.meongmoryteam.data.model.request.family.toRegisterWithCodeRequest
+import com.meongmoryteam.data.model.request.family.toRegisterWithNameRequest
+import com.meongmoryteam.data.model.response.family.toPostRegisterFamilyCodeEntity
+import com.meongmoryteam.data.model.response.family.toPostRegisterFamilyNameEntity
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyCodeRequestEntity
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyNameRequestEntity
+import com.meongmoryteam.domain.model.response.family.PostRegisterFamilyCodeEntity
+import com.meongmoryteam.domain.model.response.family.PostRegisterFamilyNameEntity
+import com.meongmoryteam.domain.repository.family.FamilyRepository
+import javax.inject.Inject
+
+class FamilyRepositoryImpl @Inject constructor(
+    private val familyDataSource: FamilyDataSource
+) : FamilyRepository {
+    override suspend fun postRegisterWithName(registerFamilyNameRequestEntity: RegisterFamilyNameRequestEntity): Result<PostRegisterFamilyNameEntity> {
+        return familyDataSource.registerFamilyWithName(registerFamilyNameRequestEntity.toRegisterWithNameRequest())
+            .map { it.toPostRegisterFamilyNameEntity() }
+    }
+
+    override suspend fun postRegisterWithCode(
+        familyId: String,
+        registerFamilyCodeRequestEntity: RegisterFamilyCodeRequestEntity
+    ): Result<PostRegisterFamilyCodeEntity> {
+        return familyDataSource.registerFamilyWithCode(
+            familyId,
+            registerFamilyCodeRequestEntity.toRegisterWithCodeRequest()
+        ).map { it.toPostRegisterFamilyCodeEntity() }
+    }
+}

data/src/main/java/com/meongmoryteam/data/service/family/FamilyApi.kt

@@ -0,0 +1,22 @@
+package com.meongmoryteam.data.service.family
+
+import com.meongmoryteam.data.model.request.family.RegisterFamilyCodeRequest
+import com.meongmoryteam.data.model.request.family.RegisterFamilyNameRequest
+import com.meongmoryteam.data.model.response.family.PostRegisterFamilyCodeRes
+import com.meongmoryteam.data.model.response.family.PostRegisterFamilyNameRes
+import retrofit2.http.Body
+import retrofit2.http.POST
+import retrofit2.http.Path
+
+interface FamilyApi {
+    @POST("families")
+    suspend fun postRegisterFamilyName(
+        @Body registerFamilyNameRequest: RegisterFamilyNameRequest
+    ): PostRegisterFamilyNameRes
+
+    @POST("families/{familyId}/invite")
+    suspend fun postRegisterFamilyCode(
+        @Path(value = "familyId") familyId: String,
+        @Body registerFamilyCodeRequest: RegisterFamilyCodeRequest
+    ): PostRegisterFamilyCodeRes
+}

domain/src/main/java/com/meongmoryteam/domain/model/reqeust/family/RegisterFamilyCodeRequestEntity.kt

@@ -0,0 +1,5 @@
+package com.meongmoryteam.domain.model.reqeust.family
+
+data class RegisterFamilyCodeRequestEntity (
+    val familyCode: String
+)

domain/src/main/java/com/meongmoryteam/domain/model/reqeust/family/RegisterFamilyNameRequestEntity.kt

@@ -0,0 +1,5 @@
+package com.meongmoryteam.domain.model.reqeust.family
+
+data class RegisterFamilyNameRequestEntity(
+    val name: String
+)

domain/src/main/java/com/meongmoryteam/domain/model/response/family/PostRegisterFamilyCodeEntity.kt

@@ -0,0 +1,8 @@
+package com.meongmoryteam.domain.model.response.family
+
+data class PostRegisterFamilyCodeEntity(
+    val code: String,
+    val data: String,
+    val message: String,
+    val status: Int,
+)

domain/src/main/java/com/meongmoryteam/domain/model/response/family/PostRegisterFamilyNameEntity.kt

@@ -0,0 +1,8 @@
+package com.meongmoryteam.domain.model.response.family
+
+data class PostRegisterFamilyNameEntity(
+    val code: String,
+    val data: String,
+    val message: String,
+    val status: Int,
+)

domain/src/main/java/com/meongmoryteam/domain/repository/family/FamilyRepository.kt

@@ -0,0 +1,14 @@
+package com.meongmoryteam.domain.repository.family
+
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyCodeRequestEntity
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyNameRequestEntity
+import com.meongmoryteam.domain.model.response.family.PostRegisterFamilyCodeEntity
+import com.meongmoryteam.domain.model.response.family.PostRegisterFamilyNameEntity
+
+interface FamilyRepository {
+    suspend fun postRegisterWithName(registerFamilyNameRequestEntity: RegisterFamilyNameRequestEntity): Result<PostRegisterFamilyNameEntity>
+    suspend fun postRegisterWithCode(
+        familyId: String,
+        registerFamilyCodeRequestEntity: RegisterFamilyCodeRequestEntity
+    ): Result<PostRegisterFamilyCodeEntity>
+}

domain/src/main/java/com/meongmoryteam/domain/usecase/family/PostRegisterFamilyCodeUseCase.kt

@@ -0,0 +1,14 @@
+package com.meongmoryteam.domain.usecase.family
+
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyCodeRequestEntity
+import com.meongmoryteam.domain.repository.family.FamilyRepository
+import javax.inject.Inject
+
+class PostRegisterFamilyCodeUseCase @Inject constructor(
+    private val familyRepository: FamilyRepository
+) {
+    suspend operator fun invoke(
+        familyId: String,
+        registerFamilyCodeRequestEntity: RegisterFamilyCodeRequestEntity
+    ) = familyRepository.postRegisterWithCode(familyId, registerFamilyCodeRequestEntity)
+}

domain/src/main/java/com/meongmoryteam/domain/usecase/family/PostRegisterFamilyNameUseCase.kt

@@ -0,0 +1,12 @@
+package com.meongmoryteam.domain.usecase.family
+
+import com.meongmoryteam.domain.model.reqeust.family.RegisterFamilyNameRequestEntity
+import com.meongmoryteam.domain.repository.family.FamilyRepository
+import javax.inject.Inject
+
+class PostRegisterFamilyNameUseCase @Inject constructor(
+    private val familyRepository: FamilyRepository
+) {
+    suspend operator fun invoke(registerFamilyNameRequestEntity: RegisterFamilyNameRequestEntity) =
+        familyRepository.postRegisterWithName(registerFamilyNameRequestEntity)
+}

presentation/src/main/java/com/meongmoryteam/presentation/ui/register_family/RegisterFamilyContract.kt

@@ -12,7 +12,8 @@ class RegisterFamilyContract {
         val familyName: String = "",
         val isFilledName: Boolean = false,
         val isFilledCode: Boolean = false,
-        val invalidCode: Boolean = false
+        val invalidCode: Boolean = true,
+        val familyId: String = ""
     ) : ViewState
 
     sealed class RegisterFamilySideEffect : ViewSideEffect {

presentation/src/main/java/com/meongmoryteam/presentation/ui/register_family/RegisterFamilyScreen.kt

@@ -49,7 +49,8 @@ fun RegisterFamilyScreen(
             TextComponent(
                 text = stringResource(R.string.register_family_info),
                 style = Typography.titleMedium,
-                color = DarkGrey
+                color = DarkGrey,
+                maxLine = 5
             )
         }
         Column(modifier = Modifier.padding(bottom = 30.dp)) {