[#198] 오늘 기준으로 관련이 있는 Todo들을 보여주는 뷰를 구성한다

DevLog/App/Assembler/DomainAssembler.swift

@@ -154,5 +154,13 @@ private extension DomainAssembler {
         container.register(UpdateProfileHeatmapActivityTypesUseCase.self) {
             UpdateProfileHeatmapActivityTypesUseCaseImpl(container.resolve(UserPreferencesRepository.self))
         }
+
+        container.register(FetchTodayDisplayOptionsUseCase.self) {
+            FetchTodayDisplayOptionsUseCaseImpl(container.resolve(UserPreferencesRepository.self))
+        }
+
+        container.register(UpdateTodayDisplayOptionsUseCase.self) {
+            UpdateTodayDisplayOptionsUseCaseImpl(container.resolve(UserPreferencesRepository.self))
+        }
     }
 }

DevLog/Data/DTO/TodoCursorDTO.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 struct TodoCursorDTO {
-    let orderedAt: Date
+    let primarySortDate: Date?
+    let secondarySortDate: Date?
     let documentID: String
 }

DevLog/Data/Mapper/TodoMapping.swift

@@ -50,14 +50,16 @@ extension TodoResponse {
 extension TodoCursorDTO {
     func toDomain() -> TodoCursor {
         TodoCursor(
-            orderedAt: orderedAt,
+            primarySortDate: primarySortDate,
+            secondarySortDate: secondarySortDate,
             documentID: documentID
         )
     }
 
     static func fromDomain(_ cursor: TodoCursor) -> Self {
         TodoCursorDTO(
-            orderedAt: cursor.orderedAt,
+            primarySortDate: cursor.primarySortDate,
+            secondarySortDate: cursor.secondarySortDate,
             documentID: cursor.documentID
         )
     }

DevLog/Data/Repository/UserPreferencesRepositoryImpl.swift

@@ -17,6 +17,8 @@ final class UserPreferencesRepositoryImpl: UserPreferencesRepository {
         static let pushTimeFilter = "PushNotification.timeFilter"
         static let pushUnreadOnly = "PushNotification.showUnreadOnly"
         static let profileHeatmapActivityTypes = "Profile.heatmap.activityTypes"
+        static let todayDueDateVisibility = "Today.dueDateVisibility"
+        static let todayFocusVisibility = "Today.focusVisibility"
     }
 
     private let store: UserDefaultsStore
@@ -101,4 +103,23 @@ final class UserPreferencesRepositoryImpl: UserPreferencesRepository {
     func setProfileHeatmapActivityTypes(_ activityTypes: [String]) {
         store.setStringArray(activityTypes, forKey: Key.profileHeatmapActivityTypes)
     }
+
+    func todayDisplayOptions() -> TodayDisplayOptions {
+        let dueDateVisibilityRawValue = store.string(forKey: Key.todayDueDateVisibility)
+        let focusVisibilityRawValue = store.string(forKey: Key.todayFocusVisibility)
+
+        return TodayDisplayOptions(
+            dueDateVisibility: TodayDisplayOptions.DueDateVisibility(
+                rawValue: dueDateVisibilityRawValue ?? ""
+            ) ?? .all,
+            focusVisibility: TodayDisplayOptions.FocusVisibility(
+                rawValue: focusVisibilityRawValue ?? ""
+            ) ?? .all
+        )
+    }
+
+    func setTodayDisplayOptions(_ options: TodayDisplayOptions) {
+        store.setString(options.dueDateVisibility.rawValue, forKey: Key.todayDueDateVisibility)
+        store.setString(options.focusVisibility.rawValue, forKey: Key.todayFocusVisibility)
+    }
 }

DevLog/Domain/Entity/TodayDisplayOptions.swift

@@ -0,0 +1,29 @@
+//
+//  TodayDisplayOptions.swift
+//  DevLog
+//
+//  Created by opfic on 3/6/26.
+//
+
+import Foundation
+
+struct TodayDisplayOptions: Equatable {
+    enum DueDateVisibility: String, CaseIterable, Equatable {
+        case all
+        case withDueDateOnly
+        case withoutDueDateOnly
+    }
+
+    enum FocusVisibility: String, CaseIterable, Equatable {
+        case all
+        case focusedOnly
+    }
+
+    var dueDateVisibility: DueDateVisibility
+    var focusVisibility: FocusVisibility
+
+    static let `default` = TodayDisplayOptions(
+        dueDateVisibility: .all,
+        focusVisibility: .all
+    )
+}

DevLog/Domain/Entity/TodoCursor.swift

@@ -8,6 +8,7 @@
 import Foundation
 
 struct TodoCursor {
-    let orderedAt: Date
+    let primarySortDate: Date?
+    let secondarySortDate: Date?
     let documentID: String
 }

DevLog/Domain/Entity/TodoQuery.swift

@@ -11,13 +11,16 @@ struct TodoQuery: Equatable {
     enum SortTarget: Equatable, Hashable {
         case createdAt
         case updatedAt
+        case dueDate
 
         var fieldName: String {
             switch self {
             case .createdAt:
                 return "createdAt"
             case .updatedAt:
                 return "updatedAt"
+            case .dueDate:
+                return "dueDate"
             }
         }
     }
@@ -48,10 +51,17 @@ struct TodoQuery: Equatable {
         }
     }
 
+    enum DueDateFilter: Equatable, Hashable {
+        case all
+        case withDueDate
+        case withoutDueDate
+    }
+
     var kind: TodoKind?
     var keyword: String?
     var isPinned: Bool?
     var completionFilter: CompletionFilter
+    var dueDateFilter: DueDateFilter
     var createdAtFrom: Date?
     var createdAtTo: Date?
     var sortTarget: SortTarget
@@ -64,6 +74,7 @@ struct TodoQuery: Equatable {
         keyword: String? = nil,
         isPinned: Bool? = nil,
         completionFilter: CompletionFilter = .all,
+        dueDateFilter: DueDateFilter = .all,
         createdAtFrom: Date? = nil,
         createdAtTo: Date? = nil,
         sortTarget: SortTarget = .createdAt,
@@ -75,6 +86,7 @@ struct TodoQuery: Equatable {
         self.keyword = keyword
         self.isPinned = isPinned
         self.completionFilter = completionFilter
+        self.dueDateFilter = dueDateFilter
         self.createdAtFrom = createdAtFrom
         self.createdAtTo = createdAtTo
         self.sortTarget = sortTarget

DevLog/Domain/Protocol/UserPreferencesRepository.swift

@@ -30,4 +30,7 @@ protocol UserPreferencesRepository {
 
     func profileHeatmapActivityTypes() -> [String]
     func setProfileHeatmapActivityTypes(_ activityTypes: [String])
+
+    func todayDisplayOptions() -> TodayDisplayOptions
+    func setTodayDisplayOptions(_ options: TodayDisplayOptions)
 }

DevLog/Domain/UseCase/UserPreferences/Today/FetchTodayDisplayOptionsUseCase.swift

@@ -0,0 +1,10 @@
+//
+//  FetchTodayDisplayOptionsUseCase.swift
+//  DevLog
+//
+//  Created by opfic on 3/6/26.
+//
+
+protocol FetchTodayDisplayOptionsUseCase {
+    func execute() -> TodayDisplayOptions
+}

DevLog/Domain/UseCase/UserPreferences/Today/FetchTodayDisplayOptionsUseCaseImpl.swift

@@ -0,0 +1,18 @@
+//
+//  FetchTodayDisplayOptionsUseCaseImpl.swift
+//  DevLog
+//
+//  Created by opfic on 3/6/26.
+//
+
+final class FetchTodayDisplayOptionsUseCaseImpl: FetchTodayDisplayOptionsUseCase {
+    private let repository: UserPreferencesRepository
+
+    init(_ repository: UserPreferencesRepository) {
+        self.repository = repository
+    }
+
+    func execute() -> TodayDisplayOptions {
+        repository.todayDisplayOptions()
+    }
+}

DevLog/Domain/UseCase/UserPreferences/Today/UpdateTodayDisplayOptionsUseCase.swift

@@ -0,0 +1,10 @@
+//
+//  UpdateTodayDisplayOptionsUseCase.swift
+//  DevLog
+//
+//  Created by opfic on 3/6/26.
+//
+
+protocol UpdateTodayDisplayOptionsUseCase {
+    func execute(_ options: TodayDisplayOptions)
+}

DevLog/Domain/UseCase/UserPreferences/Today/UpdateTodayDisplayOptionsUseCaseImpl.swift

@@ -0,0 +1,18 @@
+//
+//  UpdateTodayDisplayOptionsUseCaseImpl.swift
+//  DevLog
+//
+//  Created by opfic on 3/6/26.
+//
+
+final class UpdateTodayDisplayOptionsUseCaseImpl: UpdateTodayDisplayOptionsUseCase {
+    private let repository: UserPreferencesRepository
+
+    init(_ repository: UserPreferencesRepository) {
+        self.repository = repository
+    }
+
+    func execute(_ options: TodayDisplayOptions) {
+        repository.setTodayDisplayOptions(options)
+    }
+}

DevLog/Infra/Service/TodoService.swift

@@ -27,6 +27,7 @@ final class TodoService {
             query.kind != nil ? "kind=\(query.kind!.rawValue)" : nil,
             query.isPinned != nil ? "pinned=\(query.isPinned!)" : nil,
             query.completionFilter.isCompletedValue != nil ? "completed=\(query.completionFilter.isCompletedValue!)" : nil,
+            query.dueDateFilter != .all ? "dueDateFilter=\(query.dueDateFilter)" : nil,
             query.createdAtFrom != nil ? "createdAtFrom=\(query.createdAtFrom!)" : nil,
             query.createdAtTo != nil ? "createdAtTo=\(query.createdAtTo!)" : nil,
             "pageSize=\(query.pageSize)",
@@ -35,10 +36,7 @@ final class TodoService {
         ]
         logger.info("Fetching todo page: \(logComponents.compactMap { $0 }.joined(separator: ", "))")
 
-        var firestoreQuery: Query = store
-            .collection("users/\(uid)/todoLists/")
-            .order(by: query.sortTarget.fieldName, descending: query.sortOrder.isDescending)
-            .order(by: FieldPath.documentID())
+        var firestoreQuery: Query = makeOrderedQuery(uid: uid, query: query)
 
         if let kind = query.kind {
             firestoreQuery = firestoreQuery.whereField("kind", isEqualTo: kind.rawValue)
@@ -52,6 +50,18 @@ final class TodoService {
             firestoreQuery = firestoreQuery.whereField("isCompleted", isEqualTo: isCompleted)
         }
 
+        switch query.dueDateFilter {
+        case .all:
+            break
+        case .withDueDate:
+            firestoreQuery = firestoreQuery.whereField(
+                "dueDate",
+                isGreaterThan: Timestamp(date: Date(timeIntervalSince1970: 0))
+            )
+        case .withoutDueDate:
+            firestoreQuery = firestoreQuery.whereField("dueDate", isEqualTo: NSNull())
+        }
+
         if let createdAtFrom = query.createdAtFrom {
             firestoreQuery = firestoreQuery.whereField(
                 "createdAt",
@@ -74,10 +84,7 @@ final class TodoService {
                 while true {
                     var pageQuery = firestoreQuery
                     if let pageCursor {
-                        pageQuery = pageQuery.start(after: [
-                            Timestamp(date: pageCursor.orderedAt),
-                            pageCursor.documentID
-                        ])
+                        pageQuery = pageQuery.start(after: cursorValues(for: query, cursor: pageCursor))
                     }
 
                     pageQuery = pageQuery.limit(to: query.pageSize)
@@ -91,7 +98,7 @@ final class TodoService {
                     guard let lastDocument = snapshot.documents.last,
                           let nextCursor = makeCursor(
                             from: lastDocument,
-                            orderField: query.sortTarget.fieldName
+                            query: query
                           ) else {
                         break
                     }
@@ -103,17 +110,14 @@ final class TodoService {
             }
 
             if let cursor {
-                firestoreQuery = firestoreQuery.start(after: [
-                    Timestamp(date: cursor.orderedAt),
-                    cursor.documentID
-                ])
+                firestoreQuery = firestoreQuery.start(after: cursorValues(for: query, cursor: cursor))
             }
 
             firestoreQuery = firestoreQuery.limit(to: query.pageSize)
             let snapshot = try await firestoreQuery.getDocuments()
             let items = snapshot.documents.compactMap { makeResponse(from: $0) }
             let nextCursor = snapshot.documents.last.flatMap {
-                makeCursor(from: $0, orderField: query.sortTarget.fieldName)
+                makeCursor(from: $0, query: query)
             }
 
             return TodoPageResponse(items: items, nextCursor: nextCursor)
@@ -195,16 +199,76 @@ final class TodoService {
 }
 
 private extension TodoService {
+    func makeOrderedQuery(uid: String, query: TodoQuery) -> Query {
+        let collection = store.collection("users/\(uid)/todoLists/")
+
+        switch query.sortTarget {
+        case .dueDate:
+            return collection
+                .order(by: query.sortTarget.fieldName, descending: query.sortOrder.isDescending)
+                .order(by: "updatedAt", descending: true)
+                .order(by: FieldPath.documentID())
+        case .createdAt, .updatedAt:
+            return collection
+                .order(by: query.sortTarget.fieldName, descending: query.sortOrder.isDescending)
+                .order(by: FieldPath.documentID())
+        }
+    }
+
+    func cursorValues(
+        for query: TodoQuery,
+        cursor: TodoCursorDTO
+    ) -> [Any] {
+        let primaryValue: Any = cursor.primarySortDate.map { Timestamp(date: $0) } ?? NSNull()
+
+        switch query.sortTarget {
+        case .dueDate:
+            guard let secondarySortDate = cursor.secondarySortDate else {
+                return [primaryValue, cursor.documentID]
+            }
+            return [
+                primaryValue,
+                Timestamp(date: secondarySortDate),
+                cursor.documentID
+            ]
+        case .createdAt, .updatedAt:
+            return [
+                primaryValue,
+                cursor.documentID
+            ]
+        }
+    }
+
     func makeCursor(
         from document: QueryDocumentSnapshot,
-        orderField: String
+        query: TodoQuery
     ) -> TodoCursorDTO? {
-        guard let orderedAt = document.data()[orderField] as? Timestamp else {
+        let data = document.data()
+        let orderField = query.sortTarget.fieldName
+        let primarySortDate: Date?
+        let secondarySortDate: Date?
+
+        if let timestamp = data[orderField] as? Timestamp {
+            primarySortDate = timestamp.dateValue()
+        } else if data[orderField] is NSNull {
+            primarySortDate = nil
+        } else {
             return nil
         }
 
+        switch query.sortTarget {
+        case .dueDate:
+            guard let updatedAt = data["updatedAt"] as? Timestamp else {
+                return nil
+            }
+            secondarySortDate = updatedAt.dateValue()
+        case .createdAt, .updatedAt:
+            secondarySortDate = nil
+        }
+
         return TodoCursorDTO(
-            orderedAt: orderedAt.dateValue(),
+            primarySortDate: primarySortDate,
+            secondarySortDate: secondarySortDate,
             documentID: document.documentID
         )
     }