[#356] 차트를 제거하고 히트맵 UI를 구체화하며 Todo 삭제도 집계되도록 개선한다

DevLog/Data/DTO/TodoDTO.swift

@@ -12,13 +12,12 @@ struct TodoRequest: Encodable {
     let isPinned: Bool
     let isCompleted: Bool
     let isChecked: Bool
-    let isDeleted: Bool
-    let number: Int?
     let title: String
     let content: String
     let createdAt: Date
     let updatedAt: Date
     let completedAt: Date?
+    let deletedAt: Date?
     let dueDate: Date?
     let tags: [String]
     let category: String
@@ -35,6 +34,7 @@ struct TodoResponse {
     let createdAt: Date
     let updatedAt: Date
     let completedAt: Date?
+    let deletedAt: Date?
     let dueDate: Date?
     let tags: [String]
     let category: TodoCategoryResponse

DevLog/Data/DTO/UserProfileResponse.swift

@@ -12,4 +12,5 @@ struct UserProfileResponse: Decodable {
     let email: String
     let statusMessage: String
     let avatarURL: URL?
+    let createdAt: Date
 }

DevLog/Data/Mapper/TodoMapping.swift

@@ -12,13 +12,12 @@ extension TodoRequest {
             isPinned: entity.isPinned,
             isCompleted: entity.isCompleted,
             isChecked: entity.isChecked,
-            isDeleted: false,
-            number: entity.number,
             title: entity.title,
             content: entity.content,
             createdAt: entity.createdAt,
             updatedAt: entity.updatedAt,
             completedAt: entity.completedAt,
+            deletedAt: entity.deletedAt,
             dueDate: entity.dueDate,
             tags: entity.tags,
             category: entity.category.storageValue
@@ -48,6 +47,7 @@ extension TodoResponse {
             createdAt: self.createdAt,
             updatedAt: self.updatedAt,
             completedAt: self.completedAt,
+            deletedAt: self.deletedAt,
             dueDate: self.dueDate,
             tags: self.tags,
             category: todoCategory

DevLog/Data/Mapper/UserProfileMapping.swift

@@ -11,7 +11,8 @@ extension UserProfileResponse {
             name: self.name,
             email: self.email,
             statusMessage: self.statusMessage,
-            avatarURL: self.avatarURL
+            avatarURL: self.avatarURL,
+            createdAt: self.createdAt
         )
     }
 }

DevLog/Data/Repository/TodoRepositoryImpl.swift

@@ -135,6 +135,7 @@ private extension TodoRepositoryImpl {
             createdAt: response.createdAt,
             updatedAt: response.updatedAt,
             completedAt: response.completedAt,
+            deletedAt: response.deletedAt,
             dueDate: response.dueDate,
             tags: response.tags,
             category: .decoded(category)

DevLog/Domain/Entity/ActivityKind.swift

@@ -0,0 +1,14 @@
+//
+//  ActivityKind.swift
+//  DevLog
+//
+//  Created by opfic on 4/4/26.
+//
+
+import Foundation
+
+enum ActivityKind: String, Hashable {
+    case created
+    case completed
+    case deleted
+}

DevLog/Domain/Entity/Todo.swift

@@ -18,6 +18,7 @@ struct Todo: Hashable {
     var createdAt: Date     //  할 일 생성 날짜
     var updatedAt: Date     //  할 일 수정 날짜
     var completedAt: Date?  //  할 일 완료 날짜
+    var deletedAt: Date?    //  할 일 삭제 날짜
     var dueDate: Date?      //  할 일의 마감 날짜 (선택 사항)
     var tags: [String]      //  할 일에 연결된 태그들
     var category: TodoCategory  //  할 일의 종류

DevLog/Domain/Entity/TodoQuery.swift

@@ -10,13 +10,19 @@ import Foundation
 struct TodoQuery: Equatable {
     enum SortTarget: Equatable, Hashable {
         case createdAt
+        case completedAt
+        case deletedAt
         case updatedAt
         case dueDate
 
         var fieldName: String {
             switch self {
             case .createdAt:
                 return "createdAt"
+            case .completedAt:
+                return "completedAt"
+            case .deletedAt:
+                return "deletedAt"
             case .updatedAt:
                 return "updatedAt"
             case .dueDate:
@@ -62,8 +68,9 @@ struct TodoQuery: Equatable {
     var isPinned: Bool?
     var completionFilter: CompletionFilter
     var dueDateFilter: DueDateFilter
-    var createdAtFrom: Date?
-    var createdAtTo: Date?
+    var sortDateFrom: Date?
+    var sortDateTo: Date?
+    var includesDeleted: Bool
     var sortTarget: SortTarget
     var sortOrder: SortOrder
     var pageSize: Int
@@ -75,8 +82,9 @@ struct TodoQuery: Equatable {
         isPinned: Bool? = nil,
         completionFilter: CompletionFilter = .all,
         dueDateFilter: DueDateFilter = .all,
-        createdAtFrom: Date? = nil,
-        createdAtTo: Date? = nil,
+        sortDateFrom: Date? = nil,
+        sortDateTo: Date? = nil,
+        includesDeleted: Bool = false,
         sortTarget: SortTarget = .createdAt,
         sortOrder: SortOrder = .latest,
         pageSize: Int = 20,
@@ -87,8 +95,9 @@ struct TodoQuery: Equatable {
         self.isPinned = isPinned
         self.completionFilter = completionFilter
         self.dueDateFilter = dueDateFilter
-        self.createdAtFrom = createdAtFrom
-        self.createdAtTo = createdAtTo
+        self.sortDateFrom = sortDateFrom
+        self.sortDateTo = sortDateTo
+        self.includesDeleted = includesDeleted
         self.sortTarget = sortTarget
         self.sortOrder = sortOrder
         self.pageSize = pageSize

DevLog/Domain/Entity/UserProfile.swift

@@ -12,4 +12,5 @@ struct UserProfile {
     let email: String
     let statusMessage: String
     let avatarURL: URL?
+    let createdAt: Date
 }

DevLog/Infra/Service/TodoService.swift

@@ -36,8 +36,9 @@ final class TodoService {
             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,
+            query.sortDateFrom != nil ? "sortDateFrom=\(query.sortDateFrom!)" : nil,
+            query.sortDateTo != nil ? "sortDateTo=\(query.sortDateTo!)" : nil,
+            query.includesDeleted ? "includesDeleted=true" : nil,
             "pageSize=\(query.pageSize)",
             query.fetchAllPages ? "fetchAllPages=true" : nil,
             cursor != nil ? "cursor=\(cursor!)" : nil
@@ -73,17 +74,17 @@ final class TodoService {
             firestoreQuery = firestoreQuery.whereField("dueDate", isEqualTo: NSNull())
         }
 
-        if let createdAtFrom = query.createdAtFrom {
+        if let sortDateFrom = query.sortDateFrom {
             firestoreQuery = firestoreQuery.whereField(
-                "createdAt",
-                isGreaterThanOrEqualTo: Timestamp(date: createdAtFrom)
+                query.sortTarget.fieldName,
+                isGreaterThanOrEqualTo: Timestamp(date: sortDateFrom)
             )
         }
 
-        if let createdAtTo = query.createdAtTo {
+        if let sortDateTo = query.sortDateTo {
             firestoreQuery = firestoreQuery.whereField(
-                "createdAt",
-                isLessThan: Timestamp(date: createdAtTo)
+                query.sortTarget.fieldName,
+                isLessThan: Timestamp(date: sortDateTo)
             )
         }
 
@@ -165,12 +166,12 @@ final class TodoService {
             let docRef = collection.document(request.id)
             var data = try encoder.encode(request)
             data.removeValue(forKey: TodoFieldKey.id.rawValue)
-            if let number = request.number {
-                data[TodoFieldKey.number.rawValue] = number
-            }
             if request.completedAt == nil {
                 data[TodoFieldKey.completedAt.rawValue] = NSNull()
             }
+            if request.deletedAt == nil {
+                data[TodoFieldKey.deletedAt.rawValue] = NSNull()
+            }
             if request.dueDate == nil {
                 data[TodoFieldKey.dueDate.rawValue] = NSNull()
             }
@@ -229,7 +230,7 @@ final class TodoService {
         do {
             let snapshot = try await store.collection(FirestorePath.todos(uid))
                 .whereField(FieldPath.documentID(), isEqualTo: todoId)
-                .whereField(TodoFieldKey.isDeleted.rawValue, isEqualTo: false)
+                .whereField(TodoFieldKey.deletedAt.rawValue, isEqualTo: NSNull())
                 .limit(to: 1)
                 .getDocuments()
             guard let document = snapshot.documents.first, let todo = makeResponse(from: document) else {
@@ -256,7 +257,7 @@ final class TodoService {
                 group.addTask {
                     let snapshot = try await collection
                         .whereField(TodoFieldKey.number.rawValue, in: chunk)
-                        .whereField(TodoFieldKey.isDeleted.rawValue, isEqualTo: false)
+                        .whereField(TodoFieldKey.deletedAt.rawValue, isEqualTo: NSNull())
                         .getDocuments()
                     return snapshot.documents
                 }
@@ -272,8 +273,7 @@ final class TodoService {
         return snapshots.reduce(into: [Int: TodoReferenceResponse]()) { partialResult, document in
             let data = document.data()
             guard
-                !(data[TodoFieldKey.deletingAt.rawValue] is Timestamp),
-                (data[TodoFieldKey.isDeleted.rawValue] as? Bool) != true,
+                data[TodoFieldKey.deletedAt.rawValue] is NSNull,
                 let response = makeResponse(from: document)
             else {
                 return
@@ -359,16 +359,19 @@ private extension TodoService {
     }
 
     func makeQuery(uid: String, query: TodoQuery) -> Query {
-        let collection = store.collection(FirestorePath.todos(uid))
-            .whereField(TodoFieldKey.isDeleted.rawValue, isEqualTo: false)
+        var collection: Query = store.collection(FirestorePath.todos(uid))
+
+        if !query.includesDeleted {
+            collection = collection.whereField(TodoFieldKey.deletedAt.rawValue, isEqualTo: NSNull())
+        }
 
         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:
+        case .createdAt, .completedAt, .deletedAt, .updatedAt:
             return collection
                 .order(by: query.sortTarget.fieldName, descending: query.sortOrder.isDescending)
                 .order(by: FieldPath.documentID())
@@ -389,7 +392,7 @@ private extension TodoService {
                 Timestamp(date: sortDate),
                 cursor.documentID
             ]
-        case .createdAt, .updatedAt:
+        case .createdAt, .completedAt, .deletedAt, .updatedAt:
             return [
                 primaryValue,
                 cursor.documentID
@@ -420,7 +423,7 @@ private extension TodoService {
                 return nil
             }
             secondarySortDate = updatedAt.dateValue()
-        case .createdAt, .updatedAt:
+        case .createdAt, .completedAt, .deletedAt, .updatedAt:
             secondarySortDate = nil
         }
 
@@ -432,10 +435,6 @@ private extension TodoService {
     }
 
     func makeResponse(from snapshot: QueryDocumentSnapshot) -> TodoResponse? {
-        if snapshot.data()[TodoFieldKey.deletingAt.rawValue] is Timestamp ||
-            (snapshot.data()[TodoFieldKey.isDeleted.rawValue] as? Bool) == true {
-            return nil
-        }
         return makeResponse(documentID: snapshot.documentID, data: snapshot.data())
     }
 
@@ -447,26 +446,25 @@ private extension TodoService {
     }
 
     func makeResponse(documentID: String, data: [String: Any]) -> TodoResponse? {
-        if data[TodoFieldKey.deletingAt.rawValue] is Timestamp ||
-            (data[TodoFieldKey.isDeleted.rawValue] as? Bool) == true {
-            return nil
-        }
         guard
-            let isPinned = data[TodoFieldKey.isPinned.rawValue] as? Bool,
-            let isCompleted = data[TodoFieldKey.isCompleted.rawValue] as? Bool,
-            let isChecked = data[TodoFieldKey.isChecked.rawValue] as? Bool,
             let number = data[TodoFieldKey.number.rawValue] as? Int,
             let title = data[TodoFieldKey.title.rawValue] as? String,
-            let content = data[TodoFieldKey.content.rawValue] as? String,
             let createdAtTimestamp = data[TodoFieldKey.createdAt.rawValue] as? Timestamp,
             let updatedAtTimestamp = data[TodoFieldKey.updatedAt.rawValue] as? Timestamp,
-            let tags = data[TodoFieldKey.tags.rawValue] as? [String],
             let category = data[TodoFieldKey.category.rawValue] as? String else {
             return nil
         }
 
         let completedAt = (data[TodoFieldKey.completedAt.rawValue] as? Timestamp)?.dateValue()
+        let deletedAt = (data[TodoFieldKey.deletedAt.rawValue] as? Timestamp)?.dateValue()
         let dueDate = (data[TodoFieldKey.dueDate.rawValue] as? Timestamp)?.dateValue()
+
+        let isPinned = data[TodoFieldKey.isPinned.rawValue] as? Bool ?? false
+        let isCompleted = data[TodoFieldKey.isCompleted.rawValue] as? Bool ?? (completedAt != nil)
+        let isChecked = data[TodoFieldKey.isChecked.rawValue] as? Bool ?? false
+        let content = data[TodoFieldKey.content.rawValue] as? String ?? ""
+        let tags = data[TodoFieldKey.tags.rawValue] as? [String] ?? []
+
         return TodoResponse(
             id: documentID,
             isPinned: isPinned,
@@ -478,6 +476,7 @@ private extension TodoService {
             createdAt: createdAtTimestamp.dateValue(),
             updatedAt: updatedAtTimestamp.dateValue(),
             completedAt: completedAt,
+            deletedAt: deletedAt,
             dueDate: dueDate,
             tags: tags,
             category: .raw(category)
@@ -495,11 +494,10 @@ private extension TodoService {
         case createdAt
         case updatedAt
         case completedAt
+        case deletedAt
         case dueDate
         case tags
         case category
-        case deletingAt // 삭제 요청으로 앱의 로컬 데이터에서 deletion이 된 상태
-        case isDeleted  // 삭제 요청으로 서버에서 soft deletion이 된 상태
     }
 
     enum CounterFieldKey: String {