diff --git a/server/AyaNova/Controllers/GlobalOpsSettingsController.cs b/server/AyaNova/Controllers/GlobalOpsSettingsController.cs index 1d6724f6..7f3982d0 100644 --- a/server/AyaNova/Controllers/GlobalOpsSettingsController.cs +++ b/server/AyaNova/Controllers/GlobalOpsSettingsController.cs @@ -38,11 +38,11 @@ namespace AyaNova.Api.Controllers } /// - /// Get GlobalOpsSettings + /// Get GlobalOpsBackupSettings /// - /// Global ops settings object + /// Global ops backup settings object [HttpGet] - public async Task GetGlobalOpsSettings() + public async Task GetGlobalOpsBackupSettings() { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -65,12 +65,12 @@ namespace AyaNova.Api.Controllers /// - /// POST (replace) Global biz settings + /// POST (replace) Global ops backup settings /// /// /// nothing [HttpPost] - public async Task ReplaceGlobalOpsSettings([FromBody] GlobalOpsBackupSettings global) + public async Task ReplaceGlobalOpsBackupSettings([FromBody] GlobalOpsBackupSettings global) { if (serverState.IsClosed) return StatusCode(503, new ApiErrorResponse(serverState.ApiErrorCode, null, serverState.Reason)); @@ -92,11 +92,11 @@ namespace AyaNova.Api.Controllers } /// - /// Get Client app relevant GlobalOpsSettings + /// Get Client app relevant GlobalOpsBackupSettings /// - /// Global settings object + /// Global ops backup settings object [HttpGet("client")] - public async Task GetClientGlobalOpsSettings() + public async Task GetClientGlobalOpsBackupSettings() { //NOTE: currently this looks like a dupe of get above and it is //but it's kept here in case want to return a subset of the settings only to client users diff --git a/server/AyaNova/biz/GlobalOpsSettingsBiz.cs b/server/AyaNova/biz/GlobalOpsSettingsBiz.cs index 2be03a4a..c1ebd70d 100644 --- a/server/AyaNova/biz/GlobalOpsSettingsBiz.cs +++ b/server/AyaNova/biz/GlobalOpsSettingsBiz.cs @@ -38,7 +38,7 @@ namespace AyaNova.Biz internal async Task GetAsync(bool logTheGetEvent = true) { //first try to fetch from db - var ret = await ct.GlobalOpsSettings.SingleOrDefaultAsync(m => m.Id == 1); + var ret = await ct.GlobalOpsBackupSettings.SingleOrDefaultAsync(m => m.Id == 1); if (logTheGetEvent && ret != null) await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, 1, BizType, AyaEvent.Retrieved), ct); @@ -60,7 +60,7 @@ namespace AyaNova.Biz //put internal async Task ReplaceAsync(GlobalOpsBackupSettings putObject) { - var dbObject = await ct.GlobalOpsSettings.FirstOrDefaultAsync(m => m.Id == 1); + var dbObject = await ct.GlobalOpsBackupSettings.FirstOrDefaultAsync(m => m.Id == 1); if (dbObject == null) throw new System.Exception("GlobalOpsSettingsBiz::ReplaceAsync -> Global settings object not found in database!!"); diff --git a/server/AyaNova/models/AyContext.cs b/server/AyaNova/models/AyContext.cs index 4965d542..78d2e354 100644 --- a/server/AyaNova/models/AyContext.cs +++ b/server/AyaNova/models/AyContext.cs @@ -9,7 +9,7 @@ namespace AyaNova.Models public virtual DbSet UserOptions { get; set; } public virtual DbSet Widget { get; set; } public virtual DbSet GlobalBizSettings { get; set; } - public virtual DbSet GlobalOpsSettings { get; set; } + public virtual DbSet GlobalOpsBackupSettings { get; set; } public virtual DbSet Event { get; set; } public virtual DbSet SearchDictionary { get; set; } public virtual DbSet SearchKey { get; set; } diff --git a/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs b/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs index 9b84fd8e..45304687 100644 --- a/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs +++ b/server/AyaNova/util/ServerGlobalOpsSettingsCache.cs @@ -21,11 +21,11 @@ namespace AyaNova.Util internal static void Initialize(AyContext ct = null) { //fetch or create as not provided (meaning this was called from Startup.cs) - Backup = ct.GlobalOpsSettings.FirstOrDefault(z => z.Id == 1); + Backup = ct.GlobalOpsBackupSettings.FirstOrDefault(z => z.Id == 1); if (Backup == null) { Backup = new GlobalOpsBackupSettings(); - ct.GlobalOpsSettings.Add(Backup); + ct.GlobalOpsBackupSettings.Add(Backup); ct.SaveChanges(); } }