목표 수정, 삭제, 끝내기 API 연동

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

@@ -60,6 +60,9 @@
     <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="toast_update_goal_failed">목표 수정에 실패했습니다.</string>
+    <string name="toast_delete_goal_failed">목표 삭제에 실패했습니다.</string>
+    <string name="toast_complete_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

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

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

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

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

@@ -3,13 +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.GoalDetail
 import com.twix.domain.model.goal.GoalList
+import com.twix.domain.model.goal.GoalSummary
 import com.twix.domain.model.goal.GoalVerification
-import com.twix.network.model.response.goal.model.CreateGoalResponse
+import com.twix.network.model.response.goal.model.GoalDetailResponse
 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.GoalSummaryListResponse
 import com.twix.network.model.response.goal.model.VerificationResponse
 import java.time.LocalDate
 
@@ -41,8 +43,8 @@ fun VerificationResponse.toDomainOrNull(): GoalVerification? =
         uploadedAt = uploadedAt,
     )
 
-fun CreateGoalResponse.toDomain(): CreatedGoal =
-    CreatedGoal(
+fun GoalDetailResponse.toDomain(): GoalDetail =
+    GoalDetail(
         goalId = goalId,
         name = name,
         icon = GoalIconType.fromApi(icon),
@@ -52,3 +54,15 @@ fun CreateGoalResponse.toDomain(): CreatedGoal =
         endDate = endDate?.let(LocalDate::parse),
         createdAt = createdAt,
     )
+
+fun GoalSummaryListResponse.toDomain(): List<GoalSummary> =
+    this.goals.map {
+        GoalSummary(
+            goalId = it.goalId,
+            name = it.name,
+            icon = GoalIconType.fromApi(it.icon),
+            repeatCycle = RepeatCycle.fromApi(it.repeatCycle),
+            startDate = LocalDate.parse(it.startDate),
+            it.endDate?.let(LocalDate::parse)
+        )
+    }

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

@@ -4,7 +4,7 @@ import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
 
 @Serializable
-data class CreateGoalResponse(
+data class GoalDetailResponse(
     @SerialName("goalId") val goalId: Long,
     @SerialName("name") val name: String,
     @SerialName("icon") val icon: String,

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

@@ -0,0 +1,9 @@
+package com.twix.network.model.response.goal.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GoalSummaryListResponse(
+    @SerialName("goals") val goals: List<GoalSummaryResponse>
+)

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

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

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

@@ -1,11 +1,16 @@
 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.request.goal.model.UpdateGoalRequest
+import com.twix.network.model.response.goal.model.GoalDetailResponse
 import com.twix.network.model.response.goal.model.GoalListResponse
+import com.twix.network.model.response.goal.model.GoalSummaryListResponse
 import de.jensklingenberg.ktorfit.http.Body
+import de.jensklingenberg.ktorfit.http.DELETE
 import de.jensklingenberg.ktorfit.http.GET
 import de.jensklingenberg.ktorfit.http.POST
+import de.jensklingenberg.ktorfit.http.PUT
+import de.jensklingenberg.ktorfit.http.Path
 import de.jensklingenberg.ktorfit.http.Query
 
 interface GoalService {
@@ -17,5 +22,31 @@ interface GoalService {
     @POST("api/v1/goals")
     suspend fun createGoal(
         @Body body: CreateGoalRequest,
-    ): CreateGoalResponse
+    ): GoalDetailResponse
+
+    @PUT("api/v1/goals/{goalId}")
+    suspend fun updateGoal(
+        @Body body: UpdateGoalRequest,
+        @Path("goalId") goalId: Long,
+    ): GoalDetailResponse
+
+    @GET("api/v1/goals/{goalId}")
+    suspend fun fetchGoalDetail(
+        @Path("goalId") goalId: Long,
+    ): GoalDetailResponse
+
+    @DELETE("api/v1/goals/{goalId}")
+    suspend fun deleteGoal(
+        @Path("goalId") goalId: Long,
+    )
+
+    @PUT("api/v1/goals/{goalId}/complete")
+    suspend fun completeGoal(
+        @Path("goalId") goalId: Long,
+    )
+
+    @GET("api/v1/goals/detail")
+    suspend fun fetchGoalSummaryList(
+        @Query("date") date: String,
+    ): GoalSummaryListResponse
 }

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

@@ -1,8 +1,10 @@
 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.GoalDetail
 import com.twix.domain.model.goal.GoalList
+import com.twix.domain.model.goal.GoalSummary
+import com.twix.domain.model.goal.UpdateGoalParam
 import com.twix.domain.repository.GoalRepository
 import com.twix.network.execute.safeApiCall
 import com.twix.network.model.request.goal.mapper.toRequest
@@ -15,8 +17,27 @@ class DefaultGoalRepository(
 ) : GoalRepository {
     override suspend fun fetchGoalList(date: String): AppResult<GoalList> = safeApiCall { service.fetchGoals(date).toDomain() }
 
-    override suspend fun createGoal(param: CreateGoalParam): AppResult<CreatedGoal> =
+    override suspend fun createGoal(param: CreateGoalParam): AppResult<GoalDetail> =
         safeApiCall {
             service.createGoal(param.toRequest()).toDomain()
         }
+
+    override suspend fun updateGoal(param: UpdateGoalParam): AppResult<GoalDetail> =
+        safeApiCall {
+            service.updateGoal(body = param.toRequest(), goalId = param.goalId).toDomain()
+        }
+
+    override suspend fun fetchGoalDetail(goalId: Long): AppResult<GoalDetail> =
+        safeApiCall {
+            service.fetchGoalDetail(goalId).toDomain()
+        }
+
+    override suspend fun deleteGoal(goalId: Long): AppResult<Unit> = safeApiCall { service.deleteGoal(goalId) }
+
+    override suspend fun completeGoal(goalId: Long): AppResult<Unit> = safeApiCall { service.completeGoal(goalId) }
+
+    override suspend fun fetchGoalSummaryList(date: String): AppResult<List<GoalSummary>> =
+        safeApiCall {
+            service.fetchGoalSummaryList(date).toDomain()
+        }
 }

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

@@ -4,7 +4,7 @@ import com.twix.domain.model.enums.GoalIconType
 import com.twix.domain.model.enums.RepeatCycle
 import java.time.LocalDate
 
-data class CreatedGoal(
+data class GoalDetail(
     val goalId: Long,
     val name: String,
     val icon: GoalIconType,

domain/src/main/java/com/twix/domain/model/goal/UpdateGoalParam.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 UpdateGoalParam(
+    val goalId: Long,
+    val name: String,
+    val icon: GoalIconType,
+    val repeatCycle: RepeatCycle,
+    val repeatCount: Int,
+    val endDate: LocalDate?,
+)

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

@@ -1,12 +1,24 @@
 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.GoalDetail
 import com.twix.domain.model.goal.GoalList
+import com.twix.domain.model.goal.GoalSummary
+import com.twix.domain.model.goal.UpdateGoalParam
 import com.twix.result.AppResult
 
 interface GoalRepository {
     suspend fun fetchGoalList(date: String): AppResult<GoalList>
 
-    suspend fun createGoal(param: CreateGoalParam): AppResult<CreatedGoal>
+    suspend fun createGoal(param: CreateGoalParam): AppResult<GoalDetail>
+
+    suspend fun updateGoal(param: UpdateGoalParam): AppResult<GoalDetail>
+
+    suspend fun fetchGoalDetail(goalId: Long): AppResult<GoalDetail>
+
+    suspend fun deleteGoal(goalId: Long): AppResult<Unit>
+
+    suspend fun completeGoal(goalId: Long): AppResult<Unit>
+
+    suspend fun fetchGoalSummaryList(date: String): AppResult<List<GoalSummary>>
 }

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

@@ -34,7 +34,9 @@ sealed interface GoalEditorIntent : Intent {
         val enabled: Boolean,
     ) : GoalEditorIntent
 
-    data object Save : GoalEditorIntent
+    data class Save(
+        val id: Long,
+    ) : GoalEditorIntent
 
     data class InitGoal(
         val id: Long,

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

@@ -105,7 +105,7 @@ fun GoalEditorRoute(
         onCommitStartDate = { viewModel.dispatch(GoalEditorIntent.SetStartDate(it)) },
         onCommitRepeatCount = { viewModel.dispatch(GoalEditorIntent.SetRepeatCount(it)) },
         onToggleEndDateEnabled = { viewModel.dispatch(GoalEditorIntent.SetEndDateEnabled(it)) },
-        onComplete = { viewModel.dispatch(GoalEditorIntent.Save) },
+        onComplete = { viewModel.dispatch(GoalEditorIntent.Save(goalId)) },
     )
 }