RE1-T114 PR#390 fixes

Author: ucswift

Core/Resgrid.Model/Services/IDepartmentSettingsService.cs

@@ -313,6 +313,6 @@ Task<DepartmentSetting> SetUnitCallStatusOverridesByUnitTypeAsync(int department
 		/// </summary>
 		Task<DepartmentSetting> GetSettingByTypeAsync(int departmentId, DepartmentSettingTypes type);
 
-		Task<bool> GetModernNotificationsEnabledAsync(int departmentId);
+		Task<bool> GetModernNotificationsEnabledAsync(int departmentId, bool bypassCache = false);
 	}
 }

Core/Resgrid.Services/DepartmentSettingsService.cs

@@ -21,6 +21,7 @@ public class DepartmentSettingsService : IDepartmentSettingsService
 		private static string StaffingSupressInfo = "DSetStaffingSupress_{0}";
 		private static string TtsLanguageCacheKey = "DSetTtsLanguage_{0}";
 		private static string PersonnelOnUnitSetUnitStatusCacheKey = "DSetPersonnelOnUnitSetUnitStatus_{0}";
+		private static string ModernNotificationsCacheKey = "DSetModernNotifications_{0}";
 		private static TimeSpan LongCacheLength = TimeSpan.FromDays(14);
 		private static TimeSpan ThatsNotLongThisIsLongCacheLength = TimeSpan.FromDays(365);
 		private static TimeSpan TwoYearCacheLength = TimeSpan.FromDays(730);
@@ -72,6 +73,9 @@ public DepartmentSettingsService(IDepartmentSettingsRepository departmentSetting
 					case DepartmentSettingTypes.PersonnelOnUnitSetUnitStatus:
 						await _cacheProvider.RemoveAsync(string.Format(PersonnelOnUnitSetUnitStatusCacheKey, departmentId));
 						break;
+					case DepartmentSettingTypes.EnableModernNotifications:
+						await _cacheProvider.RemoveAsync(string.Format(ModernNotificationsCacheKey, departmentId));
+						break;
 				}
 
 				savedSetting.Setting = setting;
@@ -924,14 +928,21 @@ public async Task<DepartmentSetting> GetSettingByTypeAsync(int departmentId, Dep
 			return await GetSettingByDepartmentIdType(departmentId, type);
 		}
 
-		public async Task<bool> GetModernNotificationsEnabledAsync(int departmentId)
+		public async Task<bool> GetModernNotificationsEnabledAsync(int departmentId, bool bypassCache = false)
 		{
-			var s = await GetSettingByDepartmentIdType(departmentId, DepartmentSettingTypes.EnableModernNotifications);
+			async Task<string> getSetting()
+			{
+				var s = await GetSettingByDepartmentIdType(departmentId, DepartmentSettingTypes.EnableModernNotifications);
+				return s?.Setting ?? "false";
+			}
 
-			if (s != null && bool.TryParse(s.Setting, out bool result))
-				return result;
+			if (Config.SystemBehaviorConfig.CacheEnabled && !bypassCache)
+			{
+				var cachedValue = await _cacheProvider.RetrieveAsync<string>(string.Format(ModernNotificationsCacheKey, departmentId), getSetting, LongCacheLength);
+				return bool.Parse(cachedValue);
+			}
 
-			return false;
+			return bool.Parse(await getSetting());
 		}
 
 		private static string GetDefaultTtsLanguage()

Core/Resgrid.Services/PushService.cs

@@ -184,15 +184,14 @@ public async Task<bool> PushCall(StandardPushCall call, string userId, UserProfi
 			if (profile == null)
 				profile = await _userProfileService.GetProfileByUserIdAsync(userId);
 
-			string color = null;
-			if (priority != null)
-				color = priority.Color;
-
-			bool useModern = call.DepartmentId.HasValue && await _departmentSettingsService.GetModernNotificationsEnabledAsync(call.DepartmentId.Value);
-			string soundType = ConvertCallPriorityToSound((int)call.Priority, priority, useModern);
-
 			if (profile != null && profile.SendPush)
 			{
+				string color = null;
+				if (priority != null)
+					color = priority.Color;
+
+				string soundType = await GetCallSoundTypeAsync(call, priority);
+
 				// Legacy Push Notifications (Azure)
 				try
 				{
@@ -228,8 +227,7 @@ public async Task<bool> PushCallUnit(StandardPushCall call, int unitId, Departme
 			if (priority != null)
 				color = priority.Color;
 
-			bool useModern = call.DepartmentId.HasValue && await _departmentSettingsService.GetModernNotificationsEnabledAsync(call.DepartmentId.Value);
-			string soundType = ConvertCallPriorityToSound((int)call.Priority, priority, useModern);
+			string soundType = await GetCallSoundTypeAsync(call, priority);
 
 			try
 			{
@@ -262,6 +260,25 @@ private async Task<string> GetSoundTypeAsync(int? departmentId, PushSoundTypes l
 			return ((int)legacyType).ToString();
 		}
 
+		private async Task<string> GetCallSoundTypeAsync(StandardPushCall call, DepartmentCallPriority priority)
+		{
+			bool useModern = false;
+
+			if (call.DepartmentId.HasValue)
+			{
+				try
+				{
+					useModern = await _departmentSettingsService.GetModernNotificationsEnabledAsync(call.DepartmentId.Value);
+				}
+				catch (Exception ex)
+				{
+					Framework.Logging.LogException(ex);
+				}
+			}
+
+			return ConvertCallPriorityToSound((int)call.Priority, priority, useModern);
+		}
+
 		private string ConvertCallPriorityToSound(int priority, DepartmentCallPriority callPriority, bool useModern)
 		{
 			if (priority > 3 && callPriority != null)