Feat: 루틴 완료 api v2 연동 (#T3-178)

choijungp · choijungp · commit b07e0f25a9ce · 2025-08-23T00:09:04.000+09:00
diff --git a/Projects/DataSource/Sources/DTO/RoutineCompletionDTO.swift b/Projects/DataSource/Sources/DTO/RoutineCompletionDTO.swift
@@ -6,13 +6,11 @@
 //
 
 struct RoutineCompletionListDTO: Encodable {
-    let performedDate: String
     let routineCompletionInfos: [RoutineCompletionDTO]
 }
 
 struct RoutineCompletionDTO: Encodable {
     let routineId: String
-    let completeYn: Bool
-    let historySeq: Int
-    let routineType: String
+    let routineCompleteYn: Bool
+    let subRoutineCompleteYn: [Bool]
 }
diff --git a/Projects/DataSource/Sources/Endpoint/RoutineEndpoint.swift b/Projects/DataSource/Sources/Endpoint/RoutineEndpoint.swift
@@ -42,8 +42,10 @@ extension RoutineEndpoint: Endpoint {
     
     var method: HTTPMethod {
         switch self {
-        case .createRoutine, .updateRoutineCompletion:
+        case .createRoutine:
                 .post
+        case .updateRoutineCompletion:
+                .put
         case .fetchRoutine, .fetchRoutines:
                 .get
         case .updateRoutine:
diff --git a/Projects/DataSource/Sources/Repository/RoutineRepository.swift b/Projects/DataSource/Sources/Repository/RoutineRepository.swift
@@ -74,18 +74,12 @@ final class RoutineRepository: RoutineRepositoryProtocol {
         _ = try await networkService.request(endpoint: endpoint, type: EmptyResponseDTO.self)
     }
 
-    func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws {
-        guard let routine = routines.first else { return }
-        let performedDate = routine.performedDate
+    func updateRoutineCompletions(routines: [RoutineEntity]) async throws {
         let completionDTO = routines.map({ RoutineCompletionDTO(
             routineId: $0.routineId,
-            completeYn: $0.completeYn,
-            historySeq: $0.historySeq,
-            routineType: $0.routineType) })
-
-        let completionListDTO = RoutineCompletionListDTO(
-            performedDate: performedDate,
-            routineCompletionInfos: completionDTO)
+            routineCompleteYn: $0.routineCompleteYn,
+            subRoutineCompleteYn: $0.subRoutineCompleteYn) })
+        let completionListDTO = RoutineCompletionListDTO(routineCompletionInfos: completionDTO)
 
         let endpoint = RoutineEndpoint.updateRoutineCompletion(routines: completionListDTO)
         _ = try await networkService.request(endpoint: endpoint, type: EmptyResponseDTO.self)
diff --git a/Projects/Domain/Sources/Entity/RoutineCompletionEntity.swift b/Projects/Domain/Sources/Entity/RoutineCompletionEntity.swift
diff --git a/Projects/Domain/Sources/Protocol/Repository/RoutineRepositoryProtocol.swift b/Projects/Domain/Sources/Protocol/Repository/RoutineRepositoryProtocol.swift
@@ -38,5 +38,5 @@ public protocol RoutineRepositoryProtocol {
 
     /// 루틴 완료 여부를 업데이트 합니다.
     /// - Parameter routines: 완료 여부를 업데이트할 루틴 배열
-    func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws
+    func updateRoutineCompletions(routines: [RoutineEntity]) async throws
 }
diff --git a/Projects/Domain/Sources/Protocol/UseCase/RoutineUseCaseProtocol.swift b/Projects/Domain/Sources/Protocol/UseCase/RoutineUseCaseProtocol.swift
@@ -18,5 +18,5 @@ public protocol RoutineUseCaseProtocol {
 
     func deleteDailyRoutine(routineId: String) async throws
 
-    func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws
+    func updateRoutineCompletions(routines: [RoutineEntity]) async throws
 }
diff --git a/Projects/Domain/Sources/UseCase/Routine/RoutineUseCase.swift b/Projects/Domain/Sources/UseCase/Routine/RoutineUseCase.swift
@@ -63,7 +63,7 @@ public final class RoutineUseCase: RoutineUseCaseProtocol {
         try await routineRepository.deleteDailyRoutine(routineId: routineId)
     }
 
-    public func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws {
+    public func updateRoutineCompletions(routines: [RoutineEntity]) async throws {
         try await routineRepository.updateRoutineCompletions(routines: routines)
     }
 }
diff --git a/Projects/Presentation/Sources/Common/View/TabBarView.swift b/Projects/Presentation/Sources/Common/View/TabBarView.swift
@@ -48,7 +48,7 @@ final public class TabBarView: UITabBarController {
         guard let mypageViewModel = DIContainer.shared.resolve(type: MypageViewModel.self)
         else { fatalError("mypageViewModel 의존성이 등록되지 않았습니다.") }
 
-        let homeView = HomeView(viewModel: homeViewModel)
+        let homeView = HomeViewController(viewModel: homeViewModel)
         let recommendView = RecommendedRoutineViewController(viewModel: recommendedRoutineViewModel)
         let mypageView = MypageView(viewModel: mypageViewModel)
 
diff --git a/Projects/Presentation/Sources/Home/Model/Routine.swift b/Projects/Presentation/Sources/Home/Model/Routine.swift
@@ -20,6 +20,21 @@ struct Routine: RoutineProtocol {
     let isDeleted: Bool
     let startDate: Date
     let endDate: Date
+
+    func toRoutineEntity() -> RoutineEntity {
+        return RoutineEntity(
+            routineId: id,
+            routineName: title,
+            repeatDay: repeatDay.map({ $0.rawValue }),
+            executionTime: startTime.convertToString(dateType: .time),
+            routineCompleteYn: isDone,
+            subRoutineNames: subRoutines,
+            subRoutineCompleteYn: subRoutineCompleted,
+            recommendedRoutineType: routineType?.rawValue,
+            routineDeletedYn: isDeleted,
+            routineStartDate: startDate.convertToString(dateType: .yearMonthDate),
+            routineEndDate: endDate.convertToString(dateType: .yearMonthDate))
+    }
 }
 
 extension RoutineEntity {
diff --git a/Projects/Presentation/Sources/Home/View/Component/DateView.swift b/Projects/Presentation/Sources/Home/View/Component/DateView.swift
@@ -16,19 +16,21 @@ final class DateView: UIView {
         static let dateButtonTopSpacing: CGFloat = 7
         static let dateButtonSize: CGFloat = 30
         static let dateLabelHeight: CGFloat = 17
+        static let allCompletedIconTopSpacing: CGFloat = 5
     }
 
     private let dayLabel = UILabel()
     private let dateButton = UIButton()
     private let dateLabel = UILabel()
+    private let allCompletedIcon = UIImageView()
     private let date: Date
     private let isToday: Bool
     private var isSelected: Bool {
         didSet {
             updateAttribute()
         }
     }
-    var didTappedDateButton: ((Date) -> Void)?
+    var didTapDateButton: ((Date) -> Void)?
 
     init(
         date: Date,
@@ -66,12 +68,16 @@ final class DateView: UIView {
         dateLabel.text = "\(date.convertToString(dateType: .date))"
         dateLabel.font = BitnagilFont(style: .body2, weight: .medium).font
         dateLabel.textColor = BitnagilColor.gray70
+
+        allCompletedIcon.image = BitnagilIcon.asteriskIcon
+        allCompletedIcon.isHidden = true
     }
 
     private func configureLayout() {
         addSubview(dayLabel)
         addSubview(dateButton)
         dateButton.addSubview(dateLabel)
+        addSubview(allCompletedIcon)
 
         dayLabel.snp.makeConstraints { make in
             make.top.leading.trailing.equalToSuperview()
@@ -89,6 +95,11 @@ final class DateView: UIView {
             make.center.equalToSuperview()
             make.height.equalTo(Layout.dateLabelHeight)
         }
+
+        allCompletedIcon.snp.makeConstraints { make in
+            make.top.equalTo(dateButton.snp.bottom).offset(Layout.allCompletedIconTopSpacing)
+            make.centerX.equalToSuperview()
+        }
     }
 
     private func updateAttribute() {
@@ -106,10 +117,14 @@ final class DateView: UIView {
     }
 
     private func selectDate() {
-        didTappedDateButton?(date)
+        didTapDateButton?(date)
     }
 
     func updateSelectState(isSelected: Bool) {
         self.isSelected = isSelected
     }
+
+    func updateAllCompleted() {
+        allCompletedIcon.isHidden.toggle()
+    }
 }
diff --git a/Projects/Presentation/Sources/Home/View/Component/RoutineView.swift b/Projects/Presentation/Sources/Home/View/Component/RoutineView.swift
@@ -9,20 +9,23 @@ import Shared
 import SnapKit
 import UIKit
 
+protocol RoutineViewDelegate: AnyObject {
+    func routineView(_ sender: RoutineView, didTapMainRoutine routine: Routine)
+    func routineView(_ sender: RoutineView, didTapSubRoutine routine: Routine)
+}
+
 final class RoutineView: UIView {
     private enum Layout {
         static let horizontalMargin: CGFloat = 16
         static let routineContentStackViewSpacing: CGFloat = 10
         static let routineContentStackViewVerticalMargin: CGFloat = 10
         static let timeLabelWidth: CGFloat = 42
         static let containerViewLeadingSpacing: CGFloat = 8
-        static let mainRoutineViewHeight: CGFloat = 28
+        static let mainRoutineViewHeight: CGFloat = 40
         static let mainRoutineLabelTrailingSpacing: CGFloat = 10
         static let mainRoutineCheckButtonSize: CGFloat = 28
-        static let grayLineHeight: CGFloat = 1
         static let subRoutineViewHeight: CGFloat = 24
-        static let subRoutineLabelLeadingSpacing: CGFloat = 10
-        static let subRoutineCheckButtonSize: CGFloat = 24
+        static let grayLineHeight: CGFloat = 1
     }
 
     private let timeLabel = UILabel()
@@ -32,12 +35,14 @@ final class RoutineView: UIView {
     private let mainRoutineLabel = UILabel()
     private let mainRoutineCheckButton = UIButton()
     private let grayLine = UIView()
+    private var subRoutineViews: [Int: SubRoutineView] = [:]
     private var routine: Routine {
         didSet {
             updateRoutineState()
         }
     }
 
+    weak var delegate: RoutineViewDelegate?
     init(routine: Routine) {
         self.routine = routine
         super.init(frame: .zero)
@@ -79,6 +84,7 @@ final class RoutineView: UIView {
                 var updatedRoutine = routine
                 updatedRoutine.isDone.toggle()
                 self.routine = updatedRoutine
+                self.delegate?.routineView(self, didTapMainRoutine: self.routine)
             },
             for: .touchUpInside)
 
@@ -98,9 +104,14 @@ final class RoutineView: UIView {
             routineContentStackView.addArrangedSubview($0)
         }
 
-        for subRoutine in zip(routine.subRoutines, routine.subRoutineCompleted) {
-            let subRoutineView = makeSubRoutineView(subRoutine: subRoutine)
+        for (index, subRoutine) in zip(routine.subRoutines, routine.subRoutineCompleted).enumerated() {
+            let subRoutineView = SubRoutineView(subRoutine: subRoutine, index: index)
             routineContentStackView.addArrangedSubview(subRoutineView)
+            subRoutineView.snp.makeConstraints { make in
+                make.height.greaterThanOrEqualTo(Layout.subRoutineViewHeight)
+            }
+            subRoutineView.delegate = self
+            subRoutineViews[index] = subRoutineView
         }
 
         containerView.addSubview(routineContentStackView)
@@ -143,43 +154,17 @@ final class RoutineView: UIView {
         }
     }
 
-    private func makeSubRoutineView(subRoutine: (title: String, isDone: Bool)) -> UIView {
-        let subRoutineView = UIView()
-        let checkButton = UIButton()
-        let subRoutineLabel = UILabel()
-
-        subRoutineView.addSubview(checkButton)
-        subRoutineView.addSubview(subRoutineLabel)
-
-        let subRoutineCheckIcon = subRoutine.isDone ? BitnagilIcon.checkedCircleSmallIcon : BitnagilIcon.uncheckedCircleSmallIcon
-        checkButton.setImage(subRoutineCheckIcon, for: .normal)
-
-        subRoutineLabel.text = subRoutine.title
-        subRoutineLabel.font = BitnagilFont(style: .body2, weight: .medium).font
-        subRoutineLabel.textColor = BitnagilColor.gray40
-        subRoutineLabel.numberOfLines = 0
-
-        checkButton.snp.makeConstraints { make in
-            make.leading.equalToSuperview()
-            make.centerY.equalTo(subRoutineLabel)
-            make.size.equalTo(Layout.subRoutineCheckButtonSize)
-        }
-
-        subRoutineLabel.snp.makeConstraints { make in
-            make.leading.equalTo(checkButton.snp.trailing).offset(Layout.subRoutineLabelLeadingSpacing)
-            make.trailing.equalToSuperview()
-            make.verticalEdges.equalToSuperview()
-        }
-
-        subRoutineView.snp.makeConstraints { make in
-            make.height.greaterThanOrEqualTo(Layout.subRoutineViewHeight)
-        }
-
-        return subRoutineView
-    }
-
     func updateRoutineState() {
         let isDone = routine.isDone
         mainRoutineCheckButton.setImage(isDone ? BitnagilIcon.checkedCircleIcon : BitnagilIcon.uncheckedCircleIcon, for: .normal)
     }
 }
+
+extension RoutineView: SubRoutineViewDelegate {
+    func subRoutineView(_ sender: SubRoutineView, didTapSubRoutine index: Int) {
+        var updatedRoutine = routine
+        updatedRoutine.subRoutineCompleted[index].toggle()
+        self.routine = updatedRoutine
+        self.delegate?.routineView(self, didTapSubRoutine: routine)
+    }
+}
diff --git a/Projects/Presentation/Sources/Home/View/Component/SubRoutineView.swift b/Projects/Presentation/Sources/Home/View/Component/SubRoutineView.swift
diff --git a/Projects/Presentation/Sources/Home/View/Component/WeekView.swift b/Projects/Presentation/Sources/Home/View/Component/WeekView.swift
diff --git a/Projects/Presentation/Sources/Home/View/HomeViewController.swift b/Projects/Presentation/Sources/Home/View/HomeViewController.swift
diff --git a/Projects/Presentation/Sources/Home/ViewModel/HomeViewModel.swift b/Projects/Presentation/Sources/Home/ViewModel/HomeViewModel.swift

Original file line number	Diff line number	Diff line change
`@@ -6,13 +6,11 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`struct RoutineCompletionListDTO: Encodable {`
`9`		`- let performedDate: String`
`10`	`9`	`let routineCompletionInfos: [RoutineCompletionDTO]`
`11`	`10`	`}`
`12`	`11`
`13`	`12`	`struct RoutineCompletionDTO: Encodable {`
`14`	`13`	`let routineId: String`
`15`		`- let completeYn: Bool`
`16`		`- let historySeq: Int`
`17`		`- let routineType: String`
	`14`	`+ let routineCompleteYn: Bool`
	`15`	`+ let subRoutineCompleteYn: [Bool]`
`18`	`16`	`}`
Original file line number	Diff line number	Diff line change
`@@ -38,5 +38,5 @@ public protocol RoutineRepositoryProtocol {`
`38`	`38`
`39`	`39`	`/// 루틴 완료 여부를 업데이트 합니다.`
`40`	`40`	`/// - Parameter routines: 완료 여부를 업데이트할 루틴 배열`
`41`		`- func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws`
	`41`	`+ func updateRoutineCompletions(routines: [RoutineEntity]) async throws`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,5 +18,5 @@ public protocol RoutineUseCaseProtocol {`
`18`	`18`
`19`	`19`	`func deleteDailyRoutine(routineId: String) async throws`
`20`	`20`
`21`		`- func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws`
	`21`	`+ func updateRoutineCompletions(routines: [RoutineEntity]) async throws`
`22`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ public final class RoutineUseCase: RoutineUseCaseProtocol {`
`63`	`63`	`try await routineRepository.deleteDailyRoutine(routineId: routineId)`
`64`	`64`	`}`
`65`	`65`
`66`		`- public func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws {`
	`66`	`+ public func updateRoutineCompletions(routines: [RoutineEntity]) async throws {`
`67`	`67`	`try await routineRepository.updateRoutineCompletions(routines: routines)`
`68`	`68`	`}`
`69`	`69`	`}`