- update next item id logic

Preventing reserving already reserved id
piotr-shishkov · Jul 1, 2024 · 4a4dcbc · 4a4dcbc
1 parent 6e6327c
commit 4a4dcbc
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 17 deletions.
diff --git a/SteamInventoryServiceTool/SteamInventoryServiceTool.csproj b/SteamInventoryServiceTool/SteamInventoryServiceTool.csproj
@@ -6,8 +6,8 @@
     <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Resources\AppLogo_Small.ico</ApplicationIcon>
-    <AssemblyVersion>0.1.0.2</AssemblyVersion>
-    <Version>0.1.0.2</Version>
+    <AssemblyVersion>0.1.0.3</AssemblyVersion>
+    <Version>0.1.0.3</Version>
     <PublishSingleFile>true</PublishSingleFile>
     <SelfContained>false</SelfContained>
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>

diff --git a/SteamInventoryServiceTool/Workspaces/Workspace.cs b/SteamInventoryServiceTool/Workspaces/Workspace.cs
@@ -14,6 +14,7 @@ public class Workspace
 	public string Name { get; set; }
 	public Dictionary<string, List<string>> Tags { get; set; } = new();
 	public List<Item> Items { get; set; } = new();
+	public int LastCreatedId { get; set; } = 1;
 
 	[JsonIgnore]
 	public string FilePath { get; set; }
@@ -70,6 +71,8 @@ public void AddItem(Item item)
 			Items.Remove(existingItem);
 		}
 		Items.Add(item);
+		if(item.Id > LastCreatedId)
+			LastCreatedId = item.Id;
 		SortItems();
 		Update();
 		Save();
@@ -93,21 +96,22 @@ private void SortItems()
 
 	public int GetNextItemId()
 	{
-		if (Items.Count == 0)
-			return 1;
-
-		// Extract IDs and sort them
-		var ids = Items.Select(item => item.Id).OrderBy(id => id).ToList();
-
-		// Check for the first missing ID
-		for (var i = 0; i < ids.Count; i++)
-		{
-			if (ids[i] != i + 1)
-				return i + 1;
-		}
-
-		// If all IDs are sequential, return the next ID
-		return ids.Count + 1;
+		return LastCreatedId + 1;
+
+		// Deprecated cause can create item with same id which was another item before
+		//
+		// // Extract IDs and sort them
+		// var ids = Items.Select(item => item.Id).OrderBy(id => id).ToList();
+		//
+		// // Check for the first missing ID
+		// for (var i = 0; i < ids.Count; i++)
+		// {
+		// 	if (ids[i] != i + 1)
+		// 		return i + 1;
+		// }
+		//
+		// // If all IDs are sequential, return the next ID
+		// return ids.Count + 1;
 	}
 
 	public void Save()

diff --git a/SteamInventoryServiceTool/Workspaces/WorkspaceManager.cs b/SteamInventoryServiceTool/Workspaces/WorkspaceManager.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using SteamInventoryServiceTool.Utility;
 
 namespace SteamInventoryServiceTool.Workspaces;
@@ -35,6 +36,8 @@ private void SetActiveWorkspace(Workspace workspace)
         }
         _activeWorkspace = workspace;
         _activeWorkspace.Updated += OnActiveWorkspaceUpdated;
+        var maxItemId = _activeWorkspace.Items.MaxBy(x => x.Id)?.Id ?? 0;
+        _activeWorkspace.LastCreatedId = Math.Max(_activeWorkspace.LastCreatedId, Math.Max(1, maxItemId));
         WorkspaceChanged?.Invoke(_activeWorkspace);
     }