From 561ba4f34a993534702c906877f4370a040a976b Mon Sep 17 00:00:00 2001
From: Mario Steele <mario@ruby-im.net>
Date: Mon, 21 Jul 2025 17:05:27 -0500
Subject: [PATCH 1/6] Updated Playlist

Updated code to filter out videos that have been removed from the
playlist, and insert new ones into the list in the Update() function.
---
 FreeTubeSync/Model/Playlist.cs | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/FreeTubeSync/Model/Playlist.cs b/FreeTubeSync/Model/Playlist.cs
index 2d1627e..6f2abb7 100644
--- a/FreeTubeSync/Model/Playlist.cs
+++ b/FreeTubeSync/Model/Playlist.cs
@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using System.Diagnostics.CodeAnalysis;
+using Microsoft.EntityFrameworkCore.Query.Internal;
 
 namespace FreeTubeSync.Model;
 
@@ -18,7 +19,20 @@ public class Playlist
     {
         if (other.playlistName != playlistName) playlistName = other.playlistName;
         if (other.@protected != @protected) @protected = other.@protected;
-        if (other.videos.Count != videos.Count) videos = other.videos;
+        var remove = new List<Video>();
+        foreach (var vid in videos)
+        {
+            if (other.videos.Any(x => x.playlistItemId == vid.playlistItemId)) continue;
+            remove.Add(vid);
+        }
+        videos.RemoveAll(x => remove.Contains(x));
+        remove.Clear();
+        foreach (var vid in other.videos)
+        {
+            if (videos.Any(x => x.playlistItemId == vid.playlistItemId)) continue;
+            remove.Add(vid);
+        }
+        videos.AddRange(remove);
         if (other.createdAt != createdAt) createdAt = other.createdAt;
         if (other.lastUpdatedAt != lastUpdatedAt) lastUpdatedAt = other.lastUpdatedAt;
     }

From b08c22e77b405d9ad6d23e4fb1d1dd5701b39660 Mon Sep 17 00:00:00 2001
From: Mario Steele <mario@ruby-im.net>
Date: Mon, 21 Jul 2025 17:08:17 -0500
Subject: [PATCH 2/6] Updated Profile

Updated code to filter out subscriptions that have been removed from the
profile, and insert new ones into the list in the Update() fucntion.
---
 FreeTubeSync/Model/Profile.cs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/FreeTubeSync/Model/Profile.cs b/FreeTubeSync/Model/Profile.cs
index 22d7608..e07c324 100644
--- a/FreeTubeSync/Model/Profile.cs
+++ b/FreeTubeSync/Model/Profile.cs
@@ -18,6 +18,19 @@ public class Profile
         if (other.name != name) name = other.name;
         if (other.bgColor != bgColor) bgColor = other.bgColor;
         if (other.textColor != textColor) textColor = other.textColor;
-        if (other.subscriptions.Count != subscriptions.Count) subscriptions = other.subscriptions;
+        var remove = new List<Subscription>();
+        foreach (var sub in subscriptions)
+        {
+            if (other.subscriptions.Any(x => x.id == sub.id)) continue;
+            remove.Add(sub);
+        }
+        subscriptions.RemoveAll(x => remove.Contains(x));
+        remove.Clear();
+        foreach (var sub in other.subscriptions)
+        {
+            if (subscriptions.Any(x => x.id == sub.id)) continue;
+            remove.Add(sub);
+        }
+        subscriptions.AddRange(remove);
     }
 }
\ No newline at end of file

From e1ad30da0c5f646f14e75cd270a8d506cb9c9971 Mon Sep 17 00:00:00 2001
From: Mario Steele <mario@ruby-im.net>
Date: Mon, 21 Jul 2025 17:08:43 -0500
Subject: [PATCH 3/6] Updated Setting

Added Update() method to model.
---
 FreeTubeSync/Model/Setting.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/FreeTubeSync/Model/Setting.cs b/FreeTubeSync/Model/Setting.cs
index 2e4220f..42acf6a 100644
--- a/FreeTubeSync/Model/Setting.cs
+++ b/FreeTubeSync/Model/Setting.cs
@@ -22,4 +22,9 @@ public class Setting
 #pragma warning restore CS8603
         set => ValueJson = JsonSerializer.Serialize(value);
     }
+
+    public void Update(Setting other)
+    {
+        Value = other.Value;
+    }
 }
\ No newline at end of file

From 77c95a9525897f306501382ccbac03533817710c Mon Sep 17 00:00:00 2001
From: Mario Steele <mario@ruby-im.net>
Date: Mon, 21 Jul 2025 17:08:58 -0500
Subject: [PATCH 4/6] Update Subscription

Added Update() Method to model.
---
 FreeTubeSync/Model/Subscription.cs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/FreeTubeSync/Model/Subscription.cs b/FreeTubeSync/Model/Subscription.cs
index 6f026b6..7f330c9 100644
--- a/FreeTubeSync/Model/Subscription.cs
+++ b/FreeTubeSync/Model/Subscription.cs
@@ -10,4 +10,10 @@ public class Subscription
     public required string id { get; set; }
     public required string name { get; set; }
     public string? thumbnail { get; set; }
+
+    public void Update(Subscription other)
+    {
+        name = other.name;
+        thumbnail = other.thumbnail;
+    }
 }
\ No newline at end of file

From 21af6f43006ba62c8711da61d7f079456a98f219 Mon Sep 17 00:00:00 2001
From: Mario Steele <mario@ruby-im.net>
Date: Mon, 21 Jul 2025 17:09:14 -0500
Subject: [PATCH 5/6] Update Video

Added Update() method to model.
---
 FreeTubeSync/Model/Video.cs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/FreeTubeSync/Model/Video.cs b/FreeTubeSync/Model/Video.cs
index 0fd1c08..435b33b 100644
--- a/FreeTubeSync/Model/Video.cs
+++ b/FreeTubeSync/Model/Video.cs
@@ -16,4 +16,16 @@ public class Video
     public long timeAdded { get; set; }
     [Key] public string playlistItemId { get; set; } = string.Empty;
     public string type { get; set; } = string.Empty;
+
+    public void Update(Video other)
+    {
+        videoId = other.videoId;
+        title = other.title;
+        author = other.author;
+        authorId = other.authorId;
+        lengthSeconds = other.lengthSeconds;
+        pubished = other.pubished;
+        timeAdded = other.timeAdded;
+        type = other.type;
+    }
 }
\ No newline at end of file

From 157d46ee2ecc137e4c176af51fbc145a89683710 Mon Sep 17 00:00:00 2001
From: Mario Steele <mario@ruby-im.net>
Date: Mon, 21 Jul 2025 17:10:42 -0500
Subject: [PATCH 6/6] Updated Endpoints

Updated all endpoints to use Update() method of the model, instead of
trying to use the data from the REST object directly to update the
database.  WHen doing so, tracking gets busted in EFCore, so instead,
will go through and update all properties of a model from the database
object, with the data from the REST object.
---
 FreeTubeSync/EndPoints/HistoryEndpoint.cs       |  5 ++++-
 FreeTubeSync/EndPoints/PlaylistEndpoint.cs      |  6 +++++-
 FreeTubeSync/EndPoints/ProfileEndpoint.cs       |  6 +++++-
 FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs | 10 +++++++---
 FreeTubeSync/EndPoints/SettingEndpoint.cs       |  5 ++++-
 5 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/FreeTubeSync/EndPoints/HistoryEndpoint.cs b/FreeTubeSync/EndPoints/HistoryEndpoint.cs
index 7f6d0d0..d57c233 100644
--- a/FreeTubeSync/EndPoints/HistoryEndpoint.cs
+++ b/FreeTubeSync/EndPoints/HistoryEndpoint.cs
@@ -20,7 +20,10 @@ public static class HistoryEndpoint
             if (results == null)
                 await repository.AddAsync(history, ct);
             else
-                await repository.UpdateAsync(history, ct);
+            {
+                results.Update(history);
+                await repository.UpdateAsync(results, ct);
+            }
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/PlaylistEndpoint.cs b/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
index a7a962f..383d8da 100644
--- a/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
+++ b/FreeTubeSync/EndPoints/PlaylistEndpoint.cs
@@ -20,7 +20,11 @@ public static class PlaylistEndpoint
             if (results == null)
                 await repository.AddAsync(playlist, ct);
             else
-                await repository.UpdateAsync(playlist, ct);
+            {
+                results.Update(playlist);
+                await repository.UpdateAsync(results, ct);
+            }
+
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/ProfileEndpoint.cs b/FreeTubeSync/EndPoints/ProfileEndpoint.cs
index 17b298c..80fc531 100644
--- a/FreeTubeSync/EndPoints/ProfileEndpoint.cs
+++ b/FreeTubeSync/EndPoints/ProfileEndpoint.cs
@@ -20,7 +20,11 @@ public static class ProfileEndpoint
             if (res == null)
                 await repository.AddAsync(profile, ct);
             else
-                await repository.UpdateAsync(profile, ct);
+            {
+                res.Update(profile);
+                await repository.UpdateAsync(res, ct);
+            }
+
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs b/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
index 8908ddc..5948186 100644
--- a/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
+++ b/FreeTubeSync/EndPoints/SearchHistoryEndpoint.cs
@@ -17,10 +17,14 @@ public static class SearchHistoryEndpoint
         group.MapPost("/", async (IRepository<SearchHistory> repository, CancellationToken ct, SearchHistory history) =>
         {
             var result = await repository.GetByIdAsync(history._id, ct);
-            if (result != null)
-                await repository.UpdateAsync(history, ct);
-            else
+            if (result == null)
                 await repository.AddAsync(history, ct);
+            else
+            {
+                result.Update(history);
+                await repository.UpdateAsync(result, ct);
+            }
+
             return Results.Ok();
         });
 
diff --git a/FreeTubeSync/EndPoints/SettingEndpoint.cs b/FreeTubeSync/EndPoints/SettingEndpoint.cs
index fdb9dc8..1b053f0 100644
--- a/FreeTubeSync/EndPoints/SettingEndpoint.cs
+++ b/FreeTubeSync/EndPoints/SettingEndpoint.cs
@@ -22,7 +22,10 @@ public static class SettingEndpoint
             if (res == null)
                 await repository.AddAsync(setting, ct);
             else
-                await repository.UpdateAsync(setting, ct);
+            {
+                res.Update(setting);
+                await repository.UpdateAsync(res, ct);
+            }
             return Results.Ok();
         });