feat: update todo

Author: ngocpd-1250

BaseSwiftUI/BaseSwiftUIApp.swift

@@ -6,10 +6,7 @@
 //
 
 import SwiftUI
-import LinkNavigator
 import Firebase
-import Defaults
-import Then
 
 @main
 struct BaseSwiftUIApp: App {

BaseSwiftUI/Data/RepositoryImpl/TodosRepositoryImpl.swift

@@ -16,7 +16,7 @@ struct TodosRepositoryImpl: TodosRepository {
     func addTodo(name: String, date: Date, note: String, category: TodoCategory) -> Observable<Void> {
         Future<Void, Error> { promise in
             do {
-                let item = TodoItem(name: name, note: note, category: category, date: date)
+                let item = TodoItem(name: name, note: note, categoryId: category.id, date: date)
                 modelContext?.insert(item)
                 try modelContext?.save()
                 promise(.success(()))
@@ -40,6 +40,21 @@ struct TodosRepositoryImpl: TodosRepository {
         .eraseToAnyPublisher()
     }
 
+    func getTodos(category: TodoCategory) -> Observable<[TodoItem]> {
+        Future<[TodoItem], Error> { promise in
+            do {
+                let descriptor = FetchDescriptor<TodoItem>(predicate: #Predicate {
+                    $0.categoryId == category.id
+                })
+                let items = try modelContext?.fetch(descriptor) ?? []
+                promise(.success(items))
+            } catch {
+                promise(.failure(error))
+            }
+        }
+        .eraseToAnyPublisher()
+    }
+
     func deleteTodo(item: TodoItem) -> Observable<Void> {
         Future<Void, Error> { promise in
             do {
@@ -53,11 +68,15 @@ struct TodosRepositoryImpl: TodosRepository {
         .eraseToAnyPublisher()
     }
 
+    func updateCompleted(item: TodoItem) {
+        item.isCompleted.toggle()
+    }
+
     private func groupTodoItemsToTodoLists(items: [TodoItem]) -> [TodoList] {
         var dict: [TodoCategory: TodoList] = [:]
 
         for todoItem in items {
-            dict[todoItem.category, default: TodoList(category: todoItem.category)].items.append(todoItem)
+            dict[TodoCategory.byId(todoItem.categoryId), default: TodoList(category: TodoCategory.byId(todoItem.categoryId))].items.append(todoItem)
         }
 
         return Array(dict.values)

BaseSwiftUI/Domain/Model/TodoCategory.swift

@@ -35,4 +35,11 @@ enum TodoCategory: String, CaseIterable, Identifiable, Codable {
     var id: String {
         return rawValue
     }
+
+    static func byId(_ name: String) -> TodoCategory {
+        for category in TodoCategory.allCases where category.name.lowercased() == name.lowercased() {
+            return category
+        }
+        return .all
+    }
 }

BaseSwiftUI/Domain/Model/TodoItem.swift

@@ -12,15 +12,15 @@ import SwiftData
     var id: String
     var name: String
     var note: String
-    var category: TodoCategory
+    var categoryId: String
     var isCompleted = false
     var date: Date
 
-    init(id: String = UUID().uuidString, name: String, note: String, category: TodoCategory, isCompleted: Bool = false, date: Date) {
+    init(id: String = UUID().uuidString, name: String, note: String, categoryId: String, isCompleted: Bool = false, date: Date) {
         self.id = id
         self.name = name
         self.note = note
-        self.category = category
+        self.categoryId = categoryId
         self.isCompleted = isCompleted
         self.date = date
     }

BaseSwiftUI/Domain/Repository/TodosRepository.swift

@@ -9,6 +9,8 @@ import Foundation
 
 protocol TodosRepository {
     func getTodoLists() -> Observable<[TodoList]>
+    func getTodos(category: TodoCategory) -> Observable<[TodoItem]>
     func addTodo(name: String, date: Date, note: String, category: TodoCategory) -> Observable<Void>
     func deleteTodo(item: TodoItem) -> Observable<Void>
+    func updateCompleted(item: TodoItem)
 }

BaseSwiftUI/Domain/UseCase/TodosUseCase.swift

@@ -10,8 +10,10 @@ import Factory
 
 protocol TodosUseCaseType {
     func getTodoLists() -> Observable<[TodoList]>
+    func getTodos(category: TodoCategory) -> Observable<[TodoItem]>
     func addTodo(name: String, date: Date, note: String, category: TodoCategory) -> Observable<Void>
     func deleteTodo(item: TodoItem) -> Observable<Void>
+    func updateCompleted(item: TodoItem)
 }
 
 struct TodosUseCase: TodosUseCaseType {
@@ -21,11 +23,19 @@ struct TodosUseCase: TodosUseCaseType {
         todosRepository.getTodoLists()
     }
 
+    func getTodos(category: TodoCategory) -> Observable<[TodoItem]> {
+        todosRepository.getTodos(category: category)
+    }
+
     func addTodo(name: String, date: Date, note: String, category: TodoCategory) -> Observable<Void> {
         todosRepository.addTodo(name: name, date: date, note: note, category: category)
     }
 
     func deleteTodo(item: TodoItem) -> Observable<Void> {
         todosRepository.deleteTodo(item: item)
     }
+
+    func updateCompleted(item: TodoItem) {
+        todosRepository.updateCompleted(item: item)
+    }
 }

BaseSwiftUI/Presentation/Component/Todo/TodoListItem.swift

@@ -8,24 +8,24 @@
 import SwiftUI
 
 struct TodoListItem: View {
-    var taskList: TodoList
+    var todoList: TodoList
 
     var body: some View {
         HStack {
             VStack(alignment: .leading) {
-                Image(taskList.category.image)
+                Image(todoList.category.image)
                     .resizable()
                     .frame(width: 30, height: 30)
 
                 Spacer()
                     .frame(height: 20)
 
                 VStack(alignment: .leading) {
-                    Text(taskList.category.name)
+                    Text(todoList.category.name)
                         .fontWeight(.medium)
                         .foregroundColor(Color(R.color.labelPrimary))
 
-                    Text("\(taskList.items.count) \(R.string.localizable.commonTasks())")
+                    Text("\(todoList.items.count) \(R.string.localizable.commonTasks())")
                         .foregroundColor(Color(R.color.labelPrimary))
                 }
             }

BaseSwiftUI/Presentation/Navigator/Home/HomeRouteBuilder.swift

@@ -70,6 +70,26 @@ struct NewTodoRouteBuilder<RootNavigator: HomeRootNavigatorType> {
     }
 }
 
+// MARK: - TodoListScreen
+
+struct ListTodoParams: Codable {
+    let category: TodoCategory
+}
+
+struct ListTodoRouteBuilder<RootNavigator: HomeRootNavigatorType> {
+    static func generate() -> RouteBuilderOf<RootNavigator> {
+        var matchPath: String { RoutePath.todoList.rawValue }
+        return .init(matchPath: matchPath) { _, items, _ -> RouteViewController? in
+            return WrappingController(matchPath: matchPath, title: "") {
+                let params: ListTodoParams = items.decoded() ?? .init(category: .all)
+                let navigator = ListTodoNavigator()
+                let viewModel = ListTodoViewModel(navigator: navigator, category: params.category)
+                ListTodoScreen(viewModel: viewModel)
+            }
+        }
+    }
+}
+
 // MARK: - SettingsScreen
 struct SettingsRouteBuilder<RootNavigator: HomeRootNavigatorType> {
     static func generate() -> RouteBuilderOf<RootNavigator> {

BaseSwiftUI/Presentation/Navigator/Home/HomeRouteGroup.swift

@@ -20,6 +20,7 @@ struct HomeRouteGroup<RootNavigator: HomeRootNavigatorType> {
             MoviesDetailRouteBuilder.generate(),
             TodosRouteBuilder.generate(),
             NewTodoRouteBuilder.generate(),
+            ListTodoRouteBuilder.generate(),
             SettingsRouteBuilder.generate()
         ]
     }

BaseSwiftUI/Presentation/Navigator/RoutePath.swift

@@ -15,5 +15,6 @@ enum RoutePath: String {
     case movieDetail
     case todos
     case newTodo
+    case todoList
     case settings
 }