♻️ Rename Player to PlayerEntity in EF project for clarity

Sources/App/Program.cs

@@ -40,7 +40,9 @@ namespace App
                     // Later, we'll use the DiceAppDbContext to get a GameDbRunner
 
                     // get all the players from the DB
-                    IEnumerable<PlayerEntity> entities = db.Players;
+                    PlayerDbManager playerDbManager = new(db);
+                    IEnumerable<PlayerEntity> entities = await playerDbManager.GetAll();
+
 
                     Debug.WriteLine("Loading players");
 

Sources/Data/EF/DiceAppDbContext.cs

@@ -12,7 +12,7 @@ namespace Data.EF
         // will be async!
         public virtual Task<MasterOfCeremonies> LoadApp() { throw new NotImplementedException(); }
 
-        public DbSet<PlayerEntity> Players { get; set; }
+        public DbSet<PlayerEntity> PlayerEntity { get; set; }
         public DbSet<NumberDieEntity> NumberDice { get; set; }
         public DbSet<NumberFaceEntity> NumberFaces { get; set; }
         public DbSet<ImageDieEntity> ImageDice { get; set; }

Sources/Data/EF/Players/PlayerDBManager.cs

@@ -47,7 +47,7 @@ namespace Data.EF.Players
         {
             CleanPlayerEntity(toAdd);
 
-            if (db.Players.Where(entity => entity.Name == toAdd.Name).Any())
+            if (db.PlayerEntity.Where(entity => entity.Name == toAdd.Name).Any())
             {
                 throw new ArgumentException("this username is already taken", nameof(toAdd));
             }
@@ -57,7 +57,7 @@ namespace Data.EF.Players
 
         private async Task<PlayerEntity> InternalAdd(PlayerEntity toAdd)
         {
-            EntityEntry ee = await db.Players.AddAsync(toAdd);
+            EntityEntry ee = await db.PlayerEntity.AddAsync(toAdd);
             await db.SaveChangesAsync();
             return (PlayerEntity)ee.Entity;
         }
@@ -65,7 +65,7 @@ namespace Data.EF.Players
         public async Task<IEnumerable<PlayerEntity>> GetAll()
         {
             List<PlayerEntity> players = new();
-            await Task.Run(() => players.AddRange(db.Players));
+            await Task.Run(() => players.AddRange(db.PlayerEntity));
             return players.AsEnumerable();
         }
 
@@ -90,7 +90,7 @@ namespace Data.EF.Players
 
         private async Task<PlayerEntity> InternalGetOneByName(string name)
         {
-            return await db.Players.Where(p => p.Name == name).FirstAsync();
+            return await db.PlayerEntity.Where(p => p.Name == name).FirstAsync();
         }
 
         public async Task<bool> IsPresentByName(string name)
@@ -100,7 +100,7 @@ namespace Data.EF.Players
                 return false;
             }
             name = name.Trim();
-            return await db.Players.Where(p => p.Name == name).FirstOrDefaultAsync() is not null;
+            return await db.PlayerEntity.Where(p => p.Name == name).FirstOrDefaultAsync() is not null;
         }
 
         /// <summary>
@@ -115,7 +115,7 @@ namespace Data.EF.Players
             bool isPresent = IsPresentByID(toRemove.ID).Result;
             if (isPresent)
             {
-                db.Players.Remove(toRemove);
+                db.PlayerEntity.Remove(toRemove);
                 db.SaveChanges();
             }
         }
@@ -161,12 +161,12 @@ namespace Data.EF.Players
         /// <exception cref="InvalidOperationException"></exception>
         public async Task<PlayerEntity> GetOneByID(Guid ID)
         {
-            return await db.Players.FirstAsync(p => p.ID == ID);
+            return await db.PlayerEntity.FirstAsync(p => p.ID == ID);
         }
 
         public async Task<bool> IsPresentByID(Guid ID)
         {
-            return await db.Players.FirstOrDefaultAsync(p => p.ID == ID) is not null;
+            return await db.PlayerEntity.FirstOrDefaultAsync(p => p.ID == ID) is not null;
         }
     }
 }

Sources/Data/EF/Players/PlayerDbManager.cs

@@ -47,7 +47,7 @@ namespace Data.EF.Players
         {
             CleanPlayerEntity(toAdd);
 
-            if (db.Players.Where(entity => entity.Name == toAdd.Name).Any())
+            if (db.PlayerEntity.Where(entity => entity.Name == toAdd.Name).Any())
             {
                 throw new ArgumentException("this username is already taken", nameof(toAdd));
             }
@@ -57,7 +57,7 @@ namespace Data.EF.Players
 
         private async Task<PlayerEntity> InternalAdd(PlayerEntity toAdd)
         {
-            EntityEntry ee = await db.Players.AddAsync(toAdd);
+            EntityEntry ee = await db.PlayerEntity.AddAsync(toAdd);
             await db.SaveChangesAsync();
             return (PlayerEntity)ee.Entity;
         }
@@ -65,7 +65,7 @@ namespace Data.EF.Players
         public async Task<IEnumerable<PlayerEntity>> GetAll()
         {
             List<PlayerEntity> players = new();
-            await Task.Run(() => players.AddRange(db.Players));
+            await Task.Run(() => players.AddRange(db.PlayerEntity));
             return players.AsEnumerable();
         }
 
@@ -90,7 +90,7 @@ namespace Data.EF.Players
 
         private async Task<PlayerEntity> InternalGetOneByName(string name)
         {
-            return await db.Players.Where(p => p.Name == name).FirstAsync();
+            return await db.PlayerEntity.Where(p => p.Name == name).FirstAsync();
         }
 
         public async Task<bool> IsPresentByName(string name)
@@ -100,7 +100,7 @@ namespace Data.EF.Players
                 return false;
             }
             name = name.Trim();
-            return await db.Players.Where(p => p.Name == name).FirstOrDefaultAsync() is not null;
+            return await db.PlayerEntity.Where(p => p.Name == name).FirstOrDefaultAsync() is not null;
         }
 
         /// <summary>
@@ -115,7 +115,7 @@ namespace Data.EF.Players
             bool isPresent = IsPresentByID(toRemove.ID).Result;
             if (isPresent)
             {
-                db.Players.Remove(toRemove);
+                db.PlayerEntity.Remove(toRemove);
                 db.SaveChanges();
             }
         }
@@ -161,12 +161,12 @@ namespace Data.EF.Players
         /// <exception cref="InvalidOperationException"></exception>
         public async Task<PlayerEntity> GetOneByID(Guid ID)
         {
-            return await db.Players.FirstAsync(p => p.ID == ID);
+            return await db.PlayerEntity.FirstAsync(p => p.ID == ID);
         }
 
         public async Task<bool> IsPresentByID(Guid ID)
         {
-            return await db.Players.FirstOrDefaultAsync(p => p.ID == ID) is not null;
+            return await db.PlayerEntity.FirstOrDefaultAsync(p => p.ID == ID) is not null;
         }
     }
 }

Sources/Data/EF/Players/PlayerEntity.cs

@@ -1,4 +1,5 @@
-using Microsoft.EntityFrameworkCore;
+using Data.EF.Games;
+using Microsoft.EntityFrameworkCore;
 
 namespace Data.EF.Players
 {
@@ -9,6 +10,8 @@ namespace Data.EF.Players
 
         public string Name { get; set; }
 
+        public ICollection<TurnEntity> Turns { get; set; }
+
         public override bool Equals(object obj)
         {
             if (obj is not PlayerEntity)

Sources/Tests/Data_UTs/DiceAppDbContextWithStubTest.cs

@@ -41,7 +41,7 @@ namespace Tests.Data_UTs
 
                 // Assert
 
-                Assert.True(db.Players.Where(p => p.Name.Equals(name)).Any());
+                Assert.True(db.PlayerEntity.Where(p => p.Name.Equals(name)).Any());
             }
         }
 

Sources/Tests/Data_UTs/Players/PlayerDbManagerTest.cs

@@ -368,7 +368,7 @@ namespace Tests.Data_UTs.Players
             {
                 db.Database.EnsureCreated();
 
-                Assert.DoesNotContain(toRemove, db.Players);
+                Assert.DoesNotContain(toRemove, db.PlayerEntity);
             }
         }
 
@@ -656,11 +656,9 @@ namespace Tests.Data_UTs.Players
 
             PlayerDbManager mgr;
             Guid id = Guid.NewGuid();
-
+            Guid otherId;
-            Guid otherId = Guid.NewGuid();
 
             PlayerEntity presentEntity;
-            PlayerEntity absentEntity;
 
             // Act
 
@@ -670,9 +668,10 @@ namespace Tests.Data_UTs.Players
                 mgr = new(db);
 
                 presentEntity = new() { ID = id, Name = "Victor" };
-                await mgr.Add(presentEntity);
+                await mgr.Add(presentEntity);
-
+
-                absentEntity = new() { ID = otherId, Name = "Victor" };
+                otherId = Guid.NewGuid();
+                // not added
             }
 
             // Assert
@@ -682,7 +681,7 @@ namespace Tests.Data_UTs.Players
                 db.Database.EnsureCreated();
                 mgr = new(db);
 
-                Assert.DoesNotContain(absentEntity, db.Players);
+                Assert.False(await mgr.IsPresentByID(otherId));
             }
         }
     }