[Feat-T3-159] 루틴 리스트 화면 구현 및 서버 v2 연동

Projects/DataSource/Sources/DTO/LoginResponseDTO.swift

@@ -1,5 +1,5 @@
 //
-//  TokenResponseDTO.swift
+//  LoginResponseDTO.swift
 //  DataSource
 //
 //  Created by 최정인 on 6/30/25.

Projects/DataSource/Sources/DTO/RoutineDTO.swift

@@ -0,0 +1,46 @@
+//
+//  RoutineDTO.swift
+//  DataSource
+//
+//  Created by 최정인 on 8/19/25.
+//
+
+import Domain
+
+struct RoutineDictionaryDTO: Decodable {
+    let routines: [String: RoutineDateDTO]
+}
+
+struct RoutineDateDTO: Decodable {
+    let routineList: [RoutineDTO]
+    let allCompleted: Bool
+}
+
+struct RoutineDTO: Decodable {
+    let routineId: String
+    let routineName: String
+    let repeatDay: [String]
+    let executionTime: String
+    let routineCompleteYn: Bool
+    let subRoutineNames: [String]
+    let subRoutineCompleteYn: [Bool]
+    let recommendedRoutineType: String?
+    let routineDeletedYn: Bool
+    let routineStartDate: String
+    let routineEndDate: String
+
+    func toRoutineEntity() -> RoutineEntity {
+        return RoutineEntity(
+            routineId: routineId,
+            routineName: routineName,
+            repeatDay: repeatDay,
+            executionTime: executionTime,
+            routineCompleteYn: routineCompleteYn,
+            subRoutineNames: subRoutineNames,
+            subRoutineCompleteYn: subRoutineCompleteYn,
+            recommendedRoutineType: recommendedRoutineType,
+            routineDeletedYn: routineDeletedYn,
+            routineStartDate: routineStartDate,
+            routineEndDate: routineEndDate)
+    }
+}

Projects/DataSource/Sources/Endpoint/RoutineEndpoint.swift

@@ -11,17 +11,17 @@ enum RoutineEndpoint {
     case fetchRoutines(startDate: String, endDate: String)
     case updateRoutine(routine: RoutineCreationDTO)
     case deleteAllRoutine(routineId: String)
-    case deleteDailyRoutine(routine: DeleteRoutineDTO)
+    case deleteDailyRoutine(routineId: String)
     case updateRoutineCompletion(routines: RoutineCompletionListDTO)
 }
 
 extension RoutineEndpoint: Endpoint {
     var baseURL: String {
         switch self {
-        case .createRoutine, .updateRoutine:
-            return AppProperties.baseURL + "/api/v2/routines"
-        default:
+        case .deleteAllRoutine:
             return AppProperties.baseURL + "/api/v1/routines"
+        default:
+            return AppProperties.baseURL + "/api/v2/routines"
         }
     }
 
@@ -31,8 +31,8 @@ extension RoutineEndpoint: Endpoint {
             "\(baseURL)/\(routineId)"
         case .deleteAllRoutine(let routineId):
             "\(baseURL)/\(routineId)"
-        case .deleteDailyRoutine:
-            "\(baseURL)/day"
+        case .deleteDailyRoutine(let routineId):
+            "\(baseURL)/day/\(routineId)"
         case .updateRoutineCompletion:
             "\(baseURL)/completions"
         default:
@@ -78,8 +78,6 @@ extension RoutineEndpoint: Endpoint {
             return routine.dictionary
         case .updateRoutine(let routine):
             return routine.dictionary
-        case .deleteDailyRoutine(let routine):
-            return routine.dictionary
         case .updateRoutineCompletion(let routines):
             return routines.dictionary
         default:

Projects/DataSource/Sources/Repository/RoutineRepository.swift

@@ -29,23 +29,25 @@ final class RoutineRepository: RoutineRepositoryProtocol {
 
     func fetchRoutine(routineId: String) async throws -> RoutineEntity? {
         let endpoint = RoutineEndpoint.fetchRoutine(routineId: routineId)
-        guard let response = try await networkService.request(endpoint: endpoint, type: RoutineResponseDTO.self) else { return nil }
+        guard let response = try await networkService.request(endpoint: endpoint, type: RoutineDTO.self) else { return nil }
 
         return response.toRoutineEntity()
     }
 
-    func fetchRoutines(from startDate: String, to endDate: String) async throws -> [String: [RoutineEntity]] {
+    func fetchRoutines(from startDate: String, to endDate: String) async throws -> [String: (routines: [RoutineEntity], allCompleted: Bool)] {
         let endpoint = RoutineEndpoint.fetchRoutines(startDate: startDate, endDate: endDate)
         guard let response = try await networkService.request(endpoint: endpoint, type: RoutineDictionaryDTO.self)
         else { return [:] }
 
-        var result: [String: [RoutineEntity]] = [:]
+        var result: [String: ([RoutineEntity], Bool)] = [:]
         for (date, routineDTO) in response.routines {
-            result[date] = routineDTO.compactMap({ $0.toRoutineEntity() })
+            let allCompleted = routineDTO.allCompleted
+            let routines = routineDTO.routineList.compactMap({ $0.toRoutineEntity() })
+            result[date] = (routines, allCompleted)
         }
         return result
     }
-
+    
     func updateRoutine(routine: RoutineCreationEntity) async throws {
         let routineUpdateDTO = RoutineCreationDTO(
             routineId: routine.id,
@@ -67,20 +69,8 @@ final class RoutineRepository: RoutineRepositoryProtocol {
         _ = try await networkService.request(endpoint: endpoint, type: EmptyResponseDTO.self)
     }
 
-    func deleteDailyRoutine(routine: DeleteRoutineEntity) async throws {
-        let deleteSubRoutineDTO = routine
-            .subRoutineInfosForDelete
-            .map({ DeleteSubRoutineDTO(subRoutineId: $0.subRoutineId, routineCompletionId: $0.routineCompletionId) })
-
-        let deleteRoutineDTO = DeleteRoutineDTO(
-            routineId: routine.routineId,
-            routineCompletionId: routine.routineCompletionId,
-            historySeq: routine.historySeq,
-            routineType: routine.routineType,
-            performedDate: routine.performedDate,
-            subRoutineInfosForDelete: deleteSubRoutineDTO)
-
-        let endpoint = RoutineEndpoint.deleteDailyRoutine(routine: deleteRoutineDTO)
+    func deleteDailyRoutine(routineId: String) async throws {
+        let endpoint = RoutineEndpoint.deleteDailyRoutine(routineId: routineId)
         _ = try await networkService.request(endpoint: endpoint, type: EmptyResponseDTO.self)
     }
 

Projects/Domain/Sources/Entity/RoutineEntity.swift

@@ -2,44 +2,45 @@
 //  RoutineEntity.swift
 //  Domain
 //
-//  Created by 최정인 on 7/30/25.
+//  Created by 최정인 on 8/19/25.
 //
 
 public struct RoutineEntity {
-    public let routineId: String?
-    public let historySeq: Int
+    public let routineId: String
     public let routineName: String
-    public let repeatDay: [Week]
+    public let repeatDay: [String]
     public let executionTime: String
-    public let subRoutineSearchResultDto: [SubRoutineEntity]
-    public let modifiedYn: Bool
-    public let routineCompletionId: Int?
-    public let completeYn: Bool
-    public let routineType: String
+    public let routineCompleteYn: Bool
+    public let subRoutineNames: [String]
+    public let subRoutineCompleteYn: [Bool]
+    public let recommendedRoutineType: String?
+    public let routineDeletedYn: Bool
+    public let routineStartDate: String
+    public let routineEndDate: String
 
     public init(
-        routineId: String?,
-        historySeq: Int,
+        routineId: String,
         routineName: String,
-        repeatDay: [String]?,
+        repeatDay: [String],
         executionTime: String,
-        subRoutineSearchResultDto: [SubRoutineEntity],
-        modifiedYn: Bool,
-        routineCompletionId: Int?,
-        completeYn: Bool,
-        routineType: String
+        routineCompleteYn: Bool,
+        subRoutineNames: [String],
+        subRoutineCompleteYn: [Bool],
+        recommendedRoutineType: String?,
+        routineDeletedYn: Bool,
+        routineStartDate: String,
+        routineEndDate: String
     ) {
-        let weekType: [Week] = repeatDay?.compactMap(Week.init(rawValue:)) ?? []
-
         self.routineId = routineId
-        self.historySeq = historySeq
         self.routineName = routineName
-        self.repeatDay = weekType
+        self.repeatDay = repeatDay
         self.executionTime = executionTime
-        self.subRoutineSearchResultDto = subRoutineSearchResultDto
-        self.modifiedYn = modifiedYn
-        self.routineCompletionId = routineCompletionId
-        self.completeYn = completeYn
-        self.routineType = routineType
+        self.routineCompleteYn = routineCompleteYn
+        self.subRoutineNames = subRoutineNames
+        self.subRoutineCompleteYn = subRoutineCompleteYn
+        self.recommendedRoutineType = recommendedRoutineType
+        self.routineDeletedYn = routineDeletedYn
+        self.routineStartDate = routineStartDate
+        self.routineEndDate = routineEndDate
     }
 }

Projects/Domain/Sources/Protocol/Repository/RoutineRepositoryProtocol.swift

@@ -21,7 +21,7 @@ public protocol RoutineRepositoryProtocol {
     /// - Parameters:
     ///   - startDate: 조회 시작 날짜
     ///   - endDate: 조회 종료 날짜
-    func fetchRoutines(from startDate: String, to endDate: String) async throws -> [String: [RoutineEntity]]
+    func fetchRoutines(from startDate: String, to endDate: String) async throws -> [String: (routines: [RoutineEntity], allCompleted: Bool)]
 
     /// 루틴을 수정합니다.
     /// - Parameters:
@@ -34,7 +34,7 @@ public protocol RoutineRepositoryProtocol {
 
     /// 당일 루틴을 삭제합니다.
     /// - Parameter routine: 삭제할 루틴 정보
-    func deleteDailyRoutine(routine: DeleteRoutineEntity) async throws
+    func deleteDailyRoutine(routineId: String) async throws
 
     /// 루틴 완료 여부를 업데이트 합니다.
     /// - Parameter routines: 완료 여부를 업데이트할 루틴 배열

Projects/Domain/Sources/Protocol/UseCase/RoutineUseCaseProtocol.swift

@@ -10,13 +10,13 @@ import Foundation
 public protocol RoutineUseCaseProtocol {
     func fetchRoutine(routineId: String) async throws -> RoutineEntity?
 
-    func fetchRoutines(startDate: Date, endDate: Date) async throws -> [String: [RoutineEntity]]
+    func fetchRoutines(startDate: Date, endDate: Date) async throws -> [String: (routines: [RoutineEntity], allCompleted: Bool)]
 
     func saveRoutine(routine: RoutineCreationEntity) async throws
 
     func deleteAllRoutine(routineId: String) async throws
 
-    func deleteDailyRoutine(routine: DeleteRoutineEntity) async throws
+    func deleteDailyRoutine(routineId: String) async throws
 
     func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws
 }

Projects/Domain/Sources/UseCase/Routine/RoutineUseCase.swift

@@ -20,7 +20,7 @@ public final class RoutineUseCase: RoutineUseCaseProtocol {
         return routineEnity
     }
 
-    public func fetchRoutines(startDate: Date, endDate: Date) async throws -> [String: [RoutineEntity]] {
+    public func fetchRoutines(startDate: Date, endDate: Date) async throws -> [String: (routines: [RoutineEntity], allCompleted: Bool)] {
         let start = startDate.convertToString(dateType: .yearMonthDate)
         let end = endDate.convertToString(dateType: .yearMonthDate)
 
@@ -59,8 +59,8 @@ public final class RoutineUseCase: RoutineUseCaseProtocol {
         try await routineRepository.deleteAllRoutine(routineId: routineId)
     }
 
-    public func deleteDailyRoutine(routine: DeleteRoutineEntity) async throws {
-        try await routineRepository.deleteDailyRoutine(routine: routine)
+    public func deleteDailyRoutine(routineId: String) async throws {
+        try await routineRepository.deleteDailyRoutine(routineId: routineId)
     }
 
     public func updateRoutineCompletions(routines: [RoutineCompletionEntity]) async throws {

Projects/Presentation/Resources/Images.xcassets/RoutineList/Contents.json

@@ -0,0 +1,6 @@
+{
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

Projects/Presentation/Resources/Images.xcassets/repeat_icon.imageset/Contents.json → Projects/Presentation/Resources/Images.xcassets/RoutineList/close_icon.imageset/Contents.json

@@ -1,17 +1,17 @@
 {
   "images" : [
     {
-      "filename" : "repeat_icon.png",
+      "filename" : "close_icon.png",
       "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "filename" : "repeat_icon@2x.png",
+      "filename" : "close_icon@2x.png",
       "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "filename" : "repeat_icon@3x.png",
+      "filename" : "close_icon@3x.png",
       "idiom" : "universal",
       "scale" : "3x"
     }