Merge branch 'master' of https://github.com/ZeroK-RTS/Zero-K-Infrastructure into ranks

Conflicts:
	ZkData/Migrations/Configuration.cs

Author: DeinFreund

ZkData/Migrations/201712232154526_AddedSunRanks.Designer.cs

@@ -0,0 +1,18 @@
+namespace ZkData.Migrations
+{
+    using System;
+    using System.Data.Entity.Migrations;
+    
+    public partial class AddedSunRanks : DbMigration
+    {
+        public override void Up()
+        {
+            AddColumn("dbo.Accounts", "Rank", c => c.Int(nullable: false));
+        }
+        
+        public override void Down()
+        {
+            DropColumn("dbo.Accounts", "Rank");
+        }
+    }
+}

ZkData/Migrations/201712232154526_AddedSunRanks.cs

@@ -35,47 +35,19 @@ private static void InitializeBattleRatings(ZkDataContext db)
             });
         }
 
+        /// <summary>
+        /// This method is called after migration to latest version
+        /// </summary>
         protected override void Seed(ZkDataContext db) {
             var ago = DateTime.UtcNow.AddDays(-GlobalConst.LadderActivityDays);
             db.Accounts.Where(x => x.LastLogin > ago).ForEach(x =>
             {
                 x.Rank = Math.Max(0, Math.Min(7, (int)(x.AccountRatings.Where(a => a.RatingCategory == RatingCategory.Casual).Select(a => a.RealElo).DefaultIfEmpty(1500).FirstOrDefault() - 1000) / 200));
             });
             db.SaveChanges();
-
-            //  This method will be called after migrating to the latest version.
-            if (GlobalConst.Mode == ModeType.Local)
-            {
-                // fill local DB with some basic test data
-                db.MiscVars.AddOrUpdate(
-                    x => x.VarName,
-                    new MiscVar { VarName = "NightwatchPassword", VarValue = "dummy" },
-                    new MiscVar { VarName = "GithubHookKey", VarValue = "secret" });
-                
-                if (!db.MiscVars.Any(y=>y.VarName=="SteamBuildPassword"))
-                    db.MiscVars.AddOrUpdate(x => x.VarName, new MiscVar { VarName = "SteamBuildPassword", VarValue = "secret" });
-
-                if (!db.MiscVars.Any(y => y.VarName == "GlacierSecretKey"))
-                    db.MiscVars.AddOrUpdate(x => x.VarName, new MiscVar { VarName = "GlacierSecretKey", VarValue = "secret" });
-
-             
-                db.Accounts.AddOrUpdate(
-                    x => x.Name,
-                    new Account
-                    {
-                        Name = "TestPlayer",
-                        NewPasswordPlain = "test",
-                        AdminLevel = AdminLevel.SuperAdmin,
-                        Kudos = 200,
-                        Level = 255,
-                        Xp = 1325900,
-                        Rank = 3,
-                        Country = "cz",
-                        Avatar = "amphimpulse",
-                        DevLevel = DevLevel.CoreDeveloper,
-                    },
-                    new Account { Name = GlobalConst.NightwatchName, NewPasswordPlain = "dummy", IsBot = true, AdminLevel = AdminLevel.SuperAdmin});
-            }
+            db.Database.ExecuteSqlCommand($"truncate table {nameof(LogEntries)}");
+           
+            if (GlobalConst.Mode == ModeType.Local) LocalSeed(db);
 
             db.Resources.AddOrUpdate(x=>x.InternalName, new Resource()
             {
@@ -137,5 +109,36 @@ protected override void Seed(ZkDataContext db) {
             db.SaveChanges();
 
         }
+
+        private static void LocalSeed(ZkDataContext db)
+        {
+            // fill local DB with some basic test data
+            db.MiscVars.AddOrUpdate(x => x.VarName,
+                new MiscVar { VarName = "NightwatchPassword", VarValue = "dummy" },
+                new MiscVar { VarName = "GithubHookKey", VarValue = "secret" });
+
+            if (!db.MiscVars.Any(y => y.VarName == "SteamBuildPassword"))
+                db.MiscVars.AddOrUpdate(x => x.VarName, new MiscVar { VarName = "SteamBuildPassword", VarValue = "secret" });
+
+            if (!db.MiscVars.Any(y => y.VarName == "GlacierSecretKey"))
+                db.MiscVars.AddOrUpdate(x => x.VarName, new MiscVar { VarName = "GlacierSecretKey", VarValue = "secret" });
+
+            db.Accounts.AddOrUpdate(x => x.Name,
+            new Account
+            {
+                Name = "TestPlayer",
+                NewPasswordPlain = "test",
+                AdminLevel = AdminLevel.SuperAdmin,
+                Kudos = 200,
+                Level = 255,
+                Xp = 1325900,
+                Rank = 3,
+                Country = "cz",
+                Avatar = "amphimpulse",
+                DevLevel = DevLevel.CoreDeveloper,
+            },
+            new Account { Name = "test", NewPasswordPlain = "test", AdminLevel = AdminLevel.SuperAdmin, Kudos = 200, Level = 50, Country = "cz" },
+            new Account { Name = GlobalConst.NightwatchName, NewPasswordPlain = "dummy", IsBot = true, AdminLevel = AdminLevel.SuperAdmin });
+        }
     }
 }

ZkData/Migrations/201712232154526_AddedSunRanks.resx

@@ -336,9 +336,9 @@
     <Compile Include="Migrations\201712192204530_EloIsHistory.Designer.cs">
       <DependentUpon>201712192204530_EloIsHistory.cs</DependentUpon>
     </Compile>
-    <Compile Include="Migrations\201712222344030_rank.cs" />
-    <Compile Include="Migrations\201712222344030_rank.Designer.cs">
-      <DependentUpon>201712222344030_rank.cs</DependentUpon>
+    <Compile Include="Migrations\201712232154526_AddedSunRanks.cs" />
+    <Compile Include="Migrations\201712232154526_AddedSunRanks.Designer.cs">
+      <DependentUpon>201712232154526_AddedSunRanks.cs</DependentUpon>
     </Compile>
     <Compile Include="SpringFilesUnitsyncAttempt.cs" />
     <Compile Include="SteamWebApi.cs" />
@@ -660,8 +660,8 @@
     <EmbeddedResource Include="Migrations\201712192204530_EloIsHistory.resx">
       <DependentUpon>201712192204530_EloIsHistory.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="Migrations\201712222344030_rank.resx">
-      <DependentUpon>201712222344030_rank.cs</DependentUpon>
+    <EmbeddedResource Include="Migrations\201712232154526_AddedSunRanks.resx">
+      <DependentUpon>201712232154526_AddedSunRanks.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="ZkDataResources.resx">
       <Generator>ResXFileCodeGenerator</Generator>