From 251f84d2af8a7107d00c17ef03c4de6a335d0a9a Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 1 May 2020 21:00:18 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/BizRoles.cs  | 10 ++++++----
 server/AyaNova/util/AySchema.cs |  8 ++++----
 server/AyaNova/util/DbUtil.cs   |  2 ++
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/server/AyaNova/biz/BizRoles.cs b/server/AyaNova/biz/BizRoles.cs
index 60b53e32..000dc467 100644
--- a/server/AyaNova/biz/BizRoles.cs
+++ b/server/AyaNova/biz/BizRoles.cs
@@ -1,7 +1,5 @@
-using System;
 using System.Collections.Generic;
-using AyaNova.Biz;
-
+using Microsoft.Extensions.Logging;
 
 namespace AyaNova.Biz
 {
@@ -216,7 +214,11 @@ namespace AyaNova.Biz
             Dictionary<AyaType, BizRoleSet> lastRolesDeserialized = Newtonsoft.Json.JsonConvert.DeserializeObject<Dictionary<AyaType, BizRoleSet>>(lastRoles);
             if (lastRolesDeserialized.Count != roles.Count)
             {
-                throw new System.ArgumentException("BizRoles::Constructor - roles were modified from last snapshot for client!!!");
+                //throw new System.ArgumentException("BizRoles::Constructor - roles were modified from last snapshot for client!!!");
+                // log =
+                {
+                    ((ILogger)AyaNova.Util.ApplicationLogging.CreateLogger("BizRoles.cs")).LogError("BizRoles::Constructor - roles were modified from last snapshot for client!!!");
+                }
             }
 
 
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 5b95534a..b9cca572 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -20,10 +20,10 @@ namespace AyaNova.Util
         /////////// CHANGE THIS ON NEW SCHEMA UPDATE ////////////////////
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
-        private const int DESIRED_SCHEMA_LEVEL = 10;
+        private const int DESIRED_SCHEMA_LEVEL = 11;
 
-        internal const long EXPECTED_COLUMN_COUNT = 104;
-        internal const long EXPECTED_INDEX_COUNT = 31;
+        internal const long EXPECTED_COLUMN_COUNT = 111;
+        internal const long EXPECTED_INDEX_COUNT = 35;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImporting WHEN NEW TABLES ADDED!!!!
 
@@ -321,7 +321,7 @@ namespace AyaNova.Util
             if (currentSchema < 11)
             {
                 LogUpdateMessage(log);
-                
+
                 //CUSTOMER                
                 await ExecQueryAsync("CREATE TABLE acustomer (id BIGSERIAL PRIMARY KEY, name varchar(255) not null unique, active bool, " +
                 "notes text NULL, wiki text null, customfields text NULL, tags varchar(255) ARRAY NULL)");                             
diff --git a/server/AyaNova/util/DbUtil.cs b/server/AyaNova/util/DbUtil.cs
index 3dc3f85e..9fec6ece 100644
--- a/server/AyaNova/util/DbUtil.cs
+++ b/server/AyaNova/util/DbUtil.cs
@@ -308,6 +308,8 @@ namespace AyaNova.Util
                 await EraseTableAsync("asearchkey", conn);
                 await EraseTableAsync("asearchdictionary", conn);
                 await EraseTableAsync("atag", conn);
+                //CUSTOMER
+                await EraseTableAsync("acustomer", conn);
 
                 await conn.CloseAsync();
             }