From ff4b0674f79b6eab8f7f149993c9841ab3331bd5 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 16 Feb 2023 01:39:09 +0000
Subject: [PATCH]

---
 server/DataList/PurchaseDataList.cs  |  4 +++-
 server/biz/TrialLicenseRequestBiz.cs |  5 +++--
 todo.txt                             | 20 ++++++++++++++++----
 3 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/server/DataList/PurchaseDataList.cs b/server/DataList/PurchaseDataList.cs
index 3aabcd7..e4831ea 100644
--- a/server/DataList/PurchaseDataList.cs
+++ b/server/DataList/PurchaseDataList.cs
@@ -75,7 +75,9 @@ namespace Sockeye.DataList
                 TKey = "PurchaseDate",
                 FieldKey = "PurchaseDate",
                 UiFieldDataType = (int)UiFieldDataType.DateTime,
-                SqlValueColumnName = "apurchase.purchasedate"
+                SqlValueColumnName = "apurchase.purchasedate",
+                SockType = (int)SockType.Purchase,
+                SqlIdColumnName = "apurchase.id"
             });
 
             FieldDefinitions.Add(new DataListFieldDefinition
diff --git a/server/biz/TrialLicenseRequestBiz.cs b/server/biz/TrialLicenseRequestBiz.cs
index 02f5883..9839186 100644
--- a/server/biz/TrialLicenseRequestBiz.cs
+++ b/server/biz/TrialLicenseRequestBiz.cs
@@ -53,7 +53,8 @@ namespace Sockeye.Biz
                 //Process a new request / Generate an email confirm code
                 newObject.EmailConfirmCode = StringUtil.GenFetchCode();
                 newObject.EmailValidated = false;
-                newObject.Status = TrialRequestStatus.AwaitingEmailValidation;
+                if (!importingDoNotNotify)
+                    newObject.Status = TrialRequestStatus.AwaitingEmailValidation;
 
                 await ct.TrialLicenseRequest.AddAsync(newObject);
                 await ct.SaveChangesAsync();
@@ -150,7 +151,7 @@ namespace Sockeye.Biz
                 l.PGroup = putObject.PGroup;
                 l.TrialMode = true;
                 l.RegTo = putObject.CompanyName;
-                l.FetchEmail=putObject.Email;
+                l.FetchEmail = putObject.Email;
                 //perpet and sub both same number of users, covers seeded data values
                 l.Users = RavenKeyFactory.TRIAL_KEY_USERS;
 
diff --git a/todo.txt b/todo.txt
index ea99ef5..9715791 100644
--- a/todo.txt
+++ b/todo.txt
@@ -1,13 +1,25 @@
 TODO:
 
-Test with v7 and v8 and test purchase vendor notification route with fake sales testsf
-If it works then test install on sockey.ayanova.com alt port and re-test then flip and transition asap.
-Need this basically done for now to move back to raven stuff asap.
+UNTESTED 
+notifications on RAVEN trial request awaiting approval
+sub server create and track
+calendar event for decommission trial sub servers and notification
+super confirm it will *not* attempt to email anyone on import even though it didn't earlier when I just ran with it but double confirm it anyway
+Vendor notification route Test with v7 and v8 and test purchase vendor notification route with fake sales testsf
+v7 license fetch
+Everything again on release build
 
-then on to all the basics, fetch licenses for v7 and v8, trial request processing trigger route, trial subscription server processing and trigger route
+
+TESTED
+Raven 
+    trial request entire flow including email validation
+    license generation manually and test installed
 
 TODO BEFORE RELEASE
 
+Re-test all of the above on ayanova.com server before flipping over from rockfish
+copy of all howto docs to sockeye somewhere or ensure they are still available before final flip over, will need them
+
 SERVER