fix: correct userIds selection, clean up code

Author: pandinocoder

Intersect.Server.Core/Database/IntersectDbContext.cs

@@ -209,18 +209,8 @@ public override int SaveChanges(bool acceptAllChangesOnSuccess)
         }
         catch (DbUpdateConcurrencyException concurrencyException)
         {
-            static Guid GetUserIdFrom(object entry)
-            {
-                return entry switch
-                {
-                    IPlayerOwned playerOwned => playerOwned.Player?.User?.Id ?? playerOwned.Player?.UserId ?? default,
-                    Player player => player.User?.Id ?? player.UserId,
-                    _ => default,
-                };
-            }
-
             var concurrencyErrors = new StringBuilder();
-            var userIds = concurrencyException.Entries.Select(GetUserIdFrom)
+            var userIds = concurrencyException.Entries.Select(entry => GetUserIdFrom(entry.Entity))
                 .Where(id => id != default)
                 .Distinct()
                 .ToArray();
@@ -273,9 +263,11 @@ static Guid GetUserIdFrom(object entry)
                 .Select(entry => entry.Entity.GetType().Name)
                 .Distinct()
                 .ToArray();
+
+            concurrencyErrors.AppendLine(Environment.StackTrace);
+
             Log.Error(concurrencyException, $"Jackpot! Concurrency Bug For {string.Join(", ", entityTypeNames)} {suffix}");
             Log.Error(concurrencyErrors.ToString());
-            Log.Error(Environment.StackTrace);
 
 #if DEBUG
             Log.Debug($"DBOP-C SaveChanges({acceptAllChangesOnSuccess}) #{currentExecutionId}");
@@ -286,6 +278,16 @@ static Guid GetUserIdFrom(object entry)
             );
 
             return -1;
+
+            static Guid GetUserIdFrom(object entry)
+            {
+                return entry switch
+                {
+                    IPlayerOwned playerOwned => playerOwned.Player?.User?.Id ?? playerOwned.Player?.UserId ?? default,
+                    Player player => player.User?.Id ?? player.UserId,
+                    _ => default,
+                };
+            }
         }
     }
 

Intersect.Server.Core/Database/PlayerData/Players/Variable.cs

@@ -6,19 +6,9 @@ namespace Intersect.Server.Database.PlayerData.Players
 {
     public partial class Variable
     {
-        private Guid _id;
-
         [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
         [JsonIgnore]
-        public Guid Id
-        {
-            get => _id;
-            set
-            {
-                Console.WriteLine("HERE IS THE ISSUE?", Environment.StackTrace);
-                _id = value;
-            }
-        }
+        public Guid Id { get; set; }
 
         [DatabaseGenerated(DatabaseGeneratedOption.None)]
         public Guid VariableId { get; protected set; }