Merge pull request #8 from GranDen-Corp/dev

Bugfix/fix unit tests (#7)
GranDen-Corp · Jul 6, 2020 · 4bf02dd · 4bf02dd
2 parents 42e749a + 8d9a445
commit 4bf02dd
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 28 deletions.
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -1,9 +1,8 @@
 <Project>
   <PropertyGroup>
-    <Version Condition=" '$(Version)'=='' ">0.0.3</Version>
-    <PackageReleaseNotes>0.0.3 : 
-      &#xD;&#xA;1. Add bingo game preset data mechanism.
-      &#xD;&#xA;2. Modifiy existing geo point preset data methods.
+    <Version Condition=" '$(Version)'=='' ">0.0.4</Version>
+    <PackageReleaseNotes>0.0.4 : 
+      &#xD;&#xA;Rename Preset seeding extension methods for better naming, and prevent existing BingoGameInfo entities being overwritten.
       &#xD;&#xA;
     </PackageReleaseNotes>
   </PropertyGroup>

diff --git a/src/GranDen.Game.ApiLib.Bingo/ServicesRegistration/BingoGameGeoPointRegistrationExtension.cs b/src/GranDen.Game.ApiLib.Bingo/ServicesRegistration/BingoGameGeoPointRegistrationExtension.cs
@@ -52,7 +52,7 @@ public static IServiceCollection ConfigPresetGeoPointData(this IServiceCollectio
         /// <param name="geoPointIds">Additional Preset Data</param>
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
-        public static IServiceProvider InitGeoPointData(this IServiceProvider serviceProvider,
+        public static IServiceProvider InitPresetGeoPointData(this IServiceProvider serviceProvider,
             IEnumerable<string> geoPointIds = null)
         {
             var mappingGeoPointsRepo = serviceProvider.GetService<IMappingGeoPointsRepo>();

diff --git a/src/GranDen.Game.ApiLib.Bingo/ServicesRegistration/BingoGamePresetDataExtension.cs b/src/GranDen.Game.ApiLib.Bingo/ServicesRegistration/BingoGamePresetDataExtension.cs
@@ -58,7 +58,7 @@ public static IServiceCollection ConfigPresetBingoGameData(this IServiceCollecti
         /// <param name="serviceProvider"></param>
         /// <param name="bingoGameOption"></param>
         /// <returns></returns>
-        public static IServiceProvider InitBingoGameData(this IServiceProvider serviceProvider, BingoGameOption bingoGameOption)
+        public static IServiceProvider InitPresetBingoGameData(this IServiceProvider serviceProvider, BingoGameOption bingoGameOption)
         {
             var gameInfoDtos = bingoGameOption.Select(o =>
                 new BingoGameInfoDto
@@ -70,7 +70,7 @@ public static IServiceProvider InitBingoGameData(this IServiceProvider servicePr
                     Enabled = true
                 }).ToList();
 
-            return InitBingoGameData(serviceProvider, gameInfoDtos);
+            return InitPresetBingoGameData(serviceProvider, gameInfoDtos);
         }
 
         /// <summary>
@@ -80,7 +80,7 @@ public static IServiceProvider InitBingoGameData(this IServiceProvider servicePr
         /// <param name="bingoGameInfos">Additional Preset Data</param>
         /// <returns></returns>
         /// <exception cref="Exception"></exception>
-        public static IServiceProvider InitBingoGameData(this IServiceProvider serviceProvider, IEnumerable<BingoGameInfoDto> bingoGameInfos = null)
+        public static IServiceProvider InitPresetBingoGameData(this IServiceProvider serviceProvider, IEnumerable<BingoGameInfoDto> bingoGameInfos = null)
         {
             var bingoGameInfoRepo = serviceProvider.GetService<IBingoGameInfoRepo>();
             var presetBingoGameService = serviceProvider.GetService<IPresetBingoGameService>();
@@ -91,15 +91,10 @@ public static IServiceProvider InitBingoGameData(this IServiceProvider servicePr
                 {
                     if (bingoGameInfoRepo.QueryBingoGames().Any(g => g.GameName == bingoGameInfoDto.GameName))
                     {
-                        if (!bingoGameInfoRepo.UpdateBingoGame(bingoGameInfoDto))
-                        {
-                            throw new Exception($"Update existing Bingo Game {bingoGameInfoDto.GameName} failed.");
-                        }
-                    }
-                    else
-                    {
-                        bingoGameInfoRepo.CreateBingoGame(bingoGameInfoDto);
+                       continue; 
                     }
+
+                    bingoGameInfoRepo.CreateBingoGame(bingoGameInfoDto);
                 }
             }
 
@@ -112,15 +107,10 @@ public static IServiceProvider InitBingoGameData(this IServiceProvider servicePr
             {
                 if (bingoGameInfoRepo.QueryBingoGames().Any(g => g.GameName == bingoGameInfoDto.GameName))
                 {
-                    if (!bingoGameInfoRepo.UpdateBingoGame(bingoGameInfoDto))
-                    {
-                        throw new Exception($"Update existing Bingo Game {bingoGameInfoDto.GameName} failed.");
-                    }
-                }
-                else
-                {
-                    bingoGameInfoRepo.CreateBingoGame(bingoGameInfoDto);
+                   continue;;
                 }
+
+                bingoGameInfoRepo.CreateBingoGame(bingoGameInfoDto);
             }
 
             return serviceProvider;

diff --git a/test/GranDen.Game.ApiLib.Bingo.Test/BingoPlayerApiTest.cs b/test/GranDen.Game.ApiLib.Bingo.Test/BingoPlayerApiTest.cs
@@ -119,7 +119,8 @@ public void PlayerCanAddBingoPointStatusDuringValidGamePeriod()
             Assert.True(marked2);
             var bingoPointRepo = _serviceProvider.GetService<IBingoPointRepo>();
             var markedPoints = bingoPointRepo.QueryBingoPoints(PresetBingoGameName, testPlayerId)
-                .Include(m => m.BelongingGame).Include(m => m.BelongingPlayer).Where(p => p.MarkPoint.Marked).ToList();
+                .Include(m => m.BelongingGame).Include(m => m.BelongingPlayer)
+                .Where(p => p.MarkPoint.Marked).OrderBy(p => p.MarkPoint.X).ThenBy(p => p.MarkPoint.Y).ToList();
 
             Assert.Equal(3, markedPoints.Count);
 
@@ -255,16 +256,18 @@ private void InitServices()
 
         private void PresetData()
         {
-            var dbContext = _serviceProvider.GetService<BingoGameDbContext>();
+            using var serviceScope = _serviceProvider.CreateScope();
+            var serviceProvider = serviceScope.ServiceProvider;
+            var dbContext = serviceProvider.GetService<BingoGameDbContext>();
 
             //NOTE: doesn't know why in-memory SQLite DB cannot just call Migration() to create DB Schema
             if (!dbContext.Database.EnsureCreated())
             {
                 dbContext.Database.Migrate();
             }
 
-            _serviceProvider.InitGeoPointData();
-            _serviceProvider.InitBingoGameData();
+            serviceProvider.InitPresetGeoPointData();
+            serviceProvider.InitPresetBingoGameData();
         }
 
         private static DbConnection CreateInMemoryDatabase()