Merge pull request #205 from YAPP-Github/fix/#203

fix: 기능결함 QA 우선 반영

Author: clxxrlove

Projects/Domain/Goal/Interface/Sources/DTO/GoalUpdateRequestDTO.swift

@@ -9,36 +9,23 @@ import Foundation
 
 /// 목표 수정 요청 DTO입니다.
 public struct GoalUpdateRequestDTO: Encodable {
-    public let name: String
+    public let goalName: String
     public let icon: String
     public let repeatCycle: String
     public let repeatCount: Int
     public let endDate: String?
 
     public init(
-        name: String,
+        goalName: String,
         icon: String,
         repeatCycle: String,
         repeatCount: Int,
         endDate: String?
     ) {
-        self.name = name
+        self.goalName = goalName
         self.icon = icon
         self.repeatCycle = repeatCycle
         self.repeatCount = repeatCount
         self.endDate = endDate
     }
-
-    enum CodingKeys: String, CodingKey {
-        case name, icon, repeatCycle, repeatCount, endDate
-    }
-
-    public func encode(to encoder: Encoder) throws {
-        var container = encoder.container(keyedBy: CodingKeys.self)
-        try container.encode(name, forKey: .name)
-        try container.encode(icon, forKey: .icon)
-        try container.encode(repeatCycle, forKey: .repeatCycle)
-        try container.encode(repeatCount, forKey: .repeatCount)
-        try container.encodeIfPresent(endDate, forKey: .endDate)
-    }
 }

Projects/Feature/Home/Interface/Sources/Home/HomeReducer.swift

@@ -62,12 +62,12 @@ public struct HomeReducer {
             let now = CalendarNow()
             let today = TXCalendarDate(year: now.year, month: now.month, day: now.day)
             if calendarDate < today {
-                return "지난 우리의 목표"
+                return "지난 우리 목표"
             }
             if today < calendarDate {
-                return "다음 우리의 목표"
+                return "다음 우리 목표"
             }
-            return "오늘 우리의 목표"
+            return "오늘 우리 목표"
         }
 
         public var proofPhoto: ProofPhotoReducer.State?
@@ -106,6 +106,7 @@ public struct HomeReducer {
         case modalConfirmTapped
         case yourCardTapped(GoalCardItem)
         case myCardTapped(GoalCardItem)
+        case headerTapped(GoalCardItem)
         case floatingButtonTapped
         case editButtonTapped
 
@@ -130,6 +131,7 @@ public struct HomeReducer {
         /// 홈 화면에서 외부로 전달하는 이벤트입니다.
         public enum Delegate {
             case goToGoalDetail(id: Int64, owner: GoalDetail.Owner, verificationDate: String)
+            case goToStatsDetail(id: Int64)
             case goToMakeGoal(GoalCategory)
             case goToEditGoalList(date: TXCalendarDate)
             case goToSettings

Projects/Feature/Home/Interface/Sources/Root/HomeCoordinator.swift

@@ -12,6 +12,7 @@ import FeatureNotificationInterface
 import FeatureMakeGoalInterface
 import FeatureProofPhotoInterface
 import FeatureSettingsInterface
+import FeatureStatsInterface
 
 /// Home Feature의 NavigationStack을 관리하는 Root Reducer입니다.
 ///
@@ -28,6 +29,7 @@ public struct HomeCoordinator {
     private let reducer: Reduce<State, Action>
     private let homeReducer: HomeReducer
     private let goalDetailReducer: GoalDetailReducer
+    private let statsDetailReducer: StatsDetailReducer
     private let makeGoalReducer: MakeGoalReducer
     private let editGoalListReducer: EditGoalListReducer
     private let settingsReducer: SettingsReducer
@@ -45,6 +47,7 @@ public struct HomeCoordinator {
 
         public var home = HomeReducer.State()
         public var goalDetail: GoalDetailReducer.State?
+        public var statsDetail: StatsDetailReducer.State?
         public var makeGoal: MakeGoalReducer.State?
         public var editGoalList: EditGoalListReducer.State?
         public var settings: SettingsReducer.State?
@@ -71,6 +74,7 @@ public struct HomeCoordinator {
         // MARK: - Child Action
         case home(HomeReducer.Action)
         case goalDetail(GoalDetailReducer.Action)
+        case statsDetail(StatsDetailReducer.Action)
         case makeGoal(MakeGoalReducer.Action)
         case editGoalList(EditGoalListReducer.Action)
         case settings(SettingsReducer.Action)
@@ -104,6 +108,7 @@ public struct HomeCoordinator {
         reducer: Reduce<State, Action>,
         homeReducer: HomeReducer,
         goalDetailReducer: GoalDetailReducer,
+        statsDetailReducer: StatsDetailReducer,
         makeGoalReducer: MakeGoalReducer,
         editGoalListReducer: EditGoalListReducer,
         settingsReducer: SettingsReducer,
@@ -112,6 +117,7 @@ public struct HomeCoordinator {
         self.reducer = reducer
         self.homeReducer = homeReducer
         self.goalDetailReducer = goalDetailReducer
+        self.statsDetailReducer = statsDetailReducer
         self.makeGoalReducer = makeGoalReducer
         self.editGoalListReducer = editGoalListReducer
         self.settingsReducer = settingsReducer
@@ -129,6 +135,9 @@ public struct HomeCoordinator {
             .ifLet(\.goalDetail, action: \.goalDetail) {
                 goalDetailReducer
             }
+            .ifLet(\.statsDetail, action: \.statsDetail) {
+                statsDetailReducer
+            }
             .ifLet(\.makeGoal, action: \.makeGoal) {
                 makeGoalReducer
             }

Projects/Feature/Home/Interface/Sources/Route/HomeRoute.swift

@@ -11,6 +11,7 @@ import Foundation
 public enum HomeRoute: Equatable, Hashable {
     case editGoalList
     case detail
+    case statsDetail
     case makeGoal
     case settings
     case settingsAccount

Projects/Feature/Home/Project.swift

@@ -15,6 +15,7 @@ let project = Project.makeModule(
                     .feature(interface: .notification),
                     .feature(interface: .makeGoal),
                     .feature(interface: .settings),
+                    .feature(interface: .stats),
                     .shared(implements: .designSystem),
                     .external(dependency: .ComposableArchitecture)
                 ]
@@ -33,6 +34,7 @@ let project = Project.makeModule(
                     .feature(interface: .notification),
                     .feature(interface: .makeGoal),
                     .feature(interface: .settings),
+                    .feature(interface: .stats),
                     .feature(interface: .home),
                     .shared(implements: .designSystem),
                     .shared(implements: .util),

Projects/Feature/Home/Sources/Goal/AddGoalListView.swift

@@ -22,16 +22,15 @@ struct AddGoalListView: View {
     }
 
     var body: some View {
-        ScrollView {
-            VStack(alignment: .leading, spacing: 0) {
-                headerView
-                    .padding(.horizontal, 20)
-                    .padding(.top, 28)
-                categoryListView
-                    .padding(.top, 33.5)
-                    .padding(.horizontal, 20)
-            }
+        VStack(alignment: .leading, spacing: 0) {
+            headerView
+                .padding(.horizontal, 20)
+            categoryListView
+                .padding(.top, 20)
+                .padding(.horizontal, 20)
+                .padding(.bottom, 80)
         }
+        .padding(.top, 28)
     }
 }
 
@@ -46,12 +45,12 @@ private extension AddGoalListView {
             Text("새로운 목표 추가")
                 .typography(.h4_20b)
                 .foregroundStyle(Color.Gray.gray500)
-                .padding(.top, 13.5)
-            
+
             Text("함께하는 목표를 추가해 보세요!")
                 .typography(.b2_14r)
                 .foregroundStyle(Color.Gray.gray400)
         }
+        .frame(height: 80, alignment: .center)
     }
 
     var categoryListView: some View {

Projects/Feature/Home/Sources/Home/HomeReducer+Impl.swift

@@ -218,7 +218,10 @@ extension HomeReducer {
             case let .myCardTapped(card):
                 let verificationDate = TXCalendarUtil.apiDateString(for: state.calendarDate)
                 return .send(.delegate(.goToGoalDetail(id: card.id, owner: .mySelf, verificationDate: verificationDate)))
-                
+
+            case let .headerTapped(card):
+                return .send(.delegate(.goToStatsDetail(id: card.id)))
+
             case .floatingButtonTapped:
                 state.isAddGoalPresented = true
                 return .none

Projects/Feature/Home/Sources/Home/HomeView.swift

@@ -46,6 +46,9 @@ public struct HomeView: View {
             if store.hasCards {
                 content
             } else {
+                headerRow
+                    .padding(.horizontal, 20)
+                    .padding(.top, 16)
                 goalEmptyView
             }
             Spacer()
@@ -66,7 +69,6 @@ public struct HomeView: View {
                 AddGoalListView { category in
                     store.send(.addGoalButtonTapped(category))
                 }
-                .frame(height: UIScreen.main.bounds.height - 92)
             }
         )
         .txBottomSheet(
@@ -165,11 +167,12 @@ private extension HomeView {
             Button {
                 store.send(.editButtonTapped)
             } label: {
-                Image.Icon.Symbol.edit
+                Text("편집")
+                    .typography(.b1_14b)
+                    .foregroundStyle(Color.Gray.gray500)
             }
         }
         .frame(height: 24)
-        .padding(.top, 12)
     }
 
     var cardList: some View {
@@ -195,41 +198,38 @@ private extension HomeView {
                 isCoupleChecked: card.yourCard.isSelected,
                 action: {
                     store.send(.goalCheckButtonTapped(id: card.id, isChecked: card.myCard.isSelected))
+                },
+                onHeaderTapped: {
+                    store.send(.headerTapped(card))
                 }
             ),
             actionLeft: {
                 store.send(.myCardTapped(card))
             }, actionRight: {
-                
                 store.send(.yourCardTapped(card))
             }
         )
     }
 
     var goalEmptyView: some View {
         GeometryReader { geometry in
-            ScrollView {
-                VStack(alignment: .center, spacing: 0) {
-                    Image.Illustration.emptyPoke
-
-                    Text("첫 목표를 세워볼까요?")
-                        .typography(.t2_16b)
-                        .foregroundStyle(Color.Gray.gray400)
-
-                    Text("+ 버튼을 눌러 목표를 추가해보세요")
-                        .typography(.c1_12r)
-                        .foregroundStyle(Color.Gray.gray300)
-                        .padding(.top, 5)
-                }
-                .frame(width: geometry.size.width, height: geometry.size.height)
-                .overlay(alignment: .bottomTrailing) {
-                    Image.Illustration.arrow
-                        .padding(.bottom, 63)
-                        .padding(.trailing, 86)
-                }
+            VStack(alignment: .center, spacing: 0) {
+                Image.Illustration.emptyPoke
+                
+                Text("첫 목표를 세워볼까요?")
+                    .typography(.t2_16b)
+                    .foregroundStyle(Color.Gray.gray400)
+                
+                Text("+ 버튼을 눌러 목표를 추가해보세요")
+                    .typography(.c1_12r)
+                    .foregroundStyle(Color.Gray.gray300)
+                    .padding(.top, 5)
             }
-            .refreshable {
-                store.send(.fetchGoals)
+            .frame(width: geometry.size.width, height: geometry.size.height)
+            .overlay(alignment: .bottomTrailing) {
+                Image.Illustration.arrow
+                    .padding(.bottom, 63)
+                    .padding(.trailing, 86)
             }
         }
     }

Projects/Feature/Home/Sources/Root/HomeCoordinator+Impl.swift

@@ -12,12 +12,14 @@ import FeatureNotificationInterface
 import FeatureMakeGoalInterface
 import FeatureProofPhotoInterface
 import FeatureSettingsInterface
+import FeatureStatsInterface
 
 extension HomeCoordinator {
     // 기본 구성의 HomeCoordinator를 생성합니다.
     // swiftlint:disable:next function_body_length
     public init(
         goalDetailReducer: GoalDetailReducer,
+        statsDetailReducer: StatsDetailReducer,
         proofPhotoReducer: ProofPhotoReducer,
         makeGoalReducer: MakeGoalReducer,
         editGoalListReducer: EditGoalListReducer,
@@ -56,7 +58,23 @@ extension HomeCoordinator {
                 state.routes.append(.notification)
                 state.notification = .init()
                 return .none
-                
+
+            case let .home(.delegate(.goToStatsDetail(id))):
+                state.routes.append(.statsDetail)
+                state.statsDetail = .init(goalId: id)
+                return .none
+
+            case .statsDetail(.delegate(.navigateBack)):
+                popLastRoute(&state.routes)
+                return .none
+
+            case .statsDetail(.onDisappear):
+                state.statsDetail = nil
+                return .none
+
+            case .statsDetail:
+                return .none
+
             case .goalDetail(.delegate(.navigateBack)):
                 popLastRoute(&state.routes)
                 return .none
@@ -173,6 +191,7 @@ extension HomeCoordinator {
             reducer: reducer,
             homeReducer: HomeReducer(proofPhotoReducer: proofPhotoReducer),
             goalDetailReducer: goalDetailReducer,
+            statsDetailReducer: statsDetailReducer,
             makeGoalReducer: makeGoalReducer,
             editGoalListReducer: editGoalListReducer,
             settingsReducer: settingsReducer,

Projects/Feature/Home/Sources/Root/HomeCoordinatorView.swift

@@ -13,6 +13,7 @@ import FeatureHomeInterface
 import FeatureNotificationInterface
 import FeatureMakeGoalInterface
 import FeatureSettingsInterface
+import FeatureStatsInterface
 
 /// Home Feature의 NavigationStack을 제공하는 Root View입니다.
 ///
@@ -28,6 +29,7 @@ import FeatureSettingsInterface
 /// ```
 public struct HomeCoordinatorView: View {
     @Dependency(\.goalDetailFactory) var goalDetailFactory
+    @Dependency(\.statsDetailFactory) var statsDetailFactory
     @Dependency(\.notificationFactory) var notificationFactory
     @Dependency(\.makeGoalFactory) var makeGoalFactory
     @Dependency(\.settingsFactory) var settingsFactory
@@ -54,6 +56,12 @@ public struct HomeCoordinatorView: View {
                                 .toolbar(.hidden, for: .tabBar)
                         }
 
+                    case .statsDetail:
+                        IfLetStore(store.scope(state: \.statsDetail, action: \.statsDetail)) { store in
+                            statsDetailFactory.makeView(store)
+                                .toolbar(.hidden, for: .tabBar)
+                        }
+
                     case .editGoalList:
                         IfLetStore(store.scope(state: \.editGoalList, action: \.editGoalList)) { store in
                             EditGoalListView(store: store)