From c6f3ca2b7241d9228894152fccbf96937da1cbfb Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Tue, 8 Mar 2022 22:59:48 +0000
Subject: [PATCH]

---
 .vscode/launch.json                          | 2 +-
 server/AyaNova/models/CustomerNotifyEvent.cs | 7 +++----
 server/AyaNova/util/AySchema.cs              | 8 ++++----
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index 2c3525c1..7c905164 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -48,7 +48,7 @@
         "AYANOVA_DATA_PATH": "c:\\temp\\ravendata",
         "AYANOVA_USE_URLS": "http://*:7575;",
         //"AYANOVA_PERMANENTLY_ERASE_DATABASE":"true",
-        "AYANOVA_SERVER_TEST_MODE": "false",
+        "AYANOVA_SERVER_TEST_MODE": "true",
         "AYANOVA_SERVER_TEST_MODE_TZ_OFFSET": "-8",
         //"AYANOVA_REPORT_RENDERING_TIMEOUT":"1",
         "AYANOVA_SERVER_TEST_MODE_SEEDLEVEL": "small",
diff --git a/server/AyaNova/models/CustomerNotifyEvent.cs b/server/AyaNova/models/CustomerNotifyEvent.cs
index 8f4adeaa..1a918285 100644
--- a/server/AyaNova/models/CustomerNotifyEvent.cs
+++ b/server/AyaNova/models/CustomerNotifyEvent.cs
@@ -29,8 +29,8 @@ namespace AyaNova.Models
 
         //date of the event actually occuring, e.g. WarrantyExpiry date. Compared with subscription to determine if deliverable or not
         public DateTime EventDate { get; set; }
-        public string Subject { get; set; }//email subject line
-        public string Message { get; set; }//email body
+        // public string Subject { get; set; }//email subject line
+        // public string Message { get; set; }//email body
 
 
 
@@ -42,8 +42,7 @@ namespace AyaNova.Models
             AyaType = AyaType.NoType;
             ObjectId = 0;
             Name = string.Empty;
-            Subject="na";
-            Message="na";
+          
         }
 
         public override string ToString()
diff --git a/server/AyaNova/util/AySchema.cs b/server/AyaNova/util/AySchema.cs
index 5b6ab267..b45f1d0d 100644
--- a/server/AyaNova/util/AySchema.cs
+++ b/server/AyaNova/util/AySchema.cs
@@ -22,16 +22,16 @@ namespace AyaNova.Util
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
         private const int DESIRED_SCHEMA_LEVEL = 1;
 
-        internal const long EXPECTED_COLUMN_COUNT = 1361;
+        internal const long EXPECTED_COLUMN_COUNT = 1359;
         internal const long EXPECTED_INDEX_COUNT = 156;
-        internal const long EXPECTED_CHECK_CONSTRAINTS = 550;
+        internal const long EXPECTED_CHECK_CONSTRAINTS = 548;
         internal const long EXPECTED_FOREIGN_KEY_CONSTRAINTS = 201;
         internal const long EXPECTED_VIEWS = 11;
         internal const long EXPECTED_ROUTINES = 2;
 
         //!!!!WARNING: BE SURE TO UPDATE THE DbUtil::EmptyBizDataFromDatabaseForSeedingOrImportingAsync WHEN NEW TABLES ADDED!!!!
 
-        ///////////////////////////////////////// C1361:I156:CC550:FC201:V11:R2)
+        ///////////////////////////////////////// (C1359:I156:CC548:FC201:V11:R2)
 
         /*
 
@@ -1215,7 +1215,7 @@ $BODY$ LANGUAGE PLPGSQL STABLE");
 
                 await ExecQueryAsync("CREATE TABLE acustomernotifyevent (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, created TIMESTAMPTZ NOT NULL, "
                     + "ayatype INTEGER NOT NULL, objectid BIGINT NOT NULL, name TEXT NOT NULL, eventtype INTEGER NOT NULL, customernotifysubscriptionid BIGINT NOT NULL REFERENCES acustomernotifysubscription(id) ON DELETE CASCADE, "
-                    + "customerid BIGINT NOT NULL REFERENCES acustomer (id) ON DELETE CASCADE, eventdate TIMESTAMPTZ NOT NULL, decvalue DECIMAL(38,18) NULL, message TEXT NOT NULL, subject TEXT NOT NULL)");
+                    + "customerid BIGINT NOT NULL REFERENCES acustomer (id) ON DELETE CASCADE, eventdate TIMESTAMPTZ NOT NULL, decvalue DECIMAL(38,18) NULL)");
 
                 await ExecQueryAsync("CREATE TABLE acustomernotifydeliverylog (id BIGINT GENERATED ALWAYS AS IDENTITY PRIMARY KEY, processed TIMESTAMPTZ NOT NULL, "
                     + "objectid BIGINT NOT NULL,  customernotifysubscriptionid BIGINT NOT NULL, fail BOOL NOT NULL, error TEXT)");