ui: 스티키 헤더로 정렬, 필터링 옵션을 위치시킨다

opficdev · opficdev · commit 61ebda50e9ad · 2026-03-03T11:34:33.000+09:00
diff --git a/DevLog/Data/DTO/TodoCursorDTO.swift b/DevLog/Data/DTO/TodoCursorDTO.swift
@@ -8,6 +8,6 @@
 import Foundation
 
 struct TodoCursorDTO {
-    let createdAt: Date
+    let orderedAt: Date
     let documentID: String
 }
diff --git a/DevLog/Data/Mapper/TodoMapping.swift b/DevLog/Data/Mapper/TodoMapping.swift
@@ -50,14 +50,14 @@ extension TodoResponse {
 extension TodoCursorDTO {
     func toDomain() -> TodoCursor {
         TodoCursor(
-            createdAt: createdAt,
+            orderedAt: orderedAt,
             documentID: documentID
         )
     }
 
     static func fromDomain(_ cursor: TodoCursor) -> Self {
         TodoCursorDTO(
-            createdAt: cursor.createdAt,
+            orderedAt: cursor.orderedAt,
             documentID: cursor.documentID
         )
     }
diff --git a/DevLog/Domain/Entity/TodoCursor.swift b/DevLog/Domain/Entity/TodoCursor.swift
@@ -8,6 +8,6 @@
 import Foundation
 
 struct TodoCursor {
-    let createdAt: Date
+    let orderedAt: Date
     let documentID: String
 }
diff --git a/DevLog/Domain/Entity/TodoQuery.swift b/DevLog/Domain/Entity/TodoQuery.swift
@@ -8,31 +8,77 @@
 import Foundation
 
 struct TodoQuery {
-    let kind: TodoKind?
-    let keyword: String?
-    let isPinned: Bool?
-    let createdAtFrom: Date?
-    let createdAtTo: Date?
-    let createdAtDescending: Bool
-    let pageSize: Int
-    let fetchAllPages: Bool
+    enum SortTarget: Equatable, Hashable {
+        case createdAt
+        case updatedAt
+
+        var fieldName: String {
+            switch self {
+            case .createdAt:
+                return "createdAt"
+            case .updatedAt:
+                return "updatedAt"
+            }
+        }
+    }
+
+    enum SortOrder: Equatable, Hashable {
+        case latest
+        case oldest
+
+        var isDescending: Bool {
+            self == .latest
+        }
+    }
+
+    enum CompletionFilter: Equatable, Hashable {
+        case all
+        case incomplete
+        case completed
+
+        var isCompletedValue: Bool? {
+            switch self {
+            case .all:
+                return nil
+            case .incomplete:
+                return false
+            case .completed:
+                return true
+            }
+        }
+    }
+
+    var kind: TodoKind?
+    var keyword: String?
+    var isPinned: Bool?
+    var completionFilter: CompletionFilter
+    var createdAtFrom: Date?
+    var createdAtTo: Date?
+    var sortTarget: SortTarget
+    var sortOrder: SortOrder
+    var pageSize: Int
+    var fetchAllPages: Bool
 
     init(
         kind: TodoKind? = nil,
         keyword: String? = nil,
         isPinned: Bool? = nil,
+        completionFilter: CompletionFilter = .all,
         createdAtFrom: Date? = nil,
         createdAtTo: Date? = nil,
-        createdAtDescending: Bool = true,
+        sortTarget: SortTarget = .createdAt,
+        sortOrder: SortOrder = .latest,
         pageSize: Int = 20,
         fetchAllPages: Bool = false
     ) {
         self.kind = kind
         self.keyword = keyword
         self.isPinned = isPinned
+        self.completionFilter = completionFilter
         self.createdAtFrom = createdAtFrom
         self.createdAtTo = createdAtTo
-        self.createdAtDescending = createdAtDescending
+        self.sortTarget = sortTarget
+        self.sortOrder = sortOrder
         self.pageSize = pageSize
         self.fetchAllPages = fetchAllPages
     }
diff --git a/DevLog/Domain/UseCase/UserData/Fetch/Todo/FetchTodosByKindUseCase.swift b/DevLog/Domain/UseCase/UserData/Fetch/Todo/FetchTodosByKindUseCase.swift
@@ -6,5 +6,5 @@
 //
 
 protocol FetchTodosByKindUseCase {
-    func execute(_ kind: TodoKind, cursor: TodoCursor?) async throws -> TodoPage
+    func execute(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage
 }
diff --git a/DevLog/Domain/UseCase/UserData/Fetch/Todo/FetchTodosByKindUseCaseImpl.swift b/DevLog/Domain/UseCase/UserData/Fetch/Todo/FetchTodosByKindUseCaseImpl.swift
@@ -12,8 +12,7 @@ final class FetchTodosByKindUseCaseImpl: FetchTodosByKindUseCase {
         self.repository = repository
     }
 
-    func execute(_ kind: TodoKind, cursor: TodoCursor?) async throws -> TodoPage {
-        let query = TodoQuery(kind: kind)
+    func execute(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage {
         return try await repository.fetchTodos(query, cursor: cursor)
     }
 }
diff --git a/DevLog/Infra/Service/TodoService.swift b/DevLog/Infra/Service/TodoService.swift
@@ -21,10 +21,12 @@ final class TodoService {
 
         let trimmedKeyword = query.keyword?.trimmingCharacters(in: .whitespacesAndNewlines) ?? ""
         let logComponents: [String?] = [
-            "createdAtDescending=\(query.createdAtDescending)",
+            "sortTarget=\(query.sortTarget.fieldName)",
+            "sortOrder=\(query.sortOrder == .latest ? "latest" : "oldest")",
             query.keyword != nil ? "keywordLength=\(trimmedKeyword.count)" : nil,
             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.createdAtFrom != nil ? "createdAtFrom=\(query.createdAtFrom!)" : nil,
             query.createdAtTo != nil ? "createdAtTo=\(query.createdAtTo!)" : nil,
             "pageSize=\(query.pageSize)",
@@ -35,7 +37,7 @@ final class TodoService {
 
         var firestoreQuery: Query = store
             .collection("users/\(uid)/todoLists/")
-            .order(by: "createdAt", descending: query.createdAtDescending)
+            .order(by: query.sortTarget.fieldName, descending: query.sortOrder.isDescending)
             .order(by: FieldPath.documentID())
 
         if let kind = query.kind {
@@ -46,6 +48,10 @@ final class TodoService {
             firestoreQuery = firestoreQuery.whereField("isPinned", isEqualTo: isPinned)
         }
 
+        if let isCompleted = query.completionFilter.isCompletedValue {
+            firestoreQuery = firestoreQuery.whereField("isCompleted", isEqualTo: isCompleted)
+        }
+
         if let createdAtFrom = query.createdAtFrom {
             firestoreQuery = firestoreQuery.whereField(
                 "createdAt",
@@ -69,7 +75,7 @@ final class TodoService {
                     var pageQuery = firestoreQuery
                     if let pageCursor {
                         pageQuery = pageQuery.start(after: [
-                            Timestamp(date: pageCursor.createdAt),
+                            Timestamp(date: pageCursor.orderedAt),
                             pageCursor.documentID
                         ])
                     }
@@ -83,7 +89,10 @@ final class TodoService {
                     }
 
                     guard let lastDocument = snapshot.documents.last,
-                          let nextCursor = makeCursor(from: lastDocument) else {
+                          let nextCursor = makeCursor(
+                            from: lastDocument,
+                            orderField: query.sortTarget.fieldName
+                          ) else {
                         break
                     }
 
@@ -95,15 +104,17 @@ final class TodoService {
 
             if let cursor {
                 firestoreQuery = firestoreQuery.start(after: [
-                    Timestamp(date: cursor.createdAt),
+                    Timestamp(date: cursor.orderedAt),
                     cursor.documentID
                 ])
             }
 
             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) }
+            let nextCursor = snapshot.documents.last.flatMap {
+                makeCursor(from: $0, orderField: query.sortTarget.fieldName)
+            }
 
             return TodoPageResponse(items: items, nextCursor: nextCursor)
         }
@@ -184,13 +195,16 @@ final class TodoService {
 }
 
 private extension TodoService {
-    func makeCursor(from document: QueryDocumentSnapshot) -> TodoCursorDTO? {
-        guard let createdAt = document.data()[TodoFieldKey.createdAt.rawValue] as? Timestamp else {
+    func makeCursor(
+        from document: QueryDocumentSnapshot,
+        orderField: String
+    ) -> TodoCursorDTO? {
+        guard let orderedAt = document.data()[orderField] as? Timestamp else {
             return nil
         }
 
         return TodoCursorDTO(
-            createdAt: createdAt.dateValue(),
+            orderedAt: orderedAt.dateValue(),
             documentID: document.documentID
         )
     }
diff --git a/DevLog/Presentation/Structure/TodoListItem.swift b/DevLog/Presentation/Structure/TodoListItem.swift
@@ -13,12 +13,16 @@ struct TodoListItem: Identifiable, Hashable {
     let tags: [String]
     let isPinned: Bool
     let isCompleted: Bool
+    let createdAt: Date
+    let updatedAt: Date
 
     init(from todo: Todo) {
         self.id = todo.id
         self.title = todo.title
         self.tags = todo.tags
         self.isPinned = todo.isPinned
         self.isCompleted = todo.isCompleted
+        self.createdAt = todo.createdAt
+        self.updatedAt = todo.updatedAt
     }
 }
diff --git a/DevLog/Presentation/ViewModel/TodoListViewModel.swift b/DevLog/Presentation/ViewModel/TodoListViewModel.swift
diff --git a/DevLog/Resource/Localizable.xcstrings b/DevLog/Resource/Localizable.xcstrings
diff --git a/DevLog/UI/Home/TodoListView.swift b/DevLog/UI/Home/TodoListView.swift

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,6 @@`
`8`	`8`	`import Foundation`
`9`	`9`
`10`	`10`	`struct TodoCursorDTO {`
`11`		`- let createdAt: Date`
	`11`	`+ let orderedAt: Date`
`12`	`12`	`let documentID: String`
`13`	`13`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,14 +50,14 @@ extension TodoResponse {`
`50`	`50`	`extension TodoCursorDTO {`
`51`	`51`	`func toDomain() -> TodoCursor {`
`52`	`52`	`TodoCursor(`
`53`		`- createdAt: createdAt,`
	`53`	`+ orderedAt: orderedAt,`
`54`	`54`	`documentID: documentID`
`55`	`55`	`)`
`56`	`56`	`}`
`57`	`57`
`58`	`58`	`static func fromDomain(_ cursor: TodoCursor) -> Self {`
`59`	`59`	`TodoCursorDTO(`
`60`		`- createdAt: cursor.createdAt,`
	`60`	`+ orderedAt: cursor.orderedAt,`
`61`	`61`	`documentID: cursor.documentID`
`62`	`62`	`)`
`63`	`63`	`}`
Original file line number	Diff line number	Diff line change
`@@ -6,5 +6,5 @@`
`6`	`6`	`//`
`7`	`7`
`8`	`8`	`protocol FetchTodosByKindUseCase {`
`9`		`- func execute(_ kind: TodoKind, cursor: TodoCursor?) async throws -> TodoPage`
	`9`	`+ func execute(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage`
`10`	`10`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ final class FetchTodosByKindUseCaseImpl: FetchTodosByKindUseCase {`
`12`	`12`	`self.repository = repository`
`13`	`13`	`}`
`14`	`14`
`15`		`- func execute(_ kind: TodoKind, cursor: TodoCursor?) async throws -> TodoPage {`
`16`		`- let query = TodoQuery(kind: kind)`
	`15`	`+ func execute(_ query: TodoQuery, cursor: TodoCursor?) async throws -> TodoPage {`
`17`	`16`	`return try await repository.fetchTodos(query, cursor: cursor)`
`18`	`17`	`}`
`19`	`18`	`}`