Some additional code cleanup

demos/MAUITodo/Data/NodeConnector.cs

@@ -1,16 +1,11 @@
-using PowerSync.Common.Client;
+using System.Text;
+using System.Text.Json;
+using PowerSync.Common.Client;
 using PowerSync.Common.Client.Connection;
 using PowerSync.Common.DB.Crud;
 
 namespace MAUITodo.Data;
 
-using System;
-using System.Collections.Generic;
-using System.Net.Http;
-using System.Text;
-using System.Text.Json;
-using System.Threading.Tasks;
-
 public class NodeConnector : IPowerSyncBackendConnector
 {
     private string StorageFilePath => Path.Combine(FileSystem.AppDataDirectory, "user_id.txt");

demos/MAUITodo/Data/PowerSyncData.cs

@@ -35,10 +35,10 @@ public PowerSyncData()
 
         var nodeConnector = new NodeConnector();
         UserId = nodeConnector.UserId;
-        
+
         Db.Connect(nodeConnector);
     }
-    
+
     public async Task SaveListAsync(TodoList list)
     {
         if (list.ID != "")
@@ -62,6 +62,7 @@ public async Task DeleteListAsync(TodoList list)
         await Db.Execute("DELETE FROM todos WHERE list_id = ?", [listId]);
         await Db.Execute("DELETE FROM lists WHERE id = ?", [listId]);
     }
+
     public async Task SaveItemAsync(TodoItem item)
     {
         if (item.ID != "")
@@ -74,22 +75,48 @@ await Db.Execute(
                     item.Description,
                     item.Completed ? 1 : 0,
                     item.CompletedAt!,
-                    UserId,
+                    item.Completed ? UserId : null,
                     item.ID
                 ]);
         }
         else
         {
             await Db.Execute(
                 @"INSERT INTO todos 
-                  (id, list_id, description, created_at, completed, created_by, completed_at)
-                  VALUES (uuid(), ?, ?, datetime(), ?, ?, ?)",
+                  (id, list_id, description, created_at, created_by, completed, completed_at, completed_by)
+                  VALUES (uuid(), ?, ?, datetime(), ?, ?, ?, ?)",
                 [
                     item.ListId,
                     item.Description,
-                    item.Completed ? 1 : 0,
                     UserId,
+                    item.Completed ? 1 : 0,
                     item.CompletedAt!,
+                    item.Completed ? UserId : null
+                ]);
+        }
+    }
+
+    public async Task SaveTodoCompletedAsync(string todoId, bool completed)
+    {
+        if (completed)
+        {
+            await Db.Execute(
+                @"UPDATE todos 
+                  SET completed = 1, completed_at = datetime(), completed_by = ?
+                  WHERE id = ?",
+                [
+                    UserId,
+                    todoId
+                ]);
+        }
+        else
+        {
+            await Db.Execute(
+                @"UPDATE todos 
+                  SET completed = 0, completed_at = NULL, completed_by = NULL
+                  WHERE id = ?",
+                [
+                    todoId
                 ]);
         }
     }

demos/MAUITodo/Models/TodoItem.cs

@@ -11,20 +11,20 @@ public class TodoItem
     public string ListId { get; set; } = null!;
 
     [JsonProperty("created_at")]
-    public string CreatedAt { get; set; }= null!;
+    public string CreatedAt { get; set; } = null!;
 
     [JsonProperty("completed_at")]
     public string? CompletedAt { get; set; }
 
     [JsonProperty("description")]
-    public string Description { get; set; }= null!;
+    public string Description { get; set; } = null!;
 
     [JsonProperty("created_by")]
-    public string CreatedBy { get; set; }= null!;
+    public string CreatedBy { get; set; } = null!;
 
     [JsonProperty("completed_by")]
-    public string CompletedBy { get; set; }= null!;
+    public string CompletedBy { get; set; } = null!;
 
     [JsonProperty("completed")]
-    public bool Completed { get; set; } = false;
+    public bool Completed { get; set; }
 }

demos/MAUITodo/Views/ListsPage.xaml.cs

@@ -4,7 +4,7 @@
 
 namespace MAUITodo.Views;
 
-public partial class ListsPage : ContentPage
+public partial class ListsPage
 {
     private readonly PowerSyncData database;
 
@@ -46,7 +46,7 @@ protected override async void OnAppearing()
 
     private async void OnAddClicked(object sender, EventArgs e)
     {
-        string name = await DisplayPromptAsync("New List", "Enter list name:");
+        var name = await DisplayPromptAsync("New List", "Enter list name:");
         if (!string.IsNullOrWhiteSpace(name))
         {
             var list = new TodoList { Name = name };
@@ -56,16 +56,16 @@ private async void OnAddClicked(object sender, EventArgs e)
 
     private async void OnDeleteClicked(object sender, EventArgs e)
     {
-        var button = (Button)sender;
-        var list = (TodoList)button.CommandParameter;
-
-        bool confirm = await DisplayAlert("Confirm Delete",
-            $"Are you sure you want to delete the list '{list.Name}'?",
-            "Yes", "No");
-
-        if (confirm)
+        if (sender is Button button && button.CommandParameter is TodoList list)
         {
-            await database.DeleteListAsync(list);
+            var confirm = await DisplayAlert("Confirm Delete",
+                $"Are you sure you want to delete the list '{list.Name}'?",
+                "Yes", "No");
+
+            if (confirm)
+            {
+                await database.DeleteListAsync(list);
+            }
         }
     }
 

demos/MAUITodo/Views/TodoListPage.xaml.cs

@@ -4,7 +4,7 @@
 
 namespace MAUITodo.Views;
 
-public partial class TodoListPage : ContentPage
+public partial class TodoListPage
 {
     private readonly PowerSyncData database;
     private readonly TodoList selectedList;
@@ -18,11 +18,11 @@ public TodoListPage(PowerSyncData powerSyncData, TodoList list)
     }
 
     public string ListName => selectedList?.Name ?? "";
-    
+
     protected override async void OnAppearing()
     {
         base.OnAppearing();
-        
+
         await database.Db.Watch("select * from todos where list_id = ?", [selectedList.ID], new WatchHandler<TodoItem>
         {
             OnResult = (results) =>
@@ -38,11 +38,11 @@ protected override async void OnAppearing()
 
     private async void OnAddClicked(object sender, EventArgs e)
     {
-        string description = await DisplayPromptAsync("New Todo", "Enter todo description:");
+        var description = await DisplayPromptAsync("New Todo", "Enter todo description:");
         if (!string.IsNullOrWhiteSpace(description))
         {
-            var todo = new TodoItem 
-            { 
+            var todo = new TodoItem
+            {
                 Description = description,
                 ListId = selectedList.ID
             };
@@ -52,34 +52,32 @@ private async void OnAddClicked(object sender, EventArgs e)
 
     private async void OnDeleteClicked(object sender, EventArgs e)
     {
-        var button = (Button)sender;
-        var todo = (TodoItem)button.CommandParameter;
-
-        bool confirm = await DisplayAlert("Confirm Delete", 
-            $"Are you sure you want to delete '{todo.Description}'?", 
-            "Yes", "No");
-
-        if (confirm)
+        if (sender is Button button && button.CommandParameter is TodoItem todo)
         {
-            await database.DeleteItemAsync(todo);
+            var confirm = await DisplayAlert("Confirm Delete",
+                $"Are you sure you want to delete '{todo.Description}'?",
+                "Yes", "No");
+
+            if (confirm)
+            {
+                await database.DeleteItemAsync(todo);
+            }
         }
     }
 
     private async void OnCheckBoxChanged(object sender, CheckedChangedEventArgs e)
     {
-        if (sender is CheckBox checkBox && 
-            checkBox.Parent?.Parent?.BindingContext is TodoItem todo)
+        if (sender is CheckBox checkBox && checkBox.Parent?.Parent?.BindingContext is TodoItem todo)
         {
-            if (e.Value == true && todo.CompletedAt == null)
+            if (e.Value && todo.CompletedAt == null)
             {
                 todo.Completed = e.Value;
-                todo.CompletedAt =  DateTime.UtcNow.ToString("o");
-                await database.SaveItemAsync(todo);
-            } else if (e.Value == false && todo.CompletedAt != null)
+                await database.SaveTodoCompletedAsync(todo.ID, true);
+            }
+            else if (e.Value == false && todo.CompletedAt != null)
             {
                 todo.Completed = e.Value;
-                todo.CompletedAt = null; // Uncheck, clear completed time
-                await database.SaveItemAsync(todo);
+                await database.SaveTodoCompletedAsync(todo.ID, false);
             }
         }
     }
@@ -88,16 +86,16 @@ private async void OnItemSelected(object sender, SelectionChangedEventArgs e)
     {
         if (e.CurrentSelection.FirstOrDefault() is TodoItem selectedItem)
         {
-            string newDescription = await DisplayPromptAsync("Edit Todo", 
-                "Enter new description:", 
+            var newDescription = await DisplayPromptAsync("Edit Todo",
+                "Enter new description:",
                 initialValue: selectedItem.Description);
-                
+
             if (!string.IsNullOrWhiteSpace(newDescription))
             {
                 selectedItem.Description = newDescription;
                 await database.SaveItemAsync(selectedItem);
             }
-            
+
             TodoItemsCollection.SelectedItem = null;
         }
     }