목표 생성 API 연동

app/src/main/java/com/yapp/twix/di/InitKoin.kt

@@ -4,6 +4,7 @@ import android.content.Context
 import com.twix.data.di.dataModule
 import com.twix.datastore.di.dataStoreModule
 import com.twix.network.di.networkModule
+import com.twix.util.di.utilModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.startKoin
 import org.koin.core.module.Module
@@ -24,6 +25,7 @@ fun initKoin(
                 add(uiModule)
                 add(dataStoreModule)
                 add(appModule)
+                add(utilModule)
             },
         )
     }

app/src/main/java/com/yapp/twix/main/MainActivity.kt

@@ -6,6 +6,7 @@ import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.safeContentPadding
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.core.view.WindowCompat
@@ -30,7 +31,8 @@ class MainActivity : ComponentActivity() {
                 Box(
                     modifier =
                         Modifier
-                            .fillMaxSize(),
+                            .fillMaxSize()
+                            .safeContentPadding(),
                 ) {
                     AppNavHost()
 

build-logic/convention/src/main/kotlin/com/twix/convention/FeatureConventionPlugin.kt

@@ -15,6 +15,7 @@ class FeatureConventionPlugin : BuildLogicConventionPlugin({
         implementation(project(":core:design-system"))
         implementation(project(":core:navigation"))
         implementation(project(":core:ui"))
+        implementation(project(":core:util"))
         implementation(project(":core:result"))
         implementation(project(":domain"))
     }

core/design-system/src/main/res/values/strings.xml

@@ -59,6 +59,7 @@
     <!-- 토스트 메시지 -->
     <string name="toast_end_date_before_start_date">종료 날짜가 시작 날짜보다 이전입니다.</string>
     <string name="toast_goal_fetch_failed">목표 조회에 실패했습니다.</string>
+    <string name="toast_create_goal_failed">목표 생성에 실패했습니다.</string>
 
     <!-- 다이얼로그 -->
     <string name="dialog_end_goal_title">%s\n목표를 이루셨나요?</string>

core/network/src/main/java/com/twix/network/model/request/goal/mapper/GoalMapper.kt

@@ -0,0 +1,14 @@
+package com.twix.network.model.request.goal.mapper
+
+import com.twix.domain.model.goal.CreateGoalParam
+import com.twix.network.model.request.goal.model.CreateGoalRequest
+
+fun CreateGoalParam.toRequest(): CreateGoalRequest =
+    CreateGoalRequest(
+        name = name,
+        icon = icon.toApi(),
+        repeatCycle = repeatCycle.toApi(),
+        repeatCount = repeatCount,
+        startDate = startDate.toString(),
+        endDate = endDate?.toString(),
+    )

core/network/src/main/java/com/twix/network/model/request/goal/model/CreateGoalRequest.kt

@@ -0,0 +1,14 @@
+package com.twix.network.model.request.goal.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CreateGoalRequest(
+    @SerialName("name") val name: String,
+    @SerialName("icon") val icon: String,
+    @SerialName("repeatCycle") val repeatCycle: String,
+    @SerialName("repeatCount") val repeatCount: Int,
+    @SerialName("startDate") val startDate: String,
+    @SerialName("endDate") val endDate: String?,
+)

core/network/src/main/java/com/twix/network/model/response/goal/mapper/GoalMapper.kt

@@ -3,12 +3,15 @@ package com.twix.network.model.response.goal.mapper
 import com.twix.domain.model.enums.GoalIconType
 import com.twix.domain.model.enums.GoalReactionType
 import com.twix.domain.model.enums.RepeatCycle
+import com.twix.domain.model.goal.CreatedGoal
 import com.twix.domain.model.goal.Goal
 import com.twix.domain.model.goal.GoalList
 import com.twix.domain.model.goal.GoalVerification
+import com.twix.network.model.response.goal.model.CreateGoalResponse
 import com.twix.network.model.response.goal.model.GoalListResponse
 import com.twix.network.model.response.goal.model.GoalResponse
 import com.twix.network.model.response.goal.model.VerificationResponse
+import java.time.LocalDate
 
 fun GoalListResponse.toDomain(): GoalList =
     GoalList(
@@ -37,3 +40,15 @@ fun VerificationResponse.toDomainOrNull(): GoalVerification? =
         reaction = GoalReactionType.fromApi(reaction),
         uploadedAt = uploadedAt,
     )
+
+fun CreateGoalResponse.toDomain(): CreatedGoal =
+    CreatedGoal(
+        goalId = goalId,
+        name = name,
+        icon = GoalIconType.fromApi(icon),
+        repeatCycle = RepeatCycle.fromApi(repeatCycle),
+        repeatCount = repeatCount,
+        startDate = LocalDate.parse(startDate),
+        endDate = endDate?.let(LocalDate::parse),
+        createdAt = createdAt,
+    )

core/network/src/main/java/com/twix/network/model/response/goal/model/CreateGoalResponse.kt

@@ -0,0 +1,17 @@
+package com.twix.network.model.response.goal.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class CreateGoalResponse(
+    @SerialName("goalId") val goalId: Long,
+    @SerialName("name") val name: String,
+    @SerialName("icon") val icon: String,
+    @SerialName("repeatCycle") val repeatCycle: String,
+    @SerialName("repeatCount") val repeatCount: Int,
+    @SerialName("startDate") val startDate: String,
+    @SerialName("endDate") val endDate: String?,
+    @SerialName("goalStatus") val goalStatus: String,
+    @SerialName("createdAt") val createdAt: String,
+)

core/network/src/main/java/com/twix/network/service/GoalService.kt

@@ -1,12 +1,21 @@
 package com.twix.network.service
 
+import com.twix.network.model.request.goal.model.CreateGoalRequest
+import com.twix.network.model.response.goal.model.CreateGoalResponse
 import com.twix.network.model.response.goal.model.GoalListResponse
+import de.jensklingenberg.ktorfit.http.Body
 import de.jensklingenberg.ktorfit.http.GET
+import de.jensklingenberg.ktorfit.http.POST
 import de.jensklingenberg.ktorfit.http.Query
 
 interface GoalService {
     @GET("api/v1/goals")
     suspend fun fetchGoals(
         @Query("date") date: String,
     ): GoalListResponse
+
+    @POST("api/v1/goals")
+    suspend fun createGoal(
+        @Body body: CreateGoalRequest,
+    ): CreateGoalResponse
 }

core/ui/src/main/java/com/twix/ui/base/BaseViewModel.kt

@@ -69,6 +69,10 @@ abstract class BaseViewModel<S : State, I : Intent, SE : SideEffect>(
         sideEffectHolder.emit(effect)
     }
 
+    protected fun tryEmitSideEffect(effect: SE) {
+        sideEffectHolder.tryEmit(effect)
+    }
+
     /**
      * Intent를 처리하는 메서드
      * */

core/ui/src/main/java/com/twix/ui/base/SideEffectHolder.kt

@@ -10,4 +10,8 @@ class SideEffectHolder<S : SideEffect> {
     suspend fun emit(effect: S) {
         channel.send(effect)
     }
+
+    fun tryEmit(effect: S) {
+        channel.trySend(effect)
+    }
 }

core/util/build.gradle.kts

@@ -1,5 +1,6 @@
 plugins {
     alias(libs.plugins.twix.android.library)
+    alias(libs.plugins.twix.koin)
 }
 
 android {

core/util/src/main/java/com/twix/util/bus/GoalRefreshBus.kt

@@ -0,0 +1,15 @@
+package com.twix.util.bus
+
+import kotlinx.coroutines.flow.MutableSharedFlow
+import kotlinx.coroutines.flow.SharedFlow
+
+class GoalRefreshBus {
+    private val _events =
+        MutableSharedFlow<Unit>(
+            replay = 0,
+            extraBufferCapacity = 1,
+        )
+    val events: SharedFlow<Unit> = _events
+
+    fun notifyChanged() = _events.tryEmit(Unit)
+}

core/util/src/main/java/com/twix/util/di/UtilModule.kt

@@ -0,0 +1,9 @@
+package com.twix.util.di
+
+import com.twix.util.bus.GoalRefreshBus
+import org.koin.dsl.module
+
+val utilModule =
+    module {
+        single { GoalRefreshBus() }
+    }

data/src/main/java/com/twix/data/repository/DefaultGoalRepository.kt

@@ -1,8 +1,11 @@
 package com.twix.data.repository
 
+import com.twix.domain.model.goal.CreateGoalParam
+import com.twix.domain.model.goal.CreatedGoal
 import com.twix.domain.model.goal.GoalList
 import com.twix.domain.repository.GoalRepository
 import com.twix.network.execute.safeApiCall
+import com.twix.network.model.request.goal.mapper.toRequest
 import com.twix.network.model.response.goal.mapper.toDomain
 import com.twix.network.service.GoalService
 import com.twix.result.AppResult
@@ -11,4 +14,9 @@ class DefaultGoalRepository(
     private val service: GoalService,
 ) : GoalRepository {
     override suspend fun fetchGoalList(date: String): AppResult<GoalList> = safeApiCall { service.fetchGoals(date).toDomain() }
+
+    override suspend fun createGoal(param: CreateGoalParam): AppResult<CreatedGoal> =
+        safeApiCall {
+            service.createGoal(param.toRequest()).toDomain()
+        }
 }

domain/src/main/java/com/twix/domain/model/enums/GoalIconType.kt

@@ -11,6 +11,18 @@ enum class GoalIconType {
     LAPTOP,
     ;
 
+    fun toApi(): String =
+        when (this) {
+            DEFAULT -> "ICON_DEFAULT"
+            CLEAN -> "ICON_CLEAN"
+            EXERCISE -> "ICON_EXERCISE"
+            BOOK -> "ICON_BOOK"
+            PENCIL -> "ICON_PENCIL"
+            HEALTH -> "ICON_HEALTH"
+            HEART -> "ICON_HEART"
+            LAPTOP -> "ICON_LAPTOP"
+        }
+
     companion object {
         fun fromApi(icon: String): GoalIconType =
             when (icon) {

domain/src/main/java/com/twix/domain/model/enums/RepeatCycle.kt

@@ -6,6 +6,8 @@ enum class RepeatCycle {
     MONTHLY,
     ;
 
+    fun toApi(): String = name
+
     companion object {
         fun fromApi(value: String): RepeatCycle = runCatching { valueOf(value) }.getOrElse { DAILY }
     }

domain/src/main/java/com/twix/domain/model/goal/CreateGoalParam.kt

@@ -0,0 +1,14 @@
+package com.twix.domain.model.goal
+
+import com.twix.domain.model.enums.GoalIconType
+import com.twix.domain.model.enums.RepeatCycle
+import java.time.LocalDate
+
+data class CreateGoalParam(
+    val name: String,
+    val icon: GoalIconType,
+    val repeatCycle: RepeatCycle,
+    val repeatCount: Int,
+    val startDate: LocalDate,
+    val endDate: LocalDate?,
+)

domain/src/main/java/com/twix/domain/model/goal/CreatedGoal.kt

@@ -0,0 +1,16 @@
+package com.twix.domain.model.goal
+
+import com.twix.domain.model.enums.GoalIconType
+import com.twix.domain.model.enums.RepeatCycle
+import java.time.LocalDate
+
+data class CreatedGoal(
+    val goalId: Long,
+    val name: String,
+    val icon: GoalIconType,
+    val repeatCycle: RepeatCycle,
+    val repeatCount: Int,
+    val startDate: LocalDate,
+    val endDate: LocalDate?,
+    val createdAt: String,
+)

domain/src/main/java/com/twix/domain/repository/GoalRepository.kt

@@ -1,8 +1,12 @@
 package com.twix.domain.repository
 
+import com.twix.domain.model.goal.CreateGoalParam
+import com.twix.domain.model.goal.CreatedGoal
 import com.twix.domain.model.goal.GoalList
 import com.twix.result.AppResult
 
 interface GoalRepository {
     suspend fun fetchGoalList(date: String): AppResult<GoalList>
+
+    suspend fun createGoal(param: CreateGoalParam): AppResult<CreatedGoal>
 }

feature/goal-editor/src/main/java/com/twix/goal_editor/GoalEditorScreen.kt

@@ -85,6 +85,7 @@ fun GoalEditorRoute(
         viewModel.sideEffect.collect { effect ->
             when (effect) {
                 is GoalEditorSideEffect.ShowToast -> toastManager.tryShow(ToastData(currentContext.getString(effect.resId), effect.type))
+                is GoalEditorSideEffect.NavigateToHome -> navigateToBack()
             }
         }
     }
@@ -332,7 +333,7 @@ private fun RepeatCountBottomSheetContent(
                         .padding(horizontal = 12.dp, vertical = 5.5.dp)
                         .noRippleClickable(onClick = {
                             internalSelectedRepeatType = RepeatCycle.WEEKLY
-                            internalRepeatCount = 0
+                            internalRepeatCount = 1
                         }),
             )
 
@@ -348,7 +349,7 @@ private fun RepeatCountBottomSheetContent(
                         .padding(horizontal = 12.dp, vertical = 5.5.dp)
                         .noRippleClickable(onClick = {
                             internalSelectedRepeatType = RepeatCycle.MONTHLY
-                            internalRepeatCount = 0
+                            internalRepeatCount = 1
                         }),
             )
         }

feature/goal-editor/src/main/java/com/twix/goal_editor/GoalEditorSideEffect.kt

@@ -9,4 +9,6 @@ interface GoalEditorSideEffect : SideEffect {
         @param:StringRes val resId: Int,
         val type: ToastType,
     ) : GoalEditorSideEffect
+
+    object NavigateToHome : GoalEditorSideEffect
 }

feature/goal-editor/src/main/java/com/twix/goal_editor/GoalEditorViewModel.kt

@@ -6,15 +6,20 @@ import com.twix.designsystem.components.toast.model.ToastType
 import com.twix.domain.model.enums.GoalIconType
 import com.twix.domain.model.enums.GoalReactionType
 import com.twix.domain.model.enums.RepeatCycle
+import com.twix.domain.model.goal.CreateGoalParam
 import com.twix.domain.model.goal.Goal
 import com.twix.domain.model.goal.GoalVerification
+import com.twix.domain.repository.GoalRepository
 import com.twix.goal_editor.model.GoalEditorUiState
 import com.twix.ui.base.BaseViewModel
+import com.twix.util.bus.GoalRefreshBus
 import kotlinx.coroutines.launch
 import java.time.LocalDate
 
-class GoalEditorViewModel :
-    BaseViewModel<GoalEditorUiState, GoalEditorIntent, GoalEditorSideEffect>(
+class GoalEditorViewModel(
+    private val goalRepository: GoalRepository,
+    private val goalRefreshBus: GoalRefreshBus,
+) : BaseViewModel<GoalEditorUiState, GoalEditorIntent, GoalEditorSideEffect>(
         GoalEditorUiState(),
     ) {
     override suspend fun handleIntent(intent: GoalEditorIntent) {
@@ -42,7 +47,7 @@ class GoalEditorViewModel :
     }
 
     private fun setRepeatType(repeatCycle: RepeatCycle) {
-        reduce { copy(selectedRepeatCycle = repeatCycle) }
+        reduce { copy(selectedRepeatCycle = repeatCycle, repeatCount = 1) }
     }
 
     private fun setRepeatCount(repeatCount: Int) {
@@ -72,6 +77,15 @@ class GoalEditorViewModel :
             }
             return
         }
+
+        launchResult(
+            block = { goalRepository.createGoal(currentState.toCreateParam()) },
+            onSuccess = {
+                goalRefreshBus.notifyChanged()
+                tryEmitSideEffect(GoalEditorSideEffect.NavigateToHome)
+            },
+            onError = { emitSideEffect(GoalEditorSideEffect.ShowToast(R.string.toast_create_goal_failed, ToastType.ERROR)) },
+        )
     }
 
     private fun initGoal(id: Long) {
@@ -113,4 +127,14 @@ class GoalEditorViewModel :
             )
         }
     }
+
+    private fun GoalEditorUiState.toCreateParam(): CreateGoalParam =
+        CreateGoalParam(
+            name = goalTitle.trim(),
+            icon = selectedIcon,
+            repeatCycle = selectedRepeatCycle,
+            repeatCount = repeatCount,
+            startDate = startDate,
+            endDate = if (endDateEnabled) endDate else null,
+        )
 }