refactor: Modern concurrency for TaskRepository and TaskItem rename

Author: peterfriese

ccdr/makeitso/iOS/MakeItSo/MakeItSo/Models/Task.swift

@@ -1,7 +1,7 @@
 import FirebaseFirestore
 import Foundation
 
-struct Task: Codable, Identifiable {
+struct TaskItem: Codable, Identifiable {
   @DocumentID var id: String? = nil
   var title: String
   var isCompleted: Bool

ccdr/makeitso/iOS/MakeItSo/MakeItSo/Repositories/TaskRepository.swift

@@ -5,7 +5,7 @@ import Observation
 
 @Observable
 class TaskRepository {
-  var tasks = [Task]()
+  var tasks = [TaskItem]()
 
   var user: User? = nil
 
@@ -15,16 +15,18 @@ class TaskRepository {
 
   init() {
     authStateListenerHandle = Auth.auth().addStateDidChangeListener { [weak self] auth, user in
-      guard let self = self else { return }
-      self.user = user
-      guard let user = user else {
-        print("User is signed out")
-        self.tasks = []
-        self.unsubscribe()
-        return
+      Task { @MainActor in
+        guard let self = self else { return }
+        self.user = user
+        guard let user = user else {
+          print("User is signed out")
+          self.tasks = []
+          self.unsubscribe()
+          return
+        }
+        print("User is signed in: \(user.uid)")
+        self.subscribe(userId: user.uid)
       }
-      print("User is signed in: \(user.uid)")
-      self.subscribe(userId: user.uid)
     }
   }
 
@@ -52,14 +54,18 @@ class TaskRepository {
           }
           print("Received \(documents.count) tasks")
 
-          self?.tasks = documents.compactMap { queryDocumentSnapshot in
+          let tasks = documents.compactMap { queryDocumentSnapshot -> TaskItem? in
             do {
-              return try queryDocumentSnapshot.data(as: Task.self)
+              return try queryDocumentSnapshot.data(as: TaskItem.self)
             } catch {
               print("Error decoding task: \(error.localizedDescription)")
               return nil
             }
           }
+
+          Task { @MainActor [weak self] in
+            self?.tasks = tasks
+          }
         }
     }
   }
@@ -69,7 +75,7 @@ class TaskRepository {
     listenerRegistration = nil
   }
 
-  func addTask(_ task: Task) {
+  func addTask(_ task: TaskItem) {
     do {
       var newTask = task
       // Assign current user ID if available
@@ -85,7 +91,7 @@ class TaskRepository {
     }
   }
 
-  func updateTask(_ task: Task) {
+  func updateTask(_ task: TaskItem) {
     if let taskID = task.id {
       do {
         try db.collection("tasks").document(taskID).setData(from: task)
@@ -95,7 +101,7 @@ class TaskRepository {
     }
   }
 
-  func deleteTask(_ task: Task) {
+  func deleteTask(_ task: TaskItem) {
     if let taskID = task.id {
       db.collection("tasks").document(taskID).delete { error in
         if let error = error {

ccdr/makeitso/iOS/MakeItSo/MakeItSo/Views/AddTaskView.swift

@@ -2,7 +2,7 @@ import SwiftUI
 
 struct AddTaskView: View {
   @Environment(\.dismiss) var dismiss
-  var onAdd: (Task) -> Void
+  var onAdd: (TaskItem) -> Void
 
   @State private var title = ""
   @State private var priority: TaskPriority = .medium
@@ -42,7 +42,7 @@ struct AddTaskView: View {
   }
 
   private func submit() {
-    let task = Task(title: title, isCompleted: false, priority: priority, dueDate: dueDate)
+    let task = TaskItem(title: title, isCompleted: false, priority: priority, dueDate: dueDate)
     onAdd(task)
     dismiss()
   }

ccdr/makeitso/iOS/MakeItSo/MakeItSo/Views/TaskRowView.swift

@@ -1,9 +1,9 @@
 import SwiftUI
 
 struct TaskRowView: View {
-  let task: Task
-  var onToggleCompleted: (Task) -> Void
-  
+  let task: TaskItem
+  var onToggleCompleted: (TaskItem) -> Void
+
   var body: some View {
     HStack {
       Image(systemName: task.isCompleted ? "checkmark.circle.fill" : "circle")
@@ -12,7 +12,7 @@ struct TaskRowView: View {
         .onTapGesture {
           onToggleCompleted(task)
         }
-      
+
       VStack(alignment: .leading) {
         Text(task.title)
           .strikethrough(task.isCompleted)
@@ -22,7 +22,7 @@ struct TaskRowView: View {
             .foregroundStyle(.secondary)
         }
       }
-      
+
       Spacer()
     }
   }