[#321] TodoKind 대신 TodoCategory라는 타입으로 변경한다 (#322)

* style: TodoKind -> TodoCategory 형태로 타입, 변수명 수정

* style: 문자열 키 수정

Author: opficdev

DevLog/Data/DTO/PushNotificationResponse.swift

@@ -14,5 +14,5 @@ struct PushNotificationResponse {
     let receivedAt: Date
     let isRead: Bool
     let todoId: String
-    let todoKind: String
+    let todoCategory: String
 }

DevLog/Data/DTO/TodoDTO.swift

@@ -20,8 +20,7 @@ struct TodoRequest: Encodable {
     let completedAt: Date?
     let dueDate: Date?
     let tags: [String]
-    let kind: TodoKind
-
+    let category: TodoCategory
 }
 
 struct TodoResponse {
@@ -37,5 +36,5 @@ struct TodoResponse {
     let completedAt: Date?
     let dueDate: Date?
     let tags: [String]
-    let kind: String
+    let category: String
 }

DevLog/Data/Mapper/PushNotificationMapping.swift

@@ -7,8 +7,8 @@
 
 extension PushNotificationResponse {
     func toDomain() throws -> PushNotification {
-        guard let todoKind = TodoKind(rawValue: self.todoKind) else {
-            throw DataError.invalidData("PushNotificationResponse.todoKind is invalid: \(self.todoKind)")
+        guard let todoCategory = TodoCategory(rawValue: self.todoCategory) else {
+            throw DataError.invalidData("PushNotificationResponse.todoCategory is invalid: \(self.todoCategory)")
         }
 
         return PushNotification(
@@ -18,7 +18,7 @@ extension PushNotificationResponse {
             receivedAt: self.receivedAt,
             isRead: self.isRead,
             todoId: self.todoId,
-            todoKind: todoKind
+            todoCategory: todoCategory
         )
     }
 }

DevLog/Data/Mapper/TodoMapping.swift

@@ -20,15 +20,15 @@ extension TodoRequest {
             completedAt: entity.completedAt,
             dueDate: entity.dueDate,
             tags: entity.tags,
-            kind: entity.kind
+            category: entity.category
         )
     }
 }
 
 extension TodoResponse {
     func toDomain() throws -> Todo {
-        guard let kind = TodoKind(rawValue: self.kind) else {
-            throw DataError.invalidData("TodoResponse.kind is invalid: \(self.kind)")
+        guard let category = TodoCategory(rawValue: self.category) else {
+            throw DataError.invalidData("TodoResponse.category is invalid: \(self.category)")
         }
 
         return Todo(
@@ -44,7 +44,7 @@ extension TodoResponse {
             completedAt: self.completedAt,
             dueDate: self.dueDate,
             tags: self.tags,
-            kind: kind
+            category: category
         )
     }
 }

DevLog/Domain/Entity/PushNotification.swift

@@ -14,5 +14,5 @@ struct PushNotification {
     let receivedAt: Date
     var isRead: Bool
     let todoId: String
-    let todoKind: TodoKind
+    let todoCategory: TodoCategory
 }

DevLog/Domain/Entity/Todo.swift

@@ -20,5 +20,5 @@ struct Todo: Identifiable, Hashable {
     var completedAt: Date?  //  할 일 완료 날짜
     var dueDate: Date?      //  할 일의 마감 날짜 (선택 사항)
     var tags: [String]      //  할 일에 연결된 태그들
-    var kind: TodoKind      //  할 일의 종류
+    var category: TodoCategory  //  할 일의 종류
 }

DevLog/Domain/Entity/TodoQuery.swift

@@ -57,7 +57,7 @@ struct TodoQuery: Equatable {
         case withoutDueDate
     }
 
-    var kind: TodoKind?
+    var category: TodoCategory?
     var keyword: String?
     var isPinned: Bool?
     var completionFilter: CompletionFilter
@@ -70,7 +70,7 @@ struct TodoQuery: Equatable {
     var fetchAllPages: Bool
 
     init(
-        kind: TodoKind? = nil,
+        category: TodoCategory? = nil,
         keyword: String? = nil,
         isPinned: Bool? = nil,
         completionFilter: CompletionFilter = .all,
@@ -82,7 +82,7 @@ struct TodoQuery: Equatable {
         pageSize: Int = 20,
         fetchAllPages: Bool = false
     ) {
-        self.kind = kind
+        self.category = category
         self.keyword = keyword
         self.isPinned = isPinned
         self.completionFilter = completionFilter

DevLog/Domain/Entity/TodoReferenceItem.swift

@@ -10,5 +10,5 @@ import Foundation
 struct TodoReferenceItem: Identifiable, Equatable {
     let id: String
     let title: String
-    let kind: TodoKind
+    let category: TodoCategory
 }

DevLog/Infra/Service/PushNotificationService.swift

@@ -307,7 +307,7 @@ private extension PushNotificationService {
             let receivedAt = data[Key.receivedAt.rawValue] as? Timestamp,
             let isRead = data[Key.isRead.rawValue] as? Bool,
             let todoId = data[Key.todoId.rawValue] as? String,
-            let todoKind = data[Key.todoKind.rawValue] as? String else {
+            let todoCategory = data[Key.todoCategory.rawValue] as? String else {
             return nil
         }
 
@@ -318,7 +318,7 @@ private extension PushNotificationService {
             receivedAt: receivedAt.dateValue(),
             isRead: isRead,
             todoId: todoId,
-            todoKind: todoKind
+            todoCategory: todoCategory
         )
     }
 
@@ -328,7 +328,7 @@ private extension PushNotificationService {
         case receivedAt
         case isRead
         case todoId
-        case todoKind
+        case todoCategory
         case deletingAt // 삭제 요청은 되었지만, 5초 유예 후 최종 삭제되기 전 상태
     }
 }

DevLog/Infra/Service/TodoService.swift

@@ -32,7 +32,7 @@ final class TodoService {
             "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.category != nil ? "category=\(query.category!.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,
@@ -46,8 +46,11 @@ final class TodoService {
 
         var firestoreQuery = makeQuery(uid: uid, query: query)
 
-        if let kind = query.kind {
-            firestoreQuery = firestoreQuery.whereField("kind", isEqualTo: kind.rawValue)
+        if let category = query.category {
+            firestoreQuery = firestoreQuery.whereField(
+                TodoFieldKey.category.rawValue,
+                isEqualTo: category.rawValue
+            )
         }
 
         if let isPinned = query.isPinned {
@@ -267,15 +270,15 @@ final class TodoService {
             guard
                 !(data[TodoFieldKey.deletingAt.rawValue] is Timestamp),
                 let response = makeResponse(from: document),
-                let kind = TodoKind(rawValue: response.kind)
+                let category = TodoCategory(rawValue: response.category)
             else {
                 return
             }
 
             partialResult[response.number] = TodoReferenceItem(
                 id: response.id,
                 title: response.title,
-                kind: kind
+                category: category
             )
         }
     }
@@ -447,7 +450,7 @@ private extension TodoService {
             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 kind = data[TodoFieldKey.kind.rawValue] as? String else {
+            let category = data[TodoFieldKey.category.rawValue] as? String else {
             return nil
         }
 
@@ -466,7 +469,7 @@ private extension TodoService {
             completedAt: completedAt,
             dueDate: dueDate,
             tags: tags,
-            kind: kind
+            category: category
         )
     }
 
@@ -483,7 +486,7 @@ private extension TodoService {
         case completedAt
         case dueDate
         case tags
-        case kind
+        case category
         case deletingAt // 삭제 요청은 되었지만, 5초 유예 후 최종 삭제되기 전 상태
     }