From bbc4a432a7747345289b95af179fa1df034316b1 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Fri, 22 May 2020 14:06:30 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs    | 4 ++--
 server/AyaNova/generator/CoreJobBackup.cs           | 4 ++--
 server/AyaNova/models/GlobalOpsBackupSettings.cs    | 6 +++---
 server/AyaNova/util/ServerGlobalOpsSettingsCache.cs | 4 ++--
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs b/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs
index 046db634..a43f633e 100644
--- a/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs
+++ b/server/AyaNova/biz/GlobalOpsBackupSettingsBiz.cs
@@ -47,7 +47,7 @@ namespace AyaNova.Biz
             //not in db then get the default
             if (ret == null)
                 throw new System.Exception("GlobalOpsSettingsBiz::GetAsync -> Global OPS settings object not found in database!!");
-
+            ret.LastBackup=ServerGlobalOpsSettingsCache.Backup.LastBackup;
             return ret;
         }
 
@@ -67,7 +67,7 @@ namespace AyaNova.Biz
             //If backup time has changed then reset last backup as well as it might block from taking effect
             if (putObject.BackupTime.Hour != dbObject.BackupTime.Hour && putObject.BackupTime.Minute != dbObject.BackupTime.Minute)
             {
-                ServerGlobalOpsSettingsCache.LastBackup = DateTime.MinValue;
+                dbObject.LastBackup = DateTime.MinValue;
             }
             CopyObject.Copy(putObject, dbObject, "Id");
             ct.Entry(dbObject).OriginalValues["Concurrency"] = putObject.Concurrency;
diff --git a/server/AyaNova/generator/CoreJobBackup.cs b/server/AyaNova/generator/CoreJobBackup.cs
index e61efbda..7e5d2a8b 100644
--- a/server/AyaNova/generator/CoreJobBackup.cs
+++ b/server/AyaNova/generator/CoreJobBackup.cs
@@ -41,7 +41,7 @@ namespace AyaNova.Biz
                 //Yes, we've passed into the backup window time, but that's also true if we just ran the backup as well so
                 //need to check for that as well...
                 //Has last backup run more than 24 hours ago?
-                if (ServerGlobalOpsSettingsCache.LastBackup > utcNow.AddHours(-24))
+                if (ServerGlobalOpsSettingsCache.Backup.LastBackup > utcNow.AddHours(-24))
                 {
                     log.LogTrace("Hasn't been 24 hours since last backup yet"); return;//nope, so we have already run today's backup
                 }
@@ -105,7 +105,7 @@ namespace AyaNova.Biz
                     var biz = GlobalOpsBackupSettingsBiz.GetBiz(ct);
                     var OpSet = await biz.GetAsync(false);                   
                     await biz.PutAsync(OpSet);
-                    ServerGlobalOpsSettingsCache.LastBackup=utcNow;
+                    ServerGlobalOpsSettingsCache.Backup.LastBackup=utcNow;
                 }
                 log.LogDebug("Backup completed");
             }
diff --git a/server/AyaNova/models/GlobalOpsBackupSettings.cs b/server/AyaNova/models/GlobalOpsBackupSettings.cs
index 6781d5c6..17e6cf80 100644
--- a/server/AyaNova/models/GlobalOpsBackupSettings.cs
+++ b/server/AyaNova/models/GlobalOpsBackupSettings.cs
@@ -1,4 +1,5 @@
 using System;
+using System.ComponentModel.DataAnnotations.Schema;
 namespace AyaNova.Models
 {
 
@@ -8,17 +9,16 @@ namespace AyaNova.Models
         public uint Concurrency { get; set; }
 
         public DateTime BackupTime { get; set; }
-        
         public int BackupSetsToKeep { get; set; }
         public bool BackupAttachments { get; set; }
+        [NotMapped]
+        public DateTime LastBackup { get; set; }
 
         public GlobalOpsBackupSettings()
         {
             Id = 1;//always 1  
             BackupTime = new DateTime(2020, 5, 19, 23, 59, 0, DateTimeKind.Local).ToUniversalTime();//date doesn't matter it only uses hour
-           
             BackupSetsToKeep = 3;
-
         }
     }
 }
diff --git a/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs b/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs
index 5d5fe574..dfab2458 100644
--- a/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs
+++ b/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs
@@ -13,7 +13,7 @@ namespace AyaNova.Util
     {
 
         internal static GlobalOpsBackupSettings Backup { get; set; }
-        internal static DateTime LastBackup { get; set; }
+      //  internal static DateTime LastBackup { get; set; }
 
 
         /// <summary>
@@ -29,7 +29,7 @@ namespace AyaNova.Util
                 ct.GlobalOpsBackupSettings.Add(Backup);
                 ct.SaveChanges();
             }            
-            LastBackup=FileUtil.MostRecentBackupFileDate();
+           Backup.LastBackup=FileUtil.MostRecentBackupFileDate();
         }