Merge pull request #42 from Nexters/faeture/add-alarm-setting

eshc123 · web-flow · commit ef8029045044 · 2025-08-14T12:51:54.000+09:00
모임 상세에서 모임 주기 설정 화면으로 이동하여 모임 주기를 설정할 수 있습니다.
diff --git a/core/data/src/main/java/com/plottwist/core/data/gathering/repository/GatheringRepository.kt b/core/data/src/main/java/com/plottwist/core/data/gathering/repository/GatheringRepository.kt
@@ -8,6 +8,7 @@ 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.model.gathering.UpdateGatheringRequest
 import com.plottwist.core.network.service.TukApiService
 import javax.inject.Inject
 
@@ -65,4 +66,26 @@ class GatheringRepositoryImpl @Inject constructor(
             return Result.failure(e)
         }
     }
+
+    override suspend fun updateGathering(
+        gatheringId: Long,
+        intervalDays: Int
+    ) : Result<Unit> {
+        try {
+            val result = tukApiService.updateGathering(
+                gatheringId = gatheringId,
+                updateGatheringRequest = UpdateGatheringRequest(
+                    gatheringIntervalDays = intervalDays
+                )
+            )
+
+            return if(result.success) {
+                Result.success(Unit)
+            }else {
+                Result.failure(Exception(result.meta?.errorMessage))
+            }
+        } catch (e: Exception) {
+            return Result.failure(e)
+        }
+    }
 }
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/gathering/repository/GatheringRepository.kt b/core/domain/src/main/java/com/plottwist/core/domain/gathering/repository/GatheringRepository.kt
@@ -15,4 +15,8 @@ interface GatheringRepository {
         whenTag: String,
         whatTag: String
     ): Result<Proposal>
+    suspend fun updateGathering(
+        gatheringId: Long,
+        intervalDays: Int
+    ) : Result<Unit>
 }
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/gathering/usecase/UpdateGatheringUseCase.kt b/core/domain/src/main/java/com/plottwist/core/domain/gathering/usecase/UpdateGatheringUseCase.kt
@@ -0,0 +1,15 @@
+package com.plottwist.core.domain.gathering.usecase
+
+import com.plottwist.core.domain.gathering.repository.GatheringRepository
+import javax.inject.Inject
+
+class UpdateGatheringUseCase @Inject constructor(
+    private val repository: GatheringRepository
+){
+    suspend operator fun invoke(
+        gatheringId: Long,
+        intervalDays: Int
+    ):Result<Unit> {
+        return repository.updateGathering(gatheringId, intervalDays)
+    }
+}
diff --git a/core/domain/src/main/java/com/plottwist/core/domain/model/GatheringIntervalDaysOption.kt b/core/domain/src/main/java/com/plottwist/core/domain/model/GatheringIntervalDaysOption.kt
@@ -0,0 +1,8 @@
+package com.plottwist.core.domain.model
+
+val gatheringIntervalDaysOptions = listOf(
+    Triple(30, "한달", "매월 만남"),
+    Triple(60, "2개월", "2개월 마다 만남"),
+    Triple(90, "3개월", "분기별 만남"),
+    Triple(180, "6개월", "6개월 마다 만남")
+)
diff --git a/core/network/src/main/java/com/plottwist/core/network/model/gathering/UpdateGatheringRequest.kt b/core/network/src/main/java/com/plottwist/core/network/model/gathering/UpdateGatheringRequest.kt
@@ -0,0 +1,9 @@
+package com.plottwist.core.network.model.gathering
+
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class UpdateGatheringRequest(
+    val gatheringIntervalDays: Int
+)
+
diff --git a/core/network/src/main/java/com/plottwist/core/network/model/gathering/UpdateGatheringResponse.kt b/core/network/src/main/java/com/plottwist/core/network/model/gathering/UpdateGatheringResponse.kt
@@ -0,0 +1,19 @@
+package com.plottwist.core.network.model.gathering
+
+import com.plottwist.core.network.model.auth.Meta
+import kotlinx.serialization.Serializable
+
+
+@Serializable
+data class UpdateGatheringResponse(
+    val success: Boolean,
+    val data: UpdateGatheringData,
+    val meta: Meta?
+)
+
+@Serializable
+data class UpdateGatheringData(
+    val gatheringId: Long,
+    val gatheringName: String,
+    val intervalDays: Int
+)
diff --git a/core/network/src/main/java/com/plottwist/core/network/service/TukApiService.kt b/core/network/src/main/java/com/plottwist/core/network/service/TukApiService.kt
@@ -10,9 +10,12 @@ import com.plottwist.core.network.model.gathering.GatheringDetailResponse
 import com.plottwist.core.network.model.gathering.GatheringsResponse
 import com.plottwist.core.network.model.gathering.GetPurposesResponse
 import com.plottwist.core.network.model.gathering.GetTagsResponse
+import com.plottwist.core.network.model.gathering.UpdateGatheringRequest
+import com.plottwist.core.network.model.gathering.UpdateGatheringResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.Path
 
@@ -46,10 +49,15 @@ interface TukApiService {
         @Path("gatheringId") gatheringId: Long
     ): GetGatheringNameResponse
 
-
     @POST("/api/v1/gatherings/{gatheringId}/proposals")
     suspend fun createPropose(
         @Path("gatheringId") gatheringId: Long?,
         @Body createProposeRequest : CreateProposeRequest
     ): CreateProposeResponse
+
+    @PATCH("/api/v1/gatherings/{gatheringId}")
+    suspend fun updateGathering(
+        @Path("gatheringId") gatheringId: Long?,
+        @Body updateGatheringRequest : UpdateGatheringRequest
+    ): UpdateGatheringResponse
 }
diff --git a/core/ui-navigation/src/main/java/com/plottwist/core/ui/navigation/Route.kt b/core/ui-navigation/src/main/java/com/plottwist/core/ui/navigation/Route.kt
@@ -77,4 +77,10 @@ sealed interface Route {
 
     @Serializable
     data class CompleteProposal(val encodedUrl : String): Route
+
+    @Serializable
+    data class GatheringAlarmSetting(
+        val gatheringId: Long,
+        val selectedIntervalDays : Long
+    ): Route
 }
diff --git a/feature/create_gathering/src/main/java/com/plottwist/create_gathering/page/IntervalDaysPage.kt b/feature/create_gathering/src/main/java/com/plottwist/create_gathering/page/IntervalDaysPage.kt
@@ -1,34 +1,20 @@
 package com.plottwist.create_gathering.page
 
-import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
-import androidx.compose.foundation.layout.Spacer
-import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
-import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.text.TextStyle
-import androidx.compose.ui.text.style.TextDecoration
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import androidx.compose.ui.unit.sp
 import com.plottwist.core.designsystem.component.TukOutlinedButton
 import com.plottwist.core.designsystem.component.TukSolidButton
 import com.plottwist.core.designsystem.component.TukSolidButtonType
-import com.plottwist.core.designsystem.foundation.type.TukPretendardTypography
+import com.plottwist.core.domain.model.gatheringIntervalDaysOptions
 import com.plottwist.core.ui.component.RadioButtonItem
-import com.plottwist.core.ui.component.StableImage
 import com.plottwist.core.ui.component.TukScaffold
-import com.plottwist.tuk.feature.create_gathering.R
 
 @Composable
 fun CreateGatheringSelectIntervalDays(
@@ -37,12 +23,6 @@ fun CreateGatheringSelectIntervalDays(
     onClickPrev: () -> Unit,
     onNext: () -> Unit
 ) {
-    val options = listOf(
-        Triple(30, "한달", "매월 만남"),
-        Triple(60, "2개월", "2개월 마다 만남"),
-        Triple(90, "3개월", "분기별 만남"),
-        Triple(180, "6개월", "6개월 마다 만남")
-    )
     TukScaffold(
         title = "앞으로는 얼마나\n자주 만나면 좋을까요?",
         description = "부담없는 주기가 제일 오래가요",
@@ -71,13 +51,13 @@ fun CreateGatheringSelectIntervalDays(
         }
     ) {
 
-        itemsIndexed(options) { index, (days, title, subtitle) ->
+        itemsIndexed(gatheringIntervalDaysOptions) { index, (days, title, subtitle) ->
             RadioButtonItem(
                 title = title,
                 subtitle = subtitle,
                 selected = selectedOption == days,
                 onClick = { onOptionSelected(days) },
-                hasDivider = index < options.lastIndex
+                hasDivider = index < gatheringIntervalDaysOptions.lastIndex
             )
         }
     }
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/GatheringDetailContract.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/GatheringDetailContract.kt
@@ -12,6 +12,7 @@ sealed class GatheringDetailAction {
     data object ClickReceivedProposal: GatheringDetailAction()
     data object ClickInviteMember: GatheringDetailAction()
     data object ClickProposal: GatheringDetailAction()
+    data object ClickAlarmSetting: GatheringDetailAction()
 }
 
 sealed class GatheringDetailSideEffect {
@@ -22,4 +23,8 @@ sealed class GatheringDetailSideEffect {
         val gatheringId: Long,
         val gatheringName: String
     ): GatheringDetailSideEffect()
+    data class NavigateToGatheringDetailAlarmSetting(
+        val gatheringId: Long,
+        val selectedIntervalDays: Long
+    ): GatheringDetailSideEffect()
 }
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/GatheringDetailScreen.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/GatheringDetailScreen.kt
@@ -42,6 +42,7 @@ fun GatheringDetailScreen(
     navigateToWebViewScreen: (String) -> Unit,
     navigateToInviteGathering: (String) -> Unit,
     navigateToCreateGatheringProposal: (Long, String) -> Unit,
+    navigateToGatheringDetailAlarmSetting: (Long, Long) -> Unit,
     modifier: Modifier = Modifier,
     viewModel: GatheringDetailViewModel = hiltViewModel()
 ) {
@@ -64,6 +65,13 @@ fun GatheringDetailScreen(
             is GatheringDetailSideEffect.NavigateToCreateGatheringProposal -> {
                 navigateToCreateGatheringProposal(sideEffect.gatheringId, sideEffect.gatheringName)
             }
+
+            is GatheringDetailSideEffect.NavigateToGatheringDetailAlarmSetting -> {
+                navigateToGatheringDetailAlarmSetting(
+                    sideEffect.gatheringId,
+                    sideEffect.selectedIntervalDays
+                )
+            }
         }
     }
 
@@ -74,7 +82,9 @@ fun GatheringDetailScreen(
         lastAlarm = state.gatheringDetail.lastPushRelativeTime,
         sentProposalCount = state.gatheringDetail.sentProposalCount,
         receivedProposalCount = state.gatheringDetail.receivedProposalCount,
-        onAlarmSettingClick = {},
+        onAlarmSettingClick = {
+            viewModel.handleAction(GatheringDetailAction.ClickAlarmSetting)
+        },
         onProposalClick = {
             viewModel.handleAction(GatheringDetailAction.ClickProposal)
         },
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/GatheringDetailViewModel.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/GatheringDetailViewModel.kt
@@ -46,6 +46,10 @@ class GatheringDetailViewModel @Inject constructor(
             GatheringDetailAction.ClickProposal -> {
                 handleCreateGatheringProposalClick()
             }
+
+            GatheringDetailAction.ClickAlarmSetting -> {
+                handleAlarmSettingClick()
+            }
         }
     }
 
@@ -89,4 +93,13 @@ class GatheringDetailViewModel @Inject constructor(
             )
         )
     }
+
+    private fun handleAlarmSettingClick() = intent {
+        postSideEffect(
+            GatheringDetailSideEffect.NavigateToGatheringDetailAlarmSetting(
+                gatheringId = state.gatheringDetail.gatheringId,
+                selectedIntervalDays = state.gatheringDetail.gatheringIntervalDays
+            )
+        )
+    }
 }
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/alarm/GatheringDetailAlarmSettingContract.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/alarm/GatheringDetailAlarmSettingContract.kt
@@ -0,0 +1,17 @@
+package com.plottwist.feature.gathering_detail.alarm
+
+data class GatheringDetailAlarmSettingState(
+    val gatheringId: Long = 0,
+    val selectedIntervalDays: Int = 0
+)
+
+sealed class GatheringDetailAlarmSettingAction {
+    data object ClickBack: GatheringDetailAlarmSettingAction()
+    data class ClickOption(val days: Int): GatheringDetailAlarmSettingAction()
+    data object ClickSave: GatheringDetailAlarmSettingAction()
+}
+
+sealed class GatheringDetailAlarmSettingSideEffect {
+    data object NavigateBack: GatheringDetailAlarmSettingSideEffect()
+    data class NavigateGatheringDetail(val gatheringId: Long) : GatheringDetailAlarmSettingSideEffect()
+}
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/alarm/GatheringDetailAlarmSettingScreen.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/alarm/GatheringDetailAlarmSettingScreen.kt
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/alarm/GatheringDetailAlarmSettingViewModel.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/alarm/GatheringDetailAlarmSettingViewModel.kt
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/navigation/GatheringDetailAlarmSettingNavigation.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/navigation/GatheringDetailAlarmSettingNavigation.kt
diff --git a/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/navigation/GatheringDetailNavigation.kt b/feature/gathering-detail/src/main/java/com/plottwist/feature/gathering_detail/navigation/GatheringDetailNavigation.kt
diff --git a/feature/main/src/main/java/com/plottwist/feature/main/ui/component/TukNavHost.kt b/feature/main/src/main/java/com/plottwist/feature/main/ui/component/TukNavHost.kt

Original file line number	Diff line number	Diff line change
`@@ -15,4 +15,8 @@ interface GatheringRepository {`
`15`	`15`	`whenTag: String,`
`16`	`16`	`whatTag: String`
`17`	`17`	`): Result<Proposal>`
	`18`	`+ suspend fun updateGathering(`
	`19`	`+ gatheringId: Long,`
	`20`	`+ intervalDays: Int`
	`21`	`+ ) : Result<Unit>`
`18`	`22`	`}`