Merge pull request #39 from Nexters/feature/create-proposal-v2

모임 제안 화면을 구현합니다.

Author: eshc123

.github/workflows/ci-for-test.yml

@@ -29,6 +29,7 @@ jobs:
           echo "TUK_SENT_PROPOSAL_URL=KEY" >> local.properties
           echo "TUK_PROPOSALS_URL" >> local.properties
           echo "TUK_INVITE_GATHERING_URL" >> local.properties
+          echo "TUK_COMPLETE_PROPOSAL_URL" >> local.properties
 
       - name: Set up JDK 21
         uses: actions/setup-java@v3

app/src/main/java/com/plottwist/tuk/config/WebUrlConfigImpl.kt

@@ -11,4 +11,6 @@ class WebUrlConfigImpl @Inject constructor() : WebUrlConfig {
         get() = BuildConfig.TUK_PROPOSALS_URL
     override val inviteGatheringUrl: String
         get() = BuildConfig.TUK_INVITE_GATHERING_URL
+    override val completeProposalUrl: String
+        get() = BuildConfig.TUK_COMPLETE_PROPOSAL_URL
 }

build-logic/convention/src/main/kotlin/AndroidApplicationConventionPlugin.kt

@@ -61,6 +61,11 @@ class AndroidApplicationConventionPlugin: Plugin<Project> {
                             "TUK_INVITE_GATHERING_URL",
                             "\"${localProperties.getProperty("TUK_INVITE_GATHERING_URL")}\""
                         )
+                        buildConfigField(
+                            "String",
+                            "TUK_COMPLETE_PROPOSAL_URL",
+                            "\"${localProperties.getProperty("TUK_COMPLETE_PROPOSAL_URL")}\""
+                        )
 
                     }
                 }

core/data/src/main/java/com/plottwist/core/data/gathering/repository/GatheringRepository.kt

@@ -4,7 +4,10 @@ import com.plottwist.core.data.mapper.toDomainModel
 import com.plottwist.core.domain.gathering.repository.GatheringRepository
 import com.plottwist.core.domain.model.GatheringDetail
 import com.plottwist.core.domain.model.Gatherings
+import com.plottwist.core.domain.model.Proposal
 import com.plottwist.core.domain.model.Purposes
+import com.plottwist.core.network.model.gathering.CreateProposeData
+import com.plottwist.core.network.model.gathering.CreateProposeRequest
 import com.plottwist.core.network.service.TukApiService
 import javax.inject.Inject
 
@@ -34,4 +37,32 @@ class GatheringRepositoryImpl @Inject constructor(
             Result.failure(e)
         }
     }
+
+    override suspend fun createPropose(
+        gatheringId: Long?,
+        whereTag: String,
+        whenTag: String,
+        whatTag: String
+    ): Result<Proposal> {
+        try {
+            val result = tukApiService.createPropose(
+                gatheringId = gatheringId,
+                CreateProposeRequest(
+                    purpose = CreateProposeData(
+                        whereTag = whereTag,
+                        whenTag = whenTag,
+                        whatTag = whatTag
+                    )
+                )
+            )
+
+            return if(result.success) {
+                Result.success(result.toDomainModel())
+            }else {
+                Result.failure(Exception(result.meta?.errorMessage))
+            }
+        } catch (e: Exception) {
+            return Result.failure(e)
+        }
+    }
 }

core/data/src/main/java/com/plottwist/core/data/mapper/Gathering.kt

@@ -4,7 +4,9 @@ import com.plottwist.core.domain.model.GatheringDetail
 import com.plottwist.core.domain.model.GatheringMember
 import com.plottwist.core.domain.model.GatheringOverviews
 import com.plottwist.core.domain.model.Gatherings
+import com.plottwist.core.domain.model.Proposal
 import com.plottwist.core.domain.model.Purposes
+import com.plottwist.core.network.model.gathering.CreateProposeResponse
 import com.plottwist.core.network.model.gathering.GatheringDetailData
 import com.plottwist.core.network.model.gathering.GatheringMemberData
 import com.plottwist.core.network.model.gathering.GatheringOverviewsData
@@ -54,3 +56,9 @@ fun GetPurposesResponse.toDomainModel() : Purposes {
         whenTags = this.data.whenTags
     )
 }
+
+fun CreateProposeResponse.toDomainModel() : Proposal {
+    return Proposal(
+        proposalId = this.data.proposalId
+    )
+}

core/designsystem/src/main/res/drawable/image_post_cover.png

@@ -24,9 +24,9 @@
     <string name="gathering_detail_received_invitation">받은 초대장</string>
     <string name="gathering_detail_member">멤버 %d</string>
 
-    <string name="create_proposal_title">가볍게 제안하고\n만남을 이어가세요</string>
+    <string name="create_proposal_title">이렇게 전해질 거예요,\n한번 볼까요?</string>
     <string name="create_proposal_select_gathering">모임 선택</string>
-    <string name="create_proposal_propose">제안하기</string>
+    <string name="create_proposal_propose">툭, 찔러보기</string>
     <string name="create_proposal_selected_gathering_name">%s 친구들에게</string>
 
     <string name="onboarding_name_title">어떤 이름으로 친구들에게\n인사할까요?</string>
@@ -46,5 +46,6 @@
 
 
     <string name="common_next">다음</string>
-    <string name="common_confirm">다음</string>
+    <string name="common_confirm">확인</string>
+    <string name="common_previous">이전</string>
 </resources>

core/designsystem/src/main/res/values/strings.xml

@@ -2,10 +2,17 @@ package com.plottwist.core.domain.gathering.repository
 
 import com.plottwist.core.domain.model.GatheringDetail
 import com.plottwist.core.domain.model.Gatherings
+import com.plottwist.core.domain.model.Proposal
 import com.plottwist.core.domain.model.Purposes
 
 interface GatheringRepository {
     suspend fun getGatherings(): Result<Gatherings>
     suspend fun getGatheringDetail(gatheringId: Long): Result<GatheringDetail>
     suspend fun getPurposes(): Result<Purposes>
+    suspend fun createPropose(
+        gatheringId: Long?,
+        whereTag: String,
+        whenTag: String,
+        whatTag: String
+    ): Result<Proposal>
 }

core/domain/src/main/java/com/plottwist/core/domain/gathering/repository/GatheringRepository.kt

@@ -0,0 +1,24 @@
+package com.plottwist.core.domain.gathering.usecase
+
+import com.plottwist.core.domain.gathering.repository.GatheringRepository
+import com.plottwist.core.domain.model.Proposal
+import com.plottwist.core.domain.model.Purposes
+import javax.inject.Inject
+
+class CreateProposalUseCase @Inject constructor(
+    private val gatheringRepository: GatheringRepository
+) {
+    suspend operator fun invoke(
+        gatheringId: Long?,
+        whereTag: String,
+        whenTag: String,
+        whatTag: String
+    ): Result<Proposal> {
+        return gatheringRepository.createPropose(
+            gatheringId = gatheringId,
+            whereTag = whereTag,
+            whenTag = whenTag,
+            whatTag = whatTag
+        )
+    }
+}

core/domain/src/main/java/com/plottwist/core/domain/gathering/usecase/CreateProposalUseCase.kt

@@ -31,3 +31,7 @@ data class Purposes(
     val whereTags: List<String> = emptyList(),
     val whatTags: List<String> = emptyList()
 )
+
+data class Proposal(
+    val proposalId : Long
+)