홈 화면 목표 조회 API 연동

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:result"))
         implementation(project(":domain"))
     }
 })

core/design-system/src/main/java/com/twix/designsystem/extension/GoalIconType.kt

@@ -0,0 +1,16 @@
+package com.twix.designsystem.extension
+
+import com.twix.designsystem.R
+import com.twix.domain.model.enums.GoalIconType
+
+fun GoalIconType.toRes(): Int =
+    when (this) {
+        GoalIconType.DEFAULT -> R.drawable.ic_default
+        GoalIconType.CLEAN -> R.drawable.ic_clean
+        GoalIconType.EXERCISE -> R.drawable.ic_exercise
+        GoalIconType.BOOK -> R.drawable.ic_book
+        GoalIconType.PENCIL -> R.drawable.ic_pencil
+        GoalIconType.HEALTH -> R.drawable.ic_health
+        GoalIconType.HEART -> R.drawable.ic_heart
+        GoalIconType.LAPTOP -> R.drawable.ic_laptop
+    }

core/design-system/src/main/res/drawable/ic_checked_me.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M14,14m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+      android:fillColor="#171717"
+      android:strokeColor="#171717"/>
+  <path
+      android:pathData="M9,12.947L13.167,18L19,10"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>

core/design-system/src/main/res/drawable/ic_checked_you.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <group>
+    <clip-path
+        android:pathData="M0,0h28v28h-28z"/>
+    <path
+        android:pathData="M14,14m-12.7,0a12.7,12.7 0,1 1,25.4 0a12.7,12.7 0,1 1,-25.4 0"
+        android:strokeWidth="1.4"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M14,14m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+        android:fillColor="#171717"
+        android:strokeColor="#171717"/>
+    <path
+        android:pathData="M9,12.947L13.167,18L19,10"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.2"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>

core/design-system/src/main/res/drawable/ic_unchecked_me.xml

@@ -0,0 +1,27 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <group>
+    <clip-path
+        android:pathData="M0,0h28v28h-28z"/>
+    <path
+        android:pathData="M14,14m-12.7,0a12.7,12.7 0,1 1,25.4 0a12.7,12.7 0,1 1,-25.4 0"
+        android:strokeWidth="1.4"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"/>
+    <path
+        android:strokeWidth="1"
+        android:pathData="M14,14m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+        android:fillColor="#ffffff"
+        android:strokeColor="#171717"/>
+    <path
+        android:pathData="M9,12.947L13.167,18L19,10"
+        android:strokeLineJoin="round"
+        android:strokeWidth="1.2"
+        android:fillColor="#00000000"
+        android:strokeColor="#ffffff"
+        android:strokeLineCap="round"/>
+  </group>
+</vector>

core/design-system/src/main/res/drawable/ic_unchecked_you.xml

@@ -0,0 +1,18 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="28dp"
+    android:height="28dp"
+    android:viewportWidth="28"
+    android:viewportHeight="28">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M14,14m-11.5,0a11.5,11.5 0,1 1,23 0a11.5,11.5 0,1 1,-23 0"
+      android:fillColor="#ffffff"
+      android:strokeColor="#C6C6C6"/>
+  <path
+      android:pathData="M9,12.947L13.167,18L19,10"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1.2"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>

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

@@ -37,5 +37,6 @@
 
     <!-- 토스트 메시지 -->
     <string name="toast_end_date_before_start_date">종료 날짜가 시작 날짜보다 이전입니다.</string>
+    <string name="toast_goal_fetch_failed">목표 조회에 실패했습니다.</string>
 
 </resources>

core/network/build.gradle.kts

@@ -42,6 +42,7 @@ android {
 dependencies {
     implementation(projects.core.token)
     implementation(projects.core.result)
+    implementation(projects.domain)
 
     implementation(libs.bundles.ktor)
     implementation(libs.ktorfit.lib)

core/network/src/main/java/com/twix/network/di/ApiServiceModule.kt

@@ -1,8 +1,10 @@
 package com.twix.network.di
 
 import com.twix.network.service.AuthService
+import com.twix.network.service.GoalService
 import com.twix.network.service.OnboardingService
 import com.twix.network.service.createAuthService
+import com.twix.network.service.createGoalService
 import com.twix.network.service.createOnboardingService
 import de.jensklingenberg.ktorfit.Ktorfit
 import org.koin.dsl.module
@@ -15,4 +17,7 @@ internal val apiServiceModule =
         single<AuthService> {
             get<Ktorfit>().createAuthService()
         }
+        single<GoalService> {
+            get<Ktorfit>().createGoalService()
+        }
     }

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

@@ -0,0 +1,38 @@
+package com.twix.network.model.response.goal.mapper
+
+import com.twix.domain.model.enums.GoalIconType
+import com.twix.domain.model.enums.RepeatCycle
+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.GoalListResponse
+import com.twix.network.model.response.goal.model.GoalResponse
+import com.twix.network.model.response.goal.model.VerificationResponse
+
+fun GoalListResponse.toDomain(): GoalList =
+    GoalList(
+        completedCount = completedCount,
+        totalCount = totalCount,
+        goals = goals.map { it.toDomain() },
+    )
+
+fun GoalResponse.toDomain(): Goal =
+    Goal(
+        goalId = goalId,
+        name = name,
+        icon = GoalIconType.fromApi(icon),
+        repeatCycle = RepeatCycle.fromApi(repeatCycle),
+        myCompleted = myCompleted,
+        partnerCompleted = partnerCompleted,
+        myVerification = myVerification?.toDomainOrNull(),
+        partnerVerification = partnerVerification?.toDomainOrNull(),
+    )
+
+fun VerificationResponse.toDomainOrNull(): GoalVerification? =
+    GoalVerification(
+        photologId = photologId,
+        imageUrl = imageUrl,
+        comment = comment,
+        reaction = reaction,
+        uploadedAt = uploadedAt,
+    )

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

@@ -0,0 +1,11 @@
+package com.twix.network.model.response.goal.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GoalListResponse(
+    @SerialName("completedCount") val completedCount: Int,
+    @SerialName("totalCount") val totalCount: Int,
+    @SerialName("goals") val goals: List<GoalResponse>,
+)

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

@@ -0,0 +1,16 @@
+package com.twix.network.model.response.goal.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class GoalResponse(
+    @SerialName("goalId") val goalId: Long,
+    @SerialName("name") val name: String,
+    @SerialName("icon") val icon: String,
+    @SerialName("repeatCycle") val repeatCycle: String,
+    @SerialName("myCompleted") val myCompleted: Boolean,
+    @SerialName("partnerCompleted") val partnerCompleted: Boolean,
+    @SerialName("myVerification") val myVerification: VerificationResponse? = null,
+    @SerialName("partnerVerification") val partnerVerification: VerificationResponse? = null,
+)

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

@@ -0,0 +1,13 @@
+package com.twix.network.model.response.goal.model
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class VerificationResponse(
+    @SerialName("photologId") val photologId: Long,
+    @SerialName("imageUrl") val imageUrl: String,
+    @SerialName("comment") val comment: String? = null,
+    @SerialName("reaction") val reaction: String? = null,
+    @SerialName("uploadedAt") val uploadedAt: String, // yyyy-mm-dd
+)

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

@@ -8,12 +8,12 @@ import de.jensklingenberg.ktorfit.http.Body
 import de.jensklingenberg.ktorfit.http.POST
 
 interface AuthService {
-    @POST("auth/google/token")
+    @POST("api/v1/auth/google/token")
     suspend fun googleLogin(
         @Body request: LoginRequest,
     ): LoginResponse
 
-    @POST("auth/refresh")
+    @POST("api/v1/auth/refresh")
     suspend fun refresh(
         @Body request: RefreshRequest,
     ): RefreshResponse

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

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

core/result/build.gradle.kts

@@ -1,7 +1,3 @@
 plugins {
-    alias(libs.plugins.twix.android.library)
-}
-
-android {
-    namespace = "com.twix.result"
+    alias(libs.plugins.twix.java.library)
 }

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

@@ -81,7 +81,7 @@ abstract class BaseViewModel<S : State, I : Intent, SE : SideEffect>(
         onStart: (() -> Unit)? = null, // 비동기 시작 전 처리해야 할 로직 ex) 로딩
         onFinally: (() -> Unit)? = null, // 비동기 종료 후 리소스 정리
         onSuccess: (D) -> Unit, // 비동기 메서드 호출이 성공했을 때 처리해야 할 로직
-        onError: ((AppError) -> Unit)? = null, // 비동기 메서드 호출에 실패했을 때 처리해야 할 로직
+        onError: (suspend (AppError) -> Unit)? = null, // 비동기 메서드 호출에 실패했을 때 처리해야 할 로직
         block: suspend () -> AppResult<D>, // 비동기 메서드 ex) 서버 통신 메서드
     ): Job =
         viewModelScope.launch {

data/build.gradle.kts

@@ -8,5 +8,6 @@ android {
 
 dependencies {
     implementation(projects.core.datastore)
+    implementation(projects.core.result)
     implementation(projects.core.token)
 }

data/src/main/java/com/twix/data/di/RepositoryModule.kt

@@ -1,8 +1,10 @@
 package com.twix.data.di
 
 import com.twix.data.repository.DefaultAuthRepository
+import com.twix.data.repository.DefaultGoalRepository
 import com.twix.data.repository.DefaultOnboardingRepository
 import com.twix.domain.repository.AuthRepository
+import com.twix.domain.repository.GoalRepository
 import com.twix.domain.repository.OnBoardingRepository
 import org.koin.dsl.module
 
@@ -11,6 +13,9 @@ internal val repositoryModule =
         single<OnBoardingRepository> {
             DefaultOnboardingRepository(get())
         }
+        single<GoalRepository> {
+            DefaultGoalRepository(get())
+        }
         single<AuthRepository> {
             DefaultAuthRepository(get(), get())
         }

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

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

domain/build.gradle.kts

@@ -1,3 +1,7 @@
 plugins {
     alias(libs.plugins.twix.java.library)
 }
+
+dependencies {
+    implementation(projects.core.result)
+}

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

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

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

@@ -0,0 +1,12 @@
+package com.twix.domain.model.enums
+
+enum class RepeatCycle {
+    DAILY,
+    WEEKLY,
+    MONTHLY,
+    ;
+
+    companion object {
+        fun fromApi(value: String): RepeatCycle = runCatching { valueOf(value) }.getOrElse { DAILY }
+    }
+}

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

@@ -0,0 +1,15 @@
+package com.twix.domain.model.goal
+
+import com.twix.domain.model.enums.GoalIconType
+import com.twix.domain.model.enums.RepeatCycle
+
+data class Goal(
+    val goalId: Long,
+    val name: String,
+    val icon: GoalIconType,
+    val repeatCycle: RepeatCycle,
+    val myCompleted: Boolean,
+    val partnerCompleted: Boolean,
+    val myVerification: GoalVerification?,
+    val partnerVerification: GoalVerification?,
+)

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

@@ -0,0 +1,7 @@
+package com.twix.domain.model.goal
+
+data class GoalList(
+    val completedCount: Int = 0,
+    val totalCount: Int = 0,
+    val goals: List<Goal> = emptyList(),
+)